From 73c3b295af515b2d31f55d6fe4593979ce0f48ef Mon Sep 17 00:00:00 2001
From: "Ullman, Brad (DCYF)" <brad.ullman@dcyf.wa.gov>
Date: Fri, 27 Mar 2026 17:12:26 -0700
Subject: [PATCH 01/21] add plan and progress

---
 .gitignore                                  |   1 +
 plan.md                                     | 173 ++++++++++++++++++++
 progress-src-step-templates-legacy-clean.md |  81 +++++++++
 3 files changed, 255 insertions(+)
 create mode 100644 plan.md
 create mode 100644 progress-src-step-templates-legacy-clean.md

diff --git a/.gitignore b/.gitignore
index 96cc31e06..2d1c306e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ step-templates/*.ps1
 step-templates/*.sh
 step-templates/*.py
 diff-output/
+.tmp*/
 /.vs
 !.vscode
 *copy.ps1
diff --git a/plan.md b/plan.md
new file mode 100644
index 000000000..6fc258b20
--- /dev/null
+++ b/plan.md
@@ -0,0 +1,173 @@
+# Plan: Rebuild The Step Template Unpack Work From `master`
+
+## Goal
+
+Start from `master` and implement a safe migration path from legacy packed templates in `step-templates/*.json` to editable source folders in `src/step-templates/<template-name>/`.
+
+The result should preserve existing site behavior while making script changes reviewable as normal files.
+
+## Desired End State
+
+For every step template:
+
+- source lives under `src/step-templates/<template-name>/`
+- `metadata.json` contains template metadata only
+- script content lives in separate files
+- packed `step-templates/*.json` can still be generated for existing consumers
+- migration can be done gradually in batches without breaking the build
+
+## Constraints
+
+- `master` currently treats `step-templates/*.json` as the legacy artifact shape
+- the migration must be incremental, not a flag day rewrite
+- reviewability matters, especially for script changes
+- round-trip equivalence matters more than elegance
+
+## Work Breakdown
+
+### 1. Define The Source Format
+
+Choose and document the source-root contract:
+
+- `src/step-templates/<template>/metadata.json`
+- `scriptbody.ps1|sh|py` when the main script exists
+- `predeploy.ps1`, `deploy.ps1`, `postdeploy.ps1` for custom script stages
+- `logos/` and `tests/` remain special-case directories under `src/step-templates`
+
+Update `README.md` so contributors and reviewers know the new source layout.
+
+### 2. Add Packing Support
+
+Create a script that reads source folders and regenerates legacy packed outputs under `step-templates/`.
+
+Requirements:
+
+- copy `metadata.json` into a temporary legacy shape
+- copy extracted script files into temporary `*.ScriptBody.*`, `*.PreDeploy.ps1`, `*.Deploy.ps1`, `*.PostDeploy.ps1`
+- call the existing legacy packing logic
+- write final packed JSON back into `step-templates/`
+- avoid mutating source files during packing
+
+This is the bridge that allows gradual migration without breaking existing consumers.
+
+### 3. Add Preparation Support
+
+Create a script that takes existing packed templates and prepares source folders from them.
+
+Requirements:
+
+- read `step-templates/<name>.json`
+- export embedded legacy scripts to temporary real files
+- move those extracted scripts into `src/step-templates/<name>/` using normalized names
+- preserve the original text content exactly before final cleanup
+
+This script should support running on a selected list of template names so migration can happen in batches.
+
+### 4. Add Finalization Support
+
+Create a script that finalizes a migrated template after verification.
+
+Requirements:
+
+- confirm extracted script files match the prepared originals
+- remove embedded script properties from `metadata.json`
+- rename any `*-orig.*` file to its final normalized name
+- leave metadata-only templates untouched
+
+Finalization should happen only after round-trip verification passes.
+
+### 5. Add Verification Helpers
+
+Add lightweight helpers or tests that prove source-to-packed round trips are safe.
+
+Verification should cover:
+
+- packed JSON can be regenerated from source
+- script content matches legacy content after normalization
+- no unexpected packed script sidecar files remain in `step-templates/`
+- representative templates across PowerShell, Bash, Python, and custom script stages
+
+### 6. Prove The Flow On A Small Proof Set
+
+Before migrating many templates, choose a small and varied proof set:
+
+- one PowerShell `ScriptBody` template
+- one Bash `ScriptBody` template
+- one Python `ScriptBody` template
+- one template using custom script stages if available
+
+For the proof set:
+
+1. prepare from legacy
+2. move metadata into source root
+3. extract scripts
+4. repack
+5. compare results
+6. finalize
+
+Do not scale out until this set works cleanly.
+
+### 7. Migrate Script-Bearing Templates In Batches
+
+After the proof set passes, migrate the script-bearing templates in manageable batches.
+
+Per batch:
+
+1. choose a bounded list of template names
+2. prepare originals from legacy packed files
+3. add `src/step-templates/<name>/metadata.json`
+4. add extracted script files
+5. repack and compare
+6. finalize
+7. commit the batch
+
+Keep commits small enough that regressions are easy to isolate.
+
+### 8. Handle Edge Cases Explicitly
+
+Expect special handling for:
+
+- templates with custom pre/deploy/post-deploy scripts
+- templates with empty custom script properties
+- templates that are metadata-only
+- templates whose names or casing are inconsistent
+- templates that already have partial source-root structure
+
+Capture these cases in docs or helper script behavior rather than solving them ad hoc each time.
+
+### 9. Finish The Remainder
+
+Once script-bearing templates are stable, migrate the rest of the templates so all authoring lives under `src/step-templates`.
+
+The packing step can continue to generate legacy JSON until the repo no longer needs it.
+
+### 10. Final Cleanup
+
+After the full migration is complete:
+
+- confirm every template exists in source-root form
+- confirm packed JSON is generated, not hand-authored
+- remove obsolete migration-only helpers if they are no longer needed
+- keep only the pack path that is still required operationally
+
+## Recommended Order Of Execution
+
+1. document the new source contract
+2. implement pack-from-source support
+3. implement prepare-from-legacy support
+4. implement finalize support
+5. add verification helpers
+6. migrate a proof set
+7. migrate script-bearing templates in batches
+8. migrate remaining templates
+9. clean up once source-root becomes authoritative
+
+## Definition Of Done
+
+The migration is complete when:
+
+- every template has a source folder in `src/step-templates`
+- script content is stored as real files, not JSON string blobs
+- pack tooling reproduces the legacy output reliably
+- reviewers can inspect script changes as normal file diffs
+- the repository no longer depends on manual editing of `step-templates/*.json`
diff --git a/progress-src-step-templates-legacy-clean.md b/progress-src-step-templates-legacy-clean.md
new file mode 100644
index 000000000..0f7f76e12
--- /dev/null
+++ b/progress-src-step-templates-legacy-clean.md
@@ -0,0 +1,81 @@
+# Progress Handoff: `src-step-templates-legacy-clean`
+
+## Purpose
+
+This branch is migrating legacy step template authoring away from packed files in `step-templates/*.json` and into source folders under `src/step-templates/<template-name>/`.
+
+The target shape for a migrated template is:
+
+- `src/step-templates/<template-name>/metadata.json`
+- optional `scriptbody.ps1`
+- optional `scriptbody.sh`
+- optional `scriptbody.py`
+- optional `predeploy.ps1`
+- optional `deploy.ps1`
+- optional `postdeploy.ps1`
+
+## What Was Done
+
+The branch added infrastructure and migrated an initial set of script-bearing templates in batches.
+
+Key commits on that branch at the time of this handoff:
+
+- `dc7e4979` Add legacy-backed step-template source infrastructure
+- `d6d73b62` Add step-template migration verification helpers
+- `e1dcec3b` Move proof set metadata into source root
+- `d1c13e56` Extract proof set source files into source root
+- `72ac72b3` Move script-bearing batch 1 metadata into source root
+- `19c21070` Extract script-bearing batch 1 source files into source root
+- `c0f16dd0` Move script-bearing batch 2 metadata into source root
+- `12347221` Extract script-bearing batch 2 source files into source root
+- `e71d0c46` Ignore temporary `.tmp*` folders
+
+## Reconstructed Workflow Used On That Branch
+
+The branch introduced and used these scripts:
+
+- `tools/Prepare-StepTemplateSourceOriginals.ps1`
+- `tools/Pack-SourceStepTemplates.ps1`
+- `tools/Finalize-StepTemplateSourceMigration.ps1`
+
+Operational flow:
+
+1. Prepare a template by exporting legacy script bodies out of `step-templates/<name>.json`.
+2. Move the template metadata into `src/step-templates/<name>/metadata.json`.
+3. Store script content as real files in the template folder.
+4. Pack from source back into legacy layout and verify the output still round-trips.
+5. Finalize by removing embedded script properties from `metadata.json` after the extracted files are confirmed.
+
+## State At Time Of Handoff
+
+Counts observed while inspecting the branch:
+
+- `step-templates/*.json`: `584`
+- `src/step-templates/<template>/metadata.json`: `212`
+- remaining legacy-only templates: `372`
+
+Additional observations:
+
+- `212` migrated template folders already had extracted script files.
+- Exactly one migrated template still appeared partially finalized:
+  - `src/step-templates/azure-function-deployment/metadata.json`
+  - still contained:
+    - `Octopus.Action.CustomScripts.PreDeploy.ps1`
+    - `Octopus.Action.CustomScripts.Deploy.ps1`
+
+## Recommended Next Actions On That Branch
+
+1. Finalize `azure-function-deployment` so its metadata no longer carries embedded custom script properties.
+2. Choose the next migration batch from the `372` legacy-only templates.
+3. Repeat the same metadata move, extraction, pack verification, and finalize sequence.
+4. Continue until `src/step-templates` becomes the complete source of truth for all templates.
+
+## Notes For Continuing On Another Machine
+
+If resuming this work elsewhere:
+
+- check out `src-step-templates-legacy-clean`
+- read this file first
+- inspect the three migration scripts above
+- verify the current counts before starting the next batch
+- use small batches and validate each one before moving on

From f7f09ebfaf0fc71fbf20e67bb80ebffe50cdaca5 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Fri, 27 Mar 2026 23:18:13 -0700
Subject: [PATCH 02/21] docs: add source-first migration plan

---
 plan.md | 384 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 211 insertions(+), 173 deletions(-)

diff --git a/plan.md b/plan.md
index 6fc258b20..dda1be7ab 100644
--- a/plan.md
+++ b/plan.md
@@ -1,173 +1,211 @@
-# Plan: Rebuild The Step Template Unpack Work From `master`
-
-## Goal
-
-Start from `master` and implement a safe migration path from legacy packed templates in `step-templates/*.json` to editable source folders in `src/step-templates/<template-name>/`.
-
-The result should preserve existing site behavior while making script changes reviewable as normal files.
-
-## Desired End State
-
-For every step template:
-
-- source lives under `src/step-templates/<template-name>/`
-- `metadata.json` contains template metadata only
-- script content lives in separate files
-- packed `step-templates/*.json` can still be generated for existing consumers
-- migration can be done gradually in batches without breaking the build
-
-## Constraints
-
-- `master` currently treats `step-templates/*.json` as the legacy artifact shape
-- the migration must be incremental, not a flag day rewrite
-- reviewability matters, especially for script changes
-- round-trip equivalence matters more than elegance
-
-## Work Breakdown
-
-### 1. Define The Source Format
-
-Choose and document the source-root contract:
-
-- `src/step-templates/<template>/metadata.json`
-- `scriptbody.ps1|sh|py` when the main script exists
-- `predeploy.ps1`, `deploy.ps1`, `postdeploy.ps1` for custom script stages
-- `logos/` and `tests/` remain special-case directories under `src/step-templates`
-
-Update `README.md` so contributors and reviewers know the new source layout.
-
-### 2. Add Packing Support
-
-Create a script that reads source folders and regenerates legacy packed outputs under `step-templates/`.
-
-Requirements:
-
-- copy `metadata.json` into a temporary legacy shape
-- copy extracted script files into temporary `*.ScriptBody.*`, `*.PreDeploy.ps1`, `*.Deploy.ps1`, `*.PostDeploy.ps1`
-- call the existing legacy packing logic
-- write final packed JSON back into `step-templates/`
-- avoid mutating source files during packing
-
-This is the bridge that allows gradual migration without breaking existing consumers.
-
-### 3. Add Preparation Support
-
-Create a script that takes existing packed templates and prepares source folders from them.
-
-Requirements:
-
-- read `step-templates/<name>.json`
-- export embedded legacy scripts to temporary real files
-- move those extracted scripts into `src/step-templates/<name>/` using normalized names
-- preserve the original text content exactly before final cleanup
-
-This script should support running on a selected list of template names so migration can happen in batches.
-
-### 4. Add Finalization Support
-
-Create a script that finalizes a migrated template after verification.
-
-Requirements:
-
-- confirm extracted script files match the prepared originals
-- remove embedded script properties from `metadata.json`
-- rename any `*-orig.*` file to its final normalized name
-- leave metadata-only templates untouched
-
-Finalization should happen only after round-trip verification passes.
-
-### 5. Add Verification Helpers
-
-Add lightweight helpers or tests that prove source-to-packed round trips are safe.
-
-Verification should cover:
-
-- packed JSON can be regenerated from source
-- script content matches legacy content after normalization
-- no unexpected packed script sidecar files remain in `step-templates/`
-- representative templates across PowerShell, Bash, Python, and custom script stages
-
-### 6. Prove The Flow On A Small Proof Set
-
-Before migrating many templates, choose a small and varied proof set:
-
-- one PowerShell `ScriptBody` template
-- one Bash `ScriptBody` template
-- one Python `ScriptBody` template
-- one template using custom script stages if available
-
-For the proof set:
-
-1. prepare from legacy
-2. move metadata into source root
-3. extract scripts
-4. repack
-5. compare results
-6. finalize
-
-Do not scale out until this set works cleanly.
-
-### 7. Migrate Script-Bearing Templates In Batches
-
-After the proof set passes, migrate the script-bearing templates in manageable batches.
-
-Per batch:
-
-1. choose a bounded list of template names
-2. prepare originals from legacy packed files
-3. add `src/step-templates/<name>/metadata.json`
-4. add extracted script files
-5. repack and compare
-6. finalize
-7. commit the batch
-
-Keep commits small enough that regressions are easy to isolate.
-
-### 8. Handle Edge Cases Explicitly
-
-Expect special handling for:
-
-- templates with custom pre/deploy/post-deploy scripts
-- templates with empty custom script properties
-- templates that are metadata-only
-- templates whose names or casing are inconsistent
-- templates that already have partial source-root structure
-
-Capture these cases in docs or helper script behavior rather than solving them ad hoc each time.
-
-### 9. Finish The Remainder
-
-Once script-bearing templates are stable, migrate the rest of the templates so all authoring lives under `src/step-templates`.
-
-The packing step can continue to generate legacy JSON until the repo no longer needs it.
-
-### 10. Final Cleanup
-
-After the full migration is complete:
-
-- confirm every template exists in source-root form
-- confirm packed JSON is generated, not hand-authored
-- remove obsolete migration-only helpers if they are no longer needed
-- keep only the pack path that is still required operationally
-
-## Recommended Order Of Execution
-
-1. document the new source contract
-2. implement pack-from-source support
-3. implement prepare-from-legacy support
-4. implement finalize support
-5. add verification helpers
-6. migrate a proof set
-7. migrate script-bearing templates in batches
-8. migrate remaining templates
-9. clean up once source-root becomes authoritative
-
-## Definition Of Done
-
-The migration is complete when:
-
-- every template has a source folder in `src/step-templates`
-- script content is stored as real files, not JSON string blobs
-- pack tooling reproduces the legacy output reliably
-- reviewers can inspect script changes as normal file diffs
-- the repository no longer depends on manual editing of `step-templates/*.json`
+# Numbered Migration Plan For Source-First Step Templates
+
+## Summary
+
+This plan moves authored step templates and related authoring assets out of `step-templates/` and into `src/`, keeps `step-templates/*.json` as generated compatibility output, and updates `npm run dev` plus watch mode to regenerate packed JSON from source.
+
+The work lands as one PR, but execution is organized into a proof batch followed by migration batches of 100 templates each. Validation is strict: each migrated template must repack to a byte-identical match against its saved `.json.orig`.
+
+The existing pack and unpack scripts must not be altered. They remain the canonical mechanism for producing identical packed output. Any additional behavior needed for migration or the new source-first workflow should be implemented in separate helper scripts. Scripts that are temporary migration scaffolding should be clearly named with a `migration-` prefix.
+
+A key requirement during migration is that the dev workflow remains usable at every intermediate point. After the proof batch, after batch 100, and after any later batch, `npm run dev`, tests, and watch mode must continue to work by combining authored templates already moved into `src/` with any templates not yet migrated.
+
+## Numbered Steps
+
+1. Write this plan into `plan.md`.
+
+2. Define and document the new source contract under `src/`:
+   - `src/step-templates/<template>/metadata.json`
+   - `src/step-templates/<template>/scriptbody.<ext>`
+   - optional `predeploy.ps1`, `deploy.ps1`, `postdeploy.ps1`
+   - placeholder values in `metadata.json` for script-backed properties
+   - move shared authoring assets from `step-templates/logos` to `src/step-templates/logos`
+   - move template tests from `step-templates/tests` to `src/step-templates/tests`
+
+3. Preserve the existing packing and unpacking behavior unchanged:
+   - do not modify `tools/_pack.ps1`
+   - do not modify `tools/_unpack.ps1`
+   - do not modify the existing `StepTemplatePacker` import/export logic
+   - treat those scripts as the source of truth for byte-identical repacking and diff validation
+
+4. Inventory existing helper scripts and classify them:
+   - keep scripts still needed after migration
+   - mark temporary migration-only scripts with `migration-` prefixes
+   - identify scripts that become obsolete once source files are first-class
+   - explicitly evaluate `_diff.ps1` and any related review/extraction helpers for removal
+   - plan README/docs updates around the retained and removed scripts
+
+5. Update `.gitignore` so `step-templates/` is treated as generated output only when the migration is complete:
+   - prepare ignore rules for generated `step-templates/*.json`
+   - ignore temporary `step-templates/*.json.orig`
+   - ensure no newly generated files under `step-templates/` are accidentally checked in once cutover is complete
+   - keep migration-safe behavior while legacy tracked JSON still exists during intermediate batches inside the PR
+
+6. Create helper scripts for the new workflow without changing the old ones:
+   - create permanent source-to-generated helper scripts for dev and watch flows
+   - create temporary `migration-*` scripts for prepare, verify, batch migration, and cleanup work
+   - keep permanent and migration-only responsibilities clearly separated
+
+7. Implement permanent helper tooling that supports mixed migration state while still using the existing packer:
+   - treat `src/step-templates/*` as authoritative for migrated templates
+   - treat legacy `step-templates/*.json` as the source for templates not yet migrated
+   - generate or refresh packed `step-templates/*.json` only for templates that already exist in `src/`
+   - leave untouched legacy packed JSON in place for templates not yet migrated
+   - stage source template material into the temporary legacy layout expected by the unchanged packer
+   - stage logos and test assets into the generated layout as needed for existing validation/build logic
+   - support generating all migrated templates for dev startup
+   - support generating a single migrated template for watch mode
+
+8. Implement migration-only prepare tooling in `migration-*` scripts for a single template:
+   - copy `step-templates/<template>.json` to `step-templates/<template>.json.orig`
+   - `git mv` `step-templates/<template>.json` to `src/step-templates/<template>/metadata.json`
+   - use the existing unpack behavior to extract scripts without changing its implementation
+   - move or normalize unpacked outputs into the final source folder layout
+   - replace embedded script values in `metadata.json` with placeholders
+
+9. Implement migration-only validation tooling in `migration-*` scripts for a single template:
+   - reconstruct the temporary legacy layout needed by the unchanged packer
+   - invoke the existing pack behavior to regenerate `step-templates/<template>.json`
+   - diff regenerated `step-templates/<template>.json` against `step-templates/<template>.json.orig`
+   - fail unless they are byte-identical
+   - remove `.json.orig` only after validation succeeds
+
+10. Update dev/build behavior so `npm run dev` works throughout migration:
+   - on startup, regenerate packed JSON for all templates currently authored under `src/step-templates/*`
+   - keep unmigrated legacy JSON files available in `step-templates/`
+   - then run the existing build pipeline against the complete effective packed set
+   - ensure this works after the proof batch, after batch 100, and at every later partial-migration checkpoint
+
+11. Update watch behavior so hot reloading works throughout migration:
+   - changes under `src/step-templates/**/*` regenerate only the corresponding migrated packed template, then rerun downstream aggregate/site generation
+   - changes to unmigrated legacy `step-templates/*.json` continue to work until those templates are migrated
+   - shared asset changes such as logos or test helpers trigger the smallest safe regeneration scope
+   - the site reload behavior should remain functional regardless of how many templates have already moved to `src/`
+
+12. Update validation/tests to align with the migration-safe source-first model:
+   - validations continue to run against the effective packed `step-templates/*.json` set
+   - any test paths that currently point at `step-templates/tests` are updated to use `src/step-templates/tests` as the authored location
+   - generated validation inputs are reconstructed as needed for unchanged pack/unpack compatibility
+   - test and dev commands must pass in mixed-state migration checkpoints, not only after final cutover
+
+13. Scan the repo and select the initial proof batch to cover migration edge cases:
+   - template with no `ScriptBody`
+   - template with non-PowerShell `ScriptBody`
+   - template with `ScriptBody` plus custom staged scripts
+   - template with only staged scripts if one exists
+   - template with unusual or metadata-heavy structure if one exists
+
+14. Migrate the proof batch using the full prepare, pack, diff, and cleanup workflow until every proof template passes strict `.json.orig` validation.
+
+15. Verify the migration-safe developer workflow immediately after the proof batch:
+   - run dev startup with only the proof templates in `src/`
+   - confirm generated packed JSON is created for proof templates
+   - confirm unmigrated legacy templates still participate in the site build
+   - confirm tests still pass
+   - confirm watch mode and hot reload still work
+
+16. Review the proof batch results and lock any required naming, placeholder, helper-script, or workflow adjustments before bulk migration begins.
+
+17. Migrate the remaining templates in batches of 100:
+   - for each batch, prepare every template with `.json.orig`
+   - `git mv` into `src/step-templates/<template>/metadata.json`
+   - unpack script files and replace metadata script values with placeholders
+   - regenerate packed JSON through helper scripts that rely on the unchanged packer
+   - diff each regenerated packed file against its `.json.orig`
+   - verify dev startup, tests, and hot reload still work with the repo in its new mixed-state checkpoint
+   - do not proceed to the next batch until the full current batch validates cleanly
+
+18. Migrate shared non-template authoring assets:
+   - move `step-templates/logos` to `src/step-templates/logos`
+   - move `step-templates/tests` to `src/step-templates/tests`
+   - update any build, validation, or helper script references to the new authored locations
+   - ensure generated layout still provides whatever the unchanged validation/build path expects
+
+19. Update README and contributor docs to reflect both the migration period and the final workflow:
+   - explain that migrated templates live in `src/step-templates/*`
+   - explain that unmigrated templates may temporarily still exist in legacy form during the migration
+   - explain that `npm run dev` and watch mode support both states during the transition
+   - explain that `step-templates/*.json` becomes generated output after full cutover
+   - document the permanent helper scripts used for generation and watch mode
+   - document temporary `migration-*` scripts and note they are disposable after migration
+   - remove review guidance that depends on unpacking JSON blobs for diffs once full cutover is complete
+
+20. Remove or retire obsolete tooling and documentation after the migration is proven:
+   - remove `_diff.ps1` if it is no longer needed
+   - evaluate other pack/unpack-adjacent utilities and remove any that only existed to work around unreadable JSON diffs
+   - keep unchanged pack/unpack scripts and any permanent source-to-generated helpers still required post-migration
+   - update docs so only supported scripts remain documented
+
+21. Perform final cutover after the last migration batch:
+   - confirm all templates now exist under `src/step-templates/*`
+   - switch `.gitignore` and workflow assumptions fully to generated-only `step-templates/*.json`
+   - ensure no legacy authored template JSON remains outside generated output
+
+22. After all batches and asset moves are complete, run full generation and repo-wide validation to confirm every packed JSON file is reproducible from `src/step-templates/*`.
+
+23. Finalize the PR state:
+   - ensure `src/step-templates/*` is the only authored source
+   - ensure packed `step-templates/*.json` are generated and untracked
+   - ensure `.json.orig` files are removed
+   - ensure docs and dev workflow reflect the new model
+   - retain only the helper scripts needed after migration
+   - remove temporary `migration-*` scripts and obsolete review helpers that are no longer needed
+
+## Script Roles
+
+- Permanent scripts:
+  - source-to-generated helper scripts needed for `npm run dev`, watch mode, and ongoing local authoring
+  - unchanged legacy pack/unpack scripts still used for byte-identical generation
+- Migration-only scripts:
+  - must be clearly named with `migration-` prefixes
+  - include prepare, verify, batch migration, and cleanup helpers
+  - may be deleted after the migration is complete
+- Obsolete scripts to evaluate for removal:
+  - `_diff.ps1` is expected to become unnecessary because GitHub diffs become readable from real source files
+  - any other script whose purpose was to compensate for embedded JSON script blobs should be reviewed for removal
+
+## Public Interfaces And Behavior
+
+- New authored source layout:
+  - `src/step-templates/<template>/metadata.json`
+  - `src/step-templates/<template>/scriptbody.<ext>`
+  - optional staged script files
+  - `src/step-templates/logos`
+  - `src/step-templates/tests`
+- Existing runtime/site interface remains unchanged:
+  - the site still consumes packed JSON from `step-templates/*.json`
+- Contributor workflow changes:
+  - contributors edit migrated templates in `src/step-templates/*`
+  - contributors may still encounter unmigrated legacy JSON during the migration window inside the PR
+  - contributors no longer need special diff tooling for migrated templates
+  - contributors rely on generation and validation tooling for round-trip safety
+- Existing pack/unpack commands remain behaviorally unchanged:
+  - helper scripts wrap them rather than replacing or editing them
+
+## Test Plan
+
+- Verify generation from migrated templates in `src/step-templates/*` produces valid packed `step-templates/*.json`
+- Verify the proof batch covers the intended edge cases and every template matches its `.json.orig` exactly after repack
+- Verify each 100-template migration batch passes strict `.json.orig` validation before the next batch starts
+- Verify `npm run dev` works after the proof batch, after batch 100, and after every later batch checkpoint
+- Verify hot reload works for migrated templates in `src/step-templates/*` throughout the migration
+- Verify unmigrated legacy templates continue to participate in dev/test/build until they are migrated
+- Verify `.gitignore` prevents newly generated files in `step-templates/` from being staged unintentionally at final cutover
+- Verify shared asset changes in `src/step-templates/logos` and `src/step-templates/tests` trigger the correct downstream regeneration
+- Verify existing validations still pass against the effective packed outputs
+- Verify existing pack/unpack behavior is unchanged and still produces identical files for diffing
+- Verify `_diff.ps1` and any other obsolete review helpers can be removed without losing required workflow support
+- Verify `.orig` artifacts are temporary, untracked, and removed after successful validation
+- Verify temporary `migration-*` scripts can be removed without affecting the post-migration dev workflow
+
+## Assumptions And Defaults
+
+- This remains one cutover PR composed of smaller commits
+- The proof batch comes first, and subsequent migration batches are fixed at 100 templates each
+- During migration, the repo must support a mixed state where some templates are authored in `src/step-templates/*` and others remain as legacy JSON
+- `metadata.json` uses placeholders for script-backed properties
+- Packed JSON equivalence is strict and byte-for-byte
+- `step-templates/` becomes generated-only after final cutover, not before the last migrated batch is complete
+- Shared authoring assets currently under `step-templates/logos` and `step-templates/tests` move to `src/step-templates/`
+- `.json.orig` files are local migration artifacts only and are never committed
+- Existing pack/unpack scripts remain unchanged; all new behavior is introduced through helper scripts around them

From b2d93f0f159db12511cdc9dc567c7cf89612b266 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Fri, 27 Mar 2026 23:29:38 -0700
Subject: [PATCH 03/21] refactor: move authored step-template assets into src

---
 README.md                                     |  38 ++++++++++--------
 .../logos/1password-connect.png               | Bin
 .../step-templates}/logos/akamai.png          | Bin
 .../step-templates}/logos/amazon-chime.png    | Bin
 .../step-templates}/logos/ansible.png         | Bin
 .../step-templates}/logos/apexsql.png         | Bin
 .../step-templates}/logos/apollo.png          | Bin
 .../step-templates}/logos/argo.png            | Bin
 .../step-templates}/logos/aspnet.png          | Bin
 .../step-templates}/logos/aws.png             | Bin
 .../step-templates}/logos/azure-devops.png    | Bin
 .../step-templates}/logos/azure-keyvault.png  | Bin
 .../logos/azure-site-extensions.png           | Bin
 .../step-templates}/logos/azure.png           | Bin
 .../step-templates}/logos/azurefunctions.png  | Bin
 .../step-templates}/logos/bash.png            | Bin
 .../step-templates}/logos/bitwarden.png       | Bin
 .../step-templates}/logos/cassandra.png       | Bin
 .../step-templates}/logos/chef.png            | Bin
 .../step-templates}/logos/chocolatey.png      | Bin
 .../step-templates}/logos/clickonce.png       | Bin
 .../step-templates}/logos/cyberark.png        | Bin
 .../step-templates}/logos/databricks.png      | Bin
 .../step-templates}/logos/datadog.png         | Bin
 .../step-templates}/logos/dll.png             | Bin
 .../step-templates}/logos/dlm.png             | Bin
 .../step-templates}/logos/docker.png          | Bin
 .../step-templates}/logos/dotnetcore.png      | Bin
 .../step-templates}/logos/dyn.png             | Bin
 .../step-templates}/logos/edgecast.png        | Bin
 .../step-templates}/logos/elmah.png           | Bin
 .../step-templates}/logos/email.png           | Bin
 .../step-templates}/logos/encrypt.png         | Bin
 .../step-templates}/logos/entityframework.png | Bin
 .../step-templates}/logos/event-tracing.png   | Bin
 .../step-templates}/logos/exe.png             | Bin
 .../step-templates}/logos/f5.png              | Bin
 .../step-templates}/logos/filesystem.png      | Bin
 .../step-templates}/logos/firebase.png        | Bin
 .../step-templates}/logos/flyway.png          | Bin
 .../step-templates}/logos/ghostinspector.png  | Bin
 .../step-templates}/logos/git.png             | Bin
 .../step-templates}/logos/github.png          | Bin
 .../step-templates}/logos/gitlab.png          | Bin
 .../step-templates}/logos/google-chat.png     | Bin
 .../step-templates}/logos/google-cloud.png    | Bin
 .../step-templates}/logos/grate.png           | Bin
 .../step-templates}/logos/hashicorp-vault.png | Bin
 .../step-templates}/logos/hipchat.png         | Bin
 .../step-templates}/logos/hockeyapp.png       | Bin
 .../step-templates}/logos/hosts-file.png      | Bin
 .../step-templates}/logos/http.png            | Bin
 .../step-templates}/logos/iis.png             | Bin
 .../step-templates}/logos/jasper.png          | Bin
 .../step-templates}/logos/jenkins.png         | Bin
 .../step-templates}/logos/jira.png            | Bin
 .../step-templates}/logos/json.png            | Bin
 .../step-templates}/logos/jwt.png             | Bin
 .../step-templates}/logos/k8s.png             | Bin
 .../logos/keeper-secretsmanager.png           | Bin
 .../step-templates}/logos/launchdarkly.png    | Bin
 .../step-templates}/logos/lets-encrypt.png    | Bin
 .../step-templates}/logos/linux.png           | Bin
 .../step-templates}/logos/liquibase.png       | Bin
 .../step-templates}/logos/mabl.png            | Bin
 .../step-templates}/logos/mariadb.png         | Bin
 .../step-templates}/logos/medianova.png       | Bin
 .../step-templates}/logos/mercurial.png       | Bin
 .../logos/microsoft-power-automate.png        | Bin
 .../step-templates}/logos/microsoft-teams.png | Bin
 .../step-templates}/logos/mongodb.png         | Bin
 .../step-templates}/logos/mulesoft.png        | Bin
 .../step-templates}/logos/mysql.png           | Bin
 .../step-templates}/logos/netscaler.png       | Bin
 .../step-templates}/logos/newrelic.png        | Bin
 .../step-templates}/logos/nunit.png           | Bin
 .../step-templates}/logos/octopus.png         | Bin
 .../step-templates}/logos/opslevel.png        | Bin
 .../step-templates}/logos/oracle.png          | Bin
 .../step-templates}/logos/other.png           | Bin
 .../step-templates}/logos/pagerduty.png       | Bin
 .../step-templates}/logos/pingdom.png         | Bin
 .../step-templates}/logos/postgresql.png      | Bin
 .../step-templates}/logos/proxmox.png         | Bin
 .../step-templates}/logos/pulumi.png          | Bin
 .../step-templates}/logos/pushalot.png        | Bin
 .../step-templates}/logos/pushover.png        | Bin
 .../step-templates}/logos/rabbitmq.png        | Bin
 .../step-templates}/logos/rackspace.png       | Bin
 .../step-templates}/logos/ravendb.png         | Bin
 .../step-templates}/logos/raygun.png          | Bin
 .../step-templates}/logos/readyroll.png       | Bin
 .../step-templates}/logos/redgate.png         | Bin
 .../step-templates}/logos/redis.png           | Bin
 .../step-templates}/logos/rnhub.png           | Bin
 .../step-templates}/logos/rollbar.png         | Bin
 .../step-templates}/logos/roundhouse.png      | Bin
 .../step-templates}/logos/sbom.png            | Bin
 .../step-templates}/logos/sentry.png          | Bin
 .../step-templates}/logos/seq.png             | Bin
 .../step-templates}/logos/sharepoint.png      | Bin
 .../step-templates}/logos/sitecore.png        | Bin
 .../step-templates}/logos/slack.png           | Bin
 .../step-templates}/logos/snowflake.png       | Bin
 .../step-templates}/logos/solarwinds.png      | Bin
 .../step-templates}/logos/spark.png           | Bin
 .../step-templates}/logos/splunk.png          | Bin
 .../step-templates}/logos/sql.png             | Bin
 .../step-templates}/logos/ssl.png             | Bin
 .../step-templates}/logos/stackify.png        | Bin
 .../step-templates}/logos/statuscake.png      | Bin
 .../step-templates}/logos/statuspage.png      | Bin
 .../step-templates}/logos/swaggerhub.png      | Bin
 .../step-templates}/logos/teamcity.png        | Bin
 .../step-templates}/logos/tenants.png         | Bin
 .../step-templates}/logos/terraform.png       | Bin
 .../step-templates}/logos/testery.png         | Bin
 .../step-templates}/logos/tests.png           | Bin
 .../step-templates}/logos/tomcat.png          | Bin
 .../step-templates}/logos/topshelf.png        | Bin
 .../step-templates}/logos/twilio.png          | Bin
 .../step-templates}/logos/umbraco.png         | Bin
 .../step-templates}/logos/unicorn.png         | Bin
 .../step-templates}/logos/unzip.png           | Bin
 .../step-templates}/logos/venafi.png          | Bin
 .../step-templates}/logos/victorops.png       | Bin
 .../step-templates}/logos/wait.png            | Bin
 .../step-templates}/logos/webdeploy.png       | Bin
 .../step-templates}/logos/windows.png         | Bin
 .../step-templates}/logos/winscp.png          | Bin
 .../step-templates}/logos/xamarin.png         | Bin
 .../step-templates}/logos/xml.png             | Bin
 .../step-templates}/logos/xunit.png           | Bin
 .../step-templates}/logos/zabbix.png          | Bin
 .../tests/Invoke-PesterTests.ps1              |  17 +++++---
 .../sql-backup-database.ScriptBody.Tests.ps1  |   0
 ...scheduled-task-create.ScriptBody.Tests.ps1 |   0
 137 files changed, 33 insertions(+), 22 deletions(-)
 rename {step-templates => src/step-templates}/logos/1password-connect.png (100%)
 rename {step-templates => src/step-templates}/logos/akamai.png (100%)
 rename {step-templates => src/step-templates}/logos/amazon-chime.png (100%)
 rename {step-templates => src/step-templates}/logos/ansible.png (100%)
 rename {step-templates => src/step-templates}/logos/apexsql.png (100%)
 rename {step-templates => src/step-templates}/logos/apollo.png (100%)
 rename {step-templates => src/step-templates}/logos/argo.png (100%)
 rename {step-templates => src/step-templates}/logos/aspnet.png (100%)
 rename {step-templates => src/step-templates}/logos/aws.png (100%)
 rename {step-templates => src/step-templates}/logos/azure-devops.png (100%)
 rename {step-templates => src/step-templates}/logos/azure-keyvault.png (100%)
 rename {step-templates => src/step-templates}/logos/azure-site-extensions.png (100%)
 rename {step-templates => src/step-templates}/logos/azure.png (100%)
 rename {step-templates => src/step-templates}/logos/azurefunctions.png (100%)
 rename {step-templates => src/step-templates}/logos/bash.png (100%)
 rename {step-templates => src/step-templates}/logos/bitwarden.png (100%)
 rename {step-templates => src/step-templates}/logos/cassandra.png (100%)
 rename {step-templates => src/step-templates}/logos/chef.png (100%)
 rename {step-templates => src/step-templates}/logos/chocolatey.png (100%)
 rename {step-templates => src/step-templates}/logos/clickonce.png (100%)
 rename {step-templates => src/step-templates}/logos/cyberark.png (100%)
 rename {step-templates => src/step-templates}/logos/databricks.png (100%)
 rename {step-templates => src/step-templates}/logos/datadog.png (100%)
 rename {step-templates => src/step-templates}/logos/dll.png (100%)
 rename {step-templates => src/step-templates}/logos/dlm.png (100%)
 rename {step-templates => src/step-templates}/logos/docker.png (100%)
 rename {step-templates => src/step-templates}/logos/dotnetcore.png (100%)
 rename {step-templates => src/step-templates}/logos/dyn.png (100%)
 rename {step-templates => src/step-templates}/logos/edgecast.png (100%)
 rename {step-templates => src/step-templates}/logos/elmah.png (100%)
 rename {step-templates => src/step-templates}/logos/email.png (100%)
 rename {step-templates => src/step-templates}/logos/encrypt.png (100%)
 rename {step-templates => src/step-templates}/logos/entityframework.png (100%)
 rename {step-templates => src/step-templates}/logos/event-tracing.png (100%)
 rename {step-templates => src/step-templates}/logos/exe.png (100%)
 rename {step-templates => src/step-templates}/logos/f5.png (100%)
 rename {step-templates => src/step-templates}/logos/filesystem.png (100%)
 rename {step-templates => src/step-templates}/logos/firebase.png (100%)
 rename {step-templates => src/step-templates}/logos/flyway.png (100%)
 rename {step-templates => src/step-templates}/logos/ghostinspector.png (100%)
 rename {step-templates => src/step-templates}/logos/git.png (100%)
 rename {step-templates => src/step-templates}/logos/github.png (100%)
 rename {step-templates => src/step-templates}/logos/gitlab.png (100%)
 rename {step-templates => src/step-templates}/logos/google-chat.png (100%)
 rename {step-templates => src/step-templates}/logos/google-cloud.png (100%)
 rename {step-templates => src/step-templates}/logos/grate.png (100%)
 rename {step-templates => src/step-templates}/logos/hashicorp-vault.png (100%)
 rename {step-templates => src/step-templates}/logos/hipchat.png (100%)
 rename {step-templates => src/step-templates}/logos/hockeyapp.png (100%)
 rename {step-templates => src/step-templates}/logos/hosts-file.png (100%)
 rename {step-templates => src/step-templates}/logos/http.png (100%)
 rename {step-templates => src/step-templates}/logos/iis.png (100%)
 rename {step-templates => src/step-templates}/logos/jasper.png (100%)
 rename {step-templates => src/step-templates}/logos/jenkins.png (100%)
 rename {step-templates => src/step-templates}/logos/jira.png (100%)
 rename {step-templates => src/step-templates}/logos/json.png (100%)
 rename {step-templates => src/step-templates}/logos/jwt.png (100%)
 rename {step-templates => src/step-templates}/logos/k8s.png (100%)
 rename {step-templates => src/step-templates}/logos/keeper-secretsmanager.png (100%)
 rename {step-templates => src/step-templates}/logos/launchdarkly.png (100%)
 rename {step-templates => src/step-templates}/logos/lets-encrypt.png (100%)
 rename {step-templates => src/step-templates}/logos/linux.png (100%)
 rename {step-templates => src/step-templates}/logos/liquibase.png (100%)
 rename {step-templates => src/step-templates}/logos/mabl.png (100%)
 rename {step-templates => src/step-templates}/logos/mariadb.png (100%)
 rename {step-templates => src/step-templates}/logos/medianova.png (100%)
 rename {step-templates => src/step-templates}/logos/mercurial.png (100%)
 rename {step-templates => src/step-templates}/logos/microsoft-power-automate.png (100%)
 rename {step-templates => src/step-templates}/logos/microsoft-teams.png (100%)
 rename {step-templates => src/step-templates}/logos/mongodb.png (100%)
 rename {step-templates => src/step-templates}/logos/mulesoft.png (100%)
 rename {step-templates => src/step-templates}/logos/mysql.png (100%)
 rename {step-templates => src/step-templates}/logos/netscaler.png (100%)
 rename {step-templates => src/step-templates}/logos/newrelic.png (100%)
 rename {step-templates => src/step-templates}/logos/nunit.png (100%)
 rename {step-templates => src/step-templates}/logos/octopus.png (100%)
 rename {step-templates => src/step-templates}/logos/opslevel.png (100%)
 rename {step-templates => src/step-templates}/logos/oracle.png (100%)
 rename {step-templates => src/step-templates}/logos/other.png (100%)
 rename {step-templates => src/step-templates}/logos/pagerduty.png (100%)
 rename {step-templates => src/step-templates}/logos/pingdom.png (100%)
 rename {step-templates => src/step-templates}/logos/postgresql.png (100%)
 rename {step-templates => src/step-templates}/logos/proxmox.png (100%)
 rename {step-templates => src/step-templates}/logos/pulumi.png (100%)
 rename {step-templates => src/step-templates}/logos/pushalot.png (100%)
 rename {step-templates => src/step-templates}/logos/pushover.png (100%)
 rename {step-templates => src/step-templates}/logos/rabbitmq.png (100%)
 rename {step-templates => src/step-templates}/logos/rackspace.png (100%)
 rename {step-templates => src/step-templates}/logos/ravendb.png (100%)
 rename {step-templates => src/step-templates}/logos/raygun.png (100%)
 rename {step-templates => src/step-templates}/logos/readyroll.png (100%)
 rename {step-templates => src/step-templates}/logos/redgate.png (100%)
 rename {step-templates => src/step-templates}/logos/redis.png (100%)
 rename {step-templates => src/step-templates}/logos/rnhub.png (100%)
 rename {step-templates => src/step-templates}/logos/rollbar.png (100%)
 rename {step-templates => src/step-templates}/logos/roundhouse.png (100%)
 rename {step-templates => src/step-templates}/logos/sbom.png (100%)
 rename {step-templates => src/step-templates}/logos/sentry.png (100%)
 rename {step-templates => src/step-templates}/logos/seq.png (100%)
 rename {step-templates => src/step-templates}/logos/sharepoint.png (100%)
 rename {step-templates => src/step-templates}/logos/sitecore.png (100%)
 rename {step-templates => src/step-templates}/logos/slack.png (100%)
 rename {step-templates => src/step-templates}/logos/snowflake.png (100%)
 rename {step-templates => src/step-templates}/logos/solarwinds.png (100%)
 rename {step-templates => src/step-templates}/logos/spark.png (100%)
 rename {step-templates => src/step-templates}/logos/splunk.png (100%)
 rename {step-templates => src/step-templates}/logos/sql.png (100%)
 rename {step-templates => src/step-templates}/logos/ssl.png (100%)
 rename {step-templates => src/step-templates}/logos/stackify.png (100%)
 rename {step-templates => src/step-templates}/logos/statuscake.png (100%)
 rename {step-templates => src/step-templates}/logos/statuspage.png (100%)
 rename {step-templates => src/step-templates}/logos/swaggerhub.png (100%)
 rename {step-templates => src/step-templates}/logos/teamcity.png (100%)
 rename {step-templates => src/step-templates}/logos/tenants.png (100%)
 rename {step-templates => src/step-templates}/logos/terraform.png (100%)
 rename {step-templates => src/step-templates}/logos/testery.png (100%)
 rename {step-templates => src/step-templates}/logos/tests.png (100%)
 rename {step-templates => src/step-templates}/logos/tomcat.png (100%)
 rename {step-templates => src/step-templates}/logos/topshelf.png (100%)
 rename {step-templates => src/step-templates}/logos/twilio.png (100%)
 rename {step-templates => src/step-templates}/logos/umbraco.png (100%)
 rename {step-templates => src/step-templates}/logos/unicorn.png (100%)
 rename {step-templates => src/step-templates}/logos/unzip.png (100%)
 rename {step-templates => src/step-templates}/logos/venafi.png (100%)
 rename {step-templates => src/step-templates}/logos/victorops.png (100%)
 rename {step-templates => src/step-templates}/logos/wait.png (100%)
 rename {step-templates => src/step-templates}/logos/webdeploy.png (100%)
 rename {step-templates => src/step-templates}/logos/windows.png (100%)
 rename {step-templates => src/step-templates}/logos/winscp.png (100%)
 rename {step-templates => src/step-templates}/logos/xamarin.png (100%)
 rename {step-templates => src/step-templates}/logos/xml.png (100%)
 rename {step-templates => src/step-templates}/logos/xunit.png (100%)
 rename {step-templates => src/step-templates}/logos/zabbix.png (100%)
 rename {step-templates => src/step-templates}/tests/Invoke-PesterTests.ps1 (63%)
 rename {step-templates => src/step-templates}/tests/sql-backup-database.ScriptBody.Tests.ps1 (100%)
 rename {step-templates => src/step-templates}/tests/windows-scheduled-task-create.ScriptBody.Tests.ps1 (100%)

diff --git a/README.md b/README.md
index 427d328aa..55db8d729 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,25 @@ A repository of step templates and other community-contributed extensions to Oct
 Organization
 ------------
 
-* *Step templates* are checked into `/step-templates` as raw JSON exports direct from Octopus Deploy
+* *Step templates* are authored under `/src/step-templates`
+* Generated compatibility JSON for the website and Octopus imports is written to `/step-templates`
 * The *library website* is largely under `/app`, with build artifacts at the root of the repository
-* The `/tools` folder contains utilities to help with editing step templates
+* The `/tools` folder contains the existing pack/unpack scripts plus migration and generation helpers
+
+Source Layout
+-------------
+
+The source-of-truth format for templates lives under `/src/step-templates`:
+
+* `/src/step-templates/<template>/metadata.json`
+* `/src/step-templates/<template>/scriptbody.ps1|sh|py`
+* `/src/step-templates/<template>/predeploy.ps1`
+* `/src/step-templates/<template>/deploy.ps1`
+* `/src/step-templates/<template>/postdeploy.ps1`
+* `/src/step-templates/logos`
+* `/src/step-templates/tests`
+
+`metadata.json` keeps the exported template metadata and uses placeholders for script-backed properties. The real script text lives in sibling files so normal GitHub diffs stay readable.
 
 Contributing step templates or to the website
 ---------------------------------------------
@@ -20,21 +36,9 @@ Reviewing PRs
 
 ### Reviewing script changes
 
-Step template JSON files embed scripts as single-line escaped strings, making diffs hard to read. Use the `_diff.ps1` tool to extract old and new scripts into separate files you can compare in your diff tool:
-
-```powershell
-# Compare ScriptBody against previous commit
-.\tools\_diff.ps1 -SearchPattern "template-name"
-
-# Compare against a specific commit or branch
-.\tools\_diff.ps1 -SearchPattern "template-name" -CompareWith "master"
-```
-
-This outputs readable files to `diff-output/`:
-- `template-name.ScriptBody.old.ps1`
-- `template-name.ScriptBody.new.ps1`
+For migrated templates, review the files under `/src/step-templates/<template>/` directly. Script changes now appear as normal file diffs instead of escaped JSON string blobs.
 
-Also handles `PreDeploy`, `Deploy`, and `PostDeploy` custom scripts if present.
+During the migration period, some templates may still exist only in legacy packed form under `/step-templates`. Dev/build tooling supports this mixed state, but all new authoring should move toward the source layout in `/src/step-templates`.
 
 ### Checklist
 
@@ -45,5 +49,5 @@ When reviewing a PR, keep the following things in mind:
 * The `DefaultValue`s of `Parameter`s should be either a string or null.
 * `LastModifiedBy` field must be present, and (_optionally_) updated with the correct author
 * If a new `Category` has been created:
-   * An image with the name `{categoryname}.png` must be present under the `step-templates/logos` folder
+   * An image with the name `{categoryname}.png` must be present under the `src/step-templates/logos` folder
    * The `switch` in the `humanize` function in [`gulpfile.babel.js`](https://github.com/OctopusDeploy/Library/blob/master/gulpfile.babel.js#L92) must have a `case` statement corresponding to it
diff --git a/step-templates/logos/1password-connect.png b/src/step-templates/logos/1password-connect.png
similarity index 100%
rename from step-templates/logos/1password-connect.png
rename to src/step-templates/logos/1password-connect.png
diff --git a/step-templates/logos/akamai.png b/src/step-templates/logos/akamai.png
similarity index 100%
rename from step-templates/logos/akamai.png
rename to src/step-templates/logos/akamai.png
diff --git a/step-templates/logos/amazon-chime.png b/src/step-templates/logos/amazon-chime.png
similarity index 100%
rename from step-templates/logos/amazon-chime.png
rename to src/step-templates/logos/amazon-chime.png
diff --git a/step-templates/logos/ansible.png b/src/step-templates/logos/ansible.png
similarity index 100%
rename from step-templates/logos/ansible.png
rename to src/step-templates/logos/ansible.png
diff --git a/step-templates/logos/apexsql.png b/src/step-templates/logos/apexsql.png
similarity index 100%
rename from step-templates/logos/apexsql.png
rename to src/step-templates/logos/apexsql.png
diff --git a/step-templates/logos/apollo.png b/src/step-templates/logos/apollo.png
similarity index 100%
rename from step-templates/logos/apollo.png
rename to src/step-templates/logos/apollo.png
diff --git a/step-templates/logos/argo.png b/src/step-templates/logos/argo.png
similarity index 100%
rename from step-templates/logos/argo.png
rename to src/step-templates/logos/argo.png
diff --git a/step-templates/logos/aspnet.png b/src/step-templates/logos/aspnet.png
similarity index 100%
rename from step-templates/logos/aspnet.png
rename to src/step-templates/logos/aspnet.png
diff --git a/step-templates/logos/aws.png b/src/step-templates/logos/aws.png
similarity index 100%
rename from step-templates/logos/aws.png
rename to src/step-templates/logos/aws.png
diff --git a/step-templates/logos/azure-devops.png b/src/step-templates/logos/azure-devops.png
similarity index 100%
rename from step-templates/logos/azure-devops.png
rename to src/step-templates/logos/azure-devops.png
diff --git a/step-templates/logos/azure-keyvault.png b/src/step-templates/logos/azure-keyvault.png
similarity index 100%
rename from step-templates/logos/azure-keyvault.png
rename to src/step-templates/logos/azure-keyvault.png
diff --git a/step-templates/logos/azure-site-extensions.png b/src/step-templates/logos/azure-site-extensions.png
similarity index 100%
rename from step-templates/logos/azure-site-extensions.png
rename to src/step-templates/logos/azure-site-extensions.png
diff --git a/step-templates/logos/azure.png b/src/step-templates/logos/azure.png
similarity index 100%
rename from step-templates/logos/azure.png
rename to src/step-templates/logos/azure.png
diff --git a/step-templates/logos/azurefunctions.png b/src/step-templates/logos/azurefunctions.png
similarity index 100%
rename from step-templates/logos/azurefunctions.png
rename to src/step-templates/logos/azurefunctions.png
diff --git a/step-templates/logos/bash.png b/src/step-templates/logos/bash.png
similarity index 100%
rename from step-templates/logos/bash.png
rename to src/step-templates/logos/bash.png
diff --git a/step-templates/logos/bitwarden.png b/src/step-templates/logos/bitwarden.png
similarity index 100%
rename from step-templates/logos/bitwarden.png
rename to src/step-templates/logos/bitwarden.png
diff --git a/step-templates/logos/cassandra.png b/src/step-templates/logos/cassandra.png
similarity index 100%
rename from step-templates/logos/cassandra.png
rename to src/step-templates/logos/cassandra.png
diff --git a/step-templates/logos/chef.png b/src/step-templates/logos/chef.png
similarity index 100%
rename from step-templates/logos/chef.png
rename to src/step-templates/logos/chef.png
diff --git a/step-templates/logos/chocolatey.png b/src/step-templates/logos/chocolatey.png
similarity index 100%
rename from step-templates/logos/chocolatey.png
rename to src/step-templates/logos/chocolatey.png
diff --git a/step-templates/logos/clickonce.png b/src/step-templates/logos/clickonce.png
similarity index 100%
rename from step-templates/logos/clickonce.png
rename to src/step-templates/logos/clickonce.png
diff --git a/step-templates/logos/cyberark.png b/src/step-templates/logos/cyberark.png
similarity index 100%
rename from step-templates/logos/cyberark.png
rename to src/step-templates/logos/cyberark.png
diff --git a/step-templates/logos/databricks.png b/src/step-templates/logos/databricks.png
similarity index 100%
rename from step-templates/logos/databricks.png
rename to src/step-templates/logos/databricks.png
diff --git a/step-templates/logos/datadog.png b/src/step-templates/logos/datadog.png
similarity index 100%
rename from step-templates/logos/datadog.png
rename to src/step-templates/logos/datadog.png
diff --git a/step-templates/logos/dll.png b/src/step-templates/logos/dll.png
similarity index 100%
rename from step-templates/logos/dll.png
rename to src/step-templates/logos/dll.png
diff --git a/step-templates/logos/dlm.png b/src/step-templates/logos/dlm.png
similarity index 100%
rename from step-templates/logos/dlm.png
rename to src/step-templates/logos/dlm.png
diff --git a/step-templates/logos/docker.png b/src/step-templates/logos/docker.png
similarity index 100%
rename from step-templates/logos/docker.png
rename to src/step-templates/logos/docker.png
diff --git a/step-templates/logos/dotnetcore.png b/src/step-templates/logos/dotnetcore.png
similarity index 100%
rename from step-templates/logos/dotnetcore.png
rename to src/step-templates/logos/dotnetcore.png
diff --git a/step-templates/logos/dyn.png b/src/step-templates/logos/dyn.png
similarity index 100%
rename from step-templates/logos/dyn.png
rename to src/step-templates/logos/dyn.png
diff --git a/step-templates/logos/edgecast.png b/src/step-templates/logos/edgecast.png
similarity index 100%
rename from step-templates/logos/edgecast.png
rename to src/step-templates/logos/edgecast.png
diff --git a/step-templates/logos/elmah.png b/src/step-templates/logos/elmah.png
similarity index 100%
rename from step-templates/logos/elmah.png
rename to src/step-templates/logos/elmah.png
diff --git a/step-templates/logos/email.png b/src/step-templates/logos/email.png
similarity index 100%
rename from step-templates/logos/email.png
rename to src/step-templates/logos/email.png
diff --git a/step-templates/logos/encrypt.png b/src/step-templates/logos/encrypt.png
similarity index 100%
rename from step-templates/logos/encrypt.png
rename to src/step-templates/logos/encrypt.png
diff --git a/step-templates/logos/entityframework.png b/src/step-templates/logos/entityframework.png
similarity index 100%
rename from step-templates/logos/entityframework.png
rename to src/step-templates/logos/entityframework.png
diff --git a/step-templates/logos/event-tracing.png b/src/step-templates/logos/event-tracing.png
similarity index 100%
rename from step-templates/logos/event-tracing.png
rename to src/step-templates/logos/event-tracing.png
diff --git a/step-templates/logos/exe.png b/src/step-templates/logos/exe.png
similarity index 100%
rename from step-templates/logos/exe.png
rename to src/step-templates/logos/exe.png
diff --git a/step-templates/logos/f5.png b/src/step-templates/logos/f5.png
similarity index 100%
rename from step-templates/logos/f5.png
rename to src/step-templates/logos/f5.png
diff --git a/step-templates/logos/filesystem.png b/src/step-templates/logos/filesystem.png
similarity index 100%
rename from step-templates/logos/filesystem.png
rename to src/step-templates/logos/filesystem.png
diff --git a/step-templates/logos/firebase.png b/src/step-templates/logos/firebase.png
similarity index 100%
rename from step-templates/logos/firebase.png
rename to src/step-templates/logos/firebase.png
diff --git a/step-templates/logos/flyway.png b/src/step-templates/logos/flyway.png
similarity index 100%
rename from step-templates/logos/flyway.png
rename to src/step-templates/logos/flyway.png
diff --git a/step-templates/logos/ghostinspector.png b/src/step-templates/logos/ghostinspector.png
similarity index 100%
rename from step-templates/logos/ghostinspector.png
rename to src/step-templates/logos/ghostinspector.png
diff --git a/step-templates/logos/git.png b/src/step-templates/logos/git.png
similarity index 100%
rename from step-templates/logos/git.png
rename to src/step-templates/logos/git.png
diff --git a/step-templates/logos/github.png b/src/step-templates/logos/github.png
similarity index 100%
rename from step-templates/logos/github.png
rename to src/step-templates/logos/github.png
diff --git a/step-templates/logos/gitlab.png b/src/step-templates/logos/gitlab.png
similarity index 100%
rename from step-templates/logos/gitlab.png
rename to src/step-templates/logos/gitlab.png
diff --git a/step-templates/logos/google-chat.png b/src/step-templates/logos/google-chat.png
similarity index 100%
rename from step-templates/logos/google-chat.png
rename to src/step-templates/logos/google-chat.png
diff --git a/step-templates/logos/google-cloud.png b/src/step-templates/logos/google-cloud.png
similarity index 100%
rename from step-templates/logos/google-cloud.png
rename to src/step-templates/logos/google-cloud.png
diff --git a/step-templates/logos/grate.png b/src/step-templates/logos/grate.png
similarity index 100%
rename from step-templates/logos/grate.png
rename to src/step-templates/logos/grate.png
diff --git a/step-templates/logos/hashicorp-vault.png b/src/step-templates/logos/hashicorp-vault.png
similarity index 100%
rename from step-templates/logos/hashicorp-vault.png
rename to src/step-templates/logos/hashicorp-vault.png
diff --git a/step-templates/logos/hipchat.png b/src/step-templates/logos/hipchat.png
similarity index 100%
rename from step-templates/logos/hipchat.png
rename to src/step-templates/logos/hipchat.png
diff --git a/step-templates/logos/hockeyapp.png b/src/step-templates/logos/hockeyapp.png
similarity index 100%
rename from step-templates/logos/hockeyapp.png
rename to src/step-templates/logos/hockeyapp.png
diff --git a/step-templates/logos/hosts-file.png b/src/step-templates/logos/hosts-file.png
similarity index 100%
rename from step-templates/logos/hosts-file.png
rename to src/step-templates/logos/hosts-file.png
diff --git a/step-templates/logos/http.png b/src/step-templates/logos/http.png
similarity index 100%
rename from step-templates/logos/http.png
rename to src/step-templates/logos/http.png
diff --git a/step-templates/logos/iis.png b/src/step-templates/logos/iis.png
similarity index 100%
rename from step-templates/logos/iis.png
rename to src/step-templates/logos/iis.png
diff --git a/step-templates/logos/jasper.png b/src/step-templates/logos/jasper.png
similarity index 100%
rename from step-templates/logos/jasper.png
rename to src/step-templates/logos/jasper.png
diff --git a/step-templates/logos/jenkins.png b/src/step-templates/logos/jenkins.png
similarity index 100%
rename from step-templates/logos/jenkins.png
rename to src/step-templates/logos/jenkins.png
diff --git a/step-templates/logos/jira.png b/src/step-templates/logos/jira.png
similarity index 100%
rename from step-templates/logos/jira.png
rename to src/step-templates/logos/jira.png
diff --git a/step-templates/logos/json.png b/src/step-templates/logos/json.png
similarity index 100%
rename from step-templates/logos/json.png
rename to src/step-templates/logos/json.png
diff --git a/step-templates/logos/jwt.png b/src/step-templates/logos/jwt.png
similarity index 100%
rename from step-templates/logos/jwt.png
rename to src/step-templates/logos/jwt.png
diff --git a/step-templates/logos/k8s.png b/src/step-templates/logos/k8s.png
similarity index 100%
rename from step-templates/logos/k8s.png
rename to src/step-templates/logos/k8s.png
diff --git a/step-templates/logos/keeper-secretsmanager.png b/src/step-templates/logos/keeper-secretsmanager.png
similarity index 100%
rename from step-templates/logos/keeper-secretsmanager.png
rename to src/step-templates/logos/keeper-secretsmanager.png
diff --git a/step-templates/logos/launchdarkly.png b/src/step-templates/logos/launchdarkly.png
similarity index 100%
rename from step-templates/logos/launchdarkly.png
rename to src/step-templates/logos/launchdarkly.png
diff --git a/step-templates/logos/lets-encrypt.png b/src/step-templates/logos/lets-encrypt.png
similarity index 100%
rename from step-templates/logos/lets-encrypt.png
rename to src/step-templates/logos/lets-encrypt.png
diff --git a/step-templates/logos/linux.png b/src/step-templates/logos/linux.png
similarity index 100%
rename from step-templates/logos/linux.png
rename to src/step-templates/logos/linux.png
diff --git a/step-templates/logos/liquibase.png b/src/step-templates/logos/liquibase.png
similarity index 100%
rename from step-templates/logos/liquibase.png
rename to src/step-templates/logos/liquibase.png
diff --git a/step-templates/logos/mabl.png b/src/step-templates/logos/mabl.png
similarity index 100%
rename from step-templates/logos/mabl.png
rename to src/step-templates/logos/mabl.png
diff --git a/step-templates/logos/mariadb.png b/src/step-templates/logos/mariadb.png
similarity index 100%
rename from step-templates/logos/mariadb.png
rename to src/step-templates/logos/mariadb.png
diff --git a/step-templates/logos/medianova.png b/src/step-templates/logos/medianova.png
similarity index 100%
rename from step-templates/logos/medianova.png
rename to src/step-templates/logos/medianova.png
diff --git a/step-templates/logos/mercurial.png b/src/step-templates/logos/mercurial.png
similarity index 100%
rename from step-templates/logos/mercurial.png
rename to src/step-templates/logos/mercurial.png
diff --git a/step-templates/logos/microsoft-power-automate.png b/src/step-templates/logos/microsoft-power-automate.png
similarity index 100%
rename from step-templates/logos/microsoft-power-automate.png
rename to src/step-templates/logos/microsoft-power-automate.png
diff --git a/step-templates/logos/microsoft-teams.png b/src/step-templates/logos/microsoft-teams.png
similarity index 100%
rename from step-templates/logos/microsoft-teams.png
rename to src/step-templates/logos/microsoft-teams.png
diff --git a/step-templates/logos/mongodb.png b/src/step-templates/logos/mongodb.png
similarity index 100%
rename from step-templates/logos/mongodb.png
rename to src/step-templates/logos/mongodb.png
diff --git a/step-templates/logos/mulesoft.png b/src/step-templates/logos/mulesoft.png
similarity index 100%
rename from step-templates/logos/mulesoft.png
rename to src/step-templates/logos/mulesoft.png
diff --git a/step-templates/logos/mysql.png b/src/step-templates/logos/mysql.png
similarity index 100%
rename from step-templates/logos/mysql.png
rename to src/step-templates/logos/mysql.png
diff --git a/step-templates/logos/netscaler.png b/src/step-templates/logos/netscaler.png
similarity index 100%
rename from step-templates/logos/netscaler.png
rename to src/step-templates/logos/netscaler.png
diff --git a/step-templates/logos/newrelic.png b/src/step-templates/logos/newrelic.png
similarity index 100%
rename from step-templates/logos/newrelic.png
rename to src/step-templates/logos/newrelic.png
diff --git a/step-templates/logos/nunit.png b/src/step-templates/logos/nunit.png
similarity index 100%
rename from step-templates/logos/nunit.png
rename to src/step-templates/logos/nunit.png
diff --git a/step-templates/logos/octopus.png b/src/step-templates/logos/octopus.png
similarity index 100%
rename from step-templates/logos/octopus.png
rename to src/step-templates/logos/octopus.png
diff --git a/step-templates/logos/opslevel.png b/src/step-templates/logos/opslevel.png
similarity index 100%
rename from step-templates/logos/opslevel.png
rename to src/step-templates/logos/opslevel.png
diff --git a/step-templates/logos/oracle.png b/src/step-templates/logos/oracle.png
similarity index 100%
rename from step-templates/logos/oracle.png
rename to src/step-templates/logos/oracle.png
diff --git a/step-templates/logos/other.png b/src/step-templates/logos/other.png
similarity index 100%
rename from step-templates/logos/other.png
rename to src/step-templates/logos/other.png
diff --git a/step-templates/logos/pagerduty.png b/src/step-templates/logos/pagerduty.png
similarity index 100%
rename from step-templates/logos/pagerduty.png
rename to src/step-templates/logos/pagerduty.png
diff --git a/step-templates/logos/pingdom.png b/src/step-templates/logos/pingdom.png
similarity index 100%
rename from step-templates/logos/pingdom.png
rename to src/step-templates/logos/pingdom.png
diff --git a/step-templates/logos/postgresql.png b/src/step-templates/logos/postgresql.png
similarity index 100%
rename from step-templates/logos/postgresql.png
rename to src/step-templates/logos/postgresql.png
diff --git a/step-templates/logos/proxmox.png b/src/step-templates/logos/proxmox.png
similarity index 100%
rename from step-templates/logos/proxmox.png
rename to src/step-templates/logos/proxmox.png
diff --git a/step-templates/logos/pulumi.png b/src/step-templates/logos/pulumi.png
similarity index 100%
rename from step-templates/logos/pulumi.png
rename to src/step-templates/logos/pulumi.png
diff --git a/step-templates/logos/pushalot.png b/src/step-templates/logos/pushalot.png
similarity index 100%
rename from step-templates/logos/pushalot.png
rename to src/step-templates/logos/pushalot.png
diff --git a/step-templates/logos/pushover.png b/src/step-templates/logos/pushover.png
similarity index 100%
rename from step-templates/logos/pushover.png
rename to src/step-templates/logos/pushover.png
diff --git a/step-templates/logos/rabbitmq.png b/src/step-templates/logos/rabbitmq.png
similarity index 100%
rename from step-templates/logos/rabbitmq.png
rename to src/step-templates/logos/rabbitmq.png
diff --git a/step-templates/logos/rackspace.png b/src/step-templates/logos/rackspace.png
similarity index 100%
rename from step-templates/logos/rackspace.png
rename to src/step-templates/logos/rackspace.png
diff --git a/step-templates/logos/ravendb.png b/src/step-templates/logos/ravendb.png
similarity index 100%
rename from step-templates/logos/ravendb.png
rename to src/step-templates/logos/ravendb.png
diff --git a/step-templates/logos/raygun.png b/src/step-templates/logos/raygun.png
similarity index 100%
rename from step-templates/logos/raygun.png
rename to src/step-templates/logos/raygun.png
diff --git a/step-templates/logos/readyroll.png b/src/step-templates/logos/readyroll.png
similarity index 100%
rename from step-templates/logos/readyroll.png
rename to src/step-templates/logos/readyroll.png
diff --git a/step-templates/logos/redgate.png b/src/step-templates/logos/redgate.png
similarity index 100%
rename from step-templates/logos/redgate.png
rename to src/step-templates/logos/redgate.png
diff --git a/step-templates/logos/redis.png b/src/step-templates/logos/redis.png
similarity index 100%
rename from step-templates/logos/redis.png
rename to src/step-templates/logos/redis.png
diff --git a/step-templates/logos/rnhub.png b/src/step-templates/logos/rnhub.png
similarity index 100%
rename from step-templates/logos/rnhub.png
rename to src/step-templates/logos/rnhub.png
diff --git a/step-templates/logos/rollbar.png b/src/step-templates/logos/rollbar.png
similarity index 100%
rename from step-templates/logos/rollbar.png
rename to src/step-templates/logos/rollbar.png
diff --git a/step-templates/logos/roundhouse.png b/src/step-templates/logos/roundhouse.png
similarity index 100%
rename from step-templates/logos/roundhouse.png
rename to src/step-templates/logos/roundhouse.png
diff --git a/step-templates/logos/sbom.png b/src/step-templates/logos/sbom.png
similarity index 100%
rename from step-templates/logos/sbom.png
rename to src/step-templates/logos/sbom.png
diff --git a/step-templates/logos/sentry.png b/src/step-templates/logos/sentry.png
similarity index 100%
rename from step-templates/logos/sentry.png
rename to src/step-templates/logos/sentry.png
diff --git a/step-templates/logos/seq.png b/src/step-templates/logos/seq.png
similarity index 100%
rename from step-templates/logos/seq.png
rename to src/step-templates/logos/seq.png
diff --git a/step-templates/logos/sharepoint.png b/src/step-templates/logos/sharepoint.png
similarity index 100%
rename from step-templates/logos/sharepoint.png
rename to src/step-templates/logos/sharepoint.png
diff --git a/step-templates/logos/sitecore.png b/src/step-templates/logos/sitecore.png
similarity index 100%
rename from step-templates/logos/sitecore.png
rename to src/step-templates/logos/sitecore.png
diff --git a/step-templates/logos/slack.png b/src/step-templates/logos/slack.png
similarity index 100%
rename from step-templates/logos/slack.png
rename to src/step-templates/logos/slack.png
diff --git a/step-templates/logos/snowflake.png b/src/step-templates/logos/snowflake.png
similarity index 100%
rename from step-templates/logos/snowflake.png
rename to src/step-templates/logos/snowflake.png
diff --git a/step-templates/logos/solarwinds.png b/src/step-templates/logos/solarwinds.png
similarity index 100%
rename from step-templates/logos/solarwinds.png
rename to src/step-templates/logos/solarwinds.png
diff --git a/step-templates/logos/spark.png b/src/step-templates/logos/spark.png
similarity index 100%
rename from step-templates/logos/spark.png
rename to src/step-templates/logos/spark.png
diff --git a/step-templates/logos/splunk.png b/src/step-templates/logos/splunk.png
similarity index 100%
rename from step-templates/logos/splunk.png
rename to src/step-templates/logos/splunk.png
diff --git a/step-templates/logos/sql.png b/src/step-templates/logos/sql.png
similarity index 100%
rename from step-templates/logos/sql.png
rename to src/step-templates/logos/sql.png
diff --git a/step-templates/logos/ssl.png b/src/step-templates/logos/ssl.png
similarity index 100%
rename from step-templates/logos/ssl.png
rename to src/step-templates/logos/ssl.png
diff --git a/step-templates/logos/stackify.png b/src/step-templates/logos/stackify.png
similarity index 100%
rename from step-templates/logos/stackify.png
rename to src/step-templates/logos/stackify.png
diff --git a/step-templates/logos/statuscake.png b/src/step-templates/logos/statuscake.png
similarity index 100%
rename from step-templates/logos/statuscake.png
rename to src/step-templates/logos/statuscake.png
diff --git a/step-templates/logos/statuspage.png b/src/step-templates/logos/statuspage.png
similarity index 100%
rename from step-templates/logos/statuspage.png
rename to src/step-templates/logos/statuspage.png
diff --git a/step-templates/logos/swaggerhub.png b/src/step-templates/logos/swaggerhub.png
similarity index 100%
rename from step-templates/logos/swaggerhub.png
rename to src/step-templates/logos/swaggerhub.png
diff --git a/step-templates/logos/teamcity.png b/src/step-templates/logos/teamcity.png
similarity index 100%
rename from step-templates/logos/teamcity.png
rename to src/step-templates/logos/teamcity.png
diff --git a/step-templates/logos/tenants.png b/src/step-templates/logos/tenants.png
similarity index 100%
rename from step-templates/logos/tenants.png
rename to src/step-templates/logos/tenants.png
diff --git a/step-templates/logos/terraform.png b/src/step-templates/logos/terraform.png
similarity index 100%
rename from step-templates/logos/terraform.png
rename to src/step-templates/logos/terraform.png
diff --git a/step-templates/logos/testery.png b/src/step-templates/logos/testery.png
similarity index 100%
rename from step-templates/logos/testery.png
rename to src/step-templates/logos/testery.png
diff --git a/step-templates/logos/tests.png b/src/step-templates/logos/tests.png
similarity index 100%
rename from step-templates/logos/tests.png
rename to src/step-templates/logos/tests.png
diff --git a/step-templates/logos/tomcat.png b/src/step-templates/logos/tomcat.png
similarity index 100%
rename from step-templates/logos/tomcat.png
rename to src/step-templates/logos/tomcat.png
diff --git a/step-templates/logos/topshelf.png b/src/step-templates/logos/topshelf.png
similarity index 100%
rename from step-templates/logos/topshelf.png
rename to src/step-templates/logos/topshelf.png
diff --git a/step-templates/logos/twilio.png b/src/step-templates/logos/twilio.png
similarity index 100%
rename from step-templates/logos/twilio.png
rename to src/step-templates/logos/twilio.png
diff --git a/step-templates/logos/umbraco.png b/src/step-templates/logos/umbraco.png
similarity index 100%
rename from step-templates/logos/umbraco.png
rename to src/step-templates/logos/umbraco.png
diff --git a/step-templates/logos/unicorn.png b/src/step-templates/logos/unicorn.png
similarity index 100%
rename from step-templates/logos/unicorn.png
rename to src/step-templates/logos/unicorn.png
diff --git a/step-templates/logos/unzip.png b/src/step-templates/logos/unzip.png
similarity index 100%
rename from step-templates/logos/unzip.png
rename to src/step-templates/logos/unzip.png
diff --git a/step-templates/logos/venafi.png b/src/step-templates/logos/venafi.png
similarity index 100%
rename from step-templates/logos/venafi.png
rename to src/step-templates/logos/venafi.png
diff --git a/step-templates/logos/victorops.png b/src/step-templates/logos/victorops.png
similarity index 100%
rename from step-templates/logos/victorops.png
rename to src/step-templates/logos/victorops.png
diff --git a/step-templates/logos/wait.png b/src/step-templates/logos/wait.png
similarity index 100%
rename from step-templates/logos/wait.png
rename to src/step-templates/logos/wait.png
diff --git a/step-templates/logos/webdeploy.png b/src/step-templates/logos/webdeploy.png
similarity index 100%
rename from step-templates/logos/webdeploy.png
rename to src/step-templates/logos/webdeploy.png
diff --git a/step-templates/logos/windows.png b/src/step-templates/logos/windows.png
similarity index 100%
rename from step-templates/logos/windows.png
rename to src/step-templates/logos/windows.png
diff --git a/step-templates/logos/winscp.png b/src/step-templates/logos/winscp.png
similarity index 100%
rename from step-templates/logos/winscp.png
rename to src/step-templates/logos/winscp.png
diff --git a/step-templates/logos/xamarin.png b/src/step-templates/logos/xamarin.png
similarity index 100%
rename from step-templates/logos/xamarin.png
rename to src/step-templates/logos/xamarin.png
diff --git a/step-templates/logos/xml.png b/src/step-templates/logos/xml.png
similarity index 100%
rename from step-templates/logos/xml.png
rename to src/step-templates/logos/xml.png
diff --git a/step-templates/logos/xunit.png b/src/step-templates/logos/xunit.png
similarity index 100%
rename from step-templates/logos/xunit.png
rename to src/step-templates/logos/xunit.png
diff --git a/step-templates/logos/zabbix.png b/src/step-templates/logos/zabbix.png
similarity index 100%
rename from step-templates/logos/zabbix.png
rename to src/step-templates/logos/zabbix.png
diff --git a/step-templates/tests/Invoke-PesterTests.ps1 b/src/step-templates/tests/Invoke-PesterTests.ps1
similarity index 63%
rename from step-templates/tests/Invoke-PesterTests.ps1
rename to src/step-templates/tests/Invoke-PesterTests.ps1
index f215274fb..8cea7ed14 100644
--- a/step-templates/tests/Invoke-PesterTests.ps1
+++ b/src/step-templates/tests/Invoke-PesterTests.ps1
@@ -7,7 +7,8 @@ Set-StrictMode -Version "Latest";
 
 $thisScript = $MyInvocation.MyCommand.Path;
 $thisFolder = [System.IO.Path]::GetDirectoryName($thisScript);
-$rootFolder = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($thisFolder, "..", "..")); # Adjust to always point to the root
+$rootFolder = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($thisFolder, "..", "..", ".."));
+$sourceStepTemplatesFolder = [System.IO.Path]::Combine($rootFolder, "src", "step-templates");
 $sharedRunner = Join-Path $rootFolder "tools" "Invoke-SharedPesterTests.ps1"
 
 function Unpack-Scripts-Under-Test {
@@ -16,11 +17,12 @@ function Unpack-Scripts-Under-Test {
   foreach ($testFile in $testFiles) {
       $baseName = $testFile.BaseName -replace "\.ScriptBody.Tests$"
       $scriptFileName = "$baseName.ScriptBody.ps1"
-      $scriptFilePath = [System.IO.Path]::Combine($rootFolder, "step-templates", $scriptFileName)
+      $scriptFilePath = [System.IO.Path]::Combine($sourceStepTemplatesFolder, $baseName, "scriptbody.ps1")
 
-      # If the .ps1 file is missing, find the corresponding .json file and unpack it
+      # During migration some templates may still be legacy-only. Keep the old unpack flow
+      # available until the corresponding source folder exists.
       if (-not [System.IO.File]::Exists($scriptFilePath)) {
-          Write-Host "Unpacking script for $($testFile.Name) since $scriptFileName is missing..."
+          Write-Host "Unpacking legacy script for $($testFile.Name) since $scriptFileName is missing from src..."
 
           $jsonFileName = "$baseName.json"
           $jsonFilePath = [System.IO.Path]::Combine($rootFolder, "step-templates", $jsonFileName)
@@ -32,8 +34,13 @@ function Unpack-Scripts-Under-Test {
           $converter = [System.IO.Path]::Combine($rootFolder, "tools", "Converter.ps1")
           & $converter -operation unpack -searchpattern $baseName
 
+          $legacyScriptPath = [System.IO.Path]::Combine($rootFolder, "step-templates", $scriptFileName)
+          if ([System.IO.File]::Exists($legacyScriptPath)) {
+              continue
+          }
+
           if (-not [System.IO.File]::Exists($scriptFilePath)) {
-              throw "Failed to unpack $scriptFileName. Make sure the JSON template exists and the unpack operation succeeded."
+              throw "Failed to locate $scriptFileName in src or legacy unpack output. Make sure the JSON template exists and the unpack operation succeeded."
           }
       } else {
           Write-Host "Script $scriptFileName already exists, no need to unpack."
diff --git a/step-templates/tests/sql-backup-database.ScriptBody.Tests.ps1 b/src/step-templates/tests/sql-backup-database.ScriptBody.Tests.ps1
similarity index 100%
rename from step-templates/tests/sql-backup-database.ScriptBody.Tests.ps1
rename to src/step-templates/tests/sql-backup-database.ScriptBody.Tests.ps1
diff --git a/step-templates/tests/windows-scheduled-task-create.ScriptBody.Tests.ps1 b/src/step-templates/tests/windows-scheduled-task-create.ScriptBody.Tests.ps1
similarity index 100%
rename from step-templates/tests/windows-scheduled-task-create.ScriptBody.Tests.ps1
rename to src/step-templates/tests/windows-scheduled-task-create.ScriptBody.Tests.ps1

From 4eaeb432bd342aac09914fecf803a9353aa82a9b Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Fri, 27 Mar 2026 23:32:36 -0700
Subject: [PATCH 04/21] feat: add source-first step-template helper tooling

---
 gulpfile.babel.js                        |  61 +++--
 package.json                             |   7 +-
 spec/logos-validation-tests.js           |   2 +-
 spec/step-template-validation-tests.js   |   3 +-
 tools/README.md                          |  52 ++++
 tools/generate-step-templates.js         |  48 ++++
 tools/migration-prepare-step-template.js |  63 +++++
 tools/migration-verify-step-template.js  |  34 +++
 tools/source-step-template-lib.js        | 302 +++++++++++++++++++++++
 9 files changed, 553 insertions(+), 19 deletions(-)
 create mode 100644 tools/README.md
 create mode 100644 tools/generate-step-templates.js
 create mode 100644 tools/migration-prepare-step-template.js
 create mode 100644 tools/migration-verify-step-template.js
 create mode 100644 tools/source-step-template-lib.js

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 17999d44c..8643fcd08 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -31,6 +31,8 @@ import jasmineTerminalReporter from "jasmine-terminal-reporter";
 import eventStream from "event-stream";
 import fs from "fs";
 import jsonlint from "gulp-jsonlint";
+import path from "path";
+import { execFileSync } from "child_process";
 
 const sass = gulpSass(dartSass);
 const clientDir = "app";
@@ -38,6 +40,7 @@ const serverDir = "server";
 
 const buildDir = "build";
 const publishDir = "dist";
+const sourceStepTemplatesDir = "src/step-templates";
 
 const $ = gulpLoadPlugins({
   rename: {
@@ -48,6 +51,21 @@ const $ = gulpLoadPlugins({
 const reload = browserSync.reload;
 const argv = yargs.argv;
 
+function runStepTemplateGenerator(args = []) {
+  execFileSync("node", [path.join("tools", "generate-step-templates.js"), ...args], {
+    cwd: process.cwd(),
+    stdio: "inherit",
+  });
+}
+
+function generateAllMigratedTemplates() {
+  runStepTemplateGenerator(["all"]);
+}
+
+function generateFromChangedSourcePath(changedPath) {
+  runStepTemplateGenerator(["changed-path", changedPath]);
+}
+
 const vendorStyles = [
   "node_modules/font-awesome/css/font-awesome.min.css",
   "node_modules/font-awesome/css/font-awesome.css.map",
@@ -72,6 +90,10 @@ function lint(files, options = {}) {
 
 gulp.task("lint:client", lint(`${clientDir}/**/*.jsx`));
 gulp.task("lint:server", lint(`./${serverDir}/server.js`));
+gulp.task("prepare:step-templates", (done) => {
+  generateAllMigratedTemplates();
+  done();
+});
 gulp.task("lint:step-templates", () => {
   return gulp
     .src("./step-templates/*.json")
@@ -83,7 +105,7 @@ gulp.task("lint:step-templates", () => {
 
 gulp.task(
   "tests",
-  gulp.series("lint:step-templates", () => {
+  gulp.series("prepare:step-templates", "lint:step-templates", () => {
     return (
       gulp
         .src("./spec/*-tests.js")
@@ -313,7 +335,7 @@ function provideMissingData() {
     template.Category = humanize(categoryId);
 
     if (!template.Logo) {
-      var logo = fs.readFileSync("./step-templates/logos/" + categoryId + ".png");
+      var logo = fs.readFileSync("./src/step-templates/logos/" + categoryId + ".png");
       template.Logo = Buffer.from(logo).toString("base64");
     }
 
@@ -323,17 +345,16 @@ function provideMissingData() {
   });
 }
 
-gulp.task(
-  "step-templates",
-  gulp.series("tests", () => {
-    return gulp
-      .src("./step-templates/*.json")
-      .pipe(provideMissingData())
-      .pipe(concat("step-templates.json", { newLine: "," }))
-      .pipe(insert.wrap('{"items": [', "]}"))
-      .pipe(argv.production ? gulp.dest(`${publishDir}/app/services`) : gulp.dest(`${buildDir}/app/services`));
-  })
-);
+gulp.task("step-templates:data", () => {
+  return gulp
+    .src("./step-templates/*.json")
+    .pipe(provideMissingData())
+    .pipe(concat("step-templates.json", { newLine: "," }))
+    .pipe(insert.wrap('{"items": [', "]}"))
+    .pipe(argv.production ? gulp.dest(`${publishDir}/app/services`) : gulp.dest(`${buildDir}/app/services`));
+});
+
+gulp.task("step-templates", gulp.series("tests", "step-templates:data"));
 
 gulp.task("styles:vendor", () => {
   return gulp.src(vendorStyles, { base: "node_modules/" }).pipe(argv.production ? gulp.dest(`${publishDir}/public/styles/vendor`) : gulp.dest(`${buildDir}/public/styles/vendor`));
@@ -433,7 +454,19 @@ gulp.task(
     gulp.watch(`${clientDir}/**/*.jade`, gulp.series("build:client"));
     gulp.watch(`${clientDir}/**/*.jsx`, gulp.series("scripts", "copy:app"));
     gulp.watch(`${clientDir}/content/styles/**/*.scss`, gulp.series("styles:client"));
-    gulp.watch("step-templates/*.json", gulp.series("step-templates"));
+    gulp.watch("step-templates/*.json", gulp.series("step-templates:data"));
+    gulp.watch(`${sourceStepTemplatesDir}/**/*`).on("all", (eventName, changedPath) => {
+      if (!changedPath) {
+        return;
+      }
+
+      generateFromChangedSourcePath(changedPath);
+      gulp.series("step-templates:data")((error) => {
+        if (error) {
+          log.error(error);
+        }
+      });
+    });
 
     gulp.watch(`${buildDir}/**/*.*`).on("change", reload);
   })
diff --git a/package.json b/package.json
index 913ee46b1..a954c6098 100644
--- a/package.json
+++ b/package.json
@@ -82,12 +82,15 @@
   },
   "scripts": {
     "setup": "npm install -g gulp && npm install",
-    "dev": "npm run lint:fix && gulp build && cd build && node server.js",
+    "dev": "npm run lint:fix && gulp watch",
     "build": "gulp build",
     "watch": "gulp watch",
     "start": "gulp watch",
     "lint": "eslint './**/*.{js,jsx}'",
-    "lint:fix": "npm run lint -- --fix"
+    "lint:fix": "npm run lint -- --fix",
+    "step-templates:generate": "node tools/generate-step-templates.js all",
+    "step-templates:prepare": "node tools/migration-prepare-step-template.js",
+    "step-templates:verify": "node tools/migration-verify-step-template.js"
   },
   "author": "The Octopus Deploy team and contributors",
   "license": "Apache-2.0",
diff --git a/spec/logos-validation-tests.js b/spec/logos-validation-tests.js
index ad0ad834a..1f2b84d82 100644
--- a/spec/logos-validation-tests.js
+++ b/spec/logos-validation-tests.js
@@ -4,7 +4,7 @@ describe("logos", function () {
   it("logos have valid details", function (done) {
     var filenameCounter = 0;
     var stepTemplateCount = 0;
-    var dirname = "./step-templates/logos";
+    var dirname = "./src/step-templates/logos";
 
     fs.readdir(dirname, function (err, filenames) {
       if (err) {
diff --git a/spec/step-template-validation-tests.js b/spec/step-template-validation-tests.js
index 394a8d76a..d0e93a3ef 100644
--- a/spec/step-template-validation-tests.js
+++ b/spec/step-template-validation-tests.js
@@ -109,9 +109,8 @@ describe("step-templates", function () {
       }
 
       var otherThings = results.filter(function (file) {
-        var pesterFile = file.endsWith(".ScriptBody.ps1");
         var jsonFile = file.endsWith(".json");
-        return !pesterFile && !jsonFile && file !== "logos" && file !== "tests";
+        return !jsonFile;
       });
       expect(otherThings).toEqual([]);
       done();
diff --git a/tools/README.md b/tools/README.md
new file mode 100644
index 000000000..0c99919f1
--- /dev/null
+++ b/tools/README.md
@@ -0,0 +1,52 @@
+Tools
+=====
+
+This folder contains both the legacy step-template pack/unpack scripts and the
+new helper scripts used during the source-first migration.
+
+Legacy scripts that must remain behaviorally unchanged
+------------------------------------------------------
+
+These are the canonical scripts for producing byte-identical packed output:
+
+* `_pack.ps1`
+* `_unpack.ps1`
+* `Converter.ps1`
+* `StepTemplatePacker/`
+
+Migration and generation helpers must wrap these scripts instead of modifying
+them directly.
+
+Permanent helper scripts
+------------------------
+
+These support the post-migration source-first workflow:
+
+* `generate-step-templates.js`
+* `source-step-template-lib.js`
+
+They read authored content from `/src/step-templates`, materialize the
+temporary legacy sidecar layout expected by the unchanged packer, invoke the
+legacy pack flow, and then clean up the temporary sidecars.
+
+Migration-only helper scripts
+-----------------------------
+
+These exist only to support the repository migration and should be removable
+after the migration is complete:
+
+* `migration-prepare-step-template.js`
+* `migration-verify-step-template.js`
+
+They handle `.json.orig` creation, `git mv` preparation, placeholder updates,
+and byte-for-byte validation of regenerated output.
+
+Helpers to evaluate for removal later
+-------------------------------------
+
+These are retained for now but should be reviewed once the migration is proven:
+
+* `_diff.ps1`
+
+After templates are authored as normal files under `/src/step-templates`, GitHub
+diffs should make `_diff.ps1` unnecessary for most review workflows.
diff --git a/tools/generate-step-templates.js b/tools/generate-step-templates.js
new file mode 100644
index 000000000..a10edf8be
--- /dev/null
+++ b/tools/generate-step-templates.js
@@ -0,0 +1,48 @@
+"use strict";
+
+const {
+  generateAllMigratedTemplates,
+  generateTemplate,
+  inferTemplateNameFromSourcePath,
+} = require("./source-step-template-lib");
+
+function main() {
+  const [, , command = "all", value] = process.argv;
+
+  if (command === "all") {
+    generateAllMigratedTemplates();
+    return;
+  }
+
+  if (command === "template") {
+    if (!value) {
+      throw new Error("A template name is required for the 'template' command.");
+    }
+
+    generateTemplate(value);
+    return;
+  }
+
+  if (command === "changed-path") {
+    if (!value) {
+      throw new Error("A source path is required for the 'changed-path' command.");
+    }
+
+    const result = inferTemplateNameFromSourcePath(value);
+    if (result.type === "template") {
+      generateTemplate(result.templateName);
+      return;
+    }
+
+    if (result.type === "logos") {
+      generateAllMigratedTemplates();
+      return;
+    }
+
+    return;
+  }
+
+  throw new Error(`Unsupported command '${command}'.`);
+}
+
+main();
diff --git a/tools/migration-prepare-step-template.js b/tools/migration-prepare-step-template.js
new file mode 100644
index 000000000..e2ae84543
--- /dev/null
+++ b/tools/migration-prepare-step-template.js
@@ -0,0 +1,63 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const { execFileSync } = require("child_process");
+const {
+  ensureDirectory,
+  getLegacyJsonPath,
+  getLegacyOrigPath,
+  getSourceTemplateDirectory,
+  moveExtractedSidecarsIntoSource,
+  normalizeTemplateName,
+  repoRoot,
+  runUnpack,
+  updateMetadataWithPlaceholders,
+} = require("./source-step-template-lib");
+
+function gitMove(fromPath, toPath) {
+  execFileSync("git", ["mv", fromPath, toPath], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
+function prepareTemplate(templateName) {
+  const normalizedName = normalizeTemplateName(templateName);
+  const legacyJsonPath = getLegacyJsonPath(normalizedName);
+  const legacyOrigPath = getLegacyOrigPath(normalizedName);
+  const sourceDirectory = getSourceTemplateDirectory(normalizedName);
+  const metadataPath = path.join(sourceDirectory, "metadata.json");
+
+  if (!fs.existsSync(legacyJsonPath)) {
+    throw new Error(`Legacy template '${normalizedName}.json' was not found.`);
+  }
+
+  ensureDirectory(sourceDirectory);
+
+  if (!fs.existsSync(legacyOrigPath)) {
+    fs.copyFileSync(legacyJsonPath, legacyOrigPath);
+  }
+
+  runUnpack(normalizedName);
+
+  if (!fs.existsSync(metadataPath)) {
+    gitMove(path.relative(repoRoot, legacyJsonPath), path.relative(repoRoot, metadataPath));
+  }
+
+  moveExtractedSidecarsIntoSource(normalizedName);
+  updateMetadataWithPlaceholders(normalizedName);
+}
+
+function main() {
+  const templateNames = process.argv.slice(2);
+  if (templateNames.length === 0) {
+    throw new Error("At least one template name is required.");
+  }
+
+  for (const templateName of templateNames) {
+    prepareTemplate(templateName);
+  }
+}
+
+main();
diff --git a/tools/migration-verify-step-template.js b/tools/migration-verify-step-template.js
new file mode 100644
index 000000000..55ab1cd40
--- /dev/null
+++ b/tools/migration-verify-step-template.js
@@ -0,0 +1,34 @@
+"use strict";
+
+const fs = require("fs");
+const {
+  compareGeneratedToOrig,
+  generateTemplate,
+  getLegacyOrigPath,
+  normalizeTemplateName,
+} = require("./source-step-template-lib");
+
+function main() {
+  const args = process.argv.slice(2);
+  const cleanup = args.includes("--cleanup");
+  const templateNames = args.filter((arg) => arg !== "--cleanup");
+
+  if (templateNames.length === 0) {
+    throw new Error("At least one template name is required.");
+  }
+
+  for (const templateName of templateNames) {
+    const normalizedName = normalizeTemplateName(templateName);
+    generateTemplate(normalizedName);
+
+    if (!compareGeneratedToOrig(normalizedName)) {
+      throw new Error(`Packed output for '${normalizedName}' does not match '${normalizedName}.json.orig'.`);
+    }
+
+    if (cleanup) {
+      fs.rmSync(getLegacyOrigPath(normalizedName), { force: true });
+    }
+  }
+}
+
+main();
diff --git a/tools/source-step-template-lib.js b/tools/source-step-template-lib.js
new file mode 100644
index 000000000..d8f29aac4
--- /dev/null
+++ b/tools/source-step-template-lib.js
@@ -0,0 +1,302 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const { execFileSync } = require("child_process");
+
+const repoRoot = path.resolve(__dirname, "..");
+const legacyRoot = path.join(repoRoot, "step-templates");
+const sourceRoot = path.join(repoRoot, "src", "step-templates");
+
+const placeholderPrefix = "__SOURCE_FILE__:";
+
+const scriptDefinitions = [
+  {
+    sourceBaseName: "scriptbody",
+    sourceExtensions: [".ps1", ".sh", ".py"],
+    legacySuffixes: [".ScriptBody.ps1", ".ScriptBody.sh", ".ScriptBody.py"],
+    propertyName: "Octopus.Action.Script.ScriptBody",
+  },
+  {
+    sourceBaseName: "predeploy",
+    sourceExtensions: [".ps1"],
+    legacySuffixes: [".PreDeploy.ps1"],
+    propertyName: "Octopus.Action.CustomScripts.PreDeploy.ps1",
+  },
+  {
+    sourceBaseName: "deploy",
+    sourceExtensions: [".ps1"],
+    legacySuffixes: [".Deploy.ps1"],
+    propertyName: "Octopus.Action.CustomScripts.Deploy.ps1",
+  },
+  {
+    sourceBaseName: "postdeploy",
+    sourceExtensions: [".ps1"],
+    legacySuffixes: [".PostDeploy.ps1"],
+    propertyName: "Octopus.Action.CustomScripts.PostDeploy.ps1",
+  },
+];
+
+function isDirectory(dirPath) {
+  return fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory();
+}
+
+function ensureDirectory(dirPath) {
+  fs.mkdirSync(dirPath, { recursive: true });
+}
+
+function normalizeTemplateName(templateName) {
+  return templateName.replace(/\.json$/i, "");
+}
+
+function getSourceTemplateDirectory(templateName) {
+  return path.join(sourceRoot, normalizeTemplateName(templateName));
+}
+
+function getMetadataPath(templateName) {
+  return path.join(getSourceTemplateDirectory(templateName), "metadata.json");
+}
+
+function getLegacyJsonPath(templateName) {
+  return path.join(legacyRoot, `${normalizeTemplateName(templateName)}.json`);
+}
+
+function getLegacyOrigPath(templateName) {
+  return path.join(legacyRoot, `${normalizeTemplateName(templateName)}.json.orig`);
+}
+
+function getPowerShellCommand() {
+  return process.env.PWSH_PATH || "pwsh";
+}
+
+function runPowerShellScript(scriptPath, args = []) {
+  execFileSync(getPowerShellCommand(), ["-NoProfile", "-File", scriptPath, ...args], {
+    cwd: repoRoot,
+    stdio: "inherit",
+  });
+}
+
+function runPack(templateName) {
+  runPowerShellScript(path.join(repoRoot, "tools", "_pack.ps1"), ["-SearchPattern", normalizeTemplateName(templateName)]);
+}
+
+function runUnpack(templateName) {
+  runPowerShellScript(path.join(repoRoot, "tools", "_unpack.ps1"), ["-SearchPattern", normalizeTemplateName(templateName), "-Force"]);
+}
+
+function listMigratedTemplates() {
+  if (!isDirectory(sourceRoot)) {
+    return [];
+  }
+
+  return fs
+    .readdirSync(sourceRoot)
+    .filter((entry) => !["logos", "tests"].includes(entry))
+    .filter((entry) => isDirectory(path.join(sourceRoot, entry)))
+    .filter((entry) => fs.existsSync(path.join(sourceRoot, entry, "metadata.json")))
+    .sort();
+}
+
+function listLegacyTemplates() {
+  if (!isDirectory(legacyRoot)) {
+    return [];
+  }
+
+  return fs
+    .readdirSync(legacyRoot)
+    .filter((entry) => entry.endsWith(".json"))
+    .map((entry) => entry.replace(/\.json$/i, ""))
+    .sort();
+}
+
+function readJson(jsonPath) {
+  return JSON.parse(fs.readFileSync(jsonPath, "utf8"));
+}
+
+function writeJson(jsonPath, value) {
+  fs.writeFileSync(jsonPath, `${JSON.stringify(value, null, 2)}\n`);
+}
+
+function setPlaceholderValue(fileName) {
+  return `${placeholderPrefix}${fileName}`;
+}
+
+function getScriptSourceFileName(templateDirectory, definition) {
+  for (const extension of definition.sourceExtensions) {
+    const fileName = `${definition.sourceBaseName}${extension}`;
+    if (fs.existsSync(path.join(templateDirectory, fileName))) {
+      return fileName;
+    }
+  }
+
+  return null;
+}
+
+function getLegacySidecarFileName(templateName, sourceFileName, definition) {
+  const extension = path.extname(sourceFileName);
+  if (definition.sourceBaseName === "scriptbody") {
+    return `${normalizeTemplateName(templateName)}.ScriptBody${extension}`;
+  }
+
+  const suffix = definition.legacySuffixes.find((candidate) => candidate.endsWith(extension));
+  if (!suffix) {
+    throw new Error(`Unsupported sidecar extension '${extension}' for ${sourceFileName}`);
+  }
+
+  return `${normalizeTemplateName(templateName)}${suffix}`;
+}
+
+function cleanGeneratedSidecars(templateName) {
+  for (const definition of scriptDefinitions) {
+    for (const suffix of definition.legacySuffixes) {
+      const sidecarPath = path.join(legacyRoot, `${normalizeTemplateName(templateName)}${suffix}`);
+      if (fs.existsSync(sidecarPath)) {
+        fs.rmSync(sidecarPath, { force: true });
+      }
+    }
+  }
+}
+
+function materializeLegacyTemplate(templateName) {
+  const normalizedName = normalizeTemplateName(templateName);
+  const templateDirectory = getSourceTemplateDirectory(normalizedName);
+  const metadataPath = getMetadataPath(normalizedName);
+
+  if (!fs.existsSync(metadataPath)) {
+    return false;
+  }
+
+  ensureDirectory(legacyRoot);
+  fs.copyFileSync(metadataPath, getLegacyJsonPath(normalizedName));
+
+  for (const definition of scriptDefinitions) {
+    const sourceFileName = getScriptSourceFileName(templateDirectory, definition);
+    if (!sourceFileName) {
+      continue;
+    }
+
+    const sourcePath = path.join(templateDirectory, sourceFileName);
+    const destinationPath = path.join(legacyRoot, getLegacySidecarFileName(normalizedName, sourceFileName, definition));
+    fs.copyFileSync(sourcePath, destinationPath);
+  }
+
+  return true;
+}
+
+function generateTemplate(templateName) {
+  const normalizedName = normalizeTemplateName(templateName);
+  const generated = materializeLegacyTemplate(normalizedName);
+  if (!generated) {
+    return false;
+  }
+
+  try {
+    runPack(normalizedName);
+  } finally {
+    cleanGeneratedSidecars(normalizedName);
+  }
+
+  return true;
+}
+
+function generateAllMigratedTemplates() {
+  for (const templateName of listMigratedTemplates()) {
+    generateTemplate(templateName);
+  }
+}
+
+function inferTemplateNameFromSourcePath(changedPath) {
+  const absolutePath = path.resolve(changedPath);
+  const relativePath = path.relative(sourceRoot, absolutePath);
+
+  if (relativePath.startsWith("..")) {
+    return { type: "outside" };
+  }
+
+  const parts = relativePath.split(path.sep).filter(Boolean);
+  if (parts.length === 0) {
+    return { type: "all" };
+  }
+
+  const [firstSegment, secondSegment] = parts;
+  if (firstSegment === "logos") {
+    return { type: "logos" };
+  }
+
+  if (firstSegment === "tests") {
+    return { type: "tests", testFile: secondSegment || null };
+  }
+
+  return { type: "template", templateName: firstSegment };
+}
+
+function updateMetadataWithPlaceholders(templateName) {
+  const metadataPath = getMetadataPath(templateName);
+  const templateDirectory = getSourceTemplateDirectory(templateName);
+  const metadata = readJson(metadataPath);
+  metadata.Properties = metadata.Properties || {};
+
+  for (const definition of scriptDefinitions) {
+    const sourceFileName = getScriptSourceFileName(templateDirectory, definition);
+    if (!sourceFileName) {
+      continue;
+    }
+
+    metadata.Properties[definition.propertyName] = setPlaceholderValue(sourceFileName);
+  }
+
+  writeJson(metadataPath, metadata);
+}
+
+function moveExtractedSidecarsIntoSource(templateName) {
+  const templateDirectory = getSourceTemplateDirectory(templateName);
+  ensureDirectory(templateDirectory);
+
+  for (const definition of scriptDefinitions) {
+    for (const suffix of definition.legacySuffixes) {
+      const legacyPath = path.join(legacyRoot, `${normalizeTemplateName(templateName)}${suffix}`);
+      if (!fs.existsSync(legacyPath)) {
+        continue;
+      }
+
+      const extension = path.extname(legacyPath);
+      const destinationPath = path.join(templateDirectory, `${definition.sourceBaseName}${extension}`);
+      fs.renameSync(legacyPath, destinationPath);
+    }
+  }
+}
+
+function compareGeneratedToOrig(templateName) {
+  const generatedPath = getLegacyJsonPath(templateName);
+  const originalPath = getLegacyOrigPath(templateName);
+  const generatedBuffer = fs.readFileSync(generatedPath);
+  const originalBuffer = fs.readFileSync(originalPath);
+  return generatedBuffer.equals(originalBuffer);
+}
+
+module.exports = {
+  cleanGeneratedSidecars,
+  compareGeneratedToOrig,
+  ensureDirectory,
+  generateAllMigratedTemplates,
+  generateTemplate,
+  getLegacyJsonPath,
+  getLegacyOrigPath,
+  getMetadataPath,
+  getSourceTemplateDirectory,
+  inferTemplateNameFromSourcePath,
+  legacyRoot,
+  listLegacyTemplates,
+  listMigratedTemplates,
+  moveExtractedSidecarsIntoSource,
+  normalizeTemplateName,
+  placeholderPrefix,
+  readJson,
+  repoRoot,
+  runUnpack,
+  scriptDefinitions,
+  setPlaceholderValue,
+  sourceRoot,
+  updateMetadataWithPlaceholders,
+  writeJson,
+};

From 5cb67a668fe17f5fd3d4191cbf3ffd9480adb707 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Fri, 27 Mar 2026 23:48:32 -0700
Subject: [PATCH 05/21] refactor: migrate proof batch step templates to src

---
 .gitignore                                    |   3 +
 plan.md                                       |   8 +-
 spec/step-template-validation-tests.js        |   3 +-
 .../metadata.json                             |   2 +-
 .../scriptbody.ps1                            |  17 +++
 .../GCP-gcloud-run-deploy/metadata.json       | 125 ++++++++++++++++++
 .../GCP-gcloud-run-deploy/scriptbody.sh       |  30 +++++
 .../azure-function-deployment/metadata.json   |   2 +-
 .../azure-function-deployment/postdeploy.ps1  |  52 ++++++++
 .../metadata.json                             |   2 +-
 .../cassandra-create-keyspace/metadata.json   |  94 +++++++++++++
 .../cassandra-create-keyspace/scriptbody.py   |  67 ++++++++++
 step-templates/GCP-gcloud-run-deploy.json     | 125 ------------------
 step-templates/cassandra-create-keyspace.json |  94 -------------
 tools/migration-prepare-step-template.js      |   6 +-
 tools/source-step-template-lib.js             |  16 ++-
 16 files changed, 416 insertions(+), 230 deletions(-)
 rename step-templates/Azure-Backup-TableStorage-to-Blob.json => src/step-templates/Azure-Backup-TableStorage-to-Blob/metadata.json (73%)
 create mode 100644 src/step-templates/Azure-Backup-TableStorage-to-Blob/scriptbody.ps1
 create mode 100644 src/step-templates/GCP-gcloud-run-deploy/metadata.json
 create mode 100644 src/step-templates/GCP-gcloud-run-deploy/scriptbody.sh
 rename step-templates/azure-function-deployment.json => src/step-templates/azure-function-deployment/metadata.json (73%)
 create mode 100644 src/step-templates/azure-function-deployment/postdeploy.ps1
 rename step-templates/azure-site-extensions-install.json => src/step-templates/azure-site-extensions-install/metadata.json (99%)
 create mode 100644 src/step-templates/cassandra-create-keyspace/metadata.json
 create mode 100644 src/step-templates/cassandra-create-keyspace/scriptbody.py
 delete mode 100644 step-templates/GCP-gcloud-run-deploy.json
 delete mode 100644 step-templates/cassandra-create-keyspace.json

diff --git a/.gitignore b/.gitignore
index 2d1c306e9..bb22e23d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ scriptcs_packages.config
 step-templates/*.ps1
 step-templates/*.sh
 step-templates/*.py
+step-templates/*.json.orig
+# Final cutover:
+# step-templates/*.json
 diff-output/
 .tmp*/
 /.vs
diff --git a/plan.md b/plan.md
index dda1be7ab..a5b3b5eb7 100644
--- a/plan.md
+++ b/plan.md
@@ -67,7 +67,9 @@ A key requirement during migration is that the dev workflow remains usable at ev
    - reconstruct the temporary legacy layout needed by the unchanged packer
    - invoke the existing pack behavior to regenerate `step-templates/<template>.json`
    - diff regenerated `step-templates/<template>.json` against `step-templates/<template>.json.orig`
-   - fail unless they are byte-identical
+   - fail unless they are identical apart from the accepted normalization differences:
+     - `"$Meta.ExportedAt"` may be reformatted by the unchanged packer
+     - a single trailing newline at end of file may be added or removed
    - remove `.json.orig` only after validation succeeds
 
 10. Update dev/build behavior so `npm run dev` works throughout migration:
@@ -204,7 +206,9 @@ A key requirement during migration is that the dev workflow remains usable at ev
 - The proof batch comes first, and subsequent migration batches are fixed at 100 templates each
 - During migration, the repo must support a mixed state where some templates are authored in `src/step-templates/*` and others remain as legacy JSON
 - `metadata.json` uses placeholders for script-backed properties
-- Packed JSON equivalence is strict and byte-for-byte
+- Packed JSON equivalence is strict apart from two accepted normalization differences:
+  - `"$Meta.ExportedAt"` may be rewritten into the unchanged packer's normalized format
+  - a single trailing newline at end of file may differ
 - `step-templates/` becomes generated-only after final cutover, not before the last migrated batch is complete
 - Shared authoring assets currently under `step-templates/logos` and `step-templates/tests` move to `src/step-templates/`
 - `.json.orig` files are local migration artifacts only and are never committed
diff --git a/spec/step-template-validation-tests.js b/spec/step-template-validation-tests.js
index d0e93a3ef..d04ec1238 100644
--- a/spec/step-template-validation-tests.js
+++ b/spec/step-template-validation-tests.js
@@ -110,7 +110,8 @@ describe("step-templates", function () {
 
       var otherThings = results.filter(function (file) {
         var jsonFile = file.endsWith(".json");
-        return !jsonFile;
+        var jsonOrigFile = file.endsWith(".json.orig");
+        return !jsonFile && !jsonOrigFile;
       });
       expect(otherThings).toEqual([]);
       done();
diff --git a/step-templates/Azure-Backup-TableStorage-to-Blob.json b/src/step-templates/Azure-Backup-TableStorage-to-Blob/metadata.json
similarity index 73%
rename from step-templates/Azure-Backup-TableStorage-to-Blob.json
rename to src/step-templates/Azure-Backup-TableStorage-to-Blob/metadata.json
index ab78f89db..eb7003aa8 100644
--- a/step-templates/Azure-Backup-TableStorage-to-Blob.json
+++ b/src/step-templates/Azure-Backup-TableStorage-to-Blob/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "if($IsEnabled -eq \"True\")\r\n{\r\nWrite-Output \"Starting Backup the Azure table 'https://$sourceStorageAccountName.table.core.windows.net/$sourceTableName' to the Blob 'https://$destinationStorageAccountName.blob.core.windows.net/$sourceStorageAccountName-$sourceTableName'\"\r\n\r\n& \"${Env:ProgramFiles(x86)}\\Microsoft SDKs\\Azure\\AzCopy\\azCopy.exe\" `\r\n    /Source:https://$sourceStorageAccountName.table.core.windows.net/$sourceTableName/ `\r\n    /Dest:https://$destinationStorageAccountName.blob.core.windows.net/$sourceStorageAccountName-$sourceTableName/ `\r\n    /SourceKey:$sourceStorageAccountKey `\r\n    /Destkey:$destinationStorageAccountKey `\r\n    /y\r\n\r\nWrite-Output \"Backup Completed\"\r\n}\r\nelse\r\n{\r\n    Write-Output \"This Step is disabled\"\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.NuGetFeedId": null,
     "Octopus.Action.Package.NuGetPackageId": null
diff --git a/src/step-templates/Azure-Backup-TableStorage-to-Blob/scriptbody.ps1 b/src/step-templates/Azure-Backup-TableStorage-to-Blob/scriptbody.ps1
new file mode 100644
index 000000000..79013ae23
--- /dev/null
+++ b/src/step-templates/Azure-Backup-TableStorage-to-Blob/scriptbody.ps1
@@ -0,0 +1,17 @@
+if($IsEnabled -eq "True")
+{
+Write-Output "Starting Backup the Azure table 'https://$sourceStorageAccountName.table.core.windows.net/$sourceTableName' to the Blob 'https://$destinationStorageAccountName.blob.core.windows.net/$sourceStorageAccountName-$sourceTableName'"
+
+& "${Env:ProgramFiles(x86)}\Microsoft SDKs\Azure\AzCopy\azCopy.exe" `
+    /Source:https://$sourceStorageAccountName.table.core.windows.net/$sourceTableName/ `
+    /Dest:https://$destinationStorageAccountName.blob.core.windows.net/$sourceStorageAccountName-$sourceTableName/ `
+    /SourceKey:$sourceStorageAccountKey `
+    /Destkey:$destinationStorageAccountKey `
+    /y
+
+Write-Output "Backup Completed"
+}
+else
+{
+    Write-Output "This Step is disabled"
+}
\ No newline at end of file
diff --git a/src/step-templates/GCP-gcloud-run-deploy/metadata.json b/src/step-templates/GCP-gcloud-run-deploy/metadata.json
new file mode 100644
index 000000000..1b85b9319
--- /dev/null
+++ b/src/step-templates/GCP-gcloud-run-deploy/metadata.json
@@ -0,0 +1,125 @@
+{
+  "Id": "acbb0a58-e176-4309-8a1f-a0296214d4a4",
+  "Name": "GCP - gcloud run deploy (bash)",
+  "Description": "[gcloud run deploy](https://cloud.google.com/sdk/gcloud/reference/run/deploy) - deploy a container to Cloud Run",
+  "ActionType": "Octopus.GoogleCloudScripting",
+  "Author": "ryanrousseau",
+  "Version": 1,
+  "Packages": [
+    {
+      "Id": "42ba13b1-0b02-48e1-a880-49f2b00ef1a5",
+      "Name": "GCloudRunDeploy.Container",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "NotAcquired",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "GCloudRunDeploy.Container",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
+    "Octopus.Action.GoogleCloud.UseVMServiceAccount": "False",
+    "Octopus.Action.GoogleCloudAccount.Variable": "#{GCloudRunDeploy.Account}",
+    "Octopus.Action.GoogleCloud.ImpersonateServiceAccount": "False",
+    "Octopus.Action.GoogleCloud.Project": "#{GCloudRunDeploy.Project}",
+    "Octopus.Action.GoogleCloud.Region": "#{GCloudRunDeploy.Region}",
+    "Octopus.Action.GoogleCloud.Zone": "#{GCloudRunDeploy.Zone}"
+  },
+  "Parameters": [
+    {
+      "Id": "cc0f6d96-8ae8-49c7-a98e-2c6ec49be818",
+      "Name": "GCloudRunDeploy.Container",
+      "Label": "Container",
+      "HelpText": "The container to deploy to Cloud Run.\n\n**This step only uses the container image and tag to provide a Release specific value to pass to the `gcloud run deploy` command.** Please make sure that the chosen container is accessible by Google Cloud and the appropriate service accounts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "7225abe8-e8c0-4c70-b077-e0e603caf330",
+      "Name": "GCloudRunDeploy.Account",
+      "Label": "Account",
+      "HelpText": "Google Cloud Account to use for the command.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "GoogleCloudAccount"
+      }
+    },
+    {
+      "Id": "7ae8e5b2-2792-415f-b53a-f38ee3a0d605",
+      "Name": "GCloudRunDeploy.Project",
+      "Label": "Project",
+      "HelpText": "Google Cloud project to use with the command.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "54794e4f-8681-4198-8157-226909dce509",
+      "Name": "GCloudRunDeploy.Region",
+      "Label": "Region",
+      "HelpText": "Google  Cloud region to use with the command. This is used by the underlying Octopus step and not passed to the `gcloud run deploy` command.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "56ae0926-0f3b-416d-beea-162a02f5f5c0",
+      "Name": "GCloudRunDeploy.Zone",
+      "Label": "Zone",
+      "HelpText": "Google Cloud zone to use with the command.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f71d5a0e-215b-4eda-a70d-589313deadd5",
+      "Name": "GCloudRunDeploy.Service",
+      "Label": "Service",
+      "HelpText": "ID of the service or fully qualified identifier for the service. To set the service attribute:\n\n* provide the argument SERVICE on the command line;\n* specify the service name from an interactive prompt.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7425e1db-79a5-4328-8d4b-5f9378e6539c",
+      "Name": "GCloudRunDeploy.AdditionalParameters",
+      "Label": "Additional Parameters",
+      "HelpText": "Provide any additional parameters per [the documentation](https://cloud.google.com/sdk/gcloud/reference/run/deploy).\n\nExample: `--platform=managed --region=us-central1 --allow-unauthenticated`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c20cdbad-f023-4a47-87a4-d17eee59c3c0",
+      "Name": "GCloudRunDeploy.PrintCommand",
+      "Label": "Print Command?",
+      "HelpText": "Prints the command in the logs using set -x. This will cause a warning when the step runs.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.GoogleCloudScripting",
+  "$Meta": {
+    "ExportedAt": "2022-03-17T19:46:39.101Z",
+    "OctopusVersion": "2022.2.387-hotfix.903",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "google-cloud",
+  "MinimumServerVersion": "2021.2.0"
+}
diff --git a/src/step-templates/GCP-gcloud-run-deploy/scriptbody.sh b/src/step-templates/GCP-gcloud-run-deploy/scriptbody.sh
new file mode 100644
index 000000000..6f989fde5
--- /dev/null
+++ b/src/step-templates/GCP-gcloud-run-deploy/scriptbody.sh
@@ -0,0 +1,30 @@
+account=$(get_octopusvariable "GCloudRunDeploy.Account")
+project=$(get_octopusvariable "GCloudRunDeploy.Project")
+region=$(get_octopusvariable "GCloudRunDeploy.Region")
+
+service=$(get_octopusvariable "GCloudRunDeploy.Service")
+image=$(get_octopusvariable "Octopus.Action.Package[GCloudRunDeploy.Container].Image")
+additionalParams=$(get_octopusvariable "GCloudRunDeploy.AdditionalParameters")
+printCommand=$(get_octopusvariable "GCloudRunDeploy.PrintCommand")
+
+if [ "$account" = "" ] ; then
+    fail_step "'Account' is a required parameter for this step."
+fi
+
+if [ "$project" = "" ] ; then
+    fail_step "'Project' is a required parameter for this step."
+fi
+
+if [ "$region" = "" ] ; then
+    fail_step "'Region' is a required parameter for this step."
+fi
+
+if [ "$service" = "" ] ; then
+    fail_step "'Service' is a required parameter for this step."
+fi
+
+if [ "$printCommand" = "True" ] ; then
+    set -x
+fi
+
+gcloud run deploy $service --image=$image ${additionalParams:+ $additionalParams}
\ No newline at end of file
diff --git a/step-templates/azure-function-deployment.json b/src/step-templates/azure-function-deployment/metadata.json
similarity index 73%
rename from step-templates/azure-function-deployment.json
rename to src/step-templates/azure-function-deployment/metadata.json
index 8930ef5c7..147589e7d 100644
--- a/step-templates/azure-function-deployment.json
+++ b/src/step-templates/azure-function-deployment/metadata.json
@@ -11,7 +11,7 @@
     "Octopus.Action.Package.DownloadOnTentacle": "False",
     "Octopus.Action.Package.FeedId": "feeds-builtin",
     "Octopus.Action.Package.JsonConfigurationVariablesEnabled": "True",
-    "Octopus.Action.CustomScripts.PostDeploy.ps1": "$installationPath = $OctopusParameters[\"Octopus.Action.Package.InstallationDirectoryPath\"]\n$packageId = $OctopusParameters[\"Octopus.Action.Package.PackageId\"]\n$packageVersion = $OctopusParameters[\"Octopus.Action.Package.PackageVersion\"]\n\nWrite-Host \"Installation Path: $($installationPath)\"\nWrite-Host \"Package ID: $($packageId)\"\nWrite-Host \"Package Version: $($packageVersion)\"\n\n$zipFilePath = \"$($installationPath)\\$($packageId).$($packageVersion).zip\"\n\nWrite-Host \"Zip File Path: $($zipFilePath)\"\n\nCompress-Archive -Path \"$($installationPath)\\*\" -DestinationPath $zipFilePath\n\nWrite-Host \"Deployment zip file created\"\n\n$username = $OctopusParameters[\"Azf.Username\"]\n$password = $OctopusParameters[\"Azf.Password\"]\n$appName = $OctopusParameters[\"Azf.ApplicationName\"]\n\nif(!$username){\n    Write-Error \"No Username has been supplied. You can do this from the Step Details page of this step.\"\n    \n    exit 1;\n}\n\n\nif(!$password){\n    Write-Error \"No Password has been supplied. You can do this from the Step Details page of this step.\"\n    \n    exit 1;\n}\n\n\nif(!$appName){\n    Write-Error \"No Application Name has been supplied. You can do this from the Step Details page of this step.\"\n    \n    exit 1;\n}\n\n$authHeader = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $username,$password)))\n\n$apiUrl = \"https://$($appName).scm.azurewebsites.net/api/zipdeploy\"\n\nWrite-Host \"Uploading deployment zip file to $($apiUrl)\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\nInvoke-RestMethod -Uri $apiUrl -Headers @{Authorization=(\"Basic {0}\" -f $authHeader)} -Method POST -InFile $zipFilePath -ContentType \"multipart/form-data\"\n\nWrite-Host \"Upload complete\"\n",
+    "Octopus.Action.CustomScripts.PostDeploy.ps1": "__SOURCE_FILE__:postdeploy.ps1",
     "Octopus.Action.Package.PackageId": "#{Azf.PackageName}",
     "Octopus.Action.Package.JsonConfigurationVariablesTargets": "#{Azf.JsonConfigFiles}",
     "Octopus.Action.CustomScripts.PreDeploy.ps1": "",
diff --git a/src/step-templates/azure-function-deployment/postdeploy.ps1 b/src/step-templates/azure-function-deployment/postdeploy.ps1
new file mode 100644
index 000000000..011fcbe9f
--- /dev/null
+++ b/src/step-templates/azure-function-deployment/postdeploy.ps1
@@ -0,0 +1,52 @@
+$installationPath = $OctopusParameters["Octopus.Action.Package.InstallationDirectoryPath"]
+$packageId = $OctopusParameters["Octopus.Action.Package.PackageId"]
+$packageVersion = $OctopusParameters["Octopus.Action.Package.PackageVersion"]
+
+Write-Host "Installation Path: $($installationPath)"
+Write-Host "Package ID: $($packageId)"
+Write-Host "Package Version: $($packageVersion)"
+
+$zipFilePath = "$($installationPath)\$($packageId).$($packageVersion).zip"
+
+Write-Host "Zip File Path: $($zipFilePath)"
+
+Compress-Archive -Path "$($installationPath)\*" -DestinationPath $zipFilePath
+
+Write-Host "Deployment zip file created"
+
+$username = $OctopusParameters["Azf.Username"]
+$password = $OctopusParameters["Azf.Password"]
+$appName = $OctopusParameters["Azf.ApplicationName"]
+
+if(!$username){
+    Write-Error "No Username has been supplied. You can do this from the Step Details page of this step."
+    
+    exit 1;
+}
+
+
+if(!$password){
+    Write-Error "No Password has been supplied. You can do this from the Step Details page of this step."
+    
+    exit 1;
+}
+
+
+if(!$appName){
+    Write-Error "No Application Name has been supplied. You can do this from the Step Details page of this step."
+    
+    exit 1;
+}
+
+$authHeader = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $username,$password)))
+
+$apiUrl = "https://$($appName).scm.azurewebsites.net/api/zipdeploy"
+
+Write-Host "Uploading deployment zip file to $($apiUrl)"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+Invoke-RestMethod -Uri $apiUrl -Headers @{Authorization=("Basic {0}" -f $authHeader)} -Method POST -InFile $zipFilePath -ContentType "multipart/form-data"
+
+Write-Host "Upload complete"
diff --git a/step-templates/azure-site-extensions-install.json b/src/step-templates/azure-site-extensions-install/metadata.json
similarity index 99%
rename from step-templates/azure-site-extensions-install.json
rename to src/step-templates/azure-site-extensions-install/metadata.json
index 1306d76be..8470eb7d1 100644
--- a/step-templates/azure-site-extensions-install.json
+++ b/src/step-templates/azure-site-extensions-install/metadata.json
@@ -77,4 +77,4 @@
     "Type": "ActionTemplate"
   },
   "Category": "azure-site-extensions"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/cassandra-create-keyspace/metadata.json b/src/step-templates/cassandra-create-keyspace/metadata.json
new file mode 100644
index 000000000..be45555e9
--- /dev/null
+++ b/src/step-templates/cassandra-create-keyspace/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "8ab26143-22d7-4e2f-83a8-f0e2d74a4de2",
+  "Name": "Cassandra - Create database if not exists",
+  "Description": "This template creates a keyspace on a Cassandra server if it doesn't already exist.  **Note** this template is written in Python and requires that `pip` is installed to function correctly.,",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "93076332-862f-44c5-b003-f8d6c9138d2b",
+      "Name": "Cassandra.Server.Name",
+      "Label": "Server Name",
+      "HelpText": "Hostname or IP address of the Cassandra database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8abf47c6-eec5-428d-be90-4b4443295867",
+      "Name": "Cassandra.Server.Port",
+      "Label": "Port",
+      "HelpText": "Port number that the Cassandra server is listening on.",
+      "DefaultValue": "9042",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5630dc27-80d2-421c-bb99-a61b2e6bd439",
+      "Name": "Cassandra.User.Name",
+      "Label": "(Optional) Username",
+      "HelpText": "Username of the account that can create databases.  Leave blank if not using Username/Password authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1e7e73db-ca36-4bd6-9c5a-3f49506c7adf",
+      "Name": "Cassandra.User.Password",
+      "Label": "(Optional) Password",
+      "HelpText": "Password for the user account that can create databases.  Leave blank if not using Username/Password authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "484d22fc-4a84-4459-ac4e-166731432709",
+      "Name": "Cassandra.Server.Mode",
+      "Label": "Server mode",
+      "HelpText": "The mode in which the Cassandra server is operating.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "NetworkTopologyStrategy|Network Topology Strategy\nSimpleStrategy|Simple Strategy"
+      }
+    },
+    {
+      "Id": "b2c433be-66bb-4ee0-9246-59e62818b7bb",
+      "Name": "Cassandra.Keyspace.Name",
+      "Label": "Keyspace",
+      "HelpText": "Name of the Keyspace to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "73a696ca-26e3-4069-852a-3be63d5bd090",
+      "Name": "Cassandra.Replicas.Number",
+      "Label": "Number of replicas",
+      "HelpText": "The number of replicas to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2023-05-03T22:44:27.358Z",
+    "OctopusVersion": "2023.1.10046",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "cassandra"
+}
diff --git a/src/step-templates/cassandra-create-keyspace/scriptbody.py b/src/step-templates/cassandra-create-keyspace/scriptbody.py
new file mode 100644
index 000000000..44609e482
--- /dev/null
+++ b/src/step-templates/cassandra-create-keyspace/scriptbody.py
@@ -0,0 +1,67 @@
+# Import subprocess 
+import subprocess
+
+# Define function to install specified package
+def install(package):
+    subprocess.check_call([sys.executable, "-m", "pip", "install", package])
+
+
+# Supress warning when in a docker container
+print('##octopus[stderr-ignore]',flush = True)    
+    
+# Check to see if cassandra-module is installed
+print('Checking for Cassandra module ...',flush = True)
+if 'cassandra-driver' not in sys.modules:
+  # Install the cassandra-driver module
+  print('Installing cassandra-driver module ...',flush = True)
+  install('cassandra-driver')
+else:
+  print('cassandra-driver module is present ...',flush = True)
+
+# Import cassandra modules
+from cassandra.cluster import Cluster
+from cassandra.auth import PlainTextAuthProvider
+
+# Set username/password authentication provider
+auth_provider = PlainTextAuthProvider(
+        username='#{Cassandra.User.Name}', password='#{Cassandra.User.Password}')
+
+# Connect to server
+print('Connecting to server ...',flush = True)
+cluster = None
+
+if '#{Cassandra.User.Name}' != '' and '#{Cassandra.User.Password}' != '':
+	cluster = Cluster(['#{Cassandra.Server.Name}'], auth_provider=auth_provider, port=#{Cassandra.Server.Port})
+else:
+	cluster = Cluster(['#{Cassandra.Server.Name}'], port=#{Cassandra.Server.Port})
+                    
+# Conect to cluster
+session = cluster.connect()
+rows = session.execute("SELECT keyspace_name FROM system_schema.keyspaces;")
+keyspace = next((x for x in rows if x.keyspace_name == '#{Cassandra.Keyspace.Name}'), None)
+
+if keyspace == None:
+  # Create json document
+  strategyjson = None
+  if '#{Cassandra.Server.Mode}' == "SimpleStrategy":
+      strategyjson = { 'class' : '#{Cassandra.Server.Mode}', 'replication_factor': '#{Cassandra.Replicas.Number}' }
+
+  if '#{Cassandra.Server.Mode}' == "NetworkTopologyStrategy":
+      strategyjson = { 'class' : '#{Cassandra.Server.Mode}', '#{Cassandra.Server.Name}' : '#{Cassandra.Replicas.Number}'}
+
+  # Create keyspace
+  print('Creating keyspace #{Cassandra.Keyspace.Name} ...',flush = True)
+  session.execute("CREATE KEYSPACE IF NOT EXISTS #{Cassandra.Keyspace.Name} WITH REPLICATION = {0};".format(strategyjson))
+
+  # Verify keyspace was created
+  rows = session.execute("SELECT keyspace_name FROM system_schema.keyspaces;")
+
+  keyspace = next((x for x in rows if x.keyspace_name == '#{Cassandra.Keyspace.Name}'), None)
+
+  if keyspace != None:
+    print('#{Cassandra.Keyspace.Name} created successfully!',flush = True)
+  else:
+    print('#{Cassandra.Keyspace.Name} was not created!',flush = True)
+    exit(1)
+else:
+  print('Keyspace #{Cassandra.Keyspace.Name} already exists.',flush = True)
\ No newline at end of file
diff --git a/step-templates/GCP-gcloud-run-deploy.json b/step-templates/GCP-gcloud-run-deploy.json
deleted file mode 100644
index 475d1c9e7..000000000
--- a/step-templates/GCP-gcloud-run-deploy.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "Id": "acbb0a58-e176-4309-8a1f-a0296214d4a4",
-    "Name": "GCP - gcloud run deploy (bash)",
-    "Description": "[gcloud run deploy](https://cloud.google.com/sdk/gcloud/reference/run/deploy) - deploy a container to Cloud Run",
-    "ActionType": "Octopus.GoogleCloudScripting",
-    "Author": "ryanrousseau",
-    "Version": 1,
-    "Packages": [
-        {
-            "Id": "42ba13b1-0b02-48e1-a880-49f2b00ef1a5",
-            "Name": "GCloudRunDeploy.Container",
-            "PackageId": null,
-            "FeedId": null,
-            "AcquisitionLocation": "NotAcquired",
-            "Properties": {
-                "Extract": "True",
-                "SelectionMode": "deferred",
-                "PackageParameterName": "GCloudRunDeploy.Container",
-                "Purpose": ""
-            }
-        }
-    ],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "Bash",
-        "Octopus.Action.Script.ScriptBody": "account=$(get_octopusvariable \"GCloudRunDeploy.Account\")\nproject=$(get_octopusvariable \"GCloudRunDeploy.Project\")\nregion=$(get_octopusvariable \"GCloudRunDeploy.Region\")\n\nservice=$(get_octopusvariable \"GCloudRunDeploy.Service\")\nimage=$(get_octopusvariable \"Octopus.Action.Package[GCloudRunDeploy.Container].Image\")\nadditionalParams=$(get_octopusvariable \"GCloudRunDeploy.AdditionalParameters\")\nprintCommand=$(get_octopusvariable \"GCloudRunDeploy.PrintCommand\")\n\nif [ \"$account\" = \"\" ] ; then\n    fail_step \"'Account' is a required parameter for this step.\"\nfi\n\nif [ \"$project\" = \"\" ] ; then\n    fail_step \"'Project' is a required parameter for this step.\"\nfi\n\nif [ \"$region\" = \"\" ] ; then\n    fail_step \"'Region' is a required parameter for this step.\"\nfi\n\nif [ \"$service\" = \"\" ] ; then\n    fail_step \"'Service' is a required parameter for this step.\"\nfi\n\nif [ \"$printCommand\" = \"True\" ] ; then\n    set -x\nfi\n\ngcloud run deploy $service --image=$image ${additionalParams:+ $additionalParams}",
-        "Octopus.Action.GoogleCloud.UseVMServiceAccount": "False",
-        "Octopus.Action.GoogleCloudAccount.Variable": "#{GCloudRunDeploy.Account}",
-        "Octopus.Action.GoogleCloud.ImpersonateServiceAccount": "False",
-        "Octopus.Action.GoogleCloud.Project": "#{GCloudRunDeploy.Project}",
-        "Octopus.Action.GoogleCloud.Region": "#{GCloudRunDeploy.Region}",
-        "Octopus.Action.GoogleCloud.Zone": "#{GCloudRunDeploy.Zone}"
-    },
-    "Parameters": [
-        {
-            "Id": "cc0f6d96-8ae8-49c7-a98e-2c6ec49be818",
-            "Name": "GCloudRunDeploy.Container",
-            "Label": "Container",
-            "HelpText": "The container to deploy to Cloud Run.\n\n**This step only uses the container image and tag to provide a Release specific value to pass to the `gcloud run deploy` command.** Please make sure that the chosen container is accessible by Google Cloud and the appropriate service accounts.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Package"
-            }
-        },
-        {
-            "Id": "7225abe8-e8c0-4c70-b077-e0e603caf330",
-            "Name": "GCloudRunDeploy.Account",
-            "Label": "Account",
-            "HelpText": "Google Cloud Account to use for the command.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "GoogleCloudAccount"
-            }
-        },
-        {
-            "Id": "7ae8e5b2-2792-415f-b53a-f38ee3a0d605",
-            "Name": "GCloudRunDeploy.Project",
-            "Label": "Project",
-            "HelpText": "Google Cloud project to use with the command.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "54794e4f-8681-4198-8157-226909dce509",
-            "Name": "GCloudRunDeploy.Region",
-            "Label": "Region",
-            "HelpText": "Google  Cloud region to use with the command. This is used by the underlying Octopus step and not passed to the `gcloud run deploy` command.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "56ae0926-0f3b-416d-beea-162a02f5f5c0",
-            "Name": "GCloudRunDeploy.Zone",
-            "Label": "Zone",
-            "HelpText": "Google Cloud zone to use with the command.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "f71d5a0e-215b-4eda-a70d-589313deadd5",
-            "Name": "GCloudRunDeploy.Service",
-            "Label": "Service",
-            "HelpText": "ID of the service or fully qualified identifier for the service. To set the service attribute:\n\n* provide the argument SERVICE on the command line;\n* specify the service name from an interactive prompt.\n",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "7425e1db-79a5-4328-8d4b-5f9378e6539c",
-            "Name": "GCloudRunDeploy.AdditionalParameters",
-            "Label": "Additional Parameters",
-            "HelpText": "Provide any additional parameters per [the documentation](https://cloud.google.com/sdk/gcloud/reference/run/deploy).\n\nExample: `--platform=managed --region=us-central1 --allow-unauthenticated`",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c20cdbad-f023-4a47-87a4-d17eee59c3c0",
-            "Name": "GCloudRunDeploy.PrintCommand",
-            "Label": "Print Command?",
-            "HelpText": "Prints the command in the logs using set -x. This will cause a warning when the step runs.",
-            "DefaultValue": "False",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "StepPackageId": "Octopus.GoogleCloudScripting",
-    "$Meta": {
-        "ExportedAt": "2022-03-17T19:46:39.101Z",
-        "OctopusVersion": "2022.2.387-hotfix.903",
-        "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "ryanrousseau",
-    "Category": "google-cloud",
-    "MinimumServerVersion": "2021.2.0"
-}
diff --git a/step-templates/cassandra-create-keyspace.json b/step-templates/cassandra-create-keyspace.json
deleted file mode 100644
index 82f5146ec..000000000
--- a/step-templates/cassandra-create-keyspace.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "Id": "8ab26143-22d7-4e2f-83a8-f0e2d74a4de2",
-    "Name": "Cassandra - Create database if not exists",
-    "Description": "This template creates a keyspace on a Cassandra server if it doesn't already exist.  **Note** this template is written in Python and requires that `pip` is installed to function correctly.,",
-    "ActionType": "Octopus.Script",
-    "Version": 4,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "Python",
-      "Octopus.Action.Script.ScriptBody": "# Import subprocess \nimport subprocess\n\n# Define function to install specified package\ndef install(package):\n    subprocess.check_call([sys.executable, \"-m\", \"pip\", \"install\", package])\n\n\n# Supress warning when in a docker container\nprint('##octopus[stderr-ignore]',flush = True)    \n    \n# Check to see if cassandra-module is installed\nprint('Checking for Cassandra module ...',flush = True)\nif 'cassandra-driver' not in sys.modules:\n  # Install the cassandra-driver module\n  print('Installing cassandra-driver module ...',flush = True)\n  install('cassandra-driver')\nelse:\n  print('cassandra-driver module is present ...',flush = True)\n\n# Import cassandra modules\nfrom cassandra.cluster import Cluster\nfrom cassandra.auth import PlainTextAuthProvider\n\n# Set username/password authentication provider\nauth_provider = PlainTextAuthProvider(\n        username='#{Cassandra.User.Name}', password='#{Cassandra.User.Password}')\n\n# Connect to server\nprint('Connecting to server ...',flush = True)\ncluster = None\n\nif '#{Cassandra.User.Name}' != '' and '#{Cassandra.User.Password}' != '':\n\tcluster = Cluster(['#{Cassandra.Server.Name}'], auth_provider=auth_provider, port=#{Cassandra.Server.Port})\nelse:\n\tcluster = Cluster(['#{Cassandra.Server.Name}'], port=#{Cassandra.Server.Port})\n                    \n# Conect to cluster\nsession = cluster.connect()\nrows = session.execute(\"SELECT keyspace_name FROM system_schema.keyspaces;\")\nkeyspace = next((x for x in rows if x.keyspace_name == '#{Cassandra.Keyspace.Name}'), None)\n\nif keyspace == None:\n  # Create json document\n  strategyjson = None\n  if '#{Cassandra.Server.Mode}' == \"SimpleStrategy\":\n      strategyjson = { 'class' : '#{Cassandra.Server.Mode}', 'replication_factor': '#{Cassandra.Replicas.Number}' }\n\n  if '#{Cassandra.Server.Mode}' == \"NetworkTopologyStrategy\":\n      strategyjson = { 'class' : '#{Cassandra.Server.Mode}', '#{Cassandra.Server.Name}' : '#{Cassandra.Replicas.Number}'}\n\n  # Create keyspace\n  print('Creating keyspace #{Cassandra.Keyspace.Name} ...',flush = True)\n  session.execute(\"CREATE KEYSPACE IF NOT EXISTS #{Cassandra.Keyspace.Name} WITH REPLICATION = {0};\".format(strategyjson))\n\n  # Verify keyspace was created\n  rows = session.execute(\"SELECT keyspace_name FROM system_schema.keyspaces;\")\n\n  keyspace = next((x for x in rows if x.keyspace_name == '#{Cassandra.Keyspace.Name}'), None)\n\n  if keyspace != None:\n    print('#{Cassandra.Keyspace.Name} created successfully!',flush = True)\n  else:\n    print('#{Cassandra.Keyspace.Name} was not created!',flush = True)\n    exit(1)\nelse:\n  print('Keyspace #{Cassandra.Keyspace.Name} already exists.',flush = True)"
-    },
-    "Parameters": [
-      {
-        "Id": "93076332-862f-44c5-b003-f8d6c9138d2b",
-        "Name": "Cassandra.Server.Name",
-        "Label": "Server Name",
-        "HelpText": "Hostname or IP address of the Cassandra database server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8abf47c6-eec5-428d-be90-4b4443295867",
-        "Name": "Cassandra.Server.Port",
-        "Label": "Port",
-        "HelpText": "Port number that the Cassandra server is listening on.",
-        "DefaultValue": "9042",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5630dc27-80d2-421c-bb99-a61b2e6bd439",
-        "Name": "Cassandra.User.Name",
-        "Label": "(Optional) Username",
-        "HelpText": "Username of the account that can create databases.  Leave blank if not using Username/Password authentication.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1e7e73db-ca36-4bd6-9c5a-3f49506c7adf",
-        "Name": "Cassandra.User.Password",
-        "Label": "(Optional) Password",
-        "HelpText": "Password for the user account that can create databases.  Leave blank if not using Username/Password authentication.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "484d22fc-4a84-4459-ac4e-166731432709",
-        "Name": "Cassandra.Server.Mode",
-        "Label": "Server mode",
-        "HelpText": "The mode in which the Cassandra server is operating.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "NetworkTopologyStrategy|Network Topology Strategy\nSimpleStrategy|Simple Strategy"
-        }
-      },
-      {
-        "Id": "b2c433be-66bb-4ee0-9246-59e62818b7bb",
-        "Name": "Cassandra.Keyspace.Name",
-        "Label": "Keyspace",
-        "HelpText": "Name of the Keyspace to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "73a696ca-26e3-4069-852a-3be63d5bd090",
-        "Name": "Cassandra.Replicas.Number",
-        "Label": "Number of replicas",
-        "HelpText": "The number of replicas to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2023-05-03T22:44:27.358Z",
-      "OctopusVersion": "2023.1.10046",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "cassandra"
-  }
diff --git a/tools/migration-prepare-step-template.js b/tools/migration-prepare-step-template.js
index e2ae84543..4933cc658 100644
--- a/tools/migration-prepare-step-template.js
+++ b/tools/migration-prepare-step-template.js
@@ -11,6 +11,7 @@ const {
   moveExtractedSidecarsIntoSource,
   normalizeTemplateName,
   repoRoot,
+  runPack,
   runUnpack,
   updateMetadataWithPlaceholders,
 } = require("./source-step-template-lib");
@@ -35,12 +36,13 @@ function prepareTemplate(templateName) {
 
   ensureDirectory(sourceDirectory);
 
+  runUnpack(normalizedName);
+  runPack(normalizedName);
+
   if (!fs.existsSync(legacyOrigPath)) {
     fs.copyFileSync(legacyJsonPath, legacyOrigPath);
   }
 
-  runUnpack(normalizedName);
-
   if (!fs.existsSync(metadataPath)) {
     gitMove(path.relative(repoRoot, legacyJsonPath), path.relative(repoRoot, metadataPath));
   }
diff --git a/tools/source-step-template-lib.js b/tools/source-step-template-lib.js
index d8f29aac4..02804e8e7 100644
--- a/tools/source-step-template-lib.js
+++ b/tools/source-step-template-lib.js
@@ -269,9 +269,18 @@ function moveExtractedSidecarsIntoSource(templateName) {
 function compareGeneratedToOrig(templateName) {
   const generatedPath = getLegacyJsonPath(templateName);
   const originalPath = getLegacyOrigPath(templateName);
-  const generatedBuffer = fs.readFileSync(generatedPath);
-  const originalBuffer = fs.readFileSync(originalPath);
-  return generatedBuffer.equals(originalBuffer);
+  const generated = readJson(generatedPath);
+  const original = readJson(originalPath);
+
+  if (generated.$Meta && original.$Meta) {
+    if (Object.prototype.hasOwnProperty.call(generated.$Meta, "ExportedAt") && Object.prototype.hasOwnProperty.call(original.$Meta, "ExportedAt")) {
+      original.$Meta.ExportedAt = generated.$Meta.ExportedAt;
+    }
+  }
+
+  const normalizedGenerated = `${JSON.stringify(generated, null, 2)}\n`;
+  const normalizedOriginal = `${JSON.stringify(original, null, 2)}\n`;
+  return normalizedGenerated === normalizedOriginal;
 }
 
 module.exports = {
@@ -293,6 +302,7 @@ module.exports = {
   placeholderPrefix,
   readJson,
   repoRoot,
+  runPack,
   runUnpack,
   scriptDefinitions,
   setPlaceholderValue,

From f9307678d82dff5740a4d5f127d7db73914aac02 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 00:05:14 -0700
Subject: [PATCH 06/21] fix: reload generated step-template data in dev

---
 app/services/LibraryDb.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/services/LibraryDb.js b/app/services/LibraryDb.js
index 3c9fd02a2..91d1ab632 100644
--- a/app/services/LibraryDb.js
+++ b/app/services/LibraryDb.js
@@ -1,12 +1,15 @@
 "use strict";
 
+import fs from "fs";
+import path from "path";
 import _ from "underscore";
 
-import StepTemplates from "./step-templates.json";
-
 class LibraryDb {
-  constructor() {
-    this._items = _.chain(StepTemplates.items)
+  loadTemplates() {
+    const templatePath = path.join(__dirname, "step-templates.json");
+    const stepTemplates = JSON.parse(fs.readFileSync(templatePath, "utf8"));
+
+    return _.chain(stepTemplates.items)
       .map(function (t) {
         if (t.Properties) {
           var script = t.Properties["Octopus.Action.Script.ScriptBody"];
@@ -41,16 +44,14 @@ class LibraryDb {
         return t.Name.toLowerCase();
       })
       .value();
-
-    this._all = _.indexBy(this._items, "Id");
   }
 
   list(cb) {
-    cb(null, this._items);
+    cb(null, this.loadTemplates());
   }
 
   get(id, cb) {
-    var item = this._all[id];
+    var item = _.indexBy(this.loadTemplates(), "Id")[id];
     cb(null, item);
   }
 }

From 3ba41549dba1284f711405ceadd1bbf70812d509 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 00:30:19 -0700
Subject: [PATCH 07/21] refactor: migrate step template batch 1 to src

---
 .../metadata.json                             |   4 +-
 .../scriptbody.ps1                            |  46 ++
 .../metadata.json                             |   6 +-
 .../scriptbody.ps1                            |  62 +++
 .../metadata.json                             |  84 +++
 .../scriptbody.ps1                            |  72 +++
 .../akamai-content-purge/metadata.json        | 139 +++++
 .../akamai-content-purge/scriptbody.ps1       | 226 ++++++++
 .../akamai-cpcode-fastpurge/metadata.json     | 106 ++++
 .../akamai-cpcode-fastpurge/scriptbody.ps1    | 168 ++++++
 .../akamai-fast-content-purge/metadata.json   | 108 ++++
 .../akamai-fast-content-purge/scriptbody.ps1  | 183 +++++++
 .../amazon-chime-post-message/metadata.json   |   6 +-
 .../amazon-chime-post-message/scriptbody.ps1  |  39 ++
 .../amazon-s3-upload/metadata.json            |   6 +-
 .../amazon-s3-upload/scriptbody.ps1           |  38 ++
 .../ansible-run-playbook/metadata.json        |   4 +-
 .../ansible-run-playbook/scriptbody.sh        |  14 +
 .../ansible-tower-run-template/metadata.json  | 174 ++++++
 .../ansible-tower-run-template/scriptbody.ps1 | 416 ++++++++++++++
 .../metadata.json                             |  84 +++
 .../scriptbody.ps1                            |  96 ++++
 .../metadata.json                             | 104 ++++
 .../scriptbody.ps1                            | 138 +++++
 .../apexsql-devops-toolkit-sync/metadata.json | 104 ++++
 .../scriptbody.ps1                            | 138 +++++
 .../metadata.json                             |   4 +-
 .../scriptbody.sh                             |  36 ++
 .../metadata.json                             |   4 +-
 .../scriptbody.sh                             |  39 ++
 .../metadata.json                             |  76 +++
 .../scriptbody.ps1                            |  80 +++
 .../metadata.json                             |  64 +++
 .../scriptbody.ps1                            | 135 +++++
 .../argo-argocd-app-get/metadata.json         |   4 +-
 .../argo-argocd-app-get/scriptbody.sh         |  44 ++
 .../metadata.json                             |   4 +-
 .../scriptbody.sh                             |  56 ++
 .../argo-argocd-app-set/metadata.json         |   4 +-
 .../argo-argocd-app-set/scriptbody.sh         |  56 ++
 .../argo-argocd-app-sync/metadata.json        |   4 +-
 .../argo-argocd-app-sync/scriptbody.sh        |  44 ++
 .../argo-argocd-app-wait/metadata.json        |   4 +-
 .../argo-argocd-app-wait/scriptbody.sh        |  44 ++
 .../argo-rollouts-get-rollout/metadata.json   |  45 ++
 .../argo-rollouts-get-rollout/scriptbody.ps1  | 171 ++++++
 .../argo-rollouts-pause/metadata.json         |  45 ++
 .../argo-rollouts-pause/scriptbody.ps1        | 160 ++++++
 .../argo-rollouts-promote/metadata.json       |  55 ++
 .../argo-rollouts-promote/scriptbody.ps1      | 167 ++++++
 .../argo-rollouts-set-image/metadata.json     |  79 +++
 .../argo-rollouts-set-image/scriptbody.ps1    | 164 ++++++
 .../argo-rollouts-status/metadata.json        |  55 ++
 .../argo-rollouts-status/scriptbody.ps1       | 231 ++++++++
 .../argo-rollouts-undo/metadata.json          |  55 ++
 .../argo-rollouts-undo/scriptbody.ps1         | 176 ++++++
 .../argo-workflow-submit/metadata.json        |   4 +-
 .../argo-workflow-submit/scriptbody.sh        |  48 ++
 .../aspnet-state-database/metadata.json       |   8 +-
 .../aspnet-state-database/scriptbody.ps1      |  18 +
 .../metadata.json                             |  54 ++
 .../scriptbody.ps1                            |  46 ++
 .../metadata.json                             |  59 ++
 .../scriptbody.ps1                            |  79 +++
 .../metadata.json                             |  75 +++
 .../scriptbody.ps1                            | 141 +++++
 .../metadata.json                             |   4 +-
 .../scriptbody.ps1                            |  16 +
 .../aws-add-remove-elbv2/metadata.json        | 104 ++++
 .../aws-add-remove-elbv2/scriptbody.ps1       | 132 +++++
 .../metadata.json                             |  79 +++
 .../scriptbody.ps1                            | 101 ++++
 .../metadata.json                             |  68 +++
 .../scriptbody.ps1                            | 114 ++++
 .../aws-cloudformation-create/metadata.json   | 170 ++++++
 .../aws-cloudformation-create/scriptbody.ps1  | 186 +++++++
 .../metadata.json                             |   4 +-
 .../scriptbody.ps1                            |  11 +
 .../aws-configure-lambda-alias/metadata.json  |   4 +-
 .../aws-configure-lambda-alias/scriptbody.ps1 | 132 +++++
 .../metadata.json                             | 121 +++++
 .../scriptbody.ps1                            | 273 ++++++++++
 .../aws-configure-lambda/metadata.json        |   6 +-
 .../aws-configure-lambda/scriptbody.ps1       | 273 ++++++++++
 .../metadata.json                             | 134 +++++
 .../scriptbody.ps1                            | 194 +++++++
 .../aws-create-a-security-group/metadata.json | 100 ++++
 .../scriptbody.ps1                            | 234 ++++++++
 .../aws-deploy-lambda-iam/metadata.json       |   4 +-
 .../aws-deploy-lambda-iam/scriptbody.ps1      | 240 ++++++++
 .../aws-deploy-lambda-image/metadata.json     | 236 ++++++++
 .../aws-deploy-lambda-image/scriptbody.ps1    | 264 +++++++++
 .../aws-deploy-lambda/metadata.json           | 234 ++++++++
 .../aws-deploy-lambda/scriptbody.ps1          | 235 ++++++++
 .../aws-deregister-elb-instance/metadata.json |  58 ++
 .../scriptbody.ps1                            |  57 ++
 .../aws-ec2-get-public-hostname/metadata.json |   6 +-
 .../scriptbody.ps1                            |   3 +
 .../metadata.json                             |   4 +-
 .../scriptbody.ps1                            |  65 +++
 .../aws-execute-powershell/metadata.json      |   6 +-
 .../aws-execute-powershell/scriptbody.ps1     |  39 ++
 .../aws-find-blue-green-asg/metadata.json     |   4 +-
 .../aws-find-blue-green-asg/scriptbody.sh     |  36 ++
 .../metadata.json                             |  90 +++
 .../scriptbody.sh                             |  90 +++
 .../metadata.json                             |  61 +++
 .../scriptbody.sh                             |  72 +++
 .../aws-lambda-create/metadata.json           |   8 +-
 .../aws-lambda-create/scriptbody.ps1          | 105 ++++
 .../aws-launch-ec2-instance/metadata.json     | 156 ++++++
 .../aws-launch-ec2-instance/scriptbody.ps1    | 292 ++++++++++
 .../aws-linux-install-tentacle/metadata.json  |   4 +-
 .../aws-linux-install-tentacle/scriptbody.ps1 | 142 +++++
 .../aws-rds-restore-s3/metadata.json          |  83 +++
 .../aws-rds-restore-s3/scriptbody.ps1         |  62 +++
 .../aws-rds-sql-backup-s3/metadata.json       |  83 +++
 .../aws-rds-sql-backup-s3/scriptbody.ps1      |  62 +++
 .../aws-register-elb-instance/metadata.json   |  76 +++
 .../aws-register-elb-instance/scriptbody.ps1  |  96 ++++
 .../metadata.json                             |  69 +++
 .../scriptbody.ps1                            | 198 +++++++
 .../metadata.json                             |   4 +-
 .../scriptbody.sh                             |  46 ++
 .../metadata.json                             |   4 +-
 .../scriptbody.sh                             |  68 +++
 .../metadata.json                             | 159 ++++++
 .../scriptbody.ps1                            | 138 +++++
 .../metadata.json                             | 123 +++++
 .../scriptbody.ps1                            |  69 +++
 .../metadata.json                             | 136 +++++
 .../scriptbody.ps1                            |  48 ++
 .../metadata.json                             | 126 +++++
 .../scriptbody.ps1                            |   8 +
 .../azure-administer-webjob/metadata.json     |   6 +-
 .../azure-administer-webjob/scriptbody.ps1    |   9 +
 .../metadata.json                             | 139 +++++
 .../scriptbody.ps1                            | 353 ++++++++++++
 .../azure-blob-storage-set-cors/metadata.json |   8 +-
 .../scriptbody.ps1                            |  32 ++
 .../azure-blob-storage-upload/metadata.json   |  75 +++
 .../azure-blob-storage-upload/scriptbody.ps1  | 120 ++++
 .../metadata.json                             | 102 ++++
 .../scriptbody.ps1                            | 300 ++++++++++
 .../metadata.json                             | 138 +++++
 .../scriptbody.ps1                            | 490 +++++++++++++++++
 .../metadata.json                             | 104 ++++
 .../scriptbody.ps1                            | 168 ++++++
 .../metadata.json                             |   6 +-
 .../scriptbody.sh                             |  41 ++
 .../bash-http-test-url/metadata.json          |   6 +-
 .../bash-http-test-url/scriptbody.sh          |  38 ++
 .../bash-service-check-running/metadata.json  |   6 +-
 .../bash-service-check-running/scriptbody.sh  |  25 +
 .../configure-spm-client/metadata.json        |   6 +-
 .../configure-spm-client/scriptbody.sh        |   9 +
 .../metadata.json                             |  95 ++++
 .../scriptbody.py                             | 124 +++++
 .../docker-install-linux/metadata.json        |   6 +-
 .../docker-install-linux/scriptbody.sh        |   5 +
 .../file-system-rclone/metadata.json          |  63 +++
 .../file-system-rclone/scriptbody.sh          |  24 +
 .../file-system-rsync/metadata.json           |  73 +++
 .../file-system-rsync/scriptbody.sh           |  15 +
 .../firebase-deploy/metadata.json             | 126 +++++
 .../firebase-deploy/scriptbody.sh             |  27 +
 .../github-create-repo/metadata.json          |  65 +++
 .../github-create-repo/scriptbody.py          | 259 +++++++++
 .../github-create-secret/metadata.json        |  75 +++
 .../github-create-secret/scriptbody.py        | 235 ++++++++
 .../github-fork-repo/metadata.json            | 115 ++++
 .../github-fork-repo/scriptbody.py            | 379 +++++++++++++
 .../github-push-yeoman-to-repo/metadata.json  | 118 ++++
 .../github-push-yeoman-to-repo/scriptbody.py  | 512 ++++++++++++++++++
 .../github-verify-attestation/metadata.json   | 111 ++++
 .../github-verify-attestation/scriptbody.sh   |  49 ++
 .../google-chat-send-message/metadata.json    |  45 ++
 .../google-chat-send-message/scriptbody.py    |  29 +
 .../metadata.json                             |   6 +-
 .../postdeploy.ps1                            |   6 +
 .../metadata.json                             |   6 +-
 .../scriptbody.py                             |  43 ++
 .../k8s-hpa-external-metrics/metadata.json    |   4 +-
 .../k8s-hpa-object-metrics/metadata.json      |   4 +-
 .../k8s-hpa-pod-metrics/metadata.json         |   4 +-
 .../k8s-hpa-resource-metrics/metadata.json    |   4 +-
 .../metadata.json                             |   2 +-
 .../octopus-ai-prompt/metadata.json           |  76 +++
 .../octopus-ai-prompt/scriptbody.py           | 123 +++++
 .../octopus-lookup-space-id/metadata.json     |  55 ++
 .../octopus-lookup-space-id/scriptbody.py     | 106 ++++
 .../metadata.json                             | 205 +++++++
 .../scriptbody.py                             | 464 ++++++++++++++++
 .../metadata.json                             |   4 +-
 .../postdeploy.ps1                            | 130 +++++
 .../add-server-to-azure-load-balancer.json    |  84 ---
 step-templates/akamai-content-purge.json      | 139 -----
 step-templates/akamai-cpcode-fastpurge.json   | 106 ----
 step-templates/akamai-fast-content-purge.json | 108 ----
 .../ansible-tower-run-template.json           | 174 ------
 .../apexsql-devops-toolkit-deploy.json        |  84 ---
 .../apexsql-devops-toolkit-sync-data.json     | 104 ----
 .../apexsql-devops-toolkit-sync.json          | 104 ----
 ...n-insights-annotate-release-with-rbac.json |  76 ---
 ...application-insights-annotate-release.json |  64 ---
 step-templates/argo-rollouts-get-rollout.json |  45 --
 step-templates/argo-rollouts-pause.json       |  45 --
 step-templates/argo-rollouts-promote.json     |  55 --
 step-templates/argo-rollouts-set-image.json   |  79 ---
 step-templates/argo-rollouts-status.json      |  55 --
 step-templates/argo-rollouts-undo.json        |  55 --
 ...pnetcore-set-environment-variable-iis.json |  54 --
 .../aspnetcore-set-environment-variable.json  |  59 --
 ...automate-manual-intervention-response.json |  75 ---
 step-templates/aws-add-remove-elbv2.json      | 104 ----
 .../aws-add-tags-to-ec2-instance.json         |  79 ---
 .../aws-change-ec2-instance-state.json        |  69 ---
 step-templates/aws-cloudformation-create.json | 170 ------
 ...figure-lambda-api-gateway-integration.json | 121 -----
 ...aws-create-a-route-53-resource-record.json | 134 -----
 .../aws-create-a-security-group.json          | 100 ----
 step-templates/aws-deploy-lambda-image.json   | 236 --------
 step-templates/aws-deploy-lambda.json         | 234 --------
 .../aws-deregister-elb-instance.json          |  58 --
 .../aws-find-blue-green-target-group.json     |  90 ---
 .../aws-initiate-instance-refresh.json        |  61 ---
 step-templates/aws-launch-ec2-instance.json   | 156 ------
 step-templates/aws-rds-restore-s3.json        |  83 ---
 step-templates/aws-rds-sql-backup-s3.json     |  83 ---
 step-templates/aws-register-elb-instance.json |  76 ---
 .../aws-secrets-manager-retrieve-secrets.json |  69 ---
 .../aws-windows-install-tentacle.json         | 159 ------
 ...pdate-azure-loadbalancer-health-probe.json | 123 -----
 ...add-or-update-azure-loadbalancer-rule.json | 136 -----
 ...dd-service-fabric-cluster-certificate.json | 126 -----
 .../azure-app-config-kv-retrieve-values.json  | 139 -----
 step-templates/azure-blob-storage-upload.json |  75 ---
 .../azure-capture-virtualmachine-image.json   | 102 ----
 .../azure-check-vmss-provision-status.json    | 138 -----
 ...azure-create-containerapp-environment.json | 104 ----
 ...k-secretsmanager-retrieve-secrets-jwt.json |  95 ----
 step-templates/file-system-rclone.json        |  63 ---
 step-templates/file-system-rsync.json         |  73 ---
 step-templates/firebase-deploy.json           | 126 -----
 step-templates/github-create-repo.json        |  65 ---
 step-templates/github-create-secret.json      |  75 ---
 step-templates/github-fork-repo.json          | 115 ----
 .../github-push-yeoman-to-repo.json           | 119 ----
 step-templates/github-verify-attestation.json | 112 ----
 step-templates/google-chat-send-message.json  |  45 --
 step-templates/octopus-ai-prompt.json         |  76 ---
 step-templates/octopus-lookup-space-id.json   |  55 --
 ...ctopus-serialize-project-to-terraform.json | 205 -------
 253 files changed, 17701 insertions(+), 5917 deletions(-)
 rename step-templates/Azure-Container-Copy-to-another-Container.json => src/step-templates/Azure-Container-Copy-to-another-Container/metadata.json (52%)
 create mode 100644 src/step-templates/Azure-Container-Copy-to-another-Container/scriptbody.ps1
 rename step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy.json => src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/metadata.json (55%)
 create mode 100644 src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/scriptbody.ps1
 create mode 100644 src/step-templates/add-server-to-azure-load-balancer/metadata.json
 create mode 100644 src/step-templates/add-server-to-azure-load-balancer/scriptbody.ps1
 create mode 100644 src/step-templates/akamai-content-purge/metadata.json
 create mode 100644 src/step-templates/akamai-content-purge/scriptbody.ps1
 create mode 100644 src/step-templates/akamai-cpcode-fastpurge/metadata.json
 create mode 100644 src/step-templates/akamai-cpcode-fastpurge/scriptbody.ps1
 create mode 100644 src/step-templates/akamai-fast-content-purge/metadata.json
 create mode 100644 src/step-templates/akamai-fast-content-purge/scriptbody.ps1
 rename step-templates/amazon-chime-post-message.json => src/step-templates/amazon-chime-post-message/metadata.json (52%)
 create mode 100644 src/step-templates/amazon-chime-post-message/scriptbody.ps1
 rename step-templates/amazon-s3-upload.json => src/step-templates/amazon-s3-upload/metadata.json (72%)
 create mode 100644 src/step-templates/amazon-s3-upload/scriptbody.ps1
 rename step-templates/ansible-run-playbook.json => src/step-templates/ansible-run-playbook/metadata.json (71%)
 create mode 100644 src/step-templates/ansible-run-playbook/scriptbody.sh
 create mode 100644 src/step-templates/ansible-tower-run-template/metadata.json
 create mode 100644 src/step-templates/ansible-tower-run-template/scriptbody.ps1
 create mode 100644 src/step-templates/apexsql-devops-toolkit-deploy/metadata.json
 create mode 100644 src/step-templates/apexsql-devops-toolkit-deploy/scriptbody.ps1
 create mode 100644 src/step-templates/apexsql-devops-toolkit-sync-data/metadata.json
 create mode 100644 src/step-templates/apexsql-devops-toolkit-sync-data/scriptbody.ps1
 create mode 100644 src/step-templates/apexsql-devops-toolkit-sync/metadata.json
 create mode 100644 src/step-templates/apexsql-devops-toolkit-sync/scriptbody.ps1
 rename step-templates/apollo-rover-check-subgraph-schema.json => src/step-templates/apollo-rover-check-subgraph-schema/metadata.json (67%)
 create mode 100644 src/step-templates/apollo-rover-check-subgraph-schema/scriptbody.sh
 rename step-templates/apollo-rover-publish-subgraph-schema.json => src/step-templates/apollo-rover-publish-subgraph-schema/metadata.json (66%)
 create mode 100644 src/step-templates/apollo-rover-publish-subgraph-schema/scriptbody.sh
 create mode 100644 src/step-templates/application-insights-annotate-release-with-rbac/metadata.json
 create mode 100644 src/step-templates/application-insights-annotate-release-with-rbac/scriptbody.ps1
 create mode 100644 src/step-templates/application-insights-annotate-release/metadata.json
 create mode 100644 src/step-templates/application-insights-annotate-release/scriptbody.ps1
 rename step-templates/argo-argocd-app-get.json => src/step-templates/argo-argocd-app-get/metadata.json (63%)
 create mode 100644 src/step-templates/argo-argocd-app-get/scriptbody.sh
 rename step-templates/argo-argocd-app-set-with-package.json => src/step-templates/argo-argocd-app-set-with-package/metadata.json (66%)
 create mode 100644 src/step-templates/argo-argocd-app-set-with-package/scriptbody.sh
 rename step-templates/argo-argocd-app-set.json => src/step-templates/argo-argocd-app-set/metadata.json (61%)
 create mode 100644 src/step-templates/argo-argocd-app-set/scriptbody.sh
 rename step-templates/argo-argocd-app-sync.json => src/step-templates/argo-argocd-app-sync/metadata.json (65%)
 create mode 100644 src/step-templates/argo-argocd-app-sync/scriptbody.sh
 rename step-templates/argo-argocd-app-wait.json => src/step-templates/argo-argocd-app-wait/metadata.json (65%)
 create mode 100644 src/step-templates/argo-argocd-app-wait/scriptbody.sh
 create mode 100644 src/step-templates/argo-rollouts-get-rollout/metadata.json
 create mode 100644 src/step-templates/argo-rollouts-get-rollout/scriptbody.ps1
 create mode 100644 src/step-templates/argo-rollouts-pause/metadata.json
 create mode 100644 src/step-templates/argo-rollouts-pause/scriptbody.ps1
 create mode 100644 src/step-templates/argo-rollouts-promote/metadata.json
 create mode 100644 src/step-templates/argo-rollouts-promote/scriptbody.ps1
 create mode 100644 src/step-templates/argo-rollouts-set-image/metadata.json
 create mode 100644 src/step-templates/argo-rollouts-set-image/scriptbody.ps1
 create mode 100644 src/step-templates/argo-rollouts-status/metadata.json
 create mode 100644 src/step-templates/argo-rollouts-status/scriptbody.ps1
 create mode 100644 src/step-templates/argo-rollouts-undo/metadata.json
 create mode 100644 src/step-templates/argo-rollouts-undo/scriptbody.ps1
 rename step-templates/argo-workflow-submit.json => src/step-templates/argo-workflow-submit/metadata.json (54%)
 create mode 100644 src/step-templates/argo-workflow-submit/scriptbody.sh
 rename step-templates/aspnet-state-database.json => src/step-templates/aspnet-state-database/metadata.json (76%)
 create mode 100644 src/step-templates/aspnet-state-database/scriptbody.ps1
 create mode 100644 src/step-templates/aspnetcore-set-environment-variable-iis/metadata.json
 create mode 100644 src/step-templates/aspnetcore-set-environment-variable-iis/scriptbody.ps1
 create mode 100644 src/step-templates/aspnetcore-set-environment-variable/metadata.json
 create mode 100644 src/step-templates/aspnetcore-set-environment-variable/scriptbody.ps1
 create mode 100644 src/step-templates/automate-manual-intervention-response/metadata.json
 create mode 100644 src/step-templates/automate-manual-intervention-response/scriptbody.ps1
 rename step-templates/aws-add-imagetag-to-all-used-ecr-packages.json => src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/metadata.json (65%)
 create mode 100644 src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/scriptbody.ps1
 create mode 100644 src/step-templates/aws-add-remove-elbv2/metadata.json
 create mode 100644 src/step-templates/aws-add-remove-elbv2/scriptbody.ps1
 create mode 100644 src/step-templates/aws-add-tags-to-ec2-instance/metadata.json
 create mode 100644 src/step-templates/aws-add-tags-to-ec2-instance/scriptbody.ps1
 create mode 100644 src/step-templates/aws-change-ec2-instance-state/metadata.json
 create mode 100644 src/step-templates/aws-change-ec2-instance-state/scriptbody.ps1
 create mode 100644 src/step-templates/aws-cloudformation-create/metadata.json
 create mode 100644 src/step-templates/aws-cloudformation-create/scriptbody.ps1
 rename step-templates/aws-cloudfront-invalidate-cache.json => src/step-templates/aws-cloudfront-invalidate-cache/metadata.json (74%)
 create mode 100644 src/step-templates/aws-cloudfront-invalidate-cache/scriptbody.ps1
 rename step-templates/aws-configure-lambda-alias.json => src/step-templates/aws-configure-lambda-alias/metadata.json (55%)
 create mode 100644 src/step-templates/aws-configure-lambda-alias/scriptbody.ps1
 create mode 100644 src/step-templates/aws-configure-lambda-api-gateway-integration/metadata.json
 create mode 100644 src/step-templates/aws-configure-lambda-api-gateway-integration/scriptbody.ps1
 rename step-templates/aws-configure-lambda.json => src/step-templates/aws-configure-lambda/metadata.json (55%)
 create mode 100644 src/step-templates/aws-configure-lambda/scriptbody.ps1
 create mode 100644 src/step-templates/aws-create-a-route-53-resource-record/metadata.json
 create mode 100644 src/step-templates/aws-create-a-route-53-resource-record/scriptbody.ps1
 create mode 100644 src/step-templates/aws-create-a-security-group/metadata.json
 create mode 100644 src/step-templates/aws-create-a-security-group/scriptbody.ps1
 rename step-templates/aws-deploy-lambda-iam.json => src/step-templates/aws-deploy-lambda-iam/metadata.json (57%)
 create mode 100644 src/step-templates/aws-deploy-lambda-iam/scriptbody.ps1
 create mode 100644 src/step-templates/aws-deploy-lambda-image/metadata.json
 create mode 100644 src/step-templates/aws-deploy-lambda-image/scriptbody.ps1
 create mode 100644 src/step-templates/aws-deploy-lambda/metadata.json
 create mode 100644 src/step-templates/aws-deploy-lambda/scriptbody.ps1
 create mode 100644 src/step-templates/aws-deregister-elb-instance/metadata.json
 create mode 100644 src/step-templates/aws-deregister-elb-instance/scriptbody.ps1
 rename step-templates/aws-ec2-get-public-hostname.json => src/step-templates/aws-ec2-get-public-hostname/metadata.json (69%)
 create mode 100644 src/step-templates/aws-ec2-get-public-hostname/scriptbody.ps1
 rename step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy.json => src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/metadata.json (54%)
 create mode 100644 src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/scriptbody.ps1
 rename step-templates/aws-execute-powershell.json => src/step-templates/aws-execute-powershell/metadata.json (57%)
 create mode 100644 src/step-templates/aws-execute-powershell/scriptbody.ps1
 rename step-templates/aws-find-blue-green-asg.json => src/step-templates/aws-find-blue-green-asg/metadata.json (69%)
 create mode 100644 src/step-templates/aws-find-blue-green-asg/scriptbody.sh
 create mode 100644 src/step-templates/aws-find-blue-green-target-group/metadata.json
 create mode 100644 src/step-templates/aws-find-blue-green-target-group/scriptbody.sh
 create mode 100644 src/step-templates/aws-initiate-instance-refresh/metadata.json
 create mode 100644 src/step-templates/aws-initiate-instance-refresh/scriptbody.sh
 rename step-templates/aws-lambda-create.json => src/step-templates/aws-lambda-create/metadata.json (53%)
 create mode 100644 src/step-templates/aws-lambda-create/scriptbody.ps1
 create mode 100644 src/step-templates/aws-launch-ec2-instance/metadata.json
 create mode 100644 src/step-templates/aws-launch-ec2-instance/scriptbody.ps1
 rename step-templates/aws-linux-install-tentacle.json => src/step-templates/aws-linux-install-tentacle/metadata.json (52%)
 create mode 100644 src/step-templates/aws-linux-install-tentacle/scriptbody.ps1
 create mode 100644 src/step-templates/aws-rds-restore-s3/metadata.json
 create mode 100644 src/step-templates/aws-rds-restore-s3/scriptbody.ps1
 create mode 100644 src/step-templates/aws-rds-sql-backup-s3/metadata.json
 create mode 100644 src/step-templates/aws-rds-sql-backup-s3/scriptbody.ps1
 create mode 100644 src/step-templates/aws-register-elb-instance/metadata.json
 create mode 100644 src/step-templates/aws-register-elb-instance/scriptbody.ps1
 create mode 100644 src/step-templates/aws-secrets-manager-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/aws-secrets-manager-retrieve-secrets/scriptbody.ps1
 rename step-templates/aws-set-blue-green-target-group.json => src/step-templates/aws-set-blue-green-target-group/metadata.json (66%)
 create mode 100644 src/step-templates/aws-set-blue-green-target-group/scriptbody.sh
 rename step-templates/aws-update-launch-template-ami.json => src/step-templates/aws-update-launch-template-ami/metadata.json (50%)
 create mode 100644 src/step-templates/aws-update-launch-template-ami/scriptbody.sh
 create mode 100644 src/step-templates/aws-windows-install-tentacle/metadata.json
 create mode 100644 src/step-templates/aws-windows-install-tentacle/scriptbody.ps1
 create mode 100644 src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/metadata.json
 create mode 100644 src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/scriptbody.ps1
 create mode 100644 src/step-templates/azure-add-or-update-azure-loadbalancer-rule/metadata.json
 create mode 100644 src/step-templates/azure-add-or-update-azure-loadbalancer-rule/scriptbody.ps1
 create mode 100644 src/step-templates/azure-add-service-fabric-cluster-certificate/metadata.json
 create mode 100644 src/step-templates/azure-add-service-fabric-cluster-certificate/scriptbody.ps1
 rename step-templates/azure-administer-webjob.json => src/step-templates/azure-administer-webjob/metadata.json (79%)
 create mode 100644 src/step-templates/azure-administer-webjob/scriptbody.ps1
 create mode 100644 src/step-templates/azure-app-config-kv-retrieve-values/metadata.json
 create mode 100644 src/step-templates/azure-app-config-kv-retrieve-values/scriptbody.ps1
 rename step-templates/azure-blob-storage-set-cors.json => src/step-templates/azure-blob-storage-set-cors/metadata.json (71%)
 create mode 100644 src/step-templates/azure-blob-storage-set-cors/scriptbody.ps1
 create mode 100644 src/step-templates/azure-blob-storage-upload/metadata.json
 create mode 100644 src/step-templates/azure-blob-storage-upload/scriptbody.ps1
 create mode 100644 src/step-templates/azure-capture-virtualmachine-image/metadata.json
 create mode 100644 src/step-templates/azure-capture-virtualmachine-image/scriptbody.ps1
 create mode 100644 src/step-templates/azure-check-vmss-provision-status/metadata.json
 create mode 100644 src/step-templates/azure-check-vmss-provision-status/scriptbody.ps1
 create mode 100644 src/step-templates/azure-create-containerapp-environment/metadata.json
 create mode 100644 src/step-templates/azure-create-containerapp-environment/scriptbody.ps1
 rename step-templates/bash-check-net-core-framework-version.json => src/step-templates/bash-check-net-core-framework-version/metadata.json (56%)
 create mode 100644 src/step-templates/bash-check-net-core-framework-version/scriptbody.sh
 rename step-templates/bash-http-test-url.json => src/step-templates/bash-http-test-url/metadata.json (58%)
 create mode 100644 src/step-templates/bash-http-test-url/scriptbody.sh
 rename step-templates/bash-service-check-running.json => src/step-templates/bash-service-check-running/metadata.json (63%)
 create mode 100644 src/step-templates/bash-service-check-running/scriptbody.sh
 rename step-templates/configure-spm-client.json => src/step-templates/configure-spm-client/metadata.json (79%)
 create mode 100644 src/step-templates/configure-spm-client/scriptbody.sh
 create mode 100644 src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/metadata.json
 create mode 100644 src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/scriptbody.py
 rename step-templates/docker-install-linux.json => src/step-templates/docker-install-linux/metadata.json (77%)
 create mode 100644 src/step-templates/docker-install-linux/scriptbody.sh
 create mode 100644 src/step-templates/file-system-rclone/metadata.json
 create mode 100644 src/step-templates/file-system-rclone/scriptbody.sh
 create mode 100644 src/step-templates/file-system-rsync/metadata.json
 create mode 100644 src/step-templates/file-system-rsync/scriptbody.sh
 create mode 100644 src/step-templates/firebase-deploy/metadata.json
 create mode 100644 src/step-templates/firebase-deploy/scriptbody.sh
 create mode 100644 src/step-templates/github-create-repo/metadata.json
 create mode 100644 src/step-templates/github-create-repo/scriptbody.py
 create mode 100644 src/step-templates/github-create-secret/metadata.json
 create mode 100644 src/step-templates/github-create-secret/scriptbody.py
 create mode 100644 src/step-templates/github-fork-repo/metadata.json
 create mode 100644 src/step-templates/github-fork-repo/scriptbody.py
 create mode 100644 src/step-templates/github-push-yeoman-to-repo/metadata.json
 create mode 100644 src/step-templates/github-push-yeoman-to-repo/scriptbody.py
 create mode 100644 src/step-templates/github-verify-attestation/metadata.json
 create mode 100644 src/step-templates/github-verify-attestation/scriptbody.sh
 create mode 100644 src/step-templates/google-chat-send-message/metadata.json
 create mode 100644 src/step-templates/google-chat-send-message/scriptbody.py
 rename step-templates/hydra-update-octopus-tentacle.json => src/step-templates/hydra-update-octopus-tentacle/metadata.json (80%)
 create mode 100644 src/step-templates/hydra-update-octopus-tentacle/postdeploy.ps1
 rename step-templates/json-validate-format-and-schema.json => src/step-templates/json-validate-format-and-schema/metadata.json (56%)
 create mode 100644 src/step-templates/json-validate-format-and-schema/scriptbody.py
 rename step-templates/k8s-hpa-external-metrics.json => src/step-templates/k8s-hpa-external-metrics/metadata.json (98%)
 rename step-templates/k8s-hpa-object-metrics.json => src/step-templates/k8s-hpa-object-metrics/metadata.json (98%)
 rename step-templates/k8s-hpa-pod-metrics.json => src/step-templates/k8s-hpa-pod-metrics/metadata.json (98%)
 rename step-templates/k8s-hpa-resource-metrics.json => src/step-templates/k8s-hpa-resource-metrics/metadata.json (98%)
 rename step-templates/octopus-add-runbook-to-project.json => src/step-templates/octopus-add-runbook-to-project/metadata.json (99%)
 create mode 100644 src/step-templates/octopus-ai-prompt/metadata.json
 create mode 100644 src/step-templates/octopus-ai-prompt/scriptbody.py
 create mode 100644 src/step-templates/octopus-lookup-space-id/metadata.json
 create mode 100644 src/step-templates/octopus-lookup-space-id/scriptbody.py
 create mode 100644 src/step-templates/octopus-serialize-project-to-terraform/metadata.json
 create mode 100644 src/step-templates/octopus-serialize-project-to-terraform/scriptbody.py
 rename step-templates/redgate-oracle-create-release.json => src/step-templates/redgate-oracle-create-release/metadata.json (60%)
 create mode 100644 src/step-templates/redgate-oracle-create-release/postdeploy.ps1
 delete mode 100644 step-templates/add-server-to-azure-load-balancer.json
 delete mode 100644 step-templates/akamai-content-purge.json
 delete mode 100644 step-templates/akamai-cpcode-fastpurge.json
 delete mode 100644 step-templates/akamai-fast-content-purge.json
 delete mode 100644 step-templates/ansible-tower-run-template.json
 delete mode 100644 step-templates/apexsql-devops-toolkit-deploy.json
 delete mode 100644 step-templates/apexsql-devops-toolkit-sync-data.json
 delete mode 100644 step-templates/apexsql-devops-toolkit-sync.json
 delete mode 100644 step-templates/application-insights-annotate-release-with-rbac.json
 delete mode 100644 step-templates/application-insights-annotate-release.json
 delete mode 100644 step-templates/argo-rollouts-get-rollout.json
 delete mode 100644 step-templates/argo-rollouts-pause.json
 delete mode 100644 step-templates/argo-rollouts-promote.json
 delete mode 100644 step-templates/argo-rollouts-set-image.json
 delete mode 100644 step-templates/argo-rollouts-status.json
 delete mode 100644 step-templates/argo-rollouts-undo.json
 delete mode 100644 step-templates/aspnetcore-set-environment-variable-iis.json
 delete mode 100644 step-templates/aspnetcore-set-environment-variable.json
 delete mode 100644 step-templates/automate-manual-intervention-response.json
 delete mode 100644 step-templates/aws-add-remove-elbv2.json
 delete mode 100644 step-templates/aws-add-tags-to-ec2-instance.json
 delete mode 100644 step-templates/aws-change-ec2-instance-state.json
 delete mode 100644 step-templates/aws-cloudformation-create.json
 delete mode 100644 step-templates/aws-configure-lambda-api-gateway-integration.json
 delete mode 100644 step-templates/aws-create-a-route-53-resource-record.json
 delete mode 100644 step-templates/aws-create-a-security-group.json
 delete mode 100644 step-templates/aws-deploy-lambda-image.json
 delete mode 100644 step-templates/aws-deploy-lambda.json
 delete mode 100644 step-templates/aws-deregister-elb-instance.json
 delete mode 100644 step-templates/aws-find-blue-green-target-group.json
 delete mode 100644 step-templates/aws-initiate-instance-refresh.json
 delete mode 100644 step-templates/aws-launch-ec2-instance.json
 delete mode 100644 step-templates/aws-rds-restore-s3.json
 delete mode 100644 step-templates/aws-rds-sql-backup-s3.json
 delete mode 100644 step-templates/aws-register-elb-instance.json
 delete mode 100644 step-templates/aws-secrets-manager-retrieve-secrets.json
 delete mode 100644 step-templates/aws-windows-install-tentacle.json
 delete mode 100644 step-templates/azure-add-or-update-azure-loadbalancer-health-probe.json
 delete mode 100644 step-templates/azure-add-or-update-azure-loadbalancer-rule.json
 delete mode 100644 step-templates/azure-add-service-fabric-cluster-certificate.json
 delete mode 100644 step-templates/azure-app-config-kv-retrieve-values.json
 delete mode 100644 step-templates/azure-blob-storage-upload.json
 delete mode 100644 step-templates/azure-capture-virtualmachine-image.json
 delete mode 100644 step-templates/azure-check-vmss-provision-status.json
 delete mode 100644 step-templates/azure-create-containerapp-environment.json
 delete mode 100644 step-templates/cyberark-secretsmanager-retrieve-secrets-jwt.json
 delete mode 100644 step-templates/file-system-rclone.json
 delete mode 100644 step-templates/file-system-rsync.json
 delete mode 100644 step-templates/firebase-deploy.json
 delete mode 100644 step-templates/github-create-repo.json
 delete mode 100644 step-templates/github-create-secret.json
 delete mode 100644 step-templates/github-fork-repo.json
 delete mode 100644 step-templates/github-push-yeoman-to-repo.json
 delete mode 100644 step-templates/github-verify-attestation.json
 delete mode 100644 step-templates/google-chat-send-message.json
 delete mode 100644 step-templates/octopus-ai-prompt.json
 delete mode 100644 step-templates/octopus-lookup-space-id.json
 delete mode 100644 step-templates/octopus-serialize-project-to-terraform.json

diff --git a/step-templates/Azure-Container-Copy-to-another-Container.json b/src/step-templates/Azure-Container-Copy-to-another-Container/metadata.json
similarity index 52%
rename from step-templates/Azure-Container-Copy-to-another-Container.json
rename to src/step-templates/Azure-Container-Copy-to-another-Container/metadata.json
index 245f161a0..67ceaaed0 100644
--- a/step-templates/Azure-Container-Copy-to-another-Container.json
+++ b/src/step-templates/Azure-Container-Copy-to-another-Container/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# Define the source storage account and context\n$SourceStorageAccountName = $OctopusParameters['SourceStorageAccountName'];\n$SourceStorageAccountKey = $OctopusParameters['SourceStorageAccountKey'];\n$SourceContainerName = $OctopusParameters['SourceContainerName'];\n$SourceContext = New-AzureStorageContext -StorageAccountName $SourceStorageAccountName -StorageAccountKey $SourceStorageAccountKey\n$SourceBlobPrefix = $OctopusParameters['SourceBlobPrefix'];\n\n# Define the destination storage account and context\n$DestinationStorageAccountName = $OctopusParameters['DestinationStorageAccountName'];\n$DestinationStorageAccountKey = $OctopusParameters['DestinationStorageAccountKey'];\n$DestinationContainerName = $OctopusParameters['DestinationContainerName'];\n$DestinationContext = New-AzureStorageContext -StorageAccountName $DestinationStorageAccountName -StorageAccountKey $DestinationStorageAccountKey\n$DestinationBlobPrefix = $OctopusParameters['DestinationBlobPrefix'];\n\n# Check if container exists, otherwise create it\n$isContainerExist = Get-AzureStorageContainer -Context $DestinationContext | Where-Object { $_.Name -eq $DestinationContainerName }\nif($isContainerExist -eq $null)\n{\n    New-AzureStorageContainer -Name $DestinationContainerName -Context $DestinationContext\n}\n\n# Get a reference to blobs in the source container\n$blobs = $null\nif ($SourceBlobPrefix -eq $null) {\n    $blobs = Get-AzureStorageBlob -Container $SourceContainerName -Context $SourceContext\n}\nelse {\n    $blobs = Get-AzureStorageBlob -Container $SourceContainerName -Context $SourceContext -Prefix $SourceBlobPrefix\n}\n\n# Copy blobs from one container to another\nif ($DestinationBlobPrefix -eq $null) {\n\t$blobs | Start-AzureStorageBlobCopy -DestContainer $DestinationContainerName -DestContext $DestinationContext\n}\nelse {\n\t$uri = $SourceContext.BlobEndPoint + $SourceContainerName +\"/\" \n\t$blobs | ForEach-Object `\n    \t{ Start-AzureStorageBlobCopy `\n\t        -SrcUri \"$uri$($_.Name)\" `\n            -Context $SourceContext `\n\t        -DestContext $DestinationContext `\n\t        -DestContainer $DestinationContainerName `\n\t        -DestBlob \"$DestinationBlobPrefix/$($_.Name)\" `\n\t    } \n}\n    ",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.NuGetFeedId": null,
     "Octopus.Action.Package.NuGetPackageId": null
@@ -88,7 +88,7 @@
   ],
   "LastModifiedBy": "ahmedig",
   "$Meta": {
-    "ExportedAt": "2016-05-12T03:09:48.287+00:00",
+    "ExportedAt": "2016-05-11T20:09:48.2870000-07:00",
     "OctopusVersion": "3.3.9",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/Azure-Container-Copy-to-another-Container/scriptbody.ps1 b/src/step-templates/Azure-Container-Copy-to-another-Container/scriptbody.ps1
new file mode 100644
index 000000000..56cc90748
--- /dev/null
+++ b/src/step-templates/Azure-Container-Copy-to-another-Container/scriptbody.ps1
@@ -0,0 +1,46 @@
+# Define the source storage account and context
+$SourceStorageAccountName = $OctopusParameters['SourceStorageAccountName'];
+$SourceStorageAccountKey = $OctopusParameters['SourceStorageAccountKey'];
+$SourceContainerName = $OctopusParameters['SourceContainerName'];
+$SourceContext = New-AzureStorageContext -StorageAccountName $SourceStorageAccountName -StorageAccountKey $SourceStorageAccountKey
+$SourceBlobPrefix = $OctopusParameters['SourceBlobPrefix'];
+
+# Define the destination storage account and context
+$DestinationStorageAccountName = $OctopusParameters['DestinationStorageAccountName'];
+$DestinationStorageAccountKey = $OctopusParameters['DestinationStorageAccountKey'];
+$DestinationContainerName = $OctopusParameters['DestinationContainerName'];
+$DestinationContext = New-AzureStorageContext -StorageAccountName $DestinationStorageAccountName -StorageAccountKey $DestinationStorageAccountKey
+$DestinationBlobPrefix = $OctopusParameters['DestinationBlobPrefix'];
+
+# Check if container exists, otherwise create it
+$isContainerExist = Get-AzureStorageContainer -Context $DestinationContext | Where-Object { $_.Name -eq $DestinationContainerName }
+if($isContainerExist -eq $null)
+{
+    New-AzureStorageContainer -Name $DestinationContainerName -Context $DestinationContext
+}
+
+# Get a reference to blobs in the source container
+$blobs = $null
+if ($SourceBlobPrefix -eq $null) {
+    $blobs = Get-AzureStorageBlob -Container $SourceContainerName -Context $SourceContext
+}
+else {
+    $blobs = Get-AzureStorageBlob -Container $SourceContainerName -Context $SourceContext -Prefix $SourceBlobPrefix
+}
+
+# Copy blobs from one container to another
+if ($DestinationBlobPrefix -eq $null) {
+	$blobs | Start-AzureStorageBlobCopy -DestContainer $DestinationContainerName -DestContext $DestinationContext
+}
+else {
+	$uri = $SourceContext.BlobEndPoint + $SourceContainerName +"/" 
+	$blobs | ForEach-Object `
+    	{ Start-AzureStorageBlobCopy `
+	        -SrcUri "$uri$($_.Name)" `
+            -Context $SourceContext `
+	        -DestContext $DestinationContext `
+	        -DestContainer $DestinationContainerName `
+	        -DestBlob "$DestinationBlobPrefix/$($_.Name)" `
+	    } 
+}
+    
\ No newline at end of file
diff --git a/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy.json b/src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/metadata.json
similarity index 55%
rename from step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy.json
rename to src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/metadata.json
index fcfb31298..5cdccc0ba 100644
--- a/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy.json
+++ b/src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$SourceStorageAccountName = $OctopusParameters['SourceStorageAccountName'];\r\n$SourceStorageAccountKey = $OctopusParameters['SourceStorageAccountKey'];\r\n$DestinationStorageAccountName = $OctopusParameters['DestinationStorageAccountName'];\r\n$DestinationStorageAccountKey = $OctopusParameters['DestinationStorageAccountKey'];\r\n$ContainersIncluded = $OctopusParameters['ContainersIncluded'];\r\n$ContainersExcluded = $OctopusParameters['ContainersExcluded'];\r\n\r\n$AzCopy = Join-Path ${env:ProgramFiles(x86)} \"Microsoft SDKs\\Azure\\AzCopy\\AzCopy.exe\"\r\n\r\nfunction AzCopyContainer($containerName)\r\n{\r\n    &$AzCopy /Source:http://$($SourceStorageAccountName).blob.core.windows.net/$containerName `\r\n\t/Dest:http://$($DestinationStorageAccountName).blob.core.windows.net/$containerName `\r\n\t/SourceKey:$SourceStorageAccountKey `\r\n\t/DestKey:$DestinationStorageAccountKey `\r\n\t/S /XO /XN /V | Out-Host\r\n}\r\n\r\n# List all Containers\r\n$ctx = New-AzureStorageContext -StorageAccountName $SourceStorageAccountName -StorageAccountKey $SourceStorageAccountKey\r\n$containers = Get-AzureStorageContainer -Context $ctx\r\n\r\n\t\r\n# If Containers Included is there  => Copy Included Only \r\nif($ContainersIncluded)\r\n{\r\n\t# Parse the Included list\r\n\t$ContainersIncluded.Split(\",\") | foreach {\r\n\t\tAzCopyContainer $_\r\n\t}\r\n}\r\n\r\n# If Containers Excluded is there, and no Included => Copy all except excluded\r\nelseif(!$ContainersIncluded -and $ContainersExcluded)\r\n{\r\n\t#Parse the exclusion list\r\n\t[Collections.Generic.List[String]]$lst = $ContainersExcluded.Split(\",\")\r\n\r\n\t# Loop through all the containers, and\r\n\tforeach ($container in $containers) \r\n\t{\r\n\t\tif($lst.Contains($container.Name)) {\r\n\t\t\tcontinue\r\n\t\t}\r\n\t\telse \r\n\t\t{\r\n\t\t\t$containerName = $container.Name\r\n            AzCopyContainer $containerName\r\n\t\t}\r\n\t} \r\n}\r\n\r\n# Copy all containers\r\nelse\r\n{\r\n\t# Loop through all the containers, and\r\n\tforeach ($container in $containers) \r\n\t{\r\n\t\t$containerName = $container.Name\r\n        AzCopyContainer $containerName\r\n\t} \r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.NuGetFeedId": null,
     "Octopus.Action.Package.NuGetPackageId": null
@@ -70,9 +70,9 @@
   ],
   "LastModifiedBy": "ahmedig",
   "$Meta": {
-    "ExportedAt": "2016-07-24T12:55:38.909+00:00",
+    "ExportedAt": "2016-07-24T05:55:38.9090000-07:00",
     "OctopusVersion": "3.3.22",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/scriptbody.ps1 b/src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/scriptbody.ps1
new file mode 100644
index 000000000..7da79a2ba
--- /dev/null
+++ b/src/step-templates/Azure-CopySelectiveStorageAccountContainersUsingAZCopy/scriptbody.ps1
@@ -0,0 +1,62 @@
+$SourceStorageAccountName = $OctopusParameters['SourceStorageAccountName'];
+$SourceStorageAccountKey = $OctopusParameters['SourceStorageAccountKey'];
+$DestinationStorageAccountName = $OctopusParameters['DestinationStorageAccountName'];
+$DestinationStorageAccountKey = $OctopusParameters['DestinationStorageAccountKey'];
+$ContainersIncluded = $OctopusParameters['ContainersIncluded'];
+$ContainersExcluded = $OctopusParameters['ContainersExcluded'];
+
+$AzCopy = Join-Path ${env:ProgramFiles(x86)} "Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+
+function AzCopyContainer($containerName)
+{
+    &$AzCopy /Source:http://$($SourceStorageAccountName).blob.core.windows.net/$containerName `
+	/Dest:http://$($DestinationStorageAccountName).blob.core.windows.net/$containerName `
+	/SourceKey:$SourceStorageAccountKey `
+	/DestKey:$DestinationStorageAccountKey `
+	/S /XO /XN /V | Out-Host
+}
+
+# List all Containers
+$ctx = New-AzureStorageContext -StorageAccountName $SourceStorageAccountName -StorageAccountKey $SourceStorageAccountKey
+$containers = Get-AzureStorageContainer -Context $ctx
+
+	
+# If Containers Included is there  => Copy Included Only 
+if($ContainersIncluded)
+{
+	# Parse the Included list
+	$ContainersIncluded.Split(",") | foreach {
+		AzCopyContainer $_
+	}
+}
+
+# If Containers Excluded is there, and no Included => Copy all except excluded
+elseif(!$ContainersIncluded -and $ContainersExcluded)
+{
+	#Parse the exclusion list
+	[Collections.Generic.List[String]]$lst = $ContainersExcluded.Split(",")
+
+	# Loop through all the containers, and
+	foreach ($container in $containers) 
+	{
+		if($lst.Contains($container.Name)) {
+			continue
+		}
+		else 
+		{
+			$containerName = $container.Name
+            AzCopyContainer $containerName
+		}
+	} 
+}
+
+# Copy all containers
+else
+{
+	# Loop through all the containers, and
+	foreach ($container in $containers) 
+	{
+		$containerName = $container.Name
+        AzCopyContainer $containerName
+	} 
+}
\ No newline at end of file
diff --git a/src/step-templates/add-server-to-azure-load-balancer/metadata.json b/src/step-templates/add-server-to-azure-load-balancer/metadata.json
new file mode 100644
index 000000000..dde5e8b1b
--- /dev/null
+++ b/src/step-templates/add-server-to-azure-load-balancer/metadata.json
@@ -0,0 +1,84 @@
+{
+  "Id": "540de6f6-f1c6-4e1c-9062-9e78570074f6",
+  "Name": "Add Server to Azure Load Balancer",
+  "Description": "Uses Service Principal to Add Server to Azure Load Balancer.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{psbilbAzureAccount}",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "Parameters": [
+    {
+      "Id": "85e7fd91-8976-415a-82b7-1303e150b447",
+      "Name": "psbilbAzureAccount",
+      "Label": "Azure Account",
+      "HelpText": "Service Principal used to connect to Azure",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "e494b221-0b8e-4f02-84f1-079199e9f4b4",
+      "Name": "psbilbAzureSubscription",
+      "Label": "Azure Subscription",
+      "HelpText": "Subscription Load Balancer belongs to. Eg. 00000000-0000-0000-0000-000000000000",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4e0b35a8-c9f7-49e0-b9d2-e8121cf589af",
+      "Name": "psbilbAzureResourceGroup",
+      "Label": "Azure Resource Group",
+      "HelpText": "Resource Group Load Balancer belongs to. Eg. ProductionAus",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "44dfd700-28eb-463c-923a-58cc5ab76eb0",
+      "Name": "psbilbAzureMachineName",
+      "Label": "Azure Machine Name",
+      "HelpText": "Name of Virtual Machine to add to Load Balancer. Eg Web01",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "337bb455-a17c-4251-9543-26cb9ffd7087",
+      "Name": "psbilbAzureLoadBalancer",
+      "Label": "Azure Load Balancer",
+      "HelpText": "Name of Load Balancer. Eg. LoadBalacer01",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0162154d-83ac-41ca-bd6d-8f983187eccd",
+      "Name": "psbilbAzureLoadBalancerBackEndPoolName",
+      "Label": "Azure Load Balancer Back End Pool Name",
+      "HelpText": "Name of Backend Pool on Azure Load Balancer. Eg. WebServers",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-22T10:39:16.4500000Z",
+    "OctopusVersion": "2020.2.8",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "Azure"
+}
diff --git a/src/step-templates/add-server-to-azure-load-balancer/scriptbody.ps1 b/src/step-templates/add-server-to-azure-load-balancer/scriptbody.ps1
new file mode 100644
index 000000000..b73499ba1
--- /dev/null
+++ b/src/step-templates/add-server-to-azure-load-balancer/scriptbody.ps1
@@ -0,0 +1,72 @@
+#region Verify variables
+
+#Verify psbilbAzureSubscription is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureSubscription']))
+{
+  Throw 'Azure Subscription cannot be null.'
+}
+$azureSubscription = $OctopusParameters['psbilbAzureSubscription']
+Write-Host ('Azure Subscription: ' + $azureSubscription)
+
+#Verify psbilbAzureResourceGroup is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureResourceGroup']))
+{
+  Throw 'Azure Resource Group cannot be null.'
+}
+$azureResourceGroup = $OctopusParameters['psbilbAzureResourceGroup']
+Write-Host ('Azure Resource Group: ' + $azureResourceGroup)
+
+#Verify psbilbAzureMachineName is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureMachineName']))
+{
+  Throw 'Azure Machine Name cannot be null.'
+}
+$azureMachineName = $OctopusParameters['psbilbAzureMachineName']
+Write-Host ('Azure Machine Name: ' + $azureMachineName)
+
+#Verify psbilbAzureLoadBalancer is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureLoadBalancer']))
+{
+  Throw 'Azure Load Balancer cannot be null.'
+}
+$azureLoadBalancer = $OctopusParameters['psbilbAzureLoadBalancer']
+Write-Host ('Azure Load Balancer: ' + $azureLoadBalancer)
+
+#Verify psbilbAzureLoadBalancerBackEndPoolName is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureLoadBalancerBackEndPoolName']))
+{
+  Throw 'Azure Load Balancer Backend Pool Name cannot be null.'
+}
+$azureLoadBalancerBackendPoolName = $OctopusParameters['psbilbAzureLoadBalancerBackEndPoolName']
+Write-Host ('Azure Load Balancer Backend Pool Name: ' + $azureLoadBalancerBackendPoolName)
+
+#endregion
+
+#region Process
+
+Set-AzureRmContext -SubscriptionName $azureSubscription
+
+$azureVM = Get-AzureRmVM -ResourceGroupName $azureResourceGroup -Name $azureMachineName
+If (!$azureVM)
+{
+  Throw 'Could not retrieve server from Azure needed to remove from Load Balancer.'
+}
+
+$nic = (Get-AzureRmNetworkInterface -ResourceGroupName $azureResourceGroup | Where-Object {$_.VirtualMachine.Id -eq $azureVM.Id})
+If (!$nic)
+{
+  Throw 'Could not retrieve NIC from Azure needed to remove from Load Balancer.'
+}
+
+$loadBalancer = Get-AzureRmLoadBalancer -Name $azureLoadBalancer -ResourceGroupName $azureResourceGroup
+If (!$loadBalancer)
+{
+  Throw 'Could not retrieve Load Balancer info from Azure.'
+}
+
+$ap = Get-AzureRmLoadBalancerBackendAddressPoolConfig -Name #{psbilbAzureLoadBalancerBackEndPoolName} -LoadBalancer $loadBalancer
+
+$nic.IpConfigurations[0].LoadBalancerBackendAddressPools = $ap
+$nic | Set-AzureRmNetworkInterface
+
+#endregion
diff --git a/src/step-templates/akamai-content-purge/metadata.json b/src/step-templates/akamai-content-purge/metadata.json
new file mode 100644
index 000000000..19288a351
--- /dev/null
+++ b/src/step-templates/akamai-content-purge/metadata.json
@@ -0,0 +1,139 @@
+{
+  "Id": "0bfe41dc-50b0-44a7-abe3-e6ba2a6d317a",
+  "Name": "Akamai - Content Purge",
+  "Description": "Allows to purge content using the Content Control Utility (CCU) v2 REST API.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "AkamaiClientToken",
+      "Label": "Client Token",
+      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiClientAccessToken",
+      "Label": "Client Access Token",
+      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiSecret",
+      "Label": "Secret",
+      "HelpText": "Authentication password used in client authentication. Available in Luna Portal.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "AkamaiQueue",
+      "Label": "Queue",
+      "HelpText": "Purge requests queue",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "default\nemergency"
+      }
+    },
+    {
+      "Name": "AkamaiObjects",
+      "Label": "Objects",
+      "HelpText": "A comma separated list of objects to purge, either URLs or CPCODEs",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiType",
+      "Label": "Type",
+      "HelpText": "The type associated with the items in the Objects parameter",
+      "DefaultValue": "arl",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "arl\ncpcode"
+      }
+    },
+    {
+      "Name": "AkamaiAction",
+      "Label": "Action",
+      "HelpText": "The action to execute on the purge operation",
+      "DefaultValue": "invalidate",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "invalidate\nremove"
+      }
+    },
+    {
+      "Name": "AkamaiDomain",
+      "Label": "Domain",
+      "HelpText": "The Akamai domain to perform the purge operation on",
+      "DefaultValue": "production",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "production\nstaging"
+      }
+    },
+    {
+      "Name": "ProxyUser",
+      "Label": "Proxy User",
+      "HelpText": "Optional, a user name for the proxy if required in the network",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ProxyPassword",
+      "Label": "Proxy Password",
+      "HelpText": "Optional, the password for the account to use if a Proxy User was specified",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "WaitForPurgeToComplete",
+      "Label": "Wait",
+      "HelpText": "Indicates if the step should wait for the purge operation to complete",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "false|No\ntrue|Yes"
+      }
+    },
+    {
+      "Name": "CheckLimit",
+      "Label": "Check Limit",
+      "HelpText": "Maximum number of times to check for the purge operation to complete if set to **Wait**",
+      "DefaultValue": "2",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText",
+        "Octopus.SelectOptions": "0\n5\n10"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-07-11T07:00:00.0000000-07:00",
+  "LastModifiedBy": "roberto-mardeni",
+  "$Meta": {
+    "ExportedAt": "2016-07-11T07:27:34.7480000-07:00",
+    "OctopusVersion": "3.3.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "akamai"
+}
diff --git a/src/step-templates/akamai-content-purge/scriptbody.ps1 b/src/step-templates/akamai-content-purge/scriptbody.ps1
new file mode 100644
index 000000000..d1b690055
--- /dev/null
+++ b/src/step-templates/akamai-content-purge/scriptbody.ps1
@@ -0,0 +1,226 @@
+$clientToken = $OctopusParameters['AkamaiClientToken']
+$clientAccessToken = $OctopusParameters['AkamaiClientAccessToken']
+$clientSecret = $OctopusParameters['AkamaiSecret']
+$queueName = $OctopusParameters['AkamaiQueue']
+$objects = $OctopusParameters['AkamaiObjects'] -split ","
+$type = $OctopusParameters['AkamaiType']
+$action = $OctopusParameters['AkamaiAction']
+$domain = $OctopusParameters['AkamaiDomain']
+$proxyUser = $OctopusParameters['ProxyUser']
+$proxyPassword = $OctopusParameters['ProxyPassword']
+
+$wait = [bool]::Parse($OctopusParameters['WaitForPurgeToComplete'])
+$maxChecks = [int]::Parse($OctopusParameters['CheckLimit'])
+
+if ($proxyUser) {
+    $securePassword = ConvertTo-SecureString $proxyPassword -AsPlainText -Force
+    $proxyCredential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $proxyUser,$securePassword
+
+    (New-Object System.Net.WebClient).Proxy.Credentials=$proxyCredential
+}
+
+# Copied from https://github.com/akamai-open/AkamaiOPEN-powershell/blob/master/Invoke-AkamaiOPEN.ps1
+function Invoke-AkamaiOpenRequest {
+    param(
+        [Parameter(Mandatory=$true)][string]$Method, 
+        [Parameter(Mandatory=$true)][string]$ClientToken, 
+        [Parameter(Mandatory=$true)][string]$ClientAccessToken, 
+        [Parameter(Mandatory=$true)][string]$ClientSecret, 
+        [Parameter(Mandatory=$true)][string]$ReqURL, 
+        [Parameter(Mandatory=$false)][string]$Body)
+
+    #Function to generate HMAC SHA256 Base64
+    Function Crypto ($secret, $message)
+    {
+	    [byte[]] $keyByte = [System.Text.Encoding]::ASCII.GetBytes($secret)
+	    [byte[]] $messageBytes = [System.Text.Encoding]::ASCII.GetBytes($message)
+	    $hmac = new-object System.Security.Cryptography.HMACSHA256((,$keyByte))
+	    [byte[]] $hashmessage = $hmac.ComputeHash($messageBytes)
+	    $Crypt = [System.Convert]::ToBase64String($hashmessage)
+
+	    return $Crypt
+    }
+
+    #ReqURL Verification
+    If (($ReqURL -as [System.URI]).AbsoluteURI -eq $null -or $ReqURL -notmatch "akamai.com")
+    {
+	    throw "Error: Ivalid Request URI"
+    }
+
+    #Sanitize Method param
+    $Method = $Method.ToUpper()
+
+    #Split $ReqURL for inclusion in SignatureData
+    $ReqArray = $ReqURL -split "(.*\/{2})(.*?)(\/)(.*)"
+
+    #Timestamp for request signing
+    $TimeStamp = [DateTime]::UtcNow.ToString("yyyyMMddTHH:mm:sszz00")
+
+    #GUID for request signing
+    $Nonce = [GUID]::NewGuid()
+
+    #Build data string for signature generation
+    $SignatureData = $Method + "`thttps`t"
+    $SignatureData += $ReqArray[2] + "`t" + $ReqArray[3] + $ReqArray[4]
+
+    if (($Body -ne $null) -and ($Method -ceq "POST"))
+    {
+	    $Body_SHA256 = [System.Security.Cryptography.SHA256]::Create()
+	    $Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body.ToString())))
+
+	    $SignatureData += "`t`t" + $Post_Hash + "`t"
+    }
+    else
+    {
+	    $SignatureData += "`t`t`t"
+    }
+
+    $SignatureData += "EG1-HMAC-SHA256 "
+    $SignatureData += "client_token=" + $ClientToken + ";"
+    $SignatureData += "access_token=" + $ClientAccessToken + ";"
+    $SignatureData += "timestamp=" + $TimeStamp  + ";"
+    $SignatureData += "nonce=" + $Nonce + ";"
+
+    #Generate SigningKey
+    $SigningKey = Crypto -secret $ClientSecret -message $TimeStamp
+
+    #Generate Auth Signature
+    $Signature = Crypto -secret $SigningKey -message $SignatureData
+
+    #Create AuthHeader
+    $AuthorizationHeader = "EG1-HMAC-SHA256 "
+    $AuthorizationHeader += "client_token=" + $ClientToken + ";"
+    $AuthorizationHeader += "access_token=" + $ClientAccessToken + ";"
+    $AuthorizationHeader += "timestamp=" + $TimeStamp + ";"
+    $AuthorizationHeader += "nonce=" + $Nonce + ";"
+    $AuthorizationHeader += "signature=" + $Signature
+
+    #Create IDictionary to hold request headers
+    $Headers = @{}
+
+    #Add Auth header
+    $Headers.Add('Authorization',$AuthorizationHeader)
+
+    #Add additional headers if POSTing or PUTing
+    If (($Method -ceq "POST") -or ($Method -ceq "PUT"))
+    {
+	    $Body_Size = [System.Text.Encoding]::UTF8.GetByteCount($Body)
+	    $Headers.Add('max-body',$Body_Size.ToString())
+
+        # turn off the "Expect: 100 Continue" header
+        # as it's not supported on the Akamai side.
+        [System.Net.ServicePointManager]::Expect100Continue = $false
+    }
+
+    #Check for valid Methods and required switches
+    If (($Method -ceq "POST") -and ($Body -ne $null))
+    {
+        Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'
+    }
+    elseif  (($Method -ceq "PUT") -and ($Body -ne $null))
+    {
+	    #Invoke API call with PUT and return
+	    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'
+    }
+    elseif (($Method -ceq "GET") -or ($Method -ceq "DELETE"))
+    {
+	    #Invoke API call with GET or DELETE and return
+	    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers
+    }
+    else
+    {
+	    throw "Error: Invalid -Method specified or missing required parameter"
+    }
+}
+
+function Perform-AkamaiRequest {
+    param (
+        [string]$request, 
+        [string]$method="Get", 
+        [int]$expectedStatusCode=200, 
+        $body)
+
+    $baseUrl = "http://private-anon-3934daf8d-akamaiopen2purgeccuv2production.apiary-mock.com"
+    # $baseUrl = "https://api.ccu.akamai.com"
+    $uri = "{0}{1}" -f $baseUrl,$request
+
+    if ($uri -match "mock"){
+        $requestHeaders = @{'Cache-Control'='no-cache,proxy-revalidate'}
+        $response = Invoke-RestMethod -Uri $uri -Method $method -DisableKeepAlive -Headers $requestHeaders -Body $body
+    } else {
+        $json = ConvertTo-Json $body -Compress
+        $response = Invoke-AkamaiOpenRequest -Method $method -ClientToken $clientToken -ClientAccessToken $clientAccessToken -ClientSecret $clientSecret -ReqURL $uri -Body $json
+    }
+
+    if ($response.httpStatus -ne $expectedStatusCode){
+        Write-Error "Request not processed correctly: $($response.detail)"
+    } elseif ($response.detail) {
+        Write-Verbose $response.detail
+    }
+
+    Write-Verbose $response
+
+    $response
+}
+
+function Get-QueueSize {
+    param ([string]$queueName)
+
+    $queueSize = Perform-AkamaiRequest "/ccu/v2/queues/$queueName"
+
+    $queueSize 
+}
+
+function Request-Purge {
+    param ($objects,[string]$type="arl",[string]$action="remove",[string]$domain="production")
+
+    $body = @{
+        objects = $objects
+        action = $action
+        type = $type
+        domain = $domain
+    }
+
+    Perform-AkamaiRequest "/ccu/v2/queues/$queueName" "Post" 201 $body
+}
+
+function Get-PurgeStatus {
+    param ([string]$purgeId)
+
+    $status = Perform-AkamaiRequest "/ccu/v2/purges/$purgeId"
+
+    Write-Host "Purge status: $($status.purgeStatus)"
+
+    $status
+}
+
+$queueSize = Get-QueueSize $queueName
+Write-Output "$($queueName) queue size is $($queueSize.queueLength)"
+
+$purge = Request-Purge $objects $type $action $domain
+
+Write-Output "Purge request created"
+Write-Output "PurgeId: $($purge.purgeId)"
+Write-Output "SupportId: $($purge.supportId)" 
+
+if ($wait) {
+    $check = 1
+    $purgeStatus = "Unknown"
+
+    do {
+        if ($check -gt 1) {
+            Write-Output "Waiting $($purge.pingAfterSeconds) seconds before checking purge status again"
+            Start-Sleep -Seconds $purge.pingAfterSeconds
+        }
+        $status = Get-PurgeStatus $purge.purgeId 
+        $purgeStatus = $status.purgeStatus
+        $check = $check + 1
+        if ($check -gt $maxChecks) { 
+            Write-Output "Maximum number of checks reached"
+        }
+    } while ($status.purgeStatus -ne "Done" -and $check -le $maxChecks)
+
+    if ($status.purgeStatus -ne "Done") {
+        Write-Error "Purge status is not Done"
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/akamai-cpcode-fastpurge/metadata.json b/src/step-templates/akamai-cpcode-fastpurge/metadata.json
new file mode 100644
index 000000000..33f94820a
--- /dev/null
+++ b/src/step-templates/akamai-cpcode-fastpurge/metadata.json
@@ -0,0 +1,106 @@
+{
+  "Id": "ee4a6957-7d98-4dcf-8f94-78f19ab1c6e0",
+  "Name": "Akamai - CPCode Fast Purge",
+  "Description": "Allows to purge CP codes using the Content Control Utility (CCU) v3 REST API.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "293e2cc1-e471-4801-8a9c-42633a3c9122",
+      "Name": "AkamaiClientToken",
+      "Label": "Client Token",
+      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e0edcbea-bfdd-4781-9a8a-55b08eba6ed5",
+      "Name": "AkamaiClientAccessToken",
+      "Label": "Client Access Token",
+      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c1ea0502-f68e-4890-99a2-3c721d16b7f0",
+      "Name": "AkamaiSecret",
+      "Label": "Secret",
+      "HelpText": "Authentication password used in client authentication. Available in Luna Portal.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f54e1b4a-3960-483b-88c9-5ea7a94698a0",
+      "Name": "AkamaiCPCode",
+      "Label": "CPCode",
+      "HelpText": "The CPCode for which to execute the purge operation",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a334eabb-8a36-4c24-b728-52f834f8a893",
+      "Name": "AkamaiHost",
+      "Label": "Host",
+      "HelpText": "Akamai Host (no HTTP/HTTPS). Available in Luna Portal.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8482001d-a6fc-4e72-b9be-8cc584a39b36",
+      "Name": "AkamaiAction",
+      "Label": "Action",
+      "HelpText": "The action to execute on the purge operation",
+      "DefaultValue": "invalidate",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "invalidate\nremove"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e1c3dfa0-7118-4e23-9315-c03ea3662125",
+      "Name": "AkamaiDomain",
+      "Label": "Domain",
+      "HelpText": "The Akamai domain to perform the purge operation on",
+      "DefaultValue": "production",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "production\nstaging"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2019-02-11T18:51:20.3580000Z",
+  "LastModifiedBy": "ajwightm",
+  "$Meta": {
+    "ExportedAt": "2019-02-11T18:51:20.3580000Z",
+    "OctopusVersion": "3.13.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Akamai"
+}
diff --git a/src/step-templates/akamai-cpcode-fastpurge/scriptbody.ps1 b/src/step-templates/akamai-cpcode-fastpurge/scriptbody.ps1
new file mode 100644
index 000000000..f6afdf036
--- /dev/null
+++ b/src/step-templates/akamai-cpcode-fastpurge/scriptbody.ps1
@@ -0,0 +1,168 @@
+$clientToken = $OctopusParameters['AkamaiClientToken']
+$clientAccessToken = $OctopusParameters['AkamaiClientAccessToken']
+$clientSecret = $OctopusParameters['AkamaiSecret']
+$cpcode = $OctopusParameters['AkamaiCPCode']
+$akhost = $OctopusParameters['AkamaiHost']
+$action = $OctopusParameters['AkamaiAction']
+$domain = $OctopusParameters['AkamaiDomain']
+
+# NOTICE : PowerShell EdgeGrid Client has been deprecated and will reach End of Life soon. For more information, please see https://developer.akamai.com/blog/2018/11/13/akamai-powershell-edgegrid-client-end-life-notice
+# Copied from https://github.com/akamai-open/AkamaiOPEN-powershell/blob/master/Invoke-AkamaiOPEN.ps1
+function Invoke-AkamaiOpenRequest {
+	param(
+		[Parameter(Mandatory=$true)]
+		[ValidateSet("GET", "PUT", "POST", "DELETE")]
+		[string]$Method,
+		[Parameter(Mandatory=$true)][string]$ClientToken,
+		[Parameter(Mandatory=$true)][string]$ClientAccessToken,
+		[Parameter(Mandatory=$true)][string]$ClientSecret,
+		[Parameter(Mandatory=$true)][string]$ReqURL,
+		[Parameter(Mandatory=$false)][string]$Body,
+		[Parameter(Mandatory=$false)][string]$MaxBody = 131072
+		)
+
+	#Function to generate HMAC SHA256 Base64
+	Function Crypto ($secret, $message)
+	{
+		[byte[]] $keyByte = [System.Text.Encoding]::ASCII.GetBytes($secret)
+		[byte[]] $messageBytes = [System.Text.Encoding]::ASCII.GetBytes($message)
+		$hmac = new-object System.Security.Cryptography.HMACSHA256((,$keyByte))
+		[byte[]] $hashmessage = $hmac.ComputeHash($messageBytes)
+		$Crypt = [System.Convert]::ToBase64String($hashmessage)
+
+		return $Crypt
+	}
+
+	#ReqURL Verification
+	If (($ReqURL -as [System.URI]).AbsoluteURI -eq $null -or $ReqURL -notmatch "akamaiapis.net")
+	{
+		throw "Error: Ivalid Request URI"
+	}
+
+	#Sanitize Method param
+	$Method = $Method.ToUpper()
+
+	#Split $ReqURL for inclusion in SignatureData
+	$ReqArray = $ReqURL -split "(.*\/{2})(.*?)(\/)(.*)"
+
+	#Timestamp for request signing
+	$TimeStamp = [DateTime]::UtcNow.ToString("yyyyMMddTHH:mm:sszz00")
+
+	#GUID for request signing
+	$Nonce = [GUID]::NewGuid()
+
+	#Build data string for signature generation
+	$SignatureData = $Method + "`thttps`t"
+	$SignatureData += $ReqArray[2] + "`t" + $ReqArray[3] + $ReqArray[4]
+
+	#Add body to signature. Truncate if body is greater than max-body (Akamai default is 131072). PUT Medthod does not require adding to signature.
+	
+	if ($Body -and $Method -eq "POST")
+	{
+	  $Body_SHA256 = [System.Security.Cryptography.SHA256]::Create()
+	  if($Body.Length -gt $MaxBody){
+		$Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body.Substring(0,$MaxBody))))
+	  }
+	  else{
+		$Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body)))
+	  }
+
+	  $SignatureData += "`t`t" + $Post_Hash + "`t"
+	}
+	else
+	{
+	  $SignatureData += "`t`t`t"
+	}
+
+	$SignatureData += "EG1-HMAC-SHA256 "
+	$SignatureData += "client_token=" + $ClientToken + ";"
+	$SignatureData += "access_token=" + $ClientAccessToken + ";"
+	$SignatureData += "timestamp=" + $TimeStamp  + ";"
+	$SignatureData += "nonce=" + $Nonce + ";"
+
+	#Generate SigningKey
+	$SigningKey = Crypto -secret $ClientSecret -message $TimeStamp
+
+	#Generate Auth Signature
+	$Signature = Crypto -secret $SigningKey -message $SignatureData
+
+	#Create AuthHeader
+	$AuthorizationHeader = "EG1-HMAC-SHA256 "
+	$AuthorizationHeader += "client_token=" + $ClientToken + ";"
+	$AuthorizationHeader += "access_token=" + $ClientAccessToken + ";"
+	$AuthorizationHeader += "timestamp=" + $TimeStamp + ";"
+	$AuthorizationHeader += "nonce=" + $Nonce + ";"
+	$AuthorizationHeader += "signature=" + $Signature
+
+	#Create IDictionary to hold request headers
+	$Headers = @{}
+
+	#Add Auth header
+	$Headers.Add('Authorization',$AuthorizationHeader)
+
+	#Add additional headers if POSTing or PUTing
+	If ($Body)
+	{
+	  # turn off the "Expect: 100 Continue" header
+	  # as it's not supported on the Akamai side.
+	  [System.Net.ServicePointManager]::Expect100Continue = $false
+	}
+	
+	#Check for valid Methods and required switches
+	[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+	if ($Method -eq "PUT" -or $Method -eq "POST") {
+		if ($Body) {
+			try{
+				Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'
+			}
+			catch{
+				Write-Host $_ -fore green
+			}
+		}
+		else {
+		  Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -ContentType 'application/json'
+		}
+	}
+	else {
+		#Invoke API call with GET or DELETE and return
+		Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers
+	}
+}
+
+function Perform-AkamaiRequest {
+    param (
+        [string]$request, 
+        [string]$method="Get", 
+        [int]$expectedStatusCode=200, 
+        $body)
+
+    $baseUrl = "https://" + $akhost
+    $uri = "{0}{1}" -f $baseUrl,$request
+
+    $json = ConvertTo-Json $body -Compress
+    $response = Invoke-AkamaiOpenRequest -Method $method -ClientToken $clientToken -ClientAccessToken $clientAccessToken -ClientSecret $clientSecret -ReqURL $uri -Body $json
+	
+    if ($response.httpStatus -ne $expectedStatusCode){
+        Write-Error "Request not processed correctly: $($response.detail)"
+    } elseif ($response.detail) {
+        Write-Verbose $response.detail
+    }
+
+    $response
+}
+
+function Request-Purge {
+    param ([Int]$cpcode,[string]$action="remove",[string]$domain="production")
+
+    $body = @{
+        objects = @($cpcode)
+    }
+
+    Perform-AkamaiRequest "/ccu/v3/$action/cpcode/$domain" "Post" 201 $body
+}
+
+$purge = Request-Purge $cpcode $action $domain
+
+Write-Output "Purge request created"
+Write-Output "PurgeId: $($purge.purgeId)"
+Write-Output "SupportId: $($purge.supportId)" 
\ No newline at end of file
diff --git a/src/step-templates/akamai-fast-content-purge/metadata.json b/src/step-templates/akamai-fast-content-purge/metadata.json
new file mode 100644
index 000000000..1518f45d4
--- /dev/null
+++ b/src/step-templates/akamai-fast-content-purge/metadata.json
@@ -0,0 +1,108 @@
+{
+  "Id": "f8e2e47b-62ba-44a0-881c-d1911dc14428",
+  "Name": "Akamai - Content Fast Purge",
+  "Description": "Allows to purge content using the Content Control Utility (CCU) v3 REST API.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "AkamaiClientToken",
+      "Label": "Client Token",
+      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiClientAccessToken",
+      "Label": "Client Access Token",
+      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiSecret",
+      "Label": "Secret",
+      "HelpText": "Authentication password used in client authentication. Available in Luna Portal.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "AkamaiHostname",
+      "Label": "Hostname",
+      "HelpText": "The hostname for which to execute the purge operation",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiObjects",
+      "Label": "Objects",
+      "HelpText": "A comma separated list of objects to purge, only URLs",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AkamaiAction",
+      "Label": "Action",
+      "HelpText": "The action to execute on the purge operation",
+      "DefaultValue": "invalidate",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "invalidate\nremove"
+      }
+    },
+    {
+      "Name": "AkamaiDomain",
+      "Label": "Domain",
+      "HelpText": "The Akamai domain to perform the purge operation on",
+      "DefaultValue": "production",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "production\nstaging"
+      }
+    },
+    {
+      "Name": "ProxyUser",
+      "Label": "Proxy User",
+      "HelpText": "Optional, a user name for the proxy if required in the network",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ProxyPassword",
+      "Label": "Proxy Password",
+      "HelpText": "Optional, the password for the account to use if a Proxy User was specified",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-07-11T07:00:00.0000000-07:00",
+  "LastModifiedBy": "roberto-mardeni",
+  "$Meta": {
+    "ExportedAt": "2016-07-11T07:30:28.5690000-07:00",
+    "OctopusVersion": "3.3.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "akamai"
+}
diff --git a/src/step-templates/akamai-fast-content-purge/scriptbody.ps1 b/src/step-templates/akamai-fast-content-purge/scriptbody.ps1
new file mode 100644
index 000000000..4c560a871
--- /dev/null
+++ b/src/step-templates/akamai-fast-content-purge/scriptbody.ps1
@@ -0,0 +1,183 @@
+$clientToken = $OctopusParameters['AkamaiClientToken']
+$clientAccessToken = $OctopusParameters['AkamaiClientAccessToken']
+$clientSecret = $OctopusParameters['AkamaiSecret']
+$hostname = $OctopusParameters['AkamaiHostname']
+$objects = $OctopusParameters['AkamaiObjects'] -split ","
+$action = $OctopusParameters['AkamaiAction']
+$domain = $OctopusParameters['AkamaiDomain']
+$proxyUser = $OctopusParameters['ProxyUser']
+$proxyPassword = $OctopusParameters['ProxyPassword']
+
+if ($proxyUser) {
+    $securePassword = ConvertTo-SecureString $proxyPassword -AsPlainText -Force
+    $proxyCredential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $proxyUser,$securePassword
+
+    (New-Object System.Net.WebClient).Proxy.Credentials=$proxyCredential
+}
+
+# Copied from https://github.com/akamai-open/AkamaiOPEN-powershell/blob/master/Invoke-AkamaiOPEN.ps1
+function Invoke-AkamaiOpenRequest {
+    param(
+        [Parameter(Mandatory=$true)][string]$Method, 
+        [Parameter(Mandatory=$true)][string]$ClientToken, 
+        [Parameter(Mandatory=$true)][string]$ClientAccessToken, 
+        [Parameter(Mandatory=$true)][string]$ClientSecret, 
+        [Parameter(Mandatory=$true)][string]$ReqURL, 
+        [Parameter(Mandatory=$false)][string]$Body)
+
+    #Function to generate HMAC SHA256 Base64
+    Function Crypto ($secret, $message)
+    {
+	    [byte[]] $keyByte = [System.Text.Encoding]::ASCII.GetBytes($secret)
+	    [byte[]] $messageBytes = [System.Text.Encoding]::ASCII.GetBytes($message)
+	    $hmac = new-object System.Security.Cryptography.HMACSHA256((,$keyByte))
+	    [byte[]] $hashmessage = $hmac.ComputeHash($messageBytes)
+	    $Crypt = [System.Convert]::ToBase64String($hashmessage)
+
+	    return $Crypt
+    }
+
+    #ReqURL Verification
+    If (($ReqURL -as [System.URI]).AbsoluteURI -eq $null -or $ReqURL -notmatch "akamai.com")
+    {
+	    throw "Error: Ivalid Request URI"
+    }
+
+    #Sanitize Method param
+    $Method = $Method.ToUpper()
+
+    #Split $ReqURL for inclusion in SignatureData
+    $ReqArray = $ReqURL -split "(.*\/{2})(.*?)(\/)(.*)"
+
+    #Timestamp for request signing
+    $TimeStamp = [DateTime]::UtcNow.ToString("yyyyMMddTHH:mm:sszz00")
+
+    #GUID for request signing
+    $Nonce = [GUID]::NewGuid()
+
+    #Build data string for signature generation
+    $SignatureData = $Method + "`thttps`t"
+    $SignatureData += $ReqArray[2] + "`t" + $ReqArray[3] + $ReqArray[4]
+
+    if (($Body -ne $null) -and ($Method -ceq "POST"))
+    {
+	    $Body_SHA256 = [System.Security.Cryptography.SHA256]::Create()
+	    $Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body.ToString())))
+
+	    $SignatureData += "`t`t" + $Post_Hash + "`t"
+    }
+    else
+    {
+	    $SignatureData += "`t`t`t"
+    }
+
+    $SignatureData += "EG1-HMAC-SHA256 "
+    $SignatureData += "client_token=" + $ClientToken + ";"
+    $SignatureData += "access_token=" + $ClientAccessToken + ";"
+    $SignatureData += "timestamp=" + $TimeStamp  + ";"
+    $SignatureData += "nonce=" + $Nonce + ";"
+
+    #Generate SigningKey
+    $SigningKey = Crypto -secret $ClientSecret -message $TimeStamp
+
+    #Generate Auth Signature
+    $Signature = Crypto -secret $SigningKey -message $SignatureData
+
+    #Create AuthHeader
+    $AuthorizationHeader = "EG1-HMAC-SHA256 "
+    $AuthorizationHeader += "client_token=" + $ClientToken + ";"
+    $AuthorizationHeader += "access_token=" + $ClientAccessToken + ";"
+    $AuthorizationHeader += "timestamp=" + $TimeStamp + ";"
+    $AuthorizationHeader += "nonce=" + $Nonce + ";"
+    $AuthorizationHeader += "signature=" + $Signature
+
+    #Create IDictionary to hold request headers
+    $Headers = @{}
+
+    #Add Auth header
+    $Headers.Add('Authorization',$AuthorizationHeader)
+
+    #Add additional headers if POSTing or PUTing
+    If (($Method -ceq "POST") -or ($Method -ceq "PUT"))
+    {
+	    $Body_Size = [System.Text.Encoding]::UTF8.GetByteCount($Body)
+	    $Headers.Add('max-body',$Body_Size.ToString())
+
+        # turn off the "Expect: 100 Continue" header
+        # as it's not supported on the Akamai side.
+        [System.Net.ServicePointManager]::Expect100Continue = $false
+    }
+
+    #Check for valid Methods and required switches
+    If (($Method -ceq "POST") -and ($Body -ne $null))
+    {
+        Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'
+    }
+    elseif  (($Method -ceq "PUT") -and ($Body -ne $null))
+    {
+	    #Invoke API call with PUT and return
+	    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'
+    }
+    elseif (($Method -ceq "GET") -or ($Method -ceq "DELETE"))
+    {
+	    #Invoke API call with GET or DELETE and return
+	    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers
+    }
+    else
+    {
+	    throw "Error: Invalid -Method specified or missing required parameter"
+    }
+}
+
+function Perform-AkamaiRequest {
+    param (
+        [string]$request, 
+        [string]$method="Get", 
+        [int]$expectedStatusCode=200, 
+        $body)
+
+    $baseUrl = "http://private-anon-3934daf8d-akamaiopen2purgeccuv3production.apiary-mock.com"
+    # $baseUrl = "https://api.ccu.akamai.com"
+    $uri = "{0}{1}" -f $baseUrl,$request
+
+    if ($uri -match "mock"){
+        $requestHeaders = @{'Cache-Control'='no-cache,proxy-revalidate'}
+        $response = Invoke-RestMethod -Uri $uri -Method $method -DisableKeepAlive -Headers $requestHeaders -Body $body
+    } else {
+        $json = ConvertTo-Json $body -Compress
+        $response = Invoke-AkamaiOpenRequest -Method $method -ClientToken $clientToken -ClientAccessToken $clientAccessToken -ClientSecret $clientSecret -ReqURL $uri -Body $json
+    }
+
+    if ($response.httpStatus -ne $expectedStatusCode){
+        Write-Error "Request not processed correctly: $($response.detail)"
+    } elseif ($response.detail) {
+        Write-Verbose $response.detail
+    }
+
+    Write-Verbose $response
+
+    $response
+}
+
+function Request-Purge {
+    param ($objects,[string]$hostname,[string]$action="remove",[string]$domain="production")
+
+    $body = @{
+        objects = $objects
+    }
+
+    if ($hostname -ne $null -and $hostname -ne "") {
+        $body = @{
+            hostname = $hostname
+            objects = $objects
+        }
+    } 
+
+    Perform-AkamaiRequest "/ccu/v3/$action/$domain" "Post" 201 $body
+}
+
+$purge = Request-Purge $objects $hostname $action $domain
+
+Write-Output "Purge request created"
+Write-Output "PurgeId: $($purge.purgeId)"
+Write-Output "SupportId: $($purge.supportId)" 
\ No newline at end of file
diff --git a/step-templates/amazon-chime-post-message.json b/src/step-templates/amazon-chime-post-message/metadata.json
similarity index 52%
rename from step-templates/amazon-chime-post-message.json
rename to src/step-templates/amazon-chime-post-message/metadata.json
index eb6d88639..b01f07aaa 100644
--- a/step-templates/amazon-chime-post-message.json
+++ b/src/step-templates/amazon-chime-post-message/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$_WebHookUrl = $OctopusParameters['acpm_WebHookURL']\n$_ContentPayload = $OctopusParameters['acpm_ContentPayload']\n$_WarningOnFailure = [System.Convert]::ToBoolean($OctopusParameters['acpm_WarningOnFailure'])\n\ntry {\n  #Encode the content message as JSON. ConvertTo-JSON adds quotes to the string.\n  $_EncodedContentPayload = $_ContentPayload | ConvertTo-JSON\n\n  #Create a JSON object that Chime wants\n  #https://docs.aws.amazon.com/chime/latest/ug/webhooks.html\n  $_JsonPayload = '{\"Content\":'\n  $_JsonPayload += $_EncodedContentPayload\n  $_JsonPayload += '}'\n\n  Write-Host \"Sending message to webhook.\"\n  Write-Host \"------ Message ------\"\n  Write-Host \"$_ContentPayload\"\n  Write-Host \"---- End Message ----\"\n\t\n  #Make the request and send the payload\n  Invoke-WebRequest \"$_WebHookUrl\" -UseBasicParsing -ContentType \"application/json\" -Method POST -Body $_JsonPayload | Out-Null\n  Write-Host \"Message successfully sent to webhook.\"\n}\ncatch {\n  #If WarningOnFailure is not true, then write an error and fail the deployment.\n  if($_WarningOnFailure -eq $false) {\n    Write-Error \"Could not send message to Chime web hook.\"\n    if(!([string]::IsNullOrEmpty($_.Exception.Message))) {\n      Write-Error \"Exception Message: $($_.Exception.Message)\"\n    }\n  }\n  #Else, just write a warning and continue on.\n  else {\n    Write-Warning \"Could not send message to Chime web hook.\"\n    if(!([string]::IsNullOrEmpty($_.Exception.Message))) {\n      Write-Warning \"Exception Message: $($_.Exception.Message)\"\n    }\n  }\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -47,9 +47,9 @@
   ],
   "LastModifiedBy": "vlouwagie",
   "$Meta": {
-    "ExportedAt": "2018-02-18T00:00:01.006Z",
+    "ExportedAt": "2018-02-18T00:00:01.0060000Z",
     "OctopusVersion": "4.1.5",
     "Type": "ActionTemplate"
   },
   "Category": "amazon-chime"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/amazon-chime-post-message/scriptbody.ps1 b/src/step-templates/amazon-chime-post-message/scriptbody.ps1
new file mode 100644
index 000000000..e646a150e
--- /dev/null
+++ b/src/step-templates/amazon-chime-post-message/scriptbody.ps1
@@ -0,0 +1,39 @@
+$_WebHookUrl = $OctopusParameters['acpm_WebHookURL']
+$_ContentPayload = $OctopusParameters['acpm_ContentPayload']
+$_WarningOnFailure = [System.Convert]::ToBoolean($OctopusParameters['acpm_WarningOnFailure'])
+
+try {
+  #Encode the content message as JSON. ConvertTo-JSON adds quotes to the string.
+  $_EncodedContentPayload = $_ContentPayload | ConvertTo-JSON
+
+  #Create a JSON object that Chime wants
+  #https://docs.aws.amazon.com/chime/latest/ug/webhooks.html
+  $_JsonPayload = '{"Content":'
+  $_JsonPayload += $_EncodedContentPayload
+  $_JsonPayload += '}'
+
+  Write-Host "Sending message to webhook."
+  Write-Host "------ Message ------"
+  Write-Host "$_ContentPayload"
+  Write-Host "---- End Message ----"
+	
+  #Make the request and send the payload
+  Invoke-WebRequest "$_WebHookUrl" -UseBasicParsing -ContentType "application/json" -Method POST -Body $_JsonPayload | Out-Null
+  Write-Host "Message successfully sent to webhook."
+}
+catch {
+  #If WarningOnFailure is not true, then write an error and fail the deployment.
+  if($_WarningOnFailure -eq $false) {
+    Write-Error "Could not send message to Chime web hook."
+    if(!([string]::IsNullOrEmpty($_.Exception.Message))) {
+      Write-Error "Exception Message: $($_.Exception.Message)"
+    }
+  }
+  #Else, just write a warning and continue on.
+  else {
+    Write-Warning "Could not send message to Chime web hook."
+    if(!([string]::IsNullOrEmpty($_.Exception.Message))) {
+      Write-Warning "Exception Message: $($_.Exception.Message)"
+    }
+  }
+}
\ No newline at end of file
diff --git a/step-templates/amazon-s3-upload.json b/src/step-templates/amazon-s3-upload/metadata.json
similarity index 72%
rename from step-templates/amazon-s3-upload.json
rename to src/step-templates/amazon-s3-upload/metadata.json
index d1bf8c37b..f2dde33e8 100644
--- a/step-templates/amazon-s3-upload.json
+++ b/src/step-templates/amazon-s3-upload/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 11,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "\r\n$recurse = [boolean]::Parse($Recursive)\r\n\r\n$params = @{}\r\n\r\n#Sets the Permissions to public if the selection is true\r\nif ($MakePublic -eq $True) {\r\n    $params.add(\"CannedACLName\", \"public-read\")\r\n}\r\n\r\n#Initialises the S3 Credentials based on the Access Key and Secret Key provided, so that we can invoke the APIs further down\r\nSet-AWSCredentials -AccessKey $S3AccessKey -SecretKey $S3SecretKey -StoreAs S3Creds\r\n\r\n#Initialises the Default AWS Region based on the region provided\r\nSet-DefaultAWSRegion -Region $S3Region\r\n\r\n#Gets all relevant files and uploads them\r\nfunction Upload($item) \r\n{\r\n    #Gets all files and child folders within the given directory\r\n    foreach ($i in Get-ChildItem $item) {\r\n\r\n        #Checks if the item is a folder\r\n        if($i -is [System.IO.DirectoryInfo]) {\r\n\r\n            #Inserts all files within a folder to AWS           \r\n            Write-S3Object -ProfileName S3Creds -BucketName $S3Bucket -KeyPrefix $S3Prefix$($i.Name) -Folder $i.FullName -Recurse:$recurse @params\r\n\r\n        } else {\r\n\r\n            #Inserts file to AWS\r\n            Write-S3Object -ProfileName S3Creds -BucketName $S3Bucket -Key $S3Prefix$($i.Name) -File $i.FullName @params\r\n\r\n        }\r\n    }\r\n}\r\n\r\nUpload($SourceFolderLocation)\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -86,9 +86,9 @@
   ],
   "LastModifiedBy": "Phillip Haydon",
   "$Meta": {
-    "ExportedAt": "2018-04-10T11:05:46.352Z",
+    "ExportedAt": "2018-04-10T11:05:46.3520000Z",
     "OctopusVersion": "2018.2.7",
     "Type": "ActionTemplate"
   },
   "Category": "aws"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/amazon-s3-upload/scriptbody.ps1 b/src/step-templates/amazon-s3-upload/scriptbody.ps1
new file mode 100644
index 000000000..934442f6f
--- /dev/null
+++ b/src/step-templates/amazon-s3-upload/scriptbody.ps1
@@ -0,0 +1,38 @@
+
+$recurse = [boolean]::Parse($Recursive)
+
+$params = @{}
+
+#Sets the Permissions to public if the selection is true
+if ($MakePublic -eq $True) {
+    $params.add("CannedACLName", "public-read")
+}
+
+#Initialises the S3 Credentials based on the Access Key and Secret Key provided, so that we can invoke the APIs further down
+Set-AWSCredentials -AccessKey $S3AccessKey -SecretKey $S3SecretKey -StoreAs S3Creds
+
+#Initialises the Default AWS Region based on the region provided
+Set-DefaultAWSRegion -Region $S3Region
+
+#Gets all relevant files and uploads them
+function Upload($item) 
+{
+    #Gets all files and child folders within the given directory
+    foreach ($i in Get-ChildItem $item) {
+
+        #Checks if the item is a folder
+        if($i -is [System.IO.DirectoryInfo]) {
+
+            #Inserts all files within a folder to AWS           
+            Write-S3Object -ProfileName S3Creds -BucketName $S3Bucket -KeyPrefix $S3Prefix$($i.Name) -Folder $i.FullName -Recurse:$recurse @params
+
+        } else {
+
+            #Inserts file to AWS
+            Write-S3Object -ProfileName S3Creds -BucketName $S3Bucket -Key $S3Prefix$($i.Name) -File $i.FullName @params
+
+        }
+    }
+}
+
+Upload($SourceFolderLocation)
diff --git a/step-templates/ansible-run-playbook.json b/src/step-templates/ansible-run-playbook/metadata.json
similarity index 71%
rename from step-templates/ansible-run-playbook.json
rename to src/step-templates/ansible-run-playbook/metadata.json
index 59bd45a0a..739183545 100644
--- a/step-templates/ansible-run-playbook.json
+++ b/src/step-templates/ansible-run-playbook/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "ansibleInstalled=$(which -a ansible-playbook >/dev/null; echo $?)\n\nif [ $ansibleInstalled -ne 0 ];then\n\techo \"Ansible Not Installed\"\n    exit 1;\nfi\n\n\nansible-playbook $(get_octopusvariable \"RunAnsible.Playbook.Path\")\nplaybookRC=$?\n\nif [ $playbookRC -ne 0 ]; then\n  exit $playbookRC;\nfi"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -25,7 +25,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2023-02-16T11:39:51.509Z",
+    "ExportedAt": "2023-02-16T11:39:51.5090000Z",
     "OctopusVersion": "2022.4.8394",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/ansible-run-playbook/scriptbody.sh b/src/step-templates/ansible-run-playbook/scriptbody.sh
new file mode 100644
index 000000000..ca5e4bfb5
--- /dev/null
+++ b/src/step-templates/ansible-run-playbook/scriptbody.sh
@@ -0,0 +1,14 @@
+ansibleInstalled=$(which -a ansible-playbook >/dev/null; echo $?)
+
+if [ $ansibleInstalled -ne 0 ];then
+	echo "Ansible Not Installed"
+    exit 1;
+fi
+
+
+ansible-playbook $(get_octopusvariable "RunAnsible.Playbook.Path")
+playbookRC=$?
+
+if [ $playbookRC -ne 0 ]; then
+  exit $playbookRC;
+fi
\ No newline at end of file
diff --git a/src/step-templates/ansible-tower-run-template/metadata.json b/src/step-templates/ansible-tower-run-template/metadata.json
new file mode 100644
index 000000000..586a713a6
--- /dev/null
+++ b/src/step-templates/ansible-tower-run-template/metadata.json
@@ -0,0 +1,174 @@
+{
+  "Id": "9a3d15aa-5a48-4922-9651-cf4ae75730dd",
+  "Name": "Ansible Tower - Run Template",
+  "Description": "Run a workflow or job template in Ansible Tower",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "6da92f7b-3e6b-496c-9095-508556a2e69a",
+      "Name": "TowerServer",
+      "Label": "Tower Server",
+      "HelpText": "The connection information of the Tower server to connect to. This can be a single host name or IP (https will be assumed) or a full specification like http://localhost:8081.",
+      "DefaultValue": "tower.example.com",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2e4148f9-73fd-430b-9ac4-d7aa0789b9d1",
+      "Name": "TowerUsername",
+      "Label": "Tower Username",
+      "HelpText": "The user to connect to Tower as. Be sure this user has permissions to execute the Job/Workflow templates you are attempting to launch.",
+      "DefaultValue": "admin",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "60f5667e-108a-4966-aaef-feb26e6739ad",
+      "Name": "TowerPassword",
+      "Label": "Tower Password",
+      "HelpText": "The password for the specified user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "4f8baac7-0b3f-4ffe-af04-deff70484518",
+      "Name": "TowerOAuthToken",
+      "Label": "OAuth Token",
+      "HelpText": "An alternative to username/password which can be used on newer versions of Tower.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ccf787b8-6589-4d59-9f0d-d964f0785252",
+      "Name": "TowerJobType",
+      "Label": "Template Type",
+      "HelpText": "Select the type of template to execute. Supported template types are Workflow and Job",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "job|Job Template\nworkflow|Workflow Template"
+      }
+    },
+    {
+      "Id": "8b6c4e7c-65dd-40f8-8fa3-4371877083fb",
+      "Name": "TowerJobTemplate",
+      "Label": "Template Name",
+      "HelpText": "The Job or Workflow template ID or name. If a name is specified the ID will attempt to be resolved.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6a64ff26-9b22-414d-9995-d1723aafdbb1",
+      "Name": "TowerExtraVars",
+      "Label": "Extra Vars",
+      "HelpText": "Extra variable to pass to the job. This can be either YAML or JSON.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
+      "DefaultValue": "---",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "f65ed9e0-2d50-4698-8e8e-3683ee6e0a41",
+      "Name": "TowerJobTags",
+      "Label": "Job Tags",
+      "HelpText": "Any job tags to pass to Tower. \n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fe800bf5-ef04-43c5-b73d-0c9ca00172a8",
+      "Name": "TowerLimit",
+      "Label": "Limit",
+      "HelpText": "Limit field to be passed to Tower.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8572d143-0ccd-4af4-b754-7df663f9e07a",
+      "Name": "TowerInventory",
+      "Label": "Inventory",
+      "HelpText": "The inventory for the job run.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "08514a4e-f34c-41cb-94f4-c6ac82f46634",
+      "Name": "TowerCredential",
+      "Label": "Credential",
+      "HelpText": "The credentials to use for this job.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9691c6c0-ac17-4bcf-947d-38bbbf027ed3",
+      "Name": "TowerImportLogs",
+      "Label": "Import Tower Logs",
+      "HelpText": "Pull the Tower logs back into the step output",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "7e8c6ea0-637f-4440-9669-55971bc1f825",
+      "Name": "TowerSecondsBetweenChecks",
+      "Label": "Second Between Checks",
+      "HelpText": "How many seconds to pause between checks when monitoring a job. 0 means no checks. Failure to parse this field as an integer will default to 3 seconds.",
+      "DefaultValue": "3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7f8b11b1-3f4b-41eb-8cf2-38d4e984418e",
+      "Name": "TowerIgnoreCert",
+      "Label": "Ignore Certificate",
+      "HelpText": "**This parameter is intended only for testing.** This tells the step to ignore any https certificate presented to it from the Tower server. Please understand the ramifications before enabling this option.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4c94cabd-ef0f-4a21-8028-430b7a0465b8",
+      "Name": "TowerVerbose",
+      "Label": "Verbose",
+      "HelpText": "Add additional details of what the plugin is doing.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-09-28T13:41:21.9890000Z",
+    "OctopusVersion": "2021.1.7500",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "kdblitz",
+  "Category": "ansible"
+}
diff --git a/src/step-templates/ansible-tower-run-template/scriptbody.ps1 b/src/step-templates/ansible-tower-run-template/scriptbody.ps1
new file mode 100644
index 000000000..32e4288fc
--- /dev/null
+++ b/src/step-templates/ansible-tower-run-template/scriptbody.ps1
@@ -0,0 +1,416 @@
+# There have been reported issues when using the default JSON parser with Invoke-RestMethod
+# on PowerShell 5. So we are going to pull in a different assembly to do the parsing for us.
+# This parser appears to be more reliable.
+[System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions")
+$jsonParser = New-Object -TypeName System.Web.Script.Serialization.JavaScriptSerializer
+$jsonParser.MaxJsonLength = 104857600 #100mb as bytes, default is 2mb
+
+function Write-AnsibleLine([String] $text) {
+    # split text at ESC-char
+    $ansi_colors = @(
+        '[0;30m' #= @{ fg = ConsoleColor.Black }
+        '[0;31m' #= @{ fg = ConsoleColor.DarkRed }
+        '[0;32m' #= @{ fg = ConsoleColor.DarkGreen }
+        '[0;33m' #= @{ fg = ConsoleColor.DarkYellow }
+        '[0;34m' #= @{ fg = ConsoleColor.DarkBlue }
+        '[0;35m' #= @{ fg = ConsoleColor.DarkMagenta }
+        '[0;36m' #= @{ fg = ConsoleColor.DarkCyan }
+        '[0;37m' #= @{ fg = ConsoleColor.White }
+        '[0m' #= @{ fg = $null; bg = $null }
+        '[1;35m' #= Magent (ansible warnings)
+        '[30;1m' #= @{ fg = ConsoleColor.Grey }
+        '[31;1m' #= @{ fg = ConsoleColor.Red }
+        '[32;1m' #= @{ fg = ConsoleColor.Green }
+        '[33;1m' #= @{ fg = ConsoleColor.Yellow }
+        '[34;1m' #= @{ fg = ConsoleColor.Blue }
+        '[35;1m' #= @{ fg = ConsoleColor.Magenta }
+        '[36;1m' #= @{ fg = ConsoleColor.Cyan }
+        '[37;1m' #= @{ fg = ConsoleColor.White }
+        '[0;40m' #= @{ bg = ConsoleColor.Black }
+        '[0;41m' #= @{ bg = ConsoleColor.DarkRed }
+        '[0;42m' #= @{ bg = ConsoleColor.DarkGreen }
+        '[0;43m' #= @{ bg = ConsoleColor.DarkYellow }
+        '[0;44m' #= @{ bg = ConsoleColor.DarkBlue }
+        '[0;45m' #= @{ bg = ConsoleColor.DarkMagenta }
+        '[0;46m' #= @{ bg = ConsoleColor.DarkCyan }
+        '[0;47m' #= @{ bg = ConsoleColor.White }
+        '[40;1m' #= @{ bg = ConsoleColor.DarkGrey }
+        '[41;1m' #= @{ bg = ConsoleColor.Red }
+        '[42;1m' #= @{ bg = ConsoleColor.Green }
+        '[43;1m' #= @{ bg = ConsoleColor.Yellow }
+        '[44;1m' #= @{ bg = ConsoleColor.Blue }
+        '[45;1m' #= @{ bg = ConsoleColor.Magenta }
+        '[46;1m' #= @{ bg = ConsoleColor.Cyan }
+        '[47;1m' #= @{ bg = ConsoleColor.White }
+    )
+    foreach ($segment in $text.split([char] 27)) {
+        foreach($code in $ansi_colors) {
+            if($segment.startswith($code)) {
+                $segment = $segment.replace($code, "")
+            }
+        }
+        Write-Host -NoNewline $segment
+    }
+    Write-Host ""
+}
+ 
+ 
+Function Resolve-Tower-Asset{
+    Param($Name, $Url)
+    Process {
+        if($script:Verbose) { Write-Host "Resolving name $Name" }
+        $object = $null
+        if($Name -match '^[0-9]+$') {
+            if($script:Verbose) { Write-Host "Using $Name as ID as its an int already" }
+            $url = "$Url/$Name/"
+            try { $object = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object]) }
+            catch {
+                Write-Host "Error when resolving ID for $Name"
+                Write-Host $_
+                return $null
+            }
+        } else {
+           if($script:Verbose) { Write-Host "Looking up ID of name $Name" }
+            $url = "$Url/?name=$Name"
+            try { $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object]) }
+            catch {
+                Write-Host "Unable to resolve name $Name"
+                Write-Host $_
+                return $null
+            }
+            if($response.count -eq 0) {
+                Write-Host "Got no results when trying to get ID for $Name"
+                return $null
+            } elseif($response.count -ne 1) {
+                Write-Host "Did not get a unique job ID for job name $Name"
+                return $null
+            }
+            if($script:Verbose) { Write-Host "Resolved to ID $($response.results[0].id)" }
+            $object = $response.results[0]
+        }
+        return $object
+    }
+}
+
+
+function Get-Auth-Headers {
+    # If we did not get a TowerOAuthToken or a (TowerUsername and TowerPassword) then we can't even try to auth
+    if(-not (($TowerUsername -and $TowerPassword) -or $TowerOAuthToken)) {
+        Fail-Step "Please pass an OAuth Token and or a Username/Password to authenticate to Tower with"
+    }
+
+    if($TowerOAuthToken) {
+        if($verbose) { Write-Host "Testing OAuth token" }
+        $token_headers = @{ "Authorization" = "Bearer $TowerOAuthToken" }
+        try {
+            # We have to assign it to something or we get a line in the output
+            $junk = $jsonParser.Deserialize((Invoke-WebRequest "$api_base/job_templates/?name=Octopus" -Method GET -Headers $token_headers -UseBasicParsing), [System.Object])
+            $script:auth_headers = $token_headers
+            return
+        } catch {
+            Write-Host "Unable to authenticate to the Tower server with OAuth token"
+            Write-Host $_
+        }
+    }
+
+    if(-not ($TowerUsername -and $TowerPassword)) {
+        Fail-Step "No username/password to fall back on"
+    }
+
+    if($verbose) { Write-Host "Testing basic auth" }
+    $pair = "${TowerUsername}:${TowerPassword}"
+    $bytes = [System.Text.Encoding]::ASCII.GetBytes($pair)
+    $base64 = [System.Convert]::ToBase64String($bytes)
+    $basic_auth_value = "Basic $base64"
+    $headers = @{ "Authorization" = $basic_auth_value }
+    try {
+        # We have to assign it to something or we get a line in the output
+        $junk = $jsonParser.Deserialize((Invoke-WebRequest "$api_base/job_templates/?name=Octopus" -Method GET -Headers $headers -UseBasicParsing), [System.Object])
+        $script:auth_headers = $headers
+    } catch {
+        Write-Host $_
+        Fail-Step "Username password combination failed to work"
+    }
+
+    if ($script:Verbose) { Write-Host "Attempting to get authentcation Token for $TowerUsername" }
+    $body = @{
+        username = $TowerUsername
+        password = $TowerPassword
+    } | ConvertTo-Json
+    $url = "$api_base/authtoken/"
+    try {
+        $auth_token = $jsonParser.Deserialize((Invoke-WebRequest $url -Method POST -Headers $headers -Body $body -ContentType "application/json" -UseBasicParsing), [System.Object])
+        $script:auth_headers = @{ Authorization = "Token $($auth_token.token)" }
+        return
+    } catch {
+        if($_.Exception.Response.StatusCode -eq 404) {
+            Write-Host(">>> Server does not support authtoken, try using an OAuth Token")
+            Write-Host(">>> Defaulting to perpetual basic auth. This can be slow for authentication with external sources")
+            return
+        } else {
+            Write-Host $_
+            Fail-Step "Unable to authenticate to the Tower server for Auth token"
+        }
+    }
+}
+
+function Watch-Job-Complete {
+    Param($Id)
+    Process {
+        $last_log_id = 0
+        while($True) {
+            # First log any events if the user wants them
+            if($TowerImportLogs) {
+                $url = "$api_base/jobs/$Id/job_events/?id__gt=$last_log_id"
+                $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])
+                foreach($result in $response.results) {
+                    if($last_log_id -lt $result.id) { $last_log_id = $result.id }
+                    if($result.event_data -and $result.event_data.res -and $result.event_data.res.output) {
+                        foreach($line in $result.event_data.res.output) {
+                            Write-AnsibleLine($line)
+                        }
+                    } else {
+                        $line = $result.stdout
+                        Write-AnsibleLine($line)
+                    }
+                }
+            }
+ 
+            # Now check the status of the job
+            $url = "$api_base/jobs/$Id/"
+            $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])
+            if($response.finished) {
+               $response.failed
+               return
+            } else {
+               Start-Sleep -s $SecondsBetweenChecks
+            }
+        }
+    }
+}
+ 
+function Watch-Workflow-Complete {
+    Param($Id)
+    Process {
+        $workflow_node_id = 0
+        while($True) {
+            # Check to see if there are any jobs we need to follow
+            $url = "$tower_base/api/v2/workflow_jobs/$Id/workflow_nodes/?id__gt=$workflow_node_id"
+            $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])
+
+            # If there are no nodes whose ID is > the last one we looked at we can see if we are complete
+            if($response.count -eq 0) {
+                $url = "$tower_base/api/v2/workflow_jobs/$Id/"
+                $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])
+                if($response.finished) {
+                    $response.failed
+                    return
+                } else {
+                    Start-Sleep -s $SecondsBetweenChecks
+                }
+            } else {
+                foreach($result in $response.results) {
+                    if($result.summary_fields.unified_job_template.unified_job_type -eq 'job') {
+                        $job_id = $result.summary_fields.job.id
+                        if(-not $job_id) {
+                            # This is a job but it hasn't started yet, lets sleep and try again
+                            Start-Sleep -s $SecondsBetweenChecks
+                            break
+                        }
+                        if($script:Verbose) { Write-Host "Monitoring job $($result.summary_fields.job.name)" }
+                        # We have to trap the return of Watch-Job-Complete
+                        $junk = Watch-Job-Complete -Id $job_id
+                    } else {
+                        if($script:Verbose) { Write-Host "Not pulling logs for node $($result.id) which is a $($result.summary_fields.unified_job_template.unified_job_type)" }
+                    }
+                    $workflow_node_id = $result.id
+                }
+            }
+        }
+    }
+}
+
+
+
+##### Main Body
+
+
+
+
+# Check that we got a TowerJobTemplate, without one we can't do anything
+if(-not ($TowerJobType -eq "job" -or $TowerJobType -eq "workflow")) { Fail-Stop "The job type must be either job or workflow" }
+if($TowerJobTemplate -eq $null -or $TowerJobTemplate -eq "") { Fail-Step "A Job Name needs to be specified" }
+if($TowerJobTags -eq "") { $TowerJobTags = $null }
+if($TowerExtraVars -eq "") { $TowerExtraVars = $null }
+if($TowerLimit -eq "") { $TowerLimit = $null }
+if($TowerInventory -eq "") { $TowerInventory = $null }
+if($TowerCredential -eq "") { $Credential = $null }
+if($TowerImportLogs -and $TowerImportLogs -eq "True") { $TowerImportLogs = $True } else { $TowerImportLogs = $False }
+if($TowerVerbose -and $TowerVerbose -eq "True") { $Verbose = $True} else { $Verbose = $False }
+if($TowerSecondsBetweenChecks) {
+    try { $SecondsBetweenChecks = [int]$TowerSecondsBetweenChecks }
+    catch {
+        write-Host "Failed to parse $TowerSecondsBetweenChecks as integer, defaulting to 3"
+        $SecondsBetweenChecks = 3
+    }
+} else {
+    $SecondsBetweenChecks = 3
+}
+if($TowerTimeLimitInSeconds) {
+    try { $TowerTimeLimitInSeconds = [int]$TowerTimeLimitInSeconds }
+    catch {
+        write-Host "Failed to parse $TowerTimeLimitInSeconds as integer, defaulting to 600"
+        $TowerTimeLimitInSeconds = 600
+    }
+} else {
+    $TowerTimeLimitInSeconds = 600
+}
+if($TowerIgnoreCert -and $TowerIgnoreCert -eq "True") {
+    # Joyfully borrowed from Markus Kraus' post on
+    # https://blog.ukotic.net/2017/08/15/could-not-establish-trust-relationship-for-the-ssltls-invoke-webrequest/
+    if(-not([System.Management.Automation.PSTypeName]'TrustAllCertsPolicy').Type) {
+        Add-Type @"
+            using System.Net;
+            using System.Security.Cryptography.X509Certificates;
+            public class TrustAllCertsPolicy : ICertificatePolicy {
+                public bool CheckValidationResult(ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem) {
+                    return true;
+                }
+            }
+"@
+        [System.Net.ServicePointManager]::CertificatePolicy = New-Object TrustAllCertsPolicy
+        [System.Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    }
+    #endregion
+}
+ 
+if ($Verbose) { Write-Host "Beginning Ansible Tower Run on $TowerServer" }
+$tower_url = [System.Uri]$TowerServer
+if(-not $tower_url.Scheme) { $tower_url = [System.Uri]"https://$TowerServer" }
+$tower_base = $tower_url.ToString().TrimEnd("/")
+$api_base = "${tower_base}/api/v2"
+ 
+# First handle authentication
+#   If we have a TowerOAuthToken try using that
+#   Else get an authentication token if we have a user name/password
+$auth_headers = @{'initial' = 'Data'}
+Get-Auth-Headers
+ 
+ 
+# If the TowerJobTemplate is actually an ID we can just use that.
+# If not we need to lookup the ID from the name
+if($TowerJobType -eq 'job') {
+    $template = Resolve-Tower-Asset -Name $TowerJobTemplate -Url "$api_base/job_templates"
+} else {
+    $template = Resolve-Tower-Asset -Name $TowerJobTemplate -Url "$api_base/workflow_job_templates"
+}
+if($template -eq $null) { Fail-Step "Unable to resolve the job name" }
+ 
+if($TowerExtraVars -ne $null -and $TowerExtraVars -ne '---' -and $template.ask_variables_on_launch -eq $False) {
+    Write-Warning "Extra variables defined but prompt for variables on launch is not set in tower job"
+}
+if($TowerLimit -ne $null -and $template.ask_limit_on_launch -eq $False) {
+    Write-Warning "Limit defined but prompt for limit on launch is not set in tower job"
+}
+if($TowerJobTags -ne $null -and $template.ask_tags_on_launch -eq $False) {
+    Write-Warning "Job Tags defined but prompt for tags on launch is not set in tower job"
+}
+if($TowerInventory -ne $null -and $template.ask_inventory_on_launch -eq $False) {
+    Write-Warning "Inventory defined but prompt for inventory on launch is not set in tower job"
+}
+if($TowerCredential -ne $null -and $template.ask_credential_on_launch -eq $False) {
+    Write-Warning "Credential defined but prompt for credential on launch is not set in tower job"
+}
+<#
+// Here are some more options we may want to use/check someday
+//    "ask_diff_mode_on_launch": false,
+//    "ask_skip_tags_on_launch": false,
+//    "ask_job_type_on_launch": false,
+//    "ask_verbosity_on_launch": false,
+#>
+ 
+ 
+# Construct the post body
+$post_body = @{}
+if($TowerInventory -ne $null) {
+    $inventory = Resolve-Tower-Asset -Name $TowerInventory -Url "$api_base/inventories"
+    if($inventory -eq $null) { Fail-Step("Unable to resolve inventory") }
+    $post_body.inventory = $inventory.id
+}
+ 
+if($TowerCredential -ne $null) {
+    $credential = Resolve-Tower-Asset -Name $TowerCredential -Url "$api_base/credentials"
+    if($credential -eq $null) { Fail-Step("Unable to resolve credential") }
+    $post_body.credentials = @($credential.id)
+}
+if($TowerLimit -ne $null) { $post_body.limit = $TowerLimit }
+if($TowerJobTags -ne $null) { $post_body.job_tags = $TowerJobTags }
+# Older versions of Tower did not like receiveing "---" as extra vars.
+if($TowerExtraVars -ne $null -and $TowerExtraVars -ne "---") { $post_body.extra_vars = $TowerExtraVars }
+ 
+if($Verbose) { Write-Host "Requesting tower to run $TowerJobTemplate" }
+if($TowerJobType -eq 'job') {
+    $url = "$api_base/job_templates/$($template.id)/launch/"
+} else {
+    $url = "$api_base/workflow_job_templates/$($template.id)/launch/"
+}
+try {
+    $response = Invoke-WebRequest -Uri $url -Method POST -Headers $auth_headers -Body ($post_body | ConvertTo-JSON) -ContentType "application/json" -UseBasicParsing
+} catch {
+    Write-Host "Failed to make request to invoke job"
+    $initialError = $_
+    try {
+        $result = $_.Exception.Response.GetResponseStream()
+        $reader = New-Object System.IO.StreamReader($result)
+        $reader.BaseStream.Position = 0
+        $reader.DiscardBufferedData()
+        $body = $reader.ReadToEnd() | ConvertFrom-Json
+        <#
+            Some stuff that we might want to catch includes:
+                {"extra_vars":["Must be valid JSON or YAML."]}
+                {"variables_needed_to_start":["'my_var' value missing"]}
+                {"credential":["Invalid pk \"999999\" - object does not exist."]}
+                {"inventory":["Invalid pk \"99999999\" - object does not exist."]}
+            The last two we don't really care about because we should never hit them
+        #>
+        if($body.extra_vars -ne $null) {
+            Fail-Step "Failed to launch job: extra vars must be vailid JSON or YAML."
+        } elseif($body.variables_needed_to_start -ne $null) {
+            Fail-Step "Failed to launch job: $($body.variables_needed_to_start)"
+        } else {
+            Write-Host $body
+            Fail-Step "Failed to launch job for an unknown reason"
+        }
+    } catch {
+        Write-Host "Failed to get response body from request"
+        Write-Host $initialError
+    }
+}
+
+
+$template_id = $($response | ConvertFrom-Json).id
+Write-Host("Best Guess Job URL: $tower_base/#/$($TowerJobType)s/$template_id")
+ 
+# For whatever reason, this never fires
+#$timer = new-object System.Timers.Timer
+#$timer.Interval = 500 #1000 * $TowerTimeLimitInSeconds
+#$action = { Fail-Step "Timed out waiting for Tower to complete tempate run. Template may still be running in Tower." }
+#$tower_timer = Register-ObjectEvent -InputObject $timer -EventName Elapsed -Action $action
+#$timer.AutoReset = $False
+#$timer.Enabled = $True
+
+if($TowerJobType -eq 'job') {
+    $failed = Watch-Job-Complete -Id $template_id
+} else {
+    $failed = Watch-Workflow-Complete -Id $template_id
+}
+
+#$timer.Stop()
+#Unregister-Event $tower_timer.Name
+
+
+if($failed) {
+    Fail-Step "Job Failed"
+} else {
+    Write-Host "Job Succeeded"
+}
diff --git a/src/step-templates/apexsql-devops-toolkit-deploy/metadata.json b/src/step-templates/apexsql-devops-toolkit-deploy/metadata.json
new file mode 100644
index 000000000..949c27062
--- /dev/null
+++ b/src/step-templates/apexsql-devops-toolkit-deploy/metadata.json
@@ -0,0 +1,84 @@
+{
+  "Id": "42412324-a768-4943-baf8-bfe26ed2dff3",
+  "Name": "ApexSQL DevOps toolkit - Deploy",
+  "Description": "This step will execute schema and data synchronization scripts created as deployment resource after comparison is done. \n\nApexSQL DevOps toolkit - Sync and/or ApexSQL DevOps toolkit - Sync data  steps are reqiured",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "ad2fad54-09c4-4210-adbc-ab238632cd67",
+      "Name": "DownloadPackageStepName",
+      "Label": "Retrieve package from",
+      "HelpText": "Select the step from which the synchronization sripts package can be sourced",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "b899f7a2-49dd-4193-8640-54e815996e02",
+      "Name": "ExportPath",
+      "Label": "Export location",
+      "HelpText": "The location for exported deployment resources. Provide the path used for synchronization steps. All tentacles used in database deployment steps should have access to the chosen location",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f0886e0e-f592-4fd7-ba04-8191224f3436",
+      "Name": "ServerName",
+      "Label": "SQL Server",
+      "HelpText": "Provide the SQL Server name for the deployment target database",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d1358f62-a3ff-4e24-b46c-036e33ff40f4",
+      "Name": "Database",
+      "Label": "Database",
+      "HelpText": "The target database for the deployment of schema and data synchronization scripts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6572b012-7386-4bae-ae31-e72ac19e5171",
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "The account name used for SQL authentication method. Windows authentication method with the account that runs the Tentacle service will be used for SQL Server connection if left empty",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d97dbe49-ccec-4be3-81a8-e356365aa250",
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Enter password for chosen account used for SQL authentication method. Leave empty if Windows authentication method is used",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-20T11:36:52.0480000Z",
+    "OctopusVersion": "2020.3.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ApexSQLtechops",
+  "Category": "apexsql"
+}
diff --git a/src/step-templates/apexsql-devops-toolkit-deploy/scriptbody.ps1 b/src/step-templates/apexsql-devops-toolkit-deploy/scriptbody.ps1
new file mode 100644
index 000000000..920a6b815
--- /dev/null
+++ b/src/step-templates/apexsql-devops-toolkit-deploy/scriptbody.ps1
@@ -0,0 +1,96 @@
+$schemaSyncScript = ''
+$dataSyncScript = ''
+$schemaSyncQuery = ''
+$dataSyncQuery= ''
+$query = ''
+
+function AddArtifact() {
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$artifact
+    )
+    if (Test-Path $artifact) {
+        New-OctopusArtifact $artifact
+    }
+}
+
+function Get-ParamValue
+{
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [String] $ParamName
+    )
+    if($OctopusParameters -and ($OctopusParameters["$($ParamName)"] -ne $null))
+    {
+        # set the variable value
+        return $OctopusParameters["$($ParamName)"]
+    }
+    else
+    {
+        # warning
+        return $null
+    }
+}
+
+$exportPath = '#{ExportPath}'
+$PackageDownloadStepName = '#{PackageDownloadStepName}'
+
+$projectId = $OctopusParameters["Octopus.Project.Id"]
+$releaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$nugetPackageId = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Package.NuGetPackageId"]
+$exportPath = Join-Path (Join-Path $exportPath $projectId) $releaseNumber
+
+$defaultSchemaSyncScript = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath"] + '\SchemaSyncScript.sql'
+$defaultDataSyncScript = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath"] + '\DataSyncScript.sql'
+
+New-Item -Path $exportPath -Name "DeploySummary.txt" -ItemType "file" -Force | Out-Null
+$deploySummary = $exportPath + "\DeploySummary.txt"
+
+$schemaSyncScript = $exportPath + '\SchemaSyncScript.sql'
+$dataSyncScript = $exportPath + '\DataSyncScript.sql'
+$serverName = Get-ParamValue -ParamName 'ServerName'
+  $database = Get-ParamValue -ParamName 'Database'
+  $username = Get-ParamValue -ParamName 'Username'
+  $password = Get-ParamValue -ParamName 'Password'
+  $auth = ''
+  
+  if (-not ($null -eq $username -and $null -eq $password))
+  {	
+      $auth = " -U ""$($username)"" -P ""$($password)"""
+  }
+  else
+  {	
+      $auth = " -E"
+  }
+
+$sqlcmdProps = "sqlcmd.exe -S ""$($serverName)"" -d ""$($database)""$auth -b -i"
+	if(Test-Path $schemaSyncScript) 
+    {
+		$result = Invoke-Expression -Command "$sqlcmdProps ""$schemaSyncScript"""
+        $content = "Sync summary: " + $result
+        if (Test-Path $deploySummary)
+        {
+        	Add-Content $deploySummary $content
+        }
+	}
+  	if(Test-Path $dataSyncScript) 
+    {
+		$result = Invoke-Expression -Command "$sqlcmdProps ""$dataSyncScript"""
+        $content = "Sync data summary: " + $result
+        if (Test-Path $deploySummary)
+        {
+        	Add-Content $deploySummary $content
+        }
+	}
+
+	if(Test-Path $defaultSchemaSyncScript) 
+    {
+		$result = Invoke-Expression -Command "$sqlcmdProps ""$defaultSchemaSyncScript"""
+	}
+    if(Test-Path $defaultDataSyncScript) 
+    {
+		$result = Invoke-Expression -Command "$sqlcmdProps ""$defaultDataSyncScript"""
+	}
+
+AddArtifact("$deploySummary")
\ No newline at end of file
diff --git a/src/step-templates/apexsql-devops-toolkit-sync-data/metadata.json b/src/step-templates/apexsql-devops-toolkit-sync-data/metadata.json
new file mode 100644
index 000000000..944245339
--- /dev/null
+++ b/src/step-templates/apexsql-devops-toolkit-sync-data/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "71d5998a-3100-4a7e-9565-b65bf0fa2352",
+  "Name": "ApexSQL DevOps toolkit - Sync data",
+  "Description": "The step will compare database from a deployment package with target database to create data synchronization script deployment resource.\n\n[ApexSQL Data Diff](https://www.apexsql.com/sql-tools-datadiff.aspx) is requred",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "3d6da5fc-e18f-4092-9e01-03c35f650644",
+      "Name": "PackageDownloadStepName",
+      "Label": "Retrieve package from",
+      "HelpText": "Select the step from which the database package can be sourced",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "a349fecf-1fe3-4827-8d3b-9f02fb2a12cf",
+      "Name": "ExportPath",
+      "Label": "Export location",
+      "HelpText": "The location for exported deployment resources. This path will be used in the “ApexSQL DevOps toolkit – Deploy” step",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "11c4c432-f021-4671-96e0-04c2b9da1588",
+      "Name": "ServerName",
+      "Label": "SQL Server",
+      "HelpText": "Provide the SQL Server name for the deployment target database",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "96fe6267-ac00-461f-bb97-a33cf628ac94",
+      "Name": "Database",
+      "Label": "Database",
+      "HelpText": "Provide the name of the target database which will be used for comparison with source data located in the deployment package in order to generate deployment resource",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1deec13b-2b56-43fb-a43e-f73c8825a986",
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "The account name used for SQL authentication method. Windows authentication method with the account that runs the Tentacle service will be used for SQL Server connection if left empty",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e2abb015-9baa-44cc-8c9a-93ba368d36aa",
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Enter password for chosen account used for SQL authentication method. Leave empty if Windows authentication method is used",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ea6a3d17-1341-4f86-87bf-57c39616132c",
+      "Name": "ProjectFilePath",
+      "Label": "Project file path",
+      "HelpText": "Use to import data comparison options and rows filter template created with ApexSQL Data Diff. Application defaults will be used if not provided\n\nSee also:\n[Using the Row filter option in ApexSQL Data Diff](https://knowledgebase.apexsql.com/using-row-filter-feature-in-apexsql-data-diff/)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "24fb5094-7d3e-421a-bddd-5629aba43982",
+      "Name": "Additional",
+      "Label": "Additional parameters",
+      "HelpText": "Enter any CLI options switches used with ApexSQL Data Diff. Options will override existing options imported from project file\n\nSee also:\n[ApexSQL Data Diff Command Line Interface (CLI) switches](https://knowledgebase.apexsql.com/apexsql-data-diff-command-line-interface-cli-switches/)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-20T11:41:02.4930000Z",
+    "OctopusVersion": "2020.3.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ApexSQLtechops",
+  "Category": "apexsql"
+}
diff --git a/src/step-templates/apexsql-devops-toolkit-sync-data/scriptbody.ps1 b/src/step-templates/apexsql-devops-toolkit-sync-data/scriptbody.ps1
new file mode 100644
index 000000000..8d648f825
--- /dev/null
+++ b/src/step-templates/apexsql-devops-toolkit-sync-data/scriptbody.ps1
@@ -0,0 +1,138 @@
+function Get-ApexSQLToolLocation
+{
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [String] $ApplicationName
+    )
+    $key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\ApexSQL $($ApplicationName)_is1"
+    if (Test-Path "HKLM:\$Key")
+    {
+		$ApplicationPath = (Get-ItemProperty -Path "HKLM:\$key" -Name InstallLocation).InstallLocation
+	}
+    else
+    {
+		$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry64)
+
+		$regKey= $reg.OpenSubKey("$key")
+		if ($regKey)
+        {
+			$ApplicationPath = $regKey.GetValue("InstallLocation")
+		}
+        else
+        {
+			$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry32)
+			$regKey= $reg.OpenSubKey("$key")
+			if ($regKey)
+            {
+				$ApplicationPath = $regKey.GetValue("InstallLocation")
+			}
+            else
+            {
+                return $null
+			}
+		}
+	}
+    if ($ApplicationPath)
+    {
+        return $ApplicationPath + "ApexSQL" + $ApplicationName.replace(' ','') + ".com"
+    }
+}
+
+function AddArtifact() {
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$artifact
+    )
+    if (Test-Path $artifact) {
+        New-OctopusArtifact $artifact
+    }
+}
+
+function Get-ParamValue
+{
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [String] $ParamName
+    )
+    if($OctopusParameters -and ($OctopusParameters["$($ParamName)"] -ne $null))
+    {
+        # set the variable value
+        return $OctopusParameters["$($ParamName)"]
+    }
+    else
+    {
+        # warning
+        return $null
+    }
+}
+
+$exportPath = Get-ParamValue -ParamName 'ExportPath'
+$PackageDownloadStepName = Get-ParamValue -ParamName 'PackageDownloadStepName'
+$s2 = Get-ParamValue -ParamName 'ServerName'
+$d2 = Get-ParamValue -ParamName 'Database'
+$u2 = Get-ParamValue -ParamName 'Username'
+$p2 = Get-ParamValue -ParamName 'Password'
+$projectFilePath = Get-ParamValue -ParamName 'ProjectFilePath'
+$additional = Get-ParamValue -ParamName 'Additional'
+
+$projectId = $OctopusParameters["Octopus.Project.Id"]
+$releaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$nugetPackageId = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Package.NuGetPackageId"]
+$exportPath = Join-Path (Join-Path $exportPath $projectId) $releaseNumber
+
+if (-Not (Test-Path $exportPath)) { New-Item $exportPath -ItemType Directory }
+
+$FolderList = Get-ChildItem $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath"] -Directory
+
+Foreach($f in $Folderlist){
+if ($f.Name -like '*Script*')
+	{
+ 		$DatabaseScripts = $f.Name
+ 	}
+}
+
+$sfPath = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath"] + '\' + $DatabaseScripts
+
+if($null -eq $sfPath) {
+    throw "Step: '$PackageDownloadStepName' didn't download any NuGet package."
+}
+
+$dataSyncScript = "DataSyncScript.sql"
+$dataSyncSummary = "DataSyncSummary.log"
+$dataSyncReport = "DataSyncReport.html"
+
+
+$creds2 = ''
+if ($u2 -ne $null -and $p2 -ne $null)
+{
+    $creds2 = "/user2:`"$($u2)`" /password2:`"$($p2)`""
+}
+
+$project = ''
+if($projectFilePath -ne $null)
+{
+    $project = "/project: `"$($projectFilePath)`""
+}
+
+$additionalParams = ''
+if($additional -ne $null)
+{
+    $additionalParams = $additional
+}
+
+
+$toolLocation = Get-ApexSQLToolLocation -ApplicationName 'Data Diff'
+$toolParams = " /sf1:`"$($sfPath)`" /server2:`"$($s2)`" /database2:`"$($d2)`" $($creds2)"
+$toolParams += " /ot:sql /on:`'$($exportPath)\$($dataSyncScript)`'"
+$toolParams += " /ot2:html /on2:`"$($exportPath)\$($dataSyncReport)`""
+$toolParams += " /cso:`"$($exportPath)\$($dataSyncSummary)`""
+$toolParams += " $($project)"
+$toolParams += " $($additionalParams) /v /f"
+write-host $toolParams
+Invoke-Expression -Command ("& `"$($toolLocation)`" $toolParams")
+
+AddArtifact("$exportPath\$dataSyncScript")
+AddArtifact("$exportPath\$dataSyncSummary")
+AddArtifact("$exportPath\$dataSyncReport")
\ No newline at end of file
diff --git a/src/step-templates/apexsql-devops-toolkit-sync/metadata.json b/src/step-templates/apexsql-devops-toolkit-sync/metadata.json
new file mode 100644
index 000000000..4a1320ffa
--- /dev/null
+++ b/src/step-templates/apexsql-devops-toolkit-sync/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "3dfd5df3-2e9f-412b-93be-dcf4ef2d3da7",
+  "Name": "ApexSQL DevOps toolkit - Sync",
+  "Description": "The step will compare the database from a deployment package with the target database to create a schema synchronization script deployment resource\n\n[ApexSQL Diff](https://www.apexsql.com/sql-tools-diff.aspx) is required",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "86778bfc-aab9-42ea-b67b-ee0c0fe1c203",
+      "Name": "PackageDownloadStepName",
+      "Label": "Retrieve package from",
+      "HelpText": "Select the step from which the database package can be sourced",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "fd75e328-92da-4e88-bb1c-35504fdccf15",
+      "Name": "ExportPath",
+      "Label": "Export location",
+      "HelpText": "The location for exported deployment resources. This path will be used in the “ApexSQL DevOps toolkit – Deploy” step. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a487d044-8a82-4065-bb1d-d7ccb5a65468",
+      "Name": "ServerName",
+      "Label": "SQL Server",
+      "HelpText": "Provide the SQL Server name for the deployment target database",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dca94a19-8d97-49b5-a4e5-21f32781df32",
+      "Name": "Database",
+      "Label": "Database",
+      "HelpText": "Provide the name of the target database which will be used for comparison with source schema located in the deployment package in order to generate deployment resource. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5465f0aa-7b85-4020-99f9-a9f45f7b39b3",
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "The account name used for SQL authentication method. Windows authentication method with the account that runs the Tentacle service will be used for SQL Server connection if left empty",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5396a1bd-5f84-48cd-a452-135aa67a24a4",
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Enter password for chosen account used for SQL authentication method. Leave empty if Windows authentication method is used",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "2a296435-ccf6-444d-8cb6-d0606eb1bce8",
+      "Name": "ProjectFilePath",
+      "Label": "Project file path",
+      "HelpText": "Use to import schema comparison options and objects filter template created with ApexSQL Diff. Application defaults will be used if not provided\n\nSee also:\n[How to narrow schema comparison and synchronization to affected objects only](https://knowledgebase.apexsql.com/narrow-schema-comparison-synchronization-affected-objects/)\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e3cfcc10-1e5c-4554-83ca-0d9db66c7848",
+      "Name": "Additional",
+      "Label": "Additional parameters",
+      "HelpText": "Enter any CLI options switches used with ApexSQL Diff. Options will override existing options imported from project file\n\nSee also:\n[ApexSQL Diff Command Line Interface (CLI) switches](https://knowledgebase.apexsql.com/apexsql-diff-command-line-interface-cli-switches/)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-20T11:40:28.1790000Z",
+    "OctopusVersion": "2020.3.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ApexSQLtechops",
+  "Category": "apexsql"
+}
diff --git a/src/step-templates/apexsql-devops-toolkit-sync/scriptbody.ps1 b/src/step-templates/apexsql-devops-toolkit-sync/scriptbody.ps1
new file mode 100644
index 000000000..2068f7632
--- /dev/null
+++ b/src/step-templates/apexsql-devops-toolkit-sync/scriptbody.ps1
@@ -0,0 +1,138 @@
+function Get-ApexSQLToolLocation
+{
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [String] $ApplicationName
+    )
+    $key = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\ApexSQL $($ApplicationName)_is1"
+    if (Test-Path "HKLM:\$Key")
+    {
+		$ApplicationPath = (Get-ItemProperty -Path "HKLM:\$key" -Name InstallLocation).InstallLocation
+	}
+    else
+    {
+		$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry64)
+
+		$regKey= $reg.OpenSubKey("$key")
+		if ($regKey)
+        {
+			$ApplicationPath = $regKey.GetValue("InstallLocation")
+		}
+        else
+        {
+			$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry32)
+			$regKey= $reg.OpenSubKey("$key")
+			if ($regKey)
+            {
+				$ApplicationPath = $regKey.GetValue("InstallLocation")
+			}
+            else
+            {
+                return $null
+			}
+		}
+	}
+    if ($ApplicationPath)
+    {
+        return $ApplicationPath + "ApexSQL" + $ApplicationName.replace(' ','') + ".com"
+    }
+}
+
+function AddArtifact() {
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$artifact
+    )
+    if (Test-Path $artifact) {
+        New-OctopusArtifact $artifact
+    }
+}
+
+function Get-ParamValue
+{
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [String] $ParamName
+    )
+    if($OctopusParameters -and ($OctopusParameters["$($ParamName)"] -ne $null))
+    {
+        # set the variable value
+        return $OctopusParameters["$($ParamName)"]
+    }
+    else
+    {
+        # warning
+        return $null
+    }
+}
+
+$exportPath = Get-ParamValue -ParamName 'ExportPath'
+$PackageDownloadStepName = Get-ParamValue -ParamName 'PackageDownloadStepName'
+$s2 = Get-ParamValue -ParamName 'ServerName'
+$d2 = Get-ParamValue -ParamName 'Database'
+$u2 = Get-ParamValue -ParamName 'Username'
+$p2 = Get-ParamValue -ParamName 'Password'
+$projectFilePath = Get-ParamValue -ParamName 'ProjectFilePath'
+$additional = Get-ParamValue -ParamName 'Additional'
+
+$projectId = $OctopusParameters["Octopus.Project.Id"]
+$releaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$nugetPackageId = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Package.NuGetPackageId"]
+$exportPath = Join-Path (Join-Path $exportPath $projectId) $releaseNumber
+
+if (-Not (Test-Path $exportPath)) { New-Item $exportPath -ItemType Directory }
+
+$FolderList = Get-ChildItem $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath"] -Directory
+
+Foreach($f in $Folderlist){
+if ($f.Name -like '*Script*')
+	{
+ 		$DatabaseScripts = $f.Name
+ 	}
+}
+
+$sfPath = $OctopusParameters["Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath"] + '\' + $DatabaseScripts
+
+if($null -eq $sfPath) {
+    throw "Step: '$PackageDownloadStepName' didn't download any NuGet package."
+}
+
+$schemaSyncScript = "SchemaSyncScript.sql"
+$schemaSyncSummary = "SchemaSyncSummary.log"
+$schemaSyncReport = "SchemaSyncReport.html"
+
+
+$creds2 = ''
+if ($u2 -ne $null -and $p2 -ne $null)
+{
+    $creds2 = "/user2:`"$($u2)`" /password2:`"$($p2)`""
+}
+
+$project = ''
+if($projectFilePath -ne $null)
+{
+    $project = "/project: `"$($projectFilePath)`""
+}
+
+$additionalParams = ''
+if($additional -ne $null)
+{
+    $additionalParams = $additional
+}
+
+
+$toolLocation = Get-ApexSQLToolLocation -ApplicationName 'Diff'
+$toolParams = " /sf1:`"$($sfPath)`" /server2:`"$($s2)`" /database2:`"$($d2)`" $($creds2)"
+$toolParams += " /ot:sql /on:`'$($exportPath)\$($schemaSyncScript)`'"
+$toolParams += " /ot2:html /on2:`"$($exportPath)\$($schemaSyncReport)`""
+$toolParams += " /cso:`"$($exportPath)\$($schemaSyncSummary)`""
+$toolParams += " $($project)"
+$toolParams += " $($additionalParams) /v /f"
+
+Invoke-Expression -Command ("& `"$($toolLocation)`" $toolParams")
+
+AddArtifact("$exportPath\$schemaSyncScript")
+AddArtifact("$exportPath\$schemaSyncSummary")
+AddArtifact("$exportPath\$schemaSyncReport")
\ No newline at end of file
diff --git a/step-templates/apollo-rover-check-subgraph-schema.json b/src/step-templates/apollo-rover-check-subgraph-schema/metadata.json
similarity index 67%
rename from step-templates/apollo-rover-check-subgraph-schema.json
rename to src/step-templates/apollo-rover-check-subgraph-schema/metadata.json
index a3bb23b16..116e2d2ad 100644
--- a/step-templates/apollo-rover-check-subgraph-schema.json
+++ b/src/step-templates/apollo-rover-check-subgraph-schema/metadata.json
@@ -20,7 +20,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "APOLLO_KEY=$(get_octopusvariable \"ApolloKey\")\nAPOLLO_GRAPH_REF=$(get_octopusvariable \"ApolloGraphRef\")\nSUBGRAPH_NAME=$(get_octopusvariable \"ApolloSubgraphName\")\nSCHEMA=$(get_octopusvariable \"ApolloSchema\")\nver=$(get_octopusvariable \"ApolloRoverVersion\")\n\n[ -z \"$ver\" ] || [ \"$ver\" == \"latest\" ] && ROVER_VERSION=\"latest\" || ROVER_VERSION=\"v$ver\"\n\nmissing_params=()\n\n[ -z \"$APOLLO_KEY\" ] && missing_params+=(\"ApolloKey\")\n[ -z \"$APOLLO_GRAPH_REF\" ] && missing_params+=(\"ApolloGraphRef\")\n[ -z \"$SUBGRAPH_NAME\" ] && missing_params+=(\"SubgraphName\")\n[ -z \"$SCHEMA\" ] && missing_params+=(\"Schema\")\n\nif [ -n \"$missing_params\" ]; then\n  >&2 echo \"Missing parameters: ${missing_params[@]}\"\n  exit 1\nfi\n\ncurl -sSL https://rover.apollo.dev/nix/$ROVER_VERSION -o installer\n\nif [ \"$(head -n1 installer)\" != \"#!/bin/bash\" ]; then\n  >&2 echo \"There was a problem fetching $ROVER_VERSION of Rover CLI:\"\n  >&2 cat installer\n  rm installer\n  exit 1\nfi\n\nsh installer --force 2>&1\nrm installer\n\nAPOLLO_KEY=$APOLLO_KEY ~/.rover/bin/rover subgraph check $APOLLO_GRAPH_REF \\\n  --name $SUBGRAPH_NAME \\\n  --schema $SCHEMA \\\n  2>&1\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -80,7 +80,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2023-10-23T17:06:36.419Z",
+    "ExportedAt": "2023-10-23T17:06:36.4190000Z",
     "OctopusVersion": "2023.4.4265",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/apollo-rover-check-subgraph-schema/scriptbody.sh b/src/step-templates/apollo-rover-check-subgraph-schema/scriptbody.sh
new file mode 100644
index 000000000..ab2aeb6cc
--- /dev/null
+++ b/src/step-templates/apollo-rover-check-subgraph-schema/scriptbody.sh
@@ -0,0 +1,36 @@
+APOLLO_KEY=$(get_octopusvariable "ApolloKey")
+APOLLO_GRAPH_REF=$(get_octopusvariable "ApolloGraphRef")
+SUBGRAPH_NAME=$(get_octopusvariable "ApolloSubgraphName")
+SCHEMA=$(get_octopusvariable "ApolloSchema")
+ver=$(get_octopusvariable "ApolloRoverVersion")
+
+[ -z "$ver" ] || [ "$ver" == "latest" ] && ROVER_VERSION="latest" || ROVER_VERSION="v$ver"
+
+missing_params=()
+
+[ -z "$APOLLO_KEY" ] && missing_params+=("ApolloKey")
+[ -z "$APOLLO_GRAPH_REF" ] && missing_params+=("ApolloGraphRef")
+[ -z "$SUBGRAPH_NAME" ] && missing_params+=("SubgraphName")
+[ -z "$SCHEMA" ] && missing_params+=("Schema")
+
+if [ -n "$missing_params" ]; then
+  >&2 echo "Missing parameters: ${missing_params[@]}"
+  exit 1
+fi
+
+curl -sSL https://rover.apollo.dev/nix/$ROVER_VERSION -o installer
+
+if [ "$(head -n1 installer)" != "#!/bin/bash" ]; then
+  >&2 echo "There was a problem fetching $ROVER_VERSION of Rover CLI:"
+  >&2 cat installer
+  rm installer
+  exit 1
+fi
+
+sh installer --force 2>&1
+rm installer
+
+APOLLO_KEY=$APOLLO_KEY ~/.rover/bin/rover subgraph check $APOLLO_GRAPH_REF \
+  --name $SUBGRAPH_NAME \
+  --schema $SCHEMA \
+  2>&1
diff --git a/step-templates/apollo-rover-publish-subgraph-schema.json b/src/step-templates/apollo-rover-publish-subgraph-schema/metadata.json
similarity index 66%
rename from step-templates/apollo-rover-publish-subgraph-schema.json
rename to src/step-templates/apollo-rover-publish-subgraph-schema/metadata.json
index c159b0ea6..73de0f47a 100644
--- a/step-templates/apollo-rover-publish-subgraph-schema.json
+++ b/src/step-templates/apollo-rover-publish-subgraph-schema/metadata.json
@@ -20,7 +20,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "APOLLO_KEY=$(get_octopusvariable \"ApolloKey\")\nAPOLLO_GRAPH_REF=$(get_octopusvariable \"ApolloGraphRef\")\nSUBGRAPH_NAME=$(get_octopusvariable \"ApolloSubgraphName\")\nSUBGRAPH_URL=$(get_octopusvariable \"ApolloSubgraphUrl\")\nSCHEMA=$(get_octopusvariable \"ApolloSchema\")\nver=$(get_octopusvariable \"ApolloRoverVersion\")\n\n[ -z \"$ver\" ] || [ \"$ver\" == \"latest\" ] && ROVER_VERSION=\"latest\" || ROVER_VERSION=\"v$ver\"\n\nmissing_params=()\n\n[ -z \"$APOLLO_KEY\" ] && missing_params+=(\"ApolloKey\")\n[ -z \"$APOLLO_GRAPH_REF\" ] && missing_params+=(\"ApolloGraphRef\")\n[ -z \"$SUBGRAPH_NAME\" ] && missing_params+=(\"SubgraphName\")\n[ -z \"$SUBGRAPH_URL\" ] && missing_params+=(\"SubgraphUrl\")\n[ -z \"$SCHEMA\" ] && missing_params+=(\"Schema\")\n\nif [ -n \"$missing_params\" ]; then\n  >&2 echo \"Missing parameters: ${missing_params[@]}\"\n  exit 1\nfi\n\ncurl -sSL https://rover.apollo.dev/nix/$ROVER_VERSION -o installer\n\nif [ \"$(head -n1 installer)\" != \"#!/bin/bash\" ]; then\n  >&2 echo \"There was a problem fetching $ROVER_VERSION of Rover CLI:\"\n  >&2 cat installer\n  rm installer\n  exit 1\nfi\n\nsh installer --force 2>&1\nrm installer\n\nAPOLLO_KEY=$APOLLO_KEY ~/.rover/bin/rover subgraph publish $APOLLO_GRAPH_REF \\\n  --name $SUBGRAPH_NAME \\\n  --routing-url $SUBGRAPH_URL \\\n  --schema $SCHEMA \\\n  2>&1\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -89,7 +89,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2023-10-23T18:58:06.459Z",
+    "ExportedAt": "2023-10-23T18:58:06.4590000Z",
     "OctopusVersion": "2023.4.4265",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/apollo-rover-publish-subgraph-schema/scriptbody.sh b/src/step-templates/apollo-rover-publish-subgraph-schema/scriptbody.sh
new file mode 100644
index 000000000..48fa20236
--- /dev/null
+++ b/src/step-templates/apollo-rover-publish-subgraph-schema/scriptbody.sh
@@ -0,0 +1,39 @@
+APOLLO_KEY=$(get_octopusvariable "ApolloKey")
+APOLLO_GRAPH_REF=$(get_octopusvariable "ApolloGraphRef")
+SUBGRAPH_NAME=$(get_octopusvariable "ApolloSubgraphName")
+SUBGRAPH_URL=$(get_octopusvariable "ApolloSubgraphUrl")
+SCHEMA=$(get_octopusvariable "ApolloSchema")
+ver=$(get_octopusvariable "ApolloRoverVersion")
+
+[ -z "$ver" ] || [ "$ver" == "latest" ] && ROVER_VERSION="latest" || ROVER_VERSION="v$ver"
+
+missing_params=()
+
+[ -z "$APOLLO_KEY" ] && missing_params+=("ApolloKey")
+[ -z "$APOLLO_GRAPH_REF" ] && missing_params+=("ApolloGraphRef")
+[ -z "$SUBGRAPH_NAME" ] && missing_params+=("SubgraphName")
+[ -z "$SUBGRAPH_URL" ] && missing_params+=("SubgraphUrl")
+[ -z "$SCHEMA" ] && missing_params+=("Schema")
+
+if [ -n "$missing_params" ]; then
+  >&2 echo "Missing parameters: ${missing_params[@]}"
+  exit 1
+fi
+
+curl -sSL https://rover.apollo.dev/nix/$ROVER_VERSION -o installer
+
+if [ "$(head -n1 installer)" != "#!/bin/bash" ]; then
+  >&2 echo "There was a problem fetching $ROVER_VERSION of Rover CLI:"
+  >&2 cat installer
+  rm installer
+  exit 1
+fi
+
+sh installer --force 2>&1
+rm installer
+
+APOLLO_KEY=$APOLLO_KEY ~/.rover/bin/rover subgraph publish $APOLLO_GRAPH_REF \
+  --name $SUBGRAPH_NAME \
+  --routing-url $SUBGRAPH_URL \
+  --schema $SCHEMA \
+  2>&1
diff --git a/src/step-templates/application-insights-annotate-release-with-rbac/metadata.json b/src/step-templates/application-insights-annotate-release-with-rbac/metadata.json
new file mode 100644
index 000000000..4597ac0f2
--- /dev/null
+++ b/src/step-templates/application-insights-annotate-release-with-rbac/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "bc4eae30-786a-4974-a003-948b7a4ed023",
+  "Name": "Application Insights - Annotate Release with Azure CLI and RBAC",
+  "Description": "Marks a release point in Application Insights. This step template uses Azure CLI and Role-Based Access Control instead of an API Key. Used application-insights-annotate-release.json as inspiration.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "ef9d044d-3765-4cb0-af55-22c15ce4013c",
+      "Name": "AppInsights.ApplicationInsightsAccount",
+      "Label": "Application Insights Account",
+      "HelpText": "Azure account for the Application Insights instance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "98174616-d9dd-4e8e-9b01-2961a061360f",
+      "Name": "AppInsights.ApplicationName",
+      "Label": "Application Name",
+      "HelpText": "The Application Insights Application name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "41835ca3-76d3-47f8-b863-d26c782c4ba4",
+      "Name": "AppInsights.ResourceGroup",
+      "Label": "Resource Group",
+      "HelpText": "The Resource Group of the Application Insights instance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e008808c-622d-4efe-91a0-ac666d264996",
+      "Name": "AppInsights.ReleaseName",
+      "Label": "Release Name",
+      "HelpText": "The release name. Typically bound to #{Octopus.Release.Number}",
+      "DefaultValue": "#{Octopus.Release.Number}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "551f06ad-9470-415b-aed9-dd80f3a4123d",
+      "Name": "AppInsights.ReleaseProperties",
+      "Label": "Release Properties",
+      "HelpText": "List of key/value pairs separated by a new-line. For example:\n\n```\nReleaseDescription = Release with annotation\nTriggerBy = John Doe\n```",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-05-17T06:54:43.8520000Z",
+    "OctopusVersion": "2024.1.12600",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedOn": "2024-05-17T07:30:00.0000000Z",
+  "LastModifiedBy": "NielsDM",
+  "Category": "azure"
+}
diff --git a/src/step-templates/application-insights-annotate-release-with-rbac/scriptbody.ps1 b/src/step-templates/application-insights-annotate-release-with-rbac/scriptbody.ps1
new file mode 100644
index 000000000..670c60795
--- /dev/null
+++ b/src/step-templates/application-insights-annotate-release-with-rbac/scriptbody.ps1
@@ -0,0 +1,80 @@
+# Function to decrypt data
+function Convert-PasswordToPlainText {
+	$base64password = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($OctopusParameters["AppInsights.ApplicationInsightsAccount.Password"]))
+    return [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($base64password))
+}
+
+# Function to ensure all Unicode characters in a JSON string are properly escaped
+function Convert-UnicodeToEscapeHex {
+  param (
+    [parameter(Mandatory = $true)][string]$JsonString
+  )
+  $JsonObject = ConvertFrom-Json -InputObject $JsonString
+  foreach ($property in $JsonObject.PSObject.Properties) {
+    $name = $property.Name
+    $value = $property.Value
+    if ($value -is [string]) {
+      $value = [regex]::Unescape($value)
+      $OutputString = ""
+      foreach ($char in $value.ToCharArray()) {
+        $dec = [int]$char
+        if ($dec -gt 127) {
+          $hex = [convert]::ToString($dec, 16)
+          $hex = $hex.PadLeft(4, '0')
+          $OutputString += "\u$hex"
+        }
+        else {
+          $OutputString += $char
+        }
+      }
+      $JsonObject.$name = $OutputString
+    }
+  }
+  return ConvertTo-Json -InputObject $JsonObject -Compress
+}
+
+$applicationName = $OctopusParameters["AppInsights.ApplicationName"]
+$resourceGroup = $OctopusParameters["AppInsights.ResourceGroup"]
+$releaseName = $OctopusParameters["AppInsights.ReleaseName"]
+$properties = $OctopusParameters["AppInsights.ReleaseProperties"]
+
+# Authenticate via Service Principal
+$securePassword = Convert-PasswordToPlainText
+$azEnv = if($OctopusParameters["AppInsights.ApplicationInsightsAccount.AzureEnvironment"]) { $OctopusParameters["AppInsights.ApplicationInsightsAccount.AzureEnvironment"] } else { "AzureCloud" }
+
+$azEnv = Get-AzEnvironment -Name $azEnv
+if (!$azEnv) {
+	Write-Error "No Azure environment could be matched given the name $($OctopusParameters["AppInsights.ApplicationInsightsAccount.AzureEnvironment"])"
+	exit -2
+}
+
+Write-Verbose "Authenticating with Service Principal"
+
+# Force any output generated to be verbose in Octopus logs.
+az login --service-principal -u $OctopusParameters["AppInsights.ApplicationInsightsAccount.Client"] -p $securePassword --tenant $OctopusParameters["AppInsights.ApplicationInsightsAccount.TenantId"]
+
+Write-Verbose "Initiating the body of the annotation"
+
+$releaseProperties = $null
+
+if ($properties -ne $null)
+{
+    $releaseProperties = ConvertFrom-StringData -StringData $properties
+}
+
+$annotation = @{
+    Id = [GUID]::NewGuid();
+    AnnotationName = $releaseName;
+    EventTime = (Get-Date).ToUniversalTime().GetDateTimeFormats("s")[0];
+    Category = "Deployment"; #Application Insights only displays annotations from the "Deployment" Category
+    Properties = ConvertTo-Json $releaseProperties -Compress
+}
+
+$annotation = ConvertTo-Json $annotation -Compress
+$annotation = Convert-UnicodeToEscapeHex -JsonString $annotation  
+
+$body = $annotation -replace '(\\+)"', '$1$1"' -replace "`"", "`"`""
+
+Write-Verbose "Send the annotation to Application Insights"
+
+az rest --method put --uri "/subscriptions/$($OctopusParameters["AppInsights.ApplicationInsightsAccount.SubscriptionNumber"])/resourceGroups/$($resourceGroup)/providers/microsoft.insights/components/$($applicationName)/Annotations?api-version=2015-05-01" --body "$($body) "
\ No newline at end of file
diff --git a/src/step-templates/application-insights-annotate-release/metadata.json b/src/step-templates/application-insights-annotate-release/metadata.json
new file mode 100644
index 000000000..d9ae55fa7
--- /dev/null
+++ b/src/step-templates/application-insights-annotate-release/metadata.json
@@ -0,0 +1,64 @@
+{
+  "Id": "c3278ce2-9cdb-46fd-96ce-e1d03ac327fe",
+  "Name": "Application Insights - Annotate Release",
+  "Description": "Marks a release point in Application Insights.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "4e276bad-2a13-4dc2-bd54-5708a76cf662",
+      "Name": "ApplicationId",
+      "Label": "Application Id",
+      "HelpText": "The Application Insights Application Id.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f818317b-6b62-4695-9272-7062a4c1c601",
+      "Name": "ApiKey",
+      "Label": "Api Key",
+      "HelpText": "The API Key to use to configure the Application Insights application.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a241d2b7-99e0-4ed5-9ed1-5b003d855b33",
+      "Name": "ReleaseName",
+      "Label": "Release Name",
+      "HelpText": "The release name. Typically bound to #{Octopus.Release.Number}",
+      "DefaultValue": "#{Octopus.Release.Number}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bdd7161a-682c-4c6b-98dd-bee990326ed0",
+      "Name": "ReleaseProperties",
+      "Label": "Release Properties",
+      "HelpText": "List of key/value pairs separated by a new-line. For example:\n\n```\nReleaseDescription = Release with annotation\nTriggerBy = John Doe\n```",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-12-18T22:35:12.5420000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2020-04-11T15:22:12.5420000Z",
+    "OctopusVersion": "2020.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/application-insights-annotate-release/scriptbody.ps1 b/src/step-templates/application-insights-annotate-release/scriptbody.ps1
new file mode 100644
index 000000000..565f4544a
--- /dev/null
+++ b/src/step-templates/application-insights-annotate-release/scriptbody.ps1
@@ -0,0 +1,135 @@
+$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
+[Net.ServicePointManager]::SecurityProtocol = $securityProtocol
+
+$applicationId = $OctopusParameters["ApplicationId"]
+$apiKey = $OctopusParameters["ApiKey"]
+$releaseName = $OctopusParameters["ReleaseName"]
+$properties = $OctopusParameters["ReleaseProperties"]
+
+$releaseProperties = $null
+
+if ($properties -ne $null)
+{
+    $releaseProperties = ConvertFrom-StringData -StringData $properties
+}
+
+# background info on how fwlink works: After you submit a web request, many sites redirect through a series of intermediate pages before you finally land on the destination page.
+# So when calling Invoke-WebRequest, the result it returns comes from the final page in any redirect sequence. Hence, I set MaximumRedirection to 0, as this prevents the call to 
+# be redirected. By doing this, we get a resposne with status code 302, which indicates that there is a redirection link from the response body. We grab this redirection link and 
+# construct the url to make a release annotation.
+# Here's how this logic is going to works
+# 1. Client send http request, such as:  http://go.microsoft.com/fwlink/?LinkId=625115
+# 2. FWLink get the request and find out the destination URL for it, such as:  http://www.bing.com
+# 3. FWLink generate a new http response with status code "302" and with destination URL "http://www.bing.com". Send it back to Client.
+# 4. Client, such as a powershell script, knows that status code "302" means redirection to new a location, and the target location is "http://www.bing.com"
+function GetRequestUrlFromFwLink($fwLink)
+{
+    $request = Invoke-WebRequest -Uri $fwLink -MaximumRedirection 0 -UseBasicParsing -ErrorAction Ignore
+    if ($request.StatusCode -eq "302") {
+        return $request.Headers.Location
+    }
+    
+    return $null
+}
+
+function CreateAnnotation($grpEnv)
+{
+	$retries = 1
+	$success = $false
+	while (!$success -and $retries -lt 6) {
+	    $location = "$grpEnv/applications/$applicationId/Annotations?api-version=2015-11"
+		    
+		Write-Host "Invoke a web request for $location to create a new release annotation. Attempting $retries"
+		set-variable -Name createResultStatus -Force -Scope Local -Value $null
+		set-variable -Name createResultStatusDescription -Force -Scope Local -Value $null
+		set-variable -Name result -Force -Scope Local
+
+		try {
+			$result = Invoke-WebRequest -Uri $location -Method Put -Body $bodyJson -Headers $headers -ContentType "application/json; charset=utf-8" -UseBasicParsing
+		} catch {
+		    if ($_.Exception){
+		        if($_.Exception.Response) {
+    				$createResultStatus = $_.Exception.Response.StatusCode.value__
+    				$createResultStatusDescription = $_.Exception.Response.StatusDescription
+    			}
+    			else {
+    				$createResultStatus = "Exception"
+    				$createResultStatusDescription = $_.Exception.Message
+    			}
+		    }
+		}
+
+		if ($result -eq $null) {
+			if ($createResultStatus -eq $null) {
+				$createResultStatus = "Unknown"
+			}
+			if ($createResultStatusDescription -eq $null) {
+				$createResultStatusDescription = "Unknown"
+			}
+		}
+ 		else {
+			    $success = $true			         
+        }
+
+		if ($createResultStatus -eq 409 -or $createResultStatus -eq 404 -or $createResultStatus -eq 401) # no retry when conflict or unauthorized or not found
+		{
+			break
+		}
+
+		$retries = $retries + 1
+		sleep 1
+	}
+
+	$createResultStatus
+	$createResultStatusDescription
+	return
+}
+
+# Need powershell version 3 or greater for script to run
+$minimumPowershellMajorVersion = 3
+if ($PSVersionTable.PSVersion.Major -le $minimumPowershellMajorVersion) {
+   Write-Host "Need powershell version $minimumPowershellMajorVersion or greater to create release annotation"
+   return
+}
+
+$currentTime = (Get-Date).ToUniversalTime()
+$annotationDate = $currentTime.ToString("MMddyyyy_HHmmss")
+set-variable -Name requestBody -Force -Scope Script
+$requestBody = @{}
+$requestBody.Id = [GUID]::NewGuid()
+$requestBody.AnnotationName = $releaseName
+$requestBody.EventTime = $currentTime.GetDateTimeFormats("s")[0] # GetDateTimeFormats returns an array
+$requestBody.Category = "Deployment"
+
+if ($releaseProperties -eq $null) {
+    $properties = @{}
+} else {
+    $properties = $releaseProperties    
+}
+$properties.Add("ReleaseName", $releaseName)
+
+$requestBody.Properties = ConvertTo-Json($properties) -Compress
+
+$bodyJson = [System.Text.Encoding]::UTF8.GetBytes(($requestBody | ConvertTo-Json))
+$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$headers.Add("X-AIAPIKEY", $apiKey)
+
+set-variable -Name createAnnotationResult1 -Force -Scope Local -Value $null
+set-variable -Name createAnnotationResultDescription -Force -Scope Local -Value ""
+
+# get redirect link from fwlink
+$requestUrl = GetRequestUrlFromFwLink("http://go.microsoft.com/fwlink/?prd=11901&pver=1.0&sbp=Application%20Insights&plcid=0x409&clcid=0x409&ar=Annotations&sar=Create%20Annotation")
+if ($requestUrl -eq $null) {
+    $output = "Failed to find the redirect link to create a release annotation"
+    throw $output
+}
+
+$createAnnotationResult1, $createAnnotationResultDescription = CreateAnnotation($requestUrl)
+if ($createAnnotationResult1) 
+{
+     $output = "Failed to create an annotation with Id: {0}. Error {1}, Description: {2}." -f $requestBody.Id, $createAnnotationResult1, $createAnnotationResultDescription
+	 throw $output
+}
+
+$str = "Release annotation created. Id: {0}." -f $requestBody.Id
+Write-Host $str
\ No newline at end of file
diff --git a/step-templates/argo-argocd-app-get.json b/src/step-templates/argo-argocd-app-get/metadata.json
similarity index 63%
rename from step-templates/argo-argocd-app-get.json
rename to src/step-templates/argo-argocd-app-get/metadata.json
index ddb653b82..83149f6ca 100644
--- a/step-templates/argo-argocd-app-get.json
+++ b/src/step-templates/argo-argocd-app-get/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# argocd is required\nif ! [ -x \"$(command -v argocd)\" ]; then\n\tfail_step 'argocd command not found'\nfi\n\n# Helper functions\nisSet() { [ ! -z \"${1}\" ]; }\nisNotSet() { [ -z \"${1}\" ]; }\n\n# Get variables\nargocd_server=$(get_octopusvariable \"ArgoCD.AppGet.ArgoCD_Server\")\nargocd_authToken=$(get_octopusvariable \"ArgoCD.AppGet.ArgoCD_Auth_Token\")\napplicationName=$(get_octopusvariable \"ArgoCD.AppGet.ApplicationName\")\nadditionalParameters=$(get_octopusvariable \"ArgoCD.AppGet.AdditionalParameters\")\n\n# Check required variables\nif isNotSet \"${argocd_server}\"; then\n  fail_step \"argocd_server is not set\"\nfi\n\nif isNotSet \"${argocd_authToken}\"; then\n  fail_step \"argocd_authToken is not set\"\nfi\n\nif isNotSet \"${applicationName}\"; then\n  fail_step \"applicationName is not set\"\nfi\n\nif isSet \"${additionalParameters}\"; then\n  IFS=$'\\n' read -rd '' -a additionalArgs <<< \"$additionalParameters\"\nelse\n  additionalArgs=()\nfi\n\nflattenedArgs=\"${additionalArgs[@]}\"\n\nwrite_verbose \"ARGOCD_SERVER: '${argocd_server}'\"\nwrite_verbose \"ARGOCD_AUTH_TOKEN: '********'\"\n\nauthArgs=\"--server ${argocd_server} --auth-token ${argocd_authToken}\"\nmaskedAuthArgs=\"--server ${argocd_server} --auth-token '********'\"\n\necho \"Executing: argocd app get ${applicationName} ${maskedAuthArgs} ${flattenedArgs}\"\nargocd app get ${applicationName} ${authArgs} ${flattenedArgs}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -56,7 +56,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2025-11-06T15:44:22.814Z",
+    "ExportedAt": "2025-11-06T15:44:22.8140000Z",
     "OctopusVersion": "2025.4.6776",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/argo-argocd-app-get/scriptbody.sh b/src/step-templates/argo-argocd-app-get/scriptbody.sh
new file mode 100644
index 000000000..29f567b89
--- /dev/null
+++ b/src/step-templates/argo-argocd-app-get/scriptbody.sh
@@ -0,0 +1,44 @@
+# argocd is required
+if ! [ -x "$(command -v argocd)" ]; then
+	fail_step 'argocd command not found'
+fi
+
+# Helper functions
+isSet() { [ ! -z "${1}" ]; }
+isNotSet() { [ -z "${1}" ]; }
+
+# Get variables
+argocd_server=$(get_octopusvariable "ArgoCD.AppGet.ArgoCD_Server")
+argocd_authToken=$(get_octopusvariable "ArgoCD.AppGet.ArgoCD_Auth_Token")
+applicationName=$(get_octopusvariable "ArgoCD.AppGet.ApplicationName")
+additionalParameters=$(get_octopusvariable "ArgoCD.AppGet.AdditionalParameters")
+
+# Check required variables
+if isNotSet "${argocd_server}"; then
+  fail_step "argocd_server is not set"
+fi
+
+if isNotSet "${argocd_authToken}"; then
+  fail_step "argocd_authToken is not set"
+fi
+
+if isNotSet "${applicationName}"; then
+  fail_step "applicationName is not set"
+fi
+
+if isSet "${additionalParameters}"; then
+  IFS=$'\n' read -rd '' -a additionalArgs <<< "$additionalParameters"
+else
+  additionalArgs=()
+fi
+
+flattenedArgs="${additionalArgs[@]}"
+
+write_verbose "ARGOCD_SERVER: '${argocd_server}'"
+write_verbose "ARGOCD_AUTH_TOKEN: '********'"
+
+authArgs="--server ${argocd_server} --auth-token ${argocd_authToken}"
+maskedAuthArgs="--server ${argocd_server} --auth-token '********'"
+
+echo "Executing: argocd app get ${applicationName} ${maskedAuthArgs} ${flattenedArgs}"
+argocd app get ${applicationName} ${authArgs} ${flattenedArgs}
\ No newline at end of file
diff --git a/step-templates/argo-argocd-app-set-with-package.json b/src/step-templates/argo-argocd-app-set-with-package/metadata.json
similarity index 66%
rename from step-templates/argo-argocd-app-set-with-package.json
rename to src/step-templates/argo-argocd-app-set-with-package/metadata.json
index 0ac3f89f0..d821fe9a1 100644
--- a/step-templates/argo-argocd-app-set-with-package.json
+++ b/src/step-templates/argo-argocd-app-set-with-package/metadata.json
@@ -24,7 +24,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# argocd is required\nif ! [ -x \"$(command -v argocd)\" ]; then\n\tfail_step 'argocd command not found'\nfi\n\n# Helper functions\nisSet() { [ ! -z \"${1}\" ]; }\nisNotSet() { [ -z \"${1}\" ]; }\n\n# Get variables\nargocd_server=$(get_octopusvariable \"ArgoCD.AppSet.ArgoCD_Server\")\nargocd_authToken=$(get_octopusvariable \"ArgoCD.AppSet.ArgoCD_Auth_Token\")\napplicationName=$(get_octopusvariable \"ArgoCD.AppSet.ApplicationName\")\napplicationParameters=$(get_octopusvariable \"ArgoCD.AppSet.AppParameters\")\nadditionalParameters=$(get_octopusvariable \"ArgoCD.AppSet.AdditionalParameters\")\n\n# Check required variables\nif isNotSet \"${argocd_server}\"; then\n  fail_step \"argocd_server is not set\"\nfi\n\nif isNotSet \"${argocd_authToken}\"; then\n  fail_step \"argocd_authToken is not set\"\nfi\n\nif isNotSet \"${applicationName}\"; then\n  fail_step \"applicationName is not set\"\nfi\n\nif isSet \"${applicationParameters}\"; then\n  parameters=\"${applicationParameters//$'\\n'/ \\\\$'\\n'}\"\n  flattenedParams=\"${applicationParameters//$'\\n'/ }\"\n  IFS=$'\\n' read -rd '' -a appParameters <<< \"$applicationParameters\"\nelse\n  appParameters=()\nfi\nflattenedParams=\"${appParameters[@]}\"\n\n\nif isSet \"${additionalParameters}\"; then\n  IFS=$'\\n' read -rd '' -a additionalArgs <<< \"$additionalParameters\"\nelse\n  additionalArgs=()\nfi\n\nflattenedArgs=\"${additionalArgs[@]}\"\n\nwrite_verbose \"ARGOCD_SERVER: '${argocd_server}'\"\nwrite_verbose \"ARGOCD_AUTH_TOKEN: '********'\"\n\nauthArgs=\"--server ${argocd_server} --auth-token ${argocd_authToken}\"\nmaskedAuthArgs=\"--server ${argocd_server} --auth-token '********'\"\n\necho \"Executing: argocd app set ${applicationName} ${maskedAuthArgs} ${flattenedArgs} \\\\ \n${parameters}\"\nargocd app set ${applicationName} ${authArgs} ${flattenedArgs} ${flattenedParams}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -90,7 +90,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2025-11-06T15:44:22.814Z",
+    "ExportedAt": "2025-11-06T15:44:22.8140000Z",
     "OctopusVersion": "2025.4.6776",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/argo-argocd-app-set-with-package/scriptbody.sh b/src/step-templates/argo-argocd-app-set-with-package/scriptbody.sh
new file mode 100644
index 000000000..585a88b8b
--- /dev/null
+++ b/src/step-templates/argo-argocd-app-set-with-package/scriptbody.sh
@@ -0,0 +1,56 @@
+# argocd is required
+if ! [ -x "$(command -v argocd)" ]; then
+	fail_step 'argocd command not found'
+fi
+
+# Helper functions
+isSet() { [ ! -z "${1}" ]; }
+isNotSet() { [ -z "${1}" ]; }
+
+# Get variables
+argocd_server=$(get_octopusvariable "ArgoCD.AppSet.ArgoCD_Server")
+argocd_authToken=$(get_octopusvariable "ArgoCD.AppSet.ArgoCD_Auth_Token")
+applicationName=$(get_octopusvariable "ArgoCD.AppSet.ApplicationName")
+applicationParameters=$(get_octopusvariable "ArgoCD.AppSet.AppParameters")
+additionalParameters=$(get_octopusvariable "ArgoCD.AppSet.AdditionalParameters")
+
+# Check required variables
+if isNotSet "${argocd_server}"; then
+  fail_step "argocd_server is not set"
+fi
+
+if isNotSet "${argocd_authToken}"; then
+  fail_step "argocd_authToken is not set"
+fi
+
+if isNotSet "${applicationName}"; then
+  fail_step "applicationName is not set"
+fi
+
+if isSet "${applicationParameters}"; then
+  parameters="${applicationParameters//$'\n'/ \\$'\n'}"
+  flattenedParams="${applicationParameters//$'\n'/ }"
+  IFS=$'\n' read -rd '' -a appParameters <<< "$applicationParameters"
+else
+  appParameters=()
+fi
+flattenedParams="${appParameters[@]}"
+
+
+if isSet "${additionalParameters}"; then
+  IFS=$'\n' read -rd '' -a additionalArgs <<< "$additionalParameters"
+else
+  additionalArgs=()
+fi
+
+flattenedArgs="${additionalArgs[@]}"
+
+write_verbose "ARGOCD_SERVER: '${argocd_server}'"
+write_verbose "ARGOCD_AUTH_TOKEN: '********'"
+
+authArgs="--server ${argocd_server} --auth-token ${argocd_authToken}"
+maskedAuthArgs="--server ${argocd_server} --auth-token '********'"
+
+echo "Executing: argocd app set ${applicationName} ${maskedAuthArgs} ${flattenedArgs} \\ 
+${parameters}"
+argocd app set ${applicationName} ${authArgs} ${flattenedArgs} ${flattenedParams}
\ No newline at end of file
diff --git a/step-templates/argo-argocd-app-set.json b/src/step-templates/argo-argocd-app-set/metadata.json
similarity index 61%
rename from step-templates/argo-argocd-app-set.json
rename to src/step-templates/argo-argocd-app-set/metadata.json
index 158ab4c09..59d247d0b 100644
--- a/step-templates/argo-argocd-app-set.json
+++ b/src/step-templates/argo-argocd-app-set/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# argocd is required\nif ! [ -x \"$(command -v argocd)\" ]; then\n\tfail_step 'argocd command not found'\nfi\n\n# Helper functions\nisSet() { [ ! -z \"${1}\" ]; }\nisNotSet() { [ -z \"${1}\" ]; }\n\n# Get variables\nargocd_server=$(get_octopusvariable \"ArgoCD.AppSet.ArgoCD_Server\")\nargocd_authToken=$(get_octopusvariable \"ArgoCD.AppSet.ArgoCD_Auth_Token\")\napplicationName=$(get_octopusvariable \"ArgoCD.AppSet.ApplicationName\")\napplicationParameters=$(get_octopusvariable \"ArgoCD.AppSet.AppParameters\")\nadditionalParameters=$(get_octopusvariable \"ArgoCD.AppSet.AdditionalParameters\")\n\n# Check required variables\nif isNotSet \"${argocd_server}\"; then\n  fail_step \"argocd_server is not set\"\nfi\n\nif isNotSet \"${argocd_authToken}\"; then\n  fail_step \"argocd_authToken is not set\"\nfi\n\nif isNotSet \"${applicationName}\"; then\n  fail_step \"applicationName is not set\"\nfi\n\nif isSet \"${applicationParameters}\"; then\n  parameters=\"${applicationParameters//$'\\n'/ \\\\$'\\n'}\"\n  flattenedParams=\"${applicationParameters//$'\\n'/ }\"\n  IFS=$'\\n' read -rd '' -a appParameters <<< \"$applicationParameters\"\nelse\n  appParameters=()\nfi\nflattenedParams=\"${appParameters[@]}\"\n\n\nif isSet \"${additionalParameters}\"; then\n  IFS=$'\\n' read -rd '' -a additionalArgs <<< \"$additionalParameters\"\nelse\n  additionalArgs=()\nfi\n\nflattenedArgs=\"${additionalArgs[@]}\"\n\nwrite_verbose \"ARGOCD_SERVER: '${argocd_server}'\"\nwrite_verbose \"ARGOCD_AUTH_TOKEN: '********'\"\n\nauthArgs=\"--server ${argocd_server} --auth-token ${argocd_authToken}\"\nmaskedAuthArgs=\"--server ${argocd_server} --auth-token '********'\"\n\necho \"Executing: argocd app set ${applicationName} ${maskedAuthArgs} ${flattenedArgs} \\\\ \n${parameters}\"\nargocd app set ${applicationName} ${authArgs} ${flattenedArgs} ${flattenedParams}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -66,7 +66,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2025-11-06T15:44:22.814Z",
+    "ExportedAt": "2025-11-06T15:44:22.8140000Z",
     "OctopusVersion": "2025.4.6776",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/argo-argocd-app-set/scriptbody.sh b/src/step-templates/argo-argocd-app-set/scriptbody.sh
new file mode 100644
index 000000000..585a88b8b
--- /dev/null
+++ b/src/step-templates/argo-argocd-app-set/scriptbody.sh
@@ -0,0 +1,56 @@
+# argocd is required
+if ! [ -x "$(command -v argocd)" ]; then
+	fail_step 'argocd command not found'
+fi
+
+# Helper functions
+isSet() { [ ! -z "${1}" ]; }
+isNotSet() { [ -z "${1}" ]; }
+
+# Get variables
+argocd_server=$(get_octopusvariable "ArgoCD.AppSet.ArgoCD_Server")
+argocd_authToken=$(get_octopusvariable "ArgoCD.AppSet.ArgoCD_Auth_Token")
+applicationName=$(get_octopusvariable "ArgoCD.AppSet.ApplicationName")
+applicationParameters=$(get_octopusvariable "ArgoCD.AppSet.AppParameters")
+additionalParameters=$(get_octopusvariable "ArgoCD.AppSet.AdditionalParameters")
+
+# Check required variables
+if isNotSet "${argocd_server}"; then
+  fail_step "argocd_server is not set"
+fi
+
+if isNotSet "${argocd_authToken}"; then
+  fail_step "argocd_authToken is not set"
+fi
+
+if isNotSet "${applicationName}"; then
+  fail_step "applicationName is not set"
+fi
+
+if isSet "${applicationParameters}"; then
+  parameters="${applicationParameters//$'\n'/ \\$'\n'}"
+  flattenedParams="${applicationParameters//$'\n'/ }"
+  IFS=$'\n' read -rd '' -a appParameters <<< "$applicationParameters"
+else
+  appParameters=()
+fi
+flattenedParams="${appParameters[@]}"
+
+
+if isSet "${additionalParameters}"; then
+  IFS=$'\n' read -rd '' -a additionalArgs <<< "$additionalParameters"
+else
+  additionalArgs=()
+fi
+
+flattenedArgs="${additionalArgs[@]}"
+
+write_verbose "ARGOCD_SERVER: '${argocd_server}'"
+write_verbose "ARGOCD_AUTH_TOKEN: '********'"
+
+authArgs="--server ${argocd_server} --auth-token ${argocd_authToken}"
+maskedAuthArgs="--server ${argocd_server} --auth-token '********'"
+
+echo "Executing: argocd app set ${applicationName} ${maskedAuthArgs} ${flattenedArgs} \\ 
+${parameters}"
+argocd app set ${applicationName} ${authArgs} ${flattenedArgs} ${flattenedParams}
\ No newline at end of file
diff --git a/step-templates/argo-argocd-app-sync.json b/src/step-templates/argo-argocd-app-sync/metadata.json
similarity index 65%
rename from step-templates/argo-argocd-app-sync.json
rename to src/step-templates/argo-argocd-app-sync/metadata.json
index 83c5fdfdb..89a98c5b1 100644
--- a/step-templates/argo-argocd-app-sync.json
+++ b/src/step-templates/argo-argocd-app-sync/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# argocd is required\nif ! [ -x \"$(command -v argocd)\" ]; then\n\tfail_step 'argocd command not found'\nfi\n\n# Helper functions\nisSet() { [ ! -z \"${1}\" ]; }\nisNotSet() { [ -z \"${1}\" ]; }\n\n# Get variables\nargocd_server=$(get_octopusvariable \"ArgoCD.AppSync.ArgoCD_Server\")\nargocd_authToken=$(get_octopusvariable \"ArgoCD.AppSync.ArgoCD_Auth_Token\")\napplicationSelector=$(get_octopusvariable \"ArgoCD.AppSync.ApplicationSelector\")\nadditionalParameters=$(get_octopusvariable \"ArgoCD.AppSync.AdditionalParameters\")\n\n# Check required variables\nif isNotSet \"${argocd_server}\"; then\n  fail_step \"argocd_server is not set\"\nfi\n\nif isNotSet \"${argocd_authToken}\"; then\n  fail_step \"argocd_authToken is not set\"\nfi\n\nif isNotSet \"${applicationSelector}\"; then\n  fail_step \"applicationSelector is not set\"\nfi\n\nif isSet \"${additionalParameters}\"; then\n  IFS=$'\\n' read -rd '' -a additionalArgs <<< \"$additionalParameters\"\nelse\n  additionalArgs=()\nfi\n\nflattenedArgs=\"${additionalArgs[@]}\"\n\nwrite_verbose \"ARGOCD_SERVER: '${argocd_server}'\"\nwrite_verbose \"ARGOCD_AUTH_TOKEN: '********'\"\n\nauthArgs=\"--server ${argocd_server} --auth-token ${argocd_authToken}\"\nmaskedAuthArgs=\"--server ${argocd_server} --auth-token '********'\"\n\necho \"Executing: argocd app sync ${applicationSelector} ${maskedAuthArgs} ${flattenedArgs}\"\nargocd app sync ${applicationSelector} ${authArgs} ${flattenedArgs}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -56,7 +56,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2025-11-06T15:44:22.814Z",
+    "ExportedAt": "2025-11-06T15:44:22.8140000Z",
     "OctopusVersion": "2025.4.6776",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/argo-argocd-app-sync/scriptbody.sh b/src/step-templates/argo-argocd-app-sync/scriptbody.sh
new file mode 100644
index 000000000..b938d6b2a
--- /dev/null
+++ b/src/step-templates/argo-argocd-app-sync/scriptbody.sh
@@ -0,0 +1,44 @@
+# argocd is required
+if ! [ -x "$(command -v argocd)" ]; then
+	fail_step 'argocd command not found'
+fi
+
+# Helper functions
+isSet() { [ ! -z "${1}" ]; }
+isNotSet() { [ -z "${1}" ]; }
+
+# Get variables
+argocd_server=$(get_octopusvariable "ArgoCD.AppSync.ArgoCD_Server")
+argocd_authToken=$(get_octopusvariable "ArgoCD.AppSync.ArgoCD_Auth_Token")
+applicationSelector=$(get_octopusvariable "ArgoCD.AppSync.ApplicationSelector")
+additionalParameters=$(get_octopusvariable "ArgoCD.AppSync.AdditionalParameters")
+
+# Check required variables
+if isNotSet "${argocd_server}"; then
+  fail_step "argocd_server is not set"
+fi
+
+if isNotSet "${argocd_authToken}"; then
+  fail_step "argocd_authToken is not set"
+fi
+
+if isNotSet "${applicationSelector}"; then
+  fail_step "applicationSelector is not set"
+fi
+
+if isSet "${additionalParameters}"; then
+  IFS=$'\n' read -rd '' -a additionalArgs <<< "$additionalParameters"
+else
+  additionalArgs=()
+fi
+
+flattenedArgs="${additionalArgs[@]}"
+
+write_verbose "ARGOCD_SERVER: '${argocd_server}'"
+write_verbose "ARGOCD_AUTH_TOKEN: '********'"
+
+authArgs="--server ${argocd_server} --auth-token ${argocd_authToken}"
+maskedAuthArgs="--server ${argocd_server} --auth-token '********'"
+
+echo "Executing: argocd app sync ${applicationSelector} ${maskedAuthArgs} ${flattenedArgs}"
+argocd app sync ${applicationSelector} ${authArgs} ${flattenedArgs}
\ No newline at end of file
diff --git a/step-templates/argo-argocd-app-wait.json b/src/step-templates/argo-argocd-app-wait/metadata.json
similarity index 65%
rename from step-templates/argo-argocd-app-wait.json
rename to src/step-templates/argo-argocd-app-wait/metadata.json
index 1e77a27aa..f681341be 100644
--- a/step-templates/argo-argocd-app-wait.json
+++ b/src/step-templates/argo-argocd-app-wait/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# argocd is required\nif ! [ -x \"$(command -v argocd)\" ]; then\n\tfail_step 'argocd command not found'\nfi\n\n# Helper functions\nisSet() { [ ! -z \"${1}\" ]; }\nisNotSet() { [ -z \"${1}\" ]; }\n\n# Get variables\nargocd_server=$(get_octopusvariable \"ArgoCD.AppWait.ArgoCD_Server\")\nargocd_authToken=$(get_octopusvariable \"ArgoCD.AppWait.ArgoCD_Auth_Token\")\napplicationSelector=$(get_octopusvariable \"ArgoCD.AppWait.ApplicationSelector\")\nadditionalParameters=$(get_octopusvariable \"ArgoCD.AppWait.AdditionalParameters\")\n\n# Check required variables\nif isNotSet \"${argocd_server}\"; then\n  fail_step \"argocd_server is not set\"\nfi\n\nif isNotSet \"${argocd_authToken}\"; then\n  fail_step \"argocd_authToken is not set\"\nfi\n\nif isNotSet \"${applicationSelector}\"; then\n  fail_step \"applicationSelector is not set\"\nfi\n\nif isSet \"${additionalParameters}\"; then\n  IFS=$'\\n' read -rd '' -a additionalArgs <<< \"$additionalParameters\"\nelse\n  additionalArgs=()\nfi\n\nflattenedArgs=\"${additionalArgs[@]}\"\n\nwrite_verbose \"ARGOCD_SERVER: '${argocd_server}'\"\nwrite_verbose \"ARGOCD_AUTH_TOKEN: '********'\"\n\nauthArgs=\"--server ${argocd_server} --auth-token ${argocd_authToken}\"\nmaskedAuthArgs=\"--server ${argocd_server} --auth-token '********'\"\n\necho \"Executing: argocd app wait ${applicationSelector} ${maskedAuthArgs} ${flattenedArgs}\"\nargocd app wait ${applicationSelector} ${authArgs} ${flattenedArgs}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -56,7 +56,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2025-11-06T15:44:22.814Z",
+    "ExportedAt": "2025-11-06T15:44:22.8140000Z",
     "OctopusVersion": "2025.4.6776",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/argo-argocd-app-wait/scriptbody.sh b/src/step-templates/argo-argocd-app-wait/scriptbody.sh
new file mode 100644
index 000000000..1041adfe8
--- /dev/null
+++ b/src/step-templates/argo-argocd-app-wait/scriptbody.sh
@@ -0,0 +1,44 @@
+# argocd is required
+if ! [ -x "$(command -v argocd)" ]; then
+	fail_step 'argocd command not found'
+fi
+
+# Helper functions
+isSet() { [ ! -z "${1}" ]; }
+isNotSet() { [ -z "${1}" ]; }
+
+# Get variables
+argocd_server=$(get_octopusvariable "ArgoCD.AppWait.ArgoCD_Server")
+argocd_authToken=$(get_octopusvariable "ArgoCD.AppWait.ArgoCD_Auth_Token")
+applicationSelector=$(get_octopusvariable "ArgoCD.AppWait.ApplicationSelector")
+additionalParameters=$(get_octopusvariable "ArgoCD.AppWait.AdditionalParameters")
+
+# Check required variables
+if isNotSet "${argocd_server}"; then
+  fail_step "argocd_server is not set"
+fi
+
+if isNotSet "${argocd_authToken}"; then
+  fail_step "argocd_authToken is not set"
+fi
+
+if isNotSet "${applicationSelector}"; then
+  fail_step "applicationSelector is not set"
+fi
+
+if isSet "${additionalParameters}"; then
+  IFS=$'\n' read -rd '' -a additionalArgs <<< "$additionalParameters"
+else
+  additionalArgs=()
+fi
+
+flattenedArgs="${additionalArgs[@]}"
+
+write_verbose "ARGOCD_SERVER: '${argocd_server}'"
+write_verbose "ARGOCD_AUTH_TOKEN: '********'"
+
+authArgs="--server ${argocd_server} --auth-token ${argocd_authToken}"
+maskedAuthArgs="--server ${argocd_server} --auth-token '********'"
+
+echo "Executing: argocd app wait ${applicationSelector} ${maskedAuthArgs} ${flattenedArgs}"
+argocd app wait ${applicationSelector} ${authArgs} ${flattenedArgs}
\ No newline at end of file
diff --git a/src/step-templates/argo-rollouts-get-rollout/metadata.json b/src/step-templates/argo-rollouts-get-rollout/metadata.json
new file mode 100644
index 000000000..bcf5399f2
--- /dev/null
+++ b/src/step-templates/argo-rollouts-get-rollout/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "c2c71e8e-429d-407e-8448-42e38cfb9c5a",
+  "Name": "Argo - Rollouts Get Rollout",
+  "Description": "Gets the status of an Argo Rollout.",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "5eefb32e-04a6-40ed-9018-3ba12e241b01",
+      "Name": "Argo.Rollout.Name",
+      "Label": "Rollout Name",
+      "HelpText": "Name of the Argo Rollout to promote.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b13022d0-9a74-42cd-8b3e-d3cfa0c4d64c",
+      "Name": "Argo.Rollout.Namespace",
+      "Label": "Namespace",
+      "HelpText": "The namespace to execute the promotion of the rollout against.",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.KubernetesRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-12T20:01:43.4410000Z",
+    "OctopusVersion": "2024.2.9210",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "argo"
+}
diff --git a/src/step-templates/argo-rollouts-get-rollout/scriptbody.ps1 b/src/step-templates/argo-rollouts-get-rollout/scriptbody.ps1
new file mode 100644
index 000000000..ff7562ba0
--- /dev/null
+++ b/src/step-templates/argo-rollouts-get-rollout/scriptbody.ps1
@@ -0,0 +1,171 @@
+function Save-OctopusVariable {
+    Param(
+        [string] $name,
+        [string] $value
+    )
+    $StepName = $OctopusParameters["Octopus.Step.Name"]    
+    
+    Set-OctopusVariable -Name $name -Value $value
+
+    Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$name}"
+}
+
+# Installs the Argo Rollouts plugin
+function Install-Plugin
+{
+# Define parameters
+	param ($PluginUri,
+           $PluginFilename
+    )
+    
+    # Check for plugin folder
+    if ((Test-Path -Path "$PWD/plugins") -eq $false)
+    {
+		# Create new plugins folder
+        New-Item -Path "$PWD/plugins" -ItemType "Directory"
+        
+        # Add to path
+        $env:PATH = "$($PWD)/plugins$([IO.Path]::PathSeparator)" + $env:PATH
+    }
+
+	# Download plugin
+	Invoke-WebRequest -Uri "$PluginUri" -OutFile "$PWD/plugins/$PluginFilename"
+
+	# Make file executable
+    if ($IsLinux)
+    {
+		# Make it executable
+    	chmod +x ./plugins/$PluginFilename
+    }
+    
+    if ($IsWindows)
+    {
+    	# Update filename to include .exe extension
+        Rename-Item -Path "$PWD/plugins/$PluginFilename" -NewName "$PWD/plugins/$($PluginFilename).exe"
+    }
+}
+
+# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist
+function Verify-Path-Variable
+{
+	# Get current path and split into array
+    $paths = $env:PATH.Split([IO.Path]::PathSeparator)
+    $verifiedPaths = @()
+    
+    # Loop through paths
+    foreach ($path in $paths)
+    {
+    	# Check for existence
+        if ((Test-Path -Path $path) -eq $true)
+        {
+        	# Add to verified
+            $verifiedPaths += $path
+        }
+    }
+    
+    # Return verified paths
+    return ($verifiedPaths -join [IO.Path]::PathSeparator)
+}
+
+function Get-Plugin-Installed
+{
+	# Define parameters
+    param (
+    	$PluginName,
+        $InstalledPlugins
+        )
+        
+   	$isInstalled = $false
+   
+	foreach ($plugin in $installedPlugins)
+   	{
+		if ($plugin -like "$($PluginName)*")
+        {
+        	$isInstalled = $true
+          	break
+        }
+	}
+    
+    return $isInstalled
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Verify all PATH variables are avaialable
+$env:PATH = Verify-Path-Variable
+if ($IsLinux)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64"
+}
+
+if ($IsWindows)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64"
+}
+
+try 
+{
+    # Check to see if plugins are installed
+    $pluginList = (kubectl plugin list 2>&1)
+
+    # This is the path that Linux will take
+    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH") 
+    {
+        Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+    }
+    else
+    {
+        # Parse list
+    	$pluginList = $pluginList.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)
+        
+        if ((Get-Plugin-Installed -PluginName "kubectl-argo-rollouts" -InstalledPlugins $pluginList) -eq $false)
+        {
+        	Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+        }
+        else
+        {
+        	Write-Host "Argo Rollout kubectl plugin found ..."
+        }
+    }    
+}
+catch
+{
+	# On Windows, the executable will cause an error if no plugins found so this the path Windows will take
+    if ($_.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH")
+    {
+		Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"    
+    }
+    else
+    {
+    	# Something else happened, we need to surface the error
+        throw
+    }
+}
+
+# Get parameters
+$rolloutsName = $OctopusParameters['Argo.Rollout.Name']
+$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']
+
+# Add new arguments
+$kubectlArguments = @("argo", "rollouts", "get", "rollout", $rolloutsName, "--namespace", $rolloutsNamespace, "--no-color")
+
+kubectl $kubectlArguments
\ No newline at end of file
diff --git a/src/step-templates/argo-rollouts-pause/metadata.json b/src/step-templates/argo-rollouts-pause/metadata.json
new file mode 100644
index 000000000..3a4a39cab
--- /dev/null
+++ b/src/step-templates/argo-rollouts-pause/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "a757705d-2551-42bf-8cef-8dd99bd6b4f9",
+  "Name": "Argo - Rollouts Pause",
+  "Description": "Set the rollout paused state to 'true'",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d7665ee0-08b1-4c3a-b7f9-bf9ccfa63219",
+      "Name": "Argo.Rollout.Name",
+      "Label": "Rollout Name",
+      "HelpText": "Name of the Argo Rollout to pause.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8a9ed999-5c3f-4652-abbb-07f592205bfc",
+      "Name": "Argo.Rollout.Namespace",
+      "Label": "Namespace",
+      "HelpText": "The namespace where the rollout exists.",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.KubernetesRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-06T19:54:47.1560000Z",
+    "OctopusVersion": "2024.1.12815",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "argo"
+}
diff --git a/src/step-templates/argo-rollouts-pause/scriptbody.ps1 b/src/step-templates/argo-rollouts-pause/scriptbody.ps1
new file mode 100644
index 000000000..f88a99035
--- /dev/null
+++ b/src/step-templates/argo-rollouts-pause/scriptbody.ps1
@@ -0,0 +1,160 @@
+# Installs the Argo Rollouts plugin
+function Install-Plugin
+{
+# Define parameters
+	param ($PluginUri,
+           $PluginFilename
+    )
+    
+    # Check for plugin folder
+    if ((Test-Path -Path "$PWD/plugins") -eq $false)
+    {
+		# Create new plugins folder
+        New-Item -Path "$PWD/plugins" -ItemType "Directory"
+        
+        # Add to path
+        $env:PATH = "$($PWD)/plugins$([IO.Path]::PathSeparator)" + $env:PATH
+    }
+
+	# Download plugin
+	Invoke-WebRequest -Uri "$PluginUri" -OutFile "$PWD/plugins/$PluginFilename"
+
+	# Make file executable
+    if ($IsLinux)
+    {
+		# Make it executable
+    	chmod +x ./plugins/$PluginFilename
+    }
+    
+    if ($IsWindows)
+    {
+    	# Update filename to include .exe extension
+        Rename-Item -Path "$PWD/plugins/$PluginFilename" -NewName "$PWD/plugins/$($PluginFilename).exe"
+    }
+}
+
+# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist
+function Verify-Path-Variable
+{
+	# Get current path and split into array
+    $paths = $env:PATH.Split([IO.Path]::PathSeparator)
+    $verifiedPaths = @()
+    
+    # Loop through paths
+    foreach ($path in $paths)
+    {
+    	# Check for existence
+        if ((Test-Path -Path $path) -eq $true)
+        {
+        	# Add to verified
+            $verifiedPaths += $path
+        }
+    }
+    
+    # Return verified paths
+    return ($verifiedPaths -join [IO.Path]::PathSeparator)
+}
+
+function Get-Plugin-Installed
+{
+	# Define parameters
+    param (
+    	$PluginName,
+        $InstalledPlugins
+        )
+        
+   	$isInstalled = $false
+   
+	foreach ($plugin in $installedPlugins)
+   	{
+		if ($plugin -like "$($PluginName)*")
+        {
+        	$isInstalled = $true
+          	break
+        }
+	}
+    
+    return $isInstalled
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Verify all PATH variables are avaialable
+$env:PATH = Verify-Path-Variable
+if ($IsLinux)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64"
+}
+
+if ($IsWindows)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64"
+}
+
+try 
+{
+    # Check to see if plugins are installed
+    $pluginList = (kubectl plugin list 2>&1)
+
+    # This is the path that Linux will take
+    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH") 
+    {
+        Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+    }
+    else
+    {
+        # Parse list
+    	$pluginList = $pluginList.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)
+        
+        if ((Get-Plugin-Installed -PluginName "kubectl-argo-rollouts" -InstalledPlugins $pluginList) -eq $false)
+        {
+        	Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+        }
+        else
+        {
+        	Write-Host "Argo Rollout kubectl plugin found ..."
+        }
+    }    
+}
+catch
+{
+	# On Windows, the executable will cause an error if no plugins found so this the path Windows will take
+    if ($_.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH")
+    {
+      Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"    
+    }
+    else
+    {
+    	# Something else happened, we need to surface the error
+        throw
+    }
+}
+
+# Get parameters
+$rolloutsName = $OctopusParameters['Argo.Rollout.Name']
+$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']
+
+# Create arguments array
+$kubectlArguments = @("argo", "rollouts", "pause", $rolloutsName, "--namespace", $rolloutsNamespace)
+
+# Pause rollout
+kubectl $kubectlArguments
\ No newline at end of file
diff --git a/src/step-templates/argo-rollouts-promote/metadata.json b/src/step-templates/argo-rollouts-promote/metadata.json
new file mode 100644
index 000000000..750630176
--- /dev/null
+++ b/src/step-templates/argo-rollouts-promote/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "cccd7fe9-b3b5-4f56-84bd-2986d5e68e06",
+  "Name": "Argo - Rollouts Promote",
+  "Description": "Promotes an Argo Rollout.",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d1dbd00e-facb-494d-bf10-27ba68334f30",
+      "Name": "Argo.Rollout.Name",
+      "Label": "Rollout Name",
+      "HelpText": "Name of the Argo Rollout to promote.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c9c4937a-e833-4df0-8f31-b53722b881c3",
+      "Name": "Argo.Rollout.Namespace",
+      "Label": "Namespace",
+      "HelpText": "The namespace to execute the promotion of the rollout against.",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "efaf2401-e059-4724-b2b3-30ac8864e450",
+      "Name": "Argo.Rollout.FullPromotion",
+      "Label": "Full Promotion",
+      "HelpText": "Fully promote a rollout to desired version, skipping analysis, pauses, and steps",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.KubernetesRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-06T19:55:28.1160000Z",
+    "OctopusVersion": "2024.1.12815",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "argo"
+}
diff --git a/src/step-templates/argo-rollouts-promote/scriptbody.ps1 b/src/step-templates/argo-rollouts-promote/scriptbody.ps1
new file mode 100644
index 000000000..21ba0a8da
--- /dev/null
+++ b/src/step-templates/argo-rollouts-promote/scriptbody.ps1
@@ -0,0 +1,167 @@
+# Installs the Argo Rollouts plugin
+function Install-Plugin
+{
+# Define parameters
+	param ($PluginUri,
+           $PluginFilename
+    )
+    
+    # Check for plugin folder
+    if ((Test-Path -Path "$PWD/plugins") -eq $false)
+    {
+		# Create new plugins folder
+        New-Item -Path "$PWD/plugins" -ItemType "Directory"
+        
+        # Add to path
+        $env:PATH = "$($PWD)/plugins$([IO.Path]::PathSeparator)" + $env:PATH
+    }
+
+	# Download plugin
+	Invoke-WebRequest -Uri "$PluginUri" -OutFile "$PWD/plugins/$PluginFilename"
+
+	# Make file executable
+    if ($IsLinux)
+    {
+		# Make it executable
+    	chmod +x ./plugins/$PluginFilename
+    }
+    
+    if ($IsWindows)
+    {
+    	# Update filename to include .exe extension
+        Rename-Item -Path "$PWD/plugins/$PluginFilename" -NewName "$PWD/plugins/$($PluginFilename).exe"
+    }
+}
+
+# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist
+function Verify-Path-Variable
+{
+	# Get current path and split into array
+    $paths = $env:PATH.Split([IO.Path]::PathSeparator)
+    $verifiedPaths = @()
+    
+    # Loop through paths
+    foreach ($path in $paths)
+    {
+    	# Check for existence
+        if ((Test-Path -Path $path) -eq $true)
+        {
+        	# Add to verified
+            $verifiedPaths += $path
+        }
+    }
+    
+    # Return verified paths
+    return ($verifiedPaths -join [IO.Path]::PathSeparator)
+}
+
+function Get-Plugin-Installed
+{
+	# Define parameters
+    param (
+    	$PluginName,
+        $InstalledPlugins
+        )
+        
+   	$isInstalled = $false
+   
+	foreach ($plugin in $installedPlugins)
+   	{
+		if ($plugin -like "$($PluginName)*")
+        {
+        	$isInstalled = $true
+          	break
+        }
+	}
+    
+    return $isInstalled
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Verify all PATH variables are avaialable
+$env:PATH = Verify-Path-Variable
+if ($IsLinux)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64"
+}
+
+if ($IsWindows)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64"
+}
+
+try 
+{
+    # Check to see if plugins are installed
+    $pluginList = (kubectl plugin list 2>&1)
+
+    # This is the path that Linux will take
+    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH") 
+    {
+        Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+    }
+    else
+    {
+        # Parse list
+    	$pluginList = $pluginList.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)
+        
+        if ((Get-Plugin-Installed -PluginName "kubectl-argo-rollouts" -InstalledPlugins $pluginList) -eq $false)
+        {
+        	Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+        }
+        else
+        {
+        	Write-Host "Argo Rollout kubectl plugin found ..."
+        }
+    }    
+}
+catch
+{
+	# On Windows, the executable will cause an error if no plugins found so this the path Windows will take
+    if ($_.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH")
+    {
+		Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"    
+    }
+    else
+    {
+    	# Something else happened, we need to surface the error
+        throw
+    }
+}
+
+# Get parameters
+$rolloutsName = $OctopusParameters['Argo.Rollout.Name']
+$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']
+$rolloutsFullPromotion = [System.Convert]::ToBoolean($OctopusParameters['Argo.Rollout.FullPromotion'])
+
+# Create arguments array
+$kubectlArguments = @("argo", "rollouts", "promote", $rolloutsName, "--namespace", $rolloutsNamespace)
+
+# Check for additional argument
+if ($rolloutsFullPromotion)
+{
+	$kubectlArguments += "--full"
+}
+
+# Promote rollout
+kubectl $kubectlArguments
\ No newline at end of file
diff --git a/src/step-templates/argo-rollouts-set-image/metadata.json b/src/step-templates/argo-rollouts-set-image/metadata.json
new file mode 100644
index 000000000..0f191eb44
--- /dev/null
+++ b/src/step-templates/argo-rollouts-set-image/metadata.json
@@ -0,0 +1,79 @@
+{
+  "Id": "5449ea73-7f77-45d7-a4d7-e56286d679f5",
+  "Name": "Argo - Rollouts Set Image",
+  "Description": "Sets a new image tag on an Argo Rollout.",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "67a06773-8f2b-49a7-95bb-1e087a38b3b9",
+      "Name": "Argo.Rollout.Image",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "NotAcquired",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Argo.Rollout.Image",
+        "Purpose": ""
+      }
+    }
+  ],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "892ac50a-e53c-47e5-997d-0ce1935b7303",
+      "Name": "Argo.Rollout.Name",
+      "Label": "Rollout Name",
+      "HelpText": "Name of the Argo Rollout to set the image on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a08c104a-3877-4989-9436-bf582b3a8505",
+      "Name": "Argo.Rollout.Namespace",
+      "Label": "Namespace",
+      "HelpText": "The namespace to execute the command against.",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "05bf80a9-0419-4d8d-b9ca-457d66a2edb0",
+      "Name": "Argo.Rollout.Image",
+      "Label": "Image",
+      "HelpText": "Select the image to update the rollout to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "115ebf6d-5613-4131-83f5-03d74fbc0f14",
+      "Name": "Argo.Rollout.Container.Name",
+      "Label": "Container Name",
+      "HelpText": "Name of the container to update the image tag on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.KubernetesRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-06T19:56:12.3970000Z",
+    "OctopusVersion": "2024.1.12815",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "argo"
+}
diff --git a/src/step-templates/argo-rollouts-set-image/scriptbody.ps1 b/src/step-templates/argo-rollouts-set-image/scriptbody.ps1
new file mode 100644
index 000000000..da49eb5ca
--- /dev/null
+++ b/src/step-templates/argo-rollouts-set-image/scriptbody.ps1
@@ -0,0 +1,164 @@
+function Install-Plugin
+{
+# Define parameters
+	param ($PluginUri,
+           $PluginFilename
+    )
+    
+    # Check for plugin folder
+    if ((Test-Path -Path "$PWD/plugins") -eq $false)
+    {
+		# Create new plugins folder
+        New-Item -Path "$PWD/plugins" -ItemType "Directory"
+        
+        # Add to path
+        $env:PATH = "$($PWD)/plugins$([IO.Path]::PathSeparator)" + $env:PATH
+    }
+
+	# Download plugin
+	Invoke-WebRequest -Uri "$PluginUri" -OutFile "$PWD/plugins/$PluginFilename"
+
+	# Check for Linux
+    if ($IsLinux)
+    {
+		# Make it executable
+    	chmod +x ./plugins/$PluginFilename
+    }
+    
+    if ($IsWindows)
+    {
+    	# Update filename to include .exe extension
+        Rename-Item -Path "$PWD/plugins/$PluginFilename" -NewName "$PWD/plugins/$($PluginFilename).exe"
+    }    
+}
+
+# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist
+function Verify-Path-Variable
+{
+	# Get current path and split into array
+    $paths = $env:PATH.Split([IO.Path]::PathSeparator)
+    $verifiedPaths = @()
+    
+    # Loop through paths
+    foreach ($path in $paths)
+    {
+    	# Check for existence
+        if ((Test-Path -Path $path) -eq $true)
+        {
+        	# Add to verified
+            $verifiedPaths += $path
+        }
+    }
+    
+    # Return verified paths
+    return ($verifiedPaths -join [IO.Path]::PathSeparator)
+}
+
+function Get-Plugin-Installed
+{
+	# Define parameters
+    param (
+    	$PluginName,
+        $InstalledPlugins
+        )
+        
+   	$isInstalled = $false
+   
+	foreach ($plugin in $installedPlugins)
+   	{
+		if ($plugin -like "$($PluginName)*")
+        {
+        	$isInstalled = $true
+          	break
+        }
+	}
+    
+    return $isInstalled
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Verify all PATH variables are avaialable
+$env:PATH = Verify-Path-Variable
+if ($IsLinux)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64"
+}
+
+if ($IsWindows)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64"
+}
+
+
+try 
+{
+    # Check to see if plugins are installed
+    $pluginList = (kubectl plugin list --name-only=true 2>&1)
+
+    # This is the path that Linux will take
+    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH") 
+    {
+        # Install the plugin
+        Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+    }
+    else
+    {
+        # Parse list
+    	$pluginList = $pluginList.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)
+        
+        if ((Get-Plugin-Installed -PluginName "kubectl-argo-rollouts" -InstalledPlugins $pluginList) -eq $false)
+        {
+        	Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+        }
+        else
+        {
+        	Write-Host "Argo Rollout kubectl plugin found ..."
+        }
+    }
+}
+catch
+{
+	# On Windows, the executable will cause an error if no plugins found so this the path Windows will take
+    if ($_.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH")
+    {
+      Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"    
+    }
+    else
+    {
+    	# Something else happened, we need to surface the error
+        throw
+    }
+}
+
+# Get variables
+$rolloutName = $OctopusParameters['Argo.Rollout.Name']
+$rolloutNamespace = $OctopusParameters['Argo.Rollout.Namespace']
+$containerName = $OctopusParameters["Argo.Rollout.Container.Name"]
+$imageName = $OctopusParameters["Octopus.Action.Package[Argo.Rollout.Image].PackageId"]
+$imageTag = $OctopusParameters["Octopus.Action.Package[Argo.Rollout.Image].PackageVersion"]
+
+# Create arguments array
+$kubectlArguments = @("argo", "rollouts", "set", "image", $rolloutName, "$containerName=`"$($imageName):$($imageTag)`"", "--namespace", $rolloutNamespace)
+
+# Set image
+kubectl $kubectlArguments
\ No newline at end of file
diff --git a/src/step-templates/argo-rollouts-status/metadata.json b/src/step-templates/argo-rollouts-status/metadata.json
new file mode 100644
index 000000000..7cbc31c16
--- /dev/null
+++ b/src/step-templates/argo-rollouts-status/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "866c3e69-5bd6-4439-8a2e-8cbf252885a4",
+  "Name": "Argo - Rollouts Status",
+  "Description": "Gets the status of an Argo Rollout.\nNote: A timeout isn't considered an error, it will return the status at the time of the timeout.",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "5eefb32e-04a6-40ed-9018-3ba12e241b01",
+      "Name": "Argo.Rollout.Name",
+      "Label": "Rollout Name",
+      "HelpText": "Name of the Argo Rollout to promote.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b13022d0-9a74-42cd-8b3e-d3cfa0c4d64c",
+      "Name": "Argo.Rollout.Namespace",
+      "Label": "Namespace",
+      "HelpText": "The namespace to execute the promotion of the rollout against.",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "065f1110-abe9-4bdf-9a98-af20dcac4e8e",
+      "Name": "Argo.Rollout.Timeout",
+      "Label": "Timeout",
+      "HelpText": "The length of time to watch before giving up. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). Zero means wait forever.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.KubernetesRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-12T18:36:25.3390000Z",
+    "OctopusVersion": "2024.2.9210",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "argo"
+}
diff --git a/src/step-templates/argo-rollouts-status/scriptbody.ps1 b/src/step-templates/argo-rollouts-status/scriptbody.ps1
new file mode 100644
index 000000000..4bad1a94e
--- /dev/null
+++ b/src/step-templates/argo-rollouts-status/scriptbody.ps1
@@ -0,0 +1,231 @@
+# Supress info messages written to stderr
+Write-Host "##octopus[stderr-progress]"
+
+function Save-OctopusVariable {
+    Param(
+        [string] $name,
+        [string] $value
+    )
+    $StepName = $OctopusParameters["Octopus.Step.Name"]    
+    
+    Set-OctopusVariable -Name $name -Value $value
+
+    Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$name}"
+}
+
+# Installs the Argo Rollouts plugin
+function Install-Plugin
+{
+# Define parameters
+	param ($PluginUri,
+           $PluginFilename
+    )
+    
+    # Check for plugin folder
+    if ((Test-Path -Path "$PWD/plugins") -eq $false)
+    {
+		# Create new plugins folder
+        New-Item -Path "$PWD/plugins" -ItemType "Directory"
+        
+        # Add to path
+        $env:PATH = "$($PWD)/plugins$([IO.Path]::PathSeparator)" + $env:PATH
+    }
+
+	# Download plugin
+	Invoke-WebRequest -Uri "$PluginUri" -OutFile "$PWD/plugins/$PluginFilename"
+
+	# Make file executable
+    if ($IsLinux)
+    {
+		# Make it executable
+    	chmod +x ./plugins/$PluginFilename
+    }
+    
+    if ($IsWindows)
+    {
+    	# Update filename to include .exe extension
+        Rename-Item -Path "$PWD/plugins/$PluginFilename" -NewName "$PWD/plugins/$($PluginFilename).exe"
+    }
+}
+
+# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist
+function Verify-Path-Variable
+{
+	# Get current path and split into array
+    $paths = $env:PATH.Split([IO.Path]::PathSeparator)
+    $verifiedPaths = @()
+    
+    # Loop through paths
+    foreach ($path in $paths)
+    {
+    	# Check for existence
+        if ((Test-Path -Path $path) -eq $true)
+        {
+        	# Add to verified
+            $verifiedPaths += $path
+        }
+    }
+    
+    # Return verified paths
+    return ($verifiedPaths -join [IO.Path]::PathSeparator)
+}
+
+function Get-Plugin-Installed
+{
+	# Define parameters
+    param (
+    	$PluginName,
+        $InstalledPlugins
+        )
+        
+   	$isInstalled = $false
+   
+	foreach ($plugin in $installedPlugins)
+   	{
+		if ($plugin -like "$($PluginName)*")
+        {
+        	$isInstalled = $true
+          	break
+        }
+	}
+    
+    return $isInstalled
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Verify all PATH variables are avaialable
+$env:PATH = Verify-Path-Variable
+if ($IsLinux)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64"
+}
+
+if ($IsWindows)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64"
+}
+
+try 
+{
+    # Check to see if plugins are installed
+    $pluginList = (kubectl plugin list 2>&1)
+
+    # This is the path that Linux will take
+    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH") 
+    {
+        Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+    }
+    else
+    {
+        # Parse list
+    	$pluginList = $pluginList.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)
+        
+        if ((Get-Plugin-Installed -PluginName "kubectl-argo-rollouts" -InstalledPlugins $pluginList) -eq $false)
+        {
+        	Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+        }
+        else
+        {
+        	Write-Host "Argo Rollout kubectl plugin found ..."
+        }
+    }    
+}
+catch
+{
+	# On Windows, the executable will cause an error if no plugins found so this the path Windows will take
+    if ($_.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH")
+    {
+		Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"    
+    }
+    else
+    {
+    	# Something else happened, we need to surface the error
+        throw
+    }
+}
+
+# Get parameters
+$rolloutsName = $OctopusParameters['Argo.Rollout.Name']
+$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']
+$rolloutsTimeout = $OctopusParameters['Argo.Rollout.Timeout']
+
+# Validate arguments
+if ([string]::IsNullOrWhitespace($rolloutsTimeout))
+{
+    Write-Error "Please specify a timeout value"
+}
+
+# Add new arguments
+$kubectlArguments = @("argo", "rollouts", "status", $rolloutsName, "--namespace", $rolloutsNamespace, "--timeout", $rolloutsTimeout)
+
+try
+{
+    # Get the current status - This was the only way to get it to work cross-platform
+    $process = Start-Process -FilePath "kubectl" -ArgumentList $kubectlArguments -NoNewWindow -RedirectStandardError "error.txt" -RedirectStandardOutput "success.txt" -Wait -PassThru
+    $lastExitCode = $process.ExitCode
+    $rolloutStatus =  (Get-Content "success.txt")
+   
+    # Check the code from the command
+    if ($lastExitCode -ne 0)
+    {
+        # Get the error from the file
+        $errorMessage = Get-Content "error.txt"
+
+        if ($errorMessage -is [array])
+        {
+          $errorMessage = $errorMessage[0]
+        }
+
+        # Expose the original error
+        throw $errorMessage
+    }
+}
+catch
+{
+    if ($_.Exception.Message -ne "Error: Rollout status watch exceeded timeout")
+    {
+        # Timeout is expected, everything else is not
+        Write-Host "$(Get-Content "error.txt")"
+        throw
+    }
+    else
+    {
+        # It was just a timeout, make last exit 0
+        Write-Host "Wait operation timed out, returning recorded status."
+        $lastExitCode = 0
+    }
+}
+
+Write-Host "Status is $rolloutStatus"
+
+if ($rolloutStatus.Contains("-"))
+{
+    $messages = $rolloutStatus.Split("-")
+    
+    Save-OctopusVariable -Name "Status" -Value $messages[0].Trim()
+    Save-OctopusVariable -Name "StatusMessage" -Value $messages[1].Trim()
+}
+else
+{
+    Save-OctopusVariable -Name "Status" -Value $rolloutStatus
+}
\ No newline at end of file
diff --git a/src/step-templates/argo-rollouts-undo/metadata.json b/src/step-templates/argo-rollouts-undo/metadata.json
new file mode 100644
index 000000000..8f5ad8484
--- /dev/null
+++ b/src/step-templates/argo-rollouts-undo/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "e75786e1-ef06-4ce7-a831-ccde04927c4c",
+  "Name": "Argo - Rollouts Undo",
+  "Description": "Rollback to the previous rollout.",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "f2c7fa50-2faf-4d16-affd-13c00a72afef",
+      "Name": "Argo.Rollout.Name",
+      "Label": "Rollout Name",
+      "HelpText": "Name of the Argo Rollout to Undo",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0910eda0-93f4-4f31-85bd-fafd2d39d3ac",
+      "Name": "Argo.Rollout.Namespace",
+      "Label": "Namespace",
+      "HelpText": "The namespace where the rollout exists.",
+      "DefaultValue": "default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b7fb60af-72fc-4a94-b242-40397941aa39",
+      "Name": "Argo.Rollout.Revision",
+      "Label": "Revision",
+      "HelpText": "Revision number to revert to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.KubernetesRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-06T20:14:10.8310000Z",
+    "OctopusVersion": "2024.1.12815",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "argo"
+}
diff --git a/src/step-templates/argo-rollouts-undo/scriptbody.ps1 b/src/step-templates/argo-rollouts-undo/scriptbody.ps1
new file mode 100644
index 000000000..4f05e8b29
--- /dev/null
+++ b/src/step-templates/argo-rollouts-undo/scriptbody.ps1
@@ -0,0 +1,176 @@
+# Supress info messages written to stderr
+Write-Host "##octopus[stderr-progress]"
+
+# Installs the Argo Rollouts plugin
+function Install-Plugin
+{
+# Define parameters
+	param ($PluginUri,
+           $PluginFilename
+    )
+    
+    # Check for plugin folder
+    if ((Test-Path -Path "$PWD/plugins") -eq $false)
+    {
+		# Create new plugins folder
+        New-Item -Path "$PWD/plugins" -ItemType "Directory"
+        
+        # Add to path
+        $env:PATH = "$($PWD)/plugins$([IO.Path]::PathSeparator)" + $env:PATH
+    }
+
+	# Download plugin
+	Invoke-WebRequest -Uri "$PluginUri" -OutFile "$PWD/plugins/$PluginFilename"
+
+	# Make file executable
+    if ($IsLinux)
+    {
+		# Make it executable
+    	chmod +x ./plugins/$PluginFilename
+    }
+    
+    if ($IsWindows)
+    {
+    	# Update filename to include .exe extension
+        Rename-Item -Path "$PWD/plugins/$PluginFilename" -NewName "$PWD/plugins/$($PluginFilename).exe"
+    }
+}
+
+# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist
+function Verify-Path-Variable
+{
+	# Get current path and split into array
+    $paths = $env:PATH.Split([IO.Path]::PathSeparator)
+    $verifiedPaths = @()
+    
+    # Loop through paths
+    foreach ($path in $paths)
+    {
+    	# Check for existence
+        if ((Test-Path -Path $path) -eq $true)
+        {
+        	# Add to verified
+            $verifiedPaths += $path
+        }
+    }
+    
+    # Return verified paths
+    return ($verifiedPaths -join [IO.Path]::PathSeparator)
+}
+
+function Get-Plugin-Installed
+{
+	# Define parameters
+    param (
+    	$PluginName,
+        $InstalledPlugins
+        )
+        
+   	$isInstalled = $false
+   
+	foreach ($plugin in $installedPlugins)
+   	{
+		if ($plugin -like "$($PluginName)*")
+        {
+        	$isInstalled = $true
+          	break
+        }
+	}
+    
+    return $isInstalled
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Verify all PATH variables are avaialable
+$env:PATH = Verify-Path-Variable
+if ($IsLinux)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64"
+}
+
+if ($IsWindows)
+{
+	$pluginUri = "https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64"
+}
+
+try 
+{
+    # Check to see if plugins are installed
+    $pluginList = (kubectl plugin list 2>&1)
+
+    # This is the path that Linux will take
+    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH") 
+    {
+        Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+    }
+    else
+    {
+        # Parse list
+    	$pluginList = $pluginList.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)
+        
+        if ((Get-Plugin-Installed -PluginName "kubectl-argo-rollouts" -InstalledPlugins $pluginList) -eq $false)
+        {
+        	Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"
+        }
+        else
+        {
+        	Write-Host "Argo Rollout kubectl plugin found ..."
+        }
+    }    
+}
+catch
+{
+	# On Windows, the executable will cause an error if no plugins found so this the path Windows will take
+    if ($_.Exception.Message -eq "error: unable to find any kubectl plugins in your PATH")
+    {
+      Install-Plugin -PluginUri $pluginUri -PluginFilename "kubectl-argo-rollouts"    
+    }
+    else
+    {
+    	# Something else happened, we need to surface the error
+        throw
+    }
+}
+
+# Get parameters
+$rolloutsName = $OctopusParameters['Argo.Rollout.Name']
+$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']
+$rolloutRevision = $OctopusParameters['Argo.Rollout.Revision']
+
+# Create arguments array
+$kubectlArguments = @("argo", "rollouts", "undo", $rolloutsName, "--namespace", $rolloutsNamespace)
+
+# Check for revision
+if (![string]::IsNullOrWhitespace($rolloutRevision))
+{
+	# Add argument
+    $kubectlArguments += @("--to-revision=$rolloutRevision")
+}
+
+# Pause rollout
+kubectl $kubectlArguments
+
+if ($lastExitCode -ne 0)
+{
+	Write-Error "Rollout command failed!"
+}
\ No newline at end of file
diff --git a/step-templates/argo-workflow-submit.json b/src/step-templates/argo-workflow-submit/metadata.json
similarity index 54%
rename from step-templates/argo-workflow-submit.json
rename to src/step-templates/argo-workflow-submit/metadata.json
index a99b15362..5bac3a1f6 100644
--- a/step-templates/argo-workflow-submit.json
+++ b/src/step-templates/argo-workflow-submit/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# Check for Argo\nif ! command -v argo -v >/dev/null 2>&1\nthen\n    echo \"argo executable could not be found. Please use a target or container including it like octopuslabs/argo-workflow-workertools.\"\n    exit 1\nfi\n\n# Grab Variables\nexport wkf_name=$(get_octopusvariable 'ArgoWorkflowSubmit.Name')\nexport namespace=$(get_octopusvariable 'ArgoWorkflowSubmit.Namespace')\nexport parameter_array=$(get_octopusvariable \"ArgoWorkflowSubmit.Parameters\")\nexport options=$(get_octopusvariable 'ArgoWorkflowSubmit.Options')\n\n# Check workflowTemplate name has been passed\nif [ -z \"$wkf_name\" ] ; then\n  echo \"WorkflowTemplate name is required\"\n  exit 1\nfi\n# Process optional parameters\nparameter_string=\"\"\nif [ -n \"$parameter_array\" ] ; then\n  parameter_string=$(echo \"$parameter_array\" | awk '{printf \"-p %s \", $0}' | sed 's/ $//')\n  echo \"Parameter string: $parameter_string\"\nelse\n  echo \"No parameters passed\"\nfi\n\n\nCMD=\"argo submit -n $namespace --from workflowtemplate/$wkf_name $parameter_string $options -o name\"\necho \"Workflow Submit command: $CMD\"\n\nNAME=$($CMD)\nargo logs --follow $NAME\n\nPHASE=$(argo get $NAME -o json | jq -r '.status.phase')\n\nif [[ \"$PHASE\" == \"Succeeded\" ]]; then\n  echo \"Workflow Succeeded.\"\n  exit 0\nelif [[ \"$PHASE\" == \"Failed\" ]] || [[ \"$PHASE\" == \"Error\" ]]; then\n  MESSAGE=$(argo get \"$NAME\" -o json | jq -r '.status.message')\n  echo \"Workflow Phase: $PHASE.\"\n  echo \"Message: $MESSAGE\"\n  exit 1\nelse\n  echo \"Workflow Phase: $PHASE (still running or unknown).\"\n  exit 2\nfi"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -56,7 +56,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2026-03-13T16:49:32.867Z",
+    "ExportedAt": "2026-03-13T16:49:32.8670000Z",
     "OctopusVersion": "2026.2.999",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/argo-workflow-submit/scriptbody.sh b/src/step-templates/argo-workflow-submit/scriptbody.sh
new file mode 100644
index 000000000..d76ad9df5
--- /dev/null
+++ b/src/step-templates/argo-workflow-submit/scriptbody.sh
@@ -0,0 +1,48 @@
+# Check for Argo
+if ! command -v argo -v >/dev/null 2>&1
+then
+    echo "argo executable could not be found. Please use a target or container including it like octopuslabs/argo-workflow-workertools."
+    exit 1
+fi
+
+# Grab Variables
+export wkf_name=$(get_octopusvariable 'ArgoWorkflowSubmit.Name')
+export namespace=$(get_octopusvariable 'ArgoWorkflowSubmit.Namespace')
+export parameter_array=$(get_octopusvariable "ArgoWorkflowSubmit.Parameters")
+export options=$(get_octopusvariable 'ArgoWorkflowSubmit.Options')
+
+# Check workflowTemplate name has been passed
+if [ -z "$wkf_name" ] ; then
+  echo "WorkflowTemplate name is required"
+  exit 1
+fi
+# Process optional parameters
+parameter_string=""
+if [ -n "$parameter_array" ] ; then
+  parameter_string=$(echo "$parameter_array" | awk '{printf "-p %s ", $0}' | sed 's/ $//')
+  echo "Parameter string: $parameter_string"
+else
+  echo "No parameters passed"
+fi
+
+
+CMD="argo submit -n $namespace --from workflowtemplate/$wkf_name $parameter_string $options -o name"
+echo "Workflow Submit command: $CMD"
+
+NAME=$($CMD)
+argo logs --follow $NAME
+
+PHASE=$(argo get $NAME -o json | jq -r '.status.phase')
+
+if [[ "$PHASE" == "Succeeded" ]]; then
+  echo "Workflow Succeeded."
+  exit 0
+elif [[ "$PHASE" == "Failed" ]] || [[ "$PHASE" == "Error" ]]; then
+  MESSAGE=$(argo get "$NAME" -o json | jq -r '.status.message')
+  echo "Workflow Phase: $PHASE."
+  echo "Message: $MESSAGE"
+  exit 1
+else
+  echo "Workflow Phase: $PHASE (still running or unknown)."
+  exit 2
+fi
\ No newline at end of file
diff --git a/step-templates/aspnet-state-database.json b/src/step-templates/aspnet-state-database/metadata.json
similarity index 76%
rename from step-templates/aspnet-state-database.json
rename to src/step-templates/aspnet-state-database/metadata.json
index e9eae55bd..fae746b11 100644
--- a/step-templates/aspnet-state-database.json
+++ b/src/step-templates/aspnet-state-database/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 6,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$command = \"$env:windir\\Microsoft.NET\\$FrameworkDirectory\\aspnet_regsql.exe\"\r\n$params = @('-ssadd', '-sstype', 'p', '-S', $SqlServer)\r\ntry\r\n{    \r\n    if ($SqlUsername -ne $null -and $SqlPassword -ne $null)\r\n    {\r\n        $params += @('-U', $SqlUsername, '-P', $SqlPassword)\r\n    } else {\r\n        $params += @('-E')\r\n    }\r\n    \r\n    & $command @params\r\n}\r\ncatch\r\n{    \r\n    $error[0] | format-list -force\r\n    Exit 1\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -48,12 +48,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-06-03T16:12:08.806+00:00",
+    "ExportedAt": "2015-06-03T09:12:08.8060000-07:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "aspnet"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/aspnet-state-database/scriptbody.ps1 b/src/step-templates/aspnet-state-database/scriptbody.ps1
new file mode 100644
index 000000000..8f0292c19
--- /dev/null
+++ b/src/step-templates/aspnet-state-database/scriptbody.ps1
@@ -0,0 +1,18 @@
+$command = "$env:windir\Microsoft.NET\$FrameworkDirectory\aspnet_regsql.exe"
+$params = @('-ssadd', '-sstype', 'p', '-S', $SqlServer)
+try
+{    
+    if ($SqlUsername -ne $null -and $SqlPassword -ne $null)
+    {
+        $params += @('-U', $SqlUsername, '-P', $SqlPassword)
+    } else {
+        $params += @('-E')
+    }
+    
+    & $command @params
+}
+catch
+{    
+    $error[0] | format-list -force
+    Exit 1
+}
\ No newline at end of file
diff --git a/src/step-templates/aspnetcore-set-environment-variable-iis/metadata.json b/src/step-templates/aspnetcore-set-environment-variable-iis/metadata.json
new file mode 100644
index 000000000..5c3b8a6e2
--- /dev/null
+++ b/src/step-templates/aspnetcore-set-environment-variable-iis/metadata.json
@@ -0,0 +1,54 @@
+{
+  "Id": "3586C580-7FC8-4FAB-A783-3641D91F7746",
+  "Author": "waxtell",
+  "Name": "ASP.NET Core Set Environment Variables Via IIS Config",
+  "Description": "Set environment variables in IIS config (no web.config)",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "3FE22421-50AB-4CBB-B86A-666EC1609115",
+      "Name": "sev_siteName",
+      "Label": "Site Name",
+      "HelpText": "Name of your ASP.NET Core site",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "78BF70F2-72F5-42E6-A992-C9504A964815",
+      "Name": "sev_envVariables",
+      "Label": "Environment Variables",
+      "HelpText": "Newline separated list of environment variables (varname=varvalue)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3F851D0C-C93E-403F-861E-5BDA361C1E92",
+      "Name": "sev_appCmdPath",
+      "Label": "Path to appcmd.exe",
+      "HelpText": "Path to the appcmd.exe executable",
+      "DefaultValue": "c:\\windows\\system32\\inetsrv",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "geeknz",
+  "$Meta": {
+    "ExportedAt": "2024-07-15T22:40:29.0700000Z",
+    "OctopusVersion": "2024.2.9220",
+    "Type": "ActionTemplate"
+  },
+  "Category": "dotnetcore"
+}
diff --git a/src/step-templates/aspnetcore-set-environment-variable-iis/scriptbody.ps1 b/src/step-templates/aspnetcore-set-environment-variable-iis/scriptbody.ps1
new file mode 100644
index 000000000..7055ed2be
--- /dev/null
+++ b/src/step-templates/aspnetcore-set-environment-variable-iis/scriptbody.ps1
@@ -0,0 +1,46 @@
+function AddOrReplaceEnvironmentVariable {
+    param
+    (
+        [string] $variableName, 
+        [string] $variableValue,
+        [string] $siteName,
+        [string] $appCmd
+    )
+
+    Try {
+        [xml] $xmlConfig = (&$appCmd list config $sev_siteName -section:system.webServer/aspNetCore)
+    }
+    Catch {
+        Write-Host $sev_siteName 'either does not exist or is not an AspNetCore site!'
+        exit -1
+    }
+
+    if($xmlConfig.selectNodes("//environmentVariable[@name='$variableName']")) {
+        &$appCmd set config $sev_siteName -section:system.webServer/aspNetCore /-"environmentVariables.[name='$variableName',value='$variableValue']" /commit:apphost
+    }
+    
+    &$appCmd set config $sev_siteName -section:system.webServer/aspNetCore /+"environmentVariables.[name='$variableName',value='$variableValue']" /commit:apphost
+}
+
+[string] $sev_siteName=$OctopusParameters['sev_siteName']
+[string] $sev_envVariables=$OctopusParameters['sev_envVariables']
+[string] $sev_appCmdPath=$OctopusParameters['sev_appCmdPath']
+
+Write-Host "---------------------------"
+Write-Host $sev_envVariables
+Write-Host $sev_appCmdPath
+Write-Host "---------------------------"
+
+$appCmd = Join-Path $sev_appCmdPath 'appcmd.exe'
+
+foreach($line in $sev_envVariables -split '\r?\n') {
+    $indexOfEquals = $line.IndexOf('=')
+    if ($indexOfEquals -eq -1) {
+        Write-Host "Invalid environment variable format: $line"
+        continue
+    }
+    $key = $line.Substring(0, $indexOfEquals)
+    $value = $line.Substring($indexOfEquals + 1)
+
+    AddOrReplaceEnvironmentVariable $key $value $sev_siteName $appCmd
+}
diff --git a/src/step-templates/aspnetcore-set-environment-variable/metadata.json b/src/step-templates/aspnetcore-set-environment-variable/metadata.json
new file mode 100644
index 000000000..e7e5a3bbf
--- /dev/null
+++ b/src/step-templates/aspnetcore-set-environment-variable/metadata.json
@@ -0,0 +1,59 @@
+{
+  "Id": "c7f96ab8-a0d3-4f01-928e-c8cb78ab108c",
+  "Name": "ASP.NET Core - set runtime environment variable via web.config",
+  "Description": "ASP.NET Core allows you specify environment variables in web.config - https://docs.microsoft.com/en-us/aspnet/core/hosting/aspnet-core-module#set-environment-variables",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "b1b74503-0f3d-4519-8ec6-d6a4aace9086",
+      "Name": "anc_WebConfigPath",
+      "Label": "Web.Config Path",
+      "HelpText": "Typically an output variable from a previous step",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "5fe18f04-de84-445e-bb69-81ed0d39980f",
+      "Name": "anc_EnvironmentVariableName",
+      "Label": "Environment Variable Name",
+      "HelpText": "Name of environment variable to set",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c9099a01-7de3-4724-8d6d-e26d8bf0fd21",
+      "Name": "anc_EnvironmentVariableValue",
+      "Label": "Environment Variable Value",
+      "HelpText": "Value of environment variable to set",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "baynenator",
+  "$Meta": {
+    "ExportedAt": "2017-08-31T06:20:39.4150000Z",
+    "OctopusVersion": "3.13.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "dotnetcore"
+}
diff --git a/src/step-templates/aspnetcore-set-environment-variable/scriptbody.ps1 b/src/step-templates/aspnetcore-set-environment-variable/scriptbody.ps1
new file mode 100644
index 000000000..af45d4f4f
--- /dev/null
+++ b/src/step-templates/aspnetcore-set-environment-variable/scriptbody.ps1
@@ -0,0 +1,79 @@
+Param(
+    [string]$anc_WebConfigPath,
+    [string]$anc_EnvironmentVariableName,
+    [string]$anc_EnvironmentVariableValue
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Parameter($Name, [switch]$Required, [switch]$TestPath) {
+
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    if ($TestPath) {
+        if (!(Test-Path $result -PathType Leaf)) {
+            throw "Could not find $result"
+        }
+    }
+
+    return $result
+}
+
+& {
+    Param(
+        [string]$anc_WebConfigPath,
+        [string]$anc_EnvironmentVariableName,
+        [string]$anc_EnvironmentVariableValue
+    )
+
+    $xml = (Get-Content $anc_WebConfigPath) -as [Xml]
+    $aspNetCore = $xml.configuration.location.'system.webServer'.aspNetCore
+    $environmentVariables = $aspNetCore.environmentVariables
+
+    if (!$environmentVariables) {
+        $environmentVariables = $xml.CreateElement("environmentVariables");
+        $aspNetCore.AppendChild($environmentVariables)
+    }
+
+    $environmentVariable = $environmentVariables.environmentVariable | Where-Object {$_.name -eq $anc_EnvironmentVariableName}
+
+    if ($environmentVariable) {
+        $environmentVariable.value = $anc_EnvironmentVariableValue
+    }
+    elseif ($environmentVariables) {
+        $environmentVariable = $xml.CreateElement("environmentVariable");
+        $environmentVariable.SetAttribute("name", $anc_EnvironmentVariableName);
+        $environmentVariable.SetAttribute("value", $anc_EnvironmentVariableValue);
+        $x = $environmentVariables.AppendChild($environmentVariable)
+    }
+    else {
+        throw "Could not find 'configuration/system.webServer/aspNetCore/environmentVariables' element in web.config"
+    }
+
+    try {
+        $xml.Save((Resolve-Path $anc_WebConfigPath))
+    }
+    catch {
+        throw "Could not save web.config because: $_.Exception.Message"
+    }
+} `
+(Get-Parameter 'anc_WebConfigPath' -Required -TestPath) `
+(Get-Parameter 'anc_EnvironmentVariableName' -Required) `
+(Get-Parameter 'anc_EnvironmentVariableValue' -Required)
diff --git a/src/step-templates/automate-manual-intervention-response/metadata.json b/src/step-templates/automate-manual-intervention-response/metadata.json
new file mode 100644
index 000000000..232acb562
--- /dev/null
+++ b/src/step-templates/automate-manual-intervention-response/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "54f95528-aa1e-4c97-8c16-b2e0d737c43e",
+  "Name": "Automate Manual Intervention Response",
+  "Description": "This template will search for deployments that have been paused due to Manual Intervention or Guided Failure and automate the response.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "f5961f82-66a5-4219-a15c-f4a9feb68904",
+      "Name": "AutomateResponse.Octopus.Url",
+      "Label": "Octopus Server Url",
+      "HelpText": "The Url to your Octopus Server instance.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3752c78e-4df8-4261-bdff-906bed063b12",
+      "Name": "AutomateResponse.Api.Key",
+      "Label": "API Key",
+      "HelpText": "API Key of the account you want to use for the automatic response.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "be44e98e-13a8-4f4e-9b51-99920dfcf763",
+      "Name": "AutomateResponse.Reason.Notes",
+      "Label": "Reason Notes",
+      "HelpText": "This is the `Notes` input for manual intervention.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1bfbcc18-7ed9-4fce-88d1-0b4ab76d2623",
+      "Name": "AutomateResponse.ManualIntervention",
+      "Label": "Manual Intervention Response Type",
+      "HelpText": "Select the response type for the Manual Intervention.  Click Default Value to reset to none",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Abort|Abort\nProceed|Proceed"
+      }
+    },
+    {
+      "Id": "30405062-6bb6-499f-85ef-78bd378684ba",
+      "Name": "AutomateResponse.GuidedFailure",
+      "Label": "Guided Failure Response Type",
+      "HelpText": "Select the automated response for a Guided Failure.  Click Default Value to reset to none.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Fail|Fail\nExclude|Exclude Machine From Deployment\nIgnore|Ignore\nRetry|Retry"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-04-21T20:17:19.3150000Z",
+    "OctopusVersion": "2025.2.7176",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/automate-manual-intervention-response/scriptbody.ps1 b/src/step-templates/automate-manual-intervention-response/scriptbody.ps1
new file mode 100644
index 000000000..7e13d24aa
--- /dev/null
+++ b/src/step-templates/automate-manual-intervention-response/scriptbody.ps1
@@ -0,0 +1,141 @@
+function Get-OctopusItems
+{
+ # Define parameters
+    param(
+        $OctopusUri,
+        $ApiKey,
+        $SkipCount = 0
+    )
+
+    # Define working variables
+    $items = @()
+    $skipQueryString = ""
+    $headers = @{"X-Octopus-ApiKey"="$ApiKey"}
+
+    # Check to see if there there is already a querystring
+    if ($octopusUri.Contains("?"))
+    {
+        $skipQueryString = "&skip="
+    }
+    else
+    {
+        $skipQueryString = "?skip="
+    }
+
+    $skipQueryString += $SkipCount
+
+    # Get intial set
+    $resultSet = Invoke-RestMethod -Uri "$($OctopusUri)$skipQueryString" -Method GET -Headers $headers
+
+    # Check to see if it returned an item collection
+    if ($null -ne $resultSet.Items)
+    {
+        # Store call results
+        $items += $resultSet.Items
+
+        # Check to see if resultset is bigger than page amount
+        if (($resultSet.Items.Count -gt 0) -and ($resultSet.Items.Count -eq $resultSet.ItemsPerPage))
+        {
+            # Increment skip count
+            $SkipCount += $resultSet.ItemsPerPage
+
+            # Recurse
+            $items += Get-OctopusItems -OctopusUri $OctopusUri -ApiKey $ApiKey -SkipCount $SkipCount
+        }
+    }
+    else
+    {
+        return $resultSet
+    }
+
+
+    # Return results
+    return ,$items
+}
+
+$automaticResponseOctopusUrl = $OctopusParameters['AutomateResponse.Octopus.Url']
+$automaticResponseApiKey = $OctopusParameters['AutomateResponse.Api.Key']
+$automaticResponseReasonNotes = $OctopusParameters['AutomateResponse.Reason.Notes']
+$automaticResponseManualInterventionResponseType = $OctopusParameters['AutomateResponse.ManualIntervention']
+$automaticResponseGuidedFailureResponseType = $OctopusParameters['AutomateResponse.GuidedFailure']
+$header = @{ "X-Octopus-ApiKey" = $automaticResponseApiKey }
+
+# Validate response type input
+if (![string]::IsNullOrWhitespace($automaticResponseManualInterventionResponseType) -and ![string]::IsNullOrWhitespace($automaticResponseGuidedFailureResponseType))
+{
+	# Fail step
+    Write-Error "Cannot have both a Manual Intervention and Guided Failure selections."
+}
+
+if ([string]::IsNullOrWhitespace($automaticResponseManualInterventionResponseType) -and [string]::IsNullOrWhitespace($automaticResponseGuidedFailureResponseType))
+{
+	# Fail step
+    Write-Error "Please select either a Manual Intervention or Guided Failure response type."
+}
+
+# Get space
+$spaceId = $OctopusParameters['Octopus.Space.Id']
+
+# Get project
+$projectId = $OctopusParameters['Octopus.Project.Id']
+
+# Get the environment
+$environmentId = $OctopusParameters['Octopus.Environment.Id']
+
+if (![string]::IsNullOrWhitespace($automaticResponseGuidedFailureResponseType))
+{
+# Get currently executing deployments for project - this is for Guided Failure as they're in an executing state
+  Write-Host "Searching for executing deployments ..."
+  $executingDeployments = Get-OctopusItems -OctopusUri "$automaticResponseOctopusUrl/api/$($spaceId)/deployments?projects=$($projectId)&taskState=Executing&environments=$($environmentId)" -ApiKey $automaticResponseApiKey
+}
+
+if (![string]::IsNullOrWhitespace($automaticResponseManualInterventionResponseType))
+{
+  Write-Host "Searching for queued deployments ..."
+  # Get queued deployments - this is for 
+  $executingDeployments = Get-OctopusItems -OctopusUri "$automaticResponseOctopusUrl/api/$($spaceId)/deployments?projects=$($projectId)&taskState=Queued&environments=$($environmentId)" -ApiKey $automaticResponseApiKey
+}
+
+# Check to see if anything was returned for the environment
+if ($executingDeployments -is [array])
+{
+  # Loop through executing deployments
+  foreach ($deployment in $executingDeployments)
+  {
+      # Get object for manual intervention
+      Write-Host "Checking $($deployment.Id) for manual interventions ..."
+      $manualIntervention = Get-OctopusItems -OctopusUri "$automaticResponseOctopusUrl/api/$($spaceId)/interruptions?regarding=$($deployment.Id)&pendingOnly=true" -ApiKey $automaticResponseApiKey
+
+      # Check to see if a manual intervention was returned
+      if ($null -ne $manualIntervention.Id)
+      {
+          # Take responsibility
+          Write-Host "Auto taking resonsibility for manual intervention ..."
+          Invoke-RestMethod -Method Put -Uri "$automaticResponseOctopusUrl/api/$($spaceId)/interruptions/$($manualIntervention.Id)/responsible" -Headers $header
+
+          # Create response object
+          $jsonBody = @{
+              Notes = $automaticResponseReasonNotes
+          }
+
+          # Check to see if manual intervention is empty
+          if (![string]::IsNullOrWhiteSpace($automaticResponseManualInterventionResponseType))
+          {
+              # Add the manual intervention type
+              Write-Host "Submitting $automaticResponseManualInterventionResponseType as response ..."
+              $jsonBody.Add("Result", $automaticResponseManualInterventionResponseType)
+          }
+
+          # Check to see if the guided failure is empty
+          if (![string]::IsNullOrWhiteSpace($automaticResponseGuidedFailureResponseType))
+          {
+              # Add the guided failure response
+              Write-Host "Submitting $automaticResponseGuidedFailureResponseType as response ..."
+              $jsonBody.Add("Guidance", $automaticResponseGuidedFailureResponseType)
+          }
+
+          # Post to server
+          Invoke-RestMethod -Method Post -Uri "$automaticResponseOctopusUrl/api/$($spaceId)/interruptions/$($manualIntervention.Id)/submit" -Body ($jsonBody | ConvertTo-Json -Depth 10) -Headers $header
+      }
+  }
+}
\ No newline at end of file
diff --git a/step-templates/aws-add-imagetag-to-all-used-ecr-packages.json b/src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/metadata.json
similarity index 65%
rename from step-templates/aws-add-imagetag-to-all-used-ecr-packages.json
rename to src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/metadata.json
index 47410a532..2293d8246 100644
--- a/step-templates/aws-add-imagetag-to-all-used-ecr-packages.json
+++ b/src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/metadata.json
@@ -13,7 +13,7 @@
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{AwsAccount}",
     "Octopus.Action.Aws.Region": "#{AwsRegion}",
-    "Octopus.Action.Script.ScriptBody": "$DeployTag = $AwsDeployPrefix + $OctopusParameters[\"Octopus.Environment.Name\"]\n\n#{each action in Octopus.Action}\n    #{each package in action.Package}\n        Write-Output \"Package #{package.PackageId} at version #{package.PackageVersion}\"\n\n        $Image = Get-ECRImageBatch -ImageId @{ imageTag=\"#{package.PackageVersion}\" } -RepositoryName \"#{package.PackageId}\"\n        $ImageDeploy = Get-ECRImageBatch -ImageId @{ imageTag=$DeployTag } -RepositoryName \"#{package.PackageId}\"\n\n        if($Image.Images[0].ImageId.ImageDigest -ne $ImageDeploy.Images[0].ImageId.ImageDigest) {\n            Write-Output \"Setting tag $DeployTag on image $($Image.Images[0].ImageId.ImageDigest)\"\n            $Manifest = $Image.Images[0].ImageManifest\n            Write-ECRImage -RepositoryName \"#{package.PackageId}\" -ImageManifest $Manifest -ImageTag $DeployTag\n        }\n\t#{/each}\n#{/each}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -49,7 +49,7 @@
   ],
   "LastModifiedBy": "hakanl",
   "$Meta": {
-    "ExportedAt": "2019-02-06T15:41:19.708Z",
+    "ExportedAt": "2019-02-06T15:41:19.7080000Z",
     "OctopusVersion": "2018.11.2",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/scriptbody.ps1 b/src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/scriptbody.ps1
new file mode 100644
index 000000000..b9fda588c
--- /dev/null
+++ b/src/step-templates/aws-add-imagetag-to-all-used-ecr-packages/scriptbody.ps1
@@ -0,0 +1,16 @@
+$DeployTag = $AwsDeployPrefix + $OctopusParameters["Octopus.Environment.Name"]
+
+#{each action in Octopus.Action}
+    #{each package in action.Package}
+        Write-Output "Package #{package.PackageId} at version #{package.PackageVersion}"
+
+        $Image = Get-ECRImageBatch -ImageId @{ imageTag="#{package.PackageVersion}" } -RepositoryName "#{package.PackageId}"
+        $ImageDeploy = Get-ECRImageBatch -ImageId @{ imageTag=$DeployTag } -RepositoryName "#{package.PackageId}"
+
+        if($Image.Images[0].ImageId.ImageDigest -ne $ImageDeploy.Images[0].ImageId.ImageDigest) {
+            Write-Output "Setting tag $DeployTag on image $($Image.Images[0].ImageId.ImageDigest)"
+            $Manifest = $Image.Images[0].ImageManifest
+            Write-ECRImage -RepositoryName "#{package.PackageId}" -ImageManifest $Manifest -ImageTag $DeployTag
+        }
+	#{/each}
+#{/each}
diff --git a/src/step-templates/aws-add-remove-elbv2/metadata.json b/src/step-templates/aws-add-remove-elbv2/metadata.json
new file mode 100644
index 000000000..3de60abdb
--- /dev/null
+++ b/src/step-templates/aws-add-remove-elbv2/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "2abc4f4f-06f4-4af6-8b10-52651ab4d3d5",
+  "Name": "AWS - Add or Remove instance from ELBv2",
+  "Description": "Add or Remove the current instance from an ELBv2 Target Group.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "81fc5ef2-2df8-4f10-a041-7277792e270a",
+      "Name": "accessKey",
+      "Label": "IAM Access Key ID",
+      "HelpText": "The IAM Access Key ID to use when authenticating with AWS.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c0f7d960-ffce-4046-9996-f7ef39a82306",
+      "Name": "secretKey",
+      "Label": "IAM Secret Key",
+      "HelpText": "The IAM secret access key used to authenticate with AWS.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ed692709-1332-4b18-9ec8-4bc02609bdee",
+      "Name": "region",
+      "Label": "AWS Region",
+      "HelpText": "The region in which the ELBv2 and Target Group live.",
+      "DefaultValue": "eu-west-1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "13d12f79-447f-4e2a-b4fb-460117b9301d",
+      "Name": "targetGroupArn",
+      "Label": "Target Group ARN",
+      "HelpText": "The ARN of the target group.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8c6fa0f4-6ebd-4021-aba9-39c7a5394ecd",
+      "Name": "action",
+      "Label": "Action",
+      "HelpText": "Choose if you want to add or remove the current instance from the selected target group.",
+      "DefaultValue": "deregister",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "deregister|Remove\nregister|Add"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "15e771c5-7fb5-45f3-ad9e-180d90aae785",
+      "Name": "checkInterval",
+      "Label": "State Check Interval",
+      "HelpText": "The number of seconds to wait before checking if the instances has been successfully added or removed from the target group.",
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "68c5d2d8-e991-4f64-87df-cd548fc16ffe",
+      "Name": "maxChecks",
+      "Label": "Maximum State Checks",
+      "HelpText": "The maximum number of times to check if the instance has been successfully added or removed from the target group.",
+      "DefaultValue": "6",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2022-05-16T07:30:05.3030000Z",
+  "LastModifiedBy": "phillip-haydon",
+  "$Meta": {
+    "ExportedAt": "2022-05-16T07:30:05.3030000Z",
+    "OctopusVersion": "2022.1.2584",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-add-remove-elbv2/scriptbody.ps1 b/src/step-templates/aws-add-remove-elbv2/scriptbody.ps1
new file mode 100644
index 000000000..cf171a6b7
--- /dev/null
+++ b/src/step-templates/aws-add-remove-elbv2/scriptbody.ps1
@@ -0,0 +1,132 @@
+$accessKey = $OctopusParameters['accessKey']
+$secretKey = $OctopusParameters['secretKey']
+$region = $OctopusParameters['region']
+
+$targetGroupArn = $OctopusParameters['targetGroupArn']
+
+$action = $OctopusParameters['action']
+
+$checkInterval = $OctopusParameters['checkInterval']
+$maxChecks = $OctopusParameters['maxChecks']
+
+$awsProfile = (get-date -Format '%y%d%M-%H%m').ToString() # random
+
+if (Get-Module | Where-Object { $_.Name -like "AWSPowerShell*" }) {
+	Write-Host "AWS PowerShell module is already loaded."
+} else {
+	$awsModule = Get-Module -ListAvailable | Where-Object {  $_.Name -like "AWSPowerShell*" }
+	if (!($awsModule)) {
+    	Write-Error "AWSPowerShell / AWSPowerShell.NetCore not found"
+        return
+    } else {
+    	Import-Module $awsModule.Name
+        Write-Host "Imported Module: $($awsModule.Name)"
+    }
+}
+
+function GetCurrentInstanceId
+{
+    Write-Host "Getting instance id"
+
+	$response = Invoke-RestMethod -Uri "http://169.254.169.254/latest/meta-data/instance-id" -Method Get
+
+	if ($response)
+	{
+		$instanceId = $response
+	}
+	else
+	{
+		Write-Error -Message "Returned Instance ID does not appear to be valid"
+		Exit 1
+	}
+
+	$response
+}
+
+function GetTarget
+{
+    $instanceId = GetCurrentInstanceId
+
+    $target = New-Object -TypeName Amazon.ElasticLoadBalancingV2.Model.TargetDescription
+    $target.Id = $instanceId
+    
+    Write-Host "Current instance id: $instanceId"
+
+    return $target
+}
+
+function GetInstanceState
+{
+	$state = (Get-ELB2TargetHealth -TargetGroupArn $targetGroupArn -Target $target -AccessKey $accessKey -SecretKey $secretKey -Region $region).TargetHealth.State
+
+	Write-Host "Current instance state: $state"
+
+	return $state
+}
+
+function WaitForState
+{
+    param([string]$expectedState)
+
+    $instanceState = GetInstanceState -arn $targetGroupArn -target $target
+
+    if ($instanceState -eq $expectedState)
+    {
+        return
+    }
+
+    $checkCount = 0
+
+    Write-Host "Waiting for instance state to be $expectedState"
+    Write-Host "Maximum Checks: $maxChecks"
+    Write-Host "Check Interval: $checkInterval"
+
+    while ($instanceState -ne $expectedState -and $checkCount -le $maxChecks)
+    {	
+	    $checkCount += 1
+	
+	    Write-Host "Waiting for $checkInterval seconds for instance state to be $expectedState"
+	    Start-Sleep -Seconds $checkInterval
+	
+	    if ($checkCount -le $maxChecks)
+	    {
+		    Write-Host "$checkCount/$maxChecks Attempts"
+	    }
+	
+	    $instanceState = GetInstanceState
+    }
+
+    if ($instanceState -ne $expectedState)
+    {
+	    Write-Error -Message "Instance state is not $expectedState, giving up."
+	    Exit 1
+    }
+}
+
+function DeregisterInstance
+{
+    Write-Host "Deregistering instance from $targetGroupArn"
+    Unregister-ELB2Target -TargetGroupArn $targetGroupArn -Target $target -AccessKey $accessKey -SecretKey $secretKey -Region $region
+    WaitForState -expectedState "unused"
+    Write-Host "Instance deregistered"
+}
+
+function RegisterInstance
+{
+    Write-Host "Registering instance with $targetGroupArn"
+    Try {
+    	Register-ELB2Target -TargetGroupArn $targetGroupArn -Target $target -AccessKey $accessKey -SecretKey $secretKey -Region $region
+    } Catch {
+    	Write-Host $Error[0]
+    }
+    WaitForState -expectedState "healthy"
+    Write-Host "Instance registered"
+}
+
+$target = GetTarget
+
+switch ($action)
+{
+    "deregister" { DeregisterInstance }
+    "register" { RegisterInstance }
+}
\ No newline at end of file
diff --git a/src/step-templates/aws-add-tags-to-ec2-instance/metadata.json b/src/step-templates/aws-add-tags-to-ec2-instance/metadata.json
new file mode 100644
index 000000000..78db8400a
--- /dev/null
+++ b/src/step-templates/aws-add-tags-to-ec2-instance/metadata.json
@@ -0,0 +1,79 @@
+{
+  "Id": "82500bb2-f442-44f3-a5a5-7ecb4165ee1f",
+  "Name": "AWS - Add Tags to EC2 Instance",
+  "Description": "This step will Add or Remove Tags from an EC2 instance.\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "3670adeb-3e4f-4c55-829b-b39bb709d841",
+      "Name": "odInstanceId",
+      "Label": "Instance ID",
+      "HelpText": "The EC2 Instance ID of the Instance you would like to add Tags to.",
+      "DefaultValue": "i-xxxxxxxxxxxxxxxxx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "918acd83-39ae-47d1-9682-12333e723cff",
+      "Name": "odAction",
+      "Label": "Action",
+      "HelpText": "The action you would like to perform - Add or Remove Tags from an EC2 Instance.",
+      "DefaultValue": "New",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "New|Add tag to an instance\nRemove|Remove tag from an instance"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9b4d592a-712d-459e-af73-1db757a769d8",
+      "Name": "odTags",
+      "Label": "Tags",
+      "HelpText": "The Tags you would like to Add or Remove from an EC2 Instance, for example:\n\n- Name=MyProject\n- Environment=Prod\n- Version=1.3.3.7",
+      "DefaultValue": "Name=#{Octopus.Project.Name}\nEnvironment=#{Octopus.Environment.Name}\nVersion=#{Octopus.Release.Number}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ccd17285-bbb4-4dcb-84a8-330f45199afd",
+      "Name": "odAccessKey",
+      "Label": "Access Key (Kind-of Optional)",
+      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6f058614-92a0-4696-bb56-b6342a8d5466",
+      "Name": "odSecretKey",
+      "Label": "Secret Key (Kind-of Optional)",
+      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tclydesdale",
+  "$Meta": {
+    "ExportedAt": "2018-01-30T12:44:07.3560000Z",
+    "OctopusVersion": "4.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-add-tags-to-ec2-instance/scriptbody.ps1 b/src/step-templates/aws-add-tags-to-ec2-instance/scriptbody.ps1
new file mode 100644
index 000000000..1228ecadf
--- /dev/null
+++ b/src/step-templates/aws-add-tags-to-ec2-instance/scriptbody.ps1
@@ -0,0 +1,101 @@
+# Running outside octopus
+param(
+    [string]$odInstanceId,
+    [string]$odAction,
+    [string]$odTags,
+    [string]$odAccessKey,
+    [string]$odSecretKey,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if (!$result -or $result -eq $null) {
+        if ($Default) {
+            $result = $Default
+        } elseif ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    return $result
+}
+
+
+& {
+    param(
+        [string]$odInstanceId,
+        [string]$odAction,
+        [string]$odTags,
+        [string]$odAccessKey,
+        [string]$odSecretKey
+    ) 
+    
+    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables
+    if ($odAccessKey -or $odSecretKey) {
+        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default
+    } elseif (([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -or ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine"))) {
+        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -SecretKey ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine")) -StoreAs default
+    } else {
+        throw "AWS API credentials were not available/provided."
+    }
+
+
+
+    Write-Output ("------------------------------")
+    Write-Output ("Add/Remove Instance Tags:")
+    Write-Output ("------------------------------")
+    
+    $filterArray = @()
+    $tagsHash = (ConvertFrom-StringData $odTags).GetEnumerator()
+    Foreach ($tag in $tagsHash) {
+        $tagObj = $(Get-EC2Instance -InstanceId $odInstanceId).Instances.Tags | ? {$_.Key -eq $tag.Key -and $_.Value -eq $tag.Value}
+        $tagObjCount = ($tagObj | measure).Count
+        if ($tagObjCount -gt 0) {
+            if ($odAction -eq "New") {
+                Write-Output ("Cannot Add: The tag '$($tag.Key)=$($tag.Value)' already exists, skipping...")
+            } elseif ($odAction -eq "Remove") {
+                Write-Output ("The tag '$($tag.Key)=$($tag.Value)' exists, deleting...")
+
+                try {
+                    Remove-EC2Tag -Tags @{key=$tag.Key} -resourceId $odInstanceId -Force
+                }
+                catch [Amazon.EC2.AmazonEC2Exception] {
+                    throw $_.Exception.errorcode + '-' + $_.Exception.Message
+                }
+            }
+        } else {
+            if ($odAction -eq "New") {
+                Write-Output ("The combination of tag and value '$($tag.Key)=$($tag.Value)' does not exist, Creating/Updating tag...")
+
+                try {
+                    New-EC2Tag -Tags @{key=$tag.Key;value=$tag.Value} -resourceId $odInstanceId
+                }
+                catch [Amazon.EC2.AmazonEC2Exception] {
+                    throw $_.Exception.errorcode + '-' + $_.Exception.Message
+                }
+            } elseif ($odAction -eq "Remove") {
+                Write-Output ("Cannot Remove: The tag '$($tag.Key)=$($tag.Value)' does not exist, skipping...")
+            }
+        }
+    }
+ } `
+ (Get-Param 'odInstanceId' -Required) `
+ (Get-Param 'odAction' -Required) `
+ (Get-Param 'odTags' -Required) `
+ (Get-Param 'odAccessKey') `
+ (Get-Param 'odSecretKey')
\ No newline at end of file
diff --git a/src/step-templates/aws-change-ec2-instance-state/metadata.json b/src/step-templates/aws-change-ec2-instance-state/metadata.json
new file mode 100644
index 000000000..885c6b945
--- /dev/null
+++ b/src/step-templates/aws-change-ec2-instance-state/metadata.json
@@ -0,0 +1,68 @@
+{
+  "Id": "302a1282-c139-4e0f-9076-cd4b16d8b795",
+  "Name": "AWS - Change EC2 Instance State",
+  "Description": "This step can Start, Stop or Terminate an EC2 instance.\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "3eec5a11-9095-40f6-bebb-71ccb94c73db",
+      "Name": "odInstanceId",
+      "Label": "Instance ID",
+      "HelpText": "The EC2 Instance ID of the Instance you would like to add Tags to.",
+      "DefaultValue": "i-xxxxxxxxxxxxxxxxx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "94b68517-858c-4232-bd1a-c760a22750a1",
+      "Name": "odState",
+      "Label": "Instance State",
+      "HelpText": "The State you would like the specified EC2 Instance to be in. For example \"Running\" (ie Start EC2 Instance).",
+      "DefaultValue": "running",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "running|Start EC2 Instance\nstopped|Stop EC2 Instance\nabsent|Terminate EC2 Instance"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e1c98924-6f3b-45fe-a4b8-16329a9a50ea",
+      "Name": "odAccessKey",
+      "Label": "Access Key (Kind-of Optional)",
+      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "45557d48-5f1a-4523-9f42-f4a53571d0ce",
+      "Name": "odSecretKey",
+      "Label": "Secret Key (Kind-of Optional)",
+      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tclydesdale",
+  "$Meta": {
+    "ExportedAt": "2018-01-30T13:25:57.1980000Z",
+    "OctopusVersion": "4.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-change-ec2-instance-state/scriptbody.ps1 b/src/step-templates/aws-change-ec2-instance-state/scriptbody.ps1
new file mode 100644
index 000000000..6e73397af
--- /dev/null
+++ b/src/step-templates/aws-change-ec2-instance-state/scriptbody.ps1
@@ -0,0 +1,114 @@
+# Running outside octopus
+param(
+    [string]$odInstanceId,
+    [string]$odState,
+    [string]$odAccessKey,
+    [string]$odSecretKey,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if (!$result -or $result -eq $null) {
+        if ($Default) {
+            $result = $Default
+        } elseif ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    return $result
+}
+
+
+& {
+    param(
+        [string]$odInstanceId,
+        [string]$odState,
+        [string]$odAccessKey,
+        [string]$odSecretKey
+    )
+    
+    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables
+    if ($odAccessKey -or $odSecretKey) {
+        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default
+    } elseif (([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -or ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine"))) {
+        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -SecretKey ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine")) -StoreAs default
+    } else {
+        throw "AWS API credentials were not available/provided."
+    }
+
+    if ($odInstanceId) {
+        $instanceObj = (Get-EC2Instance $odInstanceId | select -ExpandProperty Instances)
+        $instanceCount = ($instanceObj | measure).Count
+
+        if ($instanceCount -eq 1) {
+            $instanceId = ($instanceObj).InstanceId
+            
+            Write-Output ("------------------------------")
+            Write-Output ("Checking/Setting the EC2 Instance state:")
+            Write-Output ("------------------------------")
+            
+            $currentState = (Get-EC2Instance $instanceId).Instances.State.Name
+
+            if ($odState -eq "running" -and $currentState -ne "running") {
+                $changeInstanceStateObj = (Start-EC2Instance -InstanceId $instanceId)
+            }
+            elseif ($odState -eq "absent" -and $currentState -ne "terminated") {
+                $changeInstanceStateObj = (Remove-EC2Instance -InstanceId $instanceId -Force)
+            }
+            elseif ($odState -eq "stopped" -and $currentState -ne "stopped") {
+                $changeInstanceStateObj = (Stop-EC2Instance -InstanceId $instanceId)
+            }
+
+            $timeout = new-timespan -Seconds 120
+            $sw = [diagnostics.stopwatch]::StartNew()
+
+            while ($true) {
+                $currentState = (Get-EC2Instance $instanceId).Instances.State.Name
+
+                if ($currentState -eq "running" -and $odState -eq "running") {
+                    break
+                }
+                elseif ($currentState -eq "terminated" -and $odState -eq "absent") {
+                    break
+                }
+                elseif ($currentState -eq "stopped" -and $odState -eq "stopped") {
+                    break
+                }
+
+                Write-Output ("$(Get-Date) | Waiting for Instance '$instanceId' to transition from state: $currentState")
+
+                if ($sw.elapsed -gt $timeout) { throw "Timed out waiting for desired state" }
+
+                Sleep -Seconds 5
+            }
+ 
+            Write-Output ("------------------------------")
+            Write-Output ("$(Get-Date) | $($instanceId) state: $currentState")
+            Write-Output ("------------------------------")
+        }
+        else
+        {
+            Write-Output ("Instance '$instanceId' could not be found...?")
+        }
+    }
+ } `
+ (Get-Param 'odInstanceId' -Required) `
+ (Get-Param 'odState' -Required) `
+ (Get-Param 'odAccessKey') `
+ (Get-Param 'odSecretKey')
\ No newline at end of file
diff --git a/src/step-templates/aws-cloudformation-create/metadata.json b/src/step-templates/aws-cloudformation-create/metadata.json
new file mode 100644
index 000000000..cba392858
--- /dev/null
+++ b/src/step-templates/aws-cloudformation-create/metadata.json
@@ -0,0 +1,170 @@
+{
+  "Id": "d6d9d9db-e4ab-487c-967c-860bf8303052",
+  "Name": "AWS - Create Cloud Formation Stack",
+  "Description": "Creates a [Amazon Cloud Formation Stack](#http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html) with the template specified.\n\n- Requires the [AWS PowerShell cmdlets](http://aws.amazon.com/powershell/)",
+  "ActionType": "Octopus.Script",
+  "Version": 50,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "13f780df-407d-48b9-b7d8-7bd92f47da38",
+      "Name": "AWSSecretAccessKey",
+      "Label": "AWS Secret Access Key",
+      "HelpText": "The [secret access key](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html) to use when executing the script",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "520b8d18-fedd-49fc-a80c-957ea00fe532",
+      "Name": "AWSAccessKey",
+      "Label": "AWS Access Key",
+      "HelpText": "The [access key](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html) to use when executing the script",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ff776b86-a3f3-4d8c-b3e1-1e7ac629d503",
+      "Name": "AWSRegion",
+      "Label": "AWS Region",
+      "HelpText": "The Amazon Region see (http://docs.aws.amazon.com/powershell/latest/reference/items/Get-AWSRegion.html) for further info",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\nca-central-1|Canada (Central)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\neu-central-1|EU (Frankfurt)\neu-west-1|EU (Ireland)\neu-west-2|EU (London)\nsa-east-1|South America (São Paulo)"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "772a57e1-824b-46bf-b652-31c27b3b8473",
+      "Name": "CloudFormationStackName",
+      "Label": "AWS Cloud Formation Stack Name",
+      "HelpText": "The name of the AWS Cloud Formation Stack",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8c6b8792-fc24-4f40-953e-4d8511b5e00d",
+      "Name": "CloudFormationCapability",
+      "Label": "AWS Cloud Formation Capability",
+      "HelpText": "The capability required for the tempate see [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
+      "DefaultValue": "CAPABILITY_IAM",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "51433c58-fc29-4e73-aae0-5a40799fa16f",
+      "Name": "CloudFormationOnFailure",
+      "Label": "Action on Failure",
+      "HelpText": "Defaults to ROLLBACK.  See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
+      "DefaultValue": "ROLLBACK",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a8919189-c361-4b05-ae4b-9aba650d9d0f",
+      "Name": "UseS3ForCloudFormationTemplate",
+      "Label": "Use AWS S3 storage for the Cloud Formation Template",
+      "HelpText": "Whether to use S3 storage to source the Cloud Formation script.  See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7169c2f4-e1ff-45fa-99f1-7fcb49b1e313",
+      "Name": "CloudFormationTemplate",
+      "Label": "The Cloud Formation Template",
+      "HelpText": "The Cloud Formation Template in the format, see [docs](http://aws.amazon.com/cloudformation/aws-cloudformation-templates/)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "48351ea3-fedb-43ec-b594-c2bbc11efb46",
+      "Name": "CloudFormationTemplateURL",
+      "Label": "The location in S3 for the Cloud Formation Template",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a01f0c6c-4a0c-4f32-9327-d6a22c10d10c",
+      "Name": "CloudFormationParameters",
+      "Label": "Cloud Formation Parameters",
+      "HelpText": "See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)\n\nShould be provided as a JSON formatted object.\n\ne.g.`{ \"Key1\": \"Value1\", \"Key2\": \"Value2\" }`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ca922e15-fd36-4a0d-8717-660afc5e7aa9",
+      "Name": "UseS3ForStackPolicy",
+      "Label": "Use AWS S3 Storage for Cloud Formation Stack Policy",
+      "HelpText": "See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "869f2c5b-511f-4dee-bde7-30bee105b81d",
+      "Name": "CloudFormationStackPolicyURL",
+      "Label": "The URL for the Cloud Formation Policy in S3",
+      "HelpText": "See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "671b3717-d0b9-4285-915b-5a52ad52ff78",
+      "Name": "DeleteExistingStack",
+      "Label": "Delete Existing Stack",
+      "HelpText": "A boolean to state whether or not to delete the existing stack if one with the same name is found. If this is set to false and a stack with the same name is found, the step will fail.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "kirkholloway",
+  "$Meta": {
+    "ExportedAt": "2017-02-06T22:56:26.7360000Z",
+    "OctopusVersion": "3.7.5",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-cloudformation-create/scriptbody.ps1 b/src/step-templates/aws-cloudformation-create/scriptbody.ps1
new file mode 100644
index 000000000..de872d9e0
--- /dev/null
+++ b/src/step-templates/aws-cloudformation-create/scriptbody.ps1
@@ -0,0 +1,186 @@
+#http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html
+
+#Check for the PowerShell cmdlets
+try{ 
+    Import-Module AWSPowerShell -ErrorAction Stop
+}catch{
+    
+    $modulePath = "C:\Program Files (x86)\AWS Tools\PowerShell\AWSPowerShell\AWSPowerShell.psd1"
+    Write-Output "Unable to find the AWS module checking $modulePath" 
+    
+    try{
+        Import-Module $modulePath
+        
+    }
+    catch{
+        throw "AWS PowerShell not found! Please make sure to install them from https://aws.amazon.com/powershell/" 
+    }
+}
+
+function Confirm-CFNStackDeleted($credential, $stackName){
+   do{
+        $stack = $null
+        try {
+            $stack = Get-CFNStack -StackName $CloudFormationStackName -Credential $credential -Region $AWSRegion       
+        }
+        catch{}
+        
+        if($stack -ne $null){
+
+			$stack | ForEach-Object {
+				$progress = $_.StackStatus.ToString()
+				$name = $_.StackName.ToString()
+
+				Write-Host "Waiting for Cloud Formation Script to deleted. Stack Name: $name Operation status: $progress" 
+         
+				if($progress -ne "DELETE_COMPLETE" -and $progress -ne "DELETE_IN_PROGRESS"){                        
+					$stack
+					throw "Something went wrong deleting the Cloud Formation Template" 
+				} 	 		
+			} 
+			 
+            Start-Sleep -s 15
+        }
+
+    }until ($stack -eq $null)
+}
+
+function Confirm-CFNStackCompleted($credential, $stackName, $region){
+
+    $awsValidStatusList = @()
+    $awsValidStatusList += "CREATE_COMPLETE"
+    $awsValidStatusList += "CREATE_IN_PROGRESS" 
+    
+    $awsFailedStatusList = @()
+    $awsFailedStatusList += "CREATE_FAILED"
+    $awsFailedStatusList += "UPDATE_FAILED"
+    $awsFailedStatusList += "DELETE_SKIPPED"
+    $awsFailedStatusList += "CREATE_FAILED"
+    $awsFailedStatusList += "CREATE_FAILED"
+
+	#http://docs.aws.amazon.com/powershell/latest/reference/Index.html
+    #CREATE_COMPLETE | CREATE_FAILED | CREATE_IN_PROGRESS | DELETE_COMPLETE | DELETE_FAILED | DELETE_IN_PROGRESS | DELETE_SKIPPED | UPDATE_COMPLETE | UPDATE_FAILED | UPDATE_IN_PROGRESS.
+	 
+    do{
+        $stack = Get-CFNStack -StackName $stackName -Credential $credential -Region $region  
+		$complete = $false
+
+		#Depending on the template sometimes there are multiple status per CFN template
+
+		$stack | ForEach-Object {
+			$progress = $_.StackStatus.ToString()
+			$name = $_.StackName.ToString()
+
+			Write-Host "Waiting for Cloud Formation Script to complete. Stack Name: $name Operation status: $progress" 
+         
+			if($progress -ne "CREATE_COMPLETE" -and $progress -ne "CREATE_IN_PROGRESS"){                        
+				$stack
+				throw "Something went wrong creating the Cloud Formation Template" 
+			} 	 		
+		}
+
+		$inProgress = $stack | Where-Object { $_.StackStatus.ToString() -eq "CREATE_IN_PROGRESS" }
+		
+		if($inProgress.Count -eq 0){
+			$complete = $true
+		}
+		 
+        Start-Sleep -s 15
+
+    }until ($complete -eq $true)
+}
+
+# Check the parameters.
+if (-NOT $AWSSecretAccessKey) { throw "You must enter a value for 'AWS Access Key'." }
+if (-NOT $AWSAccessKey) { throw "You must enter a value for 'AWS Secret Access Key'." }
+if (-NOT $AWSRegion) { throw "You must enter a value for 'AWS Region'." }
+if (-NOT $CloudFormationStackName) { throw "You must enter a value for 'AWS Cloud Formation Stack Name'." }  
+
+
+#Reformat the CloudFormation parameters
+$paramObject = ConvertFrom-Json $CloudFormationParameters
+$cloudFormationParams = @()
+
+$paramObject.psobject.properties | ForEach-Object { 
+    $keyPair = New-Object -Type Amazon.CloudFormation.Model.Parameter
+    $keyPair.ParameterKey = $_.Name
+    $keyPair.ParameterValue = $_.Value
+
+    $cloudFormationParams += $keyPair
+} 
+
+Write-Output "--------------------------------------------------"
+Write-Output "AWS Region: $AWSRegion"
+Write-Output "AWS Cloud Formation Stack Name: $CloudFormationStackName"
+Write-Output "Use S3 for AWS Cloud Formation Script?: $UseS3ForCloudFormationTemplate"
+Write-Output "Use S3 for AWS Cloud Formation Stack Policy?: $UseS3ForStackPolicy"
+Write-Output "AWS Cloud Formation Script Url: $CloudFormationTemplateURL"
+Write-Output "AWS Cloud Formation Stack Policy Url: $CloudFormationStackPolicyURL"
+Write-Output "AWS Cloud Formation Parameters:"
+Write-Output $cloudFormationParams
+Write-Output "--------------------------------------------------"
+
+#Set up the credentials and the dependencies
+Set-DefaultAWSRegion -Region $AWSRegion
+$credential = New-AWSCredentials -AccessKey $AWSAccessKey -SecretKey $AWSSecretAccessKey  
+
+#Check to see if the stack exists
+try{
+    $stack = Get-CFNStack -StackName $CloudFormationStackName -Credential $credential -Region $AWSRegion    
+}
+catch{} #Do nothing as this will throw if the stack does not exist
+
+if($stack -ne $null){
+    if($DeleteExistingStack -eq $false) {
+        Write-Output "Stack with name $CloudFormationStackName already exists. If you wish to automatically delete existing stacks, set 'Delete Existing Stack' to True."
+        exit -1
+    }
+    Write-Output "Stack found, removing the existing Cloud Formation Stack"           
+    
+    Remove-CFNStack -Credential $credential -StackName $CloudFormationStackName -Region $AWSRegion -Force
+    Confirm-CFNStackDeleted -credential $credential -stackName $CloudFormationStackName
+}
+
+if($UseS3ForCloudFormationTemplate -eq $true){   
+
+    if (-NOT $CloudFormationTemplateURL) { throw "You must enter a value for 'AWS Cloud Formation Template'." } 
+
+    if($UseS3ForStackPolicy -eq $true){
+        Write-Output "Using Cloud Formation Stack Policy from $CloudFormationStackPolicyURL"
+        New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateUrl $CloudFormationTemplateURL -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability -StackPolicyURL $CloudFormationStackPolicyURL
+    }
+    else {
+        New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateUrl $CloudFormationTemplateURL -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability            
+    }
+
+    Confirm-CFNStackCompleted -credential $credential -stackName $CloudFormationStackName -region $AWSRegion
+}
+else{
+    
+    Write-Output "Using Cloud Formation script from Template"
+
+    $validTemplate = Test-CFNTemplate -TemplateBody $CloudFormationTemplate -Region $AWSRegion  -Credential $credential
+    $statusCode =  $validTemplate.HttpStatusCode.ToString()
+
+    Write-Output "Validation Response: $statusCode"
+
+    if($validTemplate.HttpStatusCode){
+
+        if($UseS3ForStackPolicy -eq $true){
+            Write-Output "Using Cloud Formation Stack Policy from $CloudFormationStackPolicyURL"
+            New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateBody $CloudFormationTemplate -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability -StackPolicyURL $CloudFormationStackPolicyURL
+        }
+        else {
+            New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateBody $CloudFormationTemplate -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability
+        }
+
+        Confirm-CFNStackCompleted -credential $credential -stackName $CloudFormationStackName -region $AWSRegion
+    }
+    else{
+        throw "AWS Cloud Formation template is not valid"
+    }         
+}
+
+$stack = Get-CFNStack -StackName $CloudFormationStackName -Credential $credential -Region $AWSRegion   
+
+Set-OctopusVariable -name "AWSCloudFormationStack" -value $stack
diff --git a/step-templates/aws-cloudfront-invalidate-cache.json b/src/step-templates/aws-cloudfront-invalidate-cache/metadata.json
similarity index 74%
rename from step-templates/aws-cloudfront-invalidate-cache.json
rename to src/step-templates/aws-cloudfront-invalidate-cache/metadata.json
index a88ddb292..4127d7089 100644
--- a/step-templates/aws-cloudfront-invalidate-cache.json
+++ b/src/step-templates/aws-cloudfront-invalidate-cache/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Setting up AWS profile environment\"\r\naws configure set aws_access_key_id $AccessKey --profile $CredentialsProfileName\r\naws configure set aws_secret_access_key $SecretKey --profile $CredentialsProfileName\r\naws configure set default.region $Region --profile $CredentialsProfileName\r\naws configure set preview.cloudfront true --profile $CredentialsProfileName\r\n\r\nWrite-Host \"Initiating AWS cloudfront invalidation of the following paths:\"\r\nWrite-Host $InvalidationPaths\r\naws cloudfront create-invalidation --profile $CredentialsProfileName --distribution-id $DistributionId --paths $InvalidationPaths\r\n\r\nWrite-Host \"Please note that it may take up to 15-20 minutes for AWS to complete the cloudfront cache invalidation\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.NuGetFeedId": null,
     "Octopus.Action.Package.NuGetPackageId": null
@@ -70,7 +70,7 @@
   ],
   "LastModifiedBy": "dovetail-technologies",
   "$Meta": {
-    "ExportedAt": "2017-01-05T09:27:06.133Z",
+    "ExportedAt": "2017-01-05T09:27:06.1330000Z",
     "OctopusVersion": "3.3.15",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-cloudfront-invalidate-cache/scriptbody.ps1 b/src/step-templates/aws-cloudfront-invalidate-cache/scriptbody.ps1
new file mode 100644
index 000000000..0a205ed5a
--- /dev/null
+++ b/src/step-templates/aws-cloudfront-invalidate-cache/scriptbody.ps1
@@ -0,0 +1,11 @@
+Write-Host "Setting up AWS profile environment"
+aws configure set aws_access_key_id $AccessKey --profile $CredentialsProfileName
+aws configure set aws_secret_access_key $SecretKey --profile $CredentialsProfileName
+aws configure set default.region $Region --profile $CredentialsProfileName
+aws configure set preview.cloudfront true --profile $CredentialsProfileName
+
+Write-Host "Initiating AWS cloudfront invalidation of the following paths:"
+Write-Host $InvalidationPaths
+aws cloudfront create-invalidation --profile $CredentialsProfileName --distribution-id $DistributionId --paths $InvalidationPaths
+
+Write-Host "Please note that it may take up to 15-20 minutes for AWS to complete the cloudfront cache invalidation"
\ No newline at end of file
diff --git a/step-templates/aws-configure-lambda-alias.json b/src/step-templates/aws-configure-lambda-alias/metadata.json
similarity index 55%
rename from step-templates/aws-configure-lambda-alias.json
rename to src/step-templates/aws-configure-lambda-alias/metadata.json
index 8931d93fa..7294ed901 100644
--- a/step-templates/aws-configure-lambda-alias.json
+++ b/src/step-templates/aws-configure-lambda-alias/metadata.json
@@ -13,7 +13,7 @@
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{AWS.Lambda.Account}",
     "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
-    "Octopus.Action.Script.ScriptBody": "$functionName = $OctopusParameters[\"AWS.Lambda.Function.Name\"]\n$functionAliasName = $OctopusParameters[\"AWS.Lambda.Alias.Name\"]\n$functionAliasPercent = $OctopusParameters[\"AWS.Lambda.Alias.Percent\"]\n$functionVersion = $OctopusParameters[\"AWS.Lambda.Alias.FunctionVersion\"]\n\nif ([string]::IsNullOrWhiteSpace($functionName))\n{\n\tWrite-Error \"The parameter Function Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionAliasName))\n{\n\tWrite-Error \"The parameter Alias Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionVersion))\n{\n\tWrite-Error \"The parameter Function Version is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionAliasPercent))\n{\n\tWrite-Error \"The parameter Alias Percent is required.\"\n    Exit 1\n}\n\n$newVersionPercent = [int]$functionAliasPercent\n    \nif ($newVersionPercent -le 0 -or $newVersionPercent -gt 100)\n{\n    Write-Error \"The parameter Alias Percent must be between 1 and 100.\"\n    exit 1\n}\n\nWrite-Host \"Function Name: $functionName\"\nWrite-Host \"Function Version: $functionVersion\"\nWrite-Host \"Function Alias Name: $functionAliasName\"\nWrite-Host \"Function Alias Percent: $functionAliasPercent\"\n\n$versionToUpdateTo = $functionVersion\nif ($functionVersion.ToLower().Trim() -eq \"latest\" -or $functionVersion.ToLower().Trim() -eq \"previous\")\n{\n\tWrite-Highlight \"The function version specified is $functionVersion, attempting to find the specific version number.\"\n    $versionOutput = aws lambda list-versions-by-function --function-name \"$functionName\" --no-paginate\n    $versionOutput = $versionOutput | ConvertFrom-JSON\n    $versionList = @($versionOutput.Versions)\n    \n    if ($functionVersion.ToLower().Trim() -eq \"previous\" -and $versionList.Count -gt 2)\n    {\n    \t$versionArrayIndex = $versionList.Count - 2\n    }\n    else\n    {\n    \t$versionArrayIndex = $versionList.Count - 1\n    }\n    \n    $versionToUpdateTo = $versionList[$versionArrayIndex].Version\n    Write-Highlight \"The alias will update to version $versionToUpdateTo\"         \n}\n\ntry\n{\n  Write-Host \"Publish set to yes with a function alias specified.  Attempting to find existing alias.\"\n  $aliasInformation = aws lambda get-alias --function-name \"$functionName\" --name \"$functionAliasName\" 2> $null\n\n  Write-Host \"The exit code from the alias lookup was $LASTEXITCODE\"\n  if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)\n  {\n  \t  Write-Highlight \"The function's alias $functionAliasName does not exist.\"\n      Write-Host \"If you see an error right here you can safely ignore that.\"\n\t  $aliasInformation = $null\n  }   \n  else\n  {\n\t  Write-Highlight \"The function's alias $functionAliasName already exists.\"\n\t  $aliasInformation = $aliasInformation | ConvertFrom-JSON\n\t  Write-Host $aliasInformation\n  }  \n}\ncatch\n{\n  Write-Host \"The alias specified $functionAliasName does not exist for $functionName.  Will create a new alias with that name.\"\n  $aliasInformation = $null\n}\n\nif ($null -ne $aliasInformation)\n{\n  \tWrite-Host \"Comparing the existing alias version $($aliasInformation.FunctionVersion) with the the published version $versionToUpdateTo\"\n                    \n   \tif ($aliasInformation.FunctionVersion -ne $versionToUpdateTo)\n    {\n    \tWrite-Host \"The alias $functionAliasName version $($aliasInformation.FunctionVersion) does not equal the published version $versionToUpdateTo\"\n            \n        if ($newVersionPercent -eq 100)\n        {\n         \tWrite-Highlight \"The percent for the new version of the function is 100%, updating the alias $functionAliasName to function version $versionToUpdateTo\"\n           \t$newAliasInformation = aws lambda update-alias --function-name \"$functionName\" --name \"$functionAliasName\" --function-version \"$versionToUpdateTo\" --routing-config \"AdditionalVersionWeights={}\"\n        }\n        else\n        {              \t\n            $newVersionPercent = $newVersionPercent / [double]100                       \n                \n            Write-Highlight \"Updating the alias $functionAliasName so $functionAliasPercent of all traffic is routed to $versionToUpdateTo\"\n\t\t\t  \n   \t        $newAliasInformation = aws lambda update-alias --function-name \"$functionName\" --name \"$functionAliasName\" --routing-config \"AdditionalVersionWeights={\"\"$versionToUpdateTo\"\"=$newVersionPercent}\"\n        }           \n    }\n    elseif ($newVersionPercent -eq 100)\n    {\n    \tWrite-Highlight \"The alias $functionAliasName is already pointed to $versionToUpdateTo and the percent sent in is 100, updating the function so all traffic is routed to that version.\"\n        $newAliasInformation = aws lambda update-alias --function-name \"$functionName\" --name \"$functionAliasName\" --routing-config \"AdditionalVersionWeights={}\"\n    }\n    else\n    {\n   \t\tWrite-Highlight \"The alias $functionAliasName is already pointed to $versionToUpdateTo.  Leaving as is.\"\n    }\n}\nelse\n{\n   \tWrite-Highlight \"Creating the alias $functionAliasName with the version $versionToUpdateTo\"\n \t$newAliasInformation = aws lambda create-alias --function-name \"$functionName\" --name \"$functionAliasName\" --function-version \"$versionToUpdateTo\"\n}\n\nif ($null -ne $newAliasInformation)\n{\n\tWrite-Host ($newAliasInformation | ConvertFrom-JSON)\n}\n\nWrite-Highlight \"The alias has finished updating.\""
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -80,7 +80,7 @@
   ],
   "StepPackageId": "Octopus.AwsRunScript",
   "$Meta": {
-    "ExportedAt": "2022-10-04T18:36:08.312Z",
+    "ExportedAt": "2022-10-04T18:36:08.3120000Z",
     "OctopusVersion": "2022.3.10594",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-configure-lambda-alias/scriptbody.ps1 b/src/step-templates/aws-configure-lambda-alias/scriptbody.ps1
new file mode 100644
index 000000000..fa5769b1d
--- /dev/null
+++ b/src/step-templates/aws-configure-lambda-alias/scriptbody.ps1
@@ -0,0 +1,132 @@
+$functionName = $OctopusParameters["AWS.Lambda.Function.Name"]
+$functionAliasName = $OctopusParameters["AWS.Lambda.Alias.Name"]
+$functionAliasPercent = $OctopusParameters["AWS.Lambda.Alias.Percent"]
+$functionVersion = $OctopusParameters["AWS.Lambda.Alias.FunctionVersion"]
+
+if ([string]::IsNullOrWhiteSpace($functionName))
+{
+	Write-Error "The parameter Function Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionAliasName))
+{
+	Write-Error "The parameter Alias Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionVersion))
+{
+	Write-Error "The parameter Function Version is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionAliasPercent))
+{
+	Write-Error "The parameter Alias Percent is required."
+    Exit 1
+}
+
+$newVersionPercent = [int]$functionAliasPercent
+    
+if ($newVersionPercent -le 0 -or $newVersionPercent -gt 100)
+{
+    Write-Error "The parameter Alias Percent must be between 1 and 100."
+    exit 1
+}
+
+Write-Host "Function Name: $functionName"
+Write-Host "Function Version: $functionVersion"
+Write-Host "Function Alias Name: $functionAliasName"
+Write-Host "Function Alias Percent: $functionAliasPercent"
+
+$versionToUpdateTo = $functionVersion
+if ($functionVersion.ToLower().Trim() -eq "latest" -or $functionVersion.ToLower().Trim() -eq "previous")
+{
+	Write-Highlight "The function version specified is $functionVersion, attempting to find the specific version number."
+    $versionOutput = aws lambda list-versions-by-function --function-name "$functionName" --no-paginate
+    $versionOutput = $versionOutput | ConvertFrom-JSON
+    $versionList = @($versionOutput.Versions)
+    
+    if ($functionVersion.ToLower().Trim() -eq "previous" -and $versionList.Count -gt 2)
+    {
+    	$versionArrayIndex = $versionList.Count - 2
+    }
+    else
+    {
+    	$versionArrayIndex = $versionList.Count - 1
+    }
+    
+    $versionToUpdateTo = $versionList[$versionArrayIndex].Version
+    Write-Highlight "The alias will update to version $versionToUpdateTo"         
+}
+
+try
+{
+  Write-Host "Publish set to yes with a function alias specified.  Attempting to find existing alias."
+  $aliasInformation = aws lambda get-alias --function-name "$functionName" --name "$functionAliasName" 2> $null
+
+  Write-Host "The exit code from the alias lookup was $LASTEXITCODE"
+  if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)
+  {
+  	  Write-Highlight "The function's alias $functionAliasName does not exist."
+      Write-Host "If you see an error right here you can safely ignore that."
+	  $aliasInformation = $null
+  }   
+  else
+  {
+	  Write-Highlight "The function's alias $functionAliasName already exists."
+	  $aliasInformation = $aliasInformation | ConvertFrom-JSON
+	  Write-Host $aliasInformation
+  }  
+}
+catch
+{
+  Write-Host "The alias specified $functionAliasName does not exist for $functionName.  Will create a new alias with that name."
+  $aliasInformation = $null
+}
+
+if ($null -ne $aliasInformation)
+{
+  	Write-Host "Comparing the existing alias version $($aliasInformation.FunctionVersion) with the the published version $versionToUpdateTo"
+                    
+   	if ($aliasInformation.FunctionVersion -ne $versionToUpdateTo)
+    {
+    	Write-Host "The alias $functionAliasName version $($aliasInformation.FunctionVersion) does not equal the published version $versionToUpdateTo"
+            
+        if ($newVersionPercent -eq 100)
+        {
+         	Write-Highlight "The percent for the new version of the function is 100%, updating the alias $functionAliasName to function version $versionToUpdateTo"
+           	$newAliasInformation = aws lambda update-alias --function-name "$functionName" --name "$functionAliasName" --function-version "$versionToUpdateTo" --routing-config "AdditionalVersionWeights={}"
+        }
+        else
+        {              	
+            $newVersionPercent = $newVersionPercent / [double]100                       
+                
+            Write-Highlight "Updating the alias $functionAliasName so $functionAliasPercent of all traffic is routed to $versionToUpdateTo"
+			  
+   	        $newAliasInformation = aws lambda update-alias --function-name "$functionName" --name "$functionAliasName" --routing-config "AdditionalVersionWeights={""$versionToUpdateTo""=$newVersionPercent}"
+        }           
+    }
+    elseif ($newVersionPercent -eq 100)
+    {
+    	Write-Highlight "The alias $functionAliasName is already pointed to $versionToUpdateTo and the percent sent in is 100, updating the function so all traffic is routed to that version."
+        $newAliasInformation = aws lambda update-alias --function-name "$functionName" --name "$functionAliasName" --routing-config "AdditionalVersionWeights={}"
+    }
+    else
+    {
+   		Write-Highlight "The alias $functionAliasName is already pointed to $versionToUpdateTo.  Leaving as is."
+    }
+}
+else
+{
+   	Write-Highlight "Creating the alias $functionAliasName with the version $versionToUpdateTo"
+ 	$newAliasInformation = aws lambda create-alias --function-name "$functionName" --name "$functionAliasName" --function-version "$versionToUpdateTo"
+}
+
+if ($null -ne $newAliasInformation)
+{
+	Write-Host ($newAliasInformation | ConvertFrom-JSON)
+}
+
+Write-Highlight "The alias has finished updating."
\ No newline at end of file
diff --git a/src/step-templates/aws-configure-lambda-api-gateway-integration/metadata.json b/src/step-templates/aws-configure-lambda-api-gateway-integration/metadata.json
new file mode 100644
index 000000000..8695c8df5
--- /dev/null
+++ b/src/step-templates/aws-configure-lambda-api-gateway-integration/metadata.json
@@ -0,0 +1,121 @@
+{
+  "Id": "7e818c42-8c59-4a14-b612-2b9cb69fcf4a",
+  "Name": "AWS - Configure Lambda API Gateway Integration",
+  "Description": "Configures an API v2 Gateway to connect to and invoke a Lambda Function.  That includes:\n\n- Integration on the API Gateway\n- Route on the API Gateway\n- Permission Policy on AWS Lambda (Aliases are supported)\n\n**Please Note:** Your AWS Lambda function **MUST** exist prior to running this step.\n\nThis step uses the following AWS CLI commands to create the integration and route.  You will be required to install the AWS CLI on your server/worker for this to work.  The AWS CLI is pre-installed on the [dynamic workers](https://octopus.com/docs/infrastructure/workers/dynamic-worker-pools) in Octopus Cloud as well as the provided docker containers for [Execution Containers](https://octopus.com/docs/deployment-process/execution-containers-for-workers).\n\nAPIGatewayV2 CLI Methods\n- [create-integration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/create-integration.html)\n- [create-route](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/create-route.html)\n- [get-apis](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-apis.html)\n- [get-integrations](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-integrations.html)\n- [get-routes](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-routes.html)\n- [get-vpc-links](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-vpc-links.html)\n- [update-integration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/update-integration.html)\n\nLambda CLI Methods\n- [add-permission](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/add-permission.html)\n- [get-policy](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/get-policy.html)\n- [remove-permission](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/remove-permission.html)\n\n\n## Output Variables\n\nThis step template sets the following output variables:\n\n- `ApiGatewayEndPoint`: The endpoint of the API Gateway\n- `ApiGatewayId`: The id of the API Gateway\n- `ApiGatewayArn`: The ARN of the API Gateway",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "Octopus.Action.AwsAccount.Variable": "#{AWS.Api.Gateway.Account}",
+    "Octopus.Action.Aws.Region": "#{AWS.Api.Gateway.Region}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "6a63ef8c-5f0b-4501-beca-fc3839f7f5c9",
+      "Name": "AWS.Api.Gateway.Name",
+      "Label": "API Gateway Name",
+      "HelpText": "Required.\n\nThe name of the API gateway to create the integration and route.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0fb1f1fa-35f6-46b3-bf4a-527ddd98fb80",
+      "Name": "AWS.Api.Gateway.Account",
+      "Label": "AWS Account",
+      "HelpText": "Required.\n\nThe account used to update the API Gateway.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "a42498df-fadd-45d1-9271-78e80edb9623",
+      "Name": "AWS.Api.Gateway.Region",
+      "Label": "AWS Region",
+      "HelpText": "Required.\n\nThe region where the API gateway is in.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\naf-south-1|Africa (Cape Town)\nap-east-1|Asia Pacific (Hong Kong)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-3|Asia Pacific (Osaka-Local)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\nca-central-1|Canada (Central)\neu-central-1|Europe (Frankfurt)\neu-west-1|Europe (Ireland)\neu-west-2|Europe (London)\neu-south-1|Europe (Milan)\neu-west-3|Europe (Paris)\neu-north-1|Europe (Stockholm)\nme-south-1|Middle East (Bahrain)\nsa-east-1|South America (São Paulo)"
+      }
+    },
+    {
+      "Id": "bd681a63-f62c-4dcb-a401-ae43428075ed",
+      "Name": "AWS.Api.Gateway.Integration.Connection",
+      "Label": "VPC Connection",
+      "HelpText": "Optional.\n\nThe VPC connection you wish to use with this link.  Supports:\n\n- VPC Link Name - The name of the VPC link specified when it was created.\n- VPC Link Id - The 6-character alphanumeric key assigned by AWS to the VPC Link.\n\n**Please note**: Sending a value in will change the connection type from `INTERNET` to `VPC_LINK`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "607e787d-d0bd-47b9-984e-2195d58278ed",
+      "Name": "AWS.Api.Gateway.Route.Key",
+      "Label": "Route Key",
+      "HelpText": "Required.\n\nThe route key for the route.  Examples:\n\n- `$default`\n- `/signup`",
+      "DefaultValue": "$default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f255a0c5-f2e6-4739-af59-a0329c6ddb14",
+      "Name": "AWS.Api.Gateway.Integration.HttpMethod",
+      "Label": "HTTP Method",
+      "HelpText": "Required.\n\nThe HTTP method of the route and integration you wish to create.",
+      "DefaultValue": "ANY",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "ANY|ANY\nPOST|POST\nPUT|PUT\nGET|GET\nDELETE|DELETE"
+      }
+    },
+    {
+      "Id": "6552c873-6576-4272-a724-a3b257b1b13e",
+      "Name": "AWS.Api.Gateway.Lambda.Arn",
+      "Label": "Lambda ARN",
+      "HelpText": "Required.\n\nThe ARN of the AWS Lambda to connect to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "261a89c2-dc9b-4608-8f76-fcb07385725c",
+      "Name": "AWS.Api.Gateway.Lambda.Alias",
+      "Label": "Lambda Alias",
+      "HelpText": "Required.\n\nThe alias in the lambda function to use when the API Gateway invokes the function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4c281de7-1922-4d78-b16d-9c60cd2d2477",
+      "Name": "AWS.Api.Gateway.Integration.PayloadFormatVersion",
+      "Label": "Payload Format Version",
+      "HelpText": "Required.\n\nThe payload format version specifies the format of the data that API Gateway sends to a Lambda integration, and how API Gateway interprets the response from Lambda.",
+      "DefaultValue": "2.0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "1.0|1.0\n2.0|2.0"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2022-10-04T18:34:13.2190000Z",
+    "OctopusVersion": "2022.3.10594",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-configure-lambda-api-gateway-integration/scriptbody.ps1 b/src/step-templates/aws-configure-lambda-api-gateway-integration/scriptbody.ps1
new file mode 100644
index 000000000..02b2aa9d1
--- /dev/null
+++ b/src/step-templates/aws-configure-lambda-api-gateway-integration/scriptbody.ps1
@@ -0,0 +1,273 @@
+$ApiGatewayName = $OctopusParameters["AWS.Api.Gateway.Name"]
+$ApiRouteKey = $OctopusParameters["AWS.Api.Gateway.Route.Key"]
+$ApiLambdaUri = $OctopusParameters["AWS.Api.Gateway.Lambda.Arn"]
+$ApiPayloadFormatVersion = $OctopusParameters["AWS.Api.Gateway.Integration.PayloadFormatVersion"]
+$ApiConnection = $OctopusParameters["AWS.Api.Gateway.Integration.Connection"]
+$ApiIntegrationMethod = $OctopusParameters["AWS.Api.Gateway.Integration.HttpMethod"]
+$ApiLambdaAlias = $OctopusParameters["AWS.Api.Gateway.Lambda.Alias"]
+$ApiRegion = $OctopusParameters["AWS.Api.Gateway.Region"]
+
+$stepName = $OctopusParameters["Octopus.Step.Name"]
+
+if ([string]::IsNullOrWhiteSpace($ApiGatewayName))
+{
+	Write-Error "The parameter Gateway Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($ApiRouteKey))
+{
+	Write-Error "The parameter Route Key is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($ApiLambdaUri))
+{
+	Write-Error "The parameter Lambda ARN is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($ApiPayloadFormatVersion))
+{
+	Write-Error "The parameter Payload Format Version is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($ApiIntegrationMethod))
+{
+	Write-Error "The parameter Http Method is required."
+    Exit 1
+}
+
+Write-Host "Gateway Name: $ApiGatewayName"
+Write-Host "Route Key: $ApiRouteKey"
+Write-Host "Lambda ARN: $ApiLambdaUri"
+Write-Host "Lambda Alias: $ApiLambdaAlias"
+Write-Host "Payload Format Version: $ApiPayloadFormatVersion"
+Write-Host "VPC Connection: $ApiConnection"
+Write-host "API Region: $apiRegion"
+
+if ([string]::IsNullOrWhiteSpace($apiLambdaAlias) -eq $false)
+{
+	Write-Host "Alias specified, adding it to the Lambda ARN"
+	$apiLambdaIntegrationArn = "$($apiLambdaUri):$($apiLambdaAlias)"
+}
+else
+{
+	Write-Host "No alias specified, going directly to the lambda function"
+	$apiLambdaIntegrationArn = $apiLambdaUri
+}
+
+$apiQueryOutput = aws apigatewayv2 get-apis --no-paginate
+$apiQueryOutput = ($apiQueryOutput | ConvertFrom-JSON)
+
+$apiList = @($apiQueryOutput.Items)
+$apiGatewayToUpdate = $null
+foreach ($api in $apiList)
+{
+	if ($api.Name.ToLower().Trim() -eq $apiGatewayName.ToLower().Trim())
+    {
+    	Write-Highlight "Found the gateway $apiGatewayName"
+    	$apiGatewayToUpdate = $api
+        break
+    }
+}
+
+if ($null -eq $apiGatewayToUpdate)
+{
+	Write-Error "Unable to find the gateway with the name $apiGatewayName"
+    exit 1
+}
+
+Write-Host $apiGatewayToUpdate
+
+$apiId = $apiGatewayToUpdate.ApiId
+Write-Host "The id of the api gateway is $apiId"
+
+$apiConnectionType = "INTERNET"
+if ([string]::IsNullOrWhiteSpace($ApiConnection) -eq $false)
+{
+	$apiConnectionType = "VPC_LINK"
+    $existingVPCLinks = aws apigatewayv2 get-vpc-links --no-paginate
+    $existingVPCLinks = ($existingVPCLinks | ConvertFrom-JSON)
+    
+    $existingVPCLinkList = @($existingVPCLinks.Items)
+    foreach ($vpc in $existingVPCLinkList)
+    {
+    	if ($vpc.Name.ToLower().Trim() -eq $ApiConnection.ToLower().Trim())
+        {
+        	Write-Host "The name $($vpc.Name) matches $apiConnection"
+        	$apiConnectionId = $vpc.VpcLinkId
+            break
+        }
+        elseif ($vpc.VpcLinkId.ToLower().Trim() -eq $apiConnection.ToLower().Trim())
+        {
+        	Write-Host "The vpc link id $($vpc.VpcLinkId) matches $apiConnection"
+        	$apiConnectionId = $vpc.VpcLinkId
+            break
+        }
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($apiConnectionId) -eq $true)
+    {
+    	Write-Error "The VPC Connection $apiConnection could not be found.  Please check the name or ID and try again.  Please note: names can be updated, if you are matching by name double check nothing has changed."
+        exit 1
+    }    
+}
+
+$apiIntegrations = aws apigatewayv2 get-integrations --api-id "$apiId" --no-paginate
+$apiIntegrations = ($apiIntegrations | ConvertFrom-JSON)
+
+$integrationList = @($apiIntegrations.Items)
+$integrationToUpdate = $null
+foreach ($integration in $integrationList)
+{
+	if ($integration.IntegrationUri -eq $apiLambdaIntegrationArn -and $integration.ConnectionType -eq $apiConnectionType -and $integration.IntegrationType -eq "AWS_PROXY" -and $integration.PayloadFormatVersion -eq $ApiPayloadFormatVersion)
+    {
+    	Write-Highlight "Found the existing integration $($integration.Id)"
+    	$integrationToUpdate = $integration
+        break
+    }
+}
+
+if ($null -ne $integrationToUpdate)
+{
+	Write-Highlight "Updating existing integration"
+}
+else
+{
+	Write-Highlight "Creating new integration"
+    if ($apiConnectionType -eq "INTERNET")
+    {
+    	Write-Host "Command line: aws apigatewayv2 create-integration --api-id ""$apiId"" --connection-type ""$apiConnectionType"" --integration-method ""$ApiIntegrationMethod"" --integration-type ""AWS_PROXY"" --integration-uri ""$apiLambdaIntegrationArn"" --payload-format-version ""$ApiPayloadFormatVersion"" "
+    	$integrationToUpdate = aws apigatewayv2 create-integration --api-id "$apiId" --connection-type "$apiConnectionType" --integration-method "$ApiIntegrationMethod" --integration-type "AWS_PROXY" --integration-uri "$apiLambdaIntegrationArn" --payload-format-version "$ApiPayloadFormatVersion"
+    }
+    else
+    {
+    	Write-Host "Command line: aws apigatewayv2 create-integration --api-id ""$apiId"" --connection-type ""$apiConnectionType"" --connection-id ""$ApiConnectionId"" --integration-method ""$ApiIntegrationMethod"" --integration-type ""AWS_PROXY"" --integration-uri ""$apiLambdaIntegrationArn"" --payload-format-version ""$ApiPayloadFormatVersion"" "
+    	$integrationToUpdate = aws apigatewayv2 create-integration --api-id "$apiId" --connection-type "$apiConnectionType" --connection-id "$ApiConnectionId" --integration-method "$ApiIntegrationMethod" --integration-type "AWS_PROXY" --integration-uri "$apiLambdaIntegrationArn" --payload-format-version "$ApiPayloadFormatVersion"    
+    }
+    
+    $integrationToUpdate = ($integrationToUpdate | ConvertFrom-JSON)
+}
+
+If ($null -eq $integrationToUpdate)
+{
+	Write-Error "There was an error finding or creating the integration."
+    Exit 1
+}
+
+Write-Host "$integrationToUpdate"
+
+Write-Host "Command line: aws apigatewayv2 update-integration --api-id ""$apiId"" --integration-id ""$($integrationToUpdate.IntegrationId)"" --integration-method ""$ApiIntegrationMethod"" "
+$updateResult = aws apigatewayv2 update-integration --api-id "$apiId" --integration-id "$($integrationToUpdate.IntegrationId)" --integration-method "$ApiIntegrationMethod"
+
+Write-Host "Command line: aws apigatewayv2 get-routes --api-id ""$apiId"" --no-paginate"
+$apiRoutes = aws apigatewayv2 get-routes --api-id "$apiId" --no-paginate
+$apiRoutes = ($apiRoutes | ConvertFrom-JSON)
+
+$routeList = @($apiRoutes.Items)
+$routeToUpdate = $null
+$routePath = "$ApiIntegrationMethod $ApiRouteKey"
+$routeTarget = "integrations/$($integrationToUpdate.IntegrationId)"
+foreach ($route in $routeList)
+{
+	Write-Host "Comparing $($route.RouteKey) with $routePath and $($route.Target) with $routeTarget"
+	if ($route.RouteKey -eq $routePath -and $route.Target -eq $routeTarget)
+    {
+    	Write-Highlight "Found the existing path $($route.RouteId)"
+    	$routeToUpdate = $route
+        break
+    }
+}
+
+if ($null -eq $routeToUpdate)
+{
+	Write-Highlight "The route with the path $routePath pointing to integration $($integrationToUpdate.IntegrationId) does not exist.  Creating that one now."
+    $routeResult = aws apigatewayv2 create-route --api-id "$apiId" --route-key "$routePath" --target "$routeTarget"
+}
+else
+{
+	Write-Highlight "The route with the path $routePath pointing to integration $($integrationToUpdate.IntegrationId) already exists.  Leaving that alone."   
+}
+
+$accountInfo = aws sts get-caller-identity
+$accountInfo = ($accountInfo | ConvertFrom-JSON)
+
+if ($apiRoute -notcontains "*default")
+{
+	$routeKeyToUse = $apiRouteKey
+    $statementIdToUse = "$($ApiGatewayName)$($apiRouteKey.Replace("/", "-"))"
+}
+else
+{
+	$routeKeyToUse = ""
+    $statementIdToUse = "$ApiGatewayName"
+}
+$sourceArn = "arn:aws:execute-api:$($apiRegion):$($accountInfo.Account):$($apiId)/*/*$routeKeyToUse"
+
+Write-Host "Source ARN: $sourceArn"
+$hasExistingPolicy = $false
+$deleteExistingPolicy = $false
+
+try
+{
+	Write-Host "Getting existing policies"
+	$existingPolicy = aws lambda get-policy --function-name "$apiLambdaIntegrationArn" 2> $null
+    
+    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)
+    {
+    	Write-Host "Last exit code was $LASTEXITCODE the policy does not exist"
+    	$hasExistingPolicy = $false
+    }
+    else
+    {
+    	Write-Host "The policy exists"
+    	$hasExistingPolicy = $true
+    }
+    
+    $existingPolicy = ($existingPolicy | ConvertFrom-JSON)
+    Write-Host $existingPolicy
+    
+    $policyObject = ($existingPolicy.Policy | ConvertFrom-JSON)
+    
+	$statementList = @($policyObject.Statement)
+    Write-Host "Statement List $statementList"
+    
+    foreach ($existingStatement in $statementList)
+    {
+    	Write-Host $existingStatement
+    	Write-Host "Comparing $($existingStatement.Sid) with $statementIdToUse and $($existingStatement.Condition.ArnLike.'AWS:SourceArn') with $sourceArn"
+    	if ($existingStatement.Sid -eq "$statementIdToUse" -and $existingStatement.Condition.ArnLike.'AWS:SourceArn' -ne "$sourceArn")
+        {
+        	Write-Host "The policy exists but it is not pointing to the write source arn, recreating it."
+        	$deleteExistingPolicy = $true
+        }
+    }
+}
+catch
+{
+	Write-Host "Error pulling back the policies, this typically means the policy does not exist"
+	$hasExistingPolicy = $false
+}
+
+if ($hasExistingPolicy -eq $true -and $deleteExistingPolicy -eq $true)
+{
+	Write-Highlight "Removing the existing policy $statementIdToUse"
+    aws lambda remove-permission --function-name "$apiLambdaIntegrationArn" --statement-id "$statementIdToUse"
+}
+
+if ($hasExistingPolicy -eq $false -or $deleteExistingPolicy -eq $true)
+{
+	Write-Highlight "Adding the policy $statementIdToUse"
+	aws lambda add-permission --function-name "$apiLambdaIntegrationArn" --statement-id "$statementIdToUse" --action "lambda:InvokeFunction" --principal "apigateway.amazonaws.com" --qualifier "$ApiLambdaAlias" --source-arn "$sourceArn"
+}
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.ApiGatewayEndPoint' to $($apiGatewayToUpdate.ApiEndpoint)"
+Set-OctopusVariable -name "ApiGatewayEndPoint" -value "$($apiGatewayToUpdate.ApiEndpoint)"
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.ApiGatewayId' to $apiId"
+Set-OctopusVariable -name "ApiGatewayId" -value "$apiId"
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.ApiGatewayArn' to $sourceArn"
+Set-OctopusVariable -name "ApiGatewayArn" -value "$sourceArn"
diff --git a/step-templates/aws-configure-lambda.json b/src/step-templates/aws-configure-lambda/metadata.json
similarity index 55%
rename from step-templates/aws-configure-lambda.json
rename to src/step-templates/aws-configure-lambda/metadata.json
index 22383fb2c..8ef4c7626 100644
--- a/step-templates/aws-configure-lambda.json
+++ b/src/step-templates/aws-configure-lambda/metadata.json
@@ -13,7 +13,7 @@
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{AWS.Lambda.Account}",
     "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
-    "Octopus.Action.Script.ScriptBody": "$functionName = $OctopusParameters[\"AWS.Lambda.FunctionName\"]\n$functionRole = $OctopusParameters[\"AWS.Lambda.FunctionRole\"]\n$functionRunTime = $OctopusParameters[\"AWS.Lambda.Runtime\"]\n$functionHandler = $OctopusParameters[\"AWS.Lambda.FunctionHandler\"]\n$functionMemorySize = $OctopusParameters[\"AWS.Lambda.MemorySize\"]\n$functionDescription = $OctopusParameters[\"AWS.Lambda.Description\"]\n$functionVPCSubnetId = $OctopusParameters[\"AWS.Lambda.VPCSubnetIds\"]\n$functionVPCSecurityGroupId = $OctopusParameters[\"AWS.Lambda.VPCSecurityGroupIds\"]\n$functionEnvironmentVariables = $OctopusParameters[\"AWS.Lambda.EnvironmentVariables\"]\n$functionEnvironmentVariablesKey = $OctopusParameters[\"AWS.Lambda.EnvironmentVariablesKey\"]\n$functionTimeout = $OctopusParameters[\"AWS.Lambda.FunctionTimeout\"]\n$functionTags = $OctopusParameters[\"AWS.Lambda.Tags\"]\n$functionFileSystemConfig = $OctopusParameters[\"AWS.Lambda.FileSystemConfig\"]\n$functionDeadLetterConfig = $OctopusParameters[\"AWS.Lambda.DeadLetterConfig\"]\n$functionTracingConfig = $OctopusParameters[\"AWS.Lambda.TracingConfig\"]\n$functionPublishOption = $OctopusParameters[\"AWS.Lambda.Publish\"]\n\n$functionReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$functionRunbookRun = $OctopusParameters[\"Octopus.RunbookRun.Id\"]\n$stepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$regionName = $OctopusParameters[\"AWS.Lambda.Region\"]\n$functionCodeS3Bucket = $OctopusParameters[\"AWS.Lambda.Code.S3Bucket\"]\n$functionCodeS3Key = $OctopusParameters[\"AWS.Lambda.Code.S3Key\"]\n$functionCodeS3Version = $OctopusParameters[\"AWS.Lambda.Code.S3ObjectVersion\"]\n$functionCodeImageUri = $OctopusParameters[\"AWS.Lambda.Code.ImageUri\"]\n$functionCodeVersion = $OctopusParameters[\"AWS.Lambda.Code.Version\"]\n\nif ([string]::IsNullOrWhiteSpace($functionName))\n{\n\tWrite-Error \"The parameter Function Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRole))\n{\n\tWrite-Error \"The parameter Role is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -and [string]::IsNullOrWhiteSpace($functionCodeImageUri))\n{\n\tWrite-Error \"You must specify either a S3 Bucket or an Image URI for the lambda to run.\"\n    exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -and [string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false)\n{\n\tWrite-Error \"The S3 Key was specified but the S3 bucket was not specified, the S3 Bucket parameter is required when the key is specified.\"\n    exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRunTime))\n{\n\tWrite-Error \"The parameter Run Time is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionHandler))\n{\n\tWrite-Error \"The parameter Handler is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionPublishOption))\n{\n\tWrite-Error \"The parameter Publish is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false)\n{\n    $deployVersionTag = \"Octopus-Release=$functionReleaseNumber\"\n}\nelse\n{\n\t$deployVersionTag = \"Octopus-Runbook-Run=$functionRunbookRun\"\n}\n\nWrite-Host \"Function Name: $functionName\"\nWrite-Host \"Function Role: $functionRole\"\nWrite-Host \"Function Runtime: $functionRunTime\"\nWrite-Host \"Function Handler: $functionHandler\"\nWrite-Host \"Function Memory Size: $functionMemorySize\"\nWrite-Host \"Function Description: $functionDescription\"\nWrite-Host \"Function Subnet Ids: $functionVPCSubnetId\"\nWrite-Host \"Function Security Group Ids: $functionVPCSecurityGroupId\"\nWrite-Host \"Function Environment Variables: $functionEnvironmentVariables\"\nWrite-Host \"Function Environment Variables Key: $functionEnvironmentVariablesKey\"\nWrite-Host \"Function Timeout: $functionTimeout\"\nWrite-Host \"Function Tags: $functionTags\"\nWrite-Host \"Function File System Config: $functionFileSystemConfig\"\nWrite-Host \"Function Dead Letter Config: $functionDeadLetterConfig\"\nWrite-Host \"Function Tracing Config: $functionTracingConfig\"\nWrite-Host \"Function S3 Bucket: $functionCodeS3Bucket\"\nWrite-host \"Function S3 Key: $functionCodeS3Key\"\nWrite-Host \"Function S3 Object Version: $functionCodeS3Version\"\nWrite-Host \"Function Image Uri: $functionCodeImageUri\"\nWrite-Host \"Function Publish: $functionPublishOption\"\n\nWrite-Host \"Attempting to find the function $functionName in the region $regionName\"\n$hasExistingFunction = $true\ntry\n{\n\t$existingFunction = aws lambda get-function --function-name \"$functionName\"\n    \n    Write-Host \"The exit code from the lookup was $LASTEXITCODE\"\n    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)\n    {\n    \t$hasExistingFunction = $false\n    }   \n    \n    $existingFunction = $existingFunction | ConvertFrom-Json\n}\ncatch\n{\n\tWrite-Host \"The function was not found\"\n\t$hasExistingFunction = $false\n}\n\nWrite-Host \"Existing functions: $hasExistingFunction\"\nWrite-Host $existingFunction\n\n$aliasInformation = $null\nif ($hasExistingFunction -eq $false)\n{\n\t$functionCodeLocation = \"ImageUri=$functionCodeImageUri\"\n    if ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -eq $false)\n    {\n    \tWrite-Host \"S3 Bucket Specified, using that as the code source.\"\n        $functionCodeLocation = \"S3Bucket=$functionCodeLocation\"\n        \n        if ([string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false)\n        {\n        \tWrite-Host \"S3 Key Specified\"\n        \t$functionCodeLocation += \",S3Key=$functionCodeS3Key\"\n        }\n        \n        if ([string]::IsNullOrWhiteSpace($functionCodeS3Version) -eq $false)\n        {\n        \tWrite-Host \"Object Version Specified\"\n        \t$functionCodeLocation += \",S3Key=$functionCodeS3Version\"\n        }\n    }\n    \n\tWrite-Highlight \"Creating $functionName in $regionName\"    \n\t$functionInformation = aws lambda create-function --function-name \"$functionName\" --code \"$functionCodeLocation\" --handler $functionHandler --runtime $functionRuntime --role $functionRole --memory-size $functionMemorySize\n}\nelse\n{\n\tif ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -eq $false)\n    {\n    \tWrite-Host \"S3 Bucket specified, updating the function $functionName to use that.\"\n        \n    \tif ([string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false -and [string]::IsNullOrWhiteSpace($functionCodeS3Version) -eq $false)\n        {\n        \tWrite-host \"Both the S3 Key and the Object Version specified\"            \n\t\t    $updatedConfig = aws lambda update-function-code --function-name \"$functionName\" --s3-bucket \"$functionCodeS3Bucket\" --s3-key \"$functionCodeS3Key\" --s3-object-version \"$functionCodeS3Version\"\n        }\n        elseif ([string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false -and [string]::IsNullOrWhiteSpace($functionCodeS3Version) -eq $true)\n        {\n        \tWrite-host \"Only the S3 key was specified\"            \n\t\t    $updatedConfig = aws lambda update-function-code --function-name \"$functionName\" --s3-bucket \"$functionCodeS3Bucket\" --s3-key \"$functionCodeS3Key\"\n        }\n        else\n        {\n        \tWrite-host \"Only the Object Version was specified\"            \n\t\t    $updatedConfig = aws lambda update-function-code --function-name \"$functionName\" --s3-bucket \"$functionCodeS3Bucket\" --s3-object-version \"$functionCodeS3Version\"\n        }\n    }\n    else\n    {\n    \tWrite-Host \"Image URI specified, updating the function $functionName to use that.\"           \n\t    $updatedConfig = aws lambda update-function-code --function-name \"$functionName\" --image-uri \"$functionCodeImageUri\"\n    }\n    \n    Write-Highlight \"Updating the $functionName base configuration\"    \n    $functionInformation = aws lambda update-function-configuration --function-name \"$functionName\" --role $functionRole --handler $functionHandler --runtime $functionRuntime --memory-size $functionMemorySize\n}\n\n$functionInformation = $functionInformation | ConvertFrom-JSON\n$functionArn = $functionInformation.FunctionArn\n\nWrite-Host \"Function ARN: $functionArn\"\n\nif ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false)\n{\n\tWrite-Highlight \"Environment variables specified, updating environment variables configuration for $functionName\"\n\t$environmentVariables = \"Variables={$functionEnvironmentVariables}\"\n    \n    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true)\n    {\n    \t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\"\n    }\n    else\n    {\n    \t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\" --kms-key-arn \"$functionEnvironmentVariablesKey\"\n    }\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false)\n{\n\tWrite-Highlight \"Timeout specified, updating timeout configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --timeout \"$functionTimeout\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTags) -eq $false)\n{\n\tWrite-Highlight \"Tags specified, updating tags configuration for $functionName\"\n\t$updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$functionTags\"\n}\n\nif ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false)\n{\n\tWrite-Highlight \"Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName\"\n    aws lambda untag-resource --resource \"$functionArn\" --tag-keys \"Octopus-Release\" \"Octopus-Runbook-Run\"\n\t$updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$deployVersionTag\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false)\n{\n\tWrite-Highlight \"VPC subnets and security group specified, updating vpc configuration for $functionName\"\n\t$vpcConfig = \"SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --vpc-config \"$vpcConfig\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false)\n{\n\tWrite-Highlight \"Description specified, updating description configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --description \"$functionDescription\"\t\n}\n\nif ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false)\n{\n\tWrite-Highlight \"File System Config specified, updating file system configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --file-system-configs \"$functionFileSystemConfig\"\t\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false)\n{\n\tWrite-Highlight \"Dead Letter specified, updating dead letter configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --dead-letter-config \"$functionDeadLetterConfig\"\t\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false)\n{\n\tWrite-Highlight \"Tracing config specified, updating tracing configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --tracing-config \"$functionTracingConfig\"\t\n}\n\nWrite-Host $updatedConfig | ConvertFrom-JSON\n\nif ($functionPublishOption -eq \"Yes\")\n{\n\t$functionVersionNumber = $functionCodeVersion\n\tif ([string]::IsNullOrWhiteSpace($functionCodeVersion) -eq $true)\n    {\n    \t$functionVersionNumber = $functionReleaseNumber\n    }\n    \n\tWrite-Highlight \"Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS.\"\n\t$publishedVersion = aws lambda publish-version --function-name \"$functionArn\" --description \"$functionVersionNumber\"\n    \n    $publishedVersion = $publishedVersion | ConvertFrom-JSON\n    \n    Write-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)\"\n    Set-OctopusVariable -name \"PublishedVersion\" -value \"$($publishedVersion.Version)\"    \n}\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn\"\nSet-OctopusVariable -name \"LambdaArn\" -value \"$functionArn\"\n\nWrite-Highlight \"AWS Lambda $functionName successfully deployed.\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.SubstituteInFiles.Enabled": "True",
     "Octopus.Action.SubstituteInFiles.OutputEncoding": "utf-8",
     "OctopusUseBundledTooling": "False"
@@ -255,10 +255,10 @@
   ],
   "StepPackageId": "Octopus.AwsRunScript",
   "$Meta": {
-    "ExportedAt": "2021-11-04T14:40:20.783Z",
+    "ExportedAt": "2021-11-04T14:40:20.7830000Z",
     "OctopusVersion": "2021.3.7807",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "bobjwalker",
   "Category": "aws"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/aws-configure-lambda/scriptbody.ps1 b/src/step-templates/aws-configure-lambda/scriptbody.ps1
new file mode 100644
index 000000000..4671680ad
--- /dev/null
+++ b/src/step-templates/aws-configure-lambda/scriptbody.ps1
@@ -0,0 +1,273 @@
+$functionName = $OctopusParameters["AWS.Lambda.FunctionName"]
+$functionRole = $OctopusParameters["AWS.Lambda.FunctionRole"]
+$functionRunTime = $OctopusParameters["AWS.Lambda.Runtime"]
+$functionHandler = $OctopusParameters["AWS.Lambda.FunctionHandler"]
+$functionMemorySize = $OctopusParameters["AWS.Lambda.MemorySize"]
+$functionDescription = $OctopusParameters["AWS.Lambda.Description"]
+$functionVPCSubnetId = $OctopusParameters["AWS.Lambda.VPCSubnetIds"]
+$functionVPCSecurityGroupId = $OctopusParameters["AWS.Lambda.VPCSecurityGroupIds"]
+$functionEnvironmentVariables = $OctopusParameters["AWS.Lambda.EnvironmentVariables"]
+$functionEnvironmentVariablesKey = $OctopusParameters["AWS.Lambda.EnvironmentVariablesKey"]
+$functionTimeout = $OctopusParameters["AWS.Lambda.FunctionTimeout"]
+$functionTags = $OctopusParameters["AWS.Lambda.Tags"]
+$functionFileSystemConfig = $OctopusParameters["AWS.Lambda.FileSystemConfig"]
+$functionDeadLetterConfig = $OctopusParameters["AWS.Lambda.DeadLetterConfig"]
+$functionTracingConfig = $OctopusParameters["AWS.Lambda.TracingConfig"]
+$functionPublishOption = $OctopusParameters["AWS.Lambda.Publish"]
+
+$functionReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$functionRunbookRun = $OctopusParameters["Octopus.RunbookRun.Id"]
+$stepName = $OctopusParameters["Octopus.Step.Name"]
+
+$regionName = $OctopusParameters["AWS.Lambda.Region"]
+$functionCodeS3Bucket = $OctopusParameters["AWS.Lambda.Code.S3Bucket"]
+$functionCodeS3Key = $OctopusParameters["AWS.Lambda.Code.S3Key"]
+$functionCodeS3Version = $OctopusParameters["AWS.Lambda.Code.S3ObjectVersion"]
+$functionCodeImageUri = $OctopusParameters["AWS.Lambda.Code.ImageUri"]
+$functionCodeVersion = $OctopusParameters["AWS.Lambda.Code.Version"]
+
+if ([string]::IsNullOrWhiteSpace($functionName))
+{
+	Write-Error "The parameter Function Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRole))
+{
+	Write-Error "The parameter Role is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -and [string]::IsNullOrWhiteSpace($functionCodeImageUri))
+{
+	Write-Error "You must specify either a S3 Bucket or an Image URI for the lambda to run."
+    exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -and [string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false)
+{
+	Write-Error "The S3 Key was specified but the S3 bucket was not specified, the S3 Bucket parameter is required when the key is specified."
+    exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRunTime))
+{
+	Write-Error "The parameter Run Time is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionHandler))
+{
+	Write-Error "The parameter Handler is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionPublishOption))
+{
+	Write-Error "The parameter Publish is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false)
+{
+    $deployVersionTag = "Octopus-Release=$functionReleaseNumber"
+}
+else
+{
+	$deployVersionTag = "Octopus-Runbook-Run=$functionRunbookRun"
+}
+
+Write-Host "Function Name: $functionName"
+Write-Host "Function Role: $functionRole"
+Write-Host "Function Runtime: $functionRunTime"
+Write-Host "Function Handler: $functionHandler"
+Write-Host "Function Memory Size: $functionMemorySize"
+Write-Host "Function Description: $functionDescription"
+Write-Host "Function Subnet Ids: $functionVPCSubnetId"
+Write-Host "Function Security Group Ids: $functionVPCSecurityGroupId"
+Write-Host "Function Environment Variables: $functionEnvironmentVariables"
+Write-Host "Function Environment Variables Key: $functionEnvironmentVariablesKey"
+Write-Host "Function Timeout: $functionTimeout"
+Write-Host "Function Tags: $functionTags"
+Write-Host "Function File System Config: $functionFileSystemConfig"
+Write-Host "Function Dead Letter Config: $functionDeadLetterConfig"
+Write-Host "Function Tracing Config: $functionTracingConfig"
+Write-Host "Function S3 Bucket: $functionCodeS3Bucket"
+Write-host "Function S3 Key: $functionCodeS3Key"
+Write-Host "Function S3 Object Version: $functionCodeS3Version"
+Write-Host "Function Image Uri: $functionCodeImageUri"
+Write-Host "Function Publish: $functionPublishOption"
+
+Write-Host "Attempting to find the function $functionName in the region $regionName"
+$hasExistingFunction = $true
+try
+{
+	$existingFunction = aws lambda get-function --function-name "$functionName"
+    
+    Write-Host "The exit code from the lookup was $LASTEXITCODE"
+    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)
+    {
+    	$hasExistingFunction = $false
+    }   
+    
+    $existingFunction = $existingFunction | ConvertFrom-Json
+}
+catch
+{
+	Write-Host "The function was not found"
+	$hasExistingFunction = $false
+}
+
+Write-Host "Existing functions: $hasExistingFunction"
+Write-Host $existingFunction
+
+$aliasInformation = $null
+if ($hasExistingFunction -eq $false)
+{
+	$functionCodeLocation = "ImageUri=$functionCodeImageUri"
+    if ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -eq $false)
+    {
+    	Write-Host "S3 Bucket Specified, using that as the code source."
+        $functionCodeLocation = "S3Bucket=$functionCodeLocation"
+        
+        if ([string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false)
+        {
+        	Write-Host "S3 Key Specified"
+        	$functionCodeLocation += ",S3Key=$functionCodeS3Key"
+        }
+        
+        if ([string]::IsNullOrWhiteSpace($functionCodeS3Version) -eq $false)
+        {
+        	Write-Host "Object Version Specified"
+        	$functionCodeLocation += ",S3Key=$functionCodeS3Version"
+        }
+    }
+    
+	Write-Highlight "Creating $functionName in $regionName"    
+	$functionInformation = aws lambda create-function --function-name "$functionName" --code "$functionCodeLocation" --handler $functionHandler --runtime $functionRuntime --role $functionRole --memory-size $functionMemorySize
+}
+else
+{
+	if ([string]::IsNullOrWhiteSpace($functionCodeS3Bucket) -eq $false)
+    {
+    	Write-Host "S3 Bucket specified, updating the function $functionName to use that."
+        
+    	if ([string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false -and [string]::IsNullOrWhiteSpace($functionCodeS3Version) -eq $false)
+        {
+        	Write-host "Both the S3 Key and the Object Version specified"            
+		    $updatedConfig = aws lambda update-function-code --function-name "$functionName" --s3-bucket "$functionCodeS3Bucket" --s3-key "$functionCodeS3Key" --s3-object-version "$functionCodeS3Version"
+        }
+        elseif ([string]::IsNullOrWhiteSpace($functionCodeS3Key) -eq $false -and [string]::IsNullOrWhiteSpace($functionCodeS3Version) -eq $true)
+        {
+        	Write-host "Only the S3 key was specified"            
+		    $updatedConfig = aws lambda update-function-code --function-name "$functionName" --s3-bucket "$functionCodeS3Bucket" --s3-key "$functionCodeS3Key"
+        }
+        else
+        {
+        	Write-host "Only the Object Version was specified"            
+		    $updatedConfig = aws lambda update-function-code --function-name "$functionName" --s3-bucket "$functionCodeS3Bucket" --s3-object-version "$functionCodeS3Version"
+        }
+    }
+    else
+    {
+    	Write-Host "Image URI specified, updating the function $functionName to use that."           
+	    $updatedConfig = aws lambda update-function-code --function-name "$functionName" --image-uri "$functionCodeImageUri"
+    }
+    
+    Write-Highlight "Updating the $functionName base configuration"    
+    $functionInformation = aws lambda update-function-configuration --function-name "$functionName" --role $functionRole --handler $functionHandler --runtime $functionRuntime --memory-size $functionMemorySize
+}
+
+$functionInformation = $functionInformation | ConvertFrom-JSON
+$functionArn = $functionInformation.FunctionArn
+
+Write-Host "Function ARN: $functionArn"
+
+if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false)
+{
+	Write-Highlight "Environment variables specified, updating environment variables configuration for $functionName"
+	$environmentVariables = "Variables={$functionEnvironmentVariables}"
+    
+    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true)
+    {
+    	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables"
+    }
+    else
+    {
+    	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables" --kms-key-arn "$functionEnvironmentVariablesKey"
+    }
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false)
+{
+	Write-Highlight "Timeout specified, updating timeout configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --timeout "$functionTimeout"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTags) -eq $false)
+{
+	Write-Highlight "Tags specified, updating tags configuration for $functionName"
+	$updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$functionTags"
+}
+
+if ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false)
+{
+	Write-Highlight "Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName"
+    aws lambda untag-resource --resource "$functionArn" --tag-keys "Octopus-Release" "Octopus-Runbook-Run"
+	$updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$deployVersionTag"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false)
+{
+	Write-Highlight "VPC subnets and security group specified, updating vpc configuration for $functionName"
+	$vpcConfig = "SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --vpc-config "$vpcConfig"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false)
+{
+	Write-Highlight "Description specified, updating description configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --description "$functionDescription"	
+}
+
+if ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false)
+{
+	Write-Highlight "File System Config specified, updating file system configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --file-system-configs "$functionFileSystemConfig"	
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false)
+{
+	Write-Highlight "Dead Letter specified, updating dead letter configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --dead-letter-config "$functionDeadLetterConfig"	
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false)
+{
+	Write-Highlight "Tracing config specified, updating tracing configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --tracing-config "$functionTracingConfig"	
+}
+
+Write-Host $updatedConfig | ConvertFrom-JSON
+
+if ($functionPublishOption -eq "Yes")
+{
+	$functionVersionNumber = $functionCodeVersion
+	if ([string]::IsNullOrWhiteSpace($functionCodeVersion) -eq $true)
+    {
+    	$functionVersionNumber = $functionReleaseNumber
+    }
+    
+	Write-Highlight "Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS."
+	$publishedVersion = aws lambda publish-version --function-name "$functionArn" --description "$functionVersionNumber"
+    
+    $publishedVersion = $publishedVersion | ConvertFrom-JSON
+    
+    Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)"
+    Set-OctopusVariable -name "PublishedVersion" -value "$($publishedVersion.Version)"    
+}
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn"
+Set-OctopusVariable -name "LambdaArn" -value "$functionArn"
+
+Write-Highlight "AWS Lambda $functionName successfully deployed."
\ No newline at end of file
diff --git a/src/step-templates/aws-create-a-route-53-resource-record/metadata.json b/src/step-templates/aws-create-a-route-53-resource-record/metadata.json
new file mode 100644
index 000000000..8bb069f4b
--- /dev/null
+++ b/src/step-templates/aws-create-a-route-53-resource-record/metadata.json
@@ -0,0 +1,134 @@
+{
+  "Id": "9271327d-6e8a-49d1-881a-3925c75aef56",
+  "Name": "AWS - Create a Route 53 Resource Record",
+  "Description": "This step will Update, Create or Delete a Resource Record from an Route 53 hosted Domain Name.\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "6ec4f68e-02b7-4015-88aa-34a2a7dd8568",
+      "Name": "odZoneId",
+      "Label": "Hosted Zone ID",
+      "HelpText": "The Hosted Zone ID of the Domain Name you would like to work with.",
+      "DefaultValue": "Zxxxxxxxxxxxxx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2e0fa53b-d85a-4afd-9fb8-a44ddd28b598",
+      "Name": "odAction",
+      "Label": "Action",
+      "HelpText": "The Action you would like to perform - Update, Create or Delete a Resource Record from an Route 53 hosted Domain Name.",
+      "DefaultValue": "UPSERT",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "UPSERT|Update a Resource Record if exists, or Create a new one\nCREATE|Create a Resource Record\nDELETE|Delete a Resource Record"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "843ef155-8583-417f-90dd-6e880ca175e2",
+      "Name": "odName",
+      "Label": "Name",
+      "HelpText": "The Name is the full Domain Name Address you would like to work with.\nFor example:\n- database01.example.com",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "956cb942-2d09-4bb4-b0a0-4c855d4f9b29",
+      "Name": "odResourceAddress",
+      "Label": "Resource Address",
+      "HelpText": "The Address (IP or Domain Name) of the Resource you would like the Resource Record to point to. For example:\n- 8.8.8.8 _(e.g. A Record)_\n- webserver01.example.com _(e.g. CNAME Record)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d2734830-3915-4759-9b06-5a174540c337",
+      "Name": "odType",
+      "Label": "Record Type",
+      "HelpText": "The Type of Resource Record you would like to work with. For example:\n- A _(e.g. 8.8.8.8)_\n- CNAME _(e.g. webserver01.example.com)_\n\nFurther Reading:\n[https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html)",
+      "DefaultValue": "A",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a62ded34-e6f4-4736-bea6-3c7294a5e6dd",
+      "Name": "odTtl",
+      "Label": "TTL (Time to Live)",
+      "HelpText": "The amount of time (in seconds) a Resource Record should be cached for.\n\nFurther Reading:\n[https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-values-basic.html#rrsets-values-basic-ttl](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-values-basic.html#rrsets-values-basic-ttl)",
+      "DefaultValue": "600",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d14fbeaf-907b-4f5f-9efc-04a5ae2031f8",
+      "Name": "odWait",
+      "Label": "Wait for Sync",
+      "HelpText": "If the Step should wait for the Resource Record to sync to all Name Servers before proceeding to the next Step.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d009432c-d746-42d1-b214-42ba78760d5b",
+      "Name": "odComment",
+      "Label": "Comment (Optional)",
+      "HelpText": "The Comment provided in this field is for auditing purposes, and is not visible in the AWS Route 53 Web Interface (it's only accessible via the API).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "078ab1ac-4560-4241-8127-29bb293622b5",
+      "Name": "odAccessKey",
+      "Label": "Access Key (Kind-of Optional)",
+      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "0e06989b-4f09-4652-8c92-398d078c3cb5",
+      "Name": "odSecretKey",
+      "Label": "Secret Key (Kind-of Optional)",
+      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tclydesdale",
+  "$Meta": {
+    "ExportedAt": "2018-01-31T13:17:01.3480000Z",
+    "OctopusVersion": "4.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-create-a-route-53-resource-record/scriptbody.ps1 b/src/step-templates/aws-create-a-route-53-resource-record/scriptbody.ps1
new file mode 100644
index 000000000..5586dab6a
--- /dev/null
+++ b/src/step-templates/aws-create-a-route-53-resource-record/scriptbody.ps1
@@ -0,0 +1,194 @@
+# Running outside octopus
+param(
+    [string]$odZoneId,
+    [string]$odAction,
+    [string]$odName,
+    [string]$odResourceAddress,
+    [string]$odType,
+    [string]$odTtl,
+    [string]$odWait,
+    [string]$odComment,
+    [string]$odAccessKey,
+    [string]$odSecretKey,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if (!$result -or $result -eq $null) {
+        if ($Default) {
+            $result = $Default
+        } elseif ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    return $result
+}
+
+# More custom functions would go here
+
+& {
+    param(
+        [string]$odZoneId,
+        [string]$odAction,
+        [string]$odName,
+        [string]$odResourceAddress,
+        [string]$odType,
+        [string]$odTtl,
+        [string]$odWait,
+        [string]$odComment,
+        [string]$odAccessKey,
+        [string]$odSecretKey
+    )
+    
+    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables
+    if ($odAccessKey -or $odSecretKey) {
+        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default
+    } elseif (([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -or ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine"))) {
+        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -SecretKey ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine")) -StoreAs default
+    } else {
+        throw "AWS API credentials were not available/provided."
+    }
+
+    If($odAction -ne "CREATE" -and $odAction -ne "DELETE" -and $odAction -ne "UPSERT") { throw "Invalid Action provided. Please use CREATE, DELETE or UPSERT." }
+
+    if ($odName -notmatch '.+?\.$') { $odName += '.' }
+
+    $change = (New-Object Amazon.Route53.Model.Change)
+    $change.Action = $odAction
+    $change.ResourceRecordSet = (New-Object Amazon.Route53.Model.ResourceRecordSet)
+    $change.ResourceRecordSet.Name = $odName
+    $change.ResourceRecordSet.Type = $odType
+    $change.ResourceRecordSet.TTL = $odTtl
+    
+    if ($odResourceAddress -like '*,*') {
+        $($odResourceAddress -split ',') | Foreach-Object {
+            $change.ResourceRecordSet.ResourceRecords.Add(@{Value=$($_)})
+        }
+    } else {
+        $change.ResourceRecordSet.ResourceRecords.Add(@{Value=$odResourceAddress})
+    }
+
+    Write-Output ("------------------------------")
+    Write-Output ("Checking if Resource Record Set Exists:")
+    Write-Output ("------------------------------")
+
+    $resourceRecordSetObj = $(Get-R53ResourceRecordSet -HostedZoneId $odZoneId).ResourceRecordSets | Where {$_.Name -eq $odName}
+    $resourceRecordSetCount = ($resourceRecordSetObj | measure).Count
+
+    if ($odAction -eq "DELETE") {
+        if ($resourceRecordSetCount -gt 0) {
+            Write-Output ("The record '$($odName)' exists, deleting...")
+        } else {
+            Write-Output ("Cannot Delete: The record '$($odName)' does not exist, skipping...")
+            Exit
+        }
+    } elseif ($odAction -eq "CREATE") {
+        if ($resourceRecordSetCount -gt 0) {
+            Write-Output ("Cannot Create: The record '$($odName)' already exists, skipping...")
+            Exit
+        } else {
+            Write-Output ("The record '$($odName)' does not exist, creating record...")
+        }
+    } elseif ($odAction -eq "UPSERT") {
+        if ($resourceRecordSetCount -gt 0) {
+            Write-Output ("The record '$($odName)' already exists, updating record...")
+        } else {
+            Write-Output ("The record '$($odName)' does not exist, creating record...")
+        }
+    } else { throw "OMG - Unexpected result" }
+    
+    $params = @{
+        HostedZoneId=$odZoneId
+        ChangeBatch_Comment=$odComment
+        ChangeBatch_Change=$change
+    }
+
+    Write-Output ("------------------------------")
+    Write-Output ("Listing DNS change/s to be made:")
+    Write-Output ("------------------------------")
+
+    $($params.ChangeBatch_Change) | Foreach-Object {
+        $resourceRecords=" | "
+
+        $($_.ResourceRecordSet.ResourceRecords) | Foreach-Object {
+            $resourceRecords += $_.Value + ","
+        }
+
+        Write-Output ($($_.Action.Value) + " | " + $($_.ResourceRecordSet.Name) + " | " + $($_.ResourceRecordSet.Type) + $($resourceRecords -replace ".$"))
+    }
+
+    
+
+    $timeout = new-timespan -Seconds 30
+    $sw = [diagnostics.stopwatch]::StartNew()
+    $attempt = 1
+
+    while ($true) {
+        try {
+            $result = Edit-R53ResourceRecordSet @params
+            break
+        }
+        catch [Amazon.Route53.AmazonRoute53Exception] {
+            Write-Output ("$($_.Exception.errorcode)-$($_.Exception.Message)")
+
+            if ($attempt -eq 3) {
+                throw $_.Exception.errorcode + '-' + $_.Exception.Message
+            }
+
+            if ($sw.elapsed -gt $timeout) {throw "Timed out waiting for 'Edit-R53ResourceRecordSet' to succeed"}
+
+            Write-Output ("Attempt no.$($attempt) failed - Trying again in 5 seconds...")
+            Sleep -Seconds 5
+
+            $attempt++
+        }
+    }
+
+
+    Write-Output ("------------------------------")
+    Write-Output ("Checking the R53 Change status:")
+    Write-Output ("------------------------------")
+
+    $timeout = new-timespan -Seconds 120
+    $sw = [diagnostics.stopwatch]::StartNew()
+
+    while ($true) {
+        $currentState = (Get-R53Change -Id $result.Id).Status
+
+        if ($currentState -eq "INSYNC") {break}
+        if ([bool]($odWait -eq $false)) {break}
+
+        Write-Output ("$(Get-Date) | Waiting for R53 Change '$($result.Id)' to transition from state: $currentState")
+
+        if ($sw.elapsed -gt $timeout) {throw "Timed out waiting for desired state"}
+
+        Sleep -Seconds 5
+    }
+    Write-Output ("$(Get-Date) | R53 Change state: $currentState")
+ } `
+ (Get-Param 'odZoneId' -Required) `
+ (Get-Param 'odAction' -Required) `
+ (Get-Param 'odName' -Required) `
+ (Get-Param 'odResourceAddress' -Required) `
+ (Get-Param 'odType' -Required) `
+ (Get-Param 'odTtl' -Required) `
+ (Get-Param 'odWait' -Required) `
+ (Get-Param 'odComment') `
+ (Get-Param 'odAccessKey') `
+ (Get-Param 'odSecretKey')
\ No newline at end of file
diff --git a/src/step-templates/aws-create-a-security-group/metadata.json b/src/step-templates/aws-create-a-security-group/metadata.json
new file mode 100644
index 000000000..b55c02c04
--- /dev/null
+++ b/src/step-templates/aws-create-a-security-group/metadata.json
@@ -0,0 +1,100 @@
+{
+  "Id": "051ee152-1ef8-4937-a616-b56eb94dad25",
+  "Name": "AWS - Create a Security Group",
+  "Description": "This step will Create a Security Group within a Virtual Private Cloud (VPC).\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on. If you would like to add comments to rules, then you will need at least version 3.3.42.0 installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "868cba60-5638-4078-aa56-b65bba16f9aa",
+      "Name": "odGroupName",
+      "Label": "Security Group Name",
+      "HelpText": "The Name you would like to assign to the new Security Group.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "55c75754-48ad-44ba-854f-7d937ace11b4",
+      "Name": "odGroupDescription",
+      "Label": "Security Group Description",
+      "HelpText": "The Description you would like to assign to the new Security Group.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "332e2d15-e8f0-4012-9eaa-a28011ab1ef3",
+      "Name": "odVpcId",
+      "Label": "Virtual Private Cloud (VPC) ID",
+      "HelpText": "The Virtual Private Cloud (VPC) ID of the VPC you would like the Security Group to be created in.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b8041ec7-6d50-4f8d-babe-9b6b3fef2ac5",
+      "Name": "odRules",
+      "Label": "Rules (Optional)",
+      "HelpText": "The Rules you would like to add to the Security Group. For example:\n- RDP=Ingress|tcp|3389|3389|52.64.52.64/32\n\nThe format being:\n- comment=direction|protocol|fromport|toport|iprange",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ae77469f-6cad-42a7-8fbc-592d2ee85c3d",
+      "Name": "odInstanceId",
+      "Label": "Instance ID (Optional)",
+      "HelpText": "The EC2 Instance ID of the Instance you would like to add the Security Group to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ee896a8c-beda-4609-a104-bdf6fd3799cd",
+      "Name": "odAccessKey",
+      "Label": "Access Key (Kind-of Optional)",
+      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "004f625b-6d07-4a12-8a80-ea74943fb283",
+      "Name": "odSecretKey",
+      "Label": "Secret Key (Kind-of Optional)",
+      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tclydesdale",
+  "$Meta": {
+    "ExportedAt": "2018-02-01T14:11:31.2620000Z",
+    "OctopusVersion": "4.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-create-a-security-group/scriptbody.ps1 b/src/step-templates/aws-create-a-security-group/scriptbody.ps1
new file mode 100644
index 000000000..b6e1ed350
--- /dev/null
+++ b/src/step-templates/aws-create-a-security-group/scriptbody.ps1
@@ -0,0 +1,234 @@
+# Running outside octopus
+param(
+    [string]$odGroupName,
+    [string]$odGroupDescription,
+    [string]$odVpcId,
+    [string]$odRules,
+    [string]$odInstanceId,
+    [string]$odAccessKey,
+    [string]$odSecretKey,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if (!$result -or $result -eq $null) {
+        if ($Default) {
+            $result = $Default
+        } elseif ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$odGroupName,
+        [string]$odGroupDescription,
+        [string]$odVpcId,
+        [string]$odRules,
+        [string]$odInstanceId,
+        [string]$odAccessKey,
+        [string]$odSecretKey
+    )
+    
+    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables
+    if ($odAccessKey -or $odSecretKey) {
+        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default
+    } elseif (([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -or ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine"))) {
+        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -SecretKey ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine")) -StoreAs default
+    } else {
+        throw "AWS API credentials were not available/provided."
+    }
+
+
+
+    Write-Output ("------------------------------")
+    Write-Output ("Checking the Security Group:")
+    Write-Output ("------------------------------")
+    
+    $filterArray = @()
+    $filterArray += @{ name="vpc-id";value=$odVpcId }
+    $filterArray += @{ name="group-name";value=$odGroupName }
+    $filterArray += @{ name="description";value=$odGroupDescription }
+
+    $securityGroupObj = (Get-EC2SecurityGroup -Filter $filterArray)
+    $securityGroupCount = ($securityGroupObj | measure).Count
+    $securityGroupId = $null
+
+    if ($securityGroupCount -gt 1) {
+        throw "More than one security group exists with the same vpcid/name/description - I don't know what to do!?"
+    }
+    elseif ($securityGroupCount -eq 1) {
+        Write-Output ("$(Get-Date) | Security group already exists...")
+
+        $securityGroupId = ($securityGroupObj).GroupId
+    }
+    elseif ($securityGroupCount -eq 0) {
+        Write-Output ("$(Get-Date) | Creating security group...")
+
+        $securityGroupId = (New-EC2SecurityGroup -VpcId $odVpcId -GroupName $odGroupName -GroupDescription $odGroupDescription)
+
+        Write-Output ("Security Group Created: $($securityGroupId)")
+    }
+
+    if ($securityGroupId -and $OctopusParameters) {
+        Set-OctopusVariable -name "GroupId" -value $securityGroupId
+    }
+
+    if ($odRules) {
+        (ConvertFrom-StringData $odRules).GetEnumerator() | Foreach-Object {
+            $ruleSplit = $_.Value.Split("|")
+        
+            $direction = $ruleSplit[0]
+            $ipProtocol = $ruleSplit[1]
+            $fromPort = $ruleSplit[2]
+            $toPort = $ruleSplit[3]
+            $ipRanges = $ruleSplit[4]
+
+            Write-Output ("------------------------------")
+            Write-Output ("Creating new $($direction) rule for Security Group $($securityGroupId):")
+            Write-Output ("------------------------------")
+
+            $failCount = 0
+            while ($true) {
+                try {
+                    if ($direction -eq "Ingress") {
+                        $check_ipPermissionObj = ($securityGroupObj | Select -ExpandProperty IpPermissions | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort})
+                    }
+                    elseif ($direction -eq "Egress") {
+                        $check_ipPermissionObj = ($securityGroupObj | Select -ExpandProperty IpPermissionsEgress | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort})
+                    }
+
+                    break
+                } 
+                catch {
+                    $failCount++
+                }
+
+                if ($failCount -eq 3) { throw "Could not register the task after three attempts!" }
+            }
+
+
+
+            $check_ipRangesObj = ($check_ipPermissionObj | Select -ExpandProperty IpRanges | ? {$_ -eq $ipRanges})
+            $check_ipRangesObjCount = ($check_ipRangesObj | measure).Count
+
+            if ($check_ipRangesObjCount -gt 0) {
+                Write-Output ("$(Get-Date) | Rule '$($_.Key)' already exists...")
+            }
+            else {
+                Write-Output ("$(Get-Date) | Creating new rule '$($_.Key)'...")
+                
+                $ipPermissionObj = (New-Object "Amazon.EC2.Model.IpPermission")
+                $ipPermissionObj.IpProtocol = $ipProtocol
+                $ipPermissionObj.FromPort = $fromPort
+                $ipPermissionObj.ToPort = $toPort
+                
+
+                try {
+                    $ipRangesObj = (New-Object "Amazon.EC2.Model.IpRange")
+                    $ipRangesObj.CidrIp = $ipRanges
+                    $ipRangesObj.Description = $_.Key
+                    $ipPermissionObj.Ipv4Ranges = $ipRangesObj
+                }
+                catch {
+                    Write-Output ("$(Get-Date) | Cannot create 'Amazon.EC2.Model.IpRange' object, possibly running an old version of the 'AWS Tools for Windows PowerShell'")
+                    Write-Output ("$(Get-Date) | Attempting to use the old method, but the old method does not allow rule comments/descriptions")
+
+                    $ipRangesObj = (New-Object "System.Collections.Generic.List[string]")
+                    $ipRangesObj.Add($ipRanges)
+                    $ipPermissionObj.IpRanges = $ipRangesObj
+                }
+
+                Write-Output $ipPermissionObj
+
+                try {
+                    if ($direction -eq "Ingress") {
+                        Grant-EC2SecurityGroupIngress -GroupId $securityGroupId -IpPermission $ipPermissionObj
+                    }
+                    elseif ($direction -eq "Egress") {
+                        Grant-EC2SecurityGroupEgress -GroupId $securityGroupId -IpPermission $ipPermissionObj
+                    }
+                }
+                catch [Amazon.EC2.AmazonEC2Exception] {
+                    throw $_.Exception.errorcode + '-' + $_.Exception.Message
+                }
+
+                Write-Output ("------------------------------")
+                Write-Output ("New $($direction) ruleset looks like:")
+                Write-Output ("------------------------------")
+
+                $securityGroupObj = (Get-EC2SecurityGroup -Filter $filterArray)
+
+                if ($direction -eq "Ingress") {
+                    Write-Output $securityGroupObj | Select -ExpandProperty IpPermissions | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort}
+                }
+                elseif ($direction -eq "Egress") {
+                    Write-Output $securityGroupObj | Select -ExpandProperty IpPermissionsEgress | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort}
+                }
+            }
+        }
+    }
+
+
+
+
+    if ($odInstanceId) {
+        $filterArray = @()
+        $filterArray += @{ name="instance-id";value=$odInstanceId }
+
+        $instanceObj = (Get-EC2Instance -Filter $filterArray | select -ExpandProperty Instances)
+        $instanceCount = ($instanceObj | measure).Count
+
+        if ($instanceCount -gt 1) {
+            throw "More than one instance exists with the same instance id - I don't know what to do!?"
+        }
+        elseif ($instanceCount -eq 1) {
+            Write-Output ("$(Get-Date) | Found instance '$($odInstanceId)'!")
+ 
+            $securityGroupArray = @()
+            $securityGroupArray += ($instanceObj.NetworkInterfaces | Where-Object {$(Get-EC2NetworkInterface -NetworkInterfaceId $($_.NetworkInterfaceId))} | Select -ExpandProperty Groups | Select GroupId | Select -Expand GroupId)
+
+            if ($securityGroupArray -contains $securityGroupId) {
+                Write-Output ("$(Get-Date) | Security Group '$($securityGroupId)' is already associated with the Instance '$($odInstanceId)'...")
+            }
+            else {
+                Write-Output ("$(Get-Date) | Adding Security Group '$($securityGroupId)' to the Instance '$($odInstanceId)'!")
+
+                $securityGroupArray += $securityGroupId
+                $instanceObj.NetworkInterfaces | Where-Object {$(Edit-EC2NetworkInterfaceAttribute -NetworkInterfaceId $($_.NetworkInterfaceId) -Groups $securityGroupArray)}
+            }
+        }
+
+        Write-Output ("------------------------------")
+        Write-Output ("Security Groups for instance '$($odInstanceId)':")
+        Write-Output ("------------------------------")
+        
+        $instanceObj = (Get-EC2Instance -Filter $filterArray | select -ExpandProperty Instances)
+        Write-Output $instanceObj.NetworkInterfaces | Where-Object {$(Get-EC2NetworkInterface -NetworkInterfaceId $($_.NetworkInterfaceId))} | Select -ExpandProperty Groups
+    }
+ } `
+ (Get-Param 'odGroupName' -Required) `
+ (Get-Param 'odGroupDescription' -Required) `
+ (Get-Param 'odVpcId' -Required) `
+ (Get-Param 'odRules') `
+ (Get-Param 'odInstanceId') `
+ (Get-Param 'odAccessKey') `
+ (Get-Param 'odSecretKey')
\ No newline at end of file
diff --git a/step-templates/aws-deploy-lambda-iam.json b/src/step-templates/aws-deploy-lambda-iam/metadata.json
similarity index 57%
rename from step-templates/aws-deploy-lambda-iam.json
rename to src/step-templates/aws-deploy-lambda-iam/metadata.json
index cde57fedf..fee611dc9 100644
--- a/step-templates/aws-deploy-lambda-iam.json
+++ b/src/step-templates/aws-deploy-lambda-iam/metadata.json
@@ -26,7 +26,7 @@
     "Octopus.Action.Aws.AssumeRole": "False",
     "Octopus.Action.AwsAccount.UseInstanceRole": "True",
     "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
-    "Octopus.Action.Script.ScriptBody": "$functionName = $OctopusParameters[\"AWS.Lambda.FunctionName\"] \n$functionRole = $OctopusParameters[\"AWS.Lambda.FunctionRole\"]\n$functionRunTime = $OctopusParameters[\"AWS.Lambda.Runtime\"]\n$functionHandler = $OctopusParameters[\"AWS.Lambda.FunctionHandler\"]\n$functionMemorySize = $OctopusParameters[\"AWS.Lambda.MemorySize\"]\n$functionDescription = $OctopusParameters[\"AWS.Lambda.Description\"]\n$functionVPCSubnetId = $OctopusParameters[\"AWS.Lambda.VPCSubnetIds\"]\n$functionVPCSecurityGroupId = $OctopusParameters[\"AWS.Lambda.VPCSecurityGroupIds\"]\n$functionEnvironmentVariables = $OctopusParameters[\"AWS.Lambda.EnvironmentVariables\"]\n$functionEnvironmentVariablesKey = $OctopusParameters[\"AWS.Lambda.EnvironmentVariablesKey\"]\n$functionTimeout = $OctopusParameters[\"AWS.Lambda.FunctionTimeout\"]\n$functionTags = $OctopusParameters[\"AWS.Lambda.Tags\"]\n$functionFileSystemConfig = $OctopusParameters[\"AWS.Lambda.FileSystemConfig\"]\n$functionDeadLetterConfig = $OctopusParameters[\"AWS.Lambda.DeadLetterConfig\"]\n$functionTracingConfig = $OctopusParameters[\"AWS.Lambda.TracingConfig\"]\n$functionVersionNumber = $OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].PackageVersion\"]\n$functionPublishOption = $OctopusParameters[\"AWS.Lambda.Publish\"]\n\n$functionReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$functionRunbookRun = $OctopusParameters[\"Octopus.RunbookRun.Id\"]\n$stepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$regionName = $OctopusParameters[\"AWS.Lambda.Region\"]\n$newArchiveFileName = \"$($OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].ExtractedPath\"])/$($OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].PackageId\"]).$($OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].PackageVersion\"]).zip\"\n\nif ([string]::IsNullOrWhiteSpace($functionName))\n{\n\tWrite-Error \"The parameter Function Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRole))\n{\n\tWrite-Error \"The parameter Role is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRunTime))\n{\n\tWrite-Error \"The parameter Run Time is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionHandler))\n{\n\tWrite-Error \"The parameter Handler is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionPublishOption))\n{\n\tWrite-Error \"The parameter Publish is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false)\n{\n    $deployVersionTag = \"Octopus-Release=$functionReleaseNumber\"\n}\nelse\n{\n\t$deployVersionTag = \"Octopus-Runbook-Run=$functionRunbookRun\"\n}\n\nWrite-Host \"Function Name: $functionName\"\nWrite-Host \"Function Role: $functionRole\"\nWrite-Host \"Function Runtime: $functionRunTime\"\nWrite-Host \"Function Handler: $functionHandler\"\nWrite-Host \"Function Memory Size: $functionMemorySize\"\nWrite-Host \"Function Description: $functionDescription\"\nWrite-Host \"Function Subnet Ids: $functionVPCSubnetId\"\nWrite-Host \"Function Security Group Ids: $functionVPCSecurityGroupId\"\nWrite-Host \"Function Environment Variables: $functionEnvironmentVariables\"\nWrite-Host \"Function Environment Variables Key: $functionEnvironmentVariablesKey\"\nWrite-Host \"Function Timeout: $functionTimeout\"\nWrite-Host \"Function Tags: $functionTags\"\nWrite-Host \"Function File System Config: $functionFileSystemConfig\"\nWrite-Host \"Function Dead Letter Config: $functionDeadLetterConfig\"\nWrite-Host \"Function Tracing Config: $functionTracingConfig\"\nWrite-Host \"Function file path: fileb://$newArchiveFileName\"\nWrite-Host \"Function Publish: $functionPublishOption\"\n\nWrite-Host \"Re-packaging archive ...\"\n\n# Repackage the files into a zip file\nCompress-Archive -Path \"$($OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].ExtractedPath\"])/*\" -DestinationPath $newArchiveFileName\n\nWrite-Host \"Attempting to find the function $functionName in the region $regionName\"\n$hasExistingFunction = $true\n\ntry\n{\n    $existingFunction = aws lambda get-function --function-name \"$functionName\" 2> $null\n    \n    Write-Host \"The exit code from the lookup was $LASTEXITCODE\"\n    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)\n    {\n    \t$hasExistingFunction = $false\n    }   \n    \n    $existingFunction = $existingFunction | ConvertFrom-Json\n}\ncatch\n{\n\tWrite-Host \"The function was not found\"\n\t$hasExistingFunction = $false\n}\n\nWrite-Host \"Existing functions: $hasExistingFunction\"\nWrite-Host $existingFunction\n\n$aliasInformation = $null\nif ($hasExistingFunction -eq $false)\n{\n\tWrite-Highlight \"Creating $functionName in $regionName\"    \n\t$functionInformation = aws lambda create-function --function-name \"$functionName\" --zip-file fileb://$newArchiveFileName --handler $functionHandler --runtime $functionRuntime --role $functionRole --memory-size $functionMemorySize\n}\nelse\n{\n\tWrite-Highlight \"Updating the $functionName code\"\n    $updatedConfig = aws lambda update-function-code --function-name \"$functionName\" --zip-file fileb://$newArchiveFileName\n    \n    Write-Highlight \"Waiting for update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n    \n    Write-Highlight \"Updating the $functionName base configuration\"    \n    $functionInformation = aws lambda update-function-configuration --function-name \"$functionName\" --role $functionRole --handler $functionHandler --runtime $functionRuntime --memory-size $functionMemorySize\n    \n    Write-Highlight \"Waiting for base configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\n$functionInformation = $functionInformation | ConvertFrom-JSON\n$functionArn = $functionInformation.FunctionArn\n\nWrite-Host \"Function ARN: $functionArn\"\n\nif ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false)\n{\n\tWrite-Highlight \"Environment variables specified, updating environment variables configuration for $functionName\"\n\t$environmentVariables = \"Variables={$functionEnvironmentVariables}\"\n    \n    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true)\n    {\n    \t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\"\n    }\n    else\n    {\n    \t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\" --kms-key-arn \"$functionEnvironmentVariablesKey\"\n    }\n    \n    Write-Highlight \"Waiting for environment variable update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false)\n{\n\tWrite-Highlight \"Timeout specified, updating timeout configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --timeout \"$functionTimeout\"\n    \n    Write-Highlight \"Waiting for timeout upate to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTags) -eq $false)\n{\n\tWrite-Highlight \"Tags specified, updating tags configuration for $functionName\"\n\t$updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$functionTags\"\n}\n\nif ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false)\n{\n\tWrite-Highlight \"Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName\"\n    aws lambda untag-resource --resource \"$functionArn\" --tag-keys \"Octopus-Release\" \"Octopus-Runbook-Run\"\n\t$updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$deployVersionTag\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false)\n{\n\tWrite-Highlight \"VPC subnets and security group specified, updating vpc configuration for $functionName\"\n\t$vpcConfig = \"SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --vpc-config \"$vpcConfig\"\n    \n    Write-Highlight \"Waiting for vpc configuration to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false)\n{\n\tWrite-Highlight \"Description specified, updating description configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --description \"$functionDescription\"\n    \n    Write-Highlight \"Waiting for description configuration ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false)\n{\n\tWrite-Highlight \"File System Config specified, updating file system configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --file-system-configs \"$functionFileSystemConfig\"\t\n    \n    Write-Highlight \"Wating for file system configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false)\n{\n\tWrite-Highlight \"Dead Letter specified, updating dead letter configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --dead-letter-config \"$functionDeadLetterConfig\"\t\n    \n    Write-Highlight \"Waitng for Dead Letter configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false)\n{\n\tWrite-Highlight \"Tracing config specified, updating tracing configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --tracing-config \"$functionTracingConfig\"\t\n    \n    Write-Highlight \"Waiting for tracing configuration to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nWrite-Host $updatedConfig | ConvertFrom-JSON\n\nif ($functionPublishOption -eq \"Yes\")\n{\n\tWrite-Highlight \"Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS.\"\n\t$publishedVersion = aws lambda publish-version --function-name \"$functionArn\" --description \"$functionVersionNumber\"\n    \n    $publishedVersion = $publishedVersion | ConvertFrom-JSON\n    \n    Write-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)\"\n    Set-OctopusVariable -name \"PublishedVersion\" -value \"$($publishedVersion.Version)\"    \n}\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn\"\nSet-OctopusVariable -name \"LambdaArn\" -value \"$functionArn\"\n\nWrite-Highlight \"AWS Lambda $functionName successfully deployed.\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "OctopusUseBundledTooling": "False",
     "Octopus.Action.EnabledFeatures": "Octopus.Features.JsonConfigurationVariables,Octopus.Features.SubstituteInFiles",
     "Octopus.Action.Package.JsonConfigurationVariablesTargets": "#{AWS.Lambda.StructuredConfigurationVariables}",
@@ -239,7 +239,7 @@
   ],
   "StepPackageId": "Octopus.AwsRunScript",
   "$Meta": {
-    "ExportedAt": "2023-06-27T18:05:45.154Z",
+    "ExportedAt": "2023-06-27T18:05:45.1540000Z",
     "OctopusVersion": "2023.3.4135",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-deploy-lambda-iam/scriptbody.ps1 b/src/step-templates/aws-deploy-lambda-iam/scriptbody.ps1
new file mode 100644
index 000000000..f45e8d791
--- /dev/null
+++ b/src/step-templates/aws-deploy-lambda-iam/scriptbody.ps1
@@ -0,0 +1,240 @@
+$functionName = $OctopusParameters["AWS.Lambda.FunctionName"] 
+$functionRole = $OctopusParameters["AWS.Lambda.FunctionRole"]
+$functionRunTime = $OctopusParameters["AWS.Lambda.Runtime"]
+$functionHandler = $OctopusParameters["AWS.Lambda.FunctionHandler"]
+$functionMemorySize = $OctopusParameters["AWS.Lambda.MemorySize"]
+$functionDescription = $OctopusParameters["AWS.Lambda.Description"]
+$functionVPCSubnetId = $OctopusParameters["AWS.Lambda.VPCSubnetIds"]
+$functionVPCSecurityGroupId = $OctopusParameters["AWS.Lambda.VPCSecurityGroupIds"]
+$functionEnvironmentVariables = $OctopusParameters["AWS.Lambda.EnvironmentVariables"]
+$functionEnvironmentVariablesKey = $OctopusParameters["AWS.Lambda.EnvironmentVariablesKey"]
+$functionTimeout = $OctopusParameters["AWS.Lambda.FunctionTimeout"]
+$functionTags = $OctopusParameters["AWS.Lambda.Tags"]
+$functionFileSystemConfig = $OctopusParameters["AWS.Lambda.FileSystemConfig"]
+$functionDeadLetterConfig = $OctopusParameters["AWS.Lambda.DeadLetterConfig"]
+$functionTracingConfig = $OctopusParameters["AWS.Lambda.TracingConfig"]
+$functionVersionNumber = $OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].PackageVersion"]
+$functionPublishOption = $OctopusParameters["AWS.Lambda.Publish"]
+
+$functionReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$functionRunbookRun = $OctopusParameters["Octopus.RunbookRun.Id"]
+$stepName = $OctopusParameters["Octopus.Step.Name"]
+
+$regionName = $OctopusParameters["AWS.Lambda.Region"]
+$newArchiveFileName = "$($OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].ExtractedPath"])/$($OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].PackageId"]).$($OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].PackageVersion"]).zip"
+
+if ([string]::IsNullOrWhiteSpace($functionName))
+{
+	Write-Error "The parameter Function Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRole))
+{
+	Write-Error "The parameter Role is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRunTime))
+{
+	Write-Error "The parameter Run Time is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionHandler))
+{
+	Write-Error "The parameter Handler is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionPublishOption))
+{
+	Write-Error "The parameter Publish is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false)
+{
+    $deployVersionTag = "Octopus-Release=$functionReleaseNumber"
+}
+else
+{
+	$deployVersionTag = "Octopus-Runbook-Run=$functionRunbookRun"
+}
+
+Write-Host "Function Name: $functionName"
+Write-Host "Function Role: $functionRole"
+Write-Host "Function Runtime: $functionRunTime"
+Write-Host "Function Handler: $functionHandler"
+Write-Host "Function Memory Size: $functionMemorySize"
+Write-Host "Function Description: $functionDescription"
+Write-Host "Function Subnet Ids: $functionVPCSubnetId"
+Write-Host "Function Security Group Ids: $functionVPCSecurityGroupId"
+Write-Host "Function Environment Variables: $functionEnvironmentVariables"
+Write-Host "Function Environment Variables Key: $functionEnvironmentVariablesKey"
+Write-Host "Function Timeout: $functionTimeout"
+Write-Host "Function Tags: $functionTags"
+Write-Host "Function File System Config: $functionFileSystemConfig"
+Write-Host "Function Dead Letter Config: $functionDeadLetterConfig"
+Write-Host "Function Tracing Config: $functionTracingConfig"
+Write-Host "Function file path: fileb://$newArchiveFileName"
+Write-Host "Function Publish: $functionPublishOption"
+
+Write-Host "Re-packaging archive ..."
+
+# Repackage the files into a zip file
+Compress-Archive -Path "$($OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].ExtractedPath"])/*" -DestinationPath $newArchiveFileName
+
+Write-Host "Attempting to find the function $functionName in the region $regionName"
+$hasExistingFunction = $true
+
+try
+{
+    $existingFunction = aws lambda get-function --function-name "$functionName" 2> $null
+    
+    Write-Host "The exit code from the lookup was $LASTEXITCODE"
+    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)
+    {
+    	$hasExistingFunction = $false
+    }   
+    
+    $existingFunction = $existingFunction | ConvertFrom-Json
+}
+catch
+{
+	Write-Host "The function was not found"
+	$hasExistingFunction = $false
+}
+
+Write-Host "Existing functions: $hasExistingFunction"
+Write-Host $existingFunction
+
+$aliasInformation = $null
+if ($hasExistingFunction -eq $false)
+{
+	Write-Highlight "Creating $functionName in $regionName"    
+	$functionInformation = aws lambda create-function --function-name "$functionName" --zip-file fileb://$newArchiveFileName --handler $functionHandler --runtime $functionRuntime --role $functionRole --memory-size $functionMemorySize
+}
+else
+{
+	Write-Highlight "Updating the $functionName code"
+    $updatedConfig = aws lambda update-function-code --function-name "$functionName" --zip-file fileb://$newArchiveFileName
+    
+    Write-Highlight "Waiting for update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+    
+    Write-Highlight "Updating the $functionName base configuration"    
+    $functionInformation = aws lambda update-function-configuration --function-name "$functionName" --role $functionRole --handler $functionHandler --runtime $functionRuntime --memory-size $functionMemorySize
+    
+    Write-Highlight "Waiting for base configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+$functionInformation = $functionInformation | ConvertFrom-JSON
+$functionArn = $functionInformation.FunctionArn
+
+Write-Host "Function ARN: $functionArn"
+
+if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false)
+{
+	Write-Highlight "Environment variables specified, updating environment variables configuration for $functionName"
+	$environmentVariables = "Variables={$functionEnvironmentVariables}"
+    
+    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true)
+    {
+    	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables"
+    }
+    else
+    {
+    	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables" --kms-key-arn "$functionEnvironmentVariablesKey"
+    }
+    
+    Write-Highlight "Waiting for environment variable update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false)
+{
+	Write-Highlight "Timeout specified, updating timeout configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --timeout "$functionTimeout"
+    
+    Write-Highlight "Waiting for timeout upate to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTags) -eq $false)
+{
+	Write-Highlight "Tags specified, updating tags configuration for $functionName"
+	$updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$functionTags"
+}
+
+if ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false)
+{
+	Write-Highlight "Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName"
+    aws lambda untag-resource --resource "$functionArn" --tag-keys "Octopus-Release" "Octopus-Runbook-Run"
+	$updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$deployVersionTag"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false)
+{
+	Write-Highlight "VPC subnets and security group specified, updating vpc configuration for $functionName"
+	$vpcConfig = "SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --vpc-config "$vpcConfig"
+    
+    Write-Highlight "Waiting for vpc configuration to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false)
+{
+	Write-Highlight "Description specified, updating description configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --description "$functionDescription"
+    
+    Write-Highlight "Waiting for description configuration ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false)
+{
+	Write-Highlight "File System Config specified, updating file system configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --file-system-configs "$functionFileSystemConfig"	
+    
+    Write-Highlight "Wating for file system configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false)
+{
+	Write-Highlight "Dead Letter specified, updating dead letter configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --dead-letter-config "$functionDeadLetterConfig"	
+    
+    Write-Highlight "Waitng for Dead Letter configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false)
+{
+	Write-Highlight "Tracing config specified, updating tracing configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --tracing-config "$functionTracingConfig"	
+    
+    Write-Highlight "Waiting for tracing configuration to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+Write-Host $updatedConfig | ConvertFrom-JSON
+
+if ($functionPublishOption -eq "Yes")
+{
+	Write-Highlight "Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS."
+	$publishedVersion = aws lambda publish-version --function-name "$functionArn" --description "$functionVersionNumber"
+    
+    $publishedVersion = $publishedVersion | ConvertFrom-JSON
+    
+    Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)"
+    Set-OctopusVariable -name "PublishedVersion" -value "$($publishedVersion.Version)"    
+}
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn"
+Set-OctopusVariable -name "LambdaArn" -value "$functionArn"
+
+Write-Highlight "AWS Lambda $functionName successfully deployed."
\ No newline at end of file
diff --git a/src/step-templates/aws-deploy-lambda-image/metadata.json b/src/step-templates/aws-deploy-lambda-image/metadata.json
new file mode 100644
index 000000000..2113a0559
--- /dev/null
+++ b/src/step-templates/aws-deploy-lambda-image/metadata.json
@@ -0,0 +1,236 @@
+{
+  "Id": "480a3d93-7bad-42d4-b439-cced56ae792a",
+  "Name": "AWS - Deploy Image Lambda Function",
+  "Description": "Deploys an image to an AWS Lambda function.  \n\nThis step uses the following AWS CLI commands to deploy the AWS Lambda.  You will be required to install the AWS CLI on your server/worker for this to work.  The AWS CLI is pre-installed on the [dynamic workers](https://octopus.com/docs/infrastructure/workers/dynamic-worker-pools) in Octopus Cloud as well as the provided docker containers for [Execution Containers](https://octopus.com/docs/deployment-process/execution-containers-for-workers).\n\n- [create-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html)\n- [get-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/get-function.html)\n- [publish-version](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/publish-version.html)\n- [tag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/tag-resource.html)\n- [untag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/untag-resource.html)\n- [update-function-code](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-code.html)\n- [update-function-configuration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-configuration.html)\n\nThis step template is worker-friendly, you can pass in a package reference rather than having to reference a previous step that downloaded the package. This step requires **Octopus Deploy 2019.10.0** or higher.\n\n## Output Variables\n\nThis step template sets the following output variables:\n\n- `LambdaArn`: The ARN of the Lambda Function\n- `PublishedVersion`: The most recent version published (only set when Publish is set to `Yes`).",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "8dbae499-5aa8-438e-a2fe-ae29fb8f0a39",
+      "Name": "AWS.Lambda.Package",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "NotAcquired",
+      "Properties": {
+        "Extract": "False",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "AWS.Lambda.Package",
+        "Purpose": ""
+      }
+    }
+  ],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "Octopus.Action.AwsAccount.Variable": "#{AWS.Lambda.Account}",
+    "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "OctopusUseBundledTooling": "False"
+  },
+  "Parameters": [
+    {
+      "Id": "8c0297c2-5a7c-4776-9ce7-8bd3dbe93e45",
+      "Name": "AWS.Lambda.FunctionName",
+      "Label": "Function Name",
+      "HelpText": "Required.\n\nThe name of the function to create or update.  See [documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html#options)\n\nExamples:\n- Function name - my-function .\n- Function ARN - arn:aws:lambda:us-west-2:123456789012:function:my-function .\n- Partial ARN - 123456789012:function:my-function .\n\nThe length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "711a1557-03c2-4c78-87aa-730389673884",
+      "Name": "AWS.Lambda.Account",
+      "Label": "AWS Account",
+      "HelpText": "Required.\n\nThe AWS Account with permissions to create / update AWS Lambdas.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "304f276c-ed3e-4766-93e1-3fb25a727ccd",
+      "Name": "AWS.Lambda.Region",
+      "Label": "Region",
+      "HelpText": "Required.\n\nThe region where the function will live.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\naf-south-1|Africa (Cape Town)\nap-east-1|Asia Pacific (Hong Kong)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-3|Asia Pacific (Osaka-Local)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\nca-central-1|Canada (Central)\neu-central-1|Europe (Frankfurt)\neu-west-1|Europe (Ireland)\neu-west-2|Europe (London)\neu-south-1|Europe (Milan)\neu-west-3|Europe (Paris)\neu-north-1|Europe (Stockholm)\nme-south-1|Middle East (Bahrain)\nsa-east-1|South America (São Paulo)"
+      }
+    },
+    {
+      "Id": "d9d48dc2-d671-41b9-8a5e-59efbf4e29e3",
+      "Name": "AWS.Lambda.Package",
+      "Label": "Image",
+      "HelpText": "Required.\n\nThe registry containing the image you wish to deploy to the AWS Lambda function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "a44a4664-f3b7-41f7-bc9c-cd7e06be7dbe",
+      "Name": "AWS.Lambda.FunctionRole",
+      "Label": "Function Role",
+      "HelpText": "Required.\n\nThe Amazon Resource Name (ARN) of the function’s execution role.  This role must exist prior to this step is run.  See [documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-intro-execution-role.html) for more detail on creating an execution role.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "12b11c8c-b31d-42b1-a4a4-c7fa0cf6219d",
+      "Name": "AWS.Lambda.MemorySize",
+      "Label": "Memory Size",
+      "HelpText": "Required.\n\nThe amount of memory that your function has access to. Increasing the function’s memory also increases its CPU allocation. The default value is 128 MB. The value must be a multiple of 64 MB.",
+      "DefaultValue": "128",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c16ab198-835b-4c1d-b289-b87ad5fe3df2",
+      "Name": "AWS.Lambda.Description",
+      "Label": "Description",
+      "HelpText": "Optional.\n\nA description of the function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "903476ad-6eca-4ddf-a656-f121c12e8785",
+      "Name": "AWS.Lambda.VPCSubnetIds",
+      "Label": "VPC Subnet Ids",
+      "HelpText": "Optional.\n\nFormat: `SubnetId1,SubnetId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "457ac64f-5538-49b4-b7a2-f6ab97b5affe",
+      "Name": "AWS.Lambda.VPCSecurityGroupIds",
+      "Label": "VPC Security Group Ids",
+      "HelpText": "Optional.\n\nFormat: `SecurityGroupId1,SecurityGroupId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6ba57e09-dfea-4dcb-9372-6e9fc5d43051",
+      "Name": "AWS.Lambda.Image.Entrypoint",
+      "Label": "Entrypoint override",
+      "HelpText": "Optional for Image Package type.\n\nComma-delimited list of commands to override the Image Entrypoint.\n\nFormat: `entrypoint1, entrypoint2`\n\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f85d4334-e896-488f-aeef-bf6d66efc8a5",
+      "Name": "AWS.Lambda.Image.Command",
+      "Label": "Command override",
+      "HelpText": "Optional for Image Package type.\n\nComma-delimited list of commands to override the Image Entrypoint.\n\nFormat: `command1, command2`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "383e3565-d091-447e-828e-f6ab50d79150",
+      "Name": "AWS.Lambda.EnvironmentVariables",
+      "Label": "Environment Variables",
+      "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nEnvironment variables that are accessible from function code during execution.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "53366a6a-783e-4db9-b8af-eb5665ea805f",
+      "Name": "AWS.Lambda.EnvironmentVariablesKey",
+      "Label": "Environment Variables Encryption Key",
+      "HelpText": "Optional.\n\nThe ARN of the AWS Key Management Service (AWS KMS) key that’s used to encrypt your function’s environment variables. If it’s not provided, AWS Lambda uses a default service key.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b2c16584-9f90-4dc1-85de-539cddd6482b",
+      "Name": "AWS.Lambda.FunctionTimeout",
+      "Label": "Timeout",
+      "HelpText": "Optional.\n\nThe amount of time that Lambda allows a function to run before stopping it. The default is 3 seconds. The maximum allowed value is 900 seconds.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e67b885a-5972-458d-9d67-2b5b8860fe61",
+      "Name": "AWS.Lambda.Tags",
+      "Label": "Tags",
+      "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nA list of tags to apply to the function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bb8af54e-5f79-45c4-b150-bdf4ee377b7b",
+      "Name": "AWS.Lambda.FileSystemConfig",
+      "Label": "File System Config",
+      "HelpText": "Optional.\n\nFormat: `Arn=string,LocalMountPath=string`\n\nConnection settings for an Amazon EFS file system.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "59047de4-a921-4437-a2a2-c9e684bcf21e",
+      "Name": "AWS.Lambda.TracingConfig",
+      "Label": "Tracing Config",
+      "HelpText": "Optional.\n\nFormat: `Mode=string`\n\nSet Mode to Active to sample and trace a subset of incoming requests with AWS X-Ray.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "37a91d63-9c42-4d49-832b-dbe64d81f6da",
+      "Name": "AWS.Lambda.DeadLetterConfig",
+      "Label": "Dead Letter Config",
+      "HelpText": "Optional.\n\nFormat: `TargetArn=string`\n\nA dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see [Dead Letter Queues](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq).\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1db6270a-9138-48d8-8d34-05c39ade10a8",
+      "Name": "AWS.Lambda.Publish",
+      "Label": "Publish",
+      "HelpText": "Required.\n\nCreates a [version](https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) from the current code and configuration of a function. Use versions to create a snapshot of your function code and configuration that doesn’t change.\n\n**Important**: Lambda doesn’t publish a version if the function’s configuration and code haven’t changed since the last version. Use UpdateFunctionCode or UpdateFunctionConfiguration to update the function before publishing a version.",
+      "DefaultValue": "Yes",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2024-06-03T15:07:31.6890000Z",
+    "OctopusVersion": "2024.3.1025",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-deploy-lambda-image/scriptbody.ps1 b/src/step-templates/aws-deploy-lambda-image/scriptbody.ps1
new file mode 100644
index 000000000..637ef15c1
--- /dev/null
+++ b/src/step-templates/aws-deploy-lambda-image/scriptbody.ps1
@@ -0,0 +1,264 @@
+$ErrorActionPreference = "Stop";
+
+$functionName = $OctopusParameters["AWS.Lambda.FunctionName"] 
+$functionRole = $OctopusParameters["AWS.Lambda.FunctionRole"]
+$functionRunTime = $OctopusParameters["AWS.Lambda.Runtime"]
+$functionMemorySize = $OctopusParameters["AWS.Lambda.MemorySize"]
+$functionDescription = $OctopusParameters["AWS.Lambda.Description"]
+$functionVPCSubnetId = $OctopusParameters["AWS.Lambda.VPCSubnetIds"]
+$functionVPCSecurityGroupId = $OctopusParameters["AWS.Lambda.VPCSecurityGroupIds"]
+$functionEnvironmentVariables = $OctopusParameters["AWS.Lambda.EnvironmentVariables"]
+$functionEnvironmentVariablesKey = $OctopusParameters["AWS.Lambda.EnvironmentVariablesKey"]
+$functionTimeout = $OctopusParameters["AWS.Lambda.FunctionTimeout"]
+$functionTags = $OctopusParameters["AWS.Lambda.Tags"]
+$functionFileSystemConfig = $OctopusParameters["AWS.Lambda.FileSystemConfig"]
+$functionDeadLetterConfig = $OctopusParameters["AWS.Lambda.DeadLetterConfig"]
+$functionTracingConfig = $OctopusParameters["AWS.Lambda.TracingConfig"]
+$functionVersionNumber = $OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].PackageVersion"]
+$functionPublishOption = $OctopusParameters["AWS.Lambda.Publish"]
+
+$functionReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$functionRunbookRun = $OctopusParameters["Octopus.RunbookRun.Id"]
+$stepName = $OctopusParameters["Octopus.Step.Name"]
+
+$regionName = $OctopusParameters["AWS.Lambda.Region"]
+
+if ($null -ne $OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].Image"]) {
+    $imageUri = $OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].Image"]
+}
+
+if ([string]::IsNullOrWhiteSpace($functionName)) {
+    Write-Error "The parameter Function Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRole)) {
+    Write-Error "The parameter Role is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false) {
+    $deployVersionTag = "Octopus-Release=$functionReleaseNumber"
+}
+else {
+    $deployVersionTag = "Octopus-Runbook-Run=$functionRunbookRun"
+}
+
+Write-Host "Function Name: $functionName"
+Write-Host "Function Role: $functionRole"
+Write-Host "Function Memory Size: $functionMemorySize"
+Write-Host "Function Description: $functionDescription"
+Write-Host "Function Subnet Ids: $functionVPCSubnetId"
+Write-Host "Function Security Group Ids: $functionVPCSecurityGroupId"
+Write-Host "Function Timeout: $functionTimeout"
+Write-Host "Function Tags: $functionTags"
+Write-Host "Function File System Config: $functionFileSystemConfig"
+Write-Host "Function Dead Letter Config: $functionDeadLetterConfig"
+Write-Host "Function Tracing Config: $functionTracingConfig"
+Write-Host "Function Publish: $functionPublishOption"
+Write-Host "Function Image URI: $imageUri"
+Write-Host "Function Environment Variables: $functionEnvironmentVariables"
+Write-Host "Function Environment Variables Key: $functionEnvironmentVariablesKey"
+
+if (![string]::IsNullOrWhitespace($OctopusParameters["AWS.Lambda.Image.Entrypoint"]))
+{
+  Write-Host "Image Entrypoint override: $($OctopusParameters["AWS.Lambda.Image.Entrypoint"])"
+}
+
+if (![string]::IsNullOrWhitespace($OctopusParameters["AWS.Lambda.Image.Command"]))
+{
+  Write-Host "Image Command override: $($OctopusParameters["AWS.Lambda.Image.Command"])"
+}
+
+
+Write-Host "Attempting to find the function $functionName in the region $regionName"
+$hasExistingFunction = $true
+
+try {
+    $existingFunction = aws lambda get-function --function-name "$functionName" 2> $null
+    
+    Write-Host "The exit code from the lookup was $LASTEXITCODE"
+    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254) {
+        $hasExistingFunction = $false
+    }   
+    
+    $existingFunction = $existingFunction | ConvertFrom-Json
+}
+catch {
+    Write-Host "The function was not found"
+    $hasExistingFunction = $false
+}
+
+Write-Host "Existing functions: $hasExistingFunction"
+Write-Host $existingFunction
+
+# Init argument variable
+$lambdaArguments = @("lambda")
+$waitArguments = @("lambda", "wait")
+
+if ($hasExistingFunction -eq $false) {
+    Write-Highlight "Creating $functionName in $regionName"
+
+    $waitArguments += @("function-active-v2")
+
+    $lambdaArguments += @("create-function", "--role", $functionRole, "--memory-size", $functionMemorySize)
+
+    if ($null -ne $imageUri) {
+        Write-Host "Deploying Lambda container ..."
+        $lambdaArguments += @("--code", "ImageUri=$imageUri", "--package-type", "Image")
+      
+        if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint']) -or ![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {
+            $lambdaArguments += "--image-config"
+        
+            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint'])) {
+                $lambdaArguments += "EntryPoint=$($OctopusParameters['AWS.Lambda.Image.Entrypoint'])"
+            }
+
+            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {
+                $lambdaArguments += "Command=$($OctopusParameters['AWS.Lambda.Image.Command'])"
+            }
+        }
+    }
+}
+else {
+    Write-Highlight "Updating the $functionName code"
+
+    $waitArguments += @("function-updated")
+    $lambdaArguments += "update-function-code"
+
+    if ($null -ne $imageUri) {
+        Write-Host "Deploying Lambda container ..."
+        $lambdaArguments += @("--image-uri", $imageUri)
+    }
+}
+
+$waitArguments += @("--function-name", "$functionName")
+
+$lambdaArguments += @("--function-name", "$functionName")
+
+# Wait for function to be done creating
+Write-Host "Running aws $lambdaArguments ..."
+$functionInformation = (aws $lambdaArguments)
+(aws $waitArguments)
+
+
+if ($hasExistingFunction -eq $true) {
+    # update configuration
+    $lambdaArguments = @("lambda", "update-function-configuration", "--function-name", "$functionName", "--role", $functionRole, "--memory-size", $functionMemorySize)
+       
+    if ($null -ne $imageUri) {
+        Write-Highlight "Updating the $functionName image configuration"
+        if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint']) -or ![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {
+            $lambdaArguments += "--image-config"
+        
+            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint'])) {
+                $lambdaArguments += "EntryPoint=$($OctopusParameters['AWS.Lambda.Image.Entrypoint'])"
+            }
+
+            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {
+                $lambdaArguments += "Command=$($OctopusParameters['AWS.Lambda.Image.Command'])"
+            }
+        }
+    }
+    
+    $functionInformation = (aws $lambdaArguments)
+    Write-Highlight "Waiting for configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+$functionInformation = $functionInformation | ConvertFrom-JSON
+$functionArn = $functionInformation.FunctionArn
+
+Write-Host "Function ARN: $functionArn"
+
+if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false) {
+    Write-Highlight "Environment variables specified, updating environment variables configuration for $functionName"
+    $environmentVariables = "Variables={$functionEnvironmentVariables}"
+    
+    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true) {
+        $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables"
+    }
+    else {
+        $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables" --kms-key-arn "$functionEnvironmentVariablesKey"
+    }
+    
+    Write-Highlight "Waiting for environment variable update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false) {
+    Write-Highlight "Timeout specified, updating timeout configuration for $functionName"
+    $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --timeout "$functionTimeout"
+    
+    Write-Highlight "Waiting for timeout upate to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTags) -eq $false) {
+    Write-Highlight "Tags specified, updating tags configuration for $functionName"
+    $updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$functionTags"
+}
+
+if ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false) {
+    Write-Highlight "Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName"
+    aws lambda untag-resource --resource "$functionArn" --tag-keys "Octopus-Release" "Octopus-Runbook-Run"
+    $updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$deployVersionTag"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false) {
+    Write-Highlight "VPC subnets and security group specified, updating vpc configuration for $functionName"
+    $vpcConfig = "SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId"
+    $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --vpc-config "$vpcConfig"
+    
+    Write-Highlight "Waiting for vpc configuration to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false) {
+    Write-Highlight "Description specified, updating description configuration for $functionName"
+    $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --description "$functionDescription"
+    
+    Write-Highlight "Waiting for description configuration ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false) {
+    Write-Highlight "File System Config specified, updating file system configuration for $functionName"
+    $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --file-system-configs "$functionFileSystemConfig"	
+    
+    Write-Highlight "Wating for file system configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false) {
+    Write-Highlight "Dead Letter specified, updating dead letter configuration for $functionName"
+    $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --dead-letter-config "$functionDeadLetterConfig"	
+    
+    Write-Highlight "Waitng for Dead Letter configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false) {
+    Write-Highlight "Tracing config specified, updating tracing configuration for $functionName"
+    $updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --tracing-config "$functionTracingConfig"	
+    
+    Write-Highlight "Waiting for tracing configuration to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+Write-Host $updatedConfig | ConvertFrom-JSON
+
+if ($functionPublishOption -eq "Yes") {
+    Write-Highlight "Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS."
+    $publishedVersion = aws lambda publish-version --function-name "$functionArn" --description "$functionVersionNumber"
+    
+    $publishedVersion = $publishedVersion | ConvertFrom-JSON
+    
+    Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)"
+    Set-OctopusVariable -name "PublishedVersion" -value "$($publishedVersion.Version)"    
+}
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn"
+Set-OctopusVariable -name "LambdaArn" -value "$functionArn"
+
+Write-Highlight "AWS Lambda $functionName successfully deployed."
\ No newline at end of file
diff --git a/src/step-templates/aws-deploy-lambda/metadata.json b/src/step-templates/aws-deploy-lambda/metadata.json
new file mode 100644
index 000000000..497c8c38c
--- /dev/null
+++ b/src/step-templates/aws-deploy-lambda/metadata.json
@@ -0,0 +1,234 @@
+{
+  "Id": "9b5ee984-bdd2-49f0-a78a-07e21e60da8a",
+  "Name": "AWS - Deploy Lambda Function",
+  "Description": "Deploys a Zip file to an AWS Lambda function.  \n\nThis step does **not** perform variable substitution (it used to).  It takes the .zip file from the specified feed and uploads it to AWS as is.  The recommended approach to changing a lambda configuration per environment is to use [environment variables](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html)  \n\nThis step uses the following AWS CLI commands to deploy the AWS Lambda.  You will be required to install the AWS CLI on your server/worker for this to work.  The AWS CLI is pre-installed on the [dynamic workers](https://octopus.com/docs/infrastructure/workers/dynamic-worker-pools) in Octopus Cloud as well as the provided docker containers for [Execution Containers](https://octopus.com/docs/deployment-process/execution-containers-for-workers).\n\n- [create-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html)\n- [get-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/get-function.html)\n- [publish-version](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/publish-version.html)\n- [tag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/tag-resource.html)\n- [untag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/untag-resource.html)\n- [update-function-code](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-code.html)\n- [update-function-configuration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-configuration.html)\n\nThis step template is worker-friendly, you can pass in a package reference rather than having to reference a previous step that downloaded the package. This step requires **Octopus Deploy 2019.10.0** or higher.\n\n## Output Variables\n\nThis step template sets the following output variables:\n\n- `LambdaArn`: The ARN of the Lambda Function\n- `PublishedVersion`: The most recent version published (only set when Publish is set to `Yes`).",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 9,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "8dbae499-5aa8-438e-a2fe-ae29fb8f0a39",
+      "Name": "AWS.Lambda.Package",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "False",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "AWS.Lambda.Package"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "Octopus.Action.AwsAccount.Variable": "#{AWS.Lambda.Account}",
+    "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "bf72bc3e-3ce6-4b63-b23f-1171b5cc72dd",
+      "Name": "AWS.Lambda.FunctionName",
+      "Label": "Function Name",
+      "HelpText": "Required.\n\nThe name of the function to create or update.  See [documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html#options)\n\nExamples:\n- Function name - my-function .\n- Function ARN - arn:aws:lambda:us-west-2:123456789012:function:my-function .\n- Partial ARN - 123456789012:function:my-function .\n\nThe length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "13dcec09-00f8-4af0-80e4-23bcb47eaf17",
+      "Name": "AWS.Lambda.Account",
+      "Label": "AWS Account",
+      "HelpText": "Required.\n\nThe AWS Account with permissions to create / update AWS Lambdas.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "8fd7ff24-7557-4f96-a809-ce611c473b13",
+      "Name": "AWS.Lambda.Region",
+      "Label": "Region",
+      "HelpText": "Required.\n\nThe region where the function will live.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\naf-south-1|Africa (Cape Town)\nap-east-1|Asia Pacific (Hong Kong)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-3|Asia Pacific (Osaka-Local)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\nca-central-1|Canada (Central)\neu-central-1|Europe (Frankfurt)\neu-west-1|Europe (Ireland)\neu-west-2|Europe (London)\neu-south-1|Europe (Milan)\neu-west-3|Europe (Paris)\neu-north-1|Europe (Stockholm)\nme-south-1|Middle East (Bahrain)\nsa-east-1|South America (São Paulo)"
+      }
+    },
+    {
+      "Id": "11928ce7-e1b8-451c-9a9b-481acac60611",
+      "Name": "AWS.Lambda.Package",
+      "Label": "Package",
+      "HelpText": "Required.\n\nThe package containing the code you wish to deploy to the AWS Lambda function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "d45499b4-5f4a-4bae-a4b9-336e97a75cdc",
+      "Name": "AWS.Lambda.FunctionRole",
+      "Label": "Function Role",
+      "HelpText": "Required.\n\nThe Amazon Resource Name (ARN) of the function’s execution role.  This role must exist prior to this step is run.  See [documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-intro-execution-role.html) for more detail on creating an execution role.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "926b93c6-a47a-4899-9865-e7329b93b4b8",
+      "Name": "AWS.Lambda.Runtime",
+      "Label": "Runtime",
+      "HelpText": "Required.\n\nThe runtime of the AWS Lambda.  See [documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html#options) for more details on what runtimes are supported.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "nodejs|nodejs\nnodejs4.3|nodejs4.3\nnodejs4.3-edge|nodejs4.3-edge\nnodejs6.10|nodejs6.10\nnodejs8.10|nodejs8.10\nnodejs10.x|nodejs10.x\nnodejs12.x|nodejs12.x\nnodejs14.x|nodejs14.x\njava8|java8\njava8.al2|java8.al2\njava11|java11\npython2.7|python2.7\npython3.6|python3.6\npython3.7|python3.7\npython3.8|python3.8\npython3.9|python3.9\ndotnet6|dotnet6\ndotnet8|dotnet8\nnodejs4.3-edge|nodejs4.3-edge\ngo1.x|go1.x\nruby2.5|ruby2.5\nruby2.7|ruby2.7\nprovided|provided\nprovided.al2|provided.al2"
+      }
+    },
+    {
+      "Id": "1b8bfb82-3736-4d9a-8b05-a39319eb5735",
+      "Name": "AWS.Lambda.FunctionHandler",
+      "Label": "Handler",
+      "HelpText": "Required.\n\nThe name of the method within your code that Lambda calls to execute your function. The format includes the file name. It can also include namespaces and other qualifiers, depending on the runtime. For more information, see [Programming Model](https://docs.aws.amazon.com/lambda/latest/dg/gettingstarted-features.html)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "68428e8e-abc3-4f29-a5bb-fe635281d073",
+      "Name": "AWS.Lambda.MemorySize",
+      "Label": "Memory Size",
+      "HelpText": "Required.\n\nThe amount of memory that your function has access to. Increasing the function’s memory also increases its CPU allocation. The default value is 128 MB. The value must be a multiple of 64 MB.",
+      "DefaultValue": "128",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "948280bb-50af-495b-9d1d-2f7567a0b0cc",
+      "Name": "AWS.Lambda.Description",
+      "Label": "Description",
+      "HelpText": "Optional.\n\nA description of the function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ed2ab9bb-d8a3-4ab4-a576-36b6c0a8f75d",
+      "Name": "AWS.Lambda.VPCSubnetIds",
+      "Label": "VPC Subnet Ids",
+      "HelpText": "Optional.\n\nFormat: `SubnetId1,SubnetId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8c2793a7-1a88-40a2-be28-3a38c7b40658",
+      "Name": "AWS.Lambda.VPCSecurityGroupIds",
+      "Label": "VPC Security Group Ids",
+      "HelpText": "Optional.\n\nFormat: `SecurityGroupId1,SecurityGroupId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ba3edded-1e19-47c4-990a-ebdf4eb0bcca",
+      "Name": "AWS.Lambda.EnvironmentVariables",
+      "Label": "Environment Variables",
+      "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nEnvironment variables that are accessible from function code during execution.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "58d76440-e4f5-46fb-a095-84aedd904a18",
+      "Name": "AWS.Lambda.EnvironmentVariablesKey",
+      "Label": "Environment Variables Encryption Key",
+      "HelpText": "Optional.\n\nThe ARN of the AWS Key Management Service (AWS KMS) key that’s used to encrypt your function’s environment variables. If it’s not provided, AWS Lambda uses a default service key.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5b9b3111-5349-49e6-ab0d-f386a53bdd7c",
+      "Name": "AWS.Lambda.FunctionTimeout",
+      "Label": "Timeout",
+      "HelpText": "Optional.\n\nThe amount of time that Lambda allows a function to run before stopping it. The default is 3 seconds. The maximum allowed value is 900 seconds.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "567f5eeb-e174-4c8f-8b17-36bd9457ea29",
+      "Name": "AWS.Lambda.Tags",
+      "Label": "Tags",
+      "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nA list of tags to apply to the function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "297f4f8e-3837-43a3-b844-a0e0d02e9d5b",
+      "Name": "AWS.Lambda.FileSystemConfig",
+      "Label": "File System Config",
+      "HelpText": "Optional.\n\nFormat: `Arn=string,LocalMountPath=string`\n\nConnection settings for an Amazon EFS file system.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c720a63a-7b77-4a13-b6ed-6d44126e9372",
+      "Name": "AWS.Lambda.TracingConfig",
+      "Label": "Tracing Config",
+      "HelpText": "Optional.\n\nFormat: `Mode=string`\n\nSet Mode to Active to sample and trace a subset of incoming requests with AWS X-Ray.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "92fd8a1f-e681-4e1c-b382-3df1de12194e",
+      "Name": "AWS.Lambda.DeadLetterConfig",
+      "Label": "Dead Letter Config",
+      "HelpText": "Optional.\n\nFormat: `TargetArn=string`\n\nA dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see [Dead Letter Queues](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq).\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "67f8da1a-08f1-4cde-a60f-238d1fb08c98",
+      "Name": "AWS.Lambda.Publish",
+      "Label": "Publish",
+      "HelpText": "Required.\n\nCreates a [version](https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) from the current code and configuration of a function. Use versions to create a snapshot of your function code and configuration that doesn’t change.\n\n**Important**: Lambda doesn’t publish a version if the function’s configuration and code haven’t changed since the last version. Use UpdateFunctionCode or UpdateFunctionConfiguration to update the function before publishing a version.",
+      "DefaultValue": "Yes",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-07T22:51:56.4570000Z",
+    "OctopusVersion": "2025.3.13248",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-deploy-lambda/scriptbody.ps1 b/src/step-templates/aws-deploy-lambda/scriptbody.ps1
new file mode 100644
index 000000000..32c158048
--- /dev/null
+++ b/src/step-templates/aws-deploy-lambda/scriptbody.ps1
@@ -0,0 +1,235 @@
+$functionName = $OctopusParameters["AWS.Lambda.FunctionName"] 
+$functionRole = $OctopusParameters["AWS.Lambda.FunctionRole"]
+$functionRunTime = $OctopusParameters["AWS.Lambda.Runtime"]
+$functionHandler = $OctopusParameters["AWS.Lambda.FunctionHandler"]
+$functionMemorySize = $OctopusParameters["AWS.Lambda.MemorySize"]
+$functionDescription = $OctopusParameters["AWS.Lambda.Description"]
+$functionVPCSubnetId = $OctopusParameters["AWS.Lambda.VPCSubnetIds"]
+$functionVPCSecurityGroupId = $OctopusParameters["AWS.Lambda.VPCSecurityGroupIds"]
+$functionEnvironmentVariables = $OctopusParameters["AWS.Lambda.EnvironmentVariables"]
+$functionEnvironmentVariablesKey = $OctopusParameters["AWS.Lambda.EnvironmentVariablesKey"]
+$functionTimeout = $OctopusParameters["AWS.Lambda.FunctionTimeout"]
+$functionTags = $OctopusParameters["AWS.Lambda.Tags"]
+$functionFileSystemConfig = $OctopusParameters["AWS.Lambda.FileSystemConfig"]
+$functionDeadLetterConfig = $OctopusParameters["AWS.Lambda.DeadLetterConfig"]
+$functionTracingConfig = $OctopusParameters["AWS.Lambda.TracingConfig"]
+$functionVersionNumber = $OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].PackageVersion"]
+$functionPublishOption = $OctopusParameters["AWS.Lambda.Publish"]
+
+$functionReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$functionRunbookRun = $OctopusParameters["Octopus.RunbookRun.Id"]
+$stepName = $OctopusParameters["Octopus.Step.Name"]
+
+$regionName = $OctopusParameters["AWS.Lambda.Region"]
+$newArchiveFileName = $OctopusParameters["Octopus.Action.Package[AWS.Lambda.Package].PackageFilePath"]
+
+if ([string]::IsNullOrWhiteSpace($functionName))
+{
+	Write-Error "The parameter Function Name is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRole))
+{
+	Write-Error "The parameter Role is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionRunTime))
+{
+	Write-Error "The parameter Run Time is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionHandler))
+{
+	Write-Error "The parameter Handler is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionPublishOption))
+{
+	Write-Error "The parameter Publish is required."
+    Exit 1
+}
+
+if ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false)
+{
+    $deployVersionTag = "Octopus-Release=$functionReleaseNumber"
+}
+else
+{
+	$deployVersionTag = "Octopus-Runbook-Run=$functionRunbookRun"
+}
+
+Write-Host "Function Name: $functionName"
+Write-Host "Function Role: $functionRole"
+Write-Host "Function Runtime: $functionRunTime"
+Write-Host "Function Handler: $functionHandler"
+Write-Host "Function Memory Size: $functionMemorySize"
+Write-Host "Function Description: $functionDescription"
+Write-Host "Function Subnet Ids: $functionVPCSubnetId"
+Write-Host "Function Security Group Ids: $functionVPCSecurityGroupId"
+Write-Host "Function Environment Variables: $functionEnvironmentVariables"
+Write-Host "Function Environment Variables Key: $functionEnvironmentVariablesKey"
+Write-Host "Function Timeout: $functionTimeout"
+Write-Host "Function Tags: $functionTags"
+Write-Host "Function File System Config: $functionFileSystemConfig"
+Write-Host "Function Dead Letter Config: $functionDeadLetterConfig"
+Write-Host "Function Tracing Config: $functionTracingConfig"
+Write-Host "Function file path: fileb://$newArchiveFileName"
+Write-Host "Function Publish: $functionPublishOption"
+
+Write-Host "Attempting to find the function $functionName in the region $regionName"
+$hasExistingFunction = $true
+
+try
+{
+    $existingFunction = aws lambda get-function --function-name "$functionName" 2> $null
+    
+    Write-Host "The exit code from the lookup was $LASTEXITCODE"
+    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)
+    {
+    	$hasExistingFunction = $false
+    }   
+    
+    $existingFunction = $existingFunction | ConvertFrom-Json
+}
+catch
+{
+	Write-Host "The function was not found"
+	$hasExistingFunction = $false
+}
+
+Write-Host "Existing functions: $hasExistingFunction"
+Write-Host $existingFunction
+
+$aliasInformation = $null
+if ($hasExistingFunction -eq $false)
+{
+	Write-Highlight "Creating $functionName in $regionName"    
+	$functionInformation = aws lambda create-function --function-name "$functionName" --zip-file fileb://$newArchiveFileName --handler $functionHandler --runtime $functionRuntime --role $functionRole --memory-size $functionMemorySize
+}
+else
+{
+	Write-Highlight "Updating the $functionName code"
+    $updatedConfig = aws lambda update-function-code --function-name "$functionName" --zip-file fileb://$newArchiveFileName
+    
+    Write-Highlight "Waiting for update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+    
+    Write-Highlight "Updating the $functionName base configuration"    
+    $functionInformation = aws lambda update-function-configuration --function-name "$functionName" --role $functionRole --handler $functionHandler --runtime $functionRuntime --memory-size $functionMemorySize
+    
+    Write-Highlight "Waiting for base configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+$functionInformation = $functionInformation | ConvertFrom-JSON
+$functionArn = $functionInformation.FunctionArn
+
+Write-Host "Function ARN: $functionArn"
+
+if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false)
+{
+	Write-Highlight "Environment variables specified, updating environment variables configuration for $functionName"
+	$environmentVariables = "Variables={$functionEnvironmentVariables}"
+    
+    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true)
+    {
+    	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables"
+    }
+    else
+    {
+    	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --environment "$environmentVariables" --kms-key-arn "$functionEnvironmentVariablesKey"
+    }
+    
+    Write-Highlight "Waiting for environment variable update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false)
+{
+	Write-Highlight "Timeout specified, updating timeout configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --timeout "$functionTimeout"
+    
+    Write-Highlight "Waiting for timeout upate to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTags) -eq $false)
+{
+	Write-Highlight "Tags specified, updating tags configuration for $functionName"
+	$updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$functionTags"
+}
+
+if ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false)
+{
+	Write-Highlight "Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName"
+    aws lambda untag-resource --resource "$functionArn" --tag-keys "Octopus-Release" "Octopus-Runbook-Run"
+	$updatedConfig = aws lambda tag-resource --resource "$functionArn" --tags "$deployVersionTag"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false)
+{
+	Write-Highlight "VPC subnets and security group specified, updating vpc configuration for $functionName"
+	$vpcConfig = "SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --vpc-config "$vpcConfig"
+    
+    Write-Highlight "Waiting for vpc configuration to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false)
+{
+	Write-Highlight "Description specified, updating description configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --description "$functionDescription"
+    
+    Write-Highlight "Waiting for description configuration ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false)
+{
+	Write-Highlight "File System Config specified, updating file system configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --file-system-configs "$functionFileSystemConfig"	
+    
+    Write-Highlight "Wating for file system configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false)
+{
+	Write-Highlight "Dead Letter specified, updating dead letter configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --dead-letter-config "$functionDeadLetterConfig"	
+    
+    Write-Highlight "Waitng for Dead Letter configuration update to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+if ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false)
+{
+	Write-Highlight "Tracing config specified, updating tracing configuration for $functionName"
+	$updatedConfig = aws lambda update-function-configuration --function-name "$functionArn" --tracing-config "$functionTracingConfig"	
+    
+    Write-Highlight "Waiting for tracing configuration to complete ..."
+    aws lambda wait function-updated --function-name "$functionName"
+}
+
+Write-Host $updatedConfig | ConvertFrom-JSON
+
+if ($functionPublishOption -eq "Yes")
+{
+	Write-Highlight "Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS."
+	$publishedVersion = aws lambda publish-version --function-name "$functionArn" --description "$functionVersionNumber"
+    
+    $publishedVersion = $publishedVersion | ConvertFrom-JSON
+    
+    Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)"
+    Set-OctopusVariable -name "PublishedVersion" -value "$($publishedVersion.Version)"    
+}
+
+Write-Highlight "Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn"
+Set-OctopusVariable -name "LambdaArn" -value "$functionArn"
+
+Write-Highlight "AWS Lambda $functionName successfully deployed."
\ No newline at end of file
diff --git a/src/step-templates/aws-deregister-elb-instance/metadata.json b/src/step-templates/aws-deregister-elb-instance/metadata.json
new file mode 100644
index 000000000..bb6b18b6a
--- /dev/null
+++ b/src/step-templates/aws-deregister-elb-instance/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "bcb05502-ae9a-48a0-a153-1cb3057efb61",
+  "Name": "AWS - Deregister ELB Instance",
+  "Description": "Removes the current instance from the ELB",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ec2ClientId",
+      "Label": "AWS EC2 Client Id",
+      "HelpText": "The client id used to authenticate with AWS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "ec2Credentials",
+      "Label": "AWS EC2 Client Secret",
+      "HelpText": "The client secret used to authenticate with AWS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "elbName",
+      "Label": "AWS ELB Name",
+      "HelpText": "The name of the AWS ELB to remove the instance from",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ec2Region",
+      "Label": "AWS EC2 Region",
+      "HelpText": "The region in which the ELB lives",
+      "DefaultValue": "us-east-1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-04-30T06:24:08.2100000-07:00",
+  "LastModifiedBy": "DudeSolutions",
+  "$Meta": {
+    "ExportedAt": "2015-04-30T06:24:16.9210000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-deregister-elb-instance/scriptbody.ps1 b/src/step-templates/aws-deregister-elb-instance/scriptbody.ps1
new file mode 100644
index 000000000..93a07058e
--- /dev/null
+++ b/src/step-templates/aws-deregister-elb-instance/scriptbody.ps1
@@ -0,0 +1,57 @@
+# Part 1 of 2
+# Part 1 Deregisters an EC2 instance from an ELB
+# Part 2 Registers an EC2 instance with an ELB and waits for it to be InService
+
+$ec2Region = $OctopusParameters['ec2Region']
+$ec2User = $OctopusParameters['ec2ClientId']
+$ec2Credentials = $OctopusParameters['ec2Credentials']
+$elbName = $OctopusParameters['elbName']
+$instanceId = ""
+
+# Load EC2 credentials (not sure if this is needed when executed from an EC2 box)
+try
+{
+	Write-Host "Loading AWS Credentials..."
+	Import-Module AWSPowerShell
+	Set-AWSCredentials -AccessKey $ec2User -SecretKey $ec2Credentials
+	Set-DefaultAWSRegion $ec2Region
+	Write-Host "AWS Credentials Loaded."
+}
+catch
+{
+	Write-Error -Message "Failed to load AWS Credentials." -Exception $_.Exception
+	Exit 1
+}
+
+# Get EC2 Instance
+try
+{
+	$response = Invoke-RestMethod -Uri "http://169.254.169.254/latest/meta-data/instance-id" -Method Get
+	if ($response)
+	{
+		$instanceId = $response
+	}
+	else
+	{
+		Write-Error -Message "Returned Instance ID does not appear to be valid"
+		Exit 1
+	}
+}
+catch
+{
+	Write-Error -Message "Failed to load instance ID from AWS." -Exception $_.Exception
+	Exit 1
+}
+
+# Deregister the current EC2 instance
+Write-Host "Deregistering instance $instanceId from $elbName"
+try
+{
+	Remove-ELBInstanceFromLoadBalancer -LoadBalancerName $elbName -Instance $instanceId -Force
+	Write-Host "Instance deregistered"
+}
+catch
+{
+	Write-Error -Message "Failed to deregister instance." -Exception $_.Exception
+	Exit 1
+}
\ No newline at end of file
diff --git a/step-templates/aws-ec2-get-public-hostname.json b/src/step-templates/aws-ec2-get-public-hostname/metadata.json
similarity index 69%
rename from step-templates/aws-ec2-get-public-hostname.json
rename to src/step-templates/aws-ec2-get-public-hostname/metadata.json
index a34cab121..9cd4ee83a 100644
--- a/step-templates/aws-ec2-get-public-hostname.json
+++ b/src/step-templates/aws-ec2-get-public-hostname/metadata.json
@@ -9,16 +9,16 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$downloader = new-object System.Net.WebClient\r\n$hostname = $downloader.DownloadString(\"http://instance-data/latest/meta-data/public-hostname\")\r\nSet-OctopusVariable -name \"Hostname\" -value $hostname\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
   },
   "Parameters": [],
-  "LastModifiedOn": "2017-02-23T19:37:06.120+00:00",
+  "LastModifiedOn": "2017-02-23T11:37:06.1200000-08:00",
   "LastModifiedBy": "natelowry",
   "$Meta": {
-    "ExportedAt": "2017-02-23T19:32:18.146Z",
+    "ExportedAt": "2017-02-23T19:32:18.1460000Z",
     "OctopusVersion": "3.8.2",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-ec2-get-public-hostname/scriptbody.ps1 b/src/step-templates/aws-ec2-get-public-hostname/scriptbody.ps1
new file mode 100644
index 000000000..88513ef0f
--- /dev/null
+++ b/src/step-templates/aws-ec2-get-public-hostname/scriptbody.ps1
@@ -0,0 +1,3 @@
+$downloader = new-object System.Net.WebClient
+$hostname = $downloader.DownloadString("http://instance-data/latest/meta-data/public-hostname")
+Set-OctopusVariable -name "Hostname" -value $hostname
diff --git a/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy.json b/src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/metadata.json
similarity index 54%
rename from step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy.json
rename to src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/metadata.json
index a237c2540..de87899d2 100644
--- a/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy.json
+++ b/src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$env:Path += \";C:\\Program Files (x86)\\AWS Tools\\Deployment Tool\\;C:\\Program Files (x86)\\IIS\\Microsoft Web Deploy V3\\\"\r\n$AwsDeployConfigFileName = \"aws-deploy.config\"\r\n$AwsDeployConfigFile = Join-Path $BuildDirectory $AwsDeployConfigFileName\r\n$MSDeployParamsFile = Join-Path $BuildDirectory $MSDeployParamsFilePath\r\n$DeployArchive = Join-Path $MSDeployOutputDirectory.trim().replace(\" \", \"_\") \"deploy.zip\"\r\n\r\nif (!(Test-Path $AwsDeployConfigFile))\r\n{\r\n    # Create an empty, dummy file (not used, awsdeploy params used instead)\r\n    New-Item -path $BuildDirectory -name $AwsDeployConfigFileName -type \"file\"\r\n}\r\n\r\nif (Test-Path $DeployArchive)\r\n{\r\n    # Delete deploy archive if it exists\r\n    Remove-Item $DeployArchive\r\n}\r\n\r\n$EscapedBuildDirectory = $BuildDirectory -replace \"\\\\\",\"\\\\\"\r\n$EscapedBuildDirectory = $EscapedBuildDirectory -replace \"\\.\",\"\\.\"\r\n$MSDeployParamsContent = (Get-Content $MSDeployParamsFile)\r\n$MSDeployParamsContent = $MSDeployParamsContent -replace \"{BUILD_DIRECTORY}\",$EscapedBuildDirectory\r\nSet-Content $MSDeployParamsFile $MSDeployParamsContent\r\n\r\nWrite-Host \"Creating WebDeploy package file $DeployArchive with the contents of directory $BuildDirectory\"\r\nmsdeploy.exe -verb:sync `\r\n    -source:iisApp=\"$BuildDirectory\" `\r\n    -dest:package=\"$DeployArchive\" `\r\n    -declareParamFile=\"$MSDeployParamsFile\"\r\n\r\nWrite-Host \"Starting AWSdeploy\"\r\nawsdeploy -r -v `\r\n    \"-DAWSProfileName=$($ProfileName)\" `\r\n    \"-DApplication.Name=$($ApplicationName)\" `\r\n    \"-DEnvironment.Name=$($EnvironmentName)\" `\r\n    \"-DRegion=$($Region)\" `\r\n    \"-DUploadBucket=$($UploadBucket)\" `\r\n    \"-DAWSAccessKey=$($AccessKey)\" `\r\n    \"-DAWSSecretKey=$($SecretKey)\" `\r\n    \"-DTemplate=ElasticBeanstalk\" `\r\n    \"-DDeploymentPackage=$($DeployArchive)\" `\r\n    \"$AwsDeployConfigFile\"\r\n\r\n# Sleep to give time to the deployment process to start\r\nStart-Sleep -Seconds 5\r\n\r\n$i = 0\r\n$isReady = $FALSE\r\n# Wait no more than 10 minutes for the deployment to finish (or 120 sleeps of 5 seconds)\r\nwhile ((!$isReady) -and ($i -lt 120)) {\r\n    $i++\r\n    $ebHealth = Get-EBEnvironment -AccessKey \"$AccessKey\" -SecretKey \"$SecretKey\" -Region \"$Region\" -EnvironmentName \"$EnvironmentName\"\r\n\r\n    if ($ebHealth.Status -eq \"Ready\") {\r\n        Write-Host \"Deployment successful.\"\r\n        $isReady=$TRUE;\r\n    } else {\r\n        Write-Host \"Deployment status: $($ebHealth.Status)\"\r\n    }\r\n    Start-Sleep -Seconds 5\r\n}\r\n\r\nif (!$isReady) {\r\n    Write-Host \"Deployment failed. Please check your AWS console.\"\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.NuGetFeedId": null,
     "Octopus.Action.Package.NuGetPackageId": null
@@ -106,7 +106,7 @@
   ],
   "LastModifiedBy": "dovetail-technologies",
   "$Meta": {
-    "ExportedAt": "2017-01-05T09:21:06.133Z",
+    "ExportedAt": "2017-01-05T09:21:06.1330000Z",
     "OctopusVersion": "3.3.15",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/scriptbody.ps1 b/src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/scriptbody.ps1
new file mode 100644
index 000000000..37821e210
--- /dev/null
+++ b/src/step-templates/aws-elastic-beanstalk-dotnet-webapp-deploy/scriptbody.ps1
@@ -0,0 +1,65 @@
+$env:Path += ";C:\Program Files (x86)\AWS Tools\Deployment Tool\;C:\Program Files (x86)\IIS\Microsoft Web Deploy V3\"
+$AwsDeployConfigFileName = "aws-deploy.config"
+$AwsDeployConfigFile = Join-Path $BuildDirectory $AwsDeployConfigFileName
+$MSDeployParamsFile = Join-Path $BuildDirectory $MSDeployParamsFilePath
+$DeployArchive = Join-Path $MSDeployOutputDirectory.trim().replace(" ", "_") "deploy.zip"
+
+if (!(Test-Path $AwsDeployConfigFile))
+{
+    # Create an empty, dummy file (not used, awsdeploy params used instead)
+    New-Item -path $BuildDirectory -name $AwsDeployConfigFileName -type "file"
+}
+
+if (Test-Path $DeployArchive)
+{
+    # Delete deploy archive if it exists
+    Remove-Item $DeployArchive
+}
+
+$EscapedBuildDirectory = $BuildDirectory -replace "\\","\\"
+$EscapedBuildDirectory = $EscapedBuildDirectory -replace "\.","\."
+$MSDeployParamsContent = (Get-Content $MSDeployParamsFile)
+$MSDeployParamsContent = $MSDeployParamsContent -replace "{BUILD_DIRECTORY}",$EscapedBuildDirectory
+Set-Content $MSDeployParamsFile $MSDeployParamsContent
+
+Write-Host "Creating WebDeploy package file $DeployArchive with the contents of directory $BuildDirectory"
+msdeploy.exe -verb:sync `
+    -source:iisApp="$BuildDirectory" `
+    -dest:package="$DeployArchive" `
+    -declareParamFile="$MSDeployParamsFile"
+
+Write-Host "Starting AWSdeploy"
+awsdeploy -r -v `
+    "-DAWSProfileName=$($ProfileName)" `
+    "-DApplication.Name=$($ApplicationName)" `
+    "-DEnvironment.Name=$($EnvironmentName)" `
+    "-DRegion=$($Region)" `
+    "-DUploadBucket=$($UploadBucket)" `
+    "-DAWSAccessKey=$($AccessKey)" `
+    "-DAWSSecretKey=$($SecretKey)" `
+    "-DTemplate=ElasticBeanstalk" `
+    "-DDeploymentPackage=$($DeployArchive)" `
+    "$AwsDeployConfigFile"
+
+# Sleep to give time to the deployment process to start
+Start-Sleep -Seconds 5
+
+$i = 0
+$isReady = $FALSE
+# Wait no more than 10 minutes for the deployment to finish (or 120 sleeps of 5 seconds)
+while ((!$isReady) -and ($i -lt 120)) {
+    $i++
+    $ebHealth = Get-EBEnvironment -AccessKey "$AccessKey" -SecretKey "$SecretKey" -Region "$Region" -EnvironmentName "$EnvironmentName"
+
+    if ($ebHealth.Status -eq "Ready") {
+        Write-Host "Deployment successful."
+        $isReady=$TRUE;
+    } else {
+        Write-Host "Deployment status: $($ebHealth.Status)"
+    }
+    Start-Sleep -Seconds 5
+}
+
+if (!$isReady) {
+    Write-Host "Deployment failed. Please check your AWS console."
+}
\ No newline at end of file
diff --git a/step-templates/aws-execute-powershell.json b/src/step-templates/aws-execute-powershell/metadata.json
similarity index 57%
rename from step-templates/aws-execute-powershell.json
rename to src/step-templates/aws-execute-powershell/metadata.json
index 17abf3660..f0ba09a28 100644
--- a/step-templates/aws-execute-powershell.json
+++ b/src/step-templates/aws-execute-powershell/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 8,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Write-Output \"Ensuring the Chocolatey package manager is installed...\"\n\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\n$chocolateyExe = \"$chocolateyBin\\choco.exe\"\n$chocInstalled = Test-Path $chocolateyExe\n\nif (-not $chocInstalled) {\n  Write-Output \"Chocolatey not found, installing...\"\n\n  $installPs1 = ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))\n  Invoke-Expression $installPs1\n\n  Write-Output \"Chocolatey installation complete.\"\n} else {\n  Write-Output \"Chocolatey was found at $chocolateyBin and won't be reinstalled.\"\n}\n\n$ChocolateyPackageId = 'awstools.powershell'\n\nif (-not $ChocolateyPackageId) {\n  throw \"Please specify the ID of an application package to install.\"\n}\n\nif (-not $ChocolateyPackageVersion) {\n  Write-Output \"Installing package $ChocolateyPackageId from the Chocolatey package repository...\"\n  & $chocolateyExe install $ChocolateyPackageId\n} else {\n  Write-Output \"Installing package $ChocolateyPackageId version $ChocolateyPackageVersion from the Chocolatey package repository...\"\n  & $chocolateyExe install $ChocolateyPackageId --version $ChocolateyPackageVersion\n}\n\nImport-Module \"C:\\Program Files (x86)\\AWS Tools\\PowerShell\\AWSPowerShell\\AWSPowerShell.psd1\"\n\nSet-AWSCredentials -AccessKey $AccessKey -SecretKey $SecretKey -StoreAs AWSKeyProfile\n\nInitialize-AWSDefaults -ProfileName AWSKeyProfile -Region $Region\n\n\nInvoke-Expression $AWSScript",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -47,10 +47,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2023-06-05T12:27:05.077+00:00",
+  "LastModifiedOn": "2023-06-05T05:27:05.0770000-07:00",
   "LastModifiedBy": "pauby",
   "$Meta": {
-    "ExportedAt": "2023-06-05T12:27:05.077+00:00",
+    "ExportedAt": "2023-06-05T05:27:05.0770000-07:00",
     "OctopusVersion": "2.5.8.447",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-execute-powershell/scriptbody.ps1 b/src/step-templates/aws-execute-powershell/scriptbody.ps1
new file mode 100644
index 000000000..aab2e2f73
--- /dev/null
+++ b/src/step-templates/aws-execute-powershell/scriptbody.ps1
@@ -0,0 +1,39 @@
+Write-Output "Ensuring the Chocolatey package manager is installed..."
+
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+$chocolateyExe = "$chocolateyBin\choco.exe"
+$chocInstalled = Test-Path $chocolateyExe
+
+if (-not $chocInstalled) {
+  Write-Output "Chocolatey not found, installing..."
+
+  $installPs1 = ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
+  Invoke-Expression $installPs1
+
+  Write-Output "Chocolatey installation complete."
+} else {
+  Write-Output "Chocolatey was found at $chocolateyBin and won't be reinstalled."
+}
+
+$ChocolateyPackageId = 'awstools.powershell'
+
+if (-not $ChocolateyPackageId) {
+  throw "Please specify the ID of an application package to install."
+}
+
+if (-not $ChocolateyPackageVersion) {
+  Write-Output "Installing package $ChocolateyPackageId from the Chocolatey package repository..."
+  & $chocolateyExe install $ChocolateyPackageId
+} else {
+  Write-Output "Installing package $ChocolateyPackageId version $ChocolateyPackageVersion from the Chocolatey package repository..."
+  & $chocolateyExe install $ChocolateyPackageId --version $ChocolateyPackageVersion
+}
+
+Import-Module "C:\Program Files (x86)\AWS Tools\PowerShell\AWSPowerShell\AWSPowerShell.psd1"
+
+Set-AWSCredentials -AccessKey $AccessKey -SecretKey $SecretKey -StoreAs AWSKeyProfile
+
+Initialize-AWSDefaults -ProfileName AWSKeyProfile -Region $Region
+
+
+Invoke-Expression $AWSScript
\ No newline at end of file
diff --git a/step-templates/aws-find-blue-green-asg.json b/src/step-templates/aws-find-blue-green-asg/metadata.json
similarity index 69%
rename from step-templates/aws-find-blue-green-asg.json
rename to src/step-templates/aws-find-blue-green-asg/metadata.json
index be78d07e9..ba01d1a20 100644
--- a/step-templates/aws-find-blue-green-asg.json
+++ b/src/step-templates/aws-find-blue-green-asg/metadata.json
@@ -14,7 +14,7 @@
     "Octopus.Action.Aws.AssumeRole": "False",
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
-    "Octopus.Action.Script.ScriptBody": "#!/bin/bash\n\nINACTIVECOLOR=${1:-'#{AWSBlueGreen.InactiveColor | Trim}'}\nGREENASG=${2:-'#{AWSBlueGreen.AWS.GreenASG | Trim}'}\nBLUEASG=${3:-'#{AWSBlueGreen.AWS.BlueASG | Trim}'}\n\nechoerror() { echo \"$@\" 1>&2; }\n\nif [[ -z \"${INACTIVECOLOR}\" ]]\nthen\n  echoerror \"Please provide the color of the inactive Auto Scaling group (Green or Blue) as the first argument\"\n  exit 1\nfi\n\nif [[ -z \"${GREENASG}\" ]]\nthen\n  echoerror \"Please provide the name of the Green Auto Scaling group as the second argument\"\n  exit 1\nfi\n\nif [[ -z \"${BLUEASG}\" ]]\nthen\n  echoerror \"Please provide the name of the Blue Auto Scaling group as the third argument\"\n  exit 1\nfi\n\nif [[ \"${INACTIVECOLOR^^}\" == \"GREEN\" ]]\nthen\n  set_octopusvariable \"ActiveGroup\" \"${BLUEASG}\"\n  set_octopusvariable \"InactiveGroup\" \"${GREENASG}\"\n  echo \"Active group is Blue (${BLUEASG}), inactive group is Green (${GREENASG})\"\nelse\n  set_octopusvariable \"ActiveGroup\" \"${GREENASG}\"\n    set_octopusvariable \"InactiveGroup\" \"${BLUEASG}\"\n    echo \"Active group is Green (${GREENASG}), inactive group is Blue (${BLUEASG})\"\nfi",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
     "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}"
   },
   "Parameters": [
@@ -71,7 +71,7 @@
   ],
   "StepPackageId": "Octopus.AwsRunScript",
   "$Meta": {
-    "ExportedAt": "2025-01-10T03:42:14.665Z",
+    "ExportedAt": "2025-01-10T03:42:14.6650000Z",
     "OctopusVersion": "2025.1.5319",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-find-blue-green-asg/scriptbody.sh b/src/step-templates/aws-find-blue-green-asg/scriptbody.sh
new file mode 100644
index 000000000..7126c27bb
--- /dev/null
+++ b/src/step-templates/aws-find-blue-green-asg/scriptbody.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+INACTIVECOLOR=${1:-'#{AWSBlueGreen.InactiveColor | Trim}'}
+GREENASG=${2:-'#{AWSBlueGreen.AWS.GreenASG | Trim}'}
+BLUEASG=${3:-'#{AWSBlueGreen.AWS.BlueASG | Trim}'}
+
+echoerror() { echo "$@" 1>&2; }
+
+if [[ -z "${INACTIVECOLOR}" ]]
+then
+  echoerror "Please provide the color of the inactive Auto Scaling group (Green or Blue) as the first argument"
+  exit 1
+fi
+
+if [[ -z "${GREENASG}" ]]
+then
+  echoerror "Please provide the name of the Green Auto Scaling group as the second argument"
+  exit 1
+fi
+
+if [[ -z "${BLUEASG}" ]]
+then
+  echoerror "Please provide the name of the Blue Auto Scaling group as the third argument"
+  exit 1
+fi
+
+if [[ "${INACTIVECOLOR^^}" == "GREEN" ]]
+then
+  set_octopusvariable "ActiveGroup" "${BLUEASG}"
+  set_octopusvariable "InactiveGroup" "${GREENASG}"
+  echo "Active group is Blue (${BLUEASG}), inactive group is Green (${GREENASG})"
+else
+  set_octopusvariable "ActiveGroup" "${GREENASG}"
+    set_octopusvariable "InactiveGroup" "${BLUEASG}"
+    echo "Active group is Green (${GREENASG}), inactive group is Blue (${BLUEASG})"
+fi
\ No newline at end of file
diff --git a/src/step-templates/aws-find-blue-green-target-group/metadata.json b/src/step-templates/aws-find-blue-green-target-group/metadata.json
new file mode 100644
index 000000000..2f97df0b4
--- /dev/null
+++ b/src/step-templates/aws-find-blue-green-target-group/metadata.json
@@ -0,0 +1,90 @@
+{
+  "Id": "2f5f8b7b-5deb-45a9-966b-bf52c6e7976c",
+  "Name": "AWS - Find Blue-Green Target Group",
+  "Description": "Find the online and offline target groups for a blue-green deployment",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
+    "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "29cdfb7d-47fa-4c8a-837b-c58bb0d90c26",
+      "Name": "AWSBlueGreen.AWS.Region",
+      "Label": "Region",
+      "HelpText": "The AWS region. See https://aws.amazon.com/about-aws/global-infrastructure/regions_az/ for more information.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "58a1ebcd-fd13-48e2-b8b9-fdfe4df8c35e",
+      "Name": "AWSBlueGreen.AWS.Account",
+      "Label": "Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "80642a7b-ef3e-4db4-b969-d0148a1baa90",
+      "Name": "AWSBlueGreen.AWS.ListenerARN",
+      "Label": "Listener ARN",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2cf29ab4-61a1-4a80-942f-6f1dd035f634",
+      "Name": "AWSBlueGreen.AWS.BlueTargetGroup",
+      "Label": "Blue Target Group ARN",
+      "HelpText": "The ARN of the blue target group. See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-target-groups.html for more details.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b7d105c6-1640-48c4-9f01-ad9ece8d3588",
+      "Name": "AWSBlueGreen.AWS.GreenTargetGroup",
+      "Label": "Green Target Group ARN",
+      "HelpText": "The ARN of the green target group. See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-target-groups.html for more details.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ff055e9f-f223-453a-9a1f-a0238e6cdfd6",
+      "Name": "AWSBlueGreen.AWS.RuleArn",
+      "Label": "Rule ARN",
+      "HelpText": "The ARN of the listener rule to update. See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/listener-update-rules.html for more information.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2025-01-10T03:41:11.7800000Z",
+    "OctopusVersion": "2025.1.5319",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-find-blue-green-target-group/scriptbody.sh b/src/step-templates/aws-find-blue-green-target-group/scriptbody.sh
new file mode 100644
index 000000000..0a0bc2802
--- /dev/null
+++ b/src/step-templates/aws-find-blue-green-target-group/scriptbody.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+LISTENER=${1:-'#{AWSBlueGreen.AWS.ListenerARN | Trim}'}
+RULE=${2:-'#{AWSBlueGreen.AWS.RuleArn | Trim}'}
+GREENTARGETGROUP=${3:-'#{AWSBlueGreen.AWS.GreenTargetGroup | Trim}'}
+BLUETARGETGROUP=${4:-'#{AWSBlueGreen.AWS.BlueTargetGroup | Trim}'}
+
+echoerror() { echo "$@" 1>&2; }
+
+if ! command -v "aws" &> /dev/null; then
+  echoerror "You must have the AWS CLI installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers"
+  exit 1
+fi
+
+if ! command -v "jq" &> /dev/null; then
+  echoerror "You must have jq installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers"
+  exit 1
+fi
+
+# Validate the arguments
+
+if [[ -z "${LISTENER}" ]]; then
+  echoerror "Please provide the ARN of the listener as the first argument"
+  exit 1
+fi
+
+if [[ -z "${RULE}" ]]; then
+  echoerror "Please provide the ARN of the listener rule as the second argument"
+  exit 1
+fi
+
+if [[ -z "${GREENTARGETGROUP}" ]]; then
+  echoerror "Please provide the ARN of the green target group as the third argument"
+  exit 1
+fi
+
+if [[ -z "${BLUETARGETGROUP}" ]]; then
+  echoerror "Please provide the ARN of the blue target group as the fourth argument"
+  exit 1
+fi
+
+# Get the JSON representation of the listener rules
+
+RULES=$(aws elbv2 describe-rules \
+  --listener-arn "${LISTENER}" \
+  --output json)
+
+write_verbose "${RULES}"
+
+# Find the weight assigned to each of the target groups.
+
+GREENWEIGHT=$(jq -r ".Rules[] | select(.RuleArn == \"${RULE}\") | .Actions[] | select(.Type == \"forward\") | .ForwardConfig | .TargetGroups[] | select(.TargetGroupArn == \"${GREENTARGETGROUP}\") | .Weight" <<< "${RULES}")
+BLUEWEIGHT=$(jq -r ".Rules[] | select(.RuleArn == \"${RULE}\") | .Actions[] | select(.Type == \"forward\") | .ForwardConfig | .TargetGroups[] | select(.TargetGroupArn == \"${BLUETARGETGROUP}\") | .Weight" <<< "${RULES}")
+
+# Validation that we found the green and blue target groups.
+
+if [[ -z "${GREENWEIGHT}" ]]; then
+  echoerror "Failed to find the target group ${GREENTARGETGROUP} in the listener rule ${RULE}"
+  echoerror "Double check that the target group exists and has been associated with the load balancer"
+  exit 1
+fi
+
+if [[ -z "${BLUEWEIGHT}" ]]; then
+  echoerror "Failed to find the target group ${BLUETARGETGROUP} in the listener rule ${RULE}"
+  echoerror "Double check that the target group exists and has been associated with the load balancer"
+  exit 1
+fi
+
+echo "Green weight: ${GREENWEIGHT}"
+echo "Blue weight: ${BLUEWEIGHT}"
+
+# Set the output variables identifying which target group is active and which is inactive.
+# Note that we assume the target groups are either active or inactive (i.e. all traffic and no traffic).
+# Load balancers support more complex routing rules, but we assume a simple blue-green deployment.
+# If the green target group has traffic, it is considered active, and the blue target group is considered inactive.
+# If the green target group has no traffic, it is considered inactive, and the blue target group is considered active.
+
+if [ "${GREENWEIGHT}" != "0" ]; then
+  echo "Green target group is active, blue target group is inactive"
+  set_octopusvariable "ActiveGroupArn" "${GREENTARGETGROUP}"
+  set_octopusvariable "ActiveGroupColor" "Green"
+  set_octopusvariable "InactiveGroupArn" "${BLUETARGETGROUP}"
+  set_octopusvariable "InactiveGroupColor" "Blue"
+else
+  echo "Blue target group is active, green target group is inactive"
+  set_octopusvariable "ActiveGroupArn" "${BLUETARGETGROUP}"
+  set_octopusvariable "ActiveGroupColor" "Blue"
+  set_octopusvariable "InactiveGroupArn" "${GREENTARGETGROUP}"
+  set_octopusvariable "InactiveGroupColor" "Green"
+fi
\ No newline at end of file
diff --git a/src/step-templates/aws-initiate-instance-refresh/metadata.json b/src/step-templates/aws-initiate-instance-refresh/metadata.json
new file mode 100644
index 000000000..64ed6e478
--- /dev/null
+++ b/src/step-templates/aws-initiate-instance-refresh/metadata.json
@@ -0,0 +1,61 @@
+{
+  "Id": "150c46d1-f33f-493b-a8c6-f5bd22f540f3",
+  "Name": "AWS - Initiate Instance Refresh",
+  "Description": "Initiates an instance refresh for an Auto Scaling group and waits for it to complete.",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
+    "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "2fe001f5-39ee-40d9-b104-24817759ac6f",
+      "Name": "AWSBlueGreen.AWS.Region",
+      "Label": "AWS Region",
+      "HelpText": "The AWS region. See https://aws.amazon.com/about-aws/global-infrastructure/regions_az/ for more information.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f3630bb5-ab07-46b4-b764-19f1c3b2ec5f",
+      "Name": "AWSBlueGreen.AWS.Account",
+      "Label": "Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "bdfdedee-fdeb-4292-96fd-e41c64b1e523",
+      "Name": "AWSBlueGreen.AWS.ASG",
+      "Label": "ASG Name",
+      "HelpText": "The name of the auto scaler group to refresh. See https://docs.aws.amazon.com/autoscaling/ec2/userguide/auto-scaling-groups.html for more details.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2025-01-10T04:12:22.6810000Z",
+    "OctopusVersion": "2025.1.5319",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-initiate-instance-refresh/scriptbody.sh b/src/step-templates/aws-initiate-instance-refresh/scriptbody.sh
new file mode 100644
index 000000000..9fe935378
--- /dev/null
+++ b/src/step-templates/aws-initiate-instance-refresh/scriptbody.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+ASG=${1:-'#{AWSBlueGreen.AWS.ASG | Trim}'}
+
+echoerror() { echo "$@" 1>&2; }
+
+if ! command -v "aws" &> /dev/null; then
+  echoerror "You must have the AWS CLI installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers"
+  exit 1
+fi
+
+if ! command -v "jq" &> /dev/null; then
+  echoerror "You must have jq installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers"
+  exit 1
+fi
+
+if [[ -z "${ASG}" ]]; then
+  echoerror "Please provide the name of the Auto Scaling group as the first argument"
+  exit 1
+fi
+
+for i in {1..30}; do
+  EXISTINGREFRESHES=$(aws autoscaling describe-instance-refreshes --auto-scaling-group-name "${ASG}")
+  NOTSUCCESSFUL=$(jq '.InstanceRefreshes[] | select(.Status == "Pending" or .Status == "InProgress" or .Status == "Cancelling" or .Status == "RollbackInProgress" or .Status == "Baking")' <<< "${EXISTINGREFRESHES}")
+  if [[ -z "${NOTSUCCESSFUL}" ]];
+  then
+    break
+  fi
+    echo "Waiting for existing Auto Scaling group ${ASG} refresh to complete..."
+    sleep 12
+done
+
+REFRESH=$(aws autoscaling start-instance-refresh --auto-scaling-group-name "${ASG}")
+
+if [[ $? -ne 0 ]];
+then
+  echoerror "Failed to start instance refresh for Auto Scaling group ${ASG}"
+  exit 1
+fi
+
+REFRESHTOKEN=$(jq -r '.InstanceRefreshId' <<< "${REFRESH}")
+
+echo "Refreshing instances in Auto Scaling group ${ASG}..."
+
+write_verbose "${REFRESH}"
+
+# Wait for all instances to be healthy
+for i in {1..30}; do
+  REFRESHSTATUS=$(aws autoscaling describe-instance-refreshes --auto-scaling-group-name "${ASG}" --instance-refresh-ids "${REFRESHTOKEN}")
+  STATUS=$(jq -r '.InstanceRefreshes[0].Status' <<< "${REFRESHSTATUS}")
+  PERCENTCOMPLETE=$(jq -r '.InstanceRefreshes[0].PercentageComplete' <<< "${REFRESHSTATUS}")
+
+  # Treat a null percentage as 0
+  if [[ "${PERCENTCOMPLETE}" == "null" ]]
+  then
+    PERCENTCOMPLETE=0
+  fi
+
+  write_verbose "${REFRESHSTATUS}"
+
+  if [[ "${STATUS}" == "Successful" ]]
+  then
+    echo "Instance refresh succeeded"
+    break
+  elif [[ "${STATUS}" == "Failed" ]];
+  then
+    echo "Instance refresh failed!"
+    exit 1
+  fi
+  echo "Waiting for Auto Scaling group ${ASG} refresh to complete (${STATUS} ${PERCENTCOMPLETE}%)..."
+  sleep 12
+done
\ No newline at end of file
diff --git a/step-templates/aws-lambda-create.json b/src/step-templates/aws-lambda-create/metadata.json
similarity index 53%
rename from step-templates/aws-lambda-create.json
rename to src/step-templates/aws-lambda-create/metadata.json
index 1266cff8f..97b90bb29 100644
--- a/step-templates/aws-lambda-create.json
+++ b/src/step-templates/aws-lambda-create/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 7,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Check for the PowerShell cmdlets (from AWS - Create Cloud Formation Stack Octopus Step).\r\ntry{ \r\n    Import-Module AWSPowerShell -ErrorAction Stop\r\n}catch{\r\n    \r\n    $modulePath = \"C:\\Program Files (x86)\\AWS Tools\\PowerShell\\AWSPowerShell\\AWSPowerShell.psd1\"\r\n    Write-Output \"Unable to find the AWS module checking $modulePath\" \r\n    \r\n    try{\r\n        Import-Module $modulePath        \r\n    }\r\n    catch{\r\n        throw \"AWS PowerShell not found! Please make sure to install them from https://aws.amazon.com/powershell/\" \r\n    }\r\n}\r\n\r\nfunction Get-EnvironmentVariables () {\r\n    $resultEV = @{}\r\n    $environmentVariableConst = 'env.'\r\n\r\n    $envVariables = $OctopusParameters.Keys | ? {$_ -like $environmentVariableConst + '*' }\r\n    \r\n    foreach($item in $envVariables)\r\n    {\r\n        $key = $item.Replace($environmentVariableConst, '')\r\n        $value = $OctopusParameters[$item]\r\n\r\n        $resultEV.Add($key, $value)\r\n    }\r\n    \r\n    return $resultEV\r\n}\r\n\r\n# Get the parameters.\r\n$functionName = $OctopusParameters['FunctionName']\r\n$functionZip = $OctopusParameters['FunctionZip']\r\n$handler = $OctopusParameters['Handler']\r\n$runtime = $OctopusParameters['Runtime']\r\n$role = $OctopusParameters['Role']\r\n$description = $OctopusParameters['Description']\r\n$memorySize = $OctopusParameters['MemorySize']\r\n$timeout = $OctopusParameters['Timeout']\r\n$awsRegion = $OctopusParameters['AWSRegion']\r\n$awsSecretAccessKey = $OctopusParameters['AWSSecretAccessKey']\r\n$awsAccessKey = $OctopusParameters['AWSAccessKey']\r\n$AWSCL_VpcConfig_SubnetId = $OctopusParameters['AWSCL_VpcConfig_SubnetId']\r\n$vpcSubnetIds = if($AWSCL_VpcConfig_SubnetId) { $AWSCL_VpcConfig_SubnetId.Split(',') }\r\n$AWSCL_VpcConfig_SecurityGroupId = $OctopusParameters['AWSCL_VpcConfig_SecurityGroupId']\r\nif($AWSCL_VpcConfig_SecurityGroupId) { $vpcSecurityGroupIds = $AWSCL_VpcConfig_SecurityGroupId.Split(',') }\r\n\r\n# Check the parameters.\r\nif (-NOT $awsSecretAccessKey) { throw \"You must enter a value for 'AWS Access Key'.\" }\r\nif (-NOT $awsAccessKey) { throw \"You must enter a value for 'AWS Secret Access Key'.\" }\r\nif (-NOT $awsRegion) { throw \"You must enter a value for 'AWS Region'.\" }\r\nif (-NOT $functionName) { throw \"You must enter a value for 'Function Name'.\" }\r\nif (-NOT $functionZip) { throw \"You must enter a value for 'Function Zip'.\" }\r\nif (-NOT $handler) { throw \"You must enter a value for 'Handler'.\" }\r\nif (-NOT $runtime) { throw \"You must enter a value for 'Runtime'.\" }\r\nif (-NOT $role) { throw \"You must enter a value for 'Role'.\" }\r\nif (-NOT $memorySize) { throw \"You must enter a value for 'Memory Size'.\" }\r\nif (-NOT $timeout) { throw \"You must enter a value for 'Timeout'.\" }\r\n\r\nWrite-Output \"--------------------------------------------------\"\r\nWrite-Output \"AWS Region: $awsRegion\"\r\nWrite-Output \"AWS Lambda Function Name: $functionName\"\r\nWrite-Output \"AWS Lambda Handler: $handler\"\r\nWrite-Output \"AWS Lambda Runtime: $runtime\"\r\nWrite-Output \"AWS Lambda Memory Size: $memorySize\"\r\nWrite-Output \"AWS Lambda Timeout: $timeout\"\r\nWrite-Output \"AWS Lambda Role: $role\"\r\nWrite-Output \"--------------------------------------------------\"\r\n\r\n# Set up the credentials and the dependencies.\r\nSet-DefaultAWSRegion -Region $awsRegion\r\n$credential = New-AWSCredentials -AccessKey $awsAccessKey -SecretKey $awsSecretAccessKey\r\n\r\n$awsEnvironmentVariables = Get-EnvironmentVariables\r\n\r\n# Check if the function exists, with a try catch\r\ntry {\r\n    Get-LMFunction -Credential $credential -FunctionName $functionName -Region $awsRegion\r\n    \r\n    Write-Host 'Updating Lambda function code.'\r\n\r\n    # Update the function.\r\n    Update-LMFunctionCode -Credential $credential -Region $awsRegion -FunctionName $functionName -ZipFilename  $functionZip\r\n    \r\n    Write-Host 'Updating Lambda function configuration.'\r\n\r\n    Update-LMFunctionConfiguration -Credential $credential -Region $awsRegion -FunctionName $functionName -Description $description -Handler $handler -MemorySize $memorySize -Role $role -Runtime $runtime -Timeout $timeout -Environment_Variable $awsEnvironmentVariables -VpcConfig_SecurityGroupId $vpcSecurityGroupIds -VpcConfig_SubnetId $vpcSubnetIds\r\n    \r\n    # Feedback\r\n    Write-Output \"--------------------------------------------------\"\r\n    Write-Output \"AWS Lambda Function updated.\"\r\n    Write-Output \"--------------------------------------------------\"\r\n}\r\ncatch {\r\n    # Create the function.\r\n    Publish-LMFunction -Credential $credential -Region $awsRegion -FunctionName $functionName -FunctionZip $functionZip -Handler $handler -Runtime $runtime -Role $role -Description $description -MemorySize $memorySize -Timeout $timeout -Environment_Variable $awsEnvironmentVariables -VpcConfig_SecurityGroupId $vpcSecurityGroupIds -VpcConfig_SubnetId $vpcSubnetIds\r\n\r\n    # Feedback\r\n    Write-Output \"--------------------------------------------------\"\r\n    Write-Output \"AWS Lambda Function created.\"\r\n    Write-Output \"--------------------------------------------------\"\r\n}\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
@@ -156,12 +156,12 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2021-02-26T12:09:57.788Z",
+  "LastModifiedOn": "2021-02-26T12:09:57.7880000Z",
   "LastModifiedBy": "harrisonmeister",
   "$Meta": {
-    "ExportedAt": "2018-04-16T10:25:57.788Z",
+    "ExportedAt": "2018-04-16T10:25:57.7880000Z",
     "OctopusVersion": "2018.3.6",
     "Type": "ActionTemplate"
   },
   "Category": "aws"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/aws-lambda-create/scriptbody.ps1 b/src/step-templates/aws-lambda-create/scriptbody.ps1
new file mode 100644
index 000000000..a2791de6f
--- /dev/null
+++ b/src/step-templates/aws-lambda-create/scriptbody.ps1
@@ -0,0 +1,105 @@
+# Check for the PowerShell cmdlets (from AWS - Create Cloud Formation Stack Octopus Step).
+try{ 
+    Import-Module AWSPowerShell -ErrorAction Stop
+}catch{
+    
+    $modulePath = "C:\Program Files (x86)\AWS Tools\PowerShell\AWSPowerShell\AWSPowerShell.psd1"
+    Write-Output "Unable to find the AWS module checking $modulePath" 
+    
+    try{
+        Import-Module $modulePath        
+    }
+    catch{
+        throw "AWS PowerShell not found! Please make sure to install them from https://aws.amazon.com/powershell/" 
+    }
+}
+
+function Get-EnvironmentVariables () {
+    $resultEV = @{}
+    $environmentVariableConst = 'env.'
+
+    $envVariables = $OctopusParameters.Keys | ? {$_ -like $environmentVariableConst + '*' }
+    
+    foreach($item in $envVariables)
+    {
+        $key = $item.Replace($environmentVariableConst, '')
+        $value = $OctopusParameters[$item]
+
+        $resultEV.Add($key, $value)
+    }
+    
+    return $resultEV
+}
+
+# Get the parameters.
+$functionName = $OctopusParameters['FunctionName']
+$functionZip = $OctopusParameters['FunctionZip']
+$handler = $OctopusParameters['Handler']
+$runtime = $OctopusParameters['Runtime']
+$role = $OctopusParameters['Role']
+$description = $OctopusParameters['Description']
+$memorySize = $OctopusParameters['MemorySize']
+$timeout = $OctopusParameters['Timeout']
+$awsRegion = $OctopusParameters['AWSRegion']
+$awsSecretAccessKey = $OctopusParameters['AWSSecretAccessKey']
+$awsAccessKey = $OctopusParameters['AWSAccessKey']
+$AWSCL_VpcConfig_SubnetId = $OctopusParameters['AWSCL_VpcConfig_SubnetId']
+$vpcSubnetIds = if($AWSCL_VpcConfig_SubnetId) { $AWSCL_VpcConfig_SubnetId.Split(',') }
+$AWSCL_VpcConfig_SecurityGroupId = $OctopusParameters['AWSCL_VpcConfig_SecurityGroupId']
+if($AWSCL_VpcConfig_SecurityGroupId) { $vpcSecurityGroupIds = $AWSCL_VpcConfig_SecurityGroupId.Split(',') }
+
+# Check the parameters.
+if (-NOT $awsSecretAccessKey) { throw "You must enter a value for 'AWS Access Key'." }
+if (-NOT $awsAccessKey) { throw "You must enter a value for 'AWS Secret Access Key'." }
+if (-NOT $awsRegion) { throw "You must enter a value for 'AWS Region'." }
+if (-NOT $functionName) { throw "You must enter a value for 'Function Name'." }
+if (-NOT $functionZip) { throw "You must enter a value for 'Function Zip'." }
+if (-NOT $handler) { throw "You must enter a value for 'Handler'." }
+if (-NOT $runtime) { throw "You must enter a value for 'Runtime'." }
+if (-NOT $role) { throw "You must enter a value for 'Role'." }
+if (-NOT $memorySize) { throw "You must enter a value for 'Memory Size'." }
+if (-NOT $timeout) { throw "You must enter a value for 'Timeout'." }
+
+Write-Output "--------------------------------------------------"
+Write-Output "AWS Region: $awsRegion"
+Write-Output "AWS Lambda Function Name: $functionName"
+Write-Output "AWS Lambda Handler: $handler"
+Write-Output "AWS Lambda Runtime: $runtime"
+Write-Output "AWS Lambda Memory Size: $memorySize"
+Write-Output "AWS Lambda Timeout: $timeout"
+Write-Output "AWS Lambda Role: $role"
+Write-Output "--------------------------------------------------"
+
+# Set up the credentials and the dependencies.
+Set-DefaultAWSRegion -Region $awsRegion
+$credential = New-AWSCredentials -AccessKey $awsAccessKey -SecretKey $awsSecretAccessKey
+
+$awsEnvironmentVariables = Get-EnvironmentVariables
+
+# Check if the function exists, with a try catch
+try {
+    Get-LMFunction -Credential $credential -FunctionName $functionName -Region $awsRegion
+    
+    Write-Host 'Updating Lambda function code.'
+
+    # Update the function.
+    Update-LMFunctionCode -Credential $credential -Region $awsRegion -FunctionName $functionName -ZipFilename  $functionZip
+    
+    Write-Host 'Updating Lambda function configuration.'
+
+    Update-LMFunctionConfiguration -Credential $credential -Region $awsRegion -FunctionName $functionName -Description $description -Handler $handler -MemorySize $memorySize -Role $role -Runtime $runtime -Timeout $timeout -Environment_Variable $awsEnvironmentVariables -VpcConfig_SecurityGroupId $vpcSecurityGroupIds -VpcConfig_SubnetId $vpcSubnetIds
+    
+    # Feedback
+    Write-Output "--------------------------------------------------"
+    Write-Output "AWS Lambda Function updated."
+    Write-Output "--------------------------------------------------"
+}
+catch {
+    # Create the function.
+    Publish-LMFunction -Credential $credential -Region $awsRegion -FunctionName $functionName -FunctionZip $functionZip -Handler $handler -Runtime $runtime -Role $role -Description $description -MemorySize $memorySize -Timeout $timeout -Environment_Variable $awsEnvironmentVariables -VpcConfig_SecurityGroupId $vpcSecurityGroupIds -VpcConfig_SubnetId $vpcSubnetIds
+
+    # Feedback
+    Write-Output "--------------------------------------------------"
+    Write-Output "AWS Lambda Function created."
+    Write-Output "--------------------------------------------------"
+}
diff --git a/src/step-templates/aws-launch-ec2-instance/metadata.json b/src/step-templates/aws-launch-ec2-instance/metadata.json
new file mode 100644
index 000000000..8f3822592
--- /dev/null
+++ b/src/step-templates/aws-launch-ec2-instance/metadata.json
@@ -0,0 +1,156 @@
+{
+  "Id": "eed13694-0208-4614-aca9-e82309838dd8",
+  "Name": "AWS - Launch EC2 Instance",
+  "Description": "This step will launch an EC2 instance, or start an instance previously created by this step.\n\nThe goal being that only one specific instance will be created, and on subsequent deploys, if the instance is not running it will be started. If the instance was terminated, a new instance will be created in its place. Basically, this step says \"_I will make sure the specified Instance will be running after this step_\".\n\nThis step makes the following Octopus \"Output\" Variables available to subsequent steps:\n- **InstanceId** (e.g. i-a1b2c3d4e5f6g7h8i)\n- **PrivateIpAddress** (e.g. 192.168.0.100)\n- **PublicIpAddress** (e.g. 52.64.52.64)\n- Usage: _#{Octopus.Action[AWS - Launch EC2 Instance].Output.**InstanceId**}_\n\nNow what...? Well, you could use the \"UserData\" field to [automatically install and register a Tentacle](https://octopus.com/blog/auto-provision-ec2-instances-with-tentacle-installed).\n\nNote for UserData: _If you're creating your own image (AMI), you may need to [re-enable User Data](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/UsingConfig_WinAMI.html#UsingConfigInterface_WinAMI), then create the image._\n\nWith a couple of extra step templates you can:\n- Wait for the Instance to register as a Deployment Target (_Octopus - Wait for Deployment Target registration_)\n- Include the new Instance in subsequent deployment steps (_Health Check_)\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "45aa8520-eb05-48a9-b4ef-30d11b5e6a73",
+      "Name": "odTags",
+      "Label": "Tags",
+      "HelpText": "The Tags to be applied to the new instance. These tags will determine if a new instance will be created, or if an instance matching the tags should be in a running state.",
+      "DefaultValue": "Name=#{Octopus.Project.Name}\nEnvironment=#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2411ffb3-c3fc-402a-9448-249415000c14",
+      "Name": "odImageId",
+      "Label": "ImageId",
+      "HelpText": "The Amazon Machine Image (AMI) Id. This can be the id of an image you've created yourself, or one of the AWS Community AMIs.",
+      "DefaultValue": "ami-xxxxxxxx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a2cc4774-b60c-4dad-9c44-074d0564b626",
+      "Name": "odInstanceType",
+      "Label": "InstanceType",
+      "HelpText": "The Instance Type (Model), e.g. t2.micro, m3.large, c4.large, etc.\nFurther reading: https://aws.amazon.com/ec2/instance-types/",
+      "DefaultValue": "t2.micro",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "dd2c238d-4758-4027-8901-b050e991bf83",
+      "Name": "odSubnetId",
+      "Label": "SubnetId",
+      "HelpText": "The Subnet Id you would like the Instance to launch in.",
+      "DefaultValue": "subnet-xxxxxxxx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "349022a4-0ad3-46bd-b408-e456c5616577",
+      "Name": "odSecurityGroupId",
+      "Label": "SecurityGroupId",
+      "HelpText": "The Security Group Id you would like the Instance to launch with.",
+      "DefaultValue": "sg-xxxxxxxx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "54508ead-07db-4f73-b8a9-8c3b8c91bdb1",
+      "Name": "odKeyName",
+      "Label": "KeyName",
+      "HelpText": "The name of the Key Pair that will be used to log into the new instance.",
+      "DefaultValue": "AutoDeployKeyNameExample",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "01097d0d-4ce5-4c38-afd4-527919a800f7",
+      "Name": "odRegion",
+      "Label": "Region",
+      "HelpText": "The AWS Region you would like the Instance to launch in, e.g. ap-southeast-2, us-west-2, eu-west-1, etc.\nFurther reading: https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region",
+      "DefaultValue": "ap-southeast-2",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b4dfba68-93fe-496a-acd4-00e01d818312",
+      "Name": "odUserData",
+      "Label": "UserData (Optional)",
+      "HelpText": "The UserData is a script that will be executed on the initial startup of your EC2 Instance.\nFurther Reading: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html",
+      "DefaultValue": "<powershell>tzutil.exe /s 'AUS Eastern Standard Time'</powershell>",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "5842e13b-af7a-4a18-bfa4-4891aded2ae9",
+      "Name": "odSpotPrice",
+      "Label": "SpotPrice (Optional)",
+      "HelpText": "The Spot Price is a variable hourly rate (often discounted), which is calculated based on the current demand for any particular Instance Type (Model).\nFurther Reading: https://aws.amazon.com/ec2/spot/pricing/",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "caa5f631-f0c5-4925-8a57-a80abb5e4300",
+      "Name": "odSpotProduct",
+      "Label": "SpotProduct (Optional)",
+      "HelpText": "The Spot Product is basically the Operating System you plan to utilise.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Linux/Unix|Linux/Unix\nSUSE Linux|SUSE Linux\nWindows|Windows"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "43206cff-be8c-4805-9045-2f6bf302e056",
+      "Name": "odAccessKey",
+      "Label": "AccessKey (Kind-of Optional)",
+      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\"\nFurther Reading:\nhttps://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b0d6b3e7-3c90-4f0e-b919-78ef04608cb3",
+      "Name": "odSecretKey",
+      "Label": "SecretKey (Kind-of Optional)",
+      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\"\nFurther Reading:\nhttps://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tclydesdale",
+  "$Meta": {
+    "ExportedAt": "2018-01-29T12:56:55.3110000Z",
+    "OctopusVersion": "4.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-launch-ec2-instance/scriptbody.ps1 b/src/step-templates/aws-launch-ec2-instance/scriptbody.ps1
new file mode 100644
index 000000000..566ae2a41
--- /dev/null
+++ b/src/step-templates/aws-launch-ec2-instance/scriptbody.ps1
@@ -0,0 +1,292 @@
+# Running outside octopus
+param(
+    [string]$odTags,
+    [string]$odImageId,
+    [string]$odInstanceType,
+    [string]$odSubnetId,
+    [string]$odSecurityGroupId,
+    [string]$odKeyName,
+    [string]$odRegion,
+    [string]$odUserData,
+    [decimal]$odSpotPrice,
+    [string]$odSpotProduct,
+    [string]$odAccessKey,
+    [string]$odSecretKey,
+    [switch]$whatIf
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if (!$result -or $result -eq $null) {
+        if ($Default) {
+            $result = $Default
+        } elseif ($Required) {
+            Throw "Missing parameter value $Name"
+        }
+    }
+
+    return $result
+}
+
+
+function removeTags($instanceId, $tags)
+{
+    (ConvertFrom-StringData $tags).GetEnumerator() | Foreach-Object {
+        try {
+            Remove-EC2Tag -Tags @{key=$_.Key} -resourceId $instanceId -Force
+        }
+        catch [Amazon.EC2.AmazonEC2Exception] {
+            Throw $_.Exception.errorcode + '-' + $_.Exception.Message
+        }
+    }
+}
+
+function NewTags($instanceId, $tags)
+{
+    (ConvertFrom-StringData $tags).GetEnumerator() | Foreach-Object {
+        try {
+            New-EC2Tag -Tags @{key=$_.Key;value=$_.Value} -resourceId $instanceId
+        }
+        catch [Amazon.EC2.AmazonEC2Exception] {
+            Throw $_.Exception.errorcode + '-' + $_.Exception.Message
+        }
+    }
+}
+
+
+& {
+    param(
+        [string]$odTags,
+        [string]$odImageId,
+        [string]$odInstanceType,
+        [string]$odSubnetId,
+        [string]$odSecurityGroupId,
+        [string]$odKeyName,
+        [string]$odRegion,
+        [string]$odUserData,
+        [decimal]$odSpotPrice,
+        [string]$odSpotProduct,
+        [string]$odAccessKey,
+        [string]$odSecretKey
+    )
+
+    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables
+    if ($odAccessKey -or $odSecretKey) {
+        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default
+    } elseif (([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -or ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine"))) {
+        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable("AWS_ACCESS_KEY", "Machine")) -SecretKey ([Environment]::GetEnvironmentVariable("AWS_SECRET_KEY", "Machine")) -StoreAs default
+    } else {
+        Throw "AWS API credentials were not available/provided."
+    }
+
+    if ($odTags) {
+        $filterArray = @()
+        (ConvertFrom-StringData $odTags).GetEnumerator() | Foreach-Object {
+            $filterHash = @{ Name="tag:"+$_.Key;value=$_.Value }
+            $filterArray += $filterHash
+        }
+
+        $instanceObj = (Get-EC2Instance -Filter $filterArray | select -ExpandProperty Instances)
+        $instanceCount = ($instanceObj | measure).Count
+        $instanceId = $null
+        $currentState = "missing"
+
+        if ($instanceCount -gt 1) {
+            Throw "More than one instance exists with the same tags - I don't know what to do!?"
+        }
+        elseif ($instanceCount -eq 1) {
+            $instanceId = ($instanceObj).InstanceId
+            $currentState = (Get-EC2Instance $instanceId).Instances.State.Name
+            
+            Write-Output ("------------------------------")
+            Write-Output ("Checking the EC2 Instance status:")
+            Write-Output ("------------------------------")
+
+            $timeout = (New-Timespan -Seconds 90)
+            $sw = [diagnostics.stopwatch]::StartNew()
+
+            while ($true) {
+                $currentState = (Get-EC2Instance $instanceId).Instances.State.Name
+
+                if ($currentState -eq "running") {
+                    break
+                }
+                elseif ($currentState -eq "terminated") {
+                    (removeTags $instanceId $odTags) | out-null
+                    $instanceId = $null
+                    break
+                }
+                elseif ($currentState -eq "stopped") {
+                    (Start-EC2Instance -InstanceIds $instanceId) | out-null
+                }
+
+                Write-Output ("$(Get-Date) | Waiting for Instance '$instanceId' to transition from state: $currentState")
+
+                if ($sw.elapsed -gt $timeout) {Throw "Timed out waiting for desired state"}
+
+                Sleep -Seconds 5
+            }
+            
+            Write-Output ("$(Get-Date) | Instance state: $currentState")
+        }
+        
+        # If the instance doesn't exist, create it!
+        if ($instanceId -eq $null) {
+            Write-Output ("------------------------------")
+            Write-Output ("Creating a new EC2 instance:")
+            Write-Output ("------------------------------")
+
+            $encodedUserData = $null
+            if ($odUserData -ne $null) { $encodedUserData = [System.Convert]::ToBase64String( [System.Text.Encoding]::UTF8.GetBytes($odUserData) ) }
+
+            if (!$odSpotPrice) {
+                Write-Output ("$(Get-Date) | Attempting to create a new EC2 instance from ImageId: $odImageId")
+
+                try {
+                    $ec2Instances = (New-EC2Instance -ImageId $odImageId -KeyName $odKeyName -SecurityGroupId $odSecurityGroupId -InstanceType $odInstanceType -UserData $encodedUserData -SubnetId $odSubnetId -Region $odRegion)
+
+                    $instanceId = $ec2Instances.Instances[0].InstanceId
+                }
+                catch [Amazon.EC2.AmazonEC2Exception] {
+                    Write-Output ($_.Exception.errorcode)
+                    Write-Output ($_.Exception.Message)
+                    Throw "Couldn't launch EC2 instance, sorry..."
+                }
+            }
+            elseif ($odSpotPrice) {
+                Write-Output ("$(Get-Date) | Attempting to create a new EC2 spot-instance from ImageId: $odImageId")
+
+                try {
+                    $spotInstancePricingObj = (Get-EC2SpotPriceHistory -InstanceType $odInstanceType -Region $odRegion -Filter @{ Name="product-description";value="$odSpotProduct" } -MaxResult 10)
+                
+                    Write-Output ("------------------------------")
+                    Write-Output ("Listing the 10 most recent spot price changes for " + $odRegion + ":")
+                    Write-Output ("------------------------------")
+
+                    [decimal]$highPrice=0
+                    $spotInstancePricingObj | Foreach-Object {
+                        if ($highPrice -lt $_.Price) { $highPrice=$_.Price }
+                        Write-Output ($_.AvailabilityZone + " | " + $_.InstanceType + " | " + $_.Price + " | " + $_.ProductDescription + " | " + $_.Timestamp)
+                    }
+
+                    if ($odSpotPrice -lt ($highPrice*1.1)) { Write-Output ("WARNING: Requested spot price (" + $odSpotPrice + ") may be too low: Below 10% of recent high (" + $highPrice + ")") }
+                    if ($odSpotPrice -gt ($highPrice*5)) { Write-Output ("WARNING: Requested spot price (" + $odSpotPrice + ") may be too high: Over 5x recent high (" + $highPrice + ")") }
+                }
+                catch [Amazon.EC2.AmazonEC2Exception] {
+                    Write-Output ($_.Exception.errorcode)
+                    Write-Output ($_.Exception.Message)
+                    Throw "Couldn't gather spot pricing details, sorry..."
+                }
+
+                try {
+                    $if0 = (New-Object Amazon.EC2.Model.InstanceNetworkInterfaceSpecification)
+                    $if0.DeviceIndex = 0
+                    $if0.SubnetId = $odSubnetId
+                    $if0.Groups.Add($odSecurityGroupId)
+
+                    $spotInstanceRequestObj = (Request-EC2SpotInstance -SpotPrice $odSpotPrice -InstanceCount 1 -Type one-time -LaunchSpecification_ImageId $odImageId -LaunchSpecification_KeyName $odKeyName -LaunchSpecification_InstanceType $odInstanceType -LaunchSpecification_UserData $encodedUserData -Region $odRegion -LaunchSpecification_NetworkInterfaces $if0)
+                
+                    Write-Output ("------------------------------")
+                    Write-Output ("Checking the spot request status:")
+                    Write-Output ("------------------------------")
+
+                    $timeout = (New-Timespan -Seconds 300)
+                    $sw = [diagnostics.stopwatch]::StartNew()
+
+                    while ($true)
+                    {
+                        if ($sw.elapsed -gt $timeout) { Throw "Timed out waiting for spot instance - please check manually!" }
+
+                        $spotcurrentState = (Get-EC2SpotInstanceRequest -SpotInstanceRequestId ($spotInstanceRequestObj.SpotInstanceRequestId)).State
+                        Write-Output ("$(Get-Date) | Current State: $spotcurrentState | Desired State: active")
+                        if ($spotcurrentState -eq "active") { break }
+
+                        Sleep -Seconds 5
+                    }
+                
+                    Write-Output ("------------------------------")
+                    Write-Output ("Spot Request details:")
+                    Write-Output (Get-EC2SpotInstanceRequest -SpotInstanceRequestId ($spotInstanceRequestObj.SpotInstanceRequestId))
+                    Write-Output ("------------------------------")
+
+                    $instanceId = (Get-EC2SpotInstanceRequest -SpotInstanceRequestId ($spotInstanceRequestObj.SpotInstanceRequestId)).InstanceId
+                }
+                catch [Amazon.EC2.AmazonEC2Exception] {
+                    Write-Output ($_.Exception.errorcode)
+                    Write-Output ($_.Exception.Message)
+                    Throw "Couldn't launch spot instance"
+                }
+            }
+
+            if ($odTags) { NewTags $instanceId $odTags }
+        }
+
+        if ($instanceId) {
+            if ($currentState -ne "running") { 
+                Write-Output ("------------------------------")
+                Write-Output ("Checking the EC2 Instance status:")
+                Write-Output ("------------------------------")
+
+                Write-Output ("$(Get-Date) | Instance state: $currentState")
+
+                $timeout = (New-Timespan -Seconds 90)
+                $sw = [diagnostics.stopwatch]::StartNew()
+
+                while ($true) {
+                    $currentState = (Get-EC2Instance $instanceId).Instances.State.Name
+
+                    if ($currentState -eq "running") { break }
+
+                    Write-Output ("$(Get-Date) | Waiting for Instance '$instanceId' to transition from state: $currentState")
+
+                    if ($sw.elapsed -gt $timeout) {Throw "Timed out waiting for desired state"}
+
+                    Sleep -Seconds 5
+                }
+
+                Write-Output ("$(Get-Date) | Instance state: $currentState")
+            }
+
+
+            Write-Output ("------------------------------")
+            Write-Output ("Instance details:")
+            Write-Output ((Get-EC2Instance $instanceId).Instances)
+            Write-Output ("------------------------------")
+    
+            $privateIpAddress = (Get-EC2Instance $instanceId).Instances.PrivateIpAddress
+            $publicIpAddress = (Get-EC2Instance $instanceId).Instances.PublicIpAddress
+            
+            if($OctopusParameters) {
+                Set-OctopusVariable -name "InstanceId" -value $instanceId
+                Set-OctopusVariable -name "PrivateIpAddress" -value $privateIpAddress
+                Set-OctopusVariable -name "PublicIpAddress" -value $publicIpAddress
+            }
+        }
+    }
+ } `
+ (Get-Param 'odTags' -Required) `
+ (Get-Param 'odImageId' -Required) `
+ (Get-Param 'odInstanceType' -Required) `
+ (Get-Param 'odSubnetId' -Required) `
+ (Get-Param 'odSecurityGroupId' -Required) `
+ (Get-Param 'odKeyName' -Required) `
+ (Get-Param 'odRegion' -Required) `
+ (Get-Param 'odUserData') `
+ (Get-Param 'odSpotPrice') `
+ (Get-Param 'odSpotProduct') `
+ (Get-Param 'odAccessKey') `
+ (Get-Param 'odSecretKey')
\ No newline at end of file
diff --git a/step-templates/aws-linux-install-tentacle.json b/src/step-templates/aws-linux-install-tentacle/metadata.json
similarity index 52%
rename from step-templates/aws-linux-install-tentacle.json
rename to src/step-templates/aws-linux-install-tentacle/metadata.json
index 9b83aec57..54bd7fe5a 100644
--- a/step-templates/aws-linux-install-tentacle.json
+++ b/src/step-templates/aws-linux-install-tentacle/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{awsInstallLinuxTentacle.AWSAccount}",
-    "Octopus.Action.Script.ScriptBody": "$sgName = $OctopusParameters[\"awsInstallLinuxTentacle.awsSGName\"]\n$instanceId = $OctopusParameters[\"awsInstallLinuxTentacle.awsVmInstanceId\"]\n$serverUri = $OctopusParameters[\"instrallTentacle.octoServerUrl\"]\n$apiKey = $OctopusParameters[\"awsInstallLinuxTentacle.octoApiKey\"]\n$rolesRaw = $OctopusParameters[\"awsInstallLinuxTentacle.octopusRoles\"]\n$enviroRaw = $OctopusParameters[\"awsInstallLinuxTentacle.octopusEnvironments\"]\n$octoThumb = $OctopusParameters[\"awsInstallLinuxTentacle.octoServerThumb\"]\n$comStyle = $OctopusParameters[\"awsInstallLinuxTentacle.tentacleType\"]\n$hostname = $OctopusParameters[\"awsInstallLinuxTentacle.tentacleHostName\"]\n$tentacleName = $OctopusParameters[\"awsInstallLinuxTentacle.tentacleName\"]\n$portNumber = $OctopusParameters[\"awsInstallLinuxTentacle.portNumber\"]\n\nWrite-Host \"Parsing Parameters\"\n\nif([string]::IsNullOrEmpty($sgName))\n{\n\tthrow \"Security Group name must be provided\"\n}\n\nif([string]::IsNullOrEmpty($instanceId))\n{\n\tthrow \"Instance Id must be provided\"\n}\n\nif([string]::IsNullOrEmpty($apiKey))\n{\n\tthrow \"apiKey must be provided\"\n}\n\nif([string]::IsNullOrEmpty($rolesRaw))\n{\n\tthrow \"At least one role must be defined\"\n}\n\nif([string]::IsNullOrEmpty($enviroRaw))\n{\n\tthrow \"At least one environment must be defined\"\n}\n\nif([string]::IsNullOrEmpty($octoThumb))\n{\n\tthrow \"octo thumbprint must be provided\"\n}\n\n$roles = \"\"\n$rolesRaw -split \"`n\" | ForEach-Object { $roles += \"--role $_ \"}\n$roles = $roles.TrimEnd(' ')\n\n$environments = \"\"\n$enviroRaw -split \"`n\" | ForEach-Object { $environments += \"--env $_ \"}\n$environments = $environments.TrimEnd(' ')\n\nif($comStyle -eq \"TentaclePassive\")\n{\n\tif([string]::IsNullOrEmpty($hostname))\n    {\n    \t$hostname = aws ec2 describe-instances --filters \"Name=instance-id,Values=$instanceId\" --query \"Reservations[].Instances[].NetworkInterfaces[].Association.PublicIp\" --output=text\n        $hostname = $hostname.Trim(\"`n\")\n    }\n    \n    $noListen = \"--port $portNumber --noListen `\"false`\"\"\n    $comStyle += \" --publicHostName='$hostname'\"\n    $openFirewall = 'true'\n}\nelse\n{\n\t$noListen = \"--noListen `\"true`\"\"\n    $openFirewall = 'false'\n}\n\nif([string]::IsNullOrEmpty($tentacleName))\n{\n\t$tentacleName = $hostname\n}\n\nif($openFirewall -eq 'true')\n{\n\tWrite-Host \"Checking SG...\" -NoNewline\n    $sgCheck = aws ec2 describe-security-groups --group-names $sgName --output json --filters Name=ip-permission.from-port,Values=$portNumber Name=ip-permission.cidr,Values='0.0.0.0/0' | convertfrom-json\n    \n    if($sgCheck.SecurityGroups.count -eq 0)\n    {\n\t\tWrite-Host \"Creating SG Rule\"\n    \taws ec2 authorize-security-group-ingress --group-name $sgName --ip-permissions IpProtocol=tcp,ToPort=$portNumber,FromPort=$portNumber,IpRanges='[{CidrIp=0.0.0.0/0,Description=\"OctopusListeningTentacle\"}]'\n\t}\n    else\n    {\n    \tWrite-Host \"Found Existing SG Rule\"\n    }\n}\n\nWrite-Verbose \"hostname: $hostname`nnoListen: $noListen\"\n\n$remoteScript = @\"\n{\n\t\"commands\": [\n    \t\"#!/bin/bash\",\n\t\t\"curl -L https://octopus.com/downloads/latest/Linux_x64TarGz/OctopusTentacle -o /tmp/tentacle-linux_x64.tar.gz -fsS\",\n\t\t\"if [ ! -d \\\"/opt/octopus\\\" ]; then sudo mkdir /opt/octopus; fi\",\n\t\t\"tar xvzf /tmp/tentacle-linux_x64.tar.gz -C /opt/octopus\",\n\t\t\"rm /tmp/tentacle-linux_x64.tar.gz\",\n\t\t\"cd /opt/octopus/tentacle\",\n\t\t\"sudo /opt/octopus/tentacle/Tentacle create-instance --config '/etc/octopus/default/tentacle-default.config'\",\n\t\t\"sudo chmod a+rwx /etc/octopus/default/tentacle-default.config\",\n\t\t\"/opt/octopus/tentacle/Tentacle new-certificate --if-blank\",\n\t\t\"/opt/octopus/tentacle/Tentacle configure --port $portNumber --noListen False --reset-trust --app '/home/Octopus/Applications'\",\n\t\t\"/opt/octopus/tentacle/Tentacle configure --trust $octoThumb\",\n\t\t\"echo 'Registering the Tentacle $name with server $serverUri in environment $environments with role $roles'\",\n\t\t\"/opt/octopus/tentacle/Tentacle register-with --server '$serverUri' --apiKey '$apikey' $environments $roles --comms-style $comStyle --name '$tentacleName' --force\",\n\t\t\"sudo /opt/octopus/tentacle/Tentacle service --install --start\"\n\t]\n}\n\"@\n\nWrite-Host \"Installing tentacle on remote machine\"\n$guid = (new-guid).guid\nSet-Content -Value $remoteScript -Path \"$env:Temp/$guid.json\"\n\nwrite-verbose $remoteScript\n\nwrite-verbose \"aws ssm send-command --document-name `\"AWS-RunShellScript`\" --instance-ids `\"$instanceId`\" --parameters `\"file://$env:Temp/$guid.json`\"\"\ntry {\n\t$cmdResponse = aws ssm send-command --document-name \"AWS-RunShellScript\" --instance-ids \"$instanceId\" --parameters \"file://$env:Temp/$guid.json\" --query \"Command\" --output json | convertfrom-json\n    $cmdId = $cmdResponse.CommandId\n    $errorResponse = aws ssm get-command-invocation --command-id \"$cmdId\" --instance-id \"$instanceId\" --output json | convertfrom-json\n    \n    while($errorResponse.Status -eq 'InProgress')\n    {\n    \twrite-verbose \"`nStatus: $($errorResponse.Status)\"\n    \t$errorResponse = aws ssm get-command-invocation --command-id \"$cmdId\" --instance-id \"$instanceId\" --output json | convertfrom-json\n    }\n    \n    write-verbose \"`nErrorResponse: $errorResponse`n\"\n    \n    if(![string]::IsNullOrEmpty($errorResponse.StandardErrorContent))\n    {\n    \tthrow $errorResponse.StandardErrorContent\n    }\n}\nfinally {\n\tremove-item \"$env:Temp\\$guid.json\"\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Aws.AssumeRole": "False",
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{awsInstallLinuxTentacle.AWSAccount}",
@@ -150,7 +150,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-08-23T12:40:10.975Z",
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
     "OctopusVersion": "2021.1.7687",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-linux-install-tentacle/scriptbody.ps1 b/src/step-templates/aws-linux-install-tentacle/scriptbody.ps1
new file mode 100644
index 000000000..07d6851fd
--- /dev/null
+++ b/src/step-templates/aws-linux-install-tentacle/scriptbody.ps1
@@ -0,0 +1,142 @@
+$sgName = $OctopusParameters["awsInstallLinuxTentacle.awsSGName"]
+$instanceId = $OctopusParameters["awsInstallLinuxTentacle.awsVmInstanceId"]
+$serverUri = $OctopusParameters["instrallTentacle.octoServerUrl"]
+$apiKey = $OctopusParameters["awsInstallLinuxTentacle.octoApiKey"]
+$rolesRaw = $OctopusParameters["awsInstallLinuxTentacle.octopusRoles"]
+$enviroRaw = $OctopusParameters["awsInstallLinuxTentacle.octopusEnvironments"]
+$octoThumb = $OctopusParameters["awsInstallLinuxTentacle.octoServerThumb"]
+$comStyle = $OctopusParameters["awsInstallLinuxTentacle.tentacleType"]
+$hostname = $OctopusParameters["awsInstallLinuxTentacle.tentacleHostName"]
+$tentacleName = $OctopusParameters["awsInstallLinuxTentacle.tentacleName"]
+$portNumber = $OctopusParameters["awsInstallLinuxTentacle.portNumber"]
+
+Write-Host "Parsing Parameters"
+
+if([string]::IsNullOrEmpty($sgName))
+{
+	throw "Security Group name must be provided"
+}
+
+if([string]::IsNullOrEmpty($instanceId))
+{
+	throw "Instance Id must be provided"
+}
+
+if([string]::IsNullOrEmpty($apiKey))
+{
+	throw "apiKey must be provided"
+}
+
+if([string]::IsNullOrEmpty($rolesRaw))
+{
+	throw "At least one role must be defined"
+}
+
+if([string]::IsNullOrEmpty($enviroRaw))
+{
+	throw "At least one environment must be defined"
+}
+
+if([string]::IsNullOrEmpty($octoThumb))
+{
+	throw "octo thumbprint must be provided"
+}
+
+$roles = ""
+$rolesRaw -split "`n" | ForEach-Object { $roles += "--role $_ "}
+$roles = $roles.TrimEnd(' ')
+
+$environments = ""
+$enviroRaw -split "`n" | ForEach-Object { $environments += "--env $_ "}
+$environments = $environments.TrimEnd(' ')
+
+if($comStyle -eq "TentaclePassive")
+{
+	if([string]::IsNullOrEmpty($hostname))
+    {
+    	$hostname = aws ec2 describe-instances --filters "Name=instance-id,Values=$instanceId" --query "Reservations[].Instances[].NetworkInterfaces[].Association.PublicIp" --output=text
+        $hostname = $hostname.Trim("`n")
+    }
+    
+    $noListen = "--port $portNumber --noListen `"false`""
+    $comStyle += " --publicHostName='$hostname'"
+    $openFirewall = 'true'
+}
+else
+{
+	$noListen = "--noListen `"true`""
+    $openFirewall = 'false'
+}
+
+if([string]::IsNullOrEmpty($tentacleName))
+{
+	$tentacleName = $hostname
+}
+
+if($openFirewall -eq 'true')
+{
+	Write-Host "Checking SG..." -NoNewline
+    $sgCheck = aws ec2 describe-security-groups --group-names $sgName --output json --filters Name=ip-permission.from-port,Values=$portNumber Name=ip-permission.cidr,Values='0.0.0.0/0' | convertfrom-json
+    
+    if($sgCheck.SecurityGroups.count -eq 0)
+    {
+		Write-Host "Creating SG Rule"
+    	aws ec2 authorize-security-group-ingress --group-name $sgName --ip-permissions IpProtocol=tcp,ToPort=$portNumber,FromPort=$portNumber,IpRanges='[{CidrIp=0.0.0.0/0,Description="OctopusListeningTentacle"}]'
+	}
+    else
+    {
+    	Write-Host "Found Existing SG Rule"
+    }
+}
+
+Write-Verbose "hostname: $hostname`nnoListen: $noListen"
+
+$remoteScript = @"
+{
+	"commands": [
+    	"#!/bin/bash",
+		"curl -L https://octopus.com/downloads/latest/Linux_x64TarGz/OctopusTentacle -o /tmp/tentacle-linux_x64.tar.gz -fsS",
+		"if [ ! -d \"/opt/octopus\" ]; then sudo mkdir /opt/octopus; fi",
+		"tar xvzf /tmp/tentacle-linux_x64.tar.gz -C /opt/octopus",
+		"rm /tmp/tentacle-linux_x64.tar.gz",
+		"cd /opt/octopus/tentacle",
+		"sudo /opt/octopus/tentacle/Tentacle create-instance --config '/etc/octopus/default/tentacle-default.config'",
+		"sudo chmod a+rwx /etc/octopus/default/tentacle-default.config",
+		"/opt/octopus/tentacle/Tentacle new-certificate --if-blank",
+		"/opt/octopus/tentacle/Tentacle configure --port $portNumber --noListen False --reset-trust --app '/home/Octopus/Applications'",
+		"/opt/octopus/tentacle/Tentacle configure --trust $octoThumb",
+		"echo 'Registering the Tentacle $name with server $serverUri in environment $environments with role $roles'",
+		"/opt/octopus/tentacle/Tentacle register-with --server '$serverUri' --apiKey '$apikey' $environments $roles --comms-style $comStyle --name '$tentacleName' --force",
+		"sudo /opt/octopus/tentacle/Tentacle service --install --start"
+	]
+}
+"@
+
+Write-Host "Installing tentacle on remote machine"
+$guid = (new-guid).guid
+Set-Content -Value $remoteScript -Path "$env:Temp/$guid.json"
+
+write-verbose $remoteScript
+
+write-verbose "aws ssm send-command --document-name `"AWS-RunShellScript`" --instance-ids `"$instanceId`" --parameters `"file://$env:Temp/$guid.json`""
+try {
+	$cmdResponse = aws ssm send-command --document-name "AWS-RunShellScript" --instance-ids "$instanceId" --parameters "file://$env:Temp/$guid.json" --query "Command" --output json | convertfrom-json
+    $cmdId = $cmdResponse.CommandId
+    $errorResponse = aws ssm get-command-invocation --command-id "$cmdId" --instance-id "$instanceId" --output json | convertfrom-json
+    
+    while($errorResponse.Status -eq 'InProgress')
+    {
+    	write-verbose "`nStatus: $($errorResponse.Status)"
+    	$errorResponse = aws ssm get-command-invocation --command-id "$cmdId" --instance-id "$instanceId" --output json | convertfrom-json
+    }
+    
+    write-verbose "`nErrorResponse: $errorResponse`n"
+    
+    if(![string]::IsNullOrEmpty($errorResponse.StandardErrorContent))
+    {
+    	throw $errorResponse.StandardErrorContent
+    }
+}
+finally {
+	remove-item "$env:Temp\$guid.json"
+}
diff --git a/src/step-templates/aws-rds-restore-s3/metadata.json b/src/step-templates/aws-rds-restore-s3/metadata.json
new file mode 100644
index 000000000..58fa53d6e
--- /dev/null
+++ b/src/step-templates/aws-rds-restore-s3/metadata.json
@@ -0,0 +1,83 @@
+{
+  "Id": "55848421-44b9-403c-b1f0-ba8a84b1f177",
+  "Name": "AWS RDS SQL Server - Restore from S3 Bucket",
+  "Description": "Will restore a database backup from an S3 bucket",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "3e45bb88-3632-4115-a0d5-54680615f0ca",
+      "Name": "rdsSqlRestoreBackupSqlServer",
+      "Label": "SQL Server",
+      "HelpText": "The SQL Server to perform the work on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "880a4e73-64fe-4a36-b4c3-a281b64e3c23",
+      "Name": "rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights",
+      "Label": "SQL Login",
+      "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6689fbe5-f47a-4800-945d-df50fc19c7b0",
+      "Name": "rdsSqlRestoreBackupSqlLoginPasswordWhoHasRights",
+      "Label": "SQL Password",
+      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "1a358cca-5cd1-41ae-b763-fcaf2c7350f9",
+      "Name": "rdsSqlRestoreBackupDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "The name of the database to restore to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c5e2fa69-1b42-4427-91d2-10e1a13af744",
+      "Name": "rdsSqlRestoreBackupS3Bucket",
+      "Label": "S3 Bucket Name",
+      "HelpText": "The name of the bucket (including any sub directories).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea9d9eb8-9c0f-4c69-a6d4-4d00e43383af",
+      "Name": "rdsSqlRestoreBackupFileName",
+      "Label": "Backup File Name and Extension",
+      "HelpText": "The name of the back up file (including the extension).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-18T13:27:31.3930000Z",
+    "OctopusVersion": "2020.4.0-ci0428",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "octobob",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-rds-restore-s3/scriptbody.ps1 b/src/step-templates/aws-rds-restore-s3/scriptbody.ps1
new file mode 100644
index 000000000..de6ea25c7
--- /dev/null
+++ b/src/step-templates/aws-rds-restore-s3/scriptbody.ps1
@@ -0,0 +1,62 @@
+Write-Host "SqlLoginWhoHasRights $rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights"
+Write-Host "CreateSqlServer $rdsSqlRestoreBackupSqlServer"
+Write-Host "CreateDatabaseName $rdsSqlRestoreBackupDatabaseName"
+Write-Host "Backup S3 Bucket $rdsSqlRestoreBackupS3Bucket"
+Write-Host "Backup File Name $rdsSqlRestoreBackupFileName"
+
+if ([string]::IsNullOrWhiteSpace($rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$rdsSqlRestoreBackupSqlServer;Database=msdb;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$rdsSqlRestoreBackupSqlServer;Database=msdb;User ID=$rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights;Password=$rdsSqlRestoreBackupSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = New-Object System.Data.SqlClient.SqlCommand("dbo.rds_restore_database", $sqlConnection)
+$command.CommandType = [System.Data.CommandType]'StoredProcedure'
+
+$backupDestParamValue = "arn:aws:s3:::$rdsSqlRestoreBackupS3Bucket/$rdsSqlRestoreBackupFileName"
+$command.Parameters.AddWithValue("s3_arn_to_restore_from", $backupDestParamValue)
+$command.Parameters.AddWithValue("with_norecovery", 0)
+$command.Parameters.AddWithValue("restore_db_name", $rdsSqlRestoreBackupDatabaseName)
+
+$taskStatusCommand = New-Object System.Data.SqlClient.SqlCommand("dbo.rds_task_status", $sqlConnection)
+$taskStatusCommand.CommandType = [System.Data.CommandType]'StoredProcedure'
+$taskStatusCommand.Parameters.AddWithValue("db_name", $rdsSqlRestoreBackupDatabaseName)
+
+$taskStatusAdapter = New-Object System.Data.SqlClient.SqlDataAdapter $taskStatusCommand
+
+Write-Host "Opening the connection to $rdsSqlRestoreBackupSqlServer"
+$sqlConnection.Open()
+    
+Write-Host "Executing backup"
+$command.ExecuteNonQuery()
+
+Write-Host "Closing the connection to $rdsSqlRestoreBackupSqlServer"
+$sqlConnection.Close()
+
+Write-Host "Getting status of backup"
+$backupIsActive = $true
+
+While ($backupIsActive)
+{
+	Write-Host "Opening the connection to $rdsSqlRestoreBackupSqlServer"
+	$sqlConnection.Open()
+    
+    $taskStatusDataSet = New-Object System.Data.DataSet
+	$taskStatusAdapter.Fill($taskStatusDataSet)
+    $taskStatus = $taskStatusDataSet.Tables[0].Rows[0]["lifecycle"]
+    $taskComplete = $taskStatusDataSet.Tables[0].Rows[0]["% complete"]
+    
+    Write-Host "The task is $taskComplete% complete."
+    $backupIsActive = $taskStatus -eq "CREATED" -or $taskStatus -eq "IN_PROGRESS"
+    
+    Write-Host "Closing the connection to $rdsSqlRestoreBackupSqlServer"
+	$sqlConnection.Close()
+    
+    Start-Sleep -Seconds 5
+}
\ No newline at end of file
diff --git a/src/step-templates/aws-rds-sql-backup-s3/metadata.json b/src/step-templates/aws-rds-sql-backup-s3/metadata.json
new file mode 100644
index 000000000..76fda5d4d
--- /dev/null
+++ b/src/step-templates/aws-rds-sql-backup-s3/metadata.json
@@ -0,0 +1,83 @@
+{
+  "Id": "3dd60fea-b98a-4760-8867-cbd049f7aa31",
+  "Name": "AWS RDS SQL Server - Backup to S3 Bucket",
+  "Description": "Will create a database user using an existing server user if that database user does not exist without using SMO.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "3e45bb88-3632-4115-a0d5-54680615f0ca",
+      "Name": "rdsSqlBackupSqlServer",
+      "Label": "SQL Server",
+      "HelpText": "The SQL Server to perform the work on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "880a4e73-64fe-4a36-b4c3-a281b64e3c23",
+      "Name": "rdsSqlBackupSqlLoginUserWhoHasCreateUserRights",
+      "Label": "SQL Login",
+      "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6689fbe5-f47a-4800-945d-df50fc19c7b0",
+      "Name": "rdsSqlBackupSqlLoginPasswordWhoHasRights",
+      "Label": "SQL Password",
+      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "1a358cca-5cd1-41ae-b763-fcaf2c7350f9",
+      "Name": "rdsSqlBackupDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "The name of the database to create the user on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c5e2fa69-1b42-4427-91d2-10e1a13af744",
+      "Name": "rdsSqlBackupS3Bucket",
+      "Label": "S3 Bucket Name",
+      "HelpText": "The name of the bucket (including any sub directories).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea9d9eb8-9c0f-4c69-a6d4-4d00e43383af",
+      "Name": "rdsSqlBackupFileName",
+      "Label": "Backup File Name and Extension",
+      "HelpText": "The name of the back up file (including the extension).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-18T14:30:56.4310000Z",
+    "OctopusVersion": "2020.4.0-ci0428",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "octobob",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-rds-sql-backup-s3/scriptbody.ps1 b/src/step-templates/aws-rds-sql-backup-s3/scriptbody.ps1
new file mode 100644
index 000000000..af553a357
--- /dev/null
+++ b/src/step-templates/aws-rds-sql-backup-s3/scriptbody.ps1
@@ -0,0 +1,62 @@
+Write-Host "SqlLoginWhoHasRights $rdsSqlBackupSqlLoginUserWhoHasCreateUserRights"
+Write-Host "CreateSqlServer $rdsSqlBackupSqlServer"
+Write-Host "CreateDatabaseName $rdsSqlBackupDatabaseName"
+Write-Host "Backup S3 Bucket $rdsSqlBackupS3Bucket"
+Write-Host "Backup File Name $rdsSqlBackupFileName"
+
+if ([string]::IsNullOrWhiteSpace($rdsSqlBackupSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$rdsSqlBackupSqlServer;Database=msdb;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$rdsSqlBackupSqlServer;Database=msdb;User ID=$rdsSqlBackupSqlLoginUserWhoHasCreateUserRights;Password=$rdsSqlBackupSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = New-Object System.Data.SqlClient.SqlCommand("dbo.rds_backup_database", $sqlConnection)
+$command.CommandType = [System.Data.CommandType]'StoredProcedure'
+
+$backupDestParamValue = "arn:aws:s3:::$rdsSqlBackupS3Bucket/$rdsSqlBackupFileName"
+$command.Parameters.AddWithValue("s3_arn_to_backup_to", $backupDestParamValue)
+$command.Parameters.AddWithValue("overwrite_S3_backup_file", 1)
+$command.Parameters.AddWithValue("source_db_name", $rdsSqlBackupDatabaseName)
+
+$taskStatusCommand = New-Object System.Data.SqlClient.SqlCommand("dbo.rds_task_status", $sqlConnection)
+$taskStatusCommand.CommandType = [System.Data.CommandType]'StoredProcedure'
+$taskStatusCommand.Parameters.AddWithValue("db_name", $rdsSqlBackupDatabaseName)
+
+$taskStatusAdapter = New-Object System.Data.SqlClient.SqlDataAdapter $taskStatusCommand
+
+Write-Host "Opening the connection to $rdsSqlBackupSqlServer"
+$sqlConnection.Open()
+    
+Write-Host "Executing backup"
+$command.ExecuteNonQuery()
+
+Write-Host "Closing the connection to $rdsSqlBackupSqlServer"
+$sqlConnection.Close()
+
+Write-Host "Getting status of backup"
+$backupIsActive = $true
+
+While ($backupIsActive)
+{
+	Write-Host "Opening the connection to $rdsSqlBackupSqlServer"
+	$sqlConnection.Open()
+    
+    $taskStatusDataSet = New-Object System.Data.DataSet
+	$taskStatusAdapter.Fill($taskStatusDataSet)
+    $taskStatus = $taskStatusDataSet.Tables[0].Rows[0]["lifecycle"]
+    $taskComplete = $taskStatusDataSet.Tables[0].Rows[0]["% complete"]
+    
+    Write-Host "The task is $taskComplete% complete."
+    $backupIsActive = $taskStatus -eq "CREATED" -or $taskStatus -eq "IN_PROGRESS"
+    
+    Write-Host "Closing the connection to $rdsSqlBackupSqlServer"
+	$sqlConnection.Close()
+    
+    Start-Sleep -Seconds 5
+}
\ No newline at end of file
diff --git a/src/step-templates/aws-register-elb-instance/metadata.json b/src/step-templates/aws-register-elb-instance/metadata.json
new file mode 100644
index 000000000..b8eb00b17
--- /dev/null
+++ b/src/step-templates/aws-register-elb-instance/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "cc1ae822-3dcf-4041-a790-69a1267552c2",
+  "Name": "AWS - Register ELB Instance",
+  "Description": "Registers an instance with an ELB",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ec2ClientId",
+      "Label": "AWS EC2 Client Id",
+      "HelpText": "The client id to use when authenticating with AWS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "ec2Credentials",
+      "Label": "AWS EC2 Client Secret",
+      "HelpText": "The client secret used to authenticate with AWS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "elbName",
+      "Label": "AWS ELB Name",
+      "HelpText": "The name of the AWS ELB to add the instance to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "registrationCheckInterval",
+      "Label": "Registration Check Interval",
+      "HelpText": "The number of seconds to wait before checking to see if the Instance has properly registered with the ELB",
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "maxRegistrationCheckCount",
+      "Label": "Maximum Registration Checks",
+      "HelpText": "The maximum number of registration checks to perform before the step fails.",
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ec2Region",
+      "Label": "AWS EC2 Region",
+      "HelpText": "The region in which the ELB lives",
+      "DefaultValue": "us-east-1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-04-30T06:23:14.3500000-07:00",
+  "LastModifiedBy": "DudeSolutions",
+  "$Meta": {
+    "ExportedAt": "2015-04-30T06:25:21.1280000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-register-elb-instance/scriptbody.ps1 b/src/step-templates/aws-register-elb-instance/scriptbody.ps1
new file mode 100644
index 000000000..4885ea197
--- /dev/null
+++ b/src/step-templates/aws-register-elb-instance/scriptbody.ps1
@@ -0,0 +1,96 @@
+# Part 2 of 2
+# Part 1 Deregisters an EC2 instance from an ELB
+# Part 2 Registers an EC2 instance with an ELB and waits for it to be InService
+
+$ec2Region = $OctopusParameters['ec2Region']
+$ec2User = $OctopusParameters['ec2ClientId']
+$ec2Credentials = $OctopusParameters['ec2Credentials']
+$elbName = $OctopusParameters['elbName']
+$instanceId = ""
+$registrationCheckInterval = $OctopusParameters['registrationCheckInterval']
+$maxRegistrationCheckCount = $OctopusParameters['maxRegistrationCheckCount']
+
+# Load EC2 credentials (not sure if this is needed when executed from an EC2 box)
+try
+{
+	Write-Host "Loading AWS Credentials..."
+	Import-Module AWSPowerShell
+	Set-AWSCredentials -AccessKey $ec2User -SecretKey $ec2Credentials
+	Set-DefaultAWSRegion $ec2Region
+	Write-Host "AWS Credentials Loaded."
+}
+catch
+{
+	Write-Error -Message "Failed to load AWS Credentials." -Exception $_.Exception
+	Exit 1
+}
+
+# Get EC2 Instance
+try
+{
+	$response = Invoke-RestMethod -Uri "http://169.254.169.254/latest/meta-data/instance-id" -Method Get
+	if ($response)
+	{
+		$instanceId = $response
+	}
+	else
+	{
+		Write-Error -Message "Returned Instance ID does not appear to be valid"
+		Exit 1
+	}
+}
+catch
+{
+	Write-Error -Message "Failed to load instance ID from AWS." -Exception $_.Exception
+	Exit 1
+}
+
+# Register the current EC2 instance
+Write-Host "Registering instance $instanceId with $elbName."
+try
+{
+	Register-ELBInstanceWithLoadBalancer -LoadBalancerName $elbName -Instance $instanceId
+	Write-Host "Instance Registered, waiting for registration to complete."
+	
+	$instanceState = (Get-ELBInstanceHealth -LoadBalancerName $elbName -Instance $instanceId).State
+	Write-Host "Current State: $instanceState"
+	
+	$checkCount = 0
+	
+	Write-Host "Retry Parameters:"
+	Write-Host "Maximum Checks: $maxRegistrationCheckCount"
+	Write-Host "Check Interval: $registrationCheckInterval"
+	
+	While ($instanceState -ne "InService" -and $checkCount -le $maxRegistrationCheckCount)
+	{	
+		$checkCount += 1
+		
+		# Wait a bit until we check the status
+		Write-Host "Waiting for $registrationCheckInterval seconds for instance to register"
+		Start-Sleep -Seconds $registrationCheckInterval
+		
+		if ($checkCount -le $maxRegistrationCheckCount)
+		{
+			Write-Host "$checkCount/$maxRegistrationCheckCount Attempts"
+		}
+		
+		$instanceState = (Get-ELBInstanceHealth -LoadBalancerName $elbName -Instance $instanceId).State
+		
+		Write-Host "Current instance state: $instanceState"
+	}
+	
+	if ($instanceState -eq "InService")
+	{
+		Write-Host "Registration complete."
+	}
+	else
+	{
+		Write-Error -Message "Failed to register instance: $instanceState"
+		Exit 1
+	}
+}
+catch
+{
+	Write-Error -Message "Failed to Register instance." -Exception $_.Exception
+	Exit 1
+}
\ No newline at end of file
diff --git a/src/step-templates/aws-secrets-manager-retrieve-secrets/metadata.json b/src/step-templates/aws-secrets-manager-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..fd5465e66
--- /dev/null
+++ b/src/step-templates/aws-secrets-manager-retrieve-secrets/metadata.json
@@ -0,0 +1,69 @@
+{
+  "Id": "5d5bd3ae-09a0-41ac-9a45-42a96ee6206a",
+  "Name": "AWS Secrets Manager - Retrieve Secrets",
+  "Description": "This step retrieves one or more secrets from AWS [Secrets Manager](https://aws.amazon.com/secrets-manager) and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. The step supports creating a variable for each key-value in a secret that's retrieved, or you can specify individual keys. These values can be used in other steps in your deployment or runbook process.\n\n---\n\n**Specifying Secret names/keys to retrieve:**\n\nSpecify the names of the secrets to be returned from AWS Secrets Manager, in the format:\n\n`SecretName SecretVersionId SecretVersionStage | KeyNames | OutputVariableName` where:\n\n- `SecretName` is the name of the secret to retrieve. You can specify either the `Amazon Resource Name (ARN)` or the friendly name of the secret.\n- `SecretVersionId` is the unique identifier of the version of the secret that you want to retrieve. If this value isn't specified, the version with the `VersionStage` value as specified in `SecretVersionStage` will be retrieved.\n- `SecretVersionStage` specifies the secret version that you want to retrieve by the staging label attached to the version. *Staging labels are used to keep track of different versions during the rotation process*. If this value isn't specified, the version with the `VersionStage` value of `AWSCURRENT` will be retrieved.\n- `KeyNames` are the names of the keys stored in the secret that you wish to retrieve values for. Multiple fields can be retrieved separated by a space. Alternatively, you can specify all fields using the special keyword `all` or `*`.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. If multiple fields are specified the field name will be appended to this value. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Examples:**\n\nGiven a secret named `OctoSamples-usercredentials`:\n\n1. `OctoSamples-usercredentials | Username | octousername`\n   \n   This would retrieve the secret and extract the value from the key-value named `Username` and save it into a sensitive output variable named `octousername`.\n\n2. `OctoSamples-usercredentials | Username Password | octocreds`\n   \n   This would retrieve the secret named `OctoSamples-usercredentials`, and then extract the values from the key-values named `Username` and `Password` and save them to two sensitive output variables named `octocreds.Username` and `octocreds.Password`.\n\n3. `OctoSamples-usercredentials | * | octocreds`\n   \n   This would retrieve the secret named `OctoSamples-usercredentials`, and then extract all key-values from the secret and save them to sensitive output variables *prefixed* with `octocreds`.\n\n4. `OctoSamples-usercredentials | all`\n   \n   This would retrieve the secret named `OctoSamples-usercredentials`, and then extract all key-values from the secret and save them to sensitive output variables *prefixed* with `OctoSamples-usercredentials`.\n\n---\n\n**AWS Dependencies:**\n\nThere are some dependencies/requirements for this step to work successfully.\n\n1. **CLI** - This step uses AWS tooling pre-installed on the target or worker. \n\n    Scripts executed in this step need to use the [AWS CLI](https://aws.amazon.com/cli/) to authenticate to AWS and perform other actions. If the CLI can't be found, the step will fail.\n\n2. **AWS Account** - An [AWS account](https://octopus.com/docs/infrastructure/accounts/aws) with permissions to retrieve secrets from AWS Secrets Manager is also required.\n\n---\n\n**Notes:** \n- Tested on Octopus **2021.2**.\n- Tested on both Windows Server 2019 and Ubuntu 20.04.\n\n",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.AwsAccount.Variable": "#{AWS.SecretsManager.RetrieveSecrets.Account}",
+    "Octopus.Action.Aws.Region": "#{AWS.SecretsManager.RetrieveSecrets.Region}"
+  },
+  "Parameters": [
+    {
+      "Id": "8623cdbe-f962-4801-9470-5d14d1d7d5ed",
+      "Name": "AWS.SecretsManager.RetrieveSecrets.Account",
+      "Label": "AWS Account",
+      "HelpText": "An AWS account with permissions to access secrets from Secrets Manager.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "55a1d3e8-90c8-4c1a-a315-246fd8660e81",
+      "Name": "AWS.SecretsManager.RetrieveSecrets.Region",
+      "Label": "AWS Region",
+      "HelpText": "Specify the default region. View the [AWS Regions and Endpoints](https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region) documentation for a current list of the available region codes.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e204a03d-80a6-437a-9a8b-8812c299741c",
+      "Name": "AWS.SecretsManager.RetrieveSecrets.SecretNames",
+      "Label": "Secret names to retrieve",
+      "HelpText": "Specify the names of the secrets to be returned from AWS Secrets Manager, in the format:\n\n`SecretName SecretVersionId SecretVersionStage | KeyNames | OutputVariableName` where:\n\n- `SecretName` is the name of the secret to retrieve. You can specify either the `Amazon Resource Name (ARN)` or the friendly name of the secret.\n- `SecretVersionId` is the unique identifier of the version of the secret that you want to retrieve. If this value isn't specified, the version with the `VersionStage` value as specified in `SecretVersionStage` will be retrieved.\n- `SecretVersionStage` specifies the secret version that you want to retrieve by the staging label attached to the version. *Staging labels are used to keep track of different versions during the rotation process*. If this value isn't specified, the version with the `VersionStage` value of `AWSCURRENT` will be retrieved.\n- `KeyNames` are the names of the keys stored in the secret that you wish to retrieve values for. Multiple fields can be retrieved separated by a space. Alternatively, you can specify all fields using the special keyword `all` or `*`. *See the step description for examples*.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. If multiple fields are specified the field name will be appended to this value. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "17ba53a4-bf94-498c-8905-0d37b86eaeea",
+      "Name": "AWS.SecretsManager.RetrieveSecrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2023-04-22T17:43:19.5800000Z",
+    "OctopusVersion": "2023.2.6614",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-secrets-manager-retrieve-secrets/scriptbody.ps1 b/src/step-templates/aws-secrets-manager-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..c5b9e12b7
--- /dev/null
+++ b/src/step-templates/aws-secrets-manager-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,198 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$SecretNames = $OctopusParameters["AWS.SecretsManager.RetrieveSecrets.SecretNames"]
+$PrintVariableNames = $OctopusParameters["AWS.SecretsManager.RetrieveSecrets.PrintVariableNames"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($SecretNames)) {
+    throw "Required parameter AWS.SecretsManager.RetrieveSecrets.SecretNames not specified"
+}
+
+# Functions
+function Format-SecretName {
+    [CmdletBinding()]
+    Param(
+        [string] $Name,
+        [string] $VersionId,
+        [string] $VersionStage,
+        [string[]] $Keys
+    )
+    $displayName = "'$Name'"
+    if (![string]::IsNullOrWhiteSpace($VersionId)) {
+        $displayName += " $VersionId"
+    }
+    if (![string]::IsNullOrWhiteSpace($VersionStage)) {
+        $displayName += " $VersionStage"
+    }
+    if ($Keys.Count -gt 0) {
+        $displayName += " ($($Keys -Join ","))"
+    }
+    return $displayName
+}
+
+function Save-OctopusVariable {
+    Param(
+        [string] $name,
+        [string] $value
+    )
+    if ($script:storedVariables -icontains $name) {
+        Write-Warning "A variable with name '$name' has already been created. Check your secret name parameters as this will likely cause unexpected behavior and should be investigated."
+    }
+    Set-OctopusVariable -Name $name -Value $value -Sensitive
+    $script:storedVariables += $name
+
+    if ($PrintVariableNames -eq $True) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$name}"
+    }
+}
+
+# End Functions
+
+$script:storedVariables = @()
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$Secrets = @()
+
+# Extract secret names
+@(($SecretNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working establishing secret definition for: '$_'"
+        $secretDefinition = ($_ -Split "\|")
+        
+        # Establish the secret name/version requirements
+        $secretName = $secretDefinition[0].Trim()
+        $secretVersionId = ""
+        $secretVersionStage = ""
+        $secretNameAndVersion = ($secretName -Split " ")
+        
+        if ($secretNameAndVersion.Count -gt 1) {
+            $secretName = $secretNameAndVersion[0].Trim()
+            $secretVersionId = $secretNameAndVersion[1].Trim()
+            if ($secretNameAndVersion.Count -eq 3) {
+                $secretVersionStage = $secretNameAndVersion[2].Trim()
+            }
+        }
+    
+        if ([string]::IsNullOrWhiteSpace($secretName)) {
+            throw "Unable to establish secret name from: '$($_)'"
+        }
+
+        # Establish the secret field(s)/output variable name requirements.
+        $VariableName = ""
+        $Keys = @()
+        if ($secretDefinition.Count -gt 1) {
+            $KeyNames = $secretDefinition[1].Trim()        
+            $Keys = @(($KeyNames -Split " "))
+            $EmptyKeys = $Keys | Where-Object { [string]::IsNullOrWhiteSpace($_) }
+            if ($Keys.Count -le 0 -or $EmptyKeys.Count -gt 0) {
+                throw "No keys (field names) were specified for '$_'. To retrieve all keys in a secret, add the word ALL or the wildcard (*) character."    
+            }
+            
+            if ($secretDefinition.Count -gt 2) {
+                $VariableName = $secretDefinition[2].Trim()
+            }
+        }
+        else {
+            throw "No keys (field names) were specified for '$_'. To retrieve all keys in a secret, add the word ALL or the wildcard (*) character."
+        }
+
+        $secret = [PsCustomObject]@{
+            Name                 = $secretName
+            SecretVersionId      = $secretVersionId
+            SecretVersionStage   = $secretVersionStage
+            Keys                 = $Keys
+            variableNameOrPrefix = $VariableName
+        }
+        $Secrets += $secret
+    }
+}
+
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "Print variables: $PrintVariableNames"
+
+$retrievedSecrets = @{}
+
+# Retrieve Secrets
+foreach ($secret in $secrets) {
+    $name = $secret.Name
+    $versionId = $secret.SecretVersionId
+    $versionStage = $secret.SecretVersionStage
+    $variableNameOrPrefix = $secret.variableNameOrPrefix
+    $keys = $secret.Keys
+    
+    # Should we extract only specified keys, or all values?
+    $SpecifiedKeys = $True
+    if ($keys.Count -eq 1 -and ($keys[0] -ieq "all" -or $keys[0] -ieq "*")) {
+        $SpecifiedKeys = $False
+    }
+    
+    $displayName = Format-SecretName -Name $name -VersionId $versionId -VersionStage $versionStage -Keys $keys
+    Write-Verbose "Retrieving Secret $displayName"
+    $_secretIdentifier = "$name"
+
+    $params = @("--secret-id $name")
+    if (![string]::IsNullOrWhiteSpace($versionId)) {
+        $params += "--version-id $versionId"
+        $_secretIdentifier += "_$versionId"
+    }
+    if (![string]::IsNullOrWhiteSpace($versionStage)) {
+        $params += "--version-stage $versionStage"
+        $_secretIdentifier += "_$versionStage"
+    }
+    
+    # Check to see if we've already retrieved this secret value to save on requests
+    if (-not $retrievedSecrets.ContainsKey($_secretIdentifier)) {
+        $command = "aws secretsmanager get-secret-value $($params -Join " ")"
+        Write-Verbose "Invoking command: $command"
+        $response = Invoke-Expression -Command $command
+        if ([string]::IsNullOrWhiteSpace($response)) {
+            throw "Error: Secret $displayName not found or has no versions."
+        }
+        Write-Verbose "Added secret to retrieved collection ($_secretIdentifier)"
+        $retrievedSecrets.Add($_secretIdentifier, $response)
+    }
+    else {
+        Write-Verbose "Rehydrating previously stored secret ($_secretIdentifier) instead of calling AWS."
+        $response = $retrievedSecrets.$_secretIdentifier
+    }    
+    
+    try {
+        $AwsSecret = $response | ConvertFrom-Json
+        $AwsSecretValue = $AwsSecret.SecretString | ConvertFrom-Json
+        $secretKeyValues = $AwsSecretValue | Get-Member | Where-Object { $_.MemberType -eq "NoteProperty" } | Select-Object -ExpandProperty "Name"
+    }
+    catch {
+        Write-Error "Error converting JSON value returned from AWS for $displayName.`n`nIf secret value is stored as JSON in Plaintext (vs Key/value), check contents validity"
+    }
+    if ($SpecifiedKeys -eq $True) {
+        foreach ($keyName in $keys) {
+            $variableName = $variableNameOrPrefix
+            if ([string]::IsNullOrWhiteSpace($variableName)) {
+                $variableName = "$($name.Trim())"
+            }
+            if ($keys.Count -gt 1) {
+                $variableName += ".$keyName"
+            }
+            if ($secretKeyValues -inotcontains $keyName) {
+                throw "Key '$keyName' not found in AWS Secret: $name."
+            }
+            $variableValue = $AwsSecretValue.$keyName
+            Save-OctopusVariable -Name $variableName -Value $variableValue            
+        }
+    }
+    else {
+        foreach ($secretKeyValueName in $secretKeyValues) {
+            $variableName = $variableNameOrPrefix
+            if ([string]::IsNullOrWhiteSpace($variableName)) {
+                $variableName = "$($name.Trim())"
+            }
+            if ($secretKeyValues.Count -gt 1) {
+                $variableName += ".$secretKeyValueName"
+            }
+            $variableValue = $AwsSecretValue.$secretKeyValueName
+            Save-OctopusVariable -Name $variableName -Value $variableValue
+        }
+    }
+}
+
+Write-Host "Created $($script:storedVariables.Count) output variables"
\ No newline at end of file
diff --git a/step-templates/aws-set-blue-green-target-group.json b/src/step-templates/aws-set-blue-green-target-group/metadata.json
similarity index 66%
rename from step-templates/aws-set-blue-green-target-group.json
rename to src/step-templates/aws-set-blue-green-target-group/metadata.json
index 004d1e8c9..2e7967f59 100644
--- a/step-templates/aws-set-blue-green-target-group.json
+++ b/src/step-templates/aws-set-blue-green-target-group/metadata.json
@@ -15,7 +15,7 @@
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
     "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}",
-    "Octopus.Action.Script.ScriptBody": "#!/bin/bash\n\nRULE=${1:-'#{AWSBlueGreen.AWS.RuleArn | Trim}'}\nOFFLINEGROUP=${2:-'#{AWSBlueGreen.AWS.OfflineTargetGroup | Trim}'}\nONLINEGROUP=${3:-'#{AWSBlueGreen.AWS.OnlineTargetGroup | Trim}'}\n\nechoerror() { echo \"$@\" 1>&2; }\n\nif ! command -v \"aws\" &> /dev/null; then\n  echoerror \"You must have the AWS CLI installed for this step.\"\n  exit 1\nfi\n\nif [[ -z \"${RULE}\" ]]; then\n  echoerror \"Please provide the ARN of the listener rule as the first argument\"\n  exit 1\nfi\n\nif [[ -z \"${OFFLINEGROUP}\" ]]; then\n  echoerror \"Please provide the ARN of the offline target group as the second argument\"\n  exit 1\nfi\n\nif [[ -z \"${ONLINEGROUP}\" ]]; then\n  echoerror \"Please provide the ARN of the online target group as the third argument\"\n  exit 1\nfi\n\n# https://stackoverflow.com/questions/61074411/modify-aws-alb-traffic-distribution-using-aws-cli\nMODIFYRULE=$(aws elbv2 modify-rule \\\n  --rule-arn \"${RULE}\" \\\n  --actions \\\n    \"[{\n        \\\"Type\\\": \\\"forward\\\",\n        \\\"Order\\\": 1,\n        \\\"ForwardConfig\\\": {\n          \\\"TargetGroups\\\": [\n              {\\\"TargetGroupArn\\\": \\\"${OFFLINEGROUP}\\\", \\\"Weight\\\": 0 },\n              {\\\"TargetGroupArn\\\": \\\"${ONLINEGROUP}\\\", \\\"Weight\\\": 100 }\n          ]\n        }\n     }]\")\n\necho \"Updated listener rules for ${RULE} to set weight to 0 for ${OFFLINEGROUP} and 100 for ${ONLINEGROUP}.\"\n\nwrite_verbose \"${MODIFYRULE}\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
     "Octopus.Action.RunOnServer": "true"
   },
   "Parameters": [
@@ -72,7 +72,7 @@
   ],
   "StepPackageId": "Octopus.AwsRunScript",
   "$Meta": {
-    "ExportedAt": "2025-01-10T03:44:19.550Z",
+    "ExportedAt": "2025-01-10T03:44:19.5500000Z",
     "OctopusVersion": "2025.1.5319",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-set-blue-green-target-group/scriptbody.sh b/src/step-templates/aws-set-blue-green-target-group/scriptbody.sh
new file mode 100644
index 000000000..0955e5a61
--- /dev/null
+++ b/src/step-templates/aws-set-blue-green-target-group/scriptbody.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+RULE=${1:-'#{AWSBlueGreen.AWS.RuleArn | Trim}'}
+OFFLINEGROUP=${2:-'#{AWSBlueGreen.AWS.OfflineTargetGroup | Trim}'}
+ONLINEGROUP=${3:-'#{AWSBlueGreen.AWS.OnlineTargetGroup | Trim}'}
+
+echoerror() { echo "$@" 1>&2; }
+
+if ! command -v "aws" &> /dev/null; then
+  echoerror "You must have the AWS CLI installed for this step."
+  exit 1
+fi
+
+if [[ -z "${RULE}" ]]; then
+  echoerror "Please provide the ARN of the listener rule as the first argument"
+  exit 1
+fi
+
+if [[ -z "${OFFLINEGROUP}" ]]; then
+  echoerror "Please provide the ARN of the offline target group as the second argument"
+  exit 1
+fi
+
+if [[ -z "${ONLINEGROUP}" ]]; then
+  echoerror "Please provide the ARN of the online target group as the third argument"
+  exit 1
+fi
+
+# https://stackoverflow.com/questions/61074411/modify-aws-alb-traffic-distribution-using-aws-cli
+MODIFYRULE=$(aws elbv2 modify-rule \
+  --rule-arn "${RULE}" \
+  --actions \
+    "[{
+        \"Type\": \"forward\",
+        \"Order\": 1,
+        \"ForwardConfig\": {
+          \"TargetGroups\": [
+              {\"TargetGroupArn\": \"${OFFLINEGROUP}\", \"Weight\": 0 },
+              {\"TargetGroupArn\": \"${ONLINEGROUP}\", \"Weight\": 100 }
+          ]
+        }
+     }]")
+
+echo "Updated listener rules for ${RULE} to set weight to 0 for ${OFFLINEGROUP} and 100 for ${ONLINEGROUP}."
+
+write_verbose "${MODIFYRULE}"
\ No newline at end of file
diff --git a/step-templates/aws-update-launch-template-ami.json b/src/step-templates/aws-update-launch-template-ami/metadata.json
similarity index 50%
rename from step-templates/aws-update-launch-template-ami.json
rename to src/step-templates/aws-update-launch-template-ami/metadata.json
index 7c409d9e9..4f8ca0176 100644
--- a/step-templates/aws-update-launch-template-ami.json
+++ b/src/step-templates/aws-update-launch-template-ami/metadata.json
@@ -15,7 +15,7 @@
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
     "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}",
-    "Octopus.Action.Script.ScriptBody": "#!/bin/bash\n\nASG=${1:-'#{AWSBlueGreen.AWS.ASG | Trim}'}\nAMI=${2:-'#{AWSBlueGreen.AWS.AMI | Trim}'}\nVERSIONDESCRIPTION=${3:-'#{AWSBlueGreen.AWS.LaunchTemplateDescription | Trim}'}\n\nechoerror() { echo \"$@\" 1>&2; }\n\nif ! command -v \"aws\" &> /dev/null; then\n  echoerror \"You must have the AWS CLI installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers\"\n  exit 1\nfi\n\nif ! command -v \"jq\" &> /dev/null; then\n  echoerror \"You must have jq installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers\"\n  exit 1\nfi\n\nif [[ -z \"${ASG}\" ]]; then\n  echoerror \"Please provide the name of the Auto Scaling group as the first argument\"\n  exit 1\nfi\n\nif [[ -z \"${AMI}\" ]]; then\n  echoerror \"Please provide the ID of the new AMI as the second argument\"\n  exit 1\nfi\n\nif [[ -z \"${VERSIONDESCRIPTION}\" ]]; then\n  echoerror \"Please provide a description for the new launch template version as the third argument\"\n  exit 1\nfi\n\nLAUNCHTEMPLATE=$(aws autoscaling describe-auto-scaling-groups \\\n  --auto-scaling-group-names \"${ASG}\" \\\n  --query 'AutoScalingGroups[0].LaunchTemplate.LaunchTemplateId' \\\n  --output text)\n\necho \"Modifying launch template ${LAUNCHTEMPLATE} for Auto Scaling group ${ASG}...\"\n\nNEWVERSION=$(aws ec2 create-launch-template-version \\\n    --launch-template-id \"${LAUNCHTEMPLATE}\" \\\n    --version-description \"${VERSIONDESCRIPTION}\" \\\n    --source-version 1 \\\n    --launch-template-data \"ImageId=${AMI}\")\n\nNEWVERSIONNUMBER=$(jq -r '.LaunchTemplateVersion.VersionNumber' <<< \"${NEWVERSION}\")\n\necho \"Set AMI for launch template ${LAUNCHTEMPLATE} to ${AMI}, generating new version ${NEWVERSIONNUMBER}...\"\n\nwrite_verbose \"${NEWVERSION}\"\n\nMODIFYTEMPLATE=$(aws ec2 modify-launch-template \\\n    --launch-template-id \"${LAUNCHTEMPLATE}\" \\\n    --default-version \"${NEWVERSIONNUMBER}\")\n\necho \"Set default version for launch template ${LAUNCHTEMPLATE} to ${NEWVERSIONNUMBER}...\"\n\nwrite_verbose \"${MODIFYTEMPLATE}\"\n\nUPDATELAUNCHTEMPLATEVERSION=$(aws autoscaling update-auto-scaling-group \\\n  --auto-scaling-group-name \"${ASG}\" \\\n  --launch-template \"LaunchTemplateId=${LAUNCHTEMPLATE},Version=${NEWVERSIONNUMBER}\")\n\necho \"Updated the ASG launch template version to ${NEWVERSIONNUMBER}...\"\n\nwrite_verbose \"${UPDATELAUNCHTEMPLATEVERSION}\"\n\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -71,7 +71,7 @@
   ],
   "StepPackageId": "Octopus.AwsRunScript",
   "$Meta": {
-    "ExportedAt": "2025-01-10T03:43:20.697Z",
+    "ExportedAt": "2025-01-10T03:43:20.6970000Z",
     "OctopusVersion": "2025.1.5319",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/aws-update-launch-template-ami/scriptbody.sh b/src/step-templates/aws-update-launch-template-ami/scriptbody.sh
new file mode 100644
index 000000000..c07d494ae
--- /dev/null
+++ b/src/step-templates/aws-update-launch-template-ami/scriptbody.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+ASG=${1:-'#{AWSBlueGreen.AWS.ASG | Trim}'}
+AMI=${2:-'#{AWSBlueGreen.AWS.AMI | Trim}'}
+VERSIONDESCRIPTION=${3:-'#{AWSBlueGreen.AWS.LaunchTemplateDescription | Trim}'}
+
+echoerror() { echo "$@" 1>&2; }
+
+if ! command -v "aws" &> /dev/null; then
+  echoerror "You must have the AWS CLI installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers"
+  exit 1
+fi
+
+if ! command -v "jq" &> /dev/null; then
+  echoerror "You must have jq installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers"
+  exit 1
+fi
+
+if [[ -z "${ASG}" ]]; then
+  echoerror "Please provide the name of the Auto Scaling group as the first argument"
+  exit 1
+fi
+
+if [[ -z "${AMI}" ]]; then
+  echoerror "Please provide the ID of the new AMI as the second argument"
+  exit 1
+fi
+
+if [[ -z "${VERSIONDESCRIPTION}" ]]; then
+  echoerror "Please provide a description for the new launch template version as the third argument"
+  exit 1
+fi
+
+LAUNCHTEMPLATE=$(aws autoscaling describe-auto-scaling-groups \
+  --auto-scaling-group-names "${ASG}" \
+  --query 'AutoScalingGroups[0].LaunchTemplate.LaunchTemplateId' \
+  --output text)
+
+echo "Modifying launch template ${LAUNCHTEMPLATE} for Auto Scaling group ${ASG}..."
+
+NEWVERSION=$(aws ec2 create-launch-template-version \
+    --launch-template-id "${LAUNCHTEMPLATE}" \
+    --version-description "${VERSIONDESCRIPTION}" \
+    --source-version 1 \
+    --launch-template-data "ImageId=${AMI}")
+
+NEWVERSIONNUMBER=$(jq -r '.LaunchTemplateVersion.VersionNumber' <<< "${NEWVERSION}")
+
+echo "Set AMI for launch template ${LAUNCHTEMPLATE} to ${AMI}, generating new version ${NEWVERSIONNUMBER}..."
+
+write_verbose "${NEWVERSION}"
+
+MODIFYTEMPLATE=$(aws ec2 modify-launch-template \
+    --launch-template-id "${LAUNCHTEMPLATE}" \
+    --default-version "${NEWVERSIONNUMBER}")
+
+echo "Set default version for launch template ${LAUNCHTEMPLATE} to ${NEWVERSIONNUMBER}..."
+
+write_verbose "${MODIFYTEMPLATE}"
+
+UPDATELAUNCHTEMPLATEVERSION=$(aws autoscaling update-auto-scaling-group \
+  --auto-scaling-group-name "${ASG}" \
+  --launch-template "LaunchTemplateId=${LAUNCHTEMPLATE},Version=${NEWVERSIONNUMBER}")
+
+echo "Updated the ASG launch template version to ${NEWVERSIONNUMBER}..."
+
+write_verbose "${UPDATELAUNCHTEMPLATEVERSION}"
+
diff --git a/src/step-templates/aws-windows-install-tentacle/metadata.json b/src/step-templates/aws-windows-install-tentacle/metadata.json
new file mode 100644
index 000000000..a818e79c9
--- /dev/null
+++ b/src/step-templates/aws-windows-install-tentacle/metadata.json
@@ -0,0 +1,159 @@
+{
+  "Id": "234ed1c6-a5fa-47ee-8669-a187d8787057",
+  "Name": "AWS Win - Install Octopus Tentacle",
+  "Description": "This step template will install the latest tentacle on an AWS hosted, Windows virtual machine. This will also open the firewall for inbound traffic on port 10933 on the Security Group.\n<hr />\n*Note: Expects the AWS CLI and Powershell to be installed on the worker running this task*",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Azure.AccountId": "#{awsInstallWinTentacle.AWSAccount}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "Octopus.Action.AwsAccount.Variable": "#{awsInstallWinTentacle.AWSAccount}",
+    "Octopus.Action.Aws.Region": "#{awsInstallWinTentacle.awsRegion}"
+  },
+  "Parameters": [
+    {
+      "Id": "dea51842-271f-48fa-901e-243488049f97",
+      "Name": "awsInstallWinTentacle.AWSAccount",
+      "Label": "AWS Account",
+      "HelpText": "AWS account with permissions to the virtual machine in which to install the tentacle on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "6a97548c-3b97-4a19-8b9a-45aa58ac62d9",
+      "Name": "awsInstallWinTentacle.awsRegion",
+      "Label": "AWS Region",
+      "HelpText": "The name of the aws region. I.E. `us-east-1`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d9efb017-65c0-4010-b09f-0a6a34fc009f",
+      "Name": "awsInstallWinTentacle.awsSGName",
+      "Label": "Security Group Name",
+      "HelpText": "The name of the AWS security group to create an exception in",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e4358aec-2798-412a-bcd2-1c7e41a0728d",
+      "Name": "awsInstallWinTentacle.awsVmInstanceId",
+      "Label": "VM Instance ID",
+      "HelpText": "The instance ID of the virtual machine to target when ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8dbe0a29-4e0f-43f8-8ef2-ae23a2884e85",
+      "Name": "awsInstallWinTentacle.octoServerThumb",
+      "Label": "Server Thumbprint",
+      "HelpText": "The Thumbprint of the octopus server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "a0859551-6c84-45d1-af2b-c57becb4e8ef",
+      "Name": "awsInstallWinTentacle.octoApiKey",
+      "Label": "Octo User API Key",
+      "HelpText": "The API key used to configure the tentacle.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "dd07815d-bfb7-43b9-90f8-21ec5a2d2953",
+      "Name": "awsInstallWinTentacle.octopusRoles",
+      "Label": "Roles",
+      "HelpText": "Roles to assign to this tentacle installation. <br />\n*Note: Each role should be on it's own line*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "d3ffb38e-7fcf-4547-be9a-6cd8e46f8e5e",
+      "Name": "awsInstallWinTentacle.octopusEnvironments",
+      "Label": "Environments",
+      "HelpText": "Environments to assign this tentacle installation to.<br />\n*Note: Each environment should be on its own line*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "15150827-7bd3-4146-a798-66344851f602",
+      "Name": "instrallTentacle.octoServerUrl",
+      "Label": "Octo Server Url",
+      "HelpText": "The server url to register the tentacle with.  Defaults to the base url",
+      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9bcd6bb5-2db3-453f-b4f6-6a78f3c39b59",
+      "Name": "awsInstallWinTentacle.tentacleType",
+      "Label": "Tentacle Type",
+      "HelpText": "Select between a listening or polling tentacle",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "TentaclePassive|Listening\nTentacleActive|Polling"
+      }
+    },
+    {
+      "Id": "6bb98570-fe3e-4ab7-adfb-79ef7ce5c2ce",
+      "Name": "awsInstallWinTentacle.tentacleHostName",
+      "Label": "Tentacle Host Name",
+      "HelpText": "The host name to register the listening tentacles with. Octopus deploy server uses this value to reach out to the vm.<br />\n*Note: Leave blank to automatically use assigned public IP address.*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "386d9f39-9e90-4215-b739-53a1af5bd105",
+      "Name": "awsInstallWinTentacle.tentacleName",
+      "Label": "Tentacle Name",
+      "HelpText": "The name of the tentacle to use in the infrastructure area of octopus deploy.  Will use the host name if not provided",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2dc806d8-bba5-44a7-b21d-4b3f041f4d49",
+      "Name": "awsInstallWinTentacle.portNumber",
+      "Label": "Port Number",
+      "HelpText": "Port number used when installing and registering the tentacle. This is also the port opened on the firewall",
+      "DefaultValue": "10933",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "aws"
+}
diff --git a/src/step-templates/aws-windows-install-tentacle/scriptbody.ps1 b/src/step-templates/aws-windows-install-tentacle/scriptbody.ps1
new file mode 100644
index 000000000..4aadbc8b7
--- /dev/null
+++ b/src/step-templates/aws-windows-install-tentacle/scriptbody.ps1
@@ -0,0 +1,138 @@
+$sgName = $OctopusParameters["awsInstallWinTentacle.awsSGName"]
+$instanceId = $OctopusParameters["awsInstallWinTentacle.awsVmInstanceId"]
+$serverUri = $OctopusParameters["awsInstallWinTentacle.octoServerUrl"]
+$apiKey = $OctopusParameters["awsInstallWinTentacle.octoApiKey"]
+$rolesRaw = $OctopusParameters["awsInstallWinTentacle.octopusRoles"]
+$enviroRaw = $OctopusParameters["awsInstallWinTentacle.octopusEnvironments"]
+$octoThumb = $OctopusParameters["awsInstallWinTentacle.octoServerThumb"]
+$comStyle = $OctopusParameters["awsInstallWinTentacle.tentacleType"]
+$hostname = $OctopusParameters["awsInstallWinTentacle.tentacleHostName"]
+$tentacleName = $OctopusParameters["awsInstallWinTentacle.tentacleName"]
+$portNumber = $OctopusParameters["awsInstallWinTentacle.portNumber"]
+
+Write-Host "Parsing Parameters"
+
+if([string]::IsNullOrEmpty($sgName))
+{
+	throw "Security Group name must be provided"
+}
+
+if([string]::IsNullOrEmpty($instanceId))
+{
+	throw "Instance Id must be provided"
+}
+
+if([string]::IsNullOrEmpty($apiKey))
+{
+	throw "apiKey must be provided"
+}
+
+if([string]::IsNullOrEmpty($rolesRaw))
+{
+	throw "At least one role must be defined"
+}
+
+if([string]::IsNullOrEmpty($enviroRaw))
+{
+	throw "At least one environment must be defined"
+}
+
+if([string]::IsNullOrEmpty($octoThumb))
+{
+	throw "octo thumbprint must be provided"
+}
+
+$roles = ""
+$rolesRaw -split "`n" | ForEach-Object { $roles += "--role $_ "}
+$roles = $roles.TrimEnd(' ')
+
+$environments = ""
+$enviroRaw -split "`n" | ForEach-Object { $environments += "--env $_ "}
+$environments = $environments.TrimEnd(' ')
+
+if($comStyle -eq "TentaclePassive")
+{
+	if([string]::IsNullOrEmpty($hostname))
+    {
+    	$hostname = aws ec2 describe-instances --filters "Name=instance-id,Values=$instanceId" --query "Reservations[].Instances[].NetworkInterfaces[].Association.PublicIp" --output=text
+        $hostname = $hostname.Trim("`n")
+    }
+
+    $noListen = "--port $portNumber --noListen 'false'"
+    $comStyle += " --publicHostName='$hostname'"
+    $openFirewall = 'true'
+}
+else
+{
+	$noListen = "--noListen 'true'"
+    $openFirewall = 'false'
+}
+
+if([string]::IsNullOrEmpty($tentacleName))
+{
+	$tentacleName = $hostname
+}
+
+if($openFirewall -eq 'true')
+{
+	Write-Host "Checking SG..." -NoNewline
+    $sgCheck = aws ec2 describe-security-groups --group-names $sgName --output json --filters Name=ip-permission.from-port,Values=$portNumber Name=ip-permission.cidr,Values='0.0.0.0/0' | convertfrom-json
+
+    if($sgCheck.SecurityGroups.count -eq 0)
+    {
+		Write-Host "Creating SG Rule"
+    	aws ec2 authorize-security-group-ingress --group-name $sgName --ip-permissions IpProtocol=tcp,ToPort=$portNumber,FromPort=$portNumber,IpRanges='[{CidrIp=0.0.0.0/0,Description="OctopusListeningTentacle"}]'
+	}
+    else
+    {
+    	Write-Host "Found Existing SG Rule"
+    }
+}
+$remoteGuid = (new-guid).guid
+Write-Verbose "hostname: $hostname`nnoListen: $noListen"
+
+$remoteScript = @"
+{ "commands": [
+"if('$env:PROCESSOR_ARCHITECTURE' -eq \"x86\") {Invoke-WebRequest -Uri 'http://octopus.com/downloads/latest/OctopusTentacle' -OutFile `$env:TEMP/$remoteGuid.msi -UseBasicParsing} else { Invoke-WebRequest -Uri 'http://octopus.com/downloads/latest/OctopusTentacle64' -OutFile `$env:TEMP/$remoteGuid.msi -UseBasicParsing}",
+"Start-Process `$env:TEMP/$remoteGuid.msi /quiet -Wait",
+"Remove-Item \"`$env:TEMP/$remoteGuid.msi\"",
+"cd 'C:/Program Files/Octopus Deploy/Tentacle'",
+".\\Tentacle.exe create-instance --instance 'Tentacle' --config 'C:/Octopus/Tentacle.config' --console",
+".\\Tentacle.exe new-certificate --instance 'Tentacle' --if-blank --console",
+".\\Tentacle.exe configure --instance 'Tentacle' --reset-trust --console",
+".\\Tentacle.exe configure --instance 'Tentacle' --home 'C:/Octopus/' --app 'C:/Octopus/Applications' $noListen --console",
+".\\Tentacle.exe configure --instance 'Tentacle' --trust '$octoThumb' --console",
+"if('$openFirewall' -eq 'true'){New-NetFirewallRule -DisplayName 'Octopus Tentacle' -Direction Inbound -LocalPort $portNumber -Protocol TCP -Action Allow}",
+".\\Tentacle.exe register-with --instance 'Tentacle' --server '$serverUri' --apiKey=$apiKey $roles $environments --comms-style $comStyle --force --console",
+".\\Tentacle.exe service --instance 'Tentacle' --install --start --console"
+]}
+"@
+
+Write-Host "Installing tentacle on remote machine"
+$guid = (new-guid).guid
+Set-Content -Value $remoteScript.Replace('`r','') -Path "$env:Temp/$guid.json"
+
+write-verbose $remoteScript
+
+write-verbose "aws ssm send-command --document-name AWS-RunPowerShellScript --instance-ids $instanceId --parameters file://$env:Temp/$guid.json"
+try {
+	$cmdResponse = aws ssm send-command --document-name "AWS-RunPowerShellScript" --instance-ids "$instanceId" --parameters "file://$env:Temp/$guid.json" --query "Command" --output json | convertfrom-json
+    $cmdId = $cmdResponse.CommandId
+    $errorResponse = aws ssm get-command-invocation --command-id "$cmdId" --instance-id "$instanceId" --output json | convertfrom-json
+
+    while($errorResponse.Status -eq 'InProgress')
+    {
+    	write-verbose "`nStatus: $($errorResponse.Status)"
+    	$errorResponse = aws ssm get-command-invocation --command-id "$cmdId" --instance-id "$instanceId" --output json | convertfrom-json
+    }
+
+    write-verbose "`nErrorResponse: $errorResponse`n"
+
+    if(![string]::IsNullOrEmpty($errorResponse.StandardErrorContent))
+    {
+    	throw $errorResponse.StandardErrorContent
+    }
+}
+finally {
+	remove-item "$env:Temp\$guid.json"
+}
diff --git a/src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/metadata.json b/src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/metadata.json
new file mode 100644
index 000000000..3a987c71e
--- /dev/null
+++ b/src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/metadata.json
@@ -0,0 +1,123 @@
+{
+  "Id": "59528692-2107-45eb-9fde-55e7329822a9",
+  "Name": "Add or update Azure Load Balancer Health Probe",
+  "Description": null,
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Azure.AccountId": "#{Azure.LoadBalancerCreateHealthProbe.Account}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e720d0e8-14d7-47cc-96a9-b074aa2dcf14",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.Account",
+      "Label": "Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "87a93c04-2395-4a73-9999-6b6dacc546fe",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.ResourceGroupName",
+      "Label": "Resource group name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d155c5eb-7cd8-4f57-b3ca-d6c32c7403e1",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.LoadBalancerName",
+      "Label": "Load balancer name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "79619a6d-1d28-4900-bc24-1c597c649bf4",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.HealthProbeName",
+      "Label": "Health probe name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "beed45f9-6c8d-424b-a072-57c0d1657437",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.Protocol",
+      "Label": "Protocol",
+      "HelpText": null,
+      "DefaultValue": "tcp",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "http|http\ntcp|tcp"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "403a32d1-17c5-4ee9-8095-25919369ded3",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.Path",
+      "Label": "Path",
+      "HelpText": null,
+      "DefaultValue": "/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6c7d97da-264c-402d-b207-239922c547ef",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.Port",
+      "Label": "Port",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a5bfd24b-1249-4383-8204-336abc43a435",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.Interval",
+      "Label": "Interval",
+      "HelpText": "interval in seconds",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "033d0e37-30f9-49c8-b012-c18416596624",
+      "Name": "Azure.LoadBalancerCreateHealthProbe.ProbeCount",
+      "Label": "Unhealty threshold",
+      "HelpText": "number of consecutive failures",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "prebenh",
+  "$Meta": {
+    "ExportedAt": "2018-05-04T12:46:43.1930000Z",
+    "OctopusVersion": "2018.4.7",
+    "Type": "ActionTemplate"
+  },
+  "Logo": "iVBORw0KGgoAAAANSUhEUgAAAlgAAAE7CAYAAAAB7v+1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAB47SURBVHhe7d1PjF3Vgefxt+pedXpHNpGQAgFPK1I02WSZ7Fj29CbRjLqTSCy6sxi6lVmEDTaUGSQQ6UTpZGh1BD2JAh0lNGIyxNhVZYoYO2AGDIkBx2Abg43/ALYhFWxsSL/xKe5LyuVTrnrv3T/nnPv5SD+1OkxwXffo3a/eufXeACAlmxYGH5uZ/+Tnb5/7i1vDZuauu2dmfsPCJZu79t/+8M+3XX3DpkcGV1X/dQAAghBIm+ev+7vN8//p0Yv/czjJZuav27N52zU33z776eurfy0AQP9snrv+q0thFAmmaTYzf+2h8O5WeDes+qMAAMp2++yn/0sTYXX5NhzbPHvtP9zy2OBPqj8aAKAs4dmqmbnrfxmPoeYW3tEK75ZVPwYAQBnCw+qx+Glz4QF5x4YAQPY++q3ADQux4OliM/OfesmD8ABAtkLIhKCJhU6Xm5nbcDocV1Y/JgBAHj563mrD6VjgJDPPZQEAuQgf/jkzd/3ZaNSkNpEFAKQuq7gaTWQBAKnKMq5GE1kAQGqyjqvRRBYAkIoi4mo0kQUAdK2ouBpNZAEAXSkyrkYTWQBA24qOq9FEFgDQll7E1WgiCwBoWq/iajSRBQA0pZdxNZrIAgDq1uu4Gk1kAQB1EVfLJrIAgGmJq8hEFgAwKXF1hYksAGBc4modE1kAwHqJqzEmsgCAtYirCSayAIDVpB5Xdy18IfqfJzGRBQCslHpcvXL8ueHRUwdEFgCQhxziakRkAQDJyymuRkQWAJCsHONqRGQBAMnJOa5GRBYAkIwS4mpEZAEAnSsprkZEFgDQmRLjakRkAQCtKzmuRkQWANCaPsTViMgCABrXp7gaEVkAQGP6GFcjIgsAqF2f42pEZAEAtRFXfySyAICpiavLiSwAYGLianUiCwAYm7ham8gCANZNXK2fyAIA1iSuxieyAIBViavJiSwA4DLianoiCwD4A3FVn5Qj69bZPxtu2jb4SvV/dgCgKeKqfilG1m1zVw03zQ4+msgCgOaIq+akFFkzc5/8Y1yJLABojrhqXiqRdVlcjSayAKA+4qo9XUfWJUeDsYksAJieuGpfV5EVPRqMTWQBwOTEVXe6iKxoTK02kQUA4xNX3WszstY8GoxNZAHA+omrdLQRWTNzn4gH1HomsgBgbeIqPU1HVjScxpnIAoDViat0NRVZEx0NxiayAOBy4ip9dUfWVEeDsYksAPgjcZWPOiMrGknTTmQBgLjKUR2RtfRFzrFAqmMiC4A+E1f5miayaj8ajE1kAdBH4ip/k0TWuj+tvY6JLAD6RFyVY9zIavRoMDaRBUAfiKvyrDeyWjkajE1kAVAycVWutSKr1aPB2EQWACUSV+W7UmS1fjQYm8gCoCSpx9X9T98y3PPaY63u+JnXqixpzqnFE9E/u8k99Nw3L/v77exoMDaRBUAJUo+rrhZipGnhXbnYn93mOj8ajE1kAZAzcbX6+hJYSRwNxiayAMiRuLry+hBYSR0NxiayAMiJuFp7pQdWkkeDsYksAHIgrta30gMr2aPB2EQWACkTV+tfyYGV/NFgbCILgBSJq/FWamBlczQYm8gCICXiavyVGlhZHQ3GJrIASIG4mmwlBtZtc1fFoyW3iSwAuiSuJl9pgZX10WBsIguALoir6VZaYGV/NBibyAKgTeJq+pUUWMUcDcYmsgBog7iqZ6UEVnFHg7GJLACaJK7qWymBVeTRYGwiC4AmiKt6V0JgFX00GJvIAqBO4qr+5R5YvTgajE1kAVAHcdXMcg+saHz0ZSILgGmIq+aWc2D17mgwNpEFwCTEVbPLNbB6ezQYm8gCYBziqvnlGljR0OjzRBYA6yGu2lmOgeVocJWJLACuRFy1t9wCa2buE/G4sI8msgCIEVftLrfAikaFXTqRBcBy4qr95RRYjgbHmMgCIBBX3SyXwHI0OMFEFkC/iavulktgRQPC1p7IAugncdXtcgis3nyRc1MTWQD9Iq66X+qB5WiwpoksgH4QV2ks5cDyae01T2QBlE1cpbOUA8vRYAMTWQBlEldpLdXAcjTY4EQWQFnEVXpLMbAcDbYwkQVQBnGV5lIMLEeDLU1kAeRNXKW71ALL0WDLE1kAeRJXaS+lwHI02NFEFkBexFX6SymwHA12OJEFkAdxlcdSCSxHgwlMZAGkTVzlsxQCy9FgQhNZAGkSV3kthcByNJjYRBZAWsRVfus6sBwNJjqRBZAGcZXnugwsR4OJT2QBdEtc5blv/eKvluKnaUdPHRh+74kvX/bnOxrMYCILoBviKr89+sL3h4dOvjD84MMLVQK1I4TWwm/+bXjXwheGt81dFb+hW3oTWQDtElf57H8/9T+G+449PTx7frHKne6EsHv5+J7hg3vujN/QLb2JLIB2pBpX4Zmi2H/e1/3Lrq+1cgw4qeNnDgutFdt7ZNfw7oUbov+s04ksgGalGlchJBbPnYn+s74t9bBa6fBb+4Y/3H1z/Mbes4XoPLV4QmQB9EnKcRX0PbDC803Pv75j6e8iR+HoMMmwaHEhsAKRBdATqcdV0OfA+vGztw/fee/t6m8iX+E5sYef/3b85t6DjQIrEFkAhcshroI+Blbu71qtpq/vZi0PrEBkARQql7gK+hZY4VmrEt61Wk14N6tvD8GvDKxAZAEUJqe4CvoUWPc/fcvw/QvnqisvV/hYh60v3he/wRe4WGAFIgugELnFVdCXwPrZr/6p9Q8K7drOVx6O3+AL22qBFYgsgMzlGFdBHwJrx8sPVlfbvLcW3x++cebscP+JxeHOQ6cu2YvH3136Z8ffbe9dtJfe2B2/wRe0KwVWILIAMpVrXAWlB9bTr26trrR+5z/4/VJI/fve48OvbX15+NUt4+/Hzx9fCq/3zn9Q/VvrFx5+j97gC9lagRWILIDM5BxXQcmBNfvSD6qrrE8IoV+98c7wR88eiwbTpPvrn+8ffvep14fPvH5m+Ntz9R9lPvfa4/EbfAFbT2AFIgsgE7nHVVBqYD303DdrfeYqhNX/felkNI6m3d9cjKv/+sile+C5Y8PT752v/vR6bN93f/wGn/nWG1iByAJIXAlxFZQYWOGLmuv6bcFwDPiLg29PfAS4nq2Mq+Xbsu9kbceHIThL/AiHcQIrEFkAiSolroLSAut7T3x56Zqm9eHv/2P47JEzw6/PH4hGUV0LR4OxsFq+G7fsHz5x8NRS7E0rhOe9T94Uv8FnunEDKxBZAIkpKa6C0gLr0MkXqiubXHgG6q4nXosGUZ2LHQ1ead+YP7j0W4rTevPdo/Gbe6abJLACkQWQiNLiKigpsOp4qD18jELT71qNFouotRbezfrNicXqp53c7kNb4jf3DDdpYAUiC6BjJcZVUEpghaPBaZ+7Cr8d2OSzVsv33yLxNM4WDkz3dT/heawf7r45fnPPbNMEViCyADpSalwFpQTW0VMHqiuazPaX34qGUBMb92hwtYXfNJzmuawQFnds/2z85p7Rpg2sQGQBtKzkuApKCKxpP6k9fFBoLISa2FcuLhZLky58dlZ4IH9Szx6ej9/YM1odgRWILICWlB5XQe6BddfCF4Znz0/+TNLuw6ejIdTUpj0ajO2nvz5WXc34wlHhd3Z8MX5jz2R1BVYgsgAa1oe4CnIPrF0HflZdyfgOvvm7aAQ1tbqOBmN76tXT1VWNb++RXfGbeiarM7ACkQXQkL7EVZBzYE3z7lX4uIO2HmgPq/toMLYDF4NxErm/i1V3YAUiC6BmfYqrIOfAmvTdq/DJ6Jt3vBoNoabWxNHgyoWPcJj0c7JyfhericAKRBZATTbPX/u5PsVVkHNgTfru1Y+fb++h9rAmjwZX7ps7J4uNnN/FaiqwgoQj60vVyxZA2v7n7H++evP8hmOxG3mXazKuglwDK3yZ8yTCOzyxCGpqbRwNrtykR4WP7/9J/Gae+JoMrCDFyNq4bXD24v/8XPXyBZCmWx4b/MnM/HV7YjfyLtd0XAW5Btakfzc/evZYNISaWhtHgysXvlJnko9uCKGy8kaew5oOrCDJyJodHNv0yODj1csYQHpm5q55KHYT73JtxFWQY2CFh9sn+dT2kn5rcK098/pkX3id4zFhG4EVJPpO1i83Pjb40+qlDCAdt8/9xa2xm3iXayuughwD69EXvl/99OP59q7mv8B5tC6OBpdv0nexcvyOwrYCK0j0naz7qpczgDRsemRwVWoPtbcZV0GOgXXo5AvVT79++08sRkOoqXVxNLhyk7yL9ea7R6M38ZTXZmAFST74vm3wmeplDaB7M9s3fCt2A+9qbcdVn7T57FWXR4PLd8eOycIjBEtOm/ZLvieRWmRtnB1sqV7WALqV2rtX4qo54QuR2/pQ0a6PBlfu9Hvnq78F6pbcO1lbB39ZvbwBdGdm/lP/GgudLiaumtXm8WAKR4PLN81X6LC2lCJr4+xgT/XyBtCN22c/fX0sdLqYuGrev+9t54NF/zqRo8Hl++5Tr1d/CzQlqXeyvIsFdGnztmtujsVO2xNXzQu/Sff1+QPRIKpzqR0NLl/4aiCalUpkbZwdPFC9zAG0b2Z+w0IseNqcuGrHa6feiwZR3UvtaHD5nj/6TvW3QZNSiKyN2wanfS4W0InwcHsseNqcuGrPs0fORIOozqV4NLh8c/vfqv42aFoS72TNDT5fvdwBtGfz3PVfjUVPWxNX7frFwbejUVTXUj4aHO2nvz5W/W3Qhq4ja+Pc4B+rlzuA9nT5tTjiqn1NP+Ce8tHgaB50b1+XkbVxdnCoerkDaM/M/LWHYvHT9MRVN+77f0ejYVTHUj8aHG3T44eqvw3a1GVkVS93AO3p4sNFxVV3Nu94NRpH0y6Ho8HloxtdRVb1cgfQjk0Lg4/FAqjJiatuNfUJ7rGISXk+qqE7XURW9ZIH0I62P2D0+dd3VC+xdCUWR9Mul6PB5fvtuQvV3whdOPzWvmgINbXqJQ+gHTPzn/x8LISa2r/s+tpw8dyZ6iWWLtT9DlZuR4OjeQerO+E14J6dN0ZDqKlVL3kA7ejiIxpEVrfqfgYrFi85jG50EVdh1UseQDtmtl19QyyCmp7I6k6dv0WY49FgmN8i7EZXcRVWveQBtGPz3IbPxAKojYmsbtT1OVh/k2lchfkcrPZ1GVdh1UseQDu6/pockdW+uj7JPRYuucwnuber67gKq17yANoTC582J7LaVcd3EeZ6NDia7yJsTwpxFVa93AG0p6tPcl8+kdWe1069F42m9S7no8HRnj/6TvW3QZNSiauw6uUOoD0z8xsWYtHT9kRWOz78/X8Mvz5/IBpP61ksWHKbj2hoXkpxtXHb4HT1cgfQns3brrk5FjxdTGS1Y9IH3XP4Iue15gH35qUUV2EbZwcPVC93AO1p+9Pc15rIat7+E4vRgLrSSjgaDHvq1dPV3wJNSC2ulrZt8JXq5Q6gXSk8h7V8IqtZ5z/4/Vif6J7rp7XHdvq989XfAnVLMq7CFgZ/Xr3UAbRrZvuGb8VCp8uJrGb96Nlj0ZiKrYSjwbA7dhyurp66pRpXG2cHj1UvcwDta/s7Cde7LiIr/HmxnyXlHTr5QvXTr996jwlLORoMe+b18f//0tnzi9Ebd8o7fqbdkEz2nauwrYNvVC9zAN2Ymb9uT+zm3fXajqwcA2v2pR9UP/14vr3rtWhUjVbS0eA35g8u/QbluJ577fH4jTvhtRlYKcfVxtnBsU2PDD5evcQBdKOr7yVcz9qMrBwD666FLww/+PBCdQXrd/DN30XDarRSjgbDJnn3Krj3yZuiN++U11ZgpRxXS9s6+Pvq5Q2gWzNz1zwUu4GnsLYiK8fACnvl+HPVFYxntWexSjoanPTdq1OLJ+I37sTXRmClHlfh3auNjw3+tHppA+hWl1/+vJ61EVm5BtbPfvVP1RWM563F9y+Lq5KOBsMOvPm76mrHs/OVh6M379TXdGClHldL2zb4UvWyBpCGlN/FCms6snINrHBMGB7InsSPn7/0g0dLOhr85s7JYiMcuX5nxxfjN+/E12Rg5RBXG2cHe6qXM4B0bFoYfCy1z8VauSYjK9fACtt14GfVVYwnfHXM5h2vLsVVSUeDN27Zv/QO3ST2HtkVvXnnsKYCK4u42jY4venRwdXVyxlAWsKnu8/MbTgdu4mnsqYiK+fAmuZdrBAif/eoo8Eg53evwpoIrBziamlbBzdUL2MAaUr5twpHayKycg6ssEdf+H51JeMLQRILlRy3cODt6qrGl/O7V2F1B1ZGceW3BoE8bJ699h9iN/GUVndk5R5YYeG33yYVvqsvFiw57YHnjlVXM77c370KqzOwcomrjbOD+6qXLYA8zMxdd0/sJp7S6oysEgJrmnexghAosXDJYeGh9kk+kmEk93evwuoKrIziaouPZACyNDP/qX+N3chTWl2RVUJghU3y9TkjIVC27DsZDZiU9/2njyx9kfWkwv/t79j+2ehNPKfVEVjiCqAlfYmsUgLre098eeIH3keeP/pONGRSXAjCaT24587oTTy3TRtY4gqgZX2IrFICK2zS7yhc7uiZs8P/PvtKNGpSWPgohhCC08rxOwdX2zSBJa4AOlJ6ZJUUWGHTHBWO/PbcheEdOw5HA6fLhfALATitd957u4ijwdEmDSxxBdCxkiOrtMAKR4WTxuZy4bms8IXJKbybFd61mtv/1tIHpE4r/NbgA8/cGr2R57pJAktcASSi1MgqLbDC7n/6luH7F85VVzid8BB5+IypEDmx+Gl6/+fFk0vvqNXl53v/OXojz3njBpa4AkhMiZFVYmCFhS+DDu/W1CW8exRiJxZBTSx8dMSkX3uzmp2ZfpnzWhsnsMQVQKJKi6xSAyusjofeVwqhFR4y/8Ezb0TDaJp996nXl44l63zHaqSEz7tabesNLHEFkLiSIqvkwJqZ++Rw96Et1ZXWLxwf/ubE4vCnvz428RFieKfqhePv1vJ81WqOnHoleiMvZesJLHEFkIlSIqvkwBrdtB7f/5PqapsXjvXCb/qF8Hri4KlLFkIq/LPj79bzfNh6vHx8T1G/MRjbWoElrgAyU0JklRpYt81ddcnNKzzcXeczWTko6bOurrQrBZa4AshU7pFVYmCFo8HYTSx8PEFdv12YuvCuXezvoMStFljiCiBzOUdWiYEVu4mNFm644YM2SxUCssSPYrjSYoElrgAKkWtklRZYK48GYwvPJIXjs9KEh9m/s+OL0WsueSsDS1wBFCbHyCopsGbmPhG9ka22cGRYwrtZ4V2r7fvuj15jH7Y8sMQVQKFyi6ySAit2I1trdy/csPSbdrnq67tWyzcKLHEFULicIquUwFrP0eCV9sPdNw8Pv7Vv6UadgzffPTp8cM+d0Wvp20JgiSuAnsglso6feS36z3LauEeDV1rqoXVq8UTvHmJfa+EdSHEF0CM5RNa3fvFX0f88p8VuZtMuhFa4cafysQ7hXRphFV8OH6QqrgBqlkNk5bxbZ/8sekOra+HmvfXF+zp5Vyu8W7XzlYd7/4xV7hNXAA0RWc2szqPB9SyEzsGTe6v8aU54vureJ2+K/gyW18QVQMNEVr1b7dPam96zh+erDGpOOJqM/dmW18QVQEtEVn1r+mhwtQksW8/EFUDLRNb0a/tocPkElq01cQXQEZE1+bo6GhxNYNmVJq4AOiayJltXR4OjCSxbbeIKIBEia7x1eTQ4msCy2MQVQGJE1vrW9dHgaALLVk5cASRKZK29ro8GRxNYtnziCiBxImv1pXA0OJrAstHEFUAmRNblS+VocDSBZWHiCiAzIuvSpXI0OJrAMnEFkCmR9dFSOhocTWD1e+IKIHN9j6zUjgZHE1j9nbgCKESfIyu1o8HRBFY/J64ACtPHyLpt7qroTS6FCaz+TVwBFKpPkZXq0eBoAqtfE1cAhetLZKV6NDiawOrPxBVAT5QeWSkfDY4msPoxcQXQM6VGVupHg6MJrPInrgB6qsTISv1ocDSBVfbEFUDPlRRZORwNjiawyp24AmBJCZGVy9HgaAKrzIkrAC6Re2TFbnYpT2CVN3EFQFSukZXT0eBoAqusiSsArii3yMrtaHA0gVXOxBUA65JTZMVueDlMYJUxcQXAWHKIrByPBkcTWPlPXAEwkZQja2buE9GbXi4TWHlPXAEwlVQjK3bTy2kvvbG7yqDmHDy5N/pn23QTVwDUIrXIyvlo8I7tn20lrkb2HtkV/TlssokrAGqVSmTlfDR4z84bh2++e7RKn/YcP3N4ePfCDdGfydY/cQVAI1KIrNiNL4eFuFo8d6ZKnvadWjyx9DPEfjZbe+IKgEZ1GVm5fJHzyv1w983Ds+cXq9TpTgi88LPEfkZbfeIKgFZ0EVm5Hg2GoHn/wrkqcboXfhaRtf6JKwBa1WZk5fpp7anF1Uj4mRwXrj1xBUAn2oqsHI8G733ypiTjaiQcF4qs1SeuAOhU05GV49Fg+I29Lh9oX6933nt76WMjYtfQ54krAJLQVGTlejR45NQrVcKk7/Bb+6LX0NeJKwCS0kRk5Xg0+Nxrj1fpko/dh7ZEr6VvE1cAJKnOyMrxaPCBZ26tkiU/4WePXVNfJq4ASFodkZXj0WB4lik805SrPj+PJa4AyMK0keVosBvPHp6PXlvJE1cAZGXSyMrxaDB83lUJPvjwQq8+hFRcAZClcSMr198afOmN3VWi5O/gyb3Rayxt4gqArI0TWTkeDX5nxxeX3vkpRbiWcE2xay1l4gqAIqwnsnL9rsG9R3ZVaVKOcE2xay1h4gqAolwpsnI9GgxL+etwJhXexSrxNwrFFQBFWi2ycjwaDHtwz51VkpQnXFvsmnOduAKgaCsj67a5q6I3xBxWwkczrKakY0JxBUAvjCIr56PBsJw/WHQt4dpi15zbxBUAvRIiK9ejwbC7F26oUqRcuT+HJa4A6KWLN8D7YjfGHHbvkzdVGVKucI2xa89h4gqAXss1skp+wH0k1wfdxRUAXJRjZG3fd3+VIeUK1xi79pQnrgBgmdwi6/H9P6kypFy5BZa4AoCInCLr53v/ucqQcoVrjF17ihNXAHAFuUTWA8/cWmVIucI1xq49tYkrAFiHHCLrnp03VhlSrnCNsWtPaeIKAMaQQ2SVLnbNKU1cAcAEUo+ss+cXqxQpT7i22DWnMnEFAFNIObIOntxb5Uh5wrXFrjmFiSsAqEGqkbX1xfuqHClPuLbYNXc9cQUANUoxssJ39X3w4YUqScoRrinF7yEUVwDQgBQj68ipV6osKUe4pti1djlxBQANSi2ySvzKnNQ+wV1cAUALUoqsuxduKOq3CcO1pHQ8KK4AoEUpRdbOVx6u8iR/4Vpi19jFxBUAdCCVyArv+JTwLtbiuTPJvHslrgCgQ6lEVglf/pzKlzuLKwBIQCqRdWrxRJUq+Qk/e+ya2p64AoCEpBBZ9z550/D9C+eqZMlH+JnDzx67pjYnrgAgQSlE1sPPf7vKlnyEnzl2LW1OXAFAwlKIrJ0Z/VZh+Flj19DmxBUAZCCFyHrpjd1VwqQr/Iyxn73NiSsAyEjXkRU+7iDlyBJXAMBEUngnK8XjQseCAMBUUois8BB5Cr9dGH4GD7QDALVIIbLCxyB0+TlZ4c/2UQwAQK1SiKywrS/et/SVNG0Jf1b4M2M/S9sTVwBQoFQiKyw8B9Xk9xeGf3f4M2J/dhcTVwBQsJQiK/ym4fZ99w8Pntw7/ODDC1UaTS78O8K/K/w7U/nS5jBxBQA9kFJkjRaCKHzZ8svH94z1QHx4pyr8d8J/N6WoGk1cAUCPpBhZKxeC6cE9dy7t8f0/Wdrof08xplZOXAFAD+UQWblOXAFAj4ms+ieuAACRVePEFQDwByJr+okrAOAyImvyiSsAYFUia/yJKwBgTSJr/RNXAMC6iay1J64AgLGJrNUnrgCAiYmsyyeuAICpiaw/TlwBALURWeIKAGhAnyNLXAEAjeljZIkrAKBxfYoscQUAtKYPkSWuAIDWlRxZ4goA6EyJkSWuAIDOlRRZ4goASEYJkSWuAIDk5BxZ4goASFaOkSWuAIDk5RRZ4goAyMbGbYP/FQualCauAIDsXIyYv70YWmdXhk0K2zg3+MfqxwQAyMvFmPncxtnBsZWB09WWgm/b4EvVjwcAkKdNjw6uvhhZe2LB0+aq0Ptc9WMBAOQtPOu0adtgU1dHhhfj6r5Njww+Xv04AADlCJHT5gPw4UH2i2H3meqPBwAo16atg+svxs9DsSiqY0tHknODz1d/HABAf4R3tC4G0d+G2Jr2+PDif/+XF8Pt70O8Vf96AIB+W3pOa+vgL5ee1ZodPFbtpctCanZwbNk/v+Pi//uvbFoY/Hn1rwHo2GDw/wGStwqRNh9FsAAAAABJRU5ErkJggg==",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/scriptbody.ps1 b/src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/scriptbody.ps1
new file mode 100644
index 000000000..0d010c912
--- /dev/null
+++ b/src/step-templates/azure-add-or-update-azure-loadbalancer-health-probe/scriptbody.ps1
@@ -0,0 +1,69 @@
+
+
+Write-Output "Resource group name: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'])"
+Write-Output "Load balancer name : $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName'])"
+Write-Output "Health probe name: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'])"
+
+Write-Output "Protocol: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'])"
+Write-Output "Path: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Path'])"
+Write-Output "Port: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port'])"
+Write-Output "Interval: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'])"
+Write-Output "Probe count: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount'])"
+
+
+$loadBalancer = Get-AzureRmLoadBalancer -ResourceGroupName $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'] -name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName']
+$healthProbe = Get-AzureRmLoadBalancerProbeConfig -name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] -LoadBalancer $loadBalancer  -ErrorAction:SilentlyContinue
+
+if($healthProbe -eq $null)
+{
+	#Create healthProbe
+	Write-Output "Creating healt probe: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName']) on load balancer: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'])"
+	
+	if($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] -eq "http")
+	{
+		#path only used in http
+		$loadBalancer  | Add-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `
+			-RequestPath  $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Path'] `
+			-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `
+			-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `
+			-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `
+			-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount'] 
+	}
+	else
+	{
+		# Path is not part of tcp config
+		$loadBalancer  | Add-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `
+			-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `
+			-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `
+			-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `
+			-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount']
+	}
+}
+else
+{
+	#Update healthProbe
+	Write-Output "Updating healt probe: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName']) on load balancer: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'])"
+	
+	if($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] -eq "http")
+	{
+		#path only used in http
+		$loadBalancer  | Set-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `
+			-RequestPath  $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Path'] `
+			-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `
+			-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `
+			-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `
+			-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount'] 
+	}
+	else
+	{
+		# Path is not part of tcp config
+		$loadBalancer  | Set-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `
+			-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `
+			-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `
+			-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `
+			-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount']
+	}
+}
+
+Write-Host "Save changes to loadbalancer"
+Set-AzureRmLoadBalancer -LoadBalancer $loadBalancer
\ No newline at end of file
diff --git a/src/step-templates/azure-add-or-update-azure-loadbalancer-rule/metadata.json b/src/step-templates/azure-add-or-update-azure-loadbalancer-rule/metadata.json
new file mode 100644
index 000000000..a4d4145d9
--- /dev/null
+++ b/src/step-templates/azure-add-or-update-azure-loadbalancer-rule/metadata.json
@@ -0,0 +1,136 @@
+{
+  "Id": "1df09b27-905c-4b24-9ad5-008af574508a",
+  "Name": "Add or update Azure Load balancer Rule",
+  "Description": "Create a new azure load balancer rule. With the default frontend ip configuration and default backend address pool.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 10,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{Azure.LoadBalancerCreateRule.Account}"
+  },
+  "Parameters": [
+    {
+      "Id": "95e211f5-7a85-4116-9eb6-578ffa72314a",
+      "Name": "Azure.LoadBalancerCreateRule.Account",
+      "Label": "Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "05715167-0ecd-463e-8ede-c2dc6eaa683c",
+      "Name": "Azure.LoadBalancerCreateRule.ResourceGroupName",
+      "Label": "Resource group name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c4adbfbd-6023-420b-8582-6d79a65a28f6",
+      "Name": "Azure.LoadBalancerCreateRule.LoadBalancerName",
+      "Label": "Load balancer name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8984e095-b895-4d2b-93c9-b62ad67b84b1",
+      "Name": "Azure.LoadBalancerCreateRule.RuleName",
+      "Label": "Rule name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fda6f233-707e-4eb3-9d61-12f44b83d92f",
+      "Name": "Azure.LoadBalancerCreateRule.Protocol",
+      "Label": "Protocol",
+      "HelpText": null,
+      "DefaultValue": "tcp",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "tcp|tcp\nudp|udp"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "077dcc26-9058-4b96-95d7-b846c5548b20",
+      "Name": "Azure.LoadBalancerCreateRule.FrontendPort",
+      "Label": "Frontend port",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8d68b615-93f3-4412-af5f-5cd2d9403cbd",
+      "Name": "Azure.LoadBalancerCreateRule.BackendPort",
+      "Label": "Backend port",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "41fdcd90-e5f1-4313-801e-033106a50afa",
+      "Name": "Azure.LoadBalancerCreateRule.HealthProbeName",
+      "Label": "Health probe name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "eef1ff50-989b-4bc7-9109-08824ac9111b",
+      "Name": "Azure.LoadBalancerCreateRule.IdleTimeout",
+      "Label": "Idle timeout",
+      "HelpText": "In minutes",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "62011de8-c0ec-4c38-8970-ff7a543d2b64",
+      "Name": "Azure.LoadBalancerCreateRule.LoadDistribution",
+      "Label": "Load distribution",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "default|none\nSourceIP|Client IP\nSourceIPProtocol|Client IPand protocol"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2018-05-04T12:53:19.4890000Z",
+    "OctopusVersion": "2018.4.7",
+    "Type": "ActionTemplate"
+  },
+  "Logo": "iVBORw0KGgoAAAANSUhEUgAAAlgAAAE7CAYAAAAB7v+1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAB47SURBVHhe7d1PjF3Vgefxt+pedXpHNpGQAgFPK1I02WSZ7Fj29CbRjLqTSCy6sxi6lVmEDTaUGSQQ6UTpZGh1BD2JAh0lNGIyxNhVZYoYO2AGDIkBx2Abg43/ALYhFWxsSL/xKe5LyuVTrnrv3T/nnPv5SD+1OkxwXffo3a/eufXeACAlmxYGH5uZ/+Tnb5/7i1vDZuauu2dmfsPCJZu79t/+8M+3XX3DpkcGV1X/dQAAghBIm+ev+7vN8//p0Yv/czjJZuav27N52zU33z776eurfy0AQP9snrv+q0thFAmmaTYzf+2h8O5WeDes+qMAAMp2++yn/0sTYXX5NhzbPHvtP9zy2OBPqj8aAKAs4dmqmbnrfxmPoeYW3tEK75ZVPwYAQBnCw+qx+Glz4QF5x4YAQPY++q3ADQux4OliM/OfesmD8ABAtkLIhKCJhU6Xm5nbcDocV1Y/JgBAHj563mrD6VjgJDPPZQEAuQgf/jkzd/3ZaNSkNpEFAKQuq7gaTWQBAKnKMq5GE1kAQGqyjqvRRBYAkIoi4mo0kQUAdK2ouBpNZAEAXSkyrkYTWQBA24qOq9FEFgDQll7E1WgiCwBoWq/iajSRBQA0pZdxNZrIAgDq1uu4Gk1kAQB1EVfLJrIAgGmJq8hEFgAwKXF1hYksAGBc4modE1kAwHqJqzEmsgCAtYirCSayAIDVpB5Xdy18IfqfJzGRBQCslHpcvXL8ueHRUwdEFgCQhxziakRkAQDJyymuRkQWAJCsHONqRGQBAMnJOa5GRBYAkIwS4mpEZAEAnSsprkZEFgDQmRLjakRkAQCtKzmuRkQWANCaPsTViMgCABrXp7gaEVkAQGP6GFcjIgsAqF2f42pEZAEAtRFXfySyAICpiavLiSwAYGLianUiCwAYm7ham8gCANZNXK2fyAIA1iSuxieyAIBViavJiSwA4DLianoiCwD4A3FVn5Qj69bZPxtu2jb4SvV/dgCgKeKqfilG1m1zVw03zQ4+msgCgOaIq+akFFkzc5/8Y1yJLABojrhqXiqRdVlcjSayAKA+4qo9XUfWJUeDsYksAJieuGpfV5EVPRqMTWQBwOTEVXe6iKxoTK02kQUA4xNX3WszstY8GoxNZAHA+omrdLQRWTNzn4gH1HomsgBgbeIqPU1HVjScxpnIAoDViat0NRVZEx0NxiayAOBy4ip9dUfWVEeDsYksAPgjcZWPOiMrGknTTmQBgLjKUR2RtfRFzrFAqmMiC4A+E1f5miayaj8ajE1kAdBH4ip/k0TWuj+tvY6JLAD6RFyVY9zIavRoMDaRBUAfiKvyrDeyWjkajE1kAVAycVWutSKr1aPB2EQWACUSV+W7UmS1fjQYm8gCoCSpx9X9T98y3PPaY63u+JnXqixpzqnFE9E/u8k99Nw3L/v77exoMDaRBUAJUo+rrhZipGnhXbnYn93mOj8ajE1kAZAzcbX6+hJYSRwNxiayAMiRuLry+hBYSR0NxiayAMiJuFp7pQdWkkeDsYksAHIgrta30gMr2aPB2EQWACkTV+tfyYGV/NFgbCILgBSJq/FWamBlczQYm8gCICXiavyVGlhZHQ3GJrIASIG4mmwlBtZtc1fFoyW3iSwAuiSuJl9pgZX10WBsIguALoir6VZaYGV/NBibyAKgTeJq+pUUWMUcDcYmsgBog7iqZ6UEVnFHg7GJLACaJK7qWymBVeTRYGwiC4AmiKt6V0JgFX00GJvIAqBO4qr+5R5YvTgajE1kAVAHcdXMcg+saHz0ZSILgGmIq+aWc2D17mgwNpEFwCTEVbPLNbB6ezQYm8gCYBziqvnlGljR0OjzRBYA6yGu2lmOgeVocJWJLACuRFy1t9wCa2buE/G4sI8msgCIEVftLrfAikaFXTqRBcBy4qr95RRYjgbHmMgCIBBX3SyXwHI0OMFEFkC/iavulktgRQPC1p7IAugncdXtcgis3nyRc1MTWQD9Iq66X+qB5WiwpoksgH4QV2ks5cDyae01T2QBlE1cpbOUA8vRYAMTWQBlEldpLdXAcjTY4EQWQFnEVXpLMbAcDbYwkQVQBnGV5lIMLEeDLU1kAeRNXKW71ALL0WDLE1kAeRJXaS+lwHI02NFEFkBexFX6SymwHA12OJEFkAdxlcdSCSxHgwlMZAGkTVzlsxQCy9FgQhNZAGkSV3kthcByNJjYRBZAWsRVfus6sBwNJjqRBZAGcZXnugwsR4OJT2QBdEtc5blv/eKvluKnaUdPHRh+74kvX/bnOxrMYCILoBviKr89+sL3h4dOvjD84MMLVQK1I4TWwm/+bXjXwheGt81dFb+hW3oTWQDtElf57H8/9T+G+449PTx7frHKne6EsHv5+J7hg3vujN/QLb2JLIB2pBpX4Zmi2H/e1/3Lrq+1cgw4qeNnDgutFdt7ZNfw7oUbov+s04ksgGalGlchJBbPnYn+s74t9bBa6fBb+4Y/3H1z/Mbes4XoPLV4QmQB9EnKcRX0PbDC803Pv75j6e8iR+HoMMmwaHEhsAKRBdATqcdV0OfA+vGztw/fee/t6m8iX+E5sYef/3b85t6DjQIrEFkAhcshroI+Blbu71qtpq/vZi0PrEBkARQql7gK+hZY4VmrEt61Wk14N6tvD8GvDKxAZAEUJqe4CvoUWPc/fcvw/QvnqisvV/hYh60v3he/wRe4WGAFIgugELnFVdCXwPrZr/6p9Q8K7drOVx6O3+AL22qBFYgsgMzlGFdBHwJrx8sPVlfbvLcW3x++cebscP+JxeHOQ6cu2YvH3136Z8ffbe9dtJfe2B2/wRe0KwVWILIAMpVrXAWlB9bTr26trrR+5z/4/VJI/fve48OvbX15+NUt4+/Hzx9fCq/3zn9Q/VvrFx5+j97gC9lagRWILIDM5BxXQcmBNfvSD6qrrE8IoV+98c7wR88eiwbTpPvrn+8ffvep14fPvH5m+Ntz9R9lPvfa4/EbfAFbT2AFIgsgE7nHVVBqYD303DdrfeYqhNX/felkNI6m3d9cjKv/+sile+C5Y8PT752v/vR6bN93f/wGn/nWG1iByAJIXAlxFZQYWOGLmuv6bcFwDPiLg29PfAS4nq2Mq+Xbsu9kbceHIThL/AiHcQIrEFkAiSolroLSAut7T3x56Zqm9eHv/2P47JEzw6/PH4hGUV0LR4OxsFq+G7fsHz5x8NRS7E0rhOe9T94Uv8FnunEDKxBZAIkpKa6C0gLr0MkXqiubXHgG6q4nXosGUZ2LHQ1ead+YP7j0W4rTevPdo/Gbe6abJLACkQWQiNLiKigpsOp4qD18jELT71qNFouotRbezfrNicXqp53c7kNb4jf3DDdpYAUiC6BjJcZVUEpghaPBaZ+7Cr8d2OSzVsv33yLxNM4WDkz3dT/heawf7r45fnPPbNMEViCyADpSalwFpQTW0VMHqiuazPaX34qGUBMb92hwtYXfNJzmuawQFnds/2z85p7Rpg2sQGQBtKzkuApKCKxpP6k9fFBoLISa2FcuLhZLky58dlZ4IH9Szx6ej9/YM1odgRWILICWlB5XQe6BddfCF4Znz0/+TNLuw6ejIdTUpj0ajO2nvz5WXc34wlHhd3Z8MX5jz2R1BVYgsgAa1oe4CnIPrF0HflZdyfgOvvm7aAQ1tbqOBmN76tXT1VWNb++RXfGbeiarM7ACkQXQkL7EVZBzYE3z7lX4uIO2HmgPq/toMLYDF4NxErm/i1V3YAUiC6BmfYqrIOfAmvTdq/DJ6Jt3vBoNoabWxNHgyoWPcJj0c7JyfhericAKRBZATTbPX/u5PsVVkHNgTfru1Y+fb++h9rAmjwZX7ps7J4uNnN/FaiqwgoQj60vVyxZA2v7n7H++evP8hmOxG3mXazKuglwDK3yZ8yTCOzyxCGpqbRwNrtykR4WP7/9J/Gae+JoMrCDFyNq4bXD24v/8XPXyBZCmWx4b/MnM/HV7YjfyLtd0XAW5Btakfzc/evZYNISaWhtHgysXvlJnko9uCKGy8kaew5oOrCDJyJodHNv0yODj1csYQHpm5q55KHYT73JtxFWQY2CFh9sn+dT2kn5rcK098/pkX3id4zFhG4EVJPpO1i83Pjb40+qlDCAdt8/9xa2xm3iXayuughwD69EXvl/99OP59q7mv8B5tC6OBpdv0nexcvyOwrYCK0j0naz7qpczgDRsemRwVWoPtbcZV0GOgXXo5AvVT79++08sRkOoqXVxNLhyk7yL9ea7R6M38ZTXZmAFST74vm3wmeplDaB7M9s3fCt2A+9qbcdVn7T57FWXR4PLd8eOycIjBEtOm/ZLvieRWmRtnB1sqV7WALqV2rtX4qo54QuR2/pQ0a6PBlfu9Hvnq78F6pbcO1lbB39ZvbwBdGdm/lP/GgudLiaumtXm8WAKR4PLN81X6LC2lCJr4+xgT/XyBtCN22c/fX0sdLqYuGrev+9t54NF/zqRo8Hl++5Tr1d/CzQlqXeyvIsFdGnztmtujsVO2xNXzQu/Sff1+QPRIKpzqR0NLl/4aiCalUpkbZwdPFC9zAG0b2Z+w0IseNqcuGrHa6feiwZR3UvtaHD5nj/6TvW3QZNSiKyN2wanfS4W0InwcHsseNqcuGrPs0fORIOozqV4NLh8c/vfqv42aFoS72TNDT5fvdwBtGfz3PVfjUVPWxNX7frFwbejUVTXUj4aHO2nvz5W/W3Qhq4ja+Pc4B+rlzuA9nT5tTjiqn1NP+Ce8tHgaB50b1+XkbVxdnCoerkDaM/M/LWHYvHT9MRVN+77f0ejYVTHUj8aHG3T44eqvw3a1GVkVS93AO3p4sNFxVV3Nu94NRpH0y6Ho8HloxtdRVb1cgfQjk0Lg4/FAqjJiatuNfUJ7rGISXk+qqE7XURW9ZIH0I62P2D0+dd3VC+xdCUWR9Mul6PB5fvtuQvV3whdOPzWvmgINbXqJQ+gHTPzn/x8LISa2r/s+tpw8dyZ6iWWLtT9DlZuR4OjeQerO+E14J6dN0ZDqKlVL3kA7ejiIxpEVrfqfgYrFi85jG50EVdh1UseQDtmtl19QyyCmp7I6k6dv0WY49FgmN8i7EZXcRVWveQBtGPz3IbPxAKojYmsbtT1OVh/k2lchfkcrPZ1GVdh1UseQDu6/pockdW+uj7JPRYuucwnuber67gKq17yANoTC582J7LaVcd3EeZ6NDia7yJsTwpxFVa93AG0p6tPcl8+kdWe1069F42m9S7no8HRnj/6TvW3QZNSiauw6uUOoD0z8xsWYtHT9kRWOz78/X8Mvz5/IBpP61ksWHKbj2hoXkpxtXHb4HT1cgfQns3brrk5FjxdTGS1Y9IH3XP4Iue15gH35qUUV2EbZwcPVC93AO1p+9Pc15rIat7+E4vRgLrSSjgaDHvq1dPV3wJNSC2ulrZt8JXq5Q6gXSk8h7V8IqtZ5z/4/Vif6J7rp7XHdvq989XfAnVLMq7CFgZ/Xr3UAbRrZvuGb8VCp8uJrGb96Nlj0ZiKrYSjwbA7dhyurp66pRpXG2cHj1UvcwDta/s7Cde7LiIr/HmxnyXlHTr5QvXTr996jwlLORoMe+b18f//0tnzi9Ebd8o7fqbdkEz2nauwrYNvVC9zAN2Ymb9uT+zm3fXajqwcA2v2pR9UP/14vr3rtWhUjVbS0eA35g8u/QbluJ577fH4jTvhtRlYKcfVxtnBsU2PDD5evcQBdKOr7yVcz9qMrBwD666FLww/+PBCdQXrd/DN30XDarRSjgbDJnn3Krj3yZuiN++U11ZgpRxXS9s6+Pvq5Q2gWzNz1zwUu4GnsLYiK8fACnvl+HPVFYxntWexSjoanPTdq1OLJ+I37sTXRmClHlfh3auNjw3+tHppA+hWl1/+vJ61EVm5BtbPfvVP1RWM563F9y+Lq5KOBsMOvPm76mrHs/OVh6M379TXdGClHldL2zb4UvWyBpCGlN/FCms6snINrHBMGB7InsSPn7/0g0dLOhr85s7JYiMcuX5nxxfjN+/E12Rg5RBXG2cHe6qXM4B0bFoYfCy1z8VauSYjK9fACtt14GfVVYwnfHXM5h2vLsVVSUeDN27Zv/QO3ST2HtkVvXnnsKYCK4u42jY4venRwdXVyxlAWsKnu8/MbTgdu4mnsqYiK+fAmuZdrBAif/eoo8Eg53evwpoIrBziamlbBzdUL2MAaUr5twpHayKycg6ssEdf+H51JeMLQRILlRy3cODt6qrGl/O7V2F1B1ZGceW3BoE8bJ699h9iN/GUVndk5R5YYeG33yYVvqsvFiw57YHnjlVXM77c370KqzOwcomrjbOD+6qXLYA8zMxdd0/sJp7S6oysEgJrmnexghAosXDJYeGh9kk+kmEk93evwuoKrIziaouPZACyNDP/qX+N3chTWl2RVUJghU3y9TkjIVC27DsZDZiU9/2njyx9kfWkwv/t79j+2ehNPKfVEVjiCqAlfYmsUgLre098eeIH3keeP/pONGRSXAjCaT24587oTTy3TRtY4gqgZX2IrFICK2zS7yhc7uiZs8P/PvtKNGpSWPgohhCC08rxOwdX2zSBJa4AOlJ6ZJUUWGHTHBWO/PbcheEdOw5HA6fLhfALATitd957u4ijwdEmDSxxBdCxkiOrtMAKR4WTxuZy4bms8IXJKbybFd61mtv/1tIHpE4r/NbgA8/cGr2R57pJAktcASSi1MgqLbDC7n/6luH7F85VVzid8BB5+IypEDmx+Gl6/+fFk0vvqNXl53v/OXojz3njBpa4AkhMiZFVYmCFhS+DDu/W1CW8exRiJxZBTSx8dMSkX3uzmp2ZfpnzWhsnsMQVQKJKi6xSAyusjofeVwqhFR4y/8Ezb0TDaJp996nXl44l63zHaqSEz7tabesNLHEFkLiSIqvkwJqZ++Rw96Et1ZXWLxwf/ubE4vCnvz428RFieKfqhePv1vJ81WqOnHoleiMvZesJLHEFkIlSIqvkwBrdtB7f/5PqapsXjvXCb/qF8Hri4KlLFkIq/LPj79bzfNh6vHx8T1G/MRjbWoElrgAyU0JklRpYt81ddcnNKzzcXeczWTko6bOurrQrBZa4AshU7pFVYmCFo8HYTSx8PEFdv12YuvCuXezvoMStFljiCiBzOUdWiYEVu4mNFm644YM2SxUCssSPYrjSYoElrgAKkWtklRZYK48GYwvPJIXjs9KEh9m/s+OL0WsueSsDS1wBFCbHyCopsGbmPhG9ka22cGRYwrtZ4V2r7fvuj15jH7Y8sMQVQKFyi6ySAit2I1trdy/csPSbdrnq67tWyzcKLHEFULicIquUwFrP0eCV9sPdNw8Pv7Vv6UadgzffPTp8cM+d0Wvp20JgiSuAnsglso6feS36z3LauEeDV1rqoXVq8UTvHmJfa+EdSHEF0CM5RNa3fvFX0f88p8VuZtMuhFa4cafysQ7hXRphFV8OH6QqrgBqlkNk5bxbZ/8sekOra+HmvfXF+zp5Vyu8W7XzlYd7/4xV7hNXAA0RWc2szqPB9SyEzsGTe6v8aU54vureJ2+K/gyW18QVQMNEVr1b7dPam96zh+erDGpOOJqM/dmW18QVQEtEVn1r+mhwtQksW8/EFUDLRNb0a/tocPkElq01cQXQEZE1+bo6GhxNYNmVJq4AOiayJltXR4OjCSxbbeIKIBEia7x1eTQ4msCy2MQVQGJE1vrW9dHgaALLVk5cASRKZK29ro8GRxNYtnziCiBxImv1pXA0OJrAstHEFUAmRNblS+VocDSBZWHiCiAzIuvSpXI0OJrAMnEFkCmR9dFSOhocTWD1e+IKIHN9j6zUjgZHE1j9nbgCKESfIyu1o8HRBFY/J64ACtPHyLpt7qroTS6FCaz+TVwBFKpPkZXq0eBoAqtfE1cAhetLZKV6NDiawOrPxBVAT5QeWSkfDY4msPoxcQXQM6VGVupHg6MJrPInrgB6qsTISv1ocDSBVfbEFUDPlRRZORwNjiawyp24AmBJCZGVy9HgaAKrzIkrAC6Re2TFbnYpT2CVN3EFQFSukZXT0eBoAqusiSsArii3yMrtaHA0gVXOxBUA65JTZMVueDlMYJUxcQXAWHKIrByPBkcTWPlPXAEwkZQja2buE9GbXi4TWHlPXAEwlVQjK3bTy2kvvbG7yqDmHDy5N/pn23QTVwDUIrXIyvlo8I7tn20lrkb2HtkV/TlssokrAGqVSmTlfDR4z84bh2++e7RKn/YcP3N4ePfCDdGfydY/cQVAI1KIrNiNL4eFuFo8d6ZKnvadWjyx9DPEfjZbe+IKgEZ1GVm5fJHzyv1w983Ds+cXq9TpTgi88LPEfkZbfeIKgFZ0EVm5Hg2GoHn/wrkqcboXfhaRtf6JKwBa1WZk5fpp7anF1Uj4mRwXrj1xBUAn2oqsHI8G733ypiTjaiQcF4qs1SeuAOhU05GV49Fg+I29Lh9oX6933nt76WMjYtfQ54krAJLQVGTlejR45NQrVcKk7/Bb+6LX0NeJKwCS0kRk5Xg0+Nxrj1fpko/dh7ZEr6VvE1cAJKnOyMrxaPCBZ26tkiU/4WePXVNfJq4ASFodkZXj0WB4lik805SrPj+PJa4AyMK0keVosBvPHp6PXlvJE1cAZGXSyMrxaDB83lUJPvjwQq8+hFRcAZClcSMr198afOmN3VWi5O/gyb3Rayxt4gqArI0TWTkeDX5nxxeX3vkpRbiWcE2xay1l4gqAIqwnsnL9rsG9R3ZVaVKOcE2xay1h4gqAolwpsnI9GgxL+etwJhXexSrxNwrFFQBFWi2ycjwaDHtwz51VkpQnXFvsmnOduAKgaCsj67a5q6I3xBxWwkczrKakY0JxBUAvjCIr56PBsJw/WHQt4dpi15zbxBUAvRIiK9ejwbC7F26oUqRcuT+HJa4A6KWLN8D7YjfGHHbvkzdVGVKucI2xa89h4gqAXss1skp+wH0k1wfdxRUAXJRjZG3fd3+VIeUK1xi79pQnrgBgmdwi6/H9P6kypFy5BZa4AoCInCLr53v/ucqQcoVrjF17ihNXAHAFuUTWA8/cWmVIucI1xq49tYkrAFiHHCLrnp03VhlSrnCNsWtPaeIKAMaQQ2SVLnbNKU1cAcAEUo+ss+cXqxQpT7i22DWnMnEFAFNIObIOntxb5Uh5wrXFrjmFiSsAqEGqkbX1xfuqHClPuLbYNXc9cQUANUoxssJ39X3w4YUqScoRrinF7yEUVwDQgBQj68ipV6osKUe4pti1djlxBQANSi2ySvzKnNQ+wV1cAUALUoqsuxduKOq3CcO1pHQ8KK4AoEUpRdbOVx6u8iR/4Vpi19jFxBUAdCCVyArv+JTwLtbiuTPJvHslrgCgQ6lEVglf/pzKlzuLKwBIQCqRdWrxRJUq+Qk/e+ya2p64AoCEpBBZ9z550/D9C+eqZMlH+JnDzx67pjYnrgAgQSlE1sPPf7vKlnyEnzl2LW1OXAFAwlKIrJ0Z/VZh+Flj19DmxBUAZCCFyHrpjd1VwqQr/Iyxn73NiSsAyEjXkRU+7iDlyBJXAMBEUngnK8XjQseCAMBUUois8BB5Cr9dGH4GD7QDALVIIbLCxyB0+TlZ4c/2UQwAQK1SiKywrS/et/SVNG0Jf1b4M2M/S9sTVwBQoFQiKyw8B9Xk9xeGf3f4M2J/dhcTVwBQsJQiK/ym4fZ99w8Pntw7/ODDC1UaTS78O8K/K/w7U/nS5jBxBQA9kFJkjRaCKHzZ8svH94z1QHx4pyr8d8J/N6WoGk1cAUCPpBhZKxeC6cE9dy7t8f0/Wdrof08xplZOXAFAD+UQWblOXAFAj4ms+ieuAACRVePEFQDwByJr+okrAOAyImvyiSsAYFUia/yJKwBgTSJr/RNXAMC6iay1J64AgLGJrNUnrgCAiYmsyyeuAICpiaw/TlwBALURWeIKAGhAnyNLXAEAjeljZIkrAKBxfYoscQUAtKYPkSWuAIDWlRxZ4goA6EyJkSWuAIDOlRRZ4goASEYJkSWuAIDk5BxZ4goASFaOkSWuAIDk5RRZ4goAyMbGbYP/FQualCauAIDsXIyYv70YWmdXhk0K2zg3+MfqxwQAyMvFmPncxtnBsZWB09WWgm/b4EvVjwcAkKdNjw6uvhhZe2LB0+aq0Ptc9WMBAOQtPOu0adtgU1dHhhfj6r5Njww+Xv04AADlCJHT5gPw4UH2i2H3meqPBwAo16atg+svxs9DsSiqY0tHknODz1d/HABAf4R3tC4G0d+G2Jr2+PDif/+XF8Pt70O8Vf96AIB+W3pOa+vgL5ee1ZodPFbtpctCanZwbNk/v+Pi//uvbFoY/Hn1rwHo2GDw/wGStwqRNh9FsAAAAABJRU5ErkJggg==",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-add-or-update-azure-loadbalancer-rule/scriptbody.ps1 b/src/step-templates/azure-add-or-update-azure-loadbalancer-rule/scriptbody.ps1
new file mode 100644
index 000000000..c0daa6c9e
--- /dev/null
+++ b/src/step-templates/azure-add-or-update-azure-loadbalancer-rule/scriptbody.ps1
@@ -0,0 +1,48 @@
+Write-Output "Resource group name: $($OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'])"
+Write-Output "Load balancer name : $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName'])"
+Write-Output "Rule name: $($OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'])"
+
+Write-Output "Protocol: $($OctopusParameters['Azure.LoadBalancerCreateRule.Protocol'])"
+Write-Output "Frontend port: $($OctopusParameters['Azure.LoadBalancerCreateRule.FrontendPort'])"
+Write-Output "Backend port: $($OctopusParameters['Azure.LoadBalancerCreateRule.BackendPort'])"
+Write-Output "Healt probe name: $($OctopusParameters['Azure.LoadBalancerCreateRule.HealthProbeName'])"
+Write-Output "Idle timeout: $($OctopusParameters['Azure.LoadBalancerCreateRule.IdleTimeout'])"
+Write-Output "Load distribution: $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadDistribution'])"
+
+$loadBalancer = Get-AzureRmLoadBalancer -ResourceGroupName $OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'] -name $OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName']
+$rule = Get-AzureRmLoadBalancerRuleConfig -Name $OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'] -LoadBalancer $loadBalancer -ErrorAction:SilentlyContinue
+$healthProbe = Get-AzureRmLoadBalancerProbeConfig -name $OctopusParameters['Azure.LoadBalancerCreateRule.HealthProbeName'] -LoadBalancer $loadBalancer -ErrorAction:SilentlyContinue
+
+if($rule -eq $null)
+{
+	#Create rule
+    Write-output "Creating load balancer rule with name: $($OctopusParameters['Azure.LoadBalancerCreateRule.RuleName']) in load balancer: $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'])"
+	
+    $loadBalancer | Add-AzureRmLoadBalancerRuleConfig -Name $OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'] `
+		-FrontendIpConfigurationId ($loadBalancer.FrontendIpConfigurations[0].Id) `
+		-Protocol $OctopusParameters['Azure.LoadBalancerCreateRule.Protocol'] `
+		-FrontendPort $OctopusParameters['Azure.LoadBalancerCreateRule.FrontendPort'] `
+		-BackendPort $OctopusParameters['Azure.LoadBalancerCreateRule.BackendPort'] `
+		-BackendAddressPoolId ($loadBalancer.BackendAddressPools[0].Id) `
+		-ProbeId ($healthProbe.Id) `
+		-IdleTimeoutInMinutes $OctopusParameters['Azure.LoadBalancerCreateRule.IdleTimeout'] `
+		-LoadDistribution $OctopusParameters['Azure.LoadBalancerCreateRule.LoadDistribution']
+}
+else
+{
+	#Update rule
+    Write-output "Updating load balancer rule with name: $($OctopusParameters['Azure.LoadBalancerCreateRule.RuleName']) in load balancer: $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'])"
+	
+	$loadBalancer | Set-AzureRmLoadBalancerRuleConfig -Name $OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'] `
+		-FrontendIpConfigurationId ($loadBalancer.FrontendIpConfigurations[0].Id) `
+		-Protocol $OctopusParameters['Azure.LoadBalancerCreateRule.Protocol'] `
+		-FrontendPort $OctopusParameters['Azure.LoadBalancerCreateRule.FrontendPort'] `
+		-BackendPort $OctopusParameters['Azure.LoadBalancerCreateRule.BackendPort'] `
+		-BackendAddressPoolId ($loadBalancer.BackendAddressPools[0].Id) `
+		-ProbeId ($healthProbe.Id) `
+		-IdleTimeoutInMinutes $OctopusParameters['Azure.LoadBalancerCreateRule.IdleTimeout'] `
+		-LoadDistribution $OctopusParameters['Azure.LoadBalancerCreateRule.LoadDistribution']
+}
+
+Write-host "Saving loadbalancer"
+Set-AzureRmLoadBalancer -LoadBalancer $loadBalancer
\ No newline at end of file
diff --git a/src/step-templates/azure-add-service-fabric-cluster-certificate/metadata.json b/src/step-templates/azure-add-service-fabric-cluster-certificate/metadata.json
new file mode 100644
index 000000000..303d136b1
--- /dev/null
+++ b/src/step-templates/azure-add-service-fabric-cluster-certificate/metadata.json
@@ -0,0 +1,126 @@
+{
+  "Id": "cf3fb207-05d7-4818-8c09-d2484eadc96c",
+  "Name": "Add Service Fabric Cluster Certificate",
+  "Description": "Add a secondary cluster certificate to a service fabric cluster using an existing azure key vault certificate.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Azure.AccountId": "#{Azure.AddServiceFabricClusterCertificate.Account}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "14ec432f-4d26-4341-8c06-5b89cfb20a6c",
+      "Name": "Azure.AddServiceFabricClusterCertificate.Account",
+      "Label": "Azure account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "dc0b28c9-40b8-4897-be2a-a48fbbbec685",
+      "Name": "Azure.AddServiceFabricClusterCertificate.ResourceGroupName",
+      "Label": "Resource group name",
+      "HelpText": "The azure resource group name where the service fabric cluster is located",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7436632f-210f-4cec-8639-c93164a6240f",
+      "Name": "Azure.AddServiceFabricClusterCertificate.ClusterName",
+      "Label": "Service fabric cluster name",
+      "HelpText": "The name of the service fabric cluster",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7ee8a384-bab3-4714-af79-dcfbd3bd602f",
+      "Name": "Azure.AddServiceFabricClusterCertificate.SecretIdentifier",
+      "Label": "Secret identifier",
+      "HelpText": "The secret identifier of the Azure Key Value certificate.\nExample\n> https://{key vault name}.vault.azure.net/secrets/{certificate name}/{identifier}",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4cb76611-ff29-4256-9475-3769fd890e0f",
+      "Name": "storageAccountName",
+      "Label": "Azure Storage Account Name",
+      "HelpText": "Name of the account that the files and folders will be uploaded to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cc0eb63d-4545-4d9d-aca3-7844e1e0a54e",
+      "Name": "storageAccountKey",
+      "Label": "Azure Storage Account Key",
+      "HelpText": "The key that is used to log into the account.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "8245c4b0-014d-467c-a95d-ab6aac230075",
+      "Name": "containerName",
+      "Label": "Azure Container Name",
+      "HelpText": "The name of the container the files and folder will be uploaded to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "45f6df33-d04d-44bd-8a26-1ab45c634afc",
+      "Name": "localFolder",
+      "Label": "Name of the Parent Folder",
+      "HelpText": "Name of the Parent Folder being uploaded",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8c559f0f-2d6e-4202-8614-65cabb29e643",
+      "Name": "doRecurse",
+      "Label": "Recursive",
+      "HelpText": null,
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "8a06615b-69a2-4d32-be29-981b6c5725fc",
+      "Name": "doForce",
+      "Label": "Force",
+      "HelpText": "Override is enabled or not",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "prebenh",
+  "$Meta": {
+    "ExportedAt": "2018-05-02T11:51:09.5990000Z",
+    "OctopusVersion": "2018.4.7",
+    "Type": "ActionTemplate"
+  },
+  "Logo": "iVBORw0KGgoAAAANSUhEUgAAAlgAAAE7CAYAAAAB7v+1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACxfSURBVHhe7d1NkBTnnefx5yTtxWL2AnNwLBpiQ2gdXmFmNUYgUFNVXYXksRfLM2NeNixmcCiw6EYyrDzYjCVsRsaiq19ourNET8wQwR5YeQ+EdCHswxL4wurEcNiQZAuqwba6pbWmJfmlJVvw5D5P9oPUFP+mq6srs57M/H4ifkHYYSs7n2z8/Jz11PMoAPBBOLZpSVgrF3RQ2h3WKod0rXRu3oxuOKeD7iP62IN77X837FNL3T8OAAAgf3StsDaslQ7oWvdPdK0ybQpSuOgc+/Mw7Feh7ldnw6o6aNLlLgcAAJA94TPqDh0Ut+ug9HLbClVjhlZEBasxpnCdMX/uCIfUEvfjAAAApJd9U6Vr3WM66J4SS1E7M/ApsWDdiCla03pAndB9apP78QAAANIjrFW+YorVRbEIxZHRDWKpmiumbNXNnzvCZ9Wd7kcGAADwkylWO3VQfl0sQXHGrb9aaEzRmtB96imKFgAA8I4pOYWOFKsbOfoZsUA1m6hoVdUWdzsAAACdEw6vW6ZrxZNi6UkyA0vF4rTQRAvih9Ryd3sAAADJmvk4MIHF6/MlKIplqdXYxfDmz/3uNgEAAJKhg+KwWHY6kZEHxKK02JiidYq1WQAAIHZ2x3W7OahYdDqV4fvEgtSOmJJ1gY8MAQBAbMLRrns7upB9rgx+WixH7Uq0AH5ArXHDAAAA0B6myBS8WG8lRShF7Y5dl6WrapcbDgAAgMWZOYBZKDY+ZGSdWIjiiilag25YAAAAWmOPuRGLjS9pcYPRxcSUrDMsfgcAAC3RQXmfWGp8ytA9YgmKO6ZknXLDBAAA0Bw9WnxELDS+ZZ4DnmMOe2UBAIDmzHxb0NMF7bMTdEmlJ9HoPrXJDRsAAIDM7XM1LhYa33LsfrH0JBldVVPmz5Vu+AAAAG7l3Sait8siD3huV3S/qodDaokbQgAAgE94dfxNM4l5g9GFxJSss24YAQAAZni915WUNh/w3I6wRxYAAPhYOFa5W9cq02KR8TUJbzDadKqqyw0rAADIs1Stu7qRDmww2kx0Vb3KJqQAAOScDorbxQLje4ZWiAXHi1TVQTe8AAAgb2a2ZChPigXG93R2g9HbRverafMnWzcAAJBHqTgKR8roBrHY+BRdVafdMAMAgLwIn1F3pPbtlafrr25Jn1rlhhsAAORBat9e2Xiyweh84UBoAAByJNVvr2wGloqFxrdEa7H61DI37AAAIMvCWmWnWFzSEA83GL1d2HwUAICc0LXSObG8pCEjD4hFxteYgjXhhh0AAGRVOLxumVhc0pLh+8Qi43N0n9rkhh8AAGRRWCsdEItLWuLRAc/NhsXuAABknA7Kr4vFJS0RCozviRa7D6kl7hEAAIAssYc6i6UlLfH1gOfmstk9BgAAkCWp/vagTVo2GBXCtwkBAMgoXSueFItLWjJ0j1he0hBTsC64xwAAALJE17rHxeKSlnh8wHNTYR0WAADZkvr1V0GXXFrSFdZhAQCQJXq0+IhYXNKSY/dLhSVt2e8eBwAAyIJUH+5sk5IDnm8XPaBOuMcBAACyQNe6x8TikpakcIPRxuiqOu8eBwAAyIJUnz+YsgOe54opWFPucQAAgCxI9TcIU3bA823Tp5a5RwIAANJOB91TYnlJQ1K8wegtGVLL3SMBAABpJxaXtGRohVxW0pmV7pEAAIC0E4tLWiIXlXSmqrrcIwEAAGmW6k1GRzfIRSWtoWABAJANqS5YWVp/ZUPBAgAgG8I+tVQsL2lIig94FkPBAgAgO8TykoYMLJWLSlpDwQIAIDuiw5KlAuNzsnHA881hmwYAALJDBxsnxRLjc7K0weiNULAAAMgOPdr1mlhifM7wfXJJSXOG1BL3SAAAQNrp0Yd+LJYYn5OBA55nR/erCfc4AABAFuhaZVgsMT5HKClpjilYZ9zjAAAAWaCD0m6xxPiakXViSUlzTMGquccBAACyIBxZXxCLjK/J2gajJrpPPeUeBwAAyAK7uDoMinKZ8TFZ22DUhj2wAADIHh0ULoplxscMfEouKSmN7lfT4bPqTvcoAABAVuigmI6F7hncYNQUrLPuMQAAgCwJRx96VCw0vuXY/WJJSXWq6qB7DAAAIEumqw+m49Dno5+RS0qK89Fz6i/dYwAAAFlx5fF1y8Z7uy9+MCAUGt+SsQ1GP3pehZf/mxof36ZWuscBAADS7tIThbX1PeXJ8T3l8J2DQqHxKfabjkJJSXPe+44pWNtUeGmrmnpjm9rsHgsAAEirem9xe31PZdqWK5srT5bD64FQbHxJBg94/tXjMwXrRkzRYj8sAADSqt7bfeRGsZqd3x4Rio0vydgGox8+d3O5mpUT44+xbQMAAKlhJu47xntKL0vlyuatbwvFxpcMrRCLSlrzzj6xXN3IefOslrjHBgAAfHW1t3K3XcwuFavZ+XBIKDc+RCgpaY1d3F7fLharj3Npm6r/bLta5R4fAADwTbSYvbd7SipUjXn7u0K56XRGN4hFJa2Z5+3Vx7m0VU2z+B0AAA/Vn9i4c/Zi9mbi3VusDK2/ul6d/+2VkP3ucQIAgE4b7y0OSwVqvnj3FitDBzzf2JphwdmqTrH4HQCADhr/mrrrdovZm8kHg0LR6VQGloplJW1pZu3VPDk//jdqmXvMAAAgKc0uZp8vE3/vyb5YGTrg+e09YmlaUFj8DgBAwi7vWl9odjF7M3nvOaHwJJ2MbDD6++/JhamV2MXvpmhtcY8dAADEpd5T2r3Qxezzxe7u/tGIUHqSzPB9YmFJU+zC9l/slMvSInPQPX4AANBurS5mbyaT3+7wR4UZOOC5HR8NzhkWvwMA0F5X925aMt5T/LFUjNqZ/9fJbxUKhSVNaflbgwvJVnWBxe8AALSBXcxe7ym9JhWiONKR9Vgj68TSkpa0c93VfLm0TU2w+B0AgEVo92L2ZjPdL5SgOJPiDUb/8AMVjj8ml6G4wuJ3AABaZBezS+UniVzdWw7/cFQoQnElpRuMXns+tkXtTcUUrcPu1wUAAMxnvKcwJhWfJPOrp8vhtaS+WTjwKbHA+J7J3XLxSTRb1WkWvwMAvBCOVe42E3shPLp6Y/isP5NTtJi9t3ROKjydyFvfFspQu5PSDUabPcg5kdjF71vUcvdr5AU9oNaEVdVlxmql+7cAAGkWDq9bZibuQlgrHdBBcVjXSud0rTx5y8QuZWRdqIPCRV3r/klYqxwKg407bQlz/+hYXd3ddW+9t/y6VHQ6GfvNwli3bzh2v1hgfM7U00LJ6XDs4veff1Wtcb9OsQr71CpdVVtMgTpo/jxtcl4aJym6X02bnDUF7ET03+9Tm8Ihv8ohAMCwhcoUqe2mFI3poPy6OIkvNkHRFK+N58LRwiHzrwvu0m1zuaf4SCcWszcbe5xObBuRHv2MOBH7GLuR6Fu9csHxIdHi9y1qh/u1apuoUPWpp1yZmpLGZrExpasela5+tYPCBQAdEj6j7ghrlZ327ZQ4acccHXRPRYVu5C8ecD9Sy+q7C/ukUuNbfvHN4s+vB5vaX2BTcsCzKRZX39ylLkrFxsMMul+vlpl7XmlKz6DJRONYJBEz3q+a7DLljn2/ACBuulZYq2vFk7pWmRYn6w5EB6XXwuChA2YiWOp+zKbYhck+LGZvKj0bz9n1YeH/PPTv9PG//F/SOLSUoChOrr7FfqQVDqkl9pnZHdWFQuNfZha/L3G/bk2x92hLjbnfC9I4dCrm5zll/tzsfkwAQLuYybjQqbdVzcb8fNOm+A3bjyzdjz0n3xaz3zamBLof+2Ph8S/+gzQGC04KDng2k3ut8YsQl7aqp8RS41uaXPxui5VbTxXLx3/tiit+bf8IFAByJ6xVvqJr3RfFydnj6KDrZHhstTixRYvZ93SPi2XGs9S/seEJ92PfwpSsv1r0m0TPD3i2b3Pc7d7ijW1qsylaU2Kx8Sj2Z5xr8bv9+M2UFvsx4LR0/77G/Lx18ydFCwAWym6jMPNNPmFSTknsG63oo8NZbz8u737oUZ8Xs9+I/RntLvLux55TONp176LeLA6tECfQTse+KbHbDLjbnJM9subSNlWXio1PiRa/b725LJr73OH7G6v50uxzAoDcm1m8Xjrg0xqrxcZ9s7GQlsXs9txD+5bNPZKmzHyLs8mtMGZHmDQ7GVc49rvbaopd52RKzPnGUuNpBs39rTT32fS2CmmIKVo1+zGneyQAgNmityFxbbPgQX7zw3J45Um51HiTnuKPx7+m7nKPZEHMBHeXDrqPNF2ORzeIk2WnEm0R0OI31qLF79vUiYYy413s5qjXq+qadP9pjylZE3ZjU/dIAACWmXALduuDWybhjOWDgZlz/sRy0+n0Fofd41iUmY1eK4fmfZ6eHPAcFas27bvk6+L3+nYV/uYZ+f6zltutmwOAXNFBeZ84AWc0fzw2s3GnWHI6kPqeyvTtFrO3KhzbtMRuzDrnR4cdPODZfhSo+9VgHHssvbFVbfJp8fuVHSr84JA8DllN9JGhR0dgAUCi7Horu6eVOPlmPPbombe/KxeeJNPsYvbF0sEjXzBF60c3fXzYgQ1GTbGyO5FviXvyHd+mVvqw+P1Xj6vwjz+UxyLrMSUr2rvMPRIAyIeZ423Kr8wuHXnMe/8oF58kYhezX9kpbyURl5l1WqXdOii8GK2ZESbGdiZ6UzVTqhLfEdwtfj/bWHqSytt7Zo72kcYlLzG/Y3Xz3Fe5RwIA2RYGldW61j0uFY485ndHOrD4fRGL2dvJTIL2G2125/CafeNgC1HjJLmQRP+MfnXKnpvnw8TqFr/XGstP3Hl3vzw+eYz5fbB7fLELPIBsmznqJjtbMLQrHwwmWLLatJg9LvbjO/ttMJuoKFXVQTH9ar/5M/rPJf12aqGSXPyel8XsLYSNSQFk08zmoS3slZST2DdZYiFqU6LF7E9s3OkeBxKWxOL3qafFYkFMojdZbOMAIGtmFrSn78ibpPPuIbkcLTZ2MfulJwpr3eNAh0SL37eqV6VytNhM7paLBfkkpmRNtGtLDgDwgg5KL0uFgtyatn+7sLf7YtKL2TG3OBa///LrKrz2vFwqyM0xJesCWzgAyAR79I1UJIicayPl8M2nG0pSq+kpvezDYnbcyhSjtix+N4Utt1sxtBr7zVL3GAAgncJa5StSiSC3j92MdNE7vu9+yOvF7IgWv++SStNCMv19uUSQebOgMycBwBvR2YJ8Y7Dl2GN1xOI0T6LF7L3F7e4xwHNvbFFdrS5+f+87YnEgzYftGwCkiz0mhb2uFp/3D8slaq7Ue0uTLGZPn1YWv//6m2JhIAuI2yNrpXsMAOA/HRSHpcJAFp6mzy1kMXuqucXvZxqLlBR7vuA1FrW3JaZknXWPAAD8Zndql4oCaS0fDjUUKSm7u14yE/Qd7hEgxUyBGmwsVI35LZuJtjtsQgrAf5wx2P688z2hVLnUn+g64oYeGWEXv5tMS+WK/a7aH7c/FgdDA/CXPchXKghkcbFbN/yi4VuF9Z4Si9kzTFr8Xt/OlgxxxZSsQTf0AOCXmd3aOQonrsxe8M5i9nwY36KWz178/s4+uRyQxSda8O75mZYAcoo9r+LNRyPuQGi7mP3xdUwEOREtft+qTtuC9eFzcjkg7QlvsQB4ibMG48/7z3X/K4vZ8+nf/rt6WSoFpH3hLRYA7/D2KplEH8E+Q8HKIzP5X5BKAWlvdFUddkMOAJ2na90/kQoBaX90wML2vNEDao1UBkj7Y4rshBt2AOiscHjdMqkIkHhiy6wbeuSEmfRrUhkg8UT3qU1u6AGgc8Ja6YBUBEiMOf7lP3XDj4wLn1V36qqakooAiSem0J5yww8AnaOD8utiCSDx5YWH/8ENPzLOlKstUgkg8SVa7M7GowA6iWNxOhP7jU33CJBxpmCdlkoAiT0cnwOgc3RQ3icVAJJAxjbx/7BzgI8HOxM9oE64RwAAydNB6WVx8ifx5/gX/8o9BmRU2KdWSZM/iT+6X9XdYwCA5Omge0qc/Ens0bXKsHsMyCjdp56SJn+SUIbUcvcoACA5rL/qbPQLFdZhZRzrrzoe1mEBSB7rrzzIkLrLPQ5kEOuvOhu7/5h7FACQHF3rHhMnfZJYdK2w1j0OZIw9E0+a9ElyMQX3vHscAJAcjsfpfDg2J7s4HqfzsW8Q3eMAgOREBw8Lkz5JLjroPuIeBzLGTO67pEmfJBv3OAAgGXYPJmnCJ8nGbpPhHgkyRverQWnCJ8nGPQ4ASEY4VrlbmvBJstG10jn3SJAxdqNLacInycY9DgBIhl1cLU34JNnooPSaeyTIGN2vzkgTPkk27nEAQDLM5F5onOxJ8tG17nH3SJAxpmCdlSZ8kmzc4wCAZOjR4iPShE+Sja6VJt0jQcbYLQKkCZ8kG/c4ACAZYa2yU5rwSfJxjwQZY8/CkyZ8kmzc4wCAZFCw/Il7JMgYCpYfcY8DAJKhg0e+IE32JNnwEWF28RGhH3GPAwCSYSZ3Frl7EB0UWOSeUSxy9yPucQBAMvTYF9ZJEz5JNnq0i20aMoptGvyIexwAkIzwX/76z6QJnyQbHWxko9GMYqNRP+IeBwAkg6Ny/Ige7XrJPRJkjOaoHC/iHgcAJIfDnjsfDnvOLg579iPucQBAcnRQfkWa9Ely0bWHe9zjQMaEVdUlTfgkuZiSO+UeBwAkR9e6x6RJnyQX+2UD9ziQMWGfWiZN+iS52K0y3OMAgOTooLxPmvRJghlSd7nHgQyyb1CkiZ8kE92vTrlHAQDJCUfWsxdWB6NHH2IPrIxjL6zORvepp9yjAIDkhM+oO3StMi1N/iT+6KDrpHsUyKiwqg5KEz9JKH1qlXsUAJAs/ULlp9LkTxJIsHGnewzIKBa6dy4scAfQUWGtckic/En8ObZ6uXsMyKjwWXWn7lfTUgEg8cYUrNPuMQBA8sKjqzeKkz+JNZxBmB+sw+pMTMHa5R4BAHSGrnWPSyWAxJjRwiE3/Mg4M9nvaJz8SbyJ3hr2qWXuEQBAZ/AxYQfCx4O5wceEyYePBwF4IRyr3C2WABJLOOA5fzj4OfFsdkMPAJ1lJ32pDJAYMrL279ywIyf4NmFy0f1qwr41dEMPAJ0VHvv8o2IZIG2NrpUm+R//fDIT/wWpEJD2xozzoBtyAPCDHl3PYvfYUzrghhs5YyZ/FrvHHBa3A/CSHvrP35RLAWlHol3zh9fxP/455Ra7T0jFgLQnvL0C4KVoAgg2TkrlgCw+OigOu6FGTtmz8aRiQBYf3l4B8Jo+9uBeqRyQxUXXSvZ//Je6YUZO8RYrvvD2CoDXogmg1n1RKgmk9dji6oYYOWfKwObGckAWF3vuIG+vAHjPFIJCY0EgrScqrHxzELPofnVGKgqktdiPXt3QAoDf9OiGF6WyQFrIyPqCG1YgEg6p5dGaIaEskIXFjOMFN6wA4D+7XkiPdk2JhYE0HR0UXnRDCtyEBe+Ljy2pekCtcUMKAOkQHl29MdpaQCgOZP7oFyoXw9rX+WgQczIF4ZRUHEhz4aNBAKmlg9JuqTyQ20fXypP2jEc3jIDIfauQHd5biBm3mhtGAEgn/cLD/ySVCCIneuv3wpeKbviA23Lrsdi6YQEx43WWL44ASD37MZc+/sWfSmWC3Bp9/Es9MyMHNMeuIzKlgUXvTcSMU92U0iVu6AAg3cIf7fv3+oUKZxXOE338C8fckAELoqtqi1QoyCeJSmifWuWGDACyITz+xf8U7UguFAsSLWr/aRiGbrSAhTMl67BULMjH2eyGCgCyJTz2+UfDoCgWjDxHjz40Ho5t4mMLLJopWaeFYkH61X43RACQTbZk6aCbPbJc9GjxFc4ZRDvpflUTCkZuw3YMAHIj+riQNVn2GJyx8Bl1hxsWoG10Ve3K+8L36IzBqupyQwIA+RAtfM/xtwv1C//16ZmRAOJhy0VUMoTykfWY+37V/LnSDQUA5Itd1G2/OScVkKxG1zZNhf+8veSGAIiV2ycrV5uRRuvQ2IoBAFS043sevmGog/Lr9uNRd9tAIqId33Oy+N2UyUF32wAASx/9j2v0yPrMLn439/aS+X/Vd7nbBRIXVtVBqZRkIXa9mSmRW9ytAgBms6/19ej641JBSWvsuYJ65MFt7haBjnK7vmfqI0NzP2fsR6HuFgEAc9Ejf/FAtH2BUFjSFB10H2F/K/jIFJP99q1PY1lJU8zPX9d9apO7JQBAs8Lh1X+rR9enbjuH6OPAo5/lG0zwWtinlukBdUIqLz7HFKsJu7cVBzYDwCJFm5OOPvSvUpnxKTroOhkeW81HFUiVqGj1q0Hf32i5N1YUKwBot/DoZ7+sg8KLUrnpVD4aKYfTfYX/TbFC2v3bN9WD735LhX/8oVxwOhVTrM6aP3e4HxMAEJfw+Jf/VNce7tEjG16TSk/cuR6Uw98dKYdvHyiH43tMejaecz8akFqXt6n9JqHNm7tU+P4BFV57Xi49cce+rYq+9cjidQDoDPM/xiv10VXf0KMbXtTBxkmpELUjHw6Vw/cPm1L13XJ4da8rVi71ntL0+GMceYN0M8Xq7I2CNTsT31ChfbM1/X25DLUjdsd5u1dX9BFgn1rlfiQAgC/s4nIdFLf/5gelyd/3lcMPBuXCNFfsR34fDMyUqXcPlcO3vn1roZJyuaf4iPsRgNQx/wdhyaWtaloqWI2xheudfaZ07Z8pXQv9SPHD51T4+++p8KPDasT86x0UKgBIkfHe4rBUhCb+fqY0zc4vmihQ88Zcz10aSJ1L29QWqUwtNPXtMwVsduzHjY3/OXO9urs0ACBNLveWC2IRiin1ntJr7tJA6pjSc6KxBMUcjrQBgDSya6LqeyrTUhmKK1d28k1CpNOlrWpKKEGx5Y2tbBAKAKk13lP8sVSE4kq9t7LTXRpIjTe2qC6pBMUVu9bL/B8g9rICgLSq7ynvk4pQbNnd9ZK7NJAapvQcbCxBsWarOu0uDQBIo6u7u+4Vi1BMqfd2T7lLA6lhCs8FsQjFlEtb2DQUAFKvvqd7XCpDceXyrvUFd2nAe+Nb1HKpBMUZe013eQBAWo3v7jopFaHY8mTlkLs04L1LW9UuqQTFlq3qgrs0ACDNLu+pfEUsQnGlp/iKuzTgPVN6ztxSguLNQXdpAECajX9N3ZX0dg1X925a4i4PeMt+k6/Z3dvblZ9/Va1xlwcApN14b+mcVITiSv2JjWzXAO/ZvaikEhRXLm1TE+7SAIAsGO8pHJKKUGzpLZ50lwa8ZUpPrbEExZwT7tIAgCy49GRltViEYkq9tzTpLg14y54HKJSg2GLPO3SXBgBkhd2jSipDceWNb6z9nLs04J2fbVerpBIUV9zu7axNBICssR/bSUUotvSWDrhLA94xpSfZ3du3qbPu0gCALLHnBIpFKK70ls65SwPesYWnoQDFmktb1VPu0gCALLny+LplYhGKKdHWEI+pO9zlAW/Yj+qkEhRn2L0dADJsvLf7olSG4srl3Q896i4NeMOeBSiVoLhiF9O7SwMAsqje231EKkKxpbc47C4NeOPyVnVKKkIxZtBdGgCQRZd7ywWxCMUUe9C0uzTgBbd7+5RQgmLLG1tUl7s8ACCL7JqopLdruNpbudtdHug4W3akEhRXbJmzpc5dHgCQVeM9pZelIhRX6rsL+9ylgY4zheewVIRiy1Z1yl0aAJBl9Z7SbqkIxRZT6NylgY4zBetVsQjFFLug3l0aAJBl9iM7sQjFFFPo2K4BXrBbJUglKM6M/41a5i4PAMg6u/hcKkNxxS6ud5cGOsZu9imVoBhz3l0aAJAHdvsEqQjFFbs9hLs00DGm8CS6e7vJQXdpAEAe2A1ApSIUW3q7L7pLAx3htmeYFkpQbLEHSrvLAwDyINquwR5lI5WhmGKP6nGXBxL3xja1WSpBceXSNjXhLg0AyBN7GLNUhOKKPWzaXRpInCk9JxpLUMw54S4NAMgTU7AOSEUotvQWT7pLA4mzb5SEEhRb7Bszd2kAQJ5cerKyWixCMcXuIO8uDSTq519Va6QSFFfsWi92bweAHKv3lialMhRXbKlzlwYSY0rPwcYSFHPOuEsDAPLIfmwnFaHY8mTlkLs0kBhTeM43FKBYY/fbcpcGAORRvbe4XSxCcaW3dM5dGkiE3UldKkFxxu4Y7y4PAMijq3s3LRGLUIyx13SXV+Gz6s6wqrpMHgpr5cLHGVhh/72ucIiJCrKwTy1zvztyhlT0e2bPApRKUFyxZx1GPyAAIN9M6XmlsQS1O299uxy+e6gcvn+4HH50rPR/9eiGSVOkwqYSdIXhyLpQ10rndFB4MRxZ//3w6Ge/bCdYdwvIKFuSdJ/aZArTQT2gTuh+ddZkOuxXYbO5fkT9Yfr7Knz/gArf/ZYKJ76hwvp2uRy1I6ZgHXY/PgAgz+y6KKkULSa2UL33j+XwgwGhMLUrQTHUIxte06Prj+vh/7L1xhsLpJd9hqYUbTYlatDkQmNZamc+OGQK134VTu6Wi1KreWOL6nK3AwDIs8u71hekkrTQvPm0e0M1IpShJGILl33Ddezzj7pbQ0rYt1TuDdWC3k61K9een3nD9eYuuTQ1m0tbFVuRAAA+YfeokkrTfLnyZDl853vl8A9HhcLTwehg46QeWXs0HFL/wd0iPGM/4tVVddiUqrpUejqVP/5QhVNPq3D8MblE3TZb1Sl3ewAAKDXeU3pZKlBz5eremY8AO/a2qtlEb7W6ToZjlbvdraLDomI18xFgR95WNZtrz6vwve+o8MoOoUjNEbug3t0mAAD2DVZlp1SkGhMVq+fK4TXfi5UQPdr1Unj0syvdLSNhUbEaUCekMuNzrlebL1rjj7EOEAAwy9Xeyt1SoZqdt7+bgjdW80TXStN65MHn7fYQ7taRAFNU9vv+xmq+XHtehb/+plysXM662wUA4BP1ntJrUrH6xd5yON0vF5a0RgeFcT1038Pu1hETPaDW6Kp6VSosaY399uEvvy4WrP3utgEA+MR4b3G4sVzZt1bXA7mkZCGmaI2Fta/zNisGdgG7VFCyEPux4a/33lywfrZdrXK3DgDAJy73lm/arsEuYpdKSdaij37u/7BpaftEm4NW1WmpmGQtdmsHu2nppW2q7m4fAICbjT+m7qjvqUzbrRd+d0QuI5nM4KfDaKuAPt5ALJYpV8vNWMa6QahvsbvEX/1b9c9uCAAAuNWb3yr99MMhoYRkNUHx44nSLsLWVbXFDQUWyJ7/Z8Zvanb5yEuu96lJCjoAQKT/ZduD14PK78UiktWMrLt1wqyqg25I0CRTrHbdMo45iyuXm92QAABgJsigtFvXKtNiCclyjv35XJPlac42nJ/d7kL3q5o0hrkNBR0AYOmRwj6xfOQhQyvkSdLElKzz7Jd1e1ERFcYu7zGlc9ANEQAgj8J/+uuSWDzykoFPiRPkjdidx91QoYF9UyONGfk4HJsDAHkUntyxQtc2TYnFIw8Z3SBNirdE96mn3JDBMeOyuXGcyM2JvjQxoNa4IQMA5EH4P/7uT0y5el0sHnnJHOuvpJiStckNXe7Zb8vZ8iCNE7k5Zpwm7NYVbugAAFkWhqHSx7/wE7F05ClHPyNOilLcN8Ryf1B0dGCz3TNMGCMix4zXBdbyAUAO6Be+2CcWjrxlYKk4Ic4VU7JezfM3C903Bs9KY0NuHzNup9wwAgCySNce3i6Wjbxl1gajC4mZKM+4ocwdc+9sx7C4cBg0AGRROLz2c7nc60rKyAPSBNhUdFUddkOaG+aec7+RaDvCWj4AyCAdlF8Ry0YeM3yfOAE2E20XeOfoWJRo3VVOj8Bpd8zvTp31WACQIfr4l3rEopHXDH5anACbjZkoz7qhzTy7F5g0BqS15PENKABkUji8blmu97uSIkx8LSTzG0naA5yF+yaLSN7egAJAZunRDS+KJSOvkQ54biFmopzI+sc95h4vSPdOFhddVefdEAMA0igcvHeVWDLynAVsMDpfsrzLu7k/dmuPMSx4B4AU00FxWCwZec7QPeKE10qy/BaLt1fxRlfVaTfUAIA0mVl7xbYMt2SeA54Xmiy+xTL3xdurJMJaLABIH95eCQm65IluEbFvsdyQZ4ZdIyTdK2lveIsFACkTHWsSdPPNwcYcu1+c6BabLK2nMfezsvH+SIzpU8vc0AMAfKeDIkfiSFnAAc8Lic7QWXN2nybpHkls4QgdAEgLU7B+LBaMvGeRG4zOFVOwprNyEHS0cF+4RxJPTKF91Q09AMBnLG6fIy0e8LyApH7jUTYW7VBY7A4A/tMjG54QC0be06YNRueKzsDxORyL05nYj2XdIwAA+EqPdr0kFoy8p40bjEqJPiZM+Z5Y5h7q0r2ReGPG/YJ7BAAAX+nRIt8elDK0Qpzc2pqq6nKPIXXCIbVcvCeSTDKyhg8AMikMKqvFckHavsGomKo66B5F6piff8ct90OSzGb3KAAAvtFBeZ9YLvKe0Q3ShNb2pHkdFuuvOhvzuzPoHgUAwDc6KLwoFoy8J+b1Vzdy7XkVXt6Wznz4nHxPJJnY3fPdX2MAgG90rfuiWDDynpg2GJVyZYdcYHzP9ap8PySZ6AweuQQAmcHxOHNkYKk4qcWRyd1ygfE5v/y6fC8k4bDQHQD8YzcYFctF3hP/BqM35dd75RLjc2wplO6FJBs9oNa4v84AAF/o0eIjYsHIe0YeECezuPLed+QS43Pe2SffC0k8qT8NAAAyJww27hQLRt4zfJ80kcWW3zwjlxif8+635HshCSfF23wAQGaFtQoFS0pMBzzPld9/Ty4xPuf9A/K9kIRDwQIA/+iRAntgSZEmshgz/X25xPgc+9ZNuheSbNgLCwA8FNYqh8SCkefEfMCzlA8OySXG5/yWguVF7Gav7q8zAMAXFCwhCW0wOjt//KFcYnyOfesm3QtJNhQsAPAQBUvI0D3iRBZnKFik1VCwAMBDFCwhSRzw3BA+IiSthoIFAB7ioOeGBF3iJBZ3WOROWg2L3AHAQ2zT0JBj94uTWNxhmwbSctimAQD8Q8FqSIIHPM8OG42SlkPBAgD/6FphrVg08pqENxi9EY7KIa1GV9UW99cZAOALDnuelYQPeJ4dDnsmLadPrXJ/nQEAPtFB95RYOPKWDmwweiNv7pJLjM+5skO+F5JwhtQS91cZAOATHZRfEQtH3tKBDUZvxJYVqcT4nutV+X5IMtH9asL9NQYA+EbXiifFwpG3DK0QJ7G4c+15ubykIR8+J98TSSamYJ1xf40BAL7hm4QuHdhg1OZ3z8rlJQ2xi/OleyIJhW8QAoC/wrHK3WLhyFNGN8gTWAKx38aTyksa8lavfE8koVRVl/trDADwka51j4vFIy/p4PqrXz0ul5c0ZPwx+Z5I/NH9ajp8Vt3p/goDAHyU+3VYHdpgNM3rr26EdVidiSlYZ91fXwCAr3K/DmtgqTiJxZ00r7+6EdZhdSisvwIA/4Vjm5boWmVaLB9ZTwc3GH17j1xa0hS7h5d0byT2rHR/fQEAPtO18o/EApL1jDwgTV6xx348WN8ul5a05Q8/kO+RxBNdVefdX1sAgO/0aPERsYBkPcP3iZNY3NH9quaGPvXM/exvvD8SX0zB2uWGHgCQBrpWnhRLSJbToQOe9YBa44Y99cI+tUy6R9L+RN8e5HgcAEgXHZT3iSUkyxEmsbhjJskLbsgzQ1fVaeleSXtjfncG3ZADANIifEbdkavF7p074HmzG/LMCPvUKuE+SbszpJa7IQcApIkOisNiGcliOrDBaBbfXt3AW6x4Y8fXDTUAIG3C4XXLcvMWa+gecSKLOZl7e3UDb7FijhlfN9QAgDTKzVushA94zvLbqxvMPZ6R7p0sLry9AoAMmFmLlfFvFAZd4kQWa3JwOK99y2JK1rR4/6SlROPZp5a5IQYApFlYq3xFLCZZybH7xcksrphJ8pQb2swz9zoojQFpLbpPPeWGFgCQBToovSyWkywkwQOe8/YGInxW3WnueUIaC7KwmHHM/MfKAJA74Vjlbh10T4kFJe1JcIPRPO68be57c+M4kIXFFvMsbUgLAJjFlJHCLeUk7UnwgGczQZ5wQ5k7YVUdlMaENJ0dbigBAFmUuR3eE9pgVFfVeftxmRvGXGJvrNZi17G5IQQAZJmudY+JZSWNSWCDUTNB1vnm18frsS5IY0TkmPE644YPAJB10dYNQfkVsbCkLUMrxImtXWHtzM3s8S66qqaksSI3JyrmHOYMAPkys8t797hYWtKUmDcYNWViixsyOHYPMFs8pfEiM3EldKUbMgBAnoRBZXWqj9IZ3SBObu2KmSQPu6FCAzM2u6QxIzPRfWqTGyoAQB6lehPSGNdfmQLBcSbz0GxCKobNRAEAEVNWCqncIyumDUZtcXBDg3nYMiGNYR4TrdfjI2UAwGzhaNe9Oii/LhYZXzOwVJzoWo2bIHO3kehimbHbbMYt1wvfze/OBF+GAACIwrFNS3St+ydimfEtbd5g1BYEJsjWmTFcaUpGvXFc8xBz3xfYxgMAMC8dFIfFUuNTRh4QJ7tWEk2QQ2q5u320yG5JYMbyrDTGWY2531N534AWALAApmRt9/obhsP3iRPeQsME2X5mTHOx+J3F7ACAluhaYa2ulSfFgtPptOOA56o66G4VbWbXspmilcm9stx6s83uVgEAWLhoXVbQfUQsOZ2MMPE1G/cxFptAxiza9b1fnWkc/zTHHvjNeisAQNu4bxn6cbxOiwc8m8l+QvM1+sTZTTfN2Kd6Abz5vXmVL0EAAGJjNybVte6LYvFJKgvcYNQWK/txIOfCdU50UHSfeip6FsIz8jWuGO5wtwEAQLxmilbpnFiA4s7QPeJk2JjojZXdCJNF7F4xz2aH72+0zM93wfxJsQIAdMbMQvjiyUR3gp/ngGczOdp1PzsoVn6zH9eanG58fp2K+b2ZNjllP9J0PyIAAJ0VPqPuCGuVnbFvVBp0zTU52jci+9nPKn3sovHo48OqerXxuSYRc93zJrv4CBkA4DX7zcPoI8SgONz29VrH7p+ZFO3Hf/Ztg50Y+UZgZtiCbJ7nDvttPVeabylEi40tcuafXTN/buEbgQCA1JopXPZA6dJuU7wO2bVb8557aI/CGVkX6pH1U3p0g/nPF8bsfzccWV8wkySFKieiwlVVXeaZ7zelaNDkrElTC+VtQYv+81V1OFqLZ/85FCogAUr9f4vlBHw2OuW1AAAAAElFTkSuQmCC",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-add-service-fabric-cluster-certificate/scriptbody.ps1 b/src/step-templates/azure-add-service-fabric-cluster-certificate/scriptbody.ps1
new file mode 100644
index 000000000..e5570ec2a
--- /dev/null
+++ b/src/step-templates/azure-add-service-fabric-cluster-certificate/scriptbody.ps1
@@ -0,0 +1,8 @@
+Write-Output "Adding Service fabric cluster certificate"
+Write-Output "Resource group name: " $OctopusParameters["Azure.AddServiceFabricClusterCertificate.ResourceGroupName"]
+Write-Output "Service fabric cluster name:" $OctopusParameters["Azure.AddServiceFabricClusterCertificate.ClusterName"]
+Write-Output "Certificate secret identifier:" $OctopusParameters["Azure.AddServiceFabricClusterCertificate.SecretIdentifier"]
+
+Add-AzureRmServiceFabricClusterCertificate -ResourceGroupName $OctopusParameters["Azure.AddServiceFabricClusterCertificate.ResourceGroupName"] `
+	-Name $OctopusParameters["Azure.AddServiceFabricClusterCertificate.ClusterName"] `
+    -SecretIdentifier $OctopusParameters["Azure.AddServiceFabricClusterCertificate.SecretIdentifier"]
\ No newline at end of file
diff --git a/step-templates/azure-administer-webjob.json b/src/step-templates/azure-administer-webjob/metadata.json
similarity index 79%
rename from step-templates/azure-administer-webjob.json
rename to src/step-templates/azure-administer-webjob/metadata.json
index 5cf6161b7..92754e60c 100644
--- a/step-templates/azure-administer-webjob.json
+++ b/src/step-templates/azure-administer-webjob/metadata.json
@@ -6,7 +6,7 @@
   "Version": 2,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$httpAction = 'POST'\r\n\r\nif ($WebJobAction -eq 'delete') {\r\n    $httpAction = 'DELETE'\r\n}\r\n\r\n$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $WebJobUserName,$WebJobPassword)))\r\n$apiUrl = \"https://$WebJobWebApp.scm.azurewebsites.net/api/$WebJobType/$WebJobName/$WebJobAction\"\r\nInvoke-RestMethod -Uri $apiUrl -Headers @{Authorization=(\"Basic {0}\" -f $base64AuthInfo)} -Method $httpAction -ContentType \"Application/Json\""
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -69,9 +69,9 @@
   ],
   "LastModifiedBy": "dustinchilson",
   "$Meta": {
-    "ExportedAt": "2015-11-23T20:15:06.113+00:00",
+    "ExportedAt": "2015-11-23T12:15:06.1130000-08:00",
     "OctopusVersion": "3.2.4",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-administer-webjob/scriptbody.ps1 b/src/step-templates/azure-administer-webjob/scriptbody.ps1
new file mode 100644
index 000000000..ae80b6889
--- /dev/null
+++ b/src/step-templates/azure-administer-webjob/scriptbody.ps1
@@ -0,0 +1,9 @@
+$httpAction = 'POST'
+
+if ($WebJobAction -eq 'delete') {
+    $httpAction = 'DELETE'
+}
+
+$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $WebJobUserName,$WebJobPassword)))
+$apiUrl = "https://$WebJobWebApp.scm.azurewebsites.net/api/$WebJobType/$WebJobName/$WebJobAction"
+Invoke-RestMethod -Uri $apiUrl -Headers @{Authorization=("Basic {0}" -f $base64AuthInfo)} -Method $httpAction -ContentType "Application/Json"
\ No newline at end of file
diff --git a/src/step-templates/azure-app-config-kv-retrieve-values/metadata.json b/src/step-templates/azure-app-config-kv-retrieve-values/metadata.json
new file mode 100644
index 000000000..62688574f
--- /dev/null
+++ b/src/step-templates/azure-app-config-kv-retrieve-values/metadata.json
@@ -0,0 +1,139 @@
+{
+  "Id": "5c4fbed9-dbba-4139-8440-d8e27318772e",
+  "Name": "Azure AppConfig KV - Retrieve Values",
+  "Description": "This step retrieves one or more key/values from an Azure App Configuration store and creates [output variables](https://octopus.com/docs/projects/variables/output-variables) for each value retrieved. These values can be used in other deployment or runbook process steps.\n\nYou can retrieve individual keys that match a specific name and you can choose a custom output variable name for each key.\n\nWildcard search is also supported using the `*` notation in the **Key Names** parameter. Note: Combining a wildcard search with custom output variable names is not supported.\n\nAuthentication is performed using an Azure Service Principal.\n\n---\n\n**Required:** \n- An Azure account with permissions to retrieve key/values from the Azure App Config store.\n- The `az` CLI on the target or worker. If the CLI can't be found, the step will fail. \n\nNotes:\n\n- Tested on Octopus `2024.1` using az version `2.38.0`\n- Tested with both Windows PowerShell and PowerShell Core (on Linux).\n\n",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Azure.AccountId": "#{Azure.AppConfig.KV.RetrieveValues.AzureAccount}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4bc809d3-71d5-4f05-ba0e-994ef6649db0",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.AzureAccount",
+      "Label": "Azure Account",
+      "HelpText": "An Azure account with permissions to retrieve values from the Azure App Config store",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "2b53fffb-cef1-4c3b-a070-aa6448fe84b0",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.ConfigStoreName",
+      "Label": "Config Store Name",
+      "HelpText": "The name of the Azure App Configuration store. Provide this or the **Config store endpoint**.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "41f5fa14-c1ce-4a27-9e63-06419e96f095",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.ConfigStoreEndpoint",
+      "Label": "Config Store Endpoint",
+      "HelpText": "The endpoint for the Azure App Configuration Store. Provide this or the **Config store name**.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "39d76051-4ede-47dd-8139-57f3801d215e",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.RetrievalMethod",
+      "Label": "Retrieval Method",
+      "HelpText": "Choose how the step calls the az cli. Either:\n- `All`: Retrieve all configuration values in one call\n- `Individually`: Retrieve configuration values in multiple calls; one for each key specified in the **Key Names** parameter.\n\nDefault: `All`",
+      "DefaultValue": "all",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "all|All\nindividual|Individually"
+      }
+    },
+    {
+      "Id": "02d67ef3-d990-499c-bdbd-226d583ccdc0",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.KeyNames",
+      "Label": "Key Names",
+      "HelpText": "Specify the names of the keys to be returned from Azure App Configuration in the format `KeyName | OutputVariableName` where:\n\n- `KeyName` is the key to retrieve. Wildcards are supported by adding `*` at the end of the key name.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the key's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple keys can be retrieved by entering each one on a new line. Note: Combining a wildcard search with custom output variable names is not supported.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "b97ff62d-6b14-4baa-abc2-9065632f5118",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.Labels",
+      "Label": "Labels",
+      "HelpText": "Labels are an attribute on keys. Provide one or more labels in the format `label1,label2` to retrieve only selected keys that are tagged with those labels.\n\n**Note:** You can include both label values *and* specify key names if you want.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a5dfafc4-743e-4a56-8c89-cd001dc73af3",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.SaveAsSensitiveVariables",
+      "Label": "Save sensitive output variables",
+      "HelpText": "Set the Octopus [output variables](https://octopus.com/docs/projects/variables/output-variables) to Sensitive values. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c93c377c-e557-4b8a-a918-ee0c47f80c1b",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.SuppressWarnings",
+      "Label": "Suppress warnings",
+      "HelpText": "Suppress warnings from being written to the task log. For example, when a supplied key can't be found in the Azure App Configuration store.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c51f515f-c749-4c00-90b3-fdc09b2cd426",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.TreatWarningsAsErrors",
+      "Label": "Treat Warnings as Errors",
+      "HelpText": "Treats warnings as errors. If enabled, the **Suppress Warnings** parameter is ignored. ",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "166f88c8-2fb0-4a3c-a0dc-c4087a5ebc76",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.CreateAppSettingsJson",
+      "Label": "Create AppSettings JSON",
+      "HelpText": "Create an Azure App Service AppSettings JSON output variable called `AppSettingsJson`. This can be useful when using the Octopus **Azure App Service** step and you want to dynamically create the JSON app settings.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "159858de-5a33-4111-a059-de261f687b08",
+      "Name": "Azure.AppConfig.KV.RetrieveValues.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AzurePowerShell",
+  "$Meta": {
+    "ExportedAt": "2023-11-30T15:10:08.8280000Z",
+    "OctopusVersion": "2024.1.2702",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedAt": "2023-11-30T15:10:08.8280000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-app-config-kv-retrieve-values/scriptbody.ps1 b/src/step-templates/azure-app-config-kv-retrieve-values/scriptbody.ps1
new file mode 100644
index 000000000..bc6b7b52c
--- /dev/null
+++ b/src/step-templates/azure-app-config-kv-retrieve-values/scriptbody.ps1
@@ -0,0 +1,353 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$global:AzureAppConfigStoreName = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.ConfigStoreName"]
+$global:AzureAppConfigStoreEndpoint = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.ConfigStoreEndpoint"]
+$global:AzureAppConfigRetrievalMethod = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.RetrievalMethod"]
+$ConfigStoreKeyNames = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.KeyNames"]
+$global:ConfigStoreLabels = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.Labels"]
+$PrintVariableNames = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.PrintVariableNames"]
+$SaveValuesAsSensitiveVariables = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.SaveAsSensitiveVariables"] -ieq "True"
+$global:SuppressWarnings = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.SuppressWarnings"] -ieq "True"
+$global:TreatWarningsAsErrors = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.TreatWarningsAsErrors"] -ieq "True"
+$global:CreateAppSettingsJson = $OctopusParameters["Azure.AppConfig.KV.RetrieveValues.CreateAppSettingsJson"] -ieq "True"
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName) -and [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {
+    throw "Either parameter ConfigStoreName or ConfigStoreEndpoint not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($global:AzureAppConfigRetrievalMethod)) {
+    throw "Required parameter Azure.AppConfig.KV.RetrieveValues.RetrievalMethod not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($ConfigStoreKeyNames) -and [string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {
+    throw "Either Azure.AppConfig.KV.RetrieveValues.KeyNames or Azure.AppConfig.KV.RetrieveValues.Labels not specified"
+}
+
+$RetrieveAllKeys = $global:AzureAppConfigRetrievalMethod -ieq "all"
+$global:ConfigStoreParameters = ""
+if (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {
+    $global:ConfigStoreParameters += " --name ""$global:AzureAppConfigStoreName"""
+}
+if (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {
+    $global:ConfigStoreParameters += " --endpoint ""$global:AzureAppConfigStoreEndpoint"""
+}
+
+### Helper functions
+function Test-ForAzCLI() {
+    $oldPreference = $ErrorActionPreference
+    $ErrorActionPreference = "Stop"
+    try { 
+        if (Get-Command "az") {
+            return $True
+        }
+    }
+    catch { 
+        return $false
+    }
+    finally { 
+        $ErrorActionPreference = $oldPreference 
+    }
+}
+
+function Write-OctopusWarning(
+    [string] $Message
+) {
+    if ($global:TreatWarningsAsErrors) {
+        throw "Error: $($Message)"
+    }
+    else {
+        if ($global:SuppressWarnings -eq $False) {
+            Write-Warning -Message $Message
+        }
+        else {
+            Write-Verbose -Message $Message
+        }
+    }
+}
+
+
+function Save-OctopusVariable(
+    [string]$variableName, 
+    [string]$variableValue) {
+
+    $VariableParams = @{name = $variableName; Value = $variableValue } 
+                    
+    if ($SaveValuesAsSensitiveVariables) {
+        $VariableParams.Sensitive = $True
+    }
+
+    Set-OctopusVariable @VariableParams
+
+    $global:VariablesCreated += 1
+
+    if ($global:CreateAppSettingsJson) {
+        $global:AppSettingsVariables += [PsCustomObject]@{name = $variableName; value = $variableValue; slotSetting = $false }
+    }
+
+    if ($PrintVariableNames) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+    }
+}
+
+function Find-AzureAppConfigMatchesFromKey(
+    [string]$KeyName,
+    [bool]$IsWildCard,
+    [string]$VariableName,
+    [PsCustomObject]$AppConfigValues) {
+
+    if ($IsWildCard -eq $False) {
+        Write-Verbose "Finding exact match for: $($keyName)"
+        $matchingAppConfigKeys = $appConfigValues | Where-Object { $_.key -ieq $keyName }
+        if ($null -eq $matchingAppConfigKeys -or $matchingAppConfigKeys.Count -eq 0) {
+            Write-OctopusWarning "Unable to find a matching key in Azure App Config for: $($keyName)"
+        }
+        else {
+            if ($matchingAppConfigKeys.Count -gt 1) {
+                Write-OctopusWarning "Found multiple matching keys ($($matchingAppConfigKeys.Count)) in Azure App Config for: $($keyName). This is usually due to multiple values with labels"
+
+                foreach ($matchingAppConfigKey in $matchingAppConfigKeys) {
+                    Write-Verbose "Found match for $($keyName) $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.label)) {"(label: $($matchingAppConfigKey.label))"})"
+                    $variableValue = $matchingAppConfigKey.value
+                    
+                    if ([string]::IsNullOrWhiteSpace($variableName)) {
+                        $variableName = $keyName.Trim()
+                    }
+                    
+                    if (![string]::IsNullOrWhiteSpace($matchingAppConfigKey.label)) {
+                        $variableName = "$($keyName.Trim())-$($matchingAppConfigKey.label)"
+                        Write-Verbose "Appending label to variable name to avoid duplicate output name: $variableName"
+                    }
+
+                    Save-OctopusVariable -variableName $variableName -variableValue $variableValue
+                }
+            } 
+            else {
+                $matchingAppConfigKey = $matchingAppConfigKeys | Select-Object -First 1
+
+                Write-Verbose "Found match for $($keyName)"
+                $variableValue = $matchingAppConfigKey.value
+    
+                if ([string]::IsNullOrWhiteSpace($variableName)) {
+                    $variableName = "$($keyName.Trim())"
+                }
+    
+                Save-OctopusVariable -variableName $variableName -variableValue $variableValue
+            }
+        }
+    }
+    else {
+        Write-Verbose "Finding wildcard match for: $($keyName)"
+        $matchingAppConfigKeys = @($appConfigValues | Where-Object { $_.key -ilike $keyName })
+        if ($matchingAppConfigKeys.Count -eq 0) {
+            Write-OctopusWarning "Unable to find any matching keys in Azure App Config for wildcard: $($keyName)"
+        }
+        else {
+            foreach ($match in $matchingAppConfigKeys) {
+                # Have to explicitly set variable Name here as its a wildcard match
+                $variableName = $match.key
+                $variableValue = $match.value
+                Write-Verbose "Found wildcard match '$variableName' $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {"($($matchingAppConfigKey.content_type))"})"
+                Save-OctopusVariable -variableName $variableName -variableValue $variableValue
+            }
+        }
+    }
+}
+
+function Find-AzureAppConfigMatchesFromLabels() {
+    
+    Write-Verbose "Retrieving values matching labels: $($global:ConfigStoreLabels)"
+    $command = "az appconfig kv list $($global:ConfigStoreParameters) --label ""$global:ConfigStoreLabels"" --auth-mode login"
+            
+    Write-Verbose "Invoking expression: $command"
+    $appConfigResponse = Invoke-Expression -Command $command
+    $ExitCode = $LastExitCode
+    Write-Verbose "az exit code: $ExitCode"
+    if ($ExitCode -ne 0) {
+        throw "Error retrieving appsettings. ExitCode: $ExitCode"
+    }
+
+    if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {
+        Write-OctopusWarning "Null or empty response received from Azure App Configuration service"
+    }
+    else {
+        $appConfigValues = $appConfigResponse | ConvertFrom-Json
+        if ($appConfigValues.Count -eq 0) {
+            Write-OctopusWarning "Unable to find any matching keys in Azure App Config for labels: $($global:ConfigStoreLabels)"
+        }
+        else {
+            Write-Verbose "Finding match(es) for labels: $($global:ConfigStoreLabels)"
+            foreach ($appConfigValue in $appConfigValues) {
+                # Have to explicitly set variable Name here as its a match based on label alone
+                $variableName = $appConfigValue.key
+                Write-Verbose "Found label match '$($appConfigValue.key)' $(if(![string]::IsNullOrWhiteSpace($appConfigValue.content_type)) {"($($appConfigValue.content_type))"})"
+                if (![string]::IsNullOrWhiteSpace($appConfigValue.label)) {
+                    $variableName = "$($variableName)-$($appConfigValue.label)"
+                    Write-Verbose "Appending label to variable name to avoid duplicate output name: $variableName"
+                }
+                $variableValue = $appConfigValue.value
+                
+                Save-OctopusVariable -variableName $variableName -variableValue $variableValue
+            }
+        }
+    }
+}
+
+# Check if Az cli is installed.
+$azCliAvailable = Test-ForAzCLI
+if ($azCliAvailable -eq $False) {
+    throw "Cannot find the Azure CLI (az) on the machine. This must be available to continue."	
+}
+
+$Keys = @()
+$global:VariablesCreated = 0
+$global:AppSettingsVariables = @()
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Extract key names+optional custom variable name
+@(($ConfigStoreKeyNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $keyDefinition = ($_ -Split "\|")
+        $keyName = $keyDefinition[0].Trim()
+        $KeyIsWildcard = $keyName.EndsWith("*")
+        $variableName = $null
+        if ($keyDefinition.Count -gt 1) {
+            if ($KeyIsWildcard) {
+                throw "Key definition: '$_' evaluated as a wildcard with a custom variable name. This is not supported."
+            }
+            $variableName = $keyDefinition[1].Trim()
+        }
+
+        if ([string]::IsNullOrWhiteSpace($keyName)) {
+            throw "Unable to establish key name from: '$($_)'"
+        }
+
+        $key = [PsCustomObject]@{
+            KeyName       = $keyName
+            KeyIsWildcard = $KeyIsWildcard
+            VariableName  = if (![string]::IsNullOrWhiteSpace($variableName)) { $variableName } else { "" }
+        }
+        $Keys += $key
+    }
+}
+
+$LabelsArray = $global:ConfigStoreLabels -Split "," | Where-Object { [string]::IsNullOrWhiteSpace($_) -eq $False }
+
+Write-Verbose "Azure AppConfig Retrieval Method: $global:AzureAppConfigRetrievalMethod"
+if (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {
+    Write-Verbose "Azure AppConfig Store Name: $global:AzureAppConfigStoreName"
+}
+if (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {
+    Write-Verbose "Azure AppConfig Store Endpoint: $global:AzureAppConfigStoreEndpoint"
+}
+Write-Verbose "Save sensitive variables: $SaveValuesAsSensitiveVariables"
+Write-Verbose "Treat warnings as errors: $global:TreatWarningsAsErrors"
+Write-Verbose "Suppress warnings: $global:SuppressWarnings"
+Write-Verbose "Print variables: $PrintVariableNames"
+Write-Verbose "Keys to retrieve: $($Keys.Count)"
+Write-Verbose "Labels to retrieve: $($LabelsArray.Count)"
+
+$appConfigResponse = $null
+
+# Retrieving all keys should be more performant, but may have a larger payload response.
+if ($RetrieveAllKeys) {
+    
+    if ($Keys.Count -gt 0) {
+        Write-Host "Retrieving ALL config values from store"
+        $command = "az appconfig kv list $($global:ConfigStoreParameters) --all --auth-mode login"
+    
+        if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {
+            $command += " --label ""$($global:ConfigStoreLabels)"" "
+        }
+        Write-Verbose "Invoking expression: $command"
+        $appConfigResponse = Invoke-Expression -Command $command
+        $ExitCode = $LastExitCode
+        Write-Verbose "az exit code: $ExitCode"
+        if ($ExitCode -ne 0) {
+            throw "Error retrieving appsettings. ExitCode: $ExitCode"
+        }
+    
+        if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {
+            Write-OctopusWarning "Null or empty response received from Azure App Configuration service"
+        }
+        else {
+            $appConfigValues = $appConfigResponse | ConvertFrom-Json
+        }
+
+        foreach ($key in $Keys) {
+            $keyName = $key.KeyName
+            $KeyIsWildcard = $key.KeyIsWildcard
+            $variableName = $key.VariableName
+        
+            Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -VariableName $variableName -AppConfigValues $appConfigValues
+        }
+    }
+    # Possible that ONLY labels have been provided
+    elseif ($LabelsArray.Count -gt 0) {
+        Find-AzureAppConfigMatchesFromLabels 
+    }
+}
+# Loop through and get keys based on the supplied names
+else {
+    
+    Write-Host "Retrieving keys based on supplied names..."
+    if ($Keys.Count -gt 0) {
+        foreach ($key in $Keys) {
+            $keyName = $key.KeyName
+            $KeyIsWildcard = $key.KeyIsWildcard
+            $variableName = $key.VariableName
+
+            if ([string]::IsNullOrWhiteSpace($variableName)) {
+                $variableName = "$($keyName.Trim())"
+            }
+
+            Write-Verbose "Retrieving values matching key: $($keyName) from store"
+            $command = "az appconfig kv list $($global:ConfigStoreParameters) --key ""$keyName"" --auth-mode login"
+            
+            if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {
+                $command += " --label ""$($global:ConfigStoreLabels)"" "
+            }
+            Write-Verbose "Invoking expression: $command"
+
+            $appConfigResponse = Invoke-Expression -Command $command
+            $ExitCode = $LastExitCode
+            Write-Verbose "az exit code: $ExitCode"
+            if ($ExitCode -ne 0) {
+                throw "Error retrieving appsettings. ExitCode: $ExitCode"
+            }
+
+            if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {
+                Write-OctopusWarning "Null or empty response received from Azure App Configuration service"
+            }
+            else {
+                $appConfigValues = $appConfigResponse | ConvertFrom-Json
+                if ($appConfigValues.Count -eq 0) {
+                    Write-OctopusWarning "Unable to find a matching key in Azure App Config for: $($keyName)"
+                }
+                else {
+                    Write-Verbose "Finding match(es) for: $($keyName)"
+                    Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -VariableName $variableName -AppConfigValues $appConfigValues
+                }
+            }
+        }
+    }
+}
+
+if ($global:AppSettingsVariables.Count -gt 0 -and $global:CreateAppSettingsJson) {
+    Write-Verbose "Creating AppSettings JSON output variable"
+    $AppSettingsJson = ($global:AppSettingsVariables | Sort-Object -Property * -Unique) | ConvertTo-Json -Compress -Depth 10
+    if ($SaveValuesAsSensitiveVariables) {
+        Set-OctopusVariable -Name "AppSettingsJson" -Value $AppSettingsJson -Sensitive
+    }
+    else {
+        Set-OctopusVariable -Name "AppSettingsJson" -Value $AppSettingsJson 
+    }
+    $global:VariablesCreated += 1
+    if ($PrintVariableNames) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.AppSettingsJson}"
+    }
+}
+
+Write-Host "Created $global:VariablesCreated output variable(s)"
\ No newline at end of file
diff --git a/step-templates/azure-blob-storage-set-cors.json b/src/step-templates/azure-blob-storage-set-cors/metadata.json
similarity index 71%
rename from step-templates/azure-blob-storage-set-cors.json
rename to src/step-templates/azure-blob-storage-set-cors/metadata.json
index 403d39a2c..a35942d9c 100644
--- a/step-templates/azure-blob-storage-set-cors.json
+++ b/src/step-templates/azure-blob-storage-set-cors/metadata.json
@@ -6,7 +6,7 @@
   "Version": 4,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "try\n{ \n    Import-Module Azure -ErrorAction Stop\n}\ncatch\n{\n    throw \"Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools\" \n}\n\nImport-AzurePublishSettingsFile $PublishSettingsFile\n\n$context = New-AzureStorageContext `\n    -StorageAccountName $StorageAccount `\n    -StorageAccountKey $StorageAccountKey\n\n$container = Get-AzureStorageContainer -Context $context | \n        Where-Object { $_.Name -like $StorageContainer }\n\nif (-not $container)\n{\n    throw \"Azure storage container ($StorageAccount) not found\"\n}\n\n$corsRules = (@{\n    AllowedHeaders=@($AllowedHeaders);\n    AllowedOrigins=@($AllowedOrigins);\n    MaxAgeInSeconds=$MaxAgeInSeconds;\n    AllowedMethods=@($AllowedMethods)})\n\nSet-AzureStorageCORSRule -Context $context -ServiceType Blob -CorsRules $corsRules\n\nWrite-Host \"Added CORS rule to container: $StorageContainer\""
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -83,12 +83,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2016-01-22T04:49:27.549+00:00",
+    "ExportedAt": "2016-01-21T20:49:27.5490000-08:00",
     "OctopusVersion": "3.1.3",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-blob-storage-set-cors/scriptbody.ps1 b/src/step-templates/azure-blob-storage-set-cors/scriptbody.ps1
new file mode 100644
index 000000000..5027bca82
--- /dev/null
+++ b/src/step-templates/azure-blob-storage-set-cors/scriptbody.ps1
@@ -0,0 +1,32 @@
+try
+{ 
+    Import-Module Azure -ErrorAction Stop
+}
+catch
+{
+    throw "Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools" 
+}
+
+Import-AzurePublishSettingsFile $PublishSettingsFile
+
+$context = New-AzureStorageContext `
+    -StorageAccountName $StorageAccount `
+    -StorageAccountKey $StorageAccountKey
+
+$container = Get-AzureStorageContainer -Context $context | 
+        Where-Object { $_.Name -like $StorageContainer }
+
+if (-not $container)
+{
+    throw "Azure storage container ($StorageAccount) not found"
+}
+
+$corsRules = (@{
+    AllowedHeaders=@($AllowedHeaders);
+    AllowedOrigins=@($AllowedOrigins);
+    MaxAgeInSeconds=$MaxAgeInSeconds;
+    AllowedMethods=@($AllowedMethods)})
+
+Set-AzureStorageCORSRule -Context $context -ServiceType Blob -CorsRules $corsRules
+
+Write-Host "Added CORS rule to container: $StorageContainer"
\ No newline at end of file
diff --git a/src/step-templates/azure-blob-storage-upload/metadata.json b/src/step-templates/azure-blob-storage-upload/metadata.json
new file mode 100644
index 000000000..85026f354
--- /dev/null
+++ b/src/step-templates/azure-blob-storage-upload/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "0b167d34-832e-4c96-8a8f-2ea0a6c0fe0c",
+  "Name": "Azure Blob Storage Upload",
+  "Description": "Upload files in a directory to a specified Azure Storage blob container.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "CopyDirectory",
+      "Label": "Copy Directory",
+      "HelpText": "Replicates files and directory under the Copy Directory.\nEg. `Content/CDN` that is located at the root of the nuget package.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "PublishSettingsFile",
+      "Label": "Publish Settings File",
+      "HelpText": "Absolute path on the tentacle to the Azure publishsettings file to use.\nEg. `C:\\Azure\\Azure.publishsettings`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "StorageAccount",
+      "Label": "Storage Account",
+      "HelpText": "The Azure Storage Account to use.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "StorageAccountKey",
+      "Label": "Storage Account Key",
+      "HelpText": "The primary or secondary key for the Azure Storage Account.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "StorageContainer",
+      "Label": "Storage Container",
+      "HelpText": "The storage container to use.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NugetPackageStepName",
+      "Label": "Nuget Package Step Name",
+      "HelpText": "Name of the previously-deployed package step that contains the Copy Directory.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "shawnmclean",
+  "$Meta": {
+    "ExportedAt": "2016-01-20T23:21:36.1820000-08:00",
+    "OctopusVersion": "3.1.3",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-blob-storage-upload/scriptbody.ps1 b/src/step-templates/azure-blob-storage-upload/scriptbody.ps1
new file mode 100644
index 000000000..560d5e9c5
--- /dev/null
+++ b/src/step-templates/azure-blob-storage-upload/scriptbody.ps1
@@ -0,0 +1,120 @@
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+# Check if Windows Azure Powershell is avaiable 
+try{ 
+    Import-Module Azure -ErrorAction Stop
+}catch{
+    throw "Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools" 
+}
+
+Import-AzurePublishSettingsFile $PublishSettingsFile
+
+# The script has been tested on Powershell 3.0
+Set-StrictMode -Version 3
+
+$stepPath = ""
+if (-not [string]::IsNullOrEmpty($NugetPackageStepName)) {
+    Write-Host "Finding path to package step: $NugetPackageStepName"
+    $stepPath = Find-InstallLocation $NugetPackageStepName
+} else {
+    $stepPath = Find-SingleInstallLocation
+}
+Write-Host "Package was installed to: $stepPath"
+
+$fullPath = "$stepPath\$CopyDirectory"
+Write-Host "Copying Files in: $fullPath"
+
+# Get a list of files from the project folder
+$files = @(ls -Path $fullPath -File -Recurse)
+
+$fileCount = $files.Count
+Write-Host "Found $fileCount Files: $files"
+
+$context = New-AzureStorageContext `
+    -StorageAccountName $StorageAccount `
+    -StorageAccountKey $StorageAccountKey
+
+if ($files -ne $null -and $files.Count -gt 0)
+{
+    # Create the storage container.
+    $existingContainer = Get-AzureStorageContainer -Context $context | 
+        Where-Object { $_.Name -like $StorageContainer }
+
+    if (-not $existingContainer)
+    {
+        $newContainer = New-AzureStorageContainer `
+                            -Context $context `
+                            -Name $StorageContainer `
+                            -Permission Blob
+        "Storage container '" + $newContainer.Name + "' created."
+    }
+
+    # Upload the files to storage container.
+    $fileCount = $files.Count
+    $time = [DateTime]::UtcNow
+    if ($files.Count -gt 0)
+    {
+        foreach ($file in $files) 
+        {
+            $blobFileName = $file.FullName.Replace($fullPath, '').TrimStart('\')
+            $contentType = switch ([System.IO.Path]::GetExtension($file))
+	        {
+	            ".css" {"text/css"}
+	            ".js" {"text/javascript"}
+	            ".json" {"application/json"}
+	            ".html" {"text/html"}
+	            ".png" {"image/png"}
+	            ".svg" {"image/svg+xml"}
+	            default {"application/octet-stream"}
+	        }
+
+            Set-AzureStorageBlobContent `
+                -Container $StorageContainer `
+                -Context $context `
+                -File $file.FullName `
+                -Blob $blobFileName `
+                -Properties @{ContentType=$contentType} `
+                -Force
+        }
+    }
+
+    $duration = [DateTime]::UtcNow - $time
+
+    "Uploaded " + $files.Count + " files to blob container '" + $StorageContainer + "'."
+    "Total upload time: " + $duration.TotalMinutes + " minutes."
+}
+else
+{
+    Write-Warning "No files found."
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-capture-virtualmachine-image/metadata.json b/src/step-templates/azure-capture-virtualmachine-image/metadata.json
new file mode 100644
index 000000000..a8d561d18
--- /dev/null
+++ b/src/step-templates/azure-capture-virtualmachine-image/metadata.json
@@ -0,0 +1,102 @@
+{
+  "Id": "dd2b147c-3f20-42e1-a94c-17b157a0f0a4",
+  "Name": "Azure - Capture AzureRM Virtual Machine Image",
+  "Description": "Prepares an AzureRM Virtual Machine (Managed Disk or Storage Account based) and captures a [Managed Image](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/capture-image-resource) or [Image VHD](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/capture-image):\n1. Runs Sysprep\n2. Deallocates & Generalizes VM\n3. Creates Managed Image or Image VHD\n4. Removes virtual machine resource group",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Azure.AccountId": "#{StepTemplate_Account}",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "911668fe-9653-4f08-892c-0e103e72cad0",
+      "Name": "StepTemplate_Account",
+      "Label": "Octopus Azure Account",
+      "HelpText": "Select the [account id](#/accounts) to use for the connection.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b838a80e-3e49-4788-8302-6b64bf0159ea",
+      "Name": "StepTemplate_ResourceGroupName",
+      "Label": "Resource Group Name",
+      "HelpText": "Name of the Azure Resource Group containing the Virtual Machine.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8be775a8-53e4-4740-ae0f-10d72f9fdc67",
+      "Name": "StepTemplate_VMName",
+      "Label": "Virtual Machine Name",
+      "HelpText": "The name of the AzureRM Virtual Machine to capture. This VM will be shut down & generalized.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "73dae502-7a82-461c-a82b-8c40f519611f",
+      "Name": "StepTemplate_ImageType",
+      "Label": "Image Type",
+      "HelpText": "Desired type of image to capture from the Virtual Machine.",
+      "DefaultValue": "managed",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "managed|Managed Image\nunmanaged|Storage Account VHD"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "111b827b-a2c2-4d57-895e-b18daf9c6344",
+      "Name": "StepTemplate_ImageDest",
+      "Label": "Image Destination",
+      "HelpText": "Where the image should be created.\n\n**Managed Images** should enter a _Resource Group_ name\n\n**Storage Account VHDs** should enter a _Storage Account_ name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f461eac4-565c-47e6-8bf0-923f9647e3b2",
+      "Name": "StepTemplate_ImageName",
+      "Label": "Image Name",
+      "HelpText": "Name to use when creating the image.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ba0ea0f4-710c-4732-8fb4-9f9b4faf325b",
+      "Name": "StepTemplate_DeleteVMResourceGroup",
+      "Label": "Delete VM Resource Group?",
+      "HelpText": "Delete the virtual machine resource group after an image has been captured.\n\n**Once a Virtual Machine is marked as generalized Azure will prevent it from being started or modified.**",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "paulmarsy",
+  "$Meta": {
+    "ExportedAt": "2017-05-29T18:58:54.7330000Z",
+    "OctopusVersion": "3.13.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-capture-virtualmachine-image/scriptbody.ps1 b/src/step-templates/azure-capture-virtualmachine-image/scriptbody.ps1
new file mode 100644
index 000000000..e726afd92
--- /dev/null
+++ b/src/step-templates/azure-capture-virtualmachine-image/scriptbody.ps1
@@ -0,0 +1,300 @@
+<#
+ ----- Capture AzureRM Virtual Machine Image ----- 
+    Paul Marston @paulmarsy (paul@marston.me)
+Links
+    https://github.com/OctopusDeploy/Library/commits/master/step-templates/azure-capture-virtualmachine-image.json
+    
+The sequence of steps performed by the step template:
+    1) Virtual Machine prep
+        a) PowerState/running - Custom script extension is used to sysprep & shutdown
+        b) PowerState/stopped - only when the VM is shutdown by the OS, if Azure stops the VM it is automatically deallocated
+        c) PowerState/deallocated
+        d) OSState/generalized
+    2) Image capture
+        - Managed VM & Managed Image - New image with VM as source
+        - Managed VM & Unmanaged VHD - Access to the underlying blob is granted, and the VHD copied into the specified storage account
+        - Unmanaged VM & Managed Image - New image with VM as source
+        - Unmanaged VM & Unmanaged VHD - VM image is saved, a SAS token is generated and it is copied from the VM's storage account into the specified storage account
+    3) Virtual machine cleanup.
+        Once a VM has been marked as 'generalized' Azure will no longer allow it to be started up, making the VM unusable
+        If the delete option is selected, and the image just created has been moved outside the VM's resource group 
+        
+----- Advanced Configuration Settings -----
+Variable names can use either of the following two formats: 
+    Octopus.Action.<Setting Name> - will apply to all steps in the deployment, e.g.
+        Octopus.Action.DebugLogging
+    Octopus.Action[Step Name].<Setting Name> - will apply to 'step name' alone, e.g.
+        Octopus.Action[Capture Web VM Image].StorageAccountKey
+
+Available Settings:
+    VhdDestContainer - overrides the default container that an unmanaged VHD image is copied to, default is 'images'
+    StorageAccountKey - allows copying to a storage account in a different subscription by using the providing the key, default is null
+#>
+#Requires -Modules AzureRM.Resources
+#Requires -Modules AzureRM.Compute
+#Requires -Modules AzureRM.Storage
+#Requires -Modules Azure.Storage
+
+$ErrorActionPreference = 'Stop'
+
+<#---------- SysPrep Script - Begin  ----------#>
+<#
+    Sysprep marker file: C:\WindowsAzure\sysprep
+    1) If marker file exists, sysprep has already been run so exit script
+    2) Start a new powershell process and exit with code 0, this allows the custom script extension to report back as having run successfully to Azure
+        a) In the child script wait until the successful exit code has been logged
+        b) Create the marker file
+        c) Run sysprep
+#>
+$SysPrepScript = @'
+if (Test-Path "${env:SystemDrive}\WindowsAzure\sysprep") { return }
+
+Start-Process -FilePath 'powershell.exe' -ArgumentList @('-NonInteractive','-NoProfile',('-EncodedCommand {0}' -f ([System.Convert]::ToBase64String([System.Text.Encoding]::Unicode.GetBytes({
+    do {
+        Start-Sleep -Seconds 1
+        $status = Get-ChildItem "${env:SystemDrive}\Packages\Plugins\Microsoft.Compute.CustomScriptExtension\*\Status\" -File | Sort-Object LastWriteTime -Descending | Select-Object -First 1 | Get-Content | ConvertFrom-Json
+    } while ($status[0].status.code -ne 0)
+    New-Item -ItemType File -Path "${env:SystemDrive}\WindowsAzure\sysprep" -Force | Out-Null
+    & (Join-Path -Resolve ([System.Environment]::SystemDirectory) 'sysprep\sysprep.exe') /oobe /generalize /quiet /shutdown
+}.ToString())))))
+
+exit 0
+'@
+<#---------- SysPrep Script - End ----------#>
+
+function Get-OctopusSetting {
+    param([Parameter(Position = 0, Mandatory)][string]$Name, [Parameter(Position = 1)]$DefaultValue)
+    $formattedName = 'Octopus.Action.{0}' -f $Name
+    if ($OctopusParameters.ContainsKey($formattedName)) {
+        $value = $OctopusParameters[$formattedName]
+        if ($DefaultValue -is [int]) { return ([int]::Parse($value)) }
+        if ($DefaultValue -is [bool]) { return ([System.Convert]::ToBoolean($value)) }
+        if ($DefaultValue -is [array] -or $DefaultValue -is [hashtable] -or $DefaultValue -is [pscustomobject]) { return (ConvertFrom-Json -InputObject $value) }
+        return $value
+    }
+    else { return $DefaultValue }
+}
+function Test-String {
+    param([Parameter(Position=0)]$InputObject,[switch]$ForAbsence)
+
+    $hasNoValue = [System.String]::IsNullOrWhiteSpace($InputObject)
+    if ($ForAbsence) { $hasNoValue }
+    else { -not $hasNoValue }
+}
+filter Out-Verbose {
+    Write-Verbose ($_ | Out-String)
+}
+function Split-BlobUri {
+    param($Uri)
+    $uriRegex = [regex]::Match($Uri, '(?>https:\/\/)(?<Account>[a-z0-9]{3,24})\.blob\.core\.windows\.net\/(?<Container>[-a-z0-9]{3,63})\/(?<Blob>.+)')
+    if (!$uriRegex.Success) {
+        throw "Unable to parse blob uri: $Uri"
+    }
+    [pscustomobject]@{
+        Account = $uriRegex.Groups['Account'].Value
+        Container = $uriRegex.Groups['Container'].Value
+        Blob = $uriRegex.Groups['Blob'].Value
+    }
+}
+function Get-AzureRmAccessToken {
+    # https://github.com/paulmarsy/AzureRest/blob/master/Internals/Get-AzureRmAccessToken.ps1
+    $accessToken = Invoke-RestMethod -UseBasicParsing -Uri ('https://login.microsoftonline.com/{0}/oauth2/token?api-version=1.0' -f $OctopusAzureADTenantId) -Method Post -Body @{"grant_type" = "client_credentials"; "resource" = "https://management.core.windows.net/"; "client_id" = $OctopusAzureADClientId; "client_secret" = $OctopusAzureADPassword }
+    [System.Net.Http.Headers.AuthenticationHeaderValue]::new('Bearer', $accessToken.access_token).ToString()
+}
+function Get-TemporarySasBlob {
+    param($BlobName)
+    # https://github.com/paulmarsy/AzureRest/blob/master/Exported/New-AzureBlob.ps1
+    $sasToken = Invoke-RestMethod -UseBasicParsing -Uri 'https://mscompute2.iaas.ext.azure.com/api/Compute/VmExtensions/GetTemporarySas/' -Headers @{
+        [Microsoft.WindowsAzure.Commands.Common.ApiConstants]::AuthorizationHeaderName = (Get-AzureRmAccessToken)
+    }
+    $containerSas = [uri]::new($sasToken)
+    $container = [Microsoft.WindowsAzure.Storage.Blob.CloudBlobContainer]::new($containerSas)
+    $blobRef = $container.GetBlockBlobReference($BlobName)
+    
+    [psobject]@{
+        Blob = $blobRef
+        Uri = [uri]::new($blobRef.Uri.AbsoluteUri + $containerSas.Query)
+    }
+}
+
+'Checking AzureRM Modules...' | Out-Verbose
+Get-Module | ? Name -like 'AzureRM.*' | Format-Table -AutoSize -Property Name,Version | Out-String | Out-Verbose
+if ((Get-Module AzureRM.Compute | % Version) -lt '2.6.0') {
+    $bundledErrorMessage = if ([System.Convert]::ToBoolean($OctopusUseBundledAzureModules)) {
+        'The Azure PowerShell Modules bundled with Octopus have been loaded. To use the version installed on the server create a variable named "Octopus.Action.Azure.UseBundledAzurePowerShellModules" and set its value to "False".'
+    }
+    throw "${bundledErrorMessage}Please ensure version 2.6.0 or newer of the AzureRM.Compute module has been installed. The module can be installed with the PowerShell command: Install-Module AzureRM.Compute -MinimumVersion 2.6.0"
+}
+
+$vm = Get-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -WarningAction SilentlyContinue
+if ($null -eq $vm) {
+    throw "Unable to find virtual machine '$StepTemplate_VMName' in resource group '$StepTemplate_ResourceGroupName'"
+}
+Write-Host "Image will be captured from Virtual Machine '$($vm.Name)' in resource group '$($vm.ResourceGroupName)'"
+if (Test-String $StepTemplate_ImageDest -ForAbsence) {
+    throw "The Image Destination parameter is required"
+}
+$StepTemplate_ImageStorageContext = if ($StepTemplate_ImageType -eq 'unmanaged') {
+    $storageAccountKey = Get-OctopusSetting StorageAccountKey $null
+    if (Test-String $storageAccountKey) {
+        Write-Host "Image will be copied to storage account context '$StepTemplate_ImageDest' using provided key"
+        New-AzureStorageContext -StorageAccountName $StepTemplate_ImageDest -StorageAccountKey $storageAccountKey
+    } else {
+        $storageAccountResource = Find-AzureRmResource -ResourceNameEquals $StepTemplate_ImageDest -ResourceType Microsoft.Storage/storageAccounts
+        if ($storageAccountResource) {
+            Write-Host "Image will be copied to storage account '$($storageAccountResource.Name)' found in resource group '$($storageAccountResource.ResourceGroupName)'"
+        } else {
+            throw "Unable to find storage account '$StepTemplate_ImageDest'"
+        }
+        Get-AzureRmStorageAccount -ResourceGroupName $storageAccountResource.ResourceGroupName -Name $storageAccountResource.Name | % Context
+    }
+}
+$StepTemplate_ImageResourceGroupName = switch ($StepTemplate_ImageType) {
+    'managed' {
+        $resourceGroup = Get-AzureRmResourceGroup -Name $StepTemplate_ImageDest | % ResourceGroupName 
+        Write-Host "Managed Image will be created in resource group '$resourceGroup'"
+        $resourceGroup
+    }
+    'unmanaged' { Find-AzureRmResource -ResourceNameEquals $StepTemplate_ImageDest -ResourceType Microsoft.Storage/storageAccounts | % ResourceGroupName }
+}
+if ($StepTemplate_ImageResourceGroupName -ieq $StepTemplate_ResourceGroupName -and $StepTemplate_DeleteVMResourceGroup -ieq 'True') {
+    throw "You have chosen to delete the virtual machine and it's resource group ($StepTemplate_ResourceGroupName), however this resource group is also where the captured image will be created!"
+}
+
+Write-Host ('-'*80)
+Write-Host "Preparing virtual machine $($vm.Name) for image capture..."
+
+$sysprepRun = $false
+while ($true) {
+    $statusCode = Get-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -Status -WarningAction SilentlyContinue | % Statuses | % Code
+    if ($statusCode -contains 'OSState/generalized') {
+        Write-Host 'VM is deallocated & generalized, proceeding to image capture...'
+        break
+    }
+    if ($statusCode -contains 'PowerState/deallocated') {
+        Write-Host 'VM has been deallocated, setting state to generalized... '
+        Set-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -Generalized | Out-Verbose
+        continue
+    }
+    if ($statusCode -contains 'PowerState/deallocating') {
+        Write-Host 'VM is deallocating, waiting...'
+        Start-Sleep 30
+        continue
+    }
+    if ($statusCode -contains 'PowerState/stopped') {
+        Write-Host 'VM has been shutdown, starting deallocation...'
+        Stop-AzureRmVm -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -Force | Out-Verbose
+        continue
+    }
+    if ($statusCode -contains 'PowerState/stopping') {
+        Write-Host 'VM is stopping, waiting...'
+        Start-Sleep 30
+        continue
+    }
+    if ($statusCode -contains 'PowerState/running' -and $sysprepRun) {
+        Write-Host 'VM is running, but sysprep already deployed, waiting...'
+        Start-Sleep 30
+        continue
+    }
+    if ($statusCode -contains 'PowerState/running') {
+        Write-Host 'VM is running, performing sysprep...'
+        $existingCustomScriptExtensionName = $vm.Extensions | ? VirtualMachineExtensionType -eq 'CustomScriptExtension' | % Name
+        if ($existingCustomScriptExtensionName) {
+            Write-Warning "Removing existing CustomScriptExtension ($existingCustomScriptExtensionName)..."
+            Remove-AzureRmVMCustomScriptExtension -ResourceGroupName $StepTemplate_ResourceGroupName -VMName $StepTemplate_VMName -Name $existingCustomScriptExtensionName -Force | Out-Verbose
+        }
+        
+        Write-Host 'Uploading sysprep script to blob storage...'
+        $sysprepScriptFileName = 'Sysprep.ps1'
+        $sysprepScriptBlob = Get-TemporarySasBlob $sysprepScriptFileName
+        $sysprepScriptBlob.Blob.UploadText($SysPrepScript)
+    
+        Write-Host 'Deploying sysprep custom script extension...'
+        Set-AzureRmVMCustomScriptExtension -ResourceGroupName $StepTemplate_ResourceGroupName -VMName $StepTemplate_VMName -Name 'Sysprep' -Location $vm.Location -FileUri $sysprepScriptBlob.Uri -Run $sysprepScriptFileName -ForceRerun (Get-Date).Ticks | Out-Verbose
+        $sysprepRun = $true
+        continue
+    }
+    Write-Warning "VM is in an unknown state. Current status codes: $($statusCode -join ', '). Waiting..."
+    Start-Sleep -Seconds 30
+}
+
+Write-Host ('-'*80)
+
+Write-Host 'Retrieving virtual machine disk configuration...'
+$vm = Get-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -WarningAction SilentlyContinue 
+$isManagedVm = $null -ne $vm.StorageProfile.OsDisk.ManagedDisk
+if ($isManagedVm) { Write-Host "Virtual machine $($vm.Name) is using Managed Disks" }
+$isUnmanagedVm = $null -ne $vm.StorageProfile.OsDisk.Vhd
+if ($isUnmanagedVm) { Write-Host "Virtual machine $($vm.Name) is using unmanaged storage account VHDs" }
+
+if ($StepTemplate_ImageType -eq 'managed') {
+    Write-Host "Creating Managed Image of $($vm.Name)..."
+    $image = New-AzureRmImageConfig -Location $vm.Location -SourceVirtualMachineId $vm.Id
+    New-AzureRmImage -Image $image -ImageName $StepTemplate_ImageName -ResourceGroupName $StepTemplate_ImageResourceGroupName | Out-Verbose
+    Write-Host 'Image created:'
+    Get-AzureRmImage -ImageName $StepTemplate_ImageName -ResourceGroupName $StepTemplate_ImageResourceGroupName | Out-Host
+}
+
+if ($StepTemplate_ImageType -eq 'unmanaged') {
+    if ($isManagedVm) {
+        Write-Host "Granting access to os disk ($($vm.StorageProfile.OsDisk.Name)) blob..."
+        $manageDisk = Grant-AzureRmDiskAccess -ResourceGroupName $StepTemplate_ResourceGroupName -DiskName $vm.StorageProfile.OsDisk.Name -DurationInSecond 3600 -Access Read 
+        $vhdSasUri = $manageDisk.AccessSAS
+    }
+    if ($isUnmanagedVm) {
+        Write-Host "Saving Unmanaged Image of $($vm.Name)..."
+        $armTemplatePath = [System.IO.Path]::GetTempFileName()
+        $vhdDestContainer = Get-OctopusSetting VhdDestContainer 'images'
+        Save-AzureRmVMImage -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -DestinationContainerName $vhdDestContainer -VHDNamePrefix $StepTemplate_ImageName -Overwrite -Path $armTemplatePath | Out-Verbose
+        $armTemplate = Get-Content -Path $armTemplatePath
+        "VM Image ARM Template:`n$armTemplate" | Out-Verbose
+        Remove-Item $armTemplatePath -Force
+        $osDiskUri = ($armTemplate | ConvertFrom-Json).resources.properties.storageprofile.osdisk.image.uri
+        "OS Disk Image URI: $osDiskUri" | Out-Verbose
+        $unmanagedVhd = Split-BlobUri $osDiskUri
+        
+        Write-Host "Granting access to vhd image ($($unmanagedVhd.Blob))..."
+        $unmanagedVhdStorageResource = Find-AzureRmResource -ResourceNameEquals $unmanagedVhd.Account -ResourceType Microsoft.Storage/storageAccounts
+        $unmanagedVhdStorageResource | Out-Verbose
+        $unmanagedVhdStorageContext = Get-AzureRmStorageAccount -ResourceGroupName $unmanagedVhdStorageResource.ResourceGroupName -Name $unmanagedVhdStorageResource.Name | % Context
+        $vhdSasUri = New-AzureStorageBlobSASToken -Container $unmanagedVhd.Container -Blob $unmanagedVhd.Blob -Permission r -ExpiryTime (Get-Date).AddHours(1) -FullUri -Context $unmanagedVhdStorageContext
+    }
+    Write-Host "Source image SAS token created: $vhdSasUri"
+
+    Write-Host 'Copying image to storage account...'
+    $destContainerName = Get-OctopusSetting VhdDestContainer 'images'
+    $destContainer = Get-AzureStorageContainer -Name $destContainerName -Context $StepTemplate_ImageStorageContext -ErrorAction SilentlyContinue
+    if ($destContainer) {
+        Write-Host "Using container '$destContainerName' in storage account $StepTemplate_ImageDest..."
+    } else {
+        Write-Host "Creating container '$destContainerName' in storage account $StepTemplate_ImageDest..."
+        $destContainer = New-AzureStorageContainer -Name $destContainerName -Context $StepTemplate_ImageStorageContext -Permission Off
+    }
+
+    $copyBlob = Start-AzureStorageBlobCopy -AbsoluteUri $vhdSasUri -DestContainer $destContainerName -DestContext $StepTemplate_ImageStorageContext -DestBlob $StepTemplate_ImageName -Force
+    $copyBlob | Out-Verbose
+    do {   
+        if ($copyState.Status -eq 'Pending') {
+            Start-Sleep -Seconds 60
+        }
+        $copyState = $copyBlob | Get-AzureStorageBlobCopyState
+        $copyState | Out-Verbose
+        $percent = ($copyState.BytesCopied / $copyState.TotalBytes) * 100
+        Write-Host "Blob transfer $($copyState.Status.ToString().ToLower())... $('{0:N2}' -f $percent)% @ $([System.Math]::Round($copyState.BytesCopied/1GB, 2))GB / $([System.Math]::Round($copyState.TotalBytes/1GB, 2))GB"
+    } while ($copyState.Status -eq 'Pending')
+    Write-Host "Final image transfer status: $($copyState.Status)"
+    
+    if ($isManagedVm) {
+        Write-Host 'Revoking access to os disk blob...'
+        Revoke-AzureRmDiskAccess -ResourceGroupName $StepTemplate_ResourceGroupName -DiskName $vm.StorageProfile.OsDisk.Name | Out-Verbose
+    }
+}
+
+Write-Host "Image of $($vm.Name) captured successfully!"
+
+if ($StepTemplate_DeleteVMResourceGroup -ieq 'True') {
+    Write-Host ('-'*80)
+    Write-Host "Removing $($vm.Name) VM's resource group $StepTemplate_ResourceGroupName, the following resources will be deleted..."
+    Find-AzureRmResource -ResourceGroupNameEquals $StepTemplate_ResourceGroupName | Sort-Object -Property ResourceId -Descending | Select-Object -Property ResourceGroupName,ResourceType,ResourceName | Format-Table -AutoSize | Out-Host
+    Remove-AzureRmResourceGroup -Name $StepTemplate_ResourceGroupName -Force | Out-Verbose
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-check-vmss-provision-status/metadata.json b/src/step-templates/azure-check-vmss-provision-status/metadata.json
new file mode 100644
index 000000000..467a93f58
--- /dev/null
+++ b/src/step-templates/azure-check-vmss-provision-status/metadata.json
@@ -0,0 +1,138 @@
+{
+  "Id": "e04c5cd8-0982-44b8-9cae-0a4b43676adc",
+  "Name": "Check VMSS Provision Status (Deployment Targets)",
+  "Description": "Use this step when leveraging Azure Virtual Machines Scale Sets (VMSS) with Octopus Deploy Deployment Targets.\n\n**Please run this on a worker or the Octopus Server.**\n\nThis step specifically targets Deployment Targets.  It will:\n- Pause a runbook run or deployment until the VMSS has been provisioned\n- Pause a runbook run or deployment until all the VMs in a VMss have been provisioned\n- Reconcile the list of VMs in the VMSS with the list of VMs in Octopus Deploy.  Any VMs in Octopus Deploy (based on role) not in the VMSS will be removed.\n- Set output variables of all the deployment targets found in the VMSS.\n\nThis step will set the following output variables:\n- `VMSSHasServersToDeployTo`: Indicates the VMSS has servers to deploy to.  \n- `VMSSDeploymentTargetIds`: A comma-separated list of deployment target Ids you can use in later steps.\n- `VMSSDeploymentTargetNames`: A comma-separated list of deployment target names you can use in later steps.\n\n**Please Note**: Setting the parameter `Exclude Pre-Existing Servers from Output` to `Yes` will remove any servers prior to a scale event from being returned in the output variables. \n\nThis step makes the following assumptions:\n- The name of the machine registration in Octopus matches the computer name.  Like matching is supported, for example, a match will be made in the case of Octopus has `p-app-server-01` and the computer name is `p-app-server-01.mydomain.com.`  \n- You have the Azure Az PowerShell modules pre-installed on a worker or your Octopus Server.\n- This step is running in the same space/environment/tenant (optional) as the deployment targets.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Azure.AccountId": "#{VMSS.Azure.Account}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9f9bc9fb-fa96-41ab-aa06-ad0dd68ff038",
+      "Name": "VMSS.ScaleSet.Name",
+      "Label": "VMSS Name",
+      "HelpText": "**Required**\n\nThe name of the Azure Virtual Machine Scale Set",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "32939873-a965-46ae-915f-f94d93f94c0b",
+      "Name": "VMSS.ResourceGroup.Name",
+      "Label": "VMSS Resource Group Name",
+      "HelpText": "**Required**\n\nThe name of the resource group where the VMSS is located.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "571df393-6353-4f12-96cd-c92f3a5e1452",
+      "Name": "VMSS.Azure.Account",
+      "Label": "Azure Account",
+      "HelpText": "**Required**\n\nThe Azure Account to use when querying the VMSS.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "b03d1bf3-76f8-4a3c-917a-60d5e19a15f4",
+      "Name": "VMSS.DeploymentTarget.Roles",
+      "Label": "Deployment Target Roles",
+      "HelpText": "**Required**\n\nA comma-separated list of deployment target roles to filter your deployment targets by.  These roles are how this step will determine which machines to reconcile.\n\nIf you supply multiple roles, for example `todo-web-server,todo-virtual-machine-scale-set` the deployment targets have to be assigned `todo-web-server` AND `todo-virtual-machine-scaleset` roles for the target to be considered.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "757ca61b-d15b-4dbb-911a-b3f4dc0258b5",
+      "Name": "VMSS.Octopus.Url",
+      "Label": "Octopus URL",
+      "HelpText": "**Required**\n\nThe URL of the Octopus Server to query against.  Example: `https://samples.octopus.app`.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7b070182-e79b-48a0-966a-39d332802b60",
+      "Name": "VMSS.Octopus.ApiKey",
+      "Label": "Octopus API Key",
+      "HelpText": "**Required**\n\nAPI Key of a service account that has permissions to:\n- Query deployment targets, environments, and tenants. \n- Query events (audit history) \n- Delete deployment targets\n\nAssigning the service account to a team with `Project Viewer` and `Environment Manager` roles will work.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "6e0f8635-70ba-4b8a-b5b4-909dba3f9fd8",
+      "Name": "VMSS.Timeout.Value",
+      "Label": "Timeout (In Minutes)",
+      "HelpText": "**Required**\n\nHow long this step will wait (in minutes) for the VMSS and VMs in the VMSS to finish being created.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0392f153-73b0-44d4-9181-4f366c9012f7",
+      "Name": "VMSS.Timeout.ErrorHandle",
+      "Label": "Timeout Error",
+      "HelpText": "**Required**\n\nWhat will happen when a timeout occurs.\n\n- `Proceed`: The script will reconcile the VMs it can and then finish.  No error thrown.  \n- `Error`: Will throw an error and it will stop the deployment from proceeding.\n\nThe default is `Proceed`",
+      "DefaultValue": "Proceed",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Proceed|Proceed\nError|Error"
+      }
+    },
+    {
+      "Id": "80ef4fb9-c773-4d0a-82af-efdfb302e58f",
+      "Name": "VMSS.Duplicate.TimeInMinutes",
+      "Label": "Duplicate Run Time Allowance (in Minutes)",
+      "HelpText": "**Required**\n\nThis step is designed to wait for VMSS to finish scaling out.  However, Octopus isn't aware of VMSS and may attempt to run the same deployment multiple times as new targets are \"discovered.\"\n\nTypically, when this happens, a deployment is queued within a few minutes of the previous one finishing.  When that happens this step will treat that as a duplicate run.  \n\nThis setting indicates the number of minutes that must pass before a duplicate run is found.  The default is `3` minutes.",
+      "DefaultValue": "3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0eb3bed8-9259-440e-bff0-cb86af7da52e",
+      "Name": "VMSS.Duplicate.Handle",
+      "Label": "Duplicate Run Adjustment",
+      "HelpText": "**Required**\n\nWhat the step will do when a duplicate run is found.  The two options are:\n\n- `Cancel`: cancel the current runbook run or deployment.\n- `Proceed`: continue on with the current runbook run or deployment.\n\nThe default is `Proceed`.",
+      "DefaultValue": "Proceed",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Cancel|Cancel\nProceed|Proceed"
+      }
+    },
+    {
+      "Id": "adaf6a8c-453f-4b69-9ba6-f6a54b4f5bb9",
+      "Name": "VMSS.OldServers.ExcludeFromOutput",
+      "Label": "Exclude Pre-Existing Servers from Output",
+      "HelpText": "**Required**\n\nOld servers are any servers that existed prior to scaling out the VMSS.  \n\nIf this step is run in a deployment target trigger it will pull back all the machines in a scale set and return them in an output variable.  Depending on how you use that list, this could result in redeployment.\n\nYou can exclude pre-existing servers by setting this value to `Yes`.  The default is `No`.",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "No|No\nYes|Yes"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-07-26T19:15:02.7180000Z",
+    "OctopusVersion": "2021.2.6259",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "BobJWalker",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-check-vmss-provision-status/scriptbody.ps1 b/src/step-templates/azure-check-vmss-provision-status/scriptbody.ps1
new file mode 100644
index 000000000..d61d8b956
--- /dev/null
+++ b/src/step-templates/azure-check-vmss-provision-status/scriptbody.ps1
@@ -0,0 +1,490 @@
+$vmssScaleSetName = $OctopusParameters["VMSS.ScaleSet.Name"]
+$vmssScaleSetResourceGroup = $OctopusParameters["VMSS.ResourceGroup.Name"]
+$roleToSearchFor = $OctopusParameters["VMSS.DeploymentTarget.Roles"]
+$apiKey = $OctopusParameters["VMSS.Octopus.ApiKey"]
+$octopusUrl = $OctopusParameters["VMSS.Octopus.Url"]
+$timeoutInMinutes = $OctopusParameters["VMSS.Timeout.Value"]
+$timeoutErrorHandle = $OctopusParameters["VMSS.Timeout.ErrorHandle"]
+$duplicateRunDetectionInMinutes = $OctopusParameters["VMSS.Duplicate.TimeInMinutes"]
+$duplicateRunHandle = $OctopusParameters["VMSS.Duplicate.Handle"]
+$excludeOldServers = $OctopusParameters["VMSS.OldServers.ExcludeFromOutput"]
+
+$octopusSpaceId = $OctopusParameters["Octopus.Space.Id"]
+$octopusEnvironmentId = $OctopusParameters["Octopus.Environment.Id"]
+$octopusTenantId = $OctopusParameters["Octopus.Deployment.Tenant.Id"]
+$octopusDeploymentId = $OctopusParameters["Octopus.Deployment.Id"]
+$octopusTriggerId = $OctopusParameters["Octopus.Deployment.Trigger.Id"]
+$octopusTaskId = $OctopusParameters["Octopus.Task.Id"]
+$octopusRunbookRunId = $OctopusParameters["Octopus.RunbookRun.Id"]
+
+function Invoke-OctopusApi
+{
+    param
+    (
+        $octopusUrl,
+        $endPoint,
+        $spaceId,
+        $apiKey,
+        $method,
+        $item  
+    )
+
+    if ([string]::IsNullOrWhiteSpace($SpaceId))
+    {
+        $url = "$OctopusUrl/api/$EndPoint"
+    }
+    else
+    {
+        $url = "$OctopusUrl/api/$spaceId/$EndPoint"    
+    }  
+
+    try
+    {        
+        if ($null -ne $item)
+        {
+            $body = $item | ConvertTo-Json -Depth 10
+            Write-Verbose $body
+
+            Write-Host "Invoking $method $url"
+            return Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -Body $body -ContentType 'application/json; charset=utf-8' 
+        }
+
+		Write-Verbose "No data to post or put, calling bog standard invoke-restmethod for $url"
+        $result = Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -ContentType 'application/json; charset=utf-8'
+
+        return $result
+
+               
+    }
+    catch
+    {
+        if ($null -ne $_.Exception.Response)
+        {
+            if ($_.Exception.Response.StatusCode -eq 401)
+            {
+                Write-Error "Unauthorized error returned from $url, please verify API key and try again"
+            }
+            elseif ($_.Exception.Response.statusCode -eq 403)
+            {
+                Write-Error "Forbidden error returned from $url, please verify API key and try again"
+            }
+            else
+            {                
+                Write-Verbose -Message "Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )"
+            }            
+        }
+        else
+        {
+            Write-Verbose $_.Exception
+        }
+    }
+
+    Throw "There was an error calling the Octopus API."
+}
+
+function Get-QueuedEventInfo
+{
+    param (
+        $octopusRunbookRunId,
+        $octopusDeploymentId,
+        $octopusSpaceId,
+        $octopusUrl,
+        $apiKey
+    )
+
+    if ([string]::IsNullOrWhiteSpace($octopusRunbookRunId))
+    {
+        $queuedListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "events?regardingAny=$($OctopusDeploymentId)&spaces=$($octopusSpaceId)&documentTypes=Deployments&eventCategories=DeploymentQueued" -spaceId $null -apiKey $apiKey -method "GET"
+    }
+    else
+    {
+        $queuedListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "events?regardingAny=$($octopusRunbookRunId)&spaces=$($octopusSpaceId)&documentTypes=RunbookRuns&eventCategories=RunbookRunQueued" -spaceId $null -apiKey $apiKey -method "GET"
+    }
+
+    $queuedArray = @($queuedListRaw.Items)
+
+    return @{
+        CurrentDeploymentQueued = [DateTime]$queuedArray[0].Occurred
+        NumberOfQueuedEvents = $queuedArray.Length
+    }
+}
+
+function Get-CompletedEventInfo
+{
+    param (
+        $octopusRunbookRunId,
+        $octopusDeploymentId,
+        $octopusSpaceId,
+        $octopusUrl,
+        $apiKey
+    )
+
+    if ([string]::IsNullOrWhiteSpace($octopusRunbookRunId))
+    {      
+        $finishedEventListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "events?regardingAny=$($OctopusDeploymentId)&spaces=$($octopusSpaceId)&documentTypes=Deployments&eventCategories=DeploymentSucceeded,DeploymentFailed&skip=0&take=1" -spaceId $null -apiKey $apiKey -method "GET"
+    }
+    else
+    {
+        $finishedEventListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "events?regardingAny=$($OctopusDeploymentId)&spaces=$($octopusSpaceId)&documentTypes=RunbookRuns&eventCategories=RunbookRunSucceeded,RunbookRunFailed&skip=0&take=1" -spaceId $null -apiKey $apiKey -method "GET"    
+    }
+
+    $finishedEventArray = @($finishedEventListRaw.Items)
+        
+    return [DateTime]$finishedEventArray[0].Occurred
+}
+
+function Test-ForDuplicateRun 
+{
+    param (
+        $octopusRunbookRunId,
+        $octopusDeploymentId,
+        $octopusSpaceId,
+        $queuedEventInfo,
+        $duplicateRunDetectionInMinutes,
+        $duplicateRunHandle,
+        $octopusTaskId,
+        $octopusUrl,
+        $apiKey        
+    )
+
+    Write-Host "Checking to see if this current run is a duplicate because of deployment target triggers"
+    $duplicateRun = $false
+
+    if ([string]::IsNullOrWhiteSpace($octopusTriggerId) -eq $false)
+    {
+        Write-Highlight "This run was triggered by a trigger."
+        
+        Write-Host "The number of items in the queued array is: $($queuedEventInfo.NumberOfQueuedEvents)"
+        if ($queuedEventInfo.NumberOfQueuedEvents -gt 1)
+        {
+            Write-Host "This task has been run before"  
+
+            $previousDeploymentFinished = Get-CompletedEventInfo -octopusRunbookRunId $octopusRunbookRunId -octopusDeploymentId $octopusDeploymentId -octopusSpaceId $octopusSpaceId -octopusUrl $octopusUrl -apiKey $apiKey            
+            Write-Host "The current deployment was queued $($queuedEventInfo.CurrentDeploymentQueued) while the previous deployment was finished $previousDeploymentFinished"
+            
+            $queuedCompletedDifference = $queuedEventInfo.CurrentDeploymentQueued - $previousDeploymentFinished            
+            Write-Host "The difference in minutes is $($queuedCompletedDifference.TotalMinutes)"
+
+            if ($queuedCompletedDifference.TotalMinutes -le $duplicateRunDetectionInMinutes)
+            {
+                Write-Highlight "The previous deployment finished in the last $($queuedCompletedDifference.TotalMinutes) minutes before this was trigger, that is extremely fast.  This is a duplicate run."
+                $duplicateRun = $true
+                
+                if ($duplicateRunHandle.ToLower().Trim() -eq "cancel")
+                {
+                    Write-Highlight "The duplicate run handle is set to cancel, cancelling current deployment."
+                    Invoke-OctopusApi -octopusUrl $octopusUrl -apiKey $apiKey -spaceId $OctopusSpaceId -method "POST" -endPoint "tasks/$($octopusTaskId)/cancel"
+                    exit 0    
+                }
+                else
+                {
+                    Write-Highlight "The duplicate run handle is set to proceed."
+                }
+            }
+            else
+            {
+                Write-Highlight "The last deployment finished and this one was queued after $($queuedCompletedDifference.TotalMinutes) minutes has passed which is outside the window of $duplicateRunDetectionInMinutes minutes.  Not a duplicate."
+            }
+        }	    
+        else
+        {
+            Write-Highlight "This is the first time this release has been deployed to this environment.  This is not a duplicate run."
+        }
+    }
+
+    return $duplicateRun
+}
+
+function Start-WaitForVMSSToFinishProvisioning
+{
+    param 
+    (
+        $vmssScaleSetResourceGroup,
+        $vmssScaleSetName,
+        $timeoutInMinutes
+    )
+
+    $vmssState = "Provisioning"
+    $startTime = Get-Date
+
+    Write-Host "Will now wait until the VMSS has finished provisioning."
+
+    do
+    {
+        try
+        {
+            $vmssInfo = Get-AzVmss -ResourceGroupName $vmssScaleSetResourceGroup -VMScaleSetName $vmssScaleSetName
+        }
+        catch
+        {
+            Write-Highlight "Unable to access the scale set $vmssScaleSetName.  Exiting step."
+            Write-Host $_.Exception
+            exit 0
+        }
+
+        Write-Verbose "VMSSInfo: "
+        Write-Verbose ($vmssInfo | ConvertTo-JSON -Depth 10)
+
+        $vmssInstanceCount = $vmssInfo.Sku.Capacity
+        $vmssState = $vmssInfo.ProvisioningState
+
+        if($vmssState.ToLower().Trim() -ne "provisioning")
+        {    
+            Write-Highlight "The VMSS $vmssScaleSetName capacity is current set to $vmssInstanceCount with a provisioning state of $vmssState"
+        }
+        else
+        {
+            Write-Host "The VMSS is still provisioning, sleeping for 10 seconds then checking again."
+            Start-Sleep -Seconds 10
+        }
+        
+        $currentTime = Get-Date
+        $dateDifference = $currentTime - $startTime
+        
+        if ($dateDifference.TotalMinutes -ge $timeoutInMinutes)
+        {
+            Write-Highlight "We have been waiting $($dateDifference.TotalMinutes) for the VMSS to finish provisioning.  Timeout reached, exiting."
+            exit 1
+        }   
+        
+    } While ($vmssState.ToLower().Trim() -eq "provisioning")
+}
+
+function Start-WaitForVMsInVMSSToFinishProvisioning
+{
+    param 
+    (
+        $vmssScaleSetResourceGroup,
+        $vmssScaleSetName,
+        $timeoutInMinutes,
+        $timeoutErrorHandle
+    )
+
+    $vmssVmsAreProvisioning = $false
+    $startTime = Get-Date
+    $numberOfWaits = 0
+    $printVmssVmList = $true
+
+    Write-Highlight "Checking the state of all VMs in the scale set."
+
+    do
+    {
+        $numberOfWaits += 1
+        $vmssVmList = Get-AzVmssVM -ResourceGroupName $vmssScaleSetResourceGroup -VMScaleSetName $vmssScaleSetName
+        
+        if ($printVmssVmList -eq $true)
+        {
+            Write-Host ($vmssVmList | ConvertTo-Json -Depth 10)
+            $printVmssVmList = $false
+        }
+        
+        $vmssVmsAreProvisioning = $false
+        foreach ($vmInfo in $vmssVmList)
+        {
+            if ($vmInfo.ProvisioningState.ToLower().Trim() -eq "creating")
+            {
+                $vmssVmsAreProvisioning = $true
+                break
+            }
+        }
+        
+        if ($vmssVmsAreProvisioning -eq $true)
+        {        
+            $currentTime = Get-Date
+            $dateDifference = $currentTime - $startTime
+
+            if ($dateDifference.TotalMinutes -ge $timeoutInMinutes)
+            {
+                $vmssVmsAreProvisioning = $false
+                if ($timeoutErrorHandle.ToLower().Trim() -eq "error")
+                {
+                    Write-Highlight "The VMs in the scale have been provisioning for over $timeoutInMinutes.  Error handle is set to error out, exiting with an exit code of 1."
+                    exit 1
+                }
+                
+                Write-Highlight "The VMs in the scale have been provisioning for over $timeoutInMinutes.  Going to move on and continue with the deployment for any VMs that have finished provisioning."
+            } 
+            else
+            {
+                if ($numberofWaits -ge 10)
+                {
+                    Write-Highlight "The VMs are still currently provisioning, waiting..."
+                    $numberOfWaits = 0
+                }
+                else
+                {            
+                    Write-Host "The VMs are still currently provisioning, sleeping for 10 seconds then checking again."
+                }
+                Start-Sleep -Seconds 10
+            }
+        }
+        else
+        {
+            Write-Highlight "All the VMs in the VM Scale Set have been provisioned, reconciling them with the list in Octopus."
+        }         
+    } while ($vmssVmsAreProvisioning -eq $true)
+}
+
+
+Write-Host "ScaleSet Name: $vmssScaleSetName"
+Write-Host "Resource Group Name: $vmssScaleSetResourceGroup"
+Write-Host "Deployment Target Role to Search For: $roleToSearchFor"
+Write-Host "Octopus Url: $octopusUrl"
+Write-Host "Timeout In Minutes: $timeoutInMinutes"
+Write-Host "Timeout Error Handle: $timeoutErrorHandle"
+Write-Host "Duplicate Run Detection in Minutes: $duplicateRunDetectionInMinutes"
+Write-Host "Duplicate Run Handle: $duplicateRunHandle"
+Write-host "Exclude Old Servers: $excludeOldServers"
+
+Write-Host "Space Id: $octopusSpaceId"
+Write-Host "Environment Id: $octopusEnvironmentId"
+Write-Host "Tenant Id: $octopusTenantId"
+Write-Host "Deployment Id: $octopusDeploymentId"
+Write-Host "Trigger Id: $octopusTriggerId"
+Write-Host "Task Id: $octopusTaskId"
+Write-Host "Runbook Run Id: $octopusRunbookRunId"
+
+if ([string]::IsNullOrWhiteSpace($vmssScaleSetName)) { Write-Error "Scale Set Name is required." }
+if ([string]::IsNullOrWhiteSpace($vmssScaleSetResourceGroup)) { Write-Error "Resource Group Name is required." }
+if ([string]::IsNullOrWhiteSpace($roleToSearchFor)) { Write-Error "Scale Set Name is required." }
+if ([string]::IsNullOrWhiteSpace($octopusUrl)) { Write-Error "Octopus Url is required." }
+if ([string]::IsNullOrWhiteSpace($apiKey)) { Write-Error "Octopus Api Key is required." }
+if ([string]::IsNullOrWhiteSpace($timeoutInMinutes)) { Write-Error "Timeout in minutes is required." }
+if ([string]::IsNullOrWhiteSpace($timeoutErrorHandle)) { Write-Error "Timeout error handle is required." }
+if ([string]::IsNullOrWhiteSpace($duplicateRunDetectionInMinutes)) { Write-Error "Duplicate run detection in minutes is required." }
+if ([string]::IsNullOrWhiteSpace($duplicateRunHandle)) { Write-Error "Duplicate run handle is required." }
+if ([string]::IsNullOrWhiteSpace($excludeOldServers)) { Write-Error "Exclude old servers is required." }
+
+$queuedEventInfo = Get-QueuedEventInfo -octopusRunbookRunId $octopusRunbookRunId -octopusDeploymentId $octopusDeploymentId -octopusSpaceId $octopusSpaceId -octopusUrl $octopusUrl -apiKey $apiKey
+
+Write-Host "The current deployment was queued at: $($queuedEventInfo.CurrentDeploymentQueued)"
+
+$duplicateRun = Test-ForDuplicateRun -octopusRunbookRunId $octopusRunbookRunId -octopusDeploymentId $octopusDeploymentId -octopusSpaceId $octopusSpaceId  -duplicateRunDetectionInMinutes $duplicateRunDetectionInMinutes -duplicateRunHandle $duplicateRunHandle -queuedEventInfo $queuedEventInfo -octopusTaskId $octopusTaskId -octopusUrl $octopusUrl -apiKey $apiKey
+
+Start-WaitForVMSSToFinishProvisioning -vmssScaleSetResourceGroup $vmssScaleSetResourceGroup -vmssScaleSetName $vmssScaleSetName -timeoutInMinutes $timeoutInMinutes
+Start-WaitForVMsInVMSSToFinishProvisioning -vmssScaleSetResourceGroup $vmssScaleSetResourceGroup -vmssScaleSetName $vmssScaleSetName -timeoutInMinutes $timeoutInMinutes -timeoutErrorHandle $timeoutErrorHandle
+
+$vmssVmList = Get-AzVmssVM -ResourceGroupName $vmssScaleSetResourceGroup -VMScaleSetName $vmssScaleSetName
+$vmListToReconcile = @()
+
+foreach ($vmInfo in $vmssVmList)
+{
+	if ($vmInfo.ProvisioningState.ToLower().Trim() -ne "failed")
+    {
+    	$vmListToReconcile += $vmInfo.OsProfile.ComputerName
+    }
+}
+
+$octopusDeployTargets = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "machines?environmentIds=$($octopusEnvironmentId)&roles=$($roleToSearchFor)&skip=0&take=1000" -spaceId $octopusSpaceId -apiKey $apiKey -method "GET"
+$octopusDeployTargetIds = @()
+$octopusDeployTargetNames = @()
+$roleList = $roleToSearchFor.Split(",")
+foreach ($deploymentTarget in $octopusDeployTargets.Items)
+{
+	$matchingRole = $true
+    foreach ($role in $roleList)
+    {
+    	if ($deploymentTarget.Roles -notContains ($role.Trim()))
+        {
+        	Write-Host "The target $($deploymentTarget.Name) does not contain the role $role.  To be considered part of the scale set it has to be assigned to all the roles $roleToSearchFor.  Excluding from reconcilation logic."
+            $matchingRole = $false
+            break
+        }
+    }
+    
+    if ($matchingRole -eq $false)
+    {
+    	continue
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($octopusTenantId) -eq $false -and $deploymentTarget.TenantIds -notcontains $octopusTenantId)
+    {
+    	Write-Host "The target $($deploymentTarget.Name) is not assigned to $octopusTenantId.  But the current run is running under the context of that tenant.  Excluding from reconcilation logic."
+        continue
+    }
+    
+    $hasMatchingName = $false
+    $deploymentTargetNameLowerTrim = $deploymentTarget.Name.ToLower().Trim()
+
+    Write-Host "Attempting to do a match on name"
+	foreach ($vmssVM in $vmListToReconcile)
+    {
+    	$vmssVMLowerTrim = $vmssVM.ToLower().Trim()
+
+        Write-Host "Checking to see if $($deploymentTarget.Name) is like $vmssVM"
+        if ($deploymentTargetNameLowerTrim -eq $vmssVMLowerTrim)
+        {
+            Write-Host "The vmss vm name $vmssVM is equal to to the deployment target name $($deploymentTarget.Name), set matching to true"         
+            $hasMatchingName = $true
+            break
+        }
+        if ($deploymentTargetNameLowerTrim -like "*$vmssVMLowerTrim*")
+        {   
+            Write-Host "The deployment target name $($deploymentTarget.Name) contains the vmss vm name $vmssVM, set matching to true"         
+            $hasMatchingName = $true
+            break
+        }
+        elseif ($vmssVMLowerTrim -like "*$deploymentTargetNameLowerTrim*")
+        {
+            Write-Host "The vmss vm name $vmssVM contains the deployment target name $($deploymentTarget.Name), set matching to true"
+            $hasMatchingName = $true
+            break
+        }
+    }
+    
+    if ($hasMatchingName -eq $false)
+    {
+    	Write-Highlight "The deployment target $($deploymentTarget.Name) is not in the list of VMs assigned to the scale set, deleting it."
+        Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "machines/$($deploymentTarget.Id)" -spaceId $octopusSpaceId -apiKey $apiKey -method "DELETE"
+    }
+    else
+    {
+    	Write-Highlight "The deployment target $($deploymentTarget.Name) is in the list of VMS assigned to the scale set, leaving it alone."
+        
+        $addToOutputArray = $true
+        if ($excludeOldServers.ToLower().Trim() -eq "yes")
+        {
+        	Write-Host "Pulling back the creation event for $($deploymentTarget.Name)"
+        	$creationTasks = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "events?regarding=$($deploymentTarget.Id)&spaces=$($octopusSpaceId)&includeSystem=true&eventCategories=Created" -spaceId $null -apiKey $apiKey -method "GET"
+            
+            $creationDate = @($creationTasks.Items)[0].Occurred
+            Write-Host "The deployment target $($deploymentTarget.Name) was created on $creationDate"
+            $differenceInCreationTime = [DateTime]$queuedEventInfo.CurrentDeploymentQueued - [DateTime]$creationDate
+            
+            Write-Host "The difference in minutes between creation date and current task queued time is $($differenceInCreationTime.TotalMinutes) minutes" 
+            if ($differenceInCreationTime.TotalMinutes -gt 3)
+            {
+            	Write-Host "The deployment target $($deploymentTarget.Name) existed for more than 3 minutes before this was ran and the excludeOldServers was set to yes, removing this from the output"
+            	$addToOutputArray = $false
+            }
+        }
+        
+        if ($addToOutputArray -eq $true)
+        {
+	        $octopusDeployTargetIds += $deploymentTarget.Id
+    	    $octopusDeployTargetNames += $deploymentTarget.Name
+        }
+    }
+}
+
+Write-Highlight "The Azure VM Scale Set $vmssScaleSetName and Octopus Deploy target list have been successfully reconciled."
+
+$vmssHasServersToDeployTo = $octopusDeployTargetIds.Count -gt 0
+if ($duplicateRun -eq $true)
+{
+	Write-Highlight "Duplicate run detected, therefore there are no new servers to deploy to."
+    $vmssHasServersToDeployTo = $false
+}
+elseif ($vmssHasServersToDeployTo -eq $false)
+{
+	Write-Highlight "There are no servers to deploy to.  Exclude old servers was set to '$excludeOldServers'.  This likely means this was a scale in event or all the servers existed prior to this run."
+}
+
+Write-Highlight "Setting the output variable 'VMSSHasServersToDeployTo' to $vmssHasServersToDeployTo."
+Set-OctopusVariable -Name "VMSSHasServersToDeployTo" -Value $vmssHasServersToDeployTo
+
+Write-Highlight "Setting the output variable 'VMSSDeploymentTargetIds' to $($octopusDeployTargetIds -join ",")."
+Set-OctopusVariable -Name "VMSSDeploymentTargetIds" -Value ($octopusDeployTargetIds -join ",")
+
+Write-Highlight "Setting the output variable 'VMSSDeploymentTargetNames' to $($octopusDeployTargetNames -join ",")."
+Set-OctopusVariable -Name "VMSSDeploymentTargetNames" -Value ($octopusDeployTargetNames -join ",")
\ No newline at end of file
diff --git a/src/step-templates/azure-create-containerapp-environment/metadata.json b/src/step-templates/azure-create-containerapp-environment/metadata.json
new file mode 100644
index 000000000..d4081680f
--- /dev/null
+++ b/src/step-templates/azure-create-containerapp-environment/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "9b4b9fdc-2f97-4507-8df5-a0c1dd7464a5",
+  "Name": "Azure - Create Container App Environment",
+  "Description": "Creates a Container App Environment if it doesn't exist.  An output variable called `ManagedEnvironmentId` is created which holds the Id.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4e3ee370-7f62-4d00-a8c2-bb8717b5d681",
+      "Name": "Template.Azure.ResourceGroup.Name",
+      "Label": "Azure Resource Group Name",
+      "HelpText": "Provide the resource group name to create the environment in.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "11ccbfe4-f170-4d25-bc55-e52327680613",
+      "Name": "Template.Azure.Account.SubscriptionId",
+      "Label": "Azure Account Subscription Id",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `SubscriptionNumber` property to for this entry.  Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.SubscriptionNumber}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e1cf9fa6-e8b9-475a-9800-ef688f1e7ad5",
+      "Name": "Template.Azure.Account.ClientId",
+      "Label": "Azure Account Client Id",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Client` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Client}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4dbcd5a4-6d41-4ae0-ac69-76e27fc6bd28",
+      "Name": "Template.Azure.Account.TenantId",
+      "Label": "Azure Account Tenant Id",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `TenantId` property to for this entry.   If blank, it will use the Managed Identity tenant.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.TenantId}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "99a141f5-2fa1-40b9-b04e-8d37fe259a27",
+      "Name": "Template.Azure.Account.Password",
+      "Label": "Azure Account Password",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Password` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Password}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "a4a216e0-0ba5-4dd9-b759-6c7121eda110",
+      "Name": "Template.Azure.Account.JWTToken",
+      "Label": "Azure Account JWT Token",
+      "HelpText": "The JWT token of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `OpenIdConnect.Jwt` property to for this entry.   Leave blank if you're using an Azure Service Principal account type.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.OpenIdConnect.Jwt}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "66f5ee93-3ba9-44e7-8a04-50535b1907cb",
+      "Name": "Template.ContainerApp.Environment.Name",
+      "Label": "Container App Environment Name",
+      "HelpText": "The name of the container app environment to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "92daa091-2b90-4615-9a2e-ffc52275ddb4",
+      "Name": "Template.Azure.Location.Name",
+      "Label": "Azure Location",
+      "HelpText": "The location in which to create the container app environment.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-01-28T16:54:33.9690000Z",
+    "OctopusVersion": "2026.1.5902",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-create-containerapp-environment/scriptbody.ps1 b/src/step-templates/azure-create-containerapp-environment/scriptbody.ps1
new file mode 100644
index 000000000..6e757bfdd
--- /dev/null
+++ b/src/step-templates/azure-create-containerapp-environment/scriptbody.ps1
@@ -0,0 +1,168 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Write-Host "Saving module $PowerShellModuleName to temporary folder ..."
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+    Write-Host "Save successful!"
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows)
+{
+	# Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PWD/Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([IO.Path]::PathSeparator)$env:PSModulePath"
+$azureModule = "Az.App"
+
+# Get variables
+$templateAzureAccountClient = $OctopusParameters['Template.Azure.Account.ClientId']
+$templateAzureAccountPassword = $OctopusParameters['Template.Azure.Account.Password']
+$templateAzureAccountTenantId = $OctopusParameters['Template.Azure.Account.TenantId']
+$templateAzureResourceGroup = $OctopusParameters['Template.Azure.ResourceGroup.Name']
+$templateAzureSubscriptionId = $OctopusParameters['Template.Azure.Account.SubscriptionId']
+$templateEnvironmentName = $OctopusParameters['Template.ContainerApp.Environment.Name']
+$templateAzureLocation = $OctopusParameters['Template.Azure.Location.Name']
+$templateAzureJWTToken = $OctopusParameters['Template.Azure.Account.JWTToken']
+
+# Check for required PowerShell module
+Write-Host "Checking for module $azureModule ..."
+
+if ((Get-ModuleInstalled -PowerShellModuleName $azureModule) -eq $false)
+{
+	# Install the module
+    Install-PowerShellModule -PowerShellModuleName $azureModule -LocalModulesPath $LocalModules
+}
+
+# Import the necessary module
+Write-Host "Importing module $azureModule ..."
+Import-Module $azureModule
+
+# Check to see if the account was specified
+if (![string]::IsNullOrWhitespace($templateAzureAccountClient))
+{
+	# Login using the provided account
+    Write-Host "Logging in as specified account ..."
+
+    # Check to see if jwt token was provided
+    if (![string]::IsNullOrWhitespace($templateAzureJWTToken))
+    {
+        # Log in with OIDC
+        Write-Host "Logging in using OIDC ..."
+
+        # Log in
+        Connect-AzAccount -FederatedToken $templateAzureJWTToken -ApplicationId $templateAzureAccountClient -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null    
+    }
+
+    if (![string]::IsNullOrWhitespace($templateAzureAccountPassword))
+    {
+        # Log in with Azure Service Principal
+        Write-Host "Logging in with Azure Service Principal ..."
+        
+        # Create credential object for az module
+	    $securePassword = ConvertTo-SecureString $templateAzureAccountPassword -AsPlainText -Force
+	    $azureCredentials = New-Object System.Management.Automation.PSCredential ($templateAzureAccountClient, $securePassword)  
+
+        Connect-AzAccount -Credential $azureCredentials -ServicePrincipal -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null
+    }    
+    
+    Write-Host "Login successful!"
+}
+else
+{
+	Write-Host "Using machine Managed Identity ..."
+    Connect-AzAccount -Identity | Out-Null
+    
+    # Get Identity context
+    $identityContext = Get-AzContext
+    
+    # Set variables
+    $templateAzureSubscriptionId = $identityContext.Subscription
+    
+    if ([string]::IsNullOrWhitespace($templateAzureAccountTenantId))
+    {
+    	$templateAzureAccountTenantId = $identityContext.Tenant
+    }
+    
+    Set-AzContext -Tenant $templateAzureAccountTenantId | Out-Null
+
+	Write-Host "Successfully set context for Managed Identity!"
+}
+
+# Check to see if Container App Environment already exists
+Write-Host "Getting list of existing environments ..."
+$existingEnvironments = Get-AzContainerAppManagedEnv -ResourceGroupName $templateAzureResourceGroup -SubscriptionId $templateAzureSubscriptionId
+$managedEnvironment = $null
+
+if (($null -ne $existingEnvironments) -and ($null -ne ($existingEnvironments | Where-Object {$_.Name -eq $templateEnvironmentName})))
+{
+	Write-Host "Environment $templateEnvironmentName already exists."
+    $managedEnvironment = $existingEnvironments | Where-Object {$_.Name -eq $templateEnvironmentName}
+}
+else
+{
+	Write-Host "Environment $templateEnvironmentName not found, creating ..."
+    $managedEnvironment = New-AzContainerAppManagedEnv -EnvName $templateEnvironmentName -ResourceGroupName $templateAzureResourceGroup -Location $templateAzureLocation -AppLogConfigurationDestination "" # Empty AppLogConfigurationDestination is workaround for properties issue caused by marking this as required
+}
+
+# Set output variable
+Write-Host "Setting output variable ManagedEnvironmentId to $($managedEnvironment.Id)"
+Set-OctopusVariable -name "ManagedEnvironmentId" -value "$($managedEnvironment.Id)"
\ No newline at end of file
diff --git a/step-templates/bash-check-net-core-framework-version.json b/src/step-templates/bash-check-net-core-framework-version/metadata.json
similarity index 56%
rename from step-templates/bash-check-net-core-framework-version.json
rename to src/step-templates/bash-check-net-core-framework-version/metadata.json
index a505e7e5b..dac422b56 100644
--- a/step-templates/bash-check-net-core-framework-version.json
+++ b/src/step-templates/bash-check-net-core-framework-version/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "targetVersion=$(get_octopusvariable \"TargetVersion\")\nexact=$(get_octopusvariable \"Exact\")\n\n# required arguments checking\nif [[ ! $targetVersion ]] || [[ ! $exact ]] \nthen\n    echo \"[ERROR]: Missing required argument. Exit!\"\n    exit 1;\nfi\n\ndotNetCorePath=/usr/share/dotnet/shared/Microsoft.NETCore.App\ndotNetCoreVersions=()\nif [ -d \"$dotNetCorePath\" ]; then\n\tcd $dotNetCorePath\n    dotNetCoreVersions=(*/)\nfi\n\nmatchedVersions=()\nfor i in ${dotNetCoreVersions[@]}; do\n\tif [ $exact = true ] || [ $exact = True ]\n    then\n    \tif [[ $i = $targetVersion/ ]]\n        then\n        \tmatchedVersions+=(${i%/})\n        fi\n    else\n    \tif [[ ! $i < $targetVersion/ ]]\n        then\n        \tmatchedVersions+=(${i%/})\n        fi\n    fi\ndone\n\nif [ ${#matchedVersions[@]} -eq 0 ]; then\n    echo \"Can't find .NET Core Runtime $targetVersion installed in the machine.\"\n    exit 1\nelse\n    for i in ${matchedVersions[@]}; do\n    \techo \"Found .NET Core Runtime $i installed in the machine.\"\n\tdone\nfi"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -35,10 +35,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2018-03-30T10:07:36.152Z",
+    "ExportedAt": "2018-03-30T10:07:36.1520000Z",
     "OctopusVersion": "2018.3.4",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "cjuroz",
   "Category": "bash"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/bash-check-net-core-framework-version/scriptbody.sh b/src/step-templates/bash-check-net-core-framework-version/scriptbody.sh
new file mode 100644
index 000000000..5d872c8b4
--- /dev/null
+++ b/src/step-templates/bash-check-net-core-framework-version/scriptbody.sh
@@ -0,0 +1,41 @@
+targetVersion=$(get_octopusvariable "TargetVersion")
+exact=$(get_octopusvariable "Exact")
+
+# required arguments checking
+if [[ ! $targetVersion ]] || [[ ! $exact ]] 
+then
+    echo "[ERROR]: Missing required argument. Exit!"
+    exit 1;
+fi
+
+dotNetCorePath=/usr/share/dotnet/shared/Microsoft.NETCore.App
+dotNetCoreVersions=()
+if [ -d "$dotNetCorePath" ]; then
+	cd $dotNetCorePath
+    dotNetCoreVersions=(*/)
+fi
+
+matchedVersions=()
+for i in ${dotNetCoreVersions[@]}; do
+	if [ $exact = true ] || [ $exact = True ]
+    then
+    	if [[ $i = $targetVersion/ ]]
+        then
+        	matchedVersions+=(${i%/})
+        fi
+    else
+    	if [[ ! $i < $targetVersion/ ]]
+        then
+        	matchedVersions+=(${i%/})
+        fi
+    fi
+done
+
+if [ ${#matchedVersions[@]} -eq 0 ]; then
+    echo "Can't find .NET Core Runtime $targetVersion installed in the machine."
+    exit 1
+else
+    for i in ${matchedVersions[@]}; do
+    	echo "Found .NET Core Runtime $i installed in the machine."
+	done
+fi
\ No newline at end of file
diff --git a/step-templates/bash-http-test-url.json b/src/step-templates/bash-http-test-url/metadata.json
similarity index 58%
rename from step-templates/bash-http-test-url.json
rename to src/step-templates/bash-http-test-url/metadata.json
index ca88bce46..98a1e8e15 100644
--- a/step-templates/bash-http-test-url.json
+++ b/src/step-templates/bash-http-test-url/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "Bash",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "uri=$(get_octopusvariable \"uri\")\r\nexpectedCode=$(get_octopusvariable \"expectedCode\")\r\ntimeout=$(get_octopusvariable \"timeout\")\r\nsuccess=false\r\n\r\n# required arguments checking\r\nif [[ $expectedCode == \"Unrecognized variable\"* ]] || [[ $uri == \"Unrecognized variable\"* ]] || [[ $timeout == \"Unrecognized variable\"* ]]\r\nthen\r\n    echo \"[ERROR]: Missing required argument. Exit!\"\r\n    exit 1;\r\nfi\r\n\r\necho \"Starting verification request to $uri\"\r\necho \"Expecting response code $expectedCode\"\r\n\r\nend=$((SECONDS+$timeout))\r\n\r\nuntil $success || [ $SECONDS -ge $end ];\r\ndo\r\n    code=$(curl --write-out %{http_code} --silent --output /dev/null $uri)\r\n    echo \"Recieved response code: $code\"\r\n    \r\n    if [ $code -eq $expectedCode ]\r\n    then\r\n        echo \"Sucesss! Found status code $expectedCode\"\r\n        success=true\r\n        exit 0\r\n    else\r\n        echo \"Trying again in 5 seconds...\"\r\n        sleep 5\r\n    fi\r\ndone\r\n\r\nif ! $success\r\nthen\r\n    echo \"Verification failed - giving up.\"\r\n    exit 1\r\nfi",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -51,9 +51,9 @@
   ],
   "LastModifiedBy": "cjuroz",
   "$Meta": {
-    "ExportedAt": "2017-02-17T05:46:18.745Z",
+    "ExportedAt": "2017-02-17T05:46:18.7450000Z",
     "OctopusVersion": "3.8.4",
     "Type": "ActionTemplate"
   },
   "Category": "bash"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/bash-http-test-url/scriptbody.sh b/src/step-templates/bash-http-test-url/scriptbody.sh
new file mode 100644
index 000000000..35c818a16
--- /dev/null
+++ b/src/step-templates/bash-http-test-url/scriptbody.sh
@@ -0,0 +1,38 @@
+uri=$(get_octopusvariable "uri")
+expectedCode=$(get_octopusvariable "expectedCode")
+timeout=$(get_octopusvariable "timeout")
+success=false
+
+# required arguments checking
+if [[ $expectedCode == "Unrecognized variable"* ]] || [[ $uri == "Unrecognized variable"* ]] || [[ $timeout == "Unrecognized variable"* ]]
+then
+    echo "[ERROR]: Missing required argument. Exit!"
+    exit 1;
+fi
+
+echo "Starting verification request to $uri"
+echo "Expecting response code $expectedCode"
+
+end=$((SECONDS+$timeout))
+
+until $success || [ $SECONDS -ge $end ];
+do
+    code=$(curl --write-out %{http_code} --silent --output /dev/null $uri)
+    echo "Recieved response code: $code"
+    
+    if [ $code -eq $expectedCode ]
+    then
+        echo "Sucesss! Found status code $expectedCode"
+        success=true
+        exit 0
+    else
+        echo "Trying again in 5 seconds..."
+        sleep 5
+    fi
+done
+
+if ! $success
+then
+    echo "Verification failed - giving up."
+    exit 1
+fi
\ No newline at end of file
diff --git a/step-templates/bash-service-check-running.json b/src/step-templates/bash-service-check-running/metadata.json
similarity index 63%
rename from step-templates/bash-service-check-running.json
rename to src/step-templates/bash-service-check-running/metadata.json
index e82eff2d9..934fcf9c2 100644
--- a/step-templates/bash-service-check-running.json
+++ b/src/step-templates/bash-service-check-running/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "Bash",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "services=$(get_octopusvariable \"services\")\r\nfailed=false\r\n\r\n# required arguments checking\r\nif [[ $services == \"Unrecognized variable\"* ]]\r\nthen\r\n    echo \"[ERROR]: Missing required argument. Exit!\"\r\n    exit 1;\r\nfi\r\n\r\nfor service in ${services//,/ }\r\ndo\r\n    if (( $(ps -ef | grep -v grep | grep $service | wc -l) > 0 ))\r\n    then\r\n        echo \"$service is running!!!\"\r\n    else\r\n        echo \"$service is not running!!!\"\r\n        failed=true\r\n    fi\r\ndone\r\n\r\nif $failed; then\r\n    echo \"At least one service is not running!!!\"\r\n    exit 1\r\nfi\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -29,9 +29,9 @@
   ],
   "LastModifiedBy": "cjuroz",
   "$Meta": {
-    "ExportedAt": "2017-02-17T05:50:08.653Z",
+    "ExportedAt": "2017-02-17T05:50:08.6530000Z",
     "OctopusVersion": "3.8.4",
     "Type": "ActionTemplate"
   },
   "Category": "bash"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/bash-service-check-running/scriptbody.sh b/src/step-templates/bash-service-check-running/scriptbody.sh
new file mode 100644
index 000000000..714626eb9
--- /dev/null
+++ b/src/step-templates/bash-service-check-running/scriptbody.sh
@@ -0,0 +1,25 @@
+services=$(get_octopusvariable "services")
+failed=false
+
+# required arguments checking
+if [[ $services == "Unrecognized variable"* ]]
+then
+    echo "[ERROR]: Missing required argument. Exit!"
+    exit 1;
+fi
+
+for service in ${services//,/ }
+do
+    if (( $(ps -ef | grep -v grep | grep $service | wc -l) > 0 ))
+    then
+        echo "$service is running!!!"
+    else
+        echo "$service is not running!!!"
+        failed=true
+    fi
+done
+
+if $failed; then
+    echo "At least one service is not running!!!"
+    exit 1
+fi
diff --git a/step-templates/configure-spm-client.json b/src/step-templates/configure-spm-client/metadata.json
similarity index 79%
rename from step-templates/configure-spm-client.json
rename to src/step-templates/configure-spm-client/metadata.json
index 0ff47445e..f6e1bfef9 100644
--- a/step-templates/configure-spm-client.json
+++ b/src/step-templates/configure-spm-client/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "Bash",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "APP_GUID=\"#{appguid}\"\nAPP_TYPE=\"#{applicationtype}\"\nAPP_MODE=\"#{applicationmode}\"\nJMXADDR=\"#{jmxhostaddress}\"\nJMXPORT=\"#{jmxhostport}\"\n\necho sudo bash /opt/spm/bin/spm-client-setup-conf.sh ${APP_GUID} ${APP_TYPE} ${APP_MODE} jmxhost:${JMXADDR} jmxport:${JMXPORT}\nsudo bash /opt/spm/bin/spm-client-setup-conf.sh ${APP_GUID} ${APP_TYPE} ${APP_MODE} jmxhost:${JMXADDR} jmxport:${JMXPORT}\nsudo service spm-monitor restart",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -71,10 +71,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2017-01-08T11:12:19.041+00:00",
+  "LastModifiedOn": "2017-01-08T03:12:19.0410000-08:00",
   "LastModifiedBy": "mani0070",
   "$Meta": {
-    "ExportedAt": "2017-01-08T11:09:57.757Z",
+    "ExportedAt": "2017-01-08T11:09:57.7570000Z",
     "OctopusVersion": "3.7.6",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/configure-spm-client/scriptbody.sh b/src/step-templates/configure-spm-client/scriptbody.sh
new file mode 100644
index 000000000..65a0cb831
--- /dev/null
+++ b/src/step-templates/configure-spm-client/scriptbody.sh
@@ -0,0 +1,9 @@
+APP_GUID="#{appguid}"
+APP_TYPE="#{applicationtype}"
+APP_MODE="#{applicationmode}"
+JMXADDR="#{jmxhostaddress}"
+JMXPORT="#{jmxhostport}"
+
+echo sudo bash /opt/spm/bin/spm-client-setup-conf.sh ${APP_GUID} ${APP_TYPE} ${APP_MODE} jmxhost:${JMXADDR} jmxport:${JMXPORT}
+sudo bash /opt/spm/bin/spm-client-setup-conf.sh ${APP_GUID} ${APP_TYPE} ${APP_MODE} jmxhost:${JMXADDR} jmxport:${JMXPORT}
+sudo service spm-monitor restart
\ No newline at end of file
diff --git a/src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/metadata.json b/src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/metadata.json
new file mode 100644
index 000000000..7dbd75948
--- /dev/null
+++ b/src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/metadata.json
@@ -0,0 +1,95 @@
+{
+  "Id": "4b30f084-fb30-4c12-b0c4-0cd4eab05793",
+  "Name": "CyberArk Secrets Manager - Retrieve Secrets (JWT)",
+  "Description": "This step retrieves one or more secrets from CyberArk Secrets Manager and creates sensitive output variables for each value retrieved. It uses the JWT authenticator in Secrets Manager in combination with a Generic OIDC Account configured in Octopus to authenticate the workload.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "e750e1fc-3ffc-40cb-9d74-a2519d5451c1",
+      "Name": "CyberArk.SecretsManager.Url",
+      "Label": "Secrets Manager URL",
+      "HelpText": "The URL of the Secrets Manager instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "68b8272e-17e4-46ee-8042-09780a763530",
+      "Name": "CyberArk.SecretsManager.Account",
+      "Label": "Secrets Manager Account",
+      "HelpText": "The Secrets Manager account.",
+      "DefaultValue": "conjur",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8ac15e8c-ba7f-4b20-8329-52df64f69729",
+      "Name": "CyberArk.SecretsManager.ServiceId",
+      "Label": "Authenticator Service ID",
+      "HelpText": "The service ID of the authn-jwt instance to be used for authentication to Secrets Manager.",
+      "DefaultValue": "octopus",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "42d42fe0-6d39-4970-be62-8ad34f611462",
+      "Name": "CyberArk.SecretsManager.Jwt",
+      "Label": "OIDC Account",
+      "HelpText": "The Generic OIDC Account configured in Octopus to generate JWT credentials for workload authentication to Secrets Manager.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "GenericOidcAccount"
+      }
+    },
+    {
+      "Id": "fe47f2ea-efa9-4468-b837-79a52ce3c22e",
+      "Name": "CyberArk.SecretsManager.Variables",
+      "Label": "Secrets Manager Variables",
+      "HelpText": "Specify the names of the secrets to be returned from Secrets Manager, in the format:\n\n`VariableID | OutputVariableName` where:\n\n* VariableID is the Variable ID of the secret to be retrieved from Secrets Manager.\n* OutputVariableName is the optional Octopus output variable name to store the secret's value in. If this value isn't specified, an output name will be generated dynamically based on the Variable ID.\n\n**Note:** Multiple Variable IDs can be retrieved by entering each one on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "8f8672c4-4e93-44b0-b7a7-ecf77e45f919",
+      "Name": "CyberArk.SecretsManager.Certificate",
+      "Label": "Trusted Server Certificate (Optional)",
+      "HelpText": "CA bundle or server certificate to establish a trusted TLS connection with Secrets Manager.\n\nYou can also use this to trust self-signed certificates.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "5ae5bb25-5f20-46d9-af93-90a493f75123",
+      "Name": "CyberArk.SecretsManager.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus output variable names to the task log.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-05-21T14:32:50.3030000Z",
+    "OctopusVersion": "2025.2.10930",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "gl-johnson",
+  "Category": "cyberark"
+}
diff --git a/src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/scriptbody.py b/src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/scriptbody.py
new file mode 100644
index 000000000..a0c27e7cd
--- /dev/null
+++ b/src/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt/scriptbody.py
@@ -0,0 +1,124 @@
+import subprocess
+import sys
+import tempfile
+
+# Install Conjur SDK
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'conjur-api', '--disable-pip-version-check'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'async-timeout', '--disable-pip-version-check'])
+
+# Conjur SDK imports
+from conjur_api.models import SslVerificationMode, ConjurConnectionInfo
+from conjur_api.providers import JWTAuthenticationStrategy
+from conjur_api import Client
+from conjur_api.errors.errors import HttpStatusError
+
+# Fetch configuration values
+def retrieve_inputs():
+    inputs = {}
+    inputs["service_id"] = get_octopusvariable('CyberArk.SecretsManager.ServiceId')
+    inputs["account"] = get_octopusvariable('CyberArk.SecretsManager.Account')
+    inputs["url"] = get_octopusvariable('CyberArk.SecretsManager.Url')
+    inputs["token"] = get_octopusvariable('CyberArk.SecretsManager.Jwt.OpenIdConnect.Jwt')
+    inputs["variables"] = get_octopusvariable('CyberArk.SecretsManager.Variables')
+    inputs["ca_bundle"] = get_octopusvariable('CyberArk.SecretsManager.Certificate')
+    inputs["print_outputs"] = get_octopusvariable('CyberArk.SecretsManager.PrintVariableNames')
+    return inputs
+
+# Validate the required inputs are not empty
+def validate_inputs(inputs):
+    if not inputs["service_id"]:
+        raise ValueError("Service ID is required.")
+    if not inputs["account"]:
+        raise ValueError("Account is required.")
+    if not inputs["url"]:
+        raise ValueError("Conjur URL is required.")
+    if not inputs["token"]:
+        raise ValueError("JWT token is required.")
+    if not inputs["variables"]:
+        raise ValueError("At least one variable must be specified.")
+
+# Parse the requested input/output variables
+# If no output variable name is provided, the Conjur var ID will be used
+def parse_variables(variables):
+    var_map = {}
+    for line_number, line in enumerate(variables.strip().splitlines(), start=1):
+        line = line.strip()
+        if not line:
+            continue
+
+        parts = [part.strip() for part in line.split('|')]
+        input_var = parts[0]
+        if len(parts) == 1:
+            output_var = input_var
+        elif len(parts) == 2:
+            output_var = parts[1]
+        else:
+            raise ValueError(f"Variables line {line_number} has too many '|' characters: '{line}'")
+
+        # Basic validations
+        if not input_var:
+            raise ValueError(f"Variables line {line_number} is missing an input variable name: '{line}'")
+        if ' ' in input_var or ' ' in output_var:
+            raise ValueError(f"Variables line {line_number} has illegal spaces in a variable name: '{line}'")
+
+        # Warn if any duplicate output vars exist
+        if output_var in var_map.values():
+            print(f"WARN: Two or more secrets mapped to the same output variable: `{output_var}`. The earlier value will be overwritten.")
+        var_map[input_var] = output_var
+    return var_map
+
+# Configure a Conjur client for JWT authentication
+def create_conjur_client(inputs):
+    ssl_verification_mode = SslVerificationMode.TRUST_STORE
+    cert_file = None
+    # If a server certificate or CA was provided, use that instead of the default trust store
+    if inputs["ca_bundle"]:
+        with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_cert_file:
+            temp_cert_file.write(inputs["ca_bundle"])
+            cert_file = temp_cert_file.name
+        ssl_verification_mode = SslVerificationMode.CA_BUNDLE
+
+    connection_info = ConjurConnectionInfo(conjur_url=inputs["url"],
+                                           account=inputs["account"],
+                                           service_id=inputs["service_id"],
+                                           cert_file=cert_file)
+    jwt_provider = JWTAuthenticationStrategy(inputs["token"])
+    return Client(connection_info,
+                    authn_strategy=jwt_provider,
+                    ssl_verification_mode=ssl_verification_mode,
+                    async_mode=False)
+
+# Retrieve requested secrets from Conjur and set them as sensitive Octopus variables
+def retrieve_secrets(var_map, client, inputs):
+    variable_ids = list(var_map.keys())
+    print(f"INFO: Attempting to authenticate and retrieve {len(variable_ids)} secrets...")
+    try:
+        retrieval_response = client.get_many(*variable_ids)
+    except HttpStatusError as e:
+        if e.response is not None:
+            if e.status == 401:
+                print("ERROR: Authentication failed. Please validate the JWT and authenticator configuration.")
+            elif e.status == 403:
+                print("ERROR: Access denied. Please ensure the role has permissions to access the requested variables.")
+            elif e.status == 404:
+                print("ERROR: One or more requested variables not found.")
+        raise
+
+    print("INFO: Successfully retrieved secrets.")
+
+    # Set the output variables
+    for input_var, output_var in var_map.items():
+        if input_var in retrieval_response:
+            set_octopusvariable(output_var, retrieval_response[input_var], True)
+
+    # Print a list output variable names if requested
+    if inputs["print_outputs"]:
+        output_var_names = list(dict.fromkeys(var_map.values()))
+        print(f"INFO: Populated sensitive output variables: {', '.join(output_var_names)}")
+
+# Main execution starts here - this has to be inline to run in the Octopus environment
+inputs = retrieve_inputs()
+validate_inputs(inputs)
+var_map = parse_variables(inputs["variables"])
+client = create_conjur_client(inputs)
+retrieve_secrets(var_map, client, inputs)
diff --git a/step-templates/docker-install-linux.json b/src/step-templates/docker-install-linux/metadata.json
similarity index 77%
rename from step-templates/docker-install-linux.json
rename to src/step-templates/docker-install-linux/metadata.json
index fbae34536..63bc5cf44 100644
--- a/step-templates/docker-install-linux.json
+++ b/src/step-templates/docker-install-linux/metadata.json
@@ -9,14 +9,14 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "echo 'Downloading install script from https://get.docker.com'\ncurl -fsSL https://get.docker.com -o get-docker.sh\n\necho 'Running get-docker.sh'\nsudo sh get-docker.sh"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [],
   "$Meta": {
-    "ExportedAt": "2020-05-19T07:17:52.446Z",
+    "ExportedAt": "2020-05-19T07:17:52.4460000Z",
     "OctopusVersion": "2020.2.4",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "MJRichardson",
   "Category": "docker"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/docker-install-linux/scriptbody.sh b/src/step-templates/docker-install-linux/scriptbody.sh
new file mode 100644
index 000000000..e35ca90a1
--- /dev/null
+++ b/src/step-templates/docker-install-linux/scriptbody.sh
@@ -0,0 +1,5 @@
+echo 'Downloading install script from https://get.docker.com'
+curl -fsSL https://get.docker.com -o get-docker.sh
+
+echo 'Running get-docker.sh'
+sudo sh get-docker.sh
\ No newline at end of file
diff --git a/src/step-templates/file-system-rclone/metadata.json b/src/step-templates/file-system-rclone/metadata.json
new file mode 100644
index 000000000..917f18a45
--- /dev/null
+++ b/src/step-templates/file-system-rclone/metadata.json
@@ -0,0 +1,63 @@
+{
+  "Id": "fe8bf996-4cdf-4857-9c26-5aefb4fb4025",
+  "Name": "File System - rclone (bash)",
+  "Description": "Runs [rclone](https://rclone.org/) on a target or worker.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "b5c7fe5c-062e-4c69-9746-e6275f8d5145",
+      "Name": "Rclone.Path",
+      "Label": "Executable Path",
+      "HelpText": "Optional path to `rclone` if it is not in the environment's path variable.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aba94574-2ab4-4657-94d6-3ae47cf6cd38",
+      "Name": "Rclone.Command",
+      "Label": "Command",
+      "HelpText": "The `rclone` [command](https://rclone.org/commands/) to run.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ce6fa762-d494-4e3b-8367-edfced04bc45",
+      "Name": "Rclone.Parameters",
+      "Label": "Parameters",
+      "HelpText": "The parameters to provide to the `rclone` command.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7647af01-707d-4a02-8f90-37fc943bdece",
+      "Name": "Rclone.PrintCommand",
+      "Label": "Print Command?",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-15T21:16:20.7330000Z",
+    "OctopusVersion": "2020.2.11",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-rclone/scriptbody.sh b/src/step-templates/file-system-rclone/scriptbody.sh
new file mode 100644
index 000000000..591ede5fa
--- /dev/null
+++ b/src/step-templates/file-system-rclone/scriptbody.sh
@@ -0,0 +1,24 @@
+rclonePath=$(get_octopusvariable "Rclone.Path")
+rcloneCommand=$(get_octopusvariable "Rclone.Command")
+rcloneParameters=$(get_octopusvariable "Rclone.Parameters")
+printCommand=$(get_octopusvariable "Rclone.PrintCommand")
+
+if [ ! -z "$rclonePath" ] ; then
+   	PATH=$rclonePath:$PATH
+fi
+
+if [ -z "$rcloneCommand" ] ; then
+   	fail_step "Command is a required paremeter."
+fi
+
+if [ "$printCommand" = "True" ] ; then
+    set -x
+fi
+
+rclone $rcloneCommand ${rcloneParameters:+ $rcloneParameters} 2>&1
+
+# Check for error
+if [[ $? -ne 0 ]]
+then
+    fail_step "The rclone command resulted in errors. Please review the logs above."
+fi
diff --git a/src/step-templates/file-system-rsync/metadata.json b/src/step-templates/file-system-rsync/metadata.json
new file mode 100644
index 000000000..48d06e721
--- /dev/null
+++ b/src/step-templates/file-system-rsync/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "d8dfa484-59ed-491f-a22a-3098d4c2a6be",
+  "Name": "File System - rsync (bash)",
+  "Description": "Run [rsync](http://manpages.org/rsync) on a target or worker.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "da47b530-69dd-482c-9b97-f9c0b1dcca5c",
+      "Name": "Rsync.Path",
+      "Label": "Executable Path",
+      "HelpText": "Optional path to `rsync` if it is not in the environment's path variable.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7d315721-f2b2-4f0b-8eb1-3b946f711a59",
+      "Name": "Rsync.Options",
+      "Label": "Options",
+      "HelpText": "[Options](http://manpages.org/rsync#options) to provide to `rsync`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a908f5a3-8284-42b9-992d-528993c5b55f",
+      "Name": "Rsync.Source",
+      "Label": "Source",
+      "HelpText": "The location of the source files to copy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "366ad01c-1ef9-408e-bbed-58d0a7a3e4db",
+      "Name": "Rsync.Destination",
+      "Label": "Destination",
+      "HelpText": "The destination to copy the source files to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d969ceca-d823-4967-afbe-80672cd55051",
+      "Name": "Rsync.PrintCommand",
+      "Label": "Print Command?",
+      "HelpText": "Prints the command in the logs using `set -x`. This will cause a warning when the step runs.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-15T21:11:29.9690000Z",
+    "OctopusVersion": "2020.2.11",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-rsync/scriptbody.sh b/src/step-templates/file-system-rsync/scriptbody.sh
new file mode 100644
index 000000000..a2ae8fbb1
--- /dev/null
+++ b/src/step-templates/file-system-rsync/scriptbody.sh
@@ -0,0 +1,15 @@
+rsyncPath=$(get_octopusvariable "Rsync.Path")
+rsyncOptions=$(get_octopusvariable "Rsync.Options")
+rsyncSource=$(get_octopusvariable "Rsync.Source")
+rsyncDestination=$(get_octopusvariable "Rsync.Destination")
+printCommand=$(get_octopusvariable "Rsync.PrintCommand")
+
+if [ ! -z "$rsyncPath" ] ; then
+   	PATH=$rsyncPath:$PATH
+fi
+
+if [ "$printCommand" = "True" ] ; then
+    set -x
+fi
+
+rsync ${rsyncOptions:+ $rsyncOptions} ${rsyncSource:+ $rsyncSource} ${rsyncDestination:+ $rsyncDestination}
\ No newline at end of file
diff --git a/src/step-templates/firebase-deploy/metadata.json b/src/step-templates/firebase-deploy/metadata.json
new file mode 100644
index 000000000..79609bf2c
--- /dev/null
+++ b/src/step-templates/firebase-deploy/metadata.json
@@ -0,0 +1,126 @@
+{
+  "Id": "ac0dee2d-dcbe-42aa-96c6-bb6c644183b4",
+  "Name": "Firebase - Deploy",
+  "Description": "Deploys the contents of a package to a Firebase project using the [Firebase CLI deploy command](https://firebase.google.com/docs/cli/#deployment).",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "343306b7-6997-429f-9ed5-4214ca4d32ac",
+      "Name": "FirebaseDeploy.Package",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "FirebaseDeploy.Package"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "55ddf9fd-bf2f-4148-912b-bc599c5f6ec6",
+      "Name": "FirebaseDeploy.Package",
+      "Label": "Package",
+      "HelpText": "The package containing the Firebase project being deployed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "46874eaf-7632-40d1-bd46-4627bd0f2d0c",
+      "Name": "FirebaseDeploy.FirebasePath",
+      "Label": "Firebase Path",
+      "HelpText": "The path to the directory containing the Firebase CLI, if not in $PATH.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c982c1f3-a91e-4dd4-89a6-db5d99b08347",
+      "Name": "FirebaseDeploy.CIToken",
+      "Label": "CI Token",
+      "HelpText": "A CI token generated by the [Firebase CLI](https://firebase.google.com/docs/cli/#cli-ci-systems)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "56628161-6b99-4ca3-9c4a-1234117a0018",
+      "Name": "FirebaseDeploy.Public",
+      "Label": "Public Path",
+      "HelpText": "Override the Hosting public directory specified in firebase.json.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e7c41fcb-dd74-4ba2-9671-fa7313d632b8",
+      "Name": "FirebaseDeploy.Message",
+      "Label": "Message",
+      "HelpText": "An optional message describing this deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6a88a428-a538-4292-b6ee-b843c28887f3",
+      "Name": "FirebaseDeploy.Force",
+      "Label": "Force?",
+      "HelpText": "Delete Cloud Functions missing from the current working directory without confirmation.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c0debcc3-6708-4d3c-977b-880811b48594",
+      "Name": "FirebaseDeploy.Only",
+      "Label": "Only Targets",
+      "HelpText": "Only deploy to specified, comma-separated targets (e.g. \"hosting,storage\"). For functions, can specify filters with colons to scope function deploys to only those functions (e.g. \"--only functions:func1,functions:func2\"). When filtering based on export groups (the exported module object keys), use dots to specify group names (e.g. \"--only functions:group1.subgroup1,functions:group2)\".",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e62a6b0f-6331-4a63-a908-c759798ccd1c",
+      "Name": "FirebaseDeploy.Except",
+      "Label": "Except Targets",
+      "HelpText": "Deploy to all targets except specified (e.g. \"database\").",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e2e0ac14-e5e9-4b3c-bdc1-b1da3d7be184",
+      "Name": "FirebaseDeploy.PrintCommand",
+      "Label": "Print Command?",
+      "HelpText": "Prints the command in the logs using `set -x`. This will cause a warning when the step runs.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-08T19:44:37.6620000Z",
+    "OctopusVersion": "2020.2.11",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "firebase"
+}
diff --git a/src/step-templates/firebase-deploy/scriptbody.sh b/src/step-templates/firebase-deploy/scriptbody.sh
new file mode 100644
index 000000000..25163e458
--- /dev/null
+++ b/src/step-templates/firebase-deploy/scriptbody.sh
@@ -0,0 +1,27 @@
+packagePath=$(get_octopusvariable "Octopus.Action.Package[FirebaseDeploy.Package].ExtractedPath")
+token=$(get_octopusvariable "FirebaseDeploy.CIToken")
+public=$(get_octopusvariable "FirebaseDeploy.Public")
+message=$(get_octopusvariable "FirebaseDeploy.Message")
+force=$(get_octopusvariable "FirebaseDeploy.Force")
+only=$(get_octopusvariable "FirebaseDeploy.Only")
+except=$(get_octopusvariable "FirebaseDeploy.Except")
+printCommand=$(get_octopusvariable "FirebaseDeploy.PrintCommand")
+firebasePath=$(get_octopusvariable "FirebaseDeploy.FirebasePath")
+
+if [ ! -z "$firebasePath" ] ; then
+   	PATH=$firebasePath:$PATH
+fi
+
+if [ "$force" = "True" ] ; then
+    force=true
+else
+    force=
+fi
+
+if [ "$printCommand" = "True" ] ; then
+    set -x
+fi
+
+cd $packagePath
+
+firebase deploy ${public:+ -p "$public"} ${message:+ -m "$message"} ${force:+ -f} ${only:+ --only "$only"} ${except:+ --except "$except"} --token $token
\ No newline at end of file
diff --git a/src/step-templates/github-create-repo/metadata.json b/src/step-templates/github-create-repo/metadata.json
new file mode 100644
index 000000000..e0a21d863
--- /dev/null
+++ b/src/step-templates/github-create-repo/metadata.json
@@ -0,0 +1,65 @@
+{
+  "Id": "493fa039-fd5c-47d2-b830-63cc32a19d04",
+  "Name": "GitHub - Create Repository",
+  "Description": "This step creates a new GitHub repository if it does not exist.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "5845b0e2-d679-4cec-9022-c233031e6b35",
+      "Name": "CreateGithubRepo.Git.Url.NewRepoName",
+      "Label": "Repository Name",
+      "HelpText": "The name of the new GitHub repository.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b85e4a76-bc9c-4a51-8ac0-653991824db2",
+      "Name": "CreateGithubRepo.Git.Url.NewRepoNamePrefix",
+      "Label": "Repository Name Prefix",
+      "HelpText": "An optional prefix to apply to the name of the new repository. The repository name will often be generated from the project name, and the prefix will be based on a tenant name (`#{Octopus.Deployment.Tenant.Name}`) to ensure each tenant has a unique repo.\n\n\nThis value can be left blank.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b0d86188-fbb8-475e-89de-4b994170f2b7",
+      "Name": "CreateGithubRepo.Git.Url.Organization",
+      "Label": "GitHub Owner or Organization",
+      "HelpText": "This is the GitHub owner or organisation where the new repo is created.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0ffd12dd-59ce-401a-b1df-cf3d6711e2eb",
+      "Name": "CreateGithubRepo.Git.Credentials.AccessToken",
+      "Label": "GitHub Access Token",
+      "HelpText": "The access token used to authenticate with GitHub. See the [GitHub documentation](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) for more details.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-10-17T02:12:09.6050000Z",
+    "OctopusVersion": "2023.4.5667",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "github"
+}
diff --git a/src/step-templates/github-create-repo/scriptbody.py b/src/step-templates/github-create-repo/scriptbody.py
new file mode 100644
index 000000000..19c5cc9e8
--- /dev/null
+++ b/src/step-templates/github-create-repo/scriptbody.py
@@ -0,0 +1,259 @@
+# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid
+# having to use a regular user account.
+import subprocess
+import sys
+
+# Install our own dependencies
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])
+
+import json
+import subprocess
+import sys
+import os
+import urllib.request
+import base64
+import re
+import jwt
+import time
+import argparse
+import platform
+from urllib.request import urlretrieve
+
+# If this script is not being run as part of an Octopus step, setting variables is a noop
+if 'set_octopusvariable' not in globals():
+    def set_octopusvariable(variable, value):
+        pass
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if 'printverbose' not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    output_no_ansi = re.sub(r'\x1b\[[0-9;]*m', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,
+            append_to_path=None):
+    """
+        The execute method provides the ability to execute external processes while capturing and returning the
+        output to std err and std out and exit code.
+    """
+
+    my_env = os.environ.copy() if env is None else env
+
+    if append_to_path is not None:
+        my_env["PATH"] = append_to_path + os.pathsep + my_env['PATH']
+
+    process = subprocess.Popen(args,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               stdin=open(os.devnull),
+                               text=True,
+                               cwd=cwd,
+                               env=my_env)
+    stdout, stderr = process.communicate()
+    retcode = process.returncode
+
+    if not retcode == 0 and raise_on_non_zero:
+        raise Exception('command returned exit code ' + retcode)
+
+    if print_args is not None:
+        print_output(' '.join(args))
+
+    if print_output is not None:
+        print_output(stdout)
+        print_output(stderr)
+
+    return stdout, stderr, retcode
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION]',
+        description='Create a GitHub repo'
+    )
+    parser.add_argument('--new-repo-name', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(
+                            'Git.Url.NewRepoName') or get_octopusvariable_quiet('Octopus.Project.Name'))
+    parser.add_argument('--new-repo-name-prefix', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(
+                            'Git.Url.NewRepoNamePrefix'))
+    parser.add_argument('--git-organization', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(
+                            'Git.Url.Organization'))
+    parser.add_argument('--github-app-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))
+    parser.add_argument('--github-app-installation-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(
+                            'GitHub.App.InstallationId'))
+    parser.add_argument('--github-app-private-key', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(
+                            'GitHub.App.PrivateKey'))
+    parser.add_argument('--github-access-token', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGithubRepo.Git.Credentials.AccessToken') or get_octopusvariable_quiet(
+                            'Git.Credentials.AccessToken'),
+                        help='The git password')
+
+    return parser.parse_known_args()
+
+
+def generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):
+    # Generate the tokens used by git and the GitHub API
+    app_id = github_app_id
+    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))
+
+    payload = {
+        # Issued at time
+        'iat': int(time.time()),
+        # JWT expiration time (10 minutes maximum)
+        'exp': int(time.time()) + 600,
+        # GitHub App's identifier
+        'iss': app_id
+    }
+
+    # Create JWT
+    jwt_instance = jwt.JWT()
+    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')
+
+    # Create access token
+    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'
+    headers = {
+        'Authorization': 'Bearer ' + encoded_jwt,
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28'
+    }
+    request = urllib.request.Request(url, headers=headers, method='POST')
+    response = urllib.request.urlopen(request)
+    response_json = json.loads(response.read().decode())
+    return response_json['token']
+
+
+def generate_auth_header(token):
+    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))
+    return 'Basic ' + auth.decode('ascii')
+
+
+def verify_new_repo(token, cac_org, new_repo):
+    # Attempt to view the new repo
+    try:
+        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo
+        headers = {
+            'Accept': 'application/vnd.github+json',
+            'Authorization': 'Bearer ' + token,
+            'X-GitHub-Api-Version': '2022-11-28'
+        }
+        request = urllib.request.Request(url, headers=headers)
+        urllib.request.urlopen(request)
+        return True
+    except:
+        return False
+
+
+def create_new_repo(token, cac_org, new_repo):
+    # If we could not view the repo, assume it needs to be created.
+    # https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#create-an-organization-repository
+    # Note you have to use the token rather than the JWT:
+    # https://stackoverflow.com/questions/39600396/bad-credentails-for-jwt-for-github-integrations-api
+
+    headers = {
+        'Authorization': 'token ' + token,
+        'Content-Type': 'application/json',
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28',
+    }
+
+    try:
+        # First try to create an organization repo:
+        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos#create-an-organization-repository
+        url = 'https://api.github.com/orgs/' + cac_org + '/repos'
+        body = {'name': new_repo}
+        request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))
+        urllib.request.urlopen(request)
+    except urllib.error.URLError as ex:
+        # Then fall back to creating a repo for the user:
+        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos?apiVersion=2022-11-28#create-a-repository-for-the-authenticated-user
+        if ex.code == 404:
+            url = 'https://api.github.com/user/repos'
+            body = {'name': new_repo}
+            request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))
+            urllib.request.urlopen(request)
+        else:
+            raise ValueError("Failed to create thew new repository. This could indicate bad credentials.") from ex
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+parser, _ = init_argparse()
+
+if not parser.github_access_token.strip() and not (
+        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):
+    print("You must supply the GitHub token, or the GitHub App ID and private key and installation ID")
+    sys.exit(1)
+
+if not parser.new_repo_name.strip():
+    print("You must define the new repo name")
+    sys.exit(1)
+
+# The access token is generated from a github app or supplied directly as an access token
+token = generate_github_token(parser.github_app_id, parser.github_app_private_key, parser.github_app_installation_id) \
+    if not parser.github_access_token.strip() else parser.github_access_token.strip()
+
+cac_org = parser.git_organization.strip()
+new_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())
+project_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name.strip())
+
+# The prefix is optional
+new_repo_prefix_with_separator = new_repo_custom_prefix + '_' if new_repo_custom_prefix else ''
+
+# The new repo name is the prefix + the name of thew new project
+new_repo = new_repo_prefix_with_separator + project_repo_sanitized
+
+# This is the value of the forked git repo
+set_octopusvariable('NewRepoUrl', 'https://github.com/' + cac_org + '/' + new_repo)
+set_octopusvariable('NewRepo', new_repo)
+
+if not verify_new_repo(token, cac_org, new_repo):
+    create_new_repo(token, cac_org, new_repo)
+    print(
+        'New repo was created at https://github.com/' + cac_org + '/' + new_repo)
+else:
+    print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')
+
+print('New repo URL is defined in the output variable "NewRepoUrl": #{Octopus.Action[' +
+      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepoUrl}')
+print('New repo name is defined in the output variable "NewRepo": #{Octopus.Action[' +
+      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')
diff --git a/src/step-templates/github-create-secret/metadata.json b/src/step-templates/github-create-secret/metadata.json
new file mode 100644
index 000000000..3ecc82a1a
--- /dev/null
+++ b/src/step-templates/github-create-secret/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "8d59cae3-3168-466e-9490-bf654c180660",
+  "Name": "GitHub - Create Repo Secret",
+  "Description": "This step creates a secret in a GitHub repo.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "6470d539-d137-42dd-bff2-9ebc1955b2a7",
+      "Name": "CreateGitHubSecret.GitHub.Secret.Name",
+      "Label": "Secret Name",
+      "HelpText": "The name of the GitHub secret.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2ead2e13-1a01-4360-9585-f920181880a1",
+      "Name": "CreateGitHubSecret.GitHub.Secret.Value",
+      "Label": "Secret Value",
+      "HelpText": "The secret value.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "643b6230-5cca-4ca2-8340-9624ed721b9b",
+      "Name": "CreateGitHubSecret.Git.Url.Repo",
+      "Label": "GitHub Repo Name",
+      "HelpText": "The GitHub repo name i.e. `myrepo` in the URL`https://github.com/owner/myrepo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8c506ad7-f8b9-458c-a53b-23a19984c413",
+      "Name": "CreateGitHubSecret.Git.Url.Organization",
+      "Label": "Github Owner",
+      "HelpText": "The GitHub repo owner or organization i.e. `owner` in the URL `https://github.com/owner/myrepo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a457faef-6cd8-4c1b-ad23-306b03419794",
+      "Name": "CreateGitHubSecret.Git.Credentials.Password",
+      "Label": "GitHub Access Token",
+      "HelpText": "The GitHub access token",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-10-19T01:59:46.7680000Z",
+    "OctopusVersion": "2023.4.6357",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "github"
+}
diff --git a/src/step-templates/github-create-secret/scriptbody.py b/src/step-templates/github-create-secret/scriptbody.py
new file mode 100644
index 000000000..3e4805443
--- /dev/null
+++ b/src/step-templates/github-create-secret/scriptbody.py
@@ -0,0 +1,235 @@
+# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094
+
+# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid
+# having to use a regular user account.
+import subprocess
+import sys
+
+# Install our own dependencies
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])
+
+import requests
+import json
+import sys
+import os
+import urllib.request
+import base64
+import re
+import jwt
+import time
+import argparse
+import urllib3
+from base64 import b64encode
+from typing import TypedDict
+from nacl import public, encoding
+
+# Disable insecure http request warnings
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+# If this script is not being run as part of an Octopus step, setting variables is a noop
+if 'set_octopusvariable' not in globals():
+    def set_octopusvariable(variable, value):
+        pass
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if 'printverbose' not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    output_no_ansi = re.sub(r'\x1b\[[0-9;]*m', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION]',
+        description='Fork a GitHub repo'
+    )
+
+    parser.add_argument('--secret-name', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(
+                            'GitHub.Secret.Name'))
+    parser.add_argument('--secret-value', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(
+                            'GitHub.Secret.Value'))
+
+    parser.add_argument('--repo', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(
+                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))
+    parser.add_argument('--git-organization', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(
+                            'Git.Url.Organization'))
+    parser.add_argument('--github-app-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))
+    parser.add_argument('--github-app-installation-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(
+                            'GitHub.App.InstallationId'))
+    parser.add_argument('--github-app-private-key', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(
+                            'GitHub.App.PrivateKey'))
+    parser.add_argument('--git-password', action='store',
+                        default=get_octopusvariable_quiet(
+                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(
+                            'Git.Credentials.Password'),
+                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')
+
+    return parser.parse_known_args()
+
+
+def generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):
+    # Generate the tokens used by git and the GitHub API
+    app_id = github_app_id
+    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))
+
+    payload = {
+        # Issued at time
+        'iat': int(time.time()),
+        # JWT expiration time (10 minutes maximum)
+        'exp': int(time.time()) + 600,
+        # GitHub App's identifier
+        'iss': app_id
+    }
+
+    # Create JWT
+    jwt_instance = jwt.JWT()
+    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')
+
+    # Create access token
+    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'
+    headers = {
+        'Authorization': 'Bearer ' + encoded_jwt,
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28'
+    }
+    request = urllib.request.Request(url, headers=headers, method='POST')
+    response = urllib.request.urlopen(request)
+    response_json = json.loads(response.read().decode())
+    return response_json['token']
+
+
+def verify_new_repo(token, cac_org, new_repo):
+    # Attempt to view the new repo
+    try:
+        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo
+        headers = {
+            'Accept': 'application/vnd.github+json',
+            'Authorization': 'Bearer ' + token,
+            'X-GitHub-Api-Version': '2022-11-28'
+        }
+        request = urllib.request.Request(url, headers=headers)
+        urllib.request.urlopen(request)
+        return True
+    except:
+        return False
+
+
+def encrypt(public_key_for_repo: str, secret_value_input: str) -> str:
+    """Encrypt a Unicode string using the public key."""
+    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode("utf-8"), encoding.Base64Encoder()))
+    encrypted = sealed_box.encrypt(secret_value_input.encode("utf-8"))
+    return b64encode(encrypted).decode("utf-8")
+
+
+def get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):
+    public_key_endpoint: str = f"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key"
+    headers: TypedDict[str, str] = {"Authorization": f"Bearer {gh_auth_token}"}
+    response = requests.get(url=public_key_endpoint, headers=headers)
+    if response.status_code != 200:
+        raise IOError(
+            f"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}")
+
+    public_key_json = response.json()
+    return public_key_json['key_id'], public_key_json['key']
+
+
+def set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,
+               encrypted_secret_value: str):
+    secret_creation_url = f"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}"
+    secret_creation_body = {"key_id": public_key_id, "encrypted_value": encrypted_secret_value}
+    headers: TypedDict[str, str] = {"Authorization": f"Bearer {gh_auth_token}", "Content-Type": "application/json"}
+
+    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)
+    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:
+        print("--Secret Created / Updated!--")
+    else:
+        print(f"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}")
+
+
+parser, _ = init_argparse()
+
+if not parser.git_password.strip() and not (
+        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):
+    print("You must supply the GitHub token, or the GitHub App ID and private key and installation ID")
+    sys.exit(1)
+
+if not parser.git_organization.strip():
+    print("You must define the organization")
+    sys.exit(1)
+
+if not parser.repo.strip():
+    print("You must define the repo name")
+    sys.exit(1)
+
+token = generate_github_token(parser.github_app_id, parser.github_app_private_key,
+                              parser.github_app_installation_id) if len(
+    parser.git_password.strip()) == 0 else parser.git_password.strip()
+
+if not parser.git_password.strip() and not (
+        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):
+    print("You must supply the GitHub token, or the GitHub App ID and private key and installation ID")
+    sys.exit(1)
+
+if not parser.git_organization.strip():
+    print("You must define the organization")
+    sys.exit(1)
+
+if not parser.repo.strip():
+    print("You must define the repo name")
+    sys.exit(1)
+
+if not parser.secret_name.strip():
+    print("You must define the secret name")
+    sys.exit(1)
+
+if not verify_new_repo(token, parser.git_organization, parser.repo):
+    print("Could not find the repo")
+    sys.exit(1)
+
+key_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,
+                                    token)
+encrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)
+set_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,
+           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,
+           encrypted_secret_value=encrypted_secret)
diff --git a/src/step-templates/github-fork-repo/metadata.json b/src/step-templates/github-fork-repo/metadata.json
new file mode 100644
index 000000000..fcbe89de8
--- /dev/null
+++ b/src/step-templates/github-fork-repo/metadata.json
@@ -0,0 +1,115 @@
+{
+  "Id": "f79befdd-9042-4e49-a4d9-164fc8daf8d6",
+  "Name": "GitHub - Fork Repo",
+  "Description": "Forks a repo in GitHub and returns the new repo URL in the output variable `NewRepo`. If the new repo already exists, it is not modified.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py",
+    "Octopus.Action.Script.Syntax": "Python"
+  },
+  "Parameters": [
+    {
+      "Id": "d6b60ef3-0dc1-4c01-86b9-b3b65a266acf",
+      "Name": "ForkGithubRepo.Git.Url.OriginalRepoName",
+      "Label": "Original Repo Name",
+      "HelpText": "This is the name of the original repo that is forked. The full URL of the original repo is `http://github.com/organization/<Original Repo Name>`.\n\nThis value defaults to the name of the project if not defined.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a4c8c416-591f-4bc5-bf76-041064d8993b",
+      "Name": "ForkGithubRepo.Git.Url.NewRepoName",
+      "Label": "Forked Repo Name",
+      "HelpText": "This value is used to generate the name of the forked repo. The full URL of the original repo is `http://github.com/organization/<Forked Repo Prefix>_<Forked Repo Name>`.\n\nThe `Forked Repo Name` defaults to the `Original Repo Name` if it is left blank.\n\nThe forked repo name is sanitized to replace non-alpha-numeric or dash characters with an underscore.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f829046a-8f59-4c53-8122-8281b6329363",
+      "Name": "ForkGithubRepo.Git.Url.NewRepoNamePrefix",
+      "Label": "Forked Repo Prefix",
+      "HelpText": "This prefix is prepended to the name of the forked repo. The final name of the forked repo is `<Forked Repo Prefix>_<Forked Repo Name>`. If a prefix is not specified, it is assumed to be the tenant's name running this script.\n\nYou must supply a prefix or run the script as a tenant.\n\nThe forked repo prefix is sanitized to replace non-alpha-numeric or dash characters with an underscore.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3fcfc3ff-ffbe-4d9f-a078-bf4394d2cf3b",
+      "Name": "ForkGithubRepo.Git.Url.Organization",
+      "Label": "GitHub Organization",
+      "HelpText": "This is the GitHub Organization or username that the source and destination repos are found in. It is the field `organization` in the URL `https://github.com/organization`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3972a9b5-ff11-4336-afff-0ed92b7e111c",
+      "Name": "ForkGiteaRepo.Git.Branch.MainLine",
+      "Label": "Mainline Branch",
+      "HelpText": "The name of the branch to fork.",
+      "DefaultValue": "main",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e6c3dc14-af61-4c3f-acc9-75f77cef9a6a",
+      "Name": "ForkGithubRepo.GitHub.Credentials.AccessToken",
+      "Label": "GitHub Access Token",
+      "HelpText": "This is the [access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) used to authenticate with GitHub. Leave this blank and fill in the App ID, Installation ID, and Private Key to use a GitHub for authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b19c2e88-1418-4a4c-8088-048007da5ffb",
+      "Name": "ForkGithubRepo.GitHub.App.Id",
+      "Label": "GitHub App ID",
+      "HelpText": "If a [GitHub App](https://docs.github.com/en/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps) is used for authentication, this is the application ID. Leave this blank and supply the `GitHub Access Token` field to use regular token authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ce37e390-a6df-4782-9166-d7a22c8e6a50",
+      "Name": "ForkGithubRepo.GitHub.App.InstallationId",
+      "Label": "GitHub App Installation ID",
+      "HelpText": "If a [GitHub App](https://docs.github.com/en/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps) is used for authentication, this is the installation ID. Leave this blank and supply the  `GitHub Access Token` field to use regular token authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1b7ad3bb-f12c-40e2-b062-8fdbfc1259e6",
+      "Name": "ForkGithubRepo.GitHub.App.PrivateKey",
+      "Label": "GitHub App Private Key",
+      "HelpText": "If a [GitHub App](https://docs.github.com/en/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps) is used for authentication, this is the private key. Leave this blank and supply the  `GitHub Access Token` field to use regular token authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-18T21:46:58.2120000Z",
+    "OctopusVersion": "2023.4.2775",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "github"
+}
diff --git a/src/step-templates/github-fork-repo/scriptbody.py b/src/step-templates/github-fork-repo/scriptbody.py
new file mode 100644
index 000000000..4d9b6a353
--- /dev/null
+++ b/src/step-templates/github-fork-repo/scriptbody.py
@@ -0,0 +1,379 @@
+# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid
+# having to use a regular user account.
+import subprocess
+import sys
+
+# Install our own dependencies
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt'])
+
+import json
+import subprocess
+import sys
+import os
+import urllib.request
+import base64
+import re
+import jwt
+import time
+import argparse
+import platform
+from urllib.request import urlretrieve
+
+# If this script is not being run as part of an Octopus step, setting variables is a noop
+if 'set_octopusvariable' not in globals():
+    def set_octopusvariable(variable, value):
+        pass
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if 'printverbose' not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    output_no_ansi = re.sub('\x1b\[[0-9;]*m', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False):
+    """
+        The execute method provides the ability to execute external processes while capturing and returning the
+        output to std err and std out and exit code.
+    """
+    process = subprocess.Popen(args,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               text=True,
+                               cwd=cwd,
+                               env=env)
+    stdout, stderr = process.communicate()
+    retcode = process.returncode
+
+    if not retcode == 0 and raise_on_non_zero:
+        raise Exception('command returned exit code ' + retcode)
+
+    if print_args is not None:
+        print_output(' '.join(args))
+
+    if print_output is not None:
+        print_output(stdout)
+        print_output(stderr)
+
+    return stdout, stderr, retcode
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION] [FILE]...',
+        description='Fork a GitHub repo'
+    )
+    parser.add_argument('--new-repo-name', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(
+                            'Exported.Project.Name'))
+    parser.add_argument('--new-repo-name-prefix', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(
+                            'Git.Url.NewRepoNamePrefix'))
+    parser.add_argument('--template-repo-name', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.OriginalRepoName') or
+                                re.sub('[^a-zA-Z0-9-]', '_', get_octopusvariable_quiet('Octopus.Project.Name')))
+    parser.add_argument('--tenant-name', action='store',
+                        default=get_octopusvariable_quiet('Octopus.Deployment.Tenant.Name'))
+    parser.add_argument('--git-organization', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet('Git.Url.Organization'))
+    parser.add_argument('--mainline-branch',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGiteaRepo.Git.Branch.MainLine') or get_octopusvariable_quiet('Git.Branch.MainLine'),
+                        help='The branch name to use for the fork. Defaults to "main".')
+    parser.add_argument('--github-app-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))
+    parser.add_argument('--github-app-installation-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(
+                            'GitHub.App.InstallationId'))
+    parser.add_argument('--github-app-private-key', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(
+                            'GitHub.App.PrivateKey'))
+    parser.add_argument('--github-access-token', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.GitHub.Credentials.AccessToken') or get_octopusvariable_quiet(
+                            'GitHub.Credentials.AccessToken'),
+                        help='The GitHub access token. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')
+
+    return parser.parse_known_args()
+
+
+def generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):
+    # Generate the tokens used by git and the GitHub API
+    app_id = github_app_id
+    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))
+
+    payload = {
+        # Issued at time
+        'iat': int(time.time()),
+        # JWT expiration time (10 minutes maximum)
+        'exp': int(time.time()) + 600,
+        # GitHub App's identifier
+        'iss': app_id
+    }
+
+    # Create JWT
+    jwt_instance = jwt.JWT()
+    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')
+
+    # Create access token
+    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'
+    headers = {
+        'Authorization': 'Bearer ' + encoded_jwt,
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28'
+    }
+    request = urllib.request.Request(url, headers=headers, method='POST')
+    response = urllib.request.urlopen(request)
+    response_json = json.loads(response.read().decode())
+    return response_json['token']
+
+
+def generate_auth_header(token):
+    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))
+    return 'Basic ' + auth.decode('ascii')
+
+
+def verify_template_repo(token, cac_org, template_repo):
+    # Attempt to view the template repo
+    url = 'https://api.github.com/repos/' + cac_org + '/' + template_repo
+    try:
+        headers = {
+            'Accept': 'application/vnd.github+json',
+            'Authorization': 'Bearer ' + token,
+            'X-GitHub-Api-Version': '2022-11-28'
+        }
+        request = urllib.request.Request(url, headers=headers)
+        urllib.request.urlopen(request)
+    except:
+        print('Could not find the template repo at ' + url)
+        print('Check that the repo exists, and that the authentication credentials are correct')
+        sys.exit(1)
+
+
+def verify_new_repo(token, cac_org, new_repo):
+    # Attempt to view the new repo
+    try:
+        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo
+        headers = {
+            'Accept': 'application/vnd.github+json',
+            'Authorization': 'Bearer ' + token,
+            'X-GitHub-Api-Version': '2022-11-28'
+        }
+        request = urllib.request.Request(url, headers=headers)
+        urllib.request.urlopen(request)
+        return True
+    except:
+        return False
+
+
+def create_new_repo(token, cac_org, new_repo):
+    # If we could not view the repo, assume it needs to be created.
+    # https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#create-an-organization-repository
+    # Note you have to use the token rather than the JWT:
+    # https://stackoverflow.com/questions/39600396/bad-credentails-for-jwt-for-github-integrations-api
+
+    headers = {
+        'Authorization': 'token ' + token,
+        'Content-Type': 'application/json',
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28',
+    }
+
+    try:
+        # First try to create an organization repo:
+        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos#create-an-organization-repository
+        url = 'https://api.github.com/orgs/' + cac_org + '/repos'
+        body = {'name': new_repo}
+        request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))
+        urllib.request.urlopen(request)
+    except urllib.error.URLError as ex:
+        # Then fall back to creating a repo for the user:
+        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos?apiVersion=2022-11-28#create-a-repository-for-the-authenticated-user
+        if ex.code == 404:
+            url = 'https://api.github.com/user/repos'
+            body = {'name': new_repo}
+            request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))
+            urllib.request.urlopen(request)
+        else:
+            raise ex
+
+
+def fork_repo(git_executable, token, cac_org, new_repo, template_repo):
+    # Clone the repo and add the upstream repo
+    _, _, retcode = execute([git_executable, 'clone', 'https://' + 'x-access-token:' + token + '@'
+                             + 'github.com/' + cac_org + '/' + new_repo + '.git'])
+
+    if not retcode == 0:
+        print('Failed to clone repo ' + 'https://github.com/' + cac_org + '/' + new_repo + '.git.' +
+              ' Check the verbose logs for details.')
+        sys.exit(1)
+
+    _, _, retcode = execute(
+        [git_executable, 'remote', 'add', 'upstream', 'https://' + 'x-access-token:' + token + '@'
+         + 'github.com/' + cac_org + '/' + template_repo + '.git'],
+        cwd=new_repo)
+
+    if not retcode == 0:
+        print('Failed to add remote ' + 'https://github.com/' + cac_org + '/' + template_repo + '.git. ' +
+              'Check the verbose logs for details.')
+        sys.exit(1)
+
+    _, _, retcode = execute([git_executable, 'fetch', '--all'], cwd=new_repo)
+
+    if not retcode == 0:
+        print('Failed to fetch. Check the verbose logs for details.')
+        sys.exit(1)
+
+    _, _, retcode = execute(['git', 'checkout', '-b', 'upstream-' + branch, 'upstream/' + branch], cwd=new_repo)
+
+    if not retcode == 0:
+        print('Failed to checkout branch ' + branch + '. Check the verbose logs for details.')
+        sys.exit(1)
+
+    if branch != 'master' and branch != 'main':
+        _, _, retcode = execute(['git', 'checkout', '-b', branch, 'origin/' + branch], cwd=new_repo)
+    else:
+        _, _, retcode = execute(['git', 'checkout', branch], cwd=new_repo)
+
+    if not retcode == 0:
+        print('Failed to checkout branch ' + branch + '. Check the verbose logs for details.')
+        sys.exit(1)
+
+    # Hard reset it to the template main branch.
+    _, _, retcode = execute([git_executable, 'reset', '--hard', 'upstream/' + branch], cwd=new_repo)
+
+    if not retcode == 0:
+        print(
+            'Failed to perform a hard reset against branch upstream/' + branch + '.'
+            + ' Check the verbose logs for details.')
+        sys.exit(1)
+
+    # Push the changes.
+    _, _, retcode = execute([git_executable, 'push', 'origin', branch], cwd=new_repo)
+
+    if not retcode == 0:
+        print('Failed to push changes. Check the verbose logs for details.')
+        sys.exit(1)
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def ensure_git_exists():
+    if is_windows():
+        print("Checking git is installed")
+        try:
+            stdout, _, exit_code = execute(['git', 'version'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "git not found"
+        except:
+            print("Downloading git")
+            urlretrieve('https://www.7-zip.org/a/7zr.exe', '7zr.exe')
+            urlretrieve(
+                'https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe',
+                'PortableGit.7z.exe')
+            print("Installing git")
+            print("Consider installing git on the worker or using a standard worker-tools image")
+            execute(['7zr.exe', 'x', 'PortableGit.7z.exe', '-o' + os.getcwd() + '\\git', '-y'])
+            return os.getcwd() + '\\git\\bin\\git'
+
+    return 'git'
+
+
+git_executable = ensure_git_exists()
+parser, _ = init_argparse()
+
+if not parser.github_access_token.strip() and not (
+        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):
+    print("You must supply the GitHub token, or the GitHub App ID and private key and installation ID")
+    sys.exit(1)
+
+if not parser.template_repo_name.strip():
+    print("You must supply the upstream (or template) repo")
+    sys.exit(1)
+
+if not parser.tenant_name.strip() and not parser.new_repo_name_prefix.strip():
+    print("You must define the new repo prefix or run this script against a tenant")
+    sys.exit(1)
+
+# The access token is generated from a github app or supplied directly as an access token
+token = generate_github_token(parser.github_app_id, parser.github_app_private_key,
+                              parser.github_app_installation_id) if len(
+    parser.github_access_token.strip()) == 0 else parser.github_access_token.strip()
+
+# The process followed here is:
+# 1. Verify the manually supplied upstream repo exists
+# 2. Build the name of the new downstream repo with a prefix and the new project name.
+#    a. The prefix is either specified or assumed to be the name of a tenant
+#    b. The new project name is either specified or assumed to be the same as the upstream project name
+# 3. Create a new downstream repo if it doesn't exist
+# 4. Fork the upstream repo into the downstream repo with a hard git reset
+
+cac_org = parser.git_organization.strip()
+template_repo = parser.template_repo_name.strip()
+new_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())
+tenant_name_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.tenant_name.strip())
+project_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_',
+                                parser.new_repo_name.strip() if parser.new_repo_name.strip() else template_repo)
+
+# The new repo is prefixed either with the custom prefix or the tenant name if no custom prefix is defined
+new_repo_prefix = new_repo_custom_prefix if len(new_repo_custom_prefix) != 0 else tenant_name_sanitized
+
+# The new repo name is the prefix + the name of thew new project
+new_repo = new_repo_prefix + '_' + project_repo_sanitized if len(new_repo_prefix) != 0 else project_repo_sanitized
+
+# Assume the main branch if nothing else was specified
+branch = parser.mainline_branch or 'main'
+
+# This is the value of the forked git repo
+set_octopusvariable('NewRepo', 'https://github.com/' + cac_org + '/' + new_repo)
+
+verify_template_repo(token, cac_org, template_repo)
+
+if not verify_new_repo(token, cac_org, new_repo):
+    create_new_repo(token, cac_org, new_repo)
+    fork_repo(git_executable, token, cac_org, new_repo, template_repo)
+    print(
+        'Repo was forked from ' + 'https://github.com/' + cac_org + '/' + template_repo + ' to '
+        + 'https://github.com/' + cac_org + '/' + new_repo)
+else:
+    print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')
+
+print('New repo URL is defined in the output variable "NewRepo": #{Octopus.Action[' +
+      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')
diff --git a/src/step-templates/github-push-yeoman-to-repo/metadata.json b/src/step-templates/github-push-yeoman-to-repo/metadata.json
new file mode 100644
index 000000000..49252eea4
--- /dev/null
+++ b/src/step-templates/github-push-yeoman-to-repo/metadata.json
@@ -0,0 +1,118 @@
+{
+  "Id": "14ffc4b7-1cab-4f81-a835-7da41fa47123",
+  "Name": "GitHub - Push Yeoman Generator",
+  "Description": "Clones a GitHub repo, runs Yeoman in the cloned directory, and pushes the changes. Note that the Yeoman generators can only use arguments or options, as prompts can not be provided.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "6bd0fbd2-442e-4ae9-9192-b93a041cfdd1",
+      "Name": "YeomanGenerator",
+      "AcquisitionLocation": "Server",
+      "FeedId": null,
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "PopulateGithubRepo.Yeoman.Generator.Package",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "334f5b32-01a8-4687-af33-54906e53cdee",
+      "Name": "PopulateGithubRepo.Yeoman.Generator.Package",
+      "Label": "Yeoman Generator Package",
+      "HelpText": "The package containing the Yeoman package. Yeoman packages are usually distributed by npm, but they can also be packaged as zip files and pushed to the built-in feed or any other feed that supports zip files.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "d1c9bf99-5f1f-417b-a482-a72878065871",
+      "Name": "PopulateGithubRepo.Yeoman.Generator.Name",
+      "Label": "Yeoman Generator Name",
+      "HelpText": "The name of the Yeoman generator.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2c1dd445-c1d4-4e44-91a0-b7f02682711b",
+      "Name": "PopulateGithubRepo.Yeoman.Generator.SubGenerator",
+      "Label": "Yeoman Subgenerator Name",
+      "HelpText": "The optional name of the Yeoman subgenerator. Leave blank to use the default generator.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bac9200a-2fce-4390-9b07-40e2a14c2e44",
+      "Name": "PopulateGithubRepo.Yeoman.Generator.Arguments",
+      "Label": "Yeoman Arguments",
+      "HelpText": "The optional arguments pass to Yeoman to define options and arguments.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f5c1092a-70d8-40ba-84e9-feedf5911946",
+      "Name": "PopulateGithubRepo.Git.Url.Repo",
+      "Label": "GitHub Repo Name",
+      "HelpText": "The GitHub repo name i.e. `myrepo` in the URL`https://github.com/owner/myrepo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ece2ee80-9572-4ca1-ab0a-65ffaec2edb7",
+      "Name": "PopulateGithubRepo.Git.Url.Organization",
+      "Label": "Github Owner",
+      "HelpText": "The GitHub repo owner or organization i.e. `owner` in the URL `https://github.com/owner/myrepo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4795ec27-f38b-4f2f-8417-97c3cd74d2db",
+      "Name": "PopulateGithubRepo.Git.Credentials.Password",
+      "Label": "GitHub Access Token",
+      "HelpText": "The GitHub access token",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "300596fd-59b1-420e-b58f-305b7c83b54d",
+      "Name": "PopulateGithubRepo.Git.Credentials.Username",
+      "Label": "GitHub Username",
+      "HelpText": "This will appear in the commit logs. Leave blank to use the default username.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-10-16T23:49:40.0310000Z",
+    "OctopusVersion": "2023.4.6093",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "github"
+}
diff --git a/src/step-templates/github-push-yeoman-to-repo/scriptbody.py b/src/step-templates/github-push-yeoman-to-repo/scriptbody.py
new file mode 100644
index 000000000..de50d8516
--- /dev/null
+++ b/src/step-templates/github-push-yeoman-to-repo/scriptbody.py
@@ -0,0 +1,512 @@
+# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid
+# having to use a regular user account.
+import subprocess
+import sys
+
+# Install our own dependencies
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'requests', '--disable-pip-version-check'])
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'anyascii', '--disable-pip-version-check'])
+
+import requests
+import json
+import subprocess
+import sys
+import os
+import urllib.request
+import base64
+import re
+import jwt
+import time
+import argparse
+import platform
+import zipfile
+import lzma
+import tarfile
+import shutil
+import urllib3
+from shlex import split
+from anyascii import anyascii
+
+# Disable insecure http request warnings
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+# If this script is not being run as part of an Octopus step, setting variables is a noop
+if 'set_octopusvariable' not in globals():
+    def set_octopusvariable(variable, value):
+        pass
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if 'printverbose' not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    output_no_ansi = re.sub(r'\x1b\[[0-9;]*m', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except Exception as inst:
+        return ''
+
+
+def execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,
+            append_to_path=None):
+    """
+        The execute method provides the ability to execute external processes while capturing and returning the
+        output to std err and std out and exit code.
+    """
+
+    my_env = os.environ.copy() if env is None else env
+
+    if append_to_path is not None:
+        my_env["PATH"] = append_to_path + os.pathsep + my_env['PATH']
+
+    process = subprocess.Popen(args,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               stdin=open(os.devnull),
+                               text=True,
+                               cwd=cwd,
+                               env=my_env)
+    stdout, stderr = process.communicate()
+    retcode = process.returncode
+
+    if not retcode == 0 and raise_on_non_zero:
+        raise Exception('command returned exit code ' + retcode)
+
+    if print_args is not None:
+        print_output(' '.join(args))
+
+    if print_output is not None:
+        print_output(stdout)
+        print_output(stderr)
+
+    return stdout, stderr, retcode
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION]',
+        description='Fork a GitHub repo'
+    )
+    parser.add_argument('--generator', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Yeoman.Generator.Name') or get_octopusvariable_quiet(
+                            'Yeoman.Generator.Name'))
+    parser.add_argument('--sub-generator', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Yeoman.Generator.SubGenerator') or get_octopusvariable_quiet(
+                            'Yeoman.Generator.SubGenerator'))
+    parser.add_argument('--generator-arguments', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Yeoman.Generator.Arguments') or get_octopusvariable_quiet(
+                            'Yeoman.Generator.Arguments'),
+                        help='The arguments to pas to yo. Pass all arguments as a single string. This string is then parsed as if it were yo arguments.')
+    parser.add_argument('--repo', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Git.Url.Repo') or get_octopusvariable_quiet(
+                            'Git.Url.Repo'))
+    parser.add_argument('--git-organization', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(
+                            'Git.Url.Organization'))
+    parser.add_argument('--github-app-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))
+    parser.add_argument('--github-app-installation-id', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(
+                            'GitHub.App.InstallationId'))
+    parser.add_argument('--github-app-private-key', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(
+                            'GitHub.App.PrivateKey'))
+    parser.add_argument('--git-password', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Git.Credentials.Password') or get_octopusvariable_quiet(
+                            'Git.Credentials.Password'),
+                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')
+    parser.add_argument('--git-username', action='store',
+                        default=get_octopusvariable_quiet(
+                            'PopulateGithubRepo.Git.Credentials.Username') or get_octopusvariable_quiet(
+                            'Git.Credentials.Username'),
+                        help='The git username. This will be used for both the git authentication and the username associated with any commits.')
+
+    return parser.parse_known_args()
+
+
+def generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):
+    # Generate the tokens used by git and the GitHub API
+    app_id = github_app_id
+    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))
+
+    payload = {
+        # Issued at time
+        'iat': int(time.time()),
+        # JWT expiration time (10 minutes maximum)
+        'exp': int(time.time()) + 600,
+        # GitHub App's identifier
+        'iss': app_id
+    }
+
+    # Create JWT
+    jwt_instance = jwt.JWT()
+    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')
+
+    # Create access token
+    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'
+    headers = {
+        'Authorization': 'Bearer ' + encoded_jwt,
+        'Accept': 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28'
+    }
+    request = urllib.request.Request(url, headers=headers, method='POST')
+    response = urllib.request.urlopen(request)
+    response_json = json.loads(response.read().decode())
+    return response_json['token']
+
+
+def generate_auth_header(token):
+    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))
+    return 'Basic ' + auth.decode('ascii')
+
+
+def verify_new_repo(token, cac_org, new_repo):
+    # Attempt to view the new repo
+    try:
+        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo
+        headers = {
+            'Accept': 'application/vnd.github+json',
+            'Authorization': 'Bearer ' + token,
+            'X-GitHub-Api-Version': '2022-11-28'
+        }
+        request = urllib.request.Request(url, headers=headers)
+        urllib.request.urlopen(request)
+        return True
+    except Exception as inst:
+        return False
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def download_file(url, filename, verify_ssl=True):
+    r = requests.get(url, verify=verify_ssl)
+    with open(filename, 'wb') as file:
+        file.write(r.content)
+
+
+def ensure_git_exists():
+    if is_windows():
+        print("Checking git is installed")
+        try:
+            stdout, _, exit_code = execute(['git', 'version'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "git not found"
+        except:
+            print("Downloading git")
+            download_file('https://www.7-zip.org/a/7zr.exe', '7zr.exe')
+            download_file(
+                'https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe',
+                'PortableGit.7z.exe')
+            print("Installing git")
+            print("Consider installing git on the worker or using a standard worker-tools image")
+            execute(['7zr.exe', 'x', 'PortableGit.7z.exe', '-o' + os.path.join(os.getcwd(), 'git'), '-y'])
+            return os.path.join(os.getcwd(), 'git', 'bin', 'git')
+
+    return 'git'
+
+
+def install_npm_linux():
+    print("Downloading node")
+    download_file(
+        'https://nodejs.org/dist/v18.18.2/node-v18.18.2-linux-x64.tar.xz',
+        'node.tar.xz')
+    print("Installing node on Linux")
+    with lzma.open("node.tar.xz", "r") as lzma_ref:
+        with open("node.tar", "wb") as fdst:
+            shutil.copyfileobj(lzma_ref, fdst)
+    with tarfile.open("node.tar", "r") as tar_ref:
+        tar_ref.extractall(os.getcwd())
+
+    try:
+        _, _, exit_code = execute([os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', '--version'],
+                                  append_to_path=os.getcwd() + '/node-v18.18.2-linux-x64/bin')
+        if not exit_code == 0:
+            raise Exception("Failed to run npm")
+    except Exception as ex:
+        print('Failed to install npm ' + str(ex))
+        sys.exit(1)
+    return os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', os.getcwd() + '/node-v18.18.2-linux-x64/bin'
+
+
+def install_npm_windows():
+    print("Downloading node")
+    download_file('https://nodejs.org/dist/v18.18.2/node-v18.18.2-win-x64.zip', 'node.zip', False)
+    print("Installing node on Windows")
+    with zipfile.ZipFile("node.zip", "r") as zip_ref:
+        zip_ref.extractall(os.getcwd())
+    try:
+        _, _, exit_code = execute([os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'), '--version'],
+                                  append_to_path=os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))
+        if not exit_code == 0:
+            raise Exception("Failed to run npm")
+    except Exception as ex:
+        print('Failed to install npm ' + str(ex))
+        sys.exit(1)
+
+    return (os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'),
+            os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))
+
+
+def ensure_node_exists():
+    try:
+        print("Checking node is installed")
+        _, _, exit_code = execute(['npm', '--version'])
+        if not exit_code == 0:
+            raise Exception("npm not found")
+    except:
+        if is_windows():
+            return install_npm_windows()
+        else:
+            return install_npm_linux()
+
+    return 'npm', None
+
+
+def ensure_yo_exists(npm_executable, npm_path):
+    try:
+        print("Checking Yeoman is installed")
+        _, _, exit_code = execute(['yo', '--version'])
+        if not exit_code == 0:
+            raise Exception("yo not found")
+    except:
+        print('Installing Yeoman')
+
+        _, _, retcode = execute([npm_executable, 'install', '-g', 'yo'], append_to_path=npm_path)
+
+        if not retcode == 0:
+            print("Failed to set install Yeoman. Check the verbose logs for details.")
+            sys.exit(1)
+
+        npm_bin, _, retcode = execute([npm_executable, 'config', 'get', 'prefix'], append_to_path=npm_path)
+
+        if not retcode == 0:
+            print("Failed to set get the npm prefix directory. Check the verbose logs for details.")
+            sys.exit(1)
+
+        try:
+            if is_windows():
+                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'yo.cmd'), '--version'],
+                                          append_to_path=npm_path)
+            else:
+                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'bin', 'yo'), '--version'],
+                                          append_to_path=npm_path)
+
+            if not exit_code == 0:
+                raise Exception("Failed to run yo")
+        except Exception as ex:
+            print('Failed to install yo ' + str(ex))
+            sys.exit(1)
+
+        # Windows and Linux save NPM binaries in different directories
+        if is_windows():
+            return os.path.join(npm_bin.strip(), 'yo.cmd')
+
+        return os.path.join(npm_bin.strip(), 'bin', 'yo')
+
+    return 'yo'
+
+
+git_executable = ensure_git_exists()
+npm_executable, npm_path = ensure_node_exists()
+yo_executable = ensure_yo_exists(npm_executable, npm_path)
+parser, _ = init_argparse()
+
+if not parser.git_password.strip() and not (
+        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):
+    print("You must supply the GitHub token, or the GitHub App ID and private key and installation ID")
+    sys.exit(1)
+
+if not parser.git_organization.strip():
+    print("You must define the organization")
+    sys.exit(1)
+
+if not parser.repo.strip():
+    print("You must define the repo name")
+    sys.exit(1)
+
+if not parser.generator.strip():
+    print("You must define the Yeoman generator")
+    sys.exit(1)
+
+# Create a dir for the git clone
+if os.path.exists('downstream'):
+    shutil.rmtree('downstream')
+
+os.mkdir('downstream')
+
+# Create a dir for yeoman to use
+if os.path.exists('downstream-yeoman'):
+    shutil.rmtree('downstream-yeoman')
+
+os.mkdir('downstream-yeoman')
+# Yeoman will use a less privileged user to write to this directory, so grant full access
+if not is_windows():
+    os.chmod('downstream-yeoman', 0o777)
+
+downstream_dir = os.path.join(os.getcwd(), 'downstream')
+downstream_yeoman_dir = os.path.join(os.getcwd(), 'downstream-yeoman')
+
+# The access token is generated from a github app or supplied directly as an access token
+token = generate_github_token(parser.github_app_id, parser.github_app_private_key,
+                              parser.github_app_installation_id) if len(
+    parser.git_password.strip()) == 0 else parser.git_password.strip()
+
+if not verify_new_repo(token, parser.git_organization, parser.repo):
+    print('Repo at https://github.com/' + parser.git_organization + '/' + parser.repo + ' could not be accessed')
+    sys.exit(1)
+
+# We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close
+if is_windows():
+    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.helper', 'manager'])
+
+    if not retcode == 0:
+        print("Failed to set the credential.helper setting. Check the verbose logs for details.")
+        sys.exit(1)
+
+    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.modalprompt', 'false'])
+
+    if not retcode == 0:
+        print("Failed to srt the credential.modalprompt setting. Check the verbose logs for details.")
+        sys.exit(1)
+
+    # We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close
+    _, _, retcode = execute(
+        [git_executable, 'config', '--system', 'credential.microsoft.visualstudio.com.interactive', 'never'])
+
+    if not retcode == 0:
+        print(
+            "Failed to set the credential.microsoft.visualstudio.com.interactive setting. Check the verbose logs for details.")
+        sys.exit(1)
+
+_, _, retcode = execute([git_executable, 'config', '--global', 'user.email', 'octopus@octopus.com'])
+
+if not retcode == 0:
+    print("Failed to set the user.email setting. Check the verbose logs for details.")
+    sys.exit(1)
+
+_, _, retcode = execute([git_executable, 'config', '--global', 'core.autocrlf', 'input'])
+
+if not retcode == 0:
+    print("Failed to set the core.autocrlf setting. Check the verbose logs for details.")
+    sys.exit(1)
+
+username = parser.git_username if len(parser.git_username) != 0 else 'Octopus'
+_, _, retcode = execute([git_executable, 'config', '--global', 'user.name', username])
+
+if not retcode == 0:
+    print("Failed to set the git username. Check the verbose logs for details.")
+    sys.exit(1)
+
+_, _, retcode = execute([git_executable, 'config', '--global', 'credential.helper', 'cache'])
+
+if not retcode == 0:
+    print("Failed to set the git credential helper. Check the verbose logs for details.")
+    sys.exit(1)
+
+print('Cloning repo')
+
+_, _, retcode = execute(
+    [git_executable, 'clone',
+     'https://' + username + ':' + token + '@github.com/' + parser.git_organization + '/' + parser.repo + '.git',
+     'downstream'])
+
+if not retcode == 0:
+    print("Failed to clone the git repo. Check the verbose logs for details.")
+    sys.exit(1)
+
+print('Configuring Yeoman Generator')
+
+_, _, retcode = execute([npm_executable, 'install'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)
+
+if not retcode == 0:
+    print("Failed to install the generator dependencies. Check the verbose logs for details.")
+    sys.exit(1)
+
+_, _, retcode = execute([npm_executable, 'link'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)
+
+if not retcode == 0:
+    print("Failed to link the npm module. Check the verbose logs for details.")
+    sys.exit(1)
+
+print('Running Yeoman Generator')
+
+# Treat the string of yo arguments as a raw input and parse it again. The resulting list of unknown arguments
+# is then passed to yo. We have to convert the incoming values from utf to ascii when parsing a second time.
+yo_args = split(anyascii(parser.generator_arguments))
+
+generator_name = parser.generator + ':' + parser.sub_generator if len(parser.sub_generator) != 0 else parser.generator
+
+yo_arguments = [yo_executable, generator_name, '--force', '--skip-install']
+
+# Yeoman has issues running as root, which it will often do in a container.
+# So we run Yeoman in its own directory, and then copy the changes to the git directory.
+_, _, retcode = execute(yo_arguments + yo_args, cwd=downstream_yeoman_dir, append_to_path=npm_path)
+
+if not retcode == 0:
+    print("Failed to run Yeoman. Check the verbose logs for details.")
+    sys.exit(1)
+
+shutil.copytree(downstream_yeoman_dir, downstream_dir, dirs_exist_ok=True)
+
+print('Adding changes to git')
+
+_, _, retcode = execute([git_executable, 'add', '.'], cwd=downstream_dir)
+
+if not retcode == 0:
+    print("Failed to add the git changes. Check the verbose logs for details.")
+    sys.exit(1)
+
+# Check for pending changes
+_, _, retcode = execute([git_executable, 'diff-index', '--quiet', 'HEAD'], cwd=downstream_dir)
+
+if not retcode == 0:
+    print('Committing changes to git')
+    _, _, retcode = execute([git_executable, 'commit', '-m',
+                             'Added files from Yeoman generator ' + parser.generator + ':' + parser.sub_generator],
+                            cwd=downstream_dir)
+
+    if not retcode == 0:
+        print("Failed to set commit the git changes. Check the verbose logs for details.")
+        sys.exit(1)
+
+    print('Pushing changes to git')
+
+    _, _, retcode = execute([git_executable, 'push', 'origin', 'main'], cwd=downstream_dir)
+
+    if not retcode == 0:
+        print("Failed to push the git changes. Check the verbose logs for details.")
+        sys.exit(1)
diff --git a/src/step-templates/github-verify-attestation/metadata.json b/src/step-templates/github-verify-attestation/metadata.json
new file mode 100644
index 000000000..fb53df7f8
--- /dev/null
+++ b/src/step-templates/github-verify-attestation/metadata.json
@@ -0,0 +1,111 @@
+{
+  "Id": "3c76dffc-b524-438f-b04d-f1a103bdbfc7",
+  "Name": "Verify GitHub Attestation",
+  "Description": "This step calls the GitHub cli to verify an attestation. It currently supports non-container packages. OCI container images will be added in the future.\n\nMore info on [Artifact Attestations](https://github.blog/changelog/2024-06-25-artifact-attestations-is-generally-available/).\n\nGitHub cli docs for [gh attestation verify](https://cli.github.com/manual/gh_attestation_verify).\n\nThe step will capture the json output from the GitHub cli and store it as an [output variable](https://octopus.com/docs/projects/variables/output-variables) named `Json`.\n\nThe json can also be captured as an [artifact](https://octopus.com/docs/projects/deployment-process/artifacts) on the deployment by checking the `Create Artifact?` parameter on the step.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "bc290bbb-cc08-4046-b72b-7ef18b2076fd",
+      "Name": "VerifyAttestation.Package",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "False",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "VerifyAttestation.Package",
+        "Purpose": ""
+      }
+    }
+  ],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
+    "OctopusUseBundledTooling": "False"
+  },
+  "Parameters": [
+    {
+      "Id": "fd8cdcff-09af-41b0-a814-464c52308f48",
+      "Name": "VerifyAttestation.Token",
+      "Label": "GitHub Access Token",
+      "HelpText": "The access token used to authenticate with GitHub. See the [GitHub documentation](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) for more details.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "406de5a6-8a71-4a7a-91cf-dc0aee73d89b",
+      "Name": "VerifyAttestation.Package",
+      "Label": "Package to verify",
+      "HelpText": "The package to verify using `gh attestation verify`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "e7b6ab3a-3522-4b97-b601-d9e51ef5dea9",
+      "Name": "VerifyAttestation.Owner",
+      "Label": "Owner",
+      "HelpText": "The `--owner` flag value must match the name of the GitHub organization that the artifact's linked repository belongs to.\n\nDo not provide both `Owner` and `Repo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0bdc7d4d-778a-498f-a950-3f2ce4e23b5d",
+      "Name": "VerifyAttestation.Repo",
+      "Label": "Repo",
+      "HelpText": "The `--repo` flag value must match the name of the GitHub repository that the artifact is linked with.\n\nDo not provide both `Owner` and `Repo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f282b9eb-a6b4-4d79-9fc0-2f985e94b1ec",
+      "Name": "VerifyAttestation.Flags",
+      "Label": "Flags",
+      "HelpText": "See [gh attestation verify](https://cli.github.com/manual/gh_attestation_verify) for available flags.\n\nDo not provide the `--format` flag as it is set to `json` by the step.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "06e3e2ad-f2e0-4ecb-b856-e709d552f3e9",
+      "Name": "VerifyAttestation.PrintCommand",
+      "Label": "Print Command?",
+      "HelpText": "Prints the command in the logs using set -x. This will cause a warning when the step runs.\n",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "eb4f5f79-7d44-4511-a8a8-1dc68f2c450d",
+      "Name": "VerifyAttestation.CreateArtifact",
+      "Label": "Create Artifact?",
+      "HelpText": "Check to save the attestation result json as an Octopus artifact on the deployment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-08-29T19:36:57.5490000Z",
+    "OctopusVersion": "2024.3.11587",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "github"
+}
diff --git a/src/step-templates/github-verify-attestation/scriptbody.sh b/src/step-templates/github-verify-attestation/scriptbody.sh
new file mode 100644
index 000000000..34d4190b0
--- /dev/null
+++ b/src/step-templates/github-verify-attestation/scriptbody.sh
@@ -0,0 +1,49 @@
+token=$(get_octopusvariable "VerifyAttestation.Token")
+package=$(get_octopusvariable "Octopus.Action.Package[VerifyAttestation.Package].PackageFilePath")
+owner=$(get_octopusvariable "VerifyAttestation.Owner")
+repo=$(get_octopusvariable "VerifyAttestation.Repo")
+flags=$(get_octopusvariable "VerifyAttestation.Flags")
+printCommand=$(get_octopusvariable "VerifyAttestation.PrintCommand")
+createArtifact=$(get_octopusvariable "VerifyAttestation.CreateArtifact")
+deploymentId="#{Octopus.Deployment.Id | ToLower}"
+stepName=$(get_octopusvariable "Octopus.Step.Name")
+
+echoerror() { echo "$@" 1>&2; }
+
+export GITHUB_TOKEN=$token
+
+if ! command -v gh &> /dev/null
+then
+    echoerror "gh could not be found, please ensure that it is installed on your worker or in the execution container image"
+    exit 1
+fi
+
+if [ "$token" = "" ] ; then
+    fail_step "'GitHub Access Token' is a required parameter for this step."
+fi
+
+if [ "$owner" = "" ] &&  [ "$repo" = "" ]; then
+    fail_step "Either 'Owner' or 'Repo' must be provided to this step."
+fi
+
+
+gh_cmd="gh attestation verify $package ${owner:+ -o $owner} ${repo:+ -R $owner} --format json ${flags:+ $flags}"
+
+if [ "$printCommand" = "True" ] ; then
+  echo $gh_cmd
+fi
+
+json=$($gh_cmd)
+
+if [ $? = 0 ]
+then
+  set_octopusvariable "Json" $json
+  echo "Created output variable: ##{Octopus.Action[$stepName].Output.Json}"
+
+  if [ "$createArtifact" = "True" ] ; then
+    echo $json > "$PWD/attestation-$deploymentId.json"
+    new_octopusartifact "$PWD/attestation-$deploymentId.json"
+  fi
+else
+  fail_step "Failed to verify attestation for $package"
+fi
\ No newline at end of file
diff --git a/src/step-templates/google-chat-send-message/metadata.json b/src/step-templates/google-chat-send-message/metadata.json
new file mode 100644
index 000000000..29035e8c7
--- /dev/null
+++ b/src/step-templates/google-chat-send-message/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "6c4c6253-45de-404f-b725-c96e1d7e4958",
+  "Name": "Google Chat - Send message",
+  "Description": "Send a message to a [Google Chat](https://chat.google.com) space using a configured [chat webhook](https://developers.google.com/workspace/chat/quickstart/webhooks#python_2).\n\nMulti-line message content and [basic formatting](https://developers.google.com/workspace/chat/format-messages) are supported.\n\n**Note:** This script is written in python, and is required for this step to function correctly.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "bb5767eb-bbfb-4379-917e-31f73cf56ad2",
+      "Name": "GoogleChat.SendMessage.WebhookUrl",
+      "Label": "Webhook URL",
+      "HelpText": "Provide the Google Chat [Webhook URL](https://developers.google.com/workspace/chat/quickstart/webhooks)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "cb6577d7-d160-4e3a-86ea-b536bf92133a",
+      "Name": "GoogleChat.SendMessage.MessageContent",
+      "Label": "Message Content",
+      "HelpText": "Provide the message to send. Multi-line values, and [basic formatting](https://developers.google.com/workspace/chat/format-messages) are supported.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-04-03T13:02:57.1920000Z",
+    "OctopusVersion": "2024.2.4001",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "google-chat"
+}
diff --git a/src/step-templates/google-chat-send-message/scriptbody.py b/src/step-templates/google-chat-send-message/scriptbody.py
new file mode 100644
index 000000000..ae3fd3f2f
--- /dev/null
+++ b/src/step-templates/google-chat-send-message/scriptbody.py
@@ -0,0 +1,29 @@
+import subprocess
+import sys
+
+subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'httplib2', '--disable-pip-version-check'])
+
+# parameters
+webhook_url = get_octopusvariable("GoogleChat.SendMessage.WebhookUrl")
+message_content = get_octopusvariable("GoogleChat.SendMessage.MessageContent")
+
+if not webhook_url:
+  raise ValueError('Webhook url null or empty!')
+  
+if not message_content:
+  raise ValueError('Message content null or empty!')
+  
+from json import dumps
+from httplib2 import Http
+
+app_message = {"text": message_content}
+message_headers = {"Content-Type": "application/json; charset=UTF-8"}
+http_obj = Http()
+response = http_obj.request(
+  uri=webhook_url,
+  method="POST",
+  headers=message_headers,
+  body=dumps(app_message),
+)
+printverbose('Google response:')
+printverbose(response)
\ No newline at end of file
diff --git a/step-templates/hydra-update-octopus-tentacle.json b/src/step-templates/hydra-update-octopus-tentacle/metadata.json
similarity index 80%
rename from step-templates/hydra-update-octopus-tentacle.json
rename to src/step-templates/hydra-update-octopus-tentacle/metadata.json
index 4914bf329..82649fdb8 100644
--- a/step-templates/hydra-update-octopus-tentacle.json
+++ b/src/step-templates/hydra-update-octopus-tentacle/metadata.json
@@ -11,7 +11,7 @@
     "Octopus.Action.Package.AutomaticallyUpdateAppSettingsAndConnectionStrings": "False",
     "Octopus.Action.Package.DownloadOnTentacle": "False",
     "Octopus.Action.Package.NuGetPackageId": "OctopusDeploy.Hydra",
-    "Octopus.Action.CustomScripts.PostDeploy.ps1": "if ([System.String]::IsNullOrEmpty($ServerMapping)) {\n    & .\\Hydra.exe --defer\n} else {\n    $cleanServerMapping = $ServerMapping.Replace(\" \",\"\")\n    & .\\Hydra.exe --defer --servers=$cleanServerMapping\n}\n"
+    "Octopus.Action.CustomScripts.PostDeploy.ps1": "__SOURCE_FILE__:postdeploy.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -25,10 +25,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-07-01T05:56:48.370+00:00",
+  "LastModifiedOn": "2015-06-30T22:56:48.3700000-07:00",
   "LastModifiedBy": "Damovisa",
   "$Meta": {
-    "ExportedAt": "2015-07-01T05:57:02.674+00:00",
+    "ExportedAt": "2015-06-30T22:57:02.6740000-07:00",
     "OctopusVersion": "2.6.5.1581",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/hydra-update-octopus-tentacle/postdeploy.ps1 b/src/step-templates/hydra-update-octopus-tentacle/postdeploy.ps1
new file mode 100644
index 000000000..2efced646
--- /dev/null
+++ b/src/step-templates/hydra-update-octopus-tentacle/postdeploy.ps1
@@ -0,0 +1,6 @@
+if ([System.String]::IsNullOrEmpty($ServerMapping)) {
+    & .\Hydra.exe --defer
+} else {
+    $cleanServerMapping = $ServerMapping.Replace(" ","")
+    & .\Hydra.exe --defer --servers=$cleanServerMapping
+}
diff --git a/step-templates/json-validate-format-and-schema.json b/src/step-templates/json-validate-format-and-schema/metadata.json
similarity index 56%
rename from step-templates/json-validate-format-and-schema.json
rename to src/step-templates/json-validate-format-and-schema/metadata.json
index bc3212add..8b6edf39f 100644
--- a/step-templates/json-validate-format-and-schema.json
+++ b/src/step-templates/json-validate-format-and-schema/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Python",
-    "Octopus.Action.Script.ScriptBody": "import json\nfrom jsonschema import validate\n\ndef validateJSON(jsonData):\n    try:\n        #jsonData must be STRING type\n        json.loads(jsonData)\n    except Exception as e:\n        #print(str(e))\n        #print(e.message)\n        return str(e)\n    return None\n\ndef validateSchema(jsonData, jsonSchema):\n    try:\n        validate(instance=json.loads(jsonData), schema=json.loads(jsonSchema))\n    except Exception as e:\n        #print(e.message)\n        #print(str(e))\n        return e.message\n    return None\n\nvSchema = get_octopusvariable(\"vSchema\")\nvJsonData = get_octopusvariable(\"vJsonData\")\n\nvError = validateJSON(vJsonData)\nif vError == None:\n   vRslt = 'Correct!'\n   print('JSON Structure is valid !','\\n')\n\n   if vSchema:\n      vError = validateSchema(vJsonData, vSchema)\n      if vError == None:\n         vRslt = 'Correct!'\n         print('JSON Schema is valid !','\\n')\n      else:\n         vRslt = 'Wrong !'        \n         print('JSON Schema error:', vError, file=sys.stderr)\nelse:\n    vRslt = 'Wrong!'\n    print('JSON structure error:', vError, file=sys.stderr)\n\nprint ('Result:', vRslt)"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
   },
   "Parameters": [
     {
@@ -35,10 +35,10 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2022-06-02T19:54:24.484Z",
+    "ExportedAt": "2022-06-02T19:54:24.4840000Z",
     "OctopusVersion": "2022.1.2121",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "cramoscr",
   "Category": "json"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/json-validate-format-and-schema/scriptbody.py b/src/step-templates/json-validate-format-and-schema/scriptbody.py
new file mode 100644
index 000000000..d0461ebed
--- /dev/null
+++ b/src/step-templates/json-validate-format-and-schema/scriptbody.py
@@ -0,0 +1,43 @@
+import json
+from jsonschema import validate
+
+def validateJSON(jsonData):
+    try:
+        #jsonData must be STRING type
+        json.loads(jsonData)
+    except Exception as e:
+        #print(str(e))
+        #print(e.message)
+        return str(e)
+    return None
+
+def validateSchema(jsonData, jsonSchema):
+    try:
+        validate(instance=json.loads(jsonData), schema=json.loads(jsonSchema))
+    except Exception as e:
+        #print(e.message)
+        #print(str(e))
+        return e.message
+    return None
+
+vSchema = get_octopusvariable("vSchema")
+vJsonData = get_octopusvariable("vJsonData")
+
+vError = validateJSON(vJsonData)
+if vError == None:
+   vRslt = 'Correct!'
+   print('JSON Structure is valid !','\n')
+
+   if vSchema:
+      vError = validateSchema(vJsonData, vSchema)
+      if vError == None:
+         vRslt = 'Correct!'
+         print('JSON Schema is valid !','\n')
+      else:
+         vRslt = 'Wrong !'        
+         print('JSON Schema error:', vError, file=sys.stderr)
+else:
+    vRslt = 'Wrong!'
+    print('JSON structure error:', vError, file=sys.stderr)
+
+print ('Result:', vRslt)
\ No newline at end of file
diff --git a/step-templates/k8s-hpa-external-metrics.json b/src/step-templates/k8s-hpa-external-metrics/metadata.json
similarity index 98%
rename from step-templates/k8s-hpa-external-metrics.json
rename to src/step-templates/k8s-hpa-external-metrics/metadata.json
index 6543cc7be..89d73d998 100644
--- a/step-templates/k8s-hpa-external-metrics.json
+++ b/src/step-templates/k8s-hpa-external-metrics/metadata.json
@@ -114,11 +114,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-07-09T03:38:24.896Z",
+    "ExportedAt": "2020-07-09T03:38:24.8960000Z",
     "OctopusVersion": "2020.3.0-rc0001",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "k8s"
 }
diff --git a/step-templates/k8s-hpa-object-metrics.json b/src/step-templates/k8s-hpa-object-metrics/metadata.json
similarity index 98%
rename from step-templates/k8s-hpa-object-metrics.json
rename to src/step-templates/k8s-hpa-object-metrics/metadata.json
index 3c3b7db8e..98a9cd9de 100644
--- a/step-templates/k8s-hpa-object-metrics.json
+++ b/src/step-templates/k8s-hpa-object-metrics/metadata.json
@@ -154,11 +154,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-07-09T03:41:50.692Z",
+    "ExportedAt": "2020-07-09T03:41:50.6920000Z",
     "OctopusVersion": "2020.3.0-rc0001",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "k8s"
 }
diff --git a/step-templates/k8s-hpa-pod-metrics.json b/src/step-templates/k8s-hpa-pod-metrics/metadata.json
similarity index 98%
rename from step-templates/k8s-hpa-pod-metrics.json
rename to src/step-templates/k8s-hpa-pod-metrics/metadata.json
index eec2b9493..813587b2f 100644
--- a/step-templates/k8s-hpa-pod-metrics.json
+++ b/src/step-templates/k8s-hpa-pod-metrics/metadata.json
@@ -103,11 +103,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-07-09T02:52:33.066Z",
+    "ExportedAt": "2020-07-09T02:52:33.0660000Z",
     "OctopusVersion": "2020.3.0-rc0001",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "k8s"
 }
diff --git a/step-templates/k8s-hpa-resource-metrics.json b/src/step-templates/k8s-hpa-resource-metrics/metadata.json
similarity index 98%
rename from step-templates/k8s-hpa-resource-metrics.json
rename to src/step-templates/k8s-hpa-resource-metrics/metadata.json
index 68c5ac84a..3263788a0 100644
--- a/step-templates/k8s-hpa-resource-metrics.json
+++ b/src/step-templates/k8s-hpa-resource-metrics/metadata.json
@@ -124,11 +124,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-07-09T00:30:39.078Z",
+    "ExportedAt": "2020-07-09T00:30:39.0780000Z",
     "OctopusVersion": "2020.3.0-rc0001",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "k8s"
 }
diff --git a/step-templates/octopus-add-runbook-to-project.json b/src/step-templates/octopus-add-runbook-to-project/metadata.json
similarity index 99%
rename from step-templates/octopus-add-runbook-to-project.json
rename to src/step-templates/octopus-add-runbook-to-project/metadata.json
index fc5ae39b6..aca40141e 100644
--- a/step-templates/octopus-add-runbook-to-project.json
+++ b/src/step-templates/octopus-add-runbook-to-project/metadata.json
@@ -164,7 +164,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-11-09T01:10:53.027Z",
+    "ExportedAt": "2023-11-09T01:10:53.0270000Z",
     "OctopusVersion": "2024.1.895",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/octopus-ai-prompt/metadata.json b/src/step-templates/octopus-ai-prompt/metadata.json
new file mode 100644
index 000000000..676e1a088
--- /dev/null
+++ b/src/step-templates/octopus-ai-prompt/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "8ce3eb55-2c35-45c2-be8c-27e71ffbf032",
+  "Name": "Octopus - Prompt AI",
+  "Description": "Prompt the Octopus AI service with a message and store the result in a variable. See https://octopus.com/docs/administration/copilot for more information.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py"
+  },
+  "Parameters": [
+    {
+      "Id": "10c6b0c8-92e0-4bce-91a7-0d1d0b275c1a",
+      "Name": "OctopusAI.Prompt",
+      "Label": "The prompt to send to the AI service",
+      "HelpText": null,
+      "DefaultValue": "Describe deployment \"#{Octopus.Release.Number}\" for project \"#{Octopus.Project.Name}\" to environment \"#{Octopus.Environment.Name}\" in space \"#{Octopus.Space.Name}\"",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "831e4eda-0ad3-460a-9375-42ce580bfd7d",
+      "Name": "OctopusAI.GitHub.Token",
+      "Label": "The GitHub Token",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "7d6a276d-fcb5-4dd9-b5a3-b7a3b48782c1",
+      "Name": "OctopusAI.Octopus.APIKey",
+      "Label": "The Octopus API Key",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "3eb54042-8169-4ae4-8910-a02b14325e71",
+      "Name": "OctopusAI.Octopus.Url",
+      "Label": "The Octopus URL",
+      "HelpText": null,
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "380c09c0-2af8-4866-a1a7-db77fa89f7d8",
+      "Name": "OctopusAI.AutoApprove",
+      "Label": "Enable this to auto approve any prompts that require approval",
+      "HelpText": null,
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-10-03T20:35:41.3720000Z",
+    "OctopusVersion": "2024.4.3391",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-ai-prompt/scriptbody.py b/src/step-templates/octopus-ai-prompt/scriptbody.py
new file mode 100644
index 000000000..8322f9356
--- /dev/null
+++ b/src/step-templates/octopus-ai-prompt/scriptbody.py
@@ -0,0 +1,123 @@
+import os
+import re
+import http.client
+import json
+import time
+from urllib.parse import quote
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if 'get_octopusvariable' not in globals():
+    def get_octopusvariable(variable):
+        return os.environ.get(re.sub('\\.', '_', variable.upper()))
+
+if 'set_octopusvariable' not in globals():
+    def set_octopusvariable(variable, value):
+        print(f"Setting {variable} to {value}")
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if 'printverbose' not in globals():
+    def printverbose(msg):
+        print(msg)
+
+def make_post_request(message, auto_approve, github_token, octopus_api_key, octopus_server, retry = 0):
+    """
+    Query the Octopus AI service with a message.
+    :param message: The prompt message
+    :param github_token: The GitHub token
+    :param octopus_api_key: The Octopus API key
+    :param octopus_server: The Octopus URL
+    :return: The AI response
+    """
+    headers = {
+        "X-GitHub-Token": github_token,
+        "X-Octopus-ApiKey": octopus_api_key,
+        "X-Octopus-Server": octopus_server,
+        "Content-Type": "application/json"
+    }
+    body = json.dumps({"messages": [{"content": message}]}).encode("utf8")
+
+    conn = http.client.HTTPSConnection("aiagent.octopus.com", timeout=240)
+    conn.request("POST", "/api/form_handler", body, headers)
+    response = conn.getresponse()
+    response_data = response.read().decode("utf8")
+    conn.close()
+
+    if response.status < 200 or response.status > 300:
+        if retry < 2:
+            printverbose(f"Request to AI Agent failed with status code {response.status} and message: {response.reason}. Retrying...")
+            time.sleep(400)
+            return make_post_request(message, auto_approve, github_token, octopus_api_key, octopus_server, retry + 1)
+        return f"Request to AI Agent failed with status code {response.status} and message: {response.reason}"
+
+    if is_action_response(response_data):
+        if auto_approve:
+            id = action_response_id(response_data)
+
+            if not id:
+                return "Prompt required approval, but no confirmation ID was found in the response."
+
+            conn = http.client.HTTPSConnection("aiagent.octopus.com", timeout=240)
+            conn.request("POST", "/api/form_handler?confirmation_id=" + quote(id, safe='') + "&confirmation_state=accepted", body, headers)
+            response = conn.getresponse()
+            response_data = response.read().decode("utf8")
+            conn.close()
+            return convert_from_sse_response(response_data)
+        else:
+            return "Prompt required approval, but auto-approval is disabled. Please enable the auto-approval option in the step."
+
+    return convert_from_sse_response(response_data)
+
+
+def convert_from_sse_response(sse_response):
+    """
+    Converts an SSE response into a string.
+    :param sse_response: The SSE response to convert.
+    :return: The string representation of the SSE response.
+    """
+
+    responses = map(
+        lambda line: json.loads(line.replace("data: ", "")),
+        filter(lambda line: line.strip().startswith("data:"), sse_response.split("\n")),
+    )
+    content_responses = filter(
+        lambda response: "content" in response["choices"][0]["delta"], responses
+    )
+    return "\n".join(
+        map(
+            lambda line: line["choices"][0]["delta"]["content"].strip(),
+            content_responses,
+        )
+    )
+
+def is_action_response(sse_response):
+    responses = map(
+        lambda line: json.loads(line.replace("data: ", "")),
+        filter(lambda line: line.strip().startswith("data:"), sse_response.split("\n")),
+    )
+
+    return any(response.get("type") == "action" for response in responses)
+
+def action_response_id(sse_response):
+    responses = map(
+        lambda line: json.loads(line.replace("data: ", "")),
+        filter(lambda line: line.strip().startswith("data:"), sse_response.split("\n")),
+    )
+
+    action = next(filter(lambda response: response.get("type") == "action", responses))
+
+    return action.get("confirmation", {}).get("id")
+
+step_name = get_octopusvariable("Octopus.Step.Name")
+message = get_octopusvariable("OctopusAI.Prompt")
+github_token = get_octopusvariable("OctopusAI.GitHub.Token")
+octopus_api = get_octopusvariable("OctopusAI.Octopus.APIKey")
+octopus_url = get_octopusvariable("OctopusAI.Octopus.Url")
+auto_approve = get_octopusvariable("OctopusAI.AutoApprove").casefold() == "true"
+
+result = make_post_request(message, auto_approve, github_token, octopus_api, octopus_url)
+
+set_octopusvariable("AIResult", result)
+
+print(result)
+print(f"AI result is available in the variable: Octopus.Action[{step_name}].Output.AIResult")
diff --git a/src/step-templates/octopus-lookup-space-id/metadata.json b/src/step-templates/octopus-lookup-space-id/metadata.json
new file mode 100644
index 000000000..694194ea2
--- /dev/null
+++ b/src/step-templates/octopus-lookup-space-id/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "324f747e-e2cd-439d-a660-774baf4991f2",
+  "Name": "Octopus - Lookup Space ID",
+  "Description": "This step queries an Octopus server to return the ID of a named space. The ID is captured in an output variables called `SpaceID`.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python"
+  },
+  "Parameters": [
+    {
+      "Id": "69b98409-b4ba-401f-8986-042b6d58584f",
+      "Name": "SpaceLookup.ThisInstance.Server.Url",
+      "Label": "Server URL",
+      "HelpText": "The URL of the Octopus Server hosting the space to resolved.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9089cd55-75d6-4e91-a390-d7a3359e3c59",
+      "Name": "SpaceLookup.ThisInstance.Api.Key",
+      "Label": "Server API Key",
+      "HelpText": "The Octopus API Key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "4f5d46a5-ea76-478f-a5fa-0bacad6afa5b",
+      "Name": "SpaceLookup.Lookup.Space.Name",
+      "Label": "Space Name",
+      "HelpText": "The name of the space return the ID of",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-11T21:15:03.8810000Z",
+    "OctopusVersion": "2023.4.2151",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-lookup-space-id/scriptbody.py b/src/step-templates/octopus-lookup-space-id/scriptbody.py
new file mode 100644
index 000000000..ee453943f
--- /dev/null
+++ b/src/step-templates/octopus-lookup-space-id/scriptbody.py
@@ -0,0 +1,106 @@
+# This script exists for those scenarios where the tenant space is created as part of the same process that
+# attempts to populate the space. The tenant space ID variable, saved when the space is created, won't be refreshed
+# in the middle of the deployment, so we query it directly.
+
+import argparse
+import json
+import urllib.request
+import urllib.parse
+import os
+import sys
+import time
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, just print any set variable to std out.
+if "set_octopusvariable" not in globals():
+    def set_octopusvariable(name, variable):
+        print(variable)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION] [FILE]...',
+        description='Lookup a space ID from the name'
+    )
+    parser.add_argument('--server-url',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SpaceLookup.ThisInstance.Server.Url') or get_octopusvariable_quiet(
+                            'ThisInstance.Server.Url'),
+                        help='Sets the Octopus server URL.')
+    parser.add_argument('--api-key',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SpaceLookup.ThisInstance.Api.Key') or get_octopusvariable_quiet('ThisInstance.Api.Key'),
+                        help='Sets the Octopus API key.')
+    parser.add_argument('--space-name',
+                        action='store',
+                        default=get_octopusvariable_quiet('SpaceLookup.Lookup.Space.Name') or get_octopusvariable_quiet(
+                            'Lookup.Space.Name') or get_octopusvariable_quiet('Octopus.Deployment.Tenant.Name'),
+                        help='The name of the space to lookup.')
+
+    return parser.parse_known_args()
+
+
+parser, _ = init_argparse()
+
+# Variable precondition checks
+if len(parser.server_url) == 0:
+    print("--server-url, ThisInstance.Server.Url, or SerializeProject.ThisInstance.Server.Url must be defined")
+    sys.exit(1)
+
+if len(parser.api_key) == 0:
+    print("--api-key, ThisInstance.Api.Key, or ThisInstance.Api.Key must be defined")
+    sys.exit(1)
+
+if len(parser.space_name) == 0:
+    print("--space-name, Lookup.Space.Name, SpaceLookup.Lookup.Space.Name, or Octopus.Deployment.Tenant.Name must be defined")
+    sys.exit(1)
+
+url = parser.server_url + '/api/Spaces?partialName=' + urllib.parse.quote(parser.space_name) + "&take=1000"
+headers = {
+    'X-Octopus-ApiKey': parser.api_key,
+    'Accept': 'application/json'
+}
+request = urllib.request.Request(url, headers=headers)
+
+# Retry the request for up to a minute.
+response = None
+for x in range(12):
+    response = urllib.request.urlopen(request)
+    if response.getcode() == 200:
+        break
+    time.sleep(5)
+
+if not response or not response.getcode() == 200:
+    print('The API query failed')
+    sys.exit(1)
+
+data = json.loads(response.read().decode("utf-8"))
+
+space = [x for x in data['Items'] if x['Name'] == parser.space_name]
+
+if len(space) != 0:
+    print('Space ' + parser.space_name + ' has ID ' + space[0]['Id'])
+    print('The space ID is available as the output variable #{Octopus.Action[' + get_octopusvariable_quiet('Octopus.Action.Name') + '].Output.SpaceID}')
+    set_octopusvariable("SpaceID", space[0]['Id'])
+else:
+    print('Failed to find space called ' + parser.space_name)
+    sys.exit(1)
diff --git a/src/step-templates/octopus-serialize-project-to-terraform/metadata.json b/src/step-templates/octopus-serialize-project-to-terraform/metadata.json
new file mode 100644
index 000000000..d19ad43da
--- /dev/null
+++ b/src/step-templates/octopus-serialize-project-to-terraform/metadata.json
@@ -0,0 +1,205 @@
+{
+  "Id": "e9526501-09d5-490f-ac3f-5079735fe041",
+  "Name": "Octopus - Serialize Project to Terraform",
+  "Description": "Serialize an Octopus project as a Terraform module and upload the resulting package to the Octopus built in feed.\n\nThis step uses naming conventions to exclude resources from the generated module:\n\n* Variables starting with `Private.` are excluded\n* Runbooks starting with `__ ` are excluded\n* The environment called `Sync` is removed from any variable scopes\n\nBecause serializing Terraform modules is done via the API, the values of any secret variables are not available, and are not included in the module generated by this step.\n\nHowever, by following a variable naming and scoping convention, it is possible to export and then apply a project in a Terraform module recreating secret variables, without ever including the secrets in the exported module.\n\nThe project to be exported must define all secret variables with a unique name and a single value.  For example, the secret variable `Test.Database.Password` can be scoped to the `Test` environment and the secret variable `Production.Database.Password` can be scoped to the `Production` environment. You can not have a single secret variable called `Database.Password` with two values for the different environments though.\n\nTo collapse the unique secret variables into a single variable used by steps, it is possible to create a non-secret variable called `Database.Password`  with two values `#{Test.Database.Password}` and `#{Production.Database.Password}` scoped to appropriate environments.\n\nIn this way steps can still reference a single variable called `Database.Password`, but all secret variables have unique names and only one value.\n\nAll secret variables are then scoped to an additional environment called `Sync`, which means all secret variables are exposed to runbooks run in the `Step` environment. The `Sync` environment is used to apply the Terraform module exported by this step, `Apply a Terraform template` step to perform variable replacements with secret variables.\n\nThe secret values in the Terraform module then have default values set to the Octostache template referencing the secret variable. For example, the Octopus variables in the Terraform module have default values like `#{Test.Database.Password}` and `#{Production.Database.Password}`. These templates are replaced at runtime by the `Apply a Terraform template` step, run in the `Sync` environment, effectively injecting the secret values back into the newly created project.\n\nThis allows secret variables to be recreated with their original values, without ever exporting the secret values. ",
+  "ActionType": "Octopus.Script",
+  "Version": 17,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python"
+  },
+  "Parameters": [
+    {
+      "Id": "ca62a702-6eb3-4d01-b645-73fbb2a1ea86",
+      "Name": "SerializeProject.Exported.Project.IgnoreAllChanges",
+      "Label": "Ignore All Changes",
+      "HelpText": "Selecting this option creates a Terraform module with the \"lifecycle.ignore_changes\" option set to \"all\" for all project resources. This allows the resources to be created if they do not exist, but won't update them if the module is reapplied. This value effectively enables the \"Ignore Variable Changes\" option.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "05fafe0b-b05f-4e7b-85c3-857b62dc4182",
+      "Name": "SerializeProject.Exported.Project.IgnoreVariableChanges",
+      "Label": "Ignore Variable Changes",
+      "HelpText": "Selecting this option creates a Terraform module with the \"lifecycle.ignore_changes\" option set to \"all\" for Octopus variables (i.e. \"octopusdeploy_variable\" resources)\". This allows Octopus variables to be created if they do not exist, but won't update Octopus variable values if the module is reapplied. This value effectively enabled if the \"Ignore All Changes\" option is enabled.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "3b8f35b6-fc1a-442b-ae0e-3036f5436a7a",
+      "Name": "SerializeProject.Exported.Project.IgnoreCacValues",
+      "Label": "Ignore CaC Settings",
+      "HelpText": "Enable this option to exclude any Config-as-Code managed resources from the exported module, such as non-secret variables, deployment process, and CaC defined project settings. This option is useful when you are exporting CaC enabled projects and do not wish to include any settings in the exported module that are managed by Git. Disable this option, and enable the \"Exclude CaC Settings\" option to essentially convert CaC projects to regular projects.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "5c315650-9ba8-48b8-a02c-269315277fea",
+      "Name": "SerializeProject.Exported.Project.ExcludeCacProjectValues",
+      "Label": "Exclude CaC Settings",
+      "HelpText": "Enable this option to exclude Config-as-Code settings from the exported module, such as Git credentials and the version controlled flag. Enable this option, and disable the \"Ignore CaC Settings\" option to essentially convert CaC projects to regular projects.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "770a6e15-1a4f-4451-ae94-b2469d5765e0",
+      "Name": "SerializeProject.Exported.Project.DefaultSecrets",
+      "Label": "Default Secrets to Default Values",
+      "HelpText": "This option sets the default value of all secrets, like account and feed passwords, to an Octostache template referencing the variable name. This allows the default value to be replaced by Octopus with the sensitive value during deployment.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "9c18e779-bddc-4f74-81c6-9d75babc9c9c",
+      "Name": "SerializeProject.ThisInstance.Terraform.Backend",
+      "Label": "Terraform Backend",
+      "HelpText": "The [backed](https://developer.hashicorp.com/terraform/language/settings/backends/configuration) to define in the Terraform module.",
+      "DefaultValue": "s3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f96cd929-1c18-4f7c-9121-82904e64834e",
+      "Name": "SerializeProject.ThisInstance.Server.Url",
+      "Label": "Octopus Server URL",
+      "HelpText": "The URL of the Octopus Server hosting the project to be serialized.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "95e0f611-d1f2-4317-ad5e-9131de73bbbe",
+      "Name": "SerializeProject.ThisInstance.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The Octopus API Key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "9473de1f-a633-41d0-ba2c-6b622ce65551",
+      "Name": "SerializeProject.Exported.Space.Id",
+      "Label": "Octopus Space ID",
+      "HelpText": "The Space ID containing the project to be exported",
+      "DefaultValue": "#{Octopus.Space.Id}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9d8af8e2-307a-4149-a28e-f75cec9ee044",
+      "Name": "SerializeProject.Exported.Project.Name",
+      "Label": "Octopus Project Name",
+      "HelpText": "The name of the project to serialize.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1b8ce71f-0931-4966-805a-e6d0ec12e3a0",
+      "Name": "SerializeProject.Octopus.UploadSpace.Id",
+      "Label": "Octopus Upload Space ID",
+      "HelpText": "The ID of the space to upload the Terraform package to. Leave this blank to upload to the space defined in the `Octopus Space ID` parameter.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aec82033-cae1-4a18-a315-c70468f71539",
+      "Name": "SerializeProject.Exported.Project.IgnoredAccounts",
+      "Label": "Ignored Accounts",
+      "HelpText": "A comma separated list of accounts that will not be included in the Terraform module. These accounts are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e45abab5-cb8f-4af2-b3e9-3cde057907df",
+      "Name": "Exported.Project.IgnoredLibraryVariableSet",
+      "Label": "Ignored Library Variables Sets",
+      "HelpText": "A comma separated list of library variables sets that will not be included in the Terraform module. These library variable sets are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cb075d4f-a02f-4c80-b8b9-6f2da83730ff",
+      "Name": "SerializeProject.Exported.Project.IgnoredTenants",
+      "Label": "Ignored Tenants",
+      "HelpText": "A comma separated list of tenants that will not be included in the Terraform module.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ab67746c-b66b-4983-ac17-9a278b711037",
+      "Name": "SerializeProject.Exported.Project.IgnoredChannels",
+      "Label": "Ignored Channels",
+      "HelpText": "A comma separated list of channels that will not be included in the Terraform module.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e456bc3f-a537-4982-8963-a091d3f31cf0",
+      "Name": "SerializeProject.Exported.Project.IncludeStepTemplates",
+      "Label": "Include Step Templates",
+      "HelpText": "Enable this option to export step templates referenced by a project. Disable this option to have step templates detached in projects instead.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d9dacd25-5b0f-4f3e-89e2-08eefc0ffb89",
+      "Name": "SerializeProject.Exported.Project.LookupProjectLinkTenants",
+      "Label": "Link Tenants and Create Tenant Variables",
+      "HelpText": "Enable this option to have each project link any tenants and create project tenant variables.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "932f67ab-5742-4cb2-9892-42bb21671757",
+      "Name": "SerializeProject.Exported.Project.OctopusManagedTerraformVars",
+      "Label": "Octopus Managed Terraform Vars",
+      "HelpText": "The optional name of an Octopus variable to use as the terraform.tfvars file.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-11T21:06:55.1010000Z",
+    "OctopusVersion": "2023.4.2151",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-serialize-project-to-terraform/scriptbody.py b/src/step-templates/octopus-serialize-project-to-terraform/scriptbody.py
new file mode 100644
index 000000000..ce24f1812
--- /dev/null
+++ b/src/step-templates/octopus-serialize-project-to-terraform/scriptbody.py
@@ -0,0 +1,464 @@
+import argparse
+import os
+import stat
+import re
+import socket
+import subprocess
+import sys
+from datetime import datetime
+from urllib.parse import urlparse
+import urllib.request
+from itertools import chain
+import platform
+from urllib.request import urlretrieve
+import zipfile
+import json
+import tarfile
+import random, time
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if "printverbose" not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    if not output:
+        return
+
+    # https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python
+    output_no_ansi = re.sub(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def retry_with_backoff(fn, retries=5, backoff_in_seconds=1):
+    x = 0
+    while True:
+        try:
+            return fn()
+        except Exception as e:
+
+            print(e)
+
+            if x == retries:
+                raise
+
+            sleep = (backoff_in_seconds * 2 ** x +
+                     random.uniform(0, 1))
+            time.sleep(sleep)
+            x += 1
+
+
+def execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi):
+    """
+        The execute method provides the ability to execute external processes while capturing and returning the
+        output to std err and std out and exit code.
+    """
+    process = subprocess.Popen(args,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               text=True,
+                               cwd=cwd,
+                               env=env)
+    stdout, stderr = process.communicate()
+    retcode = process.returncode
+
+    if print_args is not None:
+        print_output(' '.join(args))
+
+    if print_output is not None:
+        print_output(stdout)
+        print_output(stderr)
+
+    return stdout, stderr, retcode
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION] [FILE]...',
+        description='Serialize an Octopus project to a Terraform module'
+    )
+    parser.add_argument('--ignore-all-changes',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoreAllChanges') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoreAllChanges') or 'false',
+                        help='Set to true to set the "lifecycle.ignore_changes" ' +
+                             'setting on each exported resource to "all"')
+    parser.add_argument('--ignore-variable-changes',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoreVariableChanges') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoreVariableChanges') or 'false',
+                        help='Set to true to set the "lifecycle.ignore_changes" ' +
+                             'setting on each exported octopus variable to "all"')
+    parser.add_argument('--terraform-backend',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.ThisInstance.Terraform.Backend') or get_octopusvariable_quiet(
+                            'ThisInstance.Terraform.Backend') or 'pg',
+                        help='Set this to the name of the Terraform backend to be included in the generated module.')
+    parser.add_argument('--server-url',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.ThisInstance.Server.Url') or get_octopusvariable_quiet(
+                            'ThisInstance.Server.Url'),
+                        help='Sets the server URL that holds the project to be serialized.')
+    parser.add_argument('--api-key',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.ThisInstance.Api.Key') or get_octopusvariable_quiet(
+                            'ThisInstance.Api.Key'),
+                        help='Sets the Octopus API key.')
+    parser.add_argument('--space-id',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Space.Id') or get_octopusvariable_quiet(
+                            'Exported.Space.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),
+                        help='Set this to the space ID containing the project to be serialized.')
+    parser.add_argument('--project-name',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.Name') or get_octopusvariable_quiet(
+                            'Exported.Project.Name') or get_octopusvariable_quiet(
+                            'Octopus.Project.Name'),
+                        help='Set this to the name of the project to be serialized.')
+    parser.add_argument('--upload-space-id',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Octopus.UploadSpace.Id') or get_octopusvariable_quiet(
+                            'Octopus.UploadSpace.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),
+                        help='Set this to the space ID of the Octopus space where ' +
+                             'the resulting package will be uploaded to.')
+    parser.add_argument('--ignore-cac-managed-values',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoreCacValues') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoreCacValues') or 'false',
+                        help='Set this to true to exclude cac managed values like non-secret variables, ' +
+                             'deployment processes, and project versioning into the Terraform module. ' +
+                             'Set to false to have these values embedded into the module.')
+    parser.add_argument('--exclude-cac-project-settings',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.ExcludeCacProjectValues') or get_octopusvariable_quiet(
+                            'Exported.Project.ExcludeCacProjectValues') or 'false',
+                        help='Set this to true to exclude CaC settings like git connections from the exported module.')
+    parser.add_argument('--ignored-library-variable-sets',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoredLibraryVariableSet') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoredLibraryVariableSet'),
+                        help='A comma separated list of library variable sets to ignore.')
+    parser.add_argument('--ignored-accounts',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoredAccounts') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoredAccounts'),
+                        help='A comma separated list of accounts to ignore.')
+    parser.add_argument('--ignored-tenants',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoredTenants') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoredTenants'),
+                        help='A comma separated list of tenants to ignore.')
+    parser.add_argument('--ignored-channels',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoredChannels') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoredChannels'),
+                        help='A comma separated list of channels to ignore.')
+    parser.add_argument('--include-step-templates',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IncludeStepTemplates') or get_octopusvariable_quiet(
+                            'Exported.Project.IncludeStepTemplates') or 'false',
+                        help='Set this to true to include step templates in the exported module. ' +
+                             'This disables the default behaviour of detaching step templates.')
+    parser.add_argument('--lookup-project-link-tenants',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.LookupProjectLinkTenants') or get_octopusvariable_quiet(
+                            'Exported.Project.LookupProjectLinkTenants') or 'false',
+                        help='Set this option to link tenants and create tenant project variables.')
+    parser.add_argument('--default-secret-variables',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.DefaultSecrets') or get_octopusvariable_quiet(
+                            'Exported.Project.DefaultSecrets') or 'false',
+                        help='Set to true to set sensitive variables to the octostache template that represents the variable')
+    parser.add_argument('--octopus-managed-terraform-vars',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.OctopusManagedTerraformVars') or get_octopusvariable_quiet(
+                            'Exported.Project.OctopusManagedTerraformVars'),
+                        help='The name of an Octopus variable to use as the terraform.tfvars file.')
+
+    return parser.parse_known_args()
+
+
+def get_latest_github_release(owner, repo, filename):
+    url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
+    releases = urllib.request.urlopen(url).read()
+    contents = json.loads(releases)
+
+    download = [asset for asset in contents.get('assets') if asset.get('name') == filename]
+
+    if len(download) != 0:
+        return download[0].get('browser_download_url')
+
+    return None
+
+
+def ensure_octo_cli_exists():
+    if is_windows():
+        print("Checking for the Octopus CLI")
+        try:
+            stdout, _, exit_code = execute(['octo.exe', 'help'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octo CLI not found"
+            return ""
+        except:
+            print("Downloading the Octopus CLI")
+            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.win-x64.zip',
+                        'OctopusTools.zip')
+            with zipfile.ZipFile('OctopusTools.zip', 'r') as zip_ref:
+                zip_ref.extractall(os.getcwd())
+            return os.getcwd()
+    else:
+        print("Checking for the Octopus CLI for Linux")
+        try:
+            stdout, _, exit_code = execute(['octo', 'help'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octo CLI not found"
+            return ""
+        except:
+            print("Downloading the Octopus CLI for Linux")
+            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.linux-x64.tar.gz',
+                        'OctopusTools.tar.gz')
+            with tarfile.open('OctopusTools.tar.gz') as file:
+                file.extractall(os.getcwd())
+                os.chmod(os.path.join(os.getcwd(), 'octo'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)
+            return os.getcwd()
+
+
+def ensure_octoterra_exists():
+    if is_windows():
+        print("Checking for the Octoterra tool for Windows")
+        try:
+            stdout, _, exit_code = execute(['octoterra.exe', '-version'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octoterra not found"
+            return ""
+        except:
+            print("Downloading Octoterra CLI for Windows")
+            retry_with_backoff(lambda: urlretrieve(
+                "https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_windows_amd64.exe",
+                'octoterra.exe'), 10, 30)
+            return os.getcwd()
+    else:
+        print("Checking for the Octoterra tool for Linux")
+        try:
+            stdout, _, exit_code = execute(['octoterra', '-version'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octoterra not found"
+            return ""
+        except:
+            print("Downloading Octoterra CLI for Linux")
+            retry_with_backoff(lambda: urlretrieve(
+                "https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_linux_amd64",
+                'octoterra'), 10, 30)
+            os.chmod(os.path.join(os.getcwd(), 'octoterra'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)
+            return os.getcwd()
+
+
+octocli_path = ensure_octo_cli_exists()
+octoterra_path = ensure_octoterra_exists()
+parser, _ = init_argparse()
+
+# Variable precondition checks
+if len(parser.server_url) == 0:
+    print("--server-url, ThisInstance.Server.Url, or SerializeProject.ThisInstance.Server.Url must be defined")
+    sys.exit(1)
+
+if len(parser.api_key) == 0:
+    print("--api-key, ThisInstance.Api.Key, or ThisInstance.Api.Key must be defined")
+    sys.exit(1)
+
+print("Octopus URL: " + parser.server_url)
+print("Octopus Space ID: " + parser.space_id)
+
+# Build the arguments to ignore library variable sets
+ignores_library_variable_sets = parser.ignored_library_variable_sets.split(',')
+ignores_library_variable_sets_args = [['-excludeLibraryVariableSet', x] for x in ignores_library_variable_sets]
+
+# Build the arguments to ignore accounts
+ignored_accounts = parser.ignored_accounts.split(',')
+ignored_accounts = [['-excludeAccounts', x] for x in ignored_accounts]
+
+# Build the arguments to ignore tenants
+ignored_tenants = parser.ignored_tenants.split(',')
+ignored_tenants_args = [['-excludeTenants', x] for x in ignored_tenants]
+
+# Build the arguments to ignore channels
+ignored_channels = parser.ignored_channels.split(',')
+ignored_channels_args = [['-excludeChannels', x] for x in ignored_channels]
+
+os.mkdir(os.getcwd() + '/export')
+
+export_args = [os.path.join(octoterra_path, 'octoterra'),
+               # the url of the instance
+               '-url', parser.server_url,
+               # the api key used to access the instance
+               '-apiKey', parser.api_key,
+               # add a postgres backend to the generated modules
+               '-terraformBackend', parser.terraform_backend,
+               # dump the generated HCL to the console
+               '-console',
+               # dump the project from the current space
+               '-space', parser.space_id,
+               # the name of the project to serialize
+               '-projectName', parser.project_name,
+               # ignoreProjectChanges can be set to ignore all changes to the project, variables, runbooks etc
+               '-ignoreProjectChanges=' + parser.ignore_all_changes,
+               # use data sources to lookup external dependencies (like environments, accounts etc) rather
+               # than serialize those external resources
+               '-lookupProjectDependencies',
+               # for any secret variables, add a default value set to the octostache value of the variable
+               # e.g. a secret variable called "database" has a default value of "#{database}"
+               '-defaultSecretVariableValues=' + parser.default_secret_variables,
+               # Any value that can't be replaced with an Octostache template, add a dummy value
+               '-dummySecretVariableValues',
+               # detach any step templates, allowing the exported project to be used in a new space
+               '-detachProjectTemplates=' + str(not parser.include_step_templates),
+               # allow the downstream project to move between project groups
+               '-ignoreProjectGroupChanges',
+               # allow the downstream project to change names
+               '-ignoreProjectNameChanges',
+               # CaC enabled projects will not export the deployment process, non-secret variables, and other
+               # CaC managed project settings if ignoreCacManagedValues is true. It is usually desirable to
+               # set this value to true, but it is false here because CaC projects created by Terraform today
+               # save some variables in the database rather than writing them to the Git repo.
+               '-ignoreCacManagedValues=' + parser.ignore_cac_managed_values,
+               # Excluding CaC values means the resulting module does not include things like git credentials.
+               # Setting excludeCaCProjectSettings to true and ignoreCacManagedValues to false essentially
+               # converts a CaC project back to a database project.
+               '-excludeCaCProjectSettings=' + parser.exclude_cac_project_settings,
+               # This value is always true. Either this is an unmanaged project, in which case we are never
+               # reapplying it; or it is a variable configured project, in which case we need to ignore
+               # variable changes, or it is a shared CaC project, in which case we don't use Terraform to
+               # manage variables.
+               '-ignoreProjectVariableChanges=' + parser.ignore_variable_changes,
+               # To have secret variables available when applying a downstream project, they must be scoped
+               # to the Sync environment. But we do not need this scoping in the downstream project, so the
+               # Sync environment is removed from any variable scopes when serializing it to Terraform.
+               '-excludeVariableEnvironmentScopes', 'Sync',
+               # Exclude any variables starting with "Private."
+               '-excludeProjectVariableRegex', 'Private\\..*',
+               # Capture the octopus endpoint, space ID, and space name as output vars. This is useful when
+               # querying th Terraform state file to know which space and instance the resources were
+               # created in. The scripts used to update downstream projects in bulk work by querying the
+               # Terraform state, finding all the downstream projects, and using the space name to only process
+               # resources that match the current tenant (because space names and tenant names are the same).
+               # The output variables added by this option are octopus_server, octopus_space_id, and
+               # octopus_space_name.
+               '-includeOctopusOutputVars',
+               # Where steps do not explicitly define a worker pool and reference the default one, this
+               # option explicitly exports the default worker pool by name. This means if two spaces have
+               # different default pools, the exported project still uses the pool that the original project
+               # used.
+               '-lookUpDefaultWorkerPools',
+               # Link any tenants that were originally link to the project and create project tenant variables
+               '-lookupProjectLinkTenants=' + parser.lookup_project_link_tenants,
+               # Add support for experimental step templates
+               '-experimentalEnableStepTemplates=' + parser.include_step_templates,
+               # Ignore invalid channels
+               '-excludeInvalidChannels',
+               # The directory where the exported files will be saved
+               '-dest', os.getcwd() + '/export',
+               # Define the name of an Octopus variable to populate the terraform.tfvars file
+               '-octopusManagedTerraformVars=' + parser.octopus_managed_terraform_vars,
+               # This is a management runbook that we do not wish to export
+               '-excludeRunbookRegex', '__ .*'] + list(chain(*ignores_library_variable_sets_args)) + list(
+    chain(*ignored_accounts)) + list(chain(*ignored_tenants_args)) + list(chain(*ignored_channels_args))
+
+print("Exporting Terraform module")
+_, _, octoterra_exit = execute(export_args)
+
+if not octoterra_exit == 0:
+    print("Octoterra failed. Please check the logs for more information.")
+    sys.exit(1)
+
+date = datetime.now().strftime('%Y.%m.%d.%H%M%S')
+
+print("Creating Terraform module package")
+if is_windows():
+    execute([os.path.join(octocli_path, 'octo.exe'),
+             'pack',
+             '--format', 'zip',
+             '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name),
+             '--version', date,
+             '--basePath', os.getcwd() + '\\export',
+             '--outFolder', os.getcwd()])
+else:
+    _, _, _ = execute([os.path.join(octocli_path, 'octo'),
+                       'pack',
+                       '--format', 'zip',
+                       '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name),
+                       '--version', date,
+                       '--basePath', os.getcwd() + '/export',
+                       '--outFolder', os.getcwd()])
+
+print("Uploading Terraform module package")
+if is_windows():
+    _, _, _ = execute([os.path.join(octocli_path, 'octo.exe'),
+                       'push',
+                       '--apiKey', parser.api_key,
+                       '--server', parser.server_url,
+                       '--space', parser.upload_space_id,
+                       '--package', os.getcwd() + "\\" +
+                       re.sub('[^0-9a-zA-Z]', '_', parser.project_name) + '.' + date + '.zip',
+                       '--replace-existing'])
+else:
+    _, _, _ = execute([os.path.join(octocli_path, 'octo'),
+                       'push',
+                       '--apiKey', parser.api_key,
+                       '--server', parser.server_url,
+                       '--space', parser.upload_space_id,
+                       '--package', os.getcwd() + "/" +
+                       re.sub('[^0-9a-zA-Z]', '_', parser.project_name) + '.' + date + '.zip',
+                       '--replace-existing'])
+
+print("##octopus[stdout-default]")
+
+print("Done")
diff --git a/step-templates/redgate-oracle-create-release.json b/src/step-templates/redgate-oracle-create-release/metadata.json
similarity index 60%
rename from step-templates/redgate-oracle-create-release.json
rename to src/step-templates/redgate-oracle-create-release/metadata.json
index 8e0f589b5..3f3666c23 100644
--- a/step-templates/redgate-oracle-create-release.json
+++ b/src/step-templates/redgate-oracle-create-release/metadata.json
@@ -19,7 +19,7 @@
     "Octopus.Action.Package.AutomaticallyRunConfigurationTransformationFiles": "True",
     "Octopus.Action.Package.AutomaticallyUpdateAppSettingsAndConnectionStrings": "True",
     "Octopus.Action.EnabledFeatures": "Octopus.Features.CustomScripts",
-    "Octopus.Action.CustomScripts.PostDeploy.ps1": "$exportPath = $OctopusParameters[\"Redgate.Oracle.ExportPath\"]\n$server = $OctopusParameters[\"Redgate.Oracle.Server\"]\n$user = $OctopusParameters[\"Redgate.Oracle.Username\"]\n$password = $OctopusParameters[\"Redgate.Oracle.Password\"]\n$oracleTools = $OctopusParameters[\"Redgate.Oracle.InstallPath\"]\n$deploymentSchema = $OctopusParameters[\"Redgate.Oracle.DeploymentSchema\"]\n$sourceSchema = $OctopusParameters[\"Redgate.Oracle.SourceSchema\"]\n$packageInstallDirectory = $OctopusParameters[\"Octopus.Action.Package.InstallationDirectoryPath\"]\n$excludeOptions = $OctopusParameters[\"Redgate.Oracle.ExcludeOptions\"]\n$behaviorOptions = $OctopusParameters[\"Redgate.Oracle.BehaviorOptions\"]\n$ignoreOptions = $OctopusParameters[\"Redgate.Oracle.IgnoreOptions\"]\n$storageOptions = $OctopusParameters[\"Redgate.Oracle.StorageOptions\"]\n$excludeDependencies = $OctopusParameters[\"Redgate.Oracle.ExcludeDependencies\"]\n$filterPath = $OctopusParameters[\"Redgate.Oracle.FilterPath\"]\n$includeIdentical = $OctopusParameters[\"Redgate.Oracle.IncludeIdentical\"]\n\nWrite-Host \"Export Path: $exportPath\"\nWrite-Host \"Oracle Server: $server\"\nWrite-Host \"Oracle Username: $user\"\nWrite-Host \"Oracle Password not shown\"\nWrite-Host \"Oracle Source Schema: $sourceSchema\"\nWrite-Host \"Oracle Deployment Schema: $deploymentSchema\"\nWrite-Host \"Oracle Toolbelt Install Path: $oracleTools\"\nWrite-Host \"Package Install Directory: $packageInstallDirectory\"\nWrite-Host \"Filter Path: $filterPath\"\nWrite-Host \"Behavior Options: $behaviorOptions\"\nWrite-Host \"Exclude Options: $excludeOptions\"\nWrite-Host \"Exclude Dependencies: $excludeDependencies\"\nWrite-Host \"Ignore Options: $ignoreOptions\"\nWrite-Host \"Storage Options: $storageOptions\"\nWrite-Host \"Include Identical: $includeIdentical\"\n\n$sourceFolder = \"$packageInstallDirectory\\{$sourceSchema}\"\nWrite-Host \"Source Folder: $sourceFolder\"\n\n$maskedConnectionString = \"$user/*****@$server{$deploymentSchema}\"\n$unmaskedConnectionString = \"$user/$password@$server{$deploymentSchema}\"\nWrite-Host \"Creating a delta script by connecting to: $maskedConnectionString\"\n\n$oracleToolsSearchPath = \"$oracleTools\\**\\SCO.exe\"\n$scoexeOptions = Get-ChildItem -Path $oracleToolsSearchPath | Sort-Object [Version] -Descending\n\nif ($scoexeOptions -eq $null){\n    Write-Error \"Unable to find Oracle Schema Compare, please verify it is installed in the directory specified\"\n}\n \n$schemaCompareExe = $scoexeOptions[0]\nWrite-Host \"Running the exe $schemaCompareExe\"\n\n$deltaReportPath = \"$exportPath\\Changes.html\"\nWrite-Host \"Creating the delta report $deltaReportPath\"\n\n$changeScript = \"$exportPath\\Update.sql\"\nWrite-Host \"The change script is set to $changeScript\"\n\n$AllArgs = @(\n\t\"/source:`\"$sourceFolder`\"\", \n    \"/target:`\"$unmaskedConnectionString`\"\",\n    \"/scriptfile:`\"$changeScript`\"\",\n    \"/report:`\"$deltaReportPath`\"\", \n    \"/reporttype:Simple\")\n\nif ([string]::IsNullOrWhiteSpace($behaviorOptions) -eq $false){\n\tWrite-Host \"Behavior Options specified, adding them to the command line\"\n\t$AllArgs += \"/b:$behaviorOptions\"\n}\n\nif ([string]::IsNullOrWhiteSpace($excludeOptions) -eq $false){\n\tWrite-Host \"Exclude Options specified, adding them to the command line\"\n\t$AllArgs += \"/exc:$excludeOptions\"\n}\n\nif ([string]::IsNullOrWhiteSpace($ignoreOptions) -eq $false){\n\tWrite-Host \"Ignore Options specified, adding them to the command line\"\n\t$AllArgs += \"/i:$ignoreOptions\"\n}\n\nif ([string]::IsNullOrWhiteSpace($storageOptions) -eq $false){\n\tWrite-Host \"Storage Options specified, adding them to the command line\"\n\t$AllArgs += \"/g:$storageOptions\"\n}\n\nif ($excludeDependencies -eq \"True\"){\n\tWrite-Host \"Exclude Dependencies set to true, adding them to the command line\"\n\t$AllArgs += \"/excludedependencies\"\n}\n\nif ($includeIdentical -eq \"True\"){\n\tWrite-Host \"Include identical set to true, adding that to the command line\"\n    $AllArgs += \"/includeidentical\" \n}\n\nif ([string]::IsNullOrWhiteSpace($filterPath) -eq $false){\n\tWrite-Host \"Custom Filter Path specified, adding them to the command line\"\n\t$AllArgs += \"/f:`\"$sourceFolder\\$filterPath`\"\"\n}\n\n& \"$schemaCompareExe\" $AllArgs\n\n$successful = $false\n$upload = $false\nif ($lastExitCode -eq 61){\n\tWrite-Highlight \"Changes found, the delta script location is: $changeScript\"\n    Write-Highlight \"Uploading script and report as artifacts\"\n    \n\t$successful = $true\n    $upload = $true\n}\n\nif ($lastExitCode -eq 0){\n\tWrite-Highlight \"No changes were detected\"\n\t$successful = $true\n}\n\nSet-OctopusVariable -name \"OracleRedgateCreateReleaseChangesFound\" -value $upload\n\nif ($upload){\n  $environmentName = $OctopusParameters[\"Octopus.Environment.Name\"]\n  $artifactName = \"$environmentName\" + \"Changes.html\"\n  New-OctopusArtifact -Path \"$deltaReportPath\" -Name \"$artifactName\"\n  \n  $scriptArtifactName = \"$environmentName\" + \"Update.sql\"\n  New-OctopusArtifact -Path \"$changeScript\" -Name \"$scriptArtifactName\"    \n}\n\nSet-OctopusVariable -name \"DatabaseChangesFound\" -value $upload\n  \nif ($successful){  \n  exit 0\n}",
+    "Octopus.Action.CustomScripts.PostDeploy.ps1": "__SOURCE_FILE__:postdeploy.ps1",
     "Octopus.Action.Package.PackageId": "#{Redgate.Oracle.PackageName}",
     "Octopus.Action.Package.FeedId": "#{Redgate.Oracle.PackageFeed}",
     "Octopus.Action.Package.DownloadOnTentacle": "False"
@@ -189,7 +189,7 @@
   "LastModifiedOn": "2019-04-16T14:34Z",
   "LastModifiedBy": "octobob",
   "$Meta": {
-    "ExportedAt": "2019-03-26T18:54:49.750Z",
+    "ExportedAt": "2019-03-26T18:54:49.7500000Z",
     "OctopusVersion": "2019.2.4",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/redgate-oracle-create-release/postdeploy.ps1 b/src/step-templates/redgate-oracle-create-release/postdeploy.ps1
new file mode 100644
index 000000000..0a5680519
--- /dev/null
+++ b/src/step-templates/redgate-oracle-create-release/postdeploy.ps1
@@ -0,0 +1,130 @@
+$exportPath = $OctopusParameters["Redgate.Oracle.ExportPath"]
+$server = $OctopusParameters["Redgate.Oracle.Server"]
+$user = $OctopusParameters["Redgate.Oracle.Username"]
+$password = $OctopusParameters["Redgate.Oracle.Password"]
+$oracleTools = $OctopusParameters["Redgate.Oracle.InstallPath"]
+$deploymentSchema = $OctopusParameters["Redgate.Oracle.DeploymentSchema"]
+$sourceSchema = $OctopusParameters["Redgate.Oracle.SourceSchema"]
+$packageInstallDirectory = $OctopusParameters["Octopus.Action.Package.InstallationDirectoryPath"]
+$excludeOptions = $OctopusParameters["Redgate.Oracle.ExcludeOptions"]
+$behaviorOptions = $OctopusParameters["Redgate.Oracle.BehaviorOptions"]
+$ignoreOptions = $OctopusParameters["Redgate.Oracle.IgnoreOptions"]
+$storageOptions = $OctopusParameters["Redgate.Oracle.StorageOptions"]
+$excludeDependencies = $OctopusParameters["Redgate.Oracle.ExcludeDependencies"]
+$filterPath = $OctopusParameters["Redgate.Oracle.FilterPath"]
+$includeIdentical = $OctopusParameters["Redgate.Oracle.IncludeIdentical"]
+
+Write-Host "Export Path: $exportPath"
+Write-Host "Oracle Server: $server"
+Write-Host "Oracle Username: $user"
+Write-Host "Oracle Password not shown"
+Write-Host "Oracle Source Schema: $sourceSchema"
+Write-Host "Oracle Deployment Schema: $deploymentSchema"
+Write-Host "Oracle Toolbelt Install Path: $oracleTools"
+Write-Host "Package Install Directory: $packageInstallDirectory"
+Write-Host "Filter Path: $filterPath"
+Write-Host "Behavior Options: $behaviorOptions"
+Write-Host "Exclude Options: $excludeOptions"
+Write-Host "Exclude Dependencies: $excludeDependencies"
+Write-Host "Ignore Options: $ignoreOptions"
+Write-Host "Storage Options: $storageOptions"
+Write-Host "Include Identical: $includeIdentical"
+
+$sourceFolder = "$packageInstallDirectory\{$sourceSchema}"
+Write-Host "Source Folder: $sourceFolder"
+
+$maskedConnectionString = "$user/*****@$server{$deploymentSchema}"
+$unmaskedConnectionString = "$user/$password@$server{$deploymentSchema}"
+Write-Host "Creating a delta script by connecting to: $maskedConnectionString"
+
+$oracleToolsSearchPath = "$oracleTools\**\SCO.exe"
+$scoexeOptions = Get-ChildItem -Path $oracleToolsSearchPath | Sort-Object [Version] -Descending
+
+if ($scoexeOptions -eq $null){
+    Write-Error "Unable to find Oracle Schema Compare, please verify it is installed in the directory specified"
+}
+ 
+$schemaCompareExe = $scoexeOptions[0]
+Write-Host "Running the exe $schemaCompareExe"
+
+$deltaReportPath = "$exportPath\Changes.html"
+Write-Host "Creating the delta report $deltaReportPath"
+
+$changeScript = "$exportPath\Update.sql"
+Write-Host "The change script is set to $changeScript"
+
+$AllArgs = @(
+	"/source:`"$sourceFolder`"", 
+    "/target:`"$unmaskedConnectionString`"",
+    "/scriptfile:`"$changeScript`"",
+    "/report:`"$deltaReportPath`"", 
+    "/reporttype:Simple")
+
+if ([string]::IsNullOrWhiteSpace($behaviorOptions) -eq $false){
+	Write-Host "Behavior Options specified, adding them to the command line"
+	$AllArgs += "/b:$behaviorOptions"
+}
+
+if ([string]::IsNullOrWhiteSpace($excludeOptions) -eq $false){
+	Write-Host "Exclude Options specified, adding them to the command line"
+	$AllArgs += "/exc:$excludeOptions"
+}
+
+if ([string]::IsNullOrWhiteSpace($ignoreOptions) -eq $false){
+	Write-Host "Ignore Options specified, adding them to the command line"
+	$AllArgs += "/i:$ignoreOptions"
+}
+
+if ([string]::IsNullOrWhiteSpace($storageOptions) -eq $false){
+	Write-Host "Storage Options specified, adding them to the command line"
+	$AllArgs += "/g:$storageOptions"
+}
+
+if ($excludeDependencies -eq "True"){
+	Write-Host "Exclude Dependencies set to true, adding them to the command line"
+	$AllArgs += "/excludedependencies"
+}
+
+if ($includeIdentical -eq "True"){
+	Write-Host "Include identical set to true, adding that to the command line"
+    $AllArgs += "/includeidentical" 
+}
+
+if ([string]::IsNullOrWhiteSpace($filterPath) -eq $false){
+	Write-Host "Custom Filter Path specified, adding them to the command line"
+	$AllArgs += "/f:`"$sourceFolder\$filterPath`""
+}
+
+& "$schemaCompareExe" $AllArgs
+
+$successful = $false
+$upload = $false
+if ($lastExitCode -eq 61){
+	Write-Highlight "Changes found, the delta script location is: $changeScript"
+    Write-Highlight "Uploading script and report as artifacts"
+    
+	$successful = $true
+    $upload = $true
+}
+
+if ($lastExitCode -eq 0){
+	Write-Highlight "No changes were detected"
+	$successful = $true
+}
+
+Set-OctopusVariable -name "OracleRedgateCreateReleaseChangesFound" -value $upload
+
+if ($upload){
+  $environmentName = $OctopusParameters["Octopus.Environment.Name"]
+  $artifactName = "$environmentName" + "Changes.html"
+  New-OctopusArtifact -Path "$deltaReportPath" -Name "$artifactName"
+  
+  $scriptArtifactName = "$environmentName" + "Update.sql"
+  New-OctopusArtifact -Path "$changeScript" -Name "$scriptArtifactName"    
+}
+
+Set-OctopusVariable -name "DatabaseChangesFound" -value $upload
+  
+if ($successful){  
+  exit 0
+}
\ No newline at end of file
diff --git a/step-templates/add-server-to-azure-load-balancer.json b/step-templates/add-server-to-azure-load-balancer.json
deleted file mode 100644
index f5cefeb69..000000000
--- a/step-templates/add-server-to-azure-load-balancer.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "Id": "540de6f6-f1c6-4e1c-9062-9e78570074f6",
-  "Name": "Add Server to Azure Load Balancer",
-  "Description": "Uses Service Principal to Add Server to Azure Load Balancer.",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "#region Verify variables\n\n#Verify psbilbAzureSubscription is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureSubscription']))\n{\n  Throw 'Azure Subscription cannot be null.'\n}\n$azureSubscription = $OctopusParameters['psbilbAzureSubscription']\nWrite-Host ('Azure Subscription: ' + $azureSubscription)\n\n#Verify psbilbAzureResourceGroup is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureResourceGroup']))\n{\n  Throw 'Azure Resource Group cannot be null.'\n}\n$azureResourceGroup = $OctopusParameters['psbilbAzureResourceGroup']\nWrite-Host ('Azure Resource Group: ' + $azureResourceGroup)\n\n#Verify psbilbAzureMachineName is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureMachineName']))\n{\n  Throw 'Azure Machine Name cannot be null.'\n}\n$azureMachineName = $OctopusParameters['psbilbAzureMachineName']\nWrite-Host ('Azure Machine Name: ' + $azureMachineName)\n\n#Verify psbilbAzureLoadBalancer is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureLoadBalancer']))\n{\n  Throw 'Azure Load Balancer cannot be null.'\n}\n$azureLoadBalancer = $OctopusParameters['psbilbAzureLoadBalancer']\nWrite-Host ('Azure Load Balancer: ' + $azureLoadBalancer)\n\n#Verify psbilbAzureLoadBalancerBackEndPoolName is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['psbilbAzureLoadBalancerBackEndPoolName']))\n{\n  Throw 'Azure Load Balancer Backend Pool Name cannot be null.'\n}\n$azureLoadBalancerBackendPoolName = $OctopusParameters['psbilbAzureLoadBalancerBackEndPoolName']\nWrite-Host ('Azure Load Balancer Backend Pool Name: ' + $azureLoadBalancerBackendPoolName)\n\n#endregion\n\n#region Process\n\nSet-AzureRmContext -SubscriptionName $azureSubscription\n\n$azureVM = Get-AzureRmVM -ResourceGroupName $azureResourceGroup -Name $azureMachineName\nIf (!$azureVM)\n{\n  Throw 'Could not retrieve server from Azure needed to remove from Load Balancer.'\n}\n\n$nic = (Get-AzureRmNetworkInterface -ResourceGroupName $azureResourceGroup | Where-Object {$_.VirtualMachine.Id -eq $azureVM.Id})\nIf (!$nic)\n{\n  Throw 'Could not retrieve NIC from Azure needed to remove from Load Balancer.'\n}\n\n$loadBalancer = Get-AzureRmLoadBalancer -Name $azureLoadBalancer -ResourceGroupName $azureResourceGroup\nIf (!$loadBalancer)\n{\n  Throw 'Could not retrieve Load Balancer info from Azure.'\n}\n\n$ap = Get-AzureRmLoadBalancerBackendAddressPoolConfig -Name #{psbilbAzureLoadBalancerBackEndPoolName} -LoadBalancer $loadBalancer\n\n$nic.IpConfigurations[0].LoadBalancerBackendAddressPools = $ap\n$nic | Set-AzureRmNetworkInterface\n\n#endregion\n",
-    "Octopus.Action.Azure.AccountId": "#{psbilbAzureAccount}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "Parameters": [
-    {
-      "Id": "85e7fd91-8976-415a-82b7-1303e150b447",
-      "Name": "psbilbAzureAccount",
-      "Label": "Azure Account",
-      "HelpText": "Service Principal used to connect to Azure",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "e494b221-0b8e-4f02-84f1-079199e9f4b4",
-      "Name": "psbilbAzureSubscription",
-      "Label": "Azure Subscription",
-      "HelpText": "Subscription Load Balancer belongs to. Eg. 00000000-0000-0000-0000-000000000000",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4e0b35a8-c9f7-49e0-b9d2-e8121cf589af",
-      "Name": "psbilbAzureResourceGroup",
-      "Label": "Azure Resource Group",
-      "HelpText": "Resource Group Load Balancer belongs to. Eg. ProductionAus",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "44dfd700-28eb-463c-923a-58cc5ab76eb0",
-      "Name": "psbilbAzureMachineName",
-      "Label": "Azure Machine Name",
-      "HelpText": "Name of Virtual Machine to add to Load Balancer. Eg Web01",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "337bb455-a17c-4251-9543-26cb9ffd7087",
-      "Name": "psbilbAzureLoadBalancer",
-      "Label": "Azure Load Balancer",
-      "HelpText": "Name of Load Balancer. Eg. LoadBalacer01",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0162154d-83ac-41ca-bd6d-8f983187eccd",
-      "Name": "psbilbAzureLoadBalancerBackEndPoolName",
-      "Label": "Azure Load Balancer Back End Pool Name",
-      "HelpText": "Name of Backend Pool on Azure Load Balancer. Eg. WebServers",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-06-22T10:39:16.450Z",
-    "OctopusVersion": "2020.2.8",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "benjimac93",
-  "Category": "Azure"
-}
\ No newline at end of file
diff --git a/step-templates/akamai-content-purge.json b/step-templates/akamai-content-purge.json
deleted file mode 100644
index 8b9e645d9..000000000
--- a/step-templates/akamai-content-purge.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-  "Id": "0bfe41dc-50b0-44a7-abe3-e6ba2a6d317a",
-  "Name": "Akamai - Content Purge",
-  "Description": "Allows to purge content using the Content Control Utility (CCU) v2 REST API.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$clientToken = $OctopusParameters['AkamaiClientToken']\r\n$clientAccessToken = $OctopusParameters['AkamaiClientAccessToken']\r\n$clientSecret = $OctopusParameters['AkamaiSecret']\r\n$queueName = $OctopusParameters['AkamaiQueue']\r\n$objects = $OctopusParameters['AkamaiObjects'] -split \",\"\r\n$type = $OctopusParameters['AkamaiType']\r\n$action = $OctopusParameters['AkamaiAction']\r\n$domain = $OctopusParameters['AkamaiDomain']\r\n$proxyUser = $OctopusParameters['ProxyUser']\r\n$proxyPassword = $OctopusParameters['ProxyPassword']\r\n\r\n$wait = [bool]::Parse($OctopusParameters['WaitForPurgeToComplete'])\r\n$maxChecks = [int]::Parse($OctopusParameters['CheckLimit'])\r\n\r\nif ($proxyUser) {\r\n    $securePassword = ConvertTo-SecureString $proxyPassword -AsPlainText -Force\r\n    $proxyCredential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $proxyUser,$securePassword\r\n\r\n    (New-Object System.Net.WebClient).Proxy.Credentials=$proxyCredential\r\n}\r\n\r\n# Copied from https://github.com/akamai-open/AkamaiOPEN-powershell/blob/master/Invoke-AkamaiOPEN.ps1\r\nfunction Invoke-AkamaiOpenRequest {\r\n    param(\r\n        [Parameter(Mandatory=$true)][string]$Method, \r\n        [Parameter(Mandatory=$true)][string]$ClientToken, \r\n        [Parameter(Mandatory=$true)][string]$ClientAccessToken, \r\n        [Parameter(Mandatory=$true)][string]$ClientSecret, \r\n        [Parameter(Mandatory=$true)][string]$ReqURL, \r\n        [Parameter(Mandatory=$false)][string]$Body)\r\n\r\n    #Function to generate HMAC SHA256 Base64\r\n    Function Crypto ($secret, $message)\r\n    {\r\n\t    [byte[]] $keyByte = [System.Text.Encoding]::ASCII.GetBytes($secret)\r\n\t    [byte[]] $messageBytes = [System.Text.Encoding]::ASCII.GetBytes($message)\r\n\t    $hmac = new-object System.Security.Cryptography.HMACSHA256((,$keyByte))\r\n\t    [byte[]] $hashmessage = $hmac.ComputeHash($messageBytes)\r\n\t    $Crypt = [System.Convert]::ToBase64String($hashmessage)\r\n\r\n\t    return $Crypt\r\n    }\r\n\r\n    #ReqURL Verification\r\n    If (($ReqURL -as [System.URI]).AbsoluteURI -eq $null -or $ReqURL -notmatch \"akamai.com\")\r\n    {\r\n\t    throw \"Error: Ivalid Request URI\"\r\n    }\r\n\r\n    #Sanitize Method param\r\n    $Method = $Method.ToUpper()\r\n\r\n    #Split $ReqURL for inclusion in SignatureData\r\n    $ReqArray = $ReqURL -split \"(.*\\/{2})(.*?)(\\/)(.*)\"\r\n\r\n    #Timestamp for request signing\r\n    $TimeStamp = [DateTime]::UtcNow.ToString(\"yyyyMMddTHH:mm:sszz00\")\r\n\r\n    #GUID for request signing\r\n    $Nonce = [GUID]::NewGuid()\r\n\r\n    #Build data string for signature generation\r\n    $SignatureData = $Method + \"`thttps`t\"\r\n    $SignatureData += $ReqArray[2] + \"`t\" + $ReqArray[3] + $ReqArray[4]\r\n\r\n    if (($Body -ne $null) -and ($Method -ceq \"POST\"))\r\n    {\r\n\t    $Body_SHA256 = [System.Security.Cryptography.SHA256]::Create()\r\n\t    $Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body.ToString())))\r\n\r\n\t    $SignatureData += \"`t`t\" + $Post_Hash + \"`t\"\r\n    }\r\n    else\r\n    {\r\n\t    $SignatureData += \"`t`t`t\"\r\n    }\r\n\r\n    $SignatureData += \"EG1-HMAC-SHA256 \"\r\n    $SignatureData += \"client_token=\" + $ClientToken + \";\"\r\n    $SignatureData += \"access_token=\" + $ClientAccessToken + \";\"\r\n    $SignatureData += \"timestamp=\" + $TimeStamp  + \";\"\r\n    $SignatureData += \"nonce=\" + $Nonce + \";\"\r\n\r\n    #Generate SigningKey\r\n    $SigningKey = Crypto -secret $ClientSecret -message $TimeStamp\r\n\r\n    #Generate Auth Signature\r\n    $Signature = Crypto -secret $SigningKey -message $SignatureData\r\n\r\n    #Create AuthHeader\r\n    $AuthorizationHeader = \"EG1-HMAC-SHA256 \"\r\n    $AuthorizationHeader += \"client_token=\" + $ClientToken + \";\"\r\n    $AuthorizationHeader += \"access_token=\" + $ClientAccessToken + \";\"\r\n    $AuthorizationHeader += \"timestamp=\" + $TimeStamp + \";\"\r\n    $AuthorizationHeader += \"nonce=\" + $Nonce + \";\"\r\n    $AuthorizationHeader += \"signature=\" + $Signature\r\n\r\n    #Create IDictionary to hold request headers\r\n    $Headers = @{}\r\n\r\n    #Add Auth header\r\n    $Headers.Add('Authorization',$AuthorizationHeader)\r\n\r\n    #Add additional headers if POSTing or PUTing\r\n    If (($Method -ceq \"POST\") -or ($Method -ceq \"PUT\"))\r\n    {\r\n\t    $Body_Size = [System.Text.Encoding]::UTF8.GetByteCount($Body)\r\n\t    $Headers.Add('max-body',$Body_Size.ToString())\r\n\r\n        # turn off the \"Expect: 100 Continue\" header\r\n        # as it's not supported on the Akamai side.\r\n        [System.Net.ServicePointManager]::Expect100Continue = $false\r\n    }\r\n\r\n    #Check for valid Methods and required switches\r\n    If (($Method -ceq \"POST\") -and ($Body -ne $null))\r\n    {\r\n        Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'\r\n    }\r\n    elseif  (($Method -ceq \"PUT\") -and ($Body -ne $null))\r\n    {\r\n\t    #Invoke API call with PUT and return\r\n\t    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'\r\n    }\r\n    elseif (($Method -ceq \"GET\") -or ($Method -ceq \"DELETE\"))\r\n    {\r\n\t    #Invoke API call with GET or DELETE and return\r\n\t    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers\r\n    }\r\n    else\r\n    {\r\n\t    throw \"Error: Invalid -Method specified or missing required parameter\"\r\n    }\r\n}\r\n\r\nfunction Perform-AkamaiRequest {\r\n    param (\r\n        [string]$request, \r\n        [string]$method=\"Get\", \r\n        [int]$expectedStatusCode=200, \r\n        $body)\r\n\r\n    $baseUrl = \"http://private-anon-3934daf8d-akamaiopen2purgeccuv2production.apiary-mock.com\"\r\n    # $baseUrl = \"https://api.ccu.akamai.com\"\r\n    $uri = \"{0}{1}\" -f $baseUrl,$request\r\n\r\n    if ($uri -match \"mock\"){\r\n        $requestHeaders = @{'Cache-Control'='no-cache,proxy-revalidate'}\r\n        $response = Invoke-RestMethod -Uri $uri -Method $method -DisableKeepAlive -Headers $requestHeaders -Body $body\r\n    } else {\r\n        $json = ConvertTo-Json $body -Compress\r\n        $response = Invoke-AkamaiOpenRequest -Method $method -ClientToken $clientToken -ClientAccessToken $clientAccessToken -ClientSecret $clientSecret -ReqURL $uri -Body $json\r\n    }\r\n\r\n    if ($response.httpStatus -ne $expectedStatusCode){\r\n        Write-Error \"Request not processed correctly: $($response.detail)\"\r\n    } elseif ($response.detail) {\r\n        Write-Verbose $response.detail\r\n    }\r\n\r\n    Write-Verbose $response\r\n\r\n    $response\r\n}\r\n\r\nfunction Get-QueueSize {\r\n    param ([string]$queueName)\r\n\r\n    $queueSize = Perform-AkamaiRequest \"/ccu/v2/queues/$queueName\"\r\n\r\n    $queueSize \r\n}\r\n\r\nfunction Request-Purge {\r\n    param ($objects,[string]$type=\"arl\",[string]$action=\"remove\",[string]$domain=\"production\")\r\n\r\n    $body = @{\r\n        objects = $objects\r\n        action = $action\r\n        type = $type\r\n        domain = $domain\r\n    }\r\n\r\n    Perform-AkamaiRequest \"/ccu/v2/queues/$queueName\" \"Post\" 201 $body\r\n}\r\n\r\nfunction Get-PurgeStatus {\r\n    param ([string]$purgeId)\r\n\r\n    $status = Perform-AkamaiRequest \"/ccu/v2/purges/$purgeId\"\r\n\r\n    Write-Host \"Purge status: $($status.purgeStatus)\"\r\n\r\n    $status\r\n}\r\n\r\n$queueSize = Get-QueueSize $queueName\r\nWrite-Output \"$($queueName) queue size is $($queueSize.queueLength)\"\r\n\r\n$purge = Request-Purge $objects $type $action $domain\r\n\r\nWrite-Output \"Purge request created\"\r\nWrite-Output \"PurgeId: $($purge.purgeId)\"\r\nWrite-Output \"SupportId: $($purge.supportId)\" \r\n\r\nif ($wait) {\r\n    $check = 1\r\n    $purgeStatus = \"Unknown\"\r\n\r\n    do {\r\n        if ($check -gt 1) {\r\n            Write-Output \"Waiting $($purge.pingAfterSeconds) seconds before checking purge status again\"\r\n            Start-Sleep -Seconds $purge.pingAfterSeconds\r\n        }\r\n        $status = Get-PurgeStatus $purge.purgeId \r\n        $purgeStatus = $status.purgeStatus\r\n        $check = $check + 1\r\n        if ($check -gt $maxChecks) { \r\n            Write-Output \"Maximum number of checks reached\"\r\n        }\r\n    } while ($status.purgeStatus -ne \"Done\" -and $check -le $maxChecks)\r\n\r\n    if ($status.purgeStatus -ne \"Done\") {\r\n        Write-Error \"Purge status is not Done\"\r\n    }\r\n}",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "AkamaiClientToken",
-      "Label": "Client Token",
-      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiClientAccessToken",
-      "Label": "Client Access Token",
-      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiSecret",
-      "Label": "Secret",
-      "HelpText": "Authentication password used in client authentication. Available in Luna Portal.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "AkamaiQueue",
-      "Label": "Queue",
-      "HelpText": "Purge requests queue",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "default\nemergency"
-      }
-    },
-    {
-      "Name": "AkamaiObjects",
-      "Label": "Objects",
-      "HelpText": "A comma separated list of objects to purge, either URLs or CPCODEs",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiType",
-      "Label": "Type",
-      "HelpText": "The type associated with the items in the Objects parameter",
-      "DefaultValue": "arl",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "arl\ncpcode"
-      }
-    },
-    {
-      "Name": "AkamaiAction",
-      "Label": "Action",
-      "HelpText": "The action to execute on the purge operation",
-      "DefaultValue": "invalidate",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "invalidate\nremove"
-      }
-    },
-    {
-      "Name": "AkamaiDomain",
-      "Label": "Domain",
-      "HelpText": "The Akamai domain to perform the purge operation on",
-      "DefaultValue": "production",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "production\nstaging"
-      }
-    },
-    {
-      "Name": "ProxyUser",
-      "Label": "Proxy User",
-      "HelpText": "Optional, a user name for the proxy if required in the network",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ProxyPassword",
-      "Label": "Proxy Password",
-      "HelpText": "Optional, the password for the account to use if a Proxy User was specified",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "WaitForPurgeToComplete",
-      "Label": "Wait",
-      "HelpText": "Indicates if the step should wait for the purge operation to complete",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "false|No\ntrue|Yes"
-      }
-    },
-    {
-      "Name": "CheckLimit",
-      "Label": "Check Limit",
-      "HelpText": "Maximum number of times to check for the purge operation to complete if set to **Wait**",
-      "DefaultValue": "2",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText",
-        "Octopus.SelectOptions": "0\n5\n10"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-07-11T14:00:00.000+00:00",
-  "LastModifiedBy": "roberto-mardeni",
-  "$Meta": {
-    "ExportedAt": "2016-07-11T14:27:34.748+00:00",
-    "OctopusVersion": "3.3.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "akamai"
-}
\ No newline at end of file
diff --git a/step-templates/akamai-cpcode-fastpurge.json b/step-templates/akamai-cpcode-fastpurge.json
deleted file mode 100644
index 0e5fe2b2e..000000000
--- a/step-templates/akamai-cpcode-fastpurge.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "Id": "ee4a6957-7d98-4dcf-8f94-78f19ab1c6e0",
-  "Name": "Akamai - CPCode Fast Purge",
-  "Description": "Allows to purge CP codes using the Content Control Utility (CCU) v3 REST API.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$clientToken = $OctopusParameters['AkamaiClientToken']\n$clientAccessToken = $OctopusParameters['AkamaiClientAccessToken']\n$clientSecret = $OctopusParameters['AkamaiSecret']\n$cpcode = $OctopusParameters['AkamaiCPCode']\n$akhost = $OctopusParameters['AkamaiHost']\n$action = $OctopusParameters['AkamaiAction']\n$domain = $OctopusParameters['AkamaiDomain']\n\n# NOTICE : PowerShell EdgeGrid Client has been deprecated and will reach End of Life soon. For more information, please see https://developer.akamai.com/blog/2018/11/13/akamai-powershell-edgegrid-client-end-life-notice\n# Copied from https://github.com/akamai-open/AkamaiOPEN-powershell/blob/master/Invoke-AkamaiOPEN.ps1\nfunction Invoke-AkamaiOpenRequest {\n\tparam(\n\t\t[Parameter(Mandatory=$true)]\n\t\t[ValidateSet(\"GET\", \"PUT\", \"POST\", \"DELETE\")]\n\t\t[string]$Method,\n\t\t[Parameter(Mandatory=$true)][string]$ClientToken,\n\t\t[Parameter(Mandatory=$true)][string]$ClientAccessToken,\n\t\t[Parameter(Mandatory=$true)][string]$ClientSecret,\n\t\t[Parameter(Mandatory=$true)][string]$ReqURL,\n\t\t[Parameter(Mandatory=$false)][string]$Body,\n\t\t[Parameter(Mandatory=$false)][string]$MaxBody = 131072\n\t\t)\n\n\t#Function to generate HMAC SHA256 Base64\n\tFunction Crypto ($secret, $message)\n\t{\n\t\t[byte[]] $keyByte = [System.Text.Encoding]::ASCII.GetBytes($secret)\n\t\t[byte[]] $messageBytes = [System.Text.Encoding]::ASCII.GetBytes($message)\n\t\t$hmac = new-object System.Security.Cryptography.HMACSHA256((,$keyByte))\n\t\t[byte[]] $hashmessage = $hmac.ComputeHash($messageBytes)\n\t\t$Crypt = [System.Convert]::ToBase64String($hashmessage)\n\n\t\treturn $Crypt\n\t}\n\n\t#ReqURL Verification\n\tIf (($ReqURL -as [System.URI]).AbsoluteURI -eq $null -or $ReqURL -notmatch \"akamaiapis.net\")\n\t{\n\t\tthrow \"Error: Ivalid Request URI\"\n\t}\n\n\t#Sanitize Method param\n\t$Method = $Method.ToUpper()\n\n\t#Split $ReqURL for inclusion in SignatureData\n\t$ReqArray = $ReqURL -split \"(.*\\/{2})(.*?)(\\/)(.*)\"\n\n\t#Timestamp for request signing\n\t$TimeStamp = [DateTime]::UtcNow.ToString(\"yyyyMMddTHH:mm:sszz00\")\n\n\t#GUID for request signing\n\t$Nonce = [GUID]::NewGuid()\n\n\t#Build data string for signature generation\n\t$SignatureData = $Method + \"`thttps`t\"\n\t$SignatureData += $ReqArray[2] + \"`t\" + $ReqArray[3] + $ReqArray[4]\n\n\t#Add body to signature. Truncate if body is greater than max-body (Akamai default is 131072). PUT Medthod does not require adding to signature.\n\t\n\tif ($Body -and $Method -eq \"POST\")\n\t{\n\t  $Body_SHA256 = [System.Security.Cryptography.SHA256]::Create()\n\t  if($Body.Length -gt $MaxBody){\n\t\t$Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body.Substring(0,$MaxBody))))\n\t  }\n\t  else{\n\t\t$Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body)))\n\t  }\n\n\t  $SignatureData += \"`t`t\" + $Post_Hash + \"`t\"\n\t}\n\telse\n\t{\n\t  $SignatureData += \"`t`t`t\"\n\t}\n\n\t$SignatureData += \"EG1-HMAC-SHA256 \"\n\t$SignatureData += \"client_token=\" + $ClientToken + \";\"\n\t$SignatureData += \"access_token=\" + $ClientAccessToken + \";\"\n\t$SignatureData += \"timestamp=\" + $TimeStamp  + \";\"\n\t$SignatureData += \"nonce=\" + $Nonce + \";\"\n\n\t#Generate SigningKey\n\t$SigningKey = Crypto -secret $ClientSecret -message $TimeStamp\n\n\t#Generate Auth Signature\n\t$Signature = Crypto -secret $SigningKey -message $SignatureData\n\n\t#Create AuthHeader\n\t$AuthorizationHeader = \"EG1-HMAC-SHA256 \"\n\t$AuthorizationHeader += \"client_token=\" + $ClientToken + \";\"\n\t$AuthorizationHeader += \"access_token=\" + $ClientAccessToken + \";\"\n\t$AuthorizationHeader += \"timestamp=\" + $TimeStamp + \";\"\n\t$AuthorizationHeader += \"nonce=\" + $Nonce + \";\"\n\t$AuthorizationHeader += \"signature=\" + $Signature\n\n\t#Create IDictionary to hold request headers\n\t$Headers = @{}\n\n\t#Add Auth header\n\t$Headers.Add('Authorization',$AuthorizationHeader)\n\n\t#Add additional headers if POSTing or PUTing\n\tIf ($Body)\n\t{\n\t  # turn off the \"Expect: 100 Continue\" header\n\t  # as it's not supported on the Akamai side.\n\t  [System.Net.ServicePointManager]::Expect100Continue = $false\n\t}\n\t\n\t#Check for valid Methods and required switches\n\t[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12\n\tif ($Method -eq \"PUT\" -or $Method -eq \"POST\") {\n\t\tif ($Body) {\n\t\t\ttry{\n\t\t\t\tInvoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'\n\t\t\t}\n\t\t\tcatch{\n\t\t\t\tWrite-Host $_ -fore green\n\t\t\t}\n\t\t}\n\t\telse {\n\t\t  Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -ContentType 'application/json'\n\t\t}\n\t}\n\telse {\n\t\t#Invoke API call with GET or DELETE and return\n\t\tInvoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers\n\t}\n}\n\nfunction Perform-AkamaiRequest {\n    param (\n        [string]$request, \n        [string]$method=\"Get\", \n        [int]$expectedStatusCode=200, \n        $body)\n\n    $baseUrl = \"https://\" + $akhost\n    $uri = \"{0}{1}\" -f $baseUrl,$request\n\n    $json = ConvertTo-Json $body -Compress\n    $response = Invoke-AkamaiOpenRequest -Method $method -ClientToken $clientToken -ClientAccessToken $clientAccessToken -ClientSecret $clientSecret -ReqURL $uri -Body $json\n\t\n    if ($response.httpStatus -ne $expectedStatusCode){\n        Write-Error \"Request not processed correctly: $($response.detail)\"\n    } elseif ($response.detail) {\n        Write-Verbose $response.detail\n    }\n\n    $response\n}\n\nfunction Request-Purge {\n    param ([Int]$cpcode,[string]$action=\"remove\",[string]$domain=\"production\")\n\n    $body = @{\n        objects = @($cpcode)\n    }\n\n    Perform-AkamaiRequest \"/ccu/v3/$action/cpcode/$domain\" \"Post\" 201 $body\n}\n\n$purge = Request-Purge $cpcode $action $domain\n\nWrite-Output \"Purge request created\"\nWrite-Output \"PurgeId: $($purge.purgeId)\"\nWrite-Output \"SupportId: $($purge.supportId)\" ",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "293e2cc1-e471-4801-8a9c-42633a3c9122",
-      "Name": "AkamaiClientToken",
-      "Label": "Client Token",
-      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e0edcbea-bfdd-4781-9a8a-55b08eba6ed5",
-      "Name": "AkamaiClientAccessToken",
-      "Label": "Client Access Token",
-      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c1ea0502-f68e-4890-99a2-3c721d16b7f0",
-      "Name": "AkamaiSecret",
-      "Label": "Secret",
-      "HelpText": "Authentication password used in client authentication. Available in Luna Portal.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "f54e1b4a-3960-483b-88c9-5ea7a94698a0",
-      "Name": "AkamaiCPCode",
-      "Label": "CPCode",
-      "HelpText": "The CPCode for which to execute the purge operation",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a334eabb-8a36-4c24-b728-52f834f8a893",
-      "Name": "AkamaiHost",
-      "Label": "Host",
-      "HelpText": "Akamai Host (no HTTP/HTTPS). Available in Luna Portal.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8482001d-a6fc-4e72-b9be-8cc584a39b36",
-      "Name": "AkamaiAction",
-      "Label": "Action",
-      "HelpText": "The action to execute on the purge operation",
-      "DefaultValue": "invalidate",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "invalidate\nremove"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e1c3dfa0-7118-4e23-9315-c03ea3662125",
-      "Name": "AkamaiDomain",
-      "Label": "Domain",
-      "HelpText": "The Akamai domain to perform the purge operation on",
-      "DefaultValue": "production",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "production\nstaging"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2019-02-11T18:51:20.358Z",
-  "LastModifiedBy": "ajwightm",
-  "$Meta": {
-    "ExportedAt": "2019-02-11T18:51:20.358Z",
-    "OctopusVersion": "3.13.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "Akamai"
-}
diff --git a/step-templates/akamai-fast-content-purge.json b/step-templates/akamai-fast-content-purge.json
deleted file mode 100644
index 5a8b4e221..000000000
--- a/step-templates/akamai-fast-content-purge.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "Id": "f8e2e47b-62ba-44a0-881c-d1911dc14428",
-  "Name": "Akamai - Content Fast Purge",
-  "Description": "Allows to purge content using the Content Control Utility (CCU) v3 REST API.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$clientToken = $OctopusParameters['AkamaiClientToken']\r\n$clientAccessToken = $OctopusParameters['AkamaiClientAccessToken']\r\n$clientSecret = $OctopusParameters['AkamaiSecret']\r\n$hostname = $OctopusParameters['AkamaiHostname']\r\n$objects = $OctopusParameters['AkamaiObjects'] -split \",\"\r\n$action = $OctopusParameters['AkamaiAction']\r\n$domain = $OctopusParameters['AkamaiDomain']\r\n$proxyUser = $OctopusParameters['ProxyUser']\r\n$proxyPassword = $OctopusParameters['ProxyPassword']\r\n\r\nif ($proxyUser) {\r\n    $securePassword = ConvertTo-SecureString $proxyPassword -AsPlainText -Force\r\n    $proxyCredential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $proxyUser,$securePassword\r\n\r\n    (New-Object System.Net.WebClient).Proxy.Credentials=$proxyCredential\r\n}\r\n\r\n# Copied from https://github.com/akamai-open/AkamaiOPEN-powershell/blob/master/Invoke-AkamaiOPEN.ps1\r\nfunction Invoke-AkamaiOpenRequest {\r\n    param(\r\n        [Parameter(Mandatory=$true)][string]$Method, \r\n        [Parameter(Mandatory=$true)][string]$ClientToken, \r\n        [Parameter(Mandatory=$true)][string]$ClientAccessToken, \r\n        [Parameter(Mandatory=$true)][string]$ClientSecret, \r\n        [Parameter(Mandatory=$true)][string]$ReqURL, \r\n        [Parameter(Mandatory=$false)][string]$Body)\r\n\r\n    #Function to generate HMAC SHA256 Base64\r\n    Function Crypto ($secret, $message)\r\n    {\r\n\t    [byte[]] $keyByte = [System.Text.Encoding]::ASCII.GetBytes($secret)\r\n\t    [byte[]] $messageBytes = [System.Text.Encoding]::ASCII.GetBytes($message)\r\n\t    $hmac = new-object System.Security.Cryptography.HMACSHA256((,$keyByte))\r\n\t    [byte[]] $hashmessage = $hmac.ComputeHash($messageBytes)\r\n\t    $Crypt = [System.Convert]::ToBase64String($hashmessage)\r\n\r\n\t    return $Crypt\r\n    }\r\n\r\n    #ReqURL Verification\r\n    If (($ReqURL -as [System.URI]).AbsoluteURI -eq $null -or $ReqURL -notmatch \"akamai.com\")\r\n    {\r\n\t    throw \"Error: Ivalid Request URI\"\r\n    }\r\n\r\n    #Sanitize Method param\r\n    $Method = $Method.ToUpper()\r\n\r\n    #Split $ReqURL for inclusion in SignatureData\r\n    $ReqArray = $ReqURL -split \"(.*\\/{2})(.*?)(\\/)(.*)\"\r\n\r\n    #Timestamp for request signing\r\n    $TimeStamp = [DateTime]::UtcNow.ToString(\"yyyyMMddTHH:mm:sszz00\")\r\n\r\n    #GUID for request signing\r\n    $Nonce = [GUID]::NewGuid()\r\n\r\n    #Build data string for signature generation\r\n    $SignatureData = $Method + \"`thttps`t\"\r\n    $SignatureData += $ReqArray[2] + \"`t\" + $ReqArray[3] + $ReqArray[4]\r\n\r\n    if (($Body -ne $null) -and ($Method -ceq \"POST\"))\r\n    {\r\n\t    $Body_SHA256 = [System.Security.Cryptography.SHA256]::Create()\r\n\t    $Post_Hash = [System.Convert]::ToBase64String($Body_SHA256.ComputeHash([System.Text.Encoding]::ASCII.GetBytes($Body.ToString())))\r\n\r\n\t    $SignatureData += \"`t`t\" + $Post_Hash + \"`t\"\r\n    }\r\n    else\r\n    {\r\n\t    $SignatureData += \"`t`t`t\"\r\n    }\r\n\r\n    $SignatureData += \"EG1-HMAC-SHA256 \"\r\n    $SignatureData += \"client_token=\" + $ClientToken + \";\"\r\n    $SignatureData += \"access_token=\" + $ClientAccessToken + \";\"\r\n    $SignatureData += \"timestamp=\" + $TimeStamp  + \";\"\r\n    $SignatureData += \"nonce=\" + $Nonce + \";\"\r\n\r\n    #Generate SigningKey\r\n    $SigningKey = Crypto -secret $ClientSecret -message $TimeStamp\r\n\r\n    #Generate Auth Signature\r\n    $Signature = Crypto -secret $SigningKey -message $SignatureData\r\n\r\n    #Create AuthHeader\r\n    $AuthorizationHeader = \"EG1-HMAC-SHA256 \"\r\n    $AuthorizationHeader += \"client_token=\" + $ClientToken + \";\"\r\n    $AuthorizationHeader += \"access_token=\" + $ClientAccessToken + \";\"\r\n    $AuthorizationHeader += \"timestamp=\" + $TimeStamp + \";\"\r\n    $AuthorizationHeader += \"nonce=\" + $Nonce + \";\"\r\n    $AuthorizationHeader += \"signature=\" + $Signature\r\n\r\n    #Create IDictionary to hold request headers\r\n    $Headers = @{}\r\n\r\n    #Add Auth header\r\n    $Headers.Add('Authorization',$AuthorizationHeader)\r\n\r\n    #Add additional headers if POSTing or PUTing\r\n    If (($Method -ceq \"POST\") -or ($Method -ceq \"PUT\"))\r\n    {\r\n\t    $Body_Size = [System.Text.Encoding]::UTF8.GetByteCount($Body)\r\n\t    $Headers.Add('max-body',$Body_Size.ToString())\r\n\r\n        # turn off the \"Expect: 100 Continue\" header\r\n        # as it's not supported on the Akamai side.\r\n        [System.Net.ServicePointManager]::Expect100Continue = $false\r\n    }\r\n\r\n    #Check for valid Methods and required switches\r\n    If (($Method -ceq \"POST\") -and ($Body -ne $null))\r\n    {\r\n        Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'\r\n    }\r\n    elseif  (($Method -ceq \"PUT\") -and ($Body -ne $null))\r\n    {\r\n\t    #Invoke API call with PUT and return\r\n\t    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers -Body $Body -ContentType 'application/json'\r\n    }\r\n    elseif (($Method -ceq \"GET\") -or ($Method -ceq \"DELETE\"))\r\n    {\r\n\t    #Invoke API call with GET or DELETE and return\r\n\t    Invoke-RestMethod -Method $Method -Uri $ReqURL -Headers $Headers\r\n    }\r\n    else\r\n    {\r\n\t    throw \"Error: Invalid -Method specified or missing required parameter\"\r\n    }\r\n}\r\n\r\nfunction Perform-AkamaiRequest {\r\n    param (\r\n        [string]$request, \r\n        [string]$method=\"Get\", \r\n        [int]$expectedStatusCode=200, \r\n        $body)\r\n\r\n    $baseUrl = \"http://private-anon-3934daf8d-akamaiopen2purgeccuv3production.apiary-mock.com\"\r\n    # $baseUrl = \"https://api.ccu.akamai.com\"\r\n    $uri = \"{0}{1}\" -f $baseUrl,$request\r\n\r\n    if ($uri -match \"mock\"){\r\n        $requestHeaders = @{'Cache-Control'='no-cache,proxy-revalidate'}\r\n        $response = Invoke-RestMethod -Uri $uri -Method $method -DisableKeepAlive -Headers $requestHeaders -Body $body\r\n    } else {\r\n        $json = ConvertTo-Json $body -Compress\r\n        $response = Invoke-AkamaiOpenRequest -Method $method -ClientToken $clientToken -ClientAccessToken $clientAccessToken -ClientSecret $clientSecret -ReqURL $uri -Body $json\r\n    }\r\n\r\n    if ($response.httpStatus -ne $expectedStatusCode){\r\n        Write-Error \"Request not processed correctly: $($response.detail)\"\r\n    } elseif ($response.detail) {\r\n        Write-Verbose $response.detail\r\n    }\r\n\r\n    Write-Verbose $response\r\n\r\n    $response\r\n}\r\n\r\nfunction Request-Purge {\r\n    param ($objects,[string]$hostname,[string]$action=\"remove\",[string]$domain=\"production\")\r\n\r\n    $body = @{\r\n        objects = $objects\r\n    }\r\n\r\n    if ($hostname -ne $null -and $hostname -ne \"\") {\r\n        $body = @{\r\n            hostname = $hostname\r\n            objects = $objects\r\n        }\r\n    } \r\n\r\n    Perform-AkamaiRequest \"/ccu/v3/$action/$domain\" \"Post\" 201 $body\r\n}\r\n\r\n$purge = Request-Purge $objects $hostname $action $domain\r\n\r\nWrite-Output \"Purge request created\"\r\nWrite-Output \"PurgeId: $($purge.purgeId)\"\r\nWrite-Output \"SupportId: $($purge.supportId)\" ",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "AkamaiClientToken",
-      "Label": "Client Token",
-      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiClientAccessToken",
-      "Label": "Client Access Token",
-      "HelpText": "Authentication token used in client authentication. Available in Luna Portal.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiSecret",
-      "Label": "Secret",
-      "HelpText": "Authentication password used in client authentication. Available in Luna Portal.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "AkamaiHostname",
-      "Label": "Hostname",
-      "HelpText": "The hostname for which to execute the purge operation",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiObjects",
-      "Label": "Objects",
-      "HelpText": "A comma separated list of objects to purge, only URLs",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AkamaiAction",
-      "Label": "Action",
-      "HelpText": "The action to execute on the purge operation",
-      "DefaultValue": "invalidate",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "invalidate\nremove"
-      }
-    },
-    {
-      "Name": "AkamaiDomain",
-      "Label": "Domain",
-      "HelpText": "The Akamai domain to perform the purge operation on",
-      "DefaultValue": "production",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "production\nstaging"
-      }
-    },
-    {
-      "Name": "ProxyUser",
-      "Label": "Proxy User",
-      "HelpText": "Optional, a user name for the proxy if required in the network",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ProxyPassword",
-      "Label": "Proxy Password",
-      "HelpText": "Optional, the password for the account to use if a Proxy User was specified",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-07-11T14:00:00.000+00:00",
-  "LastModifiedBy": "roberto-mardeni",
-  "$Meta": {
-    "ExportedAt": "2016-07-11T14:30:28.569+00:00",
-    "OctopusVersion": "3.3.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "akamai"
-}
\ No newline at end of file
diff --git a/step-templates/ansible-tower-run-template.json b/step-templates/ansible-tower-run-template.json
deleted file mode 100644
index 53b351bd0..000000000
--- a/step-templates/ansible-tower-run-template.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "Id": "9a3d15aa-5a48-4922-9651-cf4ae75730dd",
-  "Name": "Ansible Tower - Run Template",
-  "Description": "Run a workflow or job template in Ansible Tower",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# There have been reported issues when using the default JSON parser with Invoke-RestMethod\n# on PowerShell 5. So we are going to pull in a different assembly to do the parsing for us.\n# This parser appears to be more reliable.\n[System.Reflection.Assembly]::LoadWithPartialName(\"System.Web.Extensions\")\n$jsonParser = New-Object -TypeName System.Web.Script.Serialization.JavaScriptSerializer\n$jsonParser.MaxJsonLength = 104857600 #100mb as bytes, default is 2mb\n\nfunction Write-AnsibleLine([String] $text) {\n    # split text at ESC-char\n    $ansi_colors = @(\n        '[0;30m' #= @{ fg = ConsoleColor.Black }\n        '[0;31m' #= @{ fg = ConsoleColor.DarkRed }\n        '[0;32m' #= @{ fg = ConsoleColor.DarkGreen }\n        '[0;33m' #= @{ fg = ConsoleColor.DarkYellow }\n        '[0;34m' #= @{ fg = ConsoleColor.DarkBlue }\n        '[0;35m' #= @{ fg = ConsoleColor.DarkMagenta }\n        '[0;36m' #= @{ fg = ConsoleColor.DarkCyan }\n        '[0;37m' #= @{ fg = ConsoleColor.White }\n        '[0m' #= @{ fg = $null; bg = $null }\n        '[1;35m' #= Magent (ansible warnings)\n        '[30;1m' #= @{ fg = ConsoleColor.Grey }\n        '[31;1m' #= @{ fg = ConsoleColor.Red }\n        '[32;1m' #= @{ fg = ConsoleColor.Green }\n        '[33;1m' #= @{ fg = ConsoleColor.Yellow }\n        '[34;1m' #= @{ fg = ConsoleColor.Blue }\n        '[35;1m' #= @{ fg = ConsoleColor.Magenta }\n        '[36;1m' #= @{ fg = ConsoleColor.Cyan }\n        '[37;1m' #= @{ fg = ConsoleColor.White }\n        '[0;40m' #= @{ bg = ConsoleColor.Black }\n        '[0;41m' #= @{ bg = ConsoleColor.DarkRed }\n        '[0;42m' #= @{ bg = ConsoleColor.DarkGreen }\n        '[0;43m' #= @{ bg = ConsoleColor.DarkYellow }\n        '[0;44m' #= @{ bg = ConsoleColor.DarkBlue }\n        '[0;45m' #= @{ bg = ConsoleColor.DarkMagenta }\n        '[0;46m' #= @{ bg = ConsoleColor.DarkCyan }\n        '[0;47m' #= @{ bg = ConsoleColor.White }\n        '[40;1m' #= @{ bg = ConsoleColor.DarkGrey }\n        '[41;1m' #= @{ bg = ConsoleColor.Red }\n        '[42;1m' #= @{ bg = ConsoleColor.Green }\n        '[43;1m' #= @{ bg = ConsoleColor.Yellow }\n        '[44;1m' #= @{ bg = ConsoleColor.Blue }\n        '[45;1m' #= @{ bg = ConsoleColor.Magenta }\n        '[46;1m' #= @{ bg = ConsoleColor.Cyan }\n        '[47;1m' #= @{ bg = ConsoleColor.White }\n    )\n    foreach ($segment in $text.split([char] 27)) {\n        foreach($code in $ansi_colors) {\n            if($segment.startswith($code)) {\n                $segment = $segment.replace($code, \"\")\n            }\n        }\n        Write-Host -NoNewline $segment\n    }\n    Write-Host \"\"\n}\n \n \nFunction Resolve-Tower-Asset{\n    Param($Name, $Url)\n    Process {\n        if($script:Verbose) { Write-Host \"Resolving name $Name\" }\n        $object = $null\n        if($Name -match '^[0-9]+$') {\n            if($script:Verbose) { Write-Host \"Using $Name as ID as its an int already\" }\n            $url = \"$Url/$Name/\"\n            try { $object = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object]) }\n            catch {\n                Write-Host \"Error when resolving ID for $Name\"\n                Write-Host $_\n                return $null\n            }\n        } else {\n           if($script:Verbose) { Write-Host \"Looking up ID of name $Name\" }\n            $url = \"$Url/?name=$Name\"\n            try { $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object]) }\n            catch {\n                Write-Host \"Unable to resolve name $Name\"\n                Write-Host $_\n                return $null\n            }\n            if($response.count -eq 0) {\n                Write-Host \"Got no results when trying to get ID for $Name\"\n                return $null\n            } elseif($response.count -ne 1) {\n                Write-Host \"Did not get a unique job ID for job name $Name\"\n                return $null\n            }\n            if($script:Verbose) { Write-Host \"Resolved to ID $($response.results[0].id)\" }\n            $object = $response.results[0]\n        }\n        return $object\n    }\n}\n\n\nfunction Get-Auth-Headers {\n    # If we did not get a TowerOAuthToken or a (TowerUsername and TowerPassword) then we can't even try to auth\n    if(-not (($TowerUsername -and $TowerPassword) -or $TowerOAuthToken)) {\n        Fail-Step \"Please pass an OAuth Token and or a Username/Password to authenticate to Tower with\"\n    }\n\n    if($TowerOAuthToken) {\n        if($verbose) { Write-Host \"Testing OAuth token\" }\n        $token_headers = @{ \"Authorization\" = \"Bearer $TowerOAuthToken\" }\n        try {\n            # We have to assign it to something or we get a line in the output\n            $junk = $jsonParser.Deserialize((Invoke-WebRequest \"$api_base/job_templates/?name=Octopus\" -Method GET -Headers $token_headers -UseBasicParsing), [System.Object])\n            $script:auth_headers = $token_headers\n            return\n        } catch {\n            Write-Host \"Unable to authenticate to the Tower server with OAuth token\"\n            Write-Host $_\n        }\n    }\n\n    if(-not ($TowerUsername -and $TowerPassword)) {\n        Fail-Step \"No username/password to fall back on\"\n    }\n\n    if($verbose) { Write-Host \"Testing basic auth\" }\n    $pair = \"${TowerUsername}:${TowerPassword}\"\n    $bytes = [System.Text.Encoding]::ASCII.GetBytes($pair)\n    $base64 = [System.Convert]::ToBase64String($bytes)\n    $basic_auth_value = \"Basic $base64\"\n    $headers = @{ \"Authorization\" = $basic_auth_value }\n    try {\n        # We have to assign it to something or we get a line in the output\n        $junk = $jsonParser.Deserialize((Invoke-WebRequest \"$api_base/job_templates/?name=Octopus\" -Method GET -Headers $headers -UseBasicParsing), [System.Object])\n        $script:auth_headers = $headers\n    } catch {\n        Write-Host $_\n        Fail-Step \"Username password combination failed to work\"\n    }\n\n    if ($script:Verbose) { Write-Host \"Attempting to get authentcation Token for $TowerUsername\" }\n    $body = @{\n        username = $TowerUsername\n        password = $TowerPassword\n    } | ConvertTo-Json\n    $url = \"$api_base/authtoken/\"\n    try {\n        $auth_token = $jsonParser.Deserialize((Invoke-WebRequest $url -Method POST -Headers $headers -Body $body -ContentType \"application/json\" -UseBasicParsing), [System.Object])\n        $script:auth_headers = @{ Authorization = \"Token $($auth_token.token)\" }\n        return\n    } catch {\n        if($_.Exception.Response.StatusCode -eq 404) {\n            Write-Host(\">>> Server does not support authtoken, try using an OAuth Token\")\n            Write-Host(\">>> Defaulting to perpetual basic auth. This can be slow for authentication with external sources\")\n            return\n        } else {\n            Write-Host $_\n            Fail-Step \"Unable to authenticate to the Tower server for Auth token\"\n        }\n    }\n}\n\nfunction Watch-Job-Complete {\n    Param($Id)\n    Process {\n        $last_log_id = 0\n        while($True) {\n            # First log any events if the user wants them\n            if($TowerImportLogs) {\n                $url = \"$api_base/jobs/$Id/job_events/?id__gt=$last_log_id\"\n                $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])\n                foreach($result in $response.results) {\n                    if($last_log_id -lt $result.id) { $last_log_id = $result.id }\n                    if($result.event_data -and $result.event_data.res -and $result.event_data.res.output) {\n                        foreach($line in $result.event_data.res.output) {\n                            Write-AnsibleLine($line)\n                        }\n                    } else {\n                        $line = $result.stdout\n                        Write-AnsibleLine($line)\n                    }\n                }\n            }\n \n            # Now check the status of the job\n            $url = \"$api_base/jobs/$Id/\"\n            $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])\n            if($response.finished) {\n               $response.failed\n               return\n            } else {\n               Start-Sleep -s $SecondsBetweenChecks\n            }\n        }\n    }\n}\n \nfunction Watch-Workflow-Complete {\n    Param($Id)\n    Process {\n        $workflow_node_id = 0\n        while($True) {\n            # Check to see if there are any jobs we need to follow\n            $url = \"$tower_base/api/v2/workflow_jobs/$Id/workflow_nodes/?id__gt=$workflow_node_id\"\n            $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])\n\n            # If there are no nodes whose ID is > the last one we looked at we can see if we are complete\n            if($response.count -eq 0) {\n                $url = \"$tower_base/api/v2/workflow_jobs/$Id/\"\n                $response = $jsonParser.Deserialize((Invoke-WebRequest $url -Method GET -Headers $script:auth_headers -UseBasicParsing), [System.Object])\n                if($response.finished) {\n                    $response.failed\n                    return\n                } else {\n                    Start-Sleep -s $SecondsBetweenChecks\n                }\n            } else {\n                foreach($result in $response.results) {\n                    if($result.summary_fields.unified_job_template.unified_job_type -eq 'job') {\n                        $job_id = $result.summary_fields.job.id\n                        if(-not $job_id) {\n                            # This is a job but it hasn't started yet, lets sleep and try again\n                            Start-Sleep -s $SecondsBetweenChecks\n                            break\n                        }\n                        if($script:Verbose) { Write-Host \"Monitoring job $($result.summary_fields.job.name)\" }\n                        # We have to trap the return of Watch-Job-Complete\n                        $junk = Watch-Job-Complete -Id $job_id\n                    } else {\n                        if($script:Verbose) { Write-Host \"Not pulling logs for node $($result.id) which is a $($result.summary_fields.unified_job_template.unified_job_type)\" }\n                    }\n                    $workflow_node_id = $result.id\n                }\n            }\n        }\n    }\n}\n\n\n\n##### Main Body\n\n\n\n\n# Check that we got a TowerJobTemplate, without one we can't do anything\nif(-not ($TowerJobType -eq \"job\" -or $TowerJobType -eq \"workflow\")) { Fail-Stop \"The job type must be either job or workflow\" }\nif($TowerJobTemplate -eq $null -or $TowerJobTemplate -eq \"\") { Fail-Step \"A Job Name needs to be specified\" }\nif($TowerJobTags -eq \"\") { $TowerJobTags = $null }\nif($TowerExtraVars -eq \"\") { $TowerExtraVars = $null }\nif($TowerLimit -eq \"\") { $TowerLimit = $null }\nif($TowerInventory -eq \"\") { $TowerInventory = $null }\nif($TowerCredential -eq \"\") { $Credential = $null }\nif($TowerImportLogs -and $TowerImportLogs -eq \"True\") { $TowerImportLogs = $True } else { $TowerImportLogs = $False }\nif($TowerVerbose -and $TowerVerbose -eq \"True\") { $Verbose = $True} else { $Verbose = $False }\nif($TowerSecondsBetweenChecks) {\n    try { $SecondsBetweenChecks = [int]$TowerSecondsBetweenChecks }\n    catch {\n        write-Host \"Failed to parse $TowerSecondsBetweenChecks as integer, defaulting to 3\"\n        $SecondsBetweenChecks = 3\n    }\n} else {\n    $SecondsBetweenChecks = 3\n}\nif($TowerTimeLimitInSeconds) {\n    try { $TowerTimeLimitInSeconds = [int]$TowerTimeLimitInSeconds }\n    catch {\n        write-Host \"Failed to parse $TowerTimeLimitInSeconds as integer, defaulting to 600\"\n        $TowerTimeLimitInSeconds = 600\n    }\n} else {\n    $TowerTimeLimitInSeconds = 600\n}\nif($TowerIgnoreCert -and $TowerIgnoreCert -eq \"True\") {\n    # Joyfully borrowed from Markus Kraus' post on\n    # https://blog.ukotic.net/2017/08/15/could-not-establish-trust-relationship-for-the-ssltls-invoke-webrequest/\n    if(-not([System.Management.Automation.PSTypeName]'TrustAllCertsPolicy').Type) {\n        Add-Type @\"\n            using System.Net;\n            using System.Security.Cryptography.X509Certificates;\n            public class TrustAllCertsPolicy : ICertificatePolicy {\n                public bool CheckValidationResult(ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem) {\n                    return true;\n                }\n            }\n\"@\n        [System.Net.ServicePointManager]::CertificatePolicy = New-Object TrustAllCertsPolicy\n        [System.Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n    }\n    #endregion\n}\n \nif ($Verbose) { Write-Host \"Beginning Ansible Tower Run on $TowerServer\" }\n$tower_url = [System.Uri]$TowerServer\nif(-not $tower_url.Scheme) { $tower_url = [System.Uri]\"https://$TowerServer\" }\n$tower_base = $tower_url.ToString().TrimEnd(\"/\")\n$api_base = \"${tower_base}/api/v2\"\n \n# First handle authentication\n#   If we have a TowerOAuthToken try using that\n#   Else get an authentication token if we have a user name/password\n$auth_headers = @{'initial' = 'Data'}\nGet-Auth-Headers\n \n \n# If the TowerJobTemplate is actually an ID we can just use that.\n# If not we need to lookup the ID from the name\nif($TowerJobType -eq 'job') {\n    $template = Resolve-Tower-Asset -Name $TowerJobTemplate -Url \"$api_base/job_templates\"\n} else {\n    $template = Resolve-Tower-Asset -Name $TowerJobTemplate -Url \"$api_base/workflow_job_templates\"\n}\nif($template -eq $null) { Fail-Step \"Unable to resolve the job name\" }\n \nif($TowerExtraVars -ne $null -and $TowerExtraVars -ne '---' -and $template.ask_variables_on_launch -eq $False) {\n    Write-Warning \"Extra variables defined but prompt for variables on launch is not set in tower job\"\n}\nif($TowerLimit -ne $null -and $template.ask_limit_on_launch -eq $False) {\n    Write-Warning \"Limit defined but prompt for limit on launch is not set in tower job\"\n}\nif($TowerJobTags -ne $null -and $template.ask_tags_on_launch -eq $False) {\n    Write-Warning \"Job Tags defined but prompt for tags on launch is not set in tower job\"\n}\nif($TowerInventory -ne $null -and $template.ask_inventory_on_launch -eq $False) {\n    Write-Warning \"Inventory defined but prompt for inventory on launch is not set in tower job\"\n}\nif($TowerCredential -ne $null -and $template.ask_credential_on_launch -eq $False) {\n    Write-Warning \"Credential defined but prompt for credential on launch is not set in tower job\"\n}\n<#\n// Here are some more options we may want to use/check someday\n//    \"ask_diff_mode_on_launch\": false,\n//    \"ask_skip_tags_on_launch\": false,\n//    \"ask_job_type_on_launch\": false,\n//    \"ask_verbosity_on_launch\": false,\n#>\n \n \n# Construct the post body\n$post_body = @{}\nif($TowerInventory -ne $null) {\n    $inventory = Resolve-Tower-Asset -Name $TowerInventory -Url \"$api_base/inventories\"\n    if($inventory -eq $null) { Fail-Step(\"Unable to resolve inventory\") }\n    $post_body.inventory = $inventory.id\n}\n \nif($TowerCredential -ne $null) {\n    $credential = Resolve-Tower-Asset -Name $TowerCredential -Url \"$api_base/credentials\"\n    if($credential -eq $null) { Fail-Step(\"Unable to resolve credential\") }\n    $post_body.credentials = @($credential.id)\n}\nif($TowerLimit -ne $null) { $post_body.limit = $TowerLimit }\nif($TowerJobTags -ne $null) { $post_body.job_tags = $TowerJobTags }\n# Older versions of Tower did not like receiveing \"---\" as extra vars.\nif($TowerExtraVars -ne $null -and $TowerExtraVars -ne \"---\") { $post_body.extra_vars = $TowerExtraVars }\n \nif($Verbose) { Write-Host \"Requesting tower to run $TowerJobTemplate\" }\nif($TowerJobType -eq 'job') {\n    $url = \"$api_base/job_templates/$($template.id)/launch/\"\n} else {\n    $url = \"$api_base/workflow_job_templates/$($template.id)/launch/\"\n}\ntry {\n    $response = Invoke-WebRequest -Uri $url -Method POST -Headers $auth_headers -Body ($post_body | ConvertTo-JSON) -ContentType \"application/json\" -UseBasicParsing\n} catch {\n    Write-Host \"Failed to make request to invoke job\"\n    $initialError = $_\n    try {\n        $result = $_.Exception.Response.GetResponseStream()\n        $reader = New-Object System.IO.StreamReader($result)\n        $reader.BaseStream.Position = 0\n        $reader.DiscardBufferedData()\n        $body = $reader.ReadToEnd() | ConvertFrom-Json\n        <#\n            Some stuff that we might want to catch includes:\n                {\"extra_vars\":[\"Must be valid JSON or YAML.\"]}\n                {\"variables_needed_to_start\":[\"'my_var' value missing\"]}\n                {\"credential\":[\"Invalid pk \\\"999999\\\" - object does not exist.\"]}\n                {\"inventory\":[\"Invalid pk \\\"99999999\\\" - object does not exist.\"]}\n            The last two we don't really care about because we should never hit them\n        #>\n        if($body.extra_vars -ne $null) {\n            Fail-Step \"Failed to launch job: extra vars must be vailid JSON or YAML.\"\n        } elseif($body.variables_needed_to_start -ne $null) {\n            Fail-Step \"Failed to launch job: $($body.variables_needed_to_start)\"\n        } else {\n            Write-Host $body\n            Fail-Step \"Failed to launch job for an unknown reason\"\n        }\n    } catch {\n        Write-Host \"Failed to get response body from request\"\n        Write-Host $initialError\n    }\n}\n\n\n$template_id = $($response | ConvertFrom-Json).id\nWrite-Host(\"Best Guess Job URL: $tower_base/#/$($TowerJobType)s/$template_id\")\n \n# For whatever reason, this never fires\n#$timer = new-object System.Timers.Timer\n#$timer.Interval = 500 #1000 * $TowerTimeLimitInSeconds\n#$action = { Fail-Step \"Timed out waiting for Tower to complete tempate run. Template may still be running in Tower.\" }\n#$tower_timer = Register-ObjectEvent -InputObject $timer -EventName Elapsed -Action $action\n#$timer.AutoReset = $False\n#$timer.Enabled = $True\n\nif($TowerJobType -eq 'job') {\n    $failed = Watch-Job-Complete -Id $template_id\n} else {\n    $failed = Watch-Workflow-Complete -Id $template_id\n}\n\n#$timer.Stop()\n#Unregister-Event $tower_timer.Name\n\n\nif($failed) {\n    Fail-Step \"Job Failed\"\n} else {\n    Write-Host \"Job Succeeded\"\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "6da92f7b-3e6b-496c-9095-508556a2e69a",
-      "Name": "TowerServer",
-      "Label": "Tower Server",
-      "HelpText": "The connection information of the Tower server to connect to. This can be a single host name or IP (https will be assumed) or a full specification like http://localhost:8081.",
-      "DefaultValue": "tower.example.com",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2e4148f9-73fd-430b-9ac4-d7aa0789b9d1",
-      "Name": "TowerUsername",
-      "Label": "Tower Username",
-      "HelpText": "The user to connect to Tower as. Be sure this user has permissions to execute the Job/Workflow templates you are attempting to launch.",
-      "DefaultValue": "admin",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "60f5667e-108a-4966-aaef-feb26e6739ad",
-      "Name": "TowerPassword",
-      "Label": "Tower Password",
-      "HelpText": "The password for the specified user.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "4f8baac7-0b3f-4ffe-af04-deff70484518",
-      "Name": "TowerOAuthToken",
-      "Label": "OAuth Token",
-      "HelpText": "An alternative to username/password which can be used on newer versions of Tower.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ccf787b8-6589-4d59-9f0d-d964f0785252",
-      "Name": "TowerJobType",
-      "Label": "Template Type",
-      "HelpText": "Select the type of template to execute. Supported template types are Workflow and Job",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "job|Job Template\nworkflow|Workflow Template"
-      }
-    },
-    {
-      "Id": "8b6c4e7c-65dd-40f8-8fa3-4371877083fb",
-      "Name": "TowerJobTemplate",
-      "Label": "Template Name",
-      "HelpText": "The Job or Workflow template ID or name. If a name is specified the ID will attempt to be resolved.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6a64ff26-9b22-414d-9995-d1723aafdbb1",
-      "Name": "TowerExtraVars",
-      "Label": "Extra Vars",
-      "HelpText": "Extra variable to pass to the job. This can be either YAML or JSON.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
-      "DefaultValue": "---",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "f65ed9e0-2d50-4698-8e8e-3683ee6e0a41",
-      "Name": "TowerJobTags",
-      "Label": "Job Tags",
-      "HelpText": "Any job tags to pass to Tower. \n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fe800bf5-ef04-43c5-b73d-0c9ca00172a8",
-      "Name": "TowerLimit",
-      "Label": "Limit",
-      "HelpText": "Limit field to be passed to Tower.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8572d143-0ccd-4af4-b754-7df663f9e07a",
-      "Name": "TowerInventory",
-      "Label": "Inventory",
-      "HelpText": "The inventory for the job run.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "08514a4e-f34c-41cb-94f4-c6ac82f46634",
-      "Name": "TowerCredential",
-      "Label": "Credential",
-      "HelpText": "The credentials to use for this job.\n**NOTE:** prompt on launch must be set in your template for this setting to take affect.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9691c6c0-ac17-4bcf-947d-38bbbf027ed3",
-      "Name": "TowerImportLogs",
-      "Label": "Import Tower Logs",
-      "HelpText": "Pull the Tower logs back into the step output",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "7e8c6ea0-637f-4440-9669-55971bc1f825",
-      "Name": "TowerSecondsBetweenChecks",
-      "Label": "Second Between Checks",
-      "HelpText": "How many seconds to pause between checks when monitoring a job. 0 means no checks. Failure to parse this field as an integer will default to 3 seconds.",
-      "DefaultValue": "3",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7f8b11b1-3f4b-41eb-8cf2-38d4e984418e",
-      "Name": "TowerIgnoreCert",
-      "Label": "Ignore Certificate",
-      "HelpText": "**This parameter is intended only for testing.** This tells the step to ignore any https certificate presented to it from the Tower server. Please understand the ramifications before enabling this option.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "4c94cabd-ef0f-4a21-8028-430b7a0465b8",
-      "Name": "TowerVerbose",
-      "Label": "Verbose",
-      "HelpText": "Add additional details of what the plugin is doing.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-09-28T13:41:21.989Z",
-    "OctopusVersion": "2021.1.7500",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "kdblitz",
-  "Category": "ansible"
-}
diff --git a/step-templates/apexsql-devops-toolkit-deploy.json b/step-templates/apexsql-devops-toolkit-deploy.json
deleted file mode 100644
index 349a5445c..000000000
--- a/step-templates/apexsql-devops-toolkit-deploy.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "Id": "42412324-a768-4943-baf8-bfe26ed2dff3",
-  "Name": "ApexSQL DevOps toolkit - Deploy",
-  "Description": "This step will execute schema and data synchronization scripts created as deployment resource after comparison is done. \n\nApexSQL DevOps toolkit - Sync and/or ApexSQL DevOps toolkit - Sync data  steps are reqiured",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$schemaSyncScript = ''\n$dataSyncScript = ''\n$schemaSyncQuery = ''\n$dataSyncQuery= ''\n$query = ''\n\nfunction AddArtifact() {\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$artifact\n    )\n    if (Test-Path $artifact) {\n        New-OctopusArtifact $artifact\n    }\n}\n\nfunction Get-ParamValue\n{\n    param\n    (\n        [Parameter(Mandatory = $true)]\n        [String] $ParamName\n    )\n    if($OctopusParameters -and ($OctopusParameters[\"$($ParamName)\"] -ne $null))\n    {\n        # set the variable value\n        return $OctopusParameters[\"$($ParamName)\"]\n    }\n    else\n    {\n        # warning\n        return $null\n    }\n}\n\n$exportPath = '#{ExportPath}'\n$PackageDownloadStepName = '#{PackageDownloadStepName}'\n\n$projectId = $OctopusParameters[\"Octopus.Project.Id\"]\n$releaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$nugetPackageId = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Package.NuGetPackageId\"]\n$exportPath = Join-Path (Join-Path $exportPath $projectId) $releaseNumber\n\n$defaultSchemaSyncScript = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath\"] + '\\SchemaSyncScript.sql'\n$defaultDataSyncScript = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath\"] + '\\DataSyncScript.sql'\n\nNew-Item -Path $exportPath -Name \"DeploySummary.txt\" -ItemType \"file\" -Force | Out-Null\n$deploySummary = $exportPath + \"\\DeploySummary.txt\"\n\n$schemaSyncScript = $exportPath + '\\SchemaSyncScript.sql'\n$dataSyncScript = $exportPath + '\\DataSyncScript.sql'\n$serverName = Get-ParamValue -ParamName 'ServerName'\n  $database = Get-ParamValue -ParamName 'Database'\n  $username = Get-ParamValue -ParamName 'Username'\n  $password = Get-ParamValue -ParamName 'Password'\n  $auth = ''\n  \n  if (-not ($null -eq $username -and $null -eq $password))\n  {\t\n      $auth = \" -U \"\"$($username)\"\" -P \"\"$($password)\"\"\"\n  }\n  else\n  {\t\n      $auth = \" -E\"\n  }\n\n$sqlcmdProps = \"sqlcmd.exe -S \"\"$($serverName)\"\" -d \"\"$($database)\"\"$auth -b -i\"\n\tif(Test-Path $schemaSyncScript) \n    {\n\t\t$result = Invoke-Expression -Command \"$sqlcmdProps \"\"$schemaSyncScript\"\"\"\n        $content = \"Sync summary: \" + $result\n        if (Test-Path $deploySummary)\n        {\n        \tAdd-Content $deploySummary $content\n        }\n\t}\n  \tif(Test-Path $dataSyncScript) \n    {\n\t\t$result = Invoke-Expression -Command \"$sqlcmdProps \"\"$dataSyncScript\"\"\"\n        $content = \"Sync data summary: \" + $result\n        if (Test-Path $deploySummary)\n        {\n        \tAdd-Content $deploySummary $content\n        }\n\t}\n\n\tif(Test-Path $defaultSchemaSyncScript) \n    {\n\t\t$result = Invoke-Expression -Command \"$sqlcmdProps \"\"$defaultSchemaSyncScript\"\"\"\n\t}\n    if(Test-Path $defaultDataSyncScript) \n    {\n\t\t$result = Invoke-Expression -Command \"$sqlcmdProps \"\"$defaultDataSyncScript\"\"\"\n\t}\n\nAddArtifact(\"$deploySummary\")",
-    "Octopus.Action.EnabledFeatures": ""
-  },
-  "Parameters": [
-    {
-      "Id": "ad2fad54-09c4-4210-adbc-ab238632cd67",
-      "Name": "DownloadPackageStepName",
-      "Label": "Retrieve package from",
-      "HelpText": "Select the step from which the synchronization sripts package can be sourced",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "b899f7a2-49dd-4193-8640-54e815996e02",
-      "Name": "ExportPath",
-      "Label": "Export location",
-      "HelpText": "The location for exported deployment resources. Provide the path used for synchronization steps. All tentacles used in database deployment steps should have access to the chosen location",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f0886e0e-f592-4fd7-ba04-8191224f3436",
-      "Name": "ServerName",
-      "Label": "SQL Server",
-      "HelpText": "Provide the SQL Server name for the deployment target database",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d1358f62-a3ff-4e24-b46c-036e33ff40f4",
-      "Name": "Database",
-      "Label": "Database",
-      "HelpText": "The target database for the deployment of schema and data synchronization scripts.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6572b012-7386-4bae-ae31-e72ac19e5171",
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "The account name used for SQL authentication method. Windows authentication method with the account that runs the Tentacle service will be used for SQL Server connection if left empty",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d97dbe49-ccec-4be3-81a8-e356365aa250",
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Enter password for chosen account used for SQL authentication method. Leave empty if Windows authentication method is used",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-20T11:36:52.048Z",
-    "OctopusVersion": "2020.3.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "ApexSQLtechops",
-  "Category": "apexsql"
-}
diff --git a/step-templates/apexsql-devops-toolkit-sync-data.json b/step-templates/apexsql-devops-toolkit-sync-data.json
deleted file mode 100644
index 0662cc975..000000000
--- a/step-templates/apexsql-devops-toolkit-sync-data.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "71d5998a-3100-4a7e-9565-b65bf0fa2352",
-  "Name": "ApexSQL DevOps toolkit - Sync data",
-  "Description": "The step will compare database from a deployment package with target database to create data synchronization script deployment resource.\n\n[ApexSQL Data Diff](https://www.apexsql.com/sql-tools-datadiff.aspx) is requred",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Get-ApexSQLToolLocation\n{\n    param\n    (\n        [Parameter(Mandatory = $true)]\n        [String] $ApplicationName\n    )\n    $key = \"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ApexSQL $($ApplicationName)_is1\"\n    if (Test-Path \"HKLM:\\$Key\")\n    {\n\t\t$ApplicationPath = (Get-ItemProperty -Path \"HKLM:\\$key\" -Name InstallLocation).InstallLocation\n\t}\n    else\n    {\n\t\t$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry64)\n\n\t\t$regKey= $reg.OpenSubKey(\"$key\")\n\t\tif ($regKey)\n        {\n\t\t\t$ApplicationPath = $regKey.GetValue(\"InstallLocation\")\n\t\t}\n        else\n        {\n\t\t\t$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry32)\n\t\t\t$regKey= $reg.OpenSubKey(\"$key\")\n\t\t\tif ($regKey)\n            {\n\t\t\t\t$ApplicationPath = $regKey.GetValue(\"InstallLocation\")\n\t\t\t}\n            else\n            {\n                return $null\n\t\t\t}\n\t\t}\n\t}\n    if ($ApplicationPath)\n    {\n        return $ApplicationPath + \"ApexSQL\" + $ApplicationName.replace(' ','') + \".com\"\n    }\n}\n\nfunction AddArtifact() {\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$artifact\n    )\n    if (Test-Path $artifact) {\n        New-OctopusArtifact $artifact\n    }\n}\n\nfunction Get-ParamValue\n{\n    param\n    (\n        [Parameter(Mandatory = $true)]\n        [String] $ParamName\n    )\n    if($OctopusParameters -and ($OctopusParameters[\"$($ParamName)\"] -ne $null))\n    {\n        # set the variable value\n        return $OctopusParameters[\"$($ParamName)\"]\n    }\n    else\n    {\n        # warning\n        return $null\n    }\n}\n\n$exportPath = Get-ParamValue -ParamName 'ExportPath'\n$PackageDownloadStepName = Get-ParamValue -ParamName 'PackageDownloadStepName'\n$s2 = Get-ParamValue -ParamName 'ServerName'\n$d2 = Get-ParamValue -ParamName 'Database'\n$u2 = Get-ParamValue -ParamName 'Username'\n$p2 = Get-ParamValue -ParamName 'Password'\n$projectFilePath = Get-ParamValue -ParamName 'ProjectFilePath'\n$additional = Get-ParamValue -ParamName 'Additional'\n\n$projectId = $OctopusParameters[\"Octopus.Project.Id\"]\n$releaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$nugetPackageId = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Package.NuGetPackageId\"]\n$exportPath = Join-Path (Join-Path $exportPath $projectId) $releaseNumber\n\nif (-Not (Test-Path $exportPath)) { New-Item $exportPath -ItemType Directory }\n\n$FolderList = Get-ChildItem $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath\"] -Directory\n\nForeach($f in $Folderlist){\nif ($f.Name -like '*Script*')\n\t{\n \t\t$DatabaseScripts = $f.Name\n \t}\n}\n\n$sfPath = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath\"] + '\\' + $DatabaseScripts\n\nif($null -eq $sfPath) {\n    throw \"Step: '$PackageDownloadStepName' didn't download any NuGet package.\"\n}\n\n$dataSyncScript = \"DataSyncScript.sql\"\n$dataSyncSummary = \"DataSyncSummary.log\"\n$dataSyncReport = \"DataSyncReport.html\"\n\n\n$creds2 = ''\nif ($u2 -ne $null -and $p2 -ne $null)\n{\n    $creds2 = \"/user2:`\"$($u2)`\" /password2:`\"$($p2)`\"\"\n}\n\n$project = ''\nif($projectFilePath -ne $null)\n{\n    $project = \"/project: `\"$($projectFilePath)`\"\"\n}\n\n$additionalParams = ''\nif($additional -ne $null)\n{\n    $additionalParams = $additional\n}\n\n\n$toolLocation = Get-ApexSQLToolLocation -ApplicationName 'Data Diff'\n$toolParams = \" /sf1:`\"$($sfPath)`\" /server2:`\"$($s2)`\" /database2:`\"$($d2)`\" $($creds2)\"\n$toolParams += \" /ot:sql /on:`'$($exportPath)\\$($dataSyncScript)`'\"\n$toolParams += \" /ot2:html /on2:`\"$($exportPath)\\$($dataSyncReport)`\"\"\n$toolParams += \" /cso:`\"$($exportPath)\\$($dataSyncSummary)`\"\"\n$toolParams += \" $($project)\"\n$toolParams += \" $($additionalParams) /v /f\"\nwrite-host $toolParams\nInvoke-Expression -Command (\"& `\"$($toolLocation)`\" $toolParams\")\n\nAddArtifact(\"$exportPath\\$dataSyncScript\")\nAddArtifact(\"$exportPath\\$dataSyncSummary\")\nAddArtifact(\"$exportPath\\$dataSyncReport\")",
-    "Octopus.Action.EnabledFeatures": ""
-  },
-  "Parameters": [
-    {
-      "Id": "3d6da5fc-e18f-4092-9e01-03c35f650644",
-      "Name": "PackageDownloadStepName",
-      "Label": "Retrieve package from",
-      "HelpText": "Select the step from which the database package can be sourced",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "a349fecf-1fe3-4827-8d3b-9f02fb2a12cf",
-      "Name": "ExportPath",
-      "Label": "Export location",
-      "HelpText": "The location for exported deployment resources. This path will be used in the “ApexSQL DevOps toolkit – Deploy” step",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "11c4c432-f021-4671-96e0-04c2b9da1588",
-      "Name": "ServerName",
-      "Label": "SQL Server",
-      "HelpText": "Provide the SQL Server name for the deployment target database",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "96fe6267-ac00-461f-bb97-a33cf628ac94",
-      "Name": "Database",
-      "Label": "Database",
-      "HelpText": "Provide the name of the target database which will be used for comparison with source data located in the deployment package in order to generate deployment resource",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1deec13b-2b56-43fb-a43e-f73c8825a986",
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "The account name used for SQL authentication method. Windows authentication method with the account that runs the Tentacle service will be used for SQL Server connection if left empty",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e2abb015-9baa-44cc-8c9a-93ba368d36aa",
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Enter password for chosen account used for SQL authentication method. Leave empty if Windows authentication method is used",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ea6a3d17-1341-4f86-87bf-57c39616132c",
-      "Name": "ProjectFilePath",
-      "Label": "Project file path",
-      "HelpText": "Use to import data comparison options and rows filter template created with ApexSQL Data Diff. Application defaults will be used if not provided\n\nSee also:\n[Using the Row filter option in ApexSQL Data Diff](https://knowledgebase.apexsql.com/using-row-filter-feature-in-apexsql-data-diff/)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "24fb5094-7d3e-421a-bddd-5629aba43982",
-      "Name": "Additional",
-      "Label": "Additional parameters",
-      "HelpText": "Enter any CLI options switches used with ApexSQL Data Diff. Options will override existing options imported from project file\n\nSee also:\n[ApexSQL Data Diff Command Line Interface (CLI) switches](https://knowledgebase.apexsql.com/apexsql-data-diff-command-line-interface-cli-switches/)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-20T11:41:02.493Z",
-    "OctopusVersion": "2020.3.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "ApexSQLtechops",
-  "Category": "apexsql"
-}
diff --git a/step-templates/apexsql-devops-toolkit-sync.json b/step-templates/apexsql-devops-toolkit-sync.json
deleted file mode 100644
index 9e5da346a..000000000
--- a/step-templates/apexsql-devops-toolkit-sync.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "3dfd5df3-2e9f-412b-93be-dcf4ef2d3da7",
-  "Name": "ApexSQL DevOps toolkit - Sync",
-  "Description": "The step will compare the database from a deployment package with the target database to create a schema synchronization script deployment resource\n\n[ApexSQL Diff](https://www.apexsql.com/sql-tools-diff.aspx) is required",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Get-ApexSQLToolLocation\n{\n    param\n    (\n        [Parameter(Mandatory = $true)]\n        [String] $ApplicationName\n    )\n    $key = \"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ApexSQL $($ApplicationName)_is1\"\n    if (Test-Path \"HKLM:\\$Key\")\n    {\n\t\t$ApplicationPath = (Get-ItemProperty -Path \"HKLM:\\$key\" -Name InstallLocation).InstallLocation\n\t}\n    else\n    {\n\t\t$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry64)\n\n\t\t$regKey= $reg.OpenSubKey(\"$key\")\n\t\tif ($regKey)\n        {\n\t\t\t$ApplicationPath = $regKey.GetValue(\"InstallLocation\")\n\t\t}\n        else\n        {\n\t\t\t$reg = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, [Microsoft.Win32.RegistryView]::Registry32)\n\t\t\t$regKey= $reg.OpenSubKey(\"$key\")\n\t\t\tif ($regKey)\n            {\n\t\t\t\t$ApplicationPath = $regKey.GetValue(\"InstallLocation\")\n\t\t\t}\n            else\n            {\n                return $null\n\t\t\t}\n\t\t}\n\t}\n    if ($ApplicationPath)\n    {\n        return $ApplicationPath + \"ApexSQL\" + $ApplicationName.replace(' ','') + \".com\"\n    }\n}\n\nfunction AddArtifact() {\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$artifact\n    )\n    if (Test-Path $artifact) {\n        New-OctopusArtifact $artifact\n    }\n}\n\nfunction Get-ParamValue\n{\n    param\n    (\n        [Parameter(Mandatory = $true)]\n        [String] $ParamName\n    )\n    if($OctopusParameters -and ($OctopusParameters[\"$($ParamName)\"] -ne $null))\n    {\n        # set the variable value\n        return $OctopusParameters[\"$($ParamName)\"]\n    }\n    else\n    {\n        # warning\n        return $null\n    }\n}\n\n$exportPath = Get-ParamValue -ParamName 'ExportPath'\n$PackageDownloadStepName = Get-ParamValue -ParamName 'PackageDownloadStepName'\n$s2 = Get-ParamValue -ParamName 'ServerName'\n$d2 = Get-ParamValue -ParamName 'Database'\n$u2 = Get-ParamValue -ParamName 'Username'\n$p2 = Get-ParamValue -ParamName 'Password'\n$projectFilePath = Get-ParamValue -ParamName 'ProjectFilePath'\n$additional = Get-ParamValue -ParamName 'Additional'\n\n$projectId = $OctopusParameters[\"Octopus.Project.Id\"]\n$releaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$nugetPackageId = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Package.NuGetPackageId\"]\n$exportPath = Join-Path (Join-Path $exportPath $projectId) $releaseNumber\n\nif (-Not (Test-Path $exportPath)) { New-Item $exportPath -ItemType Directory }\n\n$FolderList = Get-ChildItem $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath\"] -Directory\n\nForeach($f in $Folderlist){\nif ($f.Name -like '*Script*')\n\t{\n \t\t$DatabaseScripts = $f.Name\n \t}\n}\n\n$sfPath = $OctopusParameters[\"Octopus.Action[$PackageDownloadStepName].Output.Package.InstallationDirectoryPath\"] + '\\' + $DatabaseScripts\n\nif($null -eq $sfPath) {\n    throw \"Step: '$PackageDownloadStepName' didn't download any NuGet package.\"\n}\n\n$schemaSyncScript = \"SchemaSyncScript.sql\"\n$schemaSyncSummary = \"SchemaSyncSummary.log\"\n$schemaSyncReport = \"SchemaSyncReport.html\"\n\n\n$creds2 = ''\nif ($u2 -ne $null -and $p2 -ne $null)\n{\n    $creds2 = \"/user2:`\"$($u2)`\" /password2:`\"$($p2)`\"\"\n}\n\n$project = ''\nif($projectFilePath -ne $null)\n{\n    $project = \"/project: `\"$($projectFilePath)`\"\"\n}\n\n$additionalParams = ''\nif($additional -ne $null)\n{\n    $additionalParams = $additional\n}\n\n\n$toolLocation = Get-ApexSQLToolLocation -ApplicationName 'Diff'\n$toolParams = \" /sf1:`\"$($sfPath)`\" /server2:`\"$($s2)`\" /database2:`\"$($d2)`\" $($creds2)\"\n$toolParams += \" /ot:sql /on:`'$($exportPath)\\$($schemaSyncScript)`'\"\n$toolParams += \" /ot2:html /on2:`\"$($exportPath)\\$($schemaSyncReport)`\"\"\n$toolParams += \" /cso:`\"$($exportPath)\\$($schemaSyncSummary)`\"\"\n$toolParams += \" $($project)\"\n$toolParams += \" $($additionalParams) /v /f\"\n\nInvoke-Expression -Command (\"& `\"$($toolLocation)`\" $toolParams\")\n\nAddArtifact(\"$exportPath\\$schemaSyncScript\")\nAddArtifact(\"$exportPath\\$schemaSyncSummary\")\nAddArtifact(\"$exportPath\\$schemaSyncReport\")",
-    "Octopus.Action.EnabledFeatures": ""
-  },
-  "Parameters": [
-    {
-      "Id": "86778bfc-aab9-42ea-b67b-ee0c0fe1c203",
-      "Name": "PackageDownloadStepName",
-      "Label": "Retrieve package from",
-      "HelpText": "Select the step from which the database package can be sourced",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "fd75e328-92da-4e88-bb1c-35504fdccf15",
-      "Name": "ExportPath",
-      "Label": "Export location",
-      "HelpText": "The location for exported deployment resources. This path will be used in the “ApexSQL DevOps toolkit – Deploy” step. ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a487d044-8a82-4065-bb1d-d7ccb5a65468",
-      "Name": "ServerName",
-      "Label": "SQL Server",
-      "HelpText": "Provide the SQL Server name for the deployment target database",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "dca94a19-8d97-49b5-a4e5-21f32781df32",
-      "Name": "Database",
-      "Label": "Database",
-      "HelpText": "Provide the name of the target database which will be used for comparison with source schema located in the deployment package in order to generate deployment resource. ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5465f0aa-7b85-4020-99f9-a9f45f7b39b3",
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "The account name used for SQL authentication method. Windows authentication method with the account that runs the Tentacle service will be used for SQL Server connection if left empty",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5396a1bd-5f84-48cd-a452-135aa67a24a4",
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Enter password for chosen account used for SQL authentication method. Leave empty if Windows authentication method is used",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "2a296435-ccf6-444d-8cb6-d0606eb1bce8",
-      "Name": "ProjectFilePath",
-      "Label": "Project file path",
-      "HelpText": "Use to import schema comparison options and objects filter template created with ApexSQL Diff. Application defaults will be used if not provided\n\nSee also:\n[How to narrow schema comparison and synchronization to affected objects only](https://knowledgebase.apexsql.com/narrow-schema-comparison-synchronization-affected-objects/)\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e3cfcc10-1e5c-4554-83ca-0d9db66c7848",
-      "Name": "Additional",
-      "Label": "Additional parameters",
-      "HelpText": "Enter any CLI options switches used with ApexSQL Diff. Options will override existing options imported from project file\n\nSee also:\n[ApexSQL Diff Command Line Interface (CLI) switches](https://knowledgebase.apexsql.com/apexsql-diff-command-line-interface-cli-switches/)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-20T11:40:28.179Z",
-    "OctopusVersion": "2020.3.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "ApexSQLtechops",
-  "Category": "apexsql"
-}
diff --git a/step-templates/application-insights-annotate-release-with-rbac.json b/step-templates/application-insights-annotate-release-with-rbac.json
deleted file mode 100644
index 35b0ce289..000000000
--- a/step-templates/application-insights-annotate-release-with-rbac.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "bc4eae30-786a-4974-a003-948b7a4ed023",
-  "Name": "Application Insights - Annotate Release with Azure CLI and RBAC",
-  "Description": "Marks a release point in Application Insights. This step template uses Azure CLI and Role-Based Access Control instead of an API Key. Used application-insights-annotate-release.json as inspiration.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Function to decrypt data\nfunction Convert-PasswordToPlainText {\n\t$base64password = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($OctopusParameters[\"AppInsights.ApplicationInsightsAccount.Password\"]))\n    return [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($base64password))\n}\n\n# Function to ensure all Unicode characters in a JSON string are properly escaped\nfunction Convert-UnicodeToEscapeHex {\n  param (\n    [parameter(Mandatory = $true)][string]$JsonString\n  )\n  $JsonObject = ConvertFrom-Json -InputObject $JsonString\n  foreach ($property in $JsonObject.PSObject.Properties) {\n    $name = $property.Name\n    $value = $property.Value\n    if ($value -is [string]) {\n      $value = [regex]::Unescape($value)\n      $OutputString = \"\"\n      foreach ($char in $value.ToCharArray()) {\n        $dec = [int]$char\n        if ($dec -gt 127) {\n          $hex = [convert]::ToString($dec, 16)\n          $hex = $hex.PadLeft(4, '0')\n          $OutputString += \"\\u$hex\"\n        }\n        else {\n          $OutputString += $char\n        }\n      }\n      $JsonObject.$name = $OutputString\n    }\n  }\n  return ConvertTo-Json -InputObject $JsonObject -Compress\n}\n\n$applicationName = $OctopusParameters[\"AppInsights.ApplicationName\"]\n$resourceGroup = $OctopusParameters[\"AppInsights.ResourceGroup\"]\n$releaseName = $OctopusParameters[\"AppInsights.ReleaseName\"]\n$properties = $OctopusParameters[\"AppInsights.ReleaseProperties\"]\n\n# Authenticate via Service Principal\n$securePassword = Convert-PasswordToPlainText\n$azEnv = if($OctopusParameters[\"AppInsights.ApplicationInsightsAccount.AzureEnvironment\"]) { $OctopusParameters[\"AppInsights.ApplicationInsightsAccount.AzureEnvironment\"] } else { \"AzureCloud\" }\n\n$azEnv = Get-AzEnvironment -Name $azEnv\nif (!$azEnv) {\n\tWrite-Error \"No Azure environment could be matched given the name $($OctopusParameters[\"AppInsights.ApplicationInsightsAccount.AzureEnvironment\"])\"\n\texit -2\n}\n\nWrite-Verbose \"Authenticating with Service Principal\"\n\n# Force any output generated to be verbose in Octopus logs.\naz login --service-principal -u $OctopusParameters[\"AppInsights.ApplicationInsightsAccount.Client\"] -p $securePassword --tenant $OctopusParameters[\"AppInsights.ApplicationInsightsAccount.TenantId\"]\n\nWrite-Verbose \"Initiating the body of the annotation\"\n\n$releaseProperties = $null\n\nif ($properties -ne $null)\n{\n    $releaseProperties = ConvertFrom-StringData -StringData $properties\n}\n\n$annotation = @{\n    Id = [GUID]::NewGuid();\n    AnnotationName = $releaseName;\n    EventTime = (Get-Date).ToUniversalTime().GetDateTimeFormats(\"s\")[0];\n    Category = \"Deployment\"; #Application Insights only displays annotations from the \"Deployment\" Category\n    Properties = ConvertTo-Json $releaseProperties -Compress\n}\n\n$annotation = ConvertTo-Json $annotation -Compress\n$annotation = Convert-UnicodeToEscapeHex -JsonString $annotation  \n\n$body = $annotation -replace '(\\\\+)\"', '$1$1\"' -replace \"`\"\", \"`\"`\"\"\n\nWrite-Verbose \"Send the annotation to Application Insights\"\n\naz rest --method put --uri \"/subscriptions/$($OctopusParameters[\"AppInsights.ApplicationInsightsAccount.SubscriptionNumber\"])/resourceGroups/$($resourceGroup)/providers/microsoft.insights/components/$($applicationName)/Annotations?api-version=2015-05-01\" --body \"$($body) \"",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "ef9d044d-3765-4cb0-af55-22c15ce4013c",
-      "Name": "AppInsights.ApplicationInsightsAccount",
-      "Label": "Application Insights Account",
-      "HelpText": "Azure account for the Application Insights instance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "98174616-d9dd-4e8e-9b01-2961a061360f",
-      "Name": "AppInsights.ApplicationName",
-      "Label": "Application Name",
-      "HelpText": "The Application Insights Application name.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "41835ca3-76d3-47f8-b863-d26c782c4ba4",
-      "Name": "AppInsights.ResourceGroup",
-      "Label": "Resource Group",
-      "HelpText": "The Resource Group of the Application Insights instance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e008808c-622d-4efe-91a0-ac666d264996",
-      "Name": "AppInsights.ReleaseName",
-      "Label": "Release Name",
-      "HelpText": "The release name. Typically bound to #{Octopus.Release.Number}",
-      "DefaultValue": "#{Octopus.Release.Number}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "551f06ad-9470-415b-aed9-dd80f3a4123d",
-      "Name": "AppInsights.ReleaseProperties",
-      "Label": "Release Properties",
-      "HelpText": "List of key/value pairs separated by a new-line. For example:\n\n```\nReleaseDescription = Release with annotation\nTriggerBy = John Doe\n```",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2024-05-17T06:54:43.852Z",
-    "OctopusVersion": "2024.1.12600",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedOn": "2024-05-17T07:30:00.000Z",
-  "LastModifiedBy": "NielsDM",
-  "Category": "azure"
-}
diff --git a/step-templates/application-insights-annotate-release.json b/step-templates/application-insights-annotate-release.json
deleted file mode 100644
index 98175d757..000000000
--- a/step-templates/application-insights-annotate-release.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "Id": "c3278ce2-9cdb-46fd-96ce-e1d03ac327fe",
-  "Name": "Application Insights - Annotate Release",
-  "Description": "Marks a release point in Application Insights.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12\n[Net.ServicePointManager]::SecurityProtocol = $securityProtocol\n\n$applicationId = $OctopusParameters[\"ApplicationId\"]\n$apiKey = $OctopusParameters[\"ApiKey\"]\n$releaseName = $OctopusParameters[\"ReleaseName\"]\n$properties = $OctopusParameters[\"ReleaseProperties\"]\n\n$releaseProperties = $null\n\nif ($properties -ne $null)\n{\n    $releaseProperties = ConvertFrom-StringData -StringData $properties\n}\n\n# background info on how fwlink works: After you submit a web request, many sites redirect through a series of intermediate pages before you finally land on the destination page.\n# So when calling Invoke-WebRequest, the result it returns comes from the final page in any redirect sequence. Hence, I set MaximumRedirection to 0, as this prevents the call to \n# be redirected. By doing this, we get a resposne with status code 302, which indicates that there is a redirection link from the response body. We grab this redirection link and \n# construct the url to make a release annotation.\n# Here's how this logic is going to works\n# 1. Client send http request, such as:  http://go.microsoft.com/fwlink/?LinkId=625115\n# 2. FWLink get the request and find out the destination URL for it, such as:  http://www.bing.com\n# 3. FWLink generate a new http response with status code \"302\" and with destination URL \"http://www.bing.com\". Send it back to Client.\n# 4. Client, such as a powershell script, knows that status code \"302\" means redirection to new a location, and the target location is \"http://www.bing.com\"\nfunction GetRequestUrlFromFwLink($fwLink)\n{\n    $request = Invoke-WebRequest -Uri $fwLink -MaximumRedirection 0 -UseBasicParsing -ErrorAction Ignore\n    if ($request.StatusCode -eq \"302\") {\n        return $request.Headers.Location\n    }\n    \n    return $null\n}\n\nfunction CreateAnnotation($grpEnv)\n{\n\t$retries = 1\n\t$success = $false\n\twhile (!$success -and $retries -lt 6) {\n\t    $location = \"$grpEnv/applications/$applicationId/Annotations?api-version=2015-11\"\n\t\t    \n\t\tWrite-Host \"Invoke a web request for $location to create a new release annotation. Attempting $retries\"\n\t\tset-variable -Name createResultStatus -Force -Scope Local -Value $null\n\t\tset-variable -Name createResultStatusDescription -Force -Scope Local -Value $null\n\t\tset-variable -Name result -Force -Scope Local\n\n\t\ttry {\n\t\t\t$result = Invoke-WebRequest -Uri $location -Method Put -Body $bodyJson -Headers $headers -ContentType \"application/json; charset=utf-8\" -UseBasicParsing\n\t\t} catch {\n\t\t    if ($_.Exception){\n\t\t        if($_.Exception.Response) {\n    \t\t\t\t$createResultStatus = $_.Exception.Response.StatusCode.value__\n    \t\t\t\t$createResultStatusDescription = $_.Exception.Response.StatusDescription\n    \t\t\t}\n    \t\t\telse {\n    \t\t\t\t$createResultStatus = \"Exception\"\n    \t\t\t\t$createResultStatusDescription = $_.Exception.Message\n    \t\t\t}\n\t\t    }\n\t\t}\n\n\t\tif ($result -eq $null) {\n\t\t\tif ($createResultStatus -eq $null) {\n\t\t\t\t$createResultStatus = \"Unknown\"\n\t\t\t}\n\t\t\tif ($createResultStatusDescription -eq $null) {\n\t\t\t\t$createResultStatusDescription = \"Unknown\"\n\t\t\t}\n\t\t}\n \t\telse {\n\t\t\t    $success = $true\t\t\t         \n        }\n\n\t\tif ($createResultStatus -eq 409 -or $createResultStatus -eq 404 -or $createResultStatus -eq 401) # no retry when conflict or unauthorized or not found\n\t\t{\n\t\t\tbreak\n\t\t}\n\n\t\t$retries = $retries + 1\n\t\tsleep 1\n\t}\n\n\t$createResultStatus\n\t$createResultStatusDescription\n\treturn\n}\n\n# Need powershell version 3 or greater for script to run\n$minimumPowershellMajorVersion = 3\nif ($PSVersionTable.PSVersion.Major -le $minimumPowershellMajorVersion) {\n   Write-Host \"Need powershell version $minimumPowershellMajorVersion or greater to create release annotation\"\n   return\n}\n\n$currentTime = (Get-Date).ToUniversalTime()\n$annotationDate = $currentTime.ToString(\"MMddyyyy_HHmmss\")\nset-variable -Name requestBody -Force -Scope Script\n$requestBody = @{}\n$requestBody.Id = [GUID]::NewGuid()\n$requestBody.AnnotationName = $releaseName\n$requestBody.EventTime = $currentTime.GetDateTimeFormats(\"s\")[0] # GetDateTimeFormats returns an array\n$requestBody.Category = \"Deployment\"\n\nif ($releaseProperties -eq $null) {\n    $properties = @{}\n} else {\n    $properties = $releaseProperties    \n}\n$properties.Add(\"ReleaseName\", $releaseName)\n\n$requestBody.Properties = ConvertTo-Json($properties) -Compress\n\n$bodyJson = [System.Text.Encoding]::UTF8.GetBytes(($requestBody | ConvertTo-Json))\n$headers = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$headers.Add(\"X-AIAPIKEY\", $apiKey)\n\nset-variable -Name createAnnotationResult1 -Force -Scope Local -Value $null\nset-variable -Name createAnnotationResultDescription -Force -Scope Local -Value \"\"\n\n# get redirect link from fwlink\n$requestUrl = GetRequestUrlFromFwLink(\"http://go.microsoft.com/fwlink/?prd=11901&pver=1.0&sbp=Application%20Insights&plcid=0x409&clcid=0x409&ar=Annotations&sar=Create%20Annotation\")\nif ($requestUrl -eq $null) {\n    $output = \"Failed to find the redirect link to create a release annotation\"\n    throw $output\n}\n\n$createAnnotationResult1, $createAnnotationResultDescription = CreateAnnotation($requestUrl)\nif ($createAnnotationResult1) \n{\n     $output = \"Failed to create an annotation with Id: {0}. Error {1}, Description: {2}.\" -f $requestBody.Id, $createAnnotationResult1, $createAnnotationResultDescription\n\t throw $output\n}\n\n$str = \"Release annotation created. Id: {0}.\" -f $requestBody.Id\nWrite-Host $str",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "4e276bad-2a13-4dc2-bd54-5708a76cf662",
-      "Name": "ApplicationId",
-      "Label": "Application Id",
-      "HelpText": "The Application Insights Application Id.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f818317b-6b62-4695-9272-7062a4c1c601",
-      "Name": "ApiKey",
-      "Label": "Api Key",
-      "HelpText": "The API Key to use to configure the Application Insights application.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a241d2b7-99e0-4ed5-9ed1-5b003d855b33",
-      "Name": "ReleaseName",
-      "Label": "Release Name",
-      "HelpText": "The release name. Typically bound to #{Octopus.Release.Number}",
-      "DefaultValue": "#{Octopus.Release.Number}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "bdd7161a-682c-4c6b-98dd-bee990326ed0",
-      "Name": "ReleaseProperties",
-      "Label": "Release Properties",
-      "HelpText": "List of key/value pairs separated by a new-line. For example:\n\n```\nReleaseDescription = Release with annotation\nTriggerBy = John Doe\n```",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2019-12-18T22:35:12.542Z",
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2020-04-11T15:22:12.542Z",
-    "OctopusVersion": "2020.1.9",
-    "Type": "ActionTemplate"
-  },
-  "Category": "azure"
-}
\ No newline at end of file
diff --git a/step-templates/argo-rollouts-get-rollout.json b/step-templates/argo-rollouts-get-rollout.json
deleted file mode 100644
index e84724281..000000000
--- a/step-templates/argo-rollouts-get-rollout.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "c2c71e8e-429d-407e-8448-42e38cfb9c5a",
-  "Name": "Argo - Rollouts Get Rollout",
-  "Description": "Gets the status of an Argo Rollout.",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Save-OctopusVariable {\n    Param(\n        [string] $name,\n        [string] $value\n    )\n    $StepName = $OctopusParameters[\"Octopus.Step.Name\"]    \n    \n    Set-OctopusVariable -Name $name -Value $value\n\n    Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$name}\"\n}\n\n# Installs the Argo Rollouts plugin\nfunction Install-Plugin\n{\n# Define parameters\n\tparam ($PluginUri,\n           $PluginFilename\n    )\n    \n    # Check for plugin folder\n    if ((Test-Path -Path \"$PWD/plugins\") -eq $false)\n    {\n\t\t# Create new plugins folder\n        New-Item -Path \"$PWD/plugins\" -ItemType \"Directory\"\n        \n        # Add to path\n        $env:PATH = \"$($PWD)/plugins$([IO.Path]::PathSeparator)\" + $env:PATH\n    }\n\n\t# Download plugin\n\tInvoke-WebRequest -Uri \"$PluginUri\" -OutFile \"$PWD/plugins/$PluginFilename\"\n\n\t# Make file executable\n    if ($IsLinux)\n    {\n\t\t# Make it executable\n    \tchmod +x ./plugins/$PluginFilename\n    }\n    \n    if ($IsWindows)\n    {\n    \t# Update filename to include .exe extension\n        Rename-Item -Path \"$PWD/plugins/$PluginFilename\" -NewName \"$PWD/plugins/$($PluginFilename).exe\"\n    }\n}\n\n# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist\nfunction Verify-Path-Variable\n{\n\t# Get current path and split into array\n    $paths = $env:PATH.Split([IO.Path]::PathSeparator)\n    $verifiedPaths = @()\n    \n    # Loop through paths\n    foreach ($path in $paths)\n    {\n    \t# Check for existence\n        if ((Test-Path -Path $path) -eq $true)\n        {\n        \t# Add to verified\n            $verifiedPaths += $path\n        }\n    }\n    \n    # Return verified paths\n    return ($verifiedPaths -join [IO.Path]::PathSeparator)\n}\n\nfunction Get-Plugin-Installed\n{\n\t# Define parameters\n    param (\n    \t$PluginName,\n        $InstalledPlugins\n        )\n        \n   \t$isInstalled = $false\n   \n\tforeach ($plugin in $installedPlugins)\n   \t{\n\t\tif ($plugin -like \"$($PluginName)*\")\n        {\n        \t$isInstalled = $true\n          \tbreak\n        }\n\t}\n    \n    return $isInstalled\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Verify all PATH variables are avaialable\n$env:PATH = Verify-Path-Variable\nif ($IsLinux)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64\"\n}\n\nif ($IsWindows)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64\"\n}\n\ntry \n{\n    # Check to see if plugins are installed\n    $pluginList = (kubectl plugin list 2>&1)\n\n    # This is the path that Linux will take\n    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\") \n    {\n        Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n    }\n    else\n    {\n        # Parse list\n    \t$pluginList = $pluginList.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)\n        \n        if ((Get-Plugin-Installed -PluginName \"kubectl-argo-rollouts\" -InstalledPlugins $pluginList) -eq $false)\n        {\n        \tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n        }\n        else\n        {\n        \tWrite-Host \"Argo Rollout kubectl plugin found ...\"\n        }\n    }    \n}\ncatch\n{\n\t# On Windows, the executable will cause an error if no plugins found so this the path Windows will take\n    if ($_.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\")\n    {\n\t\tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"    \n    }\n    else\n    {\n    \t# Something else happened, we need to surface the error\n        throw\n    }\n}\n\n# Get parameters\n$rolloutsName = $OctopusParameters['Argo.Rollout.Name']\n$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']\n\n# Add new arguments\n$kubectlArguments = @(\"argo\", \"rollouts\", \"get\", \"rollout\", $rolloutsName, \"--namespace\", $rolloutsNamespace, \"--no-color\")\n\nkubectl $kubectlArguments"
-  },
-  "Parameters": [
-    {
-      "Id": "5eefb32e-04a6-40ed-9018-3ba12e241b01",
-      "Name": "Argo.Rollout.Name",
-      "Label": "Rollout Name",
-      "HelpText": "Name of the Argo Rollout to promote.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b13022d0-9a74-42cd-8b3e-d3cfa0c4d64c",
-      "Name": "Argo.Rollout.Namespace",
-      "Label": "Namespace",
-      "HelpText": "The namespace to execute the promotion of the rollout against.",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.KubernetesRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-12T20:01:43.441Z",
-    "OctopusVersion": "2024.2.9210",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "argo"
-}
diff --git a/step-templates/argo-rollouts-pause.json b/step-templates/argo-rollouts-pause.json
deleted file mode 100644
index 5456ba9ed..000000000
--- a/step-templates/argo-rollouts-pause.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "a757705d-2551-42bf-8cef-8dd99bd6b4f9",
-  "Name": "Argo - Rollouts Pause",
-  "Description": "Set the rollout paused state to 'true'",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Installs the Argo Rollouts plugin\nfunction Install-Plugin\n{\n# Define parameters\n\tparam ($PluginUri,\n           $PluginFilename\n    )\n    \n    # Check for plugin folder\n    if ((Test-Path -Path \"$PWD/plugins\") -eq $false)\n    {\n\t\t# Create new plugins folder\n        New-Item -Path \"$PWD/plugins\" -ItemType \"Directory\"\n        \n        # Add to path\n        $env:PATH = \"$($PWD)/plugins$([IO.Path]::PathSeparator)\" + $env:PATH\n    }\n\n\t# Download plugin\n\tInvoke-WebRequest -Uri \"$PluginUri\" -OutFile \"$PWD/plugins/$PluginFilename\"\n\n\t# Make file executable\n    if ($IsLinux)\n    {\n\t\t# Make it executable\n    \tchmod +x ./plugins/$PluginFilename\n    }\n    \n    if ($IsWindows)\n    {\n    \t# Update filename to include .exe extension\n        Rename-Item -Path \"$PWD/plugins/$PluginFilename\" -NewName \"$PWD/plugins/$($PluginFilename).exe\"\n    }\n}\n\n# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist\nfunction Verify-Path-Variable\n{\n\t# Get current path and split into array\n    $paths = $env:PATH.Split([IO.Path]::PathSeparator)\n    $verifiedPaths = @()\n    \n    # Loop through paths\n    foreach ($path in $paths)\n    {\n    \t# Check for existence\n        if ((Test-Path -Path $path) -eq $true)\n        {\n        \t# Add to verified\n            $verifiedPaths += $path\n        }\n    }\n    \n    # Return verified paths\n    return ($verifiedPaths -join [IO.Path]::PathSeparator)\n}\n\nfunction Get-Plugin-Installed\n{\n\t# Define parameters\n    param (\n    \t$PluginName,\n        $InstalledPlugins\n        )\n        \n   \t$isInstalled = $false\n   \n\tforeach ($plugin in $installedPlugins)\n   \t{\n\t\tif ($plugin -like \"$($PluginName)*\")\n        {\n        \t$isInstalled = $true\n          \tbreak\n        }\n\t}\n    \n    return $isInstalled\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Verify all PATH variables are avaialable\n$env:PATH = Verify-Path-Variable\nif ($IsLinux)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64\"\n}\n\nif ($IsWindows)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64\"\n}\n\ntry \n{\n    # Check to see if plugins are installed\n    $pluginList = (kubectl plugin list 2>&1)\n\n    # This is the path that Linux will take\n    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\") \n    {\n        Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n    }\n    else\n    {\n        # Parse list\n    \t$pluginList = $pluginList.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)\n        \n        if ((Get-Plugin-Installed -PluginName \"kubectl-argo-rollouts\" -InstalledPlugins $pluginList) -eq $false)\n        {\n        \tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n        }\n        else\n        {\n        \tWrite-Host \"Argo Rollout kubectl plugin found ...\"\n        }\n    }    \n}\ncatch\n{\n\t# On Windows, the executable will cause an error if no plugins found so this the path Windows will take\n    if ($_.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\")\n    {\n      Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"    \n    }\n    else\n    {\n    \t# Something else happened, we need to surface the error\n        throw\n    }\n}\n\n# Get parameters\n$rolloutsName = $OctopusParameters['Argo.Rollout.Name']\n$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']\n\n# Create arguments array\n$kubectlArguments = @(\"argo\", \"rollouts\", \"pause\", $rolloutsName, \"--namespace\", $rolloutsNamespace)\n\n# Pause rollout\nkubectl $kubectlArguments"
-  },
-  "Parameters": [
-    {
-      "Id": "d7665ee0-08b1-4c3a-b7f9-bf9ccfa63219",
-      "Name": "Argo.Rollout.Name",
-      "Label": "Rollout Name",
-      "HelpText": "Name of the Argo Rollout to pause.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8a9ed999-5c3f-4652-abbb-07f592205bfc",
-      "Name": "Argo.Rollout.Namespace",
-      "Label": "Namespace",
-      "HelpText": "The namespace where the rollout exists.",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.KubernetesRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-06T19:54:47.156Z",
-    "OctopusVersion": "2024.1.12815",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "argo"
-}
diff --git a/step-templates/argo-rollouts-promote.json b/step-templates/argo-rollouts-promote.json
deleted file mode 100644
index a65a72ae9..000000000
--- a/step-templates/argo-rollouts-promote.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Id": "cccd7fe9-b3b5-4f56-84bd-2986d5e68e06",
-  "Name": "Argo - Rollouts Promote",
-  "Description": "Promotes an Argo Rollout.",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Installs the Argo Rollouts plugin\nfunction Install-Plugin\n{\n# Define parameters\n\tparam ($PluginUri,\n           $PluginFilename\n    )\n    \n    # Check for plugin folder\n    if ((Test-Path -Path \"$PWD/plugins\") -eq $false)\n    {\n\t\t# Create new plugins folder\n        New-Item -Path \"$PWD/plugins\" -ItemType \"Directory\"\n        \n        # Add to path\n        $env:PATH = \"$($PWD)/plugins$([IO.Path]::PathSeparator)\" + $env:PATH\n    }\n\n\t# Download plugin\n\tInvoke-WebRequest -Uri \"$PluginUri\" -OutFile \"$PWD/plugins/$PluginFilename\"\n\n\t# Make file executable\n    if ($IsLinux)\n    {\n\t\t# Make it executable\n    \tchmod +x ./plugins/$PluginFilename\n    }\n    \n    if ($IsWindows)\n    {\n    \t# Update filename to include .exe extension\n        Rename-Item -Path \"$PWD/plugins/$PluginFilename\" -NewName \"$PWD/plugins/$($PluginFilename).exe\"\n    }\n}\n\n# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist\nfunction Verify-Path-Variable\n{\n\t# Get current path and split into array\n    $paths = $env:PATH.Split([IO.Path]::PathSeparator)\n    $verifiedPaths = @()\n    \n    # Loop through paths\n    foreach ($path in $paths)\n    {\n    \t# Check for existence\n        if ((Test-Path -Path $path) -eq $true)\n        {\n        \t# Add to verified\n            $verifiedPaths += $path\n        }\n    }\n    \n    # Return verified paths\n    return ($verifiedPaths -join [IO.Path]::PathSeparator)\n}\n\nfunction Get-Plugin-Installed\n{\n\t# Define parameters\n    param (\n    \t$PluginName,\n        $InstalledPlugins\n        )\n        \n   \t$isInstalled = $false\n   \n\tforeach ($plugin in $installedPlugins)\n   \t{\n\t\tif ($plugin -like \"$($PluginName)*\")\n        {\n        \t$isInstalled = $true\n          \tbreak\n        }\n\t}\n    \n    return $isInstalled\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Verify all PATH variables are avaialable\n$env:PATH = Verify-Path-Variable\nif ($IsLinux)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64\"\n}\n\nif ($IsWindows)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64\"\n}\n\ntry \n{\n    # Check to see if plugins are installed\n    $pluginList = (kubectl plugin list 2>&1)\n\n    # This is the path that Linux will take\n    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\") \n    {\n        Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n    }\n    else\n    {\n        # Parse list\n    \t$pluginList = $pluginList.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)\n        \n        if ((Get-Plugin-Installed -PluginName \"kubectl-argo-rollouts\" -InstalledPlugins $pluginList) -eq $false)\n        {\n        \tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n        }\n        else\n        {\n        \tWrite-Host \"Argo Rollout kubectl plugin found ...\"\n        }\n    }    \n}\ncatch\n{\n\t# On Windows, the executable will cause an error if no plugins found so this the path Windows will take\n    if ($_.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\")\n    {\n\t\tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"    \n    }\n    else\n    {\n    \t# Something else happened, we need to surface the error\n        throw\n    }\n}\n\n# Get parameters\n$rolloutsName = $OctopusParameters['Argo.Rollout.Name']\n$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']\n$rolloutsFullPromotion = [System.Convert]::ToBoolean($OctopusParameters['Argo.Rollout.FullPromotion'])\n\n# Create arguments array\n$kubectlArguments = @(\"argo\", \"rollouts\", \"promote\", $rolloutsName, \"--namespace\", $rolloutsNamespace)\n\n# Check for additional argument\nif ($rolloutsFullPromotion)\n{\n\t$kubectlArguments += \"--full\"\n}\n\n# Promote rollout\nkubectl $kubectlArguments"
-  },
-  "Parameters": [
-    {
-      "Id": "d1dbd00e-facb-494d-bf10-27ba68334f30",
-      "Name": "Argo.Rollout.Name",
-      "Label": "Rollout Name",
-      "HelpText": "Name of the Argo Rollout to promote.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c9c4937a-e833-4df0-8f31-b53722b881c3",
-      "Name": "Argo.Rollout.Namespace",
-      "Label": "Namespace",
-      "HelpText": "The namespace to execute the promotion of the rollout against.",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "efaf2401-e059-4724-b2b3-30ac8864e450",
-      "Name": "Argo.Rollout.FullPromotion",
-      "Label": "Full Promotion",
-      "HelpText": "Fully promote a rollout to desired version, skipping analysis, pauses, and steps",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.KubernetesRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-06T19:55:28.116Z",
-    "OctopusVersion": "2024.1.12815",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "argo"
-}
diff --git a/step-templates/argo-rollouts-set-image.json b/step-templates/argo-rollouts-set-image.json
deleted file mode 100644
index a01198a30..000000000
--- a/step-templates/argo-rollouts-set-image.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "Id": "5449ea73-7f77-45d7-a4d7-e56286d679f5",
-  "Name": "Argo - Rollouts Set Image",
-  "Description": "Sets a new image tag on an Argo Rollout.",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "67a06773-8f2b-49a7-95bb-1e087a38b3b9",
-      "Name": "Argo.Rollout.Image",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "NotAcquired",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Argo.Rollout.Image",
-        "Purpose": ""
-      }
-    }
-  ],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Install-Plugin\n{\n# Define parameters\n\tparam ($PluginUri,\n           $PluginFilename\n    )\n    \n    # Check for plugin folder\n    if ((Test-Path -Path \"$PWD/plugins\") -eq $false)\n    {\n\t\t# Create new plugins folder\n        New-Item -Path \"$PWD/plugins\" -ItemType \"Directory\"\n        \n        # Add to path\n        $env:PATH = \"$($PWD)/plugins$([IO.Path]::PathSeparator)\" + $env:PATH\n    }\n\n\t# Download plugin\n\tInvoke-WebRequest -Uri \"$PluginUri\" -OutFile \"$PWD/plugins/$PluginFilename\"\n\n\t# Check for Linux\n    if ($IsLinux)\n    {\n\t\t# Make it executable\n    \tchmod +x ./plugins/$PluginFilename\n    }\n    \n    if ($IsWindows)\n    {\n    \t# Update filename to include .exe extension\n        Rename-Item -Path \"$PWD/plugins/$PluginFilename\" -NewName \"$PWD/plugins/$($PluginFilename).exe\"\n    }    \n}\n\n# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist\nfunction Verify-Path-Variable\n{\n\t# Get current path and split into array\n    $paths = $env:PATH.Split([IO.Path]::PathSeparator)\n    $verifiedPaths = @()\n    \n    # Loop through paths\n    foreach ($path in $paths)\n    {\n    \t# Check for existence\n        if ((Test-Path -Path $path) -eq $true)\n        {\n        \t# Add to verified\n            $verifiedPaths += $path\n        }\n    }\n    \n    # Return verified paths\n    return ($verifiedPaths -join [IO.Path]::PathSeparator)\n}\n\nfunction Get-Plugin-Installed\n{\n\t# Define parameters\n    param (\n    \t$PluginName,\n        $InstalledPlugins\n        )\n        \n   \t$isInstalled = $false\n   \n\tforeach ($plugin in $installedPlugins)\n   \t{\n\t\tif ($plugin -like \"$($PluginName)*\")\n        {\n        \t$isInstalled = $true\n          \tbreak\n        }\n\t}\n    \n    return $isInstalled\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Verify all PATH variables are avaialable\n$env:PATH = Verify-Path-Variable\nif ($IsLinux)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64\"\n}\n\nif ($IsWindows)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64\"\n}\n\n\ntry \n{\n    # Check to see if plugins are installed\n    $pluginList = (kubectl plugin list --name-only=true 2>&1)\n\n    # This is the path that Linux will take\n    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\") \n    {\n        # Install the plugin\n        Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n    }\n    else\n    {\n        # Parse list\n    \t$pluginList = $pluginList.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)\n        \n        if ((Get-Plugin-Installed -PluginName \"kubectl-argo-rollouts\" -InstalledPlugins $pluginList) -eq $false)\n        {\n        \tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n        }\n        else\n        {\n        \tWrite-Host \"Argo Rollout kubectl plugin found ...\"\n        }\n    }\n}\ncatch\n{\n\t# On Windows, the executable will cause an error if no plugins found so this the path Windows will take\n    if ($_.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\")\n    {\n      Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"    \n    }\n    else\n    {\n    \t# Something else happened, we need to surface the error\n        throw\n    }\n}\n\n# Get variables\n$rolloutName = $OctopusParameters['Argo.Rollout.Name']\n$rolloutNamespace = $OctopusParameters['Argo.Rollout.Namespace']\n$containerName = $OctopusParameters[\"Argo.Rollout.Container.Name\"]\n$imageName = $OctopusParameters[\"Octopus.Action.Package[Argo.Rollout.Image].PackageId\"]\n$imageTag = $OctopusParameters[\"Octopus.Action.Package[Argo.Rollout.Image].PackageVersion\"]\n\n# Create arguments array\n$kubectlArguments = @(\"argo\", \"rollouts\", \"set\", \"image\", $rolloutName, \"$containerName=`\"$($imageName):$($imageTag)`\"\", \"--namespace\", $rolloutNamespace)\n\n# Set image\nkubectl $kubectlArguments"
-  },
-  "Parameters": [
-    {
-      "Id": "892ac50a-e53c-47e5-997d-0ce1935b7303",
-      "Name": "Argo.Rollout.Name",
-      "Label": "Rollout Name",
-      "HelpText": "Name of the Argo Rollout to set the image on.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a08c104a-3877-4989-9436-bf582b3a8505",
-      "Name": "Argo.Rollout.Namespace",
-      "Label": "Namespace",
-      "HelpText": "The namespace to execute the command against.",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "05bf80a9-0419-4d8d-b9ca-457d66a2edb0",
-      "Name": "Argo.Rollout.Image",
-      "Label": "Image",
-      "HelpText": "Select the image to update the rollout to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "115ebf6d-5613-4131-83f5-03d74fbc0f14",
-      "Name": "Argo.Rollout.Container.Name",
-      "Label": "Container Name",
-      "HelpText": "Name of the container to update the image tag on.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.KubernetesRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-06T19:56:12.397Z",
-    "OctopusVersion": "2024.1.12815",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "argo"
-}
diff --git a/step-templates/argo-rollouts-status.json b/step-templates/argo-rollouts-status.json
deleted file mode 100644
index f8f2aaebf..000000000
--- a/step-templates/argo-rollouts-status.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Id": "866c3e69-5bd6-4439-8a2e-8cbf252885a4",
-  "Name": "Argo - Rollouts Status",
-  "Description": "Gets the status of an Argo Rollout.\nNote: A timeout isn't considered an error, it will return the status at the time of the timeout.",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Supress info messages written to stderr\nWrite-Host \"##octopus[stderr-progress]\"\n\nfunction Save-OctopusVariable {\n    Param(\n        [string] $name,\n        [string] $value\n    )\n    $StepName = $OctopusParameters[\"Octopus.Step.Name\"]    \n    \n    Set-OctopusVariable -Name $name -Value $value\n\n    Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$name}\"\n}\n\n# Installs the Argo Rollouts plugin\nfunction Install-Plugin\n{\n# Define parameters\n\tparam ($PluginUri,\n           $PluginFilename\n    )\n    \n    # Check for plugin folder\n    if ((Test-Path -Path \"$PWD/plugins\") -eq $false)\n    {\n\t\t# Create new plugins folder\n        New-Item -Path \"$PWD/plugins\" -ItemType \"Directory\"\n        \n        # Add to path\n        $env:PATH = \"$($PWD)/plugins$([IO.Path]::PathSeparator)\" + $env:PATH\n    }\n\n\t# Download plugin\n\tInvoke-WebRequest -Uri \"$PluginUri\" -OutFile \"$PWD/plugins/$PluginFilename\"\n\n\t# Make file executable\n    if ($IsLinux)\n    {\n\t\t# Make it executable\n    \tchmod +x ./plugins/$PluginFilename\n    }\n    \n    if ($IsWindows)\n    {\n    \t# Update filename to include .exe extension\n        Rename-Item -Path \"$PWD/plugins/$PluginFilename\" -NewName \"$PWD/plugins/$($PluginFilename).exe\"\n    }\n}\n\n# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist\nfunction Verify-Path-Variable\n{\n\t# Get current path and split into array\n    $paths = $env:PATH.Split([IO.Path]::PathSeparator)\n    $verifiedPaths = @()\n    \n    # Loop through paths\n    foreach ($path in $paths)\n    {\n    \t# Check for existence\n        if ((Test-Path -Path $path) -eq $true)\n        {\n        \t# Add to verified\n            $verifiedPaths += $path\n        }\n    }\n    \n    # Return verified paths\n    return ($verifiedPaths -join [IO.Path]::PathSeparator)\n}\n\nfunction Get-Plugin-Installed\n{\n\t# Define parameters\n    param (\n    \t$PluginName,\n        $InstalledPlugins\n        )\n        \n   \t$isInstalled = $false\n   \n\tforeach ($plugin in $installedPlugins)\n   \t{\n\t\tif ($plugin -like \"$($PluginName)*\")\n        {\n        \t$isInstalled = $true\n          \tbreak\n        }\n\t}\n    \n    return $isInstalled\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Verify all PATH variables are avaialable\n$env:PATH = Verify-Path-Variable\nif ($IsLinux)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64\"\n}\n\nif ($IsWindows)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64\"\n}\n\ntry \n{\n    # Check to see if plugins are installed\n    $pluginList = (kubectl plugin list 2>&1)\n\n    # This is the path that Linux will take\n    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\") \n    {\n        Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n    }\n    else\n    {\n        # Parse list\n    \t$pluginList = $pluginList.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)\n        \n        if ((Get-Plugin-Installed -PluginName \"kubectl-argo-rollouts\" -InstalledPlugins $pluginList) -eq $false)\n        {\n        \tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n        }\n        else\n        {\n        \tWrite-Host \"Argo Rollout kubectl plugin found ...\"\n        }\n    }    \n}\ncatch\n{\n\t# On Windows, the executable will cause an error if no plugins found so this the path Windows will take\n    if ($_.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\")\n    {\n\t\tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"    \n    }\n    else\n    {\n    \t# Something else happened, we need to surface the error\n        throw\n    }\n}\n\n# Get parameters\n$rolloutsName = $OctopusParameters['Argo.Rollout.Name']\n$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']\n$rolloutsTimeout = $OctopusParameters['Argo.Rollout.Timeout']\n\n# Validate arguments\nif ([string]::IsNullOrWhitespace($rolloutsTimeout))\n{\n    Write-Error \"Please specify a timeout value\"\n}\n\n# Add new arguments\n$kubectlArguments = @(\"argo\", \"rollouts\", \"status\", $rolloutsName, \"--namespace\", $rolloutsNamespace, \"--timeout\", $rolloutsTimeout)\n\ntry\n{\n    # Get the current status - This was the only way to get it to work cross-platform\n    $process = Start-Process -FilePath \"kubectl\" -ArgumentList $kubectlArguments -NoNewWindow -RedirectStandardError \"error.txt\" -RedirectStandardOutput \"success.txt\" -Wait -PassThru\n    $lastExitCode = $process.ExitCode\n    $rolloutStatus =  (Get-Content \"success.txt\")\n   \n    # Check the code from the command\n    if ($lastExitCode -ne 0)\n    {\n        # Get the error from the file\n        $errorMessage = Get-Content \"error.txt\"\n\n        if ($errorMessage -is [array])\n        {\n          $errorMessage = $errorMessage[0]\n        }\n\n        # Expose the original error\n        throw $errorMessage\n    }\n}\ncatch\n{\n    if ($_.Exception.Message -ne \"Error: Rollout status watch exceeded timeout\")\n    {\n        # Timeout is expected, everything else is not\n        Write-Host \"$(Get-Content \"error.txt\")\"\n        throw\n    }\n    else\n    {\n        # It was just a timeout, make last exit 0\n        Write-Host \"Wait operation timed out, returning recorded status.\"\n        $lastExitCode = 0\n    }\n}\n\nWrite-Host \"Status is $rolloutStatus\"\n\nif ($rolloutStatus.Contains(\"-\"))\n{\n    $messages = $rolloutStatus.Split(\"-\")\n    \n    Save-OctopusVariable -Name \"Status\" -Value $messages[0].Trim()\n    Save-OctopusVariable -Name \"StatusMessage\" -Value $messages[1].Trim()\n}\nelse\n{\n    Save-OctopusVariable -Name \"Status\" -Value $rolloutStatus\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "5eefb32e-04a6-40ed-9018-3ba12e241b01",
-      "Name": "Argo.Rollout.Name",
-      "Label": "Rollout Name",
-      "HelpText": "Name of the Argo Rollout to promote.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b13022d0-9a74-42cd-8b3e-d3cfa0c4d64c",
-      "Name": "Argo.Rollout.Namespace",
-      "Label": "Namespace",
-      "HelpText": "The namespace to execute the promotion of the rollout against.",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "065f1110-abe9-4bdf-9a98-af20dcac4e8e",
-      "Name": "Argo.Rollout.Timeout",
-      "Label": "Timeout",
-      "HelpText": "The length of time to watch before giving up. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). Zero means wait forever.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.KubernetesRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-12T18:36:25.339Z",
-    "OctopusVersion": "2024.2.9210",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "argo"
-}
diff --git a/step-templates/argo-rollouts-undo.json b/step-templates/argo-rollouts-undo.json
deleted file mode 100644
index 1dbde36c8..000000000
--- a/step-templates/argo-rollouts-undo.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Id": "e75786e1-ef06-4ce7-a831-ccde04927c4c",
-  "Name": "Argo - Rollouts Undo",
-  "Description": "Rollback to the previous rollout.",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Supress info messages written to stderr\nWrite-Host \"##octopus[stderr-progress]\"\n\n# Installs the Argo Rollouts plugin\nfunction Install-Plugin\n{\n# Define parameters\n\tparam ($PluginUri,\n           $PluginFilename\n    )\n    \n    # Check for plugin folder\n    if ((Test-Path -Path \"$PWD/plugins\") -eq $false)\n    {\n\t\t# Create new plugins folder\n        New-Item -Path \"$PWD/plugins\" -ItemType \"Directory\"\n        \n        # Add to path\n        $env:PATH = \"$($PWD)/plugins$([IO.Path]::PathSeparator)\" + $env:PATH\n    }\n\n\t# Download plugin\n\tInvoke-WebRequest -Uri \"$PluginUri\" -OutFile \"$PWD/plugins/$PluginFilename\"\n\n\t# Make file executable\n    if ($IsLinux)\n    {\n\t\t# Make it executable\n    \tchmod +x ./plugins/$PluginFilename\n    }\n    \n    if ($IsWindows)\n    {\n    \t# Update filename to include .exe extension\n        Rename-Item -Path \"$PWD/plugins/$PluginFilename\" -NewName \"$PWD/plugins/$($PluginFilename).exe\"\n    }\n}\n\n# When listing plugins, kubectl looks in all paths defined in $env:PATH and will fail if the path does not exist\nfunction Verify-Path-Variable\n{\n\t# Get current path and split into array\n    $paths = $env:PATH.Split([IO.Path]::PathSeparator)\n    $verifiedPaths = @()\n    \n    # Loop through paths\n    foreach ($path in $paths)\n    {\n    \t# Check for existence\n        if ((Test-Path -Path $path) -eq $true)\n        {\n        \t# Add to verified\n            $verifiedPaths += $path\n        }\n    }\n    \n    # Return verified paths\n    return ($verifiedPaths -join [IO.Path]::PathSeparator)\n}\n\nfunction Get-Plugin-Installed\n{\n\t# Define parameters\n    param (\n    \t$PluginName,\n        $InstalledPlugins\n        )\n        \n   \t$isInstalled = $false\n   \n\tforeach ($plugin in $installedPlugins)\n   \t{\n\t\tif ($plugin -like \"$($PluginName)*\")\n        {\n        \t$isInstalled = $true\n          \tbreak\n        }\n\t}\n    \n    return $isInstalled\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Verify all PATH variables are avaialable\n$env:PATH = Verify-Path-Variable\nif ($IsLinux)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64\"\n}\n\nif ($IsWindows)\n{\n\t$pluginUri = \"https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-windows-amd64\"\n}\n\ntry \n{\n    # Check to see if plugins are installed\n    $pluginList = (kubectl plugin list 2>&1)\n\n    # This is the path that Linux will take\n    if ($lastExitCode -ne 0 -and $pluginList.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\") \n    {\n        Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n    }\n    else\n    {\n        # Parse list\n    \t$pluginList = $pluginList.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)\n        \n        if ((Get-Plugin-Installed -PluginName \"kubectl-argo-rollouts\" -InstalledPlugins $pluginList) -eq $false)\n        {\n        \tInstall-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"\n        }\n        else\n        {\n        \tWrite-Host \"Argo Rollout kubectl plugin found ...\"\n        }\n    }    \n}\ncatch\n{\n\t# On Windows, the executable will cause an error if no plugins found so this the path Windows will take\n    if ($_.Exception.Message -eq \"error: unable to find any kubectl plugins in your PATH\")\n    {\n      Install-Plugin -PluginUri $pluginUri -PluginFilename \"kubectl-argo-rollouts\"    \n    }\n    else\n    {\n    \t# Something else happened, we need to surface the error\n        throw\n    }\n}\n\n# Get parameters\n$rolloutsName = $OctopusParameters['Argo.Rollout.Name']\n$rolloutsNamespace = $OctopusParameters['Argo.Rollout.Namespace']\n$rolloutRevision = $OctopusParameters['Argo.Rollout.Revision']\n\n# Create arguments array\n$kubectlArguments = @(\"argo\", \"rollouts\", \"undo\", $rolloutsName, \"--namespace\", $rolloutsNamespace)\n\n# Check for revision\nif (![string]::IsNullOrWhitespace($rolloutRevision))\n{\n\t# Add argument\n    $kubectlArguments += @(\"--to-revision=$rolloutRevision\")\n}\n\n# Pause rollout\nkubectl $kubectlArguments\n\nif ($lastExitCode -ne 0)\n{\n\tWrite-Error \"Rollout command failed!\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "f2c7fa50-2faf-4d16-affd-13c00a72afef",
-      "Name": "Argo.Rollout.Name",
-      "Label": "Rollout Name",
-      "HelpText": "Name of the Argo Rollout to Undo",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0910eda0-93f4-4f31-85bd-fafd2d39d3ac",
-      "Name": "Argo.Rollout.Namespace",
-      "Label": "Namespace",
-      "HelpText": "The namespace where the rollout exists.",
-      "DefaultValue": "default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b7fb60af-72fc-4a94-b242-40397941aa39",
-      "Name": "Argo.Rollout.Revision",
-      "Label": "Revision",
-      "HelpText": "Revision number to revert to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.KubernetesRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-06T20:14:10.831Z",
-    "OctopusVersion": "2024.1.12815",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "argo"
-}
diff --git a/step-templates/aspnetcore-set-environment-variable-iis.json b/step-templates/aspnetcore-set-environment-variable-iis.json
deleted file mode 100644
index 6ae216757..000000000
--- a/step-templates/aspnetcore-set-environment-variable-iis.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "Id": "3586C580-7FC8-4FAB-A783-3641D91F7746",
-  "Author": "waxtell",
-  "Name": "ASP.NET Core Set Environment Variables Via IIS Config",
-  "Description": "Set environment variables in IIS config (no web.config)",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function AddOrReplaceEnvironmentVariable {\n    param\n    (\n        [string] $variableName, \n        [string] $variableValue,\n        [string] $siteName,\n        [string] $appCmd\n    )\n\n    Try {\n        [xml] $xmlConfig = (&$appCmd list config $sev_siteName -section:system.webServer/aspNetCore)\n    }\n    Catch {\n        Write-Host $sev_siteName 'either does not exist or is not an AspNetCore site!'\n        exit -1\n    }\n\n    if($xmlConfig.selectNodes(\"//environmentVariable[@name='$variableName']\")) {\n        &$appCmd set config $sev_siteName -section:system.webServer/aspNetCore /-\"environmentVariables.[name='$variableName',value='$variableValue']\" /commit:apphost\n    }\n    \n    &$appCmd set config $sev_siteName -section:system.webServer/aspNetCore /+\"environmentVariables.[name='$variableName',value='$variableValue']\" /commit:apphost\n}\n\n[string] $sev_siteName=$OctopusParameters['sev_siteName']\n[string] $sev_envVariables=$OctopusParameters['sev_envVariables']\n[string] $sev_appCmdPath=$OctopusParameters['sev_appCmdPath']\n\nWrite-Host \"---------------------------\"\nWrite-Host $sev_envVariables\nWrite-Host $sev_appCmdPath\nWrite-Host \"---------------------------\"\n\n$appCmd = Join-Path $sev_appCmdPath 'appcmd.exe'\n\nforeach($line in $sev_envVariables -split '\\r?\\n') {\n    $indexOfEquals = $line.IndexOf('=')\n    if ($indexOfEquals -eq -1) {\n        Write-Host \"Invalid environment variable format: $line\"\n        continue\n    }\n    $key = $line.Substring(0, $indexOfEquals)\n    $value = $line.Substring($indexOfEquals + 1)\n\n    AddOrReplaceEnvironmentVariable $key $value $sev_siteName $appCmd\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "3FE22421-50AB-4CBB-B86A-666EC1609115",
-      "Name": "sev_siteName",
-      "Label": "Site Name",
-      "HelpText": "Name of your ASP.NET Core site",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "78BF70F2-72F5-42E6-A992-C9504A964815",
-      "Name": "sev_envVariables",
-      "Label": "Environment Variables",
-      "HelpText": "Newline separated list of environment variables (varname=varvalue)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "3F851D0C-C93E-403F-861E-5BDA361C1E92",
-      "Name": "sev_appCmdPath",
-      "Label": "Path to appcmd.exe",
-      "HelpText": "Path to the appcmd.exe executable",
-      "DefaultValue": "c:\\windows\\system32\\inetsrv",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "geeknz",
-  "$Meta": {
-    "ExportedAt": "2024-07-15T22:40:29.070Z",
-    "OctopusVersion": "2024.2.9220",
-    "Type": "ActionTemplate"
-  },
-  "Category": "dotnetcore"
-}
diff --git a/step-templates/aspnetcore-set-environment-variable.json b/step-templates/aspnetcore-set-environment-variable.json
deleted file mode 100644
index d58961fae..000000000
--- a/step-templates/aspnetcore-set-environment-variable.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Id": "c7f96ab8-a0d3-4f01-928e-c8cb78ab108c",
-  "Name": "ASP.NET Core - set runtime environment variable via web.config",
-  "Description": "ASP.NET Core allows you specify environment variables in web.config - https://docs.microsoft.com/en-us/aspnet/core/hosting/aspnet-core-module#set-environment-variables",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "Param(\r\n    [string]$anc_WebConfigPath,\r\n    [string]$anc_EnvironmentVariableName,\r\n    [string]$anc_EnvironmentVariableValue\r\n)\r\n\r\n$ErrorActionPreference = \"Stop\"\r\n\r\nfunction Get-Parameter($Name, [switch]$Required, [switch]$TestPath) {\r\n\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name\r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null -or $result -eq \"\") {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        }\r\n    }\r\n\r\n    if ($TestPath) {\r\n        if (!(Test-Path $result -PathType Leaf)) {\r\n            throw \"Could not find $result\"\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    Param(\r\n        [string]$anc_WebConfigPath,\r\n        [string]$anc_EnvironmentVariableName,\r\n        [string]$anc_EnvironmentVariableValue\r\n    )\r\n\r\n    $xml = (Get-Content $anc_WebConfigPath) -as [Xml]\r\n    $aspNetCore = $xml.configuration.location.'system.webServer'.aspNetCore\r\n    $environmentVariables = $aspNetCore.environmentVariables\r\n\r\n    if (!$environmentVariables) {\r\n        $environmentVariables = $xml.CreateElement(\"environmentVariables\");\r\n        $aspNetCore.AppendChild($environmentVariables)\r\n    }\r\n\r\n    $environmentVariable = $environmentVariables.environmentVariable | Where-Object {$_.name -eq $anc_EnvironmentVariableName}\r\n\r\n    if ($environmentVariable) {\r\n        $environmentVariable.value = $anc_EnvironmentVariableValue\r\n    }\r\n    elseif ($environmentVariables) {\r\n        $environmentVariable = $xml.CreateElement(\"environmentVariable\");\r\n        $environmentVariable.SetAttribute(\"name\", $anc_EnvironmentVariableName);\r\n        $environmentVariable.SetAttribute(\"value\", $anc_EnvironmentVariableValue);\r\n        $x = $environmentVariables.AppendChild($environmentVariable)\r\n    }\r\n    else {\r\n        throw \"Could not find 'configuration/system.webServer/aspNetCore/environmentVariables' element in web.config\"\r\n    }\r\n\r\n    try {\r\n        $xml.Save((Resolve-Path $anc_WebConfigPath))\r\n    }\r\n    catch {\r\n        throw \"Could not save web.config because: $_.Exception.Message\"\r\n    }\r\n} `\r\n(Get-Parameter 'anc_WebConfigPath' -Required -TestPath) `\r\n(Get-Parameter 'anc_EnvironmentVariableName' -Required) `\r\n(Get-Parameter 'anc_EnvironmentVariableValue' -Required)\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "b1b74503-0f3d-4519-8ec6-d6a4aace9086",
-      "Name": "anc_WebConfigPath",
-      "Label": "Web.Config Path",
-      "HelpText": "Typically an output variable from a previous step",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "5fe18f04-de84-445e-bb69-81ed0d39980f",
-      "Name": "anc_EnvironmentVariableName",
-      "Label": "Environment Variable Name",
-      "HelpText": "Name of environment variable to set",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c9099a01-7de3-4724-8d6d-e26d8bf0fd21",
-      "Name": "anc_EnvironmentVariableValue",
-      "Label": "Environment Variable Value",
-      "HelpText": "Value of environment variable to set",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "baynenator",
-  "$Meta": {
-    "ExportedAt": "2017-08-31T06:20:39.415Z",
-    "OctopusVersion": "3.13.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "dotnetcore"
-}
diff --git a/step-templates/automate-manual-intervention-response.json b/step-templates/automate-manual-intervention-response.json
deleted file mode 100644
index 4f62dfb24..000000000
--- a/step-templates/automate-manual-intervention-response.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "Id": "54f95528-aa1e-4c97-8c16-b2e0d737c43e",
-    "Name": "Automate Manual Intervention Response",
-    "Description": "This template will search for deployments that have been paused due to Manual Intervention or Guided Failure and automate the response.",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "function Get-OctopusItems\n{\n # Define parameters\n    param(\n        $OctopusUri,\n        $ApiKey,\n        $SkipCount = 0\n    )\n\n    # Define working variables\n    $items = @()\n    $skipQueryString = \"\"\n    $headers = @{\"X-Octopus-ApiKey\"=\"$ApiKey\"}\n\n    # Check to see if there there is already a querystring\n    if ($octopusUri.Contains(\"?\"))\n    {\n        $skipQueryString = \"&skip=\"\n    }\n    else\n    {\n        $skipQueryString = \"?skip=\"\n    }\n\n    $skipQueryString += $SkipCount\n\n    # Get intial set\n    $resultSet = Invoke-RestMethod -Uri \"$($OctopusUri)$skipQueryString\" -Method GET -Headers $headers\n\n    # Check to see if it returned an item collection\n    if ($null -ne $resultSet.Items)\n    {\n        # Store call results\n        $items += $resultSet.Items\n\n        # Check to see if resultset is bigger than page amount\n        if (($resultSet.Items.Count -gt 0) -and ($resultSet.Items.Count -eq $resultSet.ItemsPerPage))\n        {\n            # Increment skip count\n            $SkipCount += $resultSet.ItemsPerPage\n\n            # Recurse\n            $items += Get-OctopusItems -OctopusUri $OctopusUri -ApiKey $ApiKey -SkipCount $SkipCount\n        }\n    }\n    else\n    {\n        return $resultSet\n    }\n\n\n    # Return results\n    return ,$items\n}\n\n$automaticResponseOctopusUrl = $OctopusParameters['AutomateResponse.Octopus.Url']\n$automaticResponseApiKey = $OctopusParameters['AutomateResponse.Api.Key']\n$automaticResponseReasonNotes = $OctopusParameters['AutomateResponse.Reason.Notes']\n$automaticResponseManualInterventionResponseType = $OctopusParameters['AutomateResponse.ManualIntervention']\n$automaticResponseGuidedFailureResponseType = $OctopusParameters['AutomateResponse.GuidedFailure']\n$header = @{ \"X-Octopus-ApiKey\" = $automaticResponseApiKey }\n\n# Validate response type input\nif (![string]::IsNullOrWhitespace($automaticResponseManualInterventionResponseType) -and ![string]::IsNullOrWhitespace($automaticResponseGuidedFailureResponseType))\n{\n\t# Fail step\n    Write-Error \"Cannot have both a Manual Intervention and Guided Failure selections.\"\n}\n\nif ([string]::IsNullOrWhitespace($automaticResponseManualInterventionResponseType) -and [string]::IsNullOrWhitespace($automaticResponseGuidedFailureResponseType))\n{\n\t# Fail step\n    Write-Error \"Please select either a Manual Intervention or Guided Failure response type.\"\n}\n\n# Get space\n$spaceId = $OctopusParameters['Octopus.Space.Id']\n\n# Get project\n$projectId = $OctopusParameters['Octopus.Project.Id']\n\n# Get the environment\n$environmentId = $OctopusParameters['Octopus.Environment.Id']\n\nif (![string]::IsNullOrWhitespace($automaticResponseGuidedFailureResponseType))\n{\n# Get currently executing deployments for project - this is for Guided Failure as they're in an executing state\n  Write-Host \"Searching for executing deployments ...\"\n  $executingDeployments = Get-OctopusItems -OctopusUri \"$automaticResponseOctopusUrl/api/$($spaceId)/deployments?projects=$($projectId)&taskState=Executing&environments=$($environmentId)\" -ApiKey $automaticResponseApiKey\n}\n\nif (![string]::IsNullOrWhitespace($automaticResponseManualInterventionResponseType))\n{\n  Write-Host \"Searching for queued deployments ...\"\n  # Get queued deployments - this is for \n  $executingDeployments = Get-OctopusItems -OctopusUri \"$automaticResponseOctopusUrl/api/$($spaceId)/deployments?projects=$($projectId)&taskState=Queued&environments=$($environmentId)\" -ApiKey $automaticResponseApiKey\n}\n\n# Check to see if anything was returned for the environment\nif ($executingDeployments -is [array])\n{\n  # Loop through executing deployments\n  foreach ($deployment in $executingDeployments)\n  {\n      # Get object for manual intervention\n      Write-Host \"Checking $($deployment.Id) for manual interventions ...\"\n      $manualIntervention = Get-OctopusItems -OctopusUri \"$automaticResponseOctopusUrl/api/$($spaceId)/interruptions?regarding=$($deployment.Id)&pendingOnly=true\" -ApiKey $automaticResponseApiKey\n\n      # Check to see if a manual intervention was returned\n      if ($null -ne $manualIntervention.Id)\n      {\n          # Take responsibility\n          Write-Host \"Auto taking resonsibility for manual intervention ...\"\n          Invoke-RestMethod -Method Put -Uri \"$automaticResponseOctopusUrl/api/$($spaceId)/interruptions/$($manualIntervention.Id)/responsible\" -Headers $header\n\n          # Create response object\n          $jsonBody = @{\n              Notes = $automaticResponseReasonNotes\n          }\n\n          # Check to see if manual intervention is empty\n          if (![string]::IsNullOrWhiteSpace($automaticResponseManualInterventionResponseType))\n          {\n              # Add the manual intervention type\n              Write-Host \"Submitting $automaticResponseManualInterventionResponseType as response ...\"\n              $jsonBody.Add(\"Result\", $automaticResponseManualInterventionResponseType)\n          }\n\n          # Check to see if the guided failure is empty\n          if (![string]::IsNullOrWhiteSpace($automaticResponseGuidedFailureResponseType))\n          {\n              # Add the guided failure response\n              Write-Host \"Submitting $automaticResponseGuidedFailureResponseType as response ...\"\n              $jsonBody.Add(\"Guidance\", $automaticResponseGuidedFailureResponseType)\n          }\n\n          # Post to server\n          Invoke-RestMethod -Method Post -Uri \"$automaticResponseOctopusUrl/api/$($spaceId)/interruptions/$($manualIntervention.Id)/submit\" -Body ($jsonBody | ConvertTo-Json -Depth 10) -Headers $header\n      }\n  }\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "f5961f82-66a5-4219-a15c-f4a9feb68904",
-        "Name": "AutomateResponse.Octopus.Url",
-        "Label": "Octopus Server Url",
-        "HelpText": "The Url to your Octopus Server instance.",
-        "DefaultValue": "#{Octopus.Web.ServerUri}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3752c78e-4df8-4261-bdff-906bed063b12",
-        "Name": "AutomateResponse.Api.Key",
-        "Label": "API Key",
-        "HelpText": "API Key of the account you want to use for the automatic response.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "be44e98e-13a8-4f4e-9b51-99920dfcf763",
-        "Name": "AutomateResponse.Reason.Notes",
-        "Label": "Reason Notes",
-        "HelpText": "This is the `Notes` input for manual intervention.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1bfbcc18-7ed9-4fce-88d1-0b4ab76d2623",
-        "Name": "AutomateResponse.ManualIntervention",
-        "Label": "Manual Intervention Response Type",
-        "HelpText": "Select the response type for the Manual Intervention.  Click Default Value to reset to none",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Abort|Abort\nProceed|Proceed"
-        }
-      },
-      {
-        "Id": "30405062-6bb6-499f-85ef-78bd378684ba",
-        "Name": "AutomateResponse.GuidedFailure",
-        "Label": "Guided Failure Response Type",
-        "HelpText": "Select the automated response for a Guided Failure.  Click Default Value to reset to none.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Fail|Fail\nExclude|Exclude Machine From Deployment\nIgnore|Ignore\nRetry|Retry"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2025-04-21T20:17:19.315Z",
-      "OctopusVersion": "2025.2.7176",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "octopus"
-  }
diff --git a/step-templates/aws-add-remove-elbv2.json b/step-templates/aws-add-remove-elbv2.json
deleted file mode 100644
index a9d7a824c..000000000
--- a/step-templates/aws-add-remove-elbv2.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "2abc4f4f-06f4-4af6-8b10-52651ab4d3d5",
-  "Name": "AWS - Add or Remove instance from ELBv2",
-  "Description": "Add or Remove the current instance from an ELBv2 Target Group.",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$accessKey = $OctopusParameters['accessKey']\n$secretKey = $OctopusParameters['secretKey']\n$region = $OctopusParameters['region']\n\n$targetGroupArn = $OctopusParameters['targetGroupArn']\n\n$action = $OctopusParameters['action']\n\n$checkInterval = $OctopusParameters['checkInterval']\n$maxChecks = $OctopusParameters['maxChecks']\n\n$awsProfile = (get-date -Format '%y%d%M-%H%m').ToString() # random\n\nif (Get-Module | Where-Object { $_.Name -like \"AWSPowerShell*\" }) {\n\tWrite-Host \"AWS PowerShell module is already loaded.\"\n} else {\n\t$awsModule = Get-Module -ListAvailable | Where-Object {  $_.Name -like \"AWSPowerShell*\" }\n\tif (!($awsModule)) {\n    \tWrite-Error \"AWSPowerShell / AWSPowerShell.NetCore not found\"\n        return\n    } else {\n    \tImport-Module $awsModule.Name\n        Write-Host \"Imported Module: $($awsModule.Name)\"\n    }\n}\n\nfunction GetCurrentInstanceId\n{\n    Write-Host \"Getting instance id\"\n\n\t$response = Invoke-RestMethod -Uri \"http://169.254.169.254/latest/meta-data/instance-id\" -Method Get\n\n\tif ($response)\n\t{\n\t\t$instanceId = $response\n\t}\n\telse\n\t{\n\t\tWrite-Error -Message \"Returned Instance ID does not appear to be valid\"\n\t\tExit 1\n\t}\n\n\t$response\n}\n\nfunction GetTarget\n{\n    $instanceId = GetCurrentInstanceId\n\n    $target = New-Object -TypeName Amazon.ElasticLoadBalancingV2.Model.TargetDescription\n    $target.Id = $instanceId\n    \n    Write-Host \"Current instance id: $instanceId\"\n\n    return $target\n}\n\nfunction GetInstanceState\n{\n\t$state = (Get-ELB2TargetHealth -TargetGroupArn $targetGroupArn -Target $target -AccessKey $accessKey -SecretKey $secretKey -Region $region).TargetHealth.State\n\n\tWrite-Host \"Current instance state: $state\"\n\n\treturn $state\n}\n\nfunction WaitForState\n{\n    param([string]$expectedState)\n\n    $instanceState = GetInstanceState -arn $targetGroupArn -target $target\n\n    if ($instanceState -eq $expectedState)\n    {\n        return\n    }\n\n    $checkCount = 0\n\n    Write-Host \"Waiting for instance state to be $expectedState\"\n    Write-Host \"Maximum Checks: $maxChecks\"\n    Write-Host \"Check Interval: $checkInterval\"\n\n    while ($instanceState -ne $expectedState -and $checkCount -le $maxChecks)\n    {\t\n\t    $checkCount += 1\n\t\n\t    Write-Host \"Waiting for $checkInterval seconds for instance state to be $expectedState\"\n\t    Start-Sleep -Seconds $checkInterval\n\t\n\t    if ($checkCount -le $maxChecks)\n\t    {\n\t\t    Write-Host \"$checkCount/$maxChecks Attempts\"\n\t    }\n\t\n\t    $instanceState = GetInstanceState\n    }\n\n    if ($instanceState -ne $expectedState)\n    {\n\t    Write-Error -Message \"Instance state is not $expectedState, giving up.\"\n\t    Exit 1\n    }\n}\n\nfunction DeregisterInstance\n{\n    Write-Host \"Deregistering instance from $targetGroupArn\"\n    Unregister-ELB2Target -TargetGroupArn $targetGroupArn -Target $target -AccessKey $accessKey -SecretKey $secretKey -Region $region\n    WaitForState -expectedState \"unused\"\n    Write-Host \"Instance deregistered\"\n}\n\nfunction RegisterInstance\n{\n    Write-Host \"Registering instance with $targetGroupArn\"\n    Try {\n    \tRegister-ELB2Target -TargetGroupArn $targetGroupArn -Target $target -AccessKey $accessKey -SecretKey $secretKey -Region $region\n    } Catch {\n    \tWrite-Host $Error[0]\n    }\n    WaitForState -expectedState \"healthy\"\n    Write-Host \"Instance registered\"\n}\n\n$target = GetTarget\n\nswitch ($action)\n{\n    \"deregister\" { DeregisterInstance }\n    \"register\" { RegisterInstance }\n}",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "81fc5ef2-2df8-4f10-a041-7277792e270a",
-      "Name": "accessKey",
-      "Label": "IAM Access Key ID",
-      "HelpText": "The IAM Access Key ID to use when authenticating with AWS.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c0f7d960-ffce-4046-9996-f7ef39a82306",
-      "Name": "secretKey",
-      "Label": "IAM Secret Key",
-      "HelpText": "The IAM secret access key used to authenticate with AWS.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ed692709-1332-4b18-9ec8-4bc02609bdee",
-      "Name": "region",
-      "Label": "AWS Region",
-      "HelpText": "The region in which the ELBv2 and Target Group live.",
-      "DefaultValue": "eu-west-1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "13d12f79-447f-4e2a-b4fb-460117b9301d",
-      "Name": "targetGroupArn",
-      "Label": "Target Group ARN",
-      "HelpText": "The ARN of the target group.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8c6fa0f4-6ebd-4021-aba9-39c7a5394ecd",
-      "Name": "action",
-      "Label": "Action",
-      "HelpText": "Choose if you want to add or remove the current instance from the selected target group.",
-      "DefaultValue": "deregister",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "deregister|Remove\nregister|Add"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "15e771c5-7fb5-45f3-ad9e-180d90aae785",
-      "Name": "checkInterval",
-      "Label": "State Check Interval",
-      "HelpText": "The number of seconds to wait before checking if the instances has been successfully added or removed from the target group.",
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "68c5d2d8-e991-4f64-87df-cd548fc16ffe",
-      "Name": "maxChecks",
-      "Label": "Maximum State Checks",
-      "HelpText": "The maximum number of times to check if the instance has been successfully added or removed from the target group.",
-      "DefaultValue": "6",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2022-05-16T07:30:05.303Z",
-  "LastModifiedBy": "phillip-haydon",
-  "$Meta": {
-    "ExportedAt": "2022-05-16T07:30:05.303Z",
-    "OctopusVersion": "2022.1.2584",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
diff --git a/step-templates/aws-add-tags-to-ec2-instance.json b/step-templates/aws-add-tags-to-ec2-instance.json
deleted file mode 100644
index 6abb813e1..000000000
--- a/step-templates/aws-add-tags-to-ec2-instance.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "Id": "82500bb2-f442-44f3-a5a5-7ecb4165ee1f",
-  "Name": "AWS - Add Tags to EC2 Instance",
-  "Description": "This step will Add or Remove Tags from an EC2 instance.\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$odInstanceId,\n    [string]$odAction,\n    [string]$odTags,\n    [string]$odAccessKey,\n    [string]$odSecretKey,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if (!$result -or $result -eq $null) {\n        if ($Default) {\n            $result = $Default\n        } elseif ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n    }\n\n    return $result\n}\n\n\n& {\n    param(\n        [string]$odInstanceId,\n        [string]$odAction,\n        [string]$odTags,\n        [string]$odAccessKey,\n        [string]$odSecretKey\n    ) \n    \n    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables\n    if ($odAccessKey -or $odSecretKey) {\n        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default\n    } elseif (([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -or ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\"))) {\n        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -SecretKey ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\")) -StoreAs default\n    } else {\n        throw \"AWS API credentials were not available/provided.\"\n    }\n\n\n\n    Write-Output (\"------------------------------\")\n    Write-Output (\"Add/Remove Instance Tags:\")\n    Write-Output (\"------------------------------\")\n    \n    $filterArray = @()\n    $tagsHash = (ConvertFrom-StringData $odTags).GetEnumerator()\n    Foreach ($tag in $tagsHash) {\n        $tagObj = $(Get-EC2Instance -InstanceId $odInstanceId).Instances.Tags | ? {$_.Key -eq $tag.Key -and $_.Value -eq $tag.Value}\n        $tagObjCount = ($tagObj | measure).Count\n        if ($tagObjCount -gt 0) {\n            if ($odAction -eq \"New\") {\n                Write-Output (\"Cannot Add: The tag '$($tag.Key)=$($tag.Value)' already exists, skipping...\")\n            } elseif ($odAction -eq \"Remove\") {\n                Write-Output (\"The tag '$($tag.Key)=$($tag.Value)' exists, deleting...\")\n\n                try {\n                    Remove-EC2Tag -Tags @{key=$tag.Key} -resourceId $odInstanceId -Force\n                }\n                catch [Amazon.EC2.AmazonEC2Exception] {\n                    throw $_.Exception.errorcode + '-' + $_.Exception.Message\n                }\n            }\n        } else {\n            if ($odAction -eq \"New\") {\n                Write-Output (\"The combination of tag and value '$($tag.Key)=$($tag.Value)' does not exist, Creating/Updating tag...\")\n\n                try {\n                    New-EC2Tag -Tags @{key=$tag.Key;value=$tag.Value} -resourceId $odInstanceId\n                }\n                catch [Amazon.EC2.AmazonEC2Exception] {\n                    throw $_.Exception.errorcode + '-' + $_.Exception.Message\n                }\n            } elseif ($odAction -eq \"Remove\") {\n                Write-Output (\"Cannot Remove: The tag '$($tag.Key)=$($tag.Value)' does not exist, skipping...\")\n            }\n        }\n    }\n } `\n (Get-Param 'odInstanceId' -Required) `\n (Get-Param 'odAction' -Required) `\n (Get-Param 'odTags' -Required) `\n (Get-Param 'odAccessKey') `\n (Get-Param 'odSecretKey')",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "3670adeb-3e4f-4c55-829b-b39bb709d841",
-      "Name": "odInstanceId",
-      "Label": "Instance ID",
-      "HelpText": "The EC2 Instance ID of the Instance you would like to add Tags to.",
-      "DefaultValue": "i-xxxxxxxxxxxxxxxxx",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "918acd83-39ae-47d1-9682-12333e723cff",
-      "Name": "odAction",
-      "Label": "Action",
-      "HelpText": "The action you would like to perform - Add or Remove Tags from an EC2 Instance.",
-      "DefaultValue": "New",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "New|Add tag to an instance\nRemove|Remove tag from an instance"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9b4d592a-712d-459e-af73-1db757a769d8",
-      "Name": "odTags",
-      "Label": "Tags",
-      "HelpText": "The Tags you would like to Add or Remove from an EC2 Instance, for example:\n\n- Name=MyProject\n- Environment=Prod\n- Version=1.3.3.7",
-      "DefaultValue": "Name=#{Octopus.Project.Name}\nEnvironment=#{Octopus.Environment.Name}\nVersion=#{Octopus.Release.Number}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ccd17285-bbb4-4dcb-84a8-330f45199afd",
-      "Name": "odAccessKey",
-      "Label": "Access Key (Kind-of Optional)",
-      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6f058614-92a0-4696-bb56-b6342a8d5466",
-      "Name": "odSecretKey",
-      "Label": "Secret Key (Kind-of Optional)",
-      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "tclydesdale",
-  "$Meta": {
-    "ExportedAt": "2018-01-30T12:44:07.356Z",
-    "OctopusVersion": "4.1.9",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
diff --git a/step-templates/aws-change-ec2-instance-state.json b/step-templates/aws-change-ec2-instance-state.json
deleted file mode 100644
index e78ebb20e..000000000
--- a/step-templates/aws-change-ec2-instance-state.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "Id": "302a1282-c139-4e0f-9076-cd4b16d8b795",
-    "Name": "AWS - Change EC2 Instance State",
-    "Description": "This step can Start, Stop or Terminate an EC2 instance.\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Properties": {
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.RunOnServer": "false",
-      "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$odInstanceId,\n    [string]$odState,\n    [string]$odAccessKey,\n    [string]$odSecretKey,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if (!$result -or $result -eq $null) {\n        if ($Default) {\n            $result = $Default\n        } elseif ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n    }\n\n    return $result\n}\n\n\n& {\n    param(\n        [string]$odInstanceId,\n        [string]$odState,\n        [string]$odAccessKey,\n        [string]$odSecretKey\n    )\n    \n    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables\n    if ($odAccessKey -or $odSecretKey) {\n        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default\n    } elseif (([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -or ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\"))) {\n        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -SecretKey ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\")) -StoreAs default\n    } else {\n        throw \"AWS API credentials were not available/provided.\"\n    }\n\n    if ($odInstanceId) {\n        $instanceObj = (Get-EC2Instance $odInstanceId | select -ExpandProperty Instances)\n        $instanceCount = ($instanceObj | measure).Count\n\n        if ($instanceCount -eq 1) {\n            $instanceId = ($instanceObj).InstanceId\n            \n            Write-Output (\"------------------------------\")\n            Write-Output (\"Checking/Setting the EC2 Instance state:\")\n            Write-Output (\"------------------------------\")\n            \n            $currentState = (Get-EC2Instance $instanceId).Instances.State.Name\n\n            if ($odState -eq \"running\" -and $currentState -ne \"running\") {\n                $changeInstanceStateObj = (Start-EC2Instance -InstanceId $instanceId)\n            }\n            elseif ($odState -eq \"absent\" -and $currentState -ne \"terminated\") {\n                $changeInstanceStateObj = (Remove-EC2Instance -InstanceId $instanceId -Force)\n            }\n            elseif ($odState -eq \"stopped\" -and $currentState -ne \"stopped\") {\n                $changeInstanceStateObj = (Stop-EC2Instance -InstanceId $instanceId)\n            }\n\n            $timeout = new-timespan -Seconds 120\n            $sw = [diagnostics.stopwatch]::StartNew()\n\n            while ($true) {\n                $currentState = (Get-EC2Instance $instanceId).Instances.State.Name\n\n                if ($currentState -eq \"running\" -and $odState -eq \"running\") {\n                    break\n                }\n                elseif ($currentState -eq \"terminated\" -and $odState -eq \"absent\") {\n                    break\n                }\n                elseif ($currentState -eq \"stopped\" -and $odState -eq \"stopped\") {\n                    break\n                }\n\n                Write-Output (\"$(Get-Date) | Waiting for Instance '$instanceId' to transition from state: $currentState\")\n\n                if ($sw.elapsed -gt $timeout) { throw \"Timed out waiting for desired state\" }\n\n                Sleep -Seconds 5\n            }\n \n            Write-Output (\"------------------------------\")\n            Write-Output (\"$(Get-Date) | $($instanceId) state: $currentState\")\n            Write-Output (\"------------------------------\")\n        }\n        else\n        {\n            Write-Output (\"Instance '$instanceId' could not be found...?\")\n        }\n    }\n } `\n (Get-Param 'odInstanceId' -Required) `\n (Get-Param 'odState' -Required) `\n (Get-Param 'odAccessKey') `\n (Get-Param 'odSecretKey')"
-    },
-    "Parameters": [
-      {
-        "Id": "3eec5a11-9095-40f6-bebb-71ccb94c73db",
-        "Name": "odInstanceId",
-        "Label": "Instance ID",
-        "HelpText": "The EC2 Instance ID of the Instance you would like to add Tags to.",
-        "DefaultValue": "i-xxxxxxxxxxxxxxxxx",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "94b68517-858c-4232-bd1a-c760a22750a1",
-        "Name": "odState",
-        "Label": "Instance State",
-        "HelpText": "The State you would like the specified EC2 Instance to be in. For example \"Running\" (ie Start EC2 Instance).",
-        "DefaultValue": "running",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "running|Start EC2 Instance\nstopped|Stop EC2 Instance\nabsent|Terminate EC2 Instance"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "e1c98924-6f3b-45fe-a4b8-16329a9a50ea",
-        "Name": "odAccessKey",
-        "Label": "Access Key (Kind-of Optional)",
-        "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "45557d48-5f1a-4523-9f42-f4a53571d0ce",
-        "Name": "odSecretKey",
-        "Label": "Secret Key (Kind-of Optional)",
-        "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      }
-    ],
-    "LastModifiedBy": "tclydesdale",
-    "$Meta": {
-      "ExportedAt": "2018-01-30T13:25:57.198Z",
-      "OctopusVersion": "4.1.9",
-      "Type": "ActionTemplate"
-    },
-    "Category": "aws"
-  }
-  
\ No newline at end of file
diff --git a/step-templates/aws-cloudformation-create.json b/step-templates/aws-cloudformation-create.json
deleted file mode 100644
index d11c88299..000000000
--- a/step-templates/aws-cloudformation-create.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  "Id": "d6d9d9db-e4ab-487c-967c-860bf8303052",
-  "Name": "AWS - Create Cloud Formation Stack",
-  "Description": "Creates a [Amazon Cloud Formation Stack](#http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html) with the template specified.\n\n- Requires the [AWS PowerShell cmdlets](http://aws.amazon.com/powershell/)",
-  "ActionType": "Octopus.Script",
-  "Version": 50,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html\r\n\r\n#Check for the PowerShell cmdlets\r\ntry{ \r\n    Import-Module AWSPowerShell -ErrorAction Stop\r\n}catch{\r\n    \r\n    $modulePath = \"C:\\Program Files (x86)\\AWS Tools\\PowerShell\\AWSPowerShell\\AWSPowerShell.psd1\"\r\n    Write-Output \"Unable to find the AWS module checking $modulePath\" \r\n    \r\n    try{\r\n        Import-Module $modulePath\r\n        \r\n    }\r\n    catch{\r\n        throw \"AWS PowerShell not found! Please make sure to install them from https://aws.amazon.com/powershell/\" \r\n    }\r\n}\r\n\r\nfunction Confirm-CFNStackDeleted($credential, $stackName){\r\n   do{\r\n        $stack = $null\r\n        try {\r\n            $stack = Get-CFNStack -StackName $CloudFormationStackName -Credential $credential -Region $AWSRegion       \r\n        }\r\n        catch{}\r\n        \r\n        if($stack -ne $null){\r\n\r\n\t\t\t$stack | ForEach-Object {\r\n\t\t\t\t$progress = $_.StackStatus.ToString()\r\n\t\t\t\t$name = $_.StackName.ToString()\r\n\r\n\t\t\t\tWrite-Host \"Waiting for Cloud Formation Script to deleted. Stack Name: $name Operation status: $progress\" \r\n         \r\n\t\t\t\tif($progress -ne \"DELETE_COMPLETE\" -and $progress -ne \"DELETE_IN_PROGRESS\"){                        \r\n\t\t\t\t\t$stack\r\n\t\t\t\t\tthrow \"Something went wrong deleting the Cloud Formation Template\" \r\n\t\t\t\t} \t \t\t\r\n\t\t\t} \r\n\t\t\t \r\n            Start-Sleep -s 15\r\n        }\r\n\r\n    }until ($stack -eq $null)\r\n}\r\n\r\nfunction Confirm-CFNStackCompleted($credential, $stackName, $region){\r\n\r\n    $awsValidStatusList = @()\r\n    $awsValidStatusList += \"CREATE_COMPLETE\"\r\n    $awsValidStatusList += \"CREATE_IN_PROGRESS\" \r\n    \r\n    $awsFailedStatusList = @()\r\n    $awsFailedStatusList += \"CREATE_FAILED\"\r\n    $awsFailedStatusList += \"UPDATE_FAILED\"\r\n    $awsFailedStatusList += \"DELETE_SKIPPED\"\r\n    $awsFailedStatusList += \"CREATE_FAILED\"\r\n    $awsFailedStatusList += \"CREATE_FAILED\"\r\n\r\n\t#http://docs.aws.amazon.com/powershell/latest/reference/Index.html\r\n    #CREATE_COMPLETE | CREATE_FAILED | CREATE_IN_PROGRESS | DELETE_COMPLETE | DELETE_FAILED | DELETE_IN_PROGRESS | DELETE_SKIPPED | UPDATE_COMPLETE | UPDATE_FAILED | UPDATE_IN_PROGRESS.\r\n\t \r\n    do{\r\n        $stack = Get-CFNStack -StackName $stackName -Credential $credential -Region $region  \r\n\t\t$complete = $false\r\n\r\n\t\t#Depending on the template sometimes there are multiple status per CFN template\r\n\r\n\t\t$stack | ForEach-Object {\r\n\t\t\t$progress = $_.StackStatus.ToString()\r\n\t\t\t$name = $_.StackName.ToString()\r\n\r\n\t\t\tWrite-Host \"Waiting for Cloud Formation Script to complete. Stack Name: $name Operation status: $progress\" \r\n         \r\n\t\t\tif($progress -ne \"CREATE_COMPLETE\" -and $progress -ne \"CREATE_IN_PROGRESS\"){                        \r\n\t\t\t\t$stack\r\n\t\t\t\tthrow \"Something went wrong creating the Cloud Formation Template\" \r\n\t\t\t} \t \t\t\r\n\t\t}\r\n\r\n\t\t$inProgress = $stack | Where-Object { $_.StackStatus.ToString() -eq \"CREATE_IN_PROGRESS\" }\r\n\t\t\r\n\t\tif($inProgress.Count -eq 0){\r\n\t\t\t$complete = $true\r\n\t\t}\r\n\t\t \r\n        Start-Sleep -s 15\r\n\r\n    }until ($complete -eq $true)\r\n}\r\n\r\n# Check the parameters.\r\nif (-NOT $AWSSecretAccessKey) { throw \"You must enter a value for 'AWS Access Key'.\" }\r\nif (-NOT $AWSAccessKey) { throw \"You must enter a value for 'AWS Secret Access Key'.\" }\r\nif (-NOT $AWSRegion) { throw \"You must enter a value for 'AWS Region'.\" }\r\nif (-NOT $CloudFormationStackName) { throw \"You must enter a value for 'AWS Cloud Formation Stack Name'.\" }  \r\n\r\n\r\n#Reformat the CloudFormation parameters\r\n$paramObject = ConvertFrom-Json $CloudFormationParameters\r\n$cloudFormationParams = @()\r\n\r\n$paramObject.psobject.properties | ForEach-Object { \r\n    $keyPair = New-Object -Type Amazon.CloudFormation.Model.Parameter\r\n    $keyPair.ParameterKey = $_.Name\r\n    $keyPair.ParameterValue = $_.Value\r\n\r\n    $cloudFormationParams += $keyPair\r\n} \r\n\r\nWrite-Output \"--------------------------------------------------\"\r\nWrite-Output \"AWS Region: $AWSRegion\"\r\nWrite-Output \"AWS Cloud Formation Stack Name: $CloudFormationStackName\"\r\nWrite-Output \"Use S3 for AWS Cloud Formation Script?: $UseS3ForCloudFormationTemplate\"\r\nWrite-Output \"Use S3 for AWS Cloud Formation Stack Policy?: $UseS3ForStackPolicy\"\r\nWrite-Output \"AWS Cloud Formation Script Url: $CloudFormationTemplateURL\"\r\nWrite-Output \"AWS Cloud Formation Stack Policy Url: $CloudFormationStackPolicyURL\"\r\nWrite-Output \"AWS Cloud Formation Parameters:\"\r\nWrite-Output $cloudFormationParams\r\nWrite-Output \"--------------------------------------------------\"\r\n\r\n#Set up the credentials and the dependencies\r\nSet-DefaultAWSRegion -Region $AWSRegion\r\n$credential = New-AWSCredentials -AccessKey $AWSAccessKey -SecretKey $AWSSecretAccessKey  \r\n\r\n#Check to see if the stack exists\r\ntry{\r\n    $stack = Get-CFNStack -StackName $CloudFormationStackName -Credential $credential -Region $AWSRegion    \r\n}\r\ncatch{} #Do nothing as this will throw if the stack does not exist\r\n\r\nif($stack -ne $null){\r\n    if($DeleteExistingStack -eq $false) {\r\n        Write-Output \"Stack with name $CloudFormationStackName already exists. If you wish to automatically delete existing stacks, set 'Delete Existing Stack' to True.\"\r\n        exit -1\r\n    }\r\n    Write-Output \"Stack found, removing the existing Cloud Formation Stack\"           \r\n    \r\n    Remove-CFNStack -Credential $credential -StackName $CloudFormationStackName -Region $AWSRegion -Force\r\n    Confirm-CFNStackDeleted -credential $credential -stackName $CloudFormationStackName\r\n}\r\n\r\nif($UseS3ForCloudFormationTemplate -eq $true){   \r\n\r\n    if (-NOT $CloudFormationTemplateURL) { throw \"You must enter a value for 'AWS Cloud Formation Template'.\" } \r\n\r\n    if($UseS3ForStackPolicy -eq $true){\r\n        Write-Output \"Using Cloud Formation Stack Policy from $CloudFormationStackPolicyURL\"\r\n        New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateUrl $CloudFormationTemplateURL -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability -StackPolicyURL $CloudFormationStackPolicyURL\r\n    }\r\n    else {\r\n        New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateUrl $CloudFormationTemplateURL -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability            \r\n    }\r\n\r\n    Confirm-CFNStackCompleted -credential $credential -stackName $CloudFormationStackName -region $AWSRegion\r\n}\r\nelse{\r\n    \r\n    Write-Output \"Using Cloud Formation script from Template\"\r\n\r\n    $validTemplate = Test-CFNTemplate -TemplateBody $CloudFormationTemplate -Region $AWSRegion  -Credential $credential\r\n    $statusCode =  $validTemplate.HttpStatusCode.ToString()\r\n\r\n    Write-Output \"Validation Response: $statusCode\"\r\n\r\n    if($validTemplate.HttpStatusCode){\r\n\r\n        if($UseS3ForStackPolicy -eq $true){\r\n            Write-Output \"Using Cloud Formation Stack Policy from $CloudFormationStackPolicyURL\"\r\n            New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateBody $CloudFormationTemplate -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability -StackPolicyURL $CloudFormationStackPolicyURL\r\n        }\r\n        else {\r\n            New-CFNStack -Credential $credential -OnFailure $CloudFormationOnFailure -TemplateBody $CloudFormationTemplate -StackName $CloudFormationStackName -Region $AWSRegion -Parameter $cloudFormationParams -Capability $CloudFormationCapability\r\n        }\r\n\r\n        Confirm-CFNStackCompleted -credential $credential -stackName $CloudFormationStackName -region $AWSRegion\r\n    }\r\n    else{\r\n        throw \"AWS Cloud Formation template is not valid\"\r\n    }         \r\n}\r\n\r\n$stack = Get-CFNStack -StackName $CloudFormationStackName -Credential $credential -Region $AWSRegion   \r\n\r\nSet-OctopusVariable -name \"AWSCloudFormationStack\" -value $stack\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "13f780df-407d-48b9-b7d8-7bd92f47da38",
-      "Name": "AWSSecretAccessKey",
-      "Label": "AWS Secret Access Key",
-      "HelpText": "The [secret access key](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html) to use when executing the script",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "520b8d18-fedd-49fc-a80c-957ea00fe532",
-      "Name": "AWSAccessKey",
-      "Label": "AWS Access Key",
-      "HelpText": "The [access key](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html) to use when executing the script",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ff776b86-a3f3-4d8c-b3e1-1e7ac629d503",
-      "Name": "AWSRegion",
-      "Label": "AWS Region",
-      "HelpText": "The Amazon Region see (http://docs.aws.amazon.com/powershell/latest/reference/items/Get-AWSRegion.html) for further info",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\nca-central-1|Canada (Central)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\neu-central-1|EU (Frankfurt)\neu-west-1|EU (Ireland)\neu-west-2|EU (London)\nsa-east-1|South America (São Paulo)"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "772a57e1-824b-46bf-b652-31c27b3b8473",
-      "Name": "CloudFormationStackName",
-      "Label": "AWS Cloud Formation Stack Name",
-      "HelpText": "The name of the AWS Cloud Formation Stack",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8c6b8792-fc24-4f40-953e-4d8511b5e00d",
-      "Name": "CloudFormationCapability",
-      "Label": "AWS Cloud Formation Capability",
-      "HelpText": "The capability required for the tempate see [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
-      "DefaultValue": "CAPABILITY_IAM",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "51433c58-fc29-4e73-aae0-5a40799fa16f",
-      "Name": "CloudFormationOnFailure",
-      "Label": "Action on Failure",
-      "HelpText": "Defaults to ROLLBACK.  See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
-      "DefaultValue": "ROLLBACK",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a8919189-c361-4b05-ae4b-9aba650d9d0f",
-      "Name": "UseS3ForCloudFormationTemplate",
-      "Label": "Use AWS S3 storage for the Cloud Formation Template",
-      "HelpText": "Whether to use S3 storage to source the Cloud Formation script.  See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7169c2f4-e1ff-45fa-99f1-7fcb49b1e313",
-      "Name": "CloudFormationTemplate",
-      "Label": "The Cloud Formation Template",
-      "HelpText": "The Cloud Formation Template in the format, see [docs](http://aws.amazon.com/cloudformation/aws-cloudformation-templates/)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "48351ea3-fedb-43ec-b594-c2bbc11efb46",
-      "Name": "CloudFormationTemplateURL",
-      "Label": "The location in S3 for the Cloud Formation Template",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a01f0c6c-4a0c-4f32-9327-d6a22c10d10c",
-      "Name": "CloudFormationParameters",
-      "Label": "Cloud Formation Parameters",
-      "HelpText": "See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)\n\nShould be provided as a JSON formatted object.\n\ne.g.`{ \"Key1\": \"Value1\", \"Key2\": \"Value2\" }`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ca922e15-fd36-4a0d-8717-660afc5e7aa9",
-      "Name": "UseS3ForStackPolicy",
-      "Label": "Use AWS S3 Storage for Cloud Formation Stack Policy",
-      "HelpText": "See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "869f2c5b-511f-4dee-bde7-30bee105b81d",
-      "Name": "CloudFormationStackPolicyURL",
-      "Label": "The URL for the Cloud Formation Policy in S3",
-      "HelpText": "See [docs](http://docs.aws.amazon.com/powershell/latest/reference/items/New-CFNStack.html)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "671b3717-d0b9-4285-915b-5a52ad52ff78",
-      "Name": "DeleteExistingStack",
-      "Label": "Delete Existing Stack",
-      "HelpText": "A boolean to state whether or not to delete the existing stack if one with the same name is found. If this is set to false and a stack with the same name is found, the step will fail.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "kirkholloway",
-  "$Meta": {
-    "ExportedAt": "2017-02-06T22:56:26.736Z",
-    "OctopusVersion": "3.7.5",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
diff --git a/step-templates/aws-configure-lambda-api-gateway-integration.json b/step-templates/aws-configure-lambda-api-gateway-integration.json
deleted file mode 100644
index ec5f3f8b3..000000000
--- a/step-templates/aws-configure-lambda-api-gateway-integration.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "Id": "7e818c42-8c59-4a14-b612-2b9cb69fcf4a",
-  "Name": "AWS - Configure Lambda API Gateway Integration",
-  "Description": "Configures an API v2 Gateway to connect to and invoke a Lambda Function.  That includes:\n\n- Integration on the API Gateway\n- Route on the API Gateway\n- Permission Policy on AWS Lambda (Aliases are supported)\n\n**Please Note:** Your AWS Lambda function **MUST** exist prior to running this step.\n\nThis step uses the following AWS CLI commands to create the integration and route.  You will be required to install the AWS CLI on your server/worker for this to work.  The AWS CLI is pre-installed on the [dynamic workers](https://octopus.com/docs/infrastructure/workers/dynamic-worker-pools) in Octopus Cloud as well as the provided docker containers for [Execution Containers](https://octopus.com/docs/deployment-process/execution-containers-for-workers).\n\nAPIGatewayV2 CLI Methods\n- [create-integration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/create-integration.html)\n- [create-route](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/create-route.html)\n- [get-apis](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-apis.html)\n- [get-integrations](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-integrations.html)\n- [get-routes](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-routes.html)\n- [get-vpc-links](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/get-vpc-links.html)\n- [update-integration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/apigatewayv2/update-integration.html)\n\nLambda CLI Methods\n- [add-permission](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/add-permission.html)\n- [get-policy](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/get-policy.html)\n- [remove-permission](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/remove-permission.html)\n\n\n## Output Variables\n\nThis step template sets the following output variables:\n\n- `ApiGatewayEndPoint`: The endpoint of the API Gateway\n- `ApiGatewayId`: The id of the API Gateway\n- `ApiGatewayArn`: The ARN of the API Gateway",
-  "ActionType": "Octopus.AwsRunScript",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Aws.AssumeRole": "False",
-    "Octopus.Action.AwsAccount.UseInstanceRole": "False",    
-    "Octopus.Action.AwsAccount.Variable": "#{AWS.Api.Gateway.Account}",
-    "Octopus.Action.Aws.Region": "#{AWS.Api.Gateway.Region}",
-    "Octopus.Action.Script.ScriptBody": "$ApiGatewayName = $OctopusParameters[\"AWS.Api.Gateway.Name\"]\n$ApiRouteKey = $OctopusParameters[\"AWS.Api.Gateway.Route.Key\"]\n$ApiLambdaUri = $OctopusParameters[\"AWS.Api.Gateway.Lambda.Arn\"]\n$ApiPayloadFormatVersion = $OctopusParameters[\"AWS.Api.Gateway.Integration.PayloadFormatVersion\"]\n$ApiConnection = $OctopusParameters[\"AWS.Api.Gateway.Integration.Connection\"]\n$ApiIntegrationMethod = $OctopusParameters[\"AWS.Api.Gateway.Integration.HttpMethod\"]\n$ApiLambdaAlias = $OctopusParameters[\"AWS.Api.Gateway.Lambda.Alias\"]\n$ApiRegion = $OctopusParameters[\"AWS.Api.Gateway.Region\"]\n\n$stepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\nif ([string]::IsNullOrWhiteSpace($ApiGatewayName))\n{\n\tWrite-Error \"The parameter Gateway Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($ApiRouteKey))\n{\n\tWrite-Error \"The parameter Route Key is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($ApiLambdaUri))\n{\n\tWrite-Error \"The parameter Lambda ARN is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($ApiPayloadFormatVersion))\n{\n\tWrite-Error \"The parameter Payload Format Version is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($ApiIntegrationMethod))\n{\n\tWrite-Error \"The parameter Http Method is required.\"\n    Exit 1\n}\n\nWrite-Host \"Gateway Name: $ApiGatewayName\"\nWrite-Host \"Route Key: $ApiRouteKey\"\nWrite-Host \"Lambda ARN: $ApiLambdaUri\"\nWrite-Host \"Lambda Alias: $ApiLambdaAlias\"\nWrite-Host \"Payload Format Version: $ApiPayloadFormatVersion\"\nWrite-Host \"VPC Connection: $ApiConnection\"\nWrite-host \"API Region: $apiRegion\"\n\nif ([string]::IsNullOrWhiteSpace($apiLambdaAlias) -eq $false)\n{\n\tWrite-Host \"Alias specified, adding it to the Lambda ARN\"\n\t$apiLambdaIntegrationArn = \"$($apiLambdaUri):$($apiLambdaAlias)\"\n}\nelse\n{\n\tWrite-Host \"No alias specified, going directly to the lambda function\"\n\t$apiLambdaIntegrationArn = $apiLambdaUri\n}\n\n$apiQueryOutput = aws apigatewayv2 get-apis --no-paginate\n$apiQueryOutput = ($apiQueryOutput | ConvertFrom-JSON)\n\n$apiList = @($apiQueryOutput.Items)\n$apiGatewayToUpdate = $null\nforeach ($api in $apiList)\n{\n\tif ($api.Name.ToLower().Trim() -eq $apiGatewayName.ToLower().Trim())\n    {\n    \tWrite-Highlight \"Found the gateway $apiGatewayName\"\n    \t$apiGatewayToUpdate = $api\n        break\n    }\n}\n\nif ($null -eq $apiGatewayToUpdate)\n{\n\tWrite-Error \"Unable to find the gateway with the name $apiGatewayName\"\n    exit 1\n}\n\nWrite-Host $apiGatewayToUpdate\n\n$apiId = $apiGatewayToUpdate.ApiId\nWrite-Host \"The id of the api gateway is $apiId\"\n\n$apiConnectionType = \"INTERNET\"\nif ([string]::IsNullOrWhiteSpace($ApiConnection) -eq $false)\n{\n\t$apiConnectionType = \"VPC_LINK\"\n    $existingVPCLinks = aws apigatewayv2 get-vpc-links --no-paginate\n    $existingVPCLinks = ($existingVPCLinks | ConvertFrom-JSON)\n    \n    $existingVPCLinkList = @($existingVPCLinks.Items)\n    foreach ($vpc in $existingVPCLinkList)\n    {\n    \tif ($vpc.Name.ToLower().Trim() -eq $ApiConnection.ToLower().Trim())\n        {\n        \tWrite-Host \"The name $($vpc.Name) matches $apiConnection\"\n        \t$apiConnectionId = $vpc.VpcLinkId\n            break\n        }\n        elseif ($vpc.VpcLinkId.ToLower().Trim() -eq $apiConnection.ToLower().Trim())\n        {\n        \tWrite-Host \"The vpc link id $($vpc.VpcLinkId) matches $apiConnection\"\n        \t$apiConnectionId = $vpc.VpcLinkId\n            break\n        }\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($apiConnectionId) -eq $true)\n    {\n    \tWrite-Error \"The VPC Connection $apiConnection could not be found.  Please check the name or ID and try again.  Please note: names can be updated, if you are matching by name double check nothing has changed.\"\n        exit 1\n    }    \n}\n\n$apiIntegrations = aws apigatewayv2 get-integrations --api-id \"$apiId\" --no-paginate\n$apiIntegrations = ($apiIntegrations | ConvertFrom-JSON)\n\n$integrationList = @($apiIntegrations.Items)\n$integrationToUpdate = $null\nforeach ($integration in $integrationList)\n{\n\tif ($integration.IntegrationUri -eq $apiLambdaIntegrationArn -and $integration.ConnectionType -eq $apiConnectionType -and $integration.IntegrationType -eq \"AWS_PROXY\" -and $integration.PayloadFormatVersion -eq $ApiPayloadFormatVersion)\n    {\n    \tWrite-Highlight \"Found the existing integration $($integration.Id)\"\n    \t$integrationToUpdate = $integration\n        break\n    }\n}\n\nif ($null -ne $integrationToUpdate)\n{\n\tWrite-Highlight \"Updating existing integration\"\n}\nelse\n{\n\tWrite-Highlight \"Creating new integration\"\n    if ($apiConnectionType -eq \"INTERNET\")\n    {\n    \tWrite-Host \"Command line: aws apigatewayv2 create-integration --api-id \"\"$apiId\"\" --connection-type \"\"$apiConnectionType\"\" --integration-method \"\"$ApiIntegrationMethod\"\" --integration-type \"\"AWS_PROXY\"\" --integration-uri \"\"$apiLambdaIntegrationArn\"\" --payload-format-version \"\"$ApiPayloadFormatVersion\"\" \"\n    \t$integrationToUpdate = aws apigatewayv2 create-integration --api-id \"$apiId\" --connection-type \"$apiConnectionType\" --integration-method \"$ApiIntegrationMethod\" --integration-type \"AWS_PROXY\" --integration-uri \"$apiLambdaIntegrationArn\" --payload-format-version \"$ApiPayloadFormatVersion\"\n    }\n    else\n    {\n    \tWrite-Host \"Command line: aws apigatewayv2 create-integration --api-id \"\"$apiId\"\" --connection-type \"\"$apiConnectionType\"\" --connection-id \"\"$ApiConnectionId\"\" --integration-method \"\"$ApiIntegrationMethod\"\" --integration-type \"\"AWS_PROXY\"\" --integration-uri \"\"$apiLambdaIntegrationArn\"\" --payload-format-version \"\"$ApiPayloadFormatVersion\"\" \"\n    \t$integrationToUpdate = aws apigatewayv2 create-integration --api-id \"$apiId\" --connection-type \"$apiConnectionType\" --connection-id \"$ApiConnectionId\" --integration-method \"$ApiIntegrationMethod\" --integration-type \"AWS_PROXY\" --integration-uri \"$apiLambdaIntegrationArn\" --payload-format-version \"$ApiPayloadFormatVersion\"    \n    }\n    \n    $integrationToUpdate = ($integrationToUpdate | ConvertFrom-JSON)\n}\n\nIf ($null -eq $integrationToUpdate)\n{\n\tWrite-Error \"There was an error finding or creating the integration.\"\n    Exit 1\n}\n\nWrite-Host \"$integrationToUpdate\"\n\nWrite-Host \"Command line: aws apigatewayv2 update-integration --api-id \"\"$apiId\"\" --integration-id \"\"$($integrationToUpdate.IntegrationId)\"\" --integration-method \"\"$ApiIntegrationMethod\"\" \"\n$updateResult = aws apigatewayv2 update-integration --api-id \"$apiId\" --integration-id \"$($integrationToUpdate.IntegrationId)\" --integration-method \"$ApiIntegrationMethod\"\n\nWrite-Host \"Command line: aws apigatewayv2 get-routes --api-id \"\"$apiId\"\" --no-paginate\"\n$apiRoutes = aws apigatewayv2 get-routes --api-id \"$apiId\" --no-paginate\n$apiRoutes = ($apiRoutes | ConvertFrom-JSON)\n\n$routeList = @($apiRoutes.Items)\n$routeToUpdate = $null\n$routePath = \"$ApiIntegrationMethod $ApiRouteKey\"\n$routeTarget = \"integrations/$($integrationToUpdate.IntegrationId)\"\nforeach ($route in $routeList)\n{\n\tWrite-Host \"Comparing $($route.RouteKey) with $routePath and $($route.Target) with $routeTarget\"\n\tif ($route.RouteKey -eq $routePath -and $route.Target -eq $routeTarget)\n    {\n    \tWrite-Highlight \"Found the existing path $($route.RouteId)\"\n    \t$routeToUpdate = $route\n        break\n    }\n}\n\nif ($null -eq $routeToUpdate)\n{\n\tWrite-Highlight \"The route with the path $routePath pointing to integration $($integrationToUpdate.IntegrationId) does not exist.  Creating that one now.\"\n    $routeResult = aws apigatewayv2 create-route --api-id \"$apiId\" --route-key \"$routePath\" --target \"$routeTarget\"\n}\nelse\n{\n\tWrite-Highlight \"The route with the path $routePath pointing to integration $($integrationToUpdate.IntegrationId) already exists.  Leaving that alone.\"   \n}\n\n$accountInfo = aws sts get-caller-identity\n$accountInfo = ($accountInfo | ConvertFrom-JSON)\n\nif ($apiRoute -notcontains \"*default\")\n{\n\t$routeKeyToUse = $apiRouteKey\n    $statementIdToUse = \"$($ApiGatewayName)$($apiRouteKey.Replace(\"/\", \"-\"))\"\n}\nelse\n{\n\t$routeKeyToUse = \"\"\n    $statementIdToUse = \"$ApiGatewayName\"\n}\n$sourceArn = \"arn:aws:execute-api:$($apiRegion):$($accountInfo.Account):$($apiId)/*/*$routeKeyToUse\"\n\nWrite-Host \"Source ARN: $sourceArn\"\n$hasExistingPolicy = $false\n$deleteExistingPolicy = $false\n\ntry\n{\n\tWrite-Host \"Getting existing policies\"\n\t$existingPolicy = aws lambda get-policy --function-name \"$apiLambdaIntegrationArn\" 2> $null\n    \n    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)\n    {\n    \tWrite-Host \"Last exit code was $LASTEXITCODE the policy does not exist\"\n    \t$hasExistingPolicy = $false\n    }\n    else\n    {\n    \tWrite-Host \"The policy exists\"\n    \t$hasExistingPolicy = $true\n    }\n    \n    $existingPolicy = ($existingPolicy | ConvertFrom-JSON)\n    Write-Host $existingPolicy\n    \n    $policyObject = ($existingPolicy.Policy | ConvertFrom-JSON)\n    \n\t$statementList = @($policyObject.Statement)\n    Write-Host \"Statement List $statementList\"\n    \n    foreach ($existingStatement in $statementList)\n    {\n    \tWrite-Host $existingStatement\n    \tWrite-Host \"Comparing $($existingStatement.Sid) with $statementIdToUse and $($existingStatement.Condition.ArnLike.'AWS:SourceArn') with $sourceArn\"\n    \tif ($existingStatement.Sid -eq \"$statementIdToUse\" -and $existingStatement.Condition.ArnLike.'AWS:SourceArn' -ne \"$sourceArn\")\n        {\n        \tWrite-Host \"The policy exists but it is not pointing to the write source arn, recreating it.\"\n        \t$deleteExistingPolicy = $true\n        }\n    }\n}\ncatch\n{\n\tWrite-Host \"Error pulling back the policies, this typically means the policy does not exist\"\n\t$hasExistingPolicy = $false\n}\n\nif ($hasExistingPolicy -eq $true -and $deleteExistingPolicy -eq $true)\n{\n\tWrite-Highlight \"Removing the existing policy $statementIdToUse\"\n    aws lambda remove-permission --function-name \"$apiLambdaIntegrationArn\" --statement-id \"$statementIdToUse\"\n}\n\nif ($hasExistingPolicy -eq $false -or $deleteExistingPolicy -eq $true)\n{\n\tWrite-Highlight \"Adding the policy $statementIdToUse\"\n\taws lambda add-permission --function-name \"$apiLambdaIntegrationArn\" --statement-id \"$statementIdToUse\" --action \"lambda:InvokeFunction\" --principal \"apigateway.amazonaws.com\" --qualifier \"$ApiLambdaAlias\" --source-arn \"$sourceArn\"\n}\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.ApiGatewayEndPoint' to $($apiGatewayToUpdate.ApiEndpoint)\"\nSet-OctopusVariable -name \"ApiGatewayEndPoint\" -value \"$($apiGatewayToUpdate.ApiEndpoint)\"\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.ApiGatewayId' to $apiId\"\nSet-OctopusVariable -name \"ApiGatewayId\" -value \"$apiId\"\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.ApiGatewayArn' to $sourceArn\"\nSet-OctopusVariable -name \"ApiGatewayArn\" -value \"$sourceArn\"\n"
-  },
-  "Parameters": [
-    {
-      "Id": "6a63ef8c-5f0b-4501-beca-fc3839f7f5c9",
-      "Name": "AWS.Api.Gateway.Name",
-      "Label": "API Gateway Name",
-      "HelpText": "Required.\n\nThe name of the API gateway to create the integration and route.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0fb1f1fa-35f6-46b3-bf4a-527ddd98fb80",
-      "Name": "AWS.Api.Gateway.Account",
-      "Label": "AWS Account",
-      "HelpText": "Required.\n\nThe account used to update the API Gateway.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AmazonWebServicesAccount"
-      }
-    },
-    {
-      "Id": "a42498df-fadd-45d1-9271-78e80edb9623",
-      "Name": "AWS.Api.Gateway.Region",
-      "Label": "AWS Region",
-      "HelpText": "Required.\n\nThe region where the API gateway is in.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\naf-south-1|Africa (Cape Town)\nap-east-1|Asia Pacific (Hong Kong)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-3|Asia Pacific (Osaka-Local)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\nca-central-1|Canada (Central)\neu-central-1|Europe (Frankfurt)\neu-west-1|Europe (Ireland)\neu-west-2|Europe (London)\neu-south-1|Europe (Milan)\neu-west-3|Europe (Paris)\neu-north-1|Europe (Stockholm)\nme-south-1|Middle East (Bahrain)\nsa-east-1|South America (São Paulo)"
-      }
-    },
-    {
-      "Id": "bd681a63-f62c-4dcb-a401-ae43428075ed",
-      "Name": "AWS.Api.Gateway.Integration.Connection",
-      "Label": "VPC Connection",
-      "HelpText": "Optional.\n\nThe VPC connection you wish to use with this link.  Supports:\n\n- VPC Link Name - The name of the VPC link specified when it was created.\n- VPC Link Id - The 6-character alphanumeric key assigned by AWS to the VPC Link.\n\n**Please note**: Sending a value in will change the connection type from `INTERNET` to `VPC_LINK`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "607e787d-d0bd-47b9-984e-2195d58278ed",
-      "Name": "AWS.Api.Gateway.Route.Key",
-      "Label": "Route Key",
-      "HelpText": "Required.\n\nThe route key for the route.  Examples:\n\n- `$default`\n- `/signup`",
-      "DefaultValue": "$default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f255a0c5-f2e6-4739-af59-a0329c6ddb14",
-      "Name": "AWS.Api.Gateway.Integration.HttpMethod",
-      "Label": "HTTP Method",
-      "HelpText": "Required.\n\nThe HTTP method of the route and integration you wish to create.",
-      "DefaultValue": "ANY",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "ANY|ANY\nPOST|POST\nPUT|PUT\nGET|GET\nDELETE|DELETE"
-      }
-    },
-    {
-      "Id": "6552c873-6576-4272-a724-a3b257b1b13e",
-      "Name": "AWS.Api.Gateway.Lambda.Arn",
-      "Label": "Lambda ARN",
-      "HelpText": "Required.\n\nThe ARN of the AWS Lambda to connect to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "261a89c2-dc9b-4608-8f76-fcb07385725c",
-      "Name": "AWS.Api.Gateway.Lambda.Alias",
-      "Label": "Lambda Alias",
-      "HelpText": "Required.\n\nThe alias in the lambda function to use when the API Gateway invokes the function.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4c281de7-1922-4d78-b16d-9c60cd2d2477",
-      "Name": "AWS.Api.Gateway.Integration.PayloadFormatVersion",
-      "Label": "Payload Format Version",
-      "HelpText": "Required.\n\nThe payload format version specifies the format of the data that API Gateway sends to a Lambda integration, and how API Gateway interprets the response from Lambda.",
-      "DefaultValue": "2.0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "1.0|1.0\n2.0|2.0"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AwsRunScript",
-  "$Meta": {
-    "ExportedAt": "2022-10-04T18:34:13.219Z",
-    "OctopusVersion": "2022.3.10594",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "aws"
-}
diff --git a/step-templates/aws-create-a-route-53-resource-record.json b/step-templates/aws-create-a-route-53-resource-record.json
deleted file mode 100644
index ccb0ac5c0..000000000
--- a/step-templates/aws-create-a-route-53-resource-record.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "Id": "9271327d-6e8a-49d1-881a-3925c75aef56",
-  "Name": "AWS - Create a Route 53 Resource Record",
-  "Description": "This step will Update, Create or Delete a Resource Record from an Route 53 hosted Domain Name.\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$odZoneId,\n    [string]$odAction,\n    [string]$odName,\n    [string]$odResourceAddress,\n    [string]$odType,\n    [string]$odTtl,\n    [string]$odWait,\n    [string]$odComment,\n    [string]$odAccessKey,\n    [string]$odSecretKey,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if (!$result -or $result -eq $null) {\n        if ($Default) {\n            $result = $Default\n        } elseif ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n    }\n\n    return $result\n}\n\n# More custom functions would go here\n\n& {\n    param(\n        [string]$odZoneId,\n        [string]$odAction,\n        [string]$odName,\n        [string]$odResourceAddress,\n        [string]$odType,\n        [string]$odTtl,\n        [string]$odWait,\n        [string]$odComment,\n        [string]$odAccessKey,\n        [string]$odSecretKey\n    )\n    \n    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables\n    if ($odAccessKey -or $odSecretKey) {\n        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default\n    } elseif (([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -or ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\"))) {\n        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -SecretKey ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\")) -StoreAs default\n    } else {\n        throw \"AWS API credentials were not available/provided.\"\n    }\n\n    If($odAction -ne \"CREATE\" -and $odAction -ne \"DELETE\" -and $odAction -ne \"UPSERT\") { throw \"Invalid Action provided. Please use CREATE, DELETE or UPSERT.\" }\n\n    if ($odName -notmatch '.+?\\.$') { $odName += '.' }\n\n    $change = (New-Object Amazon.Route53.Model.Change)\n    $change.Action = $odAction\n    $change.ResourceRecordSet = (New-Object Amazon.Route53.Model.ResourceRecordSet)\n    $change.ResourceRecordSet.Name = $odName\n    $change.ResourceRecordSet.Type = $odType\n    $change.ResourceRecordSet.TTL = $odTtl\n    \n    if ($odResourceAddress -like '*,*') {\n        $($odResourceAddress -split ',') | Foreach-Object {\n            $change.ResourceRecordSet.ResourceRecords.Add(@{Value=$($_)})\n        }\n    } else {\n        $change.ResourceRecordSet.ResourceRecords.Add(@{Value=$odResourceAddress})\n    }\n\n    Write-Output (\"------------------------------\")\n    Write-Output (\"Checking if Resource Record Set Exists:\")\n    Write-Output (\"------------------------------\")\n\n    $resourceRecordSetObj = $(Get-R53ResourceRecordSet -HostedZoneId $odZoneId).ResourceRecordSets | Where {$_.Name -eq $odName}\n    $resourceRecordSetCount = ($resourceRecordSetObj | measure).Count\n\n    if ($odAction -eq \"DELETE\") {\n        if ($resourceRecordSetCount -gt 0) {\n            Write-Output (\"The record '$($odName)' exists, deleting...\")\n        } else {\n            Write-Output (\"Cannot Delete: The record '$($odName)' does not exist, skipping...\")\n            Exit\n        }\n    } elseif ($odAction -eq \"CREATE\") {\n        if ($resourceRecordSetCount -gt 0) {\n            Write-Output (\"Cannot Create: The record '$($odName)' already exists, skipping...\")\n            Exit\n        } else {\n            Write-Output (\"The record '$($odName)' does not exist, creating record...\")\n        }\n    } elseif ($odAction -eq \"UPSERT\") {\n        if ($resourceRecordSetCount -gt 0) {\n            Write-Output (\"The record '$($odName)' already exists, updating record...\")\n        } else {\n            Write-Output (\"The record '$($odName)' does not exist, creating record...\")\n        }\n    } else { throw \"OMG - Unexpected result\" }\n    \n    $params = @{\n        HostedZoneId=$odZoneId\n        ChangeBatch_Comment=$odComment\n        ChangeBatch_Change=$change\n    }\n\n    Write-Output (\"------------------------------\")\n    Write-Output (\"Listing DNS change/s to be made:\")\n    Write-Output (\"------------------------------\")\n\n    $($params.ChangeBatch_Change) | Foreach-Object {\n        $resourceRecords=\" | \"\n\n        $($_.ResourceRecordSet.ResourceRecords) | Foreach-Object {\n            $resourceRecords += $_.Value + \",\"\n        }\n\n        Write-Output ($($_.Action.Value) + \" | \" + $($_.ResourceRecordSet.Name) + \" | \" + $($_.ResourceRecordSet.Type) + $($resourceRecords -replace \".$\"))\n    }\n\n    \n\n    $timeout = new-timespan -Seconds 30\n    $sw = [diagnostics.stopwatch]::StartNew()\n    $attempt = 1\n\n    while ($true) {\n        try {\n            $result = Edit-R53ResourceRecordSet @params\n            break\n        }\n        catch [Amazon.Route53.AmazonRoute53Exception] {\n            Write-Output (\"$($_.Exception.errorcode)-$($_.Exception.Message)\")\n\n            if ($attempt -eq 3) {\n                throw $_.Exception.errorcode + '-' + $_.Exception.Message\n            }\n\n            if ($sw.elapsed -gt $timeout) {throw \"Timed out waiting for 'Edit-R53ResourceRecordSet' to succeed\"}\n\n            Write-Output (\"Attempt no.$($attempt) failed - Trying again in 5 seconds...\")\n            Sleep -Seconds 5\n\n            $attempt++\n        }\n    }\n\n\n    Write-Output (\"------------------------------\")\n    Write-Output (\"Checking the R53 Change status:\")\n    Write-Output (\"------------------------------\")\n\n    $timeout = new-timespan -Seconds 120\n    $sw = [diagnostics.stopwatch]::StartNew()\n\n    while ($true) {\n        $currentState = (Get-R53Change -Id $result.Id).Status\n\n        if ($currentState -eq \"INSYNC\") {break}\n        if ([bool]($odWait -eq $false)) {break}\n\n        Write-Output (\"$(Get-Date) | Waiting for R53 Change '$($result.Id)' to transition from state: $currentState\")\n\n        if ($sw.elapsed -gt $timeout) {throw \"Timed out waiting for desired state\"}\n\n        Sleep -Seconds 5\n    }\n    Write-Output (\"$(Get-Date) | R53 Change state: $currentState\")\n } `\n (Get-Param 'odZoneId' -Required) `\n (Get-Param 'odAction' -Required) `\n (Get-Param 'odName' -Required) `\n (Get-Param 'odResourceAddress' -Required) `\n (Get-Param 'odType' -Required) `\n (Get-Param 'odTtl' -Required) `\n (Get-Param 'odWait' -Required) `\n (Get-Param 'odComment') `\n (Get-Param 'odAccessKey') `\n (Get-Param 'odSecretKey')"
-  },
-  "Parameters": [
-    {
-      "Id": "6ec4f68e-02b7-4015-88aa-34a2a7dd8568",
-      "Name": "odZoneId",
-      "Label": "Hosted Zone ID",
-      "HelpText": "The Hosted Zone ID of the Domain Name you would like to work with.",
-      "DefaultValue": "Zxxxxxxxxxxxxx",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2e0fa53b-d85a-4afd-9fb8-a44ddd28b598",
-      "Name": "odAction",
-      "Label": "Action",
-      "HelpText": "The Action you would like to perform - Update, Create or Delete a Resource Record from an Route 53 hosted Domain Name.",
-      "DefaultValue": "UPSERT",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "UPSERT|Update a Resource Record if exists, or Create a new one\nCREATE|Create a Resource Record\nDELETE|Delete a Resource Record"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "843ef155-8583-417f-90dd-6e880ca175e2",
-      "Name": "odName",
-      "Label": "Name",
-      "HelpText": "The Name is the full Domain Name Address you would like to work with.\nFor example:\n- database01.example.com",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "956cb942-2d09-4bb4-b0a0-4c855d4f9b29",
-      "Name": "odResourceAddress",
-      "Label": "Resource Address",
-      "HelpText": "The Address (IP or Domain Name) of the Resource you would like the Resource Record to point to. For example:\n- 8.8.8.8 _(e.g. A Record)_\n- webserver01.example.com _(e.g. CNAME Record)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d2734830-3915-4759-9b06-5a174540c337",
-      "Name": "odType",
-      "Label": "Record Type",
-      "HelpText": "The Type of Resource Record you would like to work with. For example:\n- A _(e.g. 8.8.8.8)_\n- CNAME _(e.g. webserver01.example.com)_\n\nFurther Reading:\n[https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html)",
-      "DefaultValue": "A",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a62ded34-e6f4-4736-bea6-3c7294a5e6dd",
-      "Name": "odTtl",
-      "Label": "TTL (Time to Live)",
-      "HelpText": "The amount of time (in seconds) a Resource Record should be cached for.\n\nFurther Reading:\n[https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-values-basic.html#rrsets-values-basic-ttl](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-values-basic.html#rrsets-values-basic-ttl)",
-      "DefaultValue": "600",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d14fbeaf-907b-4f5f-9efc-04a5ae2031f8",
-      "Name": "odWait",
-      "Label": "Wait for Sync",
-      "HelpText": "If the Step should wait for the Resource Record to sync to all Name Servers before proceeding to the next Step.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d009432c-d746-42d1-b214-42ba78760d5b",
-      "Name": "odComment",
-      "Label": "Comment (Optional)",
-      "HelpText": "The Comment provided in this field is for auditing purposes, and is not visible in the AWS Route 53 Web Interface (it's only accessible via the API).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "078ab1ac-4560-4241-8127-29bb293622b5",
-      "Name": "odAccessKey",
-      "Label": "Access Key (Kind-of Optional)",
-      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "0e06989b-4f09-4652-8c92-398d078c3cb5",
-      "Name": "odSecretKey",
-      "Label": "Secret Key (Kind-of Optional)",
-      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "tclydesdale",
-  "$Meta": {
-    "ExportedAt": "2018-01-31T13:17:01.348Z",
-    "OctopusVersion": "4.1.9",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
\ No newline at end of file
diff --git a/step-templates/aws-create-a-security-group.json b/step-templates/aws-create-a-security-group.json
deleted file mode 100644
index b4fc77930..000000000
--- a/step-templates/aws-create-a-security-group.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "Id": "051ee152-1ef8-4937-a616-b56eb94dad25",
-  "Name": "AWS - Create a Security Group",
-  "Description": "This step will Create a Security Group within a Virtual Private Cloud (VPC).\n\nWorks well with the \"_AWS - Launch EC2 Instance_\" Community Step Template.\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on. If you would like to add comments to rules, then you will need at least version 3.3.42.0 installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$odGroupName,\n    [string]$odGroupDescription,\n    [string]$odVpcId,\n    [string]$odRules,\n    [string]$odInstanceId,\n    [string]$odAccessKey,\n    [string]$odSecretKey,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if (!$result -or $result -eq $null) {\n        if ($Default) {\n            $result = $Default\n        } elseif ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n    }\n\n    return $result\n}\n\n& {\n    param(\n        [string]$odGroupName,\n        [string]$odGroupDescription,\n        [string]$odVpcId,\n        [string]$odRules,\n        [string]$odInstanceId,\n        [string]$odAccessKey,\n        [string]$odSecretKey\n    )\n    \n    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables\n    if ($odAccessKey -or $odSecretKey) {\n        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default\n    } elseif (([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -or ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\"))) {\n        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -SecretKey ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\")) -StoreAs default\n    } else {\n        throw \"AWS API credentials were not available/provided.\"\n    }\n\n\n\n    Write-Output (\"------------------------------\")\n    Write-Output (\"Checking the Security Group:\")\n    Write-Output (\"------------------------------\")\n    \n    $filterArray = @()\n    $filterArray += @{ name=\"vpc-id\";value=$odVpcId }\n    $filterArray += @{ name=\"group-name\";value=$odGroupName }\n    $filterArray += @{ name=\"description\";value=$odGroupDescription }\n\n    $securityGroupObj = (Get-EC2SecurityGroup -Filter $filterArray)\n    $securityGroupCount = ($securityGroupObj | measure).Count\n    $securityGroupId = $null\n\n    if ($securityGroupCount -gt 1) {\n        throw \"More than one security group exists with the same vpcid/name/description - I don't know what to do!?\"\n    }\n    elseif ($securityGroupCount -eq 1) {\n        Write-Output (\"$(Get-Date) | Security group already exists...\")\n\n        $securityGroupId = ($securityGroupObj).GroupId\n    }\n    elseif ($securityGroupCount -eq 0) {\n        Write-Output (\"$(Get-Date) | Creating security group...\")\n\n        $securityGroupId = (New-EC2SecurityGroup -VpcId $odVpcId -GroupName $odGroupName -GroupDescription $odGroupDescription)\n\n        Write-Output (\"Security Group Created: $($securityGroupId)\")\n    }\n\n    if ($securityGroupId -and $OctopusParameters) {\n        Set-OctopusVariable -name \"GroupId\" -value $securityGroupId\n    }\n\n    if ($odRules) {\n        (ConvertFrom-StringData $odRules).GetEnumerator() | Foreach-Object {\n            $ruleSplit = $_.Value.Split(\"|\")\n        \n            $direction = $ruleSplit[0]\n            $ipProtocol = $ruleSplit[1]\n            $fromPort = $ruleSplit[2]\n            $toPort = $ruleSplit[3]\n            $ipRanges = $ruleSplit[4]\n\n            Write-Output (\"------------------------------\")\n            Write-Output (\"Creating new $($direction) rule for Security Group $($securityGroupId):\")\n            Write-Output (\"------------------------------\")\n\n            $failCount = 0\n            while ($true) {\n                try {\n                    if ($direction -eq \"Ingress\") {\n                        $check_ipPermissionObj = ($securityGroupObj | Select -ExpandProperty IpPermissions | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort})\n                    }\n                    elseif ($direction -eq \"Egress\") {\n                        $check_ipPermissionObj = ($securityGroupObj | Select -ExpandProperty IpPermissionsEgress | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort})\n                    }\n\n                    break\n                } \n                catch {\n                    $failCount++\n                }\n\n                if ($failCount -eq 3) { throw \"Could not register the task after three attempts!\" }\n            }\n\n\n\n            $check_ipRangesObj = ($check_ipPermissionObj | Select -ExpandProperty IpRanges | ? {$_ -eq $ipRanges})\n            $check_ipRangesObjCount = ($check_ipRangesObj | measure).Count\n\n            if ($check_ipRangesObjCount -gt 0) {\n                Write-Output (\"$(Get-Date) | Rule '$($_.Key)' already exists...\")\n            }\n            else {\n                Write-Output (\"$(Get-Date) | Creating new rule '$($_.Key)'...\")\n                \n                $ipPermissionObj = (New-Object \"Amazon.EC2.Model.IpPermission\")\n                $ipPermissionObj.IpProtocol = $ipProtocol\n                $ipPermissionObj.FromPort = $fromPort\n                $ipPermissionObj.ToPort = $toPort\n                \n\n                try {\n                    $ipRangesObj = (New-Object \"Amazon.EC2.Model.IpRange\")\n                    $ipRangesObj.CidrIp = $ipRanges\n                    $ipRangesObj.Description = $_.Key\n                    $ipPermissionObj.Ipv4Ranges = $ipRangesObj\n                }\n                catch {\n                    Write-Output (\"$(Get-Date) | Cannot create 'Amazon.EC2.Model.IpRange' object, possibly running an old version of the 'AWS Tools for Windows PowerShell'\")\n                    Write-Output (\"$(Get-Date) | Attempting to use the old method, but the old method does not allow rule comments/descriptions\")\n\n                    $ipRangesObj = (New-Object \"System.Collections.Generic.List[string]\")\n                    $ipRangesObj.Add($ipRanges)\n                    $ipPermissionObj.IpRanges = $ipRangesObj\n                }\n\n                Write-Output $ipPermissionObj\n\n                try {\n                    if ($direction -eq \"Ingress\") {\n                        Grant-EC2SecurityGroupIngress -GroupId $securityGroupId -IpPermission $ipPermissionObj\n                    }\n                    elseif ($direction -eq \"Egress\") {\n                        Grant-EC2SecurityGroupEgress -GroupId $securityGroupId -IpPermission $ipPermissionObj\n                    }\n                }\n                catch [Amazon.EC2.AmazonEC2Exception] {\n                    throw $_.Exception.errorcode + '-' + $_.Exception.Message\n                }\n\n                Write-Output (\"------------------------------\")\n                Write-Output (\"New $($direction) ruleset looks like:\")\n                Write-Output (\"------------------------------\")\n\n                $securityGroupObj = (Get-EC2SecurityGroup -Filter $filterArray)\n\n                if ($direction -eq \"Ingress\") {\n                    Write-Output $securityGroupObj | Select -ExpandProperty IpPermissions | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort}\n                }\n                elseif ($direction -eq \"Egress\") {\n                    Write-Output $securityGroupObj | Select -ExpandProperty IpPermissionsEgress | ? {$_.IpProtocol -eq $ipProtocol -and $_.FromPort -eq $fromPort -and $_.ToPort -eq $toPort}\n                }\n            }\n        }\n    }\n\n\n\n\n    if ($odInstanceId) {\n        $filterArray = @()\n        $filterArray += @{ name=\"instance-id\";value=$odInstanceId }\n\n        $instanceObj = (Get-EC2Instance -Filter $filterArray | select -ExpandProperty Instances)\n        $instanceCount = ($instanceObj | measure).Count\n\n        if ($instanceCount -gt 1) {\n            throw \"More than one instance exists with the same instance id - I don't know what to do!?\"\n        }\n        elseif ($instanceCount -eq 1) {\n            Write-Output (\"$(Get-Date) | Found instance '$($odInstanceId)'!\")\n \n            $securityGroupArray = @()\n            $securityGroupArray += ($instanceObj.NetworkInterfaces | Where-Object {$(Get-EC2NetworkInterface -NetworkInterfaceId $($_.NetworkInterfaceId))} | Select -ExpandProperty Groups | Select GroupId | Select -Expand GroupId)\n\n            if ($securityGroupArray -contains $securityGroupId) {\n                Write-Output (\"$(Get-Date) | Security Group '$($securityGroupId)' is already associated with the Instance '$($odInstanceId)'...\")\n            }\n            else {\n                Write-Output (\"$(Get-Date) | Adding Security Group '$($securityGroupId)' to the Instance '$($odInstanceId)'!\")\n\n                $securityGroupArray += $securityGroupId\n                $instanceObj.NetworkInterfaces | Where-Object {$(Edit-EC2NetworkInterfaceAttribute -NetworkInterfaceId $($_.NetworkInterfaceId) -Groups $securityGroupArray)}\n            }\n        }\n\n        Write-Output (\"------------------------------\")\n        Write-Output (\"Security Groups for instance '$($odInstanceId)':\")\n        Write-Output (\"------------------------------\")\n        \n        $instanceObj = (Get-EC2Instance -Filter $filterArray | select -ExpandProperty Instances)\n        Write-Output $instanceObj.NetworkInterfaces | Where-Object {$(Get-EC2NetworkInterface -NetworkInterfaceId $($_.NetworkInterfaceId))} | Select -ExpandProperty Groups\n    }\n } `\n (Get-Param 'odGroupName' -Required) `\n (Get-Param 'odGroupDescription' -Required) `\n (Get-Param 'odVpcId' -Required) `\n (Get-Param 'odRules') `\n (Get-Param 'odInstanceId') `\n (Get-Param 'odAccessKey') `\n (Get-Param 'odSecretKey')"
-  },
-  "Parameters": [
-    {
-      "Id": "868cba60-5638-4078-aa56-b65bba16f9aa",
-      "Name": "odGroupName",
-      "Label": "Security Group Name",
-      "HelpText": "The Name you would like to assign to the new Security Group.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "55c75754-48ad-44ba-854f-7d937ace11b4",
-      "Name": "odGroupDescription",
-      "Label": "Security Group Description",
-      "HelpText": "The Description you would like to assign to the new Security Group.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "332e2d15-e8f0-4012-9eaa-a28011ab1ef3",
-      "Name": "odVpcId",
-      "Label": "Virtual Private Cloud (VPC) ID",
-      "HelpText": "The Virtual Private Cloud (VPC) ID of the VPC you would like the Security Group to be created in.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b8041ec7-6d50-4f8d-babe-9b6b3fef2ac5",
-      "Name": "odRules",
-      "Label": "Rules (Optional)",
-      "HelpText": "The Rules you would like to add to the Security Group. For example:\n- RDP=Ingress|tcp|3389|3389|52.64.52.64/32\n\nThe format being:\n- comment=direction|protocol|fromport|toport|iprange",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ae77469f-6cad-42a7-8fbc-592d2ee85c3d",
-      "Name": "odInstanceId",
-      "Label": "Instance ID (Optional)",
-      "HelpText": "The EC2 Instance ID of the Instance you would like to add the Security Group to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ee896a8c-beda-4609-a104-bdf6fd3799cd",
-      "Name": "odAccessKey",
-      "Label": "Access Key (Kind-of Optional)",
-      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "004f625b-6d07-4a12-8a80-ea74943fb283",
-      "Name": "odSecretKey",
-      "Label": "Secret Key (Kind-of Optional)",
-      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\".\n\nFurther Reading:\n[https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html](https://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "tclydesdale",
-  "$Meta": {
-    "ExportedAt": "2018-02-01T14:11:31.262Z",
-    "OctopusVersion": "4.1.9",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
diff --git a/step-templates/aws-deploy-lambda-image.json b/step-templates/aws-deploy-lambda-image.json
deleted file mode 100644
index 834c5197e..000000000
--- a/step-templates/aws-deploy-lambda-image.json
+++ /dev/null
@@ -1,236 +0,0 @@
-{
-  "Id": "480a3d93-7bad-42d4-b439-cced56ae792a",
-  "Name": "AWS - Deploy Image Lambda Function",
-  "Description": "Deploys an image to an AWS Lambda function.  \n\nThis step uses the following AWS CLI commands to deploy the AWS Lambda.  You will be required to install the AWS CLI on your server/worker for this to work.  The AWS CLI is pre-installed on the [dynamic workers](https://octopus.com/docs/infrastructure/workers/dynamic-worker-pools) in Octopus Cloud as well as the provided docker containers for [Execution Containers](https://octopus.com/docs/deployment-process/execution-containers-for-workers).\n\n- [create-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html)\n- [get-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/get-function.html)\n- [publish-version](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/publish-version.html)\n- [tag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/tag-resource.html)\n- [untag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/untag-resource.html)\n- [update-function-code](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-code.html)\n- [update-function-configuration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-configuration.html)\n\nThis step template is worker-friendly, you can pass in a package reference rather than having to reference a previous step that downloaded the package. This step requires **Octopus Deploy 2019.10.0** or higher.\n\n## Output Variables\n\nThis step template sets the following output variables:\n\n- `LambdaArn`: The ARN of the Lambda Function\n- `PublishedVersion`: The most recent version published (only set when Publish is set to `Yes`).",
-  "ActionType": "Octopus.AwsRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "8dbae499-5aa8-438e-a2fe-ae29fb8f0a39",
-      "Name": "AWS.Lambda.Package",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "NotAcquired",
-      "Properties": {
-        "Extract": "False",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "AWS.Lambda.Package",
-        "Purpose": ""
-      }
-    }
-  ],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Aws.AssumeRole": "False",
-    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-    "Octopus.Action.AwsAccount.Variable": "#{AWS.Lambda.Account}",
-    "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\n\n$functionName = $OctopusParameters[\"AWS.Lambda.FunctionName\"] \n$functionRole = $OctopusParameters[\"AWS.Lambda.FunctionRole\"]\n$functionRunTime = $OctopusParameters[\"AWS.Lambda.Runtime\"]\n$functionMemorySize = $OctopusParameters[\"AWS.Lambda.MemorySize\"]\n$functionDescription = $OctopusParameters[\"AWS.Lambda.Description\"]\n$functionVPCSubnetId = $OctopusParameters[\"AWS.Lambda.VPCSubnetIds\"]\n$functionVPCSecurityGroupId = $OctopusParameters[\"AWS.Lambda.VPCSecurityGroupIds\"]\n$functionEnvironmentVariables = $OctopusParameters[\"AWS.Lambda.EnvironmentVariables\"]\n$functionEnvironmentVariablesKey = $OctopusParameters[\"AWS.Lambda.EnvironmentVariablesKey\"]\n$functionTimeout = $OctopusParameters[\"AWS.Lambda.FunctionTimeout\"]\n$functionTags = $OctopusParameters[\"AWS.Lambda.Tags\"]\n$functionFileSystemConfig = $OctopusParameters[\"AWS.Lambda.FileSystemConfig\"]\n$functionDeadLetterConfig = $OctopusParameters[\"AWS.Lambda.DeadLetterConfig\"]\n$functionTracingConfig = $OctopusParameters[\"AWS.Lambda.TracingConfig\"]\n$functionVersionNumber = $OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].PackageVersion\"]\n$functionPublishOption = $OctopusParameters[\"AWS.Lambda.Publish\"]\n\n$functionReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$functionRunbookRun = $OctopusParameters[\"Octopus.RunbookRun.Id\"]\n$stepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$regionName = $OctopusParameters[\"AWS.Lambda.Region\"]\n\nif ($null -ne $OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].Image\"]) {\n    $imageUri = $OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].Image\"]\n}\n\nif ([string]::IsNullOrWhiteSpace($functionName)) {\n    Write-Error \"The parameter Function Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRole)) {\n    Write-Error \"The parameter Role is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false) {\n    $deployVersionTag = \"Octopus-Release=$functionReleaseNumber\"\n}\nelse {\n    $deployVersionTag = \"Octopus-Runbook-Run=$functionRunbookRun\"\n}\n\nWrite-Host \"Function Name: $functionName\"\nWrite-Host \"Function Role: $functionRole\"\nWrite-Host \"Function Memory Size: $functionMemorySize\"\nWrite-Host \"Function Description: $functionDescription\"\nWrite-Host \"Function Subnet Ids: $functionVPCSubnetId\"\nWrite-Host \"Function Security Group Ids: $functionVPCSecurityGroupId\"\nWrite-Host \"Function Timeout: $functionTimeout\"\nWrite-Host \"Function Tags: $functionTags\"\nWrite-Host \"Function File System Config: $functionFileSystemConfig\"\nWrite-Host \"Function Dead Letter Config: $functionDeadLetterConfig\"\nWrite-Host \"Function Tracing Config: $functionTracingConfig\"\nWrite-Host \"Function Publish: $functionPublishOption\"\nWrite-Host \"Function Image URI: $imageUri\"\nWrite-Host \"Function Environment Variables: $functionEnvironmentVariables\"\nWrite-Host \"Function Environment Variables Key: $functionEnvironmentVariablesKey\"\n\nif (![string]::IsNullOrWhitespace($OctopusParameters[\"AWS.Lambda.Image.Entrypoint\"]))\n{\n  Write-Host \"Image Entrypoint override: $($OctopusParameters[\"AWS.Lambda.Image.Entrypoint\"])\"\n}\n\nif (![string]::IsNullOrWhitespace($OctopusParameters[\"AWS.Lambda.Image.Command\"]))\n{\n  Write-Host \"Image Command override: $($OctopusParameters[\"AWS.Lambda.Image.Command\"])\"\n}\n\n\nWrite-Host \"Attempting to find the function $functionName in the region $regionName\"\n$hasExistingFunction = $true\n\ntry {\n    $existingFunction = aws lambda get-function --function-name \"$functionName\" 2> $null\n    \n    Write-Host \"The exit code from the lookup was $LASTEXITCODE\"\n    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254) {\n        $hasExistingFunction = $false\n    }   \n    \n    $existingFunction = $existingFunction | ConvertFrom-Json\n}\ncatch {\n    Write-Host \"The function was not found\"\n    $hasExistingFunction = $false\n}\n\nWrite-Host \"Existing functions: $hasExistingFunction\"\nWrite-Host $existingFunction\n\n# Init argument variable\n$lambdaArguments = @(\"lambda\")\n$waitArguments = @(\"lambda\", \"wait\")\n\nif ($hasExistingFunction -eq $false) {\n    Write-Highlight \"Creating $functionName in $regionName\"\n\n    $waitArguments += @(\"function-active-v2\")\n\n    $lambdaArguments += @(\"create-function\", \"--role\", $functionRole, \"--memory-size\", $functionMemorySize)\n\n    if ($null -ne $imageUri) {\n        Write-Host \"Deploying Lambda container ...\"\n        $lambdaArguments += @(\"--code\", \"ImageUri=$imageUri\", \"--package-type\", \"Image\")\n      \n        if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint']) -or ![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {\n            $lambdaArguments += \"--image-config\"\n        \n            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint'])) {\n                $lambdaArguments += \"EntryPoint=$($OctopusParameters['AWS.Lambda.Image.Entrypoint'])\"\n            }\n\n            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {\n                $lambdaArguments += \"Command=$($OctopusParameters['AWS.Lambda.Image.Command'])\"\n            }\n        }\n    }\n}\nelse {\n    Write-Highlight \"Updating the $functionName code\"\n\n    $waitArguments += @(\"function-updated\")\n    $lambdaArguments += \"update-function-code\"\n\n    if ($null -ne $imageUri) {\n        Write-Host \"Deploying Lambda container ...\"\n        $lambdaArguments += @(\"--image-uri\", $imageUri)\n    }\n}\n\n$waitArguments += @(\"--function-name\", \"$functionName\")\n\n$lambdaArguments += @(\"--function-name\", \"$functionName\")\n\n# Wait for function to be done creating\nWrite-Host \"Running aws $lambdaArguments ...\"\n$functionInformation = (aws $lambdaArguments)\n(aws $waitArguments)\n\n\nif ($hasExistingFunction -eq $true) {\n    # update configuration\n    $lambdaArguments = @(\"lambda\", \"update-function-configuration\", \"--function-name\", \"$functionName\", \"--role\", $functionRole, \"--memory-size\", $functionMemorySize)\n       \n    if ($null -ne $imageUri) {\n        Write-Highlight \"Updating the $functionName image configuration\"\n        if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint']) -or ![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {\n            $lambdaArguments += \"--image-config\"\n        \n            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Entrypoint'])) {\n                $lambdaArguments += \"EntryPoint=$($OctopusParameters['AWS.Lambda.Image.Entrypoint'])\"\n            }\n\n            if (![string]::IsNullOrWhitespace($OctopusParameters['AWS.Lambda.Image.Command'])) {\n                $lambdaArguments += \"Command=$($OctopusParameters['AWS.Lambda.Image.Command'])\"\n            }\n        }\n    }\n    \n    $functionInformation = (aws $lambdaArguments)\n    Write-Highlight \"Waiting for configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\n$functionInformation = $functionInformation | ConvertFrom-JSON\n$functionArn = $functionInformation.FunctionArn\n\nWrite-Host \"Function ARN: $functionArn\"\n\nif ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false) {\n    Write-Highlight \"Environment variables specified, updating environment variables configuration for $functionName\"\n    $environmentVariables = \"Variables={$functionEnvironmentVariables}\"\n    \n    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true) {\n        $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\"\n    }\n    else {\n        $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\" --kms-key-arn \"$functionEnvironmentVariablesKey\"\n    }\n    \n    Write-Highlight \"Waiting for environment variable update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false) {\n    Write-Highlight \"Timeout specified, updating timeout configuration for $functionName\"\n    $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --timeout \"$functionTimeout\"\n    \n    Write-Highlight \"Waiting for timeout upate to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTags) -eq $false) {\n    Write-Highlight \"Tags specified, updating tags configuration for $functionName\"\n    $updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$functionTags\"\n}\n\nif ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false) {\n    Write-Highlight \"Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName\"\n    aws lambda untag-resource --resource \"$functionArn\" --tag-keys \"Octopus-Release\" \"Octopus-Runbook-Run\"\n    $updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$deployVersionTag\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false) {\n    Write-Highlight \"VPC subnets and security group specified, updating vpc configuration for $functionName\"\n    $vpcConfig = \"SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId\"\n    $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --vpc-config \"$vpcConfig\"\n    \n    Write-Highlight \"Waiting for vpc configuration to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false) {\n    Write-Highlight \"Description specified, updating description configuration for $functionName\"\n    $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --description \"$functionDescription\"\n    \n    Write-Highlight \"Waiting for description configuration ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false) {\n    Write-Highlight \"File System Config specified, updating file system configuration for $functionName\"\n    $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --file-system-configs \"$functionFileSystemConfig\"\t\n    \n    Write-Highlight \"Wating for file system configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false) {\n    Write-Highlight \"Dead Letter specified, updating dead letter configuration for $functionName\"\n    $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --dead-letter-config \"$functionDeadLetterConfig\"\t\n    \n    Write-Highlight \"Waitng for Dead Letter configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false) {\n    Write-Highlight \"Tracing config specified, updating tracing configuration for $functionName\"\n    $updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --tracing-config \"$functionTracingConfig\"\t\n    \n    Write-Highlight \"Waiting for tracing configuration to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nWrite-Host $updatedConfig | ConvertFrom-JSON\n\nif ($functionPublishOption -eq \"Yes\") {\n    Write-Highlight \"Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS.\"\n    $publishedVersion = aws lambda publish-version --function-name \"$functionArn\" --description \"$functionVersionNumber\"\n    \n    $publishedVersion = $publishedVersion | ConvertFrom-JSON\n    \n    Write-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)\"\n    Set-OctopusVariable -name \"PublishedVersion\" -value \"$($publishedVersion.Version)\"    \n}\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn\"\nSet-OctopusVariable -name \"LambdaArn\" -value \"$functionArn\"\n\nWrite-Highlight \"AWS Lambda $functionName successfully deployed.\"",
-    "OctopusUseBundledTooling": "False"
-  },
-  "Parameters": [
-    {
-      "Id": "8c0297c2-5a7c-4776-9ce7-8bd3dbe93e45",
-      "Name": "AWS.Lambda.FunctionName",
-      "Label": "Function Name",
-      "HelpText": "Required.\n\nThe name of the function to create or update.  See [documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html#options)\n\nExamples:\n- Function name - my-function .\n- Function ARN - arn:aws:lambda:us-west-2:123456789012:function:my-function .\n- Partial ARN - 123456789012:function:my-function .\n\nThe length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "711a1557-03c2-4c78-87aa-730389673884",
-      "Name": "AWS.Lambda.Account",
-      "Label": "AWS Account",
-      "HelpText": "Required.\n\nThe AWS Account with permissions to create / update AWS Lambdas.\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AmazonWebServicesAccount"
-      }
-    },
-    {
-      "Id": "304f276c-ed3e-4766-93e1-3fb25a727ccd",
-      "Name": "AWS.Lambda.Region",
-      "Label": "Region",
-      "HelpText": "Required.\n\nThe region where the function will live.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\naf-south-1|Africa (Cape Town)\nap-east-1|Asia Pacific (Hong Kong)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-3|Asia Pacific (Osaka-Local)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\nca-central-1|Canada (Central)\neu-central-1|Europe (Frankfurt)\neu-west-1|Europe (Ireland)\neu-west-2|Europe (London)\neu-south-1|Europe (Milan)\neu-west-3|Europe (Paris)\neu-north-1|Europe (Stockholm)\nme-south-1|Middle East (Bahrain)\nsa-east-1|South America (São Paulo)"
-      }
-    },
-    {
-      "Id": "d9d48dc2-d671-41b9-8a5e-59efbf4e29e3",
-      "Name": "AWS.Lambda.Package",
-      "Label": "Image",
-      "HelpText": "Required.\n\nThe registry containing the image you wish to deploy to the AWS Lambda function.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "a44a4664-f3b7-41f7-bc9c-cd7e06be7dbe",
-      "Name": "AWS.Lambda.FunctionRole",
-      "Label": "Function Role",
-      "HelpText": "Required.\n\nThe Amazon Resource Name (ARN) of the function’s execution role.  This role must exist prior to this step is run.  See [documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-intro-execution-role.html) for more detail on creating an execution role.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "12b11c8c-b31d-42b1-a4a4-c7fa0cf6219d",
-      "Name": "AWS.Lambda.MemorySize",
-      "Label": "Memory Size",
-      "HelpText": "Required.\n\nThe amount of memory that your function has access to. Increasing the function’s memory also increases its CPU allocation. The default value is 128 MB. The value must be a multiple of 64 MB.",
-      "DefaultValue": "128",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c16ab198-835b-4c1d-b289-b87ad5fe3df2",
-      "Name": "AWS.Lambda.Description",
-      "Label": "Description",
-      "HelpText": "Optional.\n\nA description of the function.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "903476ad-6eca-4ddf-a656-f121c12e8785",
-      "Name": "AWS.Lambda.VPCSubnetIds",
-      "Label": "VPC Subnet Ids",
-      "HelpText": "Optional.\n\nFormat: `SubnetId1,SubnetId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "457ac64f-5538-49b4-b7a2-f6ab97b5affe",
-      "Name": "AWS.Lambda.VPCSecurityGroupIds",
-      "Label": "VPC Security Group Ids",
-      "HelpText": "Optional.\n\nFormat: `SecurityGroupId1,SecurityGroupId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6ba57e09-dfea-4dcb-9372-6e9fc5d43051",
-      "Name": "AWS.Lambda.Image.Entrypoint",
-      "Label": "Entrypoint override",
-      "HelpText": "Optional for Image Package type.\n\nComma-delimited list of commands to override the Image Entrypoint.\n\nFormat: `entrypoint1, entrypoint2`\n\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f85d4334-e896-488f-aeef-bf6d66efc8a5",
-      "Name": "AWS.Lambda.Image.Command",
-      "Label": "Command override",
-      "HelpText": "Optional for Image Package type.\n\nComma-delimited list of commands to override the Image Entrypoint.\n\nFormat: `command1, command2`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "383e3565-d091-447e-828e-f6ab50d79150",
-      "Name": "AWS.Lambda.EnvironmentVariables",
-      "Label": "Environment Variables",
-      "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nEnvironment variables that are accessible from function code during execution.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "53366a6a-783e-4db9-b8af-eb5665ea805f",
-      "Name": "AWS.Lambda.EnvironmentVariablesKey",
-      "Label": "Environment Variables Encryption Key",
-      "HelpText": "Optional.\n\nThe ARN of the AWS Key Management Service (AWS KMS) key that’s used to encrypt your function’s environment variables. If it’s not provided, AWS Lambda uses a default service key.\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b2c16584-9f90-4dc1-85de-539cddd6482b",
-      "Name": "AWS.Lambda.FunctionTimeout",
-      "Label": "Timeout",
-      "HelpText": "Optional.\n\nThe amount of time that Lambda allows a function to run before stopping it. The default is 3 seconds. The maximum allowed value is 900 seconds.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e67b885a-5972-458d-9d67-2b5b8860fe61",
-      "Name": "AWS.Lambda.Tags",
-      "Label": "Tags",
-      "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nA list of tags to apply to the function.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "bb8af54e-5f79-45c4-b150-bdf4ee377b7b",
-      "Name": "AWS.Lambda.FileSystemConfig",
-      "Label": "File System Config",
-      "HelpText": "Optional.\n\nFormat: `Arn=string,LocalMountPath=string`\n\nConnection settings for an Amazon EFS file system.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "59047de4-a921-4437-a2a2-c9e684bcf21e",
-      "Name": "AWS.Lambda.TracingConfig",
-      "Label": "Tracing Config",
-      "HelpText": "Optional.\n\nFormat: `Mode=string`\n\nSet Mode to Active to sample and trace a subset of incoming requests with AWS X-Ray.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "37a91d63-9c42-4d49-832b-dbe64d81f6da",
-      "Name": "AWS.Lambda.DeadLetterConfig",
-      "Label": "Dead Letter Config",
-      "HelpText": "Optional.\n\nFormat: `TargetArn=string`\n\nA dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see [Dead Letter Queues](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq).\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1db6270a-9138-48d8-8d34-05c39ade10a8",
-      "Name": "AWS.Lambda.Publish",
-      "Label": "Publish",
-      "HelpText": "Required.\n\nCreates a [version](https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) from the current code and configuration of a function. Use versions to create a snapshot of your function code and configuration that doesn’t change.\n\n**Important**: Lambda doesn’t publish a version if the function’s configuration and code haven’t changed since the last version. Use UpdateFunctionCode or UpdateFunctionConfiguration to update the function before publishing a version.",
-      "DefaultValue": "Yes",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AwsRunScript",
-  "$Meta": {
-    "ExportedAt": "2024-06-03T15:07:31.689Z",
-    "OctopusVersion": "2024.3.1025",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "aws"
-}
diff --git a/step-templates/aws-deploy-lambda.json b/step-templates/aws-deploy-lambda.json
deleted file mode 100644
index ab5011797..000000000
--- a/step-templates/aws-deploy-lambda.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-    "Id": "9b5ee984-bdd2-49f0-a78a-07e21e60da8a",
-    "Name": "AWS - Deploy Lambda Function",
-    "Description": "Deploys a Zip file to an AWS Lambda function.  \n\nThis step does **not** perform variable substitution (it used to).  It takes the .zip file from the specified feed and uploads it to AWS as is.  The recommended approach to changing a lambda configuration per environment is to use [environment variables](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html)  \n\nThis step uses the following AWS CLI commands to deploy the AWS Lambda.  You will be required to install the AWS CLI on your server/worker for this to work.  The AWS CLI is pre-installed on the [dynamic workers](https://octopus.com/docs/infrastructure/workers/dynamic-worker-pools) in Octopus Cloud as well as the provided docker containers for [Execution Containers](https://octopus.com/docs/deployment-process/execution-containers-for-workers).\n\n- [create-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html)\n- [get-function](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/get-function.html)\n- [publish-version](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/publish-version.html)\n- [tag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/tag-resource.html)\n- [untag-resource](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/untag-resource.html)\n- [update-function-code](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-code.html)\n- [update-function-configuration](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/update-function-configuration.html)\n\nThis step template is worker-friendly, you can pass in a package reference rather than having to reference a previous step that downloaded the package. This step requires **Octopus Deploy 2019.10.0** or higher.\n\n## Output Variables\n\nThis step template sets the following output variables:\n\n- `LambdaArn`: The ARN of the Lambda Function\n- `PublishedVersion`: The most recent version published (only set when Publish is set to `Yes`).",
-    "ActionType": "Octopus.AwsRunScript",
-    "Version": 9,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-      {
-        "Id": "8dbae499-5aa8-438e-a2fe-ae29fb8f0a39",
-        "Name": "AWS.Lambda.Package",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "False",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "AWS.Lambda.Package"
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Aws.AssumeRole": "False",
-      "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-      "Octopus.Action.AwsAccount.Variable": "#{AWS.Lambda.Account}",
-      "Octopus.Action.Aws.Region": "#{AWS.Lambda.Region}",
-      "Octopus.Action.Script.ScriptBody": "$functionName = $OctopusParameters[\"AWS.Lambda.FunctionName\"] \n$functionRole = $OctopusParameters[\"AWS.Lambda.FunctionRole\"]\n$functionRunTime = $OctopusParameters[\"AWS.Lambda.Runtime\"]\n$functionHandler = $OctopusParameters[\"AWS.Lambda.FunctionHandler\"]\n$functionMemorySize = $OctopusParameters[\"AWS.Lambda.MemorySize\"]\n$functionDescription = $OctopusParameters[\"AWS.Lambda.Description\"]\n$functionVPCSubnetId = $OctopusParameters[\"AWS.Lambda.VPCSubnetIds\"]\n$functionVPCSecurityGroupId = $OctopusParameters[\"AWS.Lambda.VPCSecurityGroupIds\"]\n$functionEnvironmentVariables = $OctopusParameters[\"AWS.Lambda.EnvironmentVariables\"]\n$functionEnvironmentVariablesKey = $OctopusParameters[\"AWS.Lambda.EnvironmentVariablesKey\"]\n$functionTimeout = $OctopusParameters[\"AWS.Lambda.FunctionTimeout\"]\n$functionTags = $OctopusParameters[\"AWS.Lambda.Tags\"]\n$functionFileSystemConfig = $OctopusParameters[\"AWS.Lambda.FileSystemConfig\"]\n$functionDeadLetterConfig = $OctopusParameters[\"AWS.Lambda.DeadLetterConfig\"]\n$functionTracingConfig = $OctopusParameters[\"AWS.Lambda.TracingConfig\"]\n$functionVersionNumber = $OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].PackageVersion\"]\n$functionPublishOption = $OctopusParameters[\"AWS.Lambda.Publish\"]\n\n$functionReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$functionRunbookRun = $OctopusParameters[\"Octopus.RunbookRun.Id\"]\n$stepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$regionName = $OctopusParameters[\"AWS.Lambda.Region\"]\n$newArchiveFileName = $OctopusParameters[\"Octopus.Action.Package[AWS.Lambda.Package].PackageFilePath\"]\n\nif ([string]::IsNullOrWhiteSpace($functionName))\n{\n\tWrite-Error \"The parameter Function Name is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRole))\n{\n\tWrite-Error \"The parameter Role is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionRunTime))\n{\n\tWrite-Error \"The parameter Run Time is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionHandler))\n{\n\tWrite-Error \"The parameter Handler is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionPublishOption))\n{\n\tWrite-Error \"The parameter Publish is required.\"\n    Exit 1\n}\n\nif ([string]::IsNullOrWhiteSpace($functionReleaseNumber) -eq $false)\n{\n    $deployVersionTag = \"Octopus-Release=$functionReleaseNumber\"\n}\nelse\n{\n\t$deployVersionTag = \"Octopus-Runbook-Run=$functionRunbookRun\"\n}\n\nWrite-Host \"Function Name: $functionName\"\nWrite-Host \"Function Role: $functionRole\"\nWrite-Host \"Function Runtime: $functionRunTime\"\nWrite-Host \"Function Handler: $functionHandler\"\nWrite-Host \"Function Memory Size: $functionMemorySize\"\nWrite-Host \"Function Description: $functionDescription\"\nWrite-Host \"Function Subnet Ids: $functionVPCSubnetId\"\nWrite-Host \"Function Security Group Ids: $functionVPCSecurityGroupId\"\nWrite-Host \"Function Environment Variables: $functionEnvironmentVariables\"\nWrite-Host \"Function Environment Variables Key: $functionEnvironmentVariablesKey\"\nWrite-Host \"Function Timeout: $functionTimeout\"\nWrite-Host \"Function Tags: $functionTags\"\nWrite-Host \"Function File System Config: $functionFileSystemConfig\"\nWrite-Host \"Function Dead Letter Config: $functionDeadLetterConfig\"\nWrite-Host \"Function Tracing Config: $functionTracingConfig\"\nWrite-Host \"Function file path: fileb://$newArchiveFileName\"\nWrite-Host \"Function Publish: $functionPublishOption\"\n\nWrite-Host \"Attempting to find the function $functionName in the region $regionName\"\n$hasExistingFunction = $true\n\ntry\n{\n    $existingFunction = aws lambda get-function --function-name \"$functionName\" 2> $null\n    \n    Write-Host \"The exit code from the lookup was $LASTEXITCODE\"\n    if ($LASTEXITCODE -eq 255 -or $LASTEXITCODE -eq 254)\n    {\n    \t$hasExistingFunction = $false\n    }   \n    \n    $existingFunction = $existingFunction | ConvertFrom-Json\n}\ncatch\n{\n\tWrite-Host \"The function was not found\"\n\t$hasExistingFunction = $false\n}\n\nWrite-Host \"Existing functions: $hasExistingFunction\"\nWrite-Host $existingFunction\n\n$aliasInformation = $null\nif ($hasExistingFunction -eq $false)\n{\n\tWrite-Highlight \"Creating $functionName in $regionName\"    \n\t$functionInformation = aws lambda create-function --function-name \"$functionName\" --zip-file fileb://$newArchiveFileName --handler $functionHandler --runtime $functionRuntime --role $functionRole --memory-size $functionMemorySize\n}\nelse\n{\n\tWrite-Highlight \"Updating the $functionName code\"\n    $updatedConfig = aws lambda update-function-code --function-name \"$functionName\" --zip-file fileb://$newArchiveFileName\n    \n    Write-Highlight \"Waiting for update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n    \n    Write-Highlight \"Updating the $functionName base configuration\"    \n    $functionInformation = aws lambda update-function-configuration --function-name \"$functionName\" --role $functionRole --handler $functionHandler --runtime $functionRuntime --memory-size $functionMemorySize\n    \n    Write-Highlight \"Waiting for base configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\n$functionInformation = $functionInformation | ConvertFrom-JSON\n$functionArn = $functionInformation.FunctionArn\n\nWrite-Host \"Function ARN: $functionArn\"\n\nif ([string]::IsNullOrWhiteSpace($functionEnvironmentVariables) -eq $false)\n{\n\tWrite-Highlight \"Environment variables specified, updating environment variables configuration for $functionName\"\n\t$environmentVariables = \"Variables={$functionEnvironmentVariables}\"\n    \n    if ([string]::IsNullOrWhiteSpace($functionEnvironmentVariablesKey) -eq $true)\n    {\n    \t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\"\n    }\n    else\n    {\n    \t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --environment \"$environmentVariables\" --kms-key-arn \"$functionEnvironmentVariablesKey\"\n    }\n    \n    Write-Highlight \"Waiting for environment variable update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTimeout) -eq $false)\n{\n\tWrite-Highlight \"Timeout specified, updating timeout configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --timeout \"$functionTimeout\"\n    \n    Write-Highlight \"Waiting for timeout upate to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTags) -eq $false)\n{\n\tWrite-Highlight \"Tags specified, updating tags configuration for $functionName\"\n\t$updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$functionTags\"\n}\n\nif ([string]::IsNullOrWhiteSpace($deployVersionTag) -eq $false)\n{\n\tWrite-Highlight \"Deploy version tag found with value of $deployVersionTag, updating tags configuration for $functionName\"\n    aws lambda untag-resource --resource \"$functionArn\" --tag-keys \"Octopus-Release\" \"Octopus-Runbook-Run\"\n\t$updatedConfig = aws lambda tag-resource --resource \"$functionArn\" --tags \"$deployVersionTag\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionVPCSubnetId) -eq $false -and [string]::IsNullOrWhiteSpace($functionVPCSecurityGroupId) -eq $false)\n{\n\tWrite-Highlight \"VPC subnets and security group specified, updating vpc configuration for $functionName\"\n\t$vpcConfig = \"SubnetIds=$functionVPCSubnetId,SecurityGroupIds=$functionVPCSecurityGroupId\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --vpc-config \"$vpcConfig\"\n    \n    Write-Highlight \"Waiting for vpc configuration to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDescription) -eq $false)\n{\n\tWrite-Highlight \"Description specified, updating description configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --description \"$functionDescription\"\n    \n    Write-Highlight \"Waiting for description configuration ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionFileSystemConfig) -eq $false)\n{\n\tWrite-Highlight \"File System Config specified, updating file system configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --file-system-configs \"$functionFileSystemConfig\"\t\n    \n    Write-Highlight \"Wating for file system configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionDeadLetterConfig) -eq $false)\n{\n\tWrite-Highlight \"Dead Letter specified, updating dead letter configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --dead-letter-config \"$functionDeadLetterConfig\"\t\n    \n    Write-Highlight \"Waitng for Dead Letter configuration update to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nif ([string]::IsNullOrWhiteSpace($functionTracingConfig) -eq $false)\n{\n\tWrite-Highlight \"Tracing config specified, updating tracing configuration for $functionName\"\n\t$updatedConfig = aws lambda update-function-configuration --function-name \"$functionArn\" --tracing-config \"$functionTracingConfig\"\t\n    \n    Write-Highlight \"Waiting for tracing configuration to complete ...\"\n    aws lambda wait function-updated --function-name \"$functionName\"\n}\n\nWrite-Host $updatedConfig | ConvertFrom-JSON\n\nif ($functionPublishOption -eq \"Yes\")\n{\n\tWrite-Highlight \"Publishing the function with the description $functionVersionNumber to create a snapshot of the current code and configuration of this function in AWS.\"\n\t$publishedVersion = aws lambda publish-version --function-name \"$functionArn\" --description \"$functionVersionNumber\"\n    \n    $publishedVersion = $publishedVersion | ConvertFrom-JSON\n    \n    Write-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.PublishedVersion' to $($publishedVersion.Version)\"\n    Set-OctopusVariable -name \"PublishedVersion\" -value \"$($publishedVersion.Version)\"    \n}\n\nWrite-Highlight \"Setting the output variable 'Octopus.Action[$($stepName)].Output.LambdaArn' to $functionArn\"\nSet-OctopusVariable -name \"LambdaArn\" -value \"$functionArn\"\n\nWrite-Highlight \"AWS Lambda $functionName successfully deployed.\"",
-      "Octopus.Action.EnabledFeatures": ""
-    },
-    "Parameters": [
-      {
-        "Id": "bf72bc3e-3ce6-4b63-b23f-1171b5cc72dd",
-        "Name": "AWS.Lambda.FunctionName",
-        "Label": "Function Name",
-        "HelpText": "Required.\n\nThe name of the function to create or update.  See [documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html#options)\n\nExamples:\n- Function name - my-function .\n- Function ARN - arn:aws:lambda:us-west-2:123456789012:function:my-function .\n- Partial ARN - 123456789012:function:my-function .\n\nThe length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "13dcec09-00f8-4af0-80e4-23bcb47eaf17",
-        "Name": "AWS.Lambda.Account",
-        "Label": "AWS Account",
-        "HelpText": "Required.\n\nThe AWS Account with permissions to create / update AWS Lambdas.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AmazonWebServicesAccount"
-        }
-      },
-      {
-        "Id": "8fd7ff24-7557-4f96-a809-ce611c473b13",
-        "Name": "AWS.Lambda.Region",
-        "Label": "Region",
-        "HelpText": "Required.\n\nThe region where the function will live.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "us-east-2|US East (Ohio)\nus-east-1|US East (N. Virginia)\nus-west-1|US West (N. California)\nus-west-2|US West (Oregon)\naf-south-1|Africa (Cape Town)\nap-east-1|Asia Pacific (Hong Kong)\nap-south-1|Asia Pacific (Mumbai)\nap-northeast-3|Asia Pacific (Osaka-Local)\nap-northeast-2|Asia Pacific (Seoul)\nap-southeast-1|Asia Pacific (Singapore)\nap-southeast-2|Asia Pacific (Sydney)\nap-northeast-1|Asia Pacific (Tokyo)\nca-central-1|Canada (Central)\neu-central-1|Europe (Frankfurt)\neu-west-1|Europe (Ireland)\neu-west-2|Europe (London)\neu-south-1|Europe (Milan)\neu-west-3|Europe (Paris)\neu-north-1|Europe (Stockholm)\nme-south-1|Middle East (Bahrain)\nsa-east-1|South America (São Paulo)"
-        }
-      },
-      {
-        "Id": "11928ce7-e1b8-451c-9a9b-481acac60611",
-        "Name": "AWS.Lambda.Package",
-        "Label": "Package",
-        "HelpText": "Required.\n\nThe package containing the code you wish to deploy to the AWS Lambda function.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "d45499b4-5f4a-4bae-a4b9-336e97a75cdc",
-        "Name": "AWS.Lambda.FunctionRole",
-        "Label": "Function Role",
-        "HelpText": "Required.\n\nThe Amazon Resource Name (ARN) of the function’s execution role.  This role must exist prior to this step is run.  See [documentation](https://docs.aws.amazon.com/lambda/latest/dg/lambda-intro-execution-role.html) for more detail on creating an execution role.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "926b93c6-a47a-4899-9865-e7329b93b4b8",
-        "Name": "AWS.Lambda.Runtime",
-        "Label": "Runtime",
-        "HelpText": "Required.\n\nThe runtime of the AWS Lambda.  See [documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/lambda/create-function.html#options) for more details on what runtimes are supported.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "nodejs|nodejs\nnodejs4.3|nodejs4.3\nnodejs4.3-edge|nodejs4.3-edge\nnodejs6.10|nodejs6.10\nnodejs8.10|nodejs8.10\nnodejs10.x|nodejs10.x\nnodejs12.x|nodejs12.x\nnodejs14.x|nodejs14.x\njava8|java8\njava8.al2|java8.al2\njava11|java11\npython2.7|python2.7\npython3.6|python3.6\npython3.7|python3.7\npython3.8|python3.8\npython3.9|python3.9\ndotnet6|dotnet6\ndotnet8|dotnet8\nnodejs4.3-edge|nodejs4.3-edge\ngo1.x|go1.x\nruby2.5|ruby2.5\nruby2.7|ruby2.7\nprovided|provided\nprovided.al2|provided.al2"
-        }
-      },
-      {
-        "Id": "1b8bfb82-3736-4d9a-8b05-a39319eb5735",
-        "Name": "AWS.Lambda.FunctionHandler",
-        "Label": "Handler",
-        "HelpText": "Required.\n\nThe name of the method within your code that Lambda calls to execute your function. The format includes the file name. It can also include namespaces and other qualifiers, depending on the runtime. For more information, see [Programming Model](https://docs.aws.amazon.com/lambda/latest/dg/gettingstarted-features.html)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "68428e8e-abc3-4f29-a5bb-fe635281d073",
-        "Name": "AWS.Lambda.MemorySize",
-        "Label": "Memory Size",
-        "HelpText": "Required.\n\nThe amount of memory that your function has access to. Increasing the function’s memory also increases its CPU allocation. The default value is 128 MB. The value must be a multiple of 64 MB.",
-        "DefaultValue": "128",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "948280bb-50af-495b-9d1d-2f7567a0b0cc",
-        "Name": "AWS.Lambda.Description",
-        "Label": "Description",
-        "HelpText": "Optional.\n\nA description of the function.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ed2ab9bb-d8a3-4ab4-a576-36b6c0a8f75d",
-        "Name": "AWS.Lambda.VPCSubnetIds",
-        "Label": "VPC Subnet Ids",
-        "HelpText": "Optional.\n\nFormat: `SubnetId1,SubnetId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8c2793a7-1a88-40a2-be28-3a38c7b40658",
-        "Name": "AWS.Lambda.VPCSecurityGroupIds",
-        "Label": "VPC Security Group Ids",
-        "HelpText": "Optional.\n\nFormat: `SecurityGroupId1,SecurityGroupId2`\n\nFor network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see [VPC Settings](https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html).",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ba3edded-1e19-47c4-990a-ebdf4eb0bcca",
-        "Name": "AWS.Lambda.EnvironmentVariables",
-        "Label": "Environment Variables",
-        "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nEnvironment variables that are accessible from function code during execution.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "58d76440-e4f5-46fb-a095-84aedd904a18",
-        "Name": "AWS.Lambda.EnvironmentVariablesKey",
-        "Label": "Environment Variables Encryption Key",
-        "HelpText": "Optional.\n\nThe ARN of the AWS Key Management Service (AWS KMS) key that’s used to encrypt your function’s environment variables. If it’s not provided, AWS Lambda uses a default service key.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5b9b3111-5349-49e6-ab0d-f386a53bdd7c",
-        "Name": "AWS.Lambda.FunctionTimeout",
-        "Label": "Timeout",
-        "HelpText": "Optional.\n\nThe amount of time that Lambda allows a function to run before stopping it. The default is 3 seconds. The maximum allowed value is 900 seconds.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "567f5eeb-e174-4c8f-8b17-36bd9457ea29",
-        "Name": "AWS.Lambda.Tags",
-        "Label": "Tags",
-        "HelpText": "Optional.\n\nFormat: `KeyName1=string,KeyName2=string`\n\nA list of tags to apply to the function.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "297f4f8e-3837-43a3-b844-a0e0d02e9d5b",
-        "Name": "AWS.Lambda.FileSystemConfig",
-        "Label": "File System Config",
-        "HelpText": "Optional.\n\nFormat: `Arn=string,LocalMountPath=string`\n\nConnection settings for an Amazon EFS file system.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c720a63a-7b77-4a13-b6ed-6d44126e9372",
-        "Name": "AWS.Lambda.TracingConfig",
-        "Label": "Tracing Config",
-        "HelpText": "Optional.\n\nFormat: `Mode=string`\n\nSet Mode to Active to sample and trace a subset of incoming requests with AWS X-Ray.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "92fd8a1f-e681-4e1c-b382-3df1de12194e",
-        "Name": "AWS.Lambda.DeadLetterConfig",
-        "Label": "Dead Letter Config",
-        "HelpText": "Optional.\n\nFormat: `TargetArn=string`\n\nA dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see [Dead Letter Queues](https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq).\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "67f8da1a-08f1-4cde-a60f-238d1fb08c98",
-        "Name": "AWS.Lambda.Publish",
-        "Label": "Publish",
-        "HelpText": "Required.\n\nCreates a [version](https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) from the current code and configuration of a function. Use versions to create a snapshot of your function code and configuration that doesn’t change.\n\n**Important**: Lambda doesn’t publish a version if the function’s configuration and code haven’t changed since the last version. Use UpdateFunctionCode or UpdateFunctionConfiguration to update the function before publishing a version.",
-        "DefaultValue": "Yes",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2025-09-07T22:51:56.457Z",
-      "OctopusVersion": "2025.3.13248",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "benjimac93",
-    "Category": "aws"
-  }
diff --git a/step-templates/aws-deregister-elb-instance.json b/step-templates/aws-deregister-elb-instance.json
deleted file mode 100644
index e6d0ce285..000000000
--- a/step-templates/aws-deregister-elb-instance.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "bcb05502-ae9a-48a0-a153-1cb3057efb61",
-  "Name": "AWS - Deregister ELB Instance",
-  "Description": "Removes the current instance from the ELB",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Part 1 of 2\r\n# Part 1 Deregisters an EC2 instance from an ELB\r\n# Part 2 Registers an EC2 instance with an ELB and waits for it to be InService\r\n\r\n$ec2Region = $OctopusParameters['ec2Region']\r\n$ec2User = $OctopusParameters['ec2ClientId']\r\n$ec2Credentials = $OctopusParameters['ec2Credentials']\r\n$elbName = $OctopusParameters['elbName']\r\n$instanceId = \"\"\r\n\r\n# Load EC2 credentials (not sure if this is needed when executed from an EC2 box)\r\ntry\r\n{\r\n\tWrite-Host \"Loading AWS Credentials...\"\r\n\tImport-Module AWSPowerShell\r\n\tSet-AWSCredentials -AccessKey $ec2User -SecretKey $ec2Credentials\r\n\tSet-DefaultAWSRegion $ec2Region\r\n\tWrite-Host \"AWS Credentials Loaded.\"\r\n}\r\ncatch\r\n{\r\n\tWrite-Error -Message \"Failed to load AWS Credentials.\" -Exception $_.Exception\r\n\tExit 1\r\n}\r\n\r\n# Get EC2 Instance\r\ntry\r\n{\r\n\t$response = Invoke-RestMethod -Uri \"http://169.254.169.254/latest/meta-data/instance-id\" -Method Get\r\n\tif ($response)\r\n\t{\r\n\t\t$instanceId = $response\r\n\t}\r\n\telse\r\n\t{\r\n\t\tWrite-Error -Message \"Returned Instance ID does not appear to be valid\"\r\n\t\tExit 1\r\n\t}\r\n}\r\ncatch\r\n{\r\n\tWrite-Error -Message \"Failed to load instance ID from AWS.\" -Exception $_.Exception\r\n\tExit 1\r\n}\r\n\r\n# Deregister the current EC2 instance\r\nWrite-Host \"Deregistering instance $instanceId from $elbName\"\r\ntry\r\n{\r\n\tRemove-ELBInstanceFromLoadBalancer -LoadBalancerName $elbName -Instance $instanceId -Force\r\n\tWrite-Host \"Instance deregistered\"\r\n}\r\ncatch\r\n{\r\n\tWrite-Error -Message \"Failed to deregister instance.\" -Exception $_.Exception\r\n\tExit 1\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ec2ClientId",
-      "Label": "AWS EC2 Client Id",
-      "HelpText": "The client id used to authenticate with AWS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "ec2Credentials",
-      "Label": "AWS EC2 Client Secret",
-      "HelpText": "The client secret used to authenticate with AWS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "elbName",
-      "Label": "AWS ELB Name",
-      "HelpText": "The name of the AWS ELB to remove the instance from",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ec2Region",
-      "Label": "AWS EC2 Region",
-      "HelpText": "The region in which the ELB lives",
-      "DefaultValue": "us-east-1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-04-30T13:24:08.210+00:00",
-  "LastModifiedBy": "DudeSolutions",
-  "$Meta": {
-    "ExportedAt": "2015-04-30T13:24:16.921+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
\ No newline at end of file
diff --git a/step-templates/aws-find-blue-green-target-group.json b/step-templates/aws-find-blue-green-target-group.json
deleted file mode 100644
index b4a611d1d..000000000
--- a/step-templates/aws-find-blue-green-target-group.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "Id": "2f5f8b7b-5deb-45a9-966b-bf52c6e7976c",
-  "Name": "AWS - Find Blue-Green Target Group",
-  "Description": "Find the online and offline target groups for a blue-green deployment",
-  "ActionType": "Octopus.AwsRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Aws.AssumeRole": "False",
-    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-    "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
-    "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}",
-    "Octopus.Action.Script.ScriptBody": "#!/bin/bash\n\nLISTENER=${1:-'#{AWSBlueGreen.AWS.ListenerARN | Trim}'}\nRULE=${2:-'#{AWSBlueGreen.AWS.RuleArn | Trim}'}\nGREENTARGETGROUP=${3:-'#{AWSBlueGreen.AWS.GreenTargetGroup | Trim}'}\nBLUETARGETGROUP=${4:-'#{AWSBlueGreen.AWS.BlueTargetGroup | Trim}'}\n\nechoerror() { echo \"$@\" 1>&2; }\n\nif ! command -v \"aws\" &> /dev/null; then\n  echoerror \"You must have the AWS CLI installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers\"\n  exit 1\nfi\n\nif ! command -v \"jq\" &> /dev/null; then\n  echoerror \"You must have jq installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers\"\n  exit 1\nfi\n\n# Validate the arguments\n\nif [[ -z \"${LISTENER}\" ]]; then\n  echoerror \"Please provide the ARN of the listener as the first argument\"\n  exit 1\nfi\n\nif [[ -z \"${RULE}\" ]]; then\n  echoerror \"Please provide the ARN of the listener rule as the second argument\"\n  exit 1\nfi\n\nif [[ -z \"${GREENTARGETGROUP}\" ]]; then\n  echoerror \"Please provide the ARN of the green target group as the third argument\"\n  exit 1\nfi\n\nif [[ -z \"${BLUETARGETGROUP}\" ]]; then\n  echoerror \"Please provide the ARN of the blue target group as the fourth argument\"\n  exit 1\nfi\n\n# Get the JSON representation of the listener rules\n\nRULES=$(aws elbv2 describe-rules \\\n  --listener-arn \"${LISTENER}\" \\\n  --output json)\n\nwrite_verbose \"${RULES}\"\n\n# Find the weight assigned to each of the target groups.\n\nGREENWEIGHT=$(jq -r \".Rules[] | select(.RuleArn == \\\"${RULE}\\\") | .Actions[] | select(.Type == \\\"forward\\\") | .ForwardConfig | .TargetGroups[] | select(.TargetGroupArn == \\\"${GREENTARGETGROUP}\\\") | .Weight\" <<< \"${RULES}\")\nBLUEWEIGHT=$(jq -r \".Rules[] | select(.RuleArn == \\\"${RULE}\\\") | .Actions[] | select(.Type == \\\"forward\\\") | .ForwardConfig | .TargetGroups[] | select(.TargetGroupArn == \\\"${BLUETARGETGROUP}\\\") | .Weight\" <<< \"${RULES}\")\n\n# Validation that we found the green and blue target groups.\n\nif [[ -z \"${GREENWEIGHT}\" ]]; then\n  echoerror \"Failed to find the target group ${GREENTARGETGROUP} in the listener rule ${RULE}\"\n  echoerror \"Double check that the target group exists and has been associated with the load balancer\"\n  exit 1\nfi\n\nif [[ -z \"${BLUEWEIGHT}\" ]]; then\n  echoerror \"Failed to find the target group ${BLUETARGETGROUP} in the listener rule ${RULE}\"\n  echoerror \"Double check that the target group exists and has been associated with the load balancer\"\n  exit 1\nfi\n\necho \"Green weight: ${GREENWEIGHT}\"\necho \"Blue weight: ${BLUEWEIGHT}\"\n\n# Set the output variables identifying which target group is active and which is inactive.\n# Note that we assume the target groups are either active or inactive (i.e. all traffic and no traffic).\n# Load balancers support more complex routing rules, but we assume a simple blue-green deployment.\n# If the green target group has traffic, it is considered active, and the blue target group is considered inactive.\n# If the green target group has no traffic, it is considered inactive, and the blue target group is considered active.\n\nif [ \"${GREENWEIGHT}\" != \"0\" ]; then\n  echo \"Green target group is active, blue target group is inactive\"\n  set_octopusvariable \"ActiveGroupArn\" \"${GREENTARGETGROUP}\"\n  set_octopusvariable \"ActiveGroupColor\" \"Green\"\n  set_octopusvariable \"InactiveGroupArn\" \"${BLUETARGETGROUP}\"\n  set_octopusvariable \"InactiveGroupColor\" \"Blue\"\nelse\n  echo \"Blue target group is active, green target group is inactive\"\n  set_octopusvariable \"ActiveGroupArn\" \"${BLUETARGETGROUP}\"\n  set_octopusvariable \"ActiveGroupColor\" \"Blue\"\n  set_octopusvariable \"InactiveGroupArn\" \"${GREENTARGETGROUP}\"\n  set_octopusvariable \"InactiveGroupColor\" \"Green\"\nfi"
-  },
-  "Parameters": [
-    {
-      "Id": "29cdfb7d-47fa-4c8a-837b-c58bb0d90c26",
-      "Name": "AWSBlueGreen.AWS.Region",
-      "Label": "Region",
-      "HelpText": "The AWS region. See https://aws.amazon.com/about-aws/global-infrastructure/regions_az/ for more information.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "58a1ebcd-fd13-48e2-b8b9-fdfe4df8c35e",
-      "Name": "AWSBlueGreen.AWS.Account",
-      "Label": "Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AmazonWebServicesAccount"
-      }
-    },
-    {
-      "Id": "80642a7b-ef3e-4db4-b969-d0148a1baa90",
-      "Name": "AWSBlueGreen.AWS.ListenerARN",
-      "Label": "Listener ARN",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2cf29ab4-61a1-4a80-942f-6f1dd035f634",
-      "Name": "AWSBlueGreen.AWS.BlueTargetGroup",
-      "Label": "Blue Target Group ARN",
-      "HelpText": "The ARN of the blue target group. See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-target-groups.html for more details.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b7d105c6-1640-48c4-9f01-ad9ece8d3588",
-      "Name": "AWSBlueGreen.AWS.GreenTargetGroup",
-      "Label": "Green Target Group ARN",
-      "HelpText": "The ARN of the green target group. See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-target-groups.html for more details.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ff055e9f-f223-453a-9a1f-a0238e6cdfd6",
-      "Name": "AWSBlueGreen.AWS.RuleArn",
-      "Label": "Rule ARN",
-      "HelpText": "The ARN of the listener rule to update. See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/listener-update-rules.html for more information.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AwsRunScript",
-  "$Meta": {
-    "ExportedAt": "2025-01-10T03:41:11.780Z",
-    "OctopusVersion": "2025.1.5319",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "aws"
-}
diff --git a/step-templates/aws-initiate-instance-refresh.json b/step-templates/aws-initiate-instance-refresh.json
deleted file mode 100644
index 7bf44df2f..000000000
--- a/step-templates/aws-initiate-instance-refresh.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "Id": "150c46d1-f33f-493b-a8c6-f5bd22f540f3",
-  "Name": "AWS - Initiate Instance Refresh",
-  "Description": "Initiates an instance refresh for an Auto Scaling group and waits for it to complete.",
-  "ActionType": "Octopus.AwsRunScript",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Aws.AssumeRole": "False",
-    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.AwsAccount.Variable": "#{AWSBlueGreen.AWS.Account}",
-    "Octopus.Action.Aws.Region": "#{AWSBlueGreen.AWS.Region}",
-    "Octopus.Action.Script.ScriptBody": "#!/bin/bash\n\nASG=${1:-'#{AWSBlueGreen.AWS.ASG | Trim}'}\n\nechoerror() { echo \"$@\" 1>&2; }\n\nif ! command -v \"aws\" &> /dev/null; then\n  echoerror \"You must have the AWS CLI installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers\"\n  exit 1\nfi\n\nif ! command -v \"jq\" &> /dev/null; then\n  echoerror \"You must have jq installed for this step. Consider using a Container Image - https://octopus.com/docs/projects/steps/execution-containers-for-workers#how-to-use-execution-containers-for-workers\"\n  exit 1\nfi\n\nif [[ -z \"${ASG}\" ]]; then\n  echoerror \"Please provide the name of the Auto Scaling group as the first argument\"\n  exit 1\nfi\n\nfor i in {1..30}; do\n  EXISTINGREFRESHES=$(aws autoscaling describe-instance-refreshes --auto-scaling-group-name \"${ASG}\")\n  NOTSUCCESSFUL=$(jq '.InstanceRefreshes[] | select(.Status == \"Pending\" or .Status == \"InProgress\" or .Status == \"Cancelling\" or .Status == \"RollbackInProgress\" or .Status == \"Baking\")' <<< \"${EXISTINGREFRESHES}\")\n  if [[ -z \"${NOTSUCCESSFUL}\" ]];\n  then\n    break\n  fi\n    echo \"Waiting for existing Auto Scaling group ${ASG} refresh to complete...\"\n    sleep 12\ndone\n\nREFRESH=$(aws autoscaling start-instance-refresh --auto-scaling-group-name \"${ASG}\")\n\nif [[ $? -ne 0 ]];\nthen\n  echoerror \"Failed to start instance refresh for Auto Scaling group ${ASG}\"\n  exit 1\nfi\n\nREFRESHTOKEN=$(jq -r '.InstanceRefreshId' <<< \"${REFRESH}\")\n\necho \"Refreshing instances in Auto Scaling group ${ASG}...\"\n\nwrite_verbose \"${REFRESH}\"\n\n# Wait for all instances to be healthy\nfor i in {1..30}; do\n  REFRESHSTATUS=$(aws autoscaling describe-instance-refreshes --auto-scaling-group-name \"${ASG}\" --instance-refresh-ids \"${REFRESHTOKEN}\")\n  STATUS=$(jq -r '.InstanceRefreshes[0].Status' <<< \"${REFRESHSTATUS}\")\n  PERCENTCOMPLETE=$(jq -r '.InstanceRefreshes[0].PercentageComplete' <<< \"${REFRESHSTATUS}\")\n\n  # Treat a null percentage as 0\n  if [[ \"${PERCENTCOMPLETE}\" == \"null\" ]]\n  then\n    PERCENTCOMPLETE=0\n  fi\n\n  write_verbose \"${REFRESHSTATUS}\"\n\n  if [[ \"${STATUS}\" == \"Successful\" ]]\n  then\n    echo \"Instance refresh succeeded\"\n    break\n  elif [[ \"${STATUS}\" == \"Failed\" ]];\n  then\n    echo \"Instance refresh failed!\"\n    exit 1\n  fi\n  echo \"Waiting for Auto Scaling group ${ASG} refresh to complete (${STATUS} ${PERCENTCOMPLETE}%)...\"\n  sleep 12\ndone"
-  },
-  "Parameters": [
-    {
-      "Id": "2fe001f5-39ee-40d9-b104-24817759ac6f",
-      "Name": "AWSBlueGreen.AWS.Region",
-      "Label": "AWS Region",
-      "HelpText": "The AWS region. See https://aws.amazon.com/about-aws/global-infrastructure/regions_az/ for more information.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f3630bb5-ab07-46b4-b764-19f1c3b2ec5f",
-      "Name": "AWSBlueGreen.AWS.Account",
-      "Label": "Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AmazonWebServicesAccount"
-      }
-    },
-    {
-      "Id": "bdfdedee-fdeb-4292-96fd-e41c64b1e523",
-      "Name": "AWSBlueGreen.AWS.ASG",
-      "Label": "ASG Name",
-      "HelpText": "The name of the auto scaler group to refresh. See https://docs.aws.amazon.com/autoscaling/ec2/userguide/auto-scaling-groups.html for more details.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AwsRunScript",
-  "$Meta": {
-    "ExportedAt": "2025-01-10T04:12:22.681Z",
-    "OctopusVersion": "2025.1.5319",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "aws"
-}
diff --git a/step-templates/aws-launch-ec2-instance.json b/step-templates/aws-launch-ec2-instance.json
deleted file mode 100644
index 362b9b24f..000000000
--- a/step-templates/aws-launch-ec2-instance.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "Id": "eed13694-0208-4614-aca9-e82309838dd8",
-  "Name": "AWS - Launch EC2 Instance",
-  "Description": "This step will launch an EC2 instance, or start an instance previously created by this step.\n\nThe goal being that only one specific instance will be created, and on subsequent deploys, if the instance is not running it will be started. If the instance was terminated, a new instance will be created in its place. Basically, this step says \"_I will make sure the specified Instance will be running after this step_\".\n\nThis step makes the following Octopus \"Output\" Variables available to subsequent steps:\n- **InstanceId** (e.g. i-a1b2c3d4e5f6g7h8i)\n- **PrivateIpAddress** (e.g. 192.168.0.100)\n- **PublicIpAddress** (e.g. 52.64.52.64)\n- Usage: _#{Octopus.Action[AWS - Launch EC2 Instance].Output.**InstanceId**}_\n\nNow what...? Well, you could use the \"UserData\" field to [automatically install and register a Tentacle](https://octopus.com/blog/auto-provision-ec2-instances-with-tentacle-installed).\n\nNote for UserData: _If you're creating your own image (AMI), you may need to [re-enable User Data](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/UsingConfig_WinAMI.html#UsingConfigInterface_WinAMI), then create the image._\n\nWith a couple of extra step templates you can:\n- Wait for the Instance to register as a Deployment Target (_Octopus - Wait for Deployment Target registration_)\n- Include the new Instance in subsequent deployment steps (_Health Check_)\n\n[AWS Tools for Windows PowerShell](http://aws.amazon.com/powershell/) must be installed on the Server/Target you plan on running this step template on.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$odTags,\n    [string]$odImageId,\n    [string]$odInstanceType,\n    [string]$odSubnetId,\n    [string]$odSecurityGroupId,\n    [string]$odKeyName,\n    [string]$odRegion,\n    [string]$odUserData,\n    [decimal]$odSpotPrice,\n    [string]$odSpotProduct,\n    [string]$odAccessKey,\n    [string]$odSecretKey,\n    [switch]$whatIf\n)\n\n$ErrorActionPreference = \"Stop\"\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if (!$result -or $result -eq $null) {\n        if ($Default) {\n            $result = $Default\n        } elseif ($Required) {\n            Throw \"Missing parameter value $Name\"\n        }\n    }\n\n    return $result\n}\n\n\nfunction removeTags($instanceId, $tags)\n{\n    (ConvertFrom-StringData $tags).GetEnumerator() | Foreach-Object {\n        try {\n            Remove-EC2Tag -Tags @{key=$_.Key} -resourceId $instanceId -Force\n        }\n        catch [Amazon.EC2.AmazonEC2Exception] {\n            Throw $_.Exception.errorcode + '-' + $_.Exception.Message\n        }\n    }\n}\n\nfunction NewTags($instanceId, $tags)\n{\n    (ConvertFrom-StringData $tags).GetEnumerator() | Foreach-Object {\n        try {\n            New-EC2Tag -Tags @{key=$_.Key;value=$_.Value} -resourceId $instanceId\n        }\n        catch [Amazon.EC2.AmazonEC2Exception] {\n            Throw $_.Exception.errorcode + '-' + $_.Exception.Message\n        }\n    }\n}\n\n\n& {\n    param(\n        [string]$odTags,\n        [string]$odImageId,\n        [string]$odInstanceType,\n        [string]$odSubnetId,\n        [string]$odSecurityGroupId,\n        [string]$odKeyName,\n        [string]$odRegion,\n        [string]$odUserData,\n        [decimal]$odSpotPrice,\n        [string]$odSpotProduct,\n        [string]$odAccessKey,\n        [string]$odSecretKey\n    )\n\n    # If AWS key's are not provided as params, attempt to retrieve them from Environment Variables\n    if ($odAccessKey -or $odSecretKey) {\n        Set-AWSCredentials -AccessKey $odAccessKey -SecretKey $odSecretKey -StoreAs default\n    } elseif (([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -or ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\"))) {\n        Set-AWSCredentials -AccessKey ([Environment]::GetEnvironmentVariable(\"AWS_ACCESS_KEY\", \"Machine\")) -SecretKey ([Environment]::GetEnvironmentVariable(\"AWS_SECRET_KEY\", \"Machine\")) -StoreAs default\n    } else {\n        Throw \"AWS API credentials were not available/provided.\"\n    }\n\n    if ($odTags) {\n        $filterArray = @()\n        (ConvertFrom-StringData $odTags).GetEnumerator() | Foreach-Object {\n            $filterHash = @{ Name=\"tag:\"+$_.Key;value=$_.Value }\n            $filterArray += $filterHash\n        }\n\n        $instanceObj = (Get-EC2Instance -Filter $filterArray | select -ExpandProperty Instances)\n        $instanceCount = ($instanceObj | measure).Count\n        $instanceId = $null\n        $currentState = \"missing\"\n\n        if ($instanceCount -gt 1) {\n            Throw \"More than one instance exists with the same tags - I don't know what to do!?\"\n        }\n        elseif ($instanceCount -eq 1) {\n            $instanceId = ($instanceObj).InstanceId\n            $currentState = (Get-EC2Instance $instanceId).Instances.State.Name\n            \n            Write-Output (\"------------------------------\")\n            Write-Output (\"Checking the EC2 Instance status:\")\n            Write-Output (\"------------------------------\")\n\n            $timeout = (New-Timespan -Seconds 90)\n            $sw = [diagnostics.stopwatch]::StartNew()\n\n            while ($true) {\n                $currentState = (Get-EC2Instance $instanceId).Instances.State.Name\n\n                if ($currentState -eq \"running\") {\n                    break\n                }\n                elseif ($currentState -eq \"terminated\") {\n                    (removeTags $instanceId $odTags) | out-null\n                    $instanceId = $null\n                    break\n                }\n                elseif ($currentState -eq \"stopped\") {\n                    (Start-EC2Instance -InstanceIds $instanceId) | out-null\n                }\n\n                Write-Output (\"$(Get-Date) | Waiting for Instance '$instanceId' to transition from state: $currentState\")\n\n                if ($sw.elapsed -gt $timeout) {Throw \"Timed out waiting for desired state\"}\n\n                Sleep -Seconds 5\n            }\n            \n            Write-Output (\"$(Get-Date) | Instance state: $currentState\")\n        }\n        \n        # If the instance doesn't exist, create it!\n        if ($instanceId -eq $null) {\n            Write-Output (\"------------------------------\")\n            Write-Output (\"Creating a new EC2 instance:\")\n            Write-Output (\"------------------------------\")\n\n            $encodedUserData = $null\n            if ($odUserData -ne $null) { $encodedUserData = [System.Convert]::ToBase64String( [System.Text.Encoding]::UTF8.GetBytes($odUserData) ) }\n\n            if (!$odSpotPrice) {\n                Write-Output (\"$(Get-Date) | Attempting to create a new EC2 instance from ImageId: $odImageId\")\n\n                try {\n                    $ec2Instances = (New-EC2Instance -ImageId $odImageId -KeyName $odKeyName -SecurityGroupId $odSecurityGroupId -InstanceType $odInstanceType -UserData $encodedUserData -SubnetId $odSubnetId -Region $odRegion)\n\n                    $instanceId = $ec2Instances.Instances[0].InstanceId\n                }\n                catch [Amazon.EC2.AmazonEC2Exception] {\n                    Write-Output ($_.Exception.errorcode)\n                    Write-Output ($_.Exception.Message)\n                    Throw \"Couldn't launch EC2 instance, sorry...\"\n                }\n            }\n            elseif ($odSpotPrice) {\n                Write-Output (\"$(Get-Date) | Attempting to create a new EC2 spot-instance from ImageId: $odImageId\")\n\n                try {\n                    $spotInstancePricingObj = (Get-EC2SpotPriceHistory -InstanceType $odInstanceType -Region $odRegion -Filter @{ Name=\"product-description\";value=\"$odSpotProduct\" } -MaxResult 10)\n                \n                    Write-Output (\"------------------------------\")\n                    Write-Output (\"Listing the 10 most recent spot price changes for \" + $odRegion + \":\")\n                    Write-Output (\"------------------------------\")\n\n                    [decimal]$highPrice=0\n                    $spotInstancePricingObj | Foreach-Object {\n                        if ($highPrice -lt $_.Price) { $highPrice=$_.Price }\n                        Write-Output ($_.AvailabilityZone + \" | \" + $_.InstanceType + \" | \" + $_.Price + \" | \" + $_.ProductDescription + \" | \" + $_.Timestamp)\n                    }\n\n                    if ($odSpotPrice -lt ($highPrice*1.1)) { Write-Output (\"WARNING: Requested spot price (\" + $odSpotPrice + \") may be too low: Below 10% of recent high (\" + $highPrice + \")\") }\n                    if ($odSpotPrice -gt ($highPrice*5)) { Write-Output (\"WARNING: Requested spot price (\" + $odSpotPrice + \") may be too high: Over 5x recent high (\" + $highPrice + \")\") }\n                }\n                catch [Amazon.EC2.AmazonEC2Exception] {\n                    Write-Output ($_.Exception.errorcode)\n                    Write-Output ($_.Exception.Message)\n                    Throw \"Couldn't gather spot pricing details, sorry...\"\n                }\n\n                try {\n                    $if0 = (New-Object Amazon.EC2.Model.InstanceNetworkInterfaceSpecification)\n                    $if0.DeviceIndex = 0\n                    $if0.SubnetId = $odSubnetId\n                    $if0.Groups.Add($odSecurityGroupId)\n\n                    $spotInstanceRequestObj = (Request-EC2SpotInstance -SpotPrice $odSpotPrice -InstanceCount 1 -Type one-time -LaunchSpecification_ImageId $odImageId -LaunchSpecification_KeyName $odKeyName -LaunchSpecification_InstanceType $odInstanceType -LaunchSpecification_UserData $encodedUserData -Region $odRegion -LaunchSpecification_NetworkInterfaces $if0)\n                \n                    Write-Output (\"------------------------------\")\n                    Write-Output (\"Checking the spot request status:\")\n                    Write-Output (\"------------------------------\")\n\n                    $timeout = (New-Timespan -Seconds 300)\n                    $sw = [diagnostics.stopwatch]::StartNew()\n\n                    while ($true)\n                    {\n                        if ($sw.elapsed -gt $timeout) { Throw \"Timed out waiting for spot instance - please check manually!\" }\n\n                        $spotcurrentState = (Get-EC2SpotInstanceRequest -SpotInstanceRequestId ($spotInstanceRequestObj.SpotInstanceRequestId)).State\n                        Write-Output (\"$(Get-Date) | Current State: $spotcurrentState | Desired State: active\")\n                        if ($spotcurrentState -eq \"active\") { break }\n\n                        Sleep -Seconds 5\n                    }\n                \n                    Write-Output (\"------------------------------\")\n                    Write-Output (\"Spot Request details:\")\n                    Write-Output (Get-EC2SpotInstanceRequest -SpotInstanceRequestId ($spotInstanceRequestObj.SpotInstanceRequestId))\n                    Write-Output (\"------------------------------\")\n\n                    $instanceId = (Get-EC2SpotInstanceRequest -SpotInstanceRequestId ($spotInstanceRequestObj.SpotInstanceRequestId)).InstanceId\n                }\n                catch [Amazon.EC2.AmazonEC2Exception] {\n                    Write-Output ($_.Exception.errorcode)\n                    Write-Output ($_.Exception.Message)\n                    Throw \"Couldn't launch spot instance\"\n                }\n            }\n\n            if ($odTags) { NewTags $instanceId $odTags }\n        }\n\n        if ($instanceId) {\n            if ($currentState -ne \"running\") { \n                Write-Output (\"------------------------------\")\n                Write-Output (\"Checking the EC2 Instance status:\")\n                Write-Output (\"------------------------------\")\n\n                Write-Output (\"$(Get-Date) | Instance state: $currentState\")\n\n                $timeout = (New-Timespan -Seconds 90)\n                $sw = [diagnostics.stopwatch]::StartNew()\n\n                while ($true) {\n                    $currentState = (Get-EC2Instance $instanceId).Instances.State.Name\n\n                    if ($currentState -eq \"running\") { break }\n\n                    Write-Output (\"$(Get-Date) | Waiting for Instance '$instanceId' to transition from state: $currentState\")\n\n                    if ($sw.elapsed -gt $timeout) {Throw \"Timed out waiting for desired state\"}\n\n                    Sleep -Seconds 5\n                }\n\n                Write-Output (\"$(Get-Date) | Instance state: $currentState\")\n            }\n\n\n            Write-Output (\"------------------------------\")\n            Write-Output (\"Instance details:\")\n            Write-Output ((Get-EC2Instance $instanceId).Instances)\n            Write-Output (\"------------------------------\")\n    \n            $privateIpAddress = (Get-EC2Instance $instanceId).Instances.PrivateIpAddress\n            $publicIpAddress = (Get-EC2Instance $instanceId).Instances.PublicIpAddress\n            \n            if($OctopusParameters) {\n                Set-OctopusVariable -name \"InstanceId\" -value $instanceId\n                Set-OctopusVariable -name \"PrivateIpAddress\" -value $privateIpAddress\n                Set-OctopusVariable -name \"PublicIpAddress\" -value $publicIpAddress\n            }\n        }\n    }\n } `\n (Get-Param 'odTags' -Required) `\n (Get-Param 'odImageId' -Required) `\n (Get-Param 'odInstanceType' -Required) `\n (Get-Param 'odSubnetId' -Required) `\n (Get-Param 'odSecurityGroupId' -Required) `\n (Get-Param 'odKeyName' -Required) `\n (Get-Param 'odRegion' -Required) `\n (Get-Param 'odUserData') `\n (Get-Param 'odSpotPrice') `\n (Get-Param 'odSpotProduct') `\n (Get-Param 'odAccessKey') `\n (Get-Param 'odSecretKey')",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "45aa8520-eb05-48a9-b4ef-30d11b5e6a73",
-      "Name": "odTags",
-      "Label": "Tags",
-      "HelpText": "The Tags to be applied to the new instance. These tags will determine if a new instance will be created, or if an instance matching the tags should be in a running state.",
-      "DefaultValue": "Name=#{Octopus.Project.Name}\nEnvironment=#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2411ffb3-c3fc-402a-9448-249415000c14",
-      "Name": "odImageId",
-      "Label": "ImageId",
-      "HelpText": "The Amazon Machine Image (AMI) Id. This can be the id of an image you've created yourself, or one of the AWS Community AMIs.",
-      "DefaultValue": "ami-xxxxxxxx",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a2cc4774-b60c-4dad-9c44-074d0564b626",
-      "Name": "odInstanceType",
-      "Label": "InstanceType",
-      "HelpText": "The Instance Type (Model), e.g. t2.micro, m3.large, c4.large, etc.\nFurther reading: https://aws.amazon.com/ec2/instance-types/",
-      "DefaultValue": "t2.micro",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "dd2c238d-4758-4027-8901-b050e991bf83",
-      "Name": "odSubnetId",
-      "Label": "SubnetId",
-      "HelpText": "The Subnet Id you would like the Instance to launch in.",
-      "DefaultValue": "subnet-xxxxxxxx",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "349022a4-0ad3-46bd-b408-e456c5616577",
-      "Name": "odSecurityGroupId",
-      "Label": "SecurityGroupId",
-      "HelpText": "The Security Group Id you would like the Instance to launch with.",
-      "DefaultValue": "sg-xxxxxxxx",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "54508ead-07db-4f73-b8a9-8c3b8c91bdb1",
-      "Name": "odKeyName",
-      "Label": "KeyName",
-      "HelpText": "The name of the Key Pair that will be used to log into the new instance.",
-      "DefaultValue": "AutoDeployKeyNameExample",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "01097d0d-4ce5-4c38-afd4-527919a800f7",
-      "Name": "odRegion",
-      "Label": "Region",
-      "HelpText": "The AWS Region you would like the Instance to launch in, e.g. ap-southeast-2, us-west-2, eu-west-1, etc.\nFurther reading: https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region",
-      "DefaultValue": "ap-southeast-2",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b4dfba68-93fe-496a-acd4-00e01d818312",
-      "Name": "odUserData",
-      "Label": "UserData (Optional)",
-      "HelpText": "The UserData is a script that will be executed on the initial startup of your EC2 Instance.\nFurther Reading: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html",
-      "DefaultValue": "<powershell>tzutil.exe /s 'AUS Eastern Standard Time'</powershell>",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "5842e13b-af7a-4a18-bfa4-4891aded2ae9",
-      "Name": "odSpotPrice",
-      "Label": "SpotPrice (Optional)",
-      "HelpText": "The Spot Price is a variable hourly rate (often discounted), which is calculated based on the current demand for any particular Instance Type (Model).\nFurther Reading: https://aws.amazon.com/ec2/spot/pricing/",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "caa5f631-f0c5-4925-8a57-a80abb5e4300",
-      "Name": "odSpotProduct",
-      "Label": "SpotProduct (Optional)",
-      "HelpText": "The Spot Product is basically the Operating System you plan to utilise.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Linux/Unix|Linux/Unix\nSUSE Linux|SUSE Linux\nWindows|Windows"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "43206cff-be8c-4805-9045-2f6bf302e056",
-      "Name": "odAccessKey",
-      "Label": "AccessKey (Kind-of Optional)",
-      "HelpText": "An Access Key with permissions to create the desired EC2 instance.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_ACCESS\\_KEY\"\nFurther Reading:\nhttps://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b0d6b3e7-3c90-4f0e-b919-78ef04608cb3",
-      "Name": "odSecretKey",
-      "Label": "SecretKey (Kind-of Optional)",
-      "HelpText": "The Secret Key associated with the above Access Key.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"AWS\\_SECRET\\_KEY\"\nFurther Reading:\nhttps://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "tclydesdale",
-  "$Meta": {
-    "ExportedAt": "2018-01-29T12:56:55.311Z",
-    "OctopusVersion": "4.1.9",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
diff --git a/step-templates/aws-rds-restore-s3.json b/step-templates/aws-rds-restore-s3.json
deleted file mode 100644
index 6f8caf8f7..000000000
--- a/step-templates/aws-rds-restore-s3.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "Id": "55848421-44b9-403c-b1f0-ba8a84b1f177",
-  "Name": "AWS RDS SQL Server - Restore from S3 Bucket",
-  "Description": "Will restore a database backup from an S3 bucket",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"SqlLoginWhoHasRights $rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights\"\nWrite-Host \"CreateSqlServer $rdsSqlRestoreBackupSqlServer\"\nWrite-Host \"CreateDatabaseName $rdsSqlRestoreBackupDatabaseName\"\nWrite-Host \"Backup S3 Bucket $rdsSqlRestoreBackupS3Bucket\"\nWrite-Host \"Backup File Name $rdsSqlRestoreBackupFileName\"\n\nif ([string]::IsNullOrWhiteSpace($rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$rdsSqlRestoreBackupSqlServer;Database=msdb;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$rdsSqlRestoreBackupSqlServer;Database=msdb;User ID=$rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights;Password=$rdsSqlRestoreBackupSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = New-Object System.Data.SqlClient.SqlCommand(\"dbo.rds_restore_database\", $sqlConnection)\n$command.CommandType = [System.Data.CommandType]'StoredProcedure'\n\n$backupDestParamValue = \"arn:aws:s3:::$rdsSqlRestoreBackupS3Bucket/$rdsSqlRestoreBackupFileName\"\n$command.Parameters.AddWithValue(\"s3_arn_to_restore_from\", $backupDestParamValue)\n$command.Parameters.AddWithValue(\"with_norecovery\", 0)\n$command.Parameters.AddWithValue(\"restore_db_name\", $rdsSqlRestoreBackupDatabaseName)\n\n$taskStatusCommand = New-Object System.Data.SqlClient.SqlCommand(\"dbo.rds_task_status\", $sqlConnection)\n$taskStatusCommand.CommandType = [System.Data.CommandType]'StoredProcedure'\n$taskStatusCommand.Parameters.AddWithValue(\"db_name\", $rdsSqlRestoreBackupDatabaseName)\n\n$taskStatusAdapter = New-Object System.Data.SqlClient.SqlDataAdapter $taskStatusCommand\n\nWrite-Host \"Opening the connection to $rdsSqlRestoreBackupSqlServer\"\n$sqlConnection.Open()\n    \nWrite-Host \"Executing backup\"\n$command.ExecuteNonQuery()\n\nWrite-Host \"Closing the connection to $rdsSqlRestoreBackupSqlServer\"\n$sqlConnection.Close()\n\nWrite-Host \"Getting status of backup\"\n$backupIsActive = $true\n\nWhile ($backupIsActive)\n{\n\tWrite-Host \"Opening the connection to $rdsSqlRestoreBackupSqlServer\"\n\t$sqlConnection.Open()\n    \n    $taskStatusDataSet = New-Object System.Data.DataSet\n\t$taskStatusAdapter.Fill($taskStatusDataSet)\n    $taskStatus = $taskStatusDataSet.Tables[0].Rows[0][\"lifecycle\"]\n    $taskComplete = $taskStatusDataSet.Tables[0].Rows[0][\"% complete\"]\n    \n    Write-Host \"The task is $taskComplete% complete.\"\n    $backupIsActive = $taskStatus -eq \"CREATED\" -or $taskStatus -eq \"IN_PROGRESS\"\n    \n    Write-Host \"Closing the connection to $rdsSqlRestoreBackupSqlServer\"\n\t$sqlConnection.Close()\n    \n    Start-Sleep -Seconds 5\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "3e45bb88-3632-4115-a0d5-54680615f0ca",
-      "Name": "rdsSqlRestoreBackupSqlServer",
-      "Label": "SQL Server",
-      "HelpText": "The SQL Server to perform the work on",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "880a4e73-64fe-4a36-b4c3-a281b64e3c23",
-      "Name": "rdsSqlRestoreBackupSqlLoginUserWhoHasCreateUserRights",
-      "Label": "SQL Login",
-      "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6689fbe5-f47a-4800-945d-df50fc19c7b0",
-      "Name": "rdsSqlRestoreBackupSqlLoginPasswordWhoHasRights",
-      "Label": "SQL Password",
-      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "1a358cca-5cd1-41ae-b763-fcaf2c7350f9",
-      "Name": "rdsSqlRestoreBackupDatabaseName",
-      "Label": "Database Name",
-      "HelpText": "The name of the database to restore to",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c5e2fa69-1b42-4427-91d2-10e1a13af744",
-      "Name": "rdsSqlRestoreBackupS3Bucket",
-      "Label": "S3 Bucket Name",
-      "HelpText": "The name of the bucket (including any sub directories).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ea9d9eb8-9c0f-4c69-a6d4-4d00e43383af",
-      "Name": "rdsSqlRestoreBackupFileName",
-      "Label": "Backup File Name and Extension",
-      "HelpText": "The name of the back up file (including the extension).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-18T13:27:31.393Z",
-    "OctopusVersion": "2020.4.0-ci0428",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "octobob",
-  "Category": "aws"
-}
diff --git a/step-templates/aws-rds-sql-backup-s3.json b/step-templates/aws-rds-sql-backup-s3.json
deleted file mode 100644
index ccaf327a1..000000000
--- a/step-templates/aws-rds-sql-backup-s3.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "Id": "3dd60fea-b98a-4760-8867-cbd049f7aa31",
-  "Name": "AWS RDS SQL Server - Backup to S3 Bucket",
-  "Description": "Will create a database user using an existing server user if that database user does not exist without using SMO.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"SqlLoginWhoHasRights $rdsSqlBackupSqlLoginUserWhoHasCreateUserRights\"\nWrite-Host \"CreateSqlServer $rdsSqlBackupSqlServer\"\nWrite-Host \"CreateDatabaseName $rdsSqlBackupDatabaseName\"\nWrite-Host \"Backup S3 Bucket $rdsSqlBackupS3Bucket\"\nWrite-Host \"Backup File Name $rdsSqlBackupFileName\"\n\nif ([string]::IsNullOrWhiteSpace($rdsSqlBackupSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$rdsSqlBackupSqlServer;Database=msdb;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$rdsSqlBackupSqlServer;Database=msdb;User ID=$rdsSqlBackupSqlLoginUserWhoHasCreateUserRights;Password=$rdsSqlBackupSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = New-Object System.Data.SqlClient.SqlCommand(\"dbo.rds_backup_database\", $sqlConnection)\n$command.CommandType = [System.Data.CommandType]'StoredProcedure'\n\n$backupDestParamValue = \"arn:aws:s3:::$rdsSqlBackupS3Bucket/$rdsSqlBackupFileName\"\n$command.Parameters.AddWithValue(\"s3_arn_to_backup_to\", $backupDestParamValue)\n$command.Parameters.AddWithValue(\"overwrite_S3_backup_file\", 1)\n$command.Parameters.AddWithValue(\"source_db_name\", $rdsSqlBackupDatabaseName)\n\n$taskStatusCommand = New-Object System.Data.SqlClient.SqlCommand(\"dbo.rds_task_status\", $sqlConnection)\n$taskStatusCommand.CommandType = [System.Data.CommandType]'StoredProcedure'\n$taskStatusCommand.Parameters.AddWithValue(\"db_name\", $rdsSqlBackupDatabaseName)\n\n$taskStatusAdapter = New-Object System.Data.SqlClient.SqlDataAdapter $taskStatusCommand\n\nWrite-Host \"Opening the connection to $rdsSqlBackupSqlServer\"\n$sqlConnection.Open()\n    \nWrite-Host \"Executing backup\"\n$command.ExecuteNonQuery()\n\nWrite-Host \"Closing the connection to $rdsSqlBackupSqlServer\"\n$sqlConnection.Close()\n\nWrite-Host \"Getting status of backup\"\n$backupIsActive = $true\n\nWhile ($backupIsActive)\n{\n\tWrite-Host \"Opening the connection to $rdsSqlBackupSqlServer\"\n\t$sqlConnection.Open()\n    \n    $taskStatusDataSet = New-Object System.Data.DataSet\n\t$taskStatusAdapter.Fill($taskStatusDataSet)\n    $taskStatus = $taskStatusDataSet.Tables[0].Rows[0][\"lifecycle\"]\n    $taskComplete = $taskStatusDataSet.Tables[0].Rows[0][\"% complete\"]\n    \n    Write-Host \"The task is $taskComplete% complete.\"\n    $backupIsActive = $taskStatus -eq \"CREATED\" -or $taskStatus -eq \"IN_PROGRESS\"\n    \n    Write-Host \"Closing the connection to $rdsSqlBackupSqlServer\"\n\t$sqlConnection.Close()\n    \n    Start-Sleep -Seconds 5\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "3e45bb88-3632-4115-a0d5-54680615f0ca",
-      "Name": "rdsSqlBackupSqlServer",
-      "Label": "SQL Server",
-      "HelpText": "The SQL Server to perform the work on",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "880a4e73-64fe-4a36-b4c3-a281b64e3c23",
-      "Name": "rdsSqlBackupSqlLoginUserWhoHasCreateUserRights",
-      "Label": "SQL Login",
-      "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6689fbe5-f47a-4800-945d-df50fc19c7b0",
-      "Name": "rdsSqlBackupSqlLoginPasswordWhoHasRights",
-      "Label": "SQL Password",
-      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "1a358cca-5cd1-41ae-b763-fcaf2c7350f9",
-      "Name": "rdsSqlBackupDatabaseName",
-      "Label": "Database Name",
-      "HelpText": "The name of the database to create the user on",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c5e2fa69-1b42-4427-91d2-10e1a13af744",
-      "Name": "rdsSqlBackupS3Bucket",
-      "Label": "S3 Bucket Name",
-      "HelpText": "The name of the bucket (including any sub directories).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ea9d9eb8-9c0f-4c69-a6d4-4d00e43383af",
-      "Name": "rdsSqlBackupFileName",
-      "Label": "Backup File Name and Extension",
-      "HelpText": "The name of the back up file (including the extension).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-18T14:30:56.431Z",
-    "OctopusVersion": "2020.4.0-ci0428",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "octobob",
-  "Category": "aws"
-}
diff --git a/step-templates/aws-register-elb-instance.json b/step-templates/aws-register-elb-instance.json
deleted file mode 100644
index dd3f03c47..000000000
--- a/step-templates/aws-register-elb-instance.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "cc1ae822-3dcf-4041-a790-69a1267552c2",
-  "Name": "AWS - Register ELB Instance",
-  "Description": "Registers an instance with an ELB",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Part 2 of 2\r\n# Part 1 Deregisters an EC2 instance from an ELB\r\n# Part 2 Registers an EC2 instance with an ELB and waits for it to be InService\r\n\r\n$ec2Region = $OctopusParameters['ec2Region']\r\n$ec2User = $OctopusParameters['ec2ClientId']\r\n$ec2Credentials = $OctopusParameters['ec2Credentials']\r\n$elbName = $OctopusParameters['elbName']\r\n$instanceId = \"\"\r\n$registrationCheckInterval = $OctopusParameters['registrationCheckInterval']\r\n$maxRegistrationCheckCount = $OctopusParameters['maxRegistrationCheckCount']\r\n\r\n# Load EC2 credentials (not sure if this is needed when executed from an EC2 box)\r\ntry\r\n{\r\n\tWrite-Host \"Loading AWS Credentials...\"\r\n\tImport-Module AWSPowerShell\r\n\tSet-AWSCredentials -AccessKey $ec2User -SecretKey $ec2Credentials\r\n\tSet-DefaultAWSRegion $ec2Region\r\n\tWrite-Host \"AWS Credentials Loaded.\"\r\n}\r\ncatch\r\n{\r\n\tWrite-Error -Message \"Failed to load AWS Credentials.\" -Exception $_.Exception\r\n\tExit 1\r\n}\r\n\r\n# Get EC2 Instance\r\ntry\r\n{\r\n\t$response = Invoke-RestMethod -Uri \"http://169.254.169.254/latest/meta-data/instance-id\" -Method Get\r\n\tif ($response)\r\n\t{\r\n\t\t$instanceId = $response\r\n\t}\r\n\telse\r\n\t{\r\n\t\tWrite-Error -Message \"Returned Instance ID does not appear to be valid\"\r\n\t\tExit 1\r\n\t}\r\n}\r\ncatch\r\n{\r\n\tWrite-Error -Message \"Failed to load instance ID from AWS.\" -Exception $_.Exception\r\n\tExit 1\r\n}\r\n\r\n# Register the current EC2 instance\r\nWrite-Host \"Registering instance $instanceId with $elbName.\"\r\ntry\r\n{\r\n\tRegister-ELBInstanceWithLoadBalancer -LoadBalancerName $elbName -Instance $instanceId\r\n\tWrite-Host \"Instance Registered, waiting for registration to complete.\"\r\n\t\r\n\t$instanceState = (Get-ELBInstanceHealth -LoadBalancerName $elbName -Instance $instanceId).State\r\n\tWrite-Host \"Current State: $instanceState\"\r\n\t\r\n\t$checkCount = 0\r\n\t\r\n\tWrite-Host \"Retry Parameters:\"\r\n\tWrite-Host \"Maximum Checks: $maxRegistrationCheckCount\"\r\n\tWrite-Host \"Check Interval: $registrationCheckInterval\"\r\n\t\r\n\tWhile ($instanceState -ne \"InService\" -and $checkCount -le $maxRegistrationCheckCount)\r\n\t{\t\r\n\t\t$checkCount += 1\r\n\t\t\r\n\t\t# Wait a bit until we check the status\r\n\t\tWrite-Host \"Waiting for $registrationCheckInterval seconds for instance to register\"\r\n\t\tStart-Sleep -Seconds $registrationCheckInterval\r\n\t\t\r\n\t\tif ($checkCount -le $maxRegistrationCheckCount)\r\n\t\t{\r\n\t\t\tWrite-Host \"$checkCount/$maxRegistrationCheckCount Attempts\"\r\n\t\t}\r\n\t\t\r\n\t\t$instanceState = (Get-ELBInstanceHealth -LoadBalancerName $elbName -Instance $instanceId).State\r\n\t\t\r\n\t\tWrite-Host \"Current instance state: $instanceState\"\r\n\t}\r\n\t\r\n\tif ($instanceState -eq \"InService\")\r\n\t{\r\n\t\tWrite-Host \"Registration complete.\"\r\n\t}\r\n\telse\r\n\t{\r\n\t\tWrite-Error -Message \"Failed to register instance: $instanceState\"\r\n\t\tExit 1\r\n\t}\r\n}\r\ncatch\r\n{\r\n\tWrite-Error -Message \"Failed to Register instance.\" -Exception $_.Exception\r\n\tExit 1\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ec2ClientId",
-      "Label": "AWS EC2 Client Id",
-      "HelpText": "The client id to use when authenticating with AWS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "ec2Credentials",
-      "Label": "AWS EC2 Client Secret",
-      "HelpText": "The client secret used to authenticate with AWS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "elbName",
-      "Label": "AWS ELB Name",
-      "HelpText": "The name of the AWS ELB to add the instance to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "registrationCheckInterval",
-      "Label": "Registration Check Interval",
-      "HelpText": "The number of seconds to wait before checking to see if the Instance has properly registered with the ELB",
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "maxRegistrationCheckCount",
-      "Label": "Maximum Registration Checks",
-      "HelpText": "The maximum number of registration checks to perform before the step fails.",
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ec2Region",
-      "Label": "AWS EC2 Region",
-      "HelpText": "The region in which the ELB lives",
-      "DefaultValue": "us-east-1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-04-30T13:23:14.350+00:00",
-  "LastModifiedBy": "DudeSolutions",
-  "$Meta": {
-    "ExportedAt": "2015-04-30T13:25:21.128+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "aws"
-}
\ No newline at end of file
diff --git a/step-templates/aws-secrets-manager-retrieve-secrets.json b/step-templates/aws-secrets-manager-retrieve-secrets.json
deleted file mode 100644
index 4e4f7dc3b..000000000
--- a/step-templates/aws-secrets-manager-retrieve-secrets.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "Id": "5d5bd3ae-09a0-41ac-9a45-42a96ee6206a",
-    "Name": "AWS Secrets Manager - Retrieve Secrets",
-    "Description": "This step retrieves one or more secrets from AWS [Secrets Manager](https://aws.amazon.com/secrets-manager) and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. The step supports creating a variable for each key-value in a secret that's retrieved, or you can specify individual keys. These values can be used in other steps in your deployment or runbook process.\n\n---\n\n**Specifying Secret names/keys to retrieve:**\n\nSpecify the names of the secrets to be returned from AWS Secrets Manager, in the format:\n\n`SecretName SecretVersionId SecretVersionStage | KeyNames | OutputVariableName` where:\n\n- `SecretName` is the name of the secret to retrieve. You can specify either the `Amazon Resource Name (ARN)` or the friendly name of the secret.\n- `SecretVersionId` is the unique identifier of the version of the secret that you want to retrieve. If this value isn't specified, the version with the `VersionStage` value as specified in `SecretVersionStage` will be retrieved.\n- `SecretVersionStage` specifies the secret version that you want to retrieve by the staging label attached to the version. *Staging labels are used to keep track of different versions during the rotation process*. If this value isn't specified, the version with the `VersionStage` value of `AWSCURRENT` will be retrieved.\n- `KeyNames` are the names of the keys stored in the secret that you wish to retrieve values for. Multiple fields can be retrieved separated by a space. Alternatively, you can specify all fields using the special keyword `all` or `*`.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. If multiple fields are specified the field name will be appended to this value. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Examples:**\n\nGiven a secret named `OctoSamples-usercredentials`:\n\n1. `OctoSamples-usercredentials | Username | octousername`\n   \n   This would retrieve the secret and extract the value from the key-value named `Username` and save it into a sensitive output variable named `octousername`.\n\n2. `OctoSamples-usercredentials | Username Password | octocreds`\n   \n   This would retrieve the secret named `OctoSamples-usercredentials`, and then extract the values from the key-values named `Username` and `Password` and save them to two sensitive output variables named `octocreds.Username` and `octocreds.Password`.\n\n3. `OctoSamples-usercredentials | * | octocreds`\n   \n   This would retrieve the secret named `OctoSamples-usercredentials`, and then extract all key-values from the secret and save them to sensitive output variables *prefixed* with `octocreds`.\n\n4. `OctoSamples-usercredentials | all`\n   \n   This would retrieve the secret named `OctoSamples-usercredentials`, and then extract all key-values from the secret and save them to sensitive output variables *prefixed* with `OctoSamples-usercredentials`.\n\n---\n\n**AWS Dependencies:**\n\nThere are some dependencies/requirements for this step to work successfully.\n\n1. **CLI** - This step uses AWS tooling pre-installed on the target or worker. \n\n    Scripts executed in this step need to use the [AWS CLI](https://aws.amazon.com/cli/) to authenticate to AWS and perform other actions. If the CLI can't be found, the step will fail.\n\n2. **AWS Account** - An [AWS account](https://octopus.com/docs/infrastructure/accounts/aws) with permissions to retrieve secrets from AWS Secrets Manager is also required.\n\n---\n\n**Notes:** \n- Tested on Octopus **2021.2**.\n- Tested on both Windows Server 2019 and Ubuntu 20.04.\n\n",
-    "ActionType": "Octopus.AwsRunScript",
-    "Version": 4,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Aws.AssumeRole": "False",
-      "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-      "OctopusUseBundledTooling": "False",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$SecretNames = $OctopusParameters[\"AWS.SecretsManager.RetrieveSecrets.SecretNames\"]\n$PrintVariableNames = $OctopusParameters[\"AWS.SecretsManager.RetrieveSecrets.PrintVariableNames\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($SecretNames)) {\n    throw \"Required parameter AWS.SecretsManager.RetrieveSecrets.SecretNames not specified\"\n}\n\n# Functions\nfunction Format-SecretName {\n    [CmdletBinding()]\n    Param(\n        [string] $Name,\n        [string] $VersionId,\n        [string] $VersionStage,\n        [string[]] $Keys\n    )\n    $displayName = \"'$Name'\"\n    if (![string]::IsNullOrWhiteSpace($VersionId)) {\n        $displayName += \" $VersionId\"\n    }\n    if (![string]::IsNullOrWhiteSpace($VersionStage)) {\n        $displayName += \" $VersionStage\"\n    }\n    if ($Keys.Count -gt 0) {\n        $displayName += \" ($($Keys -Join \",\"))\"\n    }\n    return $displayName\n}\n\nfunction Save-OctopusVariable {\n    Param(\n        [string] $name,\n        [string] $value\n    )\n    if ($script:storedVariables -icontains $name) {\n        Write-Warning \"A variable with name '$name' has already been created. Check your secret name parameters as this will likely cause unexpected behavior and should be investigated.\"\n    }\n    Set-OctopusVariable -Name $name -Value $value -Sensitive\n    $script:storedVariables += $name\n\n    if ($PrintVariableNames -eq $True) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$name}\"\n    }\n}\n\n# End Functions\n\n$script:storedVariables = @()\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$Secrets = @()\n\n# Extract secret names\n@(($SecretNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working establishing secret definition for: '$_'\"\n        $secretDefinition = ($_ -Split \"\\|\")\n        \n        # Establish the secret name/version requirements\n        $secretName = $secretDefinition[0].Trim()\n        $secretVersionId = \"\"\n        $secretVersionStage = \"\"\n        $secretNameAndVersion = ($secretName -Split \" \")\n        \n        if ($secretNameAndVersion.Count -gt 1) {\n            $secretName = $secretNameAndVersion[0].Trim()\n            $secretVersionId = $secretNameAndVersion[1].Trim()\n            if ($secretNameAndVersion.Count -eq 3) {\n                $secretVersionStage = $secretNameAndVersion[2].Trim()\n            }\n        }\n    \n        if ([string]::IsNullOrWhiteSpace($secretName)) {\n            throw \"Unable to establish secret name from: '$($_)'\"\n        }\n\n        # Establish the secret field(s)/output variable name requirements.\n        $VariableName = \"\"\n        $Keys = @()\n        if ($secretDefinition.Count -gt 1) {\n            $KeyNames = $secretDefinition[1].Trim()        \n            $Keys = @(($KeyNames -Split \" \"))\n            $EmptyKeys = $Keys | Where-Object { [string]::IsNullOrWhiteSpace($_) }\n            if ($Keys.Count -le 0 -or $EmptyKeys.Count -gt 0) {\n                throw \"No keys (field names) were specified for '$_'. To retrieve all keys in a secret, add the word ALL or the wildcard (*) character.\"    \n            }\n            \n            if ($secretDefinition.Count -gt 2) {\n                $VariableName = $secretDefinition[2].Trim()\n            }\n        }\n        else {\n            throw \"No keys (field names) were specified for '$_'. To retrieve all keys in a secret, add the word ALL or the wildcard (*) character.\"\n        }\n\n        $secret = [PsCustomObject]@{\n            Name                 = $secretName\n            SecretVersionId      = $secretVersionId\n            SecretVersionStage   = $secretVersionStage\n            Keys                 = $Keys\n            variableNameOrPrefix = $VariableName\n        }\n        $Secrets += $secret\n    }\n}\n\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\n\n$retrievedSecrets = @{}\n\n# Retrieve Secrets\nforeach ($secret in $secrets) {\n    $name = $secret.Name\n    $versionId = $secret.SecretVersionId\n    $versionStage = $secret.SecretVersionStage\n    $variableNameOrPrefix = $secret.variableNameOrPrefix\n    $keys = $secret.Keys\n    \n    # Should we extract only specified keys, or all values?\n    $SpecifiedKeys = $True\n    if ($keys.Count -eq 1 -and ($keys[0] -ieq \"all\" -or $keys[0] -ieq \"*\")) {\n        $SpecifiedKeys = $False\n    }\n    \n    $displayName = Format-SecretName -Name $name -VersionId $versionId -VersionStage $versionStage -Keys $keys\n    Write-Verbose \"Retrieving Secret $displayName\"\n    $_secretIdentifier = \"$name\"\n\n    $params = @(\"--secret-id $name\")\n    if (![string]::IsNullOrWhiteSpace($versionId)) {\n        $params += \"--version-id $versionId\"\n        $_secretIdentifier += \"_$versionId\"\n    }\n    if (![string]::IsNullOrWhiteSpace($versionStage)) {\n        $params += \"--version-stage $versionStage\"\n        $_secretIdentifier += \"_$versionStage\"\n    }\n    \n    # Check to see if we've already retrieved this secret value to save on requests\n    if (-not $retrievedSecrets.ContainsKey($_secretIdentifier)) {\n        $command = \"aws secretsmanager get-secret-value $($params -Join \" \")\"\n        Write-Verbose \"Invoking command: $command\"\n        $response = Invoke-Expression -Command $command\n        if ([string]::IsNullOrWhiteSpace($response)) {\n            throw \"Error: Secret $displayName not found or has no versions.\"\n        }\n        Write-Verbose \"Added secret to retrieved collection ($_secretIdentifier)\"\n        $retrievedSecrets.Add($_secretIdentifier, $response)\n    }\n    else {\n        Write-Verbose \"Rehydrating previously stored secret ($_secretIdentifier) instead of calling AWS.\"\n        $response = $retrievedSecrets.$_secretIdentifier\n    }    \n    \n    try {\n        $AwsSecret = $response | ConvertFrom-Json\n        $AwsSecretValue = $AwsSecret.SecretString | ConvertFrom-Json\n        $secretKeyValues = $AwsSecretValue | Get-Member | Where-Object { $_.MemberType -eq \"NoteProperty\" } | Select-Object -ExpandProperty \"Name\"\n    }\n    catch {\n        Write-Error \"Error converting JSON value returned from AWS for $displayName.`n`nIf secret value is stored as JSON in Plaintext (vs Key/value), check contents validity\"\n    }\n    if ($SpecifiedKeys -eq $True) {\n        foreach ($keyName in $keys) {\n            $variableName = $variableNameOrPrefix\n            if ([string]::IsNullOrWhiteSpace($variableName)) {\n                $variableName = \"$($name.Trim())\"\n            }\n            if ($keys.Count -gt 1) {\n                $variableName += \".$keyName\"\n            }\n            if ($secretKeyValues -inotcontains $keyName) {\n                throw \"Key '$keyName' not found in AWS Secret: $name.\"\n            }\n            $variableValue = $AwsSecretValue.$keyName\n            Save-OctopusVariable -Name $variableName -Value $variableValue            \n        }\n    }\n    else {\n        foreach ($secretKeyValueName in $secretKeyValues) {\n            $variableName = $variableNameOrPrefix\n            if ([string]::IsNullOrWhiteSpace($variableName)) {\n                $variableName = \"$($name.Trim())\"\n            }\n            if ($secretKeyValues.Count -gt 1) {\n                $variableName += \".$secretKeyValueName\"\n            }\n            $variableValue = $AwsSecretValue.$secretKeyValueName\n            Save-OctopusVariable -Name $variableName -Value $variableValue\n        }\n    }\n}\n\nWrite-Host \"Created $($script:storedVariables.Count) output variables\"",
-      "Octopus.Action.AwsAccount.Variable": "#{AWS.SecretsManager.RetrieveSecrets.Account}",
-      "Octopus.Action.Aws.Region": "#{AWS.SecretsManager.RetrieveSecrets.Region}"
-    },
-    "Parameters": [
-      {
-        "Id": "8623cdbe-f962-4801-9470-5d14d1d7d5ed",
-        "Name": "AWS.SecretsManager.RetrieveSecrets.Account",
-        "Label": "AWS Account",
-        "HelpText": "An AWS account with permissions to access secrets from Secrets Manager.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AmazonWebServicesAccount"
-        }
-      },
-      {
-        "Id": "55a1d3e8-90c8-4c1a-a315-246fd8660e81",
-        "Name": "AWS.SecretsManager.RetrieveSecrets.Region",
-        "Label": "AWS Region",
-        "HelpText": "Specify the default region. View the [AWS Regions and Endpoints](https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region) documentation for a current list of the available region codes.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e204a03d-80a6-437a-9a8b-8812c299741c",
-        "Name": "AWS.SecretsManager.RetrieveSecrets.SecretNames",
-        "Label": "Secret names to retrieve",
-        "HelpText": "Specify the names of the secrets to be returned from AWS Secrets Manager, in the format:\n\n`SecretName SecretVersionId SecretVersionStage | KeyNames | OutputVariableName` where:\n\n- `SecretName` is the name of the secret to retrieve. You can specify either the `Amazon Resource Name (ARN)` or the friendly name of the secret.\n- `SecretVersionId` is the unique identifier of the version of the secret that you want to retrieve. If this value isn't specified, the version with the `VersionStage` value as specified in `SecretVersionStage` will be retrieved.\n- `SecretVersionStage` specifies the secret version that you want to retrieve by the staging label attached to the version. *Staging labels are used to keep track of different versions during the rotation process*. If this value isn't specified, the version with the `VersionStage` value of `AWSCURRENT` will be retrieved.\n- `KeyNames` are the names of the keys stored in the secret that you wish to retrieve values for. Multiple fields can be retrieved separated by a space. Alternatively, you can specify all fields using the special keyword `all` or `*`. *See the step description for examples*.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. If multiple fields are specified the field name will be appended to this value. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "17ba53a4-bf94-498c-8905-0d37b86eaeea",
-        "Name": "AWS.SecretsManager.RetrieveSecrets.PrintVariableNames",
-        "Label": "Print output variable names",
-        "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.AwsRunScript",
-    "$Meta": {
-      "ExportedAt": "2023-04-22T17:43:19.580Z",
-      "OctopusVersion": "2023.2.6614",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "aws"
-  }
diff --git a/step-templates/aws-windows-install-tentacle.json b/step-templates/aws-windows-install-tentacle.json
deleted file mode 100644
index 445125c92..000000000
--- a/step-templates/aws-windows-install-tentacle.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-    "Id": "234ed1c6-a5fa-47ee-8669-a187d8787057",
-    "Name": "AWS Win - Install Octopus Tentacle",
-    "Description": "This step template will install the latest tentacle on an AWS hosted, Windows virtual machine. This will also open the firewall for inbound traffic on port 10933 on the Security Group.\n<hr />\n*Note: Expects the AWS CLI and Powershell to be installed on the worker running this task*",
-    "ActionType": "Octopus.AwsRunScript",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Azure.AccountId": "#{awsInstallWinTentacle.AWSAccount}",
-      "Octopus.Action.Script.ScriptBody": "$sgName = $OctopusParameters[\"awsInstallWinTentacle.awsSGName\"]\n$instanceId = $OctopusParameters[\"awsInstallWinTentacle.awsVmInstanceId\"]\n$serverUri = $OctopusParameters[\"awsInstallWinTentacle.octoServerUrl\"]\n$apiKey = $OctopusParameters[\"awsInstallWinTentacle.octoApiKey\"]\n$rolesRaw = $OctopusParameters[\"awsInstallWinTentacle.octopusRoles\"]\n$enviroRaw = $OctopusParameters[\"awsInstallWinTentacle.octopusEnvironments\"]\n$octoThumb = $OctopusParameters[\"awsInstallWinTentacle.octoServerThumb\"]\n$comStyle = $OctopusParameters[\"awsInstallWinTentacle.tentacleType\"]\n$hostname = $OctopusParameters[\"awsInstallWinTentacle.tentacleHostName\"]\n$tentacleName = $OctopusParameters[\"awsInstallWinTentacle.tentacleName\"]\n$portNumber = $OctopusParameters[\"awsInstallWinTentacle.portNumber\"]\n\nWrite-Host \"Parsing Parameters\"\n\nif([string]::IsNullOrEmpty($sgName))\n{\n\tthrow \"Security Group name must be provided\"\n}\n\nif([string]::IsNullOrEmpty($instanceId))\n{\n\tthrow \"Instance Id must be provided\"\n}\n\nif([string]::IsNullOrEmpty($apiKey))\n{\n\tthrow \"apiKey must be provided\"\n}\n\nif([string]::IsNullOrEmpty($rolesRaw))\n{\n\tthrow \"At least one role must be defined\"\n}\n\nif([string]::IsNullOrEmpty($enviroRaw))\n{\n\tthrow \"At least one environment must be defined\"\n}\n\nif([string]::IsNullOrEmpty($octoThumb))\n{\n\tthrow \"octo thumbprint must be provided\"\n}\n\n$roles = \"\"\n$rolesRaw -split \"`n\" | ForEach-Object { $roles += \"--role $_ \"}\n$roles = $roles.TrimEnd(' ')\n\n$environments = \"\"\n$enviroRaw -split \"`n\" | ForEach-Object { $environments += \"--env $_ \"}\n$environments = $environments.TrimEnd(' ')\n\nif($comStyle -eq \"TentaclePassive\")\n{\n\tif([string]::IsNullOrEmpty($hostname))\n    {\n    \t$hostname = aws ec2 describe-instances --filters \"Name=instance-id,Values=$instanceId\" --query \"Reservations[].Instances[].NetworkInterfaces[].Association.PublicIp\" --output=text\n        $hostname = $hostname.Trim(\"`n\")\n    }\n\n    $noListen = \"--port $portNumber --noListen 'false'\"\n    $comStyle += \" --publicHostName='$hostname'\"\n    $openFirewall = 'true'\n}\nelse\n{\n\t$noListen = \"--noListen 'true'\"\n    $openFirewall = 'false'\n}\n\nif([string]::IsNullOrEmpty($tentacleName))\n{\n\t$tentacleName = $hostname\n}\n\nif($openFirewall -eq 'true')\n{\n\tWrite-Host \"Checking SG...\" -NoNewline\n    $sgCheck = aws ec2 describe-security-groups --group-names $sgName --output json --filters Name=ip-permission.from-port,Values=$portNumber Name=ip-permission.cidr,Values='0.0.0.0/0' | convertfrom-json\n\n    if($sgCheck.SecurityGroups.count -eq 0)\n    {\n\t\tWrite-Host \"Creating SG Rule\"\n    \taws ec2 authorize-security-group-ingress --group-name $sgName --ip-permissions IpProtocol=tcp,ToPort=$portNumber,FromPort=$portNumber,IpRanges='[{CidrIp=0.0.0.0/0,Description=\"OctopusListeningTentacle\"}]'\n\t}\n    else\n    {\n    \tWrite-Host \"Found Existing SG Rule\"\n    }\n}\n$remoteGuid = (new-guid).guid\nWrite-Verbose \"hostname: $hostname`nnoListen: $noListen\"\n\n$remoteScript = @\"\n{ \"commands\": [\n\"if('$env:PROCESSOR_ARCHITECTURE' -eq \\\"x86\\\") {Invoke-WebRequest -Uri 'http://octopus.com/downloads/latest/OctopusTentacle' -OutFile `$env:TEMP/$remoteGuid.msi -UseBasicParsing} else { Invoke-WebRequest -Uri 'http://octopus.com/downloads/latest/OctopusTentacle64' -OutFile `$env:TEMP/$remoteGuid.msi -UseBasicParsing}\",\n\"Start-Process `$env:TEMP/$remoteGuid.msi /quiet -Wait\",\n\"Remove-Item \\\"`$env:TEMP/$remoteGuid.msi\\\"\",\n\"cd 'C:/Program Files/Octopus Deploy/Tentacle'\",\n\".\\\\Tentacle.exe create-instance --instance 'Tentacle' --config 'C:/Octopus/Tentacle.config' --console\",\n\".\\\\Tentacle.exe new-certificate --instance 'Tentacle' --if-blank --console\",\n\".\\\\Tentacle.exe configure --instance 'Tentacle' --reset-trust --console\",\n\".\\\\Tentacle.exe configure --instance 'Tentacle' --home 'C:/Octopus/' --app 'C:/Octopus/Applications' $noListen --console\",\n\".\\\\Tentacle.exe configure --instance 'Tentacle' --trust '$octoThumb' --console\",\n\"if('$openFirewall' -eq 'true'){New-NetFirewallRule -DisplayName 'Octopus Tentacle' -Direction Inbound -LocalPort $portNumber -Protocol TCP -Action Allow}\",\n\".\\\\Tentacle.exe register-with --instance 'Tentacle' --server '$serverUri' --apiKey=$apiKey $roles $environments --comms-style $comStyle --force --console\",\n\".\\\\Tentacle.exe service --instance 'Tentacle' --install --start --console\"\n]}\n\"@\n\nWrite-Host \"Installing tentacle on remote machine\"\n$guid = (new-guid).guid\nSet-Content -Value $remoteScript.Replace('`r','') -Path \"$env:Temp/$guid.json\"\n\nwrite-verbose $remoteScript\n\nwrite-verbose \"aws ssm send-command --document-name AWS-RunPowerShellScript --instance-ids $instanceId --parameters file://$env:Temp/$guid.json\"\ntry {\n\t$cmdResponse = aws ssm send-command --document-name \"AWS-RunPowerShellScript\" --instance-ids \"$instanceId\" --parameters \"file://$env:Temp/$guid.json\" --query \"Command\" --output json | convertfrom-json\n    $cmdId = $cmdResponse.CommandId\n    $errorResponse = aws ssm get-command-invocation --command-id \"$cmdId\" --instance-id \"$instanceId\" --output json | convertfrom-json\n\n    while($errorResponse.Status -eq 'InProgress')\n    {\n    \twrite-verbose \"`nStatus: $($errorResponse.Status)\"\n    \t$errorResponse = aws ssm get-command-invocation --command-id \"$cmdId\" --instance-id \"$instanceId\" --output json | convertfrom-json\n    }\n\n    write-verbose \"`nErrorResponse: $errorResponse`n\"\n\n    if(![string]::IsNullOrEmpty($errorResponse.StandardErrorContent))\n    {\n    \tthrow $errorResponse.StandardErrorContent\n    }\n}\nfinally {\n\tremove-item \"$env:Temp\\$guid.json\"\n}\n",
-      "Octopus.Action.Aws.AssumeRole": "False",
-      "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-      "Octopus.Action.AwsAccount.Variable": "#{awsInstallWinTentacle.AWSAccount}",
-      "Octopus.Action.Aws.Region": "#{awsInstallWinTentacle.awsRegion}"
-    },
-    "Parameters": [
-      {
-        "Id": "dea51842-271f-48fa-901e-243488049f97",
-        "Name": "awsInstallWinTentacle.AWSAccount",
-        "Label": "AWS Account",
-        "HelpText": "AWS account with permissions to the virtual machine in which to install the tentacle on",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AmazonWebServicesAccount"
-        }
-      },
-      {
-        "Id": "6a97548c-3b97-4a19-8b9a-45aa58ac62d9",
-        "Name": "awsInstallWinTentacle.awsRegion",
-        "Label": "AWS Region",
-        "HelpText": "The name of the aws region. I.E. `us-east-1`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d9efb017-65c0-4010-b09f-0a6a34fc009f",
-        "Name": "awsInstallWinTentacle.awsSGName",
-        "Label": "Security Group Name",
-        "HelpText": "The name of the AWS security group to create an exception in",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e4358aec-2798-412a-bcd2-1c7e41a0728d",
-        "Name": "awsInstallWinTentacle.awsVmInstanceId",
-        "Label": "VM Instance ID",
-        "HelpText": "The instance ID of the virtual machine to target when ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8dbe0a29-4e0f-43f8-8ef2-ae23a2884e85",
-        "Name": "awsInstallWinTentacle.octoServerThumb",
-        "Label": "Server Thumbprint",
-        "HelpText": "The Thumbprint of the octopus server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "a0859551-6c84-45d1-af2b-c57becb4e8ef",
-        "Name": "awsInstallWinTentacle.octoApiKey",
-        "Label": "Octo User API Key",
-        "HelpText": "The API key used to configure the tentacle.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "dd07815d-bfb7-43b9-90f8-21ec5a2d2953",
-        "Name": "awsInstallWinTentacle.octopusRoles",
-        "Label": "Roles",
-        "HelpText": "Roles to assign to this tentacle installation. <br />\n*Note: Each role should be on it's own line*",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "d3ffb38e-7fcf-4547-be9a-6cd8e46f8e5e",
-        "Name": "awsInstallWinTentacle.octopusEnvironments",
-        "Label": "Environments",
-        "HelpText": "Environments to assign this tentacle installation to.<br />\n*Note: Each environment should be on its own line*",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "15150827-7bd3-4146-a798-66344851f602",
-        "Name": "instrallTentacle.octoServerUrl",
-        "Label": "Octo Server Url",
-        "HelpText": "The server url to register the tentacle with.  Defaults to the base url",
-        "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "9bcd6bb5-2db3-453f-b4f6-6a78f3c39b59",
-        "Name": "awsInstallWinTentacle.tentacleType",
-        "Label": "Tentacle Type",
-        "HelpText": "Select between a listening or polling tentacle",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "TentaclePassive|Listening\nTentacleActive|Polling"
-        }
-      },
-      {
-        "Id": "6bb98570-fe3e-4ab7-adfb-79ef7ce5c2ce",
-        "Name": "awsInstallWinTentacle.tentacleHostName",
-        "Label": "Tentacle Host Name",
-        "HelpText": "The host name to register the listening tentacles with. Octopus deploy server uses this value to reach out to the vm.<br />\n*Note: Leave blank to automatically use assigned public IP address.*",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "386d9f39-9e90-4215-b739-53a1af5bd105",
-        "Name": "awsInstallWinTentacle.tentacleName",
-        "Label": "Tentacle Name",
-        "HelpText": "The name of the tentacle to use in the infrastructure area of octopus deploy.  Will use the host name if not provided",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "2dc806d8-bba5-44a7-b21d-4b3f041f4d49",
-        "Name": "awsInstallWinTentacle.portNumber",
-        "Label": "Port Number",
-        "HelpText": "Port number used when installing and registering the tentacle. This is also the port opened on the firewall",
-        "DefaultValue": "10933",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-08-23T12:40:10.975Z",
-      "OctopusVersion": "2021.1.7687",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "benjimac93",
-    "Category": "aws"
-  }
diff --git a/step-templates/azure-add-or-update-azure-loadbalancer-health-probe.json b/step-templates/azure-add-or-update-azure-loadbalancer-health-probe.json
deleted file mode 100644
index f4a20a0b1..000000000
--- a/step-templates/azure-add-or-update-azure-loadbalancer-health-probe.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "Id": "59528692-2107-45eb-9fde-55e7329822a9",
-  "Name": "Add or update Azure Load Balancer Health Probe",
-  "Description": null,
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Azure.AccountId": "#{Azure.LoadBalancerCreateHealthProbe.Account}",
-    "Octopus.Action.Script.ScriptBody": "\n\nWrite-Output \"Resource group name: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'])\"\nWrite-Output \"Load balancer name : $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName'])\"\nWrite-Output \"Health probe name: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'])\"\n\nWrite-Output \"Protocol: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'])\"\nWrite-Output \"Path: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Path'])\"\nWrite-Output \"Port: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port'])\"\nWrite-Output \"Interval: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'])\"\nWrite-Output \"Probe count: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount'])\"\n\n\n$loadBalancer = Get-AzureRmLoadBalancer -ResourceGroupName $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'] -name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName']\n$healthProbe = Get-AzureRmLoadBalancerProbeConfig -name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] -LoadBalancer $loadBalancer  -ErrorAction:SilentlyContinue\n\nif($healthProbe -eq $null)\n{\n\t#Create healthProbe\n\tWrite-Output \"Creating healt probe: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName']) on load balancer: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'])\"\n\t\n\tif($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] -eq \"http\")\n\t{\n\t\t#path only used in http\n\t\t$loadBalancer  | Add-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `\n\t\t\t-RequestPath  $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Path'] `\n\t\t\t-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `\n\t\t\t-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `\n\t\t\t-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `\n\t\t\t-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount'] \n\t}\n\telse\n\t{\n\t\t# Path is not part of tcp config\n\t\t$loadBalancer  | Add-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `\n\t\t\t-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `\n\t\t\t-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `\n\t\t\t-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `\n\t\t\t-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount']\n\t}\n}\nelse\n{\n\t#Update healthProbe\n\tWrite-Output \"Updating healt probe: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName']) on load balancer: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ResourceGroupName'])\"\n\t\n\tif($OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] -eq \"http\")\n\t{\n\t\t#path only used in http\n\t\t$loadBalancer  | Set-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `\n\t\t\t-RequestPath  $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Path'] `\n\t\t\t-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `\n\t\t\t-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `\n\t\t\t-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `\n\t\t\t-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount'] \n\t}\n\telse\n\t{\n\t\t# Path is not part of tcp config\n\t\t$loadBalancer  | Set-AzureRmLoadBalancerProbeConfig -Name $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.HealthProbeName'] `\n\t\t\t-Protocol $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Protocol'] `\n\t\t\t-Port $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Port']  `\n\t\t\t-IntervalInSeconds $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.Interval'] `\n\t\t\t-ProbeCount $OctopusParameters['Azure.LoadBalancerCreateHealthProbe.ProbeCount']\n\t}\n}\n\nWrite-Host \"Save changes to loadbalancer\"\nSet-AzureRmLoadBalancer -LoadBalancer $loadBalancer"
-  },
-  "Parameters": [
-    {
-      "Id": "e720d0e8-14d7-47cc-96a9-b074aa2dcf14",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.Account",
-      "Label": "Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "87a93c04-2395-4a73-9999-6b6dacc546fe",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.ResourceGroupName",
-      "Label": "Resource group name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d155c5eb-7cd8-4f57-b3ca-d6c32c7403e1",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.LoadBalancerName",
-      "Label": "Load balancer name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "79619a6d-1d28-4900-bc24-1c597c649bf4",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.HealthProbeName",
-      "Label": "Health probe name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "beed45f9-6c8d-424b-a072-57c0d1657437",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.Protocol",
-      "Label": "Protocol",
-      "HelpText": null,
-      "DefaultValue": "tcp",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "http|http\ntcp|tcp"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "403a32d1-17c5-4ee9-8095-25919369ded3",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.Path",
-      "Label": "Path",
-      "HelpText": null,
-      "DefaultValue": "/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6c7d97da-264c-402d-b207-239922c547ef",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.Port",
-      "Label": "Port",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a5bfd24b-1249-4383-8204-336abc43a435",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.Interval",
-      "Label": "Interval",
-      "HelpText": "interval in seconds",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "033d0e37-30f9-49c8-b012-c18416596624",
-      "Name": "Azure.LoadBalancerCreateHealthProbe.ProbeCount",
-      "Label": "Unhealty threshold",
-      "HelpText": "number of consecutive failures",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "prebenh",
-  "$Meta": {
-    "ExportedAt": "2018-05-04T12:46:43.193Z",
-    "OctopusVersion": "2018.4.7",
-    "Type": "ActionTemplate"
-  },
-  "Logo" : "iVBORw0KGgoAAAANSUhEUgAAAlgAAAE7CAYAAAAB7v+1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAB47SURBVHhe7d1PjF3Vgefxt+pedXpHNpGQAgFPK1I02WSZ7Fj29CbRjLqTSCy6sxi6lVmEDTaUGSQQ6UTpZGh1BD2JAh0lNGIyxNhVZYoYO2AGDIkBx2Abg43/ALYhFWxsSL/xKe5LyuVTrnrv3T/nnPv5SD+1OkxwXffo3a/eufXeACAlmxYGH5uZ/+Tnb5/7i1vDZuauu2dmfsPCJZu79t/+8M+3XX3DpkcGV1X/dQAAghBIm+ev+7vN8//p0Yv/czjJZuav27N52zU33z776eurfy0AQP9snrv+q0thFAmmaTYzf+2h8O5WeDes+qMAAMp2++yn/0sTYXX5NhzbPHvtP9zy2OBPqj8aAKAs4dmqmbnrfxmPoeYW3tEK75ZVPwYAQBnCw+qx+Glz4QF5x4YAQPY++q3ADQux4OliM/OfesmD8ABAtkLIhKCJhU6Xm5nbcDocV1Y/JgBAHj563mrD6VjgJDPPZQEAuQgf/jkzd/3ZaNSkNpEFAKQuq7gaTWQBAKnKMq5GE1kAQGqyjqvRRBYAkIoi4mo0kQUAdK2ouBpNZAEAXSkyrkYTWQBA24qOq9FEFgDQll7E1WgiCwBoWq/iajSRBQA0pZdxNZrIAgDq1uu4Gk1kAQB1EVfLJrIAgGmJq8hEFgAwKXF1hYksAGBc4modE1kAwHqJqzEmsgCAtYirCSayAIDVpB5Xdy18IfqfJzGRBQCslHpcvXL8ueHRUwdEFgCQhxziakRkAQDJyymuRkQWAJCsHONqRGQBAMnJOa5GRBYAkIwS4mpEZAEAnSsprkZEFgDQmRLjakRkAQCtKzmuRkQWANCaPsTViMgCABrXp7gaEVkAQGP6GFcjIgsAqF2f42pEZAEAtRFXfySyAICpiavLiSwAYGLianUiCwAYm7ham8gCANZNXK2fyAIA1iSuxieyAIBViavJiSwA4DLianoiCwD4A3FVn5Qj69bZPxtu2jb4SvV/dgCgKeKqfilG1m1zVw03zQ4+msgCgOaIq+akFFkzc5/8Y1yJLABojrhqXiqRdVlcjSayAKA+4qo9XUfWJUeDsYksAJieuGpfV5EVPRqMTWQBwOTEVXe6iKxoTK02kQUA4xNX3WszstY8GoxNZAHA+omrdLQRWTNzn4gH1HomsgBgbeIqPU1HVjScxpnIAoDViat0NRVZEx0NxiayAOBy4ip9dUfWVEeDsYksAPgjcZWPOiMrGknTTmQBgLjKUR2RtfRFzrFAqmMiC4A+E1f5miayaj8ajE1kAdBH4ip/k0TWuj+tvY6JLAD6RFyVY9zIavRoMDaRBUAfiKvyrDeyWjkajE1kAVAycVWutSKr1aPB2EQWACUSV+W7UmS1fjQYm8gCoCSpx9X9T98y3PPaY63u+JnXqixpzqnFE9E/u8k99Nw3L/v77exoMDaRBUAJUo+rrhZipGnhXbnYn93mOj8ajE1kAZAzcbX6+hJYSRwNxiayAMiRuLry+hBYSR0NxiayAMiJuFp7pQdWkkeDsYksAHIgrta30gMr2aPB2EQWACkTV+tfyYGV/NFgbCILgBSJq/FWamBlczQYm8gCICXiavyVGlhZHQ3GJrIASIG4mmwlBtZtc1fFoyW3iSwAuiSuJl9pgZX10WBsIguALoir6VZaYGV/NBibyAKgTeJq+pUUWMUcDcYmsgBog7iqZ6UEVnFHg7GJLACaJK7qWymBVeTRYGwiC4AmiKt6V0JgFX00GJvIAqBO4qr+5R5YvTgajE1kAVAHcdXMcg+saHz0ZSILgGmIq+aWc2D17mgwNpEFwCTEVbPLNbB6ezQYm8gCYBziqvnlGljR0OjzRBYA6yGu2lmOgeVocJWJLACuRFy1t9wCa2buE/G4sI8msgCIEVftLrfAikaFXTqRBcBy4qr95RRYjgbHmMgCIBBX3SyXwHI0OMFEFkC/iavulktgRQPC1p7IAugncdXtcgis3nyRc1MTWQD9Iq66X+qB5WiwpoksgH4QV2ks5cDyae01T2QBlE1cpbOUA8vRYAMTWQBlEldpLdXAcjTY4EQWQFnEVXpLMbAcDbYwkQVQBnGV5lIMLEeDLU1kAeRNXKW71ALL0WDLE1kAeRJXaS+lwHI02NFEFkBexFX6SymwHA12OJEFkAdxlcdSCSxHgwlMZAGkTVzlsxQCy9FgQhNZAGkSV3kthcByNJjYRBZAWsRVfus6sBwNJjqRBZAGcZXnugwsR4OJT2QBdEtc5blv/eKvluKnaUdPHRh+74kvX/bnOxrMYCILoBviKr89+sL3h4dOvjD84MMLVQK1I4TWwm/+bXjXwheGt81dFb+hW3oTWQDtElf57H8/9T+G+449PTx7frHKne6EsHv5+J7hg3vujN/QLb2JLIB2pBpX4Zmi2H/e1/3Lrq+1cgw4qeNnDgutFdt7ZNfw7oUbov+s04ksgGalGlchJBbPnYn+s74t9bBa6fBb+4Y/3H1z/Mbes4XoPLV4QmQB9EnKcRX0PbDC803Pv75j6e8iR+HoMMmwaHEhsAKRBdATqcdV0OfA+vGztw/fee/t6m8iX+E5sYef/3b85t6DjQIrEFkAhcshroI+Blbu71qtpq/vZi0PrEBkARQql7gK+hZY4VmrEt61Wk14N6tvD8GvDKxAZAEUJqe4CvoUWPc/fcvw/QvnqisvV/hYh60v3he/wRe4WGAFIgugELnFVdCXwPrZr/6p9Q8K7drOVx6O3+AL22qBFYgsgMzlGFdBHwJrx8sPVlfbvLcW3x++cebscP+JxeHOQ6cu2YvH3136Z8ffbe9dtJfe2B2/wRe0KwVWILIAMpVrXAWlB9bTr26trrR+5z/4/VJI/fve48OvbX15+NUt4+/Hzx9fCq/3zn9Q/VvrFx5+j97gC9lagRWILIDM5BxXQcmBNfvSD6qrrE8IoV+98c7wR88eiwbTpPvrn+8ffvep14fPvH5m+Ntz9R9lPvfa4/EbfAFbT2AFIgsgE7nHVVBqYD303DdrfeYqhNX/felkNI6m3d9cjKv/+sile+C5Y8PT752v/vR6bN93f/wGn/nWG1iByAJIXAlxFZQYWOGLmuv6bcFwDPiLg29PfAS4nq2Mq+Xbsu9kbceHIThL/AiHcQIrEFkAiSolroLSAut7T3x56Zqm9eHv/2P47JEzw6/PH4hGUV0LR4OxsFq+G7fsHz5x8NRS7E0rhOe9T94Uv8FnunEDKxBZAIkpKa6C0gLr0MkXqiubXHgG6q4nXosGUZ2LHQ1ead+YP7j0W4rTevPdo/Gbe6abJLACkQWQiNLiKigpsOp4qD18jELT71qNFouotRbezfrNicXqp53c7kNb4jf3DDdpYAUiC6BjJcZVUEpghaPBaZ+7Cr8d2OSzVsv33yLxNM4WDkz3dT/heawf7r45fnPPbNMEViCyADpSalwFpQTW0VMHqiuazPaX34qGUBMb92hwtYXfNJzmuawQFnds/2z85p7Rpg2sQGQBtKzkuApKCKxpP6k9fFBoLISa2FcuLhZLky58dlZ4IH9Szx6ej9/YM1odgRWILICWlB5XQe6BddfCF4Znz0/+TNLuw6ejIdTUpj0ajO2nvz5WXc34wlHhd3Z8MX5jz2R1BVYgsgAa1oe4CnIPrF0HflZdyfgOvvm7aAQ1tbqOBmN76tXT1VWNb++RXfGbeiarM7ACkQXQkL7EVZBzYE3z7lX4uIO2HmgPq/toMLYDF4NxErm/i1V3YAUiC6BmfYqrIOfAmvTdq/DJ6Jt3vBoNoabWxNHgyoWPcJj0c7JyfhericAKRBZATTbPX/u5PsVVkHNgTfru1Y+fb++h9rAmjwZX7ps7J4uNnN/FaiqwgoQj60vVyxZA2v7n7H++evP8hmOxG3mXazKuglwDK3yZ8yTCOzyxCGpqbRwNrtykR4WP7/9J/Gae+JoMrCDFyNq4bXD24v/8XPXyBZCmWx4b/MnM/HV7YjfyLtd0XAW5Btakfzc/evZYNISaWhtHgysXvlJnko9uCKGy8kaew5oOrCDJyJodHNv0yODj1csYQHpm5q55KHYT73JtxFWQY2CFh9sn+dT2kn5rcK098/pkX3id4zFhG4EVJPpO1i83Pjb40+qlDCAdt8/9xa2xm3iXayuughwD69EXvl/99OP59q7mv8B5tC6OBpdv0nexcvyOwrYCK0j0naz7qpczgDRsemRwVWoPtbcZV0GOgXXo5AvVT79++08sRkOoqXVxNLhyk7yL9ea7R6M38ZTXZmAFST74vm3wmeplDaB7M9s3fCt2A+9qbcdVn7T57FWXR4PLd8eOycIjBEtOm/ZLvieRWmRtnB1sqV7WALqV2rtX4qo54QuR2/pQ0a6PBlfu9Hvnq78F6pbcO1lbB39ZvbwBdGdm/lP/GgudLiaumtXm8WAKR4PLN81X6LC2lCJr4+xgT/XyBtCN22c/fX0sdLqYuGrev+9t54NF/zqRo8Hl++5Tr1d/CzQlqXeyvIsFdGnztmtujsVO2xNXzQu/Sff1+QPRIKpzqR0NLl/4aiCalUpkbZwdPFC9zAG0b2Z+w0IseNqcuGrHa6feiwZR3UvtaHD5nj/6TvW3QZNSiKyN2wanfS4W0InwcHsseNqcuGrPs0fORIOozqV4NLh8c/vfqv42aFoS72TNDT5fvdwBtGfz3PVfjUVPWxNX7frFwbejUVTXUj4aHO2nvz5W/W3Qhq4ja+Pc4B+rlzuA9nT5tTjiqn1NP+Ce8tHgaB50b1+XkbVxdnCoerkDaM/M/LWHYvHT9MRVN+77f0ejYVTHUj8aHG3T44eqvw3a1GVkVS93AO3p4sNFxVV3Nu94NRpH0y6Ho8HloxtdRVb1cgfQjk0Lg4/FAqjJiatuNfUJ7rGISXk+qqE7XURW9ZIH0I62P2D0+dd3VC+xdCUWR9Mul6PB5fvtuQvV3whdOPzWvmgINbXqJQ+gHTPzn/x8LISa2r/s+tpw8dyZ6iWWLtT9DlZuR4OjeQerO+E14J6dN0ZDqKlVL3kA7ejiIxpEVrfqfgYrFi85jG50EVdh1UseQDtmtl19QyyCmp7I6k6dv0WY49FgmN8i7EZXcRVWveQBtGPz3IbPxAKojYmsbtT1OVh/k2lchfkcrPZ1GVdh1UseQDu6/pockdW+uj7JPRYuucwnuber67gKq17yANoTC582J7LaVcd3EeZ6NDia7yJsTwpxFVa93AG0p6tPcl8+kdWe1069F42m9S7no8HRnj/6TvW3QZNSiauw6uUOoD0z8xsWYtHT9kRWOz78/X8Mvz5/IBpP61ksWHKbj2hoXkpxtXHb4HT1cgfQns3brrk5FjxdTGS1Y9IH3XP4Iue15gH35qUUV2EbZwcPVC93AO1p+9Pc15rIat7+E4vRgLrSSjgaDHvq1dPV3wJNSC2ulrZt8JXq5Q6gXSk8h7V8IqtZ5z/4/Vif6J7rp7XHdvq989XfAnVLMq7CFgZ/Xr3UAbRrZvuGb8VCp8uJrGb96Nlj0ZiKrYSjwbA7dhyurp66pRpXG2cHj1UvcwDta/s7Cde7LiIr/HmxnyXlHTr5QvXTr996jwlLORoMe+b18f//0tnzi9Ebd8o7fqbdkEz2nauwrYNvVC9zAN2Ymb9uT+zm3fXajqwcA2v2pR9UP/14vr3rtWhUjVbS0eA35g8u/QbluJ577fH4jTvhtRlYKcfVxtnBsU2PDD5evcQBdKOr7yVcz9qMrBwD666FLww/+PBCdQXrd/DN30XDarRSjgbDJnn3Krj3yZuiN++U11ZgpRxXS9s6+Pvq5Q2gWzNz1zwUu4GnsLYiK8fACnvl+HPVFYxntWexSjoanPTdq1OLJ+I37sTXRmClHlfh3auNjw3+tHppA+hWl1/+vJ61EVm5BtbPfvVP1RWM563F9y+Lq5KOBsMOvPm76mrHs/OVh6M379TXdGClHldL2zb4UvWyBpCGlN/FCms6snINrHBMGB7InsSPn7/0g0dLOhr85s7JYiMcuX5nxxfjN+/E12Rg5RBXG2cHe6qXM4B0bFoYfCy1z8VauSYjK9fACtt14GfVVYwnfHXM5h2vLsVVSUeDN27Zv/QO3ST2HtkVvXnnsKYCK4u42jY4venRwdXVyxlAWsKnu8/MbTgdu4mnsqYiK+fAmuZdrBAif/eoo8Eg53evwpoIrBziamlbBzdUL2MAaUr5twpHayKycg6ssEdf+H51JeMLQRILlRy3cODt6qrGl/O7V2F1B1ZGceW3BoE8bJ699h9iN/GUVndk5R5YYeG33yYVvqsvFiw57YHnjlVXM77c370KqzOwcomrjbOD+6qXLYA8zMxdd0/sJp7S6oysEgJrmnexghAosXDJYeGh9kk+kmEk93evwuoKrIziaouPZACyNDP/qX+N3chTWl2RVUJghU3y9TkjIVC27DsZDZiU9/2njyx9kfWkwv/t79j+2ehNPKfVEVjiCqAlfYmsUgLre098eeIH3keeP/pONGRSXAjCaT24587oTTy3TRtY4gqgZX2IrFICK2zS7yhc7uiZs8P/PvtKNGpSWPgohhCC08rxOwdX2zSBJa4AOlJ6ZJUUWGHTHBWO/PbcheEdOw5HA6fLhfALATitd957u4ijwdEmDSxxBdCxkiOrtMAKR4WTxuZy4bms8IXJKbybFd61mtv/1tIHpE4r/NbgA8/cGr2R57pJAktcASSi1MgqLbDC7n/6luH7F85VVzid8BB5+IypEDmx+Gl6/+fFk0vvqNXl53v/OXojz3njBpa4AkhMiZFVYmCFhS+DDu/W1CW8exRiJxZBTSx8dMSkX3uzmp2ZfpnzWhsnsMQVQKJKi6xSAyusjofeVwqhFR4y/8Ezb0TDaJp996nXl44l63zHaqSEz7tabesNLHEFkLiSIqvkwJqZ++Rw96Et1ZXWLxwf/ubE4vCnvz428RFieKfqhePv1vJ81WqOnHoleiMvZesJLHEFkIlSIqvkwBrdtB7f/5PqapsXjvXCb/qF8Hri4KlLFkIq/LPj79bzfNh6vHx8T1G/MRjbWoElrgAyU0JklRpYt81ddcnNKzzcXeczWTko6bOurrQrBZa4AshU7pFVYmCFo8HYTSx8PEFdv12YuvCuXezvoMStFljiCiBzOUdWiYEVu4mNFm644YM2SxUCssSPYrjSYoElrgAKkWtklRZYK48GYwvPJIXjs9KEh9m/s+OL0WsueSsDS1wBFCbHyCopsGbmPhG9ka22cGRYwrtZ4V2r7fvuj15jH7Y8sMQVQKFyi6ySAit2I1trdy/csPSbdrnq67tWyzcKLHEFULicIquUwFrP0eCV9sPdNw8Pv7Vv6UadgzffPTp8cM+d0Wvp20JgiSuAnsglso6feS36z3LauEeDV1rqoXVq8UTvHmJfa+EdSHEF0CM5RNa3fvFX0f88p8VuZtMuhFa4cafysQ7hXRphFV8OH6QqrgBqlkNk5bxbZ/8sekOra+HmvfXF+zp5Vyu8W7XzlYd7/4xV7hNXAA0RWc2szqPB9SyEzsGTe6v8aU54vureJ2+K/gyW18QVQMNEVr1b7dPam96zh+erDGpOOJqM/dmW18QVQEtEVn1r+mhwtQksW8/EFUDLRNb0a/tocPkElq01cQXQEZE1+bo6GhxNYNmVJq4AOiayJltXR4OjCSxbbeIKIBEia7x1eTQ4msCy2MQVQGJE1vrW9dHgaALLVk5cASRKZK29ro8GRxNYtnziCiBxImv1pXA0OJrAstHEFUAmRNblS+VocDSBZWHiCiAzIuvSpXI0OJrAMnEFkCmR9dFSOhocTWD1e+IKIHN9j6zUjgZHE1j9nbgCKESfIyu1o8HRBFY/J64ACtPHyLpt7qroTS6FCaz+TVwBFKpPkZXq0eBoAqtfE1cAhetLZKV6NDiawOrPxBVAT5QeWSkfDY4msPoxcQXQM6VGVupHg6MJrPInrgB6qsTISv1ocDSBVfbEFUDPlRRZORwNjiawyp24AmBJCZGVy9HgaAKrzIkrAC6Re2TFbnYpT2CVN3EFQFSukZXT0eBoAqusiSsArii3yMrtaHA0gVXOxBUA65JTZMVueDlMYJUxcQXAWHKIrByPBkcTWPlPXAEwkZQja2buE9GbXi4TWHlPXAEwlVQjK3bTy2kvvbG7yqDmHDy5N/pn23QTVwDUIrXIyvlo8I7tn20lrkb2HtkV/TlssokrAGqVSmTlfDR4z84bh2++e7RKn/YcP3N4ePfCDdGfydY/cQVAI1KIrNiNL4eFuFo8d6ZKnvadWjyx9DPEfjZbe+IKgEZ1GVm5fJHzyv1w983Ds+cXq9TpTgi88LPEfkZbfeIKgFZ0EVm5Hg2GoHn/wrkqcboXfhaRtf6JKwBa1WZk5fpp7anF1Uj4mRwXrj1xBUAn2oqsHI8G733ypiTjaiQcF4qs1SeuAOhU05GV49Fg+I29Lh9oX6933nt76WMjYtfQ54krAJLQVGTlejR45NQrVcKk7/Bb+6LX0NeJKwCS0kRk5Xg0+Nxrj1fpko/dh7ZEr6VvE1cAJKnOyMrxaPCBZ26tkiU/4WePXVNfJq4ASFodkZXj0WB4lik805SrPj+PJa4AyMK0keVosBvPHp6PXlvJE1cAZGXSyMrxaDB83lUJPvjwQq8+hFRcAZClcSMr198afOmN3VWi5O/gyb3Rayxt4gqArI0TWTkeDX5nxxeX3vkpRbiWcE2xay1l4gqAIqwnsnL9rsG9R3ZVaVKOcE2xay1h4gqAolwpsnI9GgxL+etwJhXexSrxNwrFFQBFWi2ycjwaDHtwz51VkpQnXFvsmnOduAKgaCsj67a5q6I3xBxWwkczrKakY0JxBUAvjCIr56PBsJw/WHQt4dpi15zbxBUAvRIiK9ejwbC7F26oUqRcuT+HJa4A6KWLN8D7YjfGHHbvkzdVGVKucI2xa89h4gqAXss1skp+wH0k1wfdxRUAXJRjZG3fd3+VIeUK1xi79pQnrgBgmdwi6/H9P6kypFy5BZa4AoCInCLr53v/ucqQcoVrjF17ihNXAHAFuUTWA8/cWmVIucI1xq49tYkrAFiHHCLrnp03VhlSrnCNsWtPaeIKAMaQQ2SVLnbNKU1cAcAEUo+ss+cXqxQpT7i22DWnMnEFAFNIObIOntxb5Uh5wrXFrjmFiSsAqEGqkbX1xfuqHClPuLbYNXc9cQUANUoxssJ39X3w4YUqScoRrinF7yEUVwDQgBQj68ipV6osKUe4pti1djlxBQANSi2ySvzKnNQ+wV1cAUALUoqsuxduKOq3CcO1pHQ8KK4AoEUpRdbOVx6u8iR/4Vpi19jFxBUAdCCVyArv+JTwLtbiuTPJvHslrgCgQ6lEVglf/pzKlzuLKwBIQCqRdWrxRJUq+Qk/e+ya2p64AoCEpBBZ9z550/D9C+eqZMlH+JnDzx67pjYnrgAgQSlE1sPPf7vKlnyEnzl2LW1OXAFAwlKIrJ0Z/VZh+Flj19DmxBUAZCCFyHrpjd1VwqQr/Iyxn73NiSsAyEjXkRU+7iDlyBJXAMBEUngnK8XjQseCAMBUUois8BB5Cr9dGH4GD7QDALVIIbLCxyB0+TlZ4c/2UQwAQK1SiKywrS/et/SVNG0Jf1b4M2M/S9sTVwBQoFQiKyw8B9Xk9xeGf3f4M2J/dhcTVwBQsJQiK/ym4fZ99w8Pntw7/ODDC1UaTS78O8K/K/w7U/nS5jBxBQA9kFJkjRaCKHzZ8svH94z1QHx4pyr8d8J/N6WoGk1cAUCPpBhZKxeC6cE9dy7t8f0/Wdrof08xplZOXAFAD+UQWblOXAFAj4ms+ieuAACRVePEFQDwByJr+okrAOAyImvyiSsAYFUia/yJKwBgTSJr/RNXAMC6iay1J64AgLGJrNUnrgCAiYmsyyeuAICpiaw/TlwBALURWeIKAGhAnyNLXAEAjeljZIkrAKBxfYoscQUAtKYPkSWuAIDWlRxZ4goA6EyJkSWuAIDOlRRZ4goASEYJkSWuAIDk5BxZ4goASFaOkSWuAIDk5RRZ4goAyMbGbYP/FQualCauAIDsXIyYv70YWmdXhk0K2zg3+MfqxwQAyMvFmPncxtnBsZWB09WWgm/b4EvVjwcAkKdNjw6uvhhZe2LB0+aq0Ptc9WMBAOQtPOu0adtgU1dHhhfj6r5Njww+Xv04AADlCJHT5gPw4UH2i2H3meqPBwAo16atg+svxs9DsSiqY0tHknODz1d/HABAf4R3tC4G0d+G2Jr2+PDif/+XF8Pt70O8Vf96AIB+W3pOa+vgL5ee1ZodPFbtpctCanZwbNk/v+Pi//uvbFoY/Hn1rwHo2GDw/wGStwqRNh9FsAAAAABJRU5ErkJggg==",
-  "Category": "azure"
-}
diff --git a/step-templates/azure-add-or-update-azure-loadbalancer-rule.json b/step-templates/azure-add-or-update-azure-loadbalancer-rule.json
deleted file mode 100644
index 4dc4b7c5c..000000000
--- a/step-templates/azure-add-or-update-azure-loadbalancer-rule.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "Id": "1df09b27-905c-4b24-9ad5-008af574508a",
-  "Name": "Add or update Azure Load balancer Rule",
-  "Description": "Create a new azure load balancer rule. With the default frontend ip configuration and default backend address pool.",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 10,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "Write-Output \"Resource group name: $($OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'])\"\nWrite-Output \"Load balancer name : $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName'])\"\nWrite-Output \"Rule name: $($OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'])\"\n\nWrite-Output \"Protocol: $($OctopusParameters['Azure.LoadBalancerCreateRule.Protocol'])\"\nWrite-Output \"Frontend port: $($OctopusParameters['Azure.LoadBalancerCreateRule.FrontendPort'])\"\nWrite-Output \"Backend port: $($OctopusParameters['Azure.LoadBalancerCreateRule.BackendPort'])\"\nWrite-Output \"Healt probe name: $($OctopusParameters['Azure.LoadBalancerCreateRule.HealthProbeName'])\"\nWrite-Output \"Idle timeout: $($OctopusParameters['Azure.LoadBalancerCreateRule.IdleTimeout'])\"\nWrite-Output \"Load distribution: $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadDistribution'])\"\n\n$loadBalancer = Get-AzureRmLoadBalancer -ResourceGroupName $OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'] -name $OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName']\n$rule = Get-AzureRmLoadBalancerRuleConfig -Name $OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'] -LoadBalancer $loadBalancer -ErrorAction:SilentlyContinue\n$healthProbe = Get-AzureRmLoadBalancerProbeConfig -name $OctopusParameters['Azure.LoadBalancerCreateRule.HealthProbeName'] -LoadBalancer $loadBalancer -ErrorAction:SilentlyContinue\n\nif($rule -eq $null)\n{\n\t#Create rule\n    Write-output \"Creating load balancer rule with name: $($OctopusParameters['Azure.LoadBalancerCreateRule.RuleName']) in load balancer: $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'])\"\n\t\n    $loadBalancer | Add-AzureRmLoadBalancerRuleConfig -Name $OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'] `\n\t\t-FrontendIpConfigurationId ($loadBalancer.FrontendIpConfigurations[0].Id) `\n\t\t-Protocol $OctopusParameters['Azure.LoadBalancerCreateRule.Protocol'] `\n\t\t-FrontendPort $OctopusParameters['Azure.LoadBalancerCreateRule.FrontendPort'] `\n\t\t-BackendPort $OctopusParameters['Azure.LoadBalancerCreateRule.BackendPort'] `\n\t\t-BackendAddressPoolId ($loadBalancer.BackendAddressPools[0].Id) `\n\t\t-ProbeId ($healthProbe.Id) `\n\t\t-IdleTimeoutInMinutes $OctopusParameters['Azure.LoadBalancerCreateRule.IdleTimeout'] `\n\t\t-LoadDistribution $OctopusParameters['Azure.LoadBalancerCreateRule.LoadDistribution']\n}\nelse\n{\n\t#Update rule\n    Write-output \"Updating load balancer rule with name: $($OctopusParameters['Azure.LoadBalancerCreateRule.RuleName']) in load balancer: $($OctopusParameters['Azure.LoadBalancerCreateRule.LoadBalancerName']) in resource group: $($OctopusParameters['Azure.LoadBalancerCreateRule.ResourceGroupName'])\"\n\t\n\t$loadBalancer | Set-AzureRmLoadBalancerRuleConfig -Name $OctopusParameters['Azure.LoadBalancerCreateRule.RuleName'] `\n\t\t-FrontendIpConfigurationId ($loadBalancer.FrontendIpConfigurations[0].Id) `\n\t\t-Protocol $OctopusParameters['Azure.LoadBalancerCreateRule.Protocol'] `\n\t\t-FrontendPort $OctopusParameters['Azure.LoadBalancerCreateRule.FrontendPort'] `\n\t\t-BackendPort $OctopusParameters['Azure.LoadBalancerCreateRule.BackendPort'] `\n\t\t-BackendAddressPoolId ($loadBalancer.BackendAddressPools[0].Id) `\n\t\t-ProbeId ($healthProbe.Id) `\n\t\t-IdleTimeoutInMinutes $OctopusParameters['Azure.LoadBalancerCreateRule.IdleTimeout'] `\n\t\t-LoadDistribution $OctopusParameters['Azure.LoadBalancerCreateRule.LoadDistribution']\n}\n\nWrite-host \"Saving loadbalancer\"\nSet-AzureRmLoadBalancer -LoadBalancer $loadBalancer",
-    "Octopus.Action.Azure.AccountId": "#{Azure.LoadBalancerCreateRule.Account}"
-  },
-  "Parameters": [
-    {
-      "Id": "95e211f5-7a85-4116-9eb6-578ffa72314a",
-      "Name": "Azure.LoadBalancerCreateRule.Account",
-      "Label": "Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "05715167-0ecd-463e-8ede-c2dc6eaa683c",
-      "Name": "Azure.LoadBalancerCreateRule.ResourceGroupName",
-      "Label": "Resource group name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c4adbfbd-6023-420b-8582-6d79a65a28f6",
-      "Name": "Azure.LoadBalancerCreateRule.LoadBalancerName",
-      "Label": "Load balancer name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8984e095-b895-4d2b-93c9-b62ad67b84b1",
-      "Name": "Azure.LoadBalancerCreateRule.RuleName",
-      "Label": "Rule name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fda6f233-707e-4eb3-9d61-12f44b83d92f",
-      "Name": "Azure.LoadBalancerCreateRule.Protocol",
-      "Label": "Protocol",
-      "HelpText": null,
-      "DefaultValue": "tcp",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "tcp|tcp\nudp|udp"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "077dcc26-9058-4b96-95d7-b846c5548b20",
-      "Name": "Azure.LoadBalancerCreateRule.FrontendPort",
-      "Label": "Frontend port",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8d68b615-93f3-4412-af5f-5cd2d9403cbd",
-      "Name": "Azure.LoadBalancerCreateRule.BackendPort",
-      "Label": "Backend port",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "41fdcd90-e5f1-4313-801e-033106a50afa",
-      "Name": "Azure.LoadBalancerCreateRule.HealthProbeName",
-      "Label": "Health probe name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "eef1ff50-989b-4bc7-9109-08824ac9111b",
-      "Name": "Azure.LoadBalancerCreateRule.IdleTimeout",
-      "Label": "Idle timeout",
-      "HelpText": "In minutes",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "62011de8-c0ec-4c38-8970-ff7a543d2b64",
-      "Name": "Azure.LoadBalancerCreateRule.LoadDistribution",
-      "Label": "Load distribution",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "default|none\nSourceIP|Client IP\nSourceIPProtocol|Client IPand protocol"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2018-05-04T12:53:19.489Z",
-    "OctopusVersion": "2018.4.7",
-    "Type": "ActionTemplate"
-  },
-  "Logo" : "iVBORw0KGgoAAAANSUhEUgAAAlgAAAE7CAYAAAAB7v+1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAB47SURBVHhe7d1PjF3Vgefxt+pedXpHNpGQAgFPK1I02WSZ7Fj29CbRjLqTSCy6sxi6lVmEDTaUGSQQ6UTpZGh1BD2JAh0lNGIyxNhVZYoYO2AGDIkBx2Abg43/ALYhFWxsSL/xKe5LyuVTrnrv3T/nnPv5SD+1OkxwXffo3a/eufXeACAlmxYGH5uZ/+Tnb5/7i1vDZuauu2dmfsPCJZu79t/+8M+3XX3DpkcGV1X/dQAAghBIm+ev+7vN8//p0Yv/czjJZuav27N52zU33z776eurfy0AQP9snrv+q0thFAmmaTYzf+2h8O5WeDes+qMAAMp2++yn/0sTYXX5NhzbPHvtP9zy2OBPqj8aAKAs4dmqmbnrfxmPoeYW3tEK75ZVPwYAQBnCw+qx+Glz4QF5x4YAQPY++q3ADQux4OliM/OfesmD8ABAtkLIhKCJhU6Xm5nbcDocV1Y/JgBAHj563mrD6VjgJDPPZQEAuQgf/jkzd/3ZaNSkNpEFAKQuq7gaTWQBAKnKMq5GE1kAQGqyjqvRRBYAkIoi4mo0kQUAdK2ouBpNZAEAXSkyrkYTWQBA24qOq9FEFgDQll7E1WgiCwBoWq/iajSRBQA0pZdxNZrIAgDq1uu4Gk1kAQB1EVfLJrIAgGmJq8hEFgAwKXF1hYksAGBc4modE1kAwHqJqzEmsgCAtYirCSayAIDVpB5Xdy18IfqfJzGRBQCslHpcvXL8ueHRUwdEFgCQhxziakRkAQDJyymuRkQWAJCsHONqRGQBAMnJOa5GRBYAkIwS4mpEZAEAnSsprkZEFgDQmRLjakRkAQCtKzmuRkQWANCaPsTViMgCABrXp7gaEVkAQGP6GFcjIgsAqF2f42pEZAEAtRFXfySyAICpiavLiSwAYGLianUiCwAYm7ham8gCANZNXK2fyAIA1iSuxieyAIBViavJiSwA4DLianoiCwD4A3FVn5Qj69bZPxtu2jb4SvV/dgCgKeKqfilG1m1zVw03zQ4+msgCgOaIq+akFFkzc5/8Y1yJLABojrhqXiqRdVlcjSayAKA+4qo9XUfWJUeDsYksAJieuGpfV5EVPRqMTWQBwOTEVXe6iKxoTK02kQUA4xNX3WszstY8GoxNZAHA+omrdLQRWTNzn4gH1HomsgBgbeIqPU1HVjScxpnIAoDViat0NRVZEx0NxiayAOBy4ip9dUfWVEeDsYksAPgjcZWPOiMrGknTTmQBgLjKUR2RtfRFzrFAqmMiC4A+E1f5miayaj8ajE1kAdBH4ip/k0TWuj+tvY6JLAD6RFyVY9zIavRoMDaRBUAfiKvyrDeyWjkajE1kAVAycVWutSKr1aPB2EQWACUSV+W7UmS1fjQYm8gCoCSpx9X9T98y3PPaY63u+JnXqixpzqnFE9E/u8k99Nw3L/v77exoMDaRBUAJUo+rrhZipGnhXbnYn93mOj8ajE1kAZAzcbX6+hJYSRwNxiayAMiRuLry+hBYSR0NxiayAMiJuFp7pQdWkkeDsYksAHIgrta30gMr2aPB2EQWACkTV+tfyYGV/NFgbCILgBSJq/FWamBlczQYm8gCICXiavyVGlhZHQ3GJrIASIG4mmwlBtZtc1fFoyW3iSwAuiSuJl9pgZX10WBsIguALoir6VZaYGV/NBibyAKgTeJq+pUUWMUcDcYmsgBog7iqZ6UEVnFHg7GJLACaJK7qWymBVeTRYGwiC4AmiKt6V0JgFX00GJvIAqBO4qr+5R5YvTgajE1kAVAHcdXMcg+saHz0ZSILgGmIq+aWc2D17mgwNpEFwCTEVbPLNbB6ezQYm8gCYBziqvnlGljR0OjzRBYA6yGu2lmOgeVocJWJLACuRFy1t9wCa2buE/G4sI8msgCIEVftLrfAikaFXTqRBcBy4qr95RRYjgbHmMgCIBBX3SyXwHI0OMFEFkC/iavulktgRQPC1p7IAugncdXtcgis3nyRc1MTWQD9Iq66X+qB5WiwpoksgH4QV2ks5cDyae01T2QBlE1cpbOUA8vRYAMTWQBlEldpLdXAcjTY4EQWQFnEVXpLMbAcDbYwkQVQBnGV5lIMLEeDLU1kAeRNXKW71ALL0WDLE1kAeRJXaS+lwHI02NFEFkBexFX6SymwHA12OJEFkAdxlcdSCSxHgwlMZAGkTVzlsxQCy9FgQhNZAGkSV3kthcByNJjYRBZAWsRVfus6sBwNJjqRBZAGcZXnugwsR4OJT2QBdEtc5blv/eKvluKnaUdPHRh+74kvX/bnOxrMYCILoBviKr89+sL3h4dOvjD84MMLVQK1I4TWwm/+bXjXwheGt81dFb+hW3oTWQDtElf57H8/9T+G+449PTx7frHKne6EsHv5+J7hg3vujN/QLb2JLIB2pBpX4Zmi2H/e1/3Lrq+1cgw4qeNnDgutFdt7ZNfw7oUbov+s04ksgGalGlchJBbPnYn+s74t9bBa6fBb+4Y/3H1z/Mbes4XoPLV4QmQB9EnKcRX0PbDC803Pv75j6e8iR+HoMMmwaHEhsAKRBdATqcdV0OfA+vGztw/fee/t6m8iX+E5sYef/3b85t6DjQIrEFkAhcshroI+Blbu71qtpq/vZi0PrEBkARQql7gK+hZY4VmrEt61Wk14N6tvD8GvDKxAZAEUJqe4CvoUWPc/fcvw/QvnqisvV/hYh60v3he/wRe4WGAFIgugELnFVdCXwPrZr/6p9Q8K7drOVx6O3+AL22qBFYgsgMzlGFdBHwJrx8sPVlfbvLcW3x++cebscP+JxeHOQ6cu2YvH3136Z8ffbe9dtJfe2B2/wRe0KwVWILIAMpVrXAWlB9bTr26trrR+5z/4/VJI/fve48OvbX15+NUt4+/Hzx9fCq/3zn9Q/VvrFx5+j97gC9lagRWILIDM5BxXQcmBNfvSD6qrrE8IoV+98c7wR88eiwbTpPvrn+8ffvep14fPvH5m+Ntz9R9lPvfa4/EbfAFbT2AFIgsgE7nHVVBqYD303DdrfeYqhNX/felkNI6m3d9cjKv/+sile+C5Y8PT752v/vR6bN93f/wGn/nWG1iByAJIXAlxFZQYWOGLmuv6bcFwDPiLg29PfAS4nq2Mq+Xbsu9kbceHIThL/AiHcQIrEFkAiSolroLSAut7T3x56Zqm9eHv/2P47JEzw6/PH4hGUV0LR4OxsFq+G7fsHz5x8NRS7E0rhOe9T94Uv8FnunEDKxBZAIkpKa6C0gLr0MkXqiubXHgG6q4nXosGUZ2LHQ1ead+YP7j0W4rTevPdo/Gbe6abJLACkQWQiNLiKigpsOp4qD18jELT71qNFouotRbezfrNicXqp53c7kNb4jf3DDdpYAUiC6BjJcZVUEpghaPBaZ+7Cr8d2OSzVsv33yLxNM4WDkz3dT/heawf7r45fnPPbNMEViCyADpSalwFpQTW0VMHqiuazPaX34qGUBMb92hwtYXfNJzmuawQFnds/2z85p7Rpg2sQGQBtKzkuApKCKxpP6k9fFBoLISa2FcuLhZLky58dlZ4IH9Szx6ej9/YM1odgRWILICWlB5XQe6BddfCF4Znz0/+TNLuw6ejIdTUpj0ajO2nvz5WXc34wlHhd3Z8MX5jz2R1BVYgsgAa1oe4CnIPrF0HflZdyfgOvvm7aAQ1tbqOBmN76tXT1VWNb++RXfGbeiarM7ACkQXQkL7EVZBzYE3z7lX4uIO2HmgPq/toMLYDF4NxErm/i1V3YAUiC6BmfYqrIOfAmvTdq/DJ6Jt3vBoNoabWxNHgyoWPcJj0c7JyfhericAKRBZATTbPX/u5PsVVkHNgTfru1Y+fb++h9rAmjwZX7ps7J4uNnN/FaiqwgoQj60vVyxZA2v7n7H++evP8hmOxG3mXazKuglwDK3yZ8yTCOzyxCGpqbRwNrtykR4WP7/9J/Gae+JoMrCDFyNq4bXD24v/8XPXyBZCmWx4b/MnM/HV7YjfyLtd0XAW5Btakfzc/evZYNISaWhtHgysXvlJnko9uCKGy8kaew5oOrCDJyJodHNv0yODj1csYQHpm5q55KHYT73JtxFWQY2CFh9sn+dT2kn5rcK098/pkX3id4zFhG4EVJPpO1i83Pjb40+qlDCAdt8/9xa2xm3iXayuughwD69EXvl/99OP59q7mv8B5tC6OBpdv0nexcvyOwrYCK0j0naz7qpczgDRsemRwVWoPtbcZV0GOgXXo5AvVT79++08sRkOoqXVxNLhyk7yL9ea7R6M38ZTXZmAFST74vm3wmeplDaB7M9s3fCt2A+9qbcdVn7T57FWXR4PLd8eOycIjBEtOm/ZLvieRWmRtnB1sqV7WALqV2rtX4qo54QuR2/pQ0a6PBlfu9Hvnq78F6pbcO1lbB39ZvbwBdGdm/lP/GgudLiaumtXm8WAKR4PLN81X6LC2lCJr4+xgT/XyBtCN22c/fX0sdLqYuGrev+9t54NF/zqRo8Hl++5Tr1d/CzQlqXeyvIsFdGnztmtujsVO2xNXzQu/Sff1+QPRIKpzqR0NLl/4aiCalUpkbZwdPFC9zAG0b2Z+w0IseNqcuGrHa6feiwZR3UvtaHD5nj/6TvW3QZNSiKyN2wanfS4W0InwcHsseNqcuGrPs0fORIOozqV4NLh8c/vfqv42aFoS72TNDT5fvdwBtGfz3PVfjUVPWxNX7frFwbejUVTXUj4aHO2nvz5W/W3Qhq4ja+Pc4B+rlzuA9nT5tTjiqn1NP+Ce8tHgaB50b1+XkbVxdnCoerkDaM/M/LWHYvHT9MRVN+77f0ejYVTHUj8aHG3T44eqvw3a1GVkVS93AO3p4sNFxVV3Nu94NRpH0y6Ho8HloxtdRVb1cgfQjk0Lg4/FAqjJiatuNfUJ7rGISXk+qqE7XURW9ZIH0I62P2D0+dd3VC+xdCUWR9Mul6PB5fvtuQvV3whdOPzWvmgINbXqJQ+gHTPzn/x8LISa2r/s+tpw8dyZ6iWWLtT9DlZuR4OjeQerO+E14J6dN0ZDqKlVL3kA7ejiIxpEVrfqfgYrFi85jG50EVdh1UseQDtmtl19QyyCmp7I6k6dv0WY49FgmN8i7EZXcRVWveQBtGPz3IbPxAKojYmsbtT1OVh/k2lchfkcrPZ1GVdh1UseQDu6/pockdW+uj7JPRYuucwnuber67gKq17yANoTC582J7LaVcd3EeZ6NDia7yJsTwpxFVa93AG0p6tPcl8+kdWe1069F42m9S7no8HRnj/6TvW3QZNSiauw6uUOoD0z8xsWYtHT9kRWOz78/X8Mvz5/IBpP61ksWHKbj2hoXkpxtXHb4HT1cgfQns3brrk5FjxdTGS1Y9IH3XP4Iue15gH35qUUV2EbZwcPVC93AO1p+9Pc15rIat7+E4vRgLrSSjgaDHvq1dPV3wJNSC2ulrZt8JXq5Q6gXSk8h7V8IqtZ5z/4/Vif6J7rp7XHdvq989XfAnVLMq7CFgZ/Xr3UAbRrZvuGb8VCp8uJrGb96Nlj0ZiKrYSjwbA7dhyurp66pRpXG2cHj1UvcwDta/s7Cde7LiIr/HmxnyXlHTr5QvXTr996jwlLORoMe+b18f//0tnzi9Ebd8o7fqbdkEz2nauwrYNvVC9zAN2Ymb9uT+zm3fXajqwcA2v2pR9UP/14vr3rtWhUjVbS0eA35g8u/QbluJ577fH4jTvhtRlYKcfVxtnBsU2PDD5evcQBdKOr7yVcz9qMrBwD666FLww/+PBCdQXrd/DN30XDarRSjgbDJnn3Krj3yZuiN++U11ZgpRxXS9s6+Pvq5Q2gWzNz1zwUu4GnsLYiK8fACnvl+HPVFYxntWexSjoanPTdq1OLJ+I37sTXRmClHlfh3auNjw3+tHppA+hWl1/+vJ61EVm5BtbPfvVP1RWM563F9y+Lq5KOBsMOvPm76mrHs/OVh6M379TXdGClHldL2zb4UvWyBpCGlN/FCms6snINrHBMGB7InsSPn7/0g0dLOhr85s7JYiMcuX5nxxfjN+/E12Rg5RBXG2cHe6qXM4B0bFoYfCy1z8VauSYjK9fACtt14GfVVYwnfHXM5h2vLsVVSUeDN27Zv/QO3ST2HtkVvXnnsKYCK4u42jY4venRwdXVyxlAWsKnu8/MbTgdu4mnsqYiK+fAmuZdrBAif/eoo8Eg53evwpoIrBziamlbBzdUL2MAaUr5twpHayKycg6ssEdf+H51JeMLQRILlRy3cODt6qrGl/O7V2F1B1ZGceW3BoE8bJ699h9iN/GUVndk5R5YYeG33yYVvqsvFiw57YHnjlVXM77c370KqzOwcomrjbOD+6qXLYA8zMxdd0/sJp7S6oysEgJrmnexghAosXDJYeGh9kk+kmEk93evwuoKrIziaouPZACyNDP/qX+N3chTWl2RVUJghU3y9TkjIVC27DsZDZiU9/2njyx9kfWkwv/t79j+2ehNPKfVEVjiCqAlfYmsUgLre098eeIH3keeP/pONGRSXAjCaT24587oTTy3TRtY4gqgZX2IrFICK2zS7yhc7uiZs8P/PvtKNGpSWPgohhCC08rxOwdX2zSBJa4AOlJ6ZJUUWGHTHBWO/PbcheEdOw5HA6fLhfALATitd957u4ijwdEmDSxxBdCxkiOrtMAKR4WTxuZy4bms8IXJKbybFd61mtv/1tIHpE4r/NbgA8/cGr2R57pJAktcASSi1MgqLbDC7n/6luH7F85VVzid8BB5+IypEDmx+Gl6/+fFk0vvqNXl53v/OXojz3njBpa4AkhMiZFVYmCFhS+DDu/W1CW8exRiJxZBTSx8dMSkX3uzmp2ZfpnzWhsnsMQVQKJKi6xSAyusjofeVwqhFR4y/8Ezb0TDaJp996nXl44l63zHaqSEz7tabesNLHEFkLiSIqvkwJqZ++Rw96Et1ZXWLxwf/ubE4vCnvz428RFieKfqhePv1vJ81WqOnHoleiMvZesJLHEFkIlSIqvkwBrdtB7f/5PqapsXjvXCb/qF8Hri4KlLFkIq/LPj79bzfNh6vHx8T1G/MRjbWoElrgAyU0JklRpYt81ddcnNKzzcXeczWTko6bOurrQrBZa4AshU7pFVYmCFo8HYTSx8PEFdv12YuvCuXezvoMStFljiCiBzOUdWiYEVu4mNFm644YM2SxUCssSPYrjSYoElrgAKkWtklRZYK48GYwvPJIXjs9KEh9m/s+OL0WsueSsDS1wBFCbHyCopsGbmPhG9ka22cGRYwrtZ4V2r7fvuj15jH7Y8sMQVQKFyi6ySAit2I1trdy/csPSbdrnq67tWyzcKLHEFULicIquUwFrP0eCV9sPdNw8Pv7Vv6UadgzffPTp8cM+d0Wvp20JgiSuAnsglso6feS36z3LauEeDV1rqoXVq8UTvHmJfa+EdSHEF0CM5RNa3fvFX0f88p8VuZtMuhFa4cafysQ7hXRphFV8OH6QqrgBqlkNk5bxbZ/8sekOra+HmvfXF+zp5Vyu8W7XzlYd7/4xV7hNXAA0RWc2szqPB9SyEzsGTe6v8aU54vureJ2+K/gyW18QVQMNEVr1b7dPam96zh+erDGpOOJqM/dmW18QVQEtEVn1r+mhwtQksW8/EFUDLRNb0a/tocPkElq01cQXQEZE1+bo6GhxNYNmVJq4AOiayJltXR4OjCSxbbeIKIBEia7x1eTQ4msCy2MQVQGJE1vrW9dHgaALLVk5cASRKZK29ro8GRxNYtnziCiBxImv1pXA0OJrAstHEFUAmRNblS+VocDSBZWHiCiAzIuvSpXI0OJrAMnEFkCmR9dFSOhocTWD1e+IKIHN9j6zUjgZHE1j9nbgCKESfIyu1o8HRBFY/J64ACtPHyLpt7qroTS6FCaz+TVwBFKpPkZXq0eBoAqtfE1cAhetLZKV6NDiawOrPxBVAT5QeWSkfDY4msPoxcQXQM6VGVupHg6MJrPInrgB6qsTISv1ocDSBVfbEFUDPlRRZORwNjiawyp24AmBJCZGVy9HgaAKrzIkrAC6Re2TFbnYpT2CVN3EFQFSukZXT0eBoAqusiSsArii3yMrtaHA0gVXOxBUA65JTZMVueDlMYJUxcQXAWHKIrByPBkcTWPlPXAEwkZQja2buE9GbXi4TWHlPXAEwlVQjK3bTy2kvvbG7yqDmHDy5N/pn23QTVwDUIrXIyvlo8I7tn20lrkb2HtkV/TlssokrAGqVSmTlfDR4z84bh2++e7RKn/YcP3N4ePfCDdGfydY/cQVAI1KIrNiNL4eFuFo8d6ZKnvadWjyx9DPEfjZbe+IKgEZ1GVm5fJHzyv1w983Ds+cXq9TpTgi88LPEfkZbfeIKgFZ0EVm5Hg2GoHn/wrkqcboXfhaRtf6JKwBa1WZk5fpp7anF1Uj4mRwXrj1xBUAn2oqsHI8G733ypiTjaiQcF4qs1SeuAOhU05GV49Fg+I29Lh9oX6933nt76WMjYtfQ54krAJLQVGTlejR45NQrVcKk7/Bb+6LX0NeJKwCS0kRk5Xg0+Nxrj1fpko/dh7ZEr6VvE1cAJKnOyMrxaPCBZ26tkiU/4WePXVNfJq4ASFodkZXj0WB4lik805SrPj+PJa4AyMK0keVosBvPHp6PXlvJE1cAZGXSyMrxaDB83lUJPvjwQq8+hFRcAZClcSMr198afOmN3VWi5O/gyb3Rayxt4gqArI0TWTkeDX5nxxeX3vkpRbiWcE2xay1l4gqAIqwnsnL9rsG9R3ZVaVKOcE2xay1h4gqAolwpsnI9GgxL+etwJhXexSrxNwrFFQBFWi2ycjwaDHtwz51VkpQnXFvsmnOduAKgaCsj67a5q6I3xBxWwkczrKakY0JxBUAvjCIr56PBsJw/WHQt4dpi15zbxBUAvRIiK9ejwbC7F26oUqRcuT+HJa4A6KWLN8D7YjfGHHbvkzdVGVKucI2xa89h4gqAXss1skp+wH0k1wfdxRUAXJRjZG3fd3+VIeUK1xi79pQnrgBgmdwi6/H9P6kypFy5BZa4AoCInCLr53v/ucqQcoVrjF17ihNXAHAFuUTWA8/cWmVIucI1xq49tYkrAFiHHCLrnp03VhlSrnCNsWtPaeIKAMaQQ2SVLnbNKU1cAcAEUo+ss+cXqxQpT7i22DWnMnEFAFNIObIOntxb5Uh5wrXFrjmFiSsAqEGqkbX1xfuqHClPuLbYNXc9cQUANUoxssJ39X3w4YUqScoRrinF7yEUVwDQgBQj68ipV6osKUe4pti1djlxBQANSi2ySvzKnNQ+wV1cAUALUoqsuxduKOq3CcO1pHQ8KK4AoEUpRdbOVx6u8iR/4Vpi19jFxBUAdCCVyArv+JTwLtbiuTPJvHslrgCgQ6lEVglf/pzKlzuLKwBIQCqRdWrxRJUq+Qk/e+ya2p64AoCEpBBZ9z550/D9C+eqZMlH+JnDzx67pjYnrgAgQSlE1sPPf7vKlnyEnzl2LW1OXAFAwlKIrJ0Z/VZh+Flj19DmxBUAZCCFyHrpjd1VwqQr/Iyxn73NiSsAyEjXkRU+7iDlyBJXAMBEUngnK8XjQseCAMBUUois8BB5Cr9dGH4GD7QDALVIIbLCxyB0+TlZ4c/2UQwAQK1SiKywrS/et/SVNG0Jf1b4M2M/S9sTVwBQoFQiKyw8B9Xk9xeGf3f4M2J/dhcTVwBQsJQiK/ym4fZ99w8Pntw7/ODDC1UaTS78O8K/K/w7U/nS5jBxBQA9kFJkjRaCKHzZ8svH94z1QHx4pyr8d8J/N6WoGk1cAUCPpBhZKxeC6cE9dy7t8f0/Wdrof08xplZOXAFAD+UQWblOXAFAj4ms+ieuAACRVePEFQDwByJr+okrAOAyImvyiSsAYFUia/yJKwBgTSJr/RNXAMC6iay1J64AgLGJrNUnrgCAiYmsyyeuAICpiaw/TlwBALURWeIKAGhAnyNLXAEAjeljZIkrAKBxfYoscQUAtKYPkSWuAIDWlRxZ4goA6EyJkSWuAIDOlRRZ4goASEYJkSWuAIDk5BxZ4goASFaOkSWuAIDk5RRZ4goAyMbGbYP/FQualCauAIDsXIyYv70YWmdXhk0K2zg3+MfqxwQAyMvFmPncxtnBsZWB09WWgm/b4EvVjwcAkKdNjw6uvhhZe2LB0+aq0Ptc9WMBAOQtPOu0adtgU1dHhhfj6r5Njww+Xv04AADlCJHT5gPw4UH2i2H3meqPBwAo16atg+svxs9DsSiqY0tHknODz1d/HABAf4R3tC4G0d+G2Jr2+PDif/+XF8Pt70O8Vf96AIB+W3pOa+vgL5ee1ZodPFbtpctCanZwbNk/v+Pi//uvbFoY/Hn1rwHo2GDw/wGStwqRNh9FsAAAAABJRU5ErkJggg==",
-  "Category": "azure"
-}
diff --git a/step-templates/azure-add-service-fabric-cluster-certificate.json b/step-templates/azure-add-service-fabric-cluster-certificate.json
deleted file mode 100644
index c13554be8..000000000
--- a/step-templates/azure-add-service-fabric-cluster-certificate.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  "Id": "cf3fb207-05d7-4818-8c09-d2484eadc96c",
-  "Name": "Add Service Fabric Cluster Certificate",
-  "Description": "Add a secondary cluster certificate to a service fabric cluster using an existing azure key vault certificate.",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Azure.AccountId": "#{Azure.AddServiceFabricClusterCertificate.Account}",
-    "Octopus.Action.Script.ScriptBody": "Write-Output \"Adding Service fabric cluster certificate\"\nWrite-Output \"Resource group name: \" $OctopusParameters[\"Azure.AddServiceFabricClusterCertificate.ResourceGroupName\"]\nWrite-Output \"Service fabric cluster name:\" $OctopusParameters[\"Azure.AddServiceFabricClusterCertificate.ClusterName\"]\nWrite-Output \"Certificate secret identifier:\" $OctopusParameters[\"Azure.AddServiceFabricClusterCertificate.SecretIdentifier\"]\n\nAdd-AzureRmServiceFabricClusterCertificate -ResourceGroupName $OctopusParameters[\"Azure.AddServiceFabricClusterCertificate.ResourceGroupName\"] `\n\t-Name $OctopusParameters[\"Azure.AddServiceFabricClusterCertificate.ClusterName\"] `\n    -SecretIdentifier $OctopusParameters[\"Azure.AddServiceFabricClusterCertificate.SecretIdentifier\"]"
-  },
-  "Parameters": [
-    {
-      "Id": "14ec432f-4d26-4341-8c06-5b89cfb20a6c",
-      "Name": "Azure.AddServiceFabricClusterCertificate.Account",
-      "Label": "Azure account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "dc0b28c9-40b8-4897-be2a-a48fbbbec685",
-      "Name": "Azure.AddServiceFabricClusterCertificate.ResourceGroupName",
-      "Label": "Resource group name",
-      "HelpText": "The azure resource group name where the service fabric cluster is located",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7436632f-210f-4cec-8639-c93164a6240f",
-      "Name": "Azure.AddServiceFabricClusterCertificate.ClusterName",
-      "Label": "Service fabric cluster name",
-      "HelpText": "The name of the service fabric cluster",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7ee8a384-bab3-4714-af79-dcfbd3bd602f",
-      "Name": "Azure.AddServiceFabricClusterCertificate.SecretIdentifier",
-      "Label": "Secret identifier",
-      "HelpText": "The secret identifier of the Azure Key Value certificate.\nExample\n> https://{key vault name}.vault.azure.net/secrets/{certificate name}/{identifier}",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4cb76611-ff29-4256-9475-3769fd890e0f",
-      "Name": "storageAccountName",
-      "Label": "Azure Storage Account Name",
-      "HelpText": "Name of the account that the files and folders will be uploaded to.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cc0eb63d-4545-4d9d-aca3-7844e1e0a54e",
-      "Name": "storageAccountKey",
-      "Label": "Azure Storage Account Key",
-      "HelpText": "The key that is used to log into the account.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "8245c4b0-014d-467c-a95d-ab6aac230075",
-      "Name": "containerName",
-      "Label": "Azure Container Name",
-      "HelpText": "The name of the container the files and folder will be uploaded to.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "45f6df33-d04d-44bd-8a26-1ab45c634afc",
-      "Name": "localFolder",
-      "Label": "Name of the Parent Folder",
-      "HelpText": "Name of the Parent Folder being uploaded",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8c559f0f-2d6e-4202-8614-65cabb29e643",
-      "Name": "doRecurse",
-      "Label": "Recursive",
-      "HelpText": null,
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "8a06615b-69a2-4d32-be29-981b6c5725fc",
-      "Name": "doForce",
-      "Label": "Force",
-      "HelpText": "Override is enabled or not",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedBy": "prebenh",
-  "$Meta": {
-    "ExportedAt": "2018-05-02T11:51:09.599Z",
-    "OctopusVersion": "2018.4.7",
-    "Type": "ActionTemplate"
-  },
-  "Logo" : "iVBORw0KGgoAAAANSUhEUgAAAlgAAAE7CAYAAAAB7v+1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAACxfSURBVHhe7d1NkBTnnefx5yTtxWL2AnNwLBpiQ2gdXmFmNUYgUFNVXYXksRfLM2NeNixmcCiw6EYyrDzYjCVsRsaiq19ourNET8wQwR5YeQ+EdCHswxL4wurEcNiQZAuqwba6pbWmJfmlJVvw5D5P9oPUFP+mq6srs57M/H4ifkHYYSs7n2z8/Jz11PMoAPBBOLZpSVgrF3RQ2h3WKod0rXRu3oxuOKeD7iP62IN77X837FNL3T8OAAAgf3StsDaslQ7oWvdPdK0ybQpSuOgc+/Mw7Feh7ldnw6o6aNLlLgcAAJA94TPqDh0Ut+ug9HLbClVjhlZEBasxpnCdMX/uCIfUEvfjAAAApJd9U6Vr3WM66J4SS1E7M/ApsWDdiCla03pAndB9apP78QAAANIjrFW+YorVRbEIxZHRDWKpmiumbNXNnzvCZ9Wd7kcGAADwkylWO3VQfl0sQXHGrb9aaEzRmtB96imKFgAA8I4pOYWOFKsbOfoZsUA1m6hoVdUWdzsAAACdEw6vW6ZrxZNi6UkyA0vF4rTQRAvih9Ryd3sAAADJmvk4MIHF6/MlKIplqdXYxfDmz/3uNgEAAJKhg+KwWHY6kZEHxKK02JiidYq1WQAAIHZ2x3W7OahYdDqV4fvEgtSOmJJ1gY8MAQBAbMLRrns7upB9rgx+WixH7Uq0AH5ArXHDAAAA0B6myBS8WG8lRShF7Y5dl6WrapcbDgAAgMWZOYBZKDY+ZGSdWIjiiilag25YAAAAWmOPuRGLjS9pcYPRxcSUrDMsfgcAAC3RQXmfWGp8ytA9YgmKO6ZknXLDBAAA0Bw9WnxELDS+ZZ4DnmMOe2UBAIDmzHxb0NMF7bMTdEmlJ9HoPrXJDRsAAIDM7XM1LhYa33LsfrH0JBldVVPmz5Vu+AAAAG7l3Sait8siD3huV3S/qodDaokbQgAAgE94dfxNM4l5g9GFxJSss24YAQAAZni915WUNh/w3I6wRxYAAPhYOFa5W9cq02KR8TUJbzDadKqqyw0rAADIs1Stu7qRDmww2kx0Vb3KJqQAAOScDorbxQLje4ZWiAXHi1TVQTe8AAAgb2a2ZChPigXG93R2g9HbRverafMnWzcAAJBHqTgKR8roBrHY+BRdVafdMAMAgLwIn1F3pPbtlafrr25Jn1rlhhsAAORBat9e2Xiyweh84UBoAAByJNVvr2wGloqFxrdEa7H61DI37AAAIMvCWmWnWFzSEA83GL1d2HwUAICc0LXSObG8pCEjD4hFxteYgjXhhh0AAGRVOLxumVhc0pLh+8Qi43N0n9rkhh8AAGRRWCsdEItLWuLRAc/NhsXuAABknA7Kr4vFJS0RCozviRa7D6kl7hEAAIAssYc6i6UlLfH1gOfmstk9BgAAkCWp/vagTVo2GBXCtwkBAMgoXSueFItLWjJ0j1he0hBTsC64xwAAALJE17rHxeKSlnh8wHNTYR0WAADZkvr1V0GXXFrSFdZhAQCQJXq0+IhYXNKSY/dLhSVt2e8eBwAAyIJUH+5sk5IDnm8XPaBOuMcBAACyQNe6x8TikpakcIPRxuiqOu8eBwAAyIJUnz+YsgOe54opWFPucQAAgCxI9TcIU3bA823Tp5a5RwIAANJOB91TYnlJQ1K8wegtGVLL3SMBAABpJxaXtGRohVxW0pmV7pEAAIC0E4tLWiIXlXSmqrrcIwEAAGmW6k1GRzfIRSWtoWABAJANqS5YWVp/ZUPBAgAgG8I+tVQsL2lIig94FkPBAgAgO8TykoYMLJWLSlpDwQIAIDuiw5KlAuNzsnHA881hmwYAALJDBxsnxRLjc7K0weiNULAAAMgOPdr1mlhifM7wfXJJSXOG1BL3SAAAQNrp0Yd+LJYYn5OBA55nR/erCfc4AABAFuhaZVgsMT5HKClpjilYZ9zjAAAAWaCD0m6xxPiakXViSUlzTMGquccBAACyIBxZXxCLjK/J2gajJrpPPeUeBwAAyAK7uDoMinKZ8TFZ22DUhj2wAADIHh0ULoplxscMfEouKSmN7lfT4bPqTvcoAABAVuigmI6F7hncYNQUrLPuMQAAgCwJRx96VCw0vuXY/WJJSXWq6qB7DAAAIEumqw+m49Dno5+RS0qK89Fz6i/dYwAAAFlx5fF1y8Z7uy9+MCAUGt+SsQ1GP3pehZf/mxof36ZWuscBAADS7tIThbX1PeXJ8T3l8J2DQqHxKfabjkJJSXPe+44pWNtUeGmrmnpjm9rsHgsAAEirem9xe31PZdqWK5srT5bD64FQbHxJBg94/tXjMwXrRkzRYj8sAADSqt7bfeRGsZqd3x4Rio0vydgGox8+d3O5mpUT44+xbQMAAKlhJu47xntKL0vlyuatbwvFxpcMrRCLSlrzzj6xXN3IefOslrjHBgAAfHW1t3K3XcwuFavZ+XBIKDc+RCgpaY1d3F7fLharj3Npm6r/bLta5R4fAADwTbSYvbd7SipUjXn7u0K56XRGN4hFJa2Z5+3Vx7m0VU2z+B0AAA/Vn9i4c/Zi9mbi3VusDK2/ul6d/+2VkP3ucQIAgE4b7y0OSwVqvnj3FitDBzzf2JphwdmqTrH4HQCADhr/mrrrdovZm8kHg0LR6VQGloplJW1pZu3VPDk//jdqmXvMAAAgKc0uZp8vE3/vyb5YGTrg+e09YmlaUFj8DgBAwi7vWl9odjF7M3nvOaHwJJ2MbDD6++/JhamV2MXvpmhtcY8dAADEpd5T2r3Qxezzxe7u/tGIUHqSzPB9YmFJU+zC9l/slMvSInPQPX4AANBurS5mbyaT3+7wR4UZOOC5HR8NzhkWvwMA0F5X925aMt5T/LFUjNqZ/9fJbxUKhSVNaflbgwvJVnWBxe8AALSBXcxe7ym9JhWiONKR9Vgj68TSkpa0c93VfLm0TU2w+B0AgEVo92L2ZjPdL5SgOJPiDUb/8AMVjj8ml6G4wuJ3AABaZBezS+UniVzdWw7/cFQoQnElpRuMXns+tkXtTcUUrcPu1wUAAMxnvKcwJhWfJPOrp8vhtaS+WTjwKbHA+J7J3XLxSTRb1WkWvwMAvBCOVe42E3shPLp6Y/isP5NTtJi9t3ROKjydyFvfFspQu5PSDUabPcg5kdjF71vUcvdr5AU9oNaEVdVlxmql+7cAAGkWDq9bZibuQlgrHdBBcVjXSud0rTx5y8QuZWRdqIPCRV3r/klYqxwKg407bQlz/+hYXd3ddW+9t/y6VHQ6GfvNwli3bzh2v1hgfM7U00LJ6XDs4veff1Wtcb9OsQr71CpdVVtMgTpo/jxtcl4aJym6X02bnDUF7ET03+9Tm8Ihv8ohAMCwhcoUqe2mFI3poPy6OIkvNkHRFK+N58LRwiHzrwvu0m1zuaf4SCcWszcbe5xObBuRHv2MOBH7GLuR6Fu9csHxIdHi9y1qh/u1apuoUPWpp1yZmpLGZrExpasela5+tYPCBQAdEj6j7ghrlZ327ZQ4acccHXRPRYVu5C8ecD9Sy+q7C/ukUuNbfvHN4s+vB5vaX2BTcsCzKRZX39ylLkrFxsMMul+vlpl7XmlKz6DJRONYJBEz3q+a7DLljn2/ACBuulZYq2vFk7pWmRYn6w5EB6XXwuChA2YiWOp+zKbYhck+LGZvKj0bz9n1YeH/PPTv9PG//F/SOLSUoChOrr7FfqQVDqkl9pnZHdWFQuNfZha/L3G/bk2x92hLjbnfC9I4dCrm5zll/tzsfkwAQLuYybjQqbdVzcb8fNOm+A3bjyzdjz0n3xaz3zamBLof+2Ph8S/+gzQGC04KDng2k3ut8YsQl7aqp8RS41uaXPxui5VbTxXLx3/tiit+bf8IFAByJ6xVvqJr3RfFydnj6KDrZHhstTixRYvZ93SPi2XGs9S/seEJ92PfwpSsv1r0m0TPD3i2b3Pc7d7ijW1qsylaU2Kx8Sj2Z5xr8bv9+M2UFvsx4LR0/77G/Lx18ydFCwAWym6jMPNNPmFSTknsG63oo8NZbz8u737oUZ8Xs9+I/RntLvLux55TONp176LeLA6tECfQTse+KbHbDLjbnJM9subSNlWXio1PiRa/b725LJr73OH7G6v50uxzAoDcm1m8Xjrg0xqrxcZ9s7GQlsXs9txD+5bNPZKmzHyLs8mtMGZHmDQ7GVc49rvbaopd52RKzPnGUuNpBs39rTT32fS2CmmIKVo1+zGneyQAgNmityFxbbPgQX7zw3J45Um51HiTnuKPx7+m7nKPZEHMBHeXDrqPNF2ORzeIk2WnEm0R0OI31qLF79vUiYYy413s5qjXq+qadP9pjylZE3ZjU/dIAACWmXALduuDWybhjOWDgZlz/sRy0+n0Fofd41iUmY1eK4fmfZ6eHPAcFas27bvk6+L3+nYV/uYZ+f6zltutmwOAXNFBeZ84AWc0fzw2s3GnWHI6kPqeyvTtFrO3KhzbtMRuzDrnR4cdPODZfhSo+9VgHHssvbFVbfJp8fuVHSr84JA8DllN9JGhR0dgAUCi7Horu6eVOPlmPPbombe/KxeeJNPsYvbF0sEjXzBF60c3fXzYgQ1GTbGyO5FviXvyHd+mVvqw+P1Xj6vwjz+UxyLrMSUr2rvMPRIAyIeZ423Kr8wuHXnMe/8oF58kYhezX9kpbyURl5l1WqXdOii8GK2ZESbGdiZ6UzVTqhLfEdwtfj/bWHqSytt7Zo72kcYlLzG/Y3Xz3Fe5RwIA2RYGldW61j0uFY485ndHOrD4fRGL2dvJTIL2G2125/CafeNgC1HjJLmQRP+MfnXKnpvnw8TqFr/XGstP3Hl3vzw+eYz5fbB7fLELPIBsmznqJjtbMLQrHwwmWLLatJg9LvbjO/ttMJuoKFXVQTH9ar/5M/rPJf12aqGSXPyel8XsLYSNSQFk08zmoS3slZST2DdZYiFqU6LF7E9s3OkeBxKWxOL3qafFYkFMojdZbOMAIGtmFrSn78ibpPPuIbkcLTZ2MfulJwpr3eNAh0SL37eqV6VytNhM7paLBfkkpmRNtGtLDgDwgg5KL0uFgtyatn+7sLf7YtKL2TG3OBa///LrKrz2vFwqyM0xJesCWzgAyAR79I1UJIicayPl8M2nG0pSq+kpvezDYnbcyhSjtix+N4Utt1sxtBr7zVL3GAAgncJa5StSiSC3j92MdNE7vu9+yOvF7IgWv++SStNCMv19uUSQebOgMycBwBvR2YJ8Y7Dl2GN1xOI0T6LF7L3F7e4xwHNvbFFdrS5+f+87YnEgzYftGwCkiz0mhb2uFp/3D8slaq7Ue0uTLGZPn1YWv//6m2JhIAuI2yNrpXsMAOA/HRSHpcJAFp6mzy1kMXuqucXvZxqLlBR7vuA1FrW3JaZknXWPAAD8Zndql4oCaS0fDjUUKSm7u14yE/Qd7hEgxUyBGmwsVI35LZuJtjtsQgrAf5wx2P688z2hVLnUn+g64oYeGWEXv5tMS+WK/a7aH7c/FgdDA/CXPchXKghkcbFbN/yi4VuF9Z4Si9kzTFr8Xt/OlgxxxZSsQTf0AOCXmd3aOQonrsxe8M5i9nwY36KWz178/s4+uRyQxSda8O75mZYAcoo9r+LNRyPuQGi7mP3xdUwEOREtft+qTtuC9eFzcjkg7QlvsQB4ibMG48/7z3X/K4vZ8+nf/rt6WSoFpH3hLRYA7/D2KplEH8E+Q8HKIzP5X5BKAWlvdFUddkMOAJ2na90/kQoBaX90wML2vNEDao1UBkj7Y4rshBt2AOiscHjdMqkIkHhiy6wbeuSEmfRrUhkg8UT3qU1u6AGgc8Ja6YBUBEiMOf7lP3XDj4wLn1V36qqakooAiSem0J5yww8AnaOD8utiCSDx5YWH/8ENPzLOlKstUgkg8SVa7M7GowA6iWNxOhP7jU33CJBxpmCdlkoAiT0cnwOgc3RQ3icVAJJAxjbx/7BzgI8HOxM9oE64RwAAydNB6WVx8ifx5/gX/8o9BmRU2KdWSZM/iT+6X9XdYwCA5Omge0qc/Ens0bXKsHsMyCjdp56SJn+SUIbUcvcoACA5rL/qbPQLFdZhZRzrrzoe1mEBSB7rrzzIkLrLPQ5kEOuvOhu7/5h7FACQHF3rHhMnfZJYdK2w1j0OZIw9E0+a9ElyMQX3vHscAJAcjsfpfDg2J7s4HqfzsW8Q3eMAgOREBw8Lkz5JLjroPuIeBzLGTO67pEmfJBv3OAAgGXYPJmnCJ8nGbpPhHgkyRverQWnCJ8nGPQ4ASEY4VrlbmvBJstG10jn3SJAxdqNLacInycY9DgBIhl1cLU34JNnooPSaeyTIGN2vzkgTPkk27nEAQDLM5F5onOxJ8tG17nH3SJAxpmCdlSZ8kmzc4wCAZOjR4iPShE+Sja6VJt0jQcbYLQKkCZ8kG/c4ACAZYa2yU5rwSfJxjwQZY8/CkyZ8kmzc4wCAZFCw/Il7JMgYCpYfcY8DAJKhg0e+IE32JNnwEWF28RGhH3GPAwCSYSZ3Frl7EB0UWOSeUSxy9yPucQBAMvTYF9ZJEz5JNnq0i20aMoptGvyIexwAkIzwX/76z6QJnyQbHWxko9GMYqNRP+IeBwAkg6Ny/Ige7XrJPRJkjOaoHC/iHgcAJIfDnjsfDnvOLg579iPucQBAcnRQfkWa9Ely0bWHe9zjQMaEVdUlTfgkuZiSO+UeBwAkR9e6x6RJnyQX+2UD9ziQMWGfWiZN+iS52K0y3OMAgOTooLxPmvRJghlSd7nHgQyyb1CkiZ8kE92vTrlHAQDJCUfWsxdWB6NHH2IPrIxjL6zORvepp9yjAIDkhM+oO3StMi1N/iT+6KDrpHsUyKiwqg5KEz9JKH1qlXsUAJAs/ULlp9LkTxJIsHGnewzIKBa6dy4scAfQUWGtckic/En8ObZ6uXsMyKjwWXWn7lfTUgEg8cYUrNPuMQBA8sKjqzeKkz+JNZxBmB+sw+pMTMHa5R4BAHSGrnWPSyWAxJjRwiE3/Mg4M9nvaJz8SbyJ3hr2qWXuEQBAZ/AxYQfCx4O5wceEyYePBwF4IRyr3C2WABJLOOA5fzj4OfFsdkMPAJ1lJ32pDJAYMrL279ywIyf4NmFy0f1qwr41dEMPAJ0VHvv8o2IZIG2NrpUm+R//fDIT/wWpEJD2xozzoBtyAPCDHl3PYvfYUzrghhs5YyZ/FrvHHBa3A/CSHvrP35RLAWlHol3zh9fxP/455Ra7T0jFgLQnvL0C4KVoAgg2TkrlgCw+OigOu6FGTtmz8aRiQBYf3l4B8Jo+9uBeqRyQxUXXSvZ//Je6YUZO8RYrvvD2CoDXogmg1n1RKgmk9dji6oYYOWfKwObGckAWF3vuIG+vAHjPFIJCY0EgrScqrHxzELPofnVGKgqktdiPXt3QAoDf9OiGF6WyQFrIyPqCG1YgEg6p5dGaIaEskIXFjOMFN6wA4D+7XkiPdk2JhYE0HR0UXnRDCtyEBe+Ljy2pekCtcUMKAOkQHl29MdpaQCgOZP7oFyoXw9rX+WgQczIF4ZRUHEhz4aNBAKmlg9JuqTyQ20fXypP2jEc3jIDIfauQHd5biBm3mhtGAEgn/cLD/ySVCCIneuv3wpeKbviA23Lrsdi6YQEx43WWL44ASD37MZc+/sWfSmWC3Bp9/Es9MyMHNMeuIzKlgUXvTcSMU92U0iVu6AAg3cIf7fv3+oUKZxXOE338C8fckAELoqtqi1QoyCeJSmifWuWGDACyITz+xf8U7UguFAsSLWr/aRiGbrSAhTMl67BULMjH2eyGCgCyJTz2+UfDoCgWjDxHjz40Ho5t4mMLLJopWaeFYkH61X43RACQTbZk6aCbPbJc9GjxFc4ZRDvpflUTCkZuw3YMAHIj+riQNVn2GJyx8Bl1hxsWoG10Ve3K+8L36IzBqupyQwIA+RAtfM/xtwv1C//16ZmRAOJhy0VUMoTykfWY+37V/LnSDQUA5Itd1G2/OScVkKxG1zZNhf+8veSGAIiV2ycrV5uRRuvQ2IoBAFS043sevmGog/Lr9uNRd9tAIqId33Oy+N2UyUF32wAASx/9j2v0yPrMLn439/aS+X/Vd7nbBRIXVtVBqZRkIXa9mSmRW9ytAgBms6/19ej641JBSWvsuYJ65MFt7haBjnK7vmfqI0NzP2fsR6HuFgEAc9Ejf/FAtH2BUFjSFB10H2F/K/jIFJP99q1PY1lJU8zPX9d9apO7JQBAs8Lh1X+rR9enbjuH6OPAo5/lG0zwWtinlukBdUIqLz7HFKsJu7cVBzYDwCJFm5OOPvSvUpnxKTroOhkeW81HFUiVqGj1q0Hf32i5N1YUKwBot/DoZ7+sg8KLUrnpVD4aKYfTfYX/TbFC2v3bN9WD735LhX/8oVxwOhVTrM6aP3e4HxMAEJfw+Jf/VNce7tEjG16TSk/cuR6Uw98dKYdvHyiH43tMejaecz8akFqXt6n9JqHNm7tU+P4BFV57Xi49cce+rYq+9cjidQDoDPM/xiv10VXf0KMbXtTBxkmpELUjHw6Vw/cPm1L13XJ4da8rVi71ntL0+GMceYN0M8Xq7I2CNTsT31ChfbM1/X25DLUjdsd5u1dX9BFgn1rlfiQAgC/s4nIdFLf/5gelyd/3lcMPBuXCNFfsR34fDMyUqXcPlcO3vn1roZJyuaf4iPsRgNQx/wdhyaWtaloqWI2xheudfaZ07Z8pXQv9SPHD51T4+++p8KPDasT86x0UKgBIkfHe4rBUhCb+fqY0zc4vmihQ88Zcz10aSJ1L29QWqUwtNPXtMwVsduzHjY3/OXO9urs0ACBNLveWC2IRiin1ntJr7tJA6pjSc6KxBMUcjrQBgDSya6LqeyrTUhmKK1d28k1CpNOlrWpKKEGx5Y2tbBAKAKk13lP8sVSE4kq9t7LTXRpIjTe2qC6pBMUVu9bL/B8g9rICgLSq7ynvk4pQbNnd9ZK7NJAapvQcbCxBsWarOu0uDQBIo6u7u+4Vi1BMqfd2T7lLA6lhCs8FsQjFlEtb2DQUAFKvvqd7XCpDceXyrvUFd2nAe+Nb1HKpBMUZe013eQBAWo3v7jopFaHY8mTlkLs04L1LW9UuqQTFlq3qgrs0ACDNLu+pfEUsQnGlp/iKuzTgPVN6ztxSguLNQXdpAECajX9N3ZX0dg1X925a4i4PeMt+k6/Z3dvblZ9/Va1xlwcApN14b+mcVITiSv2JjWzXAO/ZvaikEhRXLm1TE+7SAIAsGO8pHJKKUGzpLZ50lwa8ZUpPrbEExZwT7tIAgCy49GRltViEYkq9tzTpLg14y54HKJSg2GLPO3SXBgBkhd2jSipDceWNb6z9nLs04J2fbVerpBIUV9zu7axNBICssR/bSUUotvSWDrhLA94xpSfZ3du3qbPu0gCALLHnBIpFKK70ls65SwPesYWnoQDFmktb1VPu0gCALLny+LplYhGKKdHWEI+pO9zlAW/Yj+qkEhRn2L0dADJsvLf7olSG4srl3Q896i4NeMOeBSiVoLhiF9O7SwMAsqje231EKkKxpbc47C4NeOPyVnVKKkIxZtBdGgCQRZd7ywWxCMUUe9C0uzTgBbd7+5RQgmLLG1tUl7s8ACCL7JqopLdruNpbudtdHug4W3akEhRXbJmzpc5dHgCQVeM9pZelIhRX6rsL+9ylgY4zheewVIRiy1Z1yl0aAJBl9Z7SbqkIxRZT6NylgY4zBetVsQjFFLug3l0aAJBl9iM7sQjFFFPo2K4BXrBbJUglKM6M/41a5i4PAMg6u/hcKkNxxS6ud5cGOsZu9imVoBhz3l0aAJAHdvsEqQjFFbs9hLs00DGm8CS6e7vJQXdpAEAe2A1ApSIUW3q7L7pLAx3htmeYFkpQbLEHSrvLAwDyINquwR5lI5WhmGKP6nGXBxL3xja1WSpBceXSNjXhLg0AyBN7GLNUhOKKPWzaXRpInCk9JxpLUMw54S4NAMgTU7AOSEUotvQWT7pLA4mzb5SEEhRb7Bszd2kAQJ5cerKyWixCMcXuIO8uDSTq519Va6QSFFfsWi92bweAHKv3lialMhRXbKlzlwYSY0rPwcYSFHPOuEsDAPLIfmwnFaHY8mTlkLs0kBhTeM43FKBYY/fbcpcGAORRvbe4XSxCcaW3dM5dGkiE3UldKkFxxu4Y7y4PAMijq3s3LRGLUIyx13SXV+Gz6s6wqrpMHgpr5cLHGVhh/72ucIiJCrKwTy1zvztyhlT0e2bPApRKUFyxZx1GPyAAIN9M6XmlsQS1O299uxy+e6gcvn+4HH50rPR/9eiGSVOkwqYSdIXhyLpQ10rndFB4MRxZ//3w6Ge/bCdYdwvIKFuSdJ/aZArTQT2gTuh+ddZkOuxXYbO5fkT9Yfr7Knz/gArf/ZYKJ76hwvp2uRy1I6ZgHXY/PgAgz+y6KKkULSa2UL33j+XwgwGhMLUrQTHUIxte06Prj+vh/7L1xhsLpJd9hqYUbTYlatDkQmNZamc+OGQK134VTu6Wi1KreWOL6nK3AwDIs8u71hekkrTQvPm0e0M1IpShJGILl33Ddezzj7pbQ0rYt1TuDdWC3k61K9een3nD9eYuuTQ1m0tbFVuRAAA+YfeokkrTfLnyZDl853vl8A9HhcLTwehg46QeWXs0HFL/wd0iPGM/4tVVddiUqrpUejqVP/5QhVNPq3D8MblE3TZb1Sl3ewAAKDXeU3pZKlBz5eremY8AO/a2qtlEb7W6ToZjlbvdraLDomI18xFgR95WNZtrz6vwve+o8MoOoUjNEbug3t0mAAD2DVZlp1SkGhMVq+fK4TXfi5UQPdr1Unj0syvdLSNhUbEaUCekMuNzrlebL1rjj7EOEAAwy9Xeyt1SoZqdt7+bgjdW80TXStN65MHn7fYQ7taRAFNU9vv+xmq+XHtehb/+plysXM662wUA4BP1ntJrUrH6xd5yON0vF5a0RgeFcT1038Pu1hETPaDW6Kp6VSosaY399uEvvy4WrP3utgEA+MR4b3G4sVzZt1bXA7mkZCGmaI2Fta/zNisGdgG7VFCyEPux4a/33lywfrZdrXK3DgDAJy73lm/arsEuYpdKSdaij37u/7BpaftEm4NW1WmpmGQtdmsHu2nppW2q7m4fAICbjT+m7qjvqUzbrRd+d0QuI5nM4KfDaKuAPt5ALJYpV8vNWMa6QahvsbvEX/1b9c9uCAAAuNWb3yr99MMhoYRkNUHx44nSLsLWVbXFDQUWyJ7/Z8Zvanb5yEuu96lJCjoAQKT/ZduD14PK78UiktWMrLt1wqyqg25I0CRTrHbdMo45iyuXm92QAABgJsigtFvXKtNiCclyjv35XJPlac42nJ/d7kL3q5o0hrkNBR0AYOmRwj6xfOQhQyvkSdLElKzz7Jd1e1ERFcYu7zGlc9ANEQAgj8J/+uuSWDzykoFPiRPkjdidx91QoYF9UyONGfk4HJsDAHkUntyxQtc2TYnFIw8Z3SBNirdE96mn3JDBMeOyuXGcyM2JvjQxoNa4IQMA5EH4P/7uT0y5el0sHnnJHOuvpJiStckNXe7Zb8vZ8iCNE7k5Zpwm7NYVbugAAFkWhqHSx7/wE7F05ClHPyNOilLcN8Ryf1B0dGCz3TNMGCMix4zXBdbyAUAO6Be+2CcWjrxlYKk4Ic4VU7JezfM3C903Bs9KY0NuHzNup9wwAgCySNce3i6Wjbxl1gajC4mZKM+4ocwdc+9sx7C4cBg0AGRROLz2c7nc60rKyAPSBNhUdFUddkOaG+aec7+RaDvCWj4AyCAdlF8Ry0YeM3yfOAE2E20XeOfoWJRo3VVOj8Bpd8zvTp31WACQIfr4l3rEopHXDH5anACbjZkoz7qhzTy7F5g0BqS15PENKABkUji8blmu97uSIkx8LSTzG0naA5yF+yaLSN7egAJAZunRDS+KJSOvkQ54biFmopzI+sc95h4vSPdOFhddVefdEAMA0igcvHeVWDLynAVsMDpfsrzLu7k/dmuPMSx4B4AU00FxWCwZec7QPeKE10qy/BaLt1fxRlfVaTfUAIA0mVl7xbYMt2SeA54Xmiy+xTL3xdurJMJaLABIH95eCQm65IluEbFvsdyQZ4ZdIyTdK2lveIsFACkTHWsSdPPNwcYcu1+c6BabLK2nMfezsvH+SIzpU8vc0AMAfKeDIkfiSFnAAc8Lic7QWXN2nybpHkls4QgdAEgLU7B+LBaMvGeRG4zOFVOwprNyEHS0cF+4RxJPTKF91Q09AMBnLG6fIy0e8LyApH7jUTYW7VBY7A4A/tMjG54QC0be06YNRueKzsDxORyL05nYj2XdIwAA+EqPdr0kFoy8p40bjEqJPiZM+Z5Y5h7q0r2ReGPG/YJ7BAAAX+nRIt8elDK0Qpzc2pqq6nKPIXXCIbVcvCeSTDKyhg8AMikMKqvFckHavsGomKo66B5F6piff8ct90OSzGb3KAAAvtFBeZ9YLvKe0Q3ShNb2pHkdFuuvOhvzuzPoHgUAwDc6KLwoFoy8J+b1Vzdy7XkVXt6Wznz4nHxPJJnY3fPdX2MAgG90rfuiWDDynpg2GJVyZYdcYHzP9ap8PySZ6AweuQQAmcHxOHNkYKk4qcWRyd1ygfE5v/y6fC8k4bDQHQD8YzcYFctF3hP/BqM35dd75RLjc2wplO6FJBs9oNa4v84AAF/o0eIjYsHIe0YeECezuPLed+QS43Pe2SffC0k8qT8NAAAyJww27hQLRt4zfJ80kcWW3zwjlxif8+635HshCSfF23wAQGaFtQoFS0pMBzzPld9/Ty4xPuf9A/K9kIRDwQIA/+iRAntgSZEmshgz/X25xPgc+9ZNuheSbNgLCwA8FNYqh8SCkefEfMCzlA8OySXG5/yWguVF7Gav7q8zAMAXFCwhCW0wOjt//KFcYnyOfesm3QtJNhQsAPAQBUvI0D3iRBZnKFik1VCwAMBDFCwhSRzw3BA+IiSthoIFAB7ioOeGBF3iJBZ3WOROWg2L3AHAQ2zT0JBj94uTWNxhmwbSctimAQD8Q8FqSIIHPM8OG42SlkPBAgD/6FphrVg08pqENxi9EY7KIa1GV9UW99cZAOALDnuelYQPeJ4dDnsmLadPrXJ/nQEAPtFB95RYOPKWDmwweiNv7pJLjM+5skO+F5JwhtQS91cZAOATHZRfEQtH3tKBDUZvxJYVqcT4nutV+X5IMtH9asL9NQYA+EbXiifFwpG3DK0QJ7G4c+15ubykIR8+J98TSSamYJ1xf40BAL7hm4QuHdhg1OZ3z8rlJQ2xi/OleyIJhW8QAoC/wrHK3WLhyFNGN8gTWAKx38aTyksa8lavfE8koVRVl/trDADwka51j4vFIy/p4PqrXz0ul5c0ZPwx+Z5I/NH9ajp8Vt3p/goDAHyU+3VYHdpgNM3rr26EdVidiSlYZ91fXwCAr3K/DmtgqTiJxZ00r7+6EdZhdSisvwIA/4Vjm5boWmVaLB9ZTwc3GH17j1xa0hS7h5d0byT2rHR/fQEAPtO18o/EApL1jDwgTV6xx348WN8ul5a05Q8/kO+RxBNdVefdX1sAgO/0aPERsYBkPcP3iZNY3NH9quaGPvXM/exvvD8SX0zB2uWGHgCQBrpWnhRLSJbToQOe9YBa44Y99cI+tUy6R9L+RN8e5HgcAEgXHZT3iSUkyxEmsbhjJskLbsgzQ1fVaeleSXtjfncG3ZADANIifEbdkavF7p074HmzG/LMCPvUKuE+SbszpJa7IQcApIkOisNiGcliOrDBaBbfXt3AW6x4Y8fXDTUAIG3C4XXLcvMWa+gecSKLOZl7e3UDb7FijhlfN9QAgDTKzVushA94zvLbqxvMPZ6R7p0sLry9AoAMmFmLlfFvFAZd4kQWa3JwOK99y2JK1rR4/6SlROPZp5a5IQYApFlYq3xFLCZZybH7xcksrphJ8pQb2swz9zoojQFpLbpPPeWGFgCQBToovSyWkywkwQOe8/YGInxW3WnueUIaC7KwmHHM/MfKAJA74Vjlbh10T4kFJe1JcIPRPO68be57c+M4kIXFFvMsbUgLAJjFlJHCLeUk7UnwgGczQZ5wQ5k7YVUdlMaENJ0dbigBAFmUuR3eE9pgVFfVeftxmRvGXGJvrNZi17G5IQQAZJmudY+JZSWNSWCDUTNB1vnm18frsS5IY0TkmPE644YPAJB10dYNQfkVsbCkLUMrxImtXWHtzM3s8S66qqaksSI3JyrmHOYMAPkys8t797hYWtKUmDcYNWViixsyOHYPMFs8pfEiM3EldKUbMgBAnoRBZXWqj9IZ3SBObu2KmSQPu6FCAzM2u6QxIzPRfWqTGyoAQB6lehPSGNdfmQLBcSbz0GxCKobNRAEAEVNWCqncIyumDUZtcXBDg3nYMiGNYR4TrdfjI2UAwGzhaNe9Oii/LhYZXzOwVJzoWo2bIHO3kehimbHbbMYt1wvfze/OBF+GAACIwrFNS3St+ydimfEtbd5g1BYEJsjWmTFcaUpGvXFc8xBz3xfYxgMAMC8dFIfFUuNTRh4QJ7tWEk2QQ2q5u320yG5JYMbyrDTGWY2531N534AWALAApmRt9/obhsP3iRPeQsME2X5mTHOx+J3F7ACAluhaYa2ulSfFgtPptOOA56o66G4VbWbXspmilcm9stx6s83uVgEAWLhoXVbQfUQsOZ2MMPE1G/cxFptAxiza9b1fnWkc/zTHHvjNeisAQNu4bxn6cbxOiwc8m8l+QvM1+sTZTTfN2Kd6Abz5vXmVL0EAAGJjNybVte6LYvFJKgvcYNQWK/txIOfCdU50UHSfeip6FsIz8jWuGO5wtwEAQLxmilbpnFiA4s7QPeJk2JjojZXdCJNF7F4xz2aH72+0zM93wfxJsQIAdMbMQvjiyUR3gp/ngGczOdp1PzsoVn6zH9eanG58fp2K+b2ZNjllP9J0PyIAAJ0VPqPuCGuVnbFvVBp0zTU52jci+9nPKn3sovHo48OqerXxuSYRc93zJrv4CBkA4DX7zcPoI8SgONz29VrH7p+ZFO3Hf/Ztg50Y+UZgZtiCbJ7nDvttPVeabylEi40tcuafXTN/buEbgQCA1JopXPZA6dJuU7wO2bVb8557aI/CGVkX6pH1U3p0g/nPF8bsfzccWV8wkySFKieiwlVVXeaZ7zelaNDkrElTC+VtQYv+81V1OFqLZ/85FCogAUr9f4vlBHw2OuW1AAAAAElFTkSuQmCC",
-  "Category": "azure"
-}
diff --git a/step-templates/azure-app-config-kv-retrieve-values.json b/step-templates/azure-app-config-kv-retrieve-values.json
deleted file mode 100644
index a5e9c9123..000000000
--- a/step-templates/azure-app-config-kv-retrieve-values.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-  "Id": "5c4fbed9-dbba-4139-8440-d8e27318772e",
-  "Name": "Azure AppConfig KV - Retrieve Values",
-  "Description": "This step retrieves one or more key/values from an Azure App Configuration store and creates [output variables](https://octopus.com/docs/projects/variables/output-variables) for each value retrieved. These values can be used in other deployment or runbook process steps.\n\nYou can retrieve individual keys that match a specific name and you can choose a custom output variable name for each key.\n\nWildcard search is also supported using the `*` notation in the **Key Names** parameter. Note: Combining a wildcard search with custom output variable names is not supported.\n\nAuthentication is performed using an Azure Service Principal.\n\n---\n\n**Required:** \n- An Azure account with permissions to retrieve key/values from the Azure App Config store.\n- The `az` CLI on the target or worker. If the CLI can't be found, the step will fail. \n\nNotes:\n\n- Tested on Octopus `2024.1` using az version `2.38.0`\n- Tested with both Windows PowerShell and PowerShell Core (on Linux).\n\n",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Azure.AccountId": "#{Azure.AppConfig.KV.RetrieveValues.AzureAccount}",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$global:AzureAppConfigStoreName = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.ConfigStoreName\"]\n$global:AzureAppConfigStoreEndpoint = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.ConfigStoreEndpoint\"]\n$global:AzureAppConfigRetrievalMethod = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.RetrievalMethod\"]\n$ConfigStoreKeyNames = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.KeyNames\"]\n$global:ConfigStoreLabels = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.Labels\"]\n$PrintVariableNames = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.PrintVariableNames\"]\n$SaveValuesAsSensitiveVariables = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.SaveAsSensitiveVariables\"] -ieq \"True\"\n$global:SuppressWarnings = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.SuppressWarnings\"] -ieq \"True\"\n$global:TreatWarningsAsErrors = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.TreatWarningsAsErrors\"] -ieq \"True\"\n$global:CreateAppSettingsJson = $OctopusParameters[\"Azure.AppConfig.KV.RetrieveValues.CreateAppSettingsJson\"] -ieq \"True\"\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName) -and [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {\n    throw \"Either parameter ConfigStoreName or ConfigStoreEndpoint not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($global:AzureAppConfigRetrievalMethod)) {\n    throw \"Required parameter Azure.AppConfig.KV.RetrieveValues.RetrievalMethod not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($ConfigStoreKeyNames) -and [string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {\n    throw \"Either Azure.AppConfig.KV.RetrieveValues.KeyNames or Azure.AppConfig.KV.RetrieveValues.Labels not specified\"\n}\n\n$RetrieveAllKeys = $global:AzureAppConfigRetrievalMethod -ieq \"all\"\n$global:ConfigStoreParameters = \"\"\nif (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {\n    $global:ConfigStoreParameters += \" --name \"\"$global:AzureAppConfigStoreName\"\"\"\n}\nif (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {\n    $global:ConfigStoreParameters += \" --endpoint \"\"$global:AzureAppConfigStoreEndpoint\"\"\"\n}\n\n### Helper functions\nfunction Test-ForAzCLI() {\n    $oldPreference = $ErrorActionPreference\n    $ErrorActionPreference = \"Stop\"\n    try { \n        if (Get-Command \"az\") {\n            return $True\n        }\n    }\n    catch { \n        return $false\n    }\n    finally { \n        $ErrorActionPreference = $oldPreference \n    }\n}\n\nfunction Write-OctopusWarning(\n    [string] $Message\n) {\n    if ($global:TreatWarningsAsErrors) {\n        throw \"Error: $($Message)\"\n    }\n    else {\n        if ($global:SuppressWarnings -eq $False) {\n            Write-Warning -Message $Message\n        }\n        else {\n            Write-Verbose -Message $Message\n        }\n    }\n}\n\n\nfunction Save-OctopusVariable(\n    [string]$variableName, \n    [string]$variableValue) {\n\n    $VariableParams = @{name = $variableName; Value = $variableValue } \n                    \n    if ($SaveValuesAsSensitiveVariables) {\n        $VariableParams.Sensitive = $True\n    }\n\n    Set-OctopusVariable @VariableParams\n\n    $global:VariablesCreated += 1\n\n    if ($global:CreateAppSettingsJson) {\n        $global:AppSettingsVariables += [PsCustomObject]@{name = $variableName; value = $variableValue; slotSetting = $false }\n    }\n\n    if ($PrintVariableNames) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n    }\n}\n\nfunction Find-AzureAppConfigMatchesFromKey(\n    [string]$KeyName,\n    [bool]$IsWildCard,\n    [string]$VariableName,\n    [PsCustomObject]$AppConfigValues) {\n\n    if ($IsWildCard -eq $False) {\n        Write-Verbose \"Finding exact match for: $($keyName)\"\n        $matchingAppConfigKeys = $appConfigValues | Where-Object { $_.key -ieq $keyName }\n        if ($null -eq $matchingAppConfigKeys -or $matchingAppConfigKeys.Count -eq 0) {\n            Write-OctopusWarning \"Unable to find a matching key in Azure App Config for: $($keyName)\"\n        }\n        else {\n            if ($matchingAppConfigKeys.Count -gt 1) {\n                Write-OctopusWarning \"Found multiple matching keys ($($matchingAppConfigKeys.Count)) in Azure App Config for: $($keyName). This is usually due to multiple values with labels\"\n\n                foreach ($matchingAppConfigKey in $matchingAppConfigKeys) {\n                    Write-Verbose \"Found match for $($keyName) $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.label)) {\"(label: $($matchingAppConfigKey.label))\"})\"\n                    $variableValue = $matchingAppConfigKey.value\n                    \n                    if ([string]::IsNullOrWhiteSpace($variableName)) {\n                        $variableName = $keyName.Trim()\n                    }\n                    \n                    if (![string]::IsNullOrWhiteSpace($matchingAppConfigKey.label)) {\n                        $variableName = \"$($keyName.Trim())-$($matchingAppConfigKey.label)\"\n                        Write-Verbose \"Appending label to variable name to avoid duplicate output name: $variableName\"\n                    }\n\n                    Save-OctopusVariable -variableName $variableName -variableValue $variableValue\n                }\n            } \n            else {\n                $matchingAppConfigKey = $matchingAppConfigKeys | Select-Object -First 1\n\n                Write-Verbose \"Found match for $($keyName)\"\n                $variableValue = $matchingAppConfigKey.value\n    \n                if ([string]::IsNullOrWhiteSpace($variableName)) {\n                    $variableName = \"$($keyName.Trim())\"\n                }\n    \n                Save-OctopusVariable -variableName $variableName -variableValue $variableValue\n            }\n        }\n    }\n    else {\n        Write-Verbose \"Finding wildcard match for: $($keyName)\"\n        $matchingAppConfigKeys = @($appConfigValues | Where-Object { $_.key -ilike $keyName })\n        if ($matchingAppConfigKeys.Count -eq 0) {\n            Write-OctopusWarning \"Unable to find any matching keys in Azure App Config for wildcard: $($keyName)\"\n        }\n        else {\n            foreach ($match in $matchingAppConfigKeys) {\n                # Have to explicitly set variable Name here as its a wildcard match\n                $variableName = $match.key\n                $variableValue = $match.value\n                Write-Verbose \"Found wildcard match '$variableName' $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {\"($($matchingAppConfigKey.content_type))\"})\"\n                Save-OctopusVariable -variableName $variableName -variableValue $variableValue\n            }\n        }\n    }\n}\n\nfunction Find-AzureAppConfigMatchesFromLabels() {\n    \n    Write-Verbose \"Retrieving values matching labels: $($global:ConfigStoreLabels)\"\n    $command = \"az appconfig kv list $($global:ConfigStoreParameters) --label \"\"$global:ConfigStoreLabels\"\" --auth-mode login\"\n            \n    Write-Verbose \"Invoking expression: $command\"\n    $appConfigResponse = Invoke-Expression -Command $command\n    $ExitCode = $LastExitCode\n    Write-Verbose \"az exit code: $ExitCode\"\n    if ($ExitCode -ne 0) {\n        throw \"Error retrieving appsettings. ExitCode: $ExitCode\"\n    }\n\n    if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {\n        Write-OctopusWarning \"Null or empty response received from Azure App Configuration service\"\n    }\n    else {\n        $appConfigValues = $appConfigResponse | ConvertFrom-Json\n        if ($appConfigValues.Count -eq 0) {\n            Write-OctopusWarning \"Unable to find any matching keys in Azure App Config for labels: $($global:ConfigStoreLabels)\"\n        }\n        else {\n            Write-Verbose \"Finding match(es) for labels: $($global:ConfigStoreLabels)\"\n            foreach ($appConfigValue in $appConfigValues) {\n                # Have to explicitly set variable Name here as its a match based on label alone\n                $variableName = $appConfigValue.key\n                Write-Verbose \"Found label match '$($appConfigValue.key)' $(if(![string]::IsNullOrWhiteSpace($appConfigValue.content_type)) {\"($($appConfigValue.content_type))\"})\"\n                if (![string]::IsNullOrWhiteSpace($appConfigValue.label)) {\n                    $variableName = \"$($variableName)-$($appConfigValue.label)\"\n                    Write-Verbose \"Appending label to variable name to avoid duplicate output name: $variableName\"\n                }\n                $variableValue = $appConfigValue.value\n                \n                Save-OctopusVariable -variableName $variableName -variableValue $variableValue\n            }\n        }\n    }\n}\n\n# Check if Az cli is installed.\n$azCliAvailable = Test-ForAzCLI\nif ($azCliAvailable -eq $False) {\n    throw \"Cannot find the Azure CLI (az) on the machine. This must be available to continue.\"\t\n}\n\n$Keys = @()\n$global:VariablesCreated = 0\n$global:AppSettingsVariables = @()\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Extract key names+optional custom variable name\n@(($ConfigStoreKeyNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $keyDefinition = ($_ -Split \"\\|\")\n        $keyName = $keyDefinition[0].Trim()\n        $KeyIsWildcard = $keyName.EndsWith(\"*\")\n        $variableName = $null\n        if ($keyDefinition.Count -gt 1) {\n            if ($KeyIsWildcard) {\n                throw \"Key definition: '$_' evaluated as a wildcard with a custom variable name. This is not supported.\"\n            }\n            $variableName = $keyDefinition[1].Trim()\n        }\n\n        if ([string]::IsNullOrWhiteSpace($keyName)) {\n            throw \"Unable to establish key name from: '$($_)'\"\n        }\n\n        $key = [PsCustomObject]@{\n            KeyName       = $keyName\n            KeyIsWildcard = $KeyIsWildcard\n            VariableName  = if (![string]::IsNullOrWhiteSpace($variableName)) { $variableName } else { \"\" }\n        }\n        $Keys += $key\n    }\n}\n\n$LabelsArray = $global:ConfigStoreLabels -Split \",\" | Where-Object { [string]::IsNullOrWhiteSpace($_) -eq $False }\n\nWrite-Verbose \"Azure AppConfig Retrieval Method: $global:AzureAppConfigRetrievalMethod\"\nif (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {\n    Write-Verbose \"Azure AppConfig Store Name: $global:AzureAppConfigStoreName\"\n}\nif (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {\n    Write-Verbose \"Azure AppConfig Store Endpoint: $global:AzureAppConfigStoreEndpoint\"\n}\nWrite-Verbose \"Save sensitive variables: $SaveValuesAsSensitiveVariables\"\nWrite-Verbose \"Treat warnings as errors: $global:TreatWarningsAsErrors\"\nWrite-Verbose \"Suppress warnings: $global:SuppressWarnings\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\nWrite-Verbose \"Keys to retrieve: $($Keys.Count)\"\nWrite-Verbose \"Labels to retrieve: $($LabelsArray.Count)\"\n\n$appConfigResponse = $null\n\n# Retrieving all keys should be more performant, but may have a larger payload response.\nif ($RetrieveAllKeys) {\n    \n    if ($Keys.Count -gt 0) {\n        Write-Host \"Retrieving ALL config values from store\"\n        $command = \"az appconfig kv list $($global:ConfigStoreParameters) --all --auth-mode login\"\n    \n        if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {\n            $command += \" --label \"\"$($global:ConfigStoreLabels)\"\" \"\n        }\n        Write-Verbose \"Invoking expression: $command\"\n        $appConfigResponse = Invoke-Expression -Command $command\n        $ExitCode = $LastExitCode\n        Write-Verbose \"az exit code: $ExitCode\"\n        if ($ExitCode -ne 0) {\n            throw \"Error retrieving appsettings. ExitCode: $ExitCode\"\n        }\n    \n        if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {\n            Write-OctopusWarning \"Null or empty response received from Azure App Configuration service\"\n        }\n        else {\n            $appConfigValues = $appConfigResponse | ConvertFrom-Json\n        }\n\n        foreach ($key in $Keys) {\n            $keyName = $key.KeyName\n            $KeyIsWildcard = $key.KeyIsWildcard\n            $variableName = $key.VariableName\n        \n            Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -VariableName $variableName -AppConfigValues $appConfigValues\n        }\n    }\n    # Possible that ONLY labels have been provided\n    elseif ($LabelsArray.Count -gt 0) {\n        Find-AzureAppConfigMatchesFromLabels \n    }\n}\n# Loop through and get keys based on the supplied names\nelse {\n    \n    Write-Host \"Retrieving keys based on supplied names...\"\n    if ($Keys.Count -gt 0) {\n        foreach ($key in $Keys) {\n            $keyName = $key.KeyName\n            $KeyIsWildcard = $key.KeyIsWildcard\n            $variableName = $key.VariableName\n\n            if ([string]::IsNullOrWhiteSpace($variableName)) {\n                $variableName = \"$($keyName.Trim())\"\n            }\n\n            Write-Verbose \"Retrieving values matching key: $($keyName) from store\"\n            $command = \"az appconfig kv list $($global:ConfigStoreParameters) --key \"\"$keyName\"\" --auth-mode login\"\n            \n            if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {\n                $command += \" --label \"\"$($global:ConfigStoreLabels)\"\" \"\n            }\n            Write-Verbose \"Invoking expression: $command\"\n\n            $appConfigResponse = Invoke-Expression -Command $command\n            $ExitCode = $LastExitCode\n            Write-Verbose \"az exit code: $ExitCode\"\n            if ($ExitCode -ne 0) {\n                throw \"Error retrieving appsettings. ExitCode: $ExitCode\"\n            }\n\n            if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {\n                Write-OctopusWarning \"Null or empty response received from Azure App Configuration service\"\n            }\n            else {\n                $appConfigValues = $appConfigResponse | ConvertFrom-Json\n                if ($appConfigValues.Count -eq 0) {\n                    Write-OctopusWarning \"Unable to find a matching key in Azure App Config for: $($keyName)\"\n                }\n                else {\n                    Write-Verbose \"Finding match(es) for: $($keyName)\"\n                    Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -VariableName $variableName -AppConfigValues $appConfigValues\n                }\n            }\n        }\n    }\n}\n\nif ($global:AppSettingsVariables.Count -gt 0 -and $global:CreateAppSettingsJson) {\n    Write-Verbose \"Creating AppSettings JSON output variable\"\n    $AppSettingsJson = ($global:AppSettingsVariables | Sort-Object -Property * -Unique) | ConvertTo-Json -Compress -Depth 10\n    if ($SaveValuesAsSensitiveVariables) {\n        Set-OctopusVariable -Name \"AppSettingsJson\" -Value $AppSettingsJson -Sensitive\n    }\n    else {\n        Set-OctopusVariable -Name \"AppSettingsJson\" -Value $AppSettingsJson \n    }\n    $global:VariablesCreated += 1\n    if ($PrintVariableNames) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.AppSettingsJson}\"\n    }\n}\n\nWrite-Host \"Created $global:VariablesCreated output variable(s)\""
-  },
-  "Parameters": [
-    {
-      "Id": "4bc809d3-71d5-4f05-ba0e-994ef6649db0",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.AzureAccount",
-      "Label": "Azure Account",
-      "HelpText": "An Azure account with permissions to retrieve values from the Azure App Config store",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "2b53fffb-cef1-4c3b-a070-aa6448fe84b0",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.ConfigStoreName",
-      "Label": "Config Store Name",
-      "HelpText": "The name of the Azure App Configuration store. Provide this or the **Config store endpoint**.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "41f5fa14-c1ce-4a27-9e63-06419e96f095",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.ConfigStoreEndpoint",
-      "Label": "Config Store Endpoint",
-      "HelpText": "The endpoint for the Azure App Configuration Store. Provide this or the **Config store name**.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "39d76051-4ede-47dd-8139-57f3801d215e",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.RetrievalMethod",
-      "Label": "Retrieval Method",
-      "HelpText": "Choose how the step calls the az cli. Either:\n- `All`: Retrieve all configuration values in one call\n- `Individually`: Retrieve configuration values in multiple calls; one for each key specified in the **Key Names** parameter.\n\nDefault: `All`",
-      "DefaultValue": "all",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "all|All\nindividual|Individually"
-      }
-    },
-    {
-      "Id": "02d67ef3-d990-499c-bdbd-226d583ccdc0",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.KeyNames",
-      "Label": "Key Names",
-      "HelpText": "Specify the names of the keys to be returned from Azure App Configuration in the format `KeyName | OutputVariableName` where:\n\n- `KeyName` is the key to retrieve. Wildcards are supported by adding `*` at the end of the key name.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the key's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple keys can be retrieved by entering each one on a new line. Note: Combining a wildcard search with custom output variable names is not supported.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "b97ff62d-6b14-4baa-abc2-9065632f5118",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.Labels",
-      "Label": "Labels",
-      "HelpText": "Labels are an attribute on keys. Provide one or more labels in the format `label1,label2` to retrieve only selected keys that are tagged with those labels.\n\n**Note:** You can include both label values *and* specify key names if you want.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a5dfafc4-743e-4a56-8c89-cd001dc73af3",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.SaveAsSensitiveVariables",
-      "Label": "Save sensitive output variables",
-      "HelpText": "Set the Octopus [output variables](https://octopus.com/docs/projects/variables/output-variables) to Sensitive values. Default: `False`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "c93c377c-e557-4b8a-a918-ee0c47f80c1b",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.SuppressWarnings",
-      "Label": "Suppress warnings",
-      "HelpText": "Suppress warnings from being written to the task log. For example, when a supplied key can't be found in the Azure App Configuration store.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "c51f515f-c749-4c00-90b3-fdc09b2cd426",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.TreatWarningsAsErrors",
-      "Label": "Treat Warnings as Errors",
-      "HelpText": "Treats warnings as errors. If enabled, the **Suppress Warnings** parameter is ignored. ",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "166f88c8-2fb0-4a3c-a0dc-c4087a5ebc76",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.CreateAppSettingsJson",
-      "Label": "Create AppSettings JSON",
-      "HelpText": "Create an Azure App Service AppSettings JSON output variable called `AppSettingsJson`. This can be useful when using the Octopus **Azure App Service** step and you want to dynamically create the JSON app settings.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "159858de-5a33-4111-a059-de261f687b08",
-      "Name": "Azure.AppConfig.KV.RetrieveValues.PrintVariableNames",
-      "Label": "Print output variable names",
-      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AzurePowerShell",
-  "$Meta": {
-    "ExportedAt": "2023-11-30T15:10:08.828Z",
-    "OctopusVersion": "2024.1.2702",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedAt": "2023-11-30T15:10:08.828Z",
-  "LastModifiedBy": "harrisonmeister",
-  "Category": "azure"
-}
diff --git a/step-templates/azure-blob-storage-upload.json b/step-templates/azure-blob-storage-upload.json
deleted file mode 100644
index 77ec05afd..000000000
--- a/step-templates/azure-blob-storage-upload.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "0b167d34-832e-4c96-8a8f-2ea0a6c0fe0c",
-  "Name": "Azure Blob Storage Upload",
-  "Description": "Upload files in a directory to a specified Azure Storage blob container.",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Find-InstallLocations {\n    $result = @()\n    $OctopusParameters.Keys | foreach {\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\n            $result += $OctopusParameters[$_]\n        }\n    }\n    return $result\n}\n\nfunction Find-InstallLocation($stepName) {\n    $result = $OctopusParameters.Keys | where {\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\n    } | select -first 1\n \n    if ($result) {\n        return $OctopusParameters[$result]\n    }\n \n    throw \"No install location found for step: $stepName\"\n}\n\nfunction Find-SingleInstallLocation {\n    $all = @(Find-InstallLocations)\n    if ($all.Length -eq 1) {\n        return $all[0]\n    }\n    if ($all.Length -eq 0) {\n        throw \"No package steps found\"\n    }\n    throw \"Multiple package steps have run; please specify a single step\"\n}\n\n# Check if Windows Azure Powershell is avaiable \ntry{ \n    Import-Module Azure -ErrorAction Stop\n}catch{\n    throw \"Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools\" \n}\n\nImport-AzurePublishSettingsFile $PublishSettingsFile\n\n# The script has been tested on Powershell 3.0\nSet-StrictMode -Version 3\n\n$stepPath = \"\"\nif (-not [string]::IsNullOrEmpty($NugetPackageStepName)) {\n    Write-Host \"Finding path to package step: $NugetPackageStepName\"\n    $stepPath = Find-InstallLocation $NugetPackageStepName\n} else {\n    $stepPath = Find-SingleInstallLocation\n}\nWrite-Host \"Package was installed to: $stepPath\"\n\n$fullPath = \"$stepPath\\$CopyDirectory\"\nWrite-Host \"Copying Files in: $fullPath\"\n\n# Get a list of files from the project folder\n$files = @(ls -Path $fullPath -File -Recurse)\n\n$fileCount = $files.Count\nWrite-Host \"Found $fileCount Files: $files\"\n\n$context = New-AzureStorageContext `\n    -StorageAccountName $StorageAccount `\n    -StorageAccountKey $StorageAccountKey\n\nif ($files -ne $null -and $files.Count -gt 0)\n{\n    # Create the storage container.\n    $existingContainer = Get-AzureStorageContainer -Context $context | \n        Where-Object { $_.Name -like $StorageContainer }\n\n    if (-not $existingContainer)\n    {\n        $newContainer = New-AzureStorageContainer `\n                            -Context $context `\n                            -Name $StorageContainer `\n                            -Permission Blob\n        \"Storage container '\" + $newContainer.Name + \"' created.\"\n    }\n\n    # Upload the files to storage container.\n    $fileCount = $files.Count\n    $time = [DateTime]::UtcNow\n    if ($files.Count -gt 0)\n    {\n        foreach ($file in $files) \n        {\n            $blobFileName = $file.FullName.Replace($fullPath, '').TrimStart('\\')\n            $contentType = switch ([System.IO.Path]::GetExtension($file))\n\t        {\n\t            \".css\" {\"text/css\"}\n\t            \".js\" {\"text/javascript\"}\n\t            \".json\" {\"application/json\"}\n\t            \".html\" {\"text/html\"}\n\t            \".png\" {\"image/png\"}\n\t            \".svg\" {\"image/svg+xml\"}\n\t            default {\"application/octet-stream\"}\n\t        }\n\n            Set-AzureStorageBlobContent `\n                -Container $StorageContainer `\n                -Context $context `\n                -File $file.FullName `\n                -Blob $blobFileName `\n                -Properties @{ContentType=$contentType} `\n                -Force\n        }\n    }\n\n    $duration = [DateTime]::UtcNow - $time\n\n    \"Uploaded \" + $files.Count + \" files to blob container '\" + $StorageContainer + \"'.\"\n    \"Total upload time: \" + $duration.TotalMinutes + \" minutes.\"\n}\nelse\n{\n    Write-Warning \"No files found.\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "CopyDirectory",
-      "Label": "Copy Directory",
-      "HelpText": "Replicates files and directory under the Copy Directory.\nEg. `Content/CDN` that is located at the root of the nuget package.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "PublishSettingsFile",
-      "Label": "Publish Settings File",
-      "HelpText": "Absolute path on the tentacle to the Azure publishsettings file to use.\nEg. `C:\\Azure\\Azure.publishsettings`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "StorageAccount",
-      "Label": "Storage Account",
-      "HelpText": "The Azure Storage Account to use.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "StorageAccountKey",
-      "Label": "Storage Account Key",
-      "HelpText": "The primary or secondary key for the Azure Storage Account.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "StorageContainer",
-      "Label": "Storage Container",
-      "HelpText": "The storage container to use.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NugetPackageStepName",
-      "Label": "Nuget Package Step Name",
-      "HelpText": "Name of the previously-deployed package step that contains the Copy Directory.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "shawnmclean",
-  "$Meta": {
-    "ExportedAt": "2016-01-21T07:21:36.182+00:00",
-    "OctopusVersion": "3.1.3",
-    "Type": "ActionTemplate"
-  },
-  "Category": "azure"
-}
\ No newline at end of file
diff --git a/step-templates/azure-capture-virtualmachine-image.json b/step-templates/azure-capture-virtualmachine-image.json
deleted file mode 100644
index 24bd91520..000000000
--- a/step-templates/azure-capture-virtualmachine-image.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "Id": "dd2b147c-3f20-42e1-a94c-17b157a0f0a4",
-  "Name": "Azure - Capture AzureRM Virtual Machine Image",
-  "Description": "Prepares an AzureRM Virtual Machine (Managed Disk or Storage Account based) and captures a [Managed Image](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/capture-image-resource) or [Image VHD](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/capture-image):\n1. Runs Sysprep\n2. Deallocates & Generalizes VM\n3. Creates Managed Image or Image VHD\n4. Removes virtual machine resource group",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Azure.AccountId": "#{StepTemplate_Account}",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "<#\n ----- Capture AzureRM Virtual Machine Image ----- \n    Paul Marston @paulmarsy (paul@marston.me)\nLinks\n    https://github.com/OctopusDeploy/Library/commits/master/step-templates/azure-capture-virtualmachine-image.json\n    \nThe sequence of steps performed by the step template:\n    1) Virtual Machine prep\n        a) PowerState/running - Custom script extension is used to sysprep & shutdown\n        b) PowerState/stopped - only when the VM is shutdown by the OS, if Azure stops the VM it is automatically deallocated\n        c) PowerState/deallocated\n        d) OSState/generalized\n    2) Image capture\n        - Managed VM & Managed Image - New image with VM as source\n        - Managed VM & Unmanaged VHD - Access to the underlying blob is granted, and the VHD copied into the specified storage account\n        - Unmanaged VM & Managed Image - New image with VM as source\n        - Unmanaged VM & Unmanaged VHD - VM image is saved, a SAS token is generated and it is copied from the VM's storage account into the specified storage account\n    3) Virtual machine cleanup.\n        Once a VM has been marked as 'generalized' Azure will no longer allow it to be started up, making the VM unusable\n        If the delete option is selected, and the image just created has been moved outside the VM's resource group \n        \n----- Advanced Configuration Settings -----\nVariable names can use either of the following two formats: \n    Octopus.Action.<Setting Name> - will apply to all steps in the deployment, e.g.\n        Octopus.Action.DebugLogging\n    Octopus.Action[Step Name].<Setting Name> - will apply to 'step name' alone, e.g.\n        Octopus.Action[Capture Web VM Image].StorageAccountKey\n\nAvailable Settings:\n    VhdDestContainer - overrides the default container that an unmanaged VHD image is copied to, default is 'images'\n    StorageAccountKey - allows copying to a storage account in a different subscription by using the providing the key, default is null\n#>\n#Requires -Modules AzureRM.Resources\n#Requires -Modules AzureRM.Compute\n#Requires -Modules AzureRM.Storage\n#Requires -Modules Azure.Storage\n\n$ErrorActionPreference = 'Stop'\n\n<#---------- SysPrep Script - Begin  ----------#>\n<#\n    Sysprep marker file: C:\\WindowsAzure\\sysprep\n    1) If marker file exists, sysprep has already been run so exit script\n    2) Start a new powershell process and exit with code 0, this allows the custom script extension to report back as having run successfully to Azure\n        a) In the child script wait until the successful exit code has been logged\n        b) Create the marker file\n        c) Run sysprep\n#>\n$SysPrepScript = @'\nif (Test-Path \"${env:SystemDrive}\\WindowsAzure\\sysprep\") { return }\n\nStart-Process -FilePath 'powershell.exe' -ArgumentList @('-NonInteractive','-NoProfile',('-EncodedCommand {0}' -f ([System.Convert]::ToBase64String([System.Text.Encoding]::Unicode.GetBytes({\n    do {\n        Start-Sleep -Seconds 1\n        $status = Get-ChildItem \"${env:SystemDrive}\\Packages\\Plugins\\Microsoft.Compute.CustomScriptExtension\\*\\Status\\\" -File | Sort-Object LastWriteTime -Descending | Select-Object -First 1 | Get-Content | ConvertFrom-Json\n    } while ($status[0].status.code -ne 0)\n    New-Item -ItemType File -Path \"${env:SystemDrive}\\WindowsAzure\\sysprep\" -Force | Out-Null\n    & (Join-Path -Resolve ([System.Environment]::SystemDirectory) 'sysprep\\sysprep.exe') /oobe /generalize /quiet /shutdown\n}.ToString())))))\n\nexit 0\n'@\n<#---------- SysPrep Script - End ----------#>\n\nfunction Get-OctopusSetting {\n    param([Parameter(Position = 0, Mandatory)][string]$Name, [Parameter(Position = 1)]$DefaultValue)\n    $formattedName = 'Octopus.Action.{0}' -f $Name\n    if ($OctopusParameters.ContainsKey($formattedName)) {\n        $value = $OctopusParameters[$formattedName]\n        if ($DefaultValue -is [int]) { return ([int]::Parse($value)) }\n        if ($DefaultValue -is [bool]) { return ([System.Convert]::ToBoolean($value)) }\n        if ($DefaultValue -is [array] -or $DefaultValue -is [hashtable] -or $DefaultValue -is [pscustomobject]) { return (ConvertFrom-Json -InputObject $value) }\n        return $value\n    }\n    else { return $DefaultValue }\n}\nfunction Test-String {\n    param([Parameter(Position=0)]$InputObject,[switch]$ForAbsence)\n\n    $hasNoValue = [System.String]::IsNullOrWhiteSpace($InputObject)\n    if ($ForAbsence) { $hasNoValue }\n    else { -not $hasNoValue }\n}\nfilter Out-Verbose {\n    Write-Verbose ($_ | Out-String)\n}\nfunction Split-BlobUri {\n    param($Uri)\n    $uriRegex = [regex]::Match($Uri, '(?>https:\\/\\/)(?<Account>[a-z0-9]{3,24})\\.blob\\.core\\.windows\\.net\\/(?<Container>[-a-z0-9]{3,63})\\/(?<Blob>.+)')\n    if (!$uriRegex.Success) {\n        throw \"Unable to parse blob uri: $Uri\"\n    }\n    [pscustomobject]@{\n        Account = $uriRegex.Groups['Account'].Value\n        Container = $uriRegex.Groups['Container'].Value\n        Blob = $uriRegex.Groups['Blob'].Value\n    }\n}\nfunction Get-AzureRmAccessToken {\n    # https://github.com/paulmarsy/AzureRest/blob/master/Internals/Get-AzureRmAccessToken.ps1\n    $accessToken = Invoke-RestMethod -UseBasicParsing -Uri ('https://login.microsoftonline.com/{0}/oauth2/token?api-version=1.0' -f $OctopusAzureADTenantId) -Method Post -Body @{\"grant_type\" = \"client_credentials\"; \"resource\" = \"https://management.core.windows.net/\"; \"client_id\" = $OctopusAzureADClientId; \"client_secret\" = $OctopusAzureADPassword }\n    [System.Net.Http.Headers.AuthenticationHeaderValue]::new('Bearer', $accessToken.access_token).ToString()\n}\nfunction Get-TemporarySasBlob {\n    param($BlobName)\n    # https://github.com/paulmarsy/AzureRest/blob/master/Exported/New-AzureBlob.ps1\n    $sasToken = Invoke-RestMethod -UseBasicParsing -Uri 'https://mscompute2.iaas.ext.azure.com/api/Compute/VmExtensions/GetTemporarySas/' -Headers @{\n        [Microsoft.WindowsAzure.Commands.Common.ApiConstants]::AuthorizationHeaderName = (Get-AzureRmAccessToken)\n    }\n    $containerSas = [uri]::new($sasToken)\n    $container = [Microsoft.WindowsAzure.Storage.Blob.CloudBlobContainer]::new($containerSas)\n    $blobRef = $container.GetBlockBlobReference($BlobName)\n    \n    [psobject]@{\n        Blob = $blobRef\n        Uri = [uri]::new($blobRef.Uri.AbsoluteUri + $containerSas.Query)\n    }\n}\n\n'Checking AzureRM Modules...' | Out-Verbose\nGet-Module | ? Name -like 'AzureRM.*' | Format-Table -AutoSize -Property Name,Version | Out-String | Out-Verbose\nif ((Get-Module AzureRM.Compute | % Version) -lt '2.6.0') {\n    $bundledErrorMessage = if ([System.Convert]::ToBoolean($OctopusUseBundledAzureModules)) {\n        'The Azure PowerShell Modules bundled with Octopus have been loaded. To use the version installed on the server create a variable named \"Octopus.Action.Azure.UseBundledAzurePowerShellModules\" and set its value to \"False\".'\n    }\n    throw \"${bundledErrorMessage}Please ensure version 2.6.0 or newer of the AzureRM.Compute module has been installed. The module can be installed with the PowerShell command: Install-Module AzureRM.Compute -MinimumVersion 2.6.0\"\n}\n\n$vm = Get-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -WarningAction SilentlyContinue\nif ($null -eq $vm) {\n    throw \"Unable to find virtual machine '$StepTemplate_VMName' in resource group '$StepTemplate_ResourceGroupName'\"\n}\nWrite-Host \"Image will be captured from Virtual Machine '$($vm.Name)' in resource group '$($vm.ResourceGroupName)'\"\nif (Test-String $StepTemplate_ImageDest -ForAbsence) {\n    throw \"The Image Destination parameter is required\"\n}\n$StepTemplate_ImageStorageContext = if ($StepTemplate_ImageType -eq 'unmanaged') {\n    $storageAccountKey = Get-OctopusSetting StorageAccountKey $null\n    if (Test-String $storageAccountKey) {\n        Write-Host \"Image will be copied to storage account context '$StepTemplate_ImageDest' using provided key\"\n        New-AzureStorageContext -StorageAccountName $StepTemplate_ImageDest -StorageAccountKey $storageAccountKey\n    } else {\n        $storageAccountResource = Find-AzureRmResource -ResourceNameEquals $StepTemplate_ImageDest -ResourceType Microsoft.Storage/storageAccounts\n        if ($storageAccountResource) {\n            Write-Host \"Image will be copied to storage account '$($storageAccountResource.Name)' found in resource group '$($storageAccountResource.ResourceGroupName)'\"\n        } else {\n            throw \"Unable to find storage account '$StepTemplate_ImageDest'\"\n        }\n        Get-AzureRmStorageAccount -ResourceGroupName $storageAccountResource.ResourceGroupName -Name $storageAccountResource.Name | % Context\n    }\n}\n$StepTemplate_ImageResourceGroupName = switch ($StepTemplate_ImageType) {\n    'managed' {\n        $resourceGroup = Get-AzureRmResourceGroup -Name $StepTemplate_ImageDest | % ResourceGroupName \n        Write-Host \"Managed Image will be created in resource group '$resourceGroup'\"\n        $resourceGroup\n    }\n    'unmanaged' { Find-AzureRmResource -ResourceNameEquals $StepTemplate_ImageDest -ResourceType Microsoft.Storage/storageAccounts | % ResourceGroupName }\n}\nif ($StepTemplate_ImageResourceGroupName -ieq $StepTemplate_ResourceGroupName -and $StepTemplate_DeleteVMResourceGroup -ieq 'True') {\n    throw \"You have chosen to delete the virtual machine and it's resource group ($StepTemplate_ResourceGroupName), however this resource group is also where the captured image will be created!\"\n}\n\nWrite-Host ('-'*80)\nWrite-Host \"Preparing virtual machine $($vm.Name) for image capture...\"\n\n$sysprepRun = $false\nwhile ($true) {\n    $statusCode = Get-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -Status -WarningAction SilentlyContinue | % Statuses | % Code\n    if ($statusCode -contains 'OSState/generalized') {\n        Write-Host 'VM is deallocated & generalized, proceeding to image capture...'\n        break\n    }\n    if ($statusCode -contains 'PowerState/deallocated') {\n        Write-Host 'VM has been deallocated, setting state to generalized... '\n        Set-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -Generalized | Out-Verbose\n        continue\n    }\n    if ($statusCode -contains 'PowerState/deallocating') {\n        Write-Host 'VM is deallocating, waiting...'\n        Start-Sleep 30\n        continue\n    }\n    if ($statusCode -contains 'PowerState/stopped') {\n        Write-Host 'VM has been shutdown, starting deallocation...'\n        Stop-AzureRmVm -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -Force | Out-Verbose\n        continue\n    }\n    if ($statusCode -contains 'PowerState/stopping') {\n        Write-Host 'VM is stopping, waiting...'\n        Start-Sleep 30\n        continue\n    }\n    if ($statusCode -contains 'PowerState/running' -and $sysprepRun) {\n        Write-Host 'VM is running, but sysprep already deployed, waiting...'\n        Start-Sleep 30\n        continue\n    }\n    if ($statusCode -contains 'PowerState/running') {\n        Write-Host 'VM is running, performing sysprep...'\n        $existingCustomScriptExtensionName = $vm.Extensions | ? VirtualMachineExtensionType -eq 'CustomScriptExtension' | % Name\n        if ($existingCustomScriptExtensionName) {\n            Write-Warning \"Removing existing CustomScriptExtension ($existingCustomScriptExtensionName)...\"\n            Remove-AzureRmVMCustomScriptExtension -ResourceGroupName $StepTemplate_ResourceGroupName -VMName $StepTemplate_VMName -Name $existingCustomScriptExtensionName -Force | Out-Verbose\n        }\n        \n        Write-Host 'Uploading sysprep script to blob storage...'\n        $sysprepScriptFileName = 'Sysprep.ps1'\n        $sysprepScriptBlob = Get-TemporarySasBlob $sysprepScriptFileName\n        $sysprepScriptBlob.Blob.UploadText($SysPrepScript)\n    \n        Write-Host 'Deploying sysprep custom script extension...'\n        Set-AzureRmVMCustomScriptExtension -ResourceGroupName $StepTemplate_ResourceGroupName -VMName $StepTemplate_VMName -Name 'Sysprep' -Location $vm.Location -FileUri $sysprepScriptBlob.Uri -Run $sysprepScriptFileName -ForceRerun (Get-Date).Ticks | Out-Verbose\n        $sysprepRun = $true\n        continue\n    }\n    Write-Warning \"VM is in an unknown state. Current status codes: $($statusCode -join ', '). Waiting...\"\n    Start-Sleep -Seconds 30\n}\n\nWrite-Host ('-'*80)\n\nWrite-Host 'Retrieving virtual machine disk configuration...'\n$vm = Get-AzureRmVM -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -WarningAction SilentlyContinue \n$isManagedVm = $null -ne $vm.StorageProfile.OsDisk.ManagedDisk\nif ($isManagedVm) { Write-Host \"Virtual machine $($vm.Name) is using Managed Disks\" }\n$isUnmanagedVm = $null -ne $vm.StorageProfile.OsDisk.Vhd\nif ($isUnmanagedVm) { Write-Host \"Virtual machine $($vm.Name) is using unmanaged storage account VHDs\" }\n\nif ($StepTemplate_ImageType -eq 'managed') {\n    Write-Host \"Creating Managed Image of $($vm.Name)...\"\n    $image = New-AzureRmImageConfig -Location $vm.Location -SourceVirtualMachineId $vm.Id\n    New-AzureRmImage -Image $image -ImageName $StepTemplate_ImageName -ResourceGroupName $StepTemplate_ImageResourceGroupName | Out-Verbose\n    Write-Host 'Image created:'\n    Get-AzureRmImage -ImageName $StepTemplate_ImageName -ResourceGroupName $StepTemplate_ImageResourceGroupName | Out-Host\n}\n\nif ($StepTemplate_ImageType -eq 'unmanaged') {\n    if ($isManagedVm) {\n        Write-Host \"Granting access to os disk ($($vm.StorageProfile.OsDisk.Name)) blob...\"\n        $manageDisk = Grant-AzureRmDiskAccess -ResourceGroupName $StepTemplate_ResourceGroupName -DiskName $vm.StorageProfile.OsDisk.Name -DurationInSecond 3600 -Access Read \n        $vhdSasUri = $manageDisk.AccessSAS\n    }\n    if ($isUnmanagedVm) {\n        Write-Host \"Saving Unmanaged Image of $($vm.Name)...\"\n        $armTemplatePath = [System.IO.Path]::GetTempFileName()\n        $vhdDestContainer = Get-OctopusSetting VhdDestContainer 'images'\n        Save-AzureRmVMImage -ResourceGroupName $StepTemplate_ResourceGroupName -Name $StepTemplate_VMName -DestinationContainerName $vhdDestContainer -VHDNamePrefix $StepTemplate_ImageName -Overwrite -Path $armTemplatePath | Out-Verbose\n        $armTemplate = Get-Content -Path $armTemplatePath\n        \"VM Image ARM Template:`n$armTemplate\" | Out-Verbose\n        Remove-Item $armTemplatePath -Force\n        $osDiskUri = ($armTemplate | ConvertFrom-Json).resources.properties.storageprofile.osdisk.image.uri\n        \"OS Disk Image URI: $osDiskUri\" | Out-Verbose\n        $unmanagedVhd = Split-BlobUri $osDiskUri\n        \n        Write-Host \"Granting access to vhd image ($($unmanagedVhd.Blob))...\"\n        $unmanagedVhdStorageResource = Find-AzureRmResource -ResourceNameEquals $unmanagedVhd.Account -ResourceType Microsoft.Storage/storageAccounts\n        $unmanagedVhdStorageResource | Out-Verbose\n        $unmanagedVhdStorageContext = Get-AzureRmStorageAccount -ResourceGroupName $unmanagedVhdStorageResource.ResourceGroupName -Name $unmanagedVhdStorageResource.Name | % Context\n        $vhdSasUri = New-AzureStorageBlobSASToken -Container $unmanagedVhd.Container -Blob $unmanagedVhd.Blob -Permission r -ExpiryTime (Get-Date).AddHours(1) -FullUri -Context $unmanagedVhdStorageContext\n    }\n    Write-Host \"Source image SAS token created: $vhdSasUri\"\n\n    Write-Host 'Copying image to storage account...'\n    $destContainerName = Get-OctopusSetting VhdDestContainer 'images'\n    $destContainer = Get-AzureStorageContainer -Name $destContainerName -Context $StepTemplate_ImageStorageContext -ErrorAction SilentlyContinue\n    if ($destContainer) {\n        Write-Host \"Using container '$destContainerName' in storage account $StepTemplate_ImageDest...\"\n    } else {\n        Write-Host \"Creating container '$destContainerName' in storage account $StepTemplate_ImageDest...\"\n        $destContainer = New-AzureStorageContainer -Name $destContainerName -Context $StepTemplate_ImageStorageContext -Permission Off\n    }\n\n    $copyBlob = Start-AzureStorageBlobCopy -AbsoluteUri $vhdSasUri -DestContainer $destContainerName -DestContext $StepTemplate_ImageStorageContext -DestBlob $StepTemplate_ImageName -Force\n    $copyBlob | Out-Verbose\n    do {   \n        if ($copyState.Status -eq 'Pending') {\n            Start-Sleep -Seconds 60\n        }\n        $copyState = $copyBlob | Get-AzureStorageBlobCopyState\n        $copyState | Out-Verbose\n        $percent = ($copyState.BytesCopied / $copyState.TotalBytes) * 100\n        Write-Host \"Blob transfer $($copyState.Status.ToString().ToLower())... $('{0:N2}' -f $percent)% @ $([System.Math]::Round($copyState.BytesCopied/1GB, 2))GB / $([System.Math]::Round($copyState.TotalBytes/1GB, 2))GB\"\n    } while ($copyState.Status -eq 'Pending')\n    Write-Host \"Final image transfer status: $($copyState.Status)\"\n    \n    if ($isManagedVm) {\n        Write-Host 'Revoking access to os disk blob...'\n        Revoke-AzureRmDiskAccess -ResourceGroupName $StepTemplate_ResourceGroupName -DiskName $vm.StorageProfile.OsDisk.Name | Out-Verbose\n    }\n}\n\nWrite-Host \"Image of $($vm.Name) captured successfully!\"\n\nif ($StepTemplate_DeleteVMResourceGroup -ieq 'True') {\n    Write-Host ('-'*80)\n    Write-Host \"Removing $($vm.Name) VM's resource group $StepTemplate_ResourceGroupName, the following resources will be deleted...\"\n    Find-AzureRmResource -ResourceGroupNameEquals $StepTemplate_ResourceGroupName | Sort-Object -Property ResourceId -Descending | Select-Object -Property ResourceGroupName,ResourceType,ResourceName | Format-Table -AutoSize | Out-Host\n    Remove-AzureRmResourceGroup -Name $StepTemplate_ResourceGroupName -Force | Out-Verbose\n}",
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "911668fe-9653-4f08-892c-0e103e72cad0",
-      "Name": "StepTemplate_Account",
-      "Label": "Octopus Azure Account",
-      "HelpText": "Select the [account id](#/accounts) to use for the connection.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b838a80e-3e49-4788-8302-6b64bf0159ea",
-      "Name": "StepTemplate_ResourceGroupName",
-      "Label": "Resource Group Name",
-      "HelpText": "Name of the Azure Resource Group containing the Virtual Machine.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8be775a8-53e4-4740-ae0f-10d72f9fdc67",
-      "Name": "StepTemplate_VMName",
-      "Label": "Virtual Machine Name",
-      "HelpText": "The name of the AzureRM Virtual Machine to capture. This VM will be shut down & generalized.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "73dae502-7a82-461c-a82b-8c40f519611f",
-      "Name": "StepTemplate_ImageType",
-      "Label": "Image Type",
-      "HelpText": "Desired type of image to capture from the Virtual Machine.",
-      "DefaultValue": "managed",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "managed|Managed Image\nunmanaged|Storage Account VHD"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "111b827b-a2c2-4d57-895e-b18daf9c6344",
-      "Name": "StepTemplate_ImageDest",
-      "Label": "Image Destination",
-      "HelpText": "Where the image should be created.\n\n**Managed Images** should enter a _Resource Group_ name\n\n**Storage Account VHDs** should enter a _Storage Account_ name",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "f461eac4-565c-47e6-8bf0-923f9647e3b2",
-      "Name": "StepTemplate_ImageName",
-      "Label": "Image Name",
-      "HelpText": "Name to use when creating the image.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ba0ea0f4-710c-4732-8fb4-9f9b4faf325b",
-      "Name": "StepTemplate_DeleteVMResourceGroup",
-      "Label": "Delete VM Resource Group?",
-      "HelpText": "Delete the virtual machine resource group after an image has been captured.\n\n**Once a Virtual Machine is marked as generalized Azure will prevent it from being started or modified.**",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "paulmarsy",
-  "$Meta": {
-    "ExportedAt": "2017-05-29T18:58:54.733Z",
-    "OctopusVersion": "3.13.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "azure"
-}
diff --git a/step-templates/azure-check-vmss-provision-status.json b/step-templates/azure-check-vmss-provision-status.json
deleted file mode 100644
index 4c7b8e7b9..000000000
--- a/step-templates/azure-check-vmss-provision-status.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-    "Id": "e04c5cd8-0982-44b8-9cae-0a4b43676adc",
-    "Name": "Check VMSS Provision Status (Deployment Targets)",
-    "Description": "Use this step when leveraging Azure Virtual Machines Scale Sets (VMSS) with Octopus Deploy Deployment Targets.\n\n**Please run this on a worker or the Octopus Server.**\n\nThis step specifically targets Deployment Targets.  It will:\n- Pause a runbook run or deployment until the VMSS has been provisioned\n- Pause a runbook run or deployment until all the VMs in a VMss have been provisioned\n- Reconcile the list of VMs in the VMSS with the list of VMs in Octopus Deploy.  Any VMs in Octopus Deploy (based on role) not in the VMSS will be removed.\n- Set output variables of all the deployment targets found in the VMSS.\n\nThis step will set the following output variables:\n- `VMSSHasServersToDeployTo`: Indicates the VMSS has servers to deploy to.  \n- `VMSSDeploymentTargetIds`: A comma-separated list of deployment target Ids you can use in later steps.\n- `VMSSDeploymentTargetNames`: A comma-separated list of deployment target names you can use in later steps.\n\n**Please Note**: Setting the parameter `Exclude Pre-Existing Servers from Output` to `Yes` will remove any servers prior to a scale event from being returned in the output variables. \n\nThis step makes the following assumptions:\n- The name of the machine registration in Octopus matches the computer name.  Like matching is supported, for example, a match will be made in the case of Octopus has `p-app-server-01` and the computer name is `p-app-server-01.mydomain.com.`  \n- You have the Azure Az PowerShell modules pre-installed on a worker or your Octopus Server.\n- This step is running in the same space/environment/tenant (optional) as the deployment targets.",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "OctopusUseBundledTooling": "False",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Azure.AccountId": "#{VMSS.Azure.Account}",
-      "Octopus.Action.Script.ScriptBody": "$vmssScaleSetName = $OctopusParameters[\"VMSS.ScaleSet.Name\"]\n$vmssScaleSetResourceGroup = $OctopusParameters[\"VMSS.ResourceGroup.Name\"]\n$roleToSearchFor = $OctopusParameters[\"VMSS.DeploymentTarget.Roles\"]\n$apiKey = $OctopusParameters[\"VMSS.Octopus.ApiKey\"]\n$octopusUrl = $OctopusParameters[\"VMSS.Octopus.Url\"]\n$timeoutInMinutes = $OctopusParameters[\"VMSS.Timeout.Value\"]\n$timeoutErrorHandle = $OctopusParameters[\"VMSS.Timeout.ErrorHandle\"]\n$duplicateRunDetectionInMinutes = $OctopusParameters[\"VMSS.Duplicate.TimeInMinutes\"]\n$duplicateRunHandle = $OctopusParameters[\"VMSS.Duplicate.Handle\"]\n$excludeOldServers = $OctopusParameters[\"VMSS.OldServers.ExcludeFromOutput\"]\n\n$octopusSpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$octopusEnvironmentId = $OctopusParameters[\"Octopus.Environment.Id\"]\n$octopusTenantId = $OctopusParameters[\"Octopus.Deployment.Tenant.Id\"]\n$octopusDeploymentId = $OctopusParameters[\"Octopus.Deployment.Id\"]\n$octopusTriggerId = $OctopusParameters[\"Octopus.Deployment.Trigger.Id\"]\n$octopusTaskId = $OctopusParameters[\"Octopus.Task.Id\"]\n$octopusRunbookRunId = $OctopusParameters[\"Octopus.RunbookRun.Id\"]\n\nfunction Invoke-OctopusApi\n{\n    param\n    (\n        $octopusUrl,\n        $endPoint,\n        $spaceId,\n        $apiKey,\n        $method,\n        $item  \n    )\n\n    if ([string]::IsNullOrWhiteSpace($SpaceId))\n    {\n        $url = \"$OctopusUrl/api/$EndPoint\"\n    }\n    else\n    {\n        $url = \"$OctopusUrl/api/$spaceId/$EndPoint\"    \n    }  \n\n    try\n    {        \n        if ($null -ne $item)\n        {\n            $body = $item | ConvertTo-Json -Depth 10\n            Write-Verbose $body\n\n            Write-Host \"Invoking $method $url\"\n            return Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -Body $body -ContentType 'application/json; charset=utf-8' \n        }\n\n\t\tWrite-Verbose \"No data to post or put, calling bog standard invoke-restmethod for $url\"\n        $result = Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -ContentType 'application/json; charset=utf-8'\n\n        return $result\n\n               \n    }\n    catch\n    {\n        if ($null -ne $_.Exception.Response)\n        {\n            if ($_.Exception.Response.StatusCode -eq 401)\n            {\n                Write-Error \"Unauthorized error returned from $url, please verify API key and try again\"\n            }\n            elseif ($_.Exception.Response.statusCode -eq 403)\n            {\n                Write-Error \"Forbidden error returned from $url, please verify API key and try again\"\n            }\n            else\n            {                \n                Write-Verbose -Message \"Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )\"\n            }            \n        }\n        else\n        {\n            Write-Verbose $_.Exception\n        }\n    }\n\n    Throw \"There was an error calling the Octopus API.\"\n}\n\nfunction Get-QueuedEventInfo\n{\n    param (\n        $octopusRunbookRunId,\n        $octopusDeploymentId,\n        $octopusSpaceId,\n        $octopusUrl,\n        $apiKey\n    )\n\n    if ([string]::IsNullOrWhiteSpace($octopusRunbookRunId))\n    {\n        $queuedListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"events?regardingAny=$($OctopusDeploymentId)&spaces=$($octopusSpaceId)&documentTypes=Deployments&eventCategories=DeploymentQueued\" -spaceId $null -apiKey $apiKey -method \"GET\"\n    }\n    else\n    {\n        $queuedListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"events?regardingAny=$($octopusRunbookRunId)&spaces=$($octopusSpaceId)&documentTypes=RunbookRuns&eventCategories=RunbookRunQueued\" -spaceId $null -apiKey $apiKey -method \"GET\"\n    }\n\n    $queuedArray = @($queuedListRaw.Items)\n\n    return @{\n        CurrentDeploymentQueued = [DateTime]$queuedArray[0].Occurred\n        NumberOfQueuedEvents = $queuedArray.Length\n    }\n}\n\nfunction Get-CompletedEventInfo\n{\n    param (\n        $octopusRunbookRunId,\n        $octopusDeploymentId,\n        $octopusSpaceId,\n        $octopusUrl,\n        $apiKey\n    )\n\n    if ([string]::IsNullOrWhiteSpace($octopusRunbookRunId))\n    {      \n        $finishedEventListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"events?regardingAny=$($OctopusDeploymentId)&spaces=$($octopusSpaceId)&documentTypes=Deployments&eventCategories=DeploymentSucceeded,DeploymentFailed&skip=0&take=1\" -spaceId $null -apiKey $apiKey -method \"GET\"\n    }\n    else\n    {\n        $finishedEventListRaw = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"events?regardingAny=$($OctopusDeploymentId)&spaces=$($octopusSpaceId)&documentTypes=RunbookRuns&eventCategories=RunbookRunSucceeded,RunbookRunFailed&skip=0&take=1\" -spaceId $null -apiKey $apiKey -method \"GET\"    \n    }\n\n    $finishedEventArray = @($finishedEventListRaw.Items)\n        \n    return [DateTime]$finishedEventArray[0].Occurred\n}\n\nfunction Test-ForDuplicateRun \n{\n    param (\n        $octopusRunbookRunId,\n        $octopusDeploymentId,\n        $octopusSpaceId,\n        $queuedEventInfo,\n        $duplicateRunDetectionInMinutes,\n        $duplicateRunHandle,\n        $octopusTaskId,\n        $octopusUrl,\n        $apiKey        \n    )\n\n    Write-Host \"Checking to see if this current run is a duplicate because of deployment target triggers\"\n    $duplicateRun = $false\n\n    if ([string]::IsNullOrWhiteSpace($octopusTriggerId) -eq $false)\n    {\n        Write-Highlight \"This run was triggered by a trigger.\"\n        \n        Write-Host \"The number of items in the queued array is: $($queuedEventInfo.NumberOfQueuedEvents)\"\n        if ($queuedEventInfo.NumberOfQueuedEvents -gt 1)\n        {\n            Write-Host \"This task has been run before\"  \n\n            $previousDeploymentFinished = Get-CompletedEventInfo -octopusRunbookRunId $octopusRunbookRunId -octopusDeploymentId $octopusDeploymentId -octopusSpaceId $octopusSpaceId -octopusUrl $octopusUrl -apiKey $apiKey            \n            Write-Host \"The current deployment was queued $($queuedEventInfo.CurrentDeploymentQueued) while the previous deployment was finished $previousDeploymentFinished\"\n            \n            $queuedCompletedDifference = $queuedEventInfo.CurrentDeploymentQueued - $previousDeploymentFinished            \n            Write-Host \"The difference in minutes is $($queuedCompletedDifference.TotalMinutes)\"\n\n            if ($queuedCompletedDifference.TotalMinutes -le $duplicateRunDetectionInMinutes)\n            {\n                Write-Highlight \"The previous deployment finished in the last $($queuedCompletedDifference.TotalMinutes) minutes before this was trigger, that is extremely fast.  This is a duplicate run.\"\n                $duplicateRun = $true\n                \n                if ($duplicateRunHandle.ToLower().Trim() -eq \"cancel\")\n                {\n                    Write-Highlight \"The duplicate run handle is set to cancel, cancelling current deployment.\"\n                    Invoke-OctopusApi -octopusUrl $octopusUrl -apiKey $apiKey -spaceId $OctopusSpaceId -method \"POST\" -endPoint \"tasks/$($octopusTaskId)/cancel\"\n                    exit 0    \n                }\n                else\n                {\n                    Write-Highlight \"The duplicate run handle is set to proceed.\"\n                }\n            }\n            else\n            {\n                Write-Highlight \"The last deployment finished and this one was queued after $($queuedCompletedDifference.TotalMinutes) minutes has passed which is outside the window of $duplicateRunDetectionInMinutes minutes.  Not a duplicate.\"\n            }\n        }\t    \n        else\n        {\n            Write-Highlight \"This is the first time this release has been deployed to this environment.  This is not a duplicate run.\"\n        }\n    }\n\n    return $duplicateRun\n}\n\nfunction Start-WaitForVMSSToFinishProvisioning\n{\n    param \n    (\n        $vmssScaleSetResourceGroup,\n        $vmssScaleSetName,\n        $timeoutInMinutes\n    )\n\n    $vmssState = \"Provisioning\"\n    $startTime = Get-Date\n\n    Write-Host \"Will now wait until the VMSS has finished provisioning.\"\n\n    do\n    {\n        try\n        {\n            $vmssInfo = Get-AzVmss -ResourceGroupName $vmssScaleSetResourceGroup -VMScaleSetName $vmssScaleSetName\n        }\n        catch\n        {\n            Write-Highlight \"Unable to access the scale set $vmssScaleSetName.  Exiting step.\"\n            Write-Host $_.Exception\n            exit 0\n        }\n\n        Write-Verbose \"VMSSInfo: \"\n        Write-Verbose ($vmssInfo | ConvertTo-JSON -Depth 10)\n\n        $vmssInstanceCount = $vmssInfo.Sku.Capacity\n        $vmssState = $vmssInfo.ProvisioningState\n\n        if($vmssState.ToLower().Trim() -ne \"provisioning\")\n        {    \n            Write-Highlight \"The VMSS $vmssScaleSetName capacity is current set to $vmssInstanceCount with a provisioning state of $vmssState\"\n        }\n        else\n        {\n            Write-Host \"The VMSS is still provisioning, sleeping for 10 seconds then checking again.\"\n            Start-Sleep -Seconds 10\n        }\n        \n        $currentTime = Get-Date\n        $dateDifference = $currentTime - $startTime\n        \n        if ($dateDifference.TotalMinutes -ge $timeoutInMinutes)\n        {\n            Write-Highlight \"We have been waiting $($dateDifference.TotalMinutes) for the VMSS to finish provisioning.  Timeout reached, exiting.\"\n            exit 1\n        }   \n        \n    } While ($vmssState.ToLower().Trim() -eq \"provisioning\")\n}\n\nfunction Start-WaitForVMsInVMSSToFinishProvisioning\n{\n    param \n    (\n        $vmssScaleSetResourceGroup,\n        $vmssScaleSetName,\n        $timeoutInMinutes,\n        $timeoutErrorHandle\n    )\n\n    $vmssVmsAreProvisioning = $false\n    $startTime = Get-Date\n    $numberOfWaits = 0\n    $printVmssVmList = $true\n\n    Write-Highlight \"Checking the state of all VMs in the scale set.\"\n\n    do\n    {\n        $numberOfWaits += 1\n        $vmssVmList = Get-AzVmssVM -ResourceGroupName $vmssScaleSetResourceGroup -VMScaleSetName $vmssScaleSetName\n        \n        if ($printVmssVmList -eq $true)\n        {\n            Write-Host ($vmssVmList | ConvertTo-Json -Depth 10)\n            $printVmssVmList = $false\n        }\n        \n        $vmssVmsAreProvisioning = $false\n        foreach ($vmInfo in $vmssVmList)\n        {\n            if ($vmInfo.ProvisioningState.ToLower().Trim() -eq \"creating\")\n            {\n                $vmssVmsAreProvisioning = $true\n                break\n            }\n        }\n        \n        if ($vmssVmsAreProvisioning -eq $true)\n        {        \n            $currentTime = Get-Date\n            $dateDifference = $currentTime - $startTime\n\n            if ($dateDifference.TotalMinutes -ge $timeoutInMinutes)\n            {\n                $vmssVmsAreProvisioning = $false\n                if ($timeoutErrorHandle.ToLower().Trim() -eq \"error\")\n                {\n                    Write-Highlight \"The VMs in the scale have been provisioning for over $timeoutInMinutes.  Error handle is set to error out, exiting with an exit code of 1.\"\n                    exit 1\n                }\n                \n                Write-Highlight \"The VMs in the scale have been provisioning for over $timeoutInMinutes.  Going to move on and continue with the deployment for any VMs that have finished provisioning.\"\n            } \n            else\n            {\n                if ($numberofWaits -ge 10)\n                {\n                    Write-Highlight \"The VMs are still currently provisioning, waiting...\"\n                    $numberOfWaits = 0\n                }\n                else\n                {            \n                    Write-Host \"The VMs are still currently provisioning, sleeping for 10 seconds then checking again.\"\n                }\n                Start-Sleep -Seconds 10\n            }\n        }\n        else\n        {\n            Write-Highlight \"All the VMs in the VM Scale Set have been provisioned, reconciling them with the list in Octopus.\"\n        }         \n    } while ($vmssVmsAreProvisioning -eq $true)\n}\n\n\nWrite-Host \"ScaleSet Name: $vmssScaleSetName\"\nWrite-Host \"Resource Group Name: $vmssScaleSetResourceGroup\"\nWrite-Host \"Deployment Target Role to Search For: $roleToSearchFor\"\nWrite-Host \"Octopus Url: $octopusUrl\"\nWrite-Host \"Timeout In Minutes: $timeoutInMinutes\"\nWrite-Host \"Timeout Error Handle: $timeoutErrorHandle\"\nWrite-Host \"Duplicate Run Detection in Minutes: $duplicateRunDetectionInMinutes\"\nWrite-Host \"Duplicate Run Handle: $duplicateRunHandle\"\nWrite-host \"Exclude Old Servers: $excludeOldServers\"\n\nWrite-Host \"Space Id: $octopusSpaceId\"\nWrite-Host \"Environment Id: $octopusEnvironmentId\"\nWrite-Host \"Tenant Id: $octopusTenantId\"\nWrite-Host \"Deployment Id: $octopusDeploymentId\"\nWrite-Host \"Trigger Id: $octopusTriggerId\"\nWrite-Host \"Task Id: $octopusTaskId\"\nWrite-Host \"Runbook Run Id: $octopusRunbookRunId\"\n\nif ([string]::IsNullOrWhiteSpace($vmssScaleSetName)) { Write-Error \"Scale Set Name is required.\" }\nif ([string]::IsNullOrWhiteSpace($vmssScaleSetResourceGroup)) { Write-Error \"Resource Group Name is required.\" }\nif ([string]::IsNullOrWhiteSpace($roleToSearchFor)) { Write-Error \"Scale Set Name is required.\" }\nif ([string]::IsNullOrWhiteSpace($octopusUrl)) { Write-Error \"Octopus Url is required.\" }\nif ([string]::IsNullOrWhiteSpace($apiKey)) { Write-Error \"Octopus Api Key is required.\" }\nif ([string]::IsNullOrWhiteSpace($timeoutInMinutes)) { Write-Error \"Timeout in minutes is required.\" }\nif ([string]::IsNullOrWhiteSpace($timeoutErrorHandle)) { Write-Error \"Timeout error handle is required.\" }\nif ([string]::IsNullOrWhiteSpace($duplicateRunDetectionInMinutes)) { Write-Error \"Duplicate run detection in minutes is required.\" }\nif ([string]::IsNullOrWhiteSpace($duplicateRunHandle)) { Write-Error \"Duplicate run handle is required.\" }\nif ([string]::IsNullOrWhiteSpace($excludeOldServers)) { Write-Error \"Exclude old servers is required.\" }\n\n$queuedEventInfo = Get-QueuedEventInfo -octopusRunbookRunId $octopusRunbookRunId -octopusDeploymentId $octopusDeploymentId -octopusSpaceId $octopusSpaceId -octopusUrl $octopusUrl -apiKey $apiKey\n\nWrite-Host \"The current deployment was queued at: $($queuedEventInfo.CurrentDeploymentQueued)\"\n\n$duplicateRun = Test-ForDuplicateRun -octopusRunbookRunId $octopusRunbookRunId -octopusDeploymentId $octopusDeploymentId -octopusSpaceId $octopusSpaceId  -duplicateRunDetectionInMinutes $duplicateRunDetectionInMinutes -duplicateRunHandle $duplicateRunHandle -queuedEventInfo $queuedEventInfo -octopusTaskId $octopusTaskId -octopusUrl $octopusUrl -apiKey $apiKey\n\nStart-WaitForVMSSToFinishProvisioning -vmssScaleSetResourceGroup $vmssScaleSetResourceGroup -vmssScaleSetName $vmssScaleSetName -timeoutInMinutes $timeoutInMinutes\nStart-WaitForVMsInVMSSToFinishProvisioning -vmssScaleSetResourceGroup $vmssScaleSetResourceGroup -vmssScaleSetName $vmssScaleSetName -timeoutInMinutes $timeoutInMinutes -timeoutErrorHandle $timeoutErrorHandle\n\n$vmssVmList = Get-AzVmssVM -ResourceGroupName $vmssScaleSetResourceGroup -VMScaleSetName $vmssScaleSetName\n$vmListToReconcile = @()\n\nforeach ($vmInfo in $vmssVmList)\n{\n\tif ($vmInfo.ProvisioningState.ToLower().Trim() -ne \"failed\")\n    {\n    \t$vmListToReconcile += $vmInfo.OsProfile.ComputerName\n    }\n}\n\n$octopusDeployTargets = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"machines?environmentIds=$($octopusEnvironmentId)&roles=$($roleToSearchFor)&skip=0&take=1000\" -spaceId $octopusSpaceId -apiKey $apiKey -method \"GET\"\n$octopusDeployTargetIds = @()\n$octopusDeployTargetNames = @()\n$roleList = $roleToSearchFor.Split(\",\")\nforeach ($deploymentTarget in $octopusDeployTargets.Items)\n{\n\t$matchingRole = $true\n    foreach ($role in $roleList)\n    {\n    \tif ($deploymentTarget.Roles -notContains ($role.Trim()))\n        {\n        \tWrite-Host \"The target $($deploymentTarget.Name) does not contain the role $role.  To be considered part of the scale set it has to be assigned to all the roles $roleToSearchFor.  Excluding from reconcilation logic.\"\n            $matchingRole = $false\n            break\n        }\n    }\n    \n    if ($matchingRole -eq $false)\n    {\n    \tcontinue\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($octopusTenantId) -eq $false -and $deploymentTarget.TenantIds -notcontains $octopusTenantId)\n    {\n    \tWrite-Host \"The target $($deploymentTarget.Name) is not assigned to $octopusTenantId.  But the current run is running under the context of that tenant.  Excluding from reconcilation logic.\"\n        continue\n    }\n    \n    $hasMatchingName = $false\n    $deploymentTargetNameLowerTrim = $deploymentTarget.Name.ToLower().Trim()\n\n    Write-Host \"Attempting to do a match on name\"\n\tforeach ($vmssVM in $vmListToReconcile)\n    {\n    \t$vmssVMLowerTrim = $vmssVM.ToLower().Trim()\n\n        Write-Host \"Checking to see if $($deploymentTarget.Name) is like $vmssVM\"\n        if ($deploymentTargetNameLowerTrim -eq $vmssVMLowerTrim)\n        {\n            Write-Host \"The vmss vm name $vmssVM is equal to to the deployment target name $($deploymentTarget.Name), set matching to true\"         \n            $hasMatchingName = $true\n            break\n        }\n        if ($deploymentTargetNameLowerTrim -like \"*$vmssVMLowerTrim*\")\n        {   \n            Write-Host \"The deployment target name $($deploymentTarget.Name) contains the vmss vm name $vmssVM, set matching to true\"         \n            $hasMatchingName = $true\n            break\n        }\n        elseif ($vmssVMLowerTrim -like \"*$deploymentTargetNameLowerTrim*\")\n        {\n            Write-Host \"The vmss vm name $vmssVM contains the deployment target name $($deploymentTarget.Name), set matching to true\"\n            $hasMatchingName = $true\n            break\n        }\n    }\n    \n    if ($hasMatchingName -eq $false)\n    {\n    \tWrite-Highlight \"The deployment target $($deploymentTarget.Name) is not in the list of VMs assigned to the scale set, deleting it.\"\n        Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"machines/$($deploymentTarget.Id)\" -spaceId $octopusSpaceId -apiKey $apiKey -method \"DELETE\"\n    }\n    else\n    {\n    \tWrite-Highlight \"The deployment target $($deploymentTarget.Name) is in the list of VMS assigned to the scale set, leaving it alone.\"\n        \n        $addToOutputArray = $true\n        if ($excludeOldServers.ToLower().Trim() -eq \"yes\")\n        {\n        \tWrite-Host \"Pulling back the creation event for $($deploymentTarget.Name)\"\n        \t$creationTasks = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"events?regarding=$($deploymentTarget.Id)&spaces=$($octopusSpaceId)&includeSystem=true&eventCategories=Created\" -spaceId $null -apiKey $apiKey -method \"GET\"\n            \n            $creationDate = @($creationTasks.Items)[0].Occurred\n            Write-Host \"The deployment target $($deploymentTarget.Name) was created on $creationDate\"\n            $differenceInCreationTime = [DateTime]$queuedEventInfo.CurrentDeploymentQueued - [DateTime]$creationDate\n            \n            Write-Host \"The difference in minutes between creation date and current task queued time is $($differenceInCreationTime.TotalMinutes) minutes\" \n            if ($differenceInCreationTime.TotalMinutes -gt 3)\n            {\n            \tWrite-Host \"The deployment target $($deploymentTarget.Name) existed for more than 3 minutes before this was ran and the excludeOldServers was set to yes, removing this from the output\"\n            \t$addToOutputArray = $false\n            }\n        }\n        \n        if ($addToOutputArray -eq $true)\n        {\n\t        $octopusDeployTargetIds += $deploymentTarget.Id\n    \t    $octopusDeployTargetNames += $deploymentTarget.Name\n        }\n    }\n}\n\nWrite-Highlight \"The Azure VM Scale Set $vmssScaleSetName and Octopus Deploy target list have been successfully reconciled.\"\n\n$vmssHasServersToDeployTo = $octopusDeployTargetIds.Count -gt 0\nif ($duplicateRun -eq $true)\n{\n\tWrite-Highlight \"Duplicate run detected, therefore there are no new servers to deploy to.\"\n    $vmssHasServersToDeployTo = $false\n}\nelseif ($vmssHasServersToDeployTo -eq $false)\n{\n\tWrite-Highlight \"There are no servers to deploy to.  Exclude old servers was set to '$excludeOldServers'.  This likely means this was a scale in event or all the servers existed prior to this run.\"\n}\n\nWrite-Highlight \"Setting the output variable 'VMSSHasServersToDeployTo' to $vmssHasServersToDeployTo.\"\nSet-OctopusVariable -Name \"VMSSHasServersToDeployTo\" -Value $vmssHasServersToDeployTo\n\nWrite-Highlight \"Setting the output variable 'VMSSDeploymentTargetIds' to $($octopusDeployTargetIds -join \",\").\"\nSet-OctopusVariable -Name \"VMSSDeploymentTargetIds\" -Value ($octopusDeployTargetIds -join \",\")\n\nWrite-Highlight \"Setting the output variable 'VMSSDeploymentTargetNames' to $($octopusDeployTargetNames -join \",\").\"\nSet-OctopusVariable -Name \"VMSSDeploymentTargetNames\" -Value ($octopusDeployTargetNames -join \",\")"
-    },
-    "Parameters": [
-      {
-        "Id": "9f9bc9fb-fa96-41ab-aa06-ad0dd68ff038",
-        "Name": "VMSS.ScaleSet.Name",
-        "Label": "VMSS Name",
-        "HelpText": "**Required**\n\nThe name of the Azure Virtual Machine Scale Set",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "32939873-a965-46ae-915f-f94d93f94c0b",
-        "Name": "VMSS.ResourceGroup.Name",
-        "Label": "VMSS Resource Group Name",
-        "HelpText": "**Required**\n\nThe name of the resource group where the VMSS is located.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "571df393-6353-4f12-96cd-c92f3a5e1452",
-        "Name": "VMSS.Azure.Account",
-        "Label": "Azure Account",
-        "HelpText": "**Required**\n\nThe Azure Account to use when querying the VMSS.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "b03d1bf3-76f8-4a3c-917a-60d5e19a15f4",
-        "Name": "VMSS.DeploymentTarget.Roles",
-        "Label": "Deployment Target Roles",
-        "HelpText": "**Required**\n\nA comma-separated list of deployment target roles to filter your deployment targets by.  These roles are how this step will determine which machines to reconcile.\n\nIf you supply multiple roles, for example `todo-web-server,todo-virtual-machine-scale-set` the deployment targets have to be assigned `todo-web-server` AND `todo-virtual-machine-scaleset` roles for the target to be considered.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "757ca61b-d15b-4dbb-911a-b3f4dc0258b5",
-        "Name": "VMSS.Octopus.Url",
-        "Label": "Octopus URL",
-        "HelpText": "**Required**\n\nThe URL of the Octopus Server to query against.  Example: `https://samples.octopus.app`.",
-        "DefaultValue": "#{Octopus.Web.ServerUri}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7b070182-e79b-48a0-966a-39d332802b60",
-        "Name": "VMSS.Octopus.ApiKey",
-        "Label": "Octopus API Key",
-        "HelpText": "**Required**\n\nAPI Key of a service account that has permissions to:\n- Query deployment targets, environments, and tenants. \n- Query events (audit history) \n- Delete deployment targets\n\nAssigning the service account to a team with `Project Viewer` and `Environment Manager` roles will work.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "6e0f8635-70ba-4b8a-b5b4-909dba3f9fd8",
-        "Name": "VMSS.Timeout.Value",
-        "Label": "Timeout (In Minutes)",
-        "HelpText": "**Required**\n\nHow long this step will wait (in minutes) for the VMSS and VMs in the VMSS to finish being created.",
-        "DefaultValue": "30",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0392f153-73b0-44d4-9181-4f366c9012f7",
-        "Name": "VMSS.Timeout.ErrorHandle",
-        "Label": "Timeout Error",
-        "HelpText": "**Required**\n\nWhat will happen when a timeout occurs.\n\n- `Proceed`: The script will reconcile the VMs it can and then finish.  No error thrown.  \n- `Error`: Will throw an error and it will stop the deployment from proceeding.\n\nThe default is `Proceed`",
-        "DefaultValue": "Proceed",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Proceed|Proceed\nError|Error"
-        }
-      },
-      {
-        "Id": "80ef4fb9-c773-4d0a-82af-efdfb302e58f",
-        "Name": "VMSS.Duplicate.TimeInMinutes",
-        "Label": "Duplicate Run Time Allowance (in Minutes)",
-        "HelpText": "**Required**\n\nThis step is designed to wait for VMSS to finish scaling out.  However, Octopus isn't aware of VMSS and may attempt to run the same deployment multiple times as new targets are \"discovered.\"\n\nTypically, when this happens, a deployment is queued within a few minutes of the previous one finishing.  When that happens this step will treat that as a duplicate run.  \n\nThis setting indicates the number of minutes that must pass before a duplicate run is found.  The default is `3` minutes.",
-        "DefaultValue": "3",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0eb3bed8-9259-440e-bff0-cb86af7da52e",
-        "Name": "VMSS.Duplicate.Handle",
-        "Label": "Duplicate Run Adjustment",
-        "HelpText": "**Required**\n\nWhat the step will do when a duplicate run is found.  The two options are:\n\n- `Cancel`: cancel the current runbook run or deployment.\n- `Proceed`: continue on with the current runbook run or deployment.\n\nThe default is `Proceed`.",
-        "DefaultValue": "Proceed",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Cancel|Cancel\nProceed|Proceed"
-        }
-      },
-      {
-        "Id": "adaf6a8c-453f-4b69-9ba6-f6a54b4f5bb9",
-        "Name": "VMSS.OldServers.ExcludeFromOutput",
-        "Label": "Exclude Pre-Existing Servers from Output",
-        "HelpText": "**Required**\n\nOld servers are any servers that existed prior to scaling out the VMSS.  \n\nIf this step is run in a deployment target trigger it will pull back all the machines in a scale set and return them in an output variable.  Depending on how you use that list, this could result in redeployment.\n\nYou can exclude pre-existing servers by setting this value to `Yes`.  The default is `No`.",
-        "DefaultValue": "No",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "No|No\nYes|Yes"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-07-26T19:15:02.718Z",
-      "OctopusVersion": "2021.2.6259",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "BobJWalker",
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-create-containerapp-environment.json b/step-templates/azure-create-containerapp-environment.json
deleted file mode 100644
index b4f869e93..000000000
--- a/step-templates/azure-create-containerapp-environment.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "9b4b9fdc-2f97-4507-8df5-a0c1dd7464a5",
-  "Name": "Azure - Create Container App Environment",
-  "Description": "Creates a Container App Environment if it doesn't exist.  An output variable called `ManagedEnvironmentId` is created which holds the Id.",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Write-Host \"Saving module $PowerShellModuleName to temporary folder ...\"\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n    Write-Host \"Save successful!\"\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows)\n{\n\t# Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PWD/Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([IO.Path]::PathSeparator)$env:PSModulePath\"\n$azureModule = \"Az.App\"\n\n# Get variables\n$templateAzureAccountClient = $OctopusParameters['Template.Azure.Account.ClientId']\n$templateAzureAccountPassword = $OctopusParameters['Template.Azure.Account.Password']\n$templateAzureAccountTenantId = $OctopusParameters['Template.Azure.Account.TenantId']\n$templateAzureResourceGroup = $OctopusParameters['Template.Azure.ResourceGroup.Name']\n$templateAzureSubscriptionId = $OctopusParameters['Template.Azure.Account.SubscriptionId']\n$templateEnvironmentName = $OctopusParameters['Template.ContainerApp.Environment.Name']\n$templateAzureLocation = $OctopusParameters['Template.Azure.Location.Name']\n$templateAzureJWTToken = $OctopusParameters['Template.Azure.Account.JWTToken']\n\n# Check for required PowerShell module\nWrite-Host \"Checking for module $azureModule ...\"\n\nif ((Get-ModuleInstalled -PowerShellModuleName $azureModule) -eq $false)\n{\n\t# Install the module\n    Install-PowerShellModule -PowerShellModuleName $azureModule -LocalModulesPath $LocalModules\n}\n\n# Import the necessary module\nWrite-Host \"Importing module $azureModule ...\"\nImport-Module $azureModule\n\n# Check to see if the account was specified\nif (![string]::IsNullOrWhitespace($templateAzureAccountClient))\n{\n\t# Login using the provided account\n    Write-Host \"Logging in as specified account ...\"\n\n    # Check to see if jwt token was provided\n    if (![string]::IsNullOrWhitespace($templateAzureJWTToken))\n    {\n        # Log in with OIDC\n        Write-Host \"Logging in using OIDC ...\"\n\n        # Log in\n        Connect-AzAccount -FederatedToken $templateAzureJWTToken -ApplicationId $templateAzureAccountClient -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null    \n    }\n\n    if (![string]::IsNullOrWhitespace($templateAzureAccountPassword))\n    {\n        # Log in with Azure Service Principal\n        Write-Host \"Logging in with Azure Service Principal ...\"\n        \n        # Create credential object for az module\n\t    $securePassword = ConvertTo-SecureString $templateAzureAccountPassword -AsPlainText -Force\n\t    $azureCredentials = New-Object System.Management.Automation.PSCredential ($templateAzureAccountClient, $securePassword)  \n\n        Connect-AzAccount -Credential $azureCredentials -ServicePrincipal -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null\n    }    \n    \n    Write-Host \"Login successful!\"\n}\nelse\n{\n\tWrite-Host \"Using machine Managed Identity ...\"\n    Connect-AzAccount -Identity | Out-Null\n    \n    # Get Identity context\n    $identityContext = Get-AzContext\n    \n    # Set variables\n    $templateAzureSubscriptionId = $identityContext.Subscription\n    \n    if ([string]::IsNullOrWhitespace($templateAzureAccountTenantId))\n    {\n    \t$templateAzureAccountTenantId = $identityContext.Tenant\n    }\n    \n    Set-AzContext -Tenant $templateAzureAccountTenantId | Out-Null\n\n\tWrite-Host \"Successfully set context for Managed Identity!\"\n}\n\n# Check to see if Container App Environment already exists\nWrite-Host \"Getting list of existing environments ...\"\n$existingEnvironments = Get-AzContainerAppManagedEnv -ResourceGroupName $templateAzureResourceGroup -SubscriptionId $templateAzureSubscriptionId\n$managedEnvironment = $null\n\nif (($null -ne $existingEnvironments) -and ($null -ne ($existingEnvironments | Where-Object {$_.Name -eq $templateEnvironmentName})))\n{\n\tWrite-Host \"Environment $templateEnvironmentName already exists.\"\n    $managedEnvironment = $existingEnvironments | Where-Object {$_.Name -eq $templateEnvironmentName}\n}\nelse\n{\n\tWrite-Host \"Environment $templateEnvironmentName not found, creating ...\"\n    $managedEnvironment = New-AzContainerAppManagedEnv -EnvName $templateEnvironmentName -ResourceGroupName $templateAzureResourceGroup -Location $templateAzureLocation -AppLogConfigurationDestination \"\" # Empty AppLogConfigurationDestination is workaround for properties issue caused by marking this as required\n}\n\n# Set output variable\nWrite-Host \"Setting output variable ManagedEnvironmentId to $($managedEnvironment.Id)\"\nSet-OctopusVariable -name \"ManagedEnvironmentId\" -value \"$($managedEnvironment.Id)\""
-  },
-  "Parameters": [
-    {
-      "Id": "4e3ee370-7f62-4d00-a8c2-bb8717b5d681",
-      "Name": "Template.Azure.ResourceGroup.Name",
-      "Label": "Azure Resource Group Name",
-      "HelpText": "Provide the resource group name to create the environment in.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "11ccbfe4-f170-4d25-bc55-e52327680613",
-      "Name": "Template.Azure.Account.SubscriptionId",
-      "Label": "Azure Account Subscription Id",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `SubscriptionNumber` property to for this entry.  Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.SubscriptionNumber}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e1cf9fa6-e8b9-475a-9800-ef688f1e7ad5",
-      "Name": "Template.Azure.Account.ClientId",
-      "Label": "Azure Account Client Id",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Client` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Client}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4dbcd5a4-6d41-4ae0-ac69-76e27fc6bd28",
-      "Name": "Template.Azure.Account.TenantId",
-      "Label": "Azure Account Tenant Id",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `TenantId` property to for this entry.   If blank, it will use the Managed Identity tenant.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.TenantId}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "99a141f5-2fa1-40b9-b04e-8d37fe259a27",
-      "Name": "Template.Azure.Account.Password",
-      "Label": "Azure Account Password",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Password` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Password}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "a4a216e0-0ba5-4dd9-b759-6c7121eda110",
-      "Name": "Template.Azure.Account.JWTToken",
-      "Label": "Azure Account JWT Token",
-      "HelpText": "The JWT token of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `OpenIdConnect.Jwt` property to for this entry.   Leave blank if you're using an Azure Service Principal account type.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.OpenIdConnect.Jwt}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },    
-    {
-      "Id": "66f5ee93-3ba9-44e7-8a04-50535b1907cb",
-      "Name": "Template.ContainerApp.Environment.Name",
-      "Label": "Container App Environment Name",
-      "HelpText": "The name of the container app environment to create.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "92daa091-2b90-4615-9a2e-ffc52275ddb4",
-      "Name": "Template.Azure.Location.Name",
-      "Label": "Azure Location",
-      "HelpText": "The location in which to create the container app environment.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2026-01-28T16:54:33.969Z",
-    "OctopusVersion": "2026.1.5902",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "azure"
-}
diff --git a/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt.json b/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt.json
deleted file mode 100644
index 88c7f4308..000000000
--- a/step-templates/cyberark-secretsmanager-retrieve-secrets-jwt.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "Id": "4b30f084-fb30-4c12-b0c4-0cd4eab05793",
-  "Name": "CyberArk Secrets Manager - Retrieve Secrets (JWT)",
-  "Description": "This step retrieves one or more secrets from CyberArk Secrets Manager and creates sensitive output variables for each value retrieved. It uses the JWT authenticator in Secrets Manager in combination with a Generic OIDC Account configured in Octopus to authenticate the workload.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python",
-    "Octopus.Action.Script.ScriptBody": "import subprocess\nimport sys\nimport tempfile\n\n# Install Conjur SDK\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'conjur-api', '--disable-pip-version-check'])\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'async-timeout', '--disable-pip-version-check'])\n\n# Conjur SDK imports\nfrom conjur_api.models import SslVerificationMode, ConjurConnectionInfo\nfrom conjur_api.providers import JWTAuthenticationStrategy\nfrom conjur_api import Client\nfrom conjur_api.errors.errors import HttpStatusError\n\n# Fetch configuration values\ndef retrieve_inputs():\n    inputs = {}\n    inputs[\"service_id\"] = get_octopusvariable('CyberArk.SecretsManager.ServiceId')\n    inputs[\"account\"] = get_octopusvariable('CyberArk.SecretsManager.Account')\n    inputs[\"url\"] = get_octopusvariable('CyberArk.SecretsManager.Url')\n    inputs[\"token\"] = get_octopusvariable('CyberArk.SecretsManager.Jwt.OpenIdConnect.Jwt')\n    inputs[\"variables\"] = get_octopusvariable('CyberArk.SecretsManager.Variables')\n    inputs[\"ca_bundle\"] = get_octopusvariable('CyberArk.SecretsManager.Certificate')\n    inputs[\"print_outputs\"] = get_octopusvariable('CyberArk.SecretsManager.PrintVariableNames')\n    return inputs\n\n# Validate the required inputs are not empty\ndef validate_inputs(inputs):\n    if not inputs[\"service_id\"]:\n        raise ValueError(\"Service ID is required.\")\n    if not inputs[\"account\"]:\n        raise ValueError(\"Account is required.\")\n    if not inputs[\"url\"]:\n        raise ValueError(\"Conjur URL is required.\")\n    if not inputs[\"token\"]:\n        raise ValueError(\"JWT token is required.\")\n    if not inputs[\"variables\"]:\n        raise ValueError(\"At least one variable must be specified.\")\n\n# Parse the requested input/output variables\n# If no output variable name is provided, the Conjur var ID will be used\ndef parse_variables(variables):\n    var_map = {}\n    for line_number, line in enumerate(variables.strip().splitlines(), start=1):\n        line = line.strip()\n        if not line:\n            continue\n\n        parts = [part.strip() for part in line.split('|')]\n        input_var = parts[0]\n        if len(parts) == 1:\n            output_var = input_var\n        elif len(parts) == 2:\n            output_var = parts[1]\n        else:\n            raise ValueError(f\"Variables line {line_number} has too many '|' characters: '{line}'\")\n\n        # Basic validations\n        if not input_var:\n            raise ValueError(f\"Variables line {line_number} is missing an input variable name: '{line}'\")\n        if ' ' in input_var or ' ' in output_var:\n            raise ValueError(f\"Variables line {line_number} has illegal spaces in a variable name: '{line}'\")\n\n        # Warn if any duplicate output vars exist\n        if output_var in var_map.values():\n            print(f\"WARN: Two or more secrets mapped to the same output variable: `{output_var}`. The earlier value will be overwritten.\")\n        var_map[input_var] = output_var\n    return var_map\n\n# Configure a Conjur client for JWT authentication\ndef create_conjur_client(inputs):\n    ssl_verification_mode = SslVerificationMode.TRUST_STORE\n    cert_file = None\n    # If a server certificate or CA was provided, use that instead of the default trust store\n    if inputs[\"ca_bundle\"]:\n        with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_cert_file:\n            temp_cert_file.write(inputs[\"ca_bundle\"])\n            cert_file = temp_cert_file.name\n        ssl_verification_mode = SslVerificationMode.CA_BUNDLE\n\n    connection_info = ConjurConnectionInfo(conjur_url=inputs[\"url\"],\n                                           account=inputs[\"account\"],\n                                           service_id=inputs[\"service_id\"],\n                                           cert_file=cert_file)\n    jwt_provider = JWTAuthenticationStrategy(inputs[\"token\"])\n    return Client(connection_info,\n                    authn_strategy=jwt_provider,\n                    ssl_verification_mode=ssl_verification_mode,\n                    async_mode=False)\n\n# Retrieve requested secrets from Conjur and set them as sensitive Octopus variables\ndef retrieve_secrets(var_map, client, inputs):\n    variable_ids = list(var_map.keys())\n    print(f\"INFO: Attempting to authenticate and retrieve {len(variable_ids)} secrets...\")\n    try:\n        retrieval_response = client.get_many(*variable_ids)\n    except HttpStatusError as e:\n        if e.response is not None:\n            if e.status == 401:\n                print(\"ERROR: Authentication failed. Please validate the JWT and authenticator configuration.\")\n            elif e.status == 403:\n                print(\"ERROR: Access denied. Please ensure the role has permissions to access the requested variables.\")\n            elif e.status == 404:\n                print(\"ERROR: One or more requested variables not found.\")\n        raise\n\n    print(\"INFO: Successfully retrieved secrets.\")\n\n    # Set the output variables\n    for input_var, output_var in var_map.items():\n        if input_var in retrieval_response:\n            set_octopusvariable(output_var, retrieval_response[input_var], True)\n\n    # Print a list output variable names if requested\n    if inputs[\"print_outputs\"]:\n        output_var_names = list(dict.fromkeys(var_map.values()))\n        print(f\"INFO: Populated sensitive output variables: {', '.join(output_var_names)}\")\n\n# Main execution starts here - this has to be inline to run in the Octopus environment\ninputs = retrieve_inputs()\nvalidate_inputs(inputs)\nvar_map = parse_variables(inputs[\"variables\"])\nclient = create_conjur_client(inputs)\nretrieve_secrets(var_map, client, inputs)\n"
-  },
-  "Parameters": [
-    {
-      "Id": "e750e1fc-3ffc-40cb-9d74-a2519d5451c1",
-      "Name": "CyberArk.SecretsManager.Url",
-      "Label": "Secrets Manager URL",
-      "HelpText": "The URL of the Secrets Manager instance.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "68b8272e-17e4-46ee-8042-09780a763530",
-      "Name": "CyberArk.SecretsManager.Account",
-      "Label": "Secrets Manager Account",
-      "HelpText": "The Secrets Manager account.",
-      "DefaultValue": "conjur",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8ac15e8c-ba7f-4b20-8329-52df64f69729",
-      "Name": "CyberArk.SecretsManager.ServiceId",
-      "Label": "Authenticator Service ID",
-      "HelpText": "The service ID of the authn-jwt instance to be used for authentication to Secrets Manager.",
-      "DefaultValue": "octopus",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "42d42fe0-6d39-4970-be62-8ad34f611462",
-      "Name": "CyberArk.SecretsManager.Jwt",
-      "Label": "OIDC Account",
-      "HelpText": "The Generic OIDC Account configured in Octopus to generate JWT credentials for workload authentication to Secrets Manager.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "GenericOidcAccount"
-      }
-    },
-    {
-      "Id": "fe47f2ea-efa9-4468-b837-79a52ce3c22e",
-      "Name": "CyberArk.SecretsManager.Variables",
-      "Label": "Secrets Manager Variables",
-      "HelpText": "Specify the names of the secrets to be returned from Secrets Manager, in the format:\n\n`VariableID | OutputVariableName` where:\n\n* VariableID is the Variable ID of the secret to be retrieved from Secrets Manager.\n* OutputVariableName is the optional Octopus output variable name to store the secret's value in. If this value isn't specified, an output name will be generated dynamically based on the Variable ID.\n\n**Note:** Multiple Variable IDs can be retrieved by entering each one on a new line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "8f8672c4-4e93-44b0-b7a7-ecf77e45f919",
-      "Name": "CyberArk.SecretsManager.Certificate",
-      "Label": "Trusted Server Certificate (Optional)",
-      "HelpText": "CA bundle or server certificate to establish a trusted TLS connection with Secrets Manager.\n\nYou can also use this to trust self-signed certificates.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "5ae5bb25-5f20-46d9-af93-90a493f75123",
-      "Name": "CyberArk.SecretsManager.PrintVariableNames",
-      "Label": "Print output variable names",
-      "HelpText": "Write out the Octopus output variable names to the task log.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-05-21T14:32:50.303Z",
-    "OctopusVersion": "2025.2.10930",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "gl-johnson",
-  "Category": "cyberark"
-}
diff --git a/step-templates/file-system-rclone.json b/step-templates/file-system-rclone.json
deleted file mode 100644
index 2121112f4..000000000
--- a/step-templates/file-system-rclone.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "Id": "fe8bf996-4cdf-4857-9c26-5aefb4fb4025",
-    "Name": "File System - rclone (bash)",
-    "Description": "Runs [rclone](https://rclone.org/) on a target or worker.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "Bash",
-        "Octopus.Action.Script.ScriptBody": "rclonePath=$(get_octopusvariable \"Rclone.Path\")\nrcloneCommand=$(get_octopusvariable \"Rclone.Command\")\nrcloneParameters=$(get_octopusvariable \"Rclone.Parameters\")\nprintCommand=$(get_octopusvariable \"Rclone.PrintCommand\")\n\nif [ ! -z \"$rclonePath\" ] ; then\n   \tPATH=$rclonePath:$PATH\nfi\n\nif [ -z \"$rcloneCommand\" ] ; then\n   \tfail_step \"Command is a required paremeter.\"\nfi\n\nif [ \"$printCommand\" = \"True\" ] ; then\n    set -x\nfi\n\nrclone $rcloneCommand ${rcloneParameters:+ $rcloneParameters} 2>&1\n\n# Check for error\nif [[ $? -ne 0 ]]\nthen\n    fail_step \"The rclone command resulted in errors. Please review the logs above.\"\nfi\n"
-    },
-    "Parameters": [
-        {
-            "Id": "b5c7fe5c-062e-4c69-9746-e6275f8d5145",
-            "Name": "Rclone.Path",
-            "Label": "Executable Path",
-            "HelpText": "Optional path to `rclone` if it is not in the environment's path variable.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "aba94574-2ab4-4657-94d6-3ae47cf6cd38",
-            "Name": "Rclone.Command",
-            "Label": "Command",
-            "HelpText": "The `rclone` [command](https://rclone.org/commands/) to run.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "ce6fa762-d494-4e3b-8367-edfced04bc45",
-            "Name": "Rclone.Parameters",
-            "Label": "Parameters",
-            "HelpText": "The parameters to provide to the `rclone` command.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "7647af01-707d-4a02-8f90-37fc943bdece",
-            "Name": "Rclone.PrintCommand",
-            "Label": "Print Command?",
-            "HelpText": null,
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "$Meta": {
-        "ExportedAt": "2020-06-15T21:16:20.733Z",
-        "OctopusVersion": "2020.2.11",
-        "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "ryanrousseau",
-    "Category": "filesystem"
-}
diff --git a/step-templates/file-system-rsync.json b/step-templates/file-system-rsync.json
deleted file mode 100644
index c0d5d15d2..000000000
--- a/step-templates/file-system-rsync.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "Id": "d8dfa484-59ed-491f-a22a-3098d4c2a6be",
-    "Name": "File System - rsync (bash)",
-    "Description": "Run [rsync](http://manpages.org/rsync) on a target or worker.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "Bash",
-        "Octopus.Action.Script.ScriptBody": "rsyncPath=$(get_octopusvariable \"Rsync.Path\")\nrsyncOptions=$(get_octopusvariable \"Rsync.Options\")\nrsyncSource=$(get_octopusvariable \"Rsync.Source\")\nrsyncDestination=$(get_octopusvariable \"Rsync.Destination\")\nprintCommand=$(get_octopusvariable \"Rsync.PrintCommand\")\n\nif [ ! -z \"$rsyncPath\" ] ; then\n   \tPATH=$rsyncPath:$PATH\nfi\n\nif [ \"$printCommand\" = \"True\" ] ; then\n    set -x\nfi\n\nrsync ${rsyncOptions:+ $rsyncOptions} ${rsyncSource:+ $rsyncSource} ${rsyncDestination:+ $rsyncDestination}"
-    },
-    "Parameters": [
-        {
-            "Id": "da47b530-69dd-482c-9b97-f9c0b1dcca5c",
-            "Name": "Rsync.Path",
-            "Label": "Executable Path",
-            "HelpText": "Optional path to `rsync` if it is not in the environment's path variable.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "7d315721-f2b2-4f0b-8eb1-3b946f711a59",
-            "Name": "Rsync.Options",
-            "Label": "Options",
-            "HelpText": "[Options](http://manpages.org/rsync#options) to provide to `rsync`.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "a908f5a3-8284-42b9-992d-528993c5b55f",
-            "Name": "Rsync.Source",
-            "Label": "Source",
-            "HelpText": "The location of the source files to copy.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "366ad01c-1ef9-408e-bbed-58d0a7a3e4db",
-            "Name": "Rsync.Destination",
-            "Label": "Destination",
-            "HelpText": "The destination to copy the source files to.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "d969ceca-d823-4967-afbe-80672cd55051",
-            "Name": "Rsync.PrintCommand",
-            "Label": "Print Command?",
-            "HelpText": "Prints the command in the logs using `set -x`. This will cause a warning when the step runs.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "$Meta": {
-        "ExportedAt": "2020-06-15T21:11:29.969Z",
-        "OctopusVersion": "2020.2.11",
-        "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "ryanrousseau",
-    "Category": "filesystem"
-}
diff --git a/step-templates/firebase-deploy.json b/step-templates/firebase-deploy.json
deleted file mode 100644
index aa0820ae5..000000000
--- a/step-templates/firebase-deploy.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "Id": "ac0dee2d-dcbe-42aa-96c6-bb6c644183b4",
-    "Name": "Firebase - Deploy",
-    "Description": "Deploys the contents of a package to a Firebase project using the [Firebase CLI deploy command](https://firebase.google.com/docs/cli/#deployment).",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-        {
-            "Id": "343306b7-6997-429f-9ed5-4214ca4d32ac",
-            "Name": "FirebaseDeploy.Package",
-            "PackageId": null,
-            "FeedId": null,
-            "AcquisitionLocation": "Server",
-            "Properties": {
-                "Extract": "True",
-                "SelectionMode": "deferred",
-                "PackageParameterName": "FirebaseDeploy.Package"
-            }
-        }
-    ],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "Bash",
-        "Octopus.Action.Script.ScriptBody": "packagePath=$(get_octopusvariable \"Octopus.Action.Package[FirebaseDeploy.Package].ExtractedPath\")\ntoken=$(get_octopusvariable \"FirebaseDeploy.CIToken\")\npublic=$(get_octopusvariable \"FirebaseDeploy.Public\")\nmessage=$(get_octopusvariable \"FirebaseDeploy.Message\")\nforce=$(get_octopusvariable \"FirebaseDeploy.Force\")\nonly=$(get_octopusvariable \"FirebaseDeploy.Only\")\nexcept=$(get_octopusvariable \"FirebaseDeploy.Except\")\nprintCommand=$(get_octopusvariable \"FirebaseDeploy.PrintCommand\")\nfirebasePath=$(get_octopusvariable \"FirebaseDeploy.FirebasePath\")\n\nif [ ! -z \"$firebasePath\" ] ; then\n   \tPATH=$firebasePath:$PATH\nfi\n\nif [ \"$force\" = \"True\" ] ; then\n    force=true\nelse\n    force=\nfi\n\nif [ \"$printCommand\" = \"True\" ] ; then\n    set -x\nfi\n\ncd $packagePath\n\nfirebase deploy ${public:+ -p \"$public\"} ${message:+ -m \"$message\"} ${force:+ -f} ${only:+ --only \"$only\"} ${except:+ --except \"$except\"} --token $token"
-    },
-    "Parameters": [
-        {
-            "Id": "55ddf9fd-bf2f-4148-912b-bc599c5f6ec6",
-            "Name": "FirebaseDeploy.Package",
-            "Label": "Package",
-            "HelpText": "The package containing the Firebase project being deployed.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Package"
-            }
-        },
-        {
-            "Id": "46874eaf-7632-40d1-bd46-4627bd0f2d0c",
-            "Name": "FirebaseDeploy.FirebasePath",
-            "Label": "Firebase Path",
-            "HelpText": "The path to the directory containing the Firebase CLI, if not in $PATH.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c982c1f3-a91e-4dd4-89a6-db5d99b08347",
-            "Name": "FirebaseDeploy.CIToken",
-            "Label": "CI Token",
-            "HelpText": "A CI token generated by the [Firebase CLI](https://firebase.google.com/docs/cli/#cli-ci-systems)",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "56628161-6b99-4ca3-9c4a-1234117a0018",
-            "Name": "FirebaseDeploy.Public",
-            "Label": "Public Path",
-            "HelpText": "Override the Hosting public directory specified in firebase.json.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "e7c41fcb-dd74-4ba2-9671-fa7313d632b8",
-            "Name": "FirebaseDeploy.Message",
-            "Label": "Message",
-            "HelpText": "An optional message describing this deploy.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "6a88a428-a538-4292-b6ee-b843c28887f3",
-            "Name": "FirebaseDeploy.Force",
-            "Label": "Force?",
-            "HelpText": "Delete Cloud Functions missing from the current working directory without confirmation.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "c0debcc3-6708-4d3c-977b-880811b48594",
-            "Name": "FirebaseDeploy.Only",
-            "Label": "Only Targets",
-            "HelpText": "Only deploy to specified, comma-separated targets (e.g. \"hosting,storage\"). For functions, can specify filters with colons to scope function deploys to only those functions (e.g. \"--only functions:func1,functions:func2\"). When filtering based on export groups (the exported module object keys), use dots to specify group names (e.g. \"--only functions:group1.subgroup1,functions:group2)\".",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "e62a6b0f-6331-4a63-a908-c759798ccd1c",
-            "Name": "FirebaseDeploy.Except",
-            "Label": "Except Targets",
-            "HelpText": "Deploy to all targets except specified (e.g. \"database\").",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "e2e0ac14-e5e9-4b3c-bdc1-b1da3d7be184",
-            "Name": "FirebaseDeploy.PrintCommand",
-            "Label": "Print Command?",
-            "HelpText": "Prints the command in the logs using `set -x`. This will cause a warning when the step runs.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "$Meta": {
-        "ExportedAt": "2020-06-08T19:44:37.662Z",
-        "OctopusVersion": "2020.2.11",
-        "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "ryanrousseau",
-    "Category": "firebase"
-}
diff --git a/step-templates/github-create-repo.json b/step-templates/github-create-repo.json
deleted file mode 100644
index 5e11c0f99..000000000
--- a/step-templates/github-create-repo.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "Id": "493fa039-fd5c-47d2-b830-63cc32a19d04",
-  "Name": "GitHub - Create Repository",
-  "Description": "This step creates a new GitHub repository if it does not exist.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python",
-    "Octopus.Action.Script.ScriptBody": "# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\n# having to use a regular user account.\nimport subprocess\nimport sys\n\n# Install our own dependencies\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\n\nimport json\nimport subprocess\nimport sys\nimport os\nimport urllib.request\nimport base64\nimport re\nimport jwt\nimport time\nimport argparse\nimport platform\nfrom urllib.request import urlretrieve\n\n# If this script is not being run as part of an Octopus step, setting variables is a noop\nif 'set_octopusvariable' not in globals():\n    def set_octopusvariable(variable, value):\n        pass\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif 'printverbose' not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    output_no_ansi = re.sub(r'\\x1b\\[[0-9;]*m', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\n            append_to_path=None):\n    \"\"\"\n        The execute method provides the ability to execute external processes while capturing and returning the\n        output to std err and std out and exit code.\n    \"\"\"\n\n    my_env = os.environ.copy() if env is None else env\n\n    if append_to_path is not None:\n        my_env[\"PATH\"] = append_to_path + os.pathsep + my_env['PATH']\n\n    process = subprocess.Popen(args,\n                               stdout=subprocess.PIPE,\n                               stderr=subprocess.PIPE,\n                               stdin=open(os.devnull),\n                               text=True,\n                               cwd=cwd,\n                               env=my_env)\n    stdout, stderr = process.communicate()\n    retcode = process.returncode\n\n    if not retcode == 0 and raise_on_non_zero:\n        raise Exception('command returned exit code ' + retcode)\n\n    if print_args is not None:\n        print_output(' '.join(args))\n\n    if print_output is not None:\n        print_output(stdout)\n        print_output(stderr)\n\n    return stdout, stderr, retcode\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION]',\n        description='Create a GitHub repo'\n    )\n    parser.add_argument('--new-repo-name', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(\n                            'Git.Url.NewRepoName') or get_octopusvariable_quiet('Octopus.Project.Name'))\n    parser.add_argument('--new-repo-name-prefix', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(\n                            'Git.Url.NewRepoNamePrefix'))\n    parser.add_argument('--git-organization', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(\n                            'Git.Url.Organization'))\n    parser.add_argument('--github-app-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\n    parser.add_argument('--github-app-installation-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\n                            'GitHub.App.InstallationId'))\n    parser.add_argument('--github-app-private-key', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\n                            'GitHub.App.PrivateKey'))\n    parser.add_argument('--github-access-token', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGithubRepo.Git.Credentials.AccessToken') or get_octopusvariable_quiet(\n                            'Git.Credentials.AccessToken'),\n                        help='The git password')\n\n    return parser.parse_known_args()\n\n\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\n    # Generate the tokens used by git and the GitHub API\n    app_id = github_app_id\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\n\n    payload = {\n        # Issued at time\n        'iat': int(time.time()),\n        # JWT expiration time (10 minutes maximum)\n        'exp': int(time.time()) + 600,\n        # GitHub App's identifier\n        'iss': app_id\n    }\n\n    # Create JWT\n    jwt_instance = jwt.JWT()\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\n\n    # Create access token\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\n    headers = {\n        'Authorization': 'Bearer ' + encoded_jwt,\n        'Accept': 'application/vnd.github+json',\n        'X-GitHub-Api-Version': '2022-11-28'\n    }\n    request = urllib.request.Request(url, headers=headers, method='POST')\n    response = urllib.request.urlopen(request)\n    response_json = json.loads(response.read().decode())\n    return response_json['token']\n\n\ndef generate_auth_header(token):\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\n    return 'Basic ' + auth.decode('ascii')\n\n\ndef verify_new_repo(token, cac_org, new_repo):\n    # Attempt to view the new repo\n    try:\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\n        headers = {\n            'Accept': 'application/vnd.github+json',\n            'Authorization': 'Bearer ' + token,\n            'X-GitHub-Api-Version': '2022-11-28'\n        }\n        request = urllib.request.Request(url, headers=headers)\n        urllib.request.urlopen(request)\n        return True\n    except:\n        return False\n\n\ndef create_new_repo(token, cac_org, new_repo):\n    # If we could not view the repo, assume it needs to be created.\n    # https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#create-an-organization-repository\n    # Note you have to use the token rather than the JWT:\n    # https://stackoverflow.com/questions/39600396/bad-credentails-for-jwt-for-github-integrations-api\n\n    headers = {\n        'Authorization': 'token ' + token,\n        'Content-Type': 'application/json',\n        'Accept': 'application/vnd.github+json',\n        'X-GitHub-Api-Version': '2022-11-28',\n    }\n\n    try:\n        # First try to create an organization repo:\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos#create-an-organization-repository\n        url = 'https://api.github.com/orgs/' + cac_org + '/repos'\n        body = {'name': new_repo}\n        request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\n        urllib.request.urlopen(request)\n    except urllib.error.URLError as ex:\n        # Then fall back to creating a repo for the user:\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos?apiVersion=2022-11-28#create-a-repository-for-the-authenticated-user\n        if ex.code == 404:\n            url = 'https://api.github.com/user/repos'\n            body = {'name': new_repo}\n            request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\n            urllib.request.urlopen(request)\n        else:\n            raise ValueError(\"Failed to create thew new repository. This could indicate bad credentials.\") from ex\n\n\ndef is_windows():\n    return platform.system() == 'Windows'\n\n\nparser, _ = init_argparse()\n\nif not parser.github_access_token.strip() and not (\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\n    print(\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\")\n    sys.exit(1)\n\nif not parser.new_repo_name.strip():\n    print(\"You must define the new repo name\")\n    sys.exit(1)\n\n# The access token is generated from a github app or supplied directly as an access token\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key, parser.github_app_installation_id) \\\n    if not parser.github_access_token.strip() else parser.github_access_token.strip()\n\ncac_org = parser.git_organization.strip()\nnew_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())\nproject_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name.strip())\n\n# The prefix is optional\nnew_repo_prefix_with_separator = new_repo_custom_prefix + '_' if new_repo_custom_prefix else ''\n\n# The new repo name is the prefix + the name of thew new project\nnew_repo = new_repo_prefix_with_separator + project_repo_sanitized\n\n# This is the value of the forked git repo\nset_octopusvariable('NewRepoUrl', 'https://github.com/' + cac_org + '/' + new_repo)\nset_octopusvariable('NewRepo', new_repo)\n\nif not verify_new_repo(token, cac_org, new_repo):\n    create_new_repo(token, cac_org, new_repo)\n    print(\n        'New repo was created at https://github.com/' + cac_org + '/' + new_repo)\nelse:\n    print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')\n\nprint('New repo URL is defined in the output variable \"NewRepoUrl\": #{Octopus.Action[' +\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepoUrl}')\nprint('New repo name is defined in the output variable \"NewRepo\": #{Octopus.Action[' +\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')\n"
-  },
-  "Parameters": [
-    {
-      "Id": "5845b0e2-d679-4cec-9022-c233031e6b35",
-      "Name": "CreateGithubRepo.Git.Url.NewRepoName",
-      "Label": "Repository Name",
-      "HelpText": "The name of the new GitHub repository.",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b85e4a76-bc9c-4a51-8ac0-653991824db2",
-      "Name": "CreateGithubRepo.Git.Url.NewRepoNamePrefix",
-      "Label": "Repository Name Prefix",
-      "HelpText": "An optional prefix to apply to the name of the new repository. The repository name will often be generated from the project name, and the prefix will be based on a tenant name (`#{Octopus.Deployment.Tenant.Name}`) to ensure each tenant has a unique repo.\n\n\nThis value can be left blank.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b0d86188-fbb8-475e-89de-4b994170f2b7",
-      "Name": "CreateGithubRepo.Git.Url.Organization",
-      "Label": "GitHub Owner or Organization",
-      "HelpText": "This is the GitHub owner or organisation where the new repo is created.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0ffd12dd-59ce-401a-b1df-cf3d6711e2eb",
-      "Name": "CreateGithubRepo.Git.Credentials.AccessToken",
-      "Label": "GitHub Access Token",
-      "HelpText": "The access token used to authenticate with GitHub. See the [GitHub documentation](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) for more details.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-10-17T02:12:09.605Z",
-    "OctopusVersion": "2023.4.5667",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "github"
-}
diff --git a/step-templates/github-create-secret.json b/step-templates/github-create-secret.json
deleted file mode 100644
index 2404701e2..000000000
--- a/step-templates/github-create-secret.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "8d59cae3-3168-466e-9490-bf654c180660",
-  "Name": "GitHub - Create Repo Secret",
-  "Description": "This step creates a secret in a GitHub repo.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python",
-    "Octopus.Action.Script.ScriptBody": "# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\n\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\n# having to use a regular user account.\nimport subprocess\nimport sys\n\n# Install our own dependencies\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\n\nimport requests\nimport json\nimport sys\nimport os\nimport urllib.request\nimport base64\nimport re\nimport jwt\nimport time\nimport argparse\nimport urllib3\nfrom base64 import b64encode\nfrom typing import TypedDict\nfrom nacl import public, encoding\n\n# Disable insecure http request warnings\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\n\n# If this script is not being run as part of an Octopus step, setting variables is a noop\nif 'set_octopusvariable' not in globals():\n    def set_octopusvariable(variable, value):\n        pass\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif 'printverbose' not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    output_no_ansi = re.sub(r'\\x1b\\[[0-9;]*m', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION]',\n        description='Fork a GitHub repo'\n    )\n\n    parser.add_argument('--secret-name', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\n                            'GitHub.Secret.Name'))\n    parser.add_argument('--secret-value', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\n                            'GitHub.Secret.Value'))\n\n    parser.add_argument('--repo', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\n    parser.add_argument('--git-organization', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\n                            'Git.Url.Organization'))\n    parser.add_argument('--github-app-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\n    parser.add_argument('--github-app-installation-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\n                            'GitHub.App.InstallationId'))\n    parser.add_argument('--github-app-private-key', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\n                            'GitHub.App.PrivateKey'))\n    parser.add_argument('--git-password', action='store',\n                        default=get_octopusvariable_quiet(\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\n                            'Git.Credentials.Password'),\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\n\n    return parser.parse_known_args()\n\n\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\n    # Generate the tokens used by git and the GitHub API\n    app_id = github_app_id\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\n\n    payload = {\n        # Issued at time\n        'iat': int(time.time()),\n        # JWT expiration time (10 minutes maximum)\n        'exp': int(time.time()) + 600,\n        # GitHub App's identifier\n        'iss': app_id\n    }\n\n    # Create JWT\n    jwt_instance = jwt.JWT()\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\n\n    # Create access token\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\n    headers = {\n        'Authorization': 'Bearer ' + encoded_jwt,\n        'Accept': 'application/vnd.github+json',\n        'X-GitHub-Api-Version': '2022-11-28'\n    }\n    request = urllib.request.Request(url, headers=headers, method='POST')\n    response = urllib.request.urlopen(request)\n    response_json = json.loads(response.read().decode())\n    return response_json['token']\n\n\ndef verify_new_repo(token, cac_org, new_repo):\n    # Attempt to view the new repo\n    try:\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\n        headers = {\n            'Accept': 'application/vnd.github+json',\n            'Authorization': 'Bearer ' + token,\n            'X-GitHub-Api-Version': '2022-11-28'\n        }\n        request = urllib.request.Request(url, headers=headers)\n        urllib.request.urlopen(request)\n        return True\n    except:\n        return False\n\n\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\n    \"\"\"Encrypt a Unicode string using the public key.\"\"\"\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\"utf-8\"), encoding.Base64Encoder()))\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\"utf-8\"))\n    return b64encode(encrypted).decode(\"utf-8\")\n\n\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\n    public_key_endpoint: str = f\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\"\n    headers: TypedDict[str, str] = {\"Authorization\": f\"Bearer {gh_auth_token}\"}\n    response = requests.get(url=public_key_endpoint, headers=headers)\n    if response.status_code != 200:\n        raise IOError(\n            f\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\")\n\n    public_key_json = response.json()\n    return public_key_json['key_id'], public_key_json['key']\n\n\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\n               encrypted_secret_value: str):\n    secret_creation_url = f\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\"\n    secret_creation_body = {\"key_id\": public_key_id, \"encrypted_value\": encrypted_secret_value}\n    headers: TypedDict[str, str] = {\"Authorization\": f\"Bearer {gh_auth_token}\", \"Content-Type\": \"application/json\"}\n\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\n        print(\"--Secret Created / Updated!--\")\n    else:\n        print(f\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\")\n\n\nparser, _ = init_argparse()\n\nif not parser.git_password.strip() and not (\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\n    print(\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\")\n    sys.exit(1)\n\nif not parser.git_organization.strip():\n    print(\"You must define the organization\")\n    sys.exit(1)\n\nif not parser.repo.strip():\n    print(\"You must define the repo name\")\n    sys.exit(1)\n\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\n                              parser.github_app_installation_id) if len(\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\n\nif not parser.git_password.strip() and not (\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\n    print(\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\")\n    sys.exit(1)\n\nif not parser.git_organization.strip():\n    print(\"You must define the organization\")\n    sys.exit(1)\n\nif not parser.repo.strip():\n    print(\"You must define the repo name\")\n    sys.exit(1)\n\nif not parser.secret_name.strip():\n    print(\"You must define the secret name\")\n    sys.exit(1)\n\nif not verify_new_repo(token, parser.git_organization, parser.repo):\n    print(\"Could not find the repo\")\n    sys.exit(1)\n\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\n                                    token)\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\n           encrypted_secret_value=encrypted_secret)\n"
-  },
-  "Parameters": [
-    {
-      "Id": "6470d539-d137-42dd-bff2-9ebc1955b2a7",
-      "Name": "CreateGitHubSecret.GitHub.Secret.Name",
-      "Label": "Secret Name",
-      "HelpText": "The name of the GitHub secret.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2ead2e13-1a01-4360-9585-f920181880a1",
-      "Name": "CreateGitHubSecret.GitHub.Secret.Value",
-      "Label": "Secret Value",
-      "HelpText": "The secret value.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "643b6230-5cca-4ca2-8340-9624ed721b9b",
-      "Name": "CreateGitHubSecret.Git.Url.Repo",
-      "Label": "GitHub Repo Name",
-      "HelpText": "The GitHub repo name i.e. `myrepo` in the URL`https://github.com/owner/myrepo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8c506ad7-f8b9-458c-a53b-23a19984c413",
-      "Name": "CreateGitHubSecret.Git.Url.Organization",
-      "Label": "Github Owner",
-      "HelpText": "The GitHub repo owner or organization i.e. `owner` in the URL `https://github.com/owner/myrepo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a457faef-6cd8-4c1b-ad23-306b03419794",
-      "Name": "CreateGitHubSecret.Git.Credentials.Password",
-      "Label": "GitHub Access Token",
-      "HelpText": "The GitHub access token",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-10-19T01:59:46.768Z",
-    "OctopusVersion": "2023.4.6357",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "github"
-}
diff --git a/step-templates/github-fork-repo.json b/step-templates/github-fork-repo.json
deleted file mode 100644
index 0aefd5dce..000000000
--- a/step-templates/github-fork-repo.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "Id": "f79befdd-9042-4e49-a4d9-164fc8daf8d6",
-  "Name": "GitHub - Fork Repo",
-  "Description": "Forks a repo in GitHub and returns the new repo URL in the output variable `NewRepo`. If the new repo already exists, it is not modified.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\n# having to use a regular user account.\nimport subprocess\nimport sys\n\n# Install our own dependencies\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt'])\n\nimport json\nimport subprocess\nimport sys\nimport os\nimport urllib.request\nimport base64\nimport re\nimport jwt\nimport time\nimport argparse\nimport platform\nfrom urllib.request import urlretrieve\n\n# If this script is not being run as part of an Octopus step, setting variables is a noop\nif 'set_octopusvariable' not in globals():\n    def set_octopusvariable(variable, value):\n        pass\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif 'printverbose' not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    output_no_ansi = re.sub('\\x1b\\[[0-9;]*m', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False):\n    \"\"\"\n        The execute method provides the ability to execute external processes while capturing and returning the\n        output to std err and std out and exit code.\n    \"\"\"\n    process = subprocess.Popen(args,\n                               stdout=subprocess.PIPE,\n                               stderr=subprocess.PIPE,\n                               text=True,\n                               cwd=cwd,\n                               env=env)\n    stdout, stderr = process.communicate()\n    retcode = process.returncode\n\n    if not retcode == 0 and raise_on_non_zero:\n        raise Exception('command returned exit code ' + retcode)\n\n    if print_args is not None:\n        print_output(' '.join(args))\n\n    if print_output is not None:\n        print_output(stdout)\n        print_output(stderr)\n\n    return stdout, stderr, retcode\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION] [FILE]...',\n        description='Fork a GitHub repo'\n    )\n    parser.add_argument('--new-repo-name', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(\n                            'Exported.Project.Name'))\n    parser.add_argument('--new-repo-name-prefix', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(\n                            'Git.Url.NewRepoNamePrefix'))\n    parser.add_argument('--template-repo-name', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.Git.Url.OriginalRepoName') or\n                                re.sub('[^a-zA-Z0-9-]', '_', get_octopusvariable_quiet('Octopus.Project.Name')))\n    parser.add_argument('--tenant-name', action='store',\n                        default=get_octopusvariable_quiet('Octopus.Deployment.Tenant.Name'))\n    parser.add_argument('--git-organization', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet('Git.Url.Organization'))\n    parser.add_argument('--mainline-branch',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGiteaRepo.Git.Branch.MainLine') or get_octopusvariable_quiet('Git.Branch.MainLine'),\n                        help='The branch name to use for the fork. Defaults to \"main\".')\n    parser.add_argument('--github-app-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\n    parser.add_argument('--github-app-installation-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\n                            'GitHub.App.InstallationId'))\n    parser.add_argument('--github-app-private-key', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\n                            'GitHub.App.PrivateKey'))\n    parser.add_argument('--github-access-token', action='store',\n                        default=get_octopusvariable_quiet(\n                            'ForkGithubRepo.GitHub.Credentials.AccessToken') or get_octopusvariable_quiet(\n                            'GitHub.Credentials.AccessToken'),\n                        help='The GitHub access token. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\n\n    return parser.parse_known_args()\n\n\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\n    # Generate the tokens used by git and the GitHub API\n    app_id = github_app_id\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\n\n    payload = {\n        # Issued at time\n        'iat': int(time.time()),\n        # JWT expiration time (10 minutes maximum)\n        'exp': int(time.time()) + 600,\n        # GitHub App's identifier\n        'iss': app_id\n    }\n\n    # Create JWT\n    jwt_instance = jwt.JWT()\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\n\n    # Create access token\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\n    headers = {\n        'Authorization': 'Bearer ' + encoded_jwt,\n        'Accept': 'application/vnd.github+json',\n        'X-GitHub-Api-Version': '2022-11-28'\n    }\n    request = urllib.request.Request(url, headers=headers, method='POST')\n    response = urllib.request.urlopen(request)\n    response_json = json.loads(response.read().decode())\n    return response_json['token']\n\n\ndef generate_auth_header(token):\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\n    return 'Basic ' + auth.decode('ascii')\n\n\ndef verify_template_repo(token, cac_org, template_repo):\n    # Attempt to view the template repo\n    url = 'https://api.github.com/repos/' + cac_org + '/' + template_repo\n    try:\n        headers = {\n            'Accept': 'application/vnd.github+json',\n            'Authorization': 'Bearer ' + token,\n            'X-GitHub-Api-Version': '2022-11-28'\n        }\n        request = urllib.request.Request(url, headers=headers)\n        urllib.request.urlopen(request)\n    except:\n        print('Could not find the template repo at ' + url)\n        print('Check that the repo exists, and that the authentication credentials are correct')\n        sys.exit(1)\n\n\ndef verify_new_repo(token, cac_org, new_repo):\n    # Attempt to view the new repo\n    try:\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\n        headers = {\n            'Accept': 'application/vnd.github+json',\n            'Authorization': 'Bearer ' + token,\n            'X-GitHub-Api-Version': '2022-11-28'\n        }\n        request = urllib.request.Request(url, headers=headers)\n        urllib.request.urlopen(request)\n        return True\n    except:\n        return False\n\n\ndef create_new_repo(token, cac_org, new_repo):\n    # If we could not view the repo, assume it needs to be created.\n    # https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#create-an-organization-repository\n    # Note you have to use the token rather than the JWT:\n    # https://stackoverflow.com/questions/39600396/bad-credentails-for-jwt-for-github-integrations-api\n\n    headers = {\n        'Authorization': 'token ' + token,\n        'Content-Type': 'application/json',\n        'Accept': 'application/vnd.github+json',\n        'X-GitHub-Api-Version': '2022-11-28',\n    }\n\n    try:\n        # First try to create an organization repo:\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos#create-an-organization-repository\n        url = 'https://api.github.com/orgs/' + cac_org + '/repos'\n        body = {'name': new_repo}\n        request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\n        urllib.request.urlopen(request)\n    except urllib.error.URLError as ex:\n        # Then fall back to creating a repo for the user:\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos?apiVersion=2022-11-28#create-a-repository-for-the-authenticated-user\n        if ex.code == 404:\n            url = 'https://api.github.com/user/repos'\n            body = {'name': new_repo}\n            request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\n            urllib.request.urlopen(request)\n        else:\n            raise ex\n\n\ndef fork_repo(git_executable, token, cac_org, new_repo, template_repo):\n    # Clone the repo and add the upstream repo\n    _, _, retcode = execute([git_executable, 'clone', 'https://' + 'x-access-token:' + token + '@'\n                             + 'github.com/' + cac_org + '/' + new_repo + '.git'])\n\n    if not retcode == 0:\n        print('Failed to clone repo ' + 'https://github.com/' + cac_org + '/' + new_repo + '.git.' +\n              ' Check the verbose logs for details.')\n        sys.exit(1)\n\n    _, _, retcode = execute(\n        [git_executable, 'remote', 'add', 'upstream', 'https://' + 'x-access-token:' + token + '@'\n         + 'github.com/' + cac_org + '/' + template_repo + '.git'],\n        cwd=new_repo)\n\n    if not retcode == 0:\n        print('Failed to add remote ' + 'https://github.com/' + cac_org + '/' + template_repo + '.git. ' +\n              'Check the verbose logs for details.')\n        sys.exit(1)\n\n    _, _, retcode = execute([git_executable, 'fetch', '--all'], cwd=new_repo)\n\n    if not retcode == 0:\n        print('Failed to fetch. Check the verbose logs for details.')\n        sys.exit(1)\n\n    _, _, retcode = execute(['git', 'checkout', '-b', 'upstream-' + branch, 'upstream/' + branch], cwd=new_repo)\n\n    if not retcode == 0:\n        print('Failed to checkout branch ' + branch + '. Check the verbose logs for details.')\n        sys.exit(1)\n\n    if branch != 'master' and branch != 'main':\n        _, _, retcode = execute(['git', 'checkout', '-b', branch, 'origin/' + branch], cwd=new_repo)\n    else:\n        _, _, retcode = execute(['git', 'checkout', branch], cwd=new_repo)\n\n    if not retcode == 0:\n        print('Failed to checkout branch ' + branch + '. Check the verbose logs for details.')\n        sys.exit(1)\n\n    # Hard reset it to the template main branch.\n    _, _, retcode = execute([git_executable, 'reset', '--hard', 'upstream/' + branch], cwd=new_repo)\n\n    if not retcode == 0:\n        print(\n            'Failed to perform a hard reset against branch upstream/' + branch + '.'\n            + ' Check the verbose logs for details.')\n        sys.exit(1)\n\n    # Push the changes.\n    _, _, retcode = execute([git_executable, 'push', 'origin', branch], cwd=new_repo)\n\n    if not retcode == 0:\n        print('Failed to push changes. Check the verbose logs for details.')\n        sys.exit(1)\n\n\ndef is_windows():\n    return platform.system() == 'Windows'\n\n\ndef ensure_git_exists():\n    if is_windows():\n        print(\"Checking git is installed\")\n        try:\n            stdout, _, exit_code = execute(['git', 'version'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"git not found\"\n        except:\n            print(\"Downloading git\")\n            urlretrieve('https://www.7-zip.org/a/7zr.exe', '7zr.exe')\n            urlretrieve(\n                'https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe',\n                'PortableGit.7z.exe')\n            print(\"Installing git\")\n            print(\"Consider installing git on the worker or using a standard worker-tools image\")\n            execute(['7zr.exe', 'x', 'PortableGit.7z.exe', '-o' + os.getcwd() + '\\\\git', '-y'])\n            return os.getcwd() + '\\\\git\\\\bin\\\\git'\n\n    return 'git'\n\n\ngit_executable = ensure_git_exists()\nparser, _ = init_argparse()\n\nif not parser.github_access_token.strip() and not (\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\n    print(\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\")\n    sys.exit(1)\n\nif not parser.template_repo_name.strip():\n    print(\"You must supply the upstream (or template) repo\")\n    sys.exit(1)\n\nif not parser.tenant_name.strip() and not parser.new_repo_name_prefix.strip():\n    print(\"You must define the new repo prefix or run this script against a tenant\")\n    sys.exit(1)\n\n# The access token is generated from a github app or supplied directly as an access token\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\n                              parser.github_app_installation_id) if len(\n    parser.github_access_token.strip()) == 0 else parser.github_access_token.strip()\n\n# The process followed here is:\n# 1. Verify the manually supplied upstream repo exists\n# 2. Build the name of the new downstream repo with a prefix and the new project name.\n#    a. The prefix is either specified or assumed to be the name of a tenant\n#    b. The new project name is either specified or assumed to be the same as the upstream project name\n# 3. Create a new downstream repo if it doesn't exist\n# 4. Fork the upstream repo into the downstream repo with a hard git reset\n\ncac_org = parser.git_organization.strip()\ntemplate_repo = parser.template_repo_name.strip()\nnew_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())\ntenant_name_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.tenant_name.strip())\nproject_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_',\n                                parser.new_repo_name.strip() if parser.new_repo_name.strip() else template_repo)\n\n# The new repo is prefixed either with the custom prefix or the tenant name if no custom prefix is defined\nnew_repo_prefix = new_repo_custom_prefix if len(new_repo_custom_prefix) != 0 else tenant_name_sanitized\n\n# The new repo name is the prefix + the name of thew new project\nnew_repo = new_repo_prefix + '_' + project_repo_sanitized if len(new_repo_prefix) != 0 else project_repo_sanitized\n\n# Assume the main branch if nothing else was specified\nbranch = parser.mainline_branch or 'main'\n\n# This is the value of the forked git repo\nset_octopusvariable('NewRepo', 'https://github.com/' + cac_org + '/' + new_repo)\n\nverify_template_repo(token, cac_org, template_repo)\n\nif not verify_new_repo(token, cac_org, new_repo):\n    create_new_repo(token, cac_org, new_repo)\n    fork_repo(git_executable, token, cac_org, new_repo, template_repo)\n    print(\n        'Repo was forked from ' + 'https://github.com/' + cac_org + '/' + template_repo + ' to '\n        + 'https://github.com/' + cac_org + '/' + new_repo)\nelse:\n    print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')\n\nprint('New repo URL is defined in the output variable \"NewRepo\": #{Octopus.Action[' +\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')\n",
-    "Octopus.Action.Script.Syntax": "Python"
-  },
-  "Parameters": [
-    {
-      "Id": "d6b60ef3-0dc1-4c01-86b9-b3b65a266acf",
-      "Name": "ForkGithubRepo.Git.Url.OriginalRepoName",
-      "Label": "Original Repo Name",
-      "HelpText": "This is the name of the original repo that is forked. The full URL of the original repo is `http://github.com/organization/<Original Repo Name>`.\n\nThis value defaults to the name of the project if not defined.",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a4c8c416-591f-4bc5-bf76-041064d8993b",
-      "Name": "ForkGithubRepo.Git.Url.NewRepoName",
-      "Label": "Forked Repo Name",
-      "HelpText": "This value is used to generate the name of the forked repo. The full URL of the original repo is `http://github.com/organization/<Forked Repo Prefix>_<Forked Repo Name>`.\n\nThe `Forked Repo Name` defaults to the `Original Repo Name` if it is left blank.\n\nThe forked repo name is sanitized to replace non-alpha-numeric or dash characters with an underscore.",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f829046a-8f59-4c53-8122-8281b6329363",
-      "Name": "ForkGithubRepo.Git.Url.NewRepoNamePrefix",
-      "Label": "Forked Repo Prefix",
-      "HelpText": "This prefix is prepended to the name of the forked repo. The final name of the forked repo is `<Forked Repo Prefix>_<Forked Repo Name>`. If a prefix is not specified, it is assumed to be the tenant's name running this script.\n\nYou must supply a prefix or run the script as a tenant.\n\nThe forked repo prefix is sanitized to replace non-alpha-numeric or dash characters with an underscore.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "3fcfc3ff-ffbe-4d9f-a078-bf4394d2cf3b",
-      "Name": "ForkGithubRepo.Git.Url.Organization",
-      "Label": "GitHub Organization",
-      "HelpText": "This is the GitHub Organization or username that the source and destination repos are found in. It is the field `organization` in the URL `https://github.com/organization`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "3972a9b5-ff11-4336-afff-0ed92b7e111c",
-      "Name": "ForkGiteaRepo.Git.Branch.MainLine",
-      "Label": "Mainline Branch",
-      "HelpText": "The name of the branch to fork.",
-      "DefaultValue": "main",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e6c3dc14-af61-4c3f-acc9-75f77cef9a6a",
-      "Name": "ForkGithubRepo.GitHub.Credentials.AccessToken",
-      "Label": "GitHub Access Token",
-      "HelpText": "This is the [access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) used to authenticate with GitHub. Leave this blank and fill in the App ID, Installation ID, and Private Key to use a GitHub for authentication.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "b19c2e88-1418-4a4c-8088-048007da5ffb",
-      "Name": "ForkGithubRepo.GitHub.App.Id",
-      "Label": "GitHub App ID",
-      "HelpText": "If a [GitHub App](https://docs.github.com/en/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps) is used for authentication, this is the application ID. Leave this blank and supply the `GitHub Access Token` field to use regular token authentication.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ce37e390-a6df-4782-9166-d7a22c8e6a50",
-      "Name": "ForkGithubRepo.GitHub.App.InstallationId",
-      "Label": "GitHub App Installation ID",
-      "HelpText": "If a [GitHub App](https://docs.github.com/en/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps) is used for authentication, this is the installation ID. Leave this blank and supply the  `GitHub Access Token` field to use regular token authentication.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1b7ad3bb-f12c-40e2-b062-8fdbfc1259e6",
-      "Name": "ForkGithubRepo.GitHub.App.PrivateKey",
-      "Label": "GitHub App Private Key",
-      "HelpText": "If a [GitHub App](https://docs.github.com/en/apps/creating-github-apps/about-creating-github-apps/about-creating-github-apps) is used for authentication, this is the private key. Leave this blank and supply the  `GitHub Access Token` field to use regular token authentication.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-18T21:46:58.212Z",
-    "OctopusVersion": "2023.4.2775",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "github"
-}
diff --git a/step-templates/github-push-yeoman-to-repo.json b/step-templates/github-push-yeoman-to-repo.json
deleted file mode 100644
index a92c50e30..000000000
--- a/step-templates/github-push-yeoman-to-repo.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "Id": "14ffc4b7-1cab-4f81-a835-7da41fa47123",
-  "Name": "GitHub - Push Yeoman Generator",
-  "Description": "Clones a GitHub repo, runs Yeoman in the cloned directory, and pushes the changes. Note that the Yeoman generators can only use arguments or options, as prompts can not be provided.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "6bd0fbd2-442e-4ae9-9192-b93a041cfdd1",
-      "Name": "YeomanGenerator",
-      "AcquisitionLocation": "Server",
-      "FeedId": null,
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "PopulateGithubRepo.Yeoman.Generator.Package",
-        "Purpose": ""
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python",
-    "Octopus.Action.Script.ScriptBody": "# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\n# having to use a regular user account.\nimport subprocess\nimport sys\n\n# Install our own dependencies\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'requests', '--disable-pip-version-check'])\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'anyascii', '--disable-pip-version-check'])\n\nimport requests\nimport json\nimport subprocess\nimport sys\nimport os\nimport urllib.request\nimport base64\nimport re\nimport jwt\nimport time\nimport argparse\nimport platform\nimport zipfile\nimport lzma\nimport tarfile\nimport shutil\nimport urllib3\nfrom shlex import split\nfrom anyascii import anyascii\n\n# Disable insecure http request warnings\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\n\n# If this script is not being run as part of an Octopus step, setting variables is a noop\nif 'set_octopusvariable' not in globals():\n    def set_octopusvariable(variable, value):\n        pass\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif 'printverbose' not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    output_no_ansi = re.sub(r'\\x1b\\[[0-9;]*m', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except Exception as inst:\n        return ''\n\n\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\n            append_to_path=None):\n    \"\"\"\n        The execute method provides the ability to execute external processes while capturing and returning the\n        output to std err and std out and exit code.\n    \"\"\"\n\n    my_env = os.environ.copy() if env is None else env\n\n    if append_to_path is not None:\n        my_env[\"PATH\"] = append_to_path + os.pathsep + my_env['PATH']\n\n    process = subprocess.Popen(args,\n                               stdout=subprocess.PIPE,\n                               stderr=subprocess.PIPE,\n                               stdin=open(os.devnull),\n                               text=True,\n                               cwd=cwd,\n                               env=my_env)\n    stdout, stderr = process.communicate()\n    retcode = process.returncode\n\n    if not retcode == 0 and raise_on_non_zero:\n        raise Exception('command returned exit code ' + retcode)\n\n    if print_args is not None:\n        print_output(' '.join(args))\n\n    if print_output is not None:\n        print_output(stdout)\n        print_output(stderr)\n\n    return stdout, stderr, retcode\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION]',\n        description='Fork a GitHub repo'\n    )\n    parser.add_argument('--generator', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Yeoman.Generator.Name') or get_octopusvariable_quiet(\n                            'Yeoman.Generator.Name'))\n    parser.add_argument('--sub-generator', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Yeoman.Generator.SubGenerator') or get_octopusvariable_quiet(\n                            'Yeoman.Generator.SubGenerator'))\n    parser.add_argument('--generator-arguments', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Yeoman.Generator.Arguments') or get_octopusvariable_quiet(\n                            'Yeoman.Generator.Arguments'),\n                        help='The arguments to pas to yo. Pass all arguments as a single string. This string is then parsed as if it were yo arguments.')\n    parser.add_argument('--repo', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Git.Url.Repo') or get_octopusvariable_quiet(\n                            'Git.Url.Repo'))\n    parser.add_argument('--git-organization', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(\n                            'Git.Url.Organization'))\n    parser.add_argument('--github-app-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\n    parser.add_argument('--github-app-installation-id', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\n                            'GitHub.App.InstallationId'))\n    parser.add_argument('--github-app-private-key', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\n                            'GitHub.App.PrivateKey'))\n    parser.add_argument('--git-password', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Git.Credentials.Password') or get_octopusvariable_quiet(\n                            'Git.Credentials.Password'),\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\n    parser.add_argument('--git-username', action='store',\n                        default=get_octopusvariable_quiet(\n                            'PopulateGithubRepo.Git.Credentials.Username') or get_octopusvariable_quiet(\n                            'Git.Credentials.Username'),\n                        help='The git username. This will be used for both the git authentication and the username associated with any commits.')\n\n    return parser.parse_known_args()\n\n\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\n    # Generate the tokens used by git and the GitHub API\n    app_id = github_app_id\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\n\n    payload = {\n        # Issued at time\n        'iat': int(time.time()),\n        # JWT expiration time (10 minutes maximum)\n        'exp': int(time.time()) + 600,\n        # GitHub App's identifier\n        'iss': app_id\n    }\n\n    # Create JWT\n    jwt_instance = jwt.JWT()\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\n\n    # Create access token\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\n    headers = {\n        'Authorization': 'Bearer ' + encoded_jwt,\n        'Accept': 'application/vnd.github+json',\n        'X-GitHub-Api-Version': '2022-11-28'\n    }\n    request = urllib.request.Request(url, headers=headers, method='POST')\n    response = urllib.request.urlopen(request)\n    response_json = json.loads(response.read().decode())\n    return response_json['token']\n\n\ndef generate_auth_header(token):\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\n    return 'Basic ' + auth.decode('ascii')\n\n\ndef verify_new_repo(token, cac_org, new_repo):\n    # Attempt to view the new repo\n    try:\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\n        headers = {\n            'Accept': 'application/vnd.github+json',\n            'Authorization': 'Bearer ' + token,\n            'X-GitHub-Api-Version': '2022-11-28'\n        }\n        request = urllib.request.Request(url, headers=headers)\n        urllib.request.urlopen(request)\n        return True\n    except Exception as inst:\n        return False\n\n\ndef is_windows():\n    return platform.system() == 'Windows'\n\n\ndef download_file(url, filename, verify_ssl=True):\n    r = requests.get(url, verify=verify_ssl)\n    with open(filename, 'wb') as file:\n        file.write(r.content)\n\n\ndef ensure_git_exists():\n    if is_windows():\n        print(\"Checking git is installed\")\n        try:\n            stdout, _, exit_code = execute(['git', 'version'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"git not found\"\n        except:\n            print(\"Downloading git\")\n            download_file('https://www.7-zip.org/a/7zr.exe', '7zr.exe')\n            download_file(\n                'https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe',\n                'PortableGit.7z.exe')\n            print(\"Installing git\")\n            print(\"Consider installing git on the worker or using a standard worker-tools image\")\n            execute(['7zr.exe', 'x', 'PortableGit.7z.exe', '-o' + os.path.join(os.getcwd(), 'git'), '-y'])\n            return os.path.join(os.getcwd(), 'git', 'bin', 'git')\n\n    return 'git'\n\n\ndef install_npm_linux():\n    print(\"Downloading node\")\n    download_file(\n        'https://nodejs.org/dist/v18.18.2/node-v18.18.2-linux-x64.tar.xz',\n        'node.tar.xz')\n    print(\"Installing node on Linux\")\n    with lzma.open(\"node.tar.xz\", \"r\") as lzma_ref:\n        with open(\"node.tar\", \"wb\") as fdst:\n            shutil.copyfileobj(lzma_ref, fdst)\n    with tarfile.open(\"node.tar\", \"r\") as tar_ref:\n        tar_ref.extractall(os.getcwd())\n\n    try:\n        _, _, exit_code = execute([os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', '--version'],\n                                  append_to_path=os.getcwd() + '/node-v18.18.2-linux-x64/bin')\n        if not exit_code == 0:\n            raise Exception(\"Failed to run npm\")\n    except Exception as ex:\n        print('Failed to install npm ' + str(ex))\n        sys.exit(1)\n    return os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', os.getcwd() + '/node-v18.18.2-linux-x64/bin'\n\n\ndef install_npm_windows():\n    print(\"Downloading node\")\n    download_file('https://nodejs.org/dist/v18.18.2/node-v18.18.2-win-x64.zip', 'node.zip', False)\n    print(\"Installing node on Windows\")\n    with zipfile.ZipFile(\"node.zip\", \"r\") as zip_ref:\n        zip_ref.extractall(os.getcwd())\n    try:\n        _, _, exit_code = execute([os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'), '--version'],\n                                  append_to_path=os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))\n        if not exit_code == 0:\n            raise Exception(\"Failed to run npm\")\n    except Exception as ex:\n        print('Failed to install npm ' + str(ex))\n        sys.exit(1)\n\n    return (os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'),\n            os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))\n\n\ndef ensure_node_exists():\n    try:\n        print(\"Checking node is installed\")\n        _, _, exit_code = execute(['npm', '--version'])\n        if not exit_code == 0:\n            raise Exception(\"npm not found\")\n    except:\n        if is_windows():\n            return install_npm_windows()\n        else:\n            return install_npm_linux()\n\n    return 'npm', None\n\n\ndef ensure_yo_exists(npm_executable, npm_path):\n    try:\n        print(\"Checking Yeoman is installed\")\n        _, _, exit_code = execute(['yo', '--version'])\n        if not exit_code == 0:\n            raise Exception(\"yo not found\")\n    except:\n        print('Installing Yeoman')\n\n        _, _, retcode = execute([npm_executable, 'install', '-g', 'yo'], append_to_path=npm_path)\n\n        if not retcode == 0:\n            print(\"Failed to set install Yeoman. Check the verbose logs for details.\")\n            sys.exit(1)\n\n        npm_bin, _, retcode = execute([npm_executable, 'config', 'get', 'prefix'], append_to_path=npm_path)\n\n        if not retcode == 0:\n            print(\"Failed to set get the npm prefix directory. Check the verbose logs for details.\")\n            sys.exit(1)\n\n        try:\n            if is_windows():\n                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'yo.cmd'), '--version'],\n                                          append_to_path=npm_path)\n            else:\n                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'bin', 'yo'), '--version'],\n                                          append_to_path=npm_path)\n\n            if not exit_code == 0:\n                raise Exception(\"Failed to run yo\")\n        except Exception as ex:\n            print('Failed to install yo ' + str(ex))\n            sys.exit(1)\n\n        # Windows and Linux save NPM binaries in different directories\n        if is_windows():\n            return os.path.join(npm_bin.strip(), 'yo.cmd')\n\n        return os.path.join(npm_bin.strip(), 'bin', 'yo')\n\n    return 'yo'\n\n\ngit_executable = ensure_git_exists()\nnpm_executable, npm_path = ensure_node_exists()\nyo_executable = ensure_yo_exists(npm_executable, npm_path)\nparser, _ = init_argparse()\n\nif not parser.git_password.strip() and not (\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\n    print(\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\")\n    sys.exit(1)\n\nif not parser.git_organization.strip():\n    print(\"You must define the organization\")\n    sys.exit(1)\n\nif not parser.repo.strip():\n    print(\"You must define the repo name\")\n    sys.exit(1)\n\nif not parser.generator.strip():\n    print(\"You must define the Yeoman generator\")\n    sys.exit(1)\n\n# Create a dir for the git clone\nif os.path.exists('downstream'):\n    shutil.rmtree('downstream')\n\nos.mkdir('downstream')\n\n# Create a dir for yeoman to use\nif os.path.exists('downstream-yeoman'):\n    shutil.rmtree('downstream-yeoman')\n\nos.mkdir('downstream-yeoman')\n# Yeoman will use a less privileged user to write to this directory, so grant full access\nif not is_windows():\n    os.chmod('downstream-yeoman', 0o777)\n\ndownstream_dir = os.path.join(os.getcwd(), 'downstream')\ndownstream_yeoman_dir = os.path.join(os.getcwd(), 'downstream-yeoman')\n\n# The access token is generated from a github app or supplied directly as an access token\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\n                              parser.github_app_installation_id) if len(\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\n\nif not verify_new_repo(token, parser.git_organization, parser.repo):\n    print('Repo at https://github.com/' + parser.git_organization + '/' + parser.repo + ' could not be accessed')\n    sys.exit(1)\n\n# We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close\nif is_windows():\n    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.helper', 'manager'])\n\n    if not retcode == 0:\n        print(\"Failed to set the credential.helper setting. Check the verbose logs for details.\")\n        sys.exit(1)\n\n    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.modalprompt', 'false'])\n\n    if not retcode == 0:\n        print(\"Failed to srt the credential.modalprompt setting. Check the verbose logs for details.\")\n        sys.exit(1)\n\n    # We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close\n    _, _, retcode = execute(\n        [git_executable, 'config', '--system', 'credential.microsoft.visualstudio.com.interactive', 'never'])\n\n    if not retcode == 0:\n        print(\n            \"Failed to set the credential.microsoft.visualstudio.com.interactive setting. Check the verbose logs for details.\")\n        sys.exit(1)\n\n_, _, retcode = execute([git_executable, 'config', '--global', 'user.email', 'octopus@octopus.com'])\n\nif not retcode == 0:\n    print(\"Failed to set the user.email setting. Check the verbose logs for details.\")\n    sys.exit(1)\n\n_, _, retcode = execute([git_executable, 'config', '--global', 'core.autocrlf', 'input'])\n\nif not retcode == 0:\n    print(\"Failed to set the core.autocrlf setting. Check the verbose logs for details.\")\n    sys.exit(1)\n\nusername = parser.git_username if len(parser.git_username) != 0 else 'Octopus'\n_, _, retcode = execute([git_executable, 'config', '--global', 'user.name', username])\n\nif not retcode == 0:\n    print(\"Failed to set the git username. Check the verbose logs for details.\")\n    sys.exit(1)\n\n_, _, retcode = execute([git_executable, 'config', '--global', 'credential.helper', 'cache'])\n\nif not retcode == 0:\n    print(\"Failed to set the git credential helper. Check the verbose logs for details.\")\n    sys.exit(1)\n\nprint('Cloning repo')\n\n_, _, retcode = execute(\n    [git_executable, 'clone',\n     'https://' + username + ':' + token + '@github.com/' + parser.git_organization + '/' + parser.repo + '.git',\n     'downstream'])\n\nif not retcode == 0:\n    print(\"Failed to clone the git repo. Check the verbose logs for details.\")\n    sys.exit(1)\n\nprint('Configuring Yeoman Generator')\n\n_, _, retcode = execute([npm_executable, 'install'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)\n\nif not retcode == 0:\n    print(\"Failed to install the generator dependencies. Check the verbose logs for details.\")\n    sys.exit(1)\n\n_, _, retcode = execute([npm_executable, 'link'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)\n\nif not retcode == 0:\n    print(\"Failed to link the npm module. Check the verbose logs for details.\")\n    sys.exit(1)\n\nprint('Running Yeoman Generator')\n\n# Treat the string of yo arguments as a raw input and parse it again. The resulting list of unknown arguments\n# is then passed to yo. We have to convert the incoming values from utf to ascii when parsing a second time.\nyo_args = split(anyascii(parser.generator_arguments))\n\ngenerator_name = parser.generator + ':' + parser.sub_generator if len(parser.sub_generator) != 0 else parser.generator\n\nyo_arguments = [yo_executable, generator_name, '--force', '--skip-install']\n\n# Yeoman has issues running as root, which it will often do in a container.\n# So we run Yeoman in its own directory, and then copy the changes to the git directory.\n_, _, retcode = execute(yo_arguments + yo_args, cwd=downstream_yeoman_dir, append_to_path=npm_path)\n\nif not retcode == 0:\n    print(\"Failed to run Yeoman. Check the verbose logs for details.\")\n    sys.exit(1)\n\nshutil.copytree(downstream_yeoman_dir, downstream_dir, dirs_exist_ok=True)\n\nprint('Adding changes to git')\n\n_, _, retcode = execute([git_executable, 'add', '.'], cwd=downstream_dir)\n\nif not retcode == 0:\n    print(\"Failed to add the git changes. Check the verbose logs for details.\")\n    sys.exit(1)\n\n# Check for pending changes\n_, _, retcode = execute([git_executable, 'diff-index', '--quiet', 'HEAD'], cwd=downstream_dir)\n\nif not retcode == 0:\n    print('Committing changes to git')\n    _, _, retcode = execute([git_executable, 'commit', '-m',\n                             'Added files from Yeoman generator ' + parser.generator + ':' + parser.sub_generator],\n                            cwd=downstream_dir)\n\n    if not retcode == 0:\n        print(\"Failed to set commit the git changes. Check the verbose logs for details.\")\n        sys.exit(1)\n\n    print('Pushing changes to git')\n\n    _, _, retcode = execute([git_executable, 'push', 'origin', 'main'], cwd=downstream_dir)\n\n    if not retcode == 0:\n        print(\"Failed to push the git changes. Check the verbose logs for details.\")\n        sys.exit(1)\n"
-  },
-  "Parameters": [
-    {
-      "Id": "334f5b32-01a8-4687-af33-54906e53cdee",
-      "Name": "PopulateGithubRepo.Yeoman.Generator.Package",
-      "Label": "Yeoman Generator Package",
-      "HelpText": "The package containing the Yeoman package. Yeoman packages are usually distributed by npm, but they can also be packaged as zip files and pushed to the built-in feed or any other feed that supports zip files.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "d1c9bf99-5f1f-417b-a482-a72878065871",
-      "Name": "PopulateGithubRepo.Yeoman.Generator.Name",
-      "Label": "Yeoman Generator Name",
-      "HelpText": "The name of the Yeoman generator.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2c1dd445-c1d4-4e44-91a0-b7f02682711b",
-      "Name": "PopulateGithubRepo.Yeoman.Generator.SubGenerator",
-      "Label": "Yeoman Subgenerator Name",
-      "HelpText": "The optional name of the Yeoman subgenerator. Leave blank to use the default generator.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "bac9200a-2fce-4390-9b07-40e2a14c2e44",
-      "Name": "PopulateGithubRepo.Yeoman.Generator.Arguments",
-      "Label": "Yeoman Arguments",
-      "HelpText": "The optional arguments pass to Yeoman to define options and arguments.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f5c1092a-70d8-40ba-84e9-feedf5911946",
-      "Name": "PopulateGithubRepo.Git.Url.Repo",
-      "Label": "GitHub Repo Name",
-      "HelpText": "The GitHub repo name i.e. `myrepo` in the URL`https://github.com/owner/myrepo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ece2ee80-9572-4ca1-ab0a-65ffaec2edb7",
-      "Name": "PopulateGithubRepo.Git.Url.Organization",
-      "Label": "Github Owner",
-      "HelpText": "The GitHub repo owner or organization i.e. `owner` in the URL `https://github.com/owner/myrepo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4795ec27-f38b-4f2f-8417-97c3cd74d2db",
-      "Name": "PopulateGithubRepo.Git.Credentials.Password",
-      "Label": "GitHub Access Token",
-      "HelpText": "The GitHub access token",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "300596fd-59b1-420e-b58f-305b7c83b54d",
-      "Name": "PopulateGithubRepo.Git.Credentials.Username",
-      "Label": "GitHub Username",
-      "HelpText": "This will appear in the commit logs. Leave blank to use the default username.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-10-16T23:49:40.031Z",
-    "OctopusVersion": "2023.4.6093",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "github"
-}
-
diff --git a/step-templates/github-verify-attestation.json b/step-templates/github-verify-attestation.json
deleted file mode 100644
index 65f932136..000000000
--- a/step-templates/github-verify-attestation.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "Id": "3c76dffc-b524-438f-b04d-f1a103bdbfc7",
-    "Name": "Verify GitHub Attestation",
-    "Description": "This step calls the GitHub cli to verify an attestation. It currently supports non-container packages. OCI container images will be added in the future.\n\nMore info on [Artifact Attestations](https://github.blog/changelog/2024-06-25-artifact-attestations-is-generally-available/).\n\nGitHub cli docs for [gh attestation verify](https://cli.github.com/manual/gh_attestation_verify).\n\nThe step will capture the json output from the GitHub cli and store it as an [output variable](https://octopus.com/docs/projects/variables/output-variables) named `Json`.\n\nThe json can also be captured as an [artifact](https://octopus.com/docs/projects/deployment-process/artifacts) on the deployment by checking the `Create Artifact?` parameter on the step.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-      {
-        "Id": "bc290bbb-cc08-4046-b72b-7ef18b2076fd",
-        "Name": "VerifyAttestation.Package",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "False",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "VerifyAttestation.Package",
-          "Purpose": ""
-        }
-      }
-    ],
-    "GitDependencies": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "Bash",
-      "Octopus.Action.Script.ScriptBody": "token=$(get_octopusvariable \"VerifyAttestation.Token\")\npackage=$(get_octopusvariable \"Octopus.Action.Package[VerifyAttestation.Package].PackageFilePath\")\nowner=$(get_octopusvariable \"VerifyAttestation.Owner\")\nrepo=$(get_octopusvariable \"VerifyAttestation.Repo\")\nflags=$(get_octopusvariable \"VerifyAttestation.Flags\")\nprintCommand=$(get_octopusvariable \"VerifyAttestation.PrintCommand\")\ncreateArtifact=$(get_octopusvariable \"VerifyAttestation.CreateArtifact\")\ndeploymentId=\"#{Octopus.Deployment.Id | ToLower}\"\nstepName=$(get_octopusvariable \"Octopus.Step.Name\")\n\nechoerror() { echo \"$@\" 1>&2; }\n\nexport GITHUB_TOKEN=$token\n\nif ! command -v gh &> /dev/null\nthen\n    echoerror \"gh could not be found, please ensure that it is installed on your worker or in the execution container image\"\n    exit 1\nfi\n\nif [ \"$token\" = \"\" ] ; then\n    fail_step \"'GitHub Access Token' is a required parameter for this step.\"\nfi\n\nif [ \"$owner\" = \"\" ] &&  [ \"$repo\" = \"\" ]; then\n    fail_step \"Either 'Owner' or 'Repo' must be provided to this step.\"\nfi\n\n\ngh_cmd=\"gh attestation verify $package ${owner:+ -o $owner} ${repo:+ -R $owner} --format json ${flags:+ $flags}\"\n\nif [ \"$printCommand\" = \"True\" ] ; then\n  echo $gh_cmd\nfi\n\njson=$($gh_cmd)\n\nif [ $? = 0 ]\nthen\n  set_octopusvariable \"Json\" $json\n  echo \"Created output variable: ##{Octopus.Action[$stepName].Output.Json}\"\n\n  if [ \"$createArtifact\" = \"True\" ] ; then\n    echo $json > \"$PWD/attestation-$deploymentId.json\"\n    new_octopusartifact \"$PWD/attestation-$deploymentId.json\"\n  fi\nelse\n  fail_step \"Failed to verify attestation for $package\"\nfi",
-      "OctopusUseBundledTooling": "False"
-    },
-    "Parameters": [
-      {
-        "Id": "fd8cdcff-09af-41b0-a814-464c52308f48",
-        "Name": "VerifyAttestation.Token",
-        "Label": "GitHub Access Token",
-        "HelpText": "The access token used to authenticate with GitHub. See the [GitHub documentation](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) for more details.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "406de5a6-8a71-4a7a-91cf-dc0aee73d89b",
-        "Name": "VerifyAttestation.Package",
-        "Label": "Package to verify",
-        "HelpText": "The package to verify using `gh attestation verify`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "e7b6ab3a-3522-4b97-b601-d9e51ef5dea9",
-        "Name": "VerifyAttestation.Owner",
-        "Label": "Owner",
-        "HelpText": "The `--owner` flag value must match the name of the GitHub organization that the artifact's linked repository belongs to.\n\nDo not provide both `Owner` and `Repo`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0bdc7d4d-778a-498f-a950-3f2ce4e23b5d",
-        "Name": "VerifyAttestation.Repo",
-        "Label": "Repo",
-        "HelpText": "The `--repo` flag value must match the name of the GitHub repository that the artifact is linked with.\n\nDo not provide both `Owner` and `Repo`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f282b9eb-a6b4-4d79-9fc0-2f985e94b1ec",
-        "Name": "VerifyAttestation.Flags",
-        "Label": "Flags",
-        "HelpText": "See [gh attestation verify](https://cli.github.com/manual/gh_attestation_verify) for available flags.\n\nDo not provide the `--format` flag as it is set to `json` by the step.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "06e3e2ad-f2e0-4ecb-b856-e709d552f3e9",
-        "Name": "VerifyAttestation.PrintCommand",
-        "Label": "Print Command?",
-        "HelpText": "Prints the command in the logs using set -x. This will cause a warning when the step runs.\n",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "eb4f5f79-7d44-4511-a8a8-1dc68f2c450d",
-        "Name": "VerifyAttestation.CreateArtifact",
-        "Label": "Create Artifact?",
-        "HelpText": "Check to save the attestation result json as an Octopus artifact on the deployment.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2024-08-29T19:36:57.549Z",
-      "OctopusVersion": "2024.3.11587",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "ryanrousseau",
-    "Category": "github"
-  }
-  
\ No newline at end of file
diff --git a/step-templates/google-chat-send-message.json b/step-templates/google-chat-send-message.json
deleted file mode 100644
index eed74d1c3..000000000
--- a/step-templates/google-chat-send-message.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "Id": "6c4c6253-45de-404f-b725-c96e1d7e4958",
-    "Name": "Google Chat - Send message",
-    "Description": "Send a message to a [Google Chat](https://chat.google.com) space using a configured [chat webhook](https://developers.google.com/workspace/chat/quickstart/webhooks#python_2).\n\nMulti-line message content and [basic formatting](https://developers.google.com/workspace/chat/format-messages) are supported.\n\n**Note:** This script is written in python, and is required for this step to function correctly.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "GitDependencies": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "Python",
-      "Octopus.Action.Script.ScriptBody": "import subprocess\nimport sys\n\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'httplib2', '--disable-pip-version-check'])\n\n# parameters\nwebhook_url = get_octopusvariable(\"GoogleChat.SendMessage.WebhookUrl\")\nmessage_content = get_octopusvariable(\"GoogleChat.SendMessage.MessageContent\")\n\nif not webhook_url:\n  raise ValueError('Webhook url null or empty!')\n  \nif not message_content:\n  raise ValueError('Message content null or empty!')\n  \nfrom json import dumps\nfrom httplib2 import Http\n\napp_message = {\"text\": message_content}\nmessage_headers = {\"Content-Type\": \"application/json; charset=UTF-8\"}\nhttp_obj = Http()\nresponse = http_obj.request(\n  uri=webhook_url,\n  method=\"POST\",\n  headers=message_headers,\n  body=dumps(app_message),\n)\nprintverbose('Google response:')\nprintverbose(response)"
-    },
-    "Parameters": [
-      {
-        "Id": "bb5767eb-bbfb-4379-917e-31f73cf56ad2",
-        "Name": "GoogleChat.SendMessage.WebhookUrl",
-        "Label": "Webhook URL",
-        "HelpText": "Provide the Google Chat [Webhook URL](https://developers.google.com/workspace/chat/quickstart/webhooks)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "cb6577d7-d160-4e3a-86ea-b536bf92133a",
-        "Name": "GoogleChat.SendMessage.MessageContent",
-        "Label": "Message Content",
-        "HelpText": "Provide the message to send. Multi-line values, and [basic formatting](https://developers.google.com/workspace/chat/format-messages) are supported.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2024-04-03T13:02:57.192Z",
-      "OctopusVersion": "2024.2.4001",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "google-chat"
-  }
diff --git a/step-templates/octopus-ai-prompt.json b/step-templates/octopus-ai-prompt.json
deleted file mode 100644
index 93613f9b0..000000000
--- a/step-templates/octopus-ai-prompt.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "8ce3eb55-2c35-45c2-be8c-27e71ffbf032",
-  "Name": "Octopus - Prompt AI",
-  "Description": "Prompt the Octopus AI service with a message and store the result in a variable. See https://octopus.com/docs/administration/copilot for more information.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python",
-    "Octopus.Action.Script.ScriptBody": "import os\nimport re\nimport http.client\nimport json\nimport time\nfrom urllib.parse import quote\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif 'get_octopusvariable' not in globals():\n    def get_octopusvariable(variable):\n        return os.environ.get(re.sub('\\\\.', '_', variable.upper()))\n\nif 'set_octopusvariable' not in globals():\n    def set_octopusvariable(variable, value):\n        print(f\"Setting {variable} to {value}\")\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif 'printverbose' not in globals():\n    def printverbose(msg):\n        print(msg)\n\ndef make_post_request(message, auto_approve, github_token, octopus_api_key, octopus_server, retry = 0):\n    \"\"\"\n    Query the Octopus AI service with a message.\n    :param message: The prompt message\n    :param github_token: The GitHub token\n    :param octopus_api_key: The Octopus API key\n    :param octopus_server: The Octopus URL\n    :return: The AI response\n    \"\"\"\n    headers = {\n        \"X-GitHub-Token\": github_token,\n        \"X-Octopus-ApiKey\": octopus_api_key,\n        \"X-Octopus-Server\": octopus_server,\n        \"Content-Type\": \"application/json\"\n    }\n    body = json.dumps({\"messages\": [{\"content\": message}]}).encode(\"utf8\")\n\n    conn = http.client.HTTPSConnection(\"aiagent.octopus.com\", timeout=240)\n    conn.request(\"POST\", \"/api/form_handler\", body, headers)\n    response = conn.getresponse()\n    response_data = response.read().decode(\"utf8\")\n    conn.close()\n\n    if response.status < 200 or response.status > 300:\n        if retry < 2:\n            printverbose(f\"Request to AI Agent failed with status code {response.status} and message: {response.reason}. Retrying...\")\n            time.sleep(400)\n            return make_post_request(message, auto_approve, github_token, octopus_api_key, octopus_server, retry + 1)\n        return f\"Request to AI Agent failed with status code {response.status} and message: {response.reason}\"\n\n    if is_action_response(response_data):\n        if auto_approve:\n            id = action_response_id(response_data)\n\n            if not id:\n                return \"Prompt required approval, but no confirmation ID was found in the response.\"\n\n            conn = http.client.HTTPSConnection(\"aiagent.octopus.com\", timeout=240)\n            conn.request(\"POST\", \"/api/form_handler?confirmation_id=\" + quote(id, safe='') + \"&confirmation_state=accepted\", body, headers)\n            response = conn.getresponse()\n            response_data = response.read().decode(\"utf8\")\n            conn.close()\n            return convert_from_sse_response(response_data)\n        else:\n            return \"Prompt required approval, but auto-approval is disabled. Please enable the auto-approval option in the step.\"\n\n    return convert_from_sse_response(response_data)\n\n\ndef convert_from_sse_response(sse_response):\n    \"\"\"\n    Converts an SSE response into a string.\n    :param sse_response: The SSE response to convert.\n    :return: The string representation of the SSE response.\n    \"\"\"\n\n    responses = map(\n        lambda line: json.loads(line.replace(\"data: \", \"\")),\n        filter(lambda line: line.strip().startswith(\"data:\"), sse_response.split(\"\\n\")),\n    )\n    content_responses = filter(\n        lambda response: \"content\" in response[\"choices\"][0][\"delta\"], responses\n    )\n    return \"\\n\".join(\n        map(\n            lambda line: line[\"choices\"][0][\"delta\"][\"content\"].strip(),\n            content_responses,\n        )\n    )\n\ndef is_action_response(sse_response):\n    responses = map(\n        lambda line: json.loads(line.replace(\"data: \", \"\")),\n        filter(lambda line: line.strip().startswith(\"data:\"), sse_response.split(\"\\n\")),\n    )\n\n    return any(response.get(\"type\") == \"action\" for response in responses)\n\ndef action_response_id(sse_response):\n    responses = map(\n        lambda line: json.loads(line.replace(\"data: \", \"\")),\n        filter(lambda line: line.strip().startswith(\"data:\"), sse_response.split(\"\\n\")),\n    )\n\n    action = next(filter(lambda response: response.get(\"type\") == \"action\", responses))\n\n    return action.get(\"confirmation\", {}).get(\"id\")\n\nstep_name = get_octopusvariable(\"Octopus.Step.Name\")\nmessage = get_octopusvariable(\"OctopusAI.Prompt\")\ngithub_token = get_octopusvariable(\"OctopusAI.GitHub.Token\")\noctopus_api = get_octopusvariable(\"OctopusAI.Octopus.APIKey\")\noctopus_url = get_octopusvariable(\"OctopusAI.Octopus.Url\")\nauto_approve = get_octopusvariable(\"OctopusAI.AutoApprove\").casefold() == \"true\"\n\nresult = make_post_request(message, auto_approve, github_token, octopus_api, octopus_url)\n\nset_octopusvariable(\"AIResult\", result)\n\nprint(result)\nprint(f\"AI result is available in the variable: Octopus.Action[{step_name}].Output.AIResult\")\n"
-  },
-  "Parameters": [
-    {
-      "Id": "10c6b0c8-92e0-4bce-91a7-0d1d0b275c1a",
-      "Name": "OctopusAI.Prompt",
-      "Label": "The prompt to send to the AI service",
-      "HelpText": null,
-      "DefaultValue": "Describe deployment \"#{Octopus.Release.Number}\" for project \"#{Octopus.Project.Name}\" to environment \"#{Octopus.Environment.Name}\" in space \"#{Octopus.Space.Name}\"",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "831e4eda-0ad3-460a-9375-42ce580bfd7d",
-      "Name": "OctopusAI.GitHub.Token",
-      "Label": "The GitHub Token",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "7d6a276d-fcb5-4dd9-b5a3-b7a3b48782c1",
-      "Name": "OctopusAI.Octopus.APIKey",
-      "Label": "The Octopus API Key",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "3eb54042-8169-4ae4-8910-a02b14325e71",
-      "Name": "OctopusAI.Octopus.Url",
-      "Label": "The Octopus URL",
-      "HelpText": null,
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "380c09c0-2af8-4866-a1a7-db77fa89f7d8",
-      "Name": "OctopusAI.AutoApprove",
-      "Label": "Enable this to auto approve any prompts that require approval",
-      "HelpText": null,
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2024-10-03T20:35:41.372Z",
-    "OctopusVersion": "2024.4.3391",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-lookup-space-id.json b/step-templates/octopus-lookup-space-id.json
deleted file mode 100644
index 6d88ad100..000000000
--- a/step-templates/octopus-lookup-space-id.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Id": "324f747e-e2cd-439d-a660-774baf4991f2",
-  "Name": "Octopus - Lookup Space ID",
-  "Description": "This step queries an Octopus server to return the ID of a named space. The ID is captured in an output variables called `SpaceID`.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "# This script exists for those scenarios where the tenant space is created as part of the same process that\n# attempts to populate the space. The tenant space ID variable, saved when the space is created, won't be refreshed\n# in the middle of the deployment, so we query it directly.\n\nimport argparse\nimport json\nimport urllib.request\nimport urllib.parse\nimport os\nimport sys\nimport time\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, just print any set variable to std out.\nif \"set_octopusvariable\" not in globals():\n    def set_octopusvariable(name, variable):\n        print(variable)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION] [FILE]...',\n        description='Lookup a space ID from the name'\n    )\n    parser.add_argument('--server-url',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SpaceLookup.ThisInstance.Server.Url') or get_octopusvariable_quiet(\n                            'ThisInstance.Server.Url'),\n                        help='Sets the Octopus server URL.')\n    parser.add_argument('--api-key',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SpaceLookup.ThisInstance.Api.Key') or get_octopusvariable_quiet('ThisInstance.Api.Key'),\n                        help='Sets the Octopus API key.')\n    parser.add_argument('--space-name',\n                        action='store',\n                        default=get_octopusvariable_quiet('SpaceLookup.Lookup.Space.Name') or get_octopusvariable_quiet(\n                            'Lookup.Space.Name') or get_octopusvariable_quiet('Octopus.Deployment.Tenant.Name'),\n                        help='The name of the space to lookup.')\n\n    return parser.parse_known_args()\n\n\nparser, _ = init_argparse()\n\n# Variable precondition checks\nif len(parser.server_url) == 0:\n    print(\"--server-url, ThisInstance.Server.Url, or SerializeProject.ThisInstance.Server.Url must be defined\")\n    sys.exit(1)\n\nif len(parser.api_key) == 0:\n    print(\"--api-key, ThisInstance.Api.Key, or ThisInstance.Api.Key must be defined\")\n    sys.exit(1)\n\nif len(parser.space_name) == 0:\n    print(\"--space-name, Lookup.Space.Name, SpaceLookup.Lookup.Space.Name, or Octopus.Deployment.Tenant.Name must be defined\")\n    sys.exit(1)\n\nurl = parser.server_url + '/api/Spaces?partialName=' + urllib.parse.quote(parser.space_name) + \"&take=1000\"\nheaders = {\n    'X-Octopus-ApiKey': parser.api_key,\n    'Accept': 'application/json'\n}\nrequest = urllib.request.Request(url, headers=headers)\n\n# Retry the request for up to a minute.\nresponse = None\nfor x in range(12):\n    response = urllib.request.urlopen(request)\n    if response.getcode() == 200:\n        break\n    time.sleep(5)\n\nif not response or not response.getcode() == 200:\n    print('The API query failed')\n    sys.exit(1)\n\ndata = json.loads(response.read().decode(\"utf-8\"))\n\nspace = [x for x in data['Items'] if x['Name'] == parser.space_name]\n\nif len(space) != 0:\n    print('Space ' + parser.space_name + ' has ID ' + space[0]['Id'])\n    print('The space ID is available as the output variable #{Octopus.Action[' + get_octopusvariable_quiet('Octopus.Action.Name') + '].Output.SpaceID}')\n    set_octopusvariable(\"SpaceID\", space[0]['Id'])\nelse:\n    print('Failed to find space called ' + parser.space_name)\n    sys.exit(1)\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python"
-  },
-  "Parameters": [
-    {
-      "Id": "69b98409-b4ba-401f-8986-042b6d58584f",
-      "Name": "SpaceLookup.ThisInstance.Server.Url",
-      "Label": "Server URL",
-      "HelpText": "The URL of the Octopus Server hosting the space to resolved.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9089cd55-75d6-4e91-a390-d7a3359e3c59",
-      "Name": "SpaceLookup.ThisInstance.Api.Key",
-      "Label": "Server API Key",
-      "HelpText": "The Octopus API Key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "4f5d46a5-ea76-478f-a5fa-0bacad6afa5b",
-      "Name": "SpaceLookup.Lookup.Space.Name",
-      "Label": "Space Name",
-      "HelpText": "The name of the space return the ID of",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-11T21:15:03.881Z",
-    "OctopusVersion": "2023.4.2151",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-serialize-project-to-terraform.json b/step-templates/octopus-serialize-project-to-terraform.json
deleted file mode 100644
index e885d7e8a..000000000
--- a/step-templates/octopus-serialize-project-to-terraform.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "Id": "e9526501-09d5-490f-ac3f-5079735fe041",
-  "Name": "Octopus - Serialize Project to Terraform",
-  "Description": "Serialize an Octopus project as a Terraform module and upload the resulting package to the Octopus built in feed.\n\nThis step uses naming conventions to exclude resources from the generated module:\n\n* Variables starting with `Private.` are excluded\n* Runbooks starting with `__ ` are excluded\n* The environment called `Sync` is removed from any variable scopes\n\nBecause serializing Terraform modules is done via the API, the values of any secret variables are not available, and are not included in the module generated by this step.\n\nHowever, by following a variable naming and scoping convention, it is possible to export and then apply a project in a Terraform module recreating secret variables, without ever including the secrets in the exported module.\n\nThe project to be exported must define all secret variables with a unique name and a single value.  For example, the secret variable `Test.Database.Password` can be scoped to the `Test` environment and the secret variable `Production.Database.Password` can be scoped to the `Production` environment. You can not have a single secret variable called `Database.Password` with two values for the different environments though.\n\nTo collapse the unique secret variables into a single variable used by steps, it is possible to create a non-secret variable called `Database.Password`  with two values `#{Test.Database.Password}` and `#{Production.Database.Password}` scoped to appropriate environments.\n\nIn this way steps can still reference a single variable called `Database.Password`, but all secret variables have unique names and only one value.\n\nAll secret variables are then scoped to an additional environment called `Sync`, which means all secret variables are exposed to runbooks run in the `Step` environment. The `Sync` environment is used to apply the Terraform module exported by this step, `Apply a Terraform template` step to perform variable replacements with secret variables.\n\nThe secret values in the Terraform module then have default values set to the Octostache template referencing the secret variable. For example, the Octopus variables in the Terraform module have default values like `#{Test.Database.Password}` and `#{Production.Database.Password}`. These templates are replaced at runtime by the `Apply a Terraform template` step, run in the `Sync` environment, effectively injecting the secret values back into the newly created project.\n\nThis allows secret variables to be recreated with their original values, without ever exporting the secret values. ",
-  "ActionType": "Octopus.Script",
-  "Version": 17,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "import argparse\nimport os\nimport stat\nimport re\nimport socket\nimport subprocess\nimport sys\nfrom datetime import datetime\nfrom urllib.parse import urlparse\nimport urllib.request\nfrom itertools import chain\nimport platform\nfrom urllib.request import urlretrieve\nimport zipfile\nimport json\nimport tarfile\nimport random, time\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif \"printverbose\" not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    if not output:\n        return\n\n    # https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python\n    output_no_ansi = re.sub(r'\\x1B(?:[@-Z\\\\-_]|\\[[0-?]*[ -/]*[@-~])', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef retry_with_backoff(fn, retries=5, backoff_in_seconds=1):\n    x = 0\n    while True:\n        try:\n            return fn()\n        except Exception as e:\n\n            print(e)\n\n            if x == retries:\n                raise\n\n            sleep = (backoff_in_seconds * 2 ** x +\n                     random.uniform(0, 1))\n            time.sleep(sleep)\n            x += 1\n\n\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi):\n    \"\"\"\n        The execute method provides the ability to execute external processes while capturing and returning the\n        output to std err and std out and exit code.\n    \"\"\"\n    process = subprocess.Popen(args,\n                               stdout=subprocess.PIPE,\n                               stderr=subprocess.PIPE,\n                               text=True,\n                               cwd=cwd,\n                               env=env)\n    stdout, stderr = process.communicate()\n    retcode = process.returncode\n\n    if print_args is not None:\n        print_output(' '.join(args))\n\n    if print_output is not None:\n        print_output(stdout)\n        print_output(stderr)\n\n    return stdout, stderr, retcode\n\n\ndef is_windows():\n    return platform.system() == 'Windows'\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION] [FILE]...',\n        description='Serialize an Octopus project to a Terraform module'\n    )\n    parser.add_argument('--ignore-all-changes',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoreAllChanges') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoreAllChanges') or 'false',\n                        help='Set to true to set the \"lifecycle.ignore_changes\" ' +\n                             'setting on each exported resource to \"all\"')\n    parser.add_argument('--ignore-variable-changes',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoreVariableChanges') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoreVariableChanges') or 'false',\n                        help='Set to true to set the \"lifecycle.ignore_changes\" ' +\n                             'setting on each exported octopus variable to \"all\"')\n    parser.add_argument('--terraform-backend',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.ThisInstance.Terraform.Backend') or get_octopusvariable_quiet(\n                            'ThisInstance.Terraform.Backend') or 'pg',\n                        help='Set this to the name of the Terraform backend to be included in the generated module.')\n    parser.add_argument('--server-url',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.ThisInstance.Server.Url') or get_octopusvariable_quiet(\n                            'ThisInstance.Server.Url'),\n                        help='Sets the server URL that holds the project to be serialized.')\n    parser.add_argument('--api-key',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.ThisInstance.Api.Key') or get_octopusvariable_quiet(\n                            'ThisInstance.Api.Key'),\n                        help='Sets the Octopus API key.')\n    parser.add_argument('--space-id',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Space.Id') or get_octopusvariable_quiet(\n                            'Exported.Space.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),\n                        help='Set this to the space ID containing the project to be serialized.')\n    parser.add_argument('--project-name',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.Name') or get_octopusvariable_quiet(\n                            'Exported.Project.Name') or get_octopusvariable_quiet(\n                            'Octopus.Project.Name'),\n                        help='Set this to the name of the project to be serialized.')\n    parser.add_argument('--upload-space-id',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Octopus.UploadSpace.Id') or get_octopusvariable_quiet(\n                            'Octopus.UploadSpace.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),\n                        help='Set this to the space ID of the Octopus space where ' +\n                             'the resulting package will be uploaded to.')\n    parser.add_argument('--ignore-cac-managed-values',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoreCacValues') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoreCacValues') or 'false',\n                        help='Set this to true to exclude cac managed values like non-secret variables, ' +\n                             'deployment processes, and project versioning into the Terraform module. ' +\n                             'Set to false to have these values embedded into the module.')\n    parser.add_argument('--exclude-cac-project-settings',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.ExcludeCacProjectValues') or get_octopusvariable_quiet(\n                            'Exported.Project.ExcludeCacProjectValues') or 'false',\n                        help='Set this to true to exclude CaC settings like git connections from the exported module.')\n    parser.add_argument('--ignored-library-variable-sets',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoredLibraryVariableSet') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoredLibraryVariableSet'),\n                        help='A comma separated list of library variable sets to ignore.')\n    parser.add_argument('--ignored-accounts',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoredAccounts') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoredAccounts'),\n                        help='A comma separated list of accounts to ignore.')\n    parser.add_argument('--ignored-tenants',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoredTenants') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoredTenants'),\n                        help='A comma separated list of tenants to ignore.')\n    parser.add_argument('--ignored-channels',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoredChannels') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoredChannels'),\n                        help='A comma separated list of channels to ignore.')\n    parser.add_argument('--include-step-templates',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IncludeStepTemplates') or get_octopusvariable_quiet(\n                            'Exported.Project.IncludeStepTemplates') or 'false',\n                        help='Set this to true to include step templates in the exported module. ' +\n                             'This disables the default behaviour of detaching step templates.')\n    parser.add_argument('--lookup-project-link-tenants',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.LookupProjectLinkTenants') or get_octopusvariable_quiet(\n                            'Exported.Project.LookupProjectLinkTenants') or 'false',\n                        help='Set this option to link tenants and create tenant project variables.')\n    parser.add_argument('--default-secret-variables',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.DefaultSecrets') or get_octopusvariable_quiet(\n                            'Exported.Project.DefaultSecrets') or 'false',\n                        help='Set to true to set sensitive variables to the octostache template that represents the variable')\n    parser.add_argument('--octopus-managed-terraform-vars',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.OctopusManagedTerraformVars') or get_octopusvariable_quiet(\n                            'Exported.Project.OctopusManagedTerraformVars'),\n                        help='The name of an Octopus variable to use as the terraform.tfvars file.')\n\n    return parser.parse_known_args()\n\n\ndef get_latest_github_release(owner, repo, filename):\n    url = f\"https://api.github.com/repos/{owner}/{repo}/releases/latest\"\n    releases = urllib.request.urlopen(url).read()\n    contents = json.loads(releases)\n\n    download = [asset for asset in contents.get('assets') if asset.get('name') == filename]\n\n    if len(download) != 0:\n        return download[0].get('browser_download_url')\n\n    return None\n\n\ndef ensure_octo_cli_exists():\n    if is_windows():\n        print(\"Checking for the Octopus CLI\")\n        try:\n            stdout, _, exit_code = execute(['octo.exe', 'help'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octo CLI not found\"\n            return \"\"\n        except:\n            print(\"Downloading the Octopus CLI\")\n            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.win-x64.zip',\n                        'OctopusTools.zip')\n            with zipfile.ZipFile('OctopusTools.zip', 'r') as zip_ref:\n                zip_ref.extractall(os.getcwd())\n            return os.getcwd()\n    else:\n        print(\"Checking for the Octopus CLI for Linux\")\n        try:\n            stdout, _, exit_code = execute(['octo', 'help'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octo CLI not found\"\n            return \"\"\n        except:\n            print(\"Downloading the Octopus CLI for Linux\")\n            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.linux-x64.tar.gz',\n                        'OctopusTools.tar.gz')\n            with tarfile.open('OctopusTools.tar.gz') as file:\n                file.extractall(os.getcwd())\n                os.chmod(os.path.join(os.getcwd(), 'octo'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)\n            return os.getcwd()\n\n\ndef ensure_octoterra_exists():\n    if is_windows():\n        print(\"Checking for the Octoterra tool for Windows\")\n        try:\n            stdout, _, exit_code = execute(['octoterra.exe', '-version'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octoterra not found\"\n            return \"\"\n        except:\n            print(\"Downloading Octoterra CLI for Windows\")\n            retry_with_backoff(lambda: urlretrieve(\n                \"https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_windows_amd64.exe\",\n                'octoterra.exe'), 10, 30)\n            return os.getcwd()\n    else:\n        print(\"Checking for the Octoterra tool for Linux\")\n        try:\n            stdout, _, exit_code = execute(['octoterra', '-version'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octoterra not found\"\n            return \"\"\n        except:\n            print(\"Downloading Octoterra CLI for Linux\")\n            retry_with_backoff(lambda: urlretrieve(\n                \"https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_linux_amd64\",\n                'octoterra'), 10, 30)\n            os.chmod(os.path.join(os.getcwd(), 'octoterra'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)\n            return os.getcwd()\n\n\noctocli_path = ensure_octo_cli_exists()\noctoterra_path = ensure_octoterra_exists()\nparser, _ = init_argparse()\n\n# Variable precondition checks\nif len(parser.server_url) == 0:\n    print(\"--server-url, ThisInstance.Server.Url, or SerializeProject.ThisInstance.Server.Url must be defined\")\n    sys.exit(1)\n\nif len(parser.api_key) == 0:\n    print(\"--api-key, ThisInstance.Api.Key, or ThisInstance.Api.Key must be defined\")\n    sys.exit(1)\n\nprint(\"Octopus URL: \" + parser.server_url)\nprint(\"Octopus Space ID: \" + parser.space_id)\n\n# Build the arguments to ignore library variable sets\nignores_library_variable_sets = parser.ignored_library_variable_sets.split(',')\nignores_library_variable_sets_args = [['-excludeLibraryVariableSet', x] for x in ignores_library_variable_sets]\n\n# Build the arguments to ignore accounts\nignored_accounts = parser.ignored_accounts.split(',')\nignored_accounts = [['-excludeAccounts', x] for x in ignored_accounts]\n\n# Build the arguments to ignore tenants\nignored_tenants = parser.ignored_tenants.split(',')\nignored_tenants_args = [['-excludeTenants', x] for x in ignored_tenants]\n\n# Build the arguments to ignore channels\nignored_channels = parser.ignored_channels.split(',')\nignored_channels_args = [['-excludeChannels', x] for x in ignored_channels]\n\nos.mkdir(os.getcwd() + '/export')\n\nexport_args = [os.path.join(octoterra_path, 'octoterra'),\n               # the url of the instance\n               '-url', parser.server_url,\n               # the api key used to access the instance\n               '-apiKey', parser.api_key,\n               # add a postgres backend to the generated modules\n               '-terraformBackend', parser.terraform_backend,\n               # dump the generated HCL to the console\n               '-console',\n               # dump the project from the current space\n               '-space', parser.space_id,\n               # the name of the project to serialize\n               '-projectName', parser.project_name,\n               # ignoreProjectChanges can be set to ignore all changes to the project, variables, runbooks etc\n               '-ignoreProjectChanges=' + parser.ignore_all_changes,\n               # use data sources to lookup external dependencies (like environments, accounts etc) rather\n               # than serialize those external resources\n               '-lookupProjectDependencies',\n               # for any secret variables, add a default value set to the octostache value of the variable\n               # e.g. a secret variable called \"database\" has a default value of \"#{database}\"\n               '-defaultSecretVariableValues=' + parser.default_secret_variables,\n               # Any value that can't be replaced with an Octostache template, add a dummy value\n               '-dummySecretVariableValues',\n               # detach any step templates, allowing the exported project to be used in a new space\n               '-detachProjectTemplates=' + str(not parser.include_step_templates),\n               # allow the downstream project to move between project groups\n               '-ignoreProjectGroupChanges',\n               # allow the downstream project to change names\n               '-ignoreProjectNameChanges',\n               # CaC enabled projects will not export the deployment process, non-secret variables, and other\n               # CaC managed project settings if ignoreCacManagedValues is true. It is usually desirable to\n               # set this value to true, but it is false here because CaC projects created by Terraform today\n               # save some variables in the database rather than writing them to the Git repo.\n               '-ignoreCacManagedValues=' + parser.ignore_cac_managed_values,\n               # Excluding CaC values means the resulting module does not include things like git credentials.\n               # Setting excludeCaCProjectSettings to true and ignoreCacManagedValues to false essentially\n               # converts a CaC project back to a database project.\n               '-excludeCaCProjectSettings=' + parser.exclude_cac_project_settings,\n               # This value is always true. Either this is an unmanaged project, in which case we are never\n               # reapplying it; or it is a variable configured project, in which case we need to ignore\n               # variable changes, or it is a shared CaC project, in which case we don't use Terraform to\n               # manage variables.\n               '-ignoreProjectVariableChanges=' + parser.ignore_variable_changes,\n               # To have secret variables available when applying a downstream project, they must be scoped\n               # to the Sync environment. But we do not need this scoping in the downstream project, so the\n               # Sync environment is removed from any variable scopes when serializing it to Terraform.\n               '-excludeVariableEnvironmentScopes', 'Sync',\n               # Exclude any variables starting with \"Private.\"\n               '-excludeProjectVariableRegex', 'Private\\\\..*',\n               # Capture the octopus endpoint, space ID, and space name as output vars. This is useful when\n               # querying th Terraform state file to know which space and instance the resources were\n               # created in. The scripts used to update downstream projects in bulk work by querying the\n               # Terraform state, finding all the downstream projects, and using the space name to only process\n               # resources that match the current tenant (because space names and tenant names are the same).\n               # The output variables added by this option are octopus_server, octopus_space_id, and\n               # octopus_space_name.\n               '-includeOctopusOutputVars',\n               # Where steps do not explicitly define a worker pool and reference the default one, this\n               # option explicitly exports the default worker pool by name. This means if two spaces have\n               # different default pools, the exported project still uses the pool that the original project\n               # used.\n               '-lookUpDefaultWorkerPools',\n               # Link any tenants that were originally link to the project and create project tenant variables\n               '-lookupProjectLinkTenants=' + parser.lookup_project_link_tenants,\n               # Add support for experimental step templates\n               '-experimentalEnableStepTemplates=' + parser.include_step_templates,\n               # Ignore invalid channels\n               '-excludeInvalidChannels',\n               # The directory where the exported files will be saved\n               '-dest', os.getcwd() + '/export',\n               # Define the name of an Octopus variable to populate the terraform.tfvars file\n               '-octopusManagedTerraformVars=' + parser.octopus_managed_terraform_vars,\n               # This is a management runbook that we do not wish to export\n               '-excludeRunbookRegex', '__ .*'] + list(chain(*ignores_library_variable_sets_args)) + list(\n    chain(*ignored_accounts)) + list(chain(*ignored_tenants_args)) + list(chain(*ignored_channels_args))\n\nprint(\"Exporting Terraform module\")\n_, _, octoterra_exit = execute(export_args)\n\nif not octoterra_exit == 0:\n    print(\"Octoterra failed. Please check the logs for more information.\")\n    sys.exit(1)\n\ndate = datetime.now().strftime('%Y.%m.%d.%H%M%S')\n\nprint(\"Creating Terraform module package\")\nif is_windows():\n    execute([os.path.join(octocli_path, 'octo.exe'),\n             'pack',\n             '--format', 'zip',\n             '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name),\n             '--version', date,\n             '--basePath', os.getcwd() + '\\\\export',\n             '--outFolder', os.getcwd()])\nelse:\n    _, _, _ = execute([os.path.join(octocli_path, 'octo'),\n                       'pack',\n                       '--format', 'zip',\n                       '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name),\n                       '--version', date,\n                       '--basePath', os.getcwd() + '/export',\n                       '--outFolder', os.getcwd()])\n\nprint(\"Uploading Terraform module package\")\nif is_windows():\n    _, _, _ = execute([os.path.join(octocli_path, 'octo.exe'),\n                       'push',\n                       '--apiKey', parser.api_key,\n                       '--server', parser.server_url,\n                       '--space', parser.upload_space_id,\n                       '--package', os.getcwd() + \"\\\\\" +\n                       re.sub('[^0-9a-zA-Z]', '_', parser.project_name) + '.' + date + '.zip',\n                       '--replace-existing'])\nelse:\n    _, _, _ = execute([os.path.join(octocli_path, 'octo'),\n                       'push',\n                       '--apiKey', parser.api_key,\n                       '--server', parser.server_url,\n                       '--space', parser.upload_space_id,\n                       '--package', os.getcwd() + \"/\" +\n                       re.sub('[^0-9a-zA-Z]', '_', parser.project_name) + '.' + date + '.zip',\n                       '--replace-existing'])\n\nprint(\"##octopus[stdout-default]\")\n\nprint(\"Done\")\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python"
-  },
-  "Parameters": [
-    {
-      "Id": "ca62a702-6eb3-4d01-b645-73fbb2a1ea86",
-      "Name": "SerializeProject.Exported.Project.IgnoreAllChanges",
-      "Label": "Ignore All Changes",
-      "HelpText": "Selecting this option creates a Terraform module with the \"lifecycle.ignore_changes\" option set to \"all\" for all project resources. This allows the resources to be created if they do not exist, but won't update them if the module is reapplied. This value effectively enables the \"Ignore Variable Changes\" option.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "05fafe0b-b05f-4e7b-85c3-857b62dc4182",
-      "Name": "SerializeProject.Exported.Project.IgnoreVariableChanges",
-      "Label": "Ignore Variable Changes",
-      "HelpText": "Selecting this option creates a Terraform module with the \"lifecycle.ignore_changes\" option set to \"all\" for Octopus variables (i.e. \"octopusdeploy_variable\" resources)\". This allows Octopus variables to be created if they do not exist, but won't update Octopus variable values if the module is reapplied. This value effectively enabled if the \"Ignore All Changes\" option is enabled.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "3b8f35b6-fc1a-442b-ae0e-3036f5436a7a",
-      "Name": "SerializeProject.Exported.Project.IgnoreCacValues",
-      "Label": "Ignore CaC Settings",
-      "HelpText": "Enable this option to exclude any Config-as-Code managed resources from the exported module, such as non-secret variables, deployment process, and CaC defined project settings. This option is useful when you are exporting CaC enabled projects and do not wish to include any settings in the exported module that are managed by Git. Disable this option, and enable the \"Exclude CaC Settings\" option to essentially convert CaC projects to regular projects.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "5c315650-9ba8-48b8-a02c-269315277fea",
-      "Name": "SerializeProject.Exported.Project.ExcludeCacProjectValues",
-      "Label": "Exclude CaC Settings",
-      "HelpText": "Enable this option to exclude Config-as-Code settings from the exported module, such as Git credentials and the version controlled flag. Enable this option, and disable the \"Ignore CaC Settings\" option to essentially convert CaC projects to regular projects.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "770a6e15-1a4f-4451-ae94-b2469d5765e0",
-      "Name": "SerializeProject.Exported.Project.DefaultSecrets",
-      "Label": "Default Secrets to Default Values",
-      "HelpText": "This option sets the default value of all secrets, like account and feed passwords, to an Octostache template referencing the variable name. This allows the default value to be replaced by Octopus with the sensitive value during deployment.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "9c18e779-bddc-4f74-81c6-9d75babc9c9c",
-      "Name": "SerializeProject.ThisInstance.Terraform.Backend",
-      "Label": "Terraform Backend",
-      "HelpText": "The [backed](https://developer.hashicorp.com/terraform/language/settings/backends/configuration) to define in the Terraform module.",
-      "DefaultValue": "s3",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f96cd929-1c18-4f7c-9121-82904e64834e",
-      "Name": "SerializeProject.ThisInstance.Server.Url",
-      "Label": "Octopus Server URL",
-      "HelpText": "The URL of the Octopus Server hosting the project to be serialized.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "95e0f611-d1f2-4317-ad5e-9131de73bbbe",
-      "Name": "SerializeProject.ThisInstance.Api.Key",
-      "Label": "Octopus API Key",
-      "HelpText": "The Octopus API Key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "9473de1f-a633-41d0-ba2c-6b622ce65551",
-      "Name": "SerializeProject.Exported.Space.Id",
-      "Label": "Octopus Space ID",
-      "HelpText": "The Space ID containing the project to be exported",
-      "DefaultValue": "#{Octopus.Space.Id}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9d8af8e2-307a-4149-a28e-f75cec9ee044",
-      "Name": "SerializeProject.Exported.Project.Name",
-      "Label": "Octopus Project Name",
-      "HelpText": "The name of the project to serialize.",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1b8ce71f-0931-4966-805a-e6d0ec12e3a0",
-      "Name": "SerializeProject.Octopus.UploadSpace.Id",
-      "Label": "Octopus Upload Space ID",
-      "HelpText": "The ID of the space to upload the Terraform package to. Leave this blank to upload to the space defined in the `Octopus Space ID` parameter.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "aec82033-cae1-4a18-a315-c70468f71539",
-      "Name": "SerializeProject.Exported.Project.IgnoredAccounts",
-      "Label": "Ignored Accounts",
-      "HelpText": "A comma separated list of accounts that will not be included in the Terraform module. These accounts are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e45abab5-cb8f-4af2-b3e9-3cde057907df",
-      "Name": "Exported.Project.IgnoredLibraryVariableSet",
-      "Label": "Ignored Library Variables Sets",
-      "HelpText": "A comma separated list of library variables sets that will not be included in the Terraform module. These library variable sets are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cb075d4f-a02f-4c80-b8b9-6f2da83730ff",
-      "Name": "SerializeProject.Exported.Project.IgnoredTenants",
-      "Label": "Ignored Tenants",
-      "HelpText": "A comma separated list of tenants that will not be included in the Terraform module.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ab67746c-b66b-4983-ac17-9a278b711037",
-      "Name": "SerializeProject.Exported.Project.IgnoredChannels",
-      "Label": "Ignored Channels",
-      "HelpText": "A comma separated list of channels that will not be included in the Terraform module.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e456bc3f-a537-4982-8963-a091d3f31cf0",
-      "Name": "SerializeProject.Exported.Project.IncludeStepTemplates",
-      "Label": "Include Step Templates",
-      "HelpText": "Enable this option to export step templates referenced by a project. Disable this option to have step templates detached in projects instead.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "d9dacd25-5b0f-4f3e-89e2-08eefc0ffb89",
-      "Name": "SerializeProject.Exported.Project.LookupProjectLinkTenants",
-      "Label": "Link Tenants and Create Tenant Variables",
-      "HelpText": "Enable this option to have each project link any tenants and create project tenant variables.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "932f67ab-5742-4cb2-9892-42bb21671757",
-      "Name": "SerializeProject.Exported.Project.OctopusManagedTerraformVars",
-      "Label": "Octopus Managed Terraform Vars",
-      "HelpText": "The optional name of an Octopus variable to use as the terraform.tfvars file.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-11T21:06:55.101Z",
-    "OctopusVersion": "2023.4.2151",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}

From 4523439f613b79301d40f5a7716e716545d60aef Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 00:39:55 -0700
Subject: [PATCH 08/21] refactor: migrate step template batch 2 to src

---
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |    5 +
 .../metadata.json                             |  114 +
 .../scriptbody.ps1                            |  126 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   25 +
 .../azure-create-new-webapp/metadata.json     |    6 +-
 .../azure-create-new-webapp/scriptbody.ps1    |   50 +
 .../metadata.json                             |   56 +
 .../scriptbody.ps1                            |   22 +
 .../metadata.json                             |   81 +
 .../scriptbody.ps1                            |   98 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   91 +
 .../azure-database-export/metadata.json       |    8 +-
 .../azure-database-export/scriptbody.ps1      |   45 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |  113 +
 .../metadata.json                             |  230 ++
 .../scriptbody.ps1                            |  218 ++
 .../azure-database-import/metadata.json       |    8 +-
 .../azure-database-import/scriptbody.ps1      |   46 +
 .../azure-delete-from-webapp/metadata.json    |   82 +
 .../azure-delete-from-webapp/scriptbody.ps1   |   78 +
 .../metadata.json                             |   14 +-
 .../scriptbody.ps1                            |   22 +
 .../azure-delete-resource-group/metadata.json |   55 +
 .../scriptbody.ps1                            |   30 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |  120 +
 .../azure-deploy-containerapp/metadata.json   |  198 ++
 .../azure-deploy-containerapp/scriptbody.ps1  |  325 +++
 .../azure-devops-build-pipeline/metadata.json |   93 +
 .../scriptbody.ps1                            |  146 ++
 .../metadata.json                             |  149 ++
 .../scriptbody.ps1                            |  433 ++++
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |  125 +
 .../metadata.json                             |   86 +
 .../scriptbody.ps1                            |  140 ++
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |  110 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   80 +
 .../azure-manage-webjob/metadata.json         |    4 +-
 .../azure-manage-webjob/scriptbody.ps1        |    9 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |    3 +
 .../metadata.json                             |   66 +
 .../scriptbody.ps1                            |   95 +
 .../metadata.json                             |   92 +
 .../scriptbody.ps1                            |  101 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |    9 +
 .../azure-upload-files/metadata.json          |    6 +-
 .../azure-upload-files/scriptbody.ps1         |   47 +
 .../metadata.json                             |   74 +
 .../scriptbody.ps1                            |   66 +
 .../metadata.json                             |  107 +
 .../scriptbody.ps1                            |   81 +
 .../metadata.json                             |   66 +
 .../scriptbody.ps1                            |   33 +
 .../azure-web-app-restart/metadata.json       |   45 +
 .../azure-web-app-restart/scriptbody.ps1      |   45 +
 .../metadata.json                             |   65 +
 .../scriptbody.ps1                            |   35 +
 .../metadata.json                             |   54 +
 .../scriptbody.ps1                            |   38 +
 .../azure-web-app-set-traffic/metadata.json   |   44 +
 .../azure-web-app-set-traffic/scriptbody.ps1  |   30 +
 .../azure-web-app-slot-swap/metadata.json     |   55 +
 .../azure-web-app-slot-swap/scriptbody.ps1    |   19 +
 .../azure-web-app-ssl/metadata.json           |    6 +-
 .../azure-web-app-ssl/scriptbody.ps1          |   37 +
 .../azure-web-app-start/metadata.json         |    6 +-
 .../azure-web-app-start/scriptbody.ps1        |   32 +
 .../azure-web-app-stop/metadata.json          |    6 +-
 .../azure-web-app-stop/scriptbody.ps1         |   23 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   31 +
 .../metadata.json                             |   75 +
 .../scriptbody.ps1                            |  143 ++
 .../block-progression/metadata.json           |   64 +
 .../block-progression/scriptbody.ps1          |   15 +
 .../calculate-deployment-mode/metadata.json   |   23 +
 .../calculate-deployment-mode/scriptbody.ps1  |  188 ++
 .../chef-run-cookbook/metadata.json           |   45 +
 .../chef-run-cookbook/scriptbody.ps1          |   35 +
 .../chocolatey-ensure-installed/metadata.json |   21 +
 .../scriptbody.ps1                            |   16 +
 .../chocolatey-install-package/metadata.json  |    6 +-
 .../chocolatey-install-package/scriptbody.ps1 |   64 +
 .../chocolatey-manage-config/metadata.json    |    6 +-
 .../chocolatey-manage-config/scriptbody.ps1   |   44 +
 .../chocolatey-manage-features/metadata.json  |    6 +-
 .../chocolatey-manage-features/scriptbody.ps1 |   38 +
 .../chocolatey-manage-sources/metadata.json   |    6 +-
 .../chocolatey-manage-sources/scriptbody.ps1  |  112 +
 .../chocolatey-pin-package/metadata.json      |    6 +-
 .../chocolatey-pin-package/scriptbody.ps1     |   50 +
 .../metadata.json                             |  106 +
 .../scriptbody.ps1                            |   93 +
 .../clickonce-re-sign/metadata.json           |   58 +
 .../clickonce-re-sign/scriptbody.ps1          |   14 +
 .../clickonce-sign-file/metadata.json         |    6 +-
 .../clickonce-sign-file/scriptbody.ps1        |    5 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |    7 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |    6 +
 src/step-templates/clone-tenant/metadata.json |   92 +
 .../clone-tenant/scriptbody.ps1               |  110 +
 .../metadata.json                             |   40 +
 .../scriptbody.ps1                            |  110 +
 .../metadata.json                             |   48 +
 .../scriptbody.ps1                            |   56 +
 .../metadata.json                             |   76 +
 .../scriptbody.ps1                            |  121 +
 .../metadata.json                             |   81 +
 .../scriptbody.ps1                            |  118 +
 .../metadata.json                             |   31 +
 .../scriptbody.ps1                            |   26 +
 .../create-tenant/metadata.json               |   82 +
 .../create-tenant/scriptbody.ps1              |   89 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   52 +
 .../metadata.json                             |   94 +
 .../scriptbody.ps1                            |  356 +++
 .../datadog-create-event/metadata.json        |    8 +-
 .../datadog-create-event/scriptbody.ps1       |   52 +
 .../datadog-schedule-downtime/metadata.json   |    8 +-
 .../datadog-schedule-downtime/scriptbody.ps1  |   49 +
 .../datadog-task-log/metadata.json            |   73 +
 .../datadog-task-log/scriptbody.ps1           |  135 ++
 .../deploy-child-project/metadata.json        |  273 +++
 .../deploy-child-project/scriptbody.ps1       | 2064 +++++++++++++++++
 .../metadata.json                             |   60 +
 .../scriptbody.ps1                            |   67 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   39 +
 .../docker-install-windows/metadata.json      |   22 +
 .../docker-install-windows/scriptbody.ps1     |   23 +
 .../dsc-windows-service/metadata.json         |   59 +
 .../dsc-windows-service/scriptbody.ps1        |   84 +
 .../dyn-create-an-A-record/metadata.json      |   85 +
 .../dyn-create-an-A-record/scriptbody.ps1     |  315 +++
 .../edgecast-cdn-purge/metadata.json          |   58 +
 .../edgecast-cdn-purge/scriptbody.ps1         |   54 +
 .../elmahio-notify-deployment/metadata.json   |    6 +-
 .../elmahio-notify-deployment/scriptbody.ps1  |   16 +
 .../elmahio-upload-source-map/metadata.json   |    6 +-
 .../elmahio-upload-source-map/scriptbody.ps1  |   31 +
 .../epplus-register-dll-gac/metadata.json     |   73 +
 .../epplus-register-dll-gac/scriptbody.ps1    |   49 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   21 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   12 +
 .../f5-enable-disable-member/metadata.json    |    4 +-
 .../f5-enable-disable-member/scriptbody.ps1   |   88 +
 .../metadata.json                             |  125 +
 .../scriptbody.ps1                            |  218 ++
 .../f5-gtm-enable-or-disable/metadata.json    |    8 +-
 .../f5-gtm-enable-or-disable/scriptbody.ps1   |   16 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   93 +
 .../file-download/metadata.json               |    6 +-
 .../file-download/scriptbody.ps1              |    4 +
 .../file-system-add-hosts-entry/metadata.json |   48 +
 .../scriptbody.ps1                            |   86 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   31 +
 .../metadata.json                             |   54 +
 .../scriptbody.ps1                            |   77 +
 .../metadata.json                             |   40 +
 .../scriptbody.ps1                            |  133 ++
 .../metadata.json                             |   40 +
 .../scriptbody.ps1                            |   74 +
 .../file-system-clean-directory/metadata.json |   49 +
 .../scriptbody.ps1                            |  141 ++
 .../file-system-combine-files/metadata.json   |    4 +-
 .../file-system-combine-files/scriptbody.ps1  |   65 +
 .../file-system-copy-file/metadata.json       |   46 +
 .../file-system-copy-file/scriptbody.ps1      |   69 +
 .../file-system-create-file/metadata.json     |    6 +-
 .../file-system-create-file/scriptbody.ps1    |   10 +
 .../file-system-create-folder/metadata.json   |   66 +
 .../file-system-create-folder/scriptbody.ps1  |   75 +
 .../file-system-create-folders/metadata.json  |   40 +
 .../file-system-create-folders/scriptbody.ps1 |   70 +
 .../file-system-create-symlink/metadata.json  |   40 +
 .../file-system-create-symlink/scriptbody.ps1 |   83 +
 .../metadata.json                             |   58 +
 .../scriptbody.ps1                            |   67 +
 .../metadata.json                             |   71 +
 .../scriptbody.ps1                            |   89 +
 .../metadata.json                             |   58 +
 .../scriptbody.ps1                            |   66 +
 .../file-system-rename-file/metadata.json     |    6 +-
 .../file-system-rename-file/scriptbody.ps1    |   50 +
 .../F5-API-enable-disable-member.json         |  114 -
 ...azure-create-resource-group-az-module.json |   56 -
 .../azure-create-staging-deployment-slot.json |   81 -
 ...azure-database-import-create-new-vcpu.json |  230 --
 step-templates/azure-delete-from-webapp.json  |   82 -
 .../azure-delete-resource-group.json          |   55 -
 step-templates/azure-deploy-containerapp.json |  198 --
 .../azure-devops-build-pipeline.json          |   93 -
 ...unction-set-appsettings-from-azconfig.json |  149 --
 .../azure-keyvault-retrieve-secrets.json      |   86 -
 ...ure-remove-resource-group-deployments.json |   66 -
 .../azure-switch-staging-deployment-slot.json |   92 -
 .../azure-web-app-disable-appoffline.json     |   74 -
 .../azure-web-app-enable-appoffline.json      |  107 -
 .../azure-web-app-get-deployment-user.json    |   66 -
 step-templates/azure-web-app-restart.json     |   45 -
 .../azure-web-app-rolling-restart.json        |   65 -
 .../azure-web-app-set-app-settings.json       |   54 -
 step-templates/azure-web-app-set-traffic.json |   44 -
 step-templates/azure-web-app-slot-swap.json   |   55 -
 ...rden-secrets-manager-retrieve-secrets.json |   75 -
 step-templates/block-progression.json         |   64 -
 step-templates/calculate-deployment-mode.json |   23 -
 step-templates/chef-run-cookbook.json         |   45 -
 .../chocolatey-ensure-installed.json          |   21 -
 .../clickonce-from-deployed-package.json      |  106 -
 step-templates/clickonce-re-sign.json         |   58 -
 step-templates/clone-tenant.json              |   92 -
 .../com-component-register-unregister.json    |   40 -
 ...figuration-encrypt-app-config-section.json |   48 -
 ...ion-encrypt-app-or-web-config-section.json |   76 -
 ...figuration-encrypt-web-config-section.json |   81 -
 .../create-azure-website-staging-slot.json    |   31 -
 step-templates/create-tenant.json             |   82 -
 .../cyberark-conjur-retrieve-secrets.json     |   94 -
 step-templates/datadog-task-log.json          |   73 -
 step-templates/deploy-child-project.json      |  273 ---
 .../determine-rolling-deploy-window-size.json |   60 -
 step-templates/docker-install-windows.json    |   22 -
 step-templates/dsc-windows-service.json       |   59 -
 step-templates/dyn-create-an-A-record.json    |   85 -
 step-templates/edgecast-cdn-purge.json        |   58 -
 step-templates/epplus-register-dll-gac.json   |   73 -
 .../f5-enable-disable-multiple-pools.json     |  127 -
 .../file-system-add-hosts-entry.json          |   48 -
 .../file-system-check-disk-space.json         |   54 -
 .../file-system-clean-asp-net-temp-files.json |   40 -
 ...system-clean-configuration-transforms.json |   40 -
 .../file-system-clean-directory.json          |   49 -
 step-templates/file-system-copy-file.json     |   46 -
 step-templates/file-system-create-folder.json |   66 -
 .../file-system-create-folders.json           |   40 -
 .../file-system-create-symlink.json           |   40 -
 .../file-system-find-and-replace.json         |   58 -
 .../file-system-grant-permissions.json        |   71 -
 ...m-regular-expression-find-and-replace.json |   58 -
 256 files changed, 13990 insertions(+), 4326 deletions(-)
 rename step-templates/Azure-Get-Publishing-Credentials.json => src/step-templates/Azure-Get-Publishing-Credentials/metadata.json (76%)
 create mode 100644 src/step-templates/Azure-Get-Publishing-Credentials/scriptbody.ps1
 create mode 100644 src/step-templates/F5-API-enable-disable-member/metadata.json
 create mode 100644 src/step-templates/F5-API-enable-disable-member/scriptbody.ps1
 rename step-templates/azure-create-new-resourcegroup.json => src/step-templates/azure-create-new-resourcegroup/metadata.json (69%)
 create mode 100644 src/step-templates/azure-create-new-resourcegroup/scriptbody.ps1
 rename step-templates/azure-create-new-webapp.json => src/step-templates/azure-create-new-webapp/metadata.json (53%)
 create mode 100644 src/step-templates/azure-create-new-webapp/scriptbody.ps1
 create mode 100644 src/step-templates/azure-create-resource-group-az-module/metadata.json
 create mode 100644 src/step-templates/azure-create-resource-group-az-module/scriptbody.ps1
 create mode 100644 src/step-templates/azure-create-staging-deployment-slot/metadata.json
 create mode 100644 src/step-templates/azure-create-staging-deployment-slot/scriptbody.ps1
 rename step-templates/azure-database-execute-sql-cmd.json => src/step-templates/azure-database-execute-sql-cmd/metadata.json (53%)
 create mode 100644 src/step-templates/azure-database-execute-sql-cmd/scriptbody.ps1
 rename step-templates/azure-database-export.json => src/step-templates/azure-database-export/metadata.json (72%)
 create mode 100644 src/step-templates/azure-database-export/scriptbody.ps1
 rename step-templates/azure-database-import-create-new-DTU.json => src/step-templates/azure-database-import-create-new-DTU/metadata.json (59%)
 create mode 100644 src/step-templates/azure-database-import-create-new-DTU/scriptbody.ps1
 create mode 100644 src/step-templates/azure-database-import-create-new-vcpu/metadata.json
 create mode 100644 src/step-templates/azure-database-import-create-new-vcpu/scriptbody.ps1
 rename step-templates/azure-database-import.json => src/step-templates/azure-database-import/metadata.json (71%)
 create mode 100644 src/step-templates/azure-database-import/scriptbody.ps1
 create mode 100644 src/step-templates/azure-delete-from-webapp/metadata.json
 create mode 100644 src/step-templates/azure-delete-from-webapp/scriptbody.ps1
 rename step-templates/azure-delete-resource-group-az-module.json => src/step-templates/azure-delete-resource-group-az-module/metadata.json (77%)
 create mode 100644 src/step-templates/azure-delete-resource-group-az-module/scriptbody.ps1
 create mode 100644 src/step-templates/azure-delete-resource-group/metadata.json
 create mode 100644 src/step-templates/azure-delete-resource-group/scriptbody.ps1
 rename step-templates/azure-deploy-app-service-config-zip.json => src/step-templates/azure-deploy-app-service-config-zip/metadata.json (57%)
 create mode 100644 src/step-templates/azure-deploy-app-service-config-zip/scriptbody.ps1
 create mode 100644 src/step-templates/azure-deploy-containerapp/metadata.json
 create mode 100644 src/step-templates/azure-deploy-containerapp/scriptbody.ps1
 create mode 100644 src/step-templates/azure-devops-build-pipeline/metadata.json
 create mode 100644 src/step-templates/azure-devops-build-pipeline/scriptbody.ps1
 create mode 100644 src/step-templates/azure-function-set-appsettings-from-azconfig/metadata.json
 create mode 100644 src/step-templates/azure-function-set-appsettings-from-azconfig/scriptbody.ps1
 rename step-templates/azure-install-windows-tentacle.json => src/step-templates/azure-install-windows-tentacle/metadata.json (55%)
 create mode 100644 src/step-templates/azure-install-windows-tentacle/scriptbody.ps1
 create mode 100644 src/step-templates/azure-keyvault-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/azure-keyvault-retrieve-secrets/scriptbody.ps1
 rename step-templates/azure-linux-install-octopus-tentacle.json => src/step-templates/azure-linux-install-octopus-tentacle/metadata.json (59%)
 create mode 100644 src/step-templates/azure-linux-install-octopus-tentacle/scriptbody.ps1
 rename step-templates/azure-load-appsettings-from-file.json => src/step-templates/azure-load-appsettings-from-file/metadata.json (53%)
 create mode 100644 src/step-templates/azure-load-appsettings-from-file/scriptbody.ps1
 rename step-templates/azure-manage-webjob.json => src/step-templates/azure-manage-webjob/metadata.json (83%)
 create mode 100644 src/step-templates/azure-manage-webjob/scriptbody.ps1
 rename step-templates/azure-powershell-version-update.json => src/step-templates/azure-powershell-version-update/metadata.json (80%)
 create mode 100644 src/step-templates/azure-powershell-version-update/scriptbody.ps1
 create mode 100644 src/step-templates/azure-remove-resource-group-deployments/metadata.json
 create mode 100644 src/step-templates/azure-remove-resource-group-deployments/scriptbody.ps1
 create mode 100644 src/step-templates/azure-switch-staging-deployment-slot/metadata.json
 create mode 100644 src/step-templates/azure-switch-staging-deployment-slot/scriptbody.ps1
 rename step-templates/azure-sync-instancecount-from-prod-to-staging.json => src/step-templates/azure-sync-instancecount-from-prod-to-staging/metadata.json (59%)
 create mode 100644 src/step-templates/azure-sync-instancecount-from-prod-to-staging/scriptbody.ps1
 rename step-templates/azure-upload-files.json => src/step-templates/azure-upload-files/metadata.json (62%)
 create mode 100644 src/step-templates/azure-upload-files/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-disable-appoffline/metadata.json
 create mode 100644 src/step-templates/azure-web-app-disable-appoffline/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-enable-appoffline/metadata.json
 create mode 100644 src/step-templates/azure-web-app-enable-appoffline/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-get-deployment-user/metadata.json
 create mode 100644 src/step-templates/azure-web-app-get-deployment-user/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-restart/metadata.json
 create mode 100644 src/step-templates/azure-web-app-restart/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-rolling-restart/metadata.json
 create mode 100644 src/step-templates/azure-web-app-rolling-restart/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-set-app-settings/metadata.json
 create mode 100644 src/step-templates/azure-web-app-set-app-settings/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-set-traffic/metadata.json
 create mode 100644 src/step-templates/azure-web-app-set-traffic/scriptbody.ps1
 create mode 100644 src/step-templates/azure-web-app-slot-swap/metadata.json
 create mode 100644 src/step-templates/azure-web-app-slot-swap/scriptbody.ps1
 rename step-templates/azure-web-app-ssl.json => src/step-templates/azure-web-app-ssl/metadata.json (65%)
 create mode 100644 src/step-templates/azure-web-app-ssl/scriptbody.ps1
 rename step-templates/azure-web-app-start.json => src/step-templates/azure-web-app-start/metadata.json (52%)
 create mode 100644 src/step-templates/azure-web-app-start/scriptbody.ps1
 rename step-templates/azure-web-app-stop.json => src/step-templates/azure-web-app-stop/metadata.json (61%)
 create mode 100644 src/step-templates/azure-web-app-stop/scriptbody.ps1
 rename step-templates/backup-azure-database-to-azure-storage.json => src/step-templates/backup-azure-database-to-azure-storage/metadata.json (58%)
 create mode 100644 src/step-templates/backup-azure-database-to-azure-storage/scriptbody.ps1
 create mode 100644 src/step-templates/bitwarden-secrets-manager-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/bitwarden-secrets-manager-retrieve-secrets/scriptbody.ps1
 create mode 100644 src/step-templates/block-progression/metadata.json
 create mode 100644 src/step-templates/block-progression/scriptbody.ps1
 create mode 100644 src/step-templates/calculate-deployment-mode/metadata.json
 create mode 100644 src/step-templates/calculate-deployment-mode/scriptbody.ps1
 create mode 100644 src/step-templates/chef-run-cookbook/metadata.json
 create mode 100644 src/step-templates/chef-run-cookbook/scriptbody.ps1
 create mode 100644 src/step-templates/chocolatey-ensure-installed/metadata.json
 create mode 100644 src/step-templates/chocolatey-ensure-installed/scriptbody.ps1
 rename step-templates/chocolatey-install-package.json => src/step-templates/chocolatey-install-package/metadata.json (54%)
 create mode 100644 src/step-templates/chocolatey-install-package/scriptbody.ps1
 rename step-templates/chocolatey-manage-config.json => src/step-templates/chocolatey-manage-config/metadata.json (56%)
 create mode 100644 src/step-templates/chocolatey-manage-config/scriptbody.ps1
 rename step-templates/chocolatey-manage-features.json => src/step-templates/chocolatey-manage-features/metadata.json (54%)
 create mode 100644 src/step-templates/chocolatey-manage-features/scriptbody.ps1
 rename step-templates/chocolatey-manage-sources.json => src/step-templates/chocolatey-manage-sources/metadata.json (51%)
 create mode 100644 src/step-templates/chocolatey-manage-sources/scriptbody.ps1
 rename step-templates/chocolatey-pin-package.json => src/step-templates/chocolatey-pin-package/metadata.json (52%)
 create mode 100644 src/step-templates/chocolatey-pin-package/scriptbody.ps1
 create mode 100644 src/step-templates/clickonce-from-deployed-package/metadata.json
 create mode 100644 src/step-templates/clickonce-from-deployed-package/scriptbody.ps1
 create mode 100644 src/step-templates/clickonce-re-sign/metadata.json
 create mode 100644 src/step-templates/clickonce-re-sign/scriptbody.ps1
 rename step-templates/clickonce-sign-file.json => src/step-templates/clickonce-sign-file/metadata.json (86%)
 create mode 100644 src/step-templates/clickonce-sign-file/scriptbody.ps1
 rename step-templates/clickonce-update-application-file.json => src/step-templates/clickonce-update-application-file/metadata.json (80%)
 create mode 100644 src/step-templates/clickonce-update-application-file/scriptbody.ps1
 rename step-templates/clickonce-update-manifest-file.json => src/step-templates/clickonce-update-manifest-file/metadata.json (78%)
 create mode 100644 src/step-templates/clickonce-update-manifest-file/scriptbody.ps1
 create mode 100644 src/step-templates/clone-tenant/metadata.json
 create mode 100644 src/step-templates/clone-tenant/scriptbody.ps1
 create mode 100644 src/step-templates/com-component-register-unregister/metadata.json
 create mode 100644 src/step-templates/com-component-register-unregister/scriptbody.ps1
 create mode 100644 src/step-templates/configuration-encrypt-app-config-section/metadata.json
 create mode 100644 src/step-templates/configuration-encrypt-app-config-section/scriptbody.ps1
 create mode 100644 src/step-templates/configuration-encrypt-app-or-web-config-section/metadata.json
 create mode 100644 src/step-templates/configuration-encrypt-app-or-web-config-section/scriptbody.ps1
 create mode 100644 src/step-templates/configuration-encrypt-web-config-section/metadata.json
 create mode 100644 src/step-templates/configuration-encrypt-web-config-section/scriptbody.ps1
 create mode 100644 src/step-templates/create-azure-website-staging-slot/metadata.json
 create mode 100644 src/step-templates/create-azure-website-staging-slot/scriptbody.ps1
 create mode 100644 src/step-templates/create-tenant/metadata.json
 create mode 100644 src/step-templates/create-tenant/scriptbody.ps1
 rename step-templates/cyberark-conjur-retrieve-a-secret.json => src/step-templates/cyberark-conjur-retrieve-a-secret/metadata.json (59%)
 create mode 100644 src/step-templates/cyberark-conjur-retrieve-a-secret/scriptbody.ps1
 create mode 100644 src/step-templates/cyberark-conjur-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/cyberark-conjur-retrieve-secrets/scriptbody.ps1
 rename step-templates/datadog-create-event.json => src/step-templates/datadog-create-event/metadata.json (58%)
 create mode 100644 src/step-templates/datadog-create-event/scriptbody.ps1
 rename step-templates/datadog-schedule-downtime.json => src/step-templates/datadog-schedule-downtime/metadata.json (53%)
 create mode 100644 src/step-templates/datadog-schedule-downtime/scriptbody.ps1
 create mode 100644 src/step-templates/datadog-task-log/metadata.json
 create mode 100644 src/step-templates/datadog-task-log/scriptbody.ps1
 create mode 100644 src/step-templates/deploy-child-project/metadata.json
 create mode 100644 src/step-templates/deploy-child-project/scriptbody.ps1
 create mode 100644 src/step-templates/determine-rolling-deploy-window-size/metadata.json
 create mode 100644 src/step-templates/determine-rolling-deploy-window-size/scriptbody.ps1
 rename step-templates/docker-create-and-push-image.json => src/step-templates/docker-create-and-push-image/metadata.json (56%)
 create mode 100644 src/step-templates/docker-create-and-push-image/scriptbody.ps1
 create mode 100644 src/step-templates/docker-install-windows/metadata.json
 create mode 100644 src/step-templates/docker-install-windows/scriptbody.ps1
 create mode 100644 src/step-templates/dsc-windows-service/metadata.json
 create mode 100644 src/step-templates/dsc-windows-service/scriptbody.ps1
 create mode 100644 src/step-templates/dyn-create-an-A-record/metadata.json
 create mode 100644 src/step-templates/dyn-create-an-A-record/scriptbody.ps1
 create mode 100644 src/step-templates/edgecast-cdn-purge/metadata.json
 create mode 100644 src/step-templates/edgecast-cdn-purge/scriptbody.ps1
 rename step-templates/elmahio-notify-deployment.json => src/step-templates/elmahio-notify-deployment/metadata.json (70%)
 create mode 100644 src/step-templates/elmahio-notify-deployment/scriptbody.ps1
 rename step-templates/elmahio-upload-source-map.json => src/step-templates/elmahio-upload-source-map/metadata.json (64%)
 create mode 100644 src/step-templates/elmahio-upload-source-map/scriptbody.ps1
 create mode 100644 src/step-templates/epplus-register-dll-gac/metadata.json
 create mode 100644 src/step-templates/epplus-register-dll-gac/scriptbody.ps1
 rename step-templates/event-tracing-register-manifest.json => src/step-templates/event-tracing-register-manifest/metadata.json (70%)
 create mode 100644 src/step-templates/event-tracing-register-manifest/scriptbody.ps1
 rename step-templates/event-tracing-unregister-manifest.json => src/step-templates/event-tracing-unregister-manifest/metadata.json (68%)
 create mode 100644 src/step-templates/event-tracing-unregister-manifest/scriptbody.ps1
 rename step-templates/f5-enable-disable-member.json => src/step-templates/f5-enable-disable-member/metadata.json (50%)
 create mode 100644 src/step-templates/f5-enable-disable-member/scriptbody.ps1
 create mode 100644 src/step-templates/f5-enable-disable-multiple-pools/metadata.json
 create mode 100644 src/step-templates/f5-enable-disable-multiple-pools/scriptbody.ps1
 rename step-templates/f5-gtm-enable-or-disable.json => src/step-templates/f5-gtm-enable-or-disable/metadata.json (61%)
 create mode 100644 src/step-templates/f5-gtm-enable-or-disable/scriptbody.ps1
 rename step-templates/f5-ltm-rest-enable-disable-member.json => src/step-templates/f5-ltm-rest-enable-disable-member/metadata.json (53%)
 create mode 100644 src/step-templates/f5-ltm-rest-enable-disable-member/scriptbody.ps1
 rename step-templates/file-download.json => src/step-templates/file-download/metadata.json (81%)
 create mode 100644 src/step-templates/file-download/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-add-hosts-entry/metadata.json
 create mode 100644 src/step-templates/file-system-add-hosts-entry/scriptbody.ps1
 rename step-templates/file-system-backup-directory.json => src/step-templates/file-system-backup-directory/metadata.json (61%)
 create mode 100644 src/step-templates/file-system-backup-directory/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-check-disk-space/metadata.json
 create mode 100644 src/step-templates/file-system-check-disk-space/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-clean-asp-net-temp-files/metadata.json
 create mode 100644 src/step-templates/file-system-clean-asp-net-temp-files/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-clean-configuration-transforms/metadata.json
 create mode 100644 src/step-templates/file-system-clean-configuration-transforms/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-clean-directory/metadata.json
 create mode 100644 src/step-templates/file-system-clean-directory/scriptbody.ps1
 rename step-templates/file-system-combine-files.json => src/step-templates/file-system-combine-files/metadata.json (56%)
 create mode 100644 src/step-templates/file-system-combine-files/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-copy-file/metadata.json
 create mode 100644 src/step-templates/file-system-copy-file/scriptbody.ps1
 rename step-templates/file-system-create-file.json => src/step-templates/file-system-create-file/metadata.json (78%)
 create mode 100644 src/step-templates/file-system-create-file/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-create-folder/metadata.json
 create mode 100644 src/step-templates/file-system-create-folder/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-create-folders/metadata.json
 create mode 100644 src/step-templates/file-system-create-folders/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-create-symlink/metadata.json
 create mode 100644 src/step-templates/file-system-create-symlink/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-find-and-replace/metadata.json
 create mode 100644 src/step-templates/file-system-find-and-replace/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-grant-permissions/metadata.json
 create mode 100644 src/step-templates/file-system-grant-permissions/scriptbody.ps1
 create mode 100644 src/step-templates/file-system-regular-expression-find-and-replace/metadata.json
 create mode 100644 src/step-templates/file-system-regular-expression-find-and-replace/scriptbody.ps1
 rename step-templates/file-system-rename-file.json => src/step-templates/file-system-rename-file/metadata.json (52%)
 create mode 100644 src/step-templates/file-system-rename-file/scriptbody.ps1
 delete mode 100644 step-templates/F5-API-enable-disable-member.json
 delete mode 100644 step-templates/azure-create-resource-group-az-module.json
 delete mode 100644 step-templates/azure-create-staging-deployment-slot.json
 delete mode 100644 step-templates/azure-database-import-create-new-vcpu.json
 delete mode 100644 step-templates/azure-delete-from-webapp.json
 delete mode 100644 step-templates/azure-delete-resource-group.json
 delete mode 100644 step-templates/azure-deploy-containerapp.json
 delete mode 100644 step-templates/azure-devops-build-pipeline.json
 delete mode 100644 step-templates/azure-function-set-appsettings-from-azconfig.json
 delete mode 100644 step-templates/azure-keyvault-retrieve-secrets.json
 delete mode 100644 step-templates/azure-remove-resource-group-deployments.json
 delete mode 100644 step-templates/azure-switch-staging-deployment-slot.json
 delete mode 100644 step-templates/azure-web-app-disable-appoffline.json
 delete mode 100644 step-templates/azure-web-app-enable-appoffline.json
 delete mode 100644 step-templates/azure-web-app-get-deployment-user.json
 delete mode 100644 step-templates/azure-web-app-restart.json
 delete mode 100644 step-templates/azure-web-app-rolling-restart.json
 delete mode 100644 step-templates/azure-web-app-set-app-settings.json
 delete mode 100644 step-templates/azure-web-app-set-traffic.json
 delete mode 100644 step-templates/azure-web-app-slot-swap.json
 delete mode 100644 step-templates/bitwarden-secrets-manager-retrieve-secrets.json
 delete mode 100644 step-templates/block-progression.json
 delete mode 100644 step-templates/calculate-deployment-mode.json
 delete mode 100644 step-templates/chef-run-cookbook.json
 delete mode 100644 step-templates/chocolatey-ensure-installed.json
 delete mode 100644 step-templates/clickonce-from-deployed-package.json
 delete mode 100644 step-templates/clickonce-re-sign.json
 delete mode 100644 step-templates/clone-tenant.json
 delete mode 100644 step-templates/com-component-register-unregister.json
 delete mode 100644 step-templates/configuration-encrypt-app-config-section.json
 delete mode 100644 step-templates/configuration-encrypt-app-or-web-config-section.json
 delete mode 100644 step-templates/configuration-encrypt-web-config-section.json
 delete mode 100644 step-templates/create-azure-website-staging-slot.json
 delete mode 100644 step-templates/create-tenant.json
 delete mode 100644 step-templates/cyberark-conjur-retrieve-secrets.json
 delete mode 100644 step-templates/datadog-task-log.json
 delete mode 100644 step-templates/deploy-child-project.json
 delete mode 100644 step-templates/determine-rolling-deploy-window-size.json
 delete mode 100644 step-templates/docker-install-windows.json
 delete mode 100644 step-templates/dsc-windows-service.json
 delete mode 100644 step-templates/dyn-create-an-A-record.json
 delete mode 100644 step-templates/edgecast-cdn-purge.json
 delete mode 100644 step-templates/epplus-register-dll-gac.json
 delete mode 100644 step-templates/f5-enable-disable-multiple-pools.json
 delete mode 100644 step-templates/file-system-add-hosts-entry.json
 delete mode 100644 step-templates/file-system-check-disk-space.json
 delete mode 100644 step-templates/file-system-clean-asp-net-temp-files.json
 delete mode 100644 step-templates/file-system-clean-configuration-transforms.json
 delete mode 100644 step-templates/file-system-clean-directory.json
 delete mode 100644 step-templates/file-system-copy-file.json
 delete mode 100644 step-templates/file-system-create-folder.json
 delete mode 100644 step-templates/file-system-create-folders.json
 delete mode 100644 step-templates/file-system-create-symlink.json
 delete mode 100644 step-templates/file-system-find-and-replace.json
 delete mode 100644 step-templates/file-system-grant-permissions.json
 delete mode 100644 step-templates/file-system-regular-expression-find-and-replace.json

diff --git a/step-templates/Azure-Get-Publishing-Credentials.json b/src/step-templates/Azure-Get-Publishing-Credentials/metadata.json
similarity index 76%
rename from step-templates/Azure-Get-Publishing-Credentials.json
rename to src/step-templates/Azure-Get-Publishing-Credentials/metadata.json
index 39d9afcdd..66b9c566a 100644
--- a/step-templates/Azure-Get-Publishing-Credentials.json
+++ b/src/step-templates/Azure-Get-Publishing-Credentials/metadata.json
@@ -1,13 +1,13 @@
 {
   "Id": "94146c4c-28a7-444d-bd09-abdcc860e3b6",
   "Name": "Get Azure Web App Publishing Credentials",
-  "Description": "Gets the publishing credentials for an Azure Web App. They are exported as variables from this step under the names PublishingUsername and PublishingPassword.", 
+  "Description": "Gets the publishing credentials for an Azure Web App. They are exported as variables from this step under the names PublishingUsername and PublishingPassword.",
   "ActionType": "Octopus.AzurePowerShell",
   "Version": 8,
   "CommunityActionTemplateId": null,
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$creds = Invoke-AzureRmResourceAction -ResourceGroupName $ResourceGroup -ResourceType Microsoft.Web/sites/config `\r\n            -ResourceName $WebApp/publishingCredentials -Action list -ApiVersion 2015-08-01 -Force\r\n\r\nSet-OctopusVariable -name \"PublishingUsername\" -value $creds.Properties.PublishingUsername\r\nSet-OctopusVariable -name \"PublishingPassword\" -value $creds.Properties.PublishingPassword",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Azure.AccountId": "#{AzureAccount}",
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Script.ScriptFileName": null,
@@ -50,7 +50,7 @@
   ],
   "LastModifiedBy": "jimmcslim",
   "$Meta": {
-    "ExportedAt": "2017-08-23T06:42:23.412Z",
+    "ExportedAt": "2017-08-23T06:42:23.4120000Z",
     "OctopusVersion": "3.16.0",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/Azure-Get-Publishing-Credentials/scriptbody.ps1 b/src/step-templates/Azure-Get-Publishing-Credentials/scriptbody.ps1
new file mode 100644
index 000000000..8a5179f94
--- /dev/null
+++ b/src/step-templates/Azure-Get-Publishing-Credentials/scriptbody.ps1
@@ -0,0 +1,5 @@
+$creds = Invoke-AzureRmResourceAction -ResourceGroupName $ResourceGroup -ResourceType Microsoft.Web/sites/config `
+            -ResourceName $WebApp/publishingCredentials -Action list -ApiVersion 2015-08-01 -Force
+
+Set-OctopusVariable -name "PublishingUsername" -value $creds.Properties.PublishingUsername
+Set-OctopusVariable -name "PublishingPassword" -value $creds.Properties.PublishingPassword
\ No newline at end of file
diff --git a/src/step-templates/F5-API-enable-disable-member/metadata.json b/src/step-templates/F5-API-enable-disable-member/metadata.json
new file mode 100644
index 000000000..08ce2a342
--- /dev/null
+++ b/src/step-templates/F5-API-enable-disable-member/metadata.json
@@ -0,0 +1,114 @@
+{
+  "Id": "45d3003a-9443-42a0-aa71-38398eb4f9d6",
+  "Name": "F5 API Enable, Disable and Force Offline pool member",
+  "Description": "Enable, Disable and to Force Offline F5 pool member via API.\nThis step not require iControl snap-in installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "c011969a-80e9-47d1-8bd3-d3da6a41ec34",
+      "Name": "node",
+      "Label": "Node Member Pool",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "313cf4d5-1006-4e54-9f4a-e4f719ca7988",
+      "Name": "pool",
+      "Label": "Pool Name",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9619ce36-f913-4fa9-91be-9ac650e0d168",
+      "Name": "f5user",
+      "Label": "F5 Username",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6374f90c-ca46-4c13-94df-bb374c9b33f9",
+      "Name": "f5pass",
+      "Label": "F5 password",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e6402134-71af-4b31-b6a4-f2112edb7e25",
+      "Name": "f5ipv4",
+      "Label": "F5 Server",
+      "HelpText": "comma separated (without spaces).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1f402f2b-5907-44ec-87f0-d74bb1901dbd",
+      "Name": "numconn",
+      "Label": "Connections limit",
+      "HelpText": null,
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6b419071-5710-4c47-a1e5-da8434ba190a",
+      "Name": "timeout",
+      "Label": "Timeout limit",
+      "HelpText": null,
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e85c607e-3511-4ae9-8f90-272964fd080f",
+      "Name": "action",
+      "Label": "Action member node",
+      "HelpText": "Change the status of member pool:\n- Enabled;\n- Disabled;\n- Forced Offline.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Enable|Member Enabled in GUI\nDisable|Member Disabled in GUI\nOffline|Member Forced Offline in GUI"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "fedelemattia",
+  "$Meta": {
+    "ExportedAt": "2016-12-16T14:01:28.2670000Z",
+    "OctopusVersion": "3.5.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "F5"
+}
diff --git a/src/step-templates/F5-API-enable-disable-member/scriptbody.ps1 b/src/step-templates/F5-API-enable-disable-member/scriptbody.ps1
new file mode 100644
index 000000000..c36631f7c
--- /dev/null
+++ b/src/step-templates/F5-API-enable-disable-member/scriptbody.ps1
@@ -0,0 +1,126 @@
+#octopus variables
+$node = "#{node}"
+$pool = "#{pool}"
+$f5pass = "#{f5pass}"
+$f5user = "#{f5user}"
+$f5ipv4 = "#{f5ipv4}"
+$numconn = "#{numconn}"
+$timeout = "#{timeout}"
+$action= "#{action}"
+$f5_ip=$f5ipv4.split(',')
+
+#whitout ssl certificate
+if (-not ([System.Management.Automation.PSTypeName]'ServerCertificateValidationCallback').Type)
+{
+$certCallback=@"
+    using System;
+    using System.Net;
+    using System.Net.Security;
+    using System.Security.Cryptography.X509Certificates;
+    public class ServerCertificateValidationCallback
+    {
+        public static void Ignore()
+        {
+            if(ServicePointManager.ServerCertificateValidationCallback ==null)
+            {
+                ServicePointManager.ServerCertificateValidationCallback += 
+                    delegate
+                    (
+                        Object obj, 
+                        X509Certificate certificate, 
+                        X509Chain chain, 
+                        SslPolicyErrors errors
+                    )
+                    {
+                        return true;
+                    };
+            }
+        }
+    }
+"@
+    Add-Type $certCallback
+ }
+[ServerCertificateValidationCallback]::Ignore();
+
+#F5 Credentials
+$username= $f5user
+$password= $f5pass | ConvertTo-SecureString -AsPlainText -Force
+$cred= New-Object System.Management.Automation.PSCredential $username, $password
+Write-Output "Cred: $cred"
+
+#retrieve Active F5 server
+function Get-StatusF5{
+    param(
+        $ipserver,
+        $credential
+    )
+    $result=Invoke-WebRequest -Uri "https://$ipserver/mgmt/tm/cm/failover-status" -Credential $credential -ErrorAction Ignore -UseBasicParsing
+    $items=$result.Content | ConvertFrom-Json
+    $status=$items.entries.'https://localhost/mgmt/tm/cm/failover-status/0'.nestedStats.entries.status
+    return $status
+}
+
+foreach($ipv4 in $f5_ip){
+    $state=Get-StatusF5 -ipserver $ipv4 -credential $cred
+    if (($state.description) -like "ACTIVE"){
+        $master=$ipv4
+        Write-Output "F5 master ACTIVE: $master"
+    }
+    else{
+        Write-Output "$ipv4 is not master active"
+    }
+}
+if (!$master){
+    Write-Error "ATTENTION - F5 servers are incorrect"
+}
+
+#retrieve informations
+$result=Invoke-WebRequest -Uri "https://$master/mgmt/tm/ltm/pool/$pool/members" -Credential $cred -UseBasicParsing
+$items=$result.Content | ConvertFrom-Json
+$items.items
+$name=($items.items | where{$_.name -like "*$node*"}).name
+Write-Host "Nome del nodo: $name"
+
+#action based on $action
+if($action -like "Enable"){
+    $state ='{"state": "user-up", "session": "user-enabled"}' ###ENABLED
+    Write-Output "Action: Enable $name"
+    Invoke-WebRequest -Uri "https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name"  -Credential $cred -ContentType application/json -Method PUT -Body $state  -Verbose -UseBasicParsing
+}
+else{
+    if($action -like "Disable"){
+        $state ='{"state": "user-up", "session": "user-disabled"}' ###Disabled
+        Write-Output "Action: Enable $name"
+        Invoke-WebRequest -Uri "https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name"  -Credential $cred -ContentType application/json -Method PUT -Body $state  -Verbose -UseBasicParsing
+    }
+    else{
+        if($action -like "Offline"){
+            $state ='{"state": "user-down", "session": "user-disabled"}' ###FORCEDOFFLINE
+            Invoke-WebRequest -Uri "https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name"  -Credential $cred -ContentType application/json -Method PUT -Body $state  -Verbose -UseBasicParsing
+            $current_conn=$numconn + 00
+
+            [int]$time = 0
+            Write-Output "Connections accepted: $numconn"
+            while($current_conn -gt $numconn){
+                if($second -ne $timeout){
+                    $url="https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name" + '/stats?$select=serverside.curConns'
+                    Start-Sleep 1
+                    [int]$second = $time++
+                    $result= Invoke-WebRequest -Uri $url -Credential $cred -UseBasicParsing
+                    $item=$result.Content | ConvertFrom-Json
+                    $current_conn=($item.entries.'serverside.curConns').value
+                    Write-Host "Second: $second - Connections: $current_conn"
+                }
+                else{
+                    Write-Output "Timeout - $current_conn connections stopped"
+                    $current_conn= 0
+                }
+            }
+    }
+        else{
+            Write-Error "ACTION IS NOT ACCEPTED"
+        }
+}
+}
+Start-sleep 10
+Write-Host "Go to next step"
diff --git a/step-templates/azure-create-new-resourcegroup.json b/src/step-templates/azure-create-new-resourcegroup/metadata.json
similarity index 69%
rename from step-templates/azure-create-new-resourcegroup.json
rename to src/step-templates/azure-create-new-resourcegroup/metadata.json
index 29bef9b08..2a225fe0a 100644
--- a/step-templates/azure-create-new-resourcegroup.json
+++ b/src/step-templates/azure-create-new-resourcegroup/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Azure.AccountId": "#{CreateResourceGroup.AzureAccount}",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$ResourceGroupName =$OctopusParameters[\"CreateResourceGroup.ResourceGroupName\"]\n$Location =$OctopusParameters[\"CreateResourceGroup.Location\"]\n \n Write-Output \"Variables:\"\n Write-Output \"ResourceGroupName: $ResourceGroupName\"\n Write-Output \"Location: $Location\"\n\nWrite-Output '###############################################'\nWrite-Output '##Step1: Create Resource Group '\n$AzureResourceGroup = Get-AzureRmResourceGroup -Name $ResourceGroupName -ErrorAction SilentlyContinue\nif ( $null -eq $AzureResourceGroup)\n{\nWrite-Output \"Resource Group $ResourceGroupName does not exist, creating one ...\"\n$AzureResourceGroup =New-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location\n} \nelse{\nWrite-Output \"Resource Group $ResourceGroupName already exists ...\"\n}\n\nWrite-Output '###############################################'\nWrite-Output '##Step2: Validate Resource Group '\n\nif ($null -eq $AzureResourceGroup ){\nThrow \"Failed to create resource group $AzureResourceGroupName\"\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Script.ScriptFileName": null,
@@ -49,10 +49,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2018-10-03T13:00:00.000+01:00",
+  "LastModifiedOn": "2018-10-03T05:00:00.0000000-07:00",
   "LastModifiedBy": "Jens-H-Eriksen",
   "$Meta": {
-    "ExportedAt": "2018-10-03T11:37:04.316Z",
+    "ExportedAt": "2018-10-03T11:37:04.3160000Z",
     "OctopusVersion": "2018.8.6",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/azure-create-new-resourcegroup/scriptbody.ps1 b/src/step-templates/azure-create-new-resourcegroup/scriptbody.ps1
new file mode 100644
index 000000000..396c1fa71
--- /dev/null
+++ b/src/step-templates/azure-create-new-resourcegroup/scriptbody.ps1
@@ -0,0 +1,25 @@
+$ResourceGroupName =$OctopusParameters["CreateResourceGroup.ResourceGroupName"]
+$Location =$OctopusParameters["CreateResourceGroup.Location"]
+ 
+ Write-Output "Variables:"
+ Write-Output "ResourceGroupName: $ResourceGroupName"
+ Write-Output "Location: $Location"
+
+Write-Output '###############################################'
+Write-Output '##Step1: Create Resource Group '
+$AzureResourceGroup = Get-AzureRmResourceGroup -Name $ResourceGroupName -ErrorAction SilentlyContinue
+if ( $null -eq $AzureResourceGroup)
+{
+Write-Output "Resource Group $ResourceGroupName does not exist, creating one ..."
+$AzureResourceGroup =New-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location
+} 
+else{
+Write-Output "Resource Group $ResourceGroupName already exists ..."
+}
+
+Write-Output '###############################################'
+Write-Output '##Step2: Validate Resource Group '
+
+if ($null -eq $AzureResourceGroup ){
+Throw "Failed to create resource group $AzureResourceGroupName"
+}
diff --git a/step-templates/azure-create-new-webapp.json b/src/step-templates/azure-create-new-webapp/metadata.json
similarity index 53%
rename from step-templates/azure-create-new-webapp.json
rename to src/step-templates/azure-create-new-webapp/metadata.json
index 2b00ca44e..c60499be5 100644
--- a/step-templates/azure-create-new-webapp.json
+++ b/src/step-templates/azure-create-new-webapp/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Azure.AccountId": "#{AzureAccount}",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "###############################################\r\n##Step 1: Get Variables\r\n$ResourceGroupName             = $OctopusParameters[\"ResourceGroupName\"] \r\n$DeploymentLocation            = $OctopusParameters[\"Location\"] \r\n$AppServicePlanName            = $OctopusParameters[\"AppServicePlanName\"] \r\n$AppServicePlanTier            = $OctopusParameters[\"AppServicePlanTier\"]\r\n$WebAppName                    = $OctopusParameters[\"WebAppName\"]\r\n$TimeStamp                          = Get-Date -Format ddMMyyyy_hhmmss\r\n$PublishProfilePath                 = Join-Path -Path $ENV:Temp -ChildPath \"publishprofile$TimeStamp.xml\"\r\n$AppServiceUse32BitWorkerProcess= $OctopusParameters[\"AppServiceUse32BitWorkerProcess\"] \r\n###############################################\r\n\r\n###############################################\r\n##Step 2: Check and Create Service Plan\r\ntry{\r\n  $ServicePlan= Get-AzureRmAppServicePlan -ResourceGroupName $ResourceGroupName -Name $AppServicePlanName  -ErrorAction SilentlyContinue \r\n  if ($null -eq $ServicePlan)\r\n  {\r\n    Write-Output \"Creating Service Plan\"\r\n    $ServicePlan=New-AzureRmAppServicePlan -Name $AppServicePlanName -Location $Location -ResourceGroupName $ResourceGroupName -Tier $AppServicePlanTier\r\n  }\r\n  else{\r\n      Write-Output \"Service Plan already set up\"\r\n  }\r\n  $WebApp = Get-AzureRmWebApp -ResourceGroupName $ResourceGroupName -Name $WebAppName -ErrorAction SilentlyContinue\r\n  if($null -eq $WebApp)\r\n  {\r\n      Write-Output \"Creating WebApp\"\r\n      $webApp = New-AzureRmWebApp -Name $WebAppName -AppServicePlan $AppServicePlanName -ResourceGroupName $ResourceGroupName -Location $DeploymentLocation\r\n  }\r\n  else {\r\n      Write-Output \"WebApp already created\"\r\n  }\r\n  \r\n  Write-Output \"setting app to use $AppServiceUse32BitWorkerProcess\" \r\n  Set-AzureRmWebApp -ResourceGroupName $ResourceGroupName -Name $WebAppName -Use32BitWorkerProcess ([bool]$AppServiceUse32BitWorkerProcess)\r\n  $null = Get-AzureRmWebAppPublishingProfile -OutputFile $PublishProfilePath -ResourceGroupName $ResourceGroupName -Name $WebAppName -Format WebDeploy -Verbose\r\n  \r\n  Write-output \"profile: $(get-content  $PublishProfilePath)\"\r\n  if (!(Test-Path -Path $PublishProfilePath)){\r\n    throw [System.IO.FileNotFoundException] \"$PublishProfilePath not found.\"\r\n  }\r\n\r\n    get-childitem $psscriptroot\r\n}\r\ncatch{\r\n  Write-Output \"Cannot add serviceplan/webapp : $AzureAppServicePlanName / $AzureWebAppName\"\r\n  Write-Output $_\r\n\r\n}\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.PackageId": null
@@ -92,10 +92,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2018-01-08T11:00:00.085+00:00",
+  "LastModifiedOn": "2018-01-08T03:00:00.0850000-08:00",
   "LastModifiedBy": "IanMoroney",
   "$Meta": {
-    "ExportedAt": "2018-01-08T10:36:38.951Z",
+    "ExportedAt": "2018-01-08T10:36:38.9510000Z",
     "OctopusVersion": "3.16.2",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/azure-create-new-webapp/scriptbody.ps1 b/src/step-templates/azure-create-new-webapp/scriptbody.ps1
new file mode 100644
index 000000000..167e8acfe
--- /dev/null
+++ b/src/step-templates/azure-create-new-webapp/scriptbody.ps1
@@ -0,0 +1,50 @@
+###############################################
+##Step 1: Get Variables
+$ResourceGroupName             = $OctopusParameters["ResourceGroupName"] 
+$DeploymentLocation            = $OctopusParameters["Location"] 
+$AppServicePlanName            = $OctopusParameters["AppServicePlanName"] 
+$AppServicePlanTier            = $OctopusParameters["AppServicePlanTier"]
+$WebAppName                    = $OctopusParameters["WebAppName"]
+$TimeStamp                          = Get-Date -Format ddMMyyyy_hhmmss
+$PublishProfilePath                 = Join-Path -Path $ENV:Temp -ChildPath "publishprofile$TimeStamp.xml"
+$AppServiceUse32BitWorkerProcess= $OctopusParameters["AppServiceUse32BitWorkerProcess"] 
+###############################################
+
+###############################################
+##Step 2: Check and Create Service Plan
+try{
+  $ServicePlan= Get-AzureRmAppServicePlan -ResourceGroupName $ResourceGroupName -Name $AppServicePlanName  -ErrorAction SilentlyContinue 
+  if ($null -eq $ServicePlan)
+  {
+    Write-Output "Creating Service Plan"
+    $ServicePlan=New-AzureRmAppServicePlan -Name $AppServicePlanName -Location $Location -ResourceGroupName $ResourceGroupName -Tier $AppServicePlanTier
+  }
+  else{
+      Write-Output "Service Plan already set up"
+  }
+  $WebApp = Get-AzureRmWebApp -ResourceGroupName $ResourceGroupName -Name $WebAppName -ErrorAction SilentlyContinue
+  if($null -eq $WebApp)
+  {
+      Write-Output "Creating WebApp"
+      $webApp = New-AzureRmWebApp -Name $WebAppName -AppServicePlan $AppServicePlanName -ResourceGroupName $ResourceGroupName -Location $DeploymentLocation
+  }
+  else {
+      Write-Output "WebApp already created"
+  }
+  
+  Write-Output "setting app to use $AppServiceUse32BitWorkerProcess" 
+  Set-AzureRmWebApp -ResourceGroupName $ResourceGroupName -Name $WebAppName -Use32BitWorkerProcess ([bool]$AppServiceUse32BitWorkerProcess)
+  $null = Get-AzureRmWebAppPublishingProfile -OutputFile $PublishProfilePath -ResourceGroupName $ResourceGroupName -Name $WebAppName -Format WebDeploy -Verbose
+  
+  Write-output "profile: $(get-content  $PublishProfilePath)"
+  if (!(Test-Path -Path $PublishProfilePath)){
+    throw [System.IO.FileNotFoundException] "$PublishProfilePath not found."
+  }
+
+    get-childitem $psscriptroot
+}
+catch{
+  Write-Output "Cannot add serviceplan/webapp : $AzureAppServicePlanName / $AzureWebAppName"
+  Write-Output $_
+
+}
diff --git a/src/step-templates/azure-create-resource-group-az-module/metadata.json b/src/step-templates/azure-create-resource-group-az-module/metadata.json
new file mode 100644
index 000000000..155c41d20
--- /dev/null
+++ b/src/step-templates/azure-create-resource-group-az-module/metadata.json
@@ -0,0 +1,56 @@
+{
+  "Id": "c2b850f7-2d9a-4cda-ab3c-ff3d229eca8e",
+  "Name": "Create Resource Group If Not Exists (AZ Module)",
+  "Description": "This step uses the new `az` modules to create a resource group if it doesn't exist.  \n\nRequires `Octopus Deploy 2020.1` or later.  Requires a worker with the `az` module installed on it.  That module is not bundled with Octopus Deploy.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "Author": "octobob",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Azure.AccountId": "#{CreateResourceGroup.Azure.Account}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b854aba4-4acb-428d-b981-79d1f2f50537",
+      "Name": "CreateResourceGroup.Azure.Account",
+      "Label": "Azure Account",
+      "HelpText": "The Azure Account with the necessary permissions to create resource groups.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "c7e43d70-f9ac-43cb-95a8-6a0e75ad40c6",
+      "Name": "CreateResourceGroup.ResourceGroup.Name",
+      "Label": "Resource Group Name",
+      "HelpText": "The name of the resource group to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e1bd7e57-5ad0-445b-9d11-6642acc55b88",
+      "Name": "CreateResourceGroup.ResourceGroup.Location.Abbr",
+      "Label": "The Resource Group Abbreviated Location",
+      "HelpText": "The abbreviated resource group location, for example: centralus",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "centralus|Americas - Central US\neastus|Americas - East US\neastus2|Americas - East US 2\nnorthcentralus|Americas - North Central US\nsouthcentralus|Americas - South Central US\nwestus|Americas - West US\nwestus2|Americas - West US 2\nwestcentralus|Americas - West Central US\ncanadacentral|Americas - Canada Central\ncanadaeast|Americas - Canada East\nbrazilsouth|Americas - Brazil South\neastasia|Asia Pacific - East Asia\nsoutheastasia|Asia Pacific - Southeast Asia\naustraliacentral|Asia Pacific - Australia Central\naustraliacentral2|Asia Pacific - Australia Central 2\naustraliaeast|Asia Pacific - Australia East\naustraliasoutheast|Asia Pacific - Australia Southeast\nchinaeast|Asia Pacific - China East\nchinaeast2|Asia Pacific - China East 2\nchinanorth|Asia Pacific - China North\nchinanorth2|Asia Pacific - China North 2\ncentralindia|Asia Pacific - Central India\nsouthindia|Asia Pacific - South India\nwestindia|Asia Pacific - West India\njapaneast|Asia Pacific - Japan East\njapanwest|Asia Pacific - Japan West\nkoreacentral|Asia Pacific - Korea Central\nkoreasouth|Asia Pacific - Korea South\nnortheurope|Europe - North Europe\nwesteurope|Europe - West Europe\nfrancecentral|Europe - France Central\nfrancesouth|Europe - France South\ngermanynorth|Europe - Germany North\ngermanywestcentral|Europe - Germany West Central\nnorwayeast|Europe - Norway East\nnorwaywest|Europe - Norway West\nspaincentral|Europe - Spain Central\nswitzerlandnorth|Europe - Switzerland North\nswitzerlandwest|Europe - Switzerland West\nuksouth|Europe - UK South\nukwest|Europe - UK West\nsouthafricanorth|Middle East and Africa - South Africa North\nsouthafricawest|Middle East and Africa - South Africa West\nuaecentral|Middle East and Africa - UAE Central\nuaenorth|Middle East and Africa - UAE North"
+      }
+    }
+  ],
+  "LastModifiedBy": "octobob",
+  "$Meta": {
+    "ExportedAt": "2020-04-13T15:37:29.8660000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-create-resource-group-az-module/scriptbody.ps1 b/src/step-templates/azure-create-resource-group-az-module/scriptbody.ps1
new file mode 100644
index 000000000..5476857ed
--- /dev/null
+++ b/src/step-templates/azure-create-resource-group-az-module/scriptbody.ps1
@@ -0,0 +1,22 @@
+$resourceGroupName = $OctopusParameters["CreateResourceGroup.ResourceGroup.Name"]
+$resourceGroupLocationAbbr = $OctopusParameters["CreateResourceGroup.ResourceGroup.Location.Abbr"]
+
+$existingResourceGroups = (az group list --query "[?location=='$resourceGroupLocationAbbr']") | ConvertFrom-JSON
+
+$createResourceGroup = $true
+foreach ($resourceGroupFound in $existingResourceGroups)
+{	
+	Write-Host "Checking if current resource group $($resourceGroupFound.name) matches $resourceGroupName"
+    if ($resourceGroupFound.name -eq $resourceGroupName)
+    {
+    	$createResourceGroup = $false
+    	Write-Highlight "Resource group already exists, skipping creation"
+    	break
+    }
+}
+
+if ($createResourceGroup)
+{
+	Write-Host "Creating the $resourceGroupName because it was not found in $resourceGroupLocationAbbr"
+	az group create -l $resourceGroupLocationAbbr -n $resourceGroupName
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-create-staging-deployment-slot/metadata.json b/src/step-templates/azure-create-staging-deployment-slot/metadata.json
new file mode 100644
index 000000000..a6eb8ea91
--- /dev/null
+++ b/src/step-templates/azure-create-staging-deployment-slot/metadata.json
@@ -0,0 +1,81 @@
+{
+  "Id": "10f6021e-27bd-47c5-9f10-4a1599182d8a",
+  "Name": "Create Azure Staging Deployment Slot",
+  "Description": "This template will create an azure deployment slot. This step template should be placed before the \"Deploy an Azure App\" Octopus Deploy template and be used with its sister step \"Switch Azure RM Deployment Slot\"\n\nThis should be used for green-blue deployments, as referenced in this document: https://octopus.com/docs/deploying-applications/deploying-to-azure/deploying-a-package-to-an-azure-web-app/using-deployment-slots-with-azure-web-apps\n\nNB: This step will promote your web app service plan to standard if it is currently using free, shared or basic tier",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Azure.AccountId": "#{AzureAccount}",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "37e14646-c52f-497a-a17b-2f17e9b1a629",
+      "Name": "ResourceGroupName",
+      "Label": "ResourceGroupName",
+      "HelpText": "Enter the name of the resource group you are deploying this Web App into",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "46bf87cd-342d-4095-bd2f-78d6a495faf5",
+      "Name": "AppServicePlanName",
+      "Label": "AppServicePlanName",
+      "HelpText": "Enter the name of the app service plan",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "54b04906-e716-4b1d-93c9-965f3a412c28",
+      "Name": "AppName",
+      "Label": "AppName",
+      "HelpText": "Enter the name of your web/api/etc app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "15176529-6bc9-4e0f-82ab-b2e004959d9e",
+      "Name": "AzureAccount",
+      "Label": "AzureAccount",
+      "HelpText": "Enter the SPN used to connect to Azure",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "30da9c4b-1fb4-425e-a5f4-2338d24ca23b",
+      "Name": "SlotName",
+      "Label": "SlotName",
+      "HelpText": "Enter the name you wish to call your deployment slot",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2018-02-27T03:23:00.0000000-08:00",
+  "LastModifiedBy": "MarkDordoy",
+  "$Meta": {
+    "ExportedAt": "2018-02-27T11:24:00.8440000Z",
+    "OctopusVersion": "3.16.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-create-staging-deployment-slot/scriptbody.ps1 b/src/step-templates/azure-create-staging-deployment-slot/scriptbody.ps1
new file mode 100644
index 000000000..c2eae8869
--- /dev/null
+++ b/src/step-templates/azure-create-staging-deployment-slot/scriptbody.ps1
@@ -0,0 +1,98 @@
+###############################################
+# Create Azure RM Staging Deployment Slot
+###############################################
+##Step1: Get Variables
+$ResourceGroupName             = $OctopusParameters["ResourceGroupName"] 
+$AppName                       = $OctopusParameters["AppName"] 
+$stagingSlotName               = $OctopusParameters["SlotName"]
+$AppServicePlanName            = $OctopusParameters["AppServicePlanName"] 
+###############################################
+###############################################
+Function Add-DeploymentSlotFunctionaility
+{
+    [cmdletbinding()]
+    param
+    (   
+        [string]$ResourceGroupName,
+        [string]$AppName,
+        [string]$AppServicePlanName
+    )
+    try 
+    {
+        write-output "Will make sure the service plan can support deployment slots"
+        $servicePlan = Get-AzureRmAppServicePlan -ResourceGroupName $ResourceGroupName -Name $AppServicePlanName
+    
+        if(($servicePlan.Sku.Tier.ToLower() -eq "free" ) -or ($servicePlan.Sku.Tier.ToLower() -eq "shared" ) -or ($servicePlan.Sku.Tier.ToLower() -eq "basic" ))
+        {
+            Write-Warning "Service plan does not currently support deployment slots, will now scale to standard tier"
+            $planUpdate = Set-AzureRmAppServicePlan -ResourceGroupName $ResourceGroupName -Name $AppServicePlanName -Tier "Standard"
+            Write-Output "Plan updated"
+            $planUpdate | Out-String | Write-Verbose
+            write-output "Plan Tier now set to:"
+            $planUpdate.Sku | Out-String | Write-Output
+        }
+        else 
+        {
+            Write-Output "Service plan already supports deployment slots"    
+        }       
+    }
+    catch 
+    {
+        throw "Error adding Deployment Slot functionailty. $_"    
+    }
+}
+
+Function Invoke-RequiredVariablesCheck
+{
+    if([string]::IsNullOrEmpty($ResourceGroupName))
+    {
+        Write-Error "ResourceGroupName variable is not set"
+    }
+
+    if([string]::IsNullOrEmpty($AppName))
+    {
+        write-error "AppName variable is not set"
+    }
+
+    if([string]::IsNullOrEmpty($stagingSlotName))
+    {
+        write-error "stagingSlotName variable is not set"
+    }
+
+    if([string]::IsNullOrEmpty($AppServicePlanName))
+    {
+        write-error "AppServicePlanName variable is not set"
+    }
+    Write-Verbose "Variables in use are:"
+    write-verbose "ResourceGroupName:$ResourceGroupName"
+    write-verbose "AppName:$AppName"
+    write-verbose "stagingSlotName:$stagingSlotName"
+    write-verbose "AppServicePlanName:$AppServicePlanName"
+}
+
+$ErrorActionPreference = "Stop"
+
+try 
+{
+    Invoke-RequiredVariablesCheck
+    Add-DeploymentSlotFunctionaility -ResourceGroupName $ResourceGroupName -AppName $AppName -AppServicePlanName $AppServicePlanName
+    Write-output "Preparing Deployment Staging slot"
+    $deploymentSlot = Get-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName -ErrorAction SilentlyContinue
+    if($deploymentSlot.Id -eq $null)
+    {
+        Write-output "No current deployment slot created, will create one now"
+        New-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName
+    }
+    else 
+    {   
+        Write-Verbose "Current slot exists, will remove to speed up deployment"
+        Remove-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName -Force
+        Write-Verbose "Slot removed"
+        New-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName   
+    }
+    Write-Output "Deployment slot $stagingSlotName created"
+}
+catch 
+{
+    Write-Error "Error in Create Azure RM Staging Deployment Slot step. $_"    
+}
\ No newline at end of file
diff --git a/step-templates/azure-database-execute-sql-cmd.json b/src/step-templates/azure-database-execute-sql-cmd/metadata.json
similarity index 53%
rename from step-templates/azure-database-execute-sql-cmd.json
rename to src/step-templates/azure-database-execute-sql-cmd/metadata.json
index bfdc1ac11..1374b443d 100644
--- a/step-templates/azure-database-execute-sql-cmd.json
+++ b/src/step-templates/azure-database-execute-sql-cmd/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{azDbSqlCmd.azAccount}",
-    "Octopus.Action.Script.ScriptBody": "# insure module installed.  Designed to run on cloud infrastructure where owners doesn't have controll over the workers.\n\nif (Get-Module -ListAvailable -Name sqlserver)\n{\n\tWrite-Verbose \"sqlserver module installed and available\"\n    Import-Module sqlserver\n}\n\nelse\n{\n\tWrite-Warning \"installing module for the current user.`nIf worker is owned, consider installing the powershell module 'sqlserver' globally to speed up deployments\"\n\tInstall-Module -Name sqlserver -Scope CurrentUser -AllowClobber -Force\n}\n\n# parse parameters\n\n$resourceGroup = $OctopusParameters[\"azDbSqlCmd.resourceGroupName\"]\n$sqlServerName = $OctopusParameters[\"azDbSqlCmd.ServerName\"]\n$dbName = $OctopusParameters[\"azDbSqlCmd.dbName\"]\n$userId = $OctopusParameters[\"azDbSqlCmd.userId\"]\n$userPwd = $OctopusParameters[\"azDbSqlCmd.userPwd\"]\n$authType = $OctopusParameters[\"azDbSqlCmd.AuthType\"]\n$connTimeout = $OctopusParameters[\"azDbSqlCmd.connectionTimeout\"] -as [int]\n$resultsOutput = $OctopusParameters[\"azDbSqlCmd.resultsOutput\"]\n\n$sqlCmd = $OctopusParameters[\"azDbSqlCmd.sqlCmd\"]\n\n# get current IP address\nWrite-Host \"Getting worker IP address...\" -NoNewLine\n$workerPublicIp = (Invoke-WebRequest -uri \"http://ifconfig.me/ip\" -UseBasicParsing).Content\nWrite-Host \"Done. IP is: $workerPublicIp\"\n\n# create Connection string\nswitch ($authType)\n{\n\t\"sql\"\n    {\n    \t$connectionString = \"Server=tcp:$sqlServerName.database.windows.net;Initial Catalog=$dbName;Persist Security Info=False;User ID=$userId;Password=$userPwd;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;\"\n    }\n    \"adPwd\"\n    {\n    \t$connectionString = \"Server=tcp:$sqlServerName.database.windows.net;Initial Catalog=$dbName;Persist Security Info=False;User ID=$userId;Password=$userPwd;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=`\"Active Directory Password`\";\"\n    }\n    \"ad\"\n    {\n    \t$connectionString = \"Server=tcp:$sqlServerName.database.windows.net;Initial Catalog=$dbName;Persist Security Info=False;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=`\"Active Directory Integrated`\";\"\n    }\n}\n\n# open firewall port\nwrite-host \"opening firewall on server $sqlServerName for ip: $workerPublicIp\"\nInvoke-Expression \"az sql server firewall-rule create -g $resourceGroup -n tempOctoSqlCmd -s $sqlServerName --start-ip-address $workerPublicIp --end-ip-address $workerPublicIp\"\n\n# invoke sql cmd\ntry\n{\n\t$id = New-Guid\n    $resultFilePath = \"$env:temp/$id.txt\"\n\tWrite-Host \"running sql statement: ``$sqlCmd``\"\n    \n    switch ($resultsOutput)\n    {\n        'none'\n        {\n        \tInvoke-SqlCmd -ConnectionString $connectionString -Query $sqlCmd -QueryTimeout $connTimeout\n        }\n\n        'variable'\n        {\n        \tInvoke-SqlCmd -ConnectionString $connectionString -Query $sqlCmd -QueryTimeout $connTimeout | ConvertTo-CSV | Out-File -FilePath \"$resultFilePath\"\n            $outputContent = Get-Content -Path $resultFilePath | ConvertFrom-CSV\n            Set-OctopusVariable -name \"azDbSqlCmd.results\"\n        }\n\n        'artifact'\n        {\n           \tInvoke-SqlCmd -ConnectionString $connectionString -Query $sqlCmd -QueryTimeout $connTimeout | ConvertTo-CSV | Out-File -FilePath \"$resultFilePath\"\n            New-OctopusArtifact -Path $resultFilePath -Name azDbSqlCmd.results.csv\n        }\n    }\n}\ncatch\n{\n\tthrow\n}\nfinally\n{\n  # close firewall port\n  write-host \"closing firewall on server $sqlServerName for ip: $workerPublicIp\"\n  Invoke-Expression \"az sql server firewall-rule delete -g $resourceGroup -n tempOctoSqlCmd -s $sqlServerName\"\n}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -117,10 +117,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-07-22T16:38:39.012Z",
+    "ExportedAt": "2020-07-22T16:38:39.0120000Z",
     "OctopusVersion": "2020.2.10",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "xtreampb",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-database-execute-sql-cmd/scriptbody.ps1 b/src/step-templates/azure-database-execute-sql-cmd/scriptbody.ps1
new file mode 100644
index 000000000..2dbbd382a
--- /dev/null
+++ b/src/step-templates/azure-database-execute-sql-cmd/scriptbody.ps1
@@ -0,0 +1,91 @@
+# insure module installed.  Designed to run on cloud infrastructure where owners doesn't have controll over the workers.
+
+if (Get-Module -ListAvailable -Name sqlserver)
+{
+	Write-Verbose "sqlserver module installed and available"
+    Import-Module sqlserver
+}
+
+else
+{
+	Write-Warning "installing module for the current user.`nIf worker is owned, consider installing the powershell module 'sqlserver' globally to speed up deployments"
+	Install-Module -Name sqlserver -Scope CurrentUser -AllowClobber -Force
+}
+
+# parse parameters
+
+$resourceGroup = $OctopusParameters["azDbSqlCmd.resourceGroupName"]
+$sqlServerName = $OctopusParameters["azDbSqlCmd.ServerName"]
+$dbName = $OctopusParameters["azDbSqlCmd.dbName"]
+$userId = $OctopusParameters["azDbSqlCmd.userId"]
+$userPwd = $OctopusParameters["azDbSqlCmd.userPwd"]
+$authType = $OctopusParameters["azDbSqlCmd.AuthType"]
+$connTimeout = $OctopusParameters["azDbSqlCmd.connectionTimeout"] -as [int]
+$resultsOutput = $OctopusParameters["azDbSqlCmd.resultsOutput"]
+
+$sqlCmd = $OctopusParameters["azDbSqlCmd.sqlCmd"]
+
+# get current IP address
+Write-Host "Getting worker IP address..." -NoNewLine
+$workerPublicIp = (Invoke-WebRequest -uri "http://ifconfig.me/ip" -UseBasicParsing).Content
+Write-Host "Done. IP is: $workerPublicIp"
+
+# create Connection string
+switch ($authType)
+{
+	"sql"
+    {
+    	$connectionString = "Server=tcp:$sqlServerName.database.windows.net;Initial Catalog=$dbName;Persist Security Info=False;User ID=$userId;Password=$userPwd;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;"
+    }
+    "adPwd"
+    {
+    	$connectionString = "Server=tcp:$sqlServerName.database.windows.net;Initial Catalog=$dbName;Persist Security Info=False;User ID=$userId;Password=$userPwd;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=`"Active Directory Password`";"
+    }
+    "ad"
+    {
+    	$connectionString = "Server=tcp:$sqlServerName.database.windows.net;Initial Catalog=$dbName;Persist Security Info=False;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Authentication=`"Active Directory Integrated`";"
+    }
+}
+
+# open firewall port
+write-host "opening firewall on server $sqlServerName for ip: $workerPublicIp"
+Invoke-Expression "az sql server firewall-rule create -g $resourceGroup -n tempOctoSqlCmd -s $sqlServerName --start-ip-address $workerPublicIp --end-ip-address $workerPublicIp"
+
+# invoke sql cmd
+try
+{
+	$id = New-Guid
+    $resultFilePath = "$env:temp/$id.txt"
+	Write-Host "running sql statement: ``$sqlCmd``"
+    
+    switch ($resultsOutput)
+    {
+        'none'
+        {
+        	Invoke-SqlCmd -ConnectionString $connectionString -Query $sqlCmd -QueryTimeout $connTimeout
+        }
+
+        'variable'
+        {
+        	Invoke-SqlCmd -ConnectionString $connectionString -Query $sqlCmd -QueryTimeout $connTimeout | ConvertTo-CSV | Out-File -FilePath "$resultFilePath"
+            $outputContent = Get-Content -Path $resultFilePath | ConvertFrom-CSV
+            Set-OctopusVariable -name "azDbSqlCmd.results"
+        }
+
+        'artifact'
+        {
+           	Invoke-SqlCmd -ConnectionString $connectionString -Query $sqlCmd -QueryTimeout $connTimeout | ConvertTo-CSV | Out-File -FilePath "$resultFilePath"
+            New-OctopusArtifact -Path $resultFilePath -Name azDbSqlCmd.results.csv
+        }
+    }
+}
+catch
+{
+	throw
+}
+finally
+{
+  # close firewall port
+  write-host "closing firewall on server $sqlServerName for ip: $workerPublicIp"
+  Invoke-Expression "az sql server firewall-rule delete -g $resourceGroup -n tempOctoSqlCmd -s $sqlServerName"
+}
diff --git a/step-templates/azure-database-export.json b/src/step-templates/azure-database-export/metadata.json
similarity index 72%
rename from step-templates/azure-database-export.json
rename to src/step-templates/azure-database-export/metadata.json
index 8a747696b..25734223a 100644
--- a/step-templates/azure-database-export.json
+++ b/src/step-templates/azure-database-export/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{azDbExport.AzAcct}",
-    "Octopus.Action.Script.ScriptBody": "$rgname = $OctopusParameters[\"azDbExport.rgName\"]\n$svrName = $OctopusParameters[\"azDbExport.sqlSvrName\"]\n$dbName = $OctopusParameters[\"azDbExport.dbName\"]\n$adminName = $OctopusParameters[\"azDbExport.adminName\"]\n$adminPwd = $OctopusParameters[\"azDbExport.adminPwd\"]\n$accessKey = $OctopusParameters[\"azDbExport.blobAccessKey\"]\n$accessKeyType = $OctopusParameters[\"azDbExport.accessKeyType\"]\n$containerUri = $OctopusParameters[\"azDbExport.ContainerUri\"]\n$backupName = $OctopusParameters[\"azDbExport.backupName\"]\n\n$backupUri = \"$containerUri/$backupName.bacpac\"\n\nif([string]::IsNullOrEmpty($rgname))\n{\n\tthrow \"resource group name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($svrName))\n{\n\tthrow \"sql server name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($dbName))\n{\n\tthrow \"database name not provided\"\n}\n# admin name, password and access key will not be validated in favor of security\n\nif([string]::IsNullOrEmpty($accessKeyType))\n{\n\tthrow \"access key type not provided\"\n}\n\nif([string]::IsNullOrEmpty($containerUri))\n{\n\tthrow \"containerUri not provided\"\n}\n\nif([string]::IsNullOrEmpty($backupName))\n{\n\tthrow \"backup name not provided\"\n}\n\nwrite-host \"starting db export\"\naz sql db export --resource-group $rgname --server $svrName --name $dbName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -116,11 +116,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-23T21:41:09.205Z",
+    "ExportedAt": "2020-06-23T21:41:09.2050000Z",
     "OctopusVersion": "2020.2.10",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-database-export/scriptbody.ps1 b/src/step-templates/azure-database-export/scriptbody.ps1
new file mode 100644
index 000000000..b146e7265
--- /dev/null
+++ b/src/step-templates/azure-database-export/scriptbody.ps1
@@ -0,0 +1,45 @@
+$rgname = $OctopusParameters["azDbExport.rgName"]
+$svrName = $OctopusParameters["azDbExport.sqlSvrName"]
+$dbName = $OctopusParameters["azDbExport.dbName"]
+$adminName = $OctopusParameters["azDbExport.adminName"]
+$adminPwd = $OctopusParameters["azDbExport.adminPwd"]
+$accessKey = $OctopusParameters["azDbExport.blobAccessKey"]
+$accessKeyType = $OctopusParameters["azDbExport.accessKeyType"]
+$containerUri = $OctopusParameters["azDbExport.ContainerUri"]
+$backupName = $OctopusParameters["azDbExport.backupName"]
+
+$backupUri = "$containerUri/$backupName.bacpac"
+
+if([string]::IsNullOrEmpty($rgname))
+{
+	throw "resource group name is not provided"
+}
+
+if([string]::IsNullOrEmpty($svrName))
+{
+	throw "sql server name is not provided"
+}
+
+if([string]::IsNullOrEmpty($dbName))
+{
+	throw "database name not provided"
+}
+# admin name, password and access key will not be validated in favor of security
+
+if([string]::IsNullOrEmpty($accessKeyType))
+{
+	throw "access key type not provided"
+}
+
+if([string]::IsNullOrEmpty($containerUri))
+{
+	throw "containerUri not provided"
+}
+
+if([string]::IsNullOrEmpty($backupName))
+{
+	throw "backup name not provided"
+}
+
+write-host "starting db export"
+az sql db export --resource-group $rgname --server $svrName --name $dbName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri
diff --git a/step-templates/azure-database-import-create-new-DTU.json b/src/step-templates/azure-database-import-create-new-DTU/metadata.json
similarity index 59%
rename from step-templates/azure-database-import-create-new-DTU.json
rename to src/step-templates/azure-database-import-create-new-DTU/metadata.json
index 8182d756a..a77515b70 100644
--- a/step-templates/azure-database-import-create-new-DTU.json
+++ b/src/step-templates/azure-database-import-create-new-DTU/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#get variables into easy to use format\n# Create DB Variables\n$databaseName = $OctopusParameters[\"azDbImportNewDTU.dbName\"]\n$sqlServer = $OctopusParameters[\"azDbImportNewDTU.server\"]\n$rgName = $OctopusParameters[\"azDbImportNewDTU.resourceGroup\"]\n$elasticPool = $OctopusParameters[\"azDbImportNewDTU.elasticPool\"]\n$readScaleTruthy = $OctopusParameters[\"azDbImportNewDTU.readScale\"]\n$serviceObjective = $OctopusParameters[\"azDbImportNewDTU.serviceObjective\"]\n$tags = $OctopusParameters[\"azDbImportNewDTU.tags\"]\n$zoneRedundant = $OctopusParameters[\"azDbImportNewDTU.zoneRedundant\"]\n$maxSize = $OctopusParameters[\"azDbImportNewDTU.maxSize\"]\n\n# Import bacpac variables\n$adminName = $OctopusParameters[\"azDbImportNewDTU.adminName\"]\n$adminPwd = $OctopusParameters[\"azDbImportNewDTU.adminPwd\"]\n$accessKey = $OctopusParameters[\"azDbImportNewDTU.blobAccessKey\"]\n$accessKeyType = $OctopusParameters[\"azDbImportNewDTU.accessKeyType\"]\n$containerUri = $OctopusParameters[\"azDbImportNewDTU.ContainerUri\"]\n$backupName = $OctopusParameters[\"azDbImportNewDTU.backupName\"]\n$backupUri = \"$containerUri/$backupName.bacpac\"\n\n$readScaleValue = \"Disabled\"\n\nif($readScaleTruthy -eq \"true\") { $readScalevalue = \"Enabled\" }\n\n$ServiceObjectiveSizes = @{Basic = 2GB; S0 = 250GB; S1 = 250GB; S2 = 250GB; S3 = 1TB; S4 = 1TB; S6 = 1TB; S7 = 1TB; S9 = 1TB; S12 = 1TB; P1 = 1TB; P2 = 1TB; P4 = 1TB; P6 = 1TB; P11 = 4TB; P15 = 4TB}\n\nif($null -eq (az sql server list --query \"[?Name==$sqlServer]\" | ConvertFrom-Json))\n{\n    throw \"$sqlServer doesn't exist or the selected azure account doesn't have access to it.\"\n}\n\nif($null -ne (az sql db list --resource-group $rgName --server $sqlServer --query \"[?Name==$databaseName]\" | ConvertFrom-Json))\n{\n    throw \"$databaseName already exists\"\n}\n\n#validate parameters\n\nif(($maxSize / 1GB) -gt ($ServiceObjectiveSizes[$serviceObjective] / 1GB))\n{\n    Write-Warning \"Desired max size of $($maxSize / 1GB)GB exceeds max size of $($ServiceObjectiveSizes[$serviceObjective] / 1GB)GB for selected service objective: $serviceObjective\"\n    Write-Warning \"Setting max size to $($ServiceObjectiveSizes[$serviceObjective] / 1GB)GB\"\n    $maxSize = \"$($ServiceObjectiveSizes[$serviceObjective] / 1GB)GB\"\n}\n\nif([string]::IsNullOrEmpty($rgname))\n{\n\tthrow \"resource group name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($sqlServer))\n{\n\tthrow \"sql server name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($databaseName))\n{\n\tthrow \"database name not provided\"\n}\n\n# admin name, password and access key will not be validated in favor of security\n\nif([string]::IsNullOrEmpty($accessKeyType))\n{\n\tthrow \"access key type not provided\"\n}\n\nif([string]::IsNullOrEmpty($containerUri))\n{\n\tthrow \"containerUri not provided\"\n}\n\nif([string]::IsNullOrEmpty($backupName))\n{\n\tthrow \"backup name not provided\"\n}\n\n# validate premium SKU settings\nif(!$serviceObjective.Contains('P'))\n{\n    if($readScaleValue -eq \"Enabled\")\n    {\n        Write-Warning \"Read Scaling only available for premium SKUs. Setting database read scale to disabled\"\n        $readScaleValue = \"Disabled\"\n    }\n    if($zoneRedundant -eq \"true\")\n    {\n        Write-Warning \"Zone redundant only available for premium SKUs. Setting database zone redundant to false\"\n        $zoneRedundant = \"false\"\n    }\n}\n\n$cliArgs = \"--name $databaseName --resource-group $rgName --server $sqlServer\"\n\nif($elasticPool) {$cliArgs += \" --elastic-pool $elasticPool\"}\nelse {$cliArgs += \" --max-size $maxSize --service-objective $serviceObjective  --zone-redundant $zoneRedundant\"}\n\nif($tags) {$cliArgs += \" --tags $tags\"}\nif($readScale) {$cliArgs += \" --read-scale $readScaleValue\"}\n\n\n$cmd = \"az sql db create $cliArgs\"\n\nwrite-verbose \"cmd is: $cmd\"\n\nWrite-Host \"Creating Database\"\nInvoke-Expression $cmd\n\nwrite-host \"starting db import\"\nwrite-verbose \"import cmd az sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri\"\n\naz sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Azure.AccountId": "azureserviceprincipal-chris-azure-account-spaces-1"
   },
   "Parameters": [
@@ -177,10 +177,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-23T20:12:56.412Z",
+    "ExportedAt": "2020-06-23T20:12:56.4120000Z",
     "OctopusVersion": "2020.2.10",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "xtreampb",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-database-import-create-new-DTU/scriptbody.ps1 b/src/step-templates/azure-database-import-create-new-DTU/scriptbody.ps1
new file mode 100644
index 000000000..12002e0f2
--- /dev/null
+++ b/src/step-templates/azure-database-import-create-new-DTU/scriptbody.ps1
@@ -0,0 +1,113 @@
+#get variables into easy to use format
+# Create DB Variables
+$databaseName = $OctopusParameters["azDbImportNewDTU.dbName"]
+$sqlServer = $OctopusParameters["azDbImportNewDTU.server"]
+$rgName = $OctopusParameters["azDbImportNewDTU.resourceGroup"]
+$elasticPool = $OctopusParameters["azDbImportNewDTU.elasticPool"]
+$readScaleTruthy = $OctopusParameters["azDbImportNewDTU.readScale"]
+$serviceObjective = $OctopusParameters["azDbImportNewDTU.serviceObjective"]
+$tags = $OctopusParameters["azDbImportNewDTU.tags"]
+$zoneRedundant = $OctopusParameters["azDbImportNewDTU.zoneRedundant"]
+$maxSize = $OctopusParameters["azDbImportNewDTU.maxSize"]
+
+# Import bacpac variables
+$adminName = $OctopusParameters["azDbImportNewDTU.adminName"]
+$adminPwd = $OctopusParameters["azDbImportNewDTU.adminPwd"]
+$accessKey = $OctopusParameters["azDbImportNewDTU.blobAccessKey"]
+$accessKeyType = $OctopusParameters["azDbImportNewDTU.accessKeyType"]
+$containerUri = $OctopusParameters["azDbImportNewDTU.ContainerUri"]
+$backupName = $OctopusParameters["azDbImportNewDTU.backupName"]
+$backupUri = "$containerUri/$backupName.bacpac"
+
+$readScaleValue = "Disabled"
+
+if($readScaleTruthy -eq "true") { $readScalevalue = "Enabled" }
+
+$ServiceObjectiveSizes = @{Basic = 2GB; S0 = 250GB; S1 = 250GB; S2 = 250GB; S3 = 1TB; S4 = 1TB; S6 = 1TB; S7 = 1TB; S9 = 1TB; S12 = 1TB; P1 = 1TB; P2 = 1TB; P4 = 1TB; P6 = 1TB; P11 = 4TB; P15 = 4TB}
+
+if($null -eq (az sql server list --query "[?Name==$sqlServer]" | ConvertFrom-Json))
+{
+    throw "$sqlServer doesn't exist or the selected azure account doesn't have access to it."
+}
+
+if($null -ne (az sql db list --resource-group $rgName --server $sqlServer --query "[?Name==$databaseName]" | ConvertFrom-Json))
+{
+    throw "$databaseName already exists"
+}
+
+#validate parameters
+
+if(($maxSize / 1GB) -gt ($ServiceObjectiveSizes[$serviceObjective] / 1GB))
+{
+    Write-Warning "Desired max size of $($maxSize / 1GB)GB exceeds max size of $($ServiceObjectiveSizes[$serviceObjective] / 1GB)GB for selected service objective: $serviceObjective"
+    Write-Warning "Setting max size to $($ServiceObjectiveSizes[$serviceObjective] / 1GB)GB"
+    $maxSize = "$($ServiceObjectiveSizes[$serviceObjective] / 1GB)GB"
+}
+
+if([string]::IsNullOrEmpty($rgname))
+{
+	throw "resource group name is not provided"
+}
+
+if([string]::IsNullOrEmpty($sqlServer))
+{
+	throw "sql server name is not provided"
+}
+
+if([string]::IsNullOrEmpty($databaseName))
+{
+	throw "database name not provided"
+}
+
+# admin name, password and access key will not be validated in favor of security
+
+if([string]::IsNullOrEmpty($accessKeyType))
+{
+	throw "access key type not provided"
+}
+
+if([string]::IsNullOrEmpty($containerUri))
+{
+	throw "containerUri not provided"
+}
+
+if([string]::IsNullOrEmpty($backupName))
+{
+	throw "backup name not provided"
+}
+
+# validate premium SKU settings
+if(!$serviceObjective.Contains('P'))
+{
+    if($readScaleValue -eq "Enabled")
+    {
+        Write-Warning "Read Scaling only available for premium SKUs. Setting database read scale to disabled"
+        $readScaleValue = "Disabled"
+    }
+    if($zoneRedundant -eq "true")
+    {
+        Write-Warning "Zone redundant only available for premium SKUs. Setting database zone redundant to false"
+        $zoneRedundant = "false"
+    }
+}
+
+$cliArgs = "--name $databaseName --resource-group $rgName --server $sqlServer"
+
+if($elasticPool) {$cliArgs += " --elastic-pool $elasticPool"}
+else {$cliArgs += " --max-size $maxSize --service-objective $serviceObjective  --zone-redundant $zoneRedundant"}
+
+if($tags) {$cliArgs += " --tags $tags"}
+if($readScale) {$cliArgs += " --read-scale $readScaleValue"}
+
+
+$cmd = "az sql db create $cliArgs"
+
+write-verbose "cmd is: $cmd"
+
+Write-Host "Creating Database"
+Invoke-Expression $cmd
+
+write-host "starting db import"
+write-verbose "import cmd az sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri"
+
+az sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri
diff --git a/src/step-templates/azure-database-import-create-new-vcpu/metadata.json b/src/step-templates/azure-database-import-create-new-vcpu/metadata.json
new file mode 100644
index 000000000..d7e4dc6c9
--- /dev/null
+++ b/src/step-templates/azure-database-import-create-new-vcpu/metadata.json
@@ -0,0 +1,230 @@
+{
+  "Id": "4f03ce31-a9ce-4aff-8c7b-5144af5401a1",
+  "Name": "Azure Database - Import Create New vcpu",
+  "Description": "Restores a bacpac to a new database\n\n*Depends on az cli*\n\n*Source database requires 'Allow Azure services and resources to access this server' option turn on in the SQL server firewall*",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{azDbImportNewVCPU.azAccount}"
+  },
+  "Parameters": [
+    {
+      "Id": "a7ee5061-2e7a-4b1a-876c-21bee392e455",
+      "Name": "azDbImportNewVCPU.azAccount",
+      "Label": "Azure Account",
+      "HelpText": "Azure account with permissions to the subscription and resource group",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "0f280e95-7f8b-4864-bd1d-6af9930257ec",
+      "Name": "azDbImportNewVCPU.resourceGroup",
+      "Label": "Resource Group",
+      "HelpText": "Resource group name housing the target SQL server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "12c084b7-1a60-4076-91e4-6471a57f8978",
+      "Name": "azDbImportNewVCPU.server",
+      "Label": "SQL Server",
+      "HelpText": "Name of the Azure SQL server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7e8e96ee-63d6-4b6b-ab69-da69bf35a798",
+      "Name": "azDbImportNewVCPU.dbName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database that will be created",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a7db94c4-7954-4bbb-af9f-b25f0d282978",
+      "Name": "azDbImportNewVCPU.edition",
+      "Label": "Edition",
+      "HelpText": "The edition component of the sku",
+      "DefaultValue": "GeneralPurpose",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "GeneralPurpose|General Purpose\nBusinessCritical|Business Critical\nHyperscale|Hyperscale"
+      }
+    },
+    {
+      "Id": "20568782-31c5-496a-8885-f69f4240a9b4",
+      "Name": "azDbImportNewVCPU.computeModel",
+      "Label": "Compute Model",
+      "HelpText": "The compute model of the database.  Only applicable for general purpose instances",
+      "DefaultValue": "Provisioned",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Provisioned|Provisioned\nServerless|Serverless"
+      }
+    },
+    {
+      "Id": "c99d1edc-62c4-4d3a-9896-8a7647a42783",
+      "Name": "azDbImportNewVCPU.family",
+      "Label": "Hardware Configuration",
+      "HelpText": "Select Between Gen5, Fsv2 , or M-Series.  Please note the documented vCPU overrides if listed.",
+      "DefaultValue": "Gen5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Gen5|Gen5\nFsv2|Fsv2 (General Purpose, Compute Optimized 72 vCPUs)\nM|M-Series (Business Critical, Memory Opimized 128 vCPUs)"
+      }
+    },
+    {
+      "Id": "d869775f-4bf4-4497-a1eb-c83fddf4c215",
+      "Name": "azDbImportNewVCPU.coreCount",
+      "Label": "vCPU Core Count",
+      "HelpText": "the number of vCores to use.\n*General purpose FSv2 hardware is set to 72*",
+      "DefaultValue": "2",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "1|1 (Only available for general purpose, serverless instances)\n2|2\n4|4\n6|6\n8|8\n10|10\n12|12\n14|14\n16|16\n18|18\n20|20\n24|24\n32|32\n40|40\n80|80 (Not available for general purpose, serverless instances)"
+      }
+    },
+    {
+      "Id": "fd690b8e-8467-4872-a8b9-b6b046f8c91d",
+      "Name": "azDbImportNewVCPU.maxsize",
+      "Label": "Max Storage Size",
+      "HelpText": "The max storage size.  If no unit is specified, defaults to bytes (B)",
+      "DefaultValue": "1GB",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ff278593-3b7a-4923-b15e-3dc958c87496",
+      "Name": "azDbImportNewVCPU.elasticPool",
+      "Label": "Elastic Pool",
+      "HelpText": "The name or resource id of the elastic pool to create the database in",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "26414a8b-d167-4b94-9142-fa9bf1c984fe",
+      "Name": "azDbImportNewVCPU.zoneRedundant",
+      "Label": "Zone Redundant",
+      "HelpText": "Specifies whether to enable zone redundancy.  This property is only applied to Business Critical databases.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "a2e4e51d-8a3b-4447-92f4-39e83f82339e",
+      "Name": "azDbImportNewVCPU.readScale",
+      "Label": "Read Scale",
+      "HelpText": "If enabled, connections that have application intent set to read only in their connection string may be routed to a read only secondary replica.  This property is only applied to Business Critical databases.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "61ef6953-b59c-44f4-80a4-a005feba912c",
+      "Name": "azDbImportNewVCPU.readReplicaCount",
+      "Label": "Read Reaplica Count",
+      "HelpText": "The number of readonly replicas to provision for the database. This property is only applied to hyperscale databases.",
+      "DefaultValue": "0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "0|0\n1|1\n2|2\n3|3\n4|4"
+      }
+    },
+    {
+      "Id": "713515d2-9dd1-4d63-8a66-14cfd08a7065",
+      "Name": "azDbImportNewVCPU.tags",
+      "Label": "Tags",
+      "HelpText": "Space-separated tags.  `key[=value] key[=value]`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "53913bf4-b70e-455f-8dbe-7002e3584ef0",
+      "Name": "azDbImportNewVCPU.blobAccessKey",
+      "Label": "Azure Blob Access Key",
+      "HelpText": "the access key (Shared Access Key or Storage Access Key) to grant access to the storage account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "9c7cdde5-e5a1-4566-80f2-f9f5391c398b",
+      "Name": "azDbImportNewVCPU.accessKeyType",
+      "Label": "Access Key Type",
+      "HelpText": "The type of key the access key represents",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "SharedAccessKey|Shared Access Key\nStorageAccessKey|Storage Access Key"
+      }
+    },
+    {
+      "Id": "fda41fbc-36cc-47b2-864f-2670144ad3e7",
+      "Name": "azDbImportNewVCPU.ContainerUri",
+      "Label": "Container Uri",
+      "HelpText": "The URI of the container to save the exported database in.  Format is: `https://{StorageAccountName}.blob.core.windows.net/{ContainerName}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0a0da7eb-afee-4595-a073-993a9e951838",
+      "Name": "azDbImportNewVCPU.backupName",
+      "Label": "Backup Name",
+      "HelpText": "The name of the file being saved.  Defaults to DB Name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8a601118-6e0d-4340-badd-c66d5c8101dd",
+      "Name": "azDbImportNewVCPU.adminName",
+      "Label": "SQL Server Admin Name",
+      "HelpText": "The admin name of the SQL server containing the database you wish to import",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f3f441ba-e92e-4cf2-bab9-0477591bc907",
+      "Name": "azDbImportNewVCPU.adminPwd",
+      "Label": "SQL Server Admin Password",
+      "HelpText": "The admin password of the SQL server containing the database you wish to import",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-23T20:13:26.1290000Z",
+    "OctopusVersion": "2020.2.10",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "Your GitHub Username",
+  "Category": "other"
+}
diff --git a/src/step-templates/azure-database-import-create-new-vcpu/scriptbody.ps1 b/src/step-templates/azure-database-import-create-new-vcpu/scriptbody.ps1
new file mode 100644
index 000000000..950ca9396
--- /dev/null
+++ b/src/step-templates/azure-database-import-create-new-vcpu/scriptbody.ps1
@@ -0,0 +1,218 @@
+#get variables into easy to use format
+
+# vCPU vars
+$family = $OctopusParameters["azDbImportNewVCPU.family"] # Gen4 is being phased out.
+$computeModel = $OctopusParameters["azDbImportNewVCPU.computeModel"]
+$readReplicaCount = $OctopusParameters["azDbImportNewVCPU.readReplicaCount"]
+$edition = $OctopusParameters["azDbImportNewVCPU.edition"]
+$capacity = $OctopusParameters["azDbImportNewVCPU.coreCount"] -as [int]
+
+# Create DB Variables
+$databaseName = $OctopusParameters["azDbImportNewVCPU.dbName"]
+$sqlServer = $OctopusParameters["azDbImportNewVCPU.server"]
+$rgName = $OctopusParameters["azDbImportNewVCPU.resourceGroup"]
+$elasticPool = $OctopusParameters["azDbImportNewVCPU.elasticPool"]
+$readScaleTruthy = $OctopusParameters["azDbImportNewVCPU.readScale"]
+
+$tags = $OctopusParameters["azDbImportNewVCPU.tags"]
+$zoneRedundant = $OctopusParameters["azDbImportNewVCPU.zoneRedundant"]
+$maxSize = $OctopusParameters["azDbImportNewVCPU.maxSize"]
+
+# Import bacpac variables
+$adminName = $OctopusParameters["azDbImportNewVCPU.adminName"]
+$adminPwd = $OctopusParameters["azDbImportNewVCPU.adminPwd"]
+$accessKey = $OctopusParameters["azDbImportNewVCPU.blobAccessKey"]
+$accessKeyType = $OctopusParameters["azDbImportNewVCPU.accessKeyType"]
+$containerUri = $OctopusParameters["azDbImportNewVCPU.ContainerUri"]
+$backupName = $OctopusParameters["azDbImportNewVCPU.backupName"]
+$backupUri = "$containerUri/$backupName.bacpac"
+
+$readScaleValue = "Disabled"
+
+if($readScaleTruthy -eq "true") { $readScalevalue = "Enabled" }
+$maxAvailableSize = 1TB
+
+$gen5VcpuCount = 2,4,6,8,10,12,14,16,18,20,24,32,40,80
+$gen5VcpuCountSvrless = 1,2,4,6,8,10,12,14,16,18,20,24,32,40
+
+#validate parameters
+
+if($null -eq (az sql server list --query "[?Name==$sqlServer]" | ConvertFrom-Json))
+{
+    throw "$sqlServer doesn't exist or the selected azure account doesn't have access to it."
+}
+
+if($null -ne (az sql db list --resource-group $rgName --server $sqlServer --query "[?Name==$databaseName]" | ConvertFrom-Json))
+{
+    throw "$database already exists"
+}
+
+# max size for all databases (except GP serverless) is 1TB
+
+if([string]::IsNullOrEmpty($rgName))
+{
+	throw "resource group name is not provided"
+}
+
+if([string]::IsNullOrEmpty($sqlServer))
+{
+	throw "sql server name is not provided"
+}
+
+if([string]::IsNullOrEmpty($databaseName))
+{
+	throw "database name not provided"
+}
+
+# admin name, password and access key will not be validated in favor of security
+
+if([string]::IsNullOrEmpty($accessKeyType))
+{
+	throw "access key type not provided"
+}
+
+if([string]::IsNullOrEmpty($containerUri))
+{
+	throw "containerUri not provided"
+}
+
+if([string]::IsNullOrEmpty($backupName))
+{
+	throw "backup name not provided"
+}
+
+switch($edition)
+{
+    "GeneralPurpose"
+    {
+        switch($computeModel)
+        {
+            "Provisioned"
+            {
+                switch($family)
+                {
+                    "Gen5"
+                    {
+                    	write-verbose "Capacity set to: $capacity"
+                        if($capacity -lt 2)
+                        {
+                        	Write-Warning "Minimum vCPU for provisioned is 2"
+                            Write-Warning "setting vCPU to 2"
+                            $capacity = 2
+                        }
+                        if(!$gen5VcpuCount.Contains($capacity))
+                        {
+                            throw "Invalid max vCPU count entered valid values for Gen5 hardware is: $gen5VcpuCount"
+                        }
+                        $maxAvailableSize = 1TB
+                    }
+                    "FSv2"
+                    {
+                        $capacity = 72
+                        $maxAvailableSize = 4TB
+                    }
+                    "Default"
+                    {
+                        throw "Invalid hardware family selected for General purpose"
+                    }
+                }
+            }
+            "Serverless"
+            {
+                if($capacity -gt 40)
+                {
+                    Write-Warning "Max vCPUs for serverless is 40"
+                    Write-Warning "Setting max vCPU to 40"
+                    $capacity = 40
+                }
+
+                if($family -ne "Gen5") {throw "Only Gen5 hardware family available for serverless"}
+
+                if(!$gen5VcpuCountSvrless.Contains($capacity))
+                {
+                    throw "Invalid max vCPU count entered valid values for serverless Gen5 hardware is: $gen5VcpuCountSvrless"
+                }
+                $maxAvailableSize = 512GB
+            }
+        }
+    }
+    "Hyperscale"
+    {
+        if($family -ne "Gen5") {throw "Only Gen5 hardware family available for Hyperscale"}
+
+        if($capacity -lt 2)
+        {
+            Write-Warning "Minimum vCPU for provisioned is 2"
+            Write-Warning "setting vCPU to 2"
+            $capacity = 2
+        }
+
+        if(!$gen5VcpuCount.Contains($capacity))
+        {
+            throw "Invalid max vCPU count entered valid values for Gen5 hardware is: $gen5VcpuCount"
+        }
+    }
+    "BusinessCritical"
+    {
+        switch ($family)
+        {
+            "Gen5"
+            {
+                if($capacity -lt 2)
+                {
+                    Write-Warning "Minimum vCPU for provisioned is 2"
+                    Write-Warning "setting vCPU to 2"
+                    $capacity = 2
+                }
+
+                if(!$gen5VcpuCount.Contains($capacity))
+                {
+                    throw "Invalid max vCPU count entered valid values for Gen5 hardware is: $gen5VcpuCount"
+                }
+                $maxAvailableSize = 1TB
+            }
+            "M"
+            {
+                $capacity = 128
+                $maxAvailableSize = 4TB
+                if($zoneRedundant -eq "true")
+                {
+                    Write-Warning "Zone redundant not available for M-Series hardware configuration"
+                    Write-Warning "Setting zone redundant to false"
+                    $zoneRedundant = "false"
+                }
+            }
+        }
+    }
+}
+
+if(($maxSize / 1GB) -gt ($maxAvailableSize / 1GB))
+{
+    Write-Warning "Desired max size of $($maxSize / 1GB)GB exceeds available max size of $($maxAvailableSize / 1GB)GB"
+    Write-Warning "Setting max size to $($maxAvailableSize / 1GB)GB"
+    $maxSize = $maxAvailableSize
+}
+
+$cliArgs = "--name $databaseName --resource-group $rgName --server $sqlServer"
+
+if($elasticPool) {$cliArgs += " --elastic-pool $elasticPool"}
+else {$cliArgs += " --edition $edition --family $family --capacity $capacity"}
+
+if((!$edition -eq "Hyperscale") -and $maxSize) {$cliArgs += " --max-size $maxSize"}
+if($edition -eq "GeneralPurpose") {$cliArgs += " --compute-model $computeModel"}
+if($edition -eq "Hyperscale") {cliArgs += " --read-replicas $readReplicaCount"}
+if($tags) {$cliArgs += " --tags $tags"}
+if($edition -eq "BusinessCritical") {$cliArgs += " --read-scale $readScaleValue --zone-redundant $zoneRedundant"}
+if($elasticPool) {$cliArgs += " --elastic-pool $elasticPool"}
+
+$cmd = "az sql db create $cliArgs"
+
+write-verbose "cmd is: $cmd"
+
+Write-Host "Creating Database"
+invoke-expression "$cmd"
+
+write-host "starting db import"
+write-verbose "import cmd az sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri"
+
+az sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri
diff --git a/step-templates/azure-database-import.json b/src/step-templates/azure-database-import/metadata.json
similarity index 71%
rename from step-templates/azure-database-import.json
rename to src/step-templates/azure-database-import/metadata.json
index 48a84908f..6de17e24e 100644
--- a/step-templates/azure-database-import.json
+++ b/src/step-templates/azure-database-import/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{azDbImport.AzAcct}",
-    "Octopus.Action.Script.ScriptBody": "$rgname = $OctopusParameters[\"azDbImport.rgName\"]\n$svrName = $OctopusParameters[\"azDbImport.sqlSvrName\"]\n$dbName = $OctopusParameters[\"azDbImport.dbName\"]\n$adminName = $OctopusParameters[\"azDbImport.adminName\"]\n$adminPwd = $OctopusParameters[\"azDbImport.adminPwd\"]\n$accessKey = $OctopusParameters[\"azDbImport.blobAccessKey\"]\n$accessKeyType = $OctopusParameters[\"azDbImport.accessKeyType\"]\n$containerUri = $OctopusParameters[\"azDbImport.ContainerUri\"]\n$backupName = $OctopusParameters[\"azDbImport.backupName\"]\n\n$backupUri = \"$containerUri/$backupName.bacpac\"\n\nif([string]::IsNullOrEmpty($rgname))\n{\n\tthrow \"resource group name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($svrName))\n{\n\tthrow \"sql server name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($dbName))\n{\n\tthrow \"database name not provided\"\n}\n\n# admin name, password and access key will not be validated in favor of security\n\nif([string]::IsNullOrEmpty($accessKeyType))\n{\n\tthrow \"access key type not provided\"\n}\n\nif([string]::IsNullOrEmpty($containerUri))\n{\n\tthrow \"containerUri not provided\"\n}\n\nif([string]::IsNullOrEmpty($backupName))\n{\n\tthrow \"backup name not provided\"\n}\n\nwrite-host \"starting db import\"\naz sql db import --resource-group $rgname --server $svrName --name $dbName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -116,11 +116,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-16T14:33:48.670Z",
+    "ExportedAt": "2020-06-16T14:33:48.6700000Z",
     "OctopusVersion": "2020.2.10",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-database-import/scriptbody.ps1 b/src/step-templates/azure-database-import/scriptbody.ps1
new file mode 100644
index 000000000..d8ca5d8f2
--- /dev/null
+++ b/src/step-templates/azure-database-import/scriptbody.ps1
@@ -0,0 +1,46 @@
+$rgname = $OctopusParameters["azDbImport.rgName"]
+$svrName = $OctopusParameters["azDbImport.sqlSvrName"]
+$dbName = $OctopusParameters["azDbImport.dbName"]
+$adminName = $OctopusParameters["azDbImport.adminName"]
+$adminPwd = $OctopusParameters["azDbImport.adminPwd"]
+$accessKey = $OctopusParameters["azDbImport.blobAccessKey"]
+$accessKeyType = $OctopusParameters["azDbImport.accessKeyType"]
+$containerUri = $OctopusParameters["azDbImport.ContainerUri"]
+$backupName = $OctopusParameters["azDbImport.backupName"]
+
+$backupUri = "$containerUri/$backupName.bacpac"
+
+if([string]::IsNullOrEmpty($rgname))
+{
+	throw "resource group name is not provided"
+}
+
+if([string]::IsNullOrEmpty($svrName))
+{
+	throw "sql server name is not provided"
+}
+
+if([string]::IsNullOrEmpty($dbName))
+{
+	throw "database name not provided"
+}
+
+# admin name, password and access key will not be validated in favor of security
+
+if([string]::IsNullOrEmpty($accessKeyType))
+{
+	throw "access key type not provided"
+}
+
+if([string]::IsNullOrEmpty($containerUri))
+{
+	throw "containerUri not provided"
+}
+
+if([string]::IsNullOrEmpty($backupName))
+{
+	throw "backup name not provided"
+}
+
+write-host "starting db import"
+az sql db import --resource-group $rgname --server $svrName --name $dbName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri
diff --git a/src/step-templates/azure-delete-from-webapp/metadata.json b/src/step-templates/azure-delete-from-webapp/metadata.json
new file mode 100644
index 000000000..62f356c87
--- /dev/null
+++ b/src/step-templates/azure-delete-from-webapp/metadata.json
@@ -0,0 +1,82 @@
+{
+  "Id": "7a3caa63-8312-4e6e-aeb9-674022e5da2f",
+  "Name": "Azure Web App - Delete Files",
+  "Description": "Provides the ability to delete files and folders from an Azure Web App through the kudu API.",
+  "Category": "azure",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{AzureAccount}"
+  },
+  "Parameters": [
+    {
+      "Id": "a575296c-babf-4c73-9023-d5a4c9cc84bf",
+      "Name": "FilesList",
+      "Label": "List of Files & Folders to Delete",
+      "HelpText": "List each file/folder on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "7643ed88-ed04-46d2-ae74-1d65b94f03f9",
+      "Name": "AzureAccount",
+      "Label": "Azure Account",
+      "HelpText": "Must exactly match the name of a configured Azure account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ac5e4147-8b41-4aa5-82d0-ad5cf5e23499",
+      "Name": "ResourceGroupName",
+      "Label": "Resource Group Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6a833494-e3e6-4b8d-8639-c03f37d6d347",
+      "Name": "WebAppName",
+      "Label": "Web App Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0186edda-110a-4cb7-a270-bdc92e55ea1e",
+      "Name": "SlotName",
+      "Label": "Slot Name",
+      "HelpText": "Optional. If you want to target a specific slot, enter it's name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ffeb3047-63d5-4ce7-9c90-81f117106a93",
+      "Name": "RetryAttempts",
+      "Label": "Retry Attempts",
+      "HelpText": "Number of delete attempts before failing. This should be set higher than 1, as the Azure Kudu API often fails on the first request.",
+      "DefaultValue": "3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "matt-byrne",
+  "$Meta": {
+    "ExportedAt": "2018-08-17T02:46:48.5360000Z",
+    "OctopusVersion": "2018.6.14",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/azure-delete-from-webapp/scriptbody.ps1 b/src/step-templates/azure-delete-from-webapp/scriptbody.ps1
new file mode 100644
index 000000000..08392cfd0
--- /dev/null
+++ b/src/step-templates/azure-delete-from-webapp/scriptbody.ps1
@@ -0,0 +1,78 @@
+Write-Host "Resource Group Name: $($ResourceGroupName)"
+Write-Host "Web App Name: $($WebAppName)"
+Write-Host "Slot Name: $($SlotName)"
+
+function Get-AzureRmWebAppPublishingCredentials($ResourceGroupName, $WebAppName, $SlotName = $null){	
+	
+	if ([string]::IsNullOrWhiteSpace($SlotName)) {
+		$resourceType = "Microsoft.Web/sites/config"
+		$resourceName = "$WebAppName/publishingcredentials"
+	} else {
+		$resourceType = "Microsoft.Web/sites/slots/config"
+		$resourceName = "$WebAppName/$SlotName/publishingcredentials"
+	}
+
+	$publishingCredentials = Invoke-AzureRmResourceAction -ResourceGroupName $ResourceGroupName -ResourceType $resourceType -ResourceName $resourceName -Action list -ApiVersion 2015-08-01 -Force
+    
+    return $publishingCredentials
+
+}
+
+function Get-KuduApiAuthorisationHeaderValue($ResourceGroupName, $WebAppName, $SlotName = $null) {
+
+    $publishingCredentials = Get-AzureRmWebAppPublishingCredentials $ResourceGroupName $WebAppName $SlotName
+
+    return ("Basic {0}" -f [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $publishingCredentials.Properties.PublishingUserName, $publishingCredentials.Properties.PublishingPassword))))
+
+}
+
+function Delete-PathFromWebApp($ResourceGroupName, $WebAppName, $SlotName = $null, $kuduPath) {
+	
+    $kuduApiAuthorisationToken = Get-KuduApiAuthorisationHeaderValue $ResourceGroupName $WebAppName $SlotName
+    
+    Write-Host "Kudu Auth Token":
+    Write-Host $kuduApiAuthorisationToken
+    
+    if ([string]::IsNullOrWhiteSpace($SlotName)) {
+        $kuduApiUrl = "https://$WebAppName.scm.azurewebsites.net/api/vfs"
+    } else {
+        $kuduApiUrl = "https://$WebAppName`-$SlotName.scm.azurewebsites.net/api/vfs"
+    }
+    
+    Write-Host "API Url: $($kuduApiUrl)"
+    Write-Host "File Path: $($kuduPath)"
+    
+    Invoke-RestMethod -Uri "$kuduApiUrl/site/wwwroot/$kuduPath" `
+                      -Headers @{"Authorization"=$kuduApiAuthorisationToken;"If-Match"="*"} `
+                      -Method DELETE 
+}
+
+function Delete-FilesAndFoldersFromWebApp($ResourceGroupName, $WebAppName, $SlotName, $FilesList, $RetryAttempts = 3) {
+
+    $list = $FilesList.Split([Environment]::NewLine)
+
+    foreach($item in $list) {
+        if(![string]::IsNullOrWhiteSpace($item)) {
+
+            $retryCount = $RetryAttempts
+            $retry = $true
+
+            while ($retryCount -gt 0 -and $retry) {
+                try {
+                    $retryCount = $retryCount -1
+
+                    Delete-PathFromWebApp $ResourceGroupName $WebAppName $SlotName $item
+
+                    $retry = $false
+                } catch {
+                    $retry = $true
+                    if($retryCount -eq 0) {
+                        throw ("Exceeded retry attempts " + $RetryAttempts + " for " + $item)
+                    }
+                }
+            }
+        }
+    }
+}
+
+Delete-FilesAndFoldersFromWebApp $ResourceGroupName $WebAppName $SlotName $FilesList $RetryAttempts
\ No newline at end of file
diff --git a/step-templates/azure-delete-resource-group-az-module.json b/src/step-templates/azure-delete-resource-group-az-module/metadata.json
similarity index 77%
rename from step-templates/azure-delete-resource-group-az-module.json
rename to src/step-templates/azure-delete-resource-group-az-module/metadata.json
index 3fd06f795..05c5129fb 100644
--- a/step-templates/azure-delete-resource-group-az-module.json
+++ b/src/step-templates/azure-delete-resource-group-az-module/metadata.json
@@ -11,7 +11,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "OctopusUseBundledTooling": "False",
     "Octopus.Action.Azure.AccountId": "#{DeleteResourceGroup.Azure.Account}",
-    "Octopus.Action.Script.ScriptBody": "$resourceGroupName = $OctopusParameters[\"DeleteResourceGroup.ResourceGroup.Name\"]\n$resourceGroupLocationAbbr = $OctopusParameters[\"DeleteResourceGroup.ResourceGroup.Location.Abbr\"]\n\n$existingResourceGroups = (az group list --query \"[?location=='$resourceGroupLocationAbbr']\") | ConvertFrom-JSON\n\n$deleteResourceGroup = $false\nforeach ($resourceGroupFound in $existingResourceGroups)\n{\t\n\tWrite-Host \"Checking if current resource group $($resourceGroupFound.name) matches $resourceGroupName\"\n    if ($resourceGroupFound.name -eq $resourceGroupName)\n    {\n    \t$deleteResourceGroup = $true\n    \tWrite-Highlight \"Resource group found, deleting\"\n    \tbreak\n    }\n}\n\nif ($deleteResourceGroup)\n{\n\tWrite-Host \"Deleting the $resourceGroupName because it was found\"\n\taz group delete -n $resourceGroupName -y\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -47,10 +47,10 @@
     }
   ],
   "LastModifiedBy": "octobob",
-    "$Meta": {
-      "ExportedAt": "2020-04-13T15:37:29.866Z",
-      "OctopusVersion": "2020.1.10",
-      "Type": "ActionTemplate"
-    },
-    "Category": "azure"
+  "$Meta": {
+    "ExportedAt": "2020-04-13T15:37:29.8660000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
 }
diff --git a/src/step-templates/azure-delete-resource-group-az-module/scriptbody.ps1 b/src/step-templates/azure-delete-resource-group-az-module/scriptbody.ps1
new file mode 100644
index 000000000..76a2a72e7
--- /dev/null
+++ b/src/step-templates/azure-delete-resource-group-az-module/scriptbody.ps1
@@ -0,0 +1,22 @@
+$resourceGroupName = $OctopusParameters["DeleteResourceGroup.ResourceGroup.Name"]
+$resourceGroupLocationAbbr = $OctopusParameters["DeleteResourceGroup.ResourceGroup.Location.Abbr"]
+
+$existingResourceGroups = (az group list --query "[?location=='$resourceGroupLocationAbbr']") | ConvertFrom-JSON
+
+$deleteResourceGroup = $false
+foreach ($resourceGroupFound in $existingResourceGroups)
+{	
+	Write-Host "Checking if current resource group $($resourceGroupFound.name) matches $resourceGroupName"
+    if ($resourceGroupFound.name -eq $resourceGroupName)
+    {
+    	$deleteResourceGroup = $true
+    	Write-Highlight "Resource group found, deleting"
+    	break
+    }
+}
+
+if ($deleteResourceGroup)
+{
+	Write-Host "Deleting the $resourceGroupName because it was found"
+	az group delete -n $resourceGroupName -y
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-delete-resource-group/metadata.json b/src/step-templates/azure-delete-resource-group/metadata.json
new file mode 100644
index 000000000..7cb6b34a8
--- /dev/null
+++ b/src/step-templates/azure-delete-resource-group/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "18ed1352-b0be-4669-aa9a-35309a669aff",
+  "Name": "Delete Azure Resource Group - AzureRM",
+  "Description": "Step to delete an Azure Resource Group using the bundled AzureRM cmdlets with Octopus Deploy.  It will first check to see if the resource group exists, and if it does exist, it will delete it.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "Author": "octobob",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Azure.AccountId": "#{DeleteResourceGroup.Azure.Account}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d0ff0ef9-90c8-4646-85ac-99e3aa8aa051",
+      "Name": "DeleteResourceGroup.Azure.Account",
+      "Label": "Azure Account",
+      "HelpText": "The Azure Account to authenticate with to delete the resource group",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "a2a3bc84-1be8-46c1-8d9b-2669edd33721",
+      "Name": "DeleteResourceGroup.ResourceGroup.Name",
+      "Label": "Resource Group Name",
+      "HelpText": "The name of the resource group to delete",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f0ca9228-92a6-4392-808e-5f767c62e2c7",
+      "Name": "DeleteResourceGroup.ResourceGroup.Location",
+      "Label": "Resource Group Location",
+      "HelpText": "The location where this resource group is located",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Central US|Americas - Central US\nEast US|Americas - East US\nEast US 2|Americas - East US 2\nNorth Central US|Americas - North Central US\nSouth Central US|Americas - South Central US\nWest US|Americas - West US\nWest US 2|Americas - West US 2\nWest Central US|Americas - West Central US\nCanada Central|Americas - Canada Central\nCanada East|Americas - Canada East\nBrazil South|Americas - Brazil South\nEast Asia|Asia Pacific - East Asia\nSoutheast Asia|Asia Pacific - Southeast Asia\nAustralia Central|Asia Pacific - Australia Central\nAustralia Central 2|Asia Pacific - Australia Central 2\nAustralia East|Asia Pacific - Australia East\nAustralia Southeast|Asia Pacific - Australia Southeast\nChina East|Asia Pacific - China East\nChina East 2|Asia Pacific - China East 2\nChina North|Asia Pacific - China North\nChina North 2|Asia Pacific - China North 2\nCentral India|Asia Pacific - Central India\nSouth India|Asia Pacific - South India\nWest India|Asia Pacific - West India\nJapan East|Asia Pacific - Japan East\nJapan West|Asia Pacific - Japan West\nKorea Central|Asia Pacific - Korea Central\nKorea South|Asia Pacific - Korea South\nNorth Europe|Europe - North Europe\nWest Europe|Europe - West Europe\nFrance Central|Europe - France Central\nFrance South|Europe - France South\nGermany North|Europe - Germany North\nGermany West Central|Europe - Germany West Central\nNorway East|Europe - Norway East\nNorway West|Europe - Norway West\nSpain Central|Europe - Spain Central\nSwitzerland North|Europe - Switzerland North\nSwitzerland West|Europe - Switzerland West\nUK South|Europe - UK South\nUK West|Europe - UK West\nSouth Africa North|Middle East and Africa - South Africa North\nSouth Africa West|Middle East and Africa - South Africa West\nUAE Central|Middle East and Africa - UAE Central\nUAE North|Middle East and Africa - UAE North"
+      }
+    }
+  ],
+  "LastModifiedBy": "octobob",
+  "$Meta": {
+    "ExportedAt": "2020-04-13T15:27:10.5810000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-delete-resource-group/scriptbody.ps1 b/src/step-templates/azure-delete-resource-group/scriptbody.ps1
new file mode 100644
index 000000000..380b02c54
--- /dev/null
+++ b/src/step-templates/azure-delete-resource-group/scriptbody.ps1
@@ -0,0 +1,30 @@
+$resourceGroupName = $OctopusParameters["DeleteResourceGroup.ResourceGroup.Name"]
+$resourceGroupLocation = $OctopusParameters["DeleteResourceGroup.ResourceGroup.Location"]
+
+$deleteResourceGroup = $false
+Try {
+	Write-Host "Getting list of existing resource groups"
+	$resourceGroupList = Get-AzureRmResourceGroup -Location "$resourceGroupLocation"    
+    
+    Write-Host "Looping through resource group list"
+    foreach ($resourceGroupItem in $resourceGroupList)
+    {
+    	Write-Host "Checking if current resource group $($resourceGroupItem.ResourceGroupName) matches $resourceGroupName"
+    	if ($resourceGroupItem.ResourceGroupName -eq $resourceGroupName)
+        {
+    		$deleteResourceGroup = $true
+            Write-Highlight "Found resource group to delete"
+            break
+        }
+    }
+    
+} Catch {
+	$deleteResourceGroup = $true
+}
+
+if ($deleteResourceGroup -eq $true){
+	Write-Host "Resource group exists, deleting it"
+    Remove-AzureRMResourceGroup -Name $resourceGroupName -Force	
+}
+
+
diff --git a/step-templates/azure-deploy-app-service-config-zip.json b/src/step-templates/azure-deploy-app-service-config-zip/metadata.json
similarity index 57%
rename from step-templates/azure-deploy-app-service-config-zip.json
rename to src/step-templates/azure-deploy-app-service-config-zip/metadata.json
index 38c770d44..4c47cd580 100644
--- a/step-templates/azure-deploy-app-service-config-zip.json
+++ b/src/step-templates/azure-deploy-app-service-config-zip/metadata.json
@@ -28,7 +28,7 @@
     "Octopus.Action.EnabledFeatures": "Octopus.Features.JsonConfigurationVariables,Octopus.Features.SubstituteInFiles",
     "Octopus.Action.Package.JsonConfigurationVariablesTargets": "#{Template.Replace.StructuredConfigurationVariables.Pattern}",
     "Octopus.Action.SubstituteInFiles.TargetFiles": "#{Template.Replace.VariablesInFiles.Pattern}",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Determining Operating System...\"\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n    switch ([System.Environment]::OSVersion.Platform)\n    {\n    \t\"Win32NT\"\n        {\n        \t# Set variable\n            $IsWindows = $true\n            $IsLinux = $false\n        }\n        \"Unix\"\n        {\n        \t$IsWindows = $false\n            $IsLinux = $true\n        }\n    }\n}\n\nif ($IsWindows)\n{\n\tWrite-Host \"Detected OS is Windows\"\n    $ProgressPreference = 'SilentlyContinue'\n}\nelse\n{\n\tWrite-Host \"Detected OS is Linux\"\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Get working variables\n$packageExtractedPath = $OctopusParameters['Octopus.Action.Package[Template.Package].ExtractedPath']\n$originalPath = $OctopusParameters['Octopus.Action.Package[Template.Package].OriginalPath']\n$packageId = $OctopusParameters['Octopus.Action.Package[Template.Package].PackageId']\n$packageVersion = $OctopusParameters['Octopus.Action.Package[Template.Package].PackageVersion']\n$azureResourceGroupName = $OctopusParameters['Template.Azure.ResourceGroup.Name']\n$azureServiceName = $OctopusParameters['Template.Azure.Service.Name']\n$azureServiceType = $OctopusParameters['Template.Azure.Service.Type']\n$slotName = $OctopusParameters['Template.Slot.Name']\n\n# Check for Windows\nif ($isWindows)\n{\n  ###########\n  # Okay, I know this looks really weird, but during development and testing, I found that the method used in the else statement did something weird to the archive where\n  # the deployment would fail, claiming the .azurfunctions folder is missing when it is clearly there only on Windows.  Grabbing the original file and only updating the changed files\n  # from the variable replacement operations and uploading the updated file seems to work\n  ###########\n  # Grab the original archive file\n  Copy-Item -Path $originalPath -Destination \"$PWD/$($packageId).$($packageVersion).zip\"\n\n  # Update the original archive with the items from the repackaged one so it includes any replacement\n  Compress-Archive -Path \"$packageExtractedPath/*\" -DestinationPath \"$PWD/$($packageId).$($packageVersion).zip\"  -Update\n}\nelse\n{\n  # Repackage the files\n  Get-ChildItem -Path $packageExtractedPath -Force | Compress-Archive -DestinationPath \"$PWD/$($packageId).$($packageVersion).zip\"\n}\n\n$archiveFile = Get-ChildItem -Path \"$PWD/$($packageId).$($packageVersion).zip\"\n\n# Create argument array\n$commandArguments = @()\n\n# Deploy the service\nswitch ($azureServiceType)\n{\n  \"functionapp\"\n  {\n    # Append functionapp specific arguments\n    $commandArguments += @(\"functionapp\")\n    break\n  }\n  \"webapp\"\n  {\n    $commandArguments += @(\"webapp\")\n    break\n  }\n}\n\n# Add additional arguments\n$commandArguments += @(\"deployment\", \"source\", \"config-zip\", \"--src\", \"$($archiveFile.FullName)\", \"--resource-group\", \"$azureResourceGroupName\", \"--name\", \"$azureServiceName\")\n\n# Check to see if they're using slots\nif (![string]::IsNullOrWhitespace($slotName))\n{\n  $commandArguments += @(\"--slot\", \"$slotName\")\n}\n\n# Execute command\nWrite-Host \"Executing: az $commandArguments\"\n\n\n\n# Redirection of stderr to stdout is done different on Windows versus Linux\nif ($IsWindows) {\n    $commandArguments += @(\"2>&1\")\n    # Execute Liquibase\n    az $commandArguments\n}\n\nif ($IsLinux) {\n    # Execute Liquibase\n    az $commandArguments 2>&1\n}\n\n# Check exit code\nif ($lastExitCode -ne 0) {\n    # Fail the step\n    Write-Error \"Deployment failed!\"\n}\n\n\n#az $commandArguments"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -115,7 +115,7 @@
   ],
   "StepPackageId": "Octopus.AzurePowerShell",
   "$Meta": {
-    "ExportedAt": "2026-02-07T00:07:05.054Z",
+    "ExportedAt": "2026-02-07T00:07:05.0540000Z",
     "OctopusVersion": "2025.4.10395",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/azure-deploy-app-service-config-zip/scriptbody.ps1 b/src/step-templates/azure-deploy-app-service-config-zip/scriptbody.ps1
new file mode 100644
index 000000000..9c91fc618
--- /dev/null
+++ b/src/step-templates/azure-deploy-app-service-config-zip/scriptbody.ps1
@@ -0,0 +1,120 @@
+Write-Host "Determining Operating System..."
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+    switch ([System.Environment]::OSVersion.Platform)
+    {
+    	"Win32NT"
+        {
+        	# Set variable
+            $IsWindows = $true
+            $IsLinux = $false
+        }
+        "Unix"
+        {
+        	$IsWindows = $false
+            $IsLinux = $true
+        }
+    }
+}
+
+if ($IsWindows)
+{
+	Write-Host "Detected OS is Windows"
+    $ProgressPreference = 'SilentlyContinue'
+}
+else
+{
+	Write-Host "Detected OS is Linux"
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Get working variables
+$packageExtractedPath = $OctopusParameters['Octopus.Action.Package[Template.Package].ExtractedPath']
+$originalPath = $OctopusParameters['Octopus.Action.Package[Template.Package].OriginalPath']
+$packageId = $OctopusParameters['Octopus.Action.Package[Template.Package].PackageId']
+$packageVersion = $OctopusParameters['Octopus.Action.Package[Template.Package].PackageVersion']
+$azureResourceGroupName = $OctopusParameters['Template.Azure.ResourceGroup.Name']
+$azureServiceName = $OctopusParameters['Template.Azure.Service.Name']
+$azureServiceType = $OctopusParameters['Template.Azure.Service.Type']
+$slotName = $OctopusParameters['Template.Slot.Name']
+
+# Check for Windows
+if ($isWindows)
+{
+  ###########
+  # Okay, I know this looks really weird, but during development and testing, I found that the method used in the else statement did something weird to the archive where
+  # the deployment would fail, claiming the .azurfunctions folder is missing when it is clearly there only on Windows.  Grabbing the original file and only updating the changed files
+  # from the variable replacement operations and uploading the updated file seems to work
+  ###########
+  # Grab the original archive file
+  Copy-Item -Path $originalPath -Destination "$PWD/$($packageId).$($packageVersion).zip"
+
+  # Update the original archive with the items from the repackaged one so it includes any replacement
+  Compress-Archive -Path "$packageExtractedPath/*" -DestinationPath "$PWD/$($packageId).$($packageVersion).zip"  -Update
+}
+else
+{
+  # Repackage the files
+  Get-ChildItem -Path $packageExtractedPath -Force | Compress-Archive -DestinationPath "$PWD/$($packageId).$($packageVersion).zip"
+}
+
+$archiveFile = Get-ChildItem -Path "$PWD/$($packageId).$($packageVersion).zip"
+
+# Create argument array
+$commandArguments = @()
+
+# Deploy the service
+switch ($azureServiceType)
+{
+  "functionapp"
+  {
+    # Append functionapp specific arguments
+    $commandArguments += @("functionapp")
+    break
+  }
+  "webapp"
+  {
+    $commandArguments += @("webapp")
+    break
+  }
+}
+
+# Add additional arguments
+$commandArguments += @("deployment", "source", "config-zip", "--src", "$($archiveFile.FullName)", "--resource-group", "$azureResourceGroupName", "--name", "$azureServiceName")
+
+# Check to see if they're using slots
+if (![string]::IsNullOrWhitespace($slotName))
+{
+  $commandArguments += @("--slot", "$slotName")
+}
+
+# Execute command
+Write-Host "Executing: az $commandArguments"
+
+
+
+# Redirection of stderr to stdout is done different on Windows versus Linux
+if ($IsWindows) {
+    $commandArguments += @("2>&1")
+    # Execute Liquibase
+    az $commandArguments
+}
+
+if ($IsLinux) {
+    # Execute Liquibase
+    az $commandArguments 2>&1
+}
+
+# Check exit code
+if ($lastExitCode -ne 0) {
+    # Fail the step
+    Write-Error "Deployment failed!"
+}
+
+
+#az $commandArguments
\ No newline at end of file
diff --git a/src/step-templates/azure-deploy-containerapp/metadata.json b/src/step-templates/azure-deploy-containerapp/metadata.json
new file mode 100644
index 000000000..605771174
--- /dev/null
+++ b/src/step-templates/azure-deploy-containerapp/metadata.json
@@ -0,0 +1,198 @@
+{
+  "Id": "db701b9a-5dbe-477e-b820-07f9e354f634",
+  "Name": "Azure - Deploy Container App",
+  "Description": "Deploys a container to an Azure Container App Environment",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "636b2191-09f6-4f86-a59c-97e1891475db",
+      "Name": "Template.Azure.Container.Image",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "NotAcquired",
+      "Properties": {
+        "Extract": "False",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Template.Azure.Container.Image",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "a1ae1b6c-99d0-4ee5-9c3c-08c345966842",
+      "Name": "Template.Azure.ResourceGroup.Name",
+      "Label": "Azure Resource Group Name",
+      "HelpText": "Provide the resource group name to create the environment in.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fb92b5d7-5e48-485d-9222-dc2c97b58535",
+      "Name": "Template.Azure.Account.SubscriptionId",
+      "Label": "Azure Account Subscription Id",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `SubscriptionNumber` property to for this entry.  Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.SubscriptionNumber}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e1ce647f-956e-48d1-8002-44d958f1c8a4",
+      "Name": "Template.Azure.Account.ClientId",
+      "Label": "Azure Account Client Id",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Client` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Client}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a02e3fd0-9d91-4106-84a4-ff0d68e5de7c",
+      "Name": "Template.Azure.Account.TenantId",
+      "Label": "Azure Account Tenant Id",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `TenantId` property to for this entry.   If blank, it will use the Managed Identity tenant.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.TenantId}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7bd73320-1889-41eb-a1c0-c8788e5eed9d",
+      "Name": "Template.Azure.Account.Password",
+      "Label": "Azure Account Password",
+      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Password` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Password}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "79b217e1-f2c4-476b-a37a-02a549731e1a",
+      "Name": "Template.Azure.Account.JWTToken",
+      "Label": "Azure Account JWT Token",
+      "HelpText": "The JWT token of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `OpenIdConnect.Jwt` property to for this entry.   Leave blank if you're using an Azure Service Principal account type.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.OpenIdConnect.Jwt}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f7fafc7e-2658-4a6f-ac30-7d9f738b9f52",
+      "Name": "Template.ContainerApp.Environment.Name",
+      "Label": "Container App Environment Name",
+      "HelpText": "The name or ID of the container app environment to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "31f02b7e-4822-49de-97dc-ee981b12268c",
+      "Name": "Template.Azure.Location.Name",
+      "Label": "Azure Location",
+      "HelpText": "The location in which to create the container app environment.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d74123b0-4104-45b9-ae12-b1f808b8b948",
+      "Name": "Template.Azure.Container.Name",
+      "Label": "Container Name",
+      "HelpText": "The name of the container to create/update.  If you want to use the image name, specify `#{Octopus.Action.Package[Template.Azure.Container.Image].PackageId | Replace \"/\" \"-\"}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1bdb6d31-4b97-4eab-aca3-5a60891b3455",
+      "Name": "Template.Azure.Container.Image",
+      "Label": "Container Image",
+      "HelpText": "Select the container image to deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "9e7aa5cf-9bab-4303-a851-1b8757f2f486",
+      "Name": "Template.Azure.Container.Variables",
+      "Label": "Environment variables",
+      "HelpText": "JSON formatted key/value pair of environment variables to pass to the container.  This supports use of OctoStache.\n\n```\n[\n  {\n    \"name\": \"ConnectionStrings__CatalogConnection\",\n    \"value\": \"Server=#{Project.SQL.DNS},1433;Integrated Security=true;Initial Catalog=#{Project.Catalog.Database.Name};User Id=#{Project.SQL.Admin.Username};Password=#{Project.SQL.Admin.Password};Trusted_Connection=false;Trust Server Certificate=True;\"\n  },\n {\n  \"name\": \"MyPasswordFromSecret\",\n  \"secretref\": \"Name of my secret\"\n },\n ...\n]\n```",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "498f308d-a94c-4364-b0be-8d739ac63f4e",
+      "Name": "Template.Azure.Container.Secrets",
+      "Label": "Secrets",
+      "HelpText": "JSON formatted key/value pair of secrets to create/update.  This supports use of OctoStache.\n\n**Note:** The name of the secret must be lowercase.\n\n```\n[\n  {\n    \"name\": \"mysecret\",\n    \"value\": \"#{Project.SQL.Admin.Password}\"\n  },\n ...\n]\n```",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "20e3e428-62b9-4eef-9cdc-780a0eedee79",
+      "Name": "Template.Azure.Container.Cpu",
+      "Label": "Resource CPU",
+      "HelpText": "The amount of CPU to allocate to the container app.\n\nExample: 0.5",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d804f749-625e-4ca5-9bef-13fc2c2a463c",
+      "Name": "Template.Azure.Container.Memory",
+      "Label": "Resource Memory",
+      "HelpText": "The amount of memory to allocate to the container app.\n\nExamples: 250Mb or 4.0Gi",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a506b328-4e10-49fe-947b-6623d4d392c1",
+      "Name": "Template.Azure.Container.Ingress.Port",
+      "Label": "Container Ingress Port",
+      "HelpText": "The port to allow traffic to the container.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "682d68a4-f1eb-469c-9557-9577ed9f1505",
+      "Name": "Template.Azure.Container.ExternalIngress",
+      "Label": "External Ingress",
+      "HelpText": "Whether the ingress is externally accessible or not.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-01-28T18:05:42.2010000Z",
+    "OctopusVersion": "2026.1.5902",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-deploy-containerapp/scriptbody.ps1 b/src/step-templates/azure-deploy-containerapp/scriptbody.ps1
new file mode 100644
index 000000000..8c11fcb58
--- /dev/null
+++ b/src/step-templates/azure-deploy-containerapp/scriptbody.ps1
@@ -0,0 +1,325 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Write-Host "Saving module $PowerShellModuleName to temporary folder ..."
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+    Write-Host "Save successful!"
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+     Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Check to see if it's running on Windows
+if ($IsWindows)
+{
+	# Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PWD/modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([IO.Path]::PathSeparator)$env:PSModulePath"
+$azureModule = "Az.App"
+
+# Get variables
+$templateAzureAccountClient = $OctopusParameters['Template.Azure.Account.ClientId']
+$templateAzureAccountPassword = $OctopusParameters['Template.Azure.Account.Password']
+$templateAzureAccountTenantId = $OctopusParameters['Template.Azure.Account.TenantId']
+$templateAzureResourceGroup = $OctopusParameters['Template.Azure.ResourceGroup.Name']
+$templateAzureSubscriptionId = $OctopusParameters['Template.Azure.Account.SubscriptionId']
+$templateEnvironmentName = $OctopusParameters['Template.ContainerApp.Environment.Name']
+$templateAzureLocation = $OctopusParameters['Template.Azure.Location.Name']
+$templateAzureContainer = $OctopusParameters['Template.Azure.Container.Image']
+$templateAzureContainerIngressPort = $OctopusParameters['Template.Azure.Container.Ingress.Port']
+$templateAzureContainerIngressExternal = $OctopusParameters['Template.Azure.Container.ExternalIngress']
+$vmMetaData = $null
+$secretRef = @()
+$templateAzureContainerSecrets = $null
+$templateAzureJWTToken = $OctopusParameters['Template.Azure.Account.JWTToken']
+
+if (![string]::IsNullOrWhitespace($OctopusParameters['Template.Azure.Container.Variables']))
+{
+    $templateAzureContainerEnvVars = ($OctopusParameters['Template.Azure.Container.Variables'] | ConvertFrom-JSON)
+}
+else
+{
+	$templateAzureContainerEnvVars = $null
+}
+
+if (![string]::IsNullOrWhitespace($OctopusParameters['Template.Azure.Container.Secrets']))
+{
+    $templateAzureContainerSecrets = ($OctopusParameters['Template.Azure.Container.Secrets'] | ConvertFrom-JSON)
+}
+else
+{
+	$templateAzureContainerSecrets = $null
+}
+
+$templateAzureContainerCPU = $OctopusParameters['Template.Azure.Container.Cpu']
+$templateAzureContainerMemory = $OctopusParameters['Template.Azure.Container.Memory']
+
+# Check for required PowerShell module
+Write-Host "Checking for module $azureModule ..."
+
+if ((Get-ModuleInstalled -PowerShellModuleName $azureModule) -eq $false)
+{
+	# Install the module
+    Install-PowerShellModule -PowerShellModuleName $azureModule -LocalModulesPath $LocalModules
+}
+
+# Import the necessary module
+Write-Host "Importing module $azureModule ..."
+Import-Module $azureModule
+
+# Check to see if the account was specified
+if (![string]::IsNullOrWhitespace($templateAzureAccountClient))
+{
+	# Login using the provided account
+    Write-Host "Logging in as specified account ..."
+
+    # Check to see if the jtw token was given
+    if (![string]::IsNullOrWhitespace($templateAzureJWTToken))
+    {
+      # Log in with OIDC
+      Write-Host "Logging in using OIDC ..."
+
+      
+      # Log in
+      Connect-AzAccount -FederatedToken $templateAzureJWTToken -ApplicationId $templateAzureAccountClient -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null    
+    }
+
+    if (![string]::IsNullOrWhitespace($templateAzureAccountPassword))
+    {
+        # Log in with Azure Service Principal
+        Write-Host "Logging in with Azure Service Principal ..."
+        
+        # Create credential object for az module
+	    $securePassword = ConvertTo-SecureString $templateAzureAccountPassword -AsPlainText -Force
+	    $azureCredentials = New-Object System.Management.Automation.PSCredential ($templateAzureAccountClient, $securePassword)  
+
+        Connect-AzAccount -Credential $azureCredentials -ServicePrincipal -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null
+    }    
+    
+    Write-Host "Login successful!"
+}
+else
+{
+	Write-Host "Using machine Managed Identity ..."
+    $vmMetaData = Invoke-RestMethod -Headers @{"Metadata"="true"} -Method GET -Uri "http://169.254.169.254/metadata/instance?api-version=2021-02-01"
+    
+    Connect-AzAccount -Identity
+    
+    # Get Identity context
+    $identityContext = Get-AzContext
+    
+    # Set variables
+    $templateAzureSubscriptionId = $vmMetaData.compute.subscriptionId
+    
+    if ([string]::IsNullOrWhitespace($templateAzureAccountTenantId))
+    {
+    	$templateAzureAccountTenantId = $identityContext.Tenant
+    }
+    
+    Set-AzContext -Tenant $templateAzureAccountTenantId | Out-Null
+	Write-Host "Successfully set context for Managed Identity!"
+}
+
+# Check to see if the environment name is a / in it
+if ($templateEnvironmentName.Contains("/") -ne $true)
+{
+	# Lookup environment id by name
+    Write-Host "Looking up Managed Environment by Name ..."
+    $templateEnvironmentName = (Get-AzContainerAppManagedEnv -ResourceGroupName $templateAzureResourceGroup -EnvName $templateEnvironmentName -SubscriptionId $templateAzureSubscriptionId).Id
+}
+
+# Build parameter list to pass to New-AzContainerAppTemplateObject
+$PSBoundParameters.Add("Image", $OctopusParameters["Octopus.Action.Package[Template.Azure.Container.Image].Image"])
+$PSBoundParameters.Add("Name", $OctopusParameters["Template.Azure.Container.Name"])
+
+if (![string]::IsNullOrWhitespace($templateAzureContainerCPU))
+{
+    $PSBoundParameters.Add("ResourceCpu", "$templateAzureContainerCPU")
+}
+
+if (![string]::IsNullOrWhitespace($templateAzureContainerMemory))
+{
+    $PSBoundParameters.Add("ResourceMemory", "$templateAzureContainerMemory")
+}
+
+if ($null -ne $templateAzureContainerEnvVars)
+{
+    # Loop through list
+    $envVars = @()
+    foreach ($envVar in $templateAzureContainerEnvVars)
+    {
+    	$envEntry = @{}
+        $envEntry.Add("Name", $envVar.Name)
+        
+        # Check for specific property
+        if ($envVar.SecretRef)
+        {
+        	$envEntry.Add("SecretRef", $envVar.SecretRef)
+        }
+        else
+        {
+        	$envEntry.Add("Value", $envVar.Value)
+        }
+        
+        # Add to collection
+        $envVars += $envEntry
+    }
+    
+    $PSBoundParameters.Add("Env", $envVars)
+}
+
+if ($null -ne $templateAzureContainerSecrets)
+{
+	# Loop through list
+    foreach ($secret in $templateAzureContainerSecrets)
+    {
+        # Create new secret object and add to array
+        $secretRef += New-AzContainerAppSecretObject -Name $secret.Name -Value $secret.Value
+    }
+}
+
+# Create new container app
+$containerDefinition = New-AzContainerAppTemplateObject @PSBoundParameters
+$PSBoundParameters.Clear()
+
+# Define ingress components
+if (![string]::IsNullOrWhitespace($templateAzureContainerIngressPort))
+{
+	$PSBoundParameters.Add("IngressExternal", [System.Convert]::ToBoolean($templateAzureContainerIngressExternal))
+    $PSBoundParameters.Add("IngressTargetPort", $templateAzureContainerIngressPort)
+}
+
+# Check the image
+if ($OctopusParameters["Octopus.Action.Package[Template.Azure.Container.Image].Image"].Contains("azurecr.io"))
+{
+	# Define local parameters
+    $registryCredentials = @{}
+    $registrySecret = @{}
+    
+    # Accessing an ACR repository, configure credentials
+    if (![string]::IsNullOrWhitespace($templateAzureAccountClient))
+    {
+
+		# Use configured client, name must be lower case
+        $registryCredentials.Add("Username", $templateAzureAccountClient)
+        $registryCredentials.Add("PasswordSecretRef", "clientpassword")
+
+		$secretRef += New-AzContainerAppSecretObject -Name "clientpassword" -Value $templateAzureAccountPassword
+    }
+    else
+    {
+    	# Using Managed Identity
+        $registryCredentials.Add("Identity", "system")
+        
+    }
+    
+    $registryServer = $OctopusParameters["Octopus.Action.Package[Template.Azure.Container.Image].Image"]
+    $registryServer = $registryServer.Substring(0, $registryServer.IndexOf("/"))
+    $registryCredentials.Add("Server", $registryServer)
+       
+    # Add credentials
+    $PSBoundParameters.Add("Registry", $registryCredentials)
+}
+
+# Define secrets component
+if ($secretRef.Count -gt 0)
+{
+	# Add to parameters
+    $PSBoundParameters.Add("Secret", $secretRef)
+}
+
+# Create new configuration object
+Write-Host "Creating new Configuration Object ..."
+$configurationObject = New-AzContainerAppConfigurationObject @PSBoundParameters
+$PSBoundParameters.Clear()
+
+# Define parameters
+$PSBoundParameters.Add("Name", $OctopusParameters["Template.Azure.Container.Name"])
+$PSBoundParameters.Add("TemplateContainer", $containerDefinition)
+$PSBoundParameters.Add("ResourceGroupName", $templateAzureResourceGroup)
+$PSBoundParameters.Add("Configuration", $configurationObject)
+
+
+# Check to see if the container app already exists
+$containerApps = Get-AzContainerApp -ResourceGroupName $templateAzureResourceGroup
+
+if ($null -eq $containerApps)
+{
+  $containerApp = $null
+}
+else
+{
+  $containerApp = ($containerApps | Where-Object {$_.Name -eq $OctopusParameters["Template.Azure.Container.Name"]})
+}
+
+if ($null -eq $containerApp)
+{
+	# Add parameters required for creating container app
+	$PSBoundParameters.Add("EnvironmentId", $templateEnvironmentName)
+	$PSBoundParameters.Add("Location", $templateAzureLocation)
+	
+	# Deploy container
+    Write-Host "Creating new container app ..."
+	New-AzContainerApp @PSBoundParameters
+}
+else
+{
+	Write-Host "Updating existing container app ..."
+    Update-AzContainerApp @PSBoundParameters
+}
diff --git a/src/step-templates/azure-devops-build-pipeline/metadata.json b/src/step-templates/azure-devops-build-pipeline/metadata.json
new file mode 100644
index 000000000..edf9ea315
--- /dev/null
+++ b/src/step-templates/azure-devops-build-pipeline/metadata.json
@@ -0,0 +1,93 @@
+{
+  "Id": "405e97d7-e7ad-4d62-81cd-5d5fc751ef42",
+  "Name": "Run Azure DevOps Build Pipeline",
+  "Description": "Will trigger a build pipeline in Azure DevOps for a specified branch using the [Azure DevOps REST API](https://docs.microsoft.com/en-us/rest/api/azure/devops/?view=azure-devops-rest-6.1).",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Author": "adamoctoclose",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "5f4bdb73-ce24-4d5d-8541-82efae04b9f5",
+      "Name": "AzureDevOpsAccessKey",
+      "Label": "Azure DevOps Access Key",
+      "HelpText": "A [personal access token (PAT)](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=preview-page) is used as an alternate password to authenticate into Azure DevOps. Learn how to create, use, modify, and revoke PATs for Azure DevOps.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "63dd21d5-3d38-4bc2-9b09-9e2e4efa5974",
+      "Name": "AzureDevOpsOrganizationName",
+      "Label": "Azure DevOps Organization Name",
+      "HelpText": "The name of the Azure DevOps [organization](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/organization-management?view=azure-devops).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0d641c0c-bd5f-408a-9d9a-6ac710bd134c",
+      "Name": "AzureDevOpsProjectName",
+      "Label": "Azure DevOps Project Name",
+      "HelpText": "Project ID or project name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b5e6ea31-5679-48b6-a5ec-4c7274dbb398",
+      "Name": "AzureDevOpsPipelineName",
+      "Label": "Azure DevOps Pipeline Name",
+      "HelpText": "The name of the pipeline you want to run in your Azure DevOps project\n\nExample: helloword-ci",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "62f3eab8-9785-4b96-9c52-a0a12f794e12",
+      "Name": "AzureDevOpsBranch",
+      "Label": "Azure DevOps Branch",
+      "HelpText": "Source branch to build from",
+      "DefaultValue": "Main",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea425cd0-110e-45de-b38f-1c07b82cb390",
+      "Name": "AzureDevOpsWaitUntilCompletion",
+      "Label": "Azure DevOps Wait Until Completion",
+      "HelpText": "Wait for the pipeline to finish. If selected then the step will wait until the build pipeline is completed before finishing the step. If the build pipeline fails then the step will also fail.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "a3d3830b-87ca-40ab-aca0-e243f0080dda",
+      "Name": "AzureDevOpsVariables",
+      "Label": "AzureDevOpsVariables",
+      "HelpText": "Azure DevOps pipeline variables should be passed in as JSON. Example... \"TestEnv\": {\"isSecret\": false,\"value\": \"true\"},\"ProdEnv\": {\"isSecret\": false,\"value\": \"false\"}",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-03-25T13:12:50.9320000Z",
+    "OctopusVersion": "2020.5.5",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "adamoctoclose",
+  "Category": "azure-devops"
+}
diff --git a/src/step-templates/azure-devops-build-pipeline/scriptbody.ps1 b/src/step-templates/azure-devops-build-pipeline/scriptbody.ps1
new file mode 100644
index 000000000..826fae300
--- /dev/null
+++ b/src/step-templates/azure-devops-build-pipeline/scriptbody.ps1
@@ -0,0 +1,146 @@
+$AzureDevOpsAccessKey = $AzureDevOpsAccessKey
+$AzureDevOpsOrganizationName = $AzureDevOpsOrganizationName
+$AzureDevOpsProjectName = $AzureDevOpsProjectName
+$AzureDevOpsPipelineName = $AzureDevOpsPipelineName
+$AzureDevOpsBranch = $AzureDevOpsBranch
+$AzureDevOpsWaitUntilCompletion = $AzureDevOpsWaitUntilCompletion
+$AzureDevOpsVariables = $AzureDevOpsVariables
+
+function Test-RequiredValues
+{
+	param (
+    	[PSVariable]$variableToCheck
+    )
+    if ([string]::IsNullOrWhiteSpace($variableToCheck.Value) -eq $true)
+    {
+    	Write-Host "$($variableToCheck.Name) is required."
+        return $false
+    }
+    return $true
+}
+function Get-BuildPipelineId 
+{
+    param (
+        $defaultUrl,
+        $pipeline
+    )
+    try {
+        Write-Host "Getting list of available pipelines"
+        $url = "$defaultUrl/_apis/pipelines?api-version=6.0-preview.1"
+        $pipelines = Invoke-RestMethod -Uri $url -Method GET -Headers $azureDevOpsAuthenticationHeader
+        if([string]::IsNullOrWhiteSpace($pipelines) -eq $true)
+        {
+            Write-Error "Couldn't find any pipelines in $AzureDevOpsPipelineName"
+            Exit 1
+        }
+        $pipelineId = ($pipelines.value | Where-Object {$_.name -eq $pipeline}).id
+        if([string]::IsNullOrWhiteSpace($pipelineId) -eq $true)
+        {
+            Write-Error "Found ${$pipelines.count} pipelines in project $AzureDevOpsProjectName but couldn't find $AzureDevOpsPipelineName"
+            Exit 1
+        }
+        return $pipelineId
+    }
+    catch 
+    {
+        Write-Error "An error occurred while getting the pipelines:`n$($_.Exception.Message)"
+        Exit 1
+    }
+}
+function Invoke-BuildPipeline 
+{
+    param (
+        $defaultUrl,
+        $pipelineId,
+        $body
+    )
+    try {
+        $url = "$defaultUrl/_apis/pipelines/$pipelineId/runs?api-version=6.0-preview.1"
+        $pipeline = Invoke-RestMethod -Uri $url -Body $body -ContentType "application/json" -Method POST -Headers $azureDevOpsAuthenticationHeader
+        return $pipeline       
+    }
+    catch {
+        Write-Error "An error occurred while invoking the pipeline:`n$($_.Exception.Message)"
+        Exit 1
+    }    
+}
+function Get-BuildPipelineStatus 
+{
+    param (
+        $defaultUrl,
+        $pipelineId,
+        $runId
+    )
+    try {
+        $url = "$defaultUrl/_apis/pipelines/$pipelineId/runs/$($runId)?api-version=6.0-preview.1"
+        return Invoke-RestMethod -Uri $url -Method GET -Headers $azureDevOpsAuthenticationHeader
+    }
+    catch {
+        Write-Error "An error occurred while getting the pipeline status:`n$($_.Exception.Message)"
+        Exit 1
+    }  
+}
+$verificationPassed = @()
+$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsAccessKey)
+$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsOrganizationName)
+$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsProjectName) 
+$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsPipelineName)
+$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsBranch)
+
+if ($verificationPassed -contains $false)
+{
+	Write-Error "Required values missing. Please see output for further details."
+	Exit 1
+}
+
+$azureDevOpsAuthenticationHeader = @{Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":$($AzureDevOpsAccessKey)")) }
+
+Write-Host "Azure DevOps Organization Name: $AzureDevOpsOrganizationName"
+Write-Host "Azure DevOps Project Name: $AzureDevOpsProjectName"
+Write-Host "Azure DevOps Pipeline Name: $AzureDevOpsPipelineName"
+Write-Host "Azure DevOps Branch: $AzureDevOpsBranch"
+Write-Host "Azure DevOps Wait Until Completion: $AzureDevOpsWaitUntilCompletion"
+
+$defaultUrl = "https://dev.azure.com/$AzureDevOpsOrganizationName/$AzureDevOpsProjectName"
+
+$buildPipelineId = Get-BuildPipelineId -defaultUrl $defaultUrl -pipeline $AzureDevOpsPipelineName
+
+$body = @"
+{
+    "resources": {
+      "repositories": {
+        "self": {
+          "refName": "refs/heads/$AzureDevOpsBranch"
+        }
+      }
+    },
+    "variables": {
+        $AzureDevOpsVariables
+    }
+  }
+"@
+
+$run = Invoke-BuildPipeline -defaultUrl $defaultUrl -pipelineId $buildPipelineId -body $body
+
+Write-Highlight "The pipeline was successfully invoked, you can access the pipeline [here]($($run._links.web.href))."
+
+if ($run.state -ne "completed" -and $AzureDevOpsWaitUntilCompletion -eq $true)
+{
+    do 
+    {
+        Write-Host "Waiting for pipeline completion..."
+        Start-Sleep 30
+        $status = Get-BuildPipelineStatus -defaultUrl $defaultUrl -pipelineId $buildPipelineId -runId $run.id
+        Write-Host "Current Status: $($status.state)"
+    }
+    while ($status.state -ne "completed") 
+    if ($status.result -ne "succeeded")
+    {
+        Write-Error "The Azure DevOps pipeline failed to complete successfully"
+        Exit 1
+    }
+}
+else 
+{
+   Write-Host "Azure DevOps pipeline status unknown. Update process to wait until completion for status updates."
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-function-set-appsettings-from-azconfig/metadata.json b/src/step-templates/azure-function-set-appsettings-from-azconfig/metadata.json
new file mode 100644
index 000000000..1883c8c2b
--- /dev/null
+++ b/src/step-templates/azure-function-set-appsettings-from-azconfig/metadata.json
@@ -0,0 +1,149 @@
+{
+  "Id": "67fcc93c-509c-4c13-bc24-645eff53c5c2",
+  "Name": "Azure Function - Set AppSettings from Azure AppConfig",
+  "Description": "This step retrieves one or more key/values from an Azure App Configuration store and adds them to an Azure App Function's AppSettings.\n\nYou can retrieve individual keys that match a specific name, and you can choose a custom setting name for each key.\n\nWildcard search is also supported using the `*` notation in the **Key Names** parameter. Note: Combining a wildcard search with custom setting names is not supported.\n\nYou can also combine retrieved values with additional parameters passed into the step using the `Additional AppSettings` parameter.\n\nAuthentication is performed using an Azure Service Principal.\n\n---\n\n**Required:** \n- An Azure account with permission to both retrieve values from the Azure App Config store and publish to the App Function.\n- The `az` CLI on the target or worker. If the CLI can't be found, the step will fail. \n\nNotes:\n\n- Tested on Octopus `2024.1` using az version `2.38.0`\n- Tested with both Windows PowerShell and PowerShell Core (on Linux).\n- Slot Settings are not currently supported.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{AzFunction.SetAppSettings.FromAzAppConfig.AzureAccount}"
+  },
+  "Parameters": [
+    {
+      "Id": "b4c7f413-9341-4602-b5f4-5d69365e6cff",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.AzureAccount",
+      "Label": "Azure Account",
+      "HelpText": "An Azure account with permission to both retrieve values from the Azure App Config store and publish to the App Function",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "fcf6f1fd-1b3c-47d2-8037-802224c76452",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreName",
+      "Label": "Config Store Name",
+      "HelpText": "The name of the Azure App Configuration store. Provide this or the **Config store endpoint**.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7d6b9332-9c13-42b1-83b5-a8e84fc593f0",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreEndpoint",
+      "Label": "Config Store Endpoint",
+      "HelpText": "The endpoint for the Azure App Configuration Store. Provide this or the **Config store name**.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c25b6875-2007-4d55-97a1-7ec7b061b06b",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.RetrievalMethod",
+      "Label": "Retrieval Method",
+      "HelpText": "Choose how the step calls the az cli. Either:\n- `All`: Retrieve all configuration values in one call\n- `Individually`: Retrieve configuration values in multiple calls; one for each key specified in the **Key Names** parameter.\n\nDefault: `All`",
+      "DefaultValue": "all",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "all|All\nindividual|Individually"
+      }
+    },
+    {
+      "Id": "cf069635-3027-47a4-8965-d229c8e64afd",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.KeyNames",
+      "Label": "Key Names",
+      "HelpText": "Specify the names of the keys to be returned from Azure App Configuration in the format `KeyName | CustomSettingName` where:\n\n- `KeyName` is the key to retrieve. Wildcards are supported by adding `*` at the end of the key name.\n- `CustomSettingName` is the _optional_ name to set for the AppSetting value in the App Function. *If this value isn't specified, the original key will be used.*.\n\n**Note:** Multiple keys can be retrieved by entering each one on a new line. Note: Combining a wildcard search with custom setting names is not supported.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "13007305-0fa2-468c-b7de-3c5317bd8611",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.Labels",
+      "Label": "Labels",
+      "HelpText": "Labels are an attribute on keys. Provide one or more labels in the format `label1,label2` to retrieve only selected keys tagged with those labels.\n\n**Note:** You can include both label values *and* specify key names if you want.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a7e79ba3-5ea3-40ab-9759-aa281e3c02f9",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.SuppressWarnings",
+      "Label": "Suppress warnings",
+      "HelpText": "Suppress warnings from being written to the task log. For example, when a supplied key can't be found in the Azure App Configuration store.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "62d8f95f-8a57-4908-b789-c3ecabd7c6dd",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.TreatWarningsAsErrors",
+      "Label": "Treat Warnings as Errors",
+      "HelpText": "Treats warnings as errors. If enabled the **Suppress Warnings** parameter is ignored. ",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c8c1c14d-a515-47e7-b117-6a69644b78af",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.FunctionName",
+      "Label": "Azure Function App Name",
+      "HelpText": "The name of the Azure App function.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "07fcb750-13a1-4272-b6b6-a5cdd120a15f",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.ResourceGroup",
+      "Label": "Resource Group",
+      "HelpText": "The name of the resource group where the Function App is located.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fbd1b5bf-e1ce-415c-b7db-9c9d49e9f8e3",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.Slot",
+      "Label": "Slot",
+      "HelpText": "\nThe name of the slot. Defaults to the production slot if not specified.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "21e9c8b3-50ce-4006-83a7-86d7803c31ee",
+      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.AdditionalSettingsValues",
+      "Label": "Additional AppSettings",
+      "HelpText": "Specify the name and values of any **additional** settings to be applied to the Azure App Function in the format `KEY | VALUE` where:\n\n- `KEY` is the name of the app setting to add\n- `VALUE` is the value to be used. [Octopus variables](https://octopus.com/docs/projects/variables) can be used here.\n\n\n**Note:** Multiple settings can be added by entering each one on a new line. As a result, values that span multiple lines will result in an error.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AzurePowerShell",
+  "$Meta": {
+    "ExportedAt": "2023-11-30T16:25:08.8280000Z",
+    "OctopusVersion": "2024.1.2558",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedAt": "2023-11-30T16:25:08.8280000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-function-set-appsettings-from-azconfig/scriptbody.ps1 b/src/step-templates/azure-function-set-appsettings-from-azconfig/scriptbody.ps1
new file mode 100644
index 000000000..a4c28b52e
--- /dev/null
+++ b/src/step-templates/azure-function-set-appsettings-from-azconfig/scriptbody.ps1
@@ -0,0 +1,433 @@
+$ErrorActionPreference = 'Stop'
+
+# KV Variables
+$global:AzureAppConfigStoreName = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreName"]
+$global:AzureAppConfigStoreEndpoint = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreEndpoint"]
+$global:AzureAppConfigRetrievalMethod = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.RetrievalMethod"]
+$ConfigStoreKeyNames = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.KeyNames"]
+$global:ConfigStoreLabels = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.Labels"]
+$global:SuppressWarnings = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.SuppressWarnings"] -ieq "True"
+$global:TreatWarningsAsErrors = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.TreatWarningsAsErrors"] -ieq "True"
+
+# Function Variables
+$FunctionName = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.FunctionName"]
+$ResourceGroup = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.ResourceGroup"]
+$AdditionalSettingsValues = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.AdditionalSettingsValues"]
+$Slot = $OctopusParameters["AzFunction.SetAppSettings.FromAzAppConfig.Slot"]
+
+# KV params validation
+if ([string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName) -and [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {
+    throw "Either parameter ConfigStoreName or ConfigStoreEndpoint not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($global:AzureAppConfigRetrievalMethod)) {
+    throw "Required parameter AzFunction.SetAppSettings.FromAzAppConfig.RetrievalMethod not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($ConfigStoreKeyNames) -and [string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {
+    throw "Either AzFunction.SetAppSettings.FromAzAppConfig.KeyNames or AzFunction.SetAppSettings.FromAzAppConfig.Labels not specified"
+}
+
+# Function params validation
+if ([string]::IsNullOrWhiteSpace($FunctionName)) {
+    throw "Required parameter AzureFunction.ConfigureAppSettings.FunctionName not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($ResourceGroup)) {
+    throw "Required parameter AzureFunction.ConfigureAppSettings.ResourceGroup not specified"
+}
+
+$RetrieveAllKeys = $global:AzureAppConfigRetrievalMethod -ieq "all"
+$global:ConfigStoreParameters = ""
+if (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {
+    $global:ConfigStoreParameters += " --name ""$global:AzureAppConfigStoreName"""
+}
+if (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {
+    $global:ConfigStoreParameters += " --endpoint ""$global:AzureAppConfigStoreEndpoint"""
+}
+
+### Helper functions
+function Test-ForAzCLI() {
+    $oldPreference = $ErrorActionPreference
+    $ErrorActionPreference = "Stop"
+    try { 
+        if (Get-Command "az") {
+            return $True
+        }
+    }
+    catch { 
+        return $false
+    }
+    finally { 
+        $ErrorActionPreference = $oldPreference 
+    }
+}
+
+
+function Write-OctopusWarning(
+    [string] $Message
+) {
+    if ($global:TreatWarningsAsErrors) {
+        throw "Error: $Message"
+    }
+    else {
+        if ($global:SuppressWarnings -eq $False) {
+            Write-Warning -Message $Message
+        }
+        else {
+            Write-Verbose -Message $Message
+        }
+    }
+}
+
+function Save-AppSetting(
+    [string]$settingName, 
+    [string]$settingValue) {
+
+    $global:Settings += [PsCustomObject]@{name = $settingName; value = $settingValue; slotSetting = $false }
+}
+
+function Find-AzureAppConfigMatchesFromKey(
+    [string]$KeyName,
+    [bool]$IsWildCard,
+    [string]$settingName,
+    [PsCustomObject]$AppConfigValues) {
+
+    if ($IsWildCard -eq $False) {
+        Write-Verbose "Finding exact match for: $keyName"
+        $matchingAppConfigKeys = $appConfigValues | Where-Object { $_.key -ieq $keyName }
+        if ($null -eq $matchingAppConfigKeys -or $matchingAppConfigKeys.Count -eq 0) {
+            Write-OctopusWarning "Unable to find a matching key in Azure App Config for: $keyName"
+        }
+        else {
+
+            if ($matchingAppConfigKeys.Count -gt 1) {
+                Write-OctopusWarning "Found multiple matching keys ($($matchingAppConfigKeys.Count)) in Azure App Config for: $keyName. This is usually due to multiple values with labels"
+
+                foreach ($matchingAppConfigKey in $matchingAppConfigKeys) {
+                    Write-Verbose "Found match for $keyName $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {"($($matchingAppConfigKey.content_type))"})"
+                    $settingValue = $matchingAppConfigKey.value
+        
+                    if ([string]::IsNullOrWhiteSpace($settingName)) {
+                        $settingName = $keyName.Trim()
+                    }
+                    if (![string]::IsNullOrWhiteSpace($matchingAppConfigKey.label)) {
+                        $settingName = "$($keyName.Trim())-$($matchingAppConfigKey.label)"
+                        Write-Verbose "Appending label to setting name to avoid duplicate setting: $settingName"
+                    }
+        
+                    Save-AppSetting -settingName $settingName -settingValue $settingValue
+                }
+            } 
+            else {
+                $matchingAppConfigKey = $matchingAppConfigKeys | Select-Object -First 1
+                Write-Verbose "Found match for $keyName $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {"($($matchingAppConfigKey.content_type))"})"
+                $settingValue = $matchingAppConfigKey.value
+    
+                if ([string]::IsNullOrWhiteSpace($settingName)) {
+                    $settingName = $keyName.Trim()
+                }
+    
+                Save-AppSetting -settingName $settingName -settingValue $settingValue
+            }
+        }
+    }
+    else {
+        Write-Verbose "Finding wildcard match for: $keyName"
+        $matchingAppConfigKeys = @($appConfigValues | Where-Object { $_.key -ilike $keyName })
+        if ($matchingAppConfigKeys.Count -eq 0) {
+            Write-OctopusWarning "Unable to find any matching keys in Azure App Config for wildcard: $keyName"
+        }
+        else {
+            foreach ($match in $matchingAppConfigKeys) {
+                # Have to explicitly set settings as they are wildcard matches
+                $settingName = $match.key
+                $settingValue = $match.value
+                Write-Verbose "Found wildcard match '$settingName' $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {"($($matchingAppConfigKey.content_type))"})"
+                Save-AppSetting -settingName $settingName -settingValue $settingValue
+            }
+        }
+    }
+}
+
+function Find-AzureAppConfigMatchesFromLabels() {
+    
+    Write-Verbose "Retrieving values matching labels: $global:ConfigStoreLabels"
+    $command = "az appconfig kv list $global:ConfigStoreParameters --label ""$global:ConfigStoreLabels"" --auth-mode login"
+            
+    Write-Verbose "Invoking expression: $command"
+    $appConfigResponse = Invoke-Expression -Command $command
+    $ExitCode = $LastExitCode
+    Write-Verbose "az exit code: $ExitCode"
+    if ($ExitCode -ne 0) {
+        throw "Error retrieving appsettings. ExitCode: $ExitCode"
+    }
+
+    if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {
+        Write-OctopusWarning "Null or empty response received from Azure App Configuration service"
+    }
+    else {
+        $appConfigValues = $appConfigResponse | ConvertFrom-Json
+        if ($appConfigValues.Count -eq 0) {
+            Write-OctopusWarning "Unable to find any matching keys in Azure App Config for labels: $global:ConfigStoreLabels"
+        }
+        else {
+            Write-Verbose "Finding match(es) for labels: $global:ConfigStoreLabels"
+            foreach ($appConfigValue in $appConfigValues) {
+                # Have to explicitly set setting Name here as its a match based on label alone
+                $settingName = $appConfigValue.key
+                Write-Verbose "Found label match '$($appConfigValue.key)' $(if(![string]::IsNullOrWhiteSpace($appConfigValue.content_type)) {"($($appConfigValue.content_type))"})"
+                if (![string]::IsNullOrWhiteSpace($appConfigValue.label)) {
+                    $settingName = "$($settingName)-$($appConfigValue.label)"
+                    Write-Verbose "Appending label to setting to avoid duplicate name: $settingName"
+                }
+                $settingValue = $appConfigValue.value
+                
+                Save-AppSetting -settingName $settingName -settingValue $settingValue
+            }
+        }
+    }
+}
+
+# Check if Az cli is installed.
+$azCliAvailable = Test-ForAzCLI
+if ($azCliAvailable -eq $False) {
+    throw "Cannot find the Azure CLI (az) on the machine. This must be available to continue."	
+}
+
+# Begin KV Retrieval
+$Keys = @()
+$global:Settings = @()
+
+# Extract key names+optional custom setting name
+@(($ConfigStoreKeyNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $keyDefinition = ($_ -Split "\|")
+        $keyName = $keyDefinition[0].Trim()
+        $KeyIsWildcard = $keyName.EndsWith("*")
+        $settingName = $null
+        if ($keyDefinition.Count -gt 1) {
+            if ($KeyIsWildcard) {
+                throw "Key definition: '$_' evaluated as a wildcard with a custom setting name. This is not supported."
+            }
+            $settingName = $keyDefinition[1].Trim()
+        }
+
+        if ([string]::IsNullOrWhiteSpace($keyName)) {
+            throw "Unable to establish key name from: '$_'"
+        }
+
+        $key = [PsCustomObject]@{
+            KeyName       = $keyName
+            KeyIsWildcard = $KeyIsWildcard
+            SettingName   = if (![string]::IsNullOrWhiteSpace($settingName)) { $settingName } else { "" }
+        }
+        $Keys += $key
+    }
+}
+
+$LabelsArray = $global:ConfigStoreLabels -Split "," | Where-Object { [string]::IsNullOrWhiteSpace($_) -eq $False }
+
+Write-Verbose "Azure AppConfig Retrieval Method: $global:AzureAppConfigRetrievalMethod"
+if (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {
+    Write-Verbose "Azure AppConfig Store Name: $global:AzureAppConfigStoreName"
+}
+if (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {
+    Write-Verbose "Azure AppConfig Store Endpoint: $global:AzureAppConfigStoreEndpoint"
+}
+Write-Verbose "Suppress warnings: $global:SuppressWarnings"
+Write-Verbose "Treat warnings as errors: $global:TreatWarningsAsErrors"
+Write-Verbose "Keys to retrieve: $($Keys.Count)"
+Write-Verbose "Labels to retrieve: $($LabelsArray.Count)"
+
+$appConfigResponse = $null
+
+# Retrieving all keys should be more performant, but may have a larger payload response.
+if ($RetrieveAllKeys) {
+    
+    if ($Keys.Count -gt 0) {
+        Write-Host "Retrieving ALL config values from store"
+        $command = "az appconfig kv list $global:ConfigStoreParameters --all --auth-mode login"
+    
+        if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {
+            $command += " --label ""$global:ConfigStoreLabels"" "
+        }
+        Write-Verbose "Invoking expression: $command"
+        $appConfigResponse = Invoke-Expression -Command $command
+        $ExitCode = $LastExitCode
+        Write-Verbose "az exit code: $ExitCode"
+        if ($ExitCode -ne 0) {
+            throw "Error retrieving appsettings. ExitCode: $ExitCode"
+        }
+    
+        if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {
+            Write-OctopusWarning "Null or empty response received from Azure App Configuration service"
+        }
+        else {
+            $appConfigValues = $appConfigResponse | ConvertFrom-Json
+        }
+
+        foreach ($key in $Keys) {
+            $keyName = $key.KeyName
+            $KeyIsWildcard = $key.KeyIsWildcard
+            $SettingName = $key.SettingName
+        
+            Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -SettingName $SettingName -AppConfigValues $appConfigValues
+        }
+    }
+    # Possible that ONLY labels have been provided
+    elseif ($LabelsArray.Count -gt 0) {
+        Find-AzureAppConfigMatchesFromLabels 
+    }
+}
+# Loop through and get keys based on the supplied names
+else {
+    
+    Write-Host "Retrieving keys based on supplied names..."
+    if ($Keys.Count -gt 0) {
+        foreach ($key in $Keys) {
+            $keyName = $key.KeyName
+            $KeyIsWildcard = $key.KeyIsWildcard
+            $settingName = $key.SettingName
+
+            if ([string]::IsNullOrWhiteSpace($settingName)) {
+                $settingName = "$($keyName.Trim())"
+            }
+
+            Write-Verbose "Retrieving values matching key: $keyName from store"
+            $command = "az appconfig kv list $global:ConfigStoreParameters --key ""$keyName"" --auth-mode login"
+            
+            if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {
+                $command += " --label ""$global:ConfigStoreLabels"" "
+            }
+            Write-Verbose "Invoking expression: $command"
+
+            $appConfigResponse = Invoke-Expression -Command $command
+            $ExitCode = $LastExitCode
+            Write-Verbose "az exit code: $ExitCode"
+            if ($ExitCode -ne 0) {
+                throw "Error retrieving appsettings. ExitCode: $ExitCode"
+            }
+
+            if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {
+                Write-OctopusWarning "Null or empty response received from Azure App Configuration service"
+            }
+            else {
+                $appConfigValues = $appConfigResponse | ConvertFrom-Json
+                if ($appConfigValues.Count -eq 0) {
+                    Write-OctopusWarning "Unable to find a matching key in Azure App Config for: $keyName"
+                }
+                else {
+                    Write-Verbose "Finding match(es) for: $keyName"
+                    Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -SettingName $settingName -AppConfigValues $appConfigValues
+                }
+            }
+        }
+    }
+}
+# End KV Retrieval
+
+# Begin AZ Function set
+
+$AdditionalSettings = @()
+#$SlotSettings = @()
+
+# Extract additional settings values
+if (-not [string]::IsNullOrWhiteSpace($AdditionalSettingsValues)) {
+    @(($AdditionalSettingsValues -Split "`n").Trim()) | ForEach-Object {
+        if (![string]::IsNullOrWhiteSpace($_)) {
+            Write-Verbose "Working on: '$_'"
+            if (-not $_.Contains("|")) {
+                throw "Setting '$_' doesnt contain the '|' delimiter. Multi-line values aren't supported."
+            }
+            $settingDefinition = ($_ -Split "\|")
+            $settingName = $settingDefinition[0].Trim()
+            $settingValue = ""
+            if ($settingDefinition.Count -gt 1) {
+                $settingValue = $settingDefinition[1].Trim()
+            }
+            if ([string]::IsNullOrWhiteSpace($settingName)) {
+                throw "Unable to establish additional setting name from: '$_'"
+            }
+            $setting = [PsCustomObject]@{
+                name        = $settingName
+                value       = $settingValue
+                slotSetting = $false
+            }
+            $AdditionalSettings += $setting
+        }
+    }
+}
+
+
+if ($Settings.Count -gt 0 -or $AdditionalSettings.Count -gt 0) {
+    Write-Host "Settings found to publish to App Function: $FunctionName"
+
+    Write-Verbose "Function Name: $FunctionName"
+    Write-Verbose "Resource Group: $ResourceGroup"
+    Write-Verbose "Slot: $Slot"
+    Write-Verbose "Settings: $($Settings.Count)"
+    Write-Verbose "Additional Settings: $($AdditionalSettings.Count)"
+    if ($AdditionalSettings.Count -gt 0) {
+        Write-Verbose "Combining additional settings with settings retrieved from Azure App Config"
+        $Settings = $Settings + $AdditionalSettings
+    }
+
+    $settingsFile = $null
+
+    try {
+
+        $command = "az functionapp config appsettings set --name=""$Functionname"" --resource-group ""$ResourceGroup"" "
+        if (-not([string]::IsNullOrWhiteSpace($Slot))) {
+            $command += " --slot ""$Slot"" "
+        }
+
+        if ($Settings.Count -ge 1) {
+            $settingsFile = [System.IO.Path]::GetRandomFileName()
+            $ConvertToJsonParameters = @{}
+            if ($PSVersionTable.PSVersion.Major -ge 6) {
+                $ConvertToJsonParameters.Add("AsArray", $True)
+            }
+            $Settings | ConvertTo-Json @ConvertToJsonParameters | Set-Content -Path $settingsFile
+            $command += " --settings '@$settingsFile'"
+        }
+
+        Write-Verbose "Invoking expression: $command"
+        Write-Host "##octopus[stderr-progress]"
+        $settingsUpdateResponse = Invoke-Expression -Command $command
+        $ExitCode = $LastExitCode
+        Write-Verbose "FunctionApp update ExitCode: $ExitCode"
+        if ($ExitCode -ne 0) {
+            throw "Error configuring appsettings for function app '$FunctionName'. ExitCode: $ExitCode"
+        }
+        Write-Host "##octopus[stderr-default]"
+        if ($null -ne $settingsUpdateResponse) {
+            Write-Host "Update of function '$FunctionName' was successful"
+            try {
+                $functionSettings = $settingsUpdateResponse | ConvertFrom-Json
+                if ($null -ne $functionSettings) {
+                    $settingsCount = @($functionSettings | Where-Object { $_.slotSetting -eq $False }).Count
+                    $slotSettingsCount = @($functionSettings | Where-Object { $_.slotSetting -eq $True }).Count
+                    Write-Verbose "Function '$FunctionName' has $settingsCount setting(s) and $slotSettingsCount slot setting(s)."
+                }
+            }
+            catch {}
+        }
+        
+    }
+    catch { throw }
+    finally {
+        if (-not([string]::IsNullOrWhiteSpace($settingsFile))) {
+            Write-Verbose "Removing temporary settings file $settingsFile"
+            Remove-Item -Path $settingsFile -Force -ErrorAction Ignore
+        }
+        if (-not([string]::IsNullOrWhiteSpace($slotSettingsFile))) {
+            Write-Verbose "Removing temporary slot settings file $slotSettingsFile"
+            Remove-Item -Path $slotSettingsFile -Force -ErrorAction Ignore
+        }
+    }
+}
+else {
+    Write-Host "No settings found to publish to the Azure App function"
+}
\ No newline at end of file
diff --git a/step-templates/azure-install-windows-tentacle.json b/src/step-templates/azure-install-windows-tentacle/metadata.json
similarity index 55%
rename from step-templates/azure-install-windows-tentacle.json
rename to src/step-templates/azure-install-windows-tentacle/metadata.json
index e5101bd5f..deb87963b 100644
--- a/step-templates/azure-install-windows-tentacle.json
+++ b/src/step-templates/azure-install-windows-tentacle/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{installWinTentacle.AzureAccount}",
-    "Octopus.Action.Script.ScriptBody": "$nsgName = $OctopusParameters[\"installWinTentacle.azNsgName\"]\n$resourceGroup = $OctopusParameters[\"installWinTentacle.azRgName\"]\n$nsgRulePriority = $OctopusParameters[\"installWinTentacle.azNsgRulePriority\"]\n$vmName = $OctopusParameters[\"installWinTentacle.azVmName\"]\n$serverUri = $OctopusParameters[\"instrallTentacle.octoServerUrl\"]\n$apiKey = $OctopusParameters[\"installWinTentacle.octoApiKey\"]\n$rolesRaw = $OctopusParameters[\"installWinTentacle.octopusRoles\"]\n$enviroRaw = $OctopusParameters[\"installWinTentacle.octopusEnvironments\"]\n$octoThumb = $OctopusParameters[\"installWinTentacle.octoServerThumb\"]\n$comStyle = $OctopusParameters[\"installWinTentacle.tentacleType\"]\n$hostname = $OctopusParameters[\"installWinTentacle.tentacleHostName\"]\n$portNumber = $OctopusParameters[\"installWinTentacle.portNumber\"]\n\nWrite-Host \"Parsing Parameters\"\n\nif([string]::IsNullOrEmpty($rolesRaw))\n{\n\tthrow \"At least one role must be defined\"\n}\n\nif([string]::IsNullOrEmpty($enviroRaw))\n{\n\tthrow \"At least one environment must be defined\"\n}\n\n$roles = \"\"\n$rolesRaw -split \"`n\" | ForEach-Object { $roles += \"--role $_ \"}\n$roles = $roles.TrimEnd(' ')\n\n$environments = \"\"\n$enviroRaw -split \"`n\" | ForEach-Object { $environments += \"--environment $_ \"}\n$environments = $environments.TrimEnd(' ')\n\nif($comStyle -eq \"TentaclePassive\")\n{\n\tif([string]::IsNullOrEmpty($hostname))\n    {\n    \t$hostname = az vm show -d -g $resourceGroup -n $vmName --query publicIps -o tsv\n        $hostname = $hostname.Trim(\"`n\")\n    }\n    \n    $noListen = \"--port $portNumber --noListen `\"false`\"\"\n    $comStyle += \" --publicHostName=`\"$hostname`\"\"\n    $openFirewall = 'true'\n}\nelse\n{\n\t$noListen = \"--noListen `\"true`\"\"\n    $openFirewall = 'false'\n}\n\nif($openFirewall -eq 'true')\n{\n\tWrite-Host \"Creating NSG Rule\"\n\taz network nsg rule create --name \"OctopusTentacle\" --nsg-name $nsgName --priority $nsgRulePriority --resource-group $resourceGroup --direction Inbound --destination-port-ranges $portNumber\n}\n\n$remoteScript = @\"\n`$msiLocation = \"`$env:TEMP\\`$(new-guid).msi\"\n\nif(`$env:PROCESSOR_ARCHITECTURE -eq \"x86\") \n{\n    `$downloadPath = \"http://octopus.com/downloads/latest/OctopusTentacle\"\n}\nelse\n{\n    `$downloadPath = \"http://octopus.com/downloads/latest/OctopusTentacle64\"\n}\n\nInvoke-WebRequest -Uri `$downloadPath -OutFile `$msiLocation -UseBasicParsing\n\nStart-Process `$msiLocation /quiet -Wait\n\nRemove-Item `$msiLocation\n\n\"@\n\nWrite-Host \"Installing tentacle on remote machine\"\n\nSet-Content -Value $remoteScript -Path \".\\script.ps1\"\n\n$result = az vm run-command invoke --command-id RunPowerShellScript --name $vmName -g $resourceGroup --scripts \"@script.ps1\"\n\n$result\n\n$msg = (($result | convertfrom-json).value | where {$_.code -eq \"componentstatus/stderr/succeeded\"}).message\n\nif(![string]::IsNullOrEmpty($msg))\n{\n\tthrow $msg\n}\n\nWrite-Verbose \"hostname: $hostname`noListen: $noListen\"\n\n$remoteScript = @\"\n\ncd \"C:\\Program Files\\Octopus Deploy\\Tentacle\"\n\n.\\Tentacle.exe create-instance --instance \"Tentacle\" --config \"C:\\Octopus\\Tentacle.config\" --console\n.\\Tentacle.exe new-certificate --instance \"Tentacle\" --if-blank --console\n.\\Tentacle.exe configure --instance \"Tentacle\" --reset-trust --console\n.\\Tentacle.exe configure --instance \"Tentacle\" --home \"C:\\Octopus\" --app \"C:\\Octopus\\Applications\" $noListen --console\n.\\Tentacle.exe configure --instance \"Tentacle\" --trust \"$octoThumb\" --console\nif('$openFirewall' -eq 'true'){\n\tNew-NetFirewallRule -DisplayName \"Octopus Tentacle\" -Direction Inbound -LocalPort $portNumber -Protocol TCP -Action Allow\n}\n.\\Tentacle.exe register-with --instance \"Tentacle\" --server \"$serverUri\" --apiKey=$apiKey $roles $environments --comms-style $comStyle --force --console\n.\\Tentacle.exe service --instance \"Tentacle\" --install --start --console\n\n\"@\n\nWrite-Host \"Configuring tentacle on remote machine\"\n\nSet-Content -Value $remoteScript -Path \".\\script.ps1\"\n\n$result = az vm run-command invoke --command-id RunPowerShellScript --name $vmName -g $resourceGroup --scripts \"@script.ps1\"\n\n$result\n\n$msg = (($result | convertfrom-json).value | where {$_.code -eq \"componentstatus/stderr/succeeded\"}).message\n\nif(![string]::IsNullOrEmpty($msg))\n{\n\tthrow $msg\n}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -146,10 +146,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2022-02-09T15:56:03.173Z",
+    "ExportedAt": "2022-02-09T15:56:03.1730000Z",
     "OctopusVersion": "2021.3.12155",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "harrisonmeister",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-install-windows-tentacle/scriptbody.ps1 b/src/step-templates/azure-install-windows-tentacle/scriptbody.ps1
new file mode 100644
index 000000000..e91f5eef8
--- /dev/null
+++ b/src/step-templates/azure-install-windows-tentacle/scriptbody.ps1
@@ -0,0 +1,125 @@
+$nsgName = $OctopusParameters["installWinTentacle.azNsgName"]
+$resourceGroup = $OctopusParameters["installWinTentacle.azRgName"]
+$nsgRulePriority = $OctopusParameters["installWinTentacle.azNsgRulePriority"]
+$vmName = $OctopusParameters["installWinTentacle.azVmName"]
+$serverUri = $OctopusParameters["instrallTentacle.octoServerUrl"]
+$apiKey = $OctopusParameters["installWinTentacle.octoApiKey"]
+$rolesRaw = $OctopusParameters["installWinTentacle.octopusRoles"]
+$enviroRaw = $OctopusParameters["installWinTentacle.octopusEnvironments"]
+$octoThumb = $OctopusParameters["installWinTentacle.octoServerThumb"]
+$comStyle = $OctopusParameters["installWinTentacle.tentacleType"]
+$hostname = $OctopusParameters["installWinTentacle.tentacleHostName"]
+$portNumber = $OctopusParameters["installWinTentacle.portNumber"]
+
+Write-Host "Parsing Parameters"
+
+if([string]::IsNullOrEmpty($rolesRaw))
+{
+	throw "At least one role must be defined"
+}
+
+if([string]::IsNullOrEmpty($enviroRaw))
+{
+	throw "At least one environment must be defined"
+}
+
+$roles = ""
+$rolesRaw -split "`n" | ForEach-Object { $roles += "--role $_ "}
+$roles = $roles.TrimEnd(' ')
+
+$environments = ""
+$enviroRaw -split "`n" | ForEach-Object { $environments += "--environment $_ "}
+$environments = $environments.TrimEnd(' ')
+
+if($comStyle -eq "TentaclePassive")
+{
+	if([string]::IsNullOrEmpty($hostname))
+    {
+    	$hostname = az vm show -d -g $resourceGroup -n $vmName --query publicIps -o tsv
+        $hostname = $hostname.Trim("`n")
+    }
+    
+    $noListen = "--port $portNumber --noListen `"false`""
+    $comStyle += " --publicHostName=`"$hostname`""
+    $openFirewall = 'true'
+}
+else
+{
+	$noListen = "--noListen `"true`""
+    $openFirewall = 'false'
+}
+
+if($openFirewall -eq 'true')
+{
+	Write-Host "Creating NSG Rule"
+	az network nsg rule create --name "OctopusTentacle" --nsg-name $nsgName --priority $nsgRulePriority --resource-group $resourceGroup --direction Inbound --destination-port-ranges $portNumber
+}
+
+$remoteScript = @"
+`$msiLocation = "`$env:TEMP\`$(new-guid).msi"
+
+if(`$env:PROCESSOR_ARCHITECTURE -eq "x86") 
+{
+    `$downloadPath = "http://octopus.com/downloads/latest/OctopusTentacle"
+}
+else
+{
+    `$downloadPath = "http://octopus.com/downloads/latest/OctopusTentacle64"
+}
+
+Invoke-WebRequest -Uri `$downloadPath -OutFile `$msiLocation -UseBasicParsing
+
+Start-Process `$msiLocation /quiet -Wait
+
+Remove-Item `$msiLocation
+
+"@
+
+Write-Host "Installing tentacle on remote machine"
+
+Set-Content -Value $remoteScript -Path ".\script.ps1"
+
+$result = az vm run-command invoke --command-id RunPowerShellScript --name $vmName -g $resourceGroup --scripts "@script.ps1"
+
+$result
+
+$msg = (($result | convertfrom-json).value | where {$_.code -eq "componentstatus/stderr/succeeded"}).message
+
+if(![string]::IsNullOrEmpty($msg))
+{
+	throw $msg
+}
+
+Write-Verbose "hostname: $hostname`noListen: $noListen"
+
+$remoteScript = @"
+
+cd "C:\Program Files\Octopus Deploy\Tentacle"
+
+.\Tentacle.exe create-instance --instance "Tentacle" --config "C:\Octopus\Tentacle.config" --console
+.\Tentacle.exe new-certificate --instance "Tentacle" --if-blank --console
+.\Tentacle.exe configure --instance "Tentacle" --reset-trust --console
+.\Tentacle.exe configure --instance "Tentacle" --home "C:\Octopus" --app "C:\Octopus\Applications" $noListen --console
+.\Tentacle.exe configure --instance "Tentacle" --trust "$octoThumb" --console
+if('$openFirewall' -eq 'true'){
+	New-NetFirewallRule -DisplayName "Octopus Tentacle" -Direction Inbound -LocalPort $portNumber -Protocol TCP -Action Allow
+}
+.\Tentacle.exe register-with --instance "Tentacle" --server "$serverUri" --apiKey=$apiKey $roles $environments --comms-style $comStyle --force --console
+.\Tentacle.exe service --instance "Tentacle" --install --start --console
+
+"@
+
+Write-Host "Configuring tentacle on remote machine"
+
+Set-Content -Value $remoteScript -Path ".\script.ps1"
+
+$result = az vm run-command invoke --command-id RunPowerShellScript --name $vmName -g $resourceGroup --scripts "@script.ps1"
+
+$result
+
+$msg = (($result | convertfrom-json).value | where {$_.code -eq "componentstatus/stderr/succeeded"}).message
+
+if(![string]::IsNullOrEmpty($msg))
+{
+	throw $msg
+}
diff --git a/src/step-templates/azure-keyvault-retrieve-secrets/metadata.json b/src/step-templates/azure-keyvault-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..8c5dd0568
--- /dev/null
+++ b/src/step-templates/azure-keyvault-retrieve-secrets/metadata.json
@@ -0,0 +1,86 @@
+{
+  "Id": "6f59f8aa-b2db-4f7a-b02d-a72c13d386f0",
+  "Name": "Azure Key Vault - Retrieve Secrets",
+  "Description": "This step retrieves one or more secrets from an Azure Key Vault and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nYou can retrieve secrets with a specific version, and you can choose a custom output variable name for each secret.\n\n---\n\n**Required:** \n- An azure account with permissions to retrieve secrets from the Azure Key Vault.\n- The`Az.KeyVault` PowerShell module installed on the target or worker. If the module can't be found, the step will fail. *The `Az` module(s) can be installed from the [PowerShell gallery](https://www.powershellgallery.com/packages/Az)*\n\nNotes:\n\n- Tested on Octopus `2021.1`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.\n\n",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{Azure.KeyVault.RetrieveSecrets.Account}"
+  },
+  "Parameters": [
+    {
+      "Id": "5b05337d-a62d-44f4-a702-95b45a400160",
+      "Name": "Azure.KeyVault.RetrieveSecrets.Account",
+      "Label": "Azure Account",
+      "HelpText": "An Azure account with permissions to retrieve secrets from the Azure Key Vault.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "9b09b2b3-3c4d-4cbb-a065-8955f62448ad",
+      "Name": "Azure.KeyVault.RetrieveSecrets.VaultName",
+      "Label": "Vault Name",
+      "HelpText": "The name of the Azure Key Vault to retrieve secrets from.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "43949afd-1049-41fc-bd01-e878476f5952",
+      "Name": "Azure.KeyVault.RetrieveSecrets.VaultSecrets",
+      "Label": "Vault Secrets to retrieve",
+      "HelpText": "Specify the names of the Secrets to be returned from Azure Key Vault, in the format `SecretName SecretVersion | OutputVariableName` where:\n\n- `SecretName` is the name of the Secret to retrieve.\n- `SecretVersion` is the _optional_ version of the Secret to retrieve. *If this value isn't specified, the latest version will be retrieved*.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "46842344-405e-4633-a63f-115baaff7774",
+      "Name": "Azure.KeyVault.RetrieveSecrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "0c20c004-c792-4acc-81c5-62ecceecf6ac",
+      "Name": "Azure.KeyVault.RetrieveSecrets.AzModule.SpecificVersion",
+      "Label": "Az PowerShell Module version (optional)",
+      "HelpText": "If you wish to use a specific version of the `Az` PowerShell module (rather than the default), enter the version number here. e.g. `5.9.0`.\n\n**Note:** The version specified must exist on the machine.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d4d93a9a-72e1-48be-9ed6-78986bbfaa06",
+      "Name": "Azure.KeyVault.RetrieveSecrets.AzModule.CustomInstallLocation",
+      "Label": "Az PowerShell Install Location (optional)",
+      "HelpText": "If you wish to provide a custom path to the `Az` PowerShell module (rather than the default), enter the value here.\n\n**Note:** The Module must exist at the specified location on the machine. This step template will not download the Module.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2021-06-02T08:34:02.5480000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-06-02T08:34:02.5480000Z",
+    "OctopusVersion": "2021.1.7236",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure-keyvault"
+}
diff --git a/src/step-templates/azure-keyvault-retrieve-secrets/scriptbody.ps1 b/src/step-templates/azure-keyvault-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..29bd56bbc
--- /dev/null
+++ b/src/step-templates/azure-keyvault-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,140 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$AzVaultModuleName = "Az.KeyVault"
+$AzureKeyVaultName = $OctopusParameters["Azure.KeyVault.RetrieveSecrets.VaultName"]
+$VaultSecretNames = $OctopusParameters["Azure.KeyVault.RetrieveSecrets.VaultSecrets"]
+$AzVaultModuleSpecificVersion = $OctopusParameters["Azure.KeyVault.RetrieveSecrets.AzModule.SpecificVersion"]
+$AzVaultModuleCustomInstallLocation = $OctopusParameters["Azure.KeyVault.RetrieveSecrets.AzModule.CustomInstallLocation"]
+$PrintVariableNames = $OctopusParameters["Azure.KeyVault.RetrieveSecrets.PrintVariableNames"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($AzureKeyVaultName)) {
+    throw "Required parameter Azure.KeyVault.RetrieveSecrets.VaultName not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VaultSecretNames)) {
+    throw "Required parameter Azure.KeyVault.RetrieveSecrets.VaultSecrets not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($AzVaultModuleSpecificVersion) -eq $False) {
+    $requiredVersion = [Version]$AzVaultModuleSpecificVersion
+}
+
+# Cross-platform bits
+$WindowsPowerShell = $True
+if ($PSEdition -eq "Core") {
+    $WindowsPowerShell = $False
+}
+
+### Helper functions
+function Get-Module-CrossPlatform {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $Name
+    )
+
+    $module = Get-Module -Name $Name -ListAvailable
+    if($WindowsPowerShell -eq $True -and $null -eq $module) {
+        $module = Get-InstalledModule -Name $Name
+    }
+
+    return $module
+}
+
+$PowerShellModuleName = $AzVaultModuleName
+
+# Check for Custom install location specified for AzVaultModule
+if ([string]::IsNullOrWhiteSpace($AzVaultModuleCustomInstallLocation) -eq $false) {
+    if ((Test-Path $AzVaultModuleCustomInstallLocation -IsValid) -eq $false) {
+        throw "The path $AzVaultModuleCustomInstallLocation is not valid, please use a relative or absolute path."
+    }
+    
+    $AzVaultModulesFolder = [System.IO.Path]::GetFullPath($AzVaultModuleCustomInstallLocation)            
+    $LocalModules = (New-Item "$AzVaultModulesFolder" -ItemType Directory -Force).FullName
+    $env:PSModulePath = $LocalModules + [System.IO.Path]::PathSeparator + $env:PSModulePath
+
+    # Check to see if there
+    if ((Test-Path -Path "$LocalModules/$AzVaultModuleName") -eq $true)
+    {
+        # Use specific location
+        $PowerShellModuleName = "$LocalModules/$PowerShellModuleName"
+    }
+}
+
+# Import module
+if([string]::IsNullOrWhiteSpace($AzVaultModuleSpecificVersion)) {
+    Write-Host "Importing module $PowerShellModuleName ..."
+    Import-Module -Name $PowerShellModuleName
+}
+else {
+    Write-Host "Importing module $PowerShellModuleName ($AzVaultModuleSpecificVersion)..."
+    Import-Module -Name $PowerShellModuleName -RequiredVersion $requiredVersion
+}
+
+# Check if Az.Vault Module is installed.
+$azVaultModule = Get-Module-CrossPlatform -Name $AzVaultModuleName	
+if ($null -eq $azVaultModule) {
+    throw "Cannot find the '$AzVaultModuleName' module on the machine. If you think it is installed, try restarting the Tentacle service for it to be detected."	
+}
+
+$Secrets = @()
+$VariablesCreated = 0
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Extract secret names+versions 
+@(($VaultSecretNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $secretDefinition = ($_ -Split "\|")
+        $secretName = $secretDefinition[0].Trim()
+        $secretNameAndVersion = ($secretName -Split " ")
+        $secretVersion = $null
+        if($secretNameAndVersion.Count -gt 1) {
+        	$secretName = $secretNameAndVersion[0].Trim()
+            $secretVersion = $secretNameAndVersion[1].Trim()
+        }
+        if([string]::IsNullOrWhiteSpace($secretName)) {
+            throw "Unable to establish secret name from: '$($_)'"
+        }
+        $secret = [PsCustomObject]@{
+            Name         = $secretName
+            SecretVersion= $secretVersion
+            VariableName = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { "" }
+        }
+        $Secrets += $secret
+    }
+}
+
+Write-Verbose "Vault Name: $AzureKeyVaultName"
+Write-Verbose "Print variables: $PrintVariableNames"
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "Az Version specified: $AzVaultModuleSpecificVersion"
+Write-Verbose "Az Custom Install Dir: $AzVaultModuleCustomInstallLocation"
+
+# Retrieve Secrets
+foreach($secret in $secrets) {
+    $name = $secret.Name
+    $secretVersion = $secret.SecretVersion
+    $variableName = $secret.VariableName
+    if ([string]::IsNullOrWhiteSpace($variableName)) {
+        $variableName = "$($AzureKeyVaultName.Trim()).$($name.Trim())"
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($secretVersion)) {
+    	$azSecretValue = Get-AzKeyVaultSecret -VaultName $AzureKeyVaultName -Name $name -AsPlainText    
+    }
+    else {
+    	$azSecretValue = Get-AzKeyVaultSecret -VaultName $AzureKeyVaultName -Name $name -Version $secretVersion -AsPlainText
+    }
+    
+    Set-OctopusVariable -Name $variableName -Value $azSecretValue -Sensitive
+
+    if($PrintVariableNames -eq $True) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+    }
+    $VariablesCreated += 1
+}
+
+Write-Host "Created $variablesCreated output variables"
\ No newline at end of file
diff --git a/step-templates/azure-linux-install-octopus-tentacle.json b/src/step-templates/azure-linux-install-octopus-tentacle/metadata.json
similarity index 59%
rename from step-templates/azure-linux-install-octopus-tentacle.json
rename to src/step-templates/azure-linux-install-octopus-tentacle/metadata.json
index 4ca02ce71..2d5d36391 100644
--- a/step-templates/azure-linux-install-octopus-tentacle.json
+++ b/src/step-templates/azure-linux-install-octopus-tentacle/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{installLinuxTentacle.AzureAccount}",
-    "Octopus.Action.Script.ScriptBody": "$nsgName = $OctopusParameters[\"installLinuxTentacle.azNsgName\"]\n$resourceGroup = $OctopusParameters[\"installLinuxTentacle.azRgName\"]\n$nsgRulePriority = $OctopusParameters[\"installLinuxTentacle.azNsgRulePriority\"]\n$vmName = $OctopusParameters[\"installLinuxTentacle.azVmName\"]\n$serverUri = $OctopusParameters[\"instrallTentacle.octoServerUrl\"]\n$apiKey = $OctopusParameters[\"installLinuxTentacle.octoApiKey\"]\n$rolesRaw = $OctopusParameters[\"installLinuxTentacle.octopusRoles\"]\n$enviroRaw = $OctopusParameters[\"installLinuxTentacle.octopusEnvironments\"]\n$octoThumb = $OctopusParameters[\"installLinuxTentacle.octoServerThumb\"]\n$comStyle = $OctopusParameters[\"installLinuxTentacle.tentacleType\"]\n$hostname = $OctopusParameters[\"installLinuxTentacle.tentacleHostName\"]\n$portNumber = $OctopusParameters[\"installLinuxTentacle.portNumber\"]\n\nWrite-Host \"Parsing Parameters\"\n\nif([string]::IsNullOrEmpty($rolesRaw))\n{\n\tthrow \"At least one role must be defined\"\n}\n\nif([string]::IsNullOrEmpty($enviroRaw))\n{\n\tthrow \"At least one environment must be defined\"\n}\n\n$roles = \"\"\n$rolesRaw -split \"`n\" | ForEach-Object { $roles += \"--role $_ \"}\n$roles = $roles.TrimEnd(' ')\n\n$environments = \"\"\n$enviroRaw -split \"`n\" | ForEach-Object { $environments += \"--env $_ \"}\n$environments = $environments.TrimEnd(' ')\n\nif($comStyle -eq \"TentaclePassive\")\n{\n\tif([string]::IsNullOrEmpty($hostname))\n    {\n    \t$hostname = az vm show -d -g $resourceGroup -n $vmName --query publicIps -o tsv\n        $hostname = $hostname.Trim(\"`n\")\n    }\n\n    $noListen = \"--port $portNumber --noListen `\"false`\"\"\n    $comStyle += \" --publicHostName=`\"$hostname`\"\"\n    $openFirewall = 'true'\n}\nelse\n{\n\t$noListen = \"--noListen `\"true`\"\"\n    $openFirewall = 'false'\n}\n\nif($openFirewall -eq 'true')\n{\n\tWrite-Host \"Creating NSG Rule\"\n\taz network nsg rule create --name \"OctopusTentacle\" --nsg-name $nsgName --priority $nsgRulePriority --resource-group $resourceGroup --direction Inbound --destination-port-ranges $portNumber\n}\n\nWrite-Verbose \"hostname: $hostname`noListen: $noListen\"\n\n$remoteScript = @\"\n\nprintf '%s\\n' \"Test case x failed\" >&2\nexit 1\n\nconfigFilePath=\"/etc/octopus/default/tentacle-default.config\"\nappPath=\"/home/Octopus/Applications\"\n\n# try curl\n{\n    curl -L https://octopus.com/downloads/latest/Linux_x64TarGz/OctopusTentacle --output /tmp/tentacle-linux_x64.tar.gz -fsS\n} || {\n    wget https://octopus.com/downloads/latest/Linux_x64TarGz/OctopusTentacle -O /tmp/tentacle-linux_x64.tar.gz -fsS\n}\n\nif [ ! -d \"/opt/octopus\" ]; then\n  mkdir /opt/octopus\nfi\n\ntar xvzf /tmp/tentacle-linux_x64.tar.gz -C /opt/octopus\nrm /tmp/tentacle-linux_x64.tar.gz\n\ncd /opt/octopus/tentacle\n\nsudo /opt/octopus/tentacle/Tentacle create-instance --config \"`$configFilePath\"\nsudo chmod a+rwx `$configFilePath\n/opt/octopus/tentacle/Tentacle new-certificate --if-blank\n/opt/octopus/tentacle/Tentacle configure --port $portNumber --noListen False --reset-trust --app \"`$appPath\"\n/opt/octopus/tentacle/Tentacle configure --trust $octoThumb\necho \"Registering the Tentacle $name with server $serverUri in environment $environments with role $roles\"\n/opt/octopus/tentacle/Tentacle register-with --server \"$serverUri\" --apiKey \"$apikey\" --name \"$name\" $environments $roles --comms-style $comStyle --force\nsudo /opt/octopus/tentacle/Tentacle service --install --start\n\n\"@\n\nWrite-Host \"Installing tentacle on remote machine\"\n$scriptGuid = (new-guid).guid\nSet-Content -Value $remoteScript -Path \".\\$scriptGuid.ps1\"\n\n$result = az vm run-command invoke --command-id RunShellScript --name $vmName -g $resourceGroup --scripts \"@script.ps1\"\n\n$result\n\n$msg = ($result | convertfrom-json).value[0].message\n\nif($msg -match \"(?<=\\[stderr\\]).+\")\n{\n\tthrow $msg\n}\n\nremove-item \".\\$scriptGuid.ps1\"\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -146,10 +146,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2022-02-09T15:56:03.173Z",
+    "ExportedAt": "2022-02-09T15:56:03.1730000Z",
     "OctopusVersion": "2021.3.12155",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "harrisonmeister",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-linux-install-octopus-tentacle/scriptbody.ps1 b/src/step-templates/azure-linux-install-octopus-tentacle/scriptbody.ps1
new file mode 100644
index 000000000..ca98397c9
--- /dev/null
+++ b/src/step-templates/azure-linux-install-octopus-tentacle/scriptbody.ps1
@@ -0,0 +1,110 @@
+$nsgName = $OctopusParameters["installLinuxTentacle.azNsgName"]
+$resourceGroup = $OctopusParameters["installLinuxTentacle.azRgName"]
+$nsgRulePriority = $OctopusParameters["installLinuxTentacle.azNsgRulePriority"]
+$vmName = $OctopusParameters["installLinuxTentacle.azVmName"]
+$serverUri = $OctopusParameters["instrallTentacle.octoServerUrl"]
+$apiKey = $OctopusParameters["installLinuxTentacle.octoApiKey"]
+$rolesRaw = $OctopusParameters["installLinuxTentacle.octopusRoles"]
+$enviroRaw = $OctopusParameters["installLinuxTentacle.octopusEnvironments"]
+$octoThumb = $OctopusParameters["installLinuxTentacle.octoServerThumb"]
+$comStyle = $OctopusParameters["installLinuxTentacle.tentacleType"]
+$hostname = $OctopusParameters["installLinuxTentacle.tentacleHostName"]
+$portNumber = $OctopusParameters["installLinuxTentacle.portNumber"]
+
+Write-Host "Parsing Parameters"
+
+if([string]::IsNullOrEmpty($rolesRaw))
+{
+	throw "At least one role must be defined"
+}
+
+if([string]::IsNullOrEmpty($enviroRaw))
+{
+	throw "At least one environment must be defined"
+}
+
+$roles = ""
+$rolesRaw -split "`n" | ForEach-Object { $roles += "--role $_ "}
+$roles = $roles.TrimEnd(' ')
+
+$environments = ""
+$enviroRaw -split "`n" | ForEach-Object { $environments += "--env $_ "}
+$environments = $environments.TrimEnd(' ')
+
+if($comStyle -eq "TentaclePassive")
+{
+	if([string]::IsNullOrEmpty($hostname))
+    {
+    	$hostname = az vm show -d -g $resourceGroup -n $vmName --query publicIps -o tsv
+        $hostname = $hostname.Trim("`n")
+    }
+
+    $noListen = "--port $portNumber --noListen `"false`""
+    $comStyle += " --publicHostName=`"$hostname`""
+    $openFirewall = 'true'
+}
+else
+{
+	$noListen = "--noListen `"true`""
+    $openFirewall = 'false'
+}
+
+if($openFirewall -eq 'true')
+{
+	Write-Host "Creating NSG Rule"
+	az network nsg rule create --name "OctopusTentacle" --nsg-name $nsgName --priority $nsgRulePriority --resource-group $resourceGroup --direction Inbound --destination-port-ranges $portNumber
+}
+
+Write-Verbose "hostname: $hostname`noListen: $noListen"
+
+$remoteScript = @"
+
+printf '%s\n' "Test case x failed" >&2
+exit 1
+
+configFilePath="/etc/octopus/default/tentacle-default.config"
+appPath="/home/Octopus/Applications"
+
+# try curl
+{
+    curl -L https://octopus.com/downloads/latest/Linux_x64TarGz/OctopusTentacle --output /tmp/tentacle-linux_x64.tar.gz -fsS
+} || {
+    wget https://octopus.com/downloads/latest/Linux_x64TarGz/OctopusTentacle -O /tmp/tentacle-linux_x64.tar.gz -fsS
+}
+
+if [ ! -d "/opt/octopus" ]; then
+  mkdir /opt/octopus
+fi
+
+tar xvzf /tmp/tentacle-linux_x64.tar.gz -C /opt/octopus
+rm /tmp/tentacle-linux_x64.tar.gz
+
+cd /opt/octopus/tentacle
+
+sudo /opt/octopus/tentacle/Tentacle create-instance --config "`$configFilePath"
+sudo chmod a+rwx `$configFilePath
+/opt/octopus/tentacle/Tentacle new-certificate --if-blank
+/opt/octopus/tentacle/Tentacle configure --port $portNumber --noListen False --reset-trust --app "`$appPath"
+/opt/octopus/tentacle/Tentacle configure --trust $octoThumb
+echo "Registering the Tentacle $name with server $serverUri in environment $environments with role $roles"
+/opt/octopus/tentacle/Tentacle register-with --server "$serverUri" --apiKey "$apikey" --name "$name" $environments $roles --comms-style $comStyle --force
+sudo /opt/octopus/tentacle/Tentacle service --install --start
+
+"@
+
+Write-Host "Installing tentacle on remote machine"
+$scriptGuid = (new-guid).guid
+Set-Content -Value $remoteScript -Path ".\$scriptGuid.ps1"
+
+$result = az vm run-command invoke --command-id RunShellScript --name $vmName -g $resourceGroup --scripts "@script.ps1"
+
+$result
+
+$msg = ($result | convertfrom-json).value[0].message
+
+if($msg -match "(?<=\[stderr\]).+")
+{
+	throw $msg
+}
+
+remove-item ".\$scriptGuid.ps1"
diff --git a/step-templates/azure-load-appsettings-from-file.json b/src/step-templates/azure-load-appsettings-from-file/metadata.json
similarity index 53%
rename from step-templates/azure-load-appsettings-from-file.json
rename to src/step-templates/azure-load-appsettings-from-file/metadata.json
index fade6ac58..0adb7e2dc 100644
--- a/step-templates/azure-load-appsettings-from-file.json
+++ b/src/step-templates/azure-load-appsettings-from-file/metadata.json
@@ -28,7 +28,7 @@
     "Octopus.Action.Package.FeedId": "feeds-builtin",
     "Octopus.Action.Package.DownloadOnTentacle": "False",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Get-Parameter($Name, $Required, $Default, [switch]$FailOnValidate) {\n    $result = $null\n    $errMessage = [string]::Empty\n\n    If ($null -ne $OctopusParameters) {\n        $result = $OctopusParameters[$Name]\n        Write-Host (\"Octopus parameter value for \" + $Name + \": \" + $result)\n    }\n\n    If ($null -eq $result) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($null -ne $variable) {\n            $result = $variable.Value\n        }\n    }\n\n    If ($null -eq $result) {\n        If ($Required) {\n            $errMessage = \"Mandatory parameter '$Name' not specified\"\n        }\n        Else {\n            $result = $Default\n        }\n    } \n\n    If (-Not [string]::IsNullOrEmpty($errMessage)) {\n        If ($FailOnValidate) {\n            Throw $errMessage\n        }\n        Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    return $result\n}\n\nFunction Main(\n    [Parameter(Mandatory = $true)][string] $azureResourceGroupName,\n    [Parameter(Mandatory = $true)][string] $azureWebAppName,\n    [Parameter(Mandatory = $true)][string] $azureSettingsFilePath,\n    [Parameter(Mandatory = $false)][string] $azureDeploySlotName = $null\n) {\n    Write-Host \"Start AzureLoadAppSettingsFromFile\"\n\n    If ((Test-Path $azureSettingsFilePath) -ne $true) {\n        Write-Warning \"Settings file '$azureSettingsFilePath' not found!\"\n        Exit 0\n    }\n\n    $settingsJson = Get-Content -Raw -Path $azureSettingsFilePath | ConvertFrom-Json\n\n    If (($settingsJson -eq $null) -or ($settingsJson.Values -eq $null)) {\n        Write-Warning \"Settings file '$azureSettingsFilePath' doesn't contain Values object. Unable to load app settings!\"\n        Exit 0\n    }\n\n    # Parse app settings into a hashtable object\n\n    $settingsValues = $settingsJson.Values\n\n    $appSettings = @{}\n    $settingsValues.psobject.properties | Foreach { $appSettings[$_.Name] = $_.Value }\n\n    # Set app settings for either slot or a webapp\n\n    If ([string]::IsNullOrEmpty($azureDeploySlotName)) {\n        Set-AzureRmWebApp -Name $azureWebAppName -ResourceGroupName $azureResourceGroupName -AppSettings $appSettings\n    } Else {\n        Set-AzureRmWebAppSlot -Name $azureWebAppName -ResourceGroupName $azureResourceGroupName -AppSettings $appSettings -Slot $azureDeploySlotName\n    }\n\n    Write-Host \"End AzureLoadAppSettingsFromFile\"\n}\n\n& Main `\n    -azureResourceGroupName (Get-Parameter \"Parameters.ResourceGroup.Name\" $true \"\" $true) `\n    -azureWebAppName (Get-Parameter \"Parameters.WebApp.Name\" $true \"\" $true) `\n    -azureSettingsFilePath (Get-Parameter \"Parameters.SettingsFile.Path\" $true \"\" $true) `\n    -azureDeploySlotName (Get-Parameter \"Parameters.DeploySlot.Name\" $false \"\" $true)"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -84,9 +84,9 @@
   ],
   "LastModifiedBy": "sarbis",
   "$Meta": {
-    "ExportedAt": "2019-01-22T09:58:08.811Z",
+    "ExportedAt": "2019-01-22T09:58:08.8110000Z",
     "OctopusVersion": "2018.10.0",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-load-appsettings-from-file/scriptbody.ps1 b/src/step-templates/azure-load-appsettings-from-file/scriptbody.ps1
new file mode 100644
index 000000000..040bebfd8
--- /dev/null
+++ b/src/step-templates/azure-load-appsettings-from-file/scriptbody.ps1
@@ -0,0 +1,80 @@
+Function Get-Parameter($Name, $Required, $Default, [switch]$FailOnValidate) {
+    $result = $null
+    $errMessage = [string]::Empty
+
+    If ($null -ne $OctopusParameters) {
+        $result = $OctopusParameters[$Name]
+        Write-Host ("Octopus parameter value for " + $Name + ": " + $result)
+    }
+
+    If ($null -eq $result) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($null -ne $variable) {
+            $result = $variable.Value
+        }
+    }
+
+    If ($null -eq $result) {
+        If ($Required) {
+            $errMessage = "Mandatory parameter '$Name' not specified"
+        }
+        Else {
+            $result = $Default
+        }
+    } 
+
+    If (-Not [string]::IsNullOrEmpty($errMessage)) {
+        If ($FailOnValidate) {
+            Throw $errMessage
+        }
+        Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    return $result
+}
+
+Function Main(
+    [Parameter(Mandatory = $true)][string] $azureResourceGroupName,
+    [Parameter(Mandatory = $true)][string] $azureWebAppName,
+    [Parameter(Mandatory = $true)][string] $azureSettingsFilePath,
+    [Parameter(Mandatory = $false)][string] $azureDeploySlotName = $null
+) {
+    Write-Host "Start AzureLoadAppSettingsFromFile"
+
+    If ((Test-Path $azureSettingsFilePath) -ne $true) {
+        Write-Warning "Settings file '$azureSettingsFilePath' not found!"
+        Exit 0
+    }
+
+    $settingsJson = Get-Content -Raw -Path $azureSettingsFilePath | ConvertFrom-Json
+
+    If (($settingsJson -eq $null) -or ($settingsJson.Values -eq $null)) {
+        Write-Warning "Settings file '$azureSettingsFilePath' doesn't contain Values object. Unable to load app settings!"
+        Exit 0
+    }
+
+    # Parse app settings into a hashtable object
+
+    $settingsValues = $settingsJson.Values
+
+    $appSettings = @{}
+    $settingsValues.psobject.properties | Foreach { $appSettings[$_.Name] = $_.Value }
+
+    # Set app settings for either slot or a webapp
+
+    If ([string]::IsNullOrEmpty($azureDeploySlotName)) {
+        Set-AzureRmWebApp -Name $azureWebAppName -ResourceGroupName $azureResourceGroupName -AppSettings $appSettings
+    } Else {
+        Set-AzureRmWebAppSlot -Name $azureWebAppName -ResourceGroupName $azureResourceGroupName -AppSettings $appSettings -Slot $azureDeploySlotName
+    }
+
+    Write-Host "End AzureLoadAppSettingsFromFile"
+}
+
+& Main `
+    -azureResourceGroupName (Get-Parameter "Parameters.ResourceGroup.Name" $true "" $true) `
+    -azureWebAppName (Get-Parameter "Parameters.WebApp.Name" $true "" $true) `
+    -azureSettingsFilePath (Get-Parameter "Parameters.SettingsFile.Path" $true "" $true) `
+    -azureDeploySlotName (Get-Parameter "Parameters.DeploySlot.Name" $false "" $true)
\ No newline at end of file
diff --git a/step-templates/azure-manage-webjob.json b/src/step-templates/azure-manage-webjob/metadata.json
similarity index 83%
rename from step-templates/azure-manage-webjob.json
rename to src/step-templates/azure-manage-webjob/metadata.json
index bef38f781..3d5bbe479 100644
--- a/step-templates/azure-manage-webjob.json
+++ b/src/step-templates/azure-manage-webjob/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{Octopus.Action.Azure.AccountId}",
-    "Octopus.Action.Script.ScriptBody": "$httpAction = 'POST'\n\nif ($WebJobAction -eq 'delete') {\n    $httpAction = 'DELETE'\n}\n\n$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $WebJobUserName,$WebJobPassword)))\n$apiUrl = \"https://$WebJobWebApp.scm.azurewebsites.net/api/$WebJobType/$WebJobName/$WebJobAction\"\nInvoke-RestMethod -Uri $apiUrl -Headers @{Authorization=(\"Basic {0}\" -f $base64AuthInfo)} -Method $httpAction -ContentType \"Application/Json\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "OctopusUseBundledTooling": "False"
   },
   "Parameters": [
@@ -79,7 +79,7 @@
   ],
   "StepPackageId": "Octopus.AzurePowerShell",
   "$Meta": {
-    "ExportedAt": "2024-06-24T10:30:22.248Z",
+    "ExportedAt": "2024-06-24T10:30:22.2480000Z",
     "OctopusVersion": "2023.3.13118",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/azure-manage-webjob/scriptbody.ps1 b/src/step-templates/azure-manage-webjob/scriptbody.ps1
new file mode 100644
index 000000000..ae80b6889
--- /dev/null
+++ b/src/step-templates/azure-manage-webjob/scriptbody.ps1
@@ -0,0 +1,9 @@
+$httpAction = 'POST'
+
+if ($WebJobAction -eq 'delete') {
+    $httpAction = 'DELETE'
+}
+
+$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $WebJobUserName,$WebJobPassword)))
+$apiUrl = "https://$WebJobWebApp.scm.azurewebsites.net/api/$WebJobType/$WebJobName/$WebJobAction"
+Invoke-RestMethod -Uri $apiUrl -Headers @{Authorization=("Basic {0}" -f $base64AuthInfo)} -Method $httpAction -ContentType "Application/Json"
\ No newline at end of file
diff --git a/step-templates/azure-powershell-version-update.json b/src/step-templates/azure-powershell-version-update/metadata.json
similarity index 80%
rename from step-templates/azure-powershell-version-update.json
rename to src/step-templates/azure-powershell-version-update/metadata.json
index 01b901f23..4c530292c 100644
--- a/step-templates/azure-powershell-version-update.json
+++ b/src/step-templates/azure-powershell-version-update/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "Get-ChildItem -Path \"C:\\Program Files\\WindowsPowerShell\\Modules\\\" -Filter Azure* -Recurse -Force | Remove-Item -Force -Recurse -Verbose\n\nInstall-Module -Name $ModuleName -RequiredVersion $AzurePSModuleVersion -Force -Verbose",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -35,10 +35,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2016-10-20T04:20:39.295+00:00",
+  "LastModifiedOn": "2016-10-19T21:20:39.2950000-07:00",
   "LastModifiedBy": "mani0070",
   "$Meta": {
-    "ExportedAt": "2016-10-20T04:20:39.295+00:00",
+    "ExportedAt": "2016-10-19T21:20:39.2950000-07:00",
     "OctopusVersion": "3.4.12",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/azure-powershell-version-update/scriptbody.ps1 b/src/step-templates/azure-powershell-version-update/scriptbody.ps1
new file mode 100644
index 000000000..43a18db43
--- /dev/null
+++ b/src/step-templates/azure-powershell-version-update/scriptbody.ps1
@@ -0,0 +1,3 @@
+Get-ChildItem -Path "C:\Program Files\WindowsPowerShell\Modules\" -Filter Azure* -Recurse -Force | Remove-Item -Force -Recurse -Verbose
+
+Install-Module -Name $ModuleName -RequiredVersion $AzurePSModuleVersion -Force -Verbose
\ No newline at end of file
diff --git a/src/step-templates/azure-remove-resource-group-deployments/metadata.json b/src/step-templates/azure-remove-resource-group-deployments/metadata.json
new file mode 100644
index 000000000..eb4c0612b
--- /dev/null
+++ b/src/step-templates/azure-remove-resource-group-deployments/metadata.json
@@ -0,0 +1,66 @@
+{
+  "Id": "7351a3e7-df59-4e0c-863a-dca6f33ad2e1",
+  "Name": "Azure - Remove Resource Group Deployments",
+  "Description": "There is a cap in Azure that prevents having more than 800 deployments in the history at any given time: link to microsoft docs\n\nThis script helps alleviate this issue by limiting how many deployments are allowed exist, keeps the latest specified number of deployments, and will remove the rest.\n\nWhat it does: Logs into Azure, selects the resource group of the app. Based on how many deployments it wants to keep, it will keep the latest X deployments and remove the rest. If there are less deployments than X to keep, the script will skip.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Azure.AccountId": "#{AzureSubscriptionAccount}",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "30a798bd-db11-44d3-82bd-28c3b13e77a5",
+      "Name": "AzureSubscriptionAccount",
+      "Label": "Azure Subscription Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "27c68d1f-7fdc-4e10-aa4a-77a0ff55eb29",
+      "Name": "Azure.RemoveResourceGroupDeployments.ResourceGroupName",
+      "Label": "Resource Group Name",
+      "HelpText": "Enter the name of the resource group.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2adcf1a9-d319-4ed3-80e7-4c533ddbe5cd",
+      "Name": "Azure.RemoveResourceGroupDeployments.NumberOfDeploymentsToKeep",
+      "Label": "Number Of Deployments To Keep",
+      "HelpText": "Number Of Deployments To Keep. Defaults to empty and will not be used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c5ce930b-ea04-42b8-8ade-d167a26dab2a",
+      "Name": "Azure.RemoveResourceGroupDeployments.NumberOfDaysToKeep",
+      "Label": "Number Of Days To Keep.",
+      "HelpText": "Number Of Days To Keep. Defaults to empty and will not be used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "Category": "Azure",
+  "SpaceId": "Spaces-1",
+  "LastModifiedBy": "bmdixon",
+  "$Meta": {
+    "ExportedAt": "2019-04-25T13:33:59.8560000Z",
+    "OctopusVersion": "2019.4.2",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/azure-remove-resource-group-deployments/scriptbody.ps1 b/src/step-templates/azure-remove-resource-group-deployments/scriptbody.ps1
new file mode 100644
index 000000000..0da01c3b4
--- /dev/null
+++ b/src/step-templates/azure-remove-resource-group-deployments/scriptbody.ps1
@@ -0,0 +1,95 @@
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($null -ne $OctopusParameters) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($null -eq $result) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($null -ne $variable) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($null -eq $result) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        }
+        else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+Function Get-Deployments {
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$resourceGroupName
+    )
+    $listOfDeployments = Get-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName
+    $azureDeploymentNameAndDate = @()
+    $listOfDeployments | ForEach-Object { $azureDeploymentNameAndDate += [PSCustomObject]@{DeploymentName = $_.DeploymentName; Time = $_.Timestamp } }
+
+    return $azureDeploymentNameAndDate
+}
+
+Function Remove-AzureRmResourceDeployments {
+
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$resourceGroupName,
+
+        [ValidateRange(0, 800)]
+        [int]$numberOfDeploymentsToKeep,
+
+        [int]$numberOfDaysToKeep
+    )
+
+    if ($null -ne $($numberOfDaysToKeep) -and $($numberOfDaysToKeep) -gt 0) {
+        $azureDeploymentNameAndDate = Get-Deployments $resourceGroupName
+
+        Write-Output "Found $($azureDeploymentNameAndDate.Count) deployments from the $resourceGroupName resource group"
+
+        $itemsToRemove = $azureDeploymentNameAndDate | Where-Object { $_.Time -lt ((get-date).AddDays( - $($numberOfDaysToKeep))) }
+        $numberOfItemsToRemove = $itemsToRemove | Measure-Object
+
+        if ($numberOfitemsToRemove.Count -eq 0) {
+            Write-Output "There are no deployments older than $($numberOfDaysToKeep) days old in $($resourceGroupName)... skipping"
+        }
+        else {
+            Write-Output "Deleting $($numberOfitemsToRemove.Count) deployment(s) from $($resourceGroupName) as they are more than $($numberOfDaysToKeep) days old."
+            $itemsToRemove | ForEach-Object { Write-Output "Deleting $($_.DeploymentName)"; Remove-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName -name $_.DeploymentName }
+        }
+    }
+
+    if ($null -ne $($numberOfDeploymentsToKeep) -and $($numberOfDeploymentsToKeep) -gt 0) {
+        $azureDeploymentNameAndDate = Get-Deployments $resourceGroupName
+
+        Write-Output "Found $($azureDeploymentNameAndDate.Count) deployments from the $resourceGroupName resource group"
+
+        $itemsToRemove = $azureDeploymentNameAndDate | Sort-Object Time -Descending | select-object -skip $numberOfDeploymentsToKeep
+        $numberOfItemsToRemove = $itemsToRemove | Measure-Object
+
+        if ($numberOfitemsToRemove.Count -eq 0) {
+            Write-Output "Max number of deployments set to keep is $numberOfDeploymentsToKeep... skipping"
+        }
+        else {
+            Write-Output "Maximum number of deployments exceeded. Deleting $($numberOfitemsToRemove.Count) deployment(s) from $($resourceGroupName)"
+            $itemsToRemove | ForEach-Object { Write-Output "Deleting $($_.DeploymentName)"; Remove-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName -name $_.DeploymentName }
+        }
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+
+$resourceGroupName = Get-Param 'Azure.RemoveResourceGroupDeployments.ResourceGroupName' -Required
+$numberOfDeploymentsToKeep = Get-Param 'Azure.RemoveResourceGroupDeployments.NumberOfDeploymentsToKeep' -Default 0
+$numberOfDaysToKeep = Get-Param 'Azure.RemoveResourceGroupDeployments.NumberOfDaysToKeep' -Default 0
+
+Remove-AzureRmResourceDeployments -resourceGroupName $resourceGroupName -numberOfDeploymentsToKeep $numberOfDeploymentsToKeep -numberOfDaysToKeep $numberOfDaysToKeep -Verbose
diff --git a/src/step-templates/azure-switch-staging-deployment-slot/metadata.json b/src/step-templates/azure-switch-staging-deployment-slot/metadata.json
new file mode 100644
index 000000000..ddb1402f6
--- /dev/null
+++ b/src/step-templates/azure-switch-staging-deployment-slot/metadata.json
@@ -0,0 +1,92 @@
+{
+  "Id": "7c39a530-6d16-4294-8ff5-74663ea13131",
+  "Name": "Switch Azure Staging Deployment Slot",
+  "Description": "This template will warm up your deployment slot then swap it with production. This step template should be placed after \"\"Deploy an Azure Web App\" Octopus Deploy template and be used with its sister step \"Create Azure RM Deployment Slot\"\n\nThis should be used for green-blue deployments, as referenced in this document: https://octopus.com/docs/deploying-applications/deploying-to-azure/deploying-a-package-to-an-azure-web-app/using-deployment-slots-with-azure-web-apps",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Azure.AccountId": "#{AzureAccount}",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "4eb022c3-2d12-4f5b-acb0-80eaec2ce26c",
+      "Name": "ResourceGroupName",
+      "Label": "ResourceGroupName",
+      "HelpText": "Enter the name of the resource group you are deploying this Web App into",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e44dbd73-6c0a-4c9f-b190-47396ea2534e",
+      "Name": "AppName",
+      "Label": "AppName",
+      "HelpText": "Enter the name of your app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c66cc42c-88e6-4008-8289-a45913dc36df",
+      "Name": "AzureAccount",
+      "Label": "AzureAccount",
+      "HelpText": "Enter the SPN used to connect to Azure",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e9559ca6-751a-4939-888a-cbf76ce5c91d",
+      "Name": "SlotName",
+      "Label": "SlotName",
+      "HelpText": "Enter the name you wish to call your deployment slot",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ed1fd1cf-479a-4aa6-beb5-404565a51ca7",
+      "Name": "SmokeTestResponseCode",
+      "Label": "SmokeTestResponseCode(Optional)",
+      "HelpText": "This is the response code that comes back from your web app. The default value is set to 200, if your app will respond with a different status code such as a 401 then please update the value.",
+      "DefaultValue": "200",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c906639e-f40d-4ab0-903c-d46462d8a8ae",
+      "Name": "smokeTestTimeoutSecs",
+      "Label": "smokeTestTimeoutSecs(Optional)",
+      "HelpText": "The timeout setting for waking up your web app. The default value is 180 seconds.",
+      "DefaultValue": "180",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2018-03-14T09:21:25.0000000-07:00",
+  "LastModifiedBy": "MarkDordoy",
+  "$Meta": {
+    "ExportedAt": "2018-03-14T16:21:25.2140000Z",
+    "OctopusVersion": "3.16.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-switch-staging-deployment-slot/scriptbody.ps1 b/src/step-templates/azure-switch-staging-deployment-slot/scriptbody.ps1
new file mode 100644
index 000000000..10db3f35d
--- /dev/null
+++ b/src/step-templates/azure-switch-staging-deployment-slot/scriptbody.ps1
@@ -0,0 +1,101 @@
+###############################################
+# Switch Azure RM Staging Deployment Slot
+###############################################
+###############################################
+##Step1: Get Variables
+$ResourceGroupName             = $OctopusParameters["ResourceGroupName"] 
+$AppName                       = $OctopusParameters["AppName"] 
+$StagingSlotName               = $OctopusParameters["SlotName"]
+$SmokeTestResponseCode         = $OctopusParameters["SmokeTestResponseCode"]
+$smokeTestTimeoutSecs          = $OctopusParameters["smokeTestTimeoutSecs"]
+###############################################
+###############################################
+$ErrorActionPreference = "Stop"
+
+Function Invoke-RequiredVariablesCheck
+{
+    if([string]::IsNullOrEmpty($ResourceGroupName))
+    {
+        Write-Error "ResourceGroupName variable is not set"
+    }
+
+    if([string]::IsNullOrEmpty($AppName))
+    {
+        write-error "AppName variable is not set"
+    }
+
+    if([string]::IsNullOrEmpty($stagingSlotName))
+    {
+        write-error "stagingSlotName variable is not set"
+    }
+
+    if([string]::IsNullOrEmpty($smokeTestTimeoutSecs))
+    {
+        Write-Output "Smoke test timeout not set, will use default of 180 seconds"
+        $smokeTestTimeoutSecs = 180
+    }
+
+    if([string]::IsNullOrEmpty($SmokeTestResponseCode))
+    {
+        Write-Output "Smoke test respose code not specfied will detail to 200"
+        $SmokeTestResponseCode = "200"
+    }
+
+    Write-Verbose "Variables in use are:"
+    write-verbose "ResourceGroupName:$ResourceGroupName"
+    write-verbose "AppName:$AppName"
+    write-verbose "stagingSlotName:$stagingSlotName"
+    Write-Verbose "smokeTestTimeoutSecs: $smokeTestTimeoutSecs"
+    Write-Verbose "SmokeTestResponseCode: $SmokeTestResponseCode"
+}
+
+Function Invoke-SlotWarmup
+{
+    [cmdletbinding()]
+    param
+    (
+        [parameter(Mandatory=$true)]
+        [string]$httpEndpoint,
+        [parameter(Mandatory=$true)]
+        [int32]$timeout
+    )
+    try 
+    {
+        $response = (Invoke-WebRequest -UseBasicParsing -Uri $httpEndpoint -TimeoutSec $timeout).statusCode
+    }
+    catch 
+    {
+        $response = $_.Exception.Response.StatusCode.Value__
+    }
+    return $response
+}
+
+try 
+{
+    Invoke-RequiredVariablesCheck
+    Write-Output "Will attempt to warm up staging slot"
+    $slotDetails = Get-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $StagingSlotName
+    
+    $hostname = $slotDetails.EnabledHostNames | select-object -First 1
+
+    Write-Output "Performing default smoke test to warm up deployment slot"
+    
+    $returnStatusCode = Invoke-SlotWarmup -httpEndpoint "https://$hostname" -timeout $smokeTestTimeoutSecs
+
+    if($returnStatusCode -ne $SmokeTestResponseCode)
+    {
+        Write-Error "Response code to https://$hostname was $returnStatusCode and did not match the expected response code of $SmokeTestResponseCode. Deployment canceled"
+    }
+    else 
+    {
+        Write-Output "Staging slot (https://$hostname) warmed up and responding ok"
+    }
+
+    Write-Output "Will now switch staging slot to production"
+    Switch-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -SourceSlotName $StagingSlotName -DestinationSlotName "Production"
+    Write-Output "Deployment slot switch complete"
+}
+catch 
+{
+    Write-Error "Error in Switch Azure RM Staging Deployment Slot Script. $_"    
+}
\ No newline at end of file
diff --git a/step-templates/azure-sync-instancecount-from-prod-to-staging.json b/src/step-templates/azure-sync-instancecount-from-prod-to-staging/metadata.json
similarity index 59%
rename from step-templates/azure-sync-instancecount-from-prod-to-staging.json
rename to src/step-templates/azure-sync-instancecount-from-prod-to-staging/metadata.json
index 21e5adbbc..44ebb8a46 100644
--- a/step-templates/azure-sync-instancecount-from-prod-to-staging.json
+++ b/src/step-templates/azure-sync-instancecount-from-prod-to-staging/metadata.json
@@ -6,7 +6,7 @@
   "Version": 7,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Current Cloud Service name \r\n$ServiceName =$octopusparameters[\"Octopus.Action.Azure.CloudServiceName\"]\r\n\r\n$deployment = Get-AzureDeployment -slot $sourceslot -serviceName $serviceName\r\n# Obtain the instance count and role name.\r\n$SourceInstanceCount =$deployment.RolesConfiguration.values.InstanceCount\r\n$rolenameService = $deployment.RolesConfiguration.values.Name\r\n#Set the Current deployment slot instance count to match production count\r\nSet-AzureRole -ServiceName $serviceName -Slot $octopusparameters[\"Octopus.Action.Azure.Slot\"] -RoleName $rolenameService -Count $SourceInstanceCount "
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-06-18T13:44:19.041+00:00",
+  "LastModifiedOn": "2015-06-18T06:44:19.0410000-07:00",
   "LastModifiedBy": "mani0070",
   "$Meta": {
-    "ExportedAt": "2015-06-18T13:48:39.548+00:00",
+    "ExportedAt": "2015-06-18T06:48:39.5480000-07:00",
     "OctopusVersion": "3.0.0.1614",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-sync-instancecount-from-prod-to-staging/scriptbody.ps1 b/src/step-templates/azure-sync-instancecount-from-prod-to-staging/scriptbody.ps1
new file mode 100644
index 000000000..f794f47c3
--- /dev/null
+++ b/src/step-templates/azure-sync-instancecount-from-prod-to-staging/scriptbody.ps1
@@ -0,0 +1,9 @@
+# Current Cloud Service name 
+$ServiceName =$octopusparameters["Octopus.Action.Azure.CloudServiceName"]
+
+$deployment = Get-AzureDeployment -slot $sourceslot -serviceName $serviceName
+# Obtain the instance count and role name.
+$SourceInstanceCount =$deployment.RolesConfiguration.values.InstanceCount
+$rolenameService = $deployment.RolesConfiguration.values.Name
+#Set the Current deployment slot instance count to match production count
+Set-AzureRole -ServiceName $serviceName -Slot $octopusparameters["Octopus.Action.Azure.Slot"] -RoleName $rolenameService -Count $SourceInstanceCount 
\ No newline at end of file
diff --git a/step-templates/azure-upload-files.json b/src/step-templates/azure-upload-files/metadata.json
similarity index 62%
rename from step-templates/azure-upload-files.json
rename to src/step-templates/azure-upload-files/metadata.json
index 90c55055f..79b72e11e 100644
--- a/step-templates/azure-upload-files.json
+++ b/src/step-templates/azure-upload-files/metadata.json
@@ -6,7 +6,7 @@
   "Version": 8,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#Sets the Permissions to public if the selection is true\nif ([boolean]::Parse($doRecurse)) \n{\n    \n\t$recurse = \"-Recurse\"\n\n}\n\nif ([boolean]::Parse($doForce)) \n{\n    \n\t$force = \"-Force\"\n\n}\n\n#--------------------------------------------------------------------\n#Checking to see if Azure is installed on the computer\n$name = 'Azure'\n\nWrite-Output \"Checking if Azure Powershell is installed\"\n\nif(Get-Module -ListAvailable | Where-Object {$_.name -eq $name})\n{\n\t(Get-Module -ListAvailable | Where-Object{ $_.Name -eq $name}) |\n\tSelect Version, Name, Author, PowerShellVersion | Format-List;\n\tWrite-Output \"Azure Powershell is installed\"\n}\nelse\n{\n\t#Provides the link to install Azure Powershell, if it is not installed\n\tWrite-Warning \"Please install Azure Powershell. To install Azure Powershell go to http://bit.ly/AzurePowershellDownload\"\n\tExit 1\n}\n\n\n\n#--------------------------------------------------------------------\n\n#Initialises the Azure Credentials based on the Storage Account Name and the Storage Account Key, \n#so that we can invoke the APIs further down. \n$storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey\n\n#--------------------------------------------------------------------\n\nGet-ChildItem -Path $localFolder -File $recurse | Set-AzureStorageBlobContent -Container $containerName -Blob $blobName -Context $storageContext $force\n\nWrite-Output \"All files in $localFolder uploaded to $containerName!\"\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
     "Octopus.Action.Script.ScriptFileName": null,
@@ -77,9 +77,9 @@
   ],
   "LastModifiedBy": "kemyke",
   "$Meta": {
-    "ExportedAt": "2016-10-25T19:17:25.877+00:00",
+    "ExportedAt": "2016-10-25T12:17:25.8770000-07:00",
     "OctopusVersion": "3.4.5",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-upload-files/scriptbody.ps1 b/src/step-templates/azure-upload-files/scriptbody.ps1
new file mode 100644
index 000000000..525af5dfd
--- /dev/null
+++ b/src/step-templates/azure-upload-files/scriptbody.ps1
@@ -0,0 +1,47 @@
+#Sets the Permissions to public if the selection is true
+if ([boolean]::Parse($doRecurse)) 
+{
+    
+	$recurse = "-Recurse"
+
+}
+
+if ([boolean]::Parse($doForce)) 
+{
+    
+	$force = "-Force"
+
+}
+
+#--------------------------------------------------------------------
+#Checking to see if Azure is installed on the computer
+$name = 'Azure'
+
+Write-Output "Checking if Azure Powershell is installed"
+
+if(Get-Module -ListAvailable | Where-Object {$_.name -eq $name})
+{
+	(Get-Module -ListAvailable | Where-Object{ $_.Name -eq $name}) |
+	Select Version, Name, Author, PowerShellVersion | Format-List;
+	Write-Output "Azure Powershell is installed"
+}
+else
+{
+	#Provides the link to install Azure Powershell, if it is not installed
+	Write-Warning "Please install Azure Powershell. To install Azure Powershell go to http://bit.ly/AzurePowershellDownload"
+	Exit 1
+}
+
+
+
+#--------------------------------------------------------------------
+
+#Initialises the Azure Credentials based on the Storage Account Name and the Storage Account Key, 
+#so that we can invoke the APIs further down. 
+$storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey
+
+#--------------------------------------------------------------------
+
+Get-ChildItem -Path $localFolder -File $recurse | Set-AzureStorageBlobContent -Container $containerName -Blob $blobName -Context $storageContext $force
+
+Write-Output "All files in $localFolder uploaded to $containerName!"
diff --git a/src/step-templates/azure-web-app-disable-appoffline/metadata.json b/src/step-templates/azure-web-app-disable-appoffline/metadata.json
new file mode 100644
index 000000000..840da9fbc
--- /dev/null
+++ b/src/step-templates/azure-web-app-disable-appoffline/metadata.json
@@ -0,0 +1,74 @@
+{
+  "Id": "143ba6fd-968f-4f24-980b-49e47aa98f71",
+  "Name": "Azure Web App - Disable app_offline",
+  "Description": "This step template will remove an app_offline file from an Azure WebApp to safely bring the app domain online following a deployment.\n\nIt requires a set of [deployment credentials](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) for the Azure Web App.\n\n**Required:** \n- Credentials with access to the [Kudu VFS API](https://github.com/projectkudu/kudu/wiki/REST-API#vfs)\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b847fd97-bc71-4c89-99fb-bd5c2327027a",
+      "Name": "AzWebApp.DisableAppOffline.AzWebAppName",
+      "Label": "Azure Web App name",
+      "HelpText": "Provide the Azure Web App name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0b2edf69-da0d-4750-882a-4036c67f0129",
+      "Name": "AzWebApp.DisableAppOffline.Filename",
+      "Label": "AppOffline file name",
+      "HelpText": "*Optional:* Choose the variation of the name of the app offline file. Default: `app_offline.htm`\n\nAvailable options:\n\n- `app_offline.htm`\n- `app_offline.html`",
+      "DefaultValue": "app_offline.htm",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "app_offline.htm|app_offline.htm\napp_offline.html|app_offline.html"
+      }
+    },
+    {
+      "Id": "c873f396-0ca1-4df9-b083-860541d24b61",
+      "Name": "AzWebApp.DisableAppOffline.Deployment.Username",
+      "Label": "Deployment username",
+      "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) username for the Azure Web App. Default: `$#{AzWebApp.DisableAppOffline.WebAppName}`.",
+      "DefaultValue": "$#{AzWebApp.DisableAppOffline.WebAppName}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1c18f666-c91d-411c-a86b-b92d0bddc4ed",
+      "Name": "AzWebApp.DisableAppOffline.Deployment.Password",
+      "Label": "Deployment password",
+      "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) password for the Azure Web App.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "023c4e13-2a25-4e29-916f-aaafea1d8284",
+      "Name": "AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl",
+      "Label": "Deployment REST API Url",
+      "HelpText": "*Optional:* Provide a custom deployment REST API URL. Default is: `https://#{AzWebApp.DisableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs`.",
+      "DefaultValue": "https://#{AzWebApp.DisableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-09-17T17:52:46.7920000Z",
+    "OctopusVersion": "2021.2.7536",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-disable-appoffline/scriptbody.ps1 b/src/step-templates/azure-web-app-disable-appoffline/scriptbody.ps1
new file mode 100644
index 000000000..082fb4a5b
--- /dev/null
+++ b/src/step-templates/azure-web-app-disable-appoffline/scriptbody.ps1
@@ -0,0 +1,66 @@
+$ErrorActionPreference = "Stop";
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$AzWebAppName = $OctopusParameters["AzWebApp.DisableAppOffline.AzWebAppName"]
+$Filename = $OctopusParameters["AzWebApp.DisableAppOffline.Filename"]
+$DeployUsername = $OctopusParameters["AzWebApp.DisableAppOffline.Deployment.Username"]
+$DeployPassword = $OctopusParameters["AzWebApp.DisableAppOffline.Deployment.Password"]
+$DeploymentUrl = $OctopusParameters["AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($AzWebAppName)) {
+    throw "Required parameter AzWebApp.DisableAppOffline.AzWebAppName not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($Filename)) {
+    throw "Required parameter AzWebApp.DisableAppOffline.Filename not specified"
+}
+if ([string]::IsNullOrWhiteSpace($DeployUsername)) {
+    throw "Required parameter AzWebApp.DisableAppOffline.Deployment.Username not specified"
+}
+if ([string]::IsNullOrWhiteSpace($DeployPassword)) {
+    throw "Required parameter AzWebApp.DisableAppOffline.Deployment.Password not specified"
+}
+if ([string]::IsNullOrWhiteSpace($DeploymentUrl)) {
+    throw "Required parameter AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl not specified"
+}
+
+$DeploymentUrl = $DeploymentUrl.TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+Write-Verbose "AzWebApp.DisableAppOffline.AzWebAppName: $AzWebAppName"
+Write-Verbose "AzWebApp.DisableAppOffline.Filename: $FileName"
+Write-Verbose "AzWebApp.DisableAppOffline.Deployment.Username: $DeployUsername"
+Write-Verbose "AzWebApp.DisableAppOffline.Deployment.Password: ********"
+Write-Verbose "AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl: $DeploymentUrl"
+
+Write-Verbose "Step Name: $StepName"
+
+try {
+    $credPair = "$($DeployUsername):$($DeployPassword)"
+    $encodedCredentials = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($credPair))
+    $headers = @{ 
+        Authorization = "Basic $encodedCredentials"
+        # Ignore E-Tag
+        "If-Match"    = "*" 
+    }
+
+    $filePathUri = "$DeploymentUrl/site/wwwroot/$filename"
+    Write-Host "Invoking Delete request for '$filePathUri'"
+    $response = Invoke-RestMethod -Method Delete -Uri $filePathUri -Headers $headers
+
+    Write-Verbose "Response: $response"
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorDetails = $_.ErrorDetails.Message
+    $Message = "An error occurred invoking the Azure Web App REST API: $ExceptionMessage"
+    if (![string]::IsNullOrWhiteSpace($ErrorDetails)) {
+        $Message += "`nDetail: $ErrorDetails"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-web-app-enable-appoffline/metadata.json b/src/step-templates/azure-web-app-enable-appoffline/metadata.json
new file mode 100644
index 000000000..a5adaecbc
--- /dev/null
+++ b/src/step-templates/azure-web-app-enable-appoffline/metadata.json
@@ -0,0 +1,107 @@
+{
+  "Id": "852b78ae-eb32-43c0-bf55-0a5bdd7bebc8",
+  "Name": "Azure Web App - Enable app_offline",
+  "Description": "This step template will take a provided app_offline file from a package and upload it to an Azure Web App to enable a way to safely bring down the app domain for a subsequent deployment.\n\nIt requires a set of [deployment credentials](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) for the Azure Web App.\n\n**Required:** \n- Credentials with access to the [Kudu VFS API](https://github.com/projectkudu/kudu/wiki/REST-API#vfs)\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "ff7d24cc-7288-428f-985a-155c467d63ff",
+      "Name": "AzWebApp.EnableAppOffline.SourcePackage",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "AzWebApp.EnableAppOffline.SourcePackage"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b847fd97-bc71-4c89-99fb-bd5c2327027a",
+      "Name": "AzWebApp.EnableAppOffline.AzWebAppName",
+      "Label": "Azure Web App name",
+      "HelpText": "Provide the Azure Web App name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e15156cc-1fbd-439f-bbea-5eb1f5da8f2f",
+      "Name": "AzWebApp.EnableAppOffline.SourcePackage",
+      "Label": "AppOffline package source",
+      "HelpText": "Provide the package to source the `app_offline.htm` file from. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "22fdf143-fd7b-48d8-ba52-eed69268b61c",
+      "Name": "AzWebApp.EnableAppOffline.FilePath",
+      "Label": "AppOffline file path",
+      "HelpText": "Provide the path (relative to the package) for the app offline file to be uploaded.\n\n*Note:* If left blank or empty, the file will be sourced from the root of the package.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0b2edf69-da0d-4750-882a-4036c67f0129",
+      "Name": "AzWebApp.EnableAppOffline.Filename",
+      "Label": "AppOffline file name",
+      "HelpText": "*Optional:* Choose the variation of the name of the app offline file. Default: `app_offline.htm`\n\nAvailable options:\n\n- `app_offline.htm`\n- `app_offline.html`",
+      "DefaultValue": "app_offline.htm",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "app_offline.htm|app_offline.htm\napp_offline.html|app_offline.html"
+      }
+    },
+    {
+      "Id": "c873f396-0ca1-4df9-b083-860541d24b61",
+      "Name": "AzWebApp.EnableAppOffline.Deployment.Username",
+      "Label": "Deployment username",
+      "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) username for the Azure Web App. Default: `$#{AzWebApp.EnableAppOffline.WebAppName}`.",
+      "DefaultValue": "$#{AzWebApp.EnableAppOffline.WebAppName}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1c18f666-c91d-411c-a86b-b92d0bddc4ed",
+      "Name": "AzWebApp.EnableAppOffline.Deployment.Password",
+      "Label": "Deployment password",
+      "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) password for the Azure Web App.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "023c4e13-2a25-4e29-916f-aaafea1d8284",
+      "Name": "AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl",
+      "Label": "Deployment REST API Url",
+      "HelpText": "*Optional:* Provide a custom deployment REST API URL. Default is: `https://#{AzWebApp.EnableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs`.",
+      "DefaultValue": "https://#{AzWebApp.EnableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-09-17T17:45:50.5390000Z",
+    "OctopusVersion": "2021.2.7536",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-enable-appoffline/scriptbody.ps1 b/src/step-templates/azure-web-app-enable-appoffline/scriptbody.ps1
new file mode 100644
index 000000000..2007d3f7b
--- /dev/null
+++ b/src/step-templates/azure-web-app-enable-appoffline/scriptbody.ps1
@@ -0,0 +1,81 @@
+$ErrorActionPreference = "Stop";
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$SourcePackage = "AzWebApp.EnableAppOffline.SourcePackage"
+$AzWebAppName = $OctopusParameters["AzWebApp.EnableAppOffline.AzWebAppName"]
+$FilePath = $OctopusParameters["AzWebApp.EnableAppOffline.FilePath"]
+$Filename = $OctopusParameters["AzWebApp.EnableAppOffline.Filename"]
+$DeployUsername = $OctopusParameters["AzWebApp.EnableAppOffline.Deployment.Username"]
+$DeployPassword = $OctopusParameters["AzWebApp.EnableAppOffline.Deployment.Password"]
+$DeploymentUrl = $OctopusParameters["AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($AzWebAppName)) {
+    throw "Required parameter AzWebApp.EnableAppOffline.AzWebAppName not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Filename)) {
+    throw "Required parameter AzWebApp.EnableAppOffline.Filename not specified"
+}
+if ([string]::IsNullOrWhiteSpace($DeployUsername)) {
+    throw "Required parameter AzWebApp.EnableAppOffline.Deployment.Username not specified"
+}
+if ([string]::IsNullOrWhiteSpace($DeployPassword)) {
+    throw "Required parameter AzWebApp.EnableAppOffline.Deployment.Password not specified"
+}
+if ([string]::IsNullOrWhiteSpace($DeploymentUrl)) {
+    throw "Required parameter AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl not specified"
+}
+
+$DeploymentUrl = $DeploymentUrl.TrimEnd('/')
+$ExtractPathKey = "Octopus.Action.Package[$($SourcePackage)].ExtractedPath"
+
+$ExtractPath = $OctopusParameters[$ExtractPathKey]
+$FilePath = Join-Path -Path $ExtractPath -ChildPath $FilePath
+if (!(Test-Path $FilePath)) {
+    throw "Either the local or package extraction folder $FilePath does not exist or the Octopus Tentacle does not have permission to access it."
+}
+
+$sourceFilePath = Join-Path -Path $FilePath -ChildPath $Filename
+
+if (!(Test-Path $sourceFilePath)) {
+    throw "The file located at '$sourceFilePath' does not exist or the Octopus Tentacle does not have permission to access it."
+}
+$destinationFilePathUri = "$DeploymentUrl/site/wwwroot/$filename"
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+Write-Verbose "AzWebApp.EnableAppOffline.AzWebAppName: $AzWebAppName"
+Write-Verbose "AzWebApp.EnableAppOffline.FilePath: $FilePath"
+Write-Verbose "AzWebApp.EnableAppOffline.Filename: $FileName"
+Write-Verbose "AzWebApp.EnableAppOffline.Deployment.Username: $DeployUsername"
+Write-Verbose "AzWebApp.EnableAppOffline.Deployment.Password: ********"
+Write-Verbose "AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl: $DeploymentUrl"
+
+Write-Verbose "Step Name: $StepName"
+
+try {
+    $credPair = "$($DeployUsername):$($DeployPassword)"
+    $encodedCredentials = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($credPair))
+    $headers = @{ 
+        Authorization = "Basic $encodedCredentials"
+        # Ignore E-Tag
+        "If-Match" = "*" 
+    }
+    
+    Write-Host "Invoking Put request for '$sourceFilePath' to '$destinationFilePathUri'"
+    $response = Invoke-RestMethod -Method Put -Infile $sourceFilePath -Uri $destinationFilePathUri -Headers $headers -UserAgent 'powershell/1.0' -ContentType 'application/json'
+    
+    Write-Verbose "Response: $response"
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorDetails = $_.ErrorDetails.Message
+    $Message = "An error occurred invoking the Azure Web App REST API: $ExceptionMessage"
+    if (![string]::IsNullOrWhiteSpace($ErrorDetails)) {
+        $Message += "`nDetail: $ErrorDetails"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/azure-web-app-get-deployment-user/metadata.json b/src/step-templates/azure-web-app-get-deployment-user/metadata.json
new file mode 100644
index 000000000..aa0ec9370
--- /dev/null
+++ b/src/step-templates/azure-web-app-get-deployment-user/metadata.json
@@ -0,0 +1,66 @@
+{
+  "Id": "f87564d3-50e0-4265-8ed7-d95e3e21f869",
+  "Name": "Azure Web App - Get Deployment User",
+  "Description": "This step template will retrieve a set of [deployment credentials](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) for an Azure Web App.\n\nIt will create two Octopus [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for use in other deployment or runbook steps. They will be named:\n\n- `userName` - the username from the provided deployment credentials.\n- `userPwd` - the password from the provided deployment credentials.\n\n**Required:** \n- An azure account with permissions to retrieve deployment credentials for the named Azure Web App.\n- The Azure CLI (`az`) is required to run this script. If running on a worker or deployment target, ensure this is installed.\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{AzWebApp.DeploymentCreds.AzAccount}",
+    "OctopusUseBundledTooling": "False"
+  },
+  "Parameters": [
+    {
+      "Id": "7f36b854-6cc8-4a64-a7b4-c3110044cd4b",
+      "Name": "AzWebApp.DeploymentCreds.AzWebAppName",
+      "Label": "Azure Web App name",
+      "HelpText": "Provide the Azure Web App name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "41c6ca57-2078-4cbb-8e92-26c2207a3ef7",
+      "Name": "AzWebApp.DeploymentCreds.AzResourceGroup",
+      "Label": "Azure Resource Group",
+      "HelpText": "Provide Azure resource group.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "149ef6c1-716c-4738-9985-ea47e5fc6e9b",
+      "Name": "AzWebApp.DeploymentCreds.AzAccount",
+      "Label": "Azure Account",
+      "HelpText": "Provide Azure Account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "9ac94483-5e3b-49b3-9014-eb4875b95798",
+      "Name": "AzWebApp.DeploymentCreds.PublishCredentialType",
+      "Label": "Deployment credential type",
+      "HelpText": "Choose type of Deployment credentials should be retrieved. Default is: `MSDeploy`\n\nAvailable options are:\n\n- `MSDeploy`\n- `FTP`\n- `ZipDeploy`",
+      "DefaultValue": "MSDeploy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "MSDeploy|MSDeploy\nFTP|FTP\nZipDeploy|ZipDeploy"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-09-17T17:13:19.3620000Z",
+    "OctopusVersion": "2021.2.7536",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "adamoctoclose",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-get-deployment-user/scriptbody.ps1 b/src/step-templates/azure-web-app-get-deployment-user/scriptbody.ps1
new file mode 100644
index 000000000..b3f10b883
--- /dev/null
+++ b/src/step-templates/azure-web-app-get-deployment-user/scriptbody.ps1
@@ -0,0 +1,33 @@
+$ErrorActionPreference = "Stop";
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$resourceGroupName = $OctopusParameters["AzWebApp.DeploymentCreds.AzResourceGroup"]
+$WebAppName = $OctopusParameters["AzWebApp.DeploymentCreds.AzWebAppName"]
+$PublishCredentialType = $OctopusParameters["AzWebApp.DeploymentCreds.PublishCredentialType"]
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($resourceGroupName)) {
+    throw "Required parameter AzWebApp.DeploymentCreds.AzResourceGroup not specified"
+}
+if ([string]::IsNullOrWhiteSpace($WebAppName)) {
+    throw "Required parameter AzWebApp.DeploymentCreds.AzWebAppName not specified"
+}
+if ([string]::IsNullOrWhiteSpace($PublishCredentialType)) {
+    throw "Required parameter AzWebApp.DeploymentCreds.PublishCredentialType not specified"
+}
+    
+Write-Verbose "Azure Resource Group Name: $resourceGroupName"
+Write-Verbose "Azure Web App Name: $WebAppName"
+Write-Verbose "Publish Credential Type: $PublishCredentialType"
+
+Write-Host "Getting $PublishCredentialType publish profile deployment credentials..."
+
+$profiles = az webapp deployment list-publishing-profiles --resource-group $resourceGroupName --name $WebAppName | ConvertFrom-Json | where { $_.publishMethod -ieq $PublishCredentialType } 
+
+Set-OctopusVariable -name "userName" -value $profiles.userName -Sensitive
+Write-Highlight "Created output variable: ##{Octopus.Action[$StepName].Output.userName}"
+Set-OctopusVariable -name "userPWD" -value $profiles.userPWD -Sensitive
+Write-Highlight "Created output variable: ##{Octopus.Action[$StepName].Output.userPWD}"
+
+Write-Host "Output variables generated for deployment credentials!"
\ No newline at end of file
diff --git a/src/step-templates/azure-web-app-restart/metadata.json b/src/step-templates/azure-web-app-restart/metadata.json
new file mode 100644
index 000000000..19b245a5f
--- /dev/null
+++ b/src/step-templates/azure-web-app-restart/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "1f40e418-17bf-4b3e-bbe7-c6d41cbded93",
+  "Name": "Azure Web App - Restart",
+  "Description": "Restarts an azure web app.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the running machine</p>*",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Azure.AccountId": "#{azWebApp.AzureAcct}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e732ddaa-a43b-4369-8813-065286069d65",
+      "Name": "azWebApp.AzureAcct",
+      "Label": "Azure Account",
+      "HelpText": "The azure account that has access to the web app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "901ec60b-0ffd-4d08-be6f-fa9e8aec457a",
+      "Name": "azWebApp.StartIfStopped",
+      "Label": "Start if stopped",
+      "HelpText": "If the web app is stopped, start it",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2022-05-17T10:59:12.6940000Z",
+    "OctopusVersion": "2022.1.2495",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "zogamorph",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-restart/scriptbody.ps1 b/src/step-templates/azure-web-app-restart/scriptbody.ps1
new file mode 100644
index 000000000..5368d350c
--- /dev/null
+++ b/src/step-templates/azure-web-app-restart/scriptbody.ps1
@@ -0,0 +1,45 @@
+try {az --version}
+catch
+{
+    throw "az CLI not installed"
+}
+
+$webApp = $OctopusParameters["Octopus.Action.Azure.WebAppName"]
+$resourceGroup = $OctopusParameters["Octopus.Action.Azure.ResourceGroupName"]
+$startIfStopped = $OctopusParameters["azWebApp.StartIfStopped"]
+
+Write-Host "Checking webapp $webApp status in resource group $resourceGroup"
+
+$appState = az webapp list --resource-group $resourceGroup --query "[?name=='$webApp'].{state: state, hostName: defaultHostName}" | ConvertFrom-Json
+if($appState.state -eq "stopped")
+{
+    if($startIfStopped -eq 'true')
+    {
+        Write-Host "Webapp is not running. Starting..." -NoNewline
+    	az webapp start --name $webApp --resource-group $resourceGroup
+        Write-Host "Done"
+    }
+    else
+    {
+      Throw "Webapp is not running."
+    }
+}
+
+Write-Host "Webapp running, restarting"
+
+else
+{
+	Write-Host "Restarting $webApp in resource group $resourceGroup"
+	az webapp restart --name $webApp --resource-group $resourceGroup
+}
+
+Start-Sleep -s 5
+
+$appState = az webapp list --resource-group $resourceGroup --query "[?name=='$webApp'].{state: state, hostName: defaultHostName}" | ConvertFrom-Json
+
+if($appState.state -ne "running")
+{
+	Throw "Webapp failed to start.  Check the app's activity/error log"
+}
+
+write-host "Webapp $webApp running. Check at: $($appState.hostName)"
diff --git a/src/step-templates/azure-web-app-rolling-restart/metadata.json b/src/step-templates/azure-web-app-rolling-restart/metadata.json
new file mode 100644
index 000000000..7adb4b2c6
--- /dev/null
+++ b/src/step-templates/azure-web-app-rolling-restart/metadata.json
@@ -0,0 +1,65 @@
+{
+  "Id": "43cfc12d-5ae9-425d-ab01-7124ffdd9ee6",
+  "Name": "Azure Web App - Rolling Restart",
+  "Description": "Performs a delayed rolling restart of all instances within an Azure Web App\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the running machine</p>*",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Azure.AccountId": "#{azWebApp.AzureAcct}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "6670dc01-4323-41b8-87f4-a824608bad71",
+      "Name": "azWebApp.AzureAcct",
+      "Label": "Azure Account",
+      "HelpText": "The azure account that has access to the web app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "56dc3fcb-237d-4618-944a-441bd3d089c5",
+      "Name": "azWebApp.WebAppName",
+      "Label": "App Service Name",
+      "HelpText": "The azure web app name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7fc59af9-00cf-4e3f-995d-1ccca3057324",
+      "Name": "azWebApp.ResourceGroup",
+      "Label": "Azure Resource Group",
+      "HelpText": "The azure resource group",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8fda8110-e3bb-4881-89dc-c148a7bd1943",
+      "Name": "azWebApp.RestartDelay",
+      "Label": "Restart Delay",
+      "HelpText": "Delay between instance restart",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-04-08T20:19:36.8560000Z",
+    "OctopusVersion": "2020.5.6",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "tekguy",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-rolling-restart/scriptbody.ps1 b/src/step-templates/azure-web-app-rolling-restart/scriptbody.ps1
new file mode 100644
index 000000000..842662fb0
--- /dev/null
+++ b/src/step-templates/azure-web-app-rolling-restart/scriptbody.ps1
@@ -0,0 +1,35 @@
+try {az --version}
+catch
+{
+    throw "az CLI not installed"
+}
+
+$webAppName = $OctopusParameters["azWebApp.WebAppName"]
+$resourceGroup = $OctopusParameters["azWebApp.ResourceGroup"]
+$restartDelay = $OctopusParameters["azWebApp.RestartDelay"]
+
+
+
+Write-Host "Web App Name: $webAppName"
+Write-Host "Resource Group: $resourceGroup"
+Write-Host "Restart Delay: $restartDelay"
+
+Write-Host "Checking $webAppName status in resource group $resourceGroup"
+
+$appState = az webapp list --resource-group $resourceGroup --query "[?name=='$webAppName'].{state: state, hostName: defaultHostName}" | ConvertFrom-Json
+
+# only execute if running
+if($appState.state -eq "running")
+{
+    $appInstances = az webapp list-instances -n $webAppName --resource-group $resourceGroup --query '[].{Id: id}' | ConvertFrom-Json
+    Write-Host "" $appInstances.Count "Instance(s) found`r`n" -ForegroundColor Green
+
+    if($appInstances.count -gt 0){
+        foreach ($instance in $appInstances){
+            Write-Host "Restarting Instance: $instance"
+            az webapp restart --ids $instance.Id
+            Write-Host "Pausing $restartDelay second(s)`r`n" -ForegroundColor Yellow
+            Start-Sleep -Seconds $restartDelay
+        }
+    }
+}
diff --git a/src/step-templates/azure-web-app-set-app-settings/metadata.json b/src/step-templates/azure-web-app-set-app-settings/metadata.json
new file mode 100644
index 000000000..033564a68
--- /dev/null
+++ b/src/step-templates/azure-web-app-set-app-settings/metadata.json
@@ -0,0 +1,54 @@
+{
+  "Id": "850667b2-567d-46ba-a87d-d85dc31ebc83",
+  "Name": "Azure Web App - Set App Settings",
+  "Description": "Sets the Azure web app settings of a targeted Azure web app deployment target.  Will use the deployment slot if defined.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target</p>*\n*<p>Depends on Azure CLI and powershell to be installed on the worker</p>*",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Azure.AccountId": "#{azureWebAppSettings.azAccount}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "598025e6-2d89-49bf-8abb-fda6da181de5",
+      "Name": "azureWebAppSettings.azAccount",
+      "Label": "Azure Account",
+      "HelpText": "An Azure account with permissions to the subscription and web app being modified",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "5d232cfd-8e9f-4b3e-8c4e-7bf3a75ced19",
+      "Name": "azureWebAppSettings.settings",
+      "Label": "Web App Settings",
+      "HelpText": "The web app settings to append or update.  Each new setting should be on a new line as a key value pair using the template `key=value`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "9bbee2cf-c57c-45db-8a7f-62a752779b56",
+      "Name": "azureWebAppSettings.isSlotSettings",
+      "Label": "Is Slot Settings",
+      "HelpText": "This is used to distinguish what settings are slot specific and which one are not.  Slot setting do not follow the deployed app when the slot is swapped.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-30T15:48:06.9050000Z",
+    "OctopusVersion": "2020.2.10",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "xtreampb",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-set-app-settings/scriptbody.ps1 b/src/step-templates/azure-web-app-set-app-settings/scriptbody.ps1
new file mode 100644
index 000000000..c5e774be5
--- /dev/null
+++ b/src/step-templates/azure-web-app-set-app-settings/scriptbody.ps1
@@ -0,0 +1,38 @@
+$webAppName = $OctopusParameters["Octopus.Action.Azure.WebAppName"]
+$rg = $OctopusParameters["Octopus.Action.Azure.ResourceGroupName"]
+$slot = $OctopusParameters["Octopus.Action.Azure.DeploymentSlot"]
+$isSlotSettings = $OctopusParameters["azureWebAppSettings.isSlotSettings"]
+
+$settingsType = "settings"
+
+$appSettings = $OctopusParameters["azureWebAppSettings.settings"]
+
+$settings = ""
+
+Write-Host "Parsing Settings"
+
+$appSettings -split "`n" | ForEach-Object { $settings += "$_ "}
+
+$settings = $settings.TrimEnd(' ')
+
+$cmdArgs = "--name $webAppName --resource-group $rg"
+
+if(![string]::IsNullOrEmpty($slot))
+{
+	if($isSlotSettings -eq 'true')
+    {
+    	$settingsType = "slot-settings"
+    }
+    
+	$settings += " --slot $slot"
+}
+
+$settingsArgs = " --$settingsType $settings"
+
+Write-Host "Setting app settings"
+
+$cmd = "az webapp config appsettings set $cmdArgs $settingsArgs"
+
+write-verbose "command to execute: $cmd"
+
+Invoke-Expression $cmd
diff --git a/src/step-templates/azure-web-app-set-traffic/metadata.json b/src/step-templates/azure-web-app-set-traffic/metadata.json
new file mode 100644
index 000000000..f25f03f46
--- /dev/null
+++ b/src/step-templates/azure-web-app-set-traffic/metadata.json
@@ -0,0 +1,44 @@
+{
+  "Id": "36791d2d-aa55-4bc7-bee4-a0d12d73f78e",
+  "Name": "Azure Web App - Set Traffic",
+  "Description": "Sets the traffic distribution between multiple web app slots.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target, but will not use the slot defined. </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the worker</p>*",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Azure.AccountId": "#{azWebAppSetTraffic.AzureAcct}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "53d1306d-691c-4739-a09a-8fc9d66c60d3",
+      "Name": "azWebAppSetTraffic.AzureAcct",
+      "Label": "Azure Account",
+      "HelpText": "An Azure account with permissions to the subscription and web app being modified",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "1f788822-9980-44cc-9e9c-f87db5998dd5",
+      "Name": "azWebAppSetTraffic.trafficDistro",
+      "Label": "Traffic Distribution",
+      "HelpText": "<p>\nThe distribution of traffic in percent (0-100). Each web app slot should be defined on a separate line. Any remaining percentage will automatically be applied to production.\n</p><p>\n*Example*\n```\nmyOtherSlot=10\nstage=30\n```\n</p>",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-29T16:52:24.0070000Z",
+    "OctopusVersion": "2020.2.10",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "xtreampb",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-set-traffic/scriptbody.ps1 b/src/step-templates/azure-web-app-set-traffic/scriptbody.ps1
new file mode 100644
index 000000000..9b0eac709
--- /dev/null
+++ b/src/step-templates/azure-web-app-set-traffic/scriptbody.ps1
@@ -0,0 +1,30 @@
+$webAppName = $OctopusParameters["Octopus.Action.Azure.WebAppName"]
+$rg = $OctopusParameters["Octopus.Action.Azure.ResourceGroupName"]
+
+$trafficDistro = $OctopusParameters["azWebAppSetTraffic.trafficDistro"]
+
+$cmdArgs = "--name $webAppName --resource-group $rg" 
+
+$cmdAction = "clear"
+
+write-host "Checking distribution"
+if(![string]::IsNullOrEmpty($trafficDistro))
+{
+	$distribution = ""
+
+	$trafficDistro -split "`n" | ForEach-Object { $distribution += "$_ "}
+
+	$distribution = $distribution.TrimEnd(' ')
+    
+    $cmdArgs += " --distribution $distribution"
+    
+    $cmdAction = "set"
+}
+
+
+$cmd = "az webapp traffic-routing $cmdAction $cmdArgs"
+
+write-verbose "cmd to invoke: $cmd"
+
+write-host "setting distributions"
+invoke-expression $cmd
diff --git a/src/step-templates/azure-web-app-slot-swap/metadata.json b/src/step-templates/azure-web-app-slot-swap/metadata.json
new file mode 100644
index 000000000..67ef6b51a
--- /dev/null
+++ b/src/step-templates/azure-web-app-slot-swap/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "f256502a-4143-4d29-914e-80e541b05783",
+  "Name": "Azure Web App - Slot Swap",
+  "Description": "Swaps an azure web app slot. Defaults to the deployment slot defined in the web app target.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the running machine</p>*",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{azureWebAppSwap.AzAccount}"
+  },
+  "Parameters": [
+    {
+      "Id": "a204505b-f995-40ff-95b3-300638d9b9df",
+      "Name": "azureWebAppSwap.AzAccount",
+      "Label": "Azure Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "0b3383f9-31ae-402c-af57-be3b82a3d5b9",
+      "Name": "azWebAppSwap.targetSlot",
+      "Label": "Target Slot",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7e4ed213-d5bb-4725-b13f-78e366535479",
+      "Name": "azWebAppSwap.sourceSlot",
+      "Label": "Source Slot",
+      "HelpText": null,
+      "DefaultValue": "#{Octopus.Action.Azure.DeploymentSlot}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-06-25T15:05:37.2590000Z",
+    "OctopusVersion": "2020.2.10",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedAt": "2020-08-21T08:42:48.7720000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "azure"
+}
diff --git a/src/step-templates/azure-web-app-slot-swap/scriptbody.ps1 b/src/step-templates/azure-web-app-slot-swap/scriptbody.ps1
new file mode 100644
index 000000000..6c346e369
--- /dev/null
+++ b/src/step-templates/azure-web-app-slot-swap/scriptbody.ps1
@@ -0,0 +1,19 @@
+$rg = $OctopusParameters["Octopus.Action.Azure.ResourceGroupName"]
+$webAppName = $OctopusParameters["Octopus.Action.Azure.WebAppName"]
+$destinationSlot = $OctopusParameters["azWebAppSwap.targetSlot"]
+$sourceSlot = $OctopusParameters["azWebAppSwap.sourceSlot"]
+
+if([string]::IsNullOrEmpty($sourceSlot))
+{
+	throw "value for source slot must be provided"
+}
+
+$cmdArgs = "-g $rg -n $webAppName -s $sourceSlot"
+
+if(![string]::IsNullOrEmpty($destinationSlot)) {$cmdArgs += " --target-slot $destinationSlot"}
+
+$cmd = "az webapp deployment slot swap $cmdArgs"
+
+write-verbose "command being invoked: $cmd"
+
+Invoke-Expression $cmd
\ No newline at end of file
diff --git a/step-templates/azure-web-app-ssl.json b/src/step-templates/azure-web-app-ssl/metadata.json
similarity index 65%
rename from step-templates/azure-web-app-ssl.json
rename to src/step-templates/azure-web-app-ssl/metadata.json
index e6c2faffc..e3e85a613 100644
--- a/step-templates/azure-web-app-ssl.json
+++ b/src/step-templates/azure-web-app-ssl/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Azure.AccountId": "#{SslAzureSubscription}",
-    "Octopus.Action.Script.ScriptBody": "<#\nTakes an Octopus certificate variable and\n    1) Writes it to a temporary file with a password (as Azure requires the PFX have a password)\n    2) Invokes New-AzureRmWebAppSSLBinding\n    3) Removes the temporary certificate file\n#>\n\n$ErrorActionPreference = 'Stop'\n\nWrite-Verbose \"Creating temporary certificate file\"\n$TempCertificateFile = New-TemporaryFile\n# The PFX upload to Azure must have a password. So we give it a GUID.\n$Password = [guid]::NewGuid().ToString(\"N\")\n\n$CertificateName = $OctopusParameters[\"SslCertificate.Name\"]\n\nWrite-Host \"Creating HTTPS binding on web app '$SslWebApp' for domain $SslDomainName using certificate '$CertificateName' \"\n\n$CertificateBytes = [Convert]::FromBase64String($OctopusParameters[\"SslCertificate.Pfx\"])\n[IO.File]::WriteAllBytes($TempCertificateFile.FullName, $CertificateBytes)\nGet-PfxData -FilePath $TempCertificateFile.FullName | Export-PfxCertificate -FilePath $TempCertificateFile.FullName -Password (ConvertTo-SecureString -String $Password -AsPlainText -Force)\n\n$BindingParams = @{\n    WebAppName = $SslWebApp\n    ResourceGroupName = $SslResourceGroup\n    Name = $SslDomainName\n    CertificateFilePath = $TempCertificateFile.FullName\n    CertificatePassword = $Password\n    SslState = $SslState\n}\n\nif ($SslSlot) { $BindingParams['Slot'] = $SslSlot }\n\nNew-AzureRmWebAppSSLBinding @BindingParams\n\nWrite-Verbose \"Removing temporary certificate file\"\nRemove-Item $TempCertificateFile.FullName -Force"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -92,9 +92,9 @@
   ],
   "LastModifiedBy": "MJRichardson",
   "$Meta": {
-    "ExportedAt": "2018-03-29T00:48:05.333Z",
+    "ExportedAt": "2018-03-29T00:48:05.3330000Z",
     "OctopusVersion": "3.11.0",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-web-app-ssl/scriptbody.ps1 b/src/step-templates/azure-web-app-ssl/scriptbody.ps1
new file mode 100644
index 000000000..9da60caf6
--- /dev/null
+++ b/src/step-templates/azure-web-app-ssl/scriptbody.ps1
@@ -0,0 +1,37 @@
+<#
+Takes an Octopus certificate variable and
+    1) Writes it to a temporary file with a password (as Azure requires the PFX have a password)
+    2) Invokes New-AzureRmWebAppSSLBinding
+    3) Removes the temporary certificate file
+#>
+
+$ErrorActionPreference = 'Stop'
+
+Write-Verbose "Creating temporary certificate file"
+$TempCertificateFile = New-TemporaryFile
+# The PFX upload to Azure must have a password. So we give it a GUID.
+$Password = [guid]::NewGuid().ToString("N")
+
+$CertificateName = $OctopusParameters["SslCertificate.Name"]
+
+Write-Host "Creating HTTPS binding on web app '$SslWebApp' for domain $SslDomainName using certificate '$CertificateName' "
+
+$CertificateBytes = [Convert]::FromBase64String($OctopusParameters["SslCertificate.Pfx"])
+[IO.File]::WriteAllBytes($TempCertificateFile.FullName, $CertificateBytes)
+Get-PfxData -FilePath $TempCertificateFile.FullName | Export-PfxCertificate -FilePath $TempCertificateFile.FullName -Password (ConvertTo-SecureString -String $Password -AsPlainText -Force)
+
+$BindingParams = @{
+    WebAppName = $SslWebApp
+    ResourceGroupName = $SslResourceGroup
+    Name = $SslDomainName
+    CertificateFilePath = $TempCertificateFile.FullName
+    CertificatePassword = $Password
+    SslState = $SslState
+}
+
+if ($SslSlot) { $BindingParams['Slot'] = $SslSlot }
+
+New-AzureRmWebAppSSLBinding @BindingParams
+
+Write-Verbose "Removing temporary certificate file"
+Remove-Item $TempCertificateFile.FullName -Force
\ No newline at end of file
diff --git a/step-templates/azure-web-app-start.json b/src/step-templates/azure-web-app-start/metadata.json
similarity index 52%
rename from step-templates/azure-web-app-start.json
rename to src/step-templates/azure-web-app-start/metadata.json
index 983935bd1..7da7faf9e 100644
--- a/step-templates/azure-web-app-start.json
+++ b/src/step-templates/azure-web-app-start/metadata.json
@@ -11,7 +11,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "OctopusUseBundledTooling": "False",
     "Octopus.Action.Azure.AccountId": "#{azWebApp.AzureAcct}",
-    "Octopus.Action.Script.ScriptBody": "try\n{\n\taz --version\n}\n\ncatch\n{\n\tthrow \"az cli not installed\"\n}\n\n$webApp = $OctopusParameters[\"Octopus.Action.Azure.WebAppName\"]\n$resourceGroup = $OctopusParameters[\"Octopus.Action.Azure.ResourceGroupName\"]\n\n$appState = az webapp list --resource-group $resourceGroup --query \"[?name=='$webApp'].{state: state, hostName: defaultHostName}\" | ConvertFrom-Json\n\nif($appState.state -eq 'running')\n{\n\tWrite-Host \"Web App $webApp already running\"\n    return \n}\n\nWrite-Host \"Starting web app $webApp in resource group $resourceGroup\"\naz webapp start --name $webApp --resource-group $resourceGroup\n\nStart-Sleep -s 5\n\n$appState = az webapp list --resource-group $resourceGroup --query \"[?name=='$webApp'].{state: state, hostName: defaultHostName}\" | ConvertFrom-Json\n\nif($appState.state -ne \"running\")\n{\n\tThrow \"Webapp failed to start.  Check the app's activity/error log\"\n}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -26,10 +26,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-08T18:36:48.569Z",
+    "ExportedAt": "2020-06-08T18:36:48.5690000Z",
     "OctopusVersion": "2020.2.10",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "xtreampb",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-web-app-start/scriptbody.ps1 b/src/step-templates/azure-web-app-start/scriptbody.ps1
new file mode 100644
index 000000000..d1b134a4c
--- /dev/null
+++ b/src/step-templates/azure-web-app-start/scriptbody.ps1
@@ -0,0 +1,32 @@
+try
+{
+	az --version
+}
+
+catch
+{
+	throw "az cli not installed"
+}
+
+$webApp = $OctopusParameters["Octopus.Action.Azure.WebAppName"]
+$resourceGroup = $OctopusParameters["Octopus.Action.Azure.ResourceGroupName"]
+
+$appState = az webapp list --resource-group $resourceGroup --query "[?name=='$webApp'].{state: state, hostName: defaultHostName}" | ConvertFrom-Json
+
+if($appState.state -eq 'running')
+{
+	Write-Host "Web App $webApp already running"
+    return 
+}
+
+Write-Host "Starting web app $webApp in resource group $resourceGroup"
+az webapp start --name $webApp --resource-group $resourceGroup
+
+Start-Sleep -s 5
+
+$appState = az webapp list --resource-group $resourceGroup --query "[?name=='$webApp'].{state: state, hostName: defaultHostName}" | ConvertFrom-Json
+
+if($appState.state -ne "running")
+{
+	Throw "Webapp failed to start.  Check the app's activity/error log"
+}
diff --git a/step-templates/azure-web-app-stop.json b/src/step-templates/azure-web-app-stop/metadata.json
similarity index 61%
rename from step-templates/azure-web-app-stop.json
rename to src/step-templates/azure-web-app-stop/metadata.json
index 3899cc6cd..695fdb844 100644
--- a/step-templates/azure-web-app-stop.json
+++ b/src/step-templates/azure-web-app-stop/metadata.json
@@ -11,7 +11,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "OctopusUseBundledTooling": "False",
     "Octopus.Action.Azure.AccountId": "#{azWebApp.AzureAcct}",
-    "Octopus.Action.Script.ScriptBody": "try\n{\n\taz --version\n}\n\ncatch\n{\n\tthrow \"az cli not installed\"\n}\n\n$webApp = $OctopusParameters[\"Octopus.Action.Azure.WebAppName\"]\n$resourceGroup = $OctopusParameters[\"Octopus.Action.Azure.ResourceGroupName\"]\n\n$appState = az webapp list --resource-group $resourceGroup --query \"[?name=='$webApp'].{state: state, hostName: defaultHostName}\" | ConvertFrom-Json\n\nif($appState.state -eq 'stopped')\n{\n\tWrite-Host \"Web App $webApp already stopped\"\n    return\n}\n\nWrite-Host \"Stopping webapp $webApp in group $resourceGroup\"\naz webapp stop --name $webApp --resource-group $resourceGroup\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -26,10 +26,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-08T18:36:07.610Z",
+    "ExportedAt": "2020-06-08T18:36:07.6100000Z",
     "OctopusVersion": "2020.2.10",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "xtreampb",
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/azure-web-app-stop/scriptbody.ps1 b/src/step-templates/azure-web-app-stop/scriptbody.ps1
new file mode 100644
index 000000000..f09fc8e95
--- /dev/null
+++ b/src/step-templates/azure-web-app-stop/scriptbody.ps1
@@ -0,0 +1,23 @@
+try
+{
+	az --version
+}
+
+catch
+{
+	throw "az cli not installed"
+}
+
+$webApp = $OctopusParameters["Octopus.Action.Azure.WebAppName"]
+$resourceGroup = $OctopusParameters["Octopus.Action.Azure.ResourceGroupName"]
+
+$appState = az webapp list --resource-group $resourceGroup --query "[?name=='$webApp'].{state: state, hostName: defaultHostName}" | ConvertFrom-Json
+
+if($appState.state -eq 'stopped')
+{
+	Write-Host "Web App $webApp already stopped"
+    return
+}
+
+Write-Host "Stopping webapp $webApp in group $resourceGroup"
+az webapp stop --name $webApp --resource-group $resourceGroup
diff --git a/step-templates/backup-azure-database-to-azure-storage.json b/src/step-templates/backup-azure-database-to-azure-storage/metadata.json
similarity index 58%
rename from step-templates/backup-azure-database-to-azure-storage.json
rename to src/step-templates/backup-azure-database-to-azure-storage/metadata.json
index ac37138db..33730807c 100644
--- a/step-templates/backup-azure-database-to-azure-storage.json
+++ b/src/step-templates/backup-azure-database-to-azure-storage/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 7,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Check if Windows Azure Powershell is avaiable \r\ntry{ \r\n    Import-Module Azure -ErrorAction Stop\r\n}catch{\r\n    throw \"Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools\" \r\n}\r\n\r\n\r\n$dateTime = get-date -Format u\r\n$blobName = \"Deployment-Backup/$DatabaseName/$dateTime.bacpac\"\r\nWrite-Host \"Using blobName: $blobName\"\r\n\r\n# Create Database Connection\r\n$securedPassword = ConvertTo-SecureString -String $DatabasePassword -asPlainText -Force\r\n$serverCredential = new-object System.Management.Automation.PSCredential($DatabaseUsername, $securedPassword) \r\n$databaseContext = New-AzureSqlDatabaseServerContext -ServerName $DatabaseServerName -Credential $serverCredential\r\n\r\n# Create Storage Connection\r\n$storageContext = New-AzureStorageContext -StorageAccountName $StorageName -StorageAccountKey $StorageKey\r\n\r\n# Initiate the Export\r\n$operationStatus = Start-AzureSqlDatabaseExport -StorageContext $storageContext -SqlConnectionContext $databaseContext -BlobName $blobName -DatabaseName $DatabaseName -StorageContainerName $StorageContainerName\r\n\r\n# Wait for the operation to finish\r\ndo{\r\n    $status = Get-AzureSqlDatabaseImportExportStatus -Request $operationStatus    \r\n    Start-Sleep -s 3\r\n    $progress =$status.Status.ToString()\r\n    Write-Host \"Waiting for database export completion. Operation status: $progress\" \r\n}until ($status.Status -eq \"Completed\")\r\nWrite-Host \"Database export is complete\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -74,12 +74,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-03-25T08:41:21.754+00:00",
+  "LastModifiedOn": "2015-03-25T01:41:21.7540000-07:00",
   "LastModifiedBy": "trailmax",
   "$Meta": {
-    "ExportedAt": "2015-03-25T08:48:19.055+00:00",
+    "ExportedAt": "2015-03-25T01:48:19.0550000-07:00",
     "OctopusVersion": "2.6.3.886",
     "Type": "ActionTemplate"
   },
   "Category": "azure"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/backup-azure-database-to-azure-storage/scriptbody.ps1 b/src/step-templates/backup-azure-database-to-azure-storage/scriptbody.ps1
new file mode 100644
index 000000000..f5eefbf7c
--- /dev/null
+++ b/src/step-templates/backup-azure-database-to-azure-storage/scriptbody.ps1
@@ -0,0 +1,31 @@
+# Check if Windows Azure Powershell is avaiable 
+try{ 
+    Import-Module Azure -ErrorAction Stop
+}catch{
+    throw "Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools" 
+}
+
+
+$dateTime = get-date -Format u
+$blobName = "Deployment-Backup/$DatabaseName/$dateTime.bacpac"
+Write-Host "Using blobName: $blobName"
+
+# Create Database Connection
+$securedPassword = ConvertTo-SecureString -String $DatabasePassword -asPlainText -Force
+$serverCredential = new-object System.Management.Automation.PSCredential($DatabaseUsername, $securedPassword) 
+$databaseContext = New-AzureSqlDatabaseServerContext -ServerName $DatabaseServerName -Credential $serverCredential
+
+# Create Storage Connection
+$storageContext = New-AzureStorageContext -StorageAccountName $StorageName -StorageAccountKey $StorageKey
+
+# Initiate the Export
+$operationStatus = Start-AzureSqlDatabaseExport -StorageContext $storageContext -SqlConnectionContext $databaseContext -BlobName $blobName -DatabaseName $DatabaseName -StorageContainerName $StorageContainerName
+
+# Wait for the operation to finish
+do{
+    $status = Get-AzureSqlDatabaseImportExportStatus -Request $operationStatus    
+    Start-Sleep -s 3
+    $progress =$status.Status.ToString()
+    Write-Host "Waiting for database export completion. Operation status: $progress" 
+}until ($status.Status -eq "Completed")
+Write-Host "Database export is complete"
\ No newline at end of file
diff --git a/src/step-templates/bitwarden-secrets-manager-retrieve-secrets/metadata.json b/src/step-templates/bitwarden-secrets-manager-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..7c7e63207
--- /dev/null
+++ b/src/step-templates/bitwarden-secrets-manager-retrieve-secrets/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "740fb4a1-e863-4e81-ab54-ef28292334e4",
+  "Name": "Bitwarden Secrets Manager - Retrieve Secrets",
+  "Description": "This step retrieves one or more secrets from [Bitwarden Secrets Manager](https://bitwarden.com/products/secrets-manager/), and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nYou can choose a custom output variable name for each secret, or one will be chosen for you.\n\n---\n\n**Required:** \n- PowerShell **5.1** or higher.\n- The Bitwarden Secrets Manager (`bws`) CLI installed on the target or worker. If the CLI can't be found, the step will fail.\n- A machine account [access token](https://bitwarden.com/help/access-tokens/) with permissions to retrieve secrets from the specified project.\n\nNotes:\n\n- Tested on Octopus **2025.4**.\n- Tested on both Windows Server 2022 and Ubuntu 24.04.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "2a500677-eb3e-4e1c-93bd-0fa896aad9fd",
+      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.ServerUrl",
+      "Label": "Server Url",
+      "HelpText": "Provide the Server Url for retrieving secrets. Default: `https://vault.bitwarden.eu`",
+      "DefaultValue": "https://vault.bitwarden.eu",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "18b7321d-803e-4217-993d-6416dd6eb5f7",
+      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.ProjectName",
+      "Label": "Project Name",
+      "HelpText": "Provide the name of the project from which to retrieve secrets.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0dada9ac-3a35-4215-b03f-9024486ee7a2",
+      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.AccessToken",
+      "Label": "Machine Account Access Token",
+      "HelpText": "Provide the machine account [access token](https://bitwarden.com/help/access-tokens/) used to authenticate to retrieve secrets.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b10f61d8-dedc-4a91-add3-451de0cfd47d",
+      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.SecretNames",
+      "Label": "Secret names to retrieve",
+      "HelpText": "Specify the names of the secrets to be returned from Secret Manager in Google Cloud, in the format:\n\n`SecretName | OutputVariableName` where:\n\n- `SecretName` is the name of the secret to retrieve.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "0a98e37e-7907-4e49-919a-5e50c7765469",
+      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the names of the Octopus [output variables](https://octopus.com/docs/projects/variables/output-variables) in the task log. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-10-09T16:22:38.4170000Z",
+    "OctopusVersion": "2025.4.3435",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "bitwarden"
+}
diff --git a/src/step-templates/bitwarden-secrets-manager-retrieve-secrets/scriptbody.ps1 b/src/step-templates/bitwarden-secrets-manager-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..ff1b1ec84
--- /dev/null
+++ b/src/step-templates/bitwarden-secrets-manager-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,143 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$BwsServerUrl = $OctopusParameters["Bitwarden.SecretsManager.RetrieveSecrets.ServerUrl"]
+$ProjectName = $OctopusParameters["Bitwarden.SecretsManager.RetrieveSecrets.ProjectName"]
+$BwsAccessToken = $OctopusParameters["Bitwarden.SecretsManager.RetrieveSecrets.AccessToken"]
+$SecretNames = $OctopusParameters["Bitwarden.SecretsManager.RetrieveSecrets.SecretNames"]
+$PrintVariableNames = $OctopusParameters["Bitwarden.SecretsManager.RetrieveSecrets.PrintVariableNames"]
+
+Write-Output "Verifying 'bws' command availability..."
+if (-not (Get-Command bws -ErrorAction SilentlyContinue)) {
+    throw "The 'bws' (Bitwarden Secrets Manager CLI) command was not found. Please ensure it is installed and available in the system's PATH."
+}
+Write-Output "'bws' command found."
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($ProjectName)) {
+    throw "Required parameter Bitwarden.SecretsManager.RetrieveSecrets.ProjectName not specified."
+}
+if ([string]::IsNullOrWhiteSpace($BwsServerUrl)) {
+    throw "Required parameter Bitwarden.SecretsManager.RetrieveSecrets.ServerURL not specified."
+}
+if ([string]::IsNullOrWhiteSpace($BwsAccessToken)) {
+    throw "Required parameter Bitwarden.SecretsManager.RetrieveSecrets.AccessToken not specified."
+}
+if ([string]::IsNullOrWhiteSpace($SecretNames)) {
+    throw "Required parameter Bitwarden.SecretsManager.RetrieveSecrets.SecretNames not specified."
+}
+
+# Functions
+function Save-OctopusVariable {
+    Param(
+        [string] $name,
+        [string] $value
+    )
+    if ($script:storedVariables -icontains $name) {
+        Write-Warning "A variable with name '$name' has already been created. Check your secret name parameters as this will likely cause unexpected behavior and should be investigated."
+    }
+    Set-OctopusVariable -Name $name -Value $value -Sensitive
+    $script:storedVariables += $name
+
+    if ($PrintVariableNames -eq $True) {
+        Write-Output "Created output variable: ##{Octopus.Action[$StepName].Output.$name}"
+    }
+}
+
+function Get-BwsProjectIdByName {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Name,
+        [Parameter(Mandatory = $true)]
+        [string]$AccessToken
+    )
+    
+    # 1. API Call: Retrieve all projects in JSON format (1st API Call)
+    $ProjectJson = bws project list `
+        --access-token $AccessToken `
+        --server-url $BwsServerUrl `
+        --output json | Out-String
+
+    # 2. Convert to PowerShell objects and filter by name
+    $Projects = $ProjectJson | ConvertFrom-Json
+
+    # 3. Find the ID of the matching project
+    $ProjectObject = $Projects | Where-Object { $_.name -eq $Name }
+
+    if (-not $ProjectObject) {
+        throw "Error: Project '$Name' not found."
+    }
+
+    # Handle the case where the project name might not be unique
+    if ($ProjectObject.Count -gt 1) {
+        Write-Warning "Multiple projects found with name '$Name'. Using the first ID found."
+    }
+
+    # Return the ID
+    return $ProjectObject.id
+}
+
+# End Functions
+
+$script:storedVariables = @()
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$Secrets = @()
+
+# Extract secret names
+@(($SecretNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $secretDefinition = ($_ -Split "\|")
+        $secretName = $secretDefinition[0].Trim()
+        
+        if ([string]::IsNullOrWhiteSpace($secretName)) {
+            throw "Unable to establish secret name from: '$($_)'"
+        }
+        $secret = [PsCustomObject]@{
+            Name         = $secretName
+            VariableName = if ($secretDefinition.Count -gt 1 -and ![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { $secretName } # If VariableName is blank, use SecretName
+        }
+        $Secrets += $secret
+    }
+}
+
+Write-Verbose "Project Name: $ProjectName"
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "Print variables: $PrintVariableNames"
+
+try {
+
+    # 1. Get the Project ID from the friendly name
+    Write-Output "Looking up project ID for '$ProjectName'"
+    $ProjectID = Get-BwsProjectIdByName -Name $ProjectName -AccessToken $BwsAccessToken
+    
+    Write-Output "Project ID found: $ProjectID"
+    
+    # 2. Retrieve all secrets from the found project (The single efficient call)
+    Write-Output "Fetching all secrets from project."
+    $SecretNamesToQuery = @($Secrets | Select-Object -ExpandProperty Name)
+
+    # Use the projectId to get all secrets in that project
+    $SecretsJson = bws secret list $ProjectID `
+        --access-token $BwsAccessToken `
+        --server-url $BwsServerUrl `
+        --output json | Out-String
+    $AllSecrets = $SecretsJson | ConvertFrom-Json
+
+    # 3. Filter the local objects to only include the desired secret names
+    Write-Output "Filtering for desired secrets: $($SecretNamesToQuery -join ', ')."
+    $FilteredSecrets = $AllSecrets | Where-Object { $_.key -in $SecretNamesToQuery } | Select-Object -Property key, value
+    
+    foreach ($secret in $FilteredSecrets) {
+        # Find the VariableName associated with the secret key
+        $variableName = ($Secrets | Where-Object { $_.Name -eq $secret.key }).VariableName    
+        
+        # Save the secret value to the output variable
+        Save-OctopusVariable -name $variableName -value $secret.value
+    }
+}
+catch {
+    throw "An error occurred while retrieving secrets: $($_.Exception.Message)"
+}
+
+Write-Output "Created $($script:storedVariables.Count) output variables"
\ No newline at end of file
diff --git a/src/step-templates/block-progression/metadata.json b/src/step-templates/block-progression/metadata.json
new file mode 100644
index 000000000..ceb5a32cb
--- /dev/null
+++ b/src/step-templates/block-progression/metadata.json
@@ -0,0 +1,64 @@
+{
+  "Id": "78a182b3-5369-4e13-9292-b7f991295ad1",
+  "Name": "Block Release Progression",
+  "Description": "Step template to block the release progression of an Octopus Deploy release so it cannot be promoted beyond the current environment.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "fc366d69-e56b-476b-8005-5431f1ce8c05",
+      "Name": "Block.Octopus.Url",
+      "Label": "Octopus Url",
+      "HelpText": "The base url (`https://samples.octopus.app`) of your Octopus Server.  Defaults to `Octopus.Web.BaseUrl`.",
+      "DefaultValue": "#{Octopus.Web.BaseUrl}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f03e6e96-f1d5-4b91-9ae6-f67fd8ba043c",
+      "Name": "Block.Octopus.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The API key of a user who has permission to block releases.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "cdcbd826-e075-476c-b67a-ddf0e75a576c",
+      "Name": "Block.Octopus.Previous.Release.Id",
+      "Label": "Release Id to Block",
+      "HelpText": "The Octopus ID (`Releases-123`) of the release to block.  Defaults to `Octopus.Release.CurrentForEnvironment.Id`",
+      "DefaultValue": "#{Octopus.Release.CurrentForEnvironment.Id}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5c9c1d6a-ec08-4d79-b442-180f9d0460c6",
+      "Name": "Block.Octopus.Reason",
+      "Label": "Reason",
+      "HelpText": "The reason why this release is being blocked.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-09-13T16:14:01.8450000Z",
+    "OctopusVersion": "2021.2.7428",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "bobjwalker",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/block-progression/scriptbody.ps1 b/src/step-templates/block-progression/scriptbody.ps1
new file mode 100644
index 000000000..10c8c53c6
--- /dev/null
+++ b/src/step-templates/block-progression/scriptbody.ps1
@@ -0,0 +1,15 @@
+$apiKey = $OctopusParameters["Block.Octopus.Api.Key"]
+$previousReleaseId = $OctopusParameters["Block.Octopus.Previous.Release.Id"]
+$reason = $OctopusParameters["Block.Octopus.Reason"]
+$octopusBaseUrl = $OctopusParameters["Block.Octopus.Url"]
+$spaceId = $OctopusParameters["Octopus.Space.Id"]
+
+$body = @{
+	Description = $reason
+}
+$bodyAsJson = $body | ConvertTo-JSON -Depth 10
+
+$headers = @{"X-Octopus-ApiKey"="$apiKey"}
+    
+Write-Host "Blocking the release $previousReleaseId from progressing"
+Invoke-RestMethod -Uri "$($octopusBaseUrl)/api/$($spaceId)/releases/$($previousReleaseId)/defects" -Method POST -Headers $headers -Body $bodyAsJSON -ContentType 'application/json; charset=utf-8'
\ No newline at end of file
diff --git a/src/step-templates/calculate-deployment-mode/metadata.json b/src/step-templates/calculate-deployment-mode/metadata.json
new file mode 100644
index 000000000..e4e117178
--- /dev/null
+++ b/src/step-templates/calculate-deployment-mode/metadata.json
@@ -0,0 +1,23 @@
+{
+  "Id": "d166457a-1421-4731-b143-dd6766fb95d5",
+  "Name": "Calculate Deployment Mode",
+  "Description": "This step uses Octopus [System Variables](https://octopus.com/docs/projects/variables/system-variables) to calculate the deployment mode.  \n\n# Deployment Mode\nThe potential modes are:\n- **Deploy**: A newer version is being deployed to the target environment.  For example, `2021.1.4` is being deployed to **Production** to replace `2021.0.5`.\n- **Rollback**: An older version is being deployed to the target environment. For example, `2021.0.5` is being deployed to **Production** to replace `2021.1.4`.\n- **Redeploy**: The same version is being deployed to the target environment.  For example, `2021.1.4` is being deployed to **Production** which already has `2021.1.4`.\n\n**Please note**: This step template uses the release numbers to calculate the deployment mode.  It doesn't look at any packages.\n\n# Version Difference\nAfter calculating the deployment mode, the step template will calculate the version difference.  The potential options are:\n- **Identical**: No differences between the previous release and the current release were found.\n- **Major**: The first number (2021 in 2021.1.2.10) is different between the previous release and the current release.\n- **Minor**: The second number (1 in 2021.1.2.10) is different between the previous release and the current release.\n- **Build**: The third number (2 in 2021.1.2.10) is different between the previous release and the current release.\n- **Revision**: The fourth number (10 in 2021.1.2.10) is different between the previous release and the current release.\n\n# Manual or Automatic Trigger\nThe step template will also determine if the deployment was caused by a trigger or is a manual deployment.  Potential values are `True` (caused by a trigger) or `False` (manual deployment).\n\n# Output Variables\n\nThe following output variables will be set:\n- **DeploymentMode**: Will either be `Deploy`, `Rollback` or `Redeploy`.\n- **Trigger**: Will either be `True` or `False`.  Indicates if this deployment was caused by a trigger (scheduled or deployment target).\n- **VersionChange**: Will either be `Identical`, `Major`, `Minor`, `Build`, or `Revision`.\n\n## Variable Run Condition Output Variables\nTo make it easier to use, the step template will set a number of run condition output variables.  \n\n### Variable Run Condition Usage\nVariable Run Conditions will _always_ be evaluated.  Even if there is an error.  If the run condition comes back as **Truthy** it will run the step.  \n\nTo limit when the step runs, wrap the output variable with an if/then or unless clause:\n- **Always Run**: `#{Octopus.Action[Calculate Deployment Mode].Output.RunOnDeploy}`  \n- **Success**: Only run when previous steps succeeds `#{unless Octopus.Deployment.Error}#{Octopus.Action[Calculate Deployment Mode].Output.RunOnDeploy}#{/unless}`\n- **Failure**: Only run when previous steps fail `#{if Octopus.Deployment.Error}#{Octopus.Action[Calculate Deployment Mode].Output.RunOnDeploy}#{/if}`\n\n**Hint:** Replace **RunOnDeploy** from the above examples with one of the variables from below.\n\n### Deployment Mode Run Conditions\n- **RunOnDeploy**: Only run the step when the **DeploymentMode** is `Deploy`.\n- **RunOnRollback**: Only run the step when the **DeploymentMode** is `Rollback`.\n- **RunOnRedeploy**: Only run the step when the **DeploymentMode** is `Redeploy`.\n- **RunOnDeployOrRollback**: Only run the step when the **DeploymentMode** is`Deploy` or `Rollback`.\n- **RunOnDeployOrRedeploy**: Only run the step when the **DeploymentMode** is`Deploy` or `Redeploy`.\n- **RunOnRedeployOrRollback**: Only run the step when the **DeploymentMode** is `Redeploy` or `Rollback`.\n\n### Version Change Run Conditions\n- **RunOnMajorVersionChange**: Only run the step when the **VersionChange** is `Major`.\n- **RunOnMinorVersionChange**: Only run the step when the **VersionChange** is `Minor`.\n- **RunOnMajorOrMinorVersionChange**: Only run the step when the **VersionChange** is `Major` or `Minor`.\n- **RunOnBuildVersionChange**: Only run the step when the **VersionChange** is `Build`.\n- **RunOnRevisionVersionChange**: Only run the step when the **VersionChange** is `Revision`.\n\n# Usage \n\n**Important:** This step template is designed for deployment processes only.  Runbooks have no concept of deployments, redeployments, or rollbacks.\n\nThis step was designed to run on a worker (or the Octopus Server).  It can run on targets, but the output variables will all be the same; running on targets will do nothing but waste compute cycles.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [],
+  "$Meta": {
+    "ExportedAt": "2021-11-02T13:48:09.1200000Z",
+    "OctopusVersion": "2021.1.7738",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "BobJWalker",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/calculate-deployment-mode/scriptbody.ps1 b/src/step-templates/calculate-deployment-mode/scriptbody.ps1
new file mode 100644
index 000000000..f0328570c
--- /dev/null
+++ b/src/step-templates/calculate-deployment-mode/scriptbody.ps1
@@ -0,0 +1,188 @@
+$currentReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$previousReleaseNumber = $OctopusParameters["Octopus.Release.CurrentForEnvironment.Number"]
+$lastAttemptedReleaseNumber = $OctopusParameters["Octopus.Release.PreviousForEnvironment.Number"]
+$stepName = $OctopusParameters["Octopus.Action.StepName"]
+$triggerName = $OctopusParameters["Octopus.Deployment.Trigger.Name"]
+
+Write-Host "The current release number is $currentReleaseNumber"
+Write-Host "The last succesful release to this environment was $previousReleaseNumber"
+Write-Host "The last release that was attempted on this environment was $lastAttemptedReleaseNumber"
+Write-Host "The deployment name is $deploymentName"
+
+if ($previousReleaseNumber -like "*-*")
+{
+	$previousReleaseNumber = $previousReleaseNumber.SubString(0, $previousReleaseNumber.IndexOf("-"))
+}
+
+if ($currentReleaseNumber -like "*-*")
+{
+	$currentReleaseNumber = $currentReleaseNumber.SubString(0, $currentReleaseNumber.IndexOf("-"))
+}
+
+if ($lastAttemptedReleaseNumber -like "*-*")
+{
+	$lastAttemptedReleaseNumber = $lastAttemptedReleaseNumber.SubString(0, $lastAttemptedReleaseNumber.IndexOf("-"))
+}
+
+Write-Host "The non-pre release tag previous version for the environment was $previousReleaseNumber"
+Write-Host "The non-pre release tag current release number is $currentReleaseNumber"
+Write-Host "The non-pre release tag of the last attempted version for the environment was $lastAttemptedReleaseNumber"
+
+$currentVersion = [System.Version]$currentReleaseNumber
+$previousVersion = [System.Version]$previousReleaseNumber
+$lastAttemptedVersion = [System.Version]$lastAttemptedReleaseNumber
+
+$differentVersions = $false
+$versionToCompare = $previousVersion
+if ($currentVersion -gt $previousVersion)
+{
+	Write-Host "The current release number $currentReleaseNumber is greater than the previous successful release number $previousReleaseNumber."
+	if ($currentVersion -lt $lastAttemptedVersion)
+    {
+    	Write-Host "The current release number $currentReleaseNumber is less than the last attempted release number $lastAttemptedReleaseNumber.  Setting deployment mode to rollback."
+	    $deploymentMode = "Rollback"
+        $versionToCompare = $lastAttemptedVersion
+    }
+    else
+    {
+    	Write-Host "The current release number $curentReleaseNumber is greater than the last attempted release number $lastAttemptedReleaseNumber.  Setting deployment mode to deploy."
+        $deploymentMode = "Deploy"
+    }
+}
+elseif ($currentVersion -lt $previousVersion)
+{
+	Write-Host "The current release number $currentReleaseNumber is less than the previous successful release number $previousReleaseNumber.  Setting deployment mode to rollback."
+    $deploymentMode = "Rollback"
+    $differentVersions = $true
+}
+elseif ($currentVersion -lt $lastAttemptedVersion)
+{
+	Write-Host "The current release number $currentReleaseNumber is less than the last attempted release number $lastAttemptedReleaseNumber.  Setting the deployment mode to rollback."
+    $deploymentMode = "Rollback"
+    $differentVersions = $true
+    $versionToCompare = $lastAttemptedVersion
+}
+else
+{
+	Write-Host "The current release number $currentReleaseNumber matches the previous release number $previousReleaseNumber.  Setting deployment mode to redeployment."
+    $deploymentMode = "Redeploy"
+}
+
+$differenceKind = "Identical"
+if ($differentVersions)
+{
+	if ($currentVersion.Major -ne $versionToCompare.Major)
+    {
+    	Write-Host "$currentReleaseNumber is a major version change from $versionToCompare"
+    	$differenceKind = "Major"
+    }
+    elseif ($currentVersion.Minor -ne $versionToCompare.Minor)
+    {
+    	Write-Host "$currentReleaseNumber is a minor version change from $versionToCompare"
+    	$differenceKind = "Minor"
+    }
+    elseif ($currentVersion.Build -ne $versionToCompare.Build)
+    {
+    	Write-Host "$currentReleaseNumber is a build version change from $versionToCompare"
+    	$differenceKind = "Build"
+    }
+    elseif ($currentVersion.Revision -ne $versionToCompare.Revision)
+    {
+    	Write-Host "$currentReleaseNumber is a revision version change from $versionToCompare"
+    	$differenceKind = "Revision"
+    }
+}
+
+$trigger = $false
+if ([string]::IsNullOrWhiteSpace($triggerName) -eq $false)
+{
+	Write-Host "This task was created by trigger $triggerName."
+    $trigger = $true
+}
+
+Set-OctopusVariable -Name "DeploymentMode" -Value $deploymentMode
+Set-OctopusVariable -Name "VersionChange" -Value $differenceKind
+Set-OctopusVariable -Name "Trigger" -Value $trigger
+
+Write-Highlight @"
+Output Variables Created:
+   	- Octopus.Action[$($stepName)].Output.DeploymentMode - Set to '$deploymentMode'
+    - Octopus.Action[$($stepName)].Output.VersionChange - Set to '$differenceKind'
+    - Octopus.Action[$($stepName)].Output.Trigger - Set to '$trigger'
+
+Deployment Mode Run Conditions Output Variables:
+   	- Octopus.Action[$($stepName)].Output.RunOnRollback
+    - Octopus.Action[$($stepName)].Output.RunOnDeploy
+    - Octopus.Action[$($stepName)].Output.RunOnRedeploy
+    - Octopus.Action[$($stepName)].Output.RunOnDeployOrRollback
+    - Octopus.Action[$($stepName)].Output.RunOnDeployOrRedeploy
+    - Octopus.Action[$($stepName)].Output.RunOnRollbackOrRedeploy
+
+Version Change Run Conditions Output Variables:
+   	- Octopus.Action[$($stepName)].Output.RunOnMajorVersionChange
+    - Octopus.Action[$($stepName)].Output.RunOnMinorVersionChange
+    - Octopus.Action[$($stepName)].Output.RunOnMajorOrMinorVersionChange
+    - Octopus.Action[$($stepName)].Output.RunOnBuildVersionChange
+    - Octopus.Action[$($stepName)].Output.RunOnRevisionVersionChange
+  
+Variable run conditions are always evaluated, even if there is an error.  Use the following examples to control when your step runs.  Replace RunOnDeploy from below examples with one of the variables from above.  
+- Always Run: `#{Octopus.Action[$stepName].Output.RunOnDeploy}`  
+- Success: Only run when previous steps succeeds `##{unless Octopus.Deployment.Error}#{Octopus.Action[$stepName].Output.RunOnDeploy}##{/unless}`
+- Failure: Only run when previous steps fail `##{if Octopus.Deployment.Error}#{Octopus.Action[$stepName].Output.RunOnDeploy}##{/if}`
+
+"@
+
+$runOnRollback = "#{if Octopus.Action[$($stepName)].Output.DeploymentMode == ""Rollback""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRollback' so you can use it as a run condition"
+Write-Verbose $runOnRollback
+Set-OctopusVariable -Name "RunOnRollback" -Value $runOnRollback
+
+$runOnDeploy = "#{if Octopus.Action[$($stepName)].Output.DeploymentMode == ""Deploy""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnDeploy' so you can use it as a run condition"
+Write-Verbose $runOnDeploy
+Set-OctopusVariable -Name "RunOnDeploy" -Value $runOnDeploy
+
+$runOnRedeploy = "#{if Octopus.Action[$($stepName)].Output.DeploymentMode == ""Redeploy""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRedeploy' so you can use it as a run condition"
+Write-Verbose $runOnRedeploy
+Set-OctopusVariable -Name "RunOnRedeploy" -Value $runOnRedeploy
+
+$runOnDeployOrRollback = "#{if Octopus.Action[$($stepName)].Output.DeploymentMode != ""Redeploy""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnDeployOrRollback' so you can use it as a run condition"
+Write-Verbose $runOnDeployOrRollback
+Set-OctopusVariable -Name "RunOnDeployOrRollback" -Value $runOnDeployOrRollback
+
+$runOnDeployOrRedeploy = "#{if Octopus.Action[$($stepName)].Output.DeploymentMode != ""Rollback""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnDeployOrRedeploy' so you can use it as a run condition"
+Write-Verbose $runOnDeployOrRedeploy
+Set-OctopusVariable -Name "RunOnDeployOrRedeploy" -Value $runOnDeployOrRedeploy
+
+$runOnRedeployOrRollback = "#{if Octopus.Action[$($stepName)].Output.DeploymentMode != ""Deploy""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRedeployOrRollback' so you can use it as a run condition"
+Write-Verbose $runOnRedeployOrRollback
+Set-OctopusVariable -Name "RunOnRedeployOrRollback" -Value $runOnRedeployOrRollback
+
+$runOnMajorVersionChange = "#{if Octopus.Action[$($stepName)].Output.VersionChange == ""Major""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnMajorVersionChange' so you can use it as a run condition"
+Write-Verbose $runOnMajorVersionChange
+Set-OctopusVariable -Name "RunOnMajorVersionChange" -Value $runOnMajorVersionChange
+
+$runOnMinorVersionChange = "#{if Octopus.Action[$($stepName)].Output.VersionChange == ""Minor""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnMinorVersionChange' so you can use it as a run condition"
+Write-Verbose $runOnMinorVersionChange
+Set-OctopusVariable -Name "RunOnMinorVersionChange" -Value $runOnMinorVersionChange
+
+$runOnMajorOrMinorVersionChange = "#{if Octopus.Action[$stepName].Output.VersionChange == ""Major""}True#{else}#{if Octopus.Action[$stepName].Output.VersionChange == ""Minor""}True#{else}False#{/if}#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnMajorOrMinorVersionChange' so you can use it as a run condition"
+Write-Verbose $runOnMajorOrMinorVersionChange
+Set-OctopusVariable -Name "RunOnMajorOrMinorVersionChange" -Value $runOnMajorOrMinorVersionChange
+
+$runOnBuildVersionChange = "#{if Octopus.Action[$($stepName)].Output.VersionChange == ""Build""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnBuildVersionChange' so you can use it as a run condition"
+Write-Verbose $runOnBuildVersionChange
+Set-OctopusVariable -Name "RunOnBuildVersionChange" -Value $runOnBuildVersionChange
+
+$runOnRevisionVersionChange = "#{if Octopus.Action[$($stepName)].Output.VersionChange == ""Revision""}True#{else}False#{/if}"
+Write-Host "Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRevisionVersionChange' so you can use it as a run condition"
+Write-Verbose $runOnRevisionVersionChange
+Set-OctopusVariable -Name "RunOnRevisionVersionChange" -Value $runOnRevisionVersionChange
\ No newline at end of file
diff --git a/src/step-templates/chef-run-cookbook/metadata.json b/src/step-templates/chef-run-cookbook/metadata.json
new file mode 100644
index 000000000..725c0a82a
--- /dev/null
+++ b/src/step-templates/chef-run-cookbook/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "877815ea-0cfb-4dfa-80a3-983140f8cf52",
+  "Name": "Chef - Run Cookbook",
+  "Description": "Runs a chef cookbook using chef-client.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "LastModifiedOn": "2018-10-16T14:31:14.8940000Z",
+  "LastModifiedBy": "margani",
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Package.DownloadOnTentacle": "False",
+    "Octopus.Action.Script.ScriptParameters": "-CookBookFolder #{CookBookDir}",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "dc6cfaed-3df0-4245-88a3-d59f14a64399",
+      "Name": "CookBookDir",
+      "Label": "Cookbook directory",
+      "HelpText": "The directory of the cookbook which has Berksfile",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6782c7cf-7562-48ff-93a2-fbeb99f0a088",
+      "Name": "OverrideRunList",
+      "Label": "Override run list",
+      "HelpText": "The list of cookbook/recipes which you want to run and override",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2018-10-16T14:31:14.8940000Z",
+    "OctopusVersion": "2018.6.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "chef"
+}
diff --git a/src/step-templates/chef-run-cookbook/scriptbody.ps1 b/src/step-templates/chef-run-cookbook/scriptbody.ps1
new file mode 100644
index 000000000..1c0a583b1
--- /dev/null
+++ b/src/step-templates/chef-run-cookbook/scriptbody.ps1
@@ -0,0 +1,35 @@
+$cookBookFolder = $OctopusParameters["CookBookDir"]
+$overrideRunList = $OctopusParameters["OverrideRunList"]
+
+if (-not $cookBookFolder -or -not $overrideRunList) {
+	throw "The parameters are mandatory."
+}
+
+$ClientPath = Join-Path $cookBookFolder "client.rb"
+$WorkingPath = Join-Path $cookBookFolder "temp"
+$DatabagPath = Join-Path $WorkingPath "data_bags"
+$EnvironmentPath = Join-Path $WorkingPath "environments"
+$CookbooksPath = Join-Path $WorkingPath "cookbooks"
+$FileCachePath = Join-Path $WorkingPath "cache"
+
+$ClientContent = @"
+data_bag_path "$($DatabagPath -replace '\\','/')"
+environment_path "$($EnvironmentPath -replace '\\','/')"
+cookbook_path "$($CookbooksPath -replace '\\','/')"
+file_cache_path "$($FileCachePath -replace '\\','/')"
+ssl_verify_mode :verify_peer
+"@
+
+[System.IO.File]::WriteAllText($ClientPath, $ClientContent)
+
+@($DatabagPath, $EnvironmentPath, $CookbooksPath, $FileCachePath) | %{
+	if (!(Test-Path $_) ){ 
+		mkdir -p $_
+	}
+}
+
+Push-Location $cookBookFolder
+Remove-Item *.lock
+&berks vendor $CookbooksPath
+&chef-client -z -c $ClientPath -o $overrideRunList
+Pop-Location
\ No newline at end of file
diff --git a/src/step-templates/chocolatey-ensure-installed/metadata.json b/src/step-templates/chocolatey-ensure-installed/metadata.json
new file mode 100644
index 000000000..0a1cecc72
--- /dev/null
+++ b/src/step-templates/chocolatey-ensure-installed/metadata.json
@@ -0,0 +1,21 @@
+{
+  "Id": "c364b0a5-a0b7-48f8-a1a4-35e9f54a82d3",
+  "Name": "Chocolatey - Ensure Installed",
+  "Description": "Ensures that the Chocolatey package manager is installed on the system. The installer is downloaded from https://chocolatey.org if required.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [],
+  "LastModifiedOn": "2020-07-28T06:42:22.2840000-07:00",
+  "LastModifiedBy": "pauby",
+  "$Meta": {
+    "ExportedAt": "2020-07-28T06:42:22.2840000-07:00",
+    "OctopusVersion": "2.4.7.85",
+    "Type": "ActionTemplate"
+  },
+  "Category": "chocolatey"
+}
diff --git a/src/step-templates/chocolatey-ensure-installed/scriptbody.ps1 b/src/step-templates/chocolatey-ensure-installed/scriptbody.ps1
new file mode 100644
index 000000000..35744e613
--- /dev/null
+++ b/src/step-templates/chocolatey-ensure-installed/scriptbody.ps1
@@ -0,0 +1,16 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+Write-Output "Ensuring the Chocolatey package manager is installed..."
+
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+$chocInstalled = Test-Path "$chocolateyBin\choco.exe"
+
+if (-not $chocInstalled) {
+    Write-Output "Chocolatey not found, installing..."
+    
+    $installPs1 = ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))
+    Invoke-Expression $installPs1
+    
+    Write-Output "Chocolatey installation complete."
+} else {
+    Write-Output "Chocolatey was found at $chocolateyBin and won't be reinstalled."
+}
diff --git a/step-templates/chocolatey-install-package.json b/src/step-templates/chocolatey-install-package/metadata.json
similarity index 54%
rename from step-templates/chocolatey-install-package.json
rename to src/step-templates/chocolatey-install-package/metadata.json
index b52ac9a6e..436504a42 100644
--- a/step-templates/chocolatey-install-package.json
+++ b/src/step-templates/chocolatey-install-package/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 6,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\nif(-not (Test-Path $chocolateyBin)) {\n    Write-Output \"Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables...\"\n    $chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"User\") + \"\\bin\"\n}\n\n$choco = \"$chocolateyBin\\choco.exe\"\n\nif (-not (Test-Path $choco)) {\n    throw \"Chocolatey was not found at $chocolateyBin.\"\n}\n\n$chocoArgs = @('install')\nif (-not $ChocolateyPackageId) {\n    throw \"Please specify the ID of an application package to install.\"\n}\nelse {\n    $chocoArgs += $ChocolateyPackageId -split ' '\n}\n\n$chocoVersion = & $choco --version\nWrite-Output \"Running Chocolatey version $chocoVersion\"\n\nif (-not $ChocolateyPackageVersion) {\n    Write-Output \"Installing package(s) $ChocolateyPackageId from the Chocolatey package repository...\"\n} else {\n    Write-Output \"Installing package $ChocolateyPackageId version $ChocolateyPackageVersion from the Chocolatey package repository...\"\n    $chocoArgs += @('--version', $ChocolateyPackageVersion)\n}\n\nif([System.Version]::Parse($chocoVersion) -ge [System.Version]::Parse(\"0.9.8.33\")) {\n    Write-Output \"Adding --yes to arguments passed to Chocolatey\"\n    $chocoArgs += @(\"--yes\")\n}\n\nif (![String]::IsNullOrEmpty($ChocolateyCacheLocation)) {\n    Write-Output \"Using --cache-location $ChocolateyCacheLocation\"\n    $chocoArgs += @(\"--cache-location\", \"`\"'$ChocolateyCacheLocation'`\"\")\n}\n\nif (![String]::IsNullOrEmpty($ChocolateySource)) {\n    Write-Output \"Using package --source $ChocolateySource\"\n    $chocoArgs += @('--source', \"`\"'$ChocolateySource'`\"\")\n}\n\nif (($ChocolateyNoProgress -eq 'True') -and ([System.Version]::Parse($chocoVersion) -ge [System.Version]::Parse(\"0.10.4\"))) {\n    Write-Output \"Disabling download progress with --no-progress\"\n    $chocoArgs += @('--no-progress')\n}\n\nif (![String]::IsNullOrEmpty($ChocolateyOtherParameters)) {\n\t$chocoArgs += $ChocolateyOtherParameters -split ' '\n}\n\n# execute the command line\nWrite-Output \"Running the command: $choco $chocoArgs\"\n& $choco $chocoArgs\n\nif ($global:LASTEXITCODE -eq 3010) { \n\t# ignore reboot required exit code\n    Write-Output \"A restart may be required for the package to work\"\n    $global:LASTEXITCODE = 0\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.EnabledFeatures": ""
@@ -72,10 +72,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2020-08-10T15:59:10.300Z",
+    "ExportedAt": "2020-08-10T15:59:10.3000000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/chocolatey-install-package/scriptbody.ps1 b/src/step-templates/chocolatey-install-package/scriptbody.ps1
new file mode 100644
index 000000000..5dc49fb1c
--- /dev/null
+++ b/src/step-templates/chocolatey-install-package/scriptbody.ps1
@@ -0,0 +1,64 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+if(-not (Test-Path $chocolateyBin)) {
+    Write-Output "Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables..."
+    $chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "User") + "\bin"
+}
+
+$choco = "$chocolateyBin\choco.exe"
+
+if (-not (Test-Path $choco)) {
+    throw "Chocolatey was not found at $chocolateyBin."
+}
+
+$chocoArgs = @('install')
+if (-not $ChocolateyPackageId) {
+    throw "Please specify the ID of an application package to install."
+}
+else {
+    $chocoArgs += $ChocolateyPackageId -split ' '
+}
+
+$chocoVersion = & $choco --version
+Write-Output "Running Chocolatey version $chocoVersion"
+
+if (-not $ChocolateyPackageVersion) {
+    Write-Output "Installing package(s) $ChocolateyPackageId from the Chocolatey package repository..."
+} else {
+    Write-Output "Installing package $ChocolateyPackageId version $ChocolateyPackageVersion from the Chocolatey package repository..."
+    $chocoArgs += @('--version', $ChocolateyPackageVersion)
+}
+
+if([System.Version]::Parse($chocoVersion) -ge [System.Version]::Parse("0.9.8.33")) {
+    Write-Output "Adding --yes to arguments passed to Chocolatey"
+    $chocoArgs += @("--yes")
+}
+
+if (![String]::IsNullOrEmpty($ChocolateyCacheLocation)) {
+    Write-Output "Using --cache-location $ChocolateyCacheLocation"
+    $chocoArgs += @("--cache-location", "`"'$ChocolateyCacheLocation'`"")
+}
+
+if (![String]::IsNullOrEmpty($ChocolateySource)) {
+    Write-Output "Using package --source $ChocolateySource"
+    $chocoArgs += @('--source', "`"'$ChocolateySource'`"")
+}
+
+if (($ChocolateyNoProgress -eq 'True') -and ([System.Version]::Parse($chocoVersion) -ge [System.Version]::Parse("0.10.4"))) {
+    Write-Output "Disabling download progress with --no-progress"
+    $chocoArgs += @('--no-progress')
+}
+
+if (![String]::IsNullOrEmpty($ChocolateyOtherParameters)) {
+	$chocoArgs += $ChocolateyOtherParameters -split ' '
+}
+
+# execute the command line
+Write-Output "Running the command: $choco $chocoArgs"
+& $choco $chocoArgs
+
+if ($global:LASTEXITCODE -eq 3010) { 
+	# ignore reboot required exit code
+    Write-Output "A restart may be required for the package to work"
+    $global:LASTEXITCODE = 0
+}
\ No newline at end of file
diff --git a/step-templates/chocolatey-manage-config.json b/src/step-templates/chocolatey-manage-config/metadata.json
similarity index 56%
rename from step-templates/chocolatey-manage-config.json
rename to src/step-templates/chocolatey-manage-config/metadata.json
index dfa6bc0a3..faec5e1a2 100644
--- a/step-templates/chocolatey-manage-config.json
+++ b/src/step-templates/chocolatey-manage-config/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\nif(-not (Test-Path $chocolateyBin)) {\n    Write-Host \"Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables...\"\n    $chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"User\") + \"\\bin\"\n}\n\n$choco = \"$chocolateyBin\\choco.exe\"\n\nif (-not (Test-Path $choco)) {\n    throw \"Chocolatey was not found at $chocolateyBin.\"\n}\n\n# Report the actual version here\n$chocoVersion = & $choco --version\nWrite-Host \"Running Chocolatey version $chocoVersion\"\n\n# default args\n$chocoArgs = @('config', $ChocolateyConfigAction, '--yes')\n\n# we need a source name\nif ([string]::IsNullOrEmpty($ChocolateyConfigName)) {\n    throw \"To manage a feature,  you need to provide a feature name.\"\n}\nelse {\n\t$chocoArgs += \"--name=\"\"'$ChocolateyConfigName'\"\"\"\n}\n\nif ($ChocolateyConfigAction -eq 'set') {\n    if ([string]::IsNullOrEmpty($ChocolateyConfigValue)) {\n        throw 'To set the config, you need to provide a value.'\n    }\n    \n    $chocoArgs += \"--value=\"\"'$ChocolateyConfigValue'\"\"\"\n}\n\n# finally add any other parameters\nif (-not [string]::IsNullOrEmpty($ChocolateyConfigOtherParameters)) {\n\t$chocoArgs += $ChocolateyConfigOtherParameters -split ' '\n}\n\n# execute the command line\nWrite-Host \"Running the command: $choco $chocoArgs\"\n& $choco $chocoArgs",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.EnabledFeatures": ""
   },
   "Parameters": [
@@ -56,11 +56,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-13T20:03:44.800Z",
+    "ExportedAt": "2020-08-13T20:03:44.8000000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
-  "LastModfiedAt": "2020-08-13T20:03:44.800Z",
+  "LastModfiedAt": "2020-08-13T20:03:44.8000000Z",
   "LastModifiedBy": "pauby",
   "Category": "chocolatey"
 }
diff --git a/src/step-templates/chocolatey-manage-config/scriptbody.ps1 b/src/step-templates/chocolatey-manage-config/scriptbody.ps1
new file mode 100644
index 000000000..1e3425276
--- /dev/null
+++ b/src/step-templates/chocolatey-manage-config/scriptbody.ps1
@@ -0,0 +1,44 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+if(-not (Test-Path $chocolateyBin)) {
+    Write-Host "Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables..."
+    $chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "User") + "\bin"
+}
+
+$choco = "$chocolateyBin\choco.exe"
+
+if (-not (Test-Path $choco)) {
+    throw "Chocolatey was not found at $chocolateyBin."
+}
+
+# Report the actual version here
+$chocoVersion = & $choco --version
+Write-Host "Running Chocolatey version $chocoVersion"
+
+# default args
+$chocoArgs = @('config', $ChocolateyConfigAction, '--yes')
+
+# we need a source name
+if ([string]::IsNullOrEmpty($ChocolateyConfigName)) {
+    throw "To manage a feature,  you need to provide a feature name."
+}
+else {
+	$chocoArgs += "--name=""'$ChocolateyConfigName'"""
+}
+
+if ($ChocolateyConfigAction -eq 'set') {
+    if ([string]::IsNullOrEmpty($ChocolateyConfigValue)) {
+        throw 'To set the config, you need to provide a value.'
+    }
+    
+    $chocoArgs += "--value=""'$ChocolateyConfigValue'"""
+}
+
+# finally add any other parameters
+if (-not [string]::IsNullOrEmpty($ChocolateyConfigOtherParameters)) {
+	$chocoArgs += $ChocolateyConfigOtherParameters -split ' '
+}
+
+# execute the command line
+Write-Host "Running the command: $choco $chocoArgs"
+& $choco $chocoArgs
\ No newline at end of file
diff --git a/step-templates/chocolatey-manage-features.json b/src/step-templates/chocolatey-manage-features/metadata.json
similarity index 54%
rename from step-templates/chocolatey-manage-features.json
rename to src/step-templates/chocolatey-manage-features/metadata.json
index e0be23d22..658fe362a 100644
--- a/step-templates/chocolatey-manage-features.json
+++ b/src/step-templates/chocolatey-manage-features/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\nif(-not (Test-Path $chocolateyBin)) {\n    Write-Host \"Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables...\"\n    $chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"User\") + \"\\bin\"\n}\n\n$choco = \"$chocolateyBin\\choco.exe\"\n\nif (-not (Test-Path $choco)) {\n    throw \"Chocolatey was not found at $chocolateyBin.\"\n}\n\n# Report the actual version here\n$chocoVersion = & $choco --version\nWrite-Host \"Running Chocolatey version $chocoVersion\"\n\n# default args\n$chocoArgs = @('feature', $ChocolateyFeatureAction, '--yes')\n\n# we need a source name\nif ([string]::IsNullOrEmpty($ChocolateyFeatureName)) {\n    throw \"To manage a feature,  you need to provide a feature name.\"\n}\n\n# finally add any other parameters\nif (-not [string]::IsNullOrEmpty($ChocolateyFeatureOtherParameters)) {\n\t$chocoArgs += $ChocolateyFeatureOtherParameters -split ' '\n}\n\n$featureNames = $ChocolateyFeatureName -split ' '\nForEach ($name in $featureNames) {\n\t$cmdArgs = $chocoArgs + \"--name=\"\"'$name'\"\"\"\n\n    # execute the command line\n    Write-Host \"Running the command: $choco $cmdArgs\"\n    & $choco $cmdArgs\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.EnabledFeatures": ""
   },
   "Parameters": [
@@ -46,11 +46,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-13T17:03:20.000Z",
+    "ExportedAt": "2020-08-13T17:03:20.0000000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
-  "LastModifiedAt": "2020-08-13T17:03:20.000Z",
+  "LastModifiedAt": "2020-08-13T17:03:20.0000000Z",
   "LastModifiedBy": "pauby",
   "Category": "chocolatey"
 }
diff --git a/src/step-templates/chocolatey-manage-features/scriptbody.ps1 b/src/step-templates/chocolatey-manage-features/scriptbody.ps1
new file mode 100644
index 000000000..9182c7283
--- /dev/null
+++ b/src/step-templates/chocolatey-manage-features/scriptbody.ps1
@@ -0,0 +1,38 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+if(-not (Test-Path $chocolateyBin)) {
+    Write-Host "Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables..."
+    $chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "User") + "\bin"
+}
+
+$choco = "$chocolateyBin\choco.exe"
+
+if (-not (Test-Path $choco)) {
+    throw "Chocolatey was not found at $chocolateyBin."
+}
+
+# Report the actual version here
+$chocoVersion = & $choco --version
+Write-Host "Running Chocolatey version $chocoVersion"
+
+# default args
+$chocoArgs = @('feature', $ChocolateyFeatureAction, '--yes')
+
+# we need a source name
+if ([string]::IsNullOrEmpty($ChocolateyFeatureName)) {
+    throw "To manage a feature,  you need to provide a feature name."
+}
+
+# finally add any other parameters
+if (-not [string]::IsNullOrEmpty($ChocolateyFeatureOtherParameters)) {
+	$chocoArgs += $ChocolateyFeatureOtherParameters -split ' '
+}
+
+$featureNames = $ChocolateyFeatureName -split ' '
+ForEach ($name in $featureNames) {
+	$cmdArgs = $chocoArgs + "--name=""'$name'"""
+
+    # execute the command line
+    Write-Host "Running the command: $choco $cmdArgs"
+    & $choco $cmdArgs
+}
\ No newline at end of file
diff --git a/step-templates/chocolatey-manage-sources.json b/src/step-templates/chocolatey-manage-sources/metadata.json
similarity index 51%
rename from step-templates/chocolatey-manage-sources.json
rename to src/step-templates/chocolatey-manage-sources/metadata.json
index 4c1854377..0beabecac 100644
--- a/step-templates/chocolatey-manage-sources.json
+++ b/src/step-templates/chocolatey-manage-sources/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\nif(-not (Test-Path $chocolateyBin)) {\n    Write-Host \"Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables...\"\n    $chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"User\") + \"\\bin\"\n}\n\n$choco = \"$chocolateyBin\\choco.exe\"\n\nif (-not (Test-Path $choco)) {\n    throw \"Chocolatey was not found at $chocolateyBin.\"\n}\n\n# Report the actual version here\n$chocoVersion = & $choco --version\nWrite-Host \"Running Chocolatey version $chocoVersion\"\n\n# You cannot use [version] with SemVer 2 versions\n# this allows pre-release versions to still work by stripping everything after the '-' as we could have\n# 0.10.15-beta-20200101. We are only interested in the major.minor.build version\n$chocoVersion = ($chocoVersion -split '-')[0].ToString()\n\n# default args\n$chocoArgs = @('source', $ChocolateySourceAction, '--yes')\n\n# we need a source name\nif ([string]::IsNullOrEmpty($ChocolateySourceName)) {\n    throw \"To manage a source you need to provide a source name.\"\n}\nelse {\n\t$chocoArgs += \"--name=\"\"'$ChocolateySourceName'\"\"\"\n}\n\n# we are adding a source - check all of the parameters\nif ($ChocolateySourceAction -eq 'add') {\n\tif ([string]::IsNullOrEmpty($ChocolateySourceLocation)) {\n\t\tthrow 'To add a source you need to provide a source location.'\n\t}\n    else {\n    \t$chocoArgs += \"--source=\"\"'$ChocolateySourceLocation'\"\"\"\n    }\n\n    # source priority\n    if (-not [string]::IsNullOrEmpty($ChocolateySourcePriority)) {\n    \tif ([version]$chocoVersion -ge [version]'0.9.9.9') {\n    \t\t$chocoArgs += \"--priority=\"\"'$ChocolateySourcePriority'\"\"\"\n        }\n        else {\n        \tWrite-Warning 'To use a source priority you must have Chocolatey version 0.9.9.9 or later. Ignoring source priority.'\n        }\n    }\n\n    # allow self service\n    if ($ChocolateySourceAllowSelfService) {\n    \t$edition = & $choco\n    \tif ($edition -like '*Business*' -and [version]$chocoVersion -ge [version]'0.10.4') {\n        \t$chocoArgs += '--allow-self-service'\n        }\n        else {\n        \tWrite-Warning 'To allow self service on a source you must have Chocolatey For Business version 0.10.4 or later. Ignoring allowing self service.'\n        }\n    }\n\n    # allow admin only\n    if ($ChocolateySourceEnableAdminOnly) {\n        # we are not going to check for the Business Edition but the chocolatey.extension version need to check we have the chocolatey.extension installed\n        $licensedExtension = & $choco list chocolatey.extension --exact --limit-output --local-only | ConvertFrom-Csv -Delimiter '|' -Header 'Name', 'Version'\n\n        # lets get the major.minor.build licensed extension version by stripping any pre-release\n        $licensedExtensionVersion = ($licensedExtension.Version -split '-')[0].ToString()\n        if ((-not [string]::IsNullOrEmpty($licensedExtensionVersion)) -and ([version]$chocoVersion -ge [version]'0.10.8' -and [version]$licensedExtensionVersion -ge [version]'1.12.2')) {\n        \t$chocoArgs += '--enable-admin-only'\n        }\n        else {\n        \tWrite-Warning 'To enable admin only on a source you must have Chocolatey For Business Licensed Extension (chocolatey.extension package) version 1.12.2 or later and Chocolatey version 0.10.8 or later. Ignoring admin only enablement.'\n        }\n\t}\n\n    # we need both a username and a password - if one is used without the other then throw\n    if (($ChocolateySourceUsername -and -not $ChocolateySourcePassword) -or ($ChocolateySourcePassword -and -not $ChocolateySourceUsername)) {\n    \tthrow 'If you are using an authenticated source you must provide both a username AND a password.'\n    }\n    elseif ($ChocolateySourceUsername -and $ChocolateySourcePassword) {\n\t\t$chocoArgs += @(\"--user=\"\"'$ChocolateySourceUsername'\"\"\", \"--password=\"\"'$ChocolateySourcePassword'\"\"\")\n    }\n\n    # check if we have a certificate path\n    if (-not [string]::IsNullOrEmpty($ChocolateySourceCertificatePath)) {\n    \tif (-not (Test-Path -Path $ChocolateySourceCertificatePath)) {\n        \tthrow \"The certificate at '$ChocolateySourceCertificatePath' does not exist. Please make sure the certificate exists on the target at the provided path.\"\n        }\n\n        $chocoArgs += \"--cert=\"\"'$ChocolateySourceCertificatePath'\"\"\"\n\n        # if we have a password it can only be used with a certificate path\n        if (-not [string]::IsNullOrEmpty($ChocolateySourceCertificatePassword)) {\n\t\t\t$chocoArgs += \"--certpassword=\"\"'$ChocolateySourceCertificatePassword'\"\"\"\n        }\n    }\n    elseif (-not [string]::IsNullOrEmpty($ChocolateySourceCertificatePassword)) {\n    \tWrite-Warning 'You have provided a client certificate password but no client certificate path. Ignoring client certificate password.'\n    }\n}\n\n# finally add any other parameters\nif (-not [string]::IsNullOrEmpty($ChocolateySourceOtherParameters)) {\n\t$chocoArgs += $ChocolateySourceOtherParameters -split ' '\n}\n\n# execute the command line\nWrite-Host \"Running the command: $choco $chocoArgs\"\n& $choco $chocoArgs",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.EnabledFeatures": ""
   },
   "Parameters": [
@@ -126,11 +126,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-13T13:35:57.400Z",
+    "ExportedAt": "2020-08-13T13:35:57.4000000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2020-08-13T13:35:57.400Z",
+  "LastModifiedOn": "2020-08-13T13:35:57.4000000Z",
   "LastModifiedBy": "pauby",
   "Category": "chocolatey"
 }
diff --git a/src/step-templates/chocolatey-manage-sources/scriptbody.ps1 b/src/step-templates/chocolatey-manage-sources/scriptbody.ps1
new file mode 100644
index 000000000..4aa38d595
--- /dev/null
+++ b/src/step-templates/chocolatey-manage-sources/scriptbody.ps1
@@ -0,0 +1,112 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+if(-not (Test-Path $chocolateyBin)) {
+    Write-Host "Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables..."
+    $chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "User") + "\bin"
+}
+
+$choco = "$chocolateyBin\choco.exe"
+
+if (-not (Test-Path $choco)) {
+    throw "Chocolatey was not found at $chocolateyBin."
+}
+
+# Report the actual version here
+$chocoVersion = & $choco --version
+Write-Host "Running Chocolatey version $chocoVersion"
+
+# You cannot use [version] with SemVer 2 versions
+# this allows pre-release versions to still work by stripping everything after the '-' as we could have
+# 0.10.15-beta-20200101. We are only interested in the major.minor.build version
+$chocoVersion = ($chocoVersion -split '-')[0].ToString()
+
+# default args
+$chocoArgs = @('source', $ChocolateySourceAction, '--yes')
+
+# we need a source name
+if ([string]::IsNullOrEmpty($ChocolateySourceName)) {
+    throw "To manage a source you need to provide a source name."
+}
+else {
+	$chocoArgs += "--name=""'$ChocolateySourceName'"""
+}
+
+# we are adding a source - check all of the parameters
+if ($ChocolateySourceAction -eq 'add') {
+	if ([string]::IsNullOrEmpty($ChocolateySourceLocation)) {
+		throw 'To add a source you need to provide a source location.'
+	}
+    else {
+    	$chocoArgs += "--source=""'$ChocolateySourceLocation'"""
+    }
+
+    # source priority
+    if (-not [string]::IsNullOrEmpty($ChocolateySourcePriority)) {
+    	if ([version]$chocoVersion -ge [version]'0.9.9.9') {
+    		$chocoArgs += "--priority=""'$ChocolateySourcePriority'"""
+        }
+        else {
+        	Write-Warning 'To use a source priority you must have Chocolatey version 0.9.9.9 or later. Ignoring source priority.'
+        }
+    }
+
+    # allow self service
+    if ($ChocolateySourceAllowSelfService) {
+    	$edition = & $choco
+    	if ($edition -like '*Business*' -and [version]$chocoVersion -ge [version]'0.10.4') {
+        	$chocoArgs += '--allow-self-service'
+        }
+        else {
+        	Write-Warning 'To allow self service on a source you must have Chocolatey For Business version 0.10.4 or later. Ignoring allowing self service.'
+        }
+    }
+
+    # allow admin only
+    if ($ChocolateySourceEnableAdminOnly) {
+        # we are not going to check for the Business Edition but the chocolatey.extension version need to check we have the chocolatey.extension installed
+        $licensedExtension = & $choco list chocolatey.extension --exact --limit-output --local-only | ConvertFrom-Csv -Delimiter '|' -Header 'Name', 'Version'
+
+        # lets get the major.minor.build licensed extension version by stripping any pre-release
+        $licensedExtensionVersion = ($licensedExtension.Version -split '-')[0].ToString()
+        if ((-not [string]::IsNullOrEmpty($licensedExtensionVersion)) -and ([version]$chocoVersion -ge [version]'0.10.8' -and [version]$licensedExtensionVersion -ge [version]'1.12.2')) {
+        	$chocoArgs += '--enable-admin-only'
+        }
+        else {
+        	Write-Warning 'To enable admin only on a source you must have Chocolatey For Business Licensed Extension (chocolatey.extension package) version 1.12.2 or later and Chocolatey version 0.10.8 or later. Ignoring admin only enablement.'
+        }
+	}
+
+    # we need both a username and a password - if one is used without the other then throw
+    if (($ChocolateySourceUsername -and -not $ChocolateySourcePassword) -or ($ChocolateySourcePassword -and -not $ChocolateySourceUsername)) {
+    	throw 'If you are using an authenticated source you must provide both a username AND a password.'
+    }
+    elseif ($ChocolateySourceUsername -and $ChocolateySourcePassword) {
+		$chocoArgs += @("--user=""'$ChocolateySourceUsername'""", "--password=""'$ChocolateySourcePassword'""")
+    }
+
+    # check if we have a certificate path
+    if (-not [string]::IsNullOrEmpty($ChocolateySourceCertificatePath)) {
+    	if (-not (Test-Path -Path $ChocolateySourceCertificatePath)) {
+        	throw "The certificate at '$ChocolateySourceCertificatePath' does not exist. Please make sure the certificate exists on the target at the provided path."
+        }
+
+        $chocoArgs += "--cert=""'$ChocolateySourceCertificatePath'"""
+
+        # if we have a password it can only be used with a certificate path
+        if (-not [string]::IsNullOrEmpty($ChocolateySourceCertificatePassword)) {
+			$chocoArgs += "--certpassword=""'$ChocolateySourceCertificatePassword'"""
+        }
+    }
+    elseif (-not [string]::IsNullOrEmpty($ChocolateySourceCertificatePassword)) {
+    	Write-Warning 'You have provided a client certificate password but no client certificate path. Ignoring client certificate password.'
+    }
+}
+
+# finally add any other parameters
+if (-not [string]::IsNullOrEmpty($ChocolateySourceOtherParameters)) {
+	$chocoArgs += $ChocolateySourceOtherParameters -split ' '
+}
+
+# execute the command line
+Write-Host "Running the command: $choco $chocoArgs"
+& $choco $chocoArgs
\ No newline at end of file
diff --git a/step-templates/chocolatey-pin-package.json b/src/step-templates/chocolatey-pin-package/metadata.json
similarity index 52%
rename from step-templates/chocolatey-pin-package.json
rename to src/step-templates/chocolatey-pin-package/metadata.json
index a1ff94e9c..599381ef8 100644
--- a/step-templates/chocolatey-pin-package.json
+++ b/src/step-templates/chocolatey-pin-package/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\nif(-not (Test-Path $chocolateyBin)) {\n    Write-Output \"Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables...\"\n    $chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"User\") + \"\\bin\"\n}\n\n$choco = \"$chocolateyBin\\choco.exe\"\n\nif (-not (Test-Path $choco)) {\n    throw \"Chocolatey was not found at $chocolateyBin.\"\n}\n\n# check we have required parameters\nif (-not $ChocolateyPackagePinId) {\n    throw \"Please specify the ID of an application package to install.\"\n}\n\n$chocoVersion = & $choco --version\nWrite-Output \"Running Chocolatey version $chocoVersion\"\n\n# base arguments to use with choco.exe\n$chocoBaseArgs = @('pin', $ChocolateyPackagePinAction)\n\n# this parameter only works in Chocolatey licensed editions\nif ($ChocolateyPackagePinReason) {\n \t# determine if this is a licensed edition\n\t$edition = & $choco\n    if ($edition -like '*Business*' -and [version]$chocoVersion -ge [version]'1.12.2') {\n    \tWrite-Output \"Using reason '$ChocolateyPackagePinReason' when pinning packages.\"\n    \t$chocoBaseArgs += \"--reason=\"\"'$ChocolateyPackagePinReason'\"\"\"\n    }\n\telse {\n    \tWrite-Output \"Using a reason for a package pin only works with Chocolatey For Business licensed editions. Ignoring the pin reason '$ChocolateyPackagePinReason'.\"\n\t}\n}\n\nif ($ChocolateyPackagePinVersion) {\n\t$chocoBaseArgs += \"--version=$ChocolateyPackagePinVersion\"\n}\n\n$chocoPackages = $ChocolateyPackagePinId -split ' '\nForEach ($package in $chocoPackages) {\n\tWrite-Output \"Pinning Chocolatey package $package.\"\n    $chocoArgs = $chocoBaseArgs + @(\"--name=\"\"'$package'\"\"\")\n    \n    # execute the command line\n\tWrite-Output \"Running the command: $choco $chocoArgs\"\n\t& $choco $chocoArgs\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.EnabledFeatures": ""
   },
   "Parameters": [
@@ -56,11 +56,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-10T17:30:40.400Z",
+    "ExportedAt": "2020-08-10T17:30:40.4000000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2020-08-10T17:30:40.400Z",
+  "LastModifiedOn": "2020-08-10T17:30:40.4000000Z",
   "LastModifiedBy": "pauby",
   "Category": "chocolatey"
 }
diff --git a/src/step-templates/chocolatey-pin-package/scriptbody.ps1 b/src/step-templates/chocolatey-pin-package/scriptbody.ps1
new file mode 100644
index 000000000..76889b494
--- /dev/null
+++ b/src/step-templates/chocolatey-pin-package/scriptbody.ps1
@@ -0,0 +1,50 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+$chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "Machine") + "\bin"
+if(-not (Test-Path $chocolateyBin)) {
+    Write-Output "Environment variable 'ChocolateyInstall' was not found in the system variables. Attempting to find it in the user variables..."
+    $chocolateyBin = [Environment]::GetEnvironmentVariable("ChocolateyInstall", "User") + "\bin"
+}
+
+$choco = "$chocolateyBin\choco.exe"
+
+if (-not (Test-Path $choco)) {
+    throw "Chocolatey was not found at $chocolateyBin."
+}
+
+# check we have required parameters
+if (-not $ChocolateyPackagePinId) {
+    throw "Please specify the ID of an application package to install."
+}
+
+$chocoVersion = & $choco --version
+Write-Output "Running Chocolatey version $chocoVersion"
+
+# base arguments to use with choco.exe
+$chocoBaseArgs = @('pin', $ChocolateyPackagePinAction)
+
+# this parameter only works in Chocolatey licensed editions
+if ($ChocolateyPackagePinReason) {
+ 	# determine if this is a licensed edition
+	$edition = & $choco
+    if ($edition -like '*Business*' -and [version]$chocoVersion -ge [version]'1.12.2') {
+    	Write-Output "Using reason '$ChocolateyPackagePinReason' when pinning packages."
+    	$chocoBaseArgs += "--reason=""'$ChocolateyPackagePinReason'"""
+    }
+	else {
+    	Write-Output "Using a reason for a package pin only works with Chocolatey For Business licensed editions. Ignoring the pin reason '$ChocolateyPackagePinReason'."
+	}
+}
+
+if ($ChocolateyPackagePinVersion) {
+	$chocoBaseArgs += "--version=$ChocolateyPackagePinVersion"
+}
+
+$chocoPackages = $ChocolateyPackagePinId -split ' '
+ForEach ($package in $chocoPackages) {
+	Write-Output "Pinning Chocolatey package $package."
+    $chocoArgs = $chocoBaseArgs + @("--name=""'$package'""")
+    
+    # execute the command line
+	Write-Output "Running the command: $choco $chocoArgs"
+	& $choco $chocoArgs
+}
\ No newline at end of file
diff --git a/src/step-templates/clickonce-from-deployed-package/metadata.json b/src/step-templates/clickonce-from-deployed-package/metadata.json
new file mode 100644
index 000000000..577d40662
--- /dev/null
+++ b/src/step-templates/clickonce-from-deployed-package/metadata.json
@@ -0,0 +1,106 @@
+{
+  "Id": "1b7909be-4870-4f81-8957-8357b9342c0f",
+  "Name": "ClickOnce - Create from deployed package",
+  "Description": "Create binaries manifest & CO application and sign them with given code sign certificate ... using mage.exe.",
+  "ActionType": "Octopus.Script",
+  "Version": 28,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "DeployStepName",
+      "Label": "Deploy step to read binaries from",
+      "HelpText": "Name of the previous step used to deploy binaries that will be packed in CO package",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "DestinationPath",
+      "Label": "Path to the directory where to deploy the ClickOnce package",
+      "HelpText": "Path to the target directory for the ClickOnce package. This will contain the created *.application file and the \"Application Files\" folder",
+      "DefaultValue": "\\\\MyServer\\MyClickOnceRepo\\#{Octopus.Project.Name}\\#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ExeFileName",
+      "Label": "Name of the target executable file",
+      "HelpText": "Name of the executable file of the application to pack",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Publisher",
+      "Label": "Publisher name",
+      "HelpText": "Publisher name to use when creating the CO package",
+      "DefaultValue": "MyCompany",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SignCertFilePath",
+      "Label": "Path to the certification file",
+      "HelpText": "Path to the certification pfx file",
+      "DefaultValue": "\\\\MyServer\\Auth\\cert\\my-cert.pfx",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SignCertPassword",
+      "Label": "Password of the certification file",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "MageExePath",
+      "Label": "Path to mage.exe",
+      "HelpText": "Path to mage.exe which is used to update manifest and .application files and sign them.",
+      "DefaultValue": "\\\\MyServer\\Tools\\Octopus\\Tentacles\\mage.exe",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "IconFile",
+      "Label": "Icon filename",
+      "HelpText": "Name of icon file in the package, eg. ApplicationIcon.ico",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DisplayName",
+      "Label": "Application display name",
+      "HelpText": "Name which appears in the Start Menu",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2017-02-27T22:53:27.9700000-08:00",
+  "LastModifiedBy": "Grendizr",
+  "$Meta": {
+    "ExportedAt": "2016-09-14T23:53:27.9700000-07:00",
+    "OctopusVersion": "3.4.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "clickOnce"
+}
diff --git a/src/step-templates/clickonce-from-deployed-package/scriptbody.ps1 b/src/step-templates/clickonce-from-deployed-package/scriptbody.ps1
new file mode 100644
index 000000000..6825dda7c
--- /dev/null
+++ b/src/step-templates/clickonce-from-deployed-package/scriptbody.ps1
@@ -0,0 +1,93 @@
+Write-Host "Building clickonce application ..."
+
+function Validate-Parameter([REF]$f, $name, $value) {
+    if (!$value) {
+        throw ('Missing required value for parameter ''{0}''.' -f $name)
+    }
+    
+    $f.Value = $value
+    Write-Host "Parameters [$name] has been initialized with : [$value]"
+}
+
+### Parameters
+$deployStepName = $null
+$appName = $null
+$exeFileName = $null
+$destinationPath = $null
+$certFilePath = $null
+$certPassword = $null
+$publisher = $null
+$mageExe = $null
+$version = $null
+$binariesFolderPath = $null
+$coAppName = $null
+$iconFile = $null
+
+Validate-Parameter ([REF]$deployStepName) 'Deploy step name to read binaries from' $OctopusParameters['DeployStepName']
+Validate-Parameter ([REF]$appName) 'Project name' $OctopusParameters['Octopus.Project.Name']
+Validate-Parameter ([REF]$coAppName) 'Application display name' $OctopusParameters['DisplayName']
+
+Validate-Parameter ([REF]$exeFileName) 'Executable file name' $OctopusParameters['ExeFileName']
+Validate-Parameter ([REF]$destinationPath) 'Path to the directory where to deploy the ClickOnce package' $OctopusParameters['DestinationPath']
+Validate-Parameter ([REF]$certFilePath) 'Path to the certification file' $OctopusParameters['SignCertFilePath']
+Validate-Parameter ([REF]$certPassword) 'Password of the certification file' $OctopusParameters['SignCertPassword']
+Validate-Parameter ([REF]$publisher) 'Publisher name' $OctopusParameters['Publisher']
+Validate-Parameter ([REF]$mageExe) 'Path to the mage.exe' $OctopusParameters['MageExePath']
+Validate-Parameter ([REF]$iconFile) 'Icon file' $OctopusParameters['IconFile']
+
+### end of parameters
+
+Validate-Parameter ([REF]$version) 'Version number (from release)' $OctopusParameters['Octopus.Release.Number']
+
+$binariesFolderParameter = -join("Octopus.Action[",$deployStepName,"].Output.Package.InstallationDirectoryPath")
+Write-Host "Trying to get Installation folder parameter value for : [$binariesFolderParameter]"
+
+$binariesFolderPath = $OctopusParameters[$binariesFolderParameter]
+if(!$binariesFolderPath){
+     throw ('Unable to retrieve binaries path from previous step execution for step with name ''{0}''.' -f $deployStepName)
+}
+
+$appVersionAndNumber = -join($appName, "_", $version)
+$packageDestinationSubDirectory = -join ("Application_Files/", $appVersionAndNumber)
+$packageDestinationPath = -join ($destinationPath, "/", $packageDestinationSubDirectory) 
+$appManifestRelativePath = -join ("Application_Files/",$appVersionAndNumber, "/", $exeFileName, ".manifest")
+$appManifestFilePath = -join ($binariesFolderPath, "/", $exeFileName, ".manifest")
+
+$coAppFilePath = -join($binariesFolderPath, "\", $appName, ".application")
+$coAppFilePathServer = -join($destinationPath, "\", $appName, ".application")
+
+### Create Application manifest
+Write-Host "Creating application manifest at "$appManifestFilePath
+& $mageExe -New Application -t "$appManifestFilePath" -n "$coAppName" -v $version -p msil -fd "$binariesFolderPath" -tr FullTrust -a sha256RSA -if $iconFile
+Write-Host "Signing application manifest ..."
+& $mageExe -Sign "$appManifestFilePath" -cf $certFilePath -pwd $certPassword
+
+### Create Deployment application
+Write-Host "Creating CO application [$coAppName] at "$coAppFilePath
+& $mageExe -New Deployment -t "$coAppFilePath" -n "$coAppName" -v $version -p msil -appm $appManifestFilePath -ip true -i true -um true -pub $publisher -pu "$coAppFilePathServer" -appc $appManifestRelativePath -a sha256RSA
+
+Write-Host "Updating minimum version to force auto-update"
+& $mageExe -Update $coAppFilePath -mv $version -pub $publisher -a sha256RSA
+
+Write-Host "Changing expiration max age => before application startup (hacking xml) of "$coAppFilePath
+$content = Get-Content $coAppFilePath
+$content -replace "<expiration maximumAge=`"0`" unit=`"days`" />", "<beforeApplicationStartup />" | set-content $coAppFilePath
+
+Write-Host "Signing CO application [$coAppName] ..."
+& $mageExe -Sign "$coAppFilePath" -cf $certFilePath -pwd $certPassword
+
+
+Write-Host "Copying binaries from "$binariesFolderPath
+Write-Host "to destination "$packageDestinationPath
+
+### Remove any existing files from the package destination folder
+Remove-Item $packageDestinationPath -Recurse -ErrorAction SilentlyContinue
+
+### Ensure target directory exists in order not to fail the copy
+New-Item $packageDestinationPath -ItemType directory > $null
+
+### Copy binaries to destination folder
+Copy-Item $binariesFolderPath"/*" $packageDestinationPath -recurse -Force > $null
+Copy-Item $coAppFilePath $destinationPath -Force > $null
+
+Write-Host "Building clickonce application script completed."
diff --git a/src/step-templates/clickonce-re-sign/metadata.json b/src/step-templates/clickonce-re-sign/metadata.json
new file mode 100644
index 000000000..627289c37
--- /dev/null
+++ b/src/step-templates/clickonce-re-sign/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "a9e5843e-d382-44fd-84dd-d999dab54993",
+  "Name": "ClickOnceRe-Sign",
+  "Description": "This Template will help to re-sign the .application and manifest files. Finally add .deploy extenstion to the files",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "signcertpath",
+      "Label": "Signing Certificate Path",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "signCertPass",
+      "Label": "Signing Certificate Password",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "baseDeployPath",
+      "Label": "Deployment Path",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AppName",
+      "Label": "Application Name",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-10-20T05:44:19.0410000-07:00",
+  "LastModifiedBy": "mani0070",
+  "$Meta": {
+    "ExportedAt": "2015-10-20T13:26:27.6930000-07:00",
+    "OctopusVersion": "3.1.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "clickOnce"
+}
diff --git a/src/step-templates/clickonce-re-sign/scriptbody.ps1 b/src/step-templates/clickonce-re-sign/scriptbody.ps1
new file mode 100644
index 000000000..35f604ab3
--- /dev/null
+++ b/src/step-templates/clickonce-re-sign/scriptbody.ps1
@@ -0,0 +1,14 @@
+$xml = [xml](Get-Content "$baseDeployPath\$AppName.application")
+$manifestpath = $xml.assembly.dependency.dependentAssembly.codebase
+$ApplicationWithVersion = $manifestpath.Split('\\')[1]
+
+#Manifest Resign
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\mage.exe" -Update "$baseDeployPath\$manifestpath" -FromDirectory "$baseDeployPath\Application Files\$ApplicationWithVersion"
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\mage.exe" -Sign "$baseDeployPath\$manifestpath" -CertFile $signcertpath -Password $signCertPass
+
+#Application Resign
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\mage.exe" -Update "$baseDeployPath\$AppName.application" -AppManifest "$baseDeployPath\$manifestpath"
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\mage.exe" -Sign "$baseDeployPath\$AppName.application" -CertFile $signcertpath -Password $signCertPass
+
+#Rename files back to the .deploy extension, skipping the files that shouldn't be renamed
+Get-ChildItem -Path "$baseDeployPath\Application Files\*"  -Recurse | Where-Object {!$_.PSIsContainer -and $_.Name -notlike "*.manifest" -and $_.Name -notlike "*.vsto"} | Rename-Item -NewName {$_.Name + ".deploy"} 
\ No newline at end of file
diff --git a/step-templates/clickonce-sign-file.json b/src/step-templates/clickonce-sign-file/metadata.json
similarity index 86%
rename from step-templates/clickonce-sign-file.json
rename to src/step-templates/clickonce-sign-file/metadata.json
index 71ff6b266..3ea03ad3e 100644
--- a/step-templates/clickonce-sign-file.json
+++ b/src/step-templates/clickonce-sign-file/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$find = Get-ChildItem \"$PackagePath\\$SignFileFilter\"\n$PathToFile = $find.FullName\n\n$splittedParams = $AdvencedMageParameters.Split(\" \")\n& \"$MagePath\\mage.exe\" -Sign \"$PathToFile\" -CertFile $SignCert -Password $SignCertPass $splittedParams"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -68,9 +68,9 @@
   ],
   "LastModifiedBy": "Kemyke",
   "$Meta": {
-    "ExportedAt": "2016-04-05T14:42:48.861+00:00",
+    "ExportedAt": "2016-04-05T07:42:48.8610000-07:00",
     "OctopusVersion": "3.3.0-beta0001",
     "Type": "ActionTemplate"
   },
   "Category": "clickOnce"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/clickonce-sign-file/scriptbody.ps1 b/src/step-templates/clickonce-sign-file/scriptbody.ps1
new file mode 100644
index 000000000..f7d465954
--- /dev/null
+++ b/src/step-templates/clickonce-sign-file/scriptbody.ps1
@@ -0,0 +1,5 @@
+$find = Get-ChildItem "$PackagePath\$SignFileFilter"
+$PathToFile = $find.FullName
+
+$splittedParams = $AdvencedMageParameters.Split(" ")
+& "$MagePath\mage.exe" -Sign "$PathToFile" -CertFile $SignCert -Password $SignCertPass $splittedParams
\ No newline at end of file
diff --git a/step-templates/clickonce-update-application-file.json b/src/step-templates/clickonce-update-application-file/metadata.json
similarity index 80%
rename from step-templates/clickonce-update-application-file.json
rename to src/step-templates/clickonce-update-application-file/metadata.json
index 3a7191887..9540c878e 100644
--- a/step-templates/clickonce-update-application-file.json
+++ b/src/step-templates/clickonce-update-application-file/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$xml = [xml](Get-Content \"$PackagePath\\$AppName.application\")\n$manifestpath = $xml.assembly.dependency.dependentAssembly.codebase\n\n$splittedParams = $AdvencedMageParameters.Split(\" \")\ncd \"$PackagePath\"\n& \"$MagePath\\mage.exe\" -Update \".\\$AppName.application\" -AppManifest \".\\$manifestpath\" $splittedParams\n\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -50,9 +50,9 @@
   ],
   "LastModifiedBy": "Kemyke",
   "$Meta": {
-    "ExportedAt": "2016-04-05T14:43:35.076+00:00",
+    "ExportedAt": "2016-04-05T07:43:35.0760000-07:00",
     "OctopusVersion": "3.3.0-beta0001",
     "Type": "ActionTemplate"
   },
   "Category": "clickOnce"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/clickonce-update-application-file/scriptbody.ps1 b/src/step-templates/clickonce-update-application-file/scriptbody.ps1
new file mode 100644
index 000000000..5fea67226
--- /dev/null
+++ b/src/step-templates/clickonce-update-application-file/scriptbody.ps1
@@ -0,0 +1,7 @@
+$xml = [xml](Get-Content "$PackagePath\$AppName.application")
+$manifestpath = $xml.assembly.dependency.dependentAssembly.codebase
+
+$splittedParams = $AdvencedMageParameters.Split(" ")
+cd "$PackagePath"
+& "$MagePath\mage.exe" -Update ".\$AppName.application" -AppManifest ".\$manifestpath" $splittedParams
+
diff --git a/step-templates/clickonce-update-manifest-file.json b/src/step-templates/clickonce-update-manifest-file/metadata.json
similarity index 78%
rename from step-templates/clickonce-update-manifest-file.json
rename to src/step-templates/clickonce-update-manifest-file/metadata.json
index 3fb1a1370..a3053f532 100644
--- a/step-templates/clickonce-update-manifest-file.json
+++ b/src/step-templates/clickonce-update-manifest-file/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$xml = [xml](Get-Content \"$PackagePath\\$AppName.application\")\n$manifestpath = $xml.assembly.dependency.dependentAssembly.codebase\n$ApplicationWithVersion = $manifestpath.Split('\\\\')[1]\n\n$splittedParams = $AdvencedMageParameters.Split(\" \")\n& \"$MagePath\\mage.exe\" -Update \"$PackagePath\\$manifestpath\" -FromDirectory \"$PackagePath\\Application Files\\$ApplicationWithVersion\" $splittedParams"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -50,9 +50,9 @@
   ],
   "LastModifiedBy": "Kemyke",
   "$Meta": {
-    "ExportedAt": "2016-04-05T14:46:10.321+00:00",
+    "ExportedAt": "2016-04-05T07:46:10.3210000-07:00",
     "OctopusVersion": "3.3.0-beta0001",
     "Type": "ActionTemplate"
   },
   "Category": "clickOnce"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/clickonce-update-manifest-file/scriptbody.ps1 b/src/step-templates/clickonce-update-manifest-file/scriptbody.ps1
new file mode 100644
index 000000000..9649e452d
--- /dev/null
+++ b/src/step-templates/clickonce-update-manifest-file/scriptbody.ps1
@@ -0,0 +1,6 @@
+$xml = [xml](Get-Content "$PackagePath\$AppName.application")
+$manifestpath = $xml.assembly.dependency.dependentAssembly.codebase
+$ApplicationWithVersion = $manifestpath.Split('\\')[1]
+
+$splittedParams = $AdvencedMageParameters.Split(" ")
+& "$MagePath\mage.exe" -Update "$PackagePath\$manifestpath" -FromDirectory "$PackagePath\Application Files\$ApplicationWithVersion" $splittedParams
\ No newline at end of file
diff --git a/src/step-templates/clone-tenant/metadata.json b/src/step-templates/clone-tenant/metadata.json
new file mode 100644
index 000000000..c2b797768
--- /dev/null
+++ b/src/step-templates/clone-tenant/metadata.json
@@ -0,0 +1,92 @@
+{
+  "Id": "3b0f8df0-93b8-44eb-86dd-264d1283ae70",
+  "Name": "Clone Tenant",
+  "Description": "Clone an Octopus [tenant](https://octopus.com/docs/deployment-patterns/multi-tenant-deployments). The project connections and tenant tags will be cloned and the non-sensitive variables can optionally be cloned.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "cbedd129-210e-4bab-a446-3f89192653c7",
+      "Name": "CloneTenantStep_OctopusUrl",
+      "Label": "Octopus URL",
+      "HelpText": "The URL of the Octopus Server to clone the tenant to.",
+      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea2614f0-bd41-4011-b263-7d2b12af5977",
+      "Name": "CloneTenantStep_ApiKey",
+      "Label": "Octopus API Key",
+      "HelpText": "The Octopus API Key to use for the API requests",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b29e27fb-362e-45e2-a244-6d590875fb68",
+      "Name": "CloneTenantStep_TenantIdToClone",
+      "Label": "Id of Tenant to Clone",
+      "HelpText": "The Id of the tenant to clone. This will be in the format of *Tenants-1*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b9b3a6c7-6c83-4a79-9a94-febc6c5818d3",
+      "Name": "CloneTenantStep_TenantName",
+      "Label": "New Tenant Name",
+      "HelpText": "The name of the tenant to create. *Note this must be unique*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "be821ad4-b195-4b11-81c2-f432ff05b86d",
+      "Name": "CloneTenantStep_CloneVariables",
+      "Label": "Clone Variables?",
+      "HelpText": "Flag indicating whether the source tenant's variables should be cloned to the new tenant. *Note this does not copy sensitive variables*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "831db28c-edc2-496b-b082-e6de827ca5df",
+      "Name": "CloneTenantStep_CloneTags",
+      "Label": "Clone Tags?",
+      "HelpText": "Flag indicating whether the source tenant's tags should be cloned.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f9320a59-9752-43a5-b46a-a4d1486cfced",
+      "Name": "CloneTenantStep_SpaceId",
+      "Label": "Space Id",
+      "HelpText": "The Id of the Space used to clone the tenant. **Leave blank if you are using an Octopus version earlier than 2019.1 or if you wish to use the Octopus.Space.Id variable value.**",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus",
+  "LastModifiedBy": "benjimac93"
+}
diff --git a/src/step-templates/clone-tenant/scriptbody.ps1 b/src/step-templates/clone-tenant/scriptbody.ps1
new file mode 100644
index 000000000..6347648e3
--- /dev/null
+++ b/src/step-templates/clone-tenant/scriptbody.ps1
@@ -0,0 +1,110 @@
+$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
+[Net.ServicePointManager]::SecurityProtocol = $securityProtocol
+
+$octopusBaseUrl = $CloneTenantStep_OctopusUrl.Trim('/')
+$apiKey = $CloneTenantStep_ApiKey
+$tenantToClone = $CloneTenantStep_TenantIdToClone
+$tenantName = $CloneTenantStep_TenantName
+$cloneVariables = $CloneTenantStep_CloneVariables
+$cloneTags = $CloneTenantStep_CloneTags
+$spaceId = $CloneTenantStep_SpaceId
+
+$ErrorActionPreference = 'Stop'
+
+if ([string]::IsNullOrWhiteSpace($octopusBaseUrl)) {
+    throw "The step parameter 'Octopus Base Url' was not found. This step requires the Octopus Server URL to function, please provide one and try again."
+}
+
+if ([string]::IsNullOrWhiteSpace($apiKey)) {
+    throw "The step parameter 'Octopus API Key' was not found. This step requires an API Key to function, please provide one and try again."
+}
+
+if ([string]::IsNullOrWhiteSpace($tenantToClone)) {
+    throw "The step parameter 'Id of Tenant to Clone' was not found. Please provide one and try again."
+}
+
+if ([string]::IsNullOrWhiteSpace($tenantName)) {
+    throw "The step parameter 'New Tenant Name' was not found. Please provide one and try again."
+}
+
+function Invoke-OctopusApi {
+    param(
+        [Parameter(Position = 0, Mandatory)]$Uri,
+        [ValidateSet("Get", "Post", "Put", "Delete")]$Method = 'Get',
+        $Body
+    )
+    
+    $uriParts = @($octopusBaseUrl, $Uri.TrimStart('/'))    
+    $uri = ($uriParts -join '/')
+
+    Write-Verbose "Uri: $uri"
+    
+    $requestParameters = @{
+        Uri = $uri
+        Method = $Method
+        Headers = @{ "X-Octopus-ApiKey" = $apiKey }
+        UseBasicParsing = $true
+    }
+    
+    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }
+    
+    return Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json
+}
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-OctopusApi 'api/';
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if([string]::IsNullOrWhiteSpace($spaceId)) {
+	if(Test-SpacesApi) {
+      	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+      	if([string]::IsNullOrWhiteSpace($spaceId)) {
+          	throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error or try providing the Space Id parameter.";
+      	}
+	}
+}
+
+$apiPrefix = "api/"
+$tenantUrlBase = @($octopusBaseUrl, 'app#')
+
+if ($spaceId) {
+	$apiPrefix += $spaceId
+    $tenantUrlBase += $spaceId
+}
+
+Write-Host "Fetching source tenant"
+$tenant = Invoke-OctopusApi "$apiPrefix/tenants/$tenantToClone"
+
+$sourceTenantId = $tenant.Id
+$sourceTenantName = $tenant.Name
+$tenant.Id = $null
+$tenant.Name = $tenantName
+
+if ($cloneTags -ne $true) {
+	Write-Host "Clearing tenant tags"
+    $tenant.TenantTags = @()
+}
+
+Write-Host "Creating new tenant"
+$newTenant = Invoke-OctopusApi "$apiPrefix/tenants" -Method Post -Body $tenant
+
+if ($cloneVariables -eq $true) {
+	Write-Host "Cloning variables"
+    $variables = Invoke-OctopusApi $tenant.Links.Variables
+    $variables.TenantId = $newTenant.Id
+    $variables.TenantName = $tenantName
+
+    Invoke-OctopusApi $newTenant.Links.Variables -Method Put -Body $variables | Out-Null
+}
+
+$tenantUrl = ($tenantUrlBase + "tenants" + $newTenant.Id + "overview") -join '/'
+$sourceTenantUrl = ($tenantUrlBase + "tenants" + $sourceTenantId + "overview") -join '/'
+
+Write-Highlight "New tenant [$tenantName]($tenantUrl) has been cloned from [$sourceTenantName]($sourceTenantUrl)"
\ No newline at end of file
diff --git a/src/step-templates/com-component-register-unregister/metadata.json b/src/step-templates/com-component-register-unregister/metadata.json
new file mode 100644
index 000000000..46bbf7967
--- /dev/null
+++ b/src/step-templates/com-component-register-unregister/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "cf8634b6-313f-4435-bae6-88520c58d81d",
+  "Name": "Com Component - Register and Unregister using Regsvr32.exe",
+  "Description": "Uses regsvr32.exe to register com components",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "DllFilePaths",
+      "Label": "DllFilePaths",
+      "HelpText": "List of dlls to be registered separated by a ; and can appear on separate lines",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "Uninstall",
+      "Label": "Un-register",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-06-29T13:18:21.5900000-07:00",
+  "LastModifiedBy": "jbennett",
+  "$Meta": {
+    "ExportedAt": "2015-06-30T11:55:08.0500000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/com-component-register-unregister/scriptbody.ps1 b/src/step-templates/com-component-register-unregister/scriptbody.ps1
new file mode 100644
index 000000000..3bf307c24
--- /dev/null
+++ b/src/step-templates/com-component-register-unregister/scriptbody.ps1
@@ -0,0 +1,110 @@
+# Running outside octopus
+param(
+    [string]$DllFilePaths,
+    [string]$Uninstall
+)
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$DllFilePaths,
+        [string]$Uninstall
+    ) 
+
+    $isUninstall = $($Uninstall.ToLower() -eq 'true')
+
+    Write-Host "COM Component - Register"
+    Write-Host "DllFilePaths: $DllFilePaths"
+
+    $DllFilePaths.split(";") | ForEach {
+        $dllFilePath = $_.Trim();
+        Write-Host $dllFilePath
+        
+        if($dllFilePath.Length -lt 1){
+            break;
+        }
+        
+        Write-Host "Attempting to register $dllFilePath"
+
+        if(!(Test-Path "$dllFilePath"))
+        {
+            Write-Host "FILE NOT FOUND $dllFilePath." -ForegroundColor Yellow;
+            return;
+        }
+
+         Write-Host "Attempting to register $dllFilePath"
+    
+        $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+
+        $cmd = "$env:windir\System32\regsvr32.exe"
+
+        Write-Host "Registering with: $env:windir\System32\regsvr32.exe"
+
+        $pinfo.FileName = "$cmd"
+
+        $pinfo.RedirectStandardError = $true
+        $pinfo.RedirectStandardOutput = $true
+        $pinfo.UseShellExecute = $false
+        
+        if($isUninstall){
+            $args = "/u"
+        }
+        $args = "$args /s `"$dllFilePath`""
+
+        $pinfo.Arguments = $args
+        
+        $p = New-Object System.Diagnostics.Process
+
+        $p.StartInfo = $pinfo
+
+        Write-Host "Command:"
+        Write-Host "$cmd $args"
+
+        if ($p.Start())
+        {
+            Write-Host $p.StandardOutput.ReadToEnd().ToString()
+
+            if($p.ExitCode -ne 0)
+            {
+                
+                Write-Host "FAILED $($p.ExitCode) - Register" -ForegroundColor Red 
+                Write-Host $p.StandardError.ReadToEnd() -ForegroundColor Red
+                                
+                throw $p.StandardError.ReadToEnd()
+            }
+            
+            Write-Host "SUCCESS- Register" -ForegroundColor Green 
+        }
+
+       
+    }
+
+ } `
+ (Get-Param 'DllFilePaths' -Required) `
+ (Get-Param 'Uninstall' -Required)
\ No newline at end of file
diff --git a/src/step-templates/configuration-encrypt-app-config-section/metadata.json b/src/step-templates/configuration-encrypt-app-config-section/metadata.json
new file mode 100644
index 000000000..5e991beb4
--- /dev/null
+++ b/src/step-templates/configuration-encrypt-app-config-section/metadata.json
@@ -0,0 +1,48 @@
+{
+  "Id": "d80a7d9a-8c7b-4aa6-934e-0929bce606fe",
+  "Name": "Configuration - Encrypt App.config Section",
+  "Description": "Encrypts configuration sections for the specified executable.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ExecutablePath",
+      "Label": "Executable path",
+      "HelpText": "The path to the executable that has a corresponding `[Executable].exe.config` file. \n\nYou can get the InstallationDirectoryPath like so `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SectionsToEncrypt",
+      "Label": "Sections to encrypt",
+      "HelpText": "The name of the section in the App config to encrypt e.g. `appSettings`, `connectionStrings` etc. For multiple sections, separate with a comma (,)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Provider",
+      "Label": "Provider Name",
+      "HelpText": "The provider to use for encryption",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "kp-tseng",
+  "$Meta": {
+    "ExportedAt": "2016-12-13T07:19:21.7410000Z",
+    "OctopusVersion": "3.7.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "encrypt"
+}
diff --git a/src/step-templates/configuration-encrypt-app-config-section/scriptbody.ps1 b/src/step-templates/configuration-encrypt-app-config-section/scriptbody.ps1
new file mode 100644
index 000000000..cf725ffc0
--- /dev/null
+++ b/src/step-templates/configuration-encrypt-app-config-section/scriptbody.ps1
@@ -0,0 +1,56 @@
+$ErrorActionPreference = "Stop" 
+function Get-Parameter($Name, $Default, [switch]$Required) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function HandleError($message) {
+	if (!$whatIf) {
+		throw $message
+	} else {
+		Write-Host $message -Foreground Yellow
+	}
+}
+
+$appPath = Get-Parameter "ExecutablePath" -Required
+$sectionsToEncrypt = (Get-Parameter "SectionsToEncrypt" -Required) -split ',' | where {$_} | %{$_.Trim()}
+$provider = Get-Parameter "Provider" "DataProtectionConfigurationProvider"
+
+Write-Host "Configuration - Encrypt .config"
+Write-Host "ExecutablePath: $appPath"
+Write-Host "SectionToEncrypt: $sectionName"
+Write-Host "Provider: $provider"
+
+if (!(Test-Path $appPath)) {
+    HandleError "The directory $appPath must exist"
+}
+
+$configurationAssembly = "System.Configuration, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a"
+[void] [Reflection.Assembly]::Load($configurationAssembly)
+ 
+$configuration = [System.Configuration.ConfigurationManager]::OpenExeConfiguration($appPath)
+
+foreach ($sectionToEncrypt in $sectionsToEncrypt){
+	$section = $configuration.GetSection($sectionToEncrypt)
+ 
+    if (-not $section.SectionInformation.IsProtected)
+    {
+        $section.SectionInformation.ProtectSection($provider);
+        $section.SectionInformation.ForceSave = [System.Boolean]::True;
+    }
+}
+
+$configuration.Save([System.Configuration.ConfigurationSaveMode]::Modified);
\ No newline at end of file
diff --git a/src/step-templates/configuration-encrypt-app-or-web-config-section/metadata.json b/src/step-templates/configuration-encrypt-app-or-web-config-section/metadata.json
new file mode 100644
index 000000000..1b8e0fd9f
--- /dev/null
+++ b/src/step-templates/configuration-encrypt-app-or-web-config-section/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "c79b5e6b-88ac-47d5-8678-99e8ab2a1cd9",
+  "Name": "Configuration - Encrypt App or Web Config Section",
+  "Description": "Encrypts a configuration section for the specified executable.",
+  "ActionType": "Octopus.Script",
+  "Version": 17,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "9ab1281d-cf2e-4248-a583-b08e9609c96d",
+      "Name": "ExecutablePath",
+      "Label": "Executable path",
+      "HelpText": "For Web:\nThe virtual path to the web site.\n\nFor Windows:\nThe path to the executable that has a corresponding `[Executable].exe.config` file.\n \nYou can get the InstallationDirectoryPath like so `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0cb4f8ec-5415-47e3-87f1-3e086cc1caa1",
+      "Name": "SectionToEncrypt",
+      "Label": "Section to encrypt",
+      "HelpText": "The name of the section(s) in the config to encrypt e.g. appSettings, connectionStrings etc.\n\nSeparate multiple sections with comma ','.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a30203d3-53d1-450d-bbcd-92a6eb31e906",
+      "Name": "Provider",
+      "Label": "Provider Name",
+      "HelpText": "The provider to use for encryption",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9116d4b3-b033-416f-844c-2a351d3bbc09",
+      "Name": "ApplicationType",
+      "Label": "Application Type",
+      "HelpText": "The application type would be web or windows.\nWeb will be used to encrypt web.config file.\nAnd Windows type application will encrypt file with \"exe.config\" or \"dll.config\" extension.",
+      "DefaultValue": "Web",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Web|Web Application\nWindows|Windows Service/Console App/Class Library (Dll)"
+      }
+    },
+    {
+      "Id": "90a1578e-efa2-44e4-84c0-34b037882cc5",
+      "Name": "WebSiteName",
+      "Label": "Web Site Name",
+      "HelpText": "Enter the web site name installed in IIS.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "KevinKelchen",
+  "$Meta": {
+    "ExportedAt": "2017-09-19T22:33:58.8010000Z",
+    "OctopusVersion": "3.12.4",
+    "Type": "ActionTemplate"
+  },
+  "Category": "encrypt"
+}
diff --git a/src/step-templates/configuration-encrypt-app-or-web-config-section/scriptbody.ps1 b/src/step-templates/configuration-encrypt-app-or-web-config-section/scriptbody.ps1
new file mode 100644
index 000000000..30559db3e
--- /dev/null
+++ b/src/step-templates/configuration-encrypt-app-or-web-config-section/scriptbody.ps1
@@ -0,0 +1,121 @@
+$ErrorActionPreference = "Stop" 
+function Get-Parameter($Name, $Default, [switch]$Required) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    Write-Verbose "Get-Parameter for '$($Name)' [value='$($result)' default='$($Default)']"
+
+    return $result
+}
+
+function HandleError($message) {
+	if (!$whatIf) {
+		throw $message
+	} else {
+		Write-Host $message -Foreground Yellow
+	}
+}
+
+function Invoke-EncryptAppConfigFile() {
+
+    if (!(Test-Path $appPath)) {
+        HandleError "The directory $appPath must exist"
+    }
+
+    $configurationAssembly = "System.Configuration, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a"
+    [void] [Reflection.Assembly]::Load($configurationAssembly)
+    $configuration = [System.Configuration.ConfigurationManager]::OpenExeConfiguration($appPath)
+
+    Invoke-ProtectSections $configuration
+}
+
+function Invoke-EncryptWebConfigFile() {
+    Import-module WebAdministration
+
+	$IISPath = "IIS:\Sites\$($webSiteName)$($appPath)\"
+
+    if (Test-Path $IISPath) { 
+        Write-Verbose "$webSiteName web site exists."
+
+        $configurationAssembly = "System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+        [void] [Reflection.Assembly]::Load($configurationAssembly)
+        $configuration = [System.Web.Configuration.WebConfigurationManager]::OpenWebConfiguration($appPath, $webSiteName)
+
+        Invoke-ProtectSections $configuration
+    }
+    else {
+        HandleError "$webSiteName web site doesn't exists. Please check if the web site is installed."
+    }    
+}
+
+function Invoke-ProtectSections($configuration) {
+
+    $saveConfigFile = $false
+
+    foreach ($sectionName in $sections) {
+        $sectionName = $sectionName.Trim()      # compatible with Powershell 2.0 
+        $section = $configuration.GetSection($sectionName)
+        
+        if ($section) {
+            if (-not $section.SectionInformation.IsProtected)
+            {
+                Write-Verbose "Encrypting $($section.SectionInformation.SectionName) section."
+                $section.SectionInformation.ProtectSection($provider);
+                $section.SectionInformation.ForceSave = [System.Boolean]::True;
+                $saveConfigFile = $true
+            }
+            else {
+                Write-Host "Section $($section.SectionInformation.SectionName) is already protected."
+            }
+        }
+        else {
+            Write-Warning "Section $($sectionName) doesn't exists in the configuratoin file."
+        }
+
+    }       
+
+    if ($saveConfigFile) {            
+        $configuration.Save([System.Configuration.ConfigurationSaveMode]::Modified);
+        Write-Host "Encryption completed successfully."
+    }
+    else {
+        Write-Host "No section(s) in the configuration were encrypted."
+    }
+}
+
+$appType = Get-Parameter "ApplicationType" -Required
+if ($appType -eq "Web") {
+    $appPath = Get-Parameter "ExecutablePath" "/"
+    $webSiteName = Get-Parameter "WebSiteName"
+}
+else {
+    $appPath = Get-Parameter "ExecutablePath" -Required
+}
+$sectionName = Get-Parameter "SectionToEncrypt" -Required
+$sections = $sectionName.Split(',')         # adding .Trim() doesn't work on Powershell 2.0 or below
+$provider = Get-Parameter "Provider" "DataProtectionConfigurationProvider"
+
+Write-Host "Configuration - Encrypt config file"
+Write-Host "Application Type: $appType"
+Write-Host "Application Path: $appPath"
+if ($appType -eq "Web") { Write-Host "Web Site Name: $webSiteName" }
+Write-Host "Section to Encrypt: $sectionName"
+Write-Host "Provider: $provider"
+
+if ($appType -eq "Web") {
+    Invoke-EncryptWebConfigFile
+}
+else {
+    Invoke-EncryptAppConfigFile 
+}
\ No newline at end of file
diff --git a/src/step-templates/configuration-encrypt-web-config-section/metadata.json b/src/step-templates/configuration-encrypt-web-config-section/metadata.json
new file mode 100644
index 000000000..21b32cc42
--- /dev/null
+++ b/src/step-templates/configuration-encrypt-web-config-section/metadata.json
@@ -0,0 +1,81 @@
+{
+  "Id": "193628c4-2251-41e9-a782-225e632ef871",
+  "Name": "Configuration - Encrypt Section",
+  "Description": "Encrypts several configuration sections for the specified file in a given directory.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "0cae0018-f915-47c5-a8d6-cdef437346df",
+      "Name": "WebsiteDirectory",
+      "Label": "Website directory",
+      "HelpText": "The path to the website physical directory that contains a `Web.Config` file. \n\nYou can get the InstallationDirectoryPath like so `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3d7e5485-106e-415e-83b7-cf12c59e776b",
+      "Name": "SectionsToEncrypt",
+      "Label": "Section to encrypt",
+      "HelpText": "The name of the section in the web config to encrypt e.g. `appSettings`, `connectionStrings` etc.\nFor multiple sections, separate with a comma (,)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "12a46b72-3835-4086-b8d6-bd5ad3f99f10",
+      "Name": "Provider",
+      "Label": "Provider Name",
+      "HelpText": "The provider to use for encryption",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "998aa949-74b6-4da6-a838-5637e7a5a322",
+      "Name": "ConfigFile",
+      "Label": "Configuration File",
+      "HelpText": "The configuration file to encrypt.",
+      "DefaultValue": "web.config",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "67415967-4722-449c-8d81-28eff7bf9876",
+      "Name": "OtherFiles",
+      "Label": "Other Files",
+      "HelpText": "A list of other files in the `#{WebsiteDirectory}` folder that should be included when encrypting the specified `#{SectionToEncrypt}`. For example, `connectionStrings.config`. Values should be separated by a comma.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "cjuroz",
+  "$Meta": {
+    "ExportedAt": "2016-12-27T03:36:42.3830000Z",
+    "OctopusVersion": "3.7.6",
+    "Type": "ActionTemplate"
+  },
+  "Category": "encrypt"
+}
diff --git a/src/step-templates/configuration-encrypt-web-config-section/scriptbody.ps1 b/src/step-templates/configuration-encrypt-web-config-section/scriptbody.ps1
new file mode 100644
index 000000000..9b0f52d06
--- /dev/null
+++ b/src/step-templates/configuration-encrypt-web-config-section/scriptbody.ps1
@@ -0,0 +1,118 @@
+$ErrorActionPreference = "Stop" 
+function Get-Parameter($Name, $Default, [switch]$Required) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function HandleError($message) {
+	if (!$whatIf) {
+		throw $message
+	} else {
+		Write-Host $message -Foreground Yellow
+	}
+}
+
+$websiteDirectory = Get-Parameter "WebsiteDirectory" -Required
+$sectionsToEncrypt = (Get-Parameter "SectionsToEncrypt" -Required) -split ',' | where {$_} | %{$_.Trim()}
+$provider = Get-Parameter "Provider" ""
+$configFile = Get-Parameter "ConfigFile" "web.config"
+$otherFiles = (Get-Parameter "OtherFiles" "") -split ',' | where {$_} | %{$_.Trim()}
+
+Write-Host "Configuration - Encrypt .config"
+Write-Host "WebsiteDirectory: $websiteDirectory"
+Write-Host "SectionsToEncrypt: $sectionsToEncrypt"
+Write-Host "Provider: $provider"
+Write-Host "ConfigFile: $configFile"
+
+
+if (!(Test-Path $websiteDirectory)) {
+	HandleError "The directory $websiteDirectory must exist"
+}
+
+$configFilePath = Join-Path $websiteDirectory $configFile
+Write-Host "configFilePath: $configFilePath"
+if (!(Test-Path $configFilePath)) {
+	HandleError "Specified file $configFile or a Web.Config file must exist in the directory $websiteDirectory"
+}
+
+$frameworkPath = [System.Runtime.InteropServices.RuntimeEnvironment]::GetRuntimeDirectory();
+$regiis = "$frameworkPath\aspnet_regiis.exe"
+
+if (!(Test-Path $regiis)) {
+	HandleError "The tool aspnet_regiis does not exist in the directory $frameworkPath"
+}
+
+# Create a temp directory to work out of and copy our config file to web.config
+$tempPath = Join-Path $websiteDirectory $([guid]::NewGuid()).ToString()
+if (!$whatIf) {
+	New-Item $tempPath -ItemType "directory"
+} else {
+	Write-Host "WhatIf: New-Item $tempPath -ItemType ""directory""" -Foreground Yellow
+}
+
+$tempFile = Join-Path $tempPath "web.config"
+if (!$whatIf) {
+    New-Item -ItemType File -Path $tempFile -Force
+	Copy-Item $configFilePath $tempFile -Force
+} else {
+	Write-Host "WhatIf: Copy-Item $configFilePath $tempFile" -Foreground Yellow
+}
+
+Foreach($fileName in $otherFiles){
+  if (!$whatIf) {
+     New-Item -ItemType File -Path (Join-Path $tempPath $fileName) -Force
+	 Copy-Item (Join-Path $websiteDirectory $fileName) (Join-Path $tempPath $fileName) -Force
+  } else {
+	 Write-Host "WhatIf: Copy-Item $configFilePath $tempFile" -Foreground Yellow
+  }
+}
+
+Foreach($sectionToEncrypt in $sectionsToEncrypt){
+	# Determine arguments
+	if ($provider) {
+		$args = "-pef", $sectionToEncrypt, $tempPath, "-prov", $provider
+	} else {
+		$args = "-pef", $sectionToEncrypt, $tempPath
+	}
+
+	# Encrypt Web.Config file in directory
+	if (!$whatIf) {
+		& $regiis $args
+		if ($LASTEXITCODE) {
+		    HandleError "There was an error trying to encrypt section: $sectionToEncrypt"
+		}
+	} else {
+		Write-Host "WhatIf: $regiis $args" -Foreground Yellow
+	}
+}
+
+# Copy the web.config back to original file and delete the temp dir
+if (!$whatIf) {
+	Copy-Item $tempFile $configFilePath -Force
+
+  Foreach($fileName in $otherFiles){
+    if (!$whatIf) {
+  	 Copy-Item (Join-Path $tempPath $fileName) (Join-Path $websiteDirectory $fileName) -Force
+    } else {
+  	 Write-Host "WhatIf: Copy-Item $configFilePath $tempFile" -Foreground Yellow
+    }
+  }
+
+  Remove-Item $tempPath -Recurse
+} else {
+	Write-Host "WhatIf: Copy-Item $tempFile $configFilePath -Force" -Foreground Yellow
+	Write-Host "WhatIf: Remove-Item $tempPath -Recurse" -Foreground Yellow
+}
diff --git a/src/step-templates/create-azure-website-staging-slot/metadata.json b/src/step-templates/create-azure-website-staging-slot/metadata.json
new file mode 100644
index 000000000..1dd444116
--- /dev/null
+++ b/src/step-templates/create-azure-website-staging-slot/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "2f763d9e-81e1-4ce2-a897-3fe2c72ab9f0",
+  "Name": "Create Azure Website Staging Slot. Requires Azure PowerShell to be installed on Tentacle machine",
+  "Description": "Creates a staging slot for Azure Website. \n\nProvides Azure publish url as variable:\n\n     #{Octopus.Action[Create Staging Slot Step Name].Output.AzurePublishUrl}\n\nAnd Username/Password for publishing:\n\n    #{Octopus.Action[Create Staging Slot Step Name].Output.AzureUsername}\n    #{Octopus.Action[Create Staging Slot Step Name].Output.AzurePassword}",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "AzureWebSite",
+      "Label": "Azure Web Site Name",
+      "HelpText": "Name of the web-site in Azure",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-03-25T01:42:32.8380000-07:00",
+  "LastModifiedBy": "trailmax",
+  "$Meta": {
+    "ExportedAt": "2015-03-25T01:51:15.6600000-07:00",
+    "OctopusVersion": "2.6.3.886",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/create-azure-website-staging-slot/scriptbody.ps1 b/src/step-templates/create-azure-website-staging-slot/scriptbody.ps1
new file mode 100644
index 000000000..7d3a34c10
--- /dev/null
+++ b/src/step-templates/create-azure-website-staging-slot/scriptbody.ps1
@@ -0,0 +1,26 @@
+# Check if Windows Azure Powershell is avaiable 
+try{ 
+    Import-Module Azure -ErrorAction Stop
+}catch{
+    throw "Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools" 
+}
+
+
+$stagingWebsite = Get-AzureWebsite -Name $AzureWebSite -Slot staging -ErrorAction SilentlyContinue
+
+
+if($stagingWebsite -eq $null)
+{
+    Write-Host "Creating staging slot"
+    $stagingWebsite = New-AzureWebsite -Name $AzureWebSite -Slot staging -Location $Location
+}
+
+
+Set-OctopusVariable -name "AzurePassword" -value $stagingWebsite.PublishingPassword
+Set-OctopusVariable -name "AzureUsername" -value $stagingWebsite.PublishingUsername
+
+$urlString = ($stagingWebsite.SiteProperties.Properties | ?{ $_.Name -eq "RepositoryURI" }).Value.ToString()
+$url = [System.Uri]$urlString
+
+
+Set-OctopusVariable -Name "AzurePublishUrl" -value $url.Host
\ No newline at end of file
diff --git a/src/step-templates/create-tenant/metadata.json b/src/step-templates/create-tenant/metadata.json
new file mode 100644
index 000000000..af297d4f5
--- /dev/null
+++ b/src/step-templates/create-tenant/metadata.json
@@ -0,0 +1,82 @@
+{
+  "Id": "581e7211-c9e2-4d7b-8934-bcdac421d022",
+  "Name": "Create Tenant",
+  "Description": "Create an Octopus [tenant](https://octopus.com/docs/deployment-patterns/multi-tenant-deployments) with optional tenant tags and project connections.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9c6ce5ed-e370-4150-88c0-880984531a48",
+      "Name": "CloneTenantStep_OctopusUrl",
+      "Label": "Octopus URL",
+      "HelpText": "The URL of the Octopus Server to create the tenant on.",
+      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a57b379b-a0dd-4d0e-8229-7bd358448766",
+      "Name": "CreateTenantStep_ApiKey",
+      "Label": "Octopus API Key",
+      "HelpText": "The Octopus API Key to use for the API requests",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e02927d1-e2a3-4887-b5d3-c49b12a297a2",
+      "Name": "CreateTenantStep_TenantName",
+      "Label": "Tenant Name",
+      "HelpText": "The name of the tenant to create. *Note this must be unique*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3c3364b8-69f9-458f-9b34-efc591c8882e",
+      "Name": "CreateTenantStep_TenantTags",
+      "Label": "Tenant Tags JSON",
+      "HelpText": "The tenant tags in a JSON array format. Example below.\n\n*[\"TagSet1/Tag1\", \"TagSet2/Tag1\", \"TagSet2/Tag2\"]*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a68945f1-7adc-4015-80da-dc3a3ce0b571",
+      "Name": "CreateTenantStep_ProjectEnvironments",
+      "Label": "Project and Environments JSON",
+      "HelpText": "The projects and environments to connect the tenant to in JSON format. Example below.\n\n*{ \"Projects-1\": [\"Environments-1\", \"Environments-2\"], \"Projects-2\": [\"Environments-1\", \"Environments-2\", \"Environments-3\"] }*",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5f80b46a-d09c-4092-8a0f-fcc96c49fde2",
+      "Name": "CloneTenantStep_SpaceId",
+      "Label": "Space Id",
+      "HelpText": "The Id of the Space used to clone the tenant. **Leave blank if you are using an Octopus version earlier than 2019.1 or if you wish to use the Octopus.Space.Id variable value.**",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus",
+  "LastModifiedBy": "benjimac93"
+}
diff --git a/src/step-templates/create-tenant/scriptbody.ps1 b/src/step-templates/create-tenant/scriptbody.ps1
new file mode 100644
index 000000000..146af2ae8
--- /dev/null
+++ b/src/step-templates/create-tenant/scriptbody.ps1
@@ -0,0 +1,89 @@
+$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
+[Net.ServicePointManager]::SecurityProtocol = $securityProtocol
+
+$ErrorActionPreference = 'Stop'
+
+$octopusBaseUrl = $CloneTenantStep_OctopusUrl.Trim('/')
+$apiKey = $CreateTenantStep_ApiKey
+$tenantName = $CreateTenantStep_TenantName
+$tenantTags = if ($CreateTenantStep_TenantTags -eq $null) { @() } else { $CreateTenantStep_TenantTags | ConvertFrom-Json }
+$projectEnvironments = if ($CreateTenantStep_ProjectEnvironments -eq $null) { @{} } else { $CreateTenantStep_ProjectEnvironments | ConvertFrom-Json }
+$spaceId = $CloneTenantStep_SpaceId
+
+if ([string]::IsNullOrWhiteSpace($octopusBaseUrl)) {
+    throw "The step parameter 'Octopus Base Url' was not found. This step requires the Octopus Server URL to function, please provide one and try again."
+}
+
+if ([string]::IsNullOrWhiteSpace($apiKey)) {
+    throw "The step parameter 'Octopus API Key' was not found. This step requires an API Key to function, please provide one and try again."
+}
+
+if ([string]::IsNullOrWhiteSpace($tenantName)) {
+    throw "The step parameter 'Tenant Name' was not found. Please provide one and try again."
+}
+
+function Invoke-OctopusApi {
+    param(
+        [Parameter(Position = 0, Mandatory)]$Uri,
+        [ValidateSet("Get", "Post", "Put", "Delete")]$Method = 'Get',
+        $Body
+    )
+    
+    $uriParts = @($octopusBaseUrl, $Uri.TrimStart('/'))    
+    $uri = ($uriParts -join '/')
+    
+    Write-Verbose "Uri: $uri"
+    
+    $requestParameters = @{
+        Uri = $uri
+        Method = $Method
+        Headers = @{ "X-Octopus-ApiKey" = $apiKey }
+        UseBasicParsing = $true
+    }
+    
+    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }
+    
+    return Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json
+}
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-OctopusApi 'api/';
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if([string]::IsNullOrWhiteSpace($spaceId)) {
+	if(Test-SpacesApi) {
+      	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+      	if([string]::IsNullOrWhiteSpace($spaceId)) {
+          	throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error or try providing the Space Id parameter.";
+      	}
+	}
+}
+
+$apiPrefix = "api/"
+$tenantUrlBase = @($octopusBaseUrl, 'app#')
+
+if ($spaceId) {
+	Write-Host "Using Space $spaceId"
+	$apiPrefix += $spaceId
+    $tenantUrlBase += $spaceId
+}
+
+$body = @{
+	Id = $null
+    Name = $tenantName
+    TenantTags = @($tenantTags)
+    ProjectEnvironments = $projectEnvironments
+}
+
+Write-Host "Creating tenant $tenantName"
+$tenant = Invoke-OctopusApi "$apiPrefix/tenants" -Method Post -Body $body
+$tenantUrl = ($tenantUrlBase + "tenants" + $tenant.Id + "overview") -join '/'
+
+Write-Highlight "New tenant [$tenantName]($tenantUrl) has been created."
\ No newline at end of file
diff --git a/step-templates/cyberark-conjur-retrieve-a-secret.json b/src/step-templates/cyberark-conjur-retrieve-a-secret/metadata.json
similarity index 59%
rename from step-templates/cyberark-conjur-retrieve-a-secret.json
rename to src/step-templates/cyberark-conjur-retrieve-a-secret/metadata.json
index f3d0307f4..7b77e6b8b 100644
--- a/step-templates/cyberark-conjur-retrieve-a-secret.json
+++ b/src/step-templates/cyberark-conjur-retrieve-a-secret/metadata.json
@@ -10,7 +10,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "# Set TLS 1.2\n[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n\nfunction CreateUriWithoutIncorrectSlashEncoding {\n    param(\n        [Parameter(Mandatory)][string]$uri\n    )\n    $newUri = New-Object System.Uri $uri\n    [void]$newUri.PathAndQuery # need to access PathAndQuery (presumably modifies internal state)\n    $flagsFieldInfo = $newUri.GetType().GetField(\"m_Flags\", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)\n    $flags = $flagsFieldInfo.GetValue($newUri)\n    $flags = $flags -band (-bnot 0x30) # remove Flags.PathNotCanonical|Flags.QueryNotCanonical (private enum)\n    $flagsFieldInfo.SetValue($newUri, $flags)\n    $newUri\n}\n\n$CONJUR_APPLIANCE_URL = \"#{CONJUR_APPLIANCE_URL}\"\n$CONJUR_ACCOUNT = \"#{CONJUR_ACCOUNT}\"\n$CONJUR_AUTHN_LOGIN = \"#{CONJUR_AUTHN_LOGIN}\"\n$CONJUR_AUTHN_API_KEY = \"#{CONJUR_AUTHN_API_KEY}\"\n$VARIABLE_ID = \"#{CONJUR_VARIABLE_ID}\"\n\n$encodedLogin = ($CONJUR_AUTHN_LOGIN).Replace(\"/\",\"%2F\")\n$encodedPath = ($VARIABLE_ID).Replace(\"/\",\"%2F\")\n\n$headers = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$headers.Add(\"Content-Type\", \"application/json\")\n$headers.Add(\"Accept-Encoding\", \"base64\")\n\n$body = $CONJUR_AUTHN_API_KEY\n\n$url1 = \"$CONJUR_APPLIANCE_URL/authn/$CONJUR_ACCOUNT/$encodedLogin/authenticate\"\nif (\"#{CONJUR_FIX_SLASH_ENCODING}\" -eq \"True\")  { $url1 = CreateUriWithoutIncorrectSlashEncoding \"$url1\" }\n\n$response = Invoke-RestMethod -uri $url1  -Method 'POST' -Headers $headers -Body $body -UseBasicParsing\n\n$token=\"Token token=\"\"$($response)\"\"\"\n\n$headers = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$headers.Add(\"Authorization\", \"$token\")\n\n$url2 = CreateUriWithoutIncorrectSlashEncoding \"$CONJUR_APPLIANCE_URL/secrets/$CONJUR_ACCOUNT/variable/$encodedPath\"\nif (\"#{CONJUR_FIX_SLASH_ENCODING}\" -eq \"True\") { $url2 = CreateUriWithoutIncorrectSlashEncoding \"$url2\" }\n\n$secretvalue = Invoke-RestMethod $url2 -Method 'GET' -Headers $headers   -UseBasicParsing\n\n$sensitiveOutputVariablesSupported = ((Get-Command 'Set-OctopusVariable').Parameters.GetEnumerator() | Where-Object { $_.key -eq \"Sensitive\" }) -ne $null\nif ($sensitiveOutputVariablesSupported -and (\"#{CONJUR_STAY_SENSITIVE}\" -eq \"True\")) {\n\tSet-OctopusVariable -name \"#{CONJUR_OUTPUT_NAME}\" -value $secretvalue -sensitive\n} else {\n\tSet-OctopusVariable -name \"#{CONJUR_OUTPUT_NAME}\" -value $secretvalue\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -95,7 +95,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-03-03T02:39:08.645Z",
+    "ExportedAt": "2021-03-03T02:39:08.6450000Z",
     "OctopusVersion": "2020.6.4634",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/cyberark-conjur-retrieve-a-secret/scriptbody.ps1 b/src/step-templates/cyberark-conjur-retrieve-a-secret/scriptbody.ps1
new file mode 100644
index 000000000..0abf81ad4
--- /dev/null
+++ b/src/step-templates/cyberark-conjur-retrieve-a-secret/scriptbody.ps1
@@ -0,0 +1,52 @@
+# Set TLS 1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+function CreateUriWithoutIncorrectSlashEncoding {
+    param(
+        [Parameter(Mandatory)][string]$uri
+    )
+    $newUri = New-Object System.Uri $uri
+    [void]$newUri.PathAndQuery # need to access PathAndQuery (presumably modifies internal state)
+    $flagsFieldInfo = $newUri.GetType().GetField("m_Flags", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)
+    $flags = $flagsFieldInfo.GetValue($newUri)
+    $flags = $flags -band (-bnot 0x30) # remove Flags.PathNotCanonical|Flags.QueryNotCanonical (private enum)
+    $flagsFieldInfo.SetValue($newUri, $flags)
+    $newUri
+}
+
+$CONJUR_APPLIANCE_URL = "#{CONJUR_APPLIANCE_URL}"
+$CONJUR_ACCOUNT = "#{CONJUR_ACCOUNT}"
+$CONJUR_AUTHN_LOGIN = "#{CONJUR_AUTHN_LOGIN}"
+$CONJUR_AUTHN_API_KEY = "#{CONJUR_AUTHN_API_KEY}"
+$VARIABLE_ID = "#{CONJUR_VARIABLE_ID}"
+
+$encodedLogin = ($CONJUR_AUTHN_LOGIN).Replace("/","%2F")
+$encodedPath = ($VARIABLE_ID).Replace("/","%2F")
+
+$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$headers.Add("Content-Type", "application/json")
+$headers.Add("Accept-Encoding", "base64")
+
+$body = $CONJUR_AUTHN_API_KEY
+
+$url1 = "$CONJUR_APPLIANCE_URL/authn/$CONJUR_ACCOUNT/$encodedLogin/authenticate"
+if ("#{CONJUR_FIX_SLASH_ENCODING}" -eq "True")  { $url1 = CreateUriWithoutIncorrectSlashEncoding "$url1" }
+
+$response = Invoke-RestMethod -uri $url1  -Method 'POST' -Headers $headers -Body $body -UseBasicParsing
+
+$token="Token token=""$($response)"""
+
+$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$headers.Add("Authorization", "$token")
+
+$url2 = CreateUriWithoutIncorrectSlashEncoding "$CONJUR_APPLIANCE_URL/secrets/$CONJUR_ACCOUNT/variable/$encodedPath"
+if ("#{CONJUR_FIX_SLASH_ENCODING}" -eq "True") { $url2 = CreateUriWithoutIncorrectSlashEncoding "$url2" }
+
+$secretvalue = Invoke-RestMethod $url2 -Method 'GET' -Headers $headers   -UseBasicParsing
+
+$sensitiveOutputVariablesSupported = ((Get-Command 'Set-OctopusVariable').Parameters.GetEnumerator() | Where-Object { $_.key -eq "Sensitive" }) -ne $null
+if ($sensitiveOutputVariablesSupported -and ("#{CONJUR_STAY_SENSITIVE}" -eq "True")) {
+	Set-OctopusVariable -name "#{CONJUR_OUTPUT_NAME}" -value $secretvalue -sensitive
+} else {
+	Set-OctopusVariable -name "#{CONJUR_OUTPUT_NAME}" -value $secretvalue
+}
\ No newline at end of file
diff --git a/src/step-templates/cyberark-conjur-retrieve-secrets/metadata.json b/src/step-templates/cyberark-conjur-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..ed7c85f53
--- /dev/null
+++ b/src/step-templates/cyberark-conjur-retrieve-secrets/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "522c7010-7189-4b2e-a3c8-36cb1759422a",
+  "Name": "CyberArk Conjur - Retrieve Secrets",
+  "Description": "This step retrieves one or more secrets from [CyberArk Conjur](https://www.conjur.org/) and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nThis step differs from the [CyberArk Conjur - Retrieve a Secret](https://library.octopus.com/step-templates/eafe9740-1008-4375-9e82-0d193109b669/actiontemplate-cyberark-conjur-retrieve-a-secret) step template as it offers the ability to retrieve multiple secrets (with optional version) and performs a batched call where possible - see below for further details.\n\n---\n\n**Retrieval Behavior:**\n\n- If any of the Conjur Variables have a version specified to retrieve, then the step template will retrieve **all** of the secrets individually using the [Conjur REST API - Secret Retrieve](https://docs.conjur.org/Latest/en/Content/Developer/Conjur_API_Retrieve_Secret.htm) endpoint.\n- If none of the Conjur Variables have a version specified (i.e. retrieve the latest version) then the step template will retrieve the secrets using the [Conjur REST API - Batch Retrieval](https://docs.conjur.org/Latest/en/Content/Developer/Conjur_API_Batch_Retrieve.htm) endpoint.\n\n*Hint:* If performance is important to you, don't include specific versions of Conjur Variables. It’s faster to fetch secrets in a batch than to fetch them one at a time.\n\n---\n\n**Required:** \n- PowerShell **5.1** or higher.\n- A set of credentials with permissions to retrieve secrets from CyberArk Conjur.\n- Access to the Conjur instance from the Worker or target where this step executes.\n\nNotes:\n\n- Tested on Conjur **v1.13.2** / API **v5.2.0**.\n- Tested on Octopus **2021.2**.\n- Tested on both Windows Server 2019 and Ubuntu 20.04.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "66a70ea0-8d3a-4682-9575-c1dae8ad75e6",
+      "Name": "CyberArk.Conjur.RetrieveSecrets.Url",
+      "Label": "Conjur URL",
+      "HelpText": "The URL of the Conjur instance you are connecting to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8b77d118-197b-40be-9382-c8ee4d5aae1b",
+      "Name": "CyberArk.Conjur.TrustCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Trust the server certificate when using an HTTPS connection and the caller cannot verify the Certificate Authority root.\n\nYou can use this option when using self-signed certificates.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ceae6659-4643-490d-9d8d-f642c1c1b4a0",
+      "Name": "CyberArk.Conjur.RetrieveSecrets.Account",
+      "Label": "Conjur Account",
+      "HelpText": "The Conjur account. This is the Conjur appliance identifier provided during Conjur configuration.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0f501e04-207f-4a05-9d21-1e2462bf5b73",
+      "Name": "CyberArk.Conjur.RetrieveSecrets.Login",
+      "Label": "Conjur Login",
+      "HelpText": "The username (from the point of view of the authenticator) of the user or machine (host) requesting authentication. For a host, the id assigned when the host was created should be used, prepended with the literal `host/`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3985b74e-1ea8-4bda-affa-9e7b22056c58",
+      "Name": "CyberArk.Conjur.RetrieveSecrets.ApiKey",
+      "Label": "Conjur Api Key",
+      "HelpText": "The API Key corresponding to the user/host provided.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "eefe9594-7dd1-4fa4-9bb1-65ced026fdda",
+      "Name": "CyberArk.Conjur.RetrieveSecrets.SecretVariables",
+      "Label": "Conjur Secret Variable IDs",
+      "HelpText": "Specify the names of the secrets to be returned from Conjur, in the format:\n\n`VariableID Version | OutputVariableName` where:\n\n- `VariableID` is the Variable ID of the Conjur secret.\n- `Version` is the version of the secret to retrieve. *If this value isn't specified, the latest version will be retrieved*.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple Variable IDs can be retrieved by entering each one on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "462f3385-dccd-4ac1-a30b-b06029fbfc18",
+      "Name": "CyberArk.Conjur.RetrieveSecrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-12-12T01:15:33.8910000Z",
+    "OctopusVersion": "2025.1.2648",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "cyberark"
+}
diff --git a/src/step-templates/cyberark-conjur-retrieve-secrets/scriptbody.ps1 b/src/step-templates/cyberark-conjur-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..9ac879dd0
--- /dev/null
+++ b/src/step-templates/cyberark-conjur-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,356 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$ConjurUrl = $OctopusParameters["CyberArk.Conjur.RetrieveSecrets.Url"]
+$ConjurAccount = $OctopusParameters["CyberArk.Conjur.RetrieveSecrets.Account"]
+$ConjurLogin = $OctopusParameters["CyberArk.Conjur.RetrieveSecrets.Login"]
+$ConjurApiKey = $OctopusParameters["CyberArk.Conjur.RetrieveSecrets.ApiKey"]
+$ConjurSecretVariables = $OctopusParameters["CyberArk.Conjur.RetrieveSecrets.SecretVariables"]
+$PrintVariableNames = $OctopusParameters["CyberArk.Conjur.RetrieveSecrets.PrintVariableNames"]
+$ConjurTrustCertificate = [System.Convert]::ToBoolean($OctopusParameters['CyberArk.Conjur.TrustCertificate'])
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($ConjurUrl)) {
+    throw "Required parameter CyberArk.Conjur.RetrieveSecrets.Url not specified"
+}
+if ([string]::IsNullOrWhiteSpace($ConjurAccount)) {
+    throw "Required parameter CyberArk.Conjur.RetrieveSecrets.Account not specified"
+}
+if ([string]::IsNullOrWhiteSpace($ConjurLogin)) {
+    throw "Required parameter CyberArk.Conjur.RetrieveSecrets.Login not specified"
+}
+if ([string]::IsNullOrWhiteSpace($ConjurApiKey)) {
+    throw "Required parameter CyberArk.Conjur.RetrieveSecrets.ApiKey not specified"
+}
+if ([string]::IsNullOrWhiteSpace($ConjurSecretVariables)) {
+    throw "Required parameter CyberArk.Conjur.RetrieveSecrets.SecretVariables not specified"
+}
+
+### Helper functions
+
+# This function creates a URI and prevents Urls that have been Url encoded from being re-encoded.
+# Typically this happens on Windows (dynamic) workers in Octopus, and not PS Core.
+# Helpful background - https://stackoverflow.com/questions/25596564/percent-encoded-slash-is-decoded-before-the-request-dispatch
+# Function based from https://github.com/IISResetMe/PSdotNETRuntimeHacks/blob/trunk/Set-DontUnescapePathDotsAndSlashes.ps1
+function New-DontUnescapePathDotsAndSlashes-Uri {
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNull()]
+        [string]$SourceUri
+    )
+
+    $uri = New-Object System.Uri $SourceUri
+
+    # If running PS Core, not affected
+    if ($PSEdition -eq "Core") {
+        return $uri
+    }
+
+    # Retrieve the private Syntax field from the uri class,
+    # this is our indirect reference to the attached parser
+    $syntaxFieldInfo = $uri.GetType().GetField('m_Syntax', 'NonPublic,Instance')
+    if (-not $syntaxFieldInfo) {
+        throw [System.MissingFieldException]"'m_Syntax' field not found"
+    }
+
+    # Retrieve the private Flags field from the parser class,
+    # this is the value we're looking to update at runtime
+    $flagsFieldInfo = [System.UriParser].GetField('m_Flags', 'NonPublic,Instance')
+    if (-not $flagsFieldInfo) {
+        throw [System.MissingFieldException]"'m_Flags' field not found"
+    }
+
+    # Retrieve the actual instances
+    $uriParser = $syntaxFieldInfo.GetValue($uri)
+    $uriSyntaxFlags = $flagsFieldInfo.GetValue($uriParser)
+
+    # Define the bit flags we want to remove
+    $UnEscapeDotsAndSlashes = 0x2000000
+    $SimpleUserSyntax = 0x20000
+
+    # Clear the flags that we don't want
+    $uriSyntaxFlags = [int]$uriSyntaxFlags -band -bnot($UnEscapeDotsAndSlashes)
+    $uriSyntaxFlags = [int]$uriSyntaxFlags -band -bnot($SimpleUserSyntax)
+
+    # Overwrite the existing Flags field
+    $flagsFieldInfo.SetValue($uriParser, $uriSyntaxFlags)
+
+    return $uri
+}
+
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+    $rawResponse = ""
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+        }
+    }
+    else {
+        $rawResponse = $RequestError.ErrorDetails.Message
+    }
+
+    try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+    return $response
+}
+
+function Format-SecretName {
+    [CmdletBinding()]
+    Param(
+        [string] $Name,
+        [string] $Version
+    )
+    $displayName = "'$Name'"
+    if (![string]::IsNullOrWhiteSpace($Version)) {
+        $displayName += " (v:$($Version))"
+    }
+    return $displayName
+}
+
+function Invoke-CyberArk-Rest-Method
+{
+  # define parameters
+  [CmdletBinding()]
+  param(
+    $Url,
+    $Method,
+    $Headers,
+    $Body,
+    $TrustCertificate
+  )
+
+  # define working variables
+  $invokeArguments = @{
+    Uri = $Url
+    Method = $Method
+  }
+
+  # Check for the presence of variables
+  if (![string]::IsNullOrWhitespace($Headers))
+  {
+    $invokeArguments.Add("Headers", $Headers)
+  }
+
+  if (![string]::IsNullOrWhitespace($Body))
+  {
+    $invokeArguments.Add("Body", $Body)
+  }
+
+  if ($TrustCertificate -eq $true)
+  {
+    $invokeArguments.Add("SkipCertificateCheck", $TrustCertificate)
+  }
+
+  return Invoke-RestMethod @invokeArguments
+}
+
+### End Helper function
+
+$Secrets = @()
+$VariablesCreated = 0
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$ConjurUrl = $ConjurUrl.TrimEnd("/")
+
+
+# Extract secret names
+@(($ConjurSecretVariables -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $secretDefinition = ($_ -Split "\|")
+        $secretName = $secretDefinition[0].Trim()
+        $secretNameAndVersion = ($secretName -Split " ")
+        $secretVersion = ""
+        if ($secretNameAndVersion.Count -gt 1) {
+            $secretName = $secretNameAndVersion[0].Trim()
+            $secretVersion = $secretNameAndVersion[1].Trim()
+        }
+        if ([string]::IsNullOrWhiteSpace($secretName)) {
+            throw "Unable to establish secret name from: '$($_)'"
+        }
+
+        $UriEscapedName = [uri]::EscapeDataString($secretName)
+        $VariableIdPrefix = "$($ConjurAccount):variable"
+
+        $secret = [PsCustomObject]@{
+            Name                 = $secretName
+            UriEscapedName       = $uriEscapedName
+            Version              = $secretVersion
+            VariableName         = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { "" }
+            VariableId           = "$($VariableIdPrefix):$($secretName)"
+            UriEscapedVariableId = "$($VariableIdPrefix):$($UriEscapedName)"
+        }
+        $Secrets += $secret
+    }
+}
+$SecretsWithVersionSpecified = @($Secrets | Where-Object { ![string]::IsNullOrWhiteSpace($_.Version) })
+
+Write-Verbose "Conjur Url: $ConjurUrl"
+Write-Verbose "Conjur Account: $ConjurAccount"
+Write-Verbose "Conjur Login: $ConjurLogin"
+Write-Verbose "Conjur API Key: ********"
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "Secrets with Version specified: $($SecretsWithVersionSpecified.Count)"
+Write-Verbose "Print variables: $PrintVariableNames"
+
+try {
+
+    $headers = @{
+        "Content-Type"    = "application/json"; 
+        "Accept-Encoding" = "base64"
+    }
+
+    $body = $ConjurApiKey
+    $loginUriSegment = [uri]::EscapeDataString($ConjurLogin)
+    $authnUri = New-DontUnescapePathDotsAndSlashes-Uri -SourceUri "$ConjurUrl/authn/$ConjurAccount/$loginUriSegment/authenticate"
+    #$authToken = Invoke-RestMethod -Uri $authnUri -Method Post -Headers $headers -Body $body
+    $authToken = Invoke-CyberArk-Rest-Method -Url $authnUri -Method Post -Headers $headers -Body $body -TrustCertificate $ConjurTrustCertificate
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred logging in to Conjur: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.error) {
+            $AdditionalDetail = "$($ErrorBody.error.code) - $($ErrorBody.error.message)"
+        }
+        else {
+            $AdditionalDetail += $ErrorBody
+        }
+    }
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`nDetail: $AdditionalDetail"
+    }
+    
+    Write-Error $Message -Category AuthenticationError
+}
+
+if ([string]::IsNullOrWhiteSpace($authToken)) {
+    Write-Error "Null or Empty token!"
+    return
+}
+
+# Set token auth header
+$headers = @{
+    "Authorization" = "Token token=`"$($authToken)`""; 
+}
+
+if ($SecretsWithVersionSpecified.Count -gt 0) {
+    Write-Verbose "Retrieving secrets individually as at least one has a version specified."
+    foreach ($secret in $Secrets) {
+        try {
+            $name = $secret.Name
+            $uriEscapedName = $secret.UriEscapedName
+            $secretVersion = $secret.Version
+            $variableName = $secret.VariableName
+            $displayName = Format-SecretName -Name $name -Version $secretVersion
+
+            if ([string]::IsNullOrWhiteSpace($variableName)) {
+                $variableName = "$($name.Trim().Replace("/","."))"
+            }
+            $secretUri = "$ConjurUrl/secrets/$ConjurAccount/variable/$uriEscapedName"
+            if (![string]::IsNullOrWhiteSpace($secretVersion)) {
+                $secretUri += "?version=$($secretVersion)"
+            }
+            $secretUri = New-DontUnescapePathDotsAndSlashes-Uri -SourceUri "$secretUri"
+            Write-Verbose "Retrieving Secret $displayName"
+            #$secretValue = Invoke-RestMethod -Uri $secretUri -Method Get -Headers $headers
+            $secretValue = Invoke-CyberArk-Rest-Method -Url $secretUri -Method Get -Headers $headers -TrustCertificate $ConjurTrustCertificate
+
+            if ([string]::IsNullOrWhiteSpace($secretValue)) {
+                Write-Error "Error: Secret $displayName not found or has no versions."
+                break;
+            }
+    
+            Set-OctopusVariable -Name $variableName -Value $secretValue -Sensitive
+    
+            if ($PrintVariableNames -eq $True) {
+                Write-Output "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+            }
+            $VariablesCreated += 1
+        }
+        catch {
+            $ExceptionMessage = $_.Exception.Message
+            $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+            $Message = "An error occurred retrieving secret $($displayName) from Conjur: $ExceptionMessage"
+            $AdditionalDetail = ""
+            if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+                if ($null -ne $ErrorBody.error) {
+                    $AdditionalDetail = "$($ErrorBody.error.code) - $($ErrorBody.error.message)"
+                }
+                else {
+                    $AdditionalDetail += $ErrorBody
+                }
+            }
+        
+            if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+                $Message += "`nDetail: $AdditionalDetail"
+            }
+    
+            Write-Error $Message -Category ReadError
+            break;
+        }
+    }
+}
+else {
+    Write-Verbose "Retrieving secrets by batch as no versions specified."
+    $uriEscapedVariableIds = @($Secrets | ForEach-Object { "$($_.UriEscapedVariableId)" }) -Join ","
+
+    try {    
+        $secretsUri = New-DontUnescapePathDotsAndSlashes-Uri -SourceUri "$ConjurUrl/secrets?variable_ids=$($uriEscapedVariableIds)"
+        #$secretValues = Invoke-RestMethod -Uri $secretsUri -Method Get -Headers $headers
+        $secretValues = Invoke-CyberArk-Rest-Method -Url $secretsUri -Method Get -Headers $headers -TrustCertificate $ConjurTrustCertificate
+        $secretKeyValues = $secretValues | Get-Member | Where-Object { $_.MemberType -eq "NoteProperty" } | Select-Object -ExpandProperty "Name"
+        foreach ($secret in $Secrets) {
+            $name = $secret.Name
+            $variableId = $secret.VariableId
+            $variableName = $secret.VariableName
+
+            Write-Verbose "Extracting Secret '$($name)' from Conjur batched response"
+
+            if ([string]::IsNullOrWhiteSpace($variableName)) {
+                $variableName = "$($name.Trim().Replace("/","."))"
+            }
+            if ($secretKeyValues -inotcontains $variableId) {
+                Write-Error "Secret '$name' not found in Conjur response."
+                return
+            }
+            
+            $variableValue = $secretValues.$variableId
+            Set-OctopusVariable -Name $variableName -Value $variableValue -Sensitive
+
+            if ($PrintVariableNames -eq $True) {
+                Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+            }
+            $VariablesCreated += 1
+        }
+    }
+    catch {
+        $ExceptionMessage = $_.Exception.Message
+        $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+        $Message = "An error occurred retrieving batched secrets from Conjur: $ExceptionMessage"
+        $AdditionalDetail = ""
+        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+            if ($null -ne $ErrorBody.error) {
+                $AdditionalDetail = "$($ErrorBody.error.code) - $($ErrorBody.error.message)"
+            }
+            else {
+                $AdditionalDetail += $ErrorBody
+            }
+        }
+        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+            $Message += "`nDetail: $AdditionalDetail"
+        }
+        
+        Write-Error $Message -Category AuthenticationError
+    }
+}
+
+Write-Host "Created $variablesCreated output variables"
\ No newline at end of file
diff --git a/step-templates/datadog-create-event.json b/src/step-templates/datadog-create-event/metadata.json
similarity index 58%
rename from step-templates/datadog-create-event.json
rename to src/step-templates/datadog-create-event/metadata.json
index 488875a04..791e47b6e 100644
--- a/step-templates/datadog-create-event.json
+++ b/src/step-templates/datadog-create-event/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 3,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Lets handle our own errors here\n$ErrorActionPreference = \"continue\"\n\n$apiKey = $OctopusParameters['ApiKey']\n$title = $OctopusParameters['EventTitle']\n$body = $OctopusParameters['EventBody']\n$alertType = $OctopusParameters['AlertType']\n$priority = $OctopusParameters['Priority']\n$tags = $OctopusParameters['Tags']\n$endpoint = $OctopusParameters['DatadogEndpoint']\n$eventsApiEndpoint = \"/api/v1/events\"\n\n# Write out some debug information\nWrite-Host \"Event Title: $title\"\nWrite-Host \"Event Body: $body\"\nWrite-Host \"Alert Type: $alertType\"\nWrite-Host \"Priority: $priority\"\nWrite-Host \"Tags: $tags\"\nWrite-Host \"Datadog Endpoint: $endpoint$eventsApiEndpoint\"\n\n# Create the url from basic information\n$url = \"$endpoint$eventsApiEndpoint`?api_key=$apiKey\"\n$tagString = [system.String]::Join(\"`\",`\"\", $tags.Split(\",\"))\n\n$json = @\"\n{\n      \"title\": \"$title\",\n      \"text\": \"$body\",\n      \"priority\": \"$priority\",\n      \"tags\": [\"$tagString\"],\n      \"alert_type\": \"$alertType\"\n  }\n\"@\n\n# Make the response and handle exceptions **Requires PS 3.0 + \ntry {\n    $response = Invoke-WebRequest -Uri $url -Method POST -Body ($json | ConvertFrom-Json | ConvertTo-Json) -ContentType \"Application/json\" -UseBasicParsing\n}catch{\n    Write-Error \"Error: $_\"\n    EXIT 0\n}\n\n# Some Error handling here\nif($response.StatusCode -ne 202){\n    Write-Error \"There was an error listing response content below to debug\"\n    $response.RawContent\n}else{\n    Write-Host \"Sent Successfully\"\n}\n\n# We usually don't want to fail a deployment because of this\nEXIT 0",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -74,12 +74,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-07-08T02:19:06.141+00:00",
+    "ExportedAt": "2014-07-07T19:19:06.1410000-07:00",
     "OctopusVersion": "2.4.10.235",
     "Type": "ActionTemplate"
   },
   "Category": "datadog"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/datadog-create-event/scriptbody.ps1 b/src/step-templates/datadog-create-event/scriptbody.ps1
new file mode 100644
index 000000000..6f8d131d1
--- /dev/null
+++ b/src/step-templates/datadog-create-event/scriptbody.ps1
@@ -0,0 +1,52 @@
+# Lets handle our own errors here
+$ErrorActionPreference = "continue"
+
+$apiKey = $OctopusParameters['ApiKey']
+$title = $OctopusParameters['EventTitle']
+$body = $OctopusParameters['EventBody']
+$alertType = $OctopusParameters['AlertType']
+$priority = $OctopusParameters['Priority']
+$tags = $OctopusParameters['Tags']
+$endpoint = $OctopusParameters['DatadogEndpoint']
+$eventsApiEndpoint = "/api/v1/events"
+
+# Write out some debug information
+Write-Host "Event Title: $title"
+Write-Host "Event Body: $body"
+Write-Host "Alert Type: $alertType"
+Write-Host "Priority: $priority"
+Write-Host "Tags: $tags"
+Write-Host "Datadog Endpoint: $endpoint$eventsApiEndpoint"
+
+# Create the url from basic information
+$url = "$endpoint$eventsApiEndpoint`?api_key=$apiKey"
+$tagString = [system.String]::Join("`",`"", $tags.Split(","))
+
+$json = @"
+{
+      "title": "$title",
+      "text": "$body",
+      "priority": "$priority",
+      "tags": ["$tagString"],
+      "alert_type": "$alertType"
+  }
+"@
+
+# Make the response and handle exceptions **Requires PS 3.0 + 
+try {
+    $response = Invoke-WebRequest -Uri $url -Method POST -Body ($json | ConvertFrom-Json | ConvertTo-Json) -ContentType "Application/json" -UseBasicParsing
+}catch{
+    Write-Error "Error: $_"
+    EXIT 0
+}
+
+# Some Error handling here
+if($response.StatusCode -ne 202){
+    Write-Error "There was an error listing response content below to debug"
+    $response.RawContent
+}else{
+    Write-Host "Sent Successfully"
+}
+
+# We usually don't want to fail a deployment because of this
+EXIT 0
\ No newline at end of file
diff --git a/step-templates/datadog-schedule-downtime.json b/src/step-templates/datadog-schedule-downtime/metadata.json
similarity index 53%
rename from step-templates/datadog-schedule-downtime.json
rename to src/step-templates/datadog-schedule-downtime/metadata.json
index 1a49e8afa..d92d3288f 100644
--- a/step-templates/datadog-schedule-downtime.json
+++ b/src/step-templates/datadog-schedule-downtime/metadata.json
@@ -6,7 +6,7 @@
   "Version": 4,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Lets handle our own errors here\r\n$ErrorActionPreference = \"continue\"\r\n\r\n$apiKey = $OctopusParameters['ApiKey']\r\n$appKey = $OctopusParameters['AppKey']\r\n$endpoint = $OctopusParameters['DatadogEndpoint']\r\n$downtimeApiEndpoint = \"/api/v1/downtime\"\r\n$scope = $OctopusParameters['Environment']\r\n$durstring = $OctopusParameters['Duration']\r\n\r\n[int]$duration = [convert]::ToInt32($durstring,10)\r\n\r\n# Write out some debug information\r\nWrite-Host \"Scheduling Downtime for: $scope\"\r\nWrite-Host \"Datadog Endpoint: $endpoint$downtimeApiEndpoint\"\r\n\r\n# Create the url from basic information\r\n$url = \"$endpoint$downtimeApiEndpoint`?api_key=$apiKey&application_key=$appKey\"\r\n\r\nWrite-Host $url\r\n\r\n$start=[Math]::Floor([decimal](Get-Date(Get-Date).ToUniversalTime()-uformat \"%s\"))\r\n$end = $start + $duration\r\n$json = @\"\r\n{\r\n      \"scope\": \"env:$scope\",\r\n      \"start\": \"$start\",\r\n      \"end\": \"$end\"\r\n  }\r\n\"@\r\n\r\n# Make the response and handle exceptions **Requires PS 3.0 + \r\ntry {\r\n    $response = Invoke-WebRequest -Uri $url -Method POST -Body ($json | ConvertFrom-Json | ConvertTo-Json) -ContentType \"Application/json\" -UseBasicParsing\r\n}catch{\r\n    Write-Error \"Error: $_\"\r\n    EXIT 0\r\n}\r\n\r\n# Some Error handling here\r\nif($response.StatusCode -ne 200){\r\n    Write-Error \"There was an error listing response content below to debug\"\r\n    $response.RawContent\r\n}else{\r\n    Write-Host \"Sent Successfully\"\r\n}\r\n\r\n# We usually don't want to fail a deployment because of this\r\nEXIT 0"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -56,12 +56,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2019-09-18T00:54:17.669Z",
+  "LastModifiedOn": "2019-09-18T00:54:17.6690000Z",
   "LastModifiedBy": "baynewc1",
   "$Meta": {
-    "ExportedAt": "2016-03-01T23:11:19.809Z",
+    "ExportedAt": "2016-03-01T23:11:19.8090000Z",
     "OctopusVersion": "3.2.0",
     "Type": "ActionTemplate"
   },
   "Category": "datadog"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/datadog-schedule-downtime/scriptbody.ps1 b/src/step-templates/datadog-schedule-downtime/scriptbody.ps1
new file mode 100644
index 000000000..af45175b3
--- /dev/null
+++ b/src/step-templates/datadog-schedule-downtime/scriptbody.ps1
@@ -0,0 +1,49 @@
+# Lets handle our own errors here
+$ErrorActionPreference = "continue"
+
+$apiKey = $OctopusParameters['ApiKey']
+$appKey = $OctopusParameters['AppKey']
+$endpoint = $OctopusParameters['DatadogEndpoint']
+$downtimeApiEndpoint = "/api/v1/downtime"
+$scope = $OctopusParameters['Environment']
+$durstring = $OctopusParameters['Duration']
+
+[int]$duration = [convert]::ToInt32($durstring,10)
+
+# Write out some debug information
+Write-Host "Scheduling Downtime for: $scope"
+Write-Host "Datadog Endpoint: $endpoint$downtimeApiEndpoint"
+
+# Create the url from basic information
+$url = "$endpoint$downtimeApiEndpoint`?api_key=$apiKey&application_key=$appKey"
+
+Write-Host $url
+
+$start=[Math]::Floor([decimal](Get-Date(Get-Date).ToUniversalTime()-uformat "%s"))
+$end = $start + $duration
+$json = @"
+{
+      "scope": "env:$scope",
+      "start": "$start",
+      "end": "$end"
+  }
+"@
+
+# Make the response and handle exceptions **Requires PS 3.0 + 
+try {
+    $response = Invoke-WebRequest -Uri $url -Method POST -Body ($json | ConvertFrom-Json | ConvertTo-Json) -ContentType "Application/json" -UseBasicParsing
+}catch{
+    Write-Error "Error: $_"
+    EXIT 0
+}
+
+# Some Error handling here
+if($response.StatusCode -ne 200){
+    Write-Error "There was an error listing response content below to debug"
+    $response.RawContent
+}else{
+    Write-Host "Sent Successfully"
+}
+
+# We usually don't want to fail a deployment because of this
+EXIT 0
\ No newline at end of file
diff --git a/src/step-templates/datadog-task-log/metadata.json b/src/step-templates/datadog-task-log/metadata.json
new file mode 100644
index 000000000..65a43c894
--- /dev/null
+++ b/src/step-templates/datadog-task-log/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "e8550a62-3ed7-4200-b5c7-ba91cbda5e2a",
+  "Name": "Datadog - Log Task",
+  "Description": "Log details of a task to Datadog, including error detail.\n\n**Configuration**: \n\n* In Datadog, add a [standard attribute](https://docs.datadoghq.com/logs/processing/attributes_naming_convention/#standard-attributes-and-aliasing) of `octopus.deployment.properties` to see and access JSON details of the task.  \n\n* When using the step, set the [run condition](https://octopus.com/docs/projects/steps/conditions) of the step to `Always run` to ensure logs are sent for errors as well as successful tasks.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "6a1f7310-294a-4593-898b-afc32bd93bb3",
+      "Name": "DatadogUrl",
+      "Label": "Datadog URL",
+      "HelpText": "The URL for POSTing log information",
+      "DefaultValue": "https://http-intake.logs.datadoghq.eu/v1/input",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2eb26500-3ced-466c-962e-18b91ce6ea46",
+      "Name": "DatadogAPIKey",
+      "Label": "Datadog API Key",
+      "HelpText": "[API Key](https://docs.datadoghq.com/account_management/api-app-keys/#api-keys) required for accessing API.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "289728cb-9442-41b3-a3be-17f4e8287380",
+      "Name": "DatadogApplicationKey",
+      "Label": "Datadog Application Key",
+      "HelpText": "Information on Datadog [Application Keys](https://docs.datadoghq.com/account_management/api-app-keys/#application-keys)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "6afbdc2a-3f85-4807-abff-d7f3e0dcba77",
+      "Name": "DatadogServiceName",
+      "Label": "Datadog Service Name",
+      "HelpText": null,
+      "DefaultValue": "Octopus Deploy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "62b47d15-e05f-4e0b-a4b9-4a80b98b62f9",
+      "Name": "DatadogOctopusAPIKey",
+      "Label": "",
+      "HelpText": "Only used when an exception has occurred.\n\nOctopus instance [API Key](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key).   Requires at least `TaskView` [permission](https://octopus.com/docs/security/users-and-teams/system-and-space-permissions).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-03-04T11:25:36.4000000Z",
+    "OctopusVersion": "2020.5.249",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "octocrock",
+  "Category": "datadog"
+}
diff --git a/src/step-templates/datadog-task-log/scriptbody.ps1 b/src/step-templates/datadog-task-log/scriptbody.ps1
new file mode 100644
index 000000000..9108f1d95
--- /dev/null
+++ b/src/step-templates/datadog-task-log/scriptbody.ps1
@@ -0,0 +1,135 @@
+  
+function Send-DatadogEvent (
+    $datadog,
+    [string] $text,
+    [string] $level,
+    $properties = @{},
+    [string] $exception = $null,
+    [switch] $template) {
+    
+    
+    if (-not $level) {
+        $level = 'Information'
+    }
+
+    if (@('Verbose', 'Debug', 'Information', 'Warning', 'Error', 'Fatal') -notcontains $level) {
+        $level = 'Information'
+    }
+
+
+    $ddtags = "project:$($properties.ProjectName),deploymentname:$($properties.DeploymentName),env:$($properties.EnvironmentName)"
+    if ($properties["TaskType"] -eq "Runbook") {
+        $ddtags += ",runbookname:$($properties.RunbookName),tasktype:runbook"
+    }
+    else {
+        $ddtags += ",tasktype:deployment"    
+    }
+
+    $body = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+    $body.Add("ddsource", "Octopus Deploy")
+    $body.Add("ddtags", $ddtags)
+    $body.Add("service", $DatadogServiceName)
+    $body.Add("hostname", "https://octopus.the-crock.com/")
+    $body.Add("http.url", "$($properties["TaskLink"])")
+    $body.Add("octopus.deployment.properties", "$($properties | ConvertTo-Json)")
+
+    if ($exception) {
+        $body.Add("error.message", "$($properties["Error"])")
+        $body.Add("error.stack", "$($exception)")
+    }
+    
+    $body.Add("level", "$($level)")
+  
+    $headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+    $headers.Add("Content-Type", "application/json")
+    $headers.Add("DD-APPLICATION-KEY", "$($DatadogApplicationKey)")
+    $headers.Add("DD-API-KEY", "$($DatadogApiKey)")
+
+    Invoke-RestMethod -Uri $DatadogUrl -Body $($body | ConvertTo-Json)  -ContentType "application/json" -Method POST -Headers $headers
+}
+
+function Set-ErrorDetails(){
+
+    $octopusAPIHeader = @{ "X-Octopus-ApiKey" = $DatadogOctopusAPIKey }
+    $taskDetailUri = "$($OctopusParameters['Octopus.Web.ServerUri'])/api/tasks/$($OctopusParameters["Octopus.Task.Id"])/details"
+
+    $taskDetails = Invoke-RestMethod -Method Get -Uri $taskDetailUri -Headers $octopusAPIHeader 
+    $errorMessage = "";
+    $errorFirstLine = "";
+    $isFirstLine = $true;
+
+    foreach ($activityLog in $taskDetails.ActivityLogs) {
+        foreach ($activityLogChild1 in $activityLog.Children) {
+            foreach ($activityLogChild2 in $activityLogChild1.Children) {
+                foreach ($logElement in $activityLogChild2.LogElements) {
+                    if ($logElement.Category -eq "Error") {
+                        if ($isFirstLine -eq $true) {
+                            $errorFirstLine = $logElement.MessageText;
+                            $isFirstLine = $false;
+                        }
+
+                        $errorMessage += $logElement.MessageText + " `n"
+                    }
+                }
+            }
+        }
+    }
+
+    $exInfo = @{
+        firstLine = $errorFirstLine
+        message = $errorMessage
+    }
+
+    return $exInfo;
+}
+
+function Set-TaskProperties(){
+    $taskProperties = @{
+        ProjectName     = $OctopusParameters['Octopus.Project.Name'];
+        Result          = "succeeded";
+        InstanceUrl     = $OctopusParameters['Octopus.Web.ServerUri'];
+        EnvironmentName = $OctopusParameters['Octopus.Environment.Name'];
+        DeploymentName  = $OctopusParameters['Octopus.Deployment.Name'];
+        TenantName      = $OctopusParameters["Octopus.Deployment.Tenant.Name"]
+        TaskLink        = $taskLink
+    }
+    
+    if ([string]::IsNullOrEmpty($OctopusParameters["Octopus.Runbook.Id"]) -eq $false) {
+        $taskProperties["TaskType"] 			= "Runbook"
+        $taskProperties["RunbookSnapshotName"] 	= $OctopusParameters["Octopus.RunbookSnapshot.Name"]
+        $taskProperties["RunbookName"]         	= $OctopusParameters["Octopus.Runbook.Name"]
+    }
+    else {
+        $taskProperties["TaskType"] 		= "Deployment"
+        $taskProperties["ReleaseNumber"] 	= $OctopusParameters['Octopus.Release.Number'];
+        $taskProperties["Channel"]  		= $OctopusParameters['Octopus.Release.Channel.Name'];
+    }
+
+    return $taskProperties;
+}
+
+#******************************************************************
+
+$taskLink = $OctopusParameters['Octopus.Web.ServerUri'] + "/app#/" + $OctopusParameters["Octopus.Space.Id"] + "/tasks/" + $OctopusParameters["Octopus.Task.Id"]
+$level = "Information"
+$exception = $null
+
+Write-Output "Logging the deployment result to Datadog at $DatadogServerUrl..."
+
+$properties = Set-TaskProperties
+
+if ($OctopusParameters['Octopus.Deployment.Error']) {
+    $exceptionInfo = Set-ErrorDetails
+    $properties["Result"] = "failed"
+    $properties["Error"] = $exceptionInfo["firstLine"]
+    $exception = $exceptionInfo["message"]
+    $level = "Error"
+}
+
+try {
+    Send-DatadogEvent $datadog "A deployment of $($properties.ProjectName) release $($properties.ReleaseNumber) $($properties.Result) in $($properties.EnvironmentName)" -level $level -template -properties $properties -exception $exception
+}
+catch [Exception] {
+    Write-Error "Unable to write task details to Datadog"
+    $_.Exception | format-list -force
+}
diff --git a/src/step-templates/deploy-child-project/metadata.json b/src/step-templates/deploy-child-project/metadata.json
new file mode 100644
index 000000000..daa8a0b31
--- /dev/null
+++ b/src/step-templates/deploy-child-project/metadata.json
@@ -0,0 +1,273 @@
+{
+  "Id": "0dac2fe6-91d5-4c05-bdfb-1b97adf1e12e",
+  "Name": "Deploy Child Octopus Deploy Project",
+  "Description": "This step will find the latest release in a source environment matching your criteria and deploy it.  \n\nUse cases:\n- As a user, I want to create a single parent release `2020.2.1`.  When I promote the parent release I want the latest child releases matching `2020.2.1.*` to be promoted to the next environment.\n- As a user, I want the latest release in the dev environment to be promoted to the test environment.  Not the most recently created release, the most recent release deployed that environment.\n- As a user, when we are finished with our QA process, we want to automatically push the latest releases from QA to Staging without having to manually promote each release.\n- As a user, I'd like to set up a nightly build to promote the latest releases from Dev to QA\n- As a user, I'd like to be able to deploy a suite of applications to a tenant.  If the tenant isn't assigned to the project then skip over.\n- As a user, I'd like to see what releases would go to production and approve those releases without having to manually verify and approve each one.\n- As a user, I'd like to be able to target specific machines in my parent project and only have child projects deploy associated with those machines.\n- As a user, I'd like to be able to exclude specific machines in my parent project and only have child projects deploy to the remaining machines.\n- As a user, I'd like to have a single deployment target trigger on my parent project and when I scale up my servers deploy the appropriate child projects.\n- As a user, I'd like to be able to approve the deployments and then schedule them to be deployed at 7 PM\n- As a user, I'd like to be able to have one space for orchestration projects and another space for developers to work in.\n\nThis step template also allows you to skip deployments to the destination environment if it has already been deployed.",
+  "ActionType": "Octopus.Script",
+  "Version": 29,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "311597af-b1d5-42c1-bb8b-88c20d322989",
+      "Name": "ChildProject.Web.ServerUrl",
+      "Label": "Octopus Base Url",
+      "HelpText": "**Required**\n\nThe base URL of your instance. For example `https://samples.octopus.app`.  Defaults to the system variable [Octopus.Web.ServerUri](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server).",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f7357d18-33c3-4f1e-883d-613e13e098cd",
+      "Name": "ChildProject.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "*Required* \n\n\nThe API key of the user authorized to query and promote releases.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e3337365-c83f-4f73-a7d0-c3f36469a70d",
+      "Name": "ChildProject.Space.Name",
+      "Label": "Child Project Space",
+      "HelpText": "*Required*\n\nThe name of the space the child project is located in.  Defaults to the current space name",
+      "DefaultValue": "#{Octopus.Space.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d9afe2db-720a-40d0-928e-6d1763286fc9",
+      "Name": "ChildProject.Project.Name",
+      "Label": "Child Project Name",
+      "HelpText": "*Required* \n\n\nThe name of the child project you wish to deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dfe2c259-11c4-491f-900a-db7c37d82836",
+      "Name": "ChildProject.Release.Number",
+      "Label": "Child Project Release Number",
+      "HelpText": "*Optional* \n\n\nThe release number to filter on.  This field accepts:\n- *No value (default)* - the most recent release for the channel in the calculated previous environment or specified previous environment\n- *Wild card* - Example: `2020.2.*` will find the most recent release with a major version of 2020 and a minor version of 2.  Please note the period is important, if you enter `2020.1*` you could end up with 2020.10 releases.\n- *Specific version* - Example: `2020.2.1.2` will deploy that specific version.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c64e9163-ce84-4f56-8509-af849262a9be",
+      "Name": "ChildProject.Release.NotFoundError",
+      "Label": "Child Project Release Not Found Error Handle",
+      "HelpText": "What this step should do when a matching release cannot be found.\n\n- `Error` - Stops the deployment when no matching release is found.  For example, you specified `2021.1.2.*`, but there is no release in the child project matching that pattern.  Or, matching releases have been found but they cannot be promoted to the destination environment.\n- `Warning` - Stops this step with a warning.  The rest of the deployment continues.\n- `Skip` - Stops this with no error or warning. Logs an information message.  The rest of the deployment continues.\n\nThe default is `Warning`.",
+      "DefaultValue": "Warning",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Error|Error\nWarning|Warning\nSkip|Skip"
+      }
+    },
+    {
+      "Id": "04b2e549-888f-4a10-811c-f325690b3a80",
+      "Name": "ChildProject.Destination.EnvironmentName",
+      "Label": "Destination Environment Name",
+      "HelpText": "*Required*\n\nThe name of the destination environment.  \n\nExamples: `Development`, `Test`, or `Production`\n\n\nThe parent project and child project do *NOT* have to have the same lifecycle.  The only requirement is all the previous phases' requirements in the child project must be met.  For example, if the child project's life cycle is Dev->Test->Staging->Prod and the parent project lifecycle is Staging->Prod and you wish to deploy to staging, then the child project's release must go through Dev and Test first.",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e439fdb3-0697-4ea1-8b2c-8e343bfaa5af",
+      "Name": "ChildProject.SourceEnvironment.Name",
+      "Label": "Source Environment Name",
+      "HelpText": "*Optional* \n\n\nThe name of the source environment.  When blank the source environment will be calculated using the channel's lifecycle.  \n\n\nExamples: `Development`, `Test`, or `Production`\n\n\n**Please Note:** The most recently created release will be selected when the destination environment is the first phase of the child project's lifecycle.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "789a658e-ee7f-4bf2-aaa3-cf1a998adf57",
+      "Name": "ChildProject.Channel.Name",
+      "Label": "Child Project Channel",
+      "HelpText": "*Optional* \n\n\nThe name of the channel in the child project tied to the release you wish to deploy.  If left blank it will look at the project's default channel.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d462feb8-1911-401c-8329-b7c9775ac4fd",
+      "Name": "ChildProject.Tenant.Name",
+      "Label": "Tenant Name",
+      "HelpText": "*Optional*\n\nThe name of the tenant you wish to deploy.",
+      "DefaultValue": "#{Octopus.Deployment.Tenant.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4f9b232a-43ce-484c-9b30-0d3b195ddb15",
+      "Name": "ChildProject.Prompted.Variables",
+      "Label": "Child Project Prompted Variables",
+      "HelpText": "*Optional*\n\n\nValues for any prompted variables for the release. Each new line represents a new variable. This will only work with string variable types, text, and sensitive values.\n\n\nUse the format Name::Value \n\n\nFor example:\n\n\n```\nPromptedVariableName::My Super Awesome Value\nOtherPromptedVariable::Other Super Awesome Value\n```",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3149fde0-05dc-4582-ac85-8539220fc09b",
+      "Name": "ChildProject.DeploymentMode.Value",
+      "Label": "Deployment Mode",
+      "HelpText": "**Required**\n\nIndicates if the step template will promote a release from one environment to another, or it will redeploy an existing release.  \n\nOptions:\n- `Promote`: the step template will promote the release from one environment to another\n- `Redeploy`: the step template will take whatever the last release deployed to the target environment and redeploy it.  Useful when you are rebuilding a server.\n- `AlwaysLatest`: the step template will find the latest release available to the target environment and deploy it, regardless if it has already been deployed or not.\n\nDefault is `Promote`\n",
+      "DefaultValue": "Promote",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Promote|Promote\nRedeploy|Redeploy\nAlwaysLatest|AlwaysLatest"
+      }
+    },
+    {
+      "Id": "f231c791-d431-493f-8802-64adcb6a6de1",
+      "Name": "ChildProject.RefreshVariableSnapShots.Option",
+      "Label": "Refresh Variables Snapshots",
+      "HelpText": "Allows you to choose if/when variable snapshots will be refreshed.\n\n- `Yes`: Variable snapshot is refreshed when a change is detected\n- `No`: Never refresh the variable snapshot\n\nDefault is `No`.  Recommend configuring a prompted variable to control this option at deployment time.  When What If is set to `Yes` this will report a change has been made, but the snapshot refresh will not run.\n",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "No|No\nYes|Yes"
+      }
+    },
+    {
+      "Id": "6b587acb-7278-45ea-bda5-3bd8f4ecc211",
+      "Name": "ChildProject.Target.MachineNames",
+      "Label": "Specific Deployment Target",
+      "HelpText": "**Optional**\n\nA comma-separated list of deployment targets names or ids you want to deploy to.  If using an id, it must start with `Machines-`.\n\nPlease note: this step template will filter out any targets your child project cannot deploy to.  If you provide a list of 5 machines and the child project can only deploy to 3 of them, then the child project will get 3 machines sent to it.\n\nThis will overwrite the machines sent in via a deployment target trigger.\n\nDefaults `N/A`.  If you do want to use this parameter the recommendation is to use prompted variables where you pass in specific machine names.",
+      "DefaultValue": "N/A",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "02805228-fde7-4c1d-853f-acad7e819ba3",
+      "Name": "ChildProject.Deployment.IgnoreSpecificMachineMismatch",
+      "Label": "Ignore specific machine mismatch",
+      "HelpText": "When the parent project is deploying to specific machines and the child project isn't associated with those machines the step will ignore it.  \n\nExamples:\n- A deployment target trigger fires for a newly created machine.  Only 1 out of 5 child projects deploy to that newly created machine's roles.\n- A redeployment needs to occur, but only for a specific machine.  Only 2 out of the 4 child projects deploy to that specific machine's roles.    \n\nIn both those examples, the default behavior of this step template is to skip those child projects not tied to the machine's roles.  When the child project is invoked, the specific matching machines will be sent to the child project.\n\nSet to `Yes` to ignore the difference.  Default is `No`.  Warning, setting to `Yes` could result in a failed deployment.",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "No|No\nYes|Yes"
+      }
+    },
+    {
+      "Id": "aefc5d01-907c-47f6-a1d6-efaf97eefb6c",
+      "Name": "ChildProject.ReleaseNotes.SaveAsArtifact",
+      "Label": "Save release notes as artifact",
+      "HelpText": "This step will pull the release notes (or build information) from the child project and will save it to the output variable `ReleaseNotes`.\n\nThis option allows you to save those release notes as an artifact.  The default is `No`.",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "No|No\nYes|Yes"
+      }
+    },
+    {
+      "Id": "563136dd-b848-49f8-b9ef-57acc879dbc2",
+      "Name": "ChildProject.WhatIf.Value",
+      "Label": "What If",
+      "HelpText": "By default, this step will trigger a deployment.\n\n\nSetting this value to Yes will perform all the work up to triggering the deployment.  This is useful for approval steps, you can run this step (or set of steps) to get the list of child releases to deploy, and then verify them via a manual intervention.\n\n\nWhen this is set to `Yes` it will set an output variable `ReleaseToPromote`.",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      }
+    },
+    {
+      "Id": "d1d42293-e6fc-425e-a81c-973cc81eaa1d",
+      "Name": "ChildProject.WaitForFinish.Value",
+      "Label": "Wait for finish",
+      "HelpText": "Set to `Yes` to avoid waiting for the deployment to finish.  Will only be used when *What If* is set to `No`.",
+      "DefaultValue": "Yes",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      }
+    },
+    {
+      "Id": "52a65ba4-4ded-4f55-82e0-dc5a8c71a2f8",
+      "Name": "ChildProject.EnableEnhancedLogging.Value",
+      "Label": "Enable Enhanced Logging",
+      "HelpText": "Set to `Yes` to retrieve output of the child release while waiting for the deployment to finish. Will only be used when *What If* is set to `No` and *Wait for finish* is set to `Yes`.",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      }
+    },
+    {
+      "Id": "fd04d6fc-cc78-4a4f-9373-e48c349c9b07",
+      "Name": "ChildProject.CancelDeployment.Seconds",
+      "Label": "Wait for Deployment",
+      "HelpText": "Amount of time, in seconds, to wait for the deployment to finish.  Default is 1800 seconds, or 30 minutes.",
+      "DefaultValue": "1800",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7c3e75d3-a91c-47a1-acaa-1c6ea9f0699d",
+      "Name": "ChildProject.Deployment.FutureTime",
+      "Label": "Scheduling",
+      "HelpText": "**Optional**\n\nSchedule the deployment for the future.  Please note, if this is set, the `Wait for Deployment` option is ignored.\n\nUses `DateTime.TryParse` to determine the value sent in.  Supported formats:\n\n- `7:00 PM` will deploy at 7:00 PM today\n- `21:00` will deploy at 21:00 hours or 9 PM today\n- `YYYY-MM-DD HH:mm:ss` or `2021-01-14 21:00:00` will deploy at 9 PM on the 14th of January, 2021\n- `YYYY/MM/DD HH:mm:ss` or `2021/03/20 22:00:00` will deploy at 10 PM on the 20th of March, 2021\n- `MM/DD/YYYY HH:mm:ss` or `06/25/2021 19:00:00` will deploy at 7 PM on the 25th of June, 2021\n- `DD MMM YYYY HH:mm:ss` or `01 Jan 2021 18:00:00` will deploy at 6 PM on the 1st of January, 2021\n\nUses the Octopus Server's Timezone.  The queue expiry time will be set to 1 hour from the supplied date.\n\nDefault is `N/A` or not applicable.  ",
+      "DefaultValue": "N/A",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5789f25c-6efb-4bbc-9236-2939faf7c553",
+      "Name": "ChildProject.ManualInterventions.UseApprovalsFromParent",
+      "Label": "Auto-Approve Child Project Manual Interventions",
+      "HelpText": "If the child project has manual interventions the step will look for manual interventions in the parent project.\n\nWhen a manual intervention in the parent project is found it will check that user's assigned teams.  If that user's assigned teams can approve the child project it will do so.\n\nPlease note, the user associated with the API key must be able to approve the child project manual interventions as well.  \n\nThe default is `Yes`, allow this to happen.  Set it to `No` to skip this functionality.",
+      "DefaultValue": "Yes",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "No|No\nYes|Yes"
+      }
+    },
+    {
+      "Id": "2a93a2e9-562f-4985-8933-acbf1b0e6df6",
+      "Name": "ChildProject.ManualIntervention.EnvironmentToUse",
+      "Label": "Approval Environment",
+      "HelpText": "*Optional*\n\nThe name of the environment you wish to pull the approvals from for the parent project.   It will look at all the deployments for the current release of the parent project and select the latest deployment to the specified environment.\n\nUsed when you are deploying to `Production` but want to pull the approvals from `Staging` or a `Prod Approval` environment.\n\nDefaults to the current environment name.",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "11101484-c68a-4a8b-aa4d-3f0a31e36ae2",
+      "Name": "ChildProject.ManualIntervention.Tenant.Name",
+      "Label": "Approval Tenant",
+      "HelpText": "*Optional*\n\nThe name of the tenant you wish to pull the approvals from for the parent project.   It will look at all the deployments for the current release of the parent project and select the latest deployment to the specified environment.\n\nUsed when you are deploying to `Production` but want to pull the approvals from `Staging` or a `Prod Approval` environment.\n\nDefaults to the current tenant name.  Will be skipped when doing a non-tenanted deployment.",
+      "DefaultValue": "#{Octopus.Deployment.Tenant.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-11-17T03:06:39.6130000Z",
+    "OctopusVersion": "2023.2.13113",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "REOScotte",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/deploy-child-project/scriptbody.ps1 b/src/step-templates/deploy-child-project/scriptbody.ps1
new file mode 100644
index 000000000..4b3b55b82
--- /dev/null
+++ b/src/step-templates/deploy-child-project/scriptbody.ps1
@@ -0,0 +1,2064 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+# Supplied Octopus Parameters
+$parentReleaseId = $OctopusParameters["Octopus.Release.Id"]
+$parentChannelId = $OctopusParameters["Octopus.Release.Channel.Id"]
+$destinationSpaceId = $OctopusParameters["Octopus.Space.Id"]
+$specificMachines = $OctopusParameters["Octopus.Deployment.SpecificMachines"]
+$excludeMachines = $OctopusParameters["Octopus.Deployment.ExcludedMachines"]
+$deploymentMachines = $OctopusParameters["Octopus.Deployment.Machines"]
+$parentDeploymentTaskId = $OctopusParameters["Octopus.Task.Id"]
+$parentProjectName = $OctopusParameters["Octopus.Project.Name"]
+$parentReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$parentEnvironmentName = $OctopusParameters["Octopus.Environment.Name"]
+$parentEnvironmentId = $OctopusParameters["Octopus.Environment.Id"]
+$parentSpaceId = $OctopusParameters["Octopus.Space.Id"]
+
+# User Parameters
+$octopusApiKey = $OctopusParameters["ChildProject.Api.Key"]
+$projectName = $OctopusParameters["ChildProject.Project.Name"]
+$channelName = $OctopusParameters["ChildProject.Channel.Name"]
+$releaseNumber = $OctopusParameters["ChildProject.Release.Number"]
+$environmentName = $OctopusParameters["ChildProject.Destination.EnvironmentName"]
+$sourceEnvironmentName = $OctopusParameters["ChildProject.SourceEnvironment.Name"]
+$formValues = $OctopusParameters["ChildProject.Prompted.Variables"]
+$destinationSpaceName = $OctopusParameters["ChildProject.Space.Name"]
+$whatIfValue = $OctopusParameters["ChildProject.WhatIf.Value"]
+$waitForFinishValue = $OctopusParameters["ChildProject.WaitForFinish.Value"]
+$enableEnhancedLoggingValue = $OctopusParameters['ChildProject.EnableEnhancedLogging.Value']
+$deploymentCancelInSeconds = $OctopusParameters["ChildProject.CancelDeployment.Seconds"]
+$ignoreSpecificMachineMismatchValue = $OctopusParameters["ChildProject.Deployment.IgnoreSpecificMachineMismatch"]
+$autoapproveChildManualInterventionsValue = $OctopusParameters["ChildProject.ManualInterventions.UseApprovalsFromParent"]
+$saveReleaseNotesAsArtifactValue = $OctopusParameters["ChildProject.ReleaseNotes.SaveAsArtifact"]
+$futureDeploymentDate = $OctopusParameters["ChildProject.Deployment.FutureTime"]
+$errorHandleForNoRelease = $OctopusParameters["ChildProject.Release.NotFoundError"]
+$approvalEnvironmentName = $OctopusParameters["ChildProject.ManualIntervention.EnvironmentToUse"]
+$approvalTenantName = $OctopusParameters["ChildProject.ManualIntervention.Tenant.Name"]
+$refreshVariableSnapShot = $OctopusParameters["ChildProject.RefreshVariableSnapShots.Option"]
+$deploymentMode = $OctopusParameters["ChildProject.DeploymentMode.Value"]
+$targetMachines = $OctopusParameters["ChildProject.Target.MachineNames"]
+$deploymentTenantName = $OctopusParameters["ChildProject.Tenant.Name"]
+$defaultUrl = $OctopusParameters["ChildProject.Web.ServerUrl"]
+
+$cachedResults = @{}
+
+function Write-OctopusVerbose
+{
+    param($message)
+    
+    Write-Verbose $message  
+}
+
+function Write-OctopusInformation
+{
+    param($message)
+    
+    Write-Host $message  
+}
+
+function Write-OctopusSuccess
+{
+    param($message)
+
+    Write-Highlight $message 
+}
+
+function Write-OctopusWarning
+{
+    param($message)
+
+    Write-Warning "$message" 
+}
+
+function Write-OctopusCritical
+{
+    param ($message)
+
+    Write-Error "$message" 
+}
+
+function Test-RequiredValues
+{
+	param (
+    	$variableToCheck,
+        $variableName
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($variableToCheck) -eq $true)
+    {
+    	Write-OctopusCritical "$variableName is required."
+        return $false
+    }
+    
+    return $true
+}
+
+function Invoke-OctopusApi
+{
+    param
+    (
+        $octopusUrl,
+        $endPoint,
+        $spaceId,
+        $apiKey,
+        $method,
+        $item,
+        $ignoreCache     
+    )
+
+    if ([string]::IsNullOrWhiteSpace($SpaceId))
+    {
+        $url = "$OctopusUrl/api/$EndPoint"
+    }
+    else
+    {
+        $url = "$OctopusUrl/api/$spaceId/$EndPoint"    
+    }  
+
+    try
+    {        
+        if ($null -ne $item)
+        {
+            $body = $item | ConvertTo-Json -Depth 10
+            Write-OctopusVerbose $body
+
+            Write-OctopusInformation "Invoking $method $url"
+            return Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -Body $body -ContentType 'application/json; charset=utf-8' 
+        }
+
+        if (($null -eq $ignoreCache -or $ignoreCache -eq $false) -and $method.ToUpper().Trim() -eq "GET")
+        {
+            Write-OctopusVerbose "Checking to see if $url is already in the cache"
+            if ($cachedResults.ContainsKey($url) -eq $true)
+            {
+                Write-OctopusVerbose "$url is already in the cache, returning the result"
+                return $cachedResults[$url]
+            }
+        }
+        else
+        {
+            Write-OctopusVerbose "Ignoring cache."    
+        }
+
+        Write-OctopusVerbose "No data to post or put, calling bog standard invoke-restmethod for $url"
+        $result = Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -ContentType 'application/json; charset=utf-8'
+
+        if ($cachedResults.ContainsKey($url) -eq $true)
+        {
+            $cachedResults.Remove($url)
+        }
+        Write-OctopusVerbose "Adding $url to the cache"
+        $cachedResults.add($url, $result)
+
+        return $result
+
+               
+    }
+    catch
+    {
+        if ($null -ne $_.Exception.Response)
+        {
+            if ($_.Exception.Response.StatusCode -eq 401)
+            {
+                Write-OctopusCritical "Unauthorized error returned from $url, please verify API key and try again"
+            }
+            elseif ($_.Exception.Response.statusCode -eq 403)
+            {
+                Write-OctopusCritical "Forbidden error returned from $url, please verify API key and try again"
+            }
+            else
+            {                
+                Write-OctopusVerbose -Message "Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )"
+            }            
+        }
+        else
+        {
+            Write-OctopusVerbose $_.Exception
+        }
+    }
+
+    Throw "There was an error calling the Octopus API please check the log for more details"
+}
+
+function Get-ListFromOctopusApi
+{
+    param (
+        $octopusUrl,
+        $endPoint,
+        $spaceId,
+        $apiKey,
+        $propertyName
+    )
+
+    $rawItemList = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint $endPoint -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+
+    $returnList = @($rawItemList.$propertyName)
+
+    Write-OctopusVerbose "The endpoint $endPoint returned a list with $($returnList.Count) items"
+
+    return ,$returnList
+}
+
+function Get-FilteredOctopusItem
+{
+    param(
+        $itemList,
+        $itemName
+    )
+
+    if ($itemList.Count -eq 0)
+    {
+        Write-OctopusCritical "Unable to find $itemName.  Exiting with an exit code of 1."
+        Exit 1
+    }  
+
+    $item = $itemList | Where-Object { $_.Name.ToLower().Trim() -eq $itemName.ToLower().Trim() }      
+
+    if ($null -eq $item)
+    {
+        Write-OctopusCritical "Unable to find $itemName.  Exiting with an exit code of 1."
+        exit 1
+    }
+
+    return $item
+}
+
+function Test-PhaseContainsEnvironmentId
+{
+    param (
+        $phase,
+        $environmentId
+    )
+
+    Write-OctopusVerbose "Checking to see if $($phase.Name) automatic deployment environments $($phase.AutomaticDeploymentTargets) contains $environmentId"
+    if ($phase.AutomaticDeploymentTargets -contains $environmentId)
+    {
+        Write-OctopusVerbose "It does, returning true"
+        return $true
+    } 
+    
+    Write-OctopusVerbose "Checking to see if $($phase.Name) optional deployment environments $($phase.OptionalDeploymentTargets) contains $environmentId"
+    if ($phase.OptionalDeploymentTargets -contains $environmentId)
+    {
+        Write-OctopusVerbose "It does, returning true"
+        return $true
+    }
+
+    Write-OctopusVerbose "The phase does not contain the environment returning false"
+    return $false
+}
+
+function Get-OctopusItemByName
+{
+    param(
+        $itemName,
+        $itemType,
+        $endpoint,
+        $defaultValue,
+        $spaceId,
+        $defaultUrl,
+        $octopusApiKey
+    )
+
+    if ([string]::IsNullOrWhiteSpace($itemName) -or $itemName -like "#{Octopus*")
+    {
+        Write-OctopusVerbose "The item name passed in was $itemName, returning the default value for $itemType"
+        return $defaultValue
+    }
+
+    Write-OctopusInformation "Attempting to find $itemType with the name of $itemName"
+    
+    $itemList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint "$($endPoint)?partialName=$([uri]::EscapeDataString($itemName))&skip=0&take=100" -spaceId $spaceId -apiKey $octopusApiKey -method "GET" -propertyName "Items"   
+    $item = Get-FilteredOctopusItem -itemList $itemList -itemName $itemName
+
+    Write-OctopusInformation "Successfully found $itemName with id of $($item.Id)"
+
+    return $item
+}
+
+function Get-OctopusItemById
+{
+    param(
+        $itemId,
+        $itemType,
+        $endpoint,
+        $defaultValue,
+        $spaceId,
+        $defaultUrl,
+        $octopusApiKey
+    )
+
+    if ([string]::IsNullOrWhiteSpace($itemId))
+    {
+        return $defaultValue
+    }
+
+    Write-OctopusInformation "Attempting to find $itemType with the id of $itemId"
+    
+    $item = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "$endPoint/$itemId" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"        
+
+    if ($null -eq $item)
+    {
+        Write-OctopusCritical "Unable to find $itemType with the id of $itemId"
+        exit 1
+    }
+    else 
+    {
+        Write-OctopusInformation "Successfully found $itemId with name of $($item.Name)"    
+    }
+    
+    return $item
+}
+
+function Get-OctopusSpaceIdByName
+{
+	param(
+    	$spaceName,
+        $spaceId,
+        $defaultUrl,
+        $octopusApiKey    
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($spaceName))
+    {
+    	return $spaceId
+    }
+
+    $space = Get-OctopusItemByName -itemName $spaceName -itemType "Space" -endpoint "spaces" -defaultValue $spaceId -spaceId $null -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+    
+    return $space.Id
+}
+
+function Get-OctopusProjectByName
+{
+    param (
+        $projectName,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    return Get-OctopusItemByName -itemName $projectName -itemType "Project" -endpoint "projects" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey    
+}
+
+function Get-OctopusEnvironmentByName
+{
+    param (
+        $environmentName,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    return Get-OctopusItemByName -itemName $environmentName -itemType "Environment" -endpoint "environments" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey    
+}
+
+function Get-OctopusTenantByName
+{
+    param (
+        $tenantName,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    return Get-OctopusItemByName -itemName $tenantName -itemType "Tenant" -endpoint "tenants" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey    
+}
+
+function Get-OctopusApprovalTenant
+{
+    param (
+        $tenantToDeploy,
+        $approvalTenantName,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    Write-OctopusInformation "Checking to see if there is an approval tenant to consider"
+
+    if ($null -eq $tenantToDeploy)
+    {
+        Write-OctopusInformation "Not doing tenant deployments, skipping this check"    
+        return $null
+    }
+
+    if ([string]::IsNullOrWhiteSpace($approvalTenantName) -eq $true -or $approvalTenantName -eq "#{Octopus.Deployment.Tenant.Name}")
+    {
+        Write-OctopusInformation "No approval tenant was provided, returning $($tenantToDeploy.Id)"
+        return $tenantToDeploy
+    }
+
+    if ($approvalTenantName.ToLower().Trim() -eq $tenantToDeploy.Name.ToLower().Trim())
+    {
+        Write-OctopusInformation "The approval tenant name matches the deployment tenant name, using the current tenant"
+        return $tenantToDeploy
+    }
+
+    return Get-OctopusTenantByName -tenantName $approvalTenantName -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+}
+
+function Get-OctopusChannel
+{
+    param (
+        $channelName,
+        $project,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    Write-OctopusInformation "Attempting to find the channel information for project $projectName matching the channel name $channelName"
+    $channelList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint "projects/$($project.Id)/channels?skip=0&take=1000" -spaceId $spaceId -apiKey $octopusApiKey -method "GET" -propertyName "Items"
+    $channelToUse = $null
+    foreach ($channel in $channelList)
+    {
+        if ([string]::IsNullOrWhiteSpace($channelName) -eq $true -and $channel.IsDefault -eq $true)
+        {
+            Write-OctopusVerbose "The channel name specified is null or empty and the current channel $($channel.Name) is the default, using that"
+            $channelToUse = $channel
+            break
+        }
+
+        if ([string]::IsNullOrWhiteSpace($channelName) -eq $false -and $channel.Name.Trim().ToLowerInvariant() -eq $channelName.Trim().ToLowerInvariant())
+        {
+            Write-OctopusVerbose "The channel name specified $channelName matches the the current channel $($channel.Name) using that"
+            $channelToUse = $channel
+            break
+        }
+    }
+
+    if ($null -eq $channelToUse)
+    {
+        Write-OctopusCritical "Unable to find a channel to use.  Exiting with an exit code of 1."
+        exit 1
+    }
+
+    return $channelToUse
+}
+
+function Get-OctopusLifecyclePhases
+{
+    param (
+        $channel,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $project
+    )
+
+    Write-OctopusInformation "Attempting to find the lifecycle information $($channel.Name)"
+    if ($null -eq $channel.LifecycleId)
+    {
+        return Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint "lifecycles/$($project.LifecycleId)/preview" -spaceId $spaceId -apiKey $octopusApiKey -method "GET" -propertyName "Phases"
+    }
+    else
+    {
+        return Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint "lifecycles/$($channel.LifecycleId)/preview" -spaceId $spaceId -apiKey $octopusApiKey -method "GET" -propertyName "Phases"
+    }
+}
+
+function Get-SourceDestinationEnvironmentInformation
+{
+    param (
+        $phaseList,
+        $targetEnvironment,
+        $sourceEnvironment,
+        $isPromotionMode,
+        $isAlwaysLatestMode
+    )
+
+    Write-OctopusVerbose "Attempting to pull the environment ids from the source and destination phases"
+
+    $destTargetEnvironmentInfo = @{        
+        TargetEnvironment = $targetEnvironment
+        SourceEnvironmentList = @()
+        FirstLifecyclePhase = $false
+        HasRequiredPhase = $false
+    }
+
+    if ($isPromotionMode -eq $false)
+    {
+        if ($isAlwaysLatestMode -eq $true)
+        {
+            Write-OctopusInformation "Currently running in AlwaysLatest mode, setting the source environment to the target environment."
+        }
+        else
+        {
+            Write-OctopusInformation "Currently running in redeploy mode, setting the source environment to the target environment."
+
+        }
+        $destTargetEnvironmentInfo.SourceEnvironmentList = $targetEnvironment.Id
+
+        return $destTargetEnvironmentInfo
+    }
+
+    $indexOfTargetEnvironment = $null
+    for ($i = 0; $i -lt $phaseList.Length; $i++)
+    {
+        Write-OctopusInformation "Checking to see if lifecycle phase $($phaseList[$i].Name) contains the target environment id $($targetEnvironment.Id)"
+
+        if (Test-PhaseContainsEnvironmentId -phase $phaseList[$i] -environmentId $targetEnvironment.Id)    
+        {            
+            Write-OctopusVerbose "The phase $($phaseList[$i].Name) has the environment $($targetEnvironment.Name)."
+            $indexOfTargetEnvironment = $i
+            break
+        }
+    }
+
+    if ($null -eq $indexOfTargetEnvironment)
+    {
+        Write-OctopusCritical "Unable to find the target phase in this lifecycle attached to this channel.  Exiting with exit code of 1"
+        Exit 1
+    }
+
+    if ($indexOfTargetEnvironment -eq 0)
+    {
+        Write-OctopusInformation "This is the first phase in the lifecycle.  The current mode is promotion.  Going to get the latest release created that matches the release number rules for the channel."
+        $destTargetEnvironmentInfo.FirstLifecyclePhase = $true        
+        $destTargetEnvironmentInfo.SourceEnvironmentList += $targetEnvironment.Id
+
+        return $destTargetEnvironmentInfo
+    }
+    
+    if ($null -ne $sourceEnvironment)
+    {
+        Write-OctopusInformation "The source environment $($sourceEnvironment.Name) was provided, using that as the source environment"
+        $destTargetEnvironmentInfo.SourceEnvironmentList += $sourceEnvironment.Id
+
+        return $destTargetEnvironmentInfo
+    }
+
+    Write-OctopusVerbose "Looping through all the previous phases until a required phase is found."
+    $startingIndex = ($indexOfTargetEnvironment - 1)
+    for($i = $startingIndex; $i -ge 0; $i--)
+    {
+        $previousPhase = $phaseList[$i]
+        Write-OctopusInformation "Adding environments from the phase $($previousPhase.Name)"
+        foreach ($environmentId in $previousPhase.AutomaticDeploymentTargets)
+        {
+            $destTargetEnvironmentInfo.SourceEnvironmentList += $environmentId
+        }
+
+        foreach ($environmentId in $previousPhase.OptionalDeploymentTargets)
+        {
+            $destTargetEnvironmentInfo.SourceEnvironmentList += $environmentId
+        }
+
+        if ($previousPhase.IsOptionalPhase -eq $false)
+        {
+            Write-OctopusVerbose "The phase $($previousPhase.Name) is a required phase, exiting previous phase loop"
+            $destTargetEnvironmentInfo.HasRequiredPhase = $true
+            break
+        }
+        elseif ($i -gt 0)
+        {
+            Write-OctopusVerbose "The phase $($previousPhase.Name) is an optional phase, continuing going to check the next phase"    
+        }
+        else
+        {
+            Write-OctopusVerbose "The phase $($previousPhase.Name) is an optional phase.  This is the last phase so I'm stopping now."    
+        }
+    }
+
+    return $destTargetEnvironmentInfo             
+}
+
+function Get-ReleaseCanBeDeployedToTargetEnvironment
+{
+    param (
+        $release,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $sourceDestinationEnvironmentInfo,
+        $tenantToDeploy,
+        $isPromotionMode,
+        $isAlwaysLatestMode
+    )
+
+    if ($isPromotionMode -eq $false -and $isAlwaysLatestMode -eq $false)
+    {
+        Write-OctopusInformation "The current mode is redeploy.  Of course the release can be deployed to the target environment, no need to recheck it."
+        return $true
+    }
+
+    Write-OctopusInformation "Pulling the deployment template information for release $($release.Version)"
+    $releaseDeploymentTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "releases/$($release.Id)/deployments/template" -spaceId $spaceId -method GET -apiKey $octopusApiKey
+
+    $releaseCanBeDeployedToDestination = $false    
+    Write-OctopusInformation "Looping through deployment template list for $($release.Version) to see if it can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)."
+    foreach ($promoteToEnvironment in $releaseDeploymentTemplate.PromoteTo)
+    {
+        if ($promoteToEnvironment.Id -eq $sourceDestinationEnvironmentInfo.TargetEnvironment.Id)
+        {
+            Write-OctopusInformation "The environment $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name) was found in the list of environments to promote to"
+            $releaseCanBeDeployedToDestination = $true
+            break
+        }
+    }    
+
+    if ($null -eq $tenantToDeploy -or $releaseDeploymentTemplate.TenantPromotions.Length -le 0)
+    {
+        return $releaseCanBeDeployedToDestination
+    }
+
+    $releaseCanBeDeployedToDestination = $false
+    Write-OctopusInformation "The tenant id was supplied, looping through the tenant templates to see if it can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)."
+    foreach ($tenantPromotion in $releaseDeploymentTemplate.TenantPromotions)
+    {
+        if ($tenantPromotion.Id -ne $tenantToDeploy.Id)
+        {
+            Write-OctopusVerbose "The tenant ids $($tenantPromotion.Id) and $($tenantToDeploy.Id) don't match, moving onto the next one"
+            continue
+        }
+
+        Write-OctopusVerbose "The tenant Id matches checking to see if the environment can be promoted to."
+        foreach ($promoteToEnvironment in $tenantPromotion.PromoteTo)
+        {
+            if ($promoteToEnvironment.Id -ne $sourceDestinationEnvironmentInfo.TargetEnvironment.Id)
+            {
+                Write-OctopusVerbose "The environmentIds $($promoteToEnvironment.Id) and $($sourceDestinationEnvironmentInfo.TargetEnvironment.Id) don't match, moving onto the next one."
+                continue
+            }
+
+            Write-OctopusInformation "The environment $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name) was found in the list of environments tenant $($tenantToDeploy.Id) can be promoted to"
+            $releaseCanBeDeployedToDestination = $true
+        }
+    }
+
+    return $releaseCanBeDeployedToDestination
+}
+
+function Get-DeploymentPreview
+{
+    param (
+        $releaseToDeploy,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $targetEnvironment,
+        $deploymentTenant
+    )
+
+    if ($null -eq $deploymentTenant)
+    {
+        Write-OctopusInformation "The deployment tenant id was not sent in, generating a preview by hitting releases/$($releaseToDeploy.Id)/deployments/preview/$($targetEnvironment.Id)?includeDisabledSteps=true"    
+        return Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "releases/$($releaseToDeploy.Id)/deployments/preview/$($targetEnvironment.Id)?includeDisabledSteps=true" -apiKey $octopusApiKey -method "GET" -spaceId $spaceId
+    }
+
+    Write-OctopusInformation "The deployment tenant id was sent in, generating a preview by hitting releases/$($releaseToDeploy.Id)/deployments/previews" 
+    $requestBody = @{
+    		DeploymentPreviews = @(
+    			@{
+                	TenantId = $deploymentTenant.Id;
+            		EnvironmentId = $targetEnvironment.Id
+                 }
+            )
+    }
+    return Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "releases/$($releaseToDeploy.Id)/deployments/previews" -apiKey $octopusApiKey -method "POST" -spaceId $spaceId -item $requestBody -itemIsArray $true
+}
+
+function Get-ValuesForPromptedVariables
+{
+    param (
+        $deploymentPreview,
+        $formValues
+    )
+
+    $deploymentFormValues = @{}
+    if ([string]::IsNullOrWhiteSpace($formValues) -eq $true)
+    {
+        return $deploymentFormValues
+    }   
+    
+    $promptedValueList = @(($formValues -Split "`n").Trim())
+    Write-OctopusVerbose $promptedValueList.Length
+    
+    foreach($element in $deploymentPreview.Form.Elements)
+    {
+        $nameToSearchFor = $element.Control.Name
+        $uniqueName = $element.Name
+        $isRequired = $element.Control.Required
+        
+        $promptedVariablefound = $false
+        
+        Write-OctopusVerbose "Looking for the prompted variable value for $nameToSearchFor"
+        foreach ($promptedValue in $promptedValueList)
+        {
+            $splitValue = $promptedValue -Split "::"
+            Write-OctopusVerbose "Comparing $nameToSearchFor with provided prompted variable $($promptedValue[0])"
+            if ($splitValue.Length -gt 1)
+            {
+                if ($nameToSearchFor.ToLower().Trim() -eq $splitValue[0].ToLower().Trim())
+                {
+                    Write-OctopusVerbose "Found the prompted variable value $nameToSearchFor"
+                    $deploymentFormValues[$uniqueName] = $splitValue[1]
+                    $promptedVariableFound = $true
+                    break
+                }
+            }
+        }
+        
+        if ($promptedVariableFound -eq $false -and $isRequired -eq $true)
+        {
+            Write-OctopusCritical "Unable to find a value for the required prompted variable $nameToSearchFor, exiting"
+            Exit 1
+        }
+    }
+    
+    return $deploymentFormValues
+}
+
+function Test-ProjectTenantSettings
+{
+    param (
+        $tenantToDeploy,
+        $project,
+        $targetEnvironment
+    )
+
+    Write-OctopusVerbose "About to check if $tenantToDeploy is not null and tenant deploy mode on the project $($project.TenantedDeploymentMode) <> Untenanted"
+    if ($null -eq $tenantToDeploy)
+    {
+        Write-OctopusInformation "Not doing a tenanted deployment, no need to check if the project supports tenanted deployments."
+        return $null
+    }
+
+    if ($project.TenantedDeploymentMode -eq "Untenanted")
+    {
+        Write-OctopusInformation "The project is not tenanted, but we are doing a tenanted deployment, removing the tenant from the equation"
+        return $null
+    }
+
+    Write-OctopusInformation "Found the tenant $($tenantToDeploy.Name) checking to see if $($project.Name) is assigned to it."
+        
+    Write-OctopusVerbose "Checking to see if $($tenantToDeploy.ProjectEnvironments) has $($project.Id) as a property."
+    if ($null -eq (Get-Member -InputObject $tenantToDeploy.ProjectEnvironments -Name $project.Id -MemberType Properties))
+    {
+        Write-OctopusSuccess "The tenant $($tenantToDeploy.Name) is not assigned to $($project.Name).  Exiting."
+        Insert-EmptyOutputVariables -releaseToDeploy $null
+        
+        Exit 0
+    }
+
+    Write-OctopusInformation "The tenant $($tenantToDeploy.Name) is assigned to $($project.Name).  Now checking to see if it can be deployed to the target environment."
+    $tenantProjectId = $project.Id
+    
+    Write-OctopusVerbose "Checking to see if $($tenantToDeploy.ProjectEnvironments.$tenantProjectId) has $($targetEnvironment.Id)"    
+    if ($tenantToDeploy.ProjectEnvironments.$tenantProjectId -notcontains $targetEnvironment.Id)
+    {
+        Write-OctopusSuccess "The tenant $($tenantToDeploy.Name) is assigned to $($project.Name), but not to the environment $($targetEnvironment.Name).  Exiting."
+        Insert-EmptyOutputVariables -releaseToDeploy $null
+        
+        Exit 0
+    } 
+    
+    return $tenantToDeploy
+}
+
+function Test-ReleaseToDeploy
+{
+	param (
+    	$releaseToDeploy,
+        $errorHandleForNoRelease,
+        $releaseNumber,        
+        $sourceDestinationEnvironmentInfo, 
+        $environmentList
+    )
+    
+    if ($null -ne $releaseToDeploy)
+    {
+    	return
+    }
+        
+    $errorMessage = "No releases were found in environment(s)" 
+
+    $environmentMessage = @()
+    foreach ($environmentId in $sourceDestinationEnvironmentInfo.SourceEnvironmentList)
+    {
+        $environment = $environmentList | Where-Object {$_.Id -eq $environmentId }
+
+        if ($null -ne $environment)
+        {
+            $environmentMessage += $environment.Name
+        }
+    }
+
+    $errorMessage += " $($environmentMessage -join ",")"
+    
+    if ([string]::IsNullOrWhitespace($releaseNumber) -eq $false)
+    {
+    	$errorMessage = "$errorMessage matching $releaseNumber"
+    }
+    
+    $errorMessage = "$errorMessage that can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)"
+    
+    if ($errorHandleForNoRelease -eq "Error")
+    {
+    	Write-OctopusCritical $errorMessage
+        exit 1
+    }
+    
+    Insert-EmptyOutputVariables -releaseToDeploy $null
+    
+    if ($errorHandleForNoRelease -eq "Skip")
+    {
+    	Write-OctopusInformation $errorMessage
+        exit 0
+    }
+    
+    Write-OctopusSuccess $errorMessage
+    exit 0
+}
+
+function Get-TenantIsAssignedToPreviousEnvironments
+{
+    param (
+        $tenantToDeploy,
+        $sourceDestinationEnvironmentInfo,
+        $projectId,
+        $isPromotionMode
+    )
+
+    if ($null -eq $tenantToDeploy)
+    {
+        Write-OctopusVerbose "The tenant is null, skipping the check to see if it is assigned to the previous environment list."
+        return $false
+    }
+
+    if ($isPromotionMode -eq $false)
+    {
+        Write-OctopusVerbose "The current mode is redeploy, the source and destination environment are the same, no need to check."
+        return $true
+    }
+
+    Write-OctopusVerbose "Checking to see if $($tenantToDeploy.Name) is assigned to the previous environments."     
+    Write-OctopusVerbose "Checking to see if $($tenantToDeploy.ProjectEnvironments.$projectId) is assigned to the source environments(s) $($sourceDestinationEnvironmentInfo.SourceEnvironmentList)"
+
+    foreach ($environmentId in $tenantToDeploy.ProjectEnvironments.$projectId)
+    {
+        Write-OctopusVerbose "Checking to see if $environmentId appears in $($sourceDestinationEnvironmentInfo.SourceEnvironmentList)"
+        if ($sourceDestinationEnvironmentInfo.SourceEnvironmentList -contains $environmentId)
+        {
+            Write-OctopusVerbose "Found the environment $environmentId assigned to $($tenantToDeploy.Name), attempting to find the latest release for this tenant"
+            return $true
+        }
+    }
+
+    Write-OctopusVerbose "The tenant is not assigned to any environment in the source environments $($sourceDestinationEnvironmentInfo.SourceEnvironmentList), pulling the latest release to the environment regardless of tenant."
+    return $false
+}
+
+function Create-NewOctopusDeployment
+{
+	param (
+    	$releaseToDeploy,
+        $targetEnvironment,
+        $createdDeployment,
+        $project,
+        $waitForFinish,
+        $enableEnhancedLogging,
+        $deploymentCancelInSeconds,
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId,
+        $parentDeploymentApprovers,
+        $parentProjectName,
+        $parentReleaseNumber, 
+        $parentEnvironmentName, 
+        $parentDeploymentTaskId,
+        $autoapproveChildManualInterventions,
+        $approvalTenant
+    )
+    
+    Write-OctopusSuccess "Deploying $($releaseToDeploy.Version) to $($targetEnvironment.Name)"
+
+    $createdDeploymentResponse = Invoke-OctopusApi -method "POST" -endPoint "deployments" -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -item $createdDeployment
+    Write-OctopusInformation "The task id for the new deployment is $($createdDeploymentResponse.TaskId)"
+
+    Write-OctopusSuccess "Deployment was successfully invoked, you can access the deployment [here]($defaultUrl/app#/$spaceId/projects/$($project.Slug)/deployments/releases/$($releaseToDeploy.Version)/deployments/$($createdDeploymentResponse.Id)?activeTab=taskSummary)"
+    
+    if ($null -ne $createdDeployment.QueueTime -and $waitForFinish -eq $true)
+    {
+    	Write-OctopusWarning "The option to wait for the deployment to finish was set to yes AND a future deployment date was set to a future value.  Ignoring the wait for finish option and exiting."
+        return
+    }
+    
+    if ($waitForFinish -eq $true)
+    {
+        Write-OctopusSuccess "Waiting until deployment has finished"
+        $startTime = Get-Date
+        $currentTime = Get-Date
+        $dateDifference = $currentTime - $startTime
+        $lastEnhancedLoggingWriteTime = [datetime]::MinValue
+
+        $numberOfWaits = 0    
+
+        While ($dateDifference.TotalSeconds -lt $deploymentCancelInSeconds)
+        {
+	        $numberOfWaits += 1
+        
+            Write-Host "Waiting 5 seconds to check status"
+            Start-Sleep -Seconds 5
+            $taskStatusResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint "tasks/$($createdDeploymentResponse.TaskId)" -method "GET" -ignoreCache $true   
+            $taskStatusResponseState = $taskStatusResponse.State
+
+            if ($taskStatusResponseState -eq "Success")
+            {
+                if ($enableEnhancedLogging -eq $true)
+                {
+                    $lastEnhancedLoggingWriteTime = Get-TaskDetails -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -taskId $createdDeploymentResponse.TaskId -lastEnhancedLoggingWriteTime $lastEnhancedLoggingWriteTime
+                }
+                Write-OctopusSuccess "The task has finished with a status of Success"
+                exit 0            
+            }
+            elseif($taskStatusResponseState -eq "Failed" -or $taskStatusResponseState -eq "Canceled")
+            {
+                Write-OctopusSuccess "The task has finished with a status of $taskStatusResponseState status, stopping the deployment"
+                exit 1            
+            }
+            elseif($taskStatusResponse.HasPendingInterruptions -eq $true)
+            {
+            	if ($autoapproveChildManualInterventions -eq $true)
+                {
+                	Submit-ChildProjectDeploymentForAutoApproval -createdDeployment $createdDeploymentResponse -parentDeploymentApprovers $parentDeploymentApprovers -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -parentProjectName $parentProjectName -parentReleaseNumber $parentReleaseNumber -parentEnvironmentName $parentEnvironmentName -parentDeploymentTaskId $parentDeploymentTaskId -approvalTenant $approvalTenant
+                }
+                else
+                {
+                	if ($numberOfWaits -ge 10)
+                    {
+                		Write-OctopusSuccess "The child project has pending manual intervention(s).  Unless you approve it, this task will time out."
+                    }
+                    else
+                    {
+                    	Write-OctopusInformation "The child project has pending manual intervention(s).  Unless you approve it, this task will time out."                        
+                    }
+                }
+            }
+            
+            if ($numberOfWaits -ge 10)
+            {
+                if ($enableEnhancedLogging -eq $true)
+                {
+                    $lastEnhancedLoggingWriteTime = Get-TaskDetails -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -taskId $createdDeploymentResponse.TaskId -lastEnhancedLoggingWriteTime $lastEnhancedLoggingWriteTime
+                }
+                else
+                {
+                    Write-OctopusSuccess "The task state is currently $taskStatusResponseState"
+                    $numberOfWaits = 0
+                }
+            }
+            else
+            {
+                if ($enableEnhancedLogging -eq $true)
+                {
+                    $lastEnhancedLoggingWriteTime = Get-TaskDetails -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -taskId $createdDeploymentResponse.TaskId -lastEnhancedLoggingWriteTime $lastEnhancedLoggingWriteTime
+                }
+                else
+                {
+                    Write-OctopusInformation "The task state is currently $taskStatusResponseState"
+                }
+            }  
+
+            $startTime = $taskStatusResponse.StartTime
+            if ($null -eq $startTime -or [string]::IsNullOrWhiteSpace($startTime) -eq $true)
+            {        
+                Write-Host "The task is still queued, let's wait a bit longer"
+                $startTime = Get-Date
+            }
+            $startTime = [DateTime]$startTime
+
+            $currentTime = Get-Date
+            $dateDifference = $currentTime - $startTime        
+        }
+
+        Write-OctopusCritical "The cancel timeout has been reached, cancelling the deployment"
+        Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -method "POST" -endPoint "tasks/$($createdDeploymentResponse.TaskId)/cancel"    
+        Write-OctopusInformation "Exiting with an error code of 1 because we reached the timeout"
+        exit 1
+    }
+}
+
+function Get-ChildDeploymentSpecificMachines
+{
+    param (
+        $deploymentPreview,
+        $deploymentMachines,
+        $specificMachineDeployment
+    )
+
+    if ($specificMachineDeployment -eq $false)
+    {
+        Write-OctopusVerbose "Not doing specific machine deployments, returning any empty list of specific machines to deploy to"
+        return @()
+    }
+
+    $filteredList = @()
+    $deploymentMachineList = $deploymentMachines -split ","
+
+    Write-OctopusInformation "Doing a specific machine deployment, comparing the machines being targeted with the machines the child project can deploy to.  The number of machines being targeted is $($deploymentMachineList.Count)"
+
+    foreach ($deploymentMachine in $deploymentMachineList)
+    {
+        $deploymentMachineLowerTrim = $deploymentMachine.Trim().ToLower()           
+
+        foreach ($step in $deploymentPreview.StepsToExecute)
+        {
+            foreach ($machine in $step.Machines)
+            {   
+                $machineLowerTrim = $machine.Id.Trim().ToLower()
+                
+                Write-OctopusVerbose "Comparing $deploymentMachineLowerTrim with $machineLowerTrim"
+                if ($deploymentMachineLowerTrim -ne $machineLowerTrim)
+                {
+                    Write-OctopusVerbose "The two machine ids do not match, moving on to the next machine"
+                    continue
+                }
+
+                Write-OctopusVerbose "Checking to see if $machineLowerTrim is already in the filtered list."
+                if ($filteredList -notcontains $machine.Id)
+                {
+                    Write-OctopusVerbose "The machine is not in the list, adding it to the list."
+                    $filteredList += $machine.Id
+                }
+            }
+        }
+    }
+
+    if ($filteredList.Count -gt 0)
+    {
+        Write-OctopusSuccess "The machines applicable to this project are $filteredList."
+    }    
+
+    return $filteredList
+}
+
+function Test-ChildProjectDeploymentCanProceed
+{
+	param (
+    	$releaseToDeploy,
+        $specificMachineDeployment,                        
+        $environmentName,
+        $childDeploymentSpecificMachines,
+        $project,
+        $ignoreSpecificMachineMismatch,
+        $deploymentMachines,
+        $releaseHasAlreadyBeenDeployed,
+        $isPromotionMode       
+    )
+    
+	if ($releaseHasAlreadyBeenDeployed -eq $true -and $isPromotionMode -eq $true)
+    {	     	 
+    	Write-OctopusSuccess "Release $($releaseToDeploy.Version) is the most recent version deployed to $environmentName.  The deployment mode is Promote.  If you wish to redeploy this release then set the deployment mode to Redeploy.  Skipping this project."
+        
+        if ($specificMachineDeployment -eq $true -and $childDeploymentSpecificMachines.Length -gt 0)
+        {
+            Write-OctopusSuccess "$($project.Name) can deploy to $childDeploymentSpecificMachines but redeployments are not allowed."
+        }
+        
+        Insert-EmptyOutputVariables -releaseToDeploy $releaseToDeploy
+
+        exit 0
+    }
+    
+    if ($childDeploymentSpecificMachines.Length -le 0 -and $specificMachineDeployment -eq $true -and $ignoreSpecificMachineMismatch -eq $false)
+    {
+        Write-OctopusSuccess "$($project.Name) does not deploy to $($deploymentMachines -replace ",", " OR ").  The value for ""Ignore specific machine mismatch"" is set to ""No"".  Skipping this project."
+        
+        Insert-EmptyOutputVariables -releaseToDeploy $releaseToDeploy
+        
+        Exit 0
+    }
+
+    if ($childDeploymentSpecificMachines.Length -le 0 -and $specificMachineDeployment -eq $true -and $ignoreSpecificMachineMismatch -eq $true)
+    {
+        Write-OctopusSuccess "You are doing a deployment for specific machines but $($project.Name) does not deploy to $($deploymentMachines -replace ",", " OR ").  You have set the value for ""Ignore specific machine mismatch"" to ""Yes"".  The child project will be deployed to, but it will do this for all machines, not any specific machines."
+    }
+}
+
+function Get-ParentDeploymentApprovers
+{
+    param (
+        $parentDeploymentTaskId,
+        $spaceId,
+        $defaultUrl,
+        $octopusApiKey
+    )
+    
+    $approverList = @()
+    if ($null -eq $parentDeploymentTaskId)
+    {
+    	Write-OctopusInformation "The deployment task id to pull the approvers from is null, return an empty approver list"
+    	return $approverList
+    }
+
+    Write-OctopusInformation "Getting all the events from the parent project"
+    $parentDeploymentEvents = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "events?regardingAny=$parentDeploymentTaskId&spaces=$spaceId&includeSystem=true" -apiKey $octopusApiKey -method "GET"
+    
+    foreach ($parentDeploymentEvent in $parentDeploymentEvents.Items)
+    {
+        Write-OctopusVerbose "Checking $($parentDeploymentEvent.Message) for manual intervention"
+        if ($parentDeploymentEvent.Message -like "Submitted interruption*")
+        {
+            Write-OctopusVerbose "The event $($parentDeploymentEvent.Id) is a manual intervention approval event which was approved by $($parentDeploymentEvent.Username)."
+
+            $approverExists = $approverList | Where-Object {$_.Id -eq $parentDeploymentEvent.UserId}        
+
+            if ($null -eq $approverExists)
+            {
+                $approverInformation = @{
+                    Id = $parentDeploymentEvent.UserId;
+                    Username = $parentDeploymentEvent.Username;
+                    Teams = @()
+                }
+
+                $approverInformation.Teams = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "teammembership?userId=$($approverInformation.Id)&spaces=$spaceId&includeSystem=true" -apiKey $octopusApiKey -method "GET"            
+
+                Write-OctopusVerbose "Adding $($approverInformation.Id) to the approval list"
+                $approverList += $approverInformation
+            }        
+        }
+    }
+
+    return $approverList
+}
+
+function Submit-ChildProjectDeploymentForAutoApproval
+{
+    param (
+        $createdDeployment,
+        $parentDeploymentApprovers,
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId,
+        $parentProjectName,
+        $parentReleaseNumber,
+        $parentEnvironmentName,
+        $parentDeploymentTaskId,
+        $approvalTenant
+    )
+
+    Write-OctopusSuccess "The task has a pending manual intervention.  Checking parent approvals."    
+    $manualInterventionInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "interruptions?regarding=$($createdDeployment.TaskId)" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId -ignoreCache $true
+    foreach ($manualIntervention in $manualInterventionInformation.Items)
+    {
+        if ($manualIntervention.IsPending -eq $false)
+        {
+            Write-OctopusInformation "This manual intervention has already been approved.  Proceeding onto the next one."
+            continue
+        }
+
+        if ($manualIntervention.CanTakeResponsibility -eq $false)
+        {
+            Write-OctopusSuccess "The user associated with the API key doesn't have permissions to take responsibility for the manual intervention."
+            Write-OctopusSuccess "If you wish to leverage the auto-approval functionality give the user permissions."
+            continue
+        }        
+
+        $automaticApprover = $null
+        Write-OctopusVerbose "Checking to see if one of the parent project approvers is assigned to one of the manual intervention teams $($manualIntervention.ResponsibleTeamIds)"
+        foreach ($approver in $parentDeploymentApprovers)
+        {
+            foreach ($approverTeam in $approver.Teams)
+            {
+                Write-OctopusVerbose "Checking to see if $($manualIntervention.ResponsibleTeamIds) contains $($approverTeam.TeamId)"
+                if ($manualIntervention.ResponsibleTeamIds -contains $approverTeam.TeamId)
+                {
+                    $automaticApprover = $approver
+                    break
+                }
+            }
+
+            if ($null -ne $automaticApprover)
+            {
+                break
+            }
+        }
+
+        if ($null -ne $automaticApprover)
+        {
+            Write-OctopusVerbose "Found matching approvers, attempting to auto approve."
+            if ($manualIntervention.HasResponsibility -eq $false)
+            {
+                Write-OctopusInformation "Taking over responsibility for this manual intervention."
+                $takeResponsiblilityResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "interruptions/$($manualIntervention.Id)/responsible" -method "PUT" -apiKey $octopusApiKey -spaceId $spaceId -ignoreCache $true
+                Write-OctopusVerbose "Response from taking responsibility $($takeResponsiblilityResponse.Id)"
+            }
+            
+            if ($null -ne $approvalTenant)
+            {
+                $approvalMessage = "Parent project $parentProjectName release $parentReleaseNumber to $parentEnvironmentName for the tenant $($approvalTenant.Name) with the task id $parentDeploymentTaskId was approved by $($automaticApprover.UserName)."
+            }
+            else
+            {
+                $approvalMessage = "Parent project $parentProjectName release $parentReleaseNumber to $parentEnvironmentName with the task id $parentDeploymentTaskId was approved by $($automaticApprover.UserName)."
+            }
+
+            $submitApprovalBody = @{
+                Instructions = $null;
+                Notes = "Auto-approving this deployment. $approvalMessage That user is a member of one of the teams this manual intervention requires.  You can view that deployment $defaultUrl/app#/$spaceId/tasks/$parentDeploymentTaskId";
+                Result = "Proceed"
+            }
+            $submitResult = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "interruptions/$($manualIntervention.Id)/submit" -method "POST" -apiKey $octopusApiKey -item $submitApprovalBody -spaceId $spaceId -ignoreCache $true
+            Write-OctopusSuccess "Successfully auto approved the manual intervention $($submitResult.Id)"
+        }
+        else
+        {
+            Write-OctopusSuccess "Couldn't find an approver to auto-approve the child project.  Waiting until timeout or child project is approved."    
+        }
+    }
+}
+
+function Get-ReleaseNotes
+{
+	param (
+    	$releaseToDeploy,
+        $deploymentPreview,
+        $channel,
+        $spaceId,
+        $defaultUrl,
+        $octopusApiKey
+    )
+            
+    $releaseNotes = @("")
+    $releaseNotes += "**Release Information**"
+    $releaseNotes += ""
+
+    $packageVersionAdded = @()
+    $workItemsAdded = @()
+    $commitsAdded = @()
+
+    if ($null -ne $releaseToDeploy.BuildInformation -and $releaseToDeploy.BuildInformation.Count -gt 0)
+    {
+        $releaseNotes += "- Package Versions"
+        foreach ($change in $deploymentPreview.Changes)
+        {        
+            foreach ($package in $change.BuildInformation)
+            {
+                $packageInformation = "$($package.PackageId).$($package.Version)"
+                if ($packageVersionAdded -notcontains $packageInformation)
+                {
+                    $releaseNotes += "  - $packageInformation"
+                    $packageVersionAdded += $packageInformation
+                }
+            }
+        }
+
+		$releaseNotes += ""
+        $releaseNotes += "- Work Items"
+        foreach ($change in $deploymentPreview.Changes)
+        {        
+            foreach ($workItem in $change.WorkItems)
+            {            
+                if ($workItemsAdded -notcontains $workItem.Id)
+                {
+                    $workItemInformation = "[$($workItem.Id)]($($workItem.LinkUrl)) - $($workItem.Description)"
+                    $releaseNotes += "  - $workItemInformation"
+                    $workItemsAdded += $workItem.Id
+                }
+            }
+        }
+
+		$releaseNotes += ""
+        $releaseNotes += "- Commits"
+        foreach ($change in $deploymentPreview.Changes)
+        {        
+            foreach ($commit in $change.Commits)
+            {            
+                if ($commitsAdded -notcontains $commit.Id)
+                {
+                    $commitInformation = "[$($commit.Id)]($($commit.LinkUrl)) - $($commit.Comment)"
+                    $releaseNotes += "  - $commitInformation"
+                    $commitsAdded += $commit.Id
+                }
+            }
+        }            
+    }
+    else
+    {
+        $releaseNotes += $releaseToDeploy.ReleaseNotes
+        $releaseNotes += ""
+        $releaseNotes += "Package Versions"  
+        
+        $releaseDeploymentTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "deploymentprocesses/$($releaseToDeploy.ProjectDeploymentProcessSnapshotId)/template?channel=$($channel.Id)&releaseId=$($releaseToDeploy.Id)" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId
+        
+        foreach ($package in $releaseToDeploy.SelectedPackages)
+        {
+        	Write-OctopusVerbose "Attempting to find $($package.StepName) and $($package.ActionName)"
+            
+            $deploymentProcessPackageInformation = $releaseDeploymentTemplate.Packages | Where-Object {$_.StepName -eq $package.StepName -and $_.actionName -eq $package.ActionName}
+            if ($null -ne $deploymentProcessPackageInformation)
+            {
+                $packageInformation = "$($deploymentProcessPackageInformation.PackageId).$($package.Version)"
+                if ($packageVersionAdded -notcontains $packageInformation)
+                {
+                    $releaseNotes += "  - $packageInformation"
+                    $packageVersionAdded += $packageInformation
+                }
+            }
+        }
+    }
+
+    return $releaseNotes -join "`n"
+}
+
+function Get-QueueDate
+{
+	param ( 
+    	$futureDeploymentDate
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($futureDeploymentDate) -or $futureDeploymentDate -eq "N/A")
+    {
+    	return $null
+    }
+    
+    [datetime]$outputDate = New-Object DateTime
+    $currentDate = Get-Date
+
+    if ([datetime]::TryParse($futureDeploymentDate, [ref]$outputDate) -eq $false)
+    {
+        Write-OctopusCritical "The suppplied date $futureDeploymentDate cannot be parsed by DateTime.TryParse.  Please verify format and try again.  Please [refer to Microsoft's Documentation](https://docs.microsoft.com/en-us/dotnet/api/system.datetime.tryparse) on supported formats."
+        exit 1
+    }
+    
+    if ($currentDate -gt $outputDate)
+    {
+    	Write-OctopusCritical "The supplied date $futureDeploymentDate is set for the past.  All queued deployments must be in the future."
+        exit 1
+    }
+    
+    return $outputDate
+}
+
+function Get-QueueExpiryDate
+{
+	param (
+    	$queueDate
+    )
+    
+    if ($null -eq $queueDate)
+    {
+    	return $null
+    }
+    
+    return $queueDate.AddHours(1)
+}
+
+function Insert-EmptyOutputVariables
+{
+	param (
+    	$releaseToDeploy
+    )
+    
+	if ($null -ne $releaseToDeploy)
+    {
+		Set-OctopusVariable -Name "ReleaseToPromote" -Value $($releaseToDeploy.Version)
+        Set-OctopusVariable -Name "ReleaseNotes" -value "Release already deployed to destination environment."
+    }
+    else
+    {
+    	Set-OctopusVariable -Name "ReleaseToPromote" -Value "N/A"
+        Set-OctopusVariable -Name "ReleaseNotes" -value "No release found"
+    }        
+    
+    Write-OctopusInformation "Setting the output variable ChildReleaseToDeploy to $false"
+    Set-OctopusVariable -Name "ChildReleaseToDeploy" -Value $false
+}
+
+function Get-ApprovalDeploymentTaskId
+{
+	param (
+    	$autoapproveChildManualInterventions,
+        $parentDeploymentTaskId,
+        $parentReleaseId,
+        $parentEnvironmentName,
+        $approvalEnvironmentName,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $parentChannelId,    
+        $parentEnvironmentId,
+        $approvalTenant,
+        $parentProject
+    )
+    
+    if ($autoapproveChildManualInterventions -eq $false)
+    {
+    	Write-OctopusInformation "Auto approvals are disabled, skipping pulling the approval deployment task id"
+        return $null
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($approvalEnvironmentName) -eq $true)
+    {
+    	Write-OctopusInformation "Approval environment not supplied, using the current environment id for approvals."
+        return $parentDeploymentTaskId
+    }
+    
+    if ($approvalEnvironmentName.ToLower().Trim() -eq $parentEnvironmentName.ToLower().Trim())
+    {
+        Write-OctopusInformation "The approval environment is the same as the current environment, using the current task id $parentDeploymentTaskId"
+        return $parentDeploymentTaskId
+    }
+    
+    $approvalEnvironment = Get-OctopusEnvironmentByName -environmentName $approvalEnvironmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+    $releaseDeploymentList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint "releases/$parentReleaseId/deployments?skip=0&take=1000" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId -propertyName "Items"
+    
+    $lastDeploymentTime = $(Get-Date).AddYears(-50)
+    $approvalTaskId = $null
+    foreach ($deployment in $releaseDeploymentList)
+    {
+        if ($deployment.EnvironmentId -ne $approvalEnvironment.Id)
+        {
+            Write-OctopusInformation "The deployment $($deployment.Id) deployed to $($deployment.EnvironmentId) which doesn't match $($approvalEnvironment.Id).  Moving onto the next deployment."
+            continue
+        }
+
+        if ($null -ne $approvalTenant -and $null -ne $deployment.TenantId -and $deployment.TenantId -ne $approvalTenant.Id)
+        {
+            Write-OctopusInformation "The deployment $($deployment.Id) was deployed to the correct environment, $($approvalEnvironment.Id), but the deployment tenant $($deployment.TenantId) doesn't match the approval tenant $($approvalTenant.Id).  Moving onto the next deployment."
+            continue
+        }
+        
+        Write-OctopusInformation "The deployment $($deployment.Id) was deployed to the approval environment $($approvalEnvironment.Id)."
+
+        $deploymentTask = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $null -endPoint "tasks/$($deployment.TaskId)" -apiKey $octopusApiKey -Method "Get"
+        if ($deploymentTask.IsCompleted -eq $false)
+        {
+            Write-OctopusInformation "The deployment $($deployment.Id) is being deployed to the approval environment, but it hasn't completed, moving onto the next deployment."
+            continue
+        }
+
+        if ($deploymentTask.IsCompleted -eq $true -and $deploymentTask.FinishedSuccessfully -eq $false)
+        {
+            Write-Information "The deployment $($deployment.Id) was deployed to the approval environment, but it encountered a failure, moving onto the next deployment."
+            continue
+        }
+
+        if ($deploymentTask.StartTime -gt $lastDeploymentTime)
+        {
+            $approvalTaskId = $deploymentTask.Id
+            $lastDeploymentTime = $deploymentTask.StartTime
+        }
+    }        
+
+    if ($null -eq $approvalTaskId)
+    {
+    	Write-OctopusVerbose "Unable to find a deployment to the environment, determining if it should've happened already."
+        $channelInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "channels/$parentChannelId" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId
+        $lifecyclePhases = Get-OctopusLifeCyclePhases -channel $channelInformation -defaultUrl $defaultUrl -spaceId $spaceId -OctopusApiKey $octopusApiKey -project $parentProject        
+        
+        $foundDestinationFirst = $false
+        $foundApprovalFirst = $false
+        
+        foreach ($phase in $lifecyclePhases)
+        {
+        	if (Test-PhaseContainsEnvironmentId -phase $phase -environmentId $parentEnvironmentId)
+            {
+            	if ($foundApprovalFirst -eq $false)
+                {
+                	$foundDestinationFirst = $true
+                }
+            }
+            
+            if (Test-PhaseContainsEnvironmentId -phase $phase -environmentId $approvalEnvironment.Id)
+            {
+            	if ($foundDestinationFirst -eq $false)
+                {
+                	$foundApprovalFirst = $true
+                }
+            }
+        }
+        
+        $messageToLog = "Unable to find a deployment for the environment $approvalEnvironmentName.  Auto approvals are disabled."
+        if ($foundApprovalFirst -eq $true)
+        {
+        	Write-OctopusWarning $messageToLog
+        }
+        else
+        {
+        	Write-OctopusInformation $messageToLog
+        }
+        
+        return $null
+    }
+
+    return $approvalTaskId
+}
+
+function Invoke-RefreshVariableSnapshot
+{
+	param (
+    	$refreshVariableSnapShot,
+        $whatIf,
+        $releaseToDeploy,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+    
+    Write-OctopusVerbose "Checking to see if variable snapshot will be updated."
+    
+    if ($refreshVariableSnapShot -eq "No")
+    {
+    	Write-OctopusVerbose "Refreshing variables is set to no, skipping"
+    	return
+    }
+    
+    $releaseDeploymentTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "releases/$($releaseToDeploy.Id)/deployments/template" -spaceId $spaceId -method GET -apiKey $octopusApiKey
+    
+    if ($releaseDeploymentTemplate.IsVariableSetModified -eq $false -and $releaseDeploymentTemplate.IsLibraryVariableSetModified -eq $false)
+    {
+    	Write-OctopusVerbose "Variables have not been updated since release creation, skipping"
+        return
+    }
+    
+    if ($whatIf -eq $true)
+    {
+    	Write-OctopusSuccess "Variables have been updated since release creation, whatif set to true, no update will occur."
+        return
+    }
+    
+    $snapshotVariables = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "releases/$($releaseToDeploy.Id)/snapshot-variables" -spaceId $spaceId -method "POST" -apiKey $octopusApiKey
+    Write-OctopusSuccess "Variables have been modified since release creation.  Variable snapshot was updated on $($snapshotVariables.LastModifiedOn)"
+}
+
+function Get-MatchingOctopusDeploymentTasks
+{
+    param (
+        $spaceId,
+        $project,
+        $tenantToDeploy,
+        $tenantIsAssignedToPreviousEnvironments,
+        $sourceDestinationEnvironmentInfo,
+        $defaultUrl,
+        $octopusApiKey
+    )
+
+    $taskEndPoint = "tasks?skip=0&take=100&spaces=$spaceId&includeSystem=false&project=$($project.Id)&name=Deploy&states=Success"
+
+    if ($null -ne $tenantToDeploy -and $tenantIsAssignedToPreviousEnvironments -eq $true)
+    {
+        $taskEndPoint += "&tenant=$($tenantToDeploy.Id)"
+    }
+
+    $taskList = @()
+
+    foreach ($sourceEnvironmentId in $sourceDestinationEnvironmentInfo.SourceEnvironmentList)
+    {
+        $octopusTaskList = Get-ListFromOctopusApi -octopusUrl $DefaultUrl -endPoint "$($taskEndPoint)&environment=$sourceEnvironmentId" -spaceId $null -apiKey $octopusApiKey -method "GET" -propertyName "Items"
+        $taskList += $octopusTaskList
+    }
+
+    $orderedTaskList = @($taskList | Sort-Object -Property StartTime -Descending)
+    Write-OctopusVerbose "We have $($orderedTaskList.Count) number of tasks to loop through"
+
+    return $orderedTaskList
+}
+
+function Get-TaskDetails
+{
+    param (
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $taskId,
+        $lastEnhancedLoggingWriteTime
+    )
+
+    $taskDetails = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint "tasks/$taskId/details" -method 'GET' -ignoreCache $true
+    $activityLogs = $taskDetails.ActivityLogs
+    $writeStepName = $writeTargetName = $true
+    $returnTime = [datetime]::MinValue
+
+    foreach ($step in $activityLogs.Children)
+    {
+        foreach ($target in $step.Children)
+        {
+            foreach ($logElement in $target.LogElements)
+            {
+                $occurredAt = [datetime]($logElement.OccurredAt)
+                if ($occurredAt -gt $lastEnhancedLoggingWriteTime)
+                {
+                    if ($writeStepName -eq $true)
+                    {
+                        $trailingCount = 66 - $step.Name.Length
+                        if ($trailingCount -lt 0) { $trailingCount = 0 }
+                        Write-OctopusInformation "╔═ $($step.Name) $("═" * $trailingCount)"
+                        $writeStepName = $false
+                    }
+                    if ($writeTargetName -eq $true)
+                    {
+                        $trailingCount = 64 - $target.Name.Length
+                        if ($trailingCount -lt 0) { $trailingCount = 0 }
+                        Write-OctopusInformation "║ ┌─ $($target.Name) $('─' * $trailingCount)"
+                        $writeTargetName = $false
+                    }
+                    Write-OctopusInformation "║ │ $($logElement.MessageText)"
+                    if ($occurredAt -gt $returnTime) { $returnTime = $occurredAt}
+                }
+            }
+            if ($writeTargetName -eq $false)
+            {
+                Write-OctopusInformation "║ └$('─' * 67)"
+                $writeTargetName = $true
+            }
+        }
+        if ($writeStepName -eq $false)
+        {
+            Write-OctopusInformation "╚$('═' * 69)"
+            $writeStepName = $true
+        }
+    }
+
+    return $returnTime
+}
+
+function Get-ReleaseToDeployFromTaskList
+{
+    param (
+        $taskList,
+        $channel,
+        $releaseNumber,
+        $tenantToDeploy,
+        $sourceDestinationEnvironmentInfo,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $isPromotionMode
+    )
+    
+    foreach ($task in $taskList)
+    {
+        Write-OctopusVerbose "Pulling the deployment information for $($task.Id)"
+        $deploymentInformation = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "deployments/$($task.Arguments.DeploymentId)" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+
+        if ($deploymentInformation.ChannelId -ne $channel.Id)
+        {
+            Write-OctopusInformation "The deployment was not for the channel we want to deploy to, moving onto next task."
+            continue
+        }
+
+        Write-OctopusVerbose "Pulling the release information for $($deploymentInformation.Id)"
+        $releaseInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "releases/$($deploymentInformation.ReleaseId)" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+        
+        if ($isPromotionMode -eq $false)
+        {
+            Write-OctopusInformation "Current mode is set to redeploy, the release is for the correct channel and was successful, using it."            
+            return $releaseInformation
+        }
+
+        if ([string]::IsNullOrWhiteSpace($releaseNumber) -eq $false -and $releaseInformation.Version -notlike $releaseNumber)
+        {
+            Write-OctopusInformation "The release version $($releaseInformation.Version) does not match $releaseNumber.  Moving onto the next task."
+            continue
+        }
+
+        $releaseCanBeDeployed = Get-ReleaseCanBeDeployedToTargetEnvironment -defaultUrl $defaultUrl -release $releaseInformation -spaceId $spaceId -octopusApiKey $octopusApiKey -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -tenantToDeploy $tenantToDeploy -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+
+        if ($releaseCanBeDeployed -eq $true)
+        {
+            Write-OctopusInformation "The release $($releaseInformation.Version) can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)."
+            return $releaseInformation                                    
+        }
+
+        Write-OctopusInformation "The release $($releaseInformation.Version) cannot be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).  Moving onto next task"
+    } 
+    
+    return $null
+}
+
+function Get-ReleaseToDeployFromChannel
+{
+    param (
+        $channel,
+        $releaseNumber,
+        $tenantToDeploy,
+        $sourceDestinationEnvironmentInfo,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey,
+        $isPromotionMode,
+        $isAlwaysLatestMode
+    )
+
+    if ([string]::IsNullOrWhiteSpace($releaseNumber) -eq $false)
+    {        
+        $urlReleaseNumber = $releaseNumber.Replace("*", "")
+        Write-OctopusInformation "The release number was sent in, sending $urlReleaseNumber to the channel endpoint to have the server filter on that number first."
+        $releaseChannelList = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "channels/$($channel.Id)/releases?skip=0&take=100&searchByVersion=$urlReleaseNumber" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"    
+    }
+    else
+    {
+        Write-OctopusInformation "The release number was not sent in, attempting to find the latest release from the channel to deploy."
+        $releaseChannelList = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "channels/$($channel.Id)/releases?skip=0&take=100" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"    
+    }
+    
+    Write-OctopusInformation "There are $($releaseChannelList.Items.Count) potential releases to go through."
+
+    foreach ($releaseInformation in $releaseChannelList.Items)
+    {
+        if ([string]::IsNullOrWhiteSpace($releaseNumber) -eq $false -and $releaseInformation.Version -notlike $releaseNumber)
+        {
+            Write-OctopusInformation "The release version $($releaseInformation.Version) does not match $releaseNumber.  Moving onto the next release in the channel."
+            continue
+        }
+
+        $releaseCanBeDeployed = Get-ReleaseCanBeDeployedToTargetEnvironment -defaultUrl $defaultUrl -release $releaseInformation -spaceId $spaceId -octopusApiKey $octopusApiKey -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -tenantToDeploy $tenantToDeploy -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+
+        if ($releaseCanBeDeployed -eq $true)
+        {
+            Write-OctopusInformation "The release $($releaseInformation.Version) can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)."
+            return $releaseInformation                                    
+        }
+
+        Write-OctopusInformation "The release $($releaseInformation.Version) cannot be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).  Moving onto next release in the channel."
+    }
+
+    return $null
+}
+
+function Get-ReleaseHasAlreadyBeenPromotedToTargetEnvironment
+{
+    param (
+        $releaseToDeploy,
+        $tenantToDeploy,
+        $sourceDestinationEnvironmentInfo,
+        $isPromotionMode,
+        $isAlwaysLatestMode,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    if ($isPromotionMode -eq $false -and $isAlwaysLatestMode -eq $false)
+    {
+        Write-OctopusInformation "Currently in redeploy mode, of course the release has already been deployed to the target environment.  Exiting the Release Has Already Been Promoted To Target Environment check."
+        return $true
+    }
+
+    Write-OctopusVerbose "Pulling the last release for the target environment to see if the release to deploy is the latest one in that environment."
+    $taskEndPoint = "tasks?skip=0&take=1&spaces=$spaceId&includeSystem=false&project=$($releaseToDeploy.ProjectId)&name=Deploy&states=Success&environment=$($sourceDestinationEnvironmentInfo.TargetEnvironment.Id)"
+
+    if ($null -ne $tenantToDeploy)
+    {
+        $taskEndPoint += "&tenant=$($tenantToDeploy.Id)"
+    }
+
+    $octopusTaskList = Get-ListFromOctopusApi -octopusUrl $DefaultUrl -endPoint "$taskEndPoint" -spaceId $null -apiKey $octopusApiKey -method "GET" -propertyName "Items"
+
+    if ($octopusTaskList.Count -eq 0)
+    {
+        Write-OctopusInformation "There have been no releases to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name) for this project."
+        return $false
+    }
+
+    $task = $octopusTaskList[0]
+    $deploymentInformation = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "deployments/$($task.Arguments.DeploymentId)" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+
+    if ($releaseToDeploy.Id -eq $deploymentInformation.ReleaseId)
+    {
+        Write-OctopusInformation "The release to deploy $($release.ReleaseNumber) is the last successful release to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)"
+        return $true
+    }
+
+    Write-OctopusInformation "The release to deploy $($release.ReleaseNumber) is different than the last successful release to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)"
+    return $false
+}
+
+function Get-MachineIdsFromMachineNames
+{
+    param (
+        $targetMachines,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    $targetMachineList = $targetMachines -split ","
+    $translatedList = @()
+
+    foreach ($machineName in $targetMachineList)
+    {
+    	$trimmedMachineName = $machineName.Trim()
+        Write-OctopusVerbose "Translating $trimmedMachineName into an Octopus Id"
+    	if ($trimmedMachineName -like "Machines-*")
+        {
+        	Write-OctopusVerbose "$trimmedMachineName is already an Octopus Id, adding it to the list"
+        	$translatedList += $machineName
+            continue
+        }
+        
+        $machineObject = Get-OctopusItemByName -itemName $trimmedMachineName -itemType "Deployment Target" -endpoint "machines" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+
+        $translatedList += $machineObject.Id
+    }
+
+    return $translatedList -join ","
+}
+
+function Write-ReleaseInformation
+{
+    param (
+        $releaseToDeploy,
+        $environmentList
+    )
+
+    $releaseDeployments = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "releases/$($releaseToDeploy.Id)/deployments" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+    $releaseEnvironmentList = @()
+
+    foreach ($deployment in $releaseDeployments.Items)
+    {        
+        $releaseEnvironment = $environmentList | Where-Object {$_.Id -eq $deployment.EnvironmentId }
+        
+        if ($null -ne $releaseEnvironment -and $releaseEnvironmentList -notcontains $releaseEnvironment.Name)
+        {
+            Write-OctopusVerbose "Adding $($releaseEnvironment.Name) to the list of environments this release has been deployed to"
+            $releaseEnvironmentList += $releaseEnvironment.Name
+        }                
+    }
+    
+    if ($releaseEnvironmentList.Count -gt 0)
+    {
+        Write-OctopusSuccess "The release to deploy is $($releaseToDeploy.Version) which has been deployed to $($releaseEnvironmentList -join ",")"
+    }
+    else
+    {
+        Write-OctopusSuccess "The release to deploy is $($releaseToDeploy.Version) which currently has no deployments."    
+    }
+}
+
+function Get-GuidedFailureMode
+{
+	param (
+    	$projectToDeploy,
+        $environmentToDeployTo
+    )
+    
+    Write-OctopusInformation "Checking $($projectToDeploy.DefaultGuidedFailureMode) and $($environmentToDeployTo.UseGuidedFailure) to determine guided failure mode."
+    
+    if ($projectToDeploy.DefaultGuidedFailureMode -eq "EnvironmentDefault" -and $environmentToDeployTo.UseGuidedFailure -eq $true)
+    {
+    	Write-OctopusInformation "Guided failure for the project is set to environment default, and destination environment says to use guided failure.  Setting guided failure to true."
+        return $true
+    }
+    
+    if ($projectToDeploy.DefaultGuidedFailureMode -eq "On")
+    {
+    	Write-OctopusInformation "Guided failure for the project is set to always use guided falure.  Setting guided failure to true."
+        return $true
+    }
+    
+    Write-OctopusInformation "Guided failure is not turned on for the project nor the environment.  Setting to false."
+    return $false
+}
+
+Write-OctopusInformation "Octopus SpaceId: $destinationSpaceId"
+Write-OctopusInformation "Octopus Deployment Task Id: $parentDeploymentTaskId"
+Write-OctopusInformation "Octopus Project Name: $parentProjectName"
+Write-OctopusInformation "Octopus Release Number: $parentReleaseNumber"
+Write-OctopusInformation "Octopus Release Id: $parentReleaseId"
+Write-OctopusInformation "Octopus Environment Name: $parentEnvironmentName"
+Write-OctopusInformation "Octopus Release Channel Id: $parentChannelId"
+Write-OctopusInformation "Octopus Specific deployment machines: $specificMachines"
+Write-OctopusInformation "Octopus Exclude deployment machines: $excludeMachines"
+Write-OctopusInformation "Octopus deployment machines: $deploymentMachines"
+
+Write-OctopusInformation "Child Project Name: $projectName"
+Write-OctopusInformation "Child Project Space Name: $destinationSpaceName"
+Write-OctopusInformation "Child Project Channel Name: $channelName"
+Write-OctopusInformation "Child Project Release Number: $releaseNumber"
+Write-OctopusInformation "Child Project Error Handle No Release Found: $errorHandleForNoRelease"
+Write-OctopusInformation "Destination Environment Name: $environmentName"
+Write-OctopusInformation "Source Environment Name: $sourceEnvironmentName"
+Write-OctopusInformation "Ignore specific machine mismatch: $ignoreSpecificMachineMismatchValue"
+Write-OctopusInformation "Save release notes as artifact: $saveReleaseNotesAsArtifactValue"
+Write-OctopusInformation "What If: $whatIfValue"
+Write-OctopusInformation "Wait for finish: $waitForFinishValue"
+Write-OctopusInformation "Cancel deployment in seconds: $deploymentCancelInSeconds"
+Write-OctopusInformation "Scheduling: $futureDeploymentDate"
+Write-OctopusInformation "Auto-Approve Child Project Manual Interventions: $autoapproveChildManualInterventionsValue"
+Write-OctopusInformation "Approval Environment: $approvalEnvironmentName"
+Write-OctopusInformation "Approval Tenant: $approvalTenantName"
+Write-OctopusInformation "Refresh Variable Snapshot: $refreshVariableSnapShot"
+Write-OctopusInformation "Deployment Mode: $deploymentMode"
+Write-OctopusInformation "Target Machine Names: $targetMachines"
+Write-OctopusInformation "Deployment Tenant Name: $deploymentTenantName"
+
+$whatIf = $whatIfValue -eq "Yes"
+$waitForFinish = $waitForFinishValue -eq "Yes"
+$enableEnhancedLogging = $enableEnhancedLoggingValue -eq "Yes"
+$ignoreSpecificMachineMismatch = $ignoreSpecificMachineMismatchValue -eq "Yes"
+$autoapproveChildManualInterventions = $autoapproveChildManualInterventionsValue -eq "Yes"
+$saveReleaseNotesAsArtifact = $saveReleaseNotesAsArtifactValue -eq "Yes"
+
+$verificationPassed = @()
+$verificationPassed += Test-RequiredValues -variableToCheck $octopusApiKey -variableName "Octopus API Key"
+$verificationPassed += Test-RequiredValues -variableToCheck $destinationSpaceName -variableName "Child Project Space"
+$verificationPassed += Test-RequiredValues -variableToCheck $projectName -variableName "Child Project Name"
+$verificationPassed += Test-RequiredValues -variableToCheck $environmentName -variableName "Destination Environment Name"
+
+if ($verificationPassed -contains $false)
+{
+	Write-OctopusInformation "Required values missing"
+	Exit 1
+}
+
+$isPromotionMode = $deploymentMode -eq "Promote"
+$isAlwaysLatestMode = $deploymentMode -eq 'AlwaysLatest'
+$spaceId = Get-OctopusSpaceIdByName -spaceName $destinationSpaceName -spaceId $destinationSpaceId -defaultUrl $defaultUrl -OctopusApiKey $octopusApiKey    
+
+Write-OctopusSuccess "The current mode of the step template is $deploymentMode"
+
+if ($isAlwaysLatestMode -eq $true)
+{
+    Write-OctopusSuccess "Currently in AlwaysLatest mode, release number filter will be ignored, source environment will be set to the target environment, all redeployment checks will be ignored."
+}
+
+if ($isPromotionMode -eq $false -and $isAlwaysLatestMode -eq $false)
+{
+    Write-OctopusSuccess "Currently in redeploy mode, release number filter will be ignored, source environment will be set to the target environment, all redeployment checks will be ignored."
+}
+
+if ($isPromotionMode -eq $true -and [string]::IsNullOrWhiteSpace($sourceEnvironmentName) -eq $false -and $sourceEnvironmentName.ToLower().Trim() -eq $environmentName.ToLower().Trim())
+{
+    Write-OctopusSuccess "The current mode is promotion.  Both the source environment and destination environment are the same.  You cannot promote from the same environment as the source environment.  Exiting.  Change the deployment mode value to redeploy if you want to redeploy."
+    Exit 0
+}
+
+$specificMachineDeployment = $false
+if ([string]::IsNullOrWhiteSpace($specificMachines) -eq $false)
+{
+	Write-OctopusSuccess "This deployment is targeting the specific machines $specificMachines."
+	$specificMachineDeployment = $true
+}
+
+if ([string]::IsNullOrWhiteSpace($excludeMachines) -eq $false)
+{
+	Write-OctopusSuccess "This deployment is excluding the specific machines $excludeMachines.  The machines being deployed to are: $deploymentMachines."
+    $specificMachineDeployment = $true
+}
+
+if ([string]::IsNullOrWhiteSpace($targetMachines) -eq $false -and $targetMachines -ne "N/A")
+{
+    Write-OctopusSuccess "You have specified specific machines to target in this deployment.  Ignoring the machines that triggered this deployment."
+    $specificMachineDeployment = $true
+    $deploymentMachines = Get-MachineIdsFromMachineNames -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -targetMachines $targetMachines
+}
+
+$project = Get-OctopusProjectByName -projectName $projectName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+$parentProject = Get-OctopusProjectByName -projectName $parentProjectName -defaultUrl $defaultUrl -spaceId $parentSpaceId -octopusApiKey $octopusApiKey
+$tenantToDeploy = Get-OctopusTenantByName -tenantName $deploymentTenantName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+$targetEnvironment = Get-OctopusEnvironmentByName -environmentName $environmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+$tenantToDeploy = Test-ProjectTenantSettings -tenantToDeploy $tenantToDeploy -project $project -targetEnvironment $targetEnvironment
+
+$sourceEnvironment = Get-OctopusEnvironmentByName -environmentName $sourceEnvironmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+$channel = Get-OctopusChannel -channelName $channelName -defaultUrl $defaultUrl -project $project -spaceId $spaceId -octopusApiKey $octopusApiKey
+$phaseList = Get-OctopusLifecyclePhases -channel $channel -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -project $project
+$sourceDestinationEnvironmentInfo = Get-SourceDestinationEnvironmentInformation -phaseList $phaseList -targetEnvironment $targetEnvironment -sourceEnvironment $sourceEnvironment -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+
+if ($deploymentMode -eq 'AlwaysLatest')
+{
+    Write-OctopusInformation "Finding the latest release that can be deployed."
+    $releaseToDeploy = Get-ReleaseToDeployFromChannel -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+}
+elseif ($sourceDestinationEnvironmentInfo.FirstLifecyclePhase -eq $false)
+{
+    $tenantIsAssignedToPreviousEnvironments = Get-TenantIsAssignedToPreviousEnvironments -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -projectId $project.Id -isPromotionMode $isPromotionMode
+    $taskList = Get-MatchingOctopusDeploymentTasks -spaceId $spaceId -project $project -tenantToDeploy $tenantToDeploy -tenantIsAssignedToPreviousEnvironments $tenantIsAssignedToPreviousEnvironments -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+    $releaseToDeploy = Get-ReleaseToDeployFromTaskList -taskList $taskList -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $DefaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode    
+
+    if ($null -eq $releaseToDeploy -and $sourceDestinationEnvironmentInfo.HasRequiredPhase -eq $false)
+    {
+        Write-OctopusInformation "No release was found that has been deployed.  However, all the phases prior to the destination phase is optional.  Checking to see if any releases exist at the channel level that haven't been deployed."
+        $releaseToDeploy = Get-ReleaseToDeployFromChannel -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+    }
+}
+else
+{
+    $releaseToDeploy = Get-ReleaseToDeployFromChannel -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+}
+
+$environmentList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint "environments?skip=0&take=1000" -spaceId $spaceId -propertyName "Items" -apiKey $octopusApiKey
+
+Test-ReleaseToDeploy -releaseToDeploy $releaseToDeploy -errorHandleForNoRelease $errorHandleForNoRelease -releaseNumber $releaseNumber -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -environmentList $environmentList
+
+if ($null -ne $releaseToDeploy)
+{
+    Write-ReleaseInformation -releaseToDeploy $releaseToDeploy -environmentList $environmentList
+}
+
+$releaseHasAlreadyBeenDeployed = Get-ReleaseHasAlreadyBeenPromotedToTargetEnvironment -releaseToDeploy $releaseToDeploy -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode
+
+$deploymentPreview = Get-DeploymentPreview -releaseToDeploy $releaseToDeploy -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -targetEnvironment $targetEnvironment -deploymentTenant $tenantToDeploy
+$childDeploymentSpecificMachines = Get-ChildDeploymentSpecificMachines -deploymentPreview $deploymentPreview -deploymentMachines $deploymentMachines -specificMachineDeployment $specificMachineDeployment
+$deploymentFormValues = Get-ValuesForPromptedVariables -formValues $formValues -deploymentPreview $deploymentPreview
+
+$queueDate = Get-QueueDate -futureDeploymentDate $futureDeploymentDate
+$queueExpiryDate = Get-QueueExpiryDate -queueDate $queueDate
+$useGuidedFailure = Get-GuidedFailureMode -projectToDeploy $project -environmentToDeployTo $targetEnvironment
+
+$createdDeployment = @{
+    EnvironmentId = $targetEnvironment.Id;
+    ExcludeMachineIds = @();
+    ForcePackageDownload = $false;
+    ForcePackageRedeployment = $false;
+    FormValues = $deploymentFormValues;
+    QueueTime = $queueDate;
+    QueueTimeExpiry = $queueExpiryDate;
+    ReleaseId = $releaseToDeploy.Id;
+    SkipActions = @();
+    SpecificMachineIds = @($childDeploymentSpecificMachines);
+    TenantId = $null;
+    UseGuidedFailure = $useGuidedFailure
+}
+
+if ($null -ne $tenantToDeploy -and $project.TenantedDeploymentMode -ne "Untenanted")
+{
+    $createdDeployment.TenantId = $tenantToDeploy.Id
+}
+
+if ($whatIf -eq $true)
+{    	
+    Write-OctopusVerbose "Would have done a POST to /api/$spaceId/deployments with the body:"
+    Write-OctopusVerbose $($createdDeployment | ConvertTo-JSON)        
+    
+    Write-OctopusSuccess "What If set to true."
+    Write-OctopusSuccess "Setting the output variable ReleaseToPromote to $($releaseToDeploy.Version)."            
+	Set-OctopusVariable -Name "ReleaseToPromote" -Value ($releaseToDeploy.Version)       
+}
+
+Write-OctopusVerbose "Getting the release notes"
+$releaseNotes = Get-ReleaseNotes -releaseToDeploy $releaseToDeploy -deploymentPreview $deploymentPreview -channel $channel -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+Write-OctopusSuccess "Setting the output variable ReleaseNotes which contains the release notes from the child project"
+Set-OctopusVariable -Name "ReleaseNotes" -value $releaseNotes
+
+Test-ChildProjectDeploymentCanProceed -releaseToDeploy $releaseToDeploy -specificMachineDeployment $specificMachineDeployment -environmentName $environmentName -childDeploymentSpecificMachines $childDeploymentSpecificMachines -project $project -ignoreSpecificMachineMismatch $ignoreSpecificMachineMismatch -deploymentMachines $deploymentMachines -releaseHasAlreadyBeenDeployed $releaseHasAlreadyBeenDeployed -isPromotionMode $isPromotionMode
+
+if ($saveReleaseNotesAsArtifact -eq $true)
+{
+	$releaseNotes | Out-File "ReleaseNotes.txt"
+    $currentDate = Get-Date
+	$currentDateFormatted = $currentDate.ToString("yyyy_MM_dd_HH_mm")
+    $artifactName = "$($project.Name) $($releaseToDeploy.Version) $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).ReleaseNotes_$($currentDateFormatted).txt"
+    Write-OctopusInformation "Creating the artifact $artifactName"
+    
+	New-OctopusArtifact -Path "ReleaseNotes.txt" -Name $artifactName
+}
+
+Invoke-RefreshVariableSnapshot -refreshVariableSnapShot $refreshVariableSnapShot -whatIf $whatIf -releaseToDeploy $releaseToDeploy -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+
+if ($whatif -eq $true)
+{
+    Write-OctopusSuccess "Exiting because What If set to true."
+    Write-OctopusInformation "Setting the output variable ChildReleaseToDeploy to $true"
+    Set-OctopusVariable -Name "ChildReleaseToDeploy" -Value $true
+    Exit 0
+}
+
+$approvalTenant = Get-OctopusApprovalTenant -tenantToDeploy $tenantToDeploy -approvalTenantName $approvalTenantName -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+$approvalDeploymentTaskId = Get-ApprovalDeploymentTaskId -autoapproveChildManualInterventions $autoapproveChildManualInterventions  -parentDeploymentTaskId $parentDeploymentTaskId -parentReleaseId $parentReleaseId -parentEnvironmentName $parentEnvironmentName -approvalEnvironmentName $approvalEnvironmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -parentChannelId $parentChannelId -parentEnvironmentId $parentEnvironmentId -approvalTenant $approvalTenant -parentProject $parentProject
+$parentDeploymentApprovers = Get-ParentDeploymentApprovers -parentDeploymentTaskId $approvalDeploymentTaskId -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+
+Create-NewOctopusDeployment -releaseToDeploy $releaseToDeploy -targetEnvironment $targetEnvironment -createdDeployment $createdDeployment -project $project -waitForFinish $waitForFinish -enableEnhancedLogging $enableEnhancedLogging -deploymentCancelInSeconds $deploymentCancelInSeconds -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -parentDeploymentApprovers $parentDeploymentApprovers -parentProjectName $parentProjectName -parentReleaseNumber $parentReleaseNumber -parentEnvironmentName $approvalEnvironmentName -parentDeploymentTaskId $approvalDeploymentTaskId -autoapproveChildManualInterventions $autoapproveChildManualInterventions -approvalTenant $approvalTenant
\ No newline at end of file
diff --git a/src/step-templates/determine-rolling-deploy-window-size/metadata.json b/src/step-templates/determine-rolling-deploy-window-size/metadata.json
new file mode 100644
index 000000000..be8d46b12
--- /dev/null
+++ b/src/step-templates/determine-rolling-deploy-window-size/metadata.json
@@ -0,0 +1,60 @@
+{
+  "Id": "cb1b825e-d945-43e4-a572-d945654ca9cc",
+  "Name": "Determine Rolling Deploy Window Size",
+  "Description": "Determine Window Size for Rolling Deploy.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "561333cc-14ea-44be-aca2-ccb06e0c582f",
+      "Name": "DRDWSPerformRollingDeploy",
+      "Label": "Perform Rolling Deploy?",
+      "HelpText": "If checkbox is unchecked, all servers will be deployed to.  \nNOTE: This can be set to use a variable or expression.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ecf32591-130c-41cb-b8f5-405e3b1c5d28",
+      "Name": "DRDWSServerPercentageToDeploy",
+      "Label": "Server percentage to deploy",
+      "HelpText": "Percentage of servers to perform rolling deploy on at a time. Enter as whole number.  \nExample for 25%: 25",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "bed9618f-6ede-4c6b-a4b1-a6f0d0a685d4",
+      "Name": "DRDWSServerRole",
+      "Label": "Server Role for Rolling Deploy",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "LastModifiedBy": "mcasperson",
+  "$Meta": {
+    "ExportedAt": "2023-08-15T07:55:04.4460000Z",
+    "OctopusVersion": "2023.3.11489",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Octopus"
+}
diff --git a/src/step-templates/determine-rolling-deploy-window-size/scriptbody.ps1 b/src/step-templates/determine-rolling-deploy-window-size/scriptbody.ps1
new file mode 100644
index 000000000..1c11574ac
--- /dev/null
+++ b/src/step-templates/determine-rolling-deploy-window-size/scriptbody.ps1
@@ -0,0 +1,67 @@
+#region Verify variables
+
+#No need to verify PerformRollingDeploy as this is a checkbox and will always have a boolean value. Report value back for logging.
+Try
+{
+  $performRollingDeploy = [System.Convert]::ToBoolean($OctopusParameters['DRDWSPerformRollingDeploy'])
+  Write-Host ('Perform Rolling Deploy: ' + $performRollingDeploy)
+}
+Catch
+{
+  Throw "Cannot convert Perform Rolling Deploy: '" + $OctopusParameters['DRDWSPerformRollingDeploy'] + "' to boolean value. Try having the expression or variable evaluate to 'True' or 'False'."
+}
+
+#Verify ServerPercentageToDeploy can be converted to integer.
+If ([string]::IsNullOrEmpty($OctopusParameters['DRDWSServerPercentageToDeploy']))
+{
+  Throw 'Server percentage to deploy cannot be null.'
+}
+
+[int]$serverPercentageToDeploy = 0
+[bool]$result = [int]::TryParse($OctopusParameters['DRDWSServerPercentageToDeploy'], [ref]$serverPercentageToDeploy)
+
+If ($result)
+{
+  Write-Host ('Server percentage to deploy: ' + $serverPercentageToDeploy + '%')
+  $serverPercentToDisconnect = $serverPercentageToDeploy / 100
+}
+Else
+{
+  Throw "Cannot convert Server percentage to deploy: '" + $OctopusParameters['DRDWSServerPercentageToDeploy'] + "' to integer."
+}
+
+#Verify ServerRole is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['DRDWSServerRole']))
+{
+  Throw 'Server Role for Rolling Deploy cannot be null.'
+}
+$role = $OctopusParameters['DRDWSServerRole']
+Write-Host ('Server Role for Rolling Deploy: ' + $role)
+
+#endregion
+
+
+#region Process
+
+$serverCountToDeployTo = 9999
+
+If ($performRollingDeploy)
+{
+  $servers = $OctopusParameters['Octopus.Environment.MachinesInRole[' + $role + ']']
+  $totalMachines = If ([string]::IsNullOrEmpty($servers)) { 0 } else { ($servers.Split(',')).Count }
+  $serverCountToDeployTo = [math]::Round(($totalMachines * $serverPercentToDisconnect))
+
+  Write-Host ('Total machines: ' + $totalMachines)
+
+  If ($serverCountToDeployTo -eq 0)
+  {
+    $serverCountToDeployTo++
+  }
+}
+
+Write-Host ('Window Size: ' + $serverCountToDeployTo)
+
+#To use this value, set Window size value to: #{Octopus.Action[Determine Rolling Deploy Window Size].Output.WindowSize}
+Set-OctopusVariable -name "WindowSize" -value $serverCountToDeployTo
+
+#endregion
diff --git a/step-templates/docker-create-and-push-image.json b/src/step-templates/docker-create-and-push-image/metadata.json
similarity index 56%
rename from step-templates/docker-create-and-push-image.json
rename to src/step-templates/docker-create-and-push-image/metadata.json
index bb06718c3..b48eb6925 100644
--- a/step-templates/docker-create-and-push-image.json
+++ b/src/step-templates/docker-create-and-push-image/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 1,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Get the parameters.\r\n$appLocation = $OctopusParameters['ApplicationLocation']\r\n$dockerFile = $OctopusParameters['DockerFile']\r\n$imageName = $OctopusParameters['ImageName']\r\n$tag = $OctopusParameters['ImageTag']\r\n$dockerUsername = $OctopusParameters['DockerUsername']\r\n$dockerPassword = $OctopusParameters['DockerPassword']\r\n\r\n# Check the parameters.\r\nif (-NOT $dockerUsername) { throw \"You must enter a value for 'Username'.\" }\r\nif (-NOT $dockerPassword) { throw \"You must enter a value for 'Password'.\" }\r\nif (-NOT $imageName) { throw \"You must enter a value for 'Image Name'.\" }\r\nif (-NOT $appLocation) { throw \"You must enter a value for 'Application Location'.\" }\r\n\r\n# If the Dockerfile parameter is not empty, save it to the file.\r\nif ($dockerFile) \r\n{\r\n    Write-Output 'Saving the Dockerfile'\r\n    $path = Join-Path $appLocation 'Dockerfile'\r\n    Set-Content -Path $path -Value $dockerFile -Force\r\n}\r\n\r\n# If the tag parameter is empty, set it as latest.\r\nif (-NOT $tag) \r\n{\r\n    $tag = 'latest'\r\n}\r\n\r\n# Prepare the final image name with the tag.\r\n$imageName += ':' + $tag\r\n\r\n# Create the docker image\r\nWrite-Output 'Building the Docker Image'\r\ndocker build -t $imageName $appLocation\r\n\r\n# Upload to DockerHub\r\nWrite-Output 'Pushing the Docker Image to DockerHub'\r\ndocker login -u $dockerUsername -p $dockerPassword\r\ndocker push $imageName",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -65,12 +65,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2017-02-03T10:49:13.997Z",
+  "LastModifiedOn": "2017-02-03T10:49:13.9970000Z",
   "LastModifiedBy": "joaoasrosa",
   "$Meta": {
-    "ExportedAt": "2017-02-03T10:49:13.997Z",
+    "ExportedAt": "2017-02-03T10:49:13.9970000Z",
     "OctopusVersion": "3.3.27",
     "Type": "ActionTemplate"
   },
   "Category": "docker"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/docker-create-and-push-image/scriptbody.ps1 b/src/step-templates/docker-create-and-push-image/scriptbody.ps1
new file mode 100644
index 000000000..75fe6d154
--- /dev/null
+++ b/src/step-templates/docker-create-and-push-image/scriptbody.ps1
@@ -0,0 +1,39 @@
+# Get the parameters.
+$appLocation = $OctopusParameters['ApplicationLocation']
+$dockerFile = $OctopusParameters['DockerFile']
+$imageName = $OctopusParameters['ImageName']
+$tag = $OctopusParameters['ImageTag']
+$dockerUsername = $OctopusParameters['DockerUsername']
+$dockerPassword = $OctopusParameters['DockerPassword']
+
+# Check the parameters.
+if (-NOT $dockerUsername) { throw "You must enter a value for 'Username'." }
+if (-NOT $dockerPassword) { throw "You must enter a value for 'Password'." }
+if (-NOT $imageName) { throw "You must enter a value for 'Image Name'." }
+if (-NOT $appLocation) { throw "You must enter a value for 'Application Location'." }
+
+# If the Dockerfile parameter is not empty, save it to the file.
+if ($dockerFile) 
+{
+    Write-Output 'Saving the Dockerfile'
+    $path = Join-Path $appLocation 'Dockerfile'
+    Set-Content -Path $path -Value $dockerFile -Force
+}
+
+# If the tag parameter is empty, set it as latest.
+if (-NOT $tag) 
+{
+    $tag = 'latest'
+}
+
+# Prepare the final image name with the tag.
+$imageName += ':' + $tag
+
+# Create the docker image
+Write-Output 'Building the Docker Image'
+docker build -t $imageName $appLocation
+
+# Upload to DockerHub
+Write-Output 'Pushing the Docker Image to DockerHub'
+docker login -u $dockerUsername -p $dockerPassword
+docker push $imageName
\ No newline at end of file
diff --git a/src/step-templates/docker-install-windows/metadata.json b/src/step-templates/docker-install-windows/metadata.json
new file mode 100644
index 000000000..670b91b66
--- /dev/null
+++ b/src/step-templates/docker-install-windows/metadata.json
@@ -0,0 +1,22 @@
+{
+  "Id": "3f78a32f-d074-43cc-a009-793f72b204f3",
+  "Name": "Install Docker on Windows Server",
+  "Description": "Automates the steps from [here](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/set-up-environment?tabs=Windows-Server#install-docker).\n\nThis step reboots the machine.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [],
+  "$Meta": {
+    "ExportedAt": "2020-05-19T03:10:21.2330000Z",
+    "OctopusVersion": "2020.2.4",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "MJRichardson",
+  "Category": "docker"
+}
diff --git a/src/step-templates/docker-install-windows/scriptbody.ps1 b/src/step-templates/docker-install-windows/scriptbody.ps1
new file mode 100644
index 000000000..7f559e037
--- /dev/null
+++ b/src/step-templates/docker-install-windows/scriptbody.ps1
@@ -0,0 +1,23 @@
+Find-PackageProvider -Name 'Nuget' -ForceBootstrap -IncludeDependencies
+
+$DockerModule = Get-Module -ListAvailable -Name DockerMsftProvider 
+if (-Not $DockerModule) {
+    Write-Host "Installing DockerMsftProvider module"
+    Install-Module -Name DockerMsftProvider -Repository PSGallery -Force
+} else {
+    Write-Host "DockerMsftProvider module already installed"
+}
+
+try {
+	$DockerPackage = Get-Package -Name docker
+} catch [Exception] {}
+
+if (-Not $DockerPackage) {
+    Write-Host "Installing docker package"
+    Install-Package -Name docker -ProviderName DockerMsftProvider -Force
+
+    Write-Host "Restarting machine..."
+    Restart-Computer -Force
+} else {
+    Write-Host "docker package already installed"
+}
\ No newline at end of file
diff --git a/src/step-templates/dsc-windows-service/metadata.json b/src/step-templates/dsc-windows-service/metadata.json
new file mode 100644
index 000000000..95049e3d7
--- /dev/null
+++ b/src/step-templates/dsc-windows-service/metadata.json
@@ -0,0 +1,59 @@
+{
+  "Id": "1cdf63ce-50c8-45a8-cce2-f6ca2d6d617b",
+  "Name": "DSC Windows Service",
+  "Description": "Starts/stops one or more services asynchronously, and then waits for them to align to the specified state",
+  "ActionType": "Octopus.Script",
+  "Version": 15,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Services",
+      "Label": "Services to align",
+      "HelpText": "A comma delimited list of services or wildcards (eg. \"Sky\") to align",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ServicesToIgnore",
+      "Label": "Services to ignore",
+      "HelpText": "A comma delimited list of services or wildcards (eg. \"Sky\") to ignore",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DesiredState",
+      "Label": "Desired state",
+      "HelpText": "The desired state of the service/s. Specify either \"Started\" or \"Stopped\"",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Running|Started\nStopped|Stopped"
+      }
+    },
+    {
+      "Name": "TimeoutSeconds",
+      "Label": "Timeout in seconds",
+      "HelpText": "The number of seconds to wait for the service/s to align before timing out and throwing an exception",
+      "DefaultValue": "300",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2017-06-20T07:00:00.0000000-07:00",
+  "LastModifiedBy": "dunedinsoftware",
+  "$Meta": {
+    "ExportedAt": "2017-06-20T14:35:09.3890000Z",
+    "OctopusVersion": "3.1.5",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/dsc-windows-service/scriptbody.ps1 b/src/step-templates/dsc-windows-service/scriptbody.ps1
new file mode 100644
index 000000000..ae336941f
--- /dev/null
+++ b/src/step-templates/dsc-windows-service/scriptbody.ps1
@@ -0,0 +1,84 @@
+
+    $ServicesToManage = $OctopusParameters['Services']
+    $ServicesToIgnore = $OctopusParameters['ServicesToIgnore']
+    $TimeoutSeconds = $OctopusParameters['TimeoutSeconds']
+    $DesiredState = $OctopusParameters['DesiredState']
+
+    # Gather information about the list of services
+    $services_status = @{}
+
+    # For each "service to manage" or wildcard specified ...
+    $ServicesToManage -split "," |% `
+    {
+        $service = $_
+    
+        # ... retrieve all the services that match that name or wildcard ...
+        $service_states = Get-Service |? { $_.Name -match $service }
+    
+        # ... and add them into an array; we use a key/value array so that services only get added to the array once, even if they are
+        # matched by multiple wildcard specifications
+        $service_states |% { $services_status[$_.Name] = $_.Status }
+    }
+    
+    # For each "service to ignore" or wildcard specified ...
+    $ServicesToIgnore -split "," |% `
+    {
+        $service = $_
+        
+        # Copy the keys within services_status, since we will need to change services_status as we enumerate them
+        $keys = @()
+        $services_status.Keys |% { $keys += $_ }
+        
+        $keys |% `
+        {
+           $key = $_
+ 
+           if ($key -match $service -and $service -match "[a-z]+")
+           {
+                $services_status.Remove($_)
+           }
+        }
+    }
+
+    Write-Host "Matched the following set of services, along with their current status:"
+    $services_status
+
+    # Now act as required to bring the services to the desired configuration state
+    [DateTime]$startTime = [DateTime]::Now
+    
+    # State to pass to sc
+    $state_type = if ($DesiredState -match "Stopped") { "stop" } else { "start" }
+
+	$unaligned_services = ($services_status.Keys |? { $services_status[$_] -notmatch $DesiredState })
+	# Attempt to align the remaining services
+	$unaligned_services |% `
+	{ 
+		Write-Host "Attempting to $state_type service: $_"
+		Start-Process -FilePath "cmd" -ArgumentList "/c sc.exe $state_type `"$_`""
+	}	
+   
+   while ($startTime.AddSeconds($TimeoutSeconds) -gt [DateTime]::Now)
+    {
+		# Attempt to align the remaining services
+		$unaligned_services |% `
+		{ 
+			Write-Host "Attempting to $state_type service: $_"
+			$services_status[$_] = Get-Service $_ | Select-Object -Property "Status"
+		}	
+		$unaligned_services = ($services_status.Keys |? { $services_status[$_] -notmatch $DesiredState })
+		Write-Host "$([DateTime]::Now): $($unaligned_services.Count) services of $($services_status.Count) not yet at status: $DesiredState"
+		
+        if ($unaligned_services.Count -eq 0)
+        {
+            Write-Host "All services now at desired state; exiting"
+            exit 0
+        }
+
+          
+        # Pause for a second
+        [System.Threading.Thread]::Sleep(1000)
+    }
+
+    throw "Error: not all services reached the desired state within the specified timeframe: $unaligned_services"
+
+
diff --git a/src/step-templates/dyn-create-an-A-record/metadata.json b/src/step-templates/dyn-create-an-A-record/metadata.json
new file mode 100644
index 000000000..30a7d3e35
--- /dev/null
+++ b/src/step-templates/dyn-create-an-A-record/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "5e359c05-89a0-4a13-98a4-d54b0415bb45",
+  "Name": "Dyn - Create an A Record",
+  "Description": "Creates an A record in the specified zone with the specified details. \n\nNOTE: The API User MUST have the follow permissions:\n\t- UserLogin\n\t- UserChangepw\n\t- RecordAdd\n\t- RecordUpdate\n        - RecordGet\n\t- ZoneGet\n\t- ZoneAddNode\n\t- ZonePublish\n\t- ZoneChangeset\n",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "dynCustomerName",
+      "Label": "Dyn Customer Name",
+      "HelpText": "The Dyn customer name,  usually the company name",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "dynUserName",
+      "Label": "Dyn User Name",
+      "HelpText": "User Name of the user that will perform this step\n\nNOTE: The API User MUST have the follow permissions:\n\t- UserLogin\n\t- UserChangepw\n\t- RecordAdd\n\t- RecordUpdate\n        - RecordGet\n\t- ZoneGet\n\t- ZoneAddNode\n\t- ZonePublish\n\t- ZoneChangeset",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "dynPassword",
+      "Label": "Password",
+      "HelpText": "Password of the user to access Dyn",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "dynZone",
+      "Label": "Dyn Zone",
+      "HelpText": "The name of the Zone, where you want the A record to be created\n\nFor example: myzone.com",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "dynFQDN",
+      "Label": "Fully Qualified Domain Name",
+      "HelpText": "The name of the A record that is being created in Fully Qualified Domain Name format\n\nFor example: newrecord.myzone.com",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "dynCorrectTTL",
+      "Label": "Time to Live",
+      "HelpText": "Limits the lifespan or lifetime of data in a computer network",
+      "DefaultValue": "0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "dynCorrectIPAddress",
+      "Label": "IPv4 Address",
+      "HelpText": "The IPv4 address of the new A record",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-26T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-26T22:25:11.2750000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "dyn"
+}
diff --git a/src/step-templates/dyn-create-an-A-record/scriptbody.ps1 b/src/step-templates/dyn-create-an-A-record/scriptbody.ps1
new file mode 100644
index 000000000..50f0d43ac
--- /dev/null
+++ b/src/step-templates/dyn-create-an-A-record/scriptbody.ps1
@@ -0,0 +1,315 @@
+#--------------------------------------------------------------------
+#Log In Variables
+
+$dynLogInURI = "https://api.dynect.net/REST/Session/"
+
+$dynCustomerName = $OctopusParameters["dynCustomerName"] 
+
+$dynUserName = $OctopusParameters["dynUserName"] 
+
+$dynPassword = $OctopusParameters["dynPassword"] 
+
+#--------------------------------------------------------------------
+#Get A Record Variables
+
+$dynARecordURI = "https://api.dynect.net/REST/ARecord"
+
+$dynZone = $OctopusParameters["dynZone"]
+
+$dynFQDN = $OctopusParameters["dynFQDN"] 
+
+#--------------------------------------------------------------------
+#A Record information to check
+
+$createNewARecord = $FALSE
+
+$UpdateARecord = $FALSE
+
+$dynCorrectTTL = $OctopusParameters["dynCorrectTTL"]
+
+$dynCorrectIPAddress = $OctopusParameters["dynCorrectIPAddress"] 
+
+
+#--------------------------------------------------------------------
+#Publish Zone Variables
+
+$dynPublishURI = "https://api.dynect.net/REST/Zone"
+
+$publishZone = $FALSE
+
+
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#Log In and Retrieve Token for this session
+
+Write-Output "Logging into Dyn and retrieving session Authentication Token."
+
+$dynCredentials = @{}
+
+$dynCredentials.Add("customer_name", $dynCustomerName)
+$dynCredentials.Add("user_name", $dynUserName)
+$dynCredentials.Add("password", $dynPassword)
+
+$dynCredentialsJSON = ConvertTo-Json -InputObject $dynCredentials
+
+$dynLoginResults = Invoke-RestMethod -Uri $dynLogInURI -Body $dynCredentialsJSON -ContentType 'application/json' -Method Post
+
+if($dynLoginResults.status -ne "success")
+{
+    Write-Error "Invalid Log In Details. Please try again." -ErrorId E4
+}
+else
+{
+    Write-Output "`nLog in was successful."
+}
+
+
+
+$dynSessionToken = @{}
+
+$dynSessionToken.Add("Auth-Token", $dynLoginResults.data.token)
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#Get A Record 
+
+Write-Output "Retrieving specified A record information.`n"
+
+#get and search all records to get the correct record ID (not a unique id) for existing A Records
+#this is done to check if a A Record does not exist already. This is the only way to do it without getting an error.
+$dynAllRecordsURI = "https://api.dynect.net/REST/AllRecord/$dynZone"
+
+ 
+$dynAllRecordResults = Invoke-RestMethod -Uri $dynAllRecordsURI -Headers $dynSessionToken -ContentType 'application/json' -Method Get 
+
+for($i = 0; $i -lt $dynAllRecordResults.data.Length; $i++)
+{
+    
+    $a = $dynAllRecordResults.data.Get($i)
+
+    $result = $a.contains($dynFQDN)
+
+    if($result -eq $TRUE)
+    {
+        $dynARecordString = $dynAllRecordResults.data.Get($i)
+
+        $dynARecordExists = $TRUE
+
+        $i = $dynAllRecordResults.data.Length
+    }
+    else
+    {
+        $dynARecordExists = $FALSE
+    }
+}
+
+
+
+#checks to see if there is more than one A record with the same name.
+if($dynARecordExists -eq $TRUE)
+{
+    $dynARecordURI = "$dynARecordURI/$dynZone/$dynFQDN" 
+ 
+    $dynARecordResults = Invoke-RestMethod -Uri $dynARecordURI -Headers $dynSessionToken -ContentType 'application/json' -Method Get 
+
+    if($dynARecordResults.data.Length -gt 1)
+    {
+        Write-Error "`nThere is more than one A record with the Fully Qualified Domain Name (FQDN) of $dynFQDN. `nThis script does not handle more than one A record witht the same FQDN" -ErrorId E1
+    }
+
+    if($dynARecordResults.status -ne "success")
+    {
+        Write-Error "Error occurred while trying to retrieve the A Record. Please check the host name and the Fully Qualified Domain Name are correct." -ErrorId E1
+    }
+}
+
+
+
+#Checks if the an A record was returned or needs to be created
+if(($dynARecordResults.data.Length -eq 0) -or ($dynARecordExists -eq $FALSE))
+{
+    $createNewARecord = $TRUE
+
+    Write-Warning "$dynFQDN does not exists. Creating $dynFQDN now."
+}
+else
+{
+    #get information for the specified record
+    $dynARecordString = $dynARecordResults.data
+
+    $dynARecordURI = "https://api.dynect.net$dynARecordString/"
+
+    $dynARecord = Invoke-RestMethod -Uri $dynARecordURI -Headers $dynSessionToken -ContentType 'application/json' -Method Get 
+
+    $dynARecord = $dynARecord.data
+
+    Write-Output "`n$dynFQDN has successfully been retrieved."
+    
+    Write-Output "`n-------------------------`n"
+
+}
+
+#--------------------------------------------------------------------
+#create new A record
+
+if($createNewARecord -eq $TRUE)
+{
+    $dynCreateURI = "https://api.dynect.net/REST/ARecord/$dynZone/$dynFQDN"   
+
+    $rData = @{}
+
+    $rData.Add("address", $dynCorrectIPAddress)
+
+    $dynCreateARecord = @{}
+
+    $dynCreateARecord.Add("ttl", $dynCorrectTTL)
+    $dynCreateARecord.Add("rdata", $rData)
+
+    $dynCreateARecordJSON = ConvertTo-Json -InputObject $dynCreateARecord
+
+    $dynCreateResult = Invoke-RestMethod -Uri $dynCreateURI -ContentType 'application/json' -Headers $dynSessionToken -Body $dynCreateARecordJSON  -Method Post
+
+    if($dynCreateResult.status -ne "success")
+    {
+        Write-Error "An error occurred while creating the new A Record. Please check the details that have been entered are correct and try again." -ErrorId E4
+
+    }
+    else
+    {
+        Write-Output "$dynFQDN has successfully been added to the $dynZone zone in Dyn."
+
+        $publishZone = $TRUE
+    }
+
+    Write-Output "`n-------------------------`n"
+
+
+}
+
+
+
+#--------------------------------------------------------------------
+#checking specified A Record to see if it is correct if it exists
+if($createNewARecord -eq $FALSE)
+{
+    Write-Output "Checking to see if $dynFQDN is current and contains the correct information."
+
+    if($dynARecord.rdata.address -ne $dynCorrectIPAddress)
+    {
+        $UpdateARecord = $TRUE
+
+        Write-Warning "`n$dynFQDN is out of date. Updating now"
+
+    }
+
+    if($UpdateARecord -eq $FALSE)
+    {
+        Write-Output "`n$dynFQDN is up-to-date"
+    }
+
+    Write-Output "`n-------------------------`n"
+}
+#--------------------------------------------------------------------
+#Update A record
+
+if($UpdateARecord -eq $TRUE)
+{
+    Write-Output "Updating $dynFQDN so that is matches the current information saved in the system."
+
+    $dynUpdateURI = $dynARecordURI
+
+    $rData = @{}
+
+    $rData.Add("address", $dynCorrectIPAddress)
+
+    $dynUpdatedARecord = @{}
+
+    
+    $dynUpdatedARecord.Add("ttl", $dynCorrectTTL)
+    $dynUpdatedARecord.Add("rdata", $rData)
+
+    $dynUpdatedARecord = ConvertTo-Json -InputObject $dynUpdatedARecord
+
+    $dynUpdateResult = Invoke-RestMethod -Uri $dynUpdateURI -ContentType 'application/json' -Headers $dynSessionToken -Body $dynUpdatedARecord -Method Put
+    
+    if($dynUpdateResult.status -ne "success")
+    {
+        Write-Error "An error occured while trying to update the $dynFQDN record"
+    }
+    else
+    {
+        Write-Output "`nUpdate was successful. Just needs to be published to make it offical."
+        
+        $publishZone = $TRUE
+
+    }
+
+
+    Write-Output "`n-------------------------`n"
+
+}
+
+#--------------------------------------------------------------------
+#publish update or creation of A Record
+
+if($publishZone -eq $TRUE)
+{
+
+    Write-Output "Publishing changes made to $dynZone"
+
+    $publish = @{}
+    $publish.Add("publish", 'true')
+
+    $publish = ConvertTo-Json -InputObject $publish
+
+    $dynPublishURI = "$dynPublishURI/$dynZone/"
+
+    $dynPublishResults = Invoke-RestMethod -Uri $dynPublishURI -ContentType 'application/json' -Headers $dynSessionToken -Body $publish -Method Put
+
+    if($dynPublishResults.status -ne "success")
+    {
+        Write-Error "An error occurred during the publication of the $dynZone zone." -ErrorId E4
+    }
+    else
+    {
+        Write-Output "`n$dynZone has successfully been published."
+    }
+
+        Write-Output "`n-------------------------`n"
+
+}
+
+
+
+
+#--------------------------------------------------------------------
+#Log Out of session
+
+Write-Output "Logging out and deleting this session's authentication token"
+
+$dynLogOutResults = Invoke-RestMethod -Uri $dynLogInURI -ContentType 'application/json' -Headers $dynSessionToken -Method Delete
+
+While(($dynLogOutResults.status -ne "success") -and ($tries -lt 10))
+{
+    Write-Output "`nWaiting to log out of Dyn"
+    $tries++
+    Start-Sleep -Seconds 1
+}
+
+if($dynLogOutResults.status -eq "success")
+{
+    $dynSessionToken.Clear()
+    Write-Output $dynSessionToken
+    Write-Output "`nThis session has been ended successfully and the authentication token has been deleted."
+    
+}
+else
+{
+    Write-Error "`nAn error occurred while logging out." -ErrorId E4
+}
+
diff --git a/src/step-templates/edgecast-cdn-purge/metadata.json b/src/step-templates/edgecast-cdn-purge/metadata.json
new file mode 100644
index 000000000..d026c61de
--- /dev/null
+++ b/src/step-templates/edgecast-cdn-purge/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "d97ff2d4-250a-4a1a-bd5e-36644893888c",
+  "Name": "Clear EdgeCast CDN Cache",
+  "Description": "This step will clear (purge) the EdgeCast CDN Cache",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "AccountNumber",
+      "Label": null,
+      "HelpText": "CDN Account number, can be found in MCC",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApiToken",
+      "Label": null,
+      "HelpText": "API token for accessing the EdgeCast API for the account",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "MediaPath",
+      "Label": null,
+      "HelpText": "A string that indicates the CDN or edge CNAME URL for the asset or the location that will be purged from our edge servers. Make sure to include the proper protocol (i.e., http:// or rtmp://).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "MediaType",
+      "Label": "MediaType",
+      "HelpText": "An integer that indicates the service for which an asset will be purged. It should be replaced with the ID associated with the desired service., default is 3. HTTP Large",
+      "DefaultValue": "3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-02-20T05:45:59.1250000-08:00",
+  "LastModifiedBy": "yooakim",
+  "$Meta": {
+    "ExportedAt": "2015-02-20T08:10:46.0080000-08:00",
+    "OctopusVersion": "2.6.2.845",
+    "Type": "ActionTemplate"
+  },
+  "Category": "edgecast"
+}
diff --git a/src/step-templates/edgecast-cdn-purge/scriptbody.ps1 b/src/step-templates/edgecast-cdn-purge/scriptbody.ps1
new file mode 100644
index 000000000..c4ea18c6d
--- /dev/null
+++ b/src/step-templates/edgecast-cdn-purge/scriptbody.ps1
@@ -0,0 +1,54 @@
+function Clear-EdgeCastCache
+{
+    [CmdletBinding()]
+    Param
+    (
+        # CDN Account number, can be found in MCC
+        [Parameter(Mandatory=$true)]
+        $AccountNumber,
+
+        # API Token
+        [Parameter(Mandatory=$true)]
+        [string]$ApiToken,
+
+         # A string that indicates the CDN or edge CNAME URL for the asset or the location that will be purged from our edge servers. Make sure to include the proper protocol (i.e., http:// or rtmp://).
+        [Parameter(Mandatory=$true)]
+        [string]
+        $MediaPath,
+
+        #An integer that indicates the service for which an asset will be purged. It should be replaced with the ID associated with the desired service., default is 3. HTTP Large
+        [ValidateSet(2,3,8,14)]
+        [int]
+        $MediaType=3
+    )
+
+    Begin
+    {
+        $uri = "https://api.edgecast.com/v2/mcc/customers/$AccountNumber/edge/purge"
+
+        $headers = @{
+            'Authorization' = "tok:" + $ApiToken
+            'Accept' = 'Application/JSON'
+            'Content-Type' = 'Application/JSON'
+            }
+        $RequestParameters = @{
+            'MediaPath'=$MediaPath
+            'MediaType'=$MediaType
+        }
+
+        $body = ConvertTo-Json $RequestParameters
+
+    }
+    Process
+    {
+        Write-Verbose "Request body $body"
+    	$request = Invoke-RestMethod -Method PUT -Uri $uri -Headers $headers -Body $body -DisableKeepAlive
+        $request
+
+    }
+    End
+    {
+    }
+}
+
+Clear-EdgeCastCache -AccountNumber $AccountNumber -ApiToken $ApiToken -MediaPath $MediaPath -MediaType $MediaType -Verbose
diff --git a/step-templates/elmahio-notify-deployment.json b/src/step-templates/elmahio-notify-deployment/metadata.json
similarity index 70%
rename from step-templates/elmahio-notify-deployment.json
rename to src/step-templates/elmahio-notify-deployment/metadata.json
index 6b434db63..745862dfa 100644
--- a/step-templates/elmahio-notify-deployment.json
+++ b/src/step-templates/elmahio-notify-deployment/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$version = $OctopusParameters['Version']\n$url = 'https://api.elmah.io/v3/deployments?api_key=' + $OctopusParameters['ApiKey']\n$body = @{\n  version = $version\n  description = $OctopusReleaseNotes\n  userName = $OctopusParameters['Octopus.Deployment.CreatedBy.Username']\n  userEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']\n  logId = $OctopusParameters['LogId']\n}\nTry {\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12, [Net.SecurityProtocolType]::Tls11, [Net.SecurityProtocolType]::Tls\n  Invoke-RestMethod -Method Post -Uri $url -Body $body\n}\nCatch {\n  Write-Error $_.Exception.Message -ErrorAction Continue\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -47,9 +47,9 @@
   ],
   "LastModifiedBy": "elmahio",
   "$Meta": {
-    "ExportedAt": "2021-09-03T08:34:01.363Z",
+    "ExportedAt": "2021-09-03T08:34:01.3630000Z",
     "OctopusVersion": "2021.2.7428",
     "Type": "ActionTemplate"
   },
   "Category": "elmah"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/elmahio-notify-deployment/scriptbody.ps1 b/src/step-templates/elmahio-notify-deployment/scriptbody.ps1
new file mode 100644
index 000000000..e7aab2a73
--- /dev/null
+++ b/src/step-templates/elmahio-notify-deployment/scriptbody.ps1
@@ -0,0 +1,16 @@
+$version = $OctopusParameters['Version']
+$url = 'https://api.elmah.io/v3/deployments?api_key=' + $OctopusParameters['ApiKey']
+$body = @{
+  version = $version
+  description = $OctopusReleaseNotes
+  userName = $OctopusParameters['Octopus.Deployment.CreatedBy.Username']
+  userEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']
+  logId = $OctopusParameters['LogId']
+}
+Try {
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12, [Net.SecurityProtocolType]::Tls11, [Net.SecurityProtocolType]::Tls
+  Invoke-RestMethod -Method Post -Uri $url -Body $body
+}
+Catch {
+  Write-Error $_.Exception.Message -ErrorAction Continue
+}
\ No newline at end of file
diff --git a/step-templates/elmahio-upload-source-map.json b/src/step-templates/elmahio-upload-source-map/metadata.json
similarity index 64%
rename from step-templates/elmahio-upload-source-map.json
rename to src/step-templates/elmahio-upload-source-map/metadata.json
index bc2bb9f46..372d66ebf 100644
--- a/step-templates/elmahio-upload-source-map.json
+++ b/src/step-templates/elmahio-upload-source-map/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$apiKey = $OctopusParameters['ElmahIoSourceMap_ApiKey']\n$logId = $OctopusParameters['ElmahIoSourceMap_LogId']\n$path = $OctopusParameters['ElmahIoSourceMap_Path']\n$sourceMap = $OctopusParameters['ElmahIoSourceMap_SourceMap']\n$minifiedJavaScript = $OctopusParameters['ElmahIoSourceMap_MinifiedJavaScript']\n$boundary = [System.Guid]::NewGuid().ToString()\n\n$mapFile = [System.IO.File]::ReadAllBytes($sourceMap)\n$mapContent = [System.Text.Encoding]::UTF8.GetString($mapFile)\n$mapFileName = Split-Path $sourceMap -leaf\n$jsFile = [System.IO.File]::ReadAllBytes($minifiedJavaScript)\n$jsContent = [System.Text.Encoding]::UTF8.GetString($jsFile)\n$jsFileName = Split-Path $minifiedJavaScript -leaf\n\n$LF = \"`r`n\"\n$bodyLines = (\n    \"--$boundary\",\n    \"Content-Disposition: form-data; name=`\"Path`\"$LF\",\n    $path,\n    \"--$boundary\",\n    \"Content-Disposition: form-data; name=`\"SourceMap`\"; filename=`\"$mapFileName`\"\",\n    \"Content-Type: application/json$LF\",\n    $mapContent,\n    \"--$boundary\",\n    \"Content-Disposition: form-data; name=`\"MinifiedJavaScript`\"; filename=`\"$jsFileName`\"\",\n    \"Content-Type: text/javascript$LF\",\n    $jsContent,\n    \"--$boundary--$LF\"\n) -join $LF\n\nInvoke-RestMethod \"https://api.elmah.io/v3/sourcemaps/${logId}?api_key=${apiKey}\" -Method POST -ContentType \"multipart/form-data; boundary=`\"$boundary`\"\" -Body $bodyLines",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -67,9 +67,9 @@
   ],
   "LastModifiedBy": "elmahio",
   "$Meta": {
-    "ExportedAt": "2021-09-06T08:51:54.463Z",
+    "ExportedAt": "2021-09-06T08:51:54.4630000Z",
     "OctopusVersion": "2021.2.7428",
     "Type": "ActionTemplate"
   },
   "Category": "elmah"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/elmahio-upload-source-map/scriptbody.ps1 b/src/step-templates/elmahio-upload-source-map/scriptbody.ps1
new file mode 100644
index 000000000..7a8d7658e
--- /dev/null
+++ b/src/step-templates/elmahio-upload-source-map/scriptbody.ps1
@@ -0,0 +1,31 @@
+$apiKey = $OctopusParameters['ElmahIoSourceMap_ApiKey']
+$logId = $OctopusParameters['ElmahIoSourceMap_LogId']
+$path = $OctopusParameters['ElmahIoSourceMap_Path']
+$sourceMap = $OctopusParameters['ElmahIoSourceMap_SourceMap']
+$minifiedJavaScript = $OctopusParameters['ElmahIoSourceMap_MinifiedJavaScript']
+$boundary = [System.Guid]::NewGuid().ToString()
+
+$mapFile = [System.IO.File]::ReadAllBytes($sourceMap)
+$mapContent = [System.Text.Encoding]::UTF8.GetString($mapFile)
+$mapFileName = Split-Path $sourceMap -leaf
+$jsFile = [System.IO.File]::ReadAllBytes($minifiedJavaScript)
+$jsContent = [System.Text.Encoding]::UTF8.GetString($jsFile)
+$jsFileName = Split-Path $minifiedJavaScript -leaf
+
+$LF = "`r`n"
+$bodyLines = (
+    "--$boundary",
+    "Content-Disposition: form-data; name=`"Path`"$LF",
+    $path,
+    "--$boundary",
+    "Content-Disposition: form-data; name=`"SourceMap`"; filename=`"$mapFileName`"",
+    "Content-Type: application/json$LF",
+    $mapContent,
+    "--$boundary",
+    "Content-Disposition: form-data; name=`"MinifiedJavaScript`"; filename=`"$jsFileName`"",
+    "Content-Type: text/javascript$LF",
+    $jsContent,
+    "--$boundary--$LF"
+) -join $LF
+
+Invoke-RestMethod "https://api.elmah.io/v3/sourcemaps/${logId}?api_key=${apiKey}" -Method POST -ContentType "multipart/form-data; boundary=`"$boundary`"" -Body $bodyLines
\ No newline at end of file
diff --git a/src/step-templates/epplus-register-dll-gac/metadata.json b/src/step-templates/epplus-register-dll-gac/metadata.json
new file mode 100644
index 000000000..db857b7ca
--- /dev/null
+++ b/src/step-templates/epplus-register-dll-gac/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "137d2be3-a329-4c65-bde9-0c062f056889",
+  "Name": "Register EPPlus DLL in the GAC",
+  "Description": "This script registers EPPlus dll to the GAC",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "5ee60108-20e4-4010-95cc-c13eb40c618f",
+      "Name": "RegisteringDllFolderPath",
+      "Label": "Path of the registering dll",
+      "HelpText": null,
+      "DefaultValue": "C:\\dll",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4817d840-5b87-4d8b-bdac-53711f093ae4",
+      "Name": "DllPathInExpanded",
+      "Label": "Regintering dll path inside NuGet archive",
+      "HelpText": null,
+      "DefaultValue": "\\lib\\net40",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c5e7cff7-e67d-48a4-adb6-6019d06ba249",
+      "Name": "DllName",
+      "Label": "Dll file name",
+      "HelpText": null,
+      "DefaultValue": "EPPlus.dll",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c326490c-ea29-4b2b-99e7-37027233bd06",
+      "Name": "PackageName",
+      "Label": "NuGet gallery package name",
+      "HelpText": null,
+      "DefaultValue": "EPPlus",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea04aa17-5fea-4e06-82e8-d344c797547c",
+      "Name": "PackageVersion",
+      "Label": "Registering dll version",
+      "HelpText": null,
+      "DefaultValue": "4.1.0.0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "fabiozanella",
+  "$Meta": {
+    "ExportedAt": "2020-11-03T09:07:40.2020000Z",
+    "OctopusVersion": "2020.4.5",
+    "Type": "ActionTemplate"
+  },
+  "Category": "dll"
+}
diff --git a/src/step-templates/epplus-register-dll-gac/scriptbody.ps1 b/src/step-templates/epplus-register-dll-gac/scriptbody.ps1
new file mode 100644
index 000000000..4c9d34fe0
--- /dev/null
+++ b/src/step-templates/epplus-register-dll-gac/scriptbody.ps1
@@ -0,0 +1,49 @@
+[System.Reflection.Assembly]::Load("System.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")
+
+function Expand-ZIPFile($file, $destination)
+{
+    $shell = new-object -com shell.application
+    $zip = $shell.NameSpace($file)
+    foreach($item in $zip.items())
+    {
+        $shell.Namespace($destination).copyhere($item)
+    }
+}
+
+$TempFolder = "\TempNupkg"
+$ExpandedFolder = "\expanded"
+
+$FileDestinationPath = $RegisteringDllFolderPath + "\" + $DllName 
+$FileSourcePath = $RegisteringDllFolderPath + $TempFolder + $ExpandedFolder + $DllPathInExpanded + "\" + $DllName
+
+$TempPath = $RegisteringDllFolderPath + $TempFolder
+$NupkgPath = $RegisteringDllFolderPath + $TempFolder + "\temp.zip"
+$ExpandedTempPath = $RegisteringDllFolderPath + $TempFolder + $ExpandedFolder
+
+$DllUrl = "https://www.nuget.org/api/v2/package/"+ $PackageName +"/" + $PackageVersion
+
+if (!(Test-Path $ExpandedTempPath -PathType Container)) {
+    New-Item -ItemType Directory -Force -Path $ExpandedTempPath
+}
+
+Write-Host "Allow SecurityProtocol TLS, TLS 1.1 and TLS 1.2 ..."
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
+Write-Host "Dowloading package ..."
+Invoke-WebRequest -Uri $DllUrl -OutFile $NupkgPath
+
+Write-Host "Expanding Archive ..."
+Expand-ZIPFile –File $NupkgPath –Destination $ExpandedTempPath
+
+Write-Host "Copying to destination folder ..."
+Copy-Item $FileSourcePath -Destination $FileDestinationPath
+
+Remove-Item -Recurse -Force $TempPath
+Write-Host "Deleteing temp folders ..."
+
+Write-Host "Library Found"
+
+#Note that you should be running PowerShell as an Administrator
+Write-Host "Installing to GAC ..."
+$publish = New-Object System.EnterpriseServices.Internal.Publish
+$publish.GacInstall($fileDestinationPath)
+Write-Host "Installed to GAC"
\ No newline at end of file
diff --git a/step-templates/event-tracing-register-manifest.json b/src/step-templates/event-tracing-register-manifest/metadata.json
similarity index 70%
rename from step-templates/event-tracing-register-manifest.json
rename to src/step-templates/event-tracing-register-manifest/metadata.json
index dac0a2708..f98d4169a 100644
--- a/step-templates/event-tracing-register-manifest.json
+++ b/src/step-templates/event-tracing-register-manifest/metadata.json
@@ -6,7 +6,7 @@
   "Version": 1,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if(-not (Test-Path $env:SystemRoot\\System32\\wevtutil.exe))\n{\n    throw \"wevtutil.exe could not be found\"\n}\n\nif(-not (Test-Path $ManifestFile))\n{\n    throw \"Manifest $manifest could not be found\"\n}\n\nif(-not (Test-Path $ResourceFile))\n{\n    throw \"Resource file $ResourceFile could not be found\"\n}\n\nif(-not (Test-Path $MessageFile))\n{\n    throw \"Message file $MessageFile could not be found\"\n}\n\n& \"$env:SystemRoot\\System32\\wevtutil.exe\" im $ManifestFile /rf:$ResourceFile /mf:$MessageFile"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -45,4 +45,4 @@
     "Type": "ActionTemplate"
   },
   "Category": "event-tracing"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/event-tracing-register-manifest/scriptbody.ps1 b/src/step-templates/event-tracing-register-manifest/scriptbody.ps1
new file mode 100644
index 000000000..299ed5e20
--- /dev/null
+++ b/src/step-templates/event-tracing-register-manifest/scriptbody.ps1
@@ -0,0 +1,21 @@
+if(-not (Test-Path $env:SystemRoot\System32\wevtutil.exe))
+{
+    throw "wevtutil.exe could not be found"
+}
+
+if(-not (Test-Path $ManifestFile))
+{
+    throw "Manifest $manifest could not be found"
+}
+
+if(-not (Test-Path $ResourceFile))
+{
+    throw "Resource file $ResourceFile could not be found"
+}
+
+if(-not (Test-Path $MessageFile))
+{
+    throw "Message file $MessageFile could not be found"
+}
+
+& "$env:SystemRoot\System32\wevtutil.exe" im $ManifestFile /rf:$ResourceFile /mf:$MessageFile
\ No newline at end of file
diff --git a/step-templates/event-tracing-unregister-manifest.json b/src/step-templates/event-tracing-unregister-manifest/metadata.json
similarity index 68%
rename from step-templates/event-tracing-unregister-manifest.json
rename to src/step-templates/event-tracing-unregister-manifest/metadata.json
index 457c382b9..c7b1edbaa 100644
--- a/step-templates/event-tracing-unregister-manifest.json
+++ b/src/step-templates/event-tracing-unregister-manifest/metadata.json
@@ -6,7 +6,7 @@
   "Version": 1,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if(-not (Test-Path $env:SystemRoot\\System32\\wevtutil.exe))\n{\n    throw \"wevtutil.exe could not be found\"\n}\n\nif(-not (Test-Path $ManifestFile))\n{\n    Write-Host \"Skipping manifest $ManifestFile because it does not exist\" \n    Exit 0\n}\n\n& \"$env:SystemRoot\\System32\\wevtutil.exe\" um $ManifestFile"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -27,4 +27,4 @@
     "Type": "ActionTemplate"
   },
   "Category": "event-tracing"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/event-tracing-unregister-manifest/scriptbody.ps1 b/src/step-templates/event-tracing-unregister-manifest/scriptbody.ps1
new file mode 100644
index 000000000..fcd813ad5
--- /dev/null
+++ b/src/step-templates/event-tracing-unregister-manifest/scriptbody.ps1
@@ -0,0 +1,12 @@
+if(-not (Test-Path $env:SystemRoot\System32\wevtutil.exe))
+{
+    throw "wevtutil.exe could not be found"
+}
+
+if(-not (Test-Path $ManifestFile))
+{
+    Write-Host "Skipping manifest $ManifestFile because it does not exist" 
+    Exit 0
+}
+
+& "$env:SystemRoot\System32\wevtutil.exe" um $ManifestFile
\ No newline at end of file
diff --git a/step-templates/f5-enable-disable-member.json b/src/step-templates/f5-enable-disable-member/metadata.json
similarity index 50%
rename from step-templates/f5-enable-disable-member.json
rename to src/step-templates/f5-enable-disable-member/metadata.json
index 479525a0d..ee72e898c 100644
--- a/step-templates/f5-enable-disable-member.json
+++ b/src/step-templates/f5-enable-disable-member/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 36,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#Load the F5 powershell iControl snapin\n#https://help.octopus.com/t/the-windows-powershell-snap-in-webadministration-is-not-installed-on-this-computer/4290\nAdd-PSSnapin iControlSnapin;\n\nfunction WaitFor-ConnectionCount() \n{ \n    param(\n        $pool_name, \n        $member,\n        [int]$MaxWaitTime = 300, #defaults to 5 minutes\n        $ConnectionCount = 0\n    )\n    $vals = $member.Split( (, ':'));\n    $member_addr = $vals[0];\n    $member_port = $vals[1];\n\n    Write-Host \"Waiting for current connections to drop to \"$OctopusParameters['ConnectionCount']\n\n    $MemberDef = New-Object -TypeName iControl.CommonIPPortDefinition;\n    $MemberDef.address = $member_addr;\n    $MemberDef.port = $member_port;\n    $MemberDefAofA = New-Object -TypeName \"iControl.CommonIPPortDefinition[][]\" 1,1\n    $MemberDefAofA[0][0] = $MemberDef;\n    $cur_connections = 100;\n    $elapsed = [System.Diagnostics.Stopwatch]::StartNew();\n\n    while ( $cur_connections -gt $ConnectionCount -and $elapsed.ElapsedMilliseconds -lt ($MaxWaitTime * 1000))\n    {\n        $MemberStatisticsA = (Get-F5.iControl).LocalLBPoolMember.get_statistics( (, $pool_name), $MemberDefAofA);\n        $MemberStatisticEntry = $MemberStatisticsA[0].statistics[0];\n        $Statistics = $MemberStatisticEntry.statistics;\n        foreach ($Statistic in $Statistics)\n        {\n            $type = $Statistic.type;\n            $value = $Statistic.value;\n            if ( $type -eq \"STATISTIC_SERVER_SIDE_CURRENT_CONNECTIONS\" )\n            {\n                # just use the low value.  Odds are there aren't over 2^32 current connections.\n                # If your site is this big, you'll have to convert this to a 64 bit number.\n                $cur_connections = $value.low; \n                Write-Host \"Current Connections: $cur_connections\"\n            }\n        }\n        Start-Sleep -s 5\n    }\n}\n\n$Pool = $OctopusParameters['PoolName'].trim();\n\nIf ([string]::IsNullOrWhiteSpace($OctopusParameters['MemberIP'])) {\n    Write-Host \"No IP Adress was provided on the 'LTM Member IP`, using [System.Net.Dns]::GetHostAddresses to resolve it\"\n    $ip = $([System.Net.Dns]::GetHostAddresses(\"$($OctopusParameters['Octopus.Machine.Hostname'])\") | Where {$_.AddressFamily -ne 'InterNetworkV6'}).IpAddressToString\n    if ($ip -is [array]) {\n      Write-Host \"Found multiple ipv4 addresses, using first address $($ip[0])\"\n      $ip = $ip[0]\n    }\n} Else {\n    $ip = $OctopusParameters['MemberIP']\n}\n\n$Member = $ip+\":\"+$OctopusParameters['MemberPort']\nWrite-Host \"Member is $Member\"\n\n# Gets the hostname of the current machine being deployed.\n$curhost = hostname\n\nWrite-host \"Currently deploying to $curhost\"\n\nIf (($OctopusParameters['EnableOrDisable'] -ne \"Enabled\") -and ($OctopusParameters['WaitForConnections'] -eq \"True\"))\n{\n    Initialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']\n    Write-Host \"Setting $curhost to $($OctopusParameters['EnableOrDisable']) in $Pool pool\";\n    Set-F5.LTMPoolMemberState -Pool $Pool -Member $Member -state $OctopusParameters['EnableOrDisable'];\n    Write-Host \"Waiting for connections to drain before deploying.  This could take a while....\"\n    WaitFor-ConnectionCount -pool_name $Pool -member $Member -MaxWaitTime $OctopusParameters['MaxWaitTime'] -ConnectionCount $OctopusParameters['ConnectionCount']\n    if ($OctopusParameters['EnableOrDisable'] -eq \"Disabled\") \n    {\n        Write-Host \"Setting $curhost to Offline in $Pool pool\";\n        # We've now waited the desired amount, go ahead and force offline and move on with deployment\n        Set-F5.LTMPoolMemberState -Pool $Pool -Member $Member -state Offline;\n    }\n}\nElse\n{\n    Initialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']\n    Write-host \"Setting $curhost to $($OctopusParameters['EnableOrDisable']) in $Pool pool.\"\n    Set-F5.LTMPoolMemberState -Pool $Pool -Member $Member -state $OctopusParameters['EnableOrDisable'];\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
@@ -118,7 +118,7 @@
   ],
   "LastModifiedBy": "spuder",
   "$Meta": {
-    "ExportedAt": "2016-09-21T17:50:00.631+00:00",
+    "ExportedAt": "2016-09-21T10:50:00.6310000-07:00",
     "OctopusVersion": "3.4.9",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/f5-enable-disable-member/scriptbody.ps1 b/src/step-templates/f5-enable-disable-member/scriptbody.ps1
new file mode 100644
index 000000000..2075759be
--- /dev/null
+++ b/src/step-templates/f5-enable-disable-member/scriptbody.ps1
@@ -0,0 +1,88 @@
+#Load the F5 powershell iControl snapin
+#https://help.octopus.com/t/the-windows-powershell-snap-in-webadministration-is-not-installed-on-this-computer/4290
+Add-PSSnapin iControlSnapin;
+
+function WaitFor-ConnectionCount() 
+{ 
+    param(
+        $pool_name, 
+        $member,
+        [int]$MaxWaitTime = 300, #defaults to 5 minutes
+        $ConnectionCount = 0
+    )
+    $vals = $member.Split( (, ':'));
+    $member_addr = $vals[0];
+    $member_port = $vals[1];
+
+    Write-Host "Waiting for current connections to drop to "$OctopusParameters['ConnectionCount']
+
+    $MemberDef = New-Object -TypeName iControl.CommonIPPortDefinition;
+    $MemberDef.address = $member_addr;
+    $MemberDef.port = $member_port;
+    $MemberDefAofA = New-Object -TypeName "iControl.CommonIPPortDefinition[][]" 1,1
+    $MemberDefAofA[0][0] = $MemberDef;
+    $cur_connections = 100;
+    $elapsed = [System.Diagnostics.Stopwatch]::StartNew();
+
+    while ( $cur_connections -gt $ConnectionCount -and $elapsed.ElapsedMilliseconds -lt ($MaxWaitTime * 1000))
+    {
+        $MemberStatisticsA = (Get-F5.iControl).LocalLBPoolMember.get_statistics( (, $pool_name), $MemberDefAofA);
+        $MemberStatisticEntry = $MemberStatisticsA[0].statistics[0];
+        $Statistics = $MemberStatisticEntry.statistics;
+        foreach ($Statistic in $Statistics)
+        {
+            $type = $Statistic.type;
+            $value = $Statistic.value;
+            if ( $type -eq "STATISTIC_SERVER_SIDE_CURRENT_CONNECTIONS" )
+            {
+                # just use the low value.  Odds are there aren't over 2^32 current connections.
+                # If your site is this big, you'll have to convert this to a 64 bit number.
+                $cur_connections = $value.low; 
+                Write-Host "Current Connections: $cur_connections"
+            }
+        }
+        Start-Sleep -s 5
+    }
+}
+
+$Pool = $OctopusParameters['PoolName'].trim();
+
+If ([string]::IsNullOrWhiteSpace($OctopusParameters['MemberIP'])) {
+    Write-Host "No IP Adress was provided on the 'LTM Member IP`, using [System.Net.Dns]::GetHostAddresses to resolve it"
+    $ip = $([System.Net.Dns]::GetHostAddresses("$($OctopusParameters['Octopus.Machine.Hostname'])") | Where {$_.AddressFamily -ne 'InterNetworkV6'}).IpAddressToString
+    if ($ip -is [array]) {
+      Write-Host "Found multiple ipv4 addresses, using first address $($ip[0])"
+      $ip = $ip[0]
+    }
+} Else {
+    $ip = $OctopusParameters['MemberIP']
+}
+
+$Member = $ip+":"+$OctopusParameters['MemberPort']
+Write-Host "Member is $Member"
+
+# Gets the hostname of the current machine being deployed.
+$curhost = hostname
+
+Write-host "Currently deploying to $curhost"
+
+If (($OctopusParameters['EnableOrDisable'] -ne "Enabled") -and ($OctopusParameters['WaitForConnections'] -eq "True"))
+{
+    Initialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']
+    Write-Host "Setting $curhost to $($OctopusParameters['EnableOrDisable']) in $Pool pool";
+    Set-F5.LTMPoolMemberState -Pool $Pool -Member $Member -state $OctopusParameters['EnableOrDisable'];
+    Write-Host "Waiting for connections to drain before deploying.  This could take a while...."
+    WaitFor-ConnectionCount -pool_name $Pool -member $Member -MaxWaitTime $OctopusParameters['MaxWaitTime'] -ConnectionCount $OctopusParameters['ConnectionCount']
+    if ($OctopusParameters['EnableOrDisable'] -eq "Disabled") 
+    {
+        Write-Host "Setting $curhost to Offline in $Pool pool";
+        # We've now waited the desired amount, go ahead and force offline and move on with deployment
+        Set-F5.LTMPoolMemberState -Pool $Pool -Member $Member -state Offline;
+    }
+}
+Else
+{
+    Initialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']
+    Write-host "Setting $curhost to $($OctopusParameters['EnableOrDisable']) in $Pool pool."
+    Set-F5.LTMPoolMemberState -Pool $Pool -Member $Member -state $OctopusParameters['EnableOrDisable'];
+}
diff --git a/src/step-templates/f5-enable-disable-multiple-pools/metadata.json b/src/step-templates/f5-enable-disable-multiple-pools/metadata.json
new file mode 100644
index 000000000..799d9e07e
--- /dev/null
+++ b/src/step-templates/f5-enable-disable-multiple-pools/metadata.json
@@ -0,0 +1,125 @@
+{
+  "Id": "b3d76f46-e074-47ff-b800-3020c3f47866",
+  "Name": "F5 - Enable or Disable Multiple Pools",
+  "Description": "F5 - Enable, Disable, or Force Offline multiple pools with optional wait for connections to drop",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "83c45726-806c-4d06-8ae3-22b13b89d5a7",
+      "Name": "RunCondition",
+      "Label": "Run Condition",
+      "HelpText": "Boolean value or expression that determines if this step should run.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fb610f88-0d64-40cf-a74d-0bb8405755c8",
+      "Name": "WaitForConnections",
+      "Label": "Wait for connections to drop to 0?",
+      "HelpText": "If checked, the deployment won't continue until current connections on the node = 0",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "af92387f-ba2d-4b44-a8f1-7ebccf01032a",
+      "Name": "MaxWaitTime",
+      "Label": "Maximum wait time in seconds",
+      "HelpText": "Maximum wait time (in seconds) before killing connections and moving on.",
+      "DefaultValue": "300",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d8c955b3-6c75-49cf-9396-25dc0fffb611",
+      "Name": "LtmStatus",
+      "Label": "LTM Status",
+      "HelpText": "State member will be put into (Enabled, Disabled, Offline)  \n\n- **Disabled** continues to process persistent and active connections. It can accept new connections only if the connections belong to an existing persistence session.  \n\n- **Offline** allows existing connections to time out, but no new connections are allowed.",
+      "DefaultValue": "Disabled",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Enabled|Enable\nDisabled|Disable\nOffline|Forced Offline"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "57b114a3-fa6a-40d6-9c42-38ba80127fca",
+      "Name": "LtmInfo",
+      "Label": "List of LTM info",
+      "HelpText": "Enter list of all Pools, IPs, and Ports. Each set delimited by carriage returns, each value delimited by pipe (|). Here is an example:\n\nPool\\_192.168.103.226\\_443|192.168.103.174|443  \nPool\\_192.168.103.226\\_80|192.168.103.174|80",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3fdbf9bc-9ee8-4610-9c34-24f1975cf8c7",
+      "Name": "HostName",
+      "Label": "LTM Host name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "61480ba0-f715-46ef-b5ad-1c6b6f580273",
+      "Name": "ConnectionCount",
+      "Label": "Kill connections when less than or equal to",
+      "HelpText": "The default is to wait until there are no connections left on the node.  If you don't want to wait for zero connections before deploying, you can put a value here and when that number of connections is reached the deployment will happen killing the rest of the connected sessions.",
+      "DefaultValue": "0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d0f276b6-ce27-4006-b3c2-00c669bfc42d",
+      "Name": "Username",
+      "Label": "LTM username",
+      "HelpText": "Credential used to access F5 Soap API",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "921b6a08-0ffe-4945-91c3-8520a3052ce9",
+      "Name": "Password",
+      "Label": "LTM password",
+      "HelpText": "Credential used to access F5 Soap API",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tbrasch",
+  "$Meta": {
+    "ExportedAt": "2017-06-02T14:54:52.8400000Z",
+    "OctopusVersion": "3.13.6",
+    "Type": "ActionTemplate"
+  },
+  "Category": "F5"
+}
diff --git a/src/step-templates/f5-enable-disable-multiple-pools/scriptbody.ps1 b/src/step-templates/f5-enable-disable-multiple-pools/scriptbody.ps1
new file mode 100644
index 000000000..46b015945
--- /dev/null
+++ b/src/step-templates/f5-enable-disable-multiple-pools/scriptbody.ps1
@@ -0,0 +1,218 @@
+#region Verify variables
+
+#Verify RunCondition can be converted to boolean.
+$runCondition = $false
+If ([string]::IsNullOrEmpty($OctopusParameters['RunCondition'])){
+    Throw "Run Condition cannot be null."
+}
+Else{
+    Try{
+        $runCondition = [System.Convert]::ToBoolean($OctopusParameters['RunCondition'])
+        Write-Host ("Run Condition: '" + $OctopusParameters['RunCondition'] + "' converts to boolean: " + $runCondition + ".")
+
+        #If run condition evaluates to false, just return/stop processing.
+        If (!$runCondition){
+            Write-Host "Skipping step."
+            return
+        }
+    }
+    Catch{
+        Throw "Cannot convert Run Condition: '" + $OctopusParameters['RunCondition'] + "' to boolean value."
+    }
+}
+
+#No need to verify WaitForConnections as this is a checkbox and will always have a boolean value. Report value back for logging.
+Write-Host ("Wait for connections to drop to 0: " + $OctopusParameters['WaitForConnections'])
+
+#Verify MaxWaitTime can be converted to integer.
+If ([string]::IsNullOrEmpty($OctopusParameters['MaxWaitTime'])){
+    Throw "Maximum wait time in seconds cannot be null."
+}
+
+[int]$maxWaitTime = 0
+[bool]$result = [int]::TryParse($OctopusParameters['MaxWaitTime'], [ref]$maxWaitTime )
+
+If ($result){
+    Write-Host ("Maximum wait time in seconds: " + $maxWaitTime)
+}
+Else{
+    Throw "Cannot convert Maximum wait time in seconds: '" + $OctopusParameters['MaxWaitTime'] + "' to integer."
+}
+
+#No need to verify LtmStatus as this is a drop down box and will always have a value. Report back for logging.
+Write-Host ("LTM Status: " + $OctopusParameters['LtmStatus'])
+
+<#
+Verify List of LTM info.
+LTM Info should contain a list of all Pools, IPs, and Ports. Each set should be delmited by carriage returns, each valude delimited by pipe (|).
+Here is an example:
+Pool_192.168.103.226_443|192.168.103.174|443 
+Pool_192.168.103.226_80|192.168.103.174|80
+#>
+If ([string]::IsNullOrEmpty($OctopusParameters['LtmInfo'])){
+    Throw "List of LTM info cannot be null."
+}
+#Write out LTM info. If the project is using variables (and it most likely is), it may be difficult to debug without seeing what it evaluated to.
+Write-Host ("List of LTM info: " + [Environment]::NewLine + $OctopusParameters['LtmInfo'])
+$f5Pools = ($OctopusParameters['LtmInfo']).Split([Environment]::NewLine)
+Foreach ($f5Pool in $f5Pools){
+    #Validate 3 values are passed in per line.
+    $poolInfo = $f5Pool.Split("|")
+    If ($poolInfo.Count -ne 3){
+        Throw ("Invalid pool info. Expecting 'PoolName|IpAddress|Port': '" + $f5Pool + "'.")
+    }
+    
+    #Validate that each value is not null.
+    Foreach ($f5Parm in $poolInfo){
+        If ([string]::IsNullOrEmpty($f5Parm)){
+            Throw ("Invalid pool info. Expecting 'PoolName|IpAddress|Port': '" + $f5Pool + "'. None can be empty.")
+        }
+    }
+    
+    #Validate IP Address (second value).
+    If ( !($poolInfo[1] -as [ipaddress]) ){
+        Throw ("Invalid IP Address: '" + $poolInfo[1] + "'.")
+    }
+
+    #Validate Port (third value).
+    [int]$port = 0
+    [bool]$result = [int]::TryParse($poolInfo[2], [ref]$port )
+    
+    If ( !($result) ){
+        Throw ("Invalid port (expecting integer): '" + $poolInfo[2] + "'.")
+    }
+}
+
+#Verify HostName is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['HostName'])){
+    Throw "LTM Host name cannot be null."
+}
+Write-Host ("LTM Host: " + $OctopusParameters['HostName'])
+
+#Verify Username is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['Username'])){
+    Throw "LTM username cannot be null."
+}
+Write-Host ("Username: " + $OctopusParameters['Username'])
+
+#Verify Password is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['Password'])){
+    Throw "LTM password cannot be null."
+}
+
+#Verify ConnectionCount can be converted to integer.
+If ([string]::IsNullOrEmpty($OctopusParameters['ConnectionCount'])){
+    Throw "Kill connections when less than or equal to cannot be null."
+}
+
+[int]$killConnectionWhenLE = 0
+[bool]$result = [int]::TryParse($OctopusParameters['ConnectionCount'], [ref]$killConnectionWhenLE )
+
+If ($result){
+    Write-Host ("Kill connections when less than or equal to: " + $killConnectionWhenLE)
+}
+Else{
+    Throw "Cannot convert Kill connections when less than or equal to: '" + $OctopusParameters['ConnectionCount'] + "' to integer."
+}
+
+#endregion
+
+#region Functions
+
+Function Set-F5PoolState{
+    param(
+        $f5Pools,
+        [switch]$forceOffline
+    )
+    
+    Foreach ($f5Pool in $f5Pools){
+        $poolInfo = $f5Pool.Split("|")
+        
+        $poolName = $poolInfo[0]
+        $ipAddress = $poolInfo[1]
+        $port = $poolInfo[2]
+        
+        $member = ($ipAddress + ":" + $port)
+        
+        $state = $OctopusParameters['LtmStatus']
+        If ($forceOffline){
+            $state = "Offline"
+        }
+        
+        Write-Host "Setting '$ipAddress' to '$state' in '$poolName' pool."
+        Set-F5.LTMPoolMemberState -Pool $poolName -Member $member -state $state
+    }
+}
+
+Function Wait-ConnectionCount(){
+    param(
+        $f5Pools,
+        [int]$maxWaitTime,
+        [int]$connectionCount
+    )
+    
+    #Start stop watch now.
+    $elapsed = [System.Diagnostics.Stopwatch]::StartNew()
+    
+    Foreach ($f5Pool in $f5Pools){
+        $poolInfo = $f5Pool.Split("|")
+        
+        $poolName = $poolInfo[0]
+        $ipAddress = $poolInfo[1]
+        $port = $poolInfo[2]
+        
+        $MemberDef = New-Object -TypeName iControl.CommonIPPortDefinition
+        $MemberDef.address = $ipAddress
+        $MemberDef.port = $port
+        $MemberDefAofA = New-Object -TypeName "iControl.CommonIPPortDefinition[][]" 1,1
+        $MemberDefAofA[0][0] = $MemberDef
+        $cur_connections = 100
+        
+        Write-Host ("Pool name: " + $poolName)
+        Write-Host ("IP Address: " + $ipAddress)
+        Write-Host ("Port: " + $port)
+
+        While ($cur_connections -gt $connectionCount -and $elapsed.ElapsedMilliseconds -lt ($maxWaitTime * 1000)){
+            $MemberStatisticsA = (Get-F5.iControl).LocalLBPoolMember.get_statistics( (, $poolName), $MemberDefAofA)
+            $MemberStatisticEntry = $MemberStatisticsA[0].statistics[0]
+            $Statistics = $MemberStatisticEntry.statistics
+            
+            Foreach ($Statistic in $Statistics){
+                $type = $Statistic.type;
+                $value = $Statistic.value;
+                If ( $type -eq "STATISTIC_SERVER_SIDE_CURRENT_CONNECTIONS" ){
+                    #Just use the low value.  Odds are there aren't over 2^32 current connections. If your site is this big, you'll have to convert this to a 64 bit number.
+                    $cur_connections = $value.low; 
+                    Write-Host "Current Connections: $cur_connections"
+                }
+            }
+            
+            If ($cur_connections -gt $connectionCount -and $elapsed.ElapsedMilliseconds -lt ($maxWaitTime * 1000)){
+                Start-Sleep -Seconds 5
+            }
+        }
+    }
+}
+
+#endregion
+
+#region Process
+
+#Load the F5 powershell iControl snapin
+Add-PSSnapin iControlSnapin
+Initialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']
+
+Set-F5PoolState -f5Pools $f5Pools
+
+If (($OctopusParameters['LtmStatus'] -ne "Enabled") -and ($OctopusParameters['WaitForConnections'] -eq "True"))
+{
+    Write-Host "Waiting for connections to drain before deploying.  This could take a while..."
+    Wait-ConnectionCount -f5Pools $f5Pools -maxWaitTime $maxWaitTime -connectionCount $killConnectionWhenLE
+    
+    #We have now waited the desired amount, go ahead and force offline and move on with deployment.
+    Set-F5PoolState -f5Pools $f5Pools -forceOffline
+}
+
+
+#endregion
+
diff --git a/step-templates/f5-gtm-enable-or-disable.json b/src/step-templates/f5-gtm-enable-or-disable/metadata.json
similarity index 61%
rename from step-templates/f5-gtm-enable-or-disable.json
rename to src/step-templates/f5-gtm-enable-or-disable/metadata.json
index d56b2fb2c..6c63c1579 100644
--- a/step-templates/f5-gtm-enable-or-disable.json
+++ b/src/step-templates/f5-gtm-enable-or-disable/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 12,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Add-PSSnapIn iControlSnapIn. F5 iControlSnapIn can be downloaded from here https://devcentral.f5.com/articles/icontrol-cmdlets \r\n\r\nInitialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']\r\n\r\n$Pool = $OctopusParameters['PoolName'];\r\n\r\n$PoolA = (, $Pool);\r\n$MemberEnabledState = New-Object -TypeName iControl.GlobalLBPoolMemberMemberEnabledState;\r\n$MemberEnabledState.member = New-Object iControl.CommonIPPortDefinition;\r\n$MemberEnabledState.member.address = $OctopusParameters['MemberIP'];\r\n$MemberEnabledState.member.port = $OctopusParameters['MemberPort'];\r\n$MemberEnabledState.state = $OctopusParameters['EnableOrDisable'];\r\n[iControl.GlobalLBPoolMemberMemberEnabledState[]]$MemberEnabledStateA = [iControl.GlobalLBPoolMemberMemberEnabledState[]](, $MemberEnabledState);\r\n[iControl.GlobalLBPoolMemberMemberEnabledState[][]]$MemberEnabledStateAofA = [iControl.GlobalLBPoolMemberMemberEnabledState[][]](, $MemberEnabledStateA);\r\n\r\n(Get-F5.iControl).GlobalLBPoolMember.set_enabled_state($PoolA, $MemberEnabledStateAofA);",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -75,12 +75,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2014-07-24T10:41:45.863+00:00",
+  "LastModifiedOn": "2014-07-24T03:41:45.8630000-07:00",
   "LastModifiedBy": "leeenglestone",
   "$Meta": {
-    "ExportedAt": "2014-07-29T14:51:04.864+00:00",
+    "ExportedAt": "2014-07-29T07:51:04.8640000-07:00",
     "OctopusVersion": "2.5.4.280",
     "Type": "ActionTemplate"
   },
   "Category": "f5"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/f5-gtm-enable-or-disable/scriptbody.ps1 b/src/step-templates/f5-gtm-enable-or-disable/scriptbody.ps1
new file mode 100644
index 000000000..f3ef08e62
--- /dev/null
+++ b/src/step-templates/f5-gtm-enable-or-disable/scriptbody.ps1
@@ -0,0 +1,16 @@
+Add-PSSnapIn iControlSnapIn. F5 iControlSnapIn can be downloaded from here https://devcentral.f5.com/articles/icontrol-cmdlets 
+
+Initialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']
+
+$Pool = $OctopusParameters['PoolName'];
+
+$PoolA = (, $Pool);
+$MemberEnabledState = New-Object -TypeName iControl.GlobalLBPoolMemberMemberEnabledState;
+$MemberEnabledState.member = New-Object iControl.CommonIPPortDefinition;
+$MemberEnabledState.member.address = $OctopusParameters['MemberIP'];
+$MemberEnabledState.member.port = $OctopusParameters['MemberPort'];
+$MemberEnabledState.state = $OctopusParameters['EnableOrDisable'];
+[iControl.GlobalLBPoolMemberMemberEnabledState[]]$MemberEnabledStateA = [iControl.GlobalLBPoolMemberMemberEnabledState[]](, $MemberEnabledState);
+[iControl.GlobalLBPoolMemberMemberEnabledState[][]]$MemberEnabledStateAofA = [iControl.GlobalLBPoolMemberMemberEnabledState[][]](, $MemberEnabledStateA);
+
+(Get-F5.iControl).GlobalLBPoolMember.set_enabled_state($PoolA, $MemberEnabledStateAofA);
\ No newline at end of file
diff --git a/step-templates/f5-ltm-rest-enable-disable-member.json b/src/step-templates/f5-ltm-rest-enable-disable-member/metadata.json
similarity index 53%
rename from step-templates/f5-ltm-rest-enable-disable-member.json
rename to src/step-templates/f5-ltm-rest-enable-disable-member/metadata.json
index 6b3408dcf..9ff6e07da 100644
--- a/step-templates/f5-ltm-rest-enable-disable-member.json
+++ b/src/step-templates/f5-ltm-rest-enable-disable-member/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Based on the F5 template by spuder.\n# This template has been translated to use REST instead of the iControl SOAP commandlets.\n# https://www.powershellgallery.com/packages/F5-LTM/1.4.297\n# https://devcentral.f5.com/s/articles/powershell-module-for-the-f5-ltm-rest-api\nImport-Module -Name F5-LTM\n\nfunction WaitFor-ConnectionCount() \n{ \n    param(\n        $pool_name, \n        $member,\n        [int]$MaxWaitTime = 300, #defaults to 5 minutes\n        $ConnectionCount = 0\n    )\n    $member_addr = $member\n\n    Write-Host \"Waiting for current connections to drop to \"$ConnectionCount\n\n    $cur_connections = 100;\n    $elapsed = [System.Diagnostics.Stopwatch]::StartNew();\n\n    while ( $cur_connections -gt $ConnectionCount -and $elapsed.ElapsedMilliseconds -lt ($MaxWaitTime * 1000))\n    {\n        $MemberStatisticsA = Get-PoolMemberStats -PoolName $pool_name -Address $member_addr\n        $MemberStatisticEntry = $MemberStatisticsA.'serverside.curConns'\n        $cur_connections = $MemberStatisticEntry.Value; \n\n        Write-Host \"Current Connections: $cur_connections\"\n\n        Start-Sleep -s 5\n    }\n}\n\n$Pool = $OctopusParameters['F5LTM.PoolName'].trim();\n\nIf ([string]::IsNullOrWhiteSpace($OctopusParameters['F5LTM.MemberIP'])) {\n    Write-Host \"No IP Adress was provided on the 'LTM Member IP`, using [System.Net.Dns]::GetHostAddresses to resolve it\"\n    $ip = $([System.Net.Dns]::GetHostAddresses(\"$($OctopusParameters['Octopus.Machine.Hostname'])\") | Where {$_.AddressFamily -ne 'InterNetworkV6'}).IpAddressToString\n    if ($ip -is [array]) {\n      Write-Host \"Found multiple ipv4 addresses, using first address $($ip[0])\"\n      $ip = $ip[0]\n    }\n} Else {\n    $ip = $OctopusParameters['F5LTM.MemberIP']\n}\n\n$Member = $ip\n\nWrite-Host \"Member is $Member\"\n\n# Gets the hostname of the current machine being deployed.\n$curhost = hostname\n$hostname = $OctopusParameters['F5LTM.HostName']\n$username = $OctopusParameters['F5LTM.Username']\n$password = ConvertTo-SecureString $OctopusParameters['F5LTM.Password'] -AsPlainText -Force\n$credential = New-Object System.Management.Automation.PSCredential ($username, $password)\n\nWrite-host \"Currently deploying to $curhost\"\n\nIf (($OctopusParameters['F5LTM.EnableOrDisable'] -ne \"Enabled\") -and ($OctopusParameters['F5LTM.WaitForConnections'] -eq \"True\"))\n{\n    New-F5Session -LTMName $hostname -LTMCredentials $credential\n\n    Write-Host \"Setting $Member to $($OctopusParameters['F5LTM.EnableOrDisable']) in $Pool pool\";\n\n    Disable-PoolMember -PoolName $Pool -Address $Member\n\n    Write-Host \"Waiting for connections to drain before deploying.  This could take a while....\"\n\n    WaitFor-ConnectionCount -pool_name $Pool -member $Member -MaxWaitTime $OctopusParameters['F5LTM.MaxWaitTime'] -ConnectionCount $OctopusParameters['F5LTM.ConnectionCount']\n\n    if ($OctopusParameters['F5LTM.EnableOrDisable'] -eq \"Disabled\") \n    {\n        Write-Host \"Setting $Member to Offline in $Pool pool\";\n\n        Disable-PoolMember -PoolName $Pool -Address $Member -Force\n    }\n}\nElse\n{\n    New-F5Session -LTMName $hostname -LTMCredentials $credential\n\n    Write-host \"Setting $Member to $($OctopusParameters['F5LTM.EnableOrDisable']) in $Pool pool.\"\n\n    if ($OctopusParameters['F5LTM.EnableOrDisable'] -eq \"Disabled\") \n    {\n        Disable-PoolMember -PoolName $Pool -Address $Member -Force\n    } \n    Else\n    {\n        Enable-PoolMember -PoolName $Pool -Address $Member\n    }\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -106,9 +106,9 @@
   ],
   "LastModifiedBy": "gvanderberg",
   "$Meta": {
-    "ExportedAt": "2020-06-10T10:23:31.760Z",
+    "ExportedAt": "2020-06-10T10:23:31.7600000Z",
     "OctopusVersion": "2019.12.0",
     "Type": "ActionTemplate"
   },
   "Category": "f5"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/f5-ltm-rest-enable-disable-member/scriptbody.ps1 b/src/step-templates/f5-ltm-rest-enable-disable-member/scriptbody.ps1
new file mode 100644
index 000000000..d0a7ab5b0
--- /dev/null
+++ b/src/step-templates/f5-ltm-rest-enable-disable-member/scriptbody.ps1
@@ -0,0 +1,93 @@
+# Based on the F5 template by spuder.
+# This template has been translated to use REST instead of the iControl SOAP commandlets.
+# https://www.powershellgallery.com/packages/F5-LTM/1.4.297
+# https://devcentral.f5.com/s/articles/powershell-module-for-the-f5-ltm-rest-api
+Import-Module -Name F5-LTM
+
+function WaitFor-ConnectionCount() 
+{ 
+    param(
+        $pool_name, 
+        $member,
+        [int]$MaxWaitTime = 300, #defaults to 5 minutes
+        $ConnectionCount = 0
+    )
+    $member_addr = $member
+
+    Write-Host "Waiting for current connections to drop to "$ConnectionCount
+
+    $cur_connections = 100;
+    $elapsed = [System.Diagnostics.Stopwatch]::StartNew();
+
+    while ( $cur_connections -gt $ConnectionCount -and $elapsed.ElapsedMilliseconds -lt ($MaxWaitTime * 1000))
+    {
+        $MemberStatisticsA = Get-PoolMemberStats -PoolName $pool_name -Address $member_addr
+        $MemberStatisticEntry = $MemberStatisticsA.'serverside.curConns'
+        $cur_connections = $MemberStatisticEntry.Value; 
+
+        Write-Host "Current Connections: $cur_connections"
+
+        Start-Sleep -s 5
+    }
+}
+
+$Pool = $OctopusParameters['F5LTM.PoolName'].trim();
+
+If ([string]::IsNullOrWhiteSpace($OctopusParameters['F5LTM.MemberIP'])) {
+    Write-Host "No IP Adress was provided on the 'LTM Member IP`, using [System.Net.Dns]::GetHostAddresses to resolve it"
+    $ip = $([System.Net.Dns]::GetHostAddresses("$($OctopusParameters['Octopus.Machine.Hostname'])") | Where {$_.AddressFamily -ne 'InterNetworkV6'}).IpAddressToString
+    if ($ip -is [array]) {
+      Write-Host "Found multiple ipv4 addresses, using first address $($ip[0])"
+      $ip = $ip[0]
+    }
+} Else {
+    $ip = $OctopusParameters['F5LTM.MemberIP']
+}
+
+$Member = $ip
+
+Write-Host "Member is $Member"
+
+# Gets the hostname of the current machine being deployed.
+$curhost = hostname
+$hostname = $OctopusParameters['F5LTM.HostName']
+$username = $OctopusParameters['F5LTM.Username']
+$password = ConvertTo-SecureString $OctopusParameters['F5LTM.Password'] -AsPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential ($username, $password)
+
+Write-host "Currently deploying to $curhost"
+
+If (($OctopusParameters['F5LTM.EnableOrDisable'] -ne "Enabled") -and ($OctopusParameters['F5LTM.WaitForConnections'] -eq "True"))
+{
+    New-F5Session -LTMName $hostname -LTMCredentials $credential
+
+    Write-Host "Setting $Member to $($OctopusParameters['F5LTM.EnableOrDisable']) in $Pool pool";
+
+    Disable-PoolMember -PoolName $Pool -Address $Member
+
+    Write-Host "Waiting for connections to drain before deploying.  This could take a while...."
+
+    WaitFor-ConnectionCount -pool_name $Pool -member $Member -MaxWaitTime $OctopusParameters['F5LTM.MaxWaitTime'] -ConnectionCount $OctopusParameters['F5LTM.ConnectionCount']
+
+    if ($OctopusParameters['F5LTM.EnableOrDisable'] -eq "Disabled") 
+    {
+        Write-Host "Setting $Member to Offline in $Pool pool";
+
+        Disable-PoolMember -PoolName $Pool -Address $Member -Force
+    }
+}
+Else
+{
+    New-F5Session -LTMName $hostname -LTMCredentials $credential
+
+    Write-host "Setting $Member to $($OctopusParameters['F5LTM.EnableOrDisable']) in $Pool pool."
+
+    if ($OctopusParameters['F5LTM.EnableOrDisable'] -eq "Disabled") 
+    {
+        Disable-PoolMember -PoolName $Pool -Address $Member -Force
+    } 
+    Else
+    {
+        Enable-PoolMember -PoolName $Pool -Address $Member
+    }
+}
\ No newline at end of file
diff --git a/step-templates/file-download.json b/src/step-templates/file-download/metadata.json
similarity index 81%
rename from step-templates/file-download.json
rename to src/step-templates/file-download/metadata.json
index 4eed21fca..21ce4555e 100644
--- a/step-templates/file-download.json
+++ b/src/step-templates/file-download/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "Write-Verbose \"Downloading file $FileUrl, to the destination $FilePath\" -Verbose\r\n$client = new-object System.Net.WebClient\r\n$client.DownloadFile($FileUrl, $FilePath)\r\nWrite-Verbose \"File downloadded\" -Verbose\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -42,9 +42,9 @@
   ],
   "LastModifiedBy": "ahmedig",
   "$Meta": {
-    "ExportedAt": "2017-03-07T05:12:43.174Z",
+    "ExportedAt": "2017-03-07T05:12:43.1740000Z",
     "OctopusVersion": "3.11.2",
     "Type": "ActionTemplate"
   },
   "Category": "http"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/file-download/scriptbody.ps1 b/src/step-templates/file-download/scriptbody.ps1
new file mode 100644
index 000000000..7d8577061
--- /dev/null
+++ b/src/step-templates/file-download/scriptbody.ps1
@@ -0,0 +1,4 @@
+Write-Verbose "Downloading file $FileUrl, to the destination $FilePath" -Verbose
+$client = new-object System.Net.WebClient
+$client.DownloadFile($FileUrl, $FilePath)
+Write-Verbose "File downloadded" -Verbose
diff --git a/src/step-templates/file-system-add-hosts-entry/metadata.json b/src/step-templates/file-system-add-hosts-entry/metadata.json
new file mode 100644
index 000000000..934bfbc63
--- /dev/null
+++ b/src/step-templates/file-system-add-hosts-entry/metadata.json
@@ -0,0 +1,48 @@
+{
+  "Id": "0ad0ad00-adad-adad-adad-000000000001",
+  "Name": "File System - Add entry to hosts file",
+  "Description": "Adds an entry to etc/hosts file with the specified host name and optional ip address",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Name": "AD_AddHostsEntry_HostName",
+      "Label": "Host name",
+      "HelpText": "The host name",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddHostsEntry_IpAddress",
+      "Label": "IP address",
+      "HelpText": "The optional IP address",
+      "DefaultValue": "127.0.0.1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddHostsEntry_Attempts",
+      "Label": "Nr of attempts",
+      "HelpText": "Optional number of attempts before failing",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "anatolie-darii",
+  "$Meta": {
+    "ExportedAt": "2018-07-16T12:37:14.4280000Z",
+    "OctopusVersion": "2018.2.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-add-hosts-entry/scriptbody.ps1 b/src/step-templates/file-system-add-hosts-entry/scriptbody.ps1
new file mode 100644
index 000000000..9f63926c6
--- /dev/null
+++ b/src/step-templates/file-system-add-hosts-entry/scriptbody.ps1
@@ -0,0 +1,86 @@
+# Running outside octopus
+Param(
+    [string] $AD_AddHostsEntry_HostName,
+    [string] $AD_AddHostsEntry_IpAddress = "127.0.0.1",
+    [Int16] $AD_AddHostsEntry_Attempts = 5,
+    [switch] $WhatIf
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($null -ne $OctopusParameters) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($null -eq $result) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($null -ne $variable) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($null -eq $result) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        }
+        else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Execute(
+    [Parameter(Mandatory = $true)][string] $HostName,
+    [Parameter(Mandatory = $false)][string] $IpAddress = "127.0.0.1",
+    [Parameter(Mandatory = $false)][Int16] $Attempts = 5
+) {
+    $attemptCount = 0
+    $operationIncomplete = $true
+    $maxFailures = $Attempts
+    $sleepBetweenFailures = 1
+
+    $hostsFile = "$($env:windir)\system32\Drivers\etc\hosts"
+    $entry = "$IpAddress $HostName"
+    $regexMatch = "^\s*$IpAddress\s+$HostName"
+    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+        $attemptCount = ($attemptCount + 1)
+        if ($attemptCount -ge 2) {
+            Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+            Start-Sleep -s $sleepBetweenFailures
+            Write-Output "Retrying..."
+            $sleepBetweenFailures = ($sleepBetweenFailures * 2)
+        }
+        try {
+            $matchingEntries = @(Get-Content $hostsFile) -match ($regexMatch)
+            if (-Not $matchingEntries) {
+                Write-Output "Entry '$entry' doesn't exist - ADDING..."
+                if (-Not ($WhatIf)) {
+                    $formattedEntry = [environment]::newline + $entry
+                    [System.IO.File]::AppendAllText($hostsFile, $formattedEntry)
+                }
+                Write-Output "Entry '$entry' - ADDED"
+            }
+            else {
+                Write-Output "Entry '$entry' already exists - SKIPPING"
+            }
+            $operationIncomplete = $false
+        }
+        catch [System.Exception] {
+            if ($attemptCount -lt ($maxFailures)) {
+                Write-Host ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+            }
+            else {
+                throw
+            }
+        }
+    }
+}
+& Execute `
+(Get-Param 'AD_AddHostsEntry_HostName' -Required)`
+(Get-Param 'AD_AddHostsEntry_IpAddress')`
+(Get-Param 'AD_AddHostsEntry_Attempts')
diff --git a/step-templates/file-system-backup-directory.json b/src/step-templates/file-system-backup-directory/metadata.json
similarity index 61%
rename from step-templates/file-system-backup-directory.json
rename to src/step-templates/file-system-backup-directory/metadata.json
index 32d9e01e2..4df0a42cf 100644
--- a/step-templates/file-system-backup-directory.json
+++ b/src/step-templates/file-system-backup-directory/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 4,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Get-Stamped-Destination($BackupDestination) {\r\n\t$stampedFolderName = get-date -format \"yyyy-MM-dd\"\r\n\t$count = 1\r\n\t$stampedDestination = Join-Path $BackupDestination $stampedFolderName\r\n\twhile(Test-Path $stampedDestination) {\r\n\t\t$count++\r\n\t\t$stamped = $stampedFolderName + \"(\" + $count + \")\"\r\n\t\t$stampedDestination = Join-Path $BackupDestination $stamped\r\n\t}\r\n\treturn $stampedDestination\r\n}\r\n\r\n$BackupSource = $OctopusParameters['BackupSource']\r\n$BackupDestination = $OctopusParameters['BackupDestination']\r\n$CreateStampedBackupFolder = $OctopusParameters['CreateStampedBackupFolder']\r\nif($CreateStampedBackupFolder -like \"True\" ) {\r\n\t$BackupDestination = get-stamped-destination $BackupDestination\r\n}\r\n\r\n$options = $OctopusParameters['Options'] -split \"\\s+\"\r\n\r\nif(Test-Path -Path $BackupSource) {\r\n    robocopy $BackupSource $BackupDestination $options\r\n}\r\n\r\nif($LastExitCode -gt 8) {\r\n    exit 1\r\n}\r\nelse {\r\n    exit 0\r\n}\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.ScriptFileName": null,
@@ -50,12 +50,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2016-08-25T15:50:24.584+00:00",
+    "ExportedAt": "2016-08-25T08:50:24.5840000-07:00",
     "OctopusVersion": "3.3.27",
     "Type": "ActionTemplate"
   },
   "Category": "filesystem"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/file-system-backup-directory/scriptbody.ps1 b/src/step-templates/file-system-backup-directory/scriptbody.ps1
new file mode 100644
index 000000000..dd9c2ae35
--- /dev/null
+++ b/src/step-templates/file-system-backup-directory/scriptbody.ps1
@@ -0,0 +1,31 @@
+function Get-Stamped-Destination($BackupDestination) {
+	$stampedFolderName = get-date -format "yyyy-MM-dd"
+	$count = 1
+	$stampedDestination = Join-Path $BackupDestination $stampedFolderName
+	while(Test-Path $stampedDestination) {
+		$count++
+		$stamped = $stampedFolderName + "(" + $count + ")"
+		$stampedDestination = Join-Path $BackupDestination $stamped
+	}
+	return $stampedDestination
+}
+
+$BackupSource = $OctopusParameters['BackupSource']
+$BackupDestination = $OctopusParameters['BackupDestination']
+$CreateStampedBackupFolder = $OctopusParameters['CreateStampedBackupFolder']
+if($CreateStampedBackupFolder -like "True" ) {
+	$BackupDestination = get-stamped-destination $BackupDestination
+}
+
+$options = $OctopusParameters['Options'] -split "\s+"
+
+if(Test-Path -Path $BackupSource) {
+    robocopy $BackupSource $BackupDestination $options
+}
+
+if($LastExitCode -gt 8) {
+    exit 1
+}
+else {
+    exit 0
+}
diff --git a/src/step-templates/file-system-check-disk-space/metadata.json b/src/step-templates/file-system-check-disk-space/metadata.json
new file mode 100644
index 000000000..3f7bfbae7
--- /dev/null
+++ b/src/step-templates/file-system-check-disk-space/metadata.json
@@ -0,0 +1,54 @@
+{
+  "Id": "e74ff6a3-65ce-4a3a-8cbd-2224653af3a2",
+  "Name": "File System - Check Disk Space",
+  "Description": "Checks all or specified fixed drives for free space, either as an absolute number (GB) or relative (%).\nIf the available disk space does not meet the minimum requirements, as set in the parameters, as error is thrown.\n\nAuthor: Jim (Dimitrios) Andrakakis, [dandraka.com](https://dandraka.com)",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "640be7e1-aa4f-4cc8-b01c-4fe6ef1a3757",
+      "Name": "fschkSpaceGB",
+      "Label": "Required Disk Space (GB)",
+      "HelpText": "Number, integer.\nThe minimum required space in GB.\nZero means do not check GB.\nExample: 2\nwhich means 2GB.",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0d28eda8-4fd0-47c5-8faf-6d1bd27a7247",
+      "Name": "fschkSpacePercent",
+      "Label": "Required Disk Space (%)",
+      "HelpText": "Number, integer.\nThe minimum required space in % of the total space.\nZero means do not check %.\nExample: 10\nwhich means 10%.",
+      "DefaultValue": "0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "00037224-9932-46e3-9cfb-5723e0b8d702",
+      "Name": "fschkDrives",
+      "Label": "Drives",
+      "HelpText": "Comma separated list of drive names to check.\nPlease use the drive label, i.e. the drive letter and a colon (C: , D: etc).\nExample: C:,D:,H:\nwhich means, the check will be done on C:, D: and H:, if they exist; if some of them do not exist in the system, they will be ignored; if none of them exist, an error is thrown.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2020-12-14T03:00:00.0000000-08:00",
+  "LastModifiedBy": "dandraka",
+  "Category": "filesystem",
+  "$Meta": {
+    "ExportedAt": "2020-12-14T09:37:17.6800000Z",
+    "OctopusVersion": "2020.1.16",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/file-system-check-disk-space/scriptbody.ps1 b/src/step-templates/file-system-check-disk-space/scriptbody.ps1
new file mode 100644
index 000000000..f0d5c3180
--- /dev/null
+++ b/src/step-templates/file-system-check-disk-space/scriptbody.ps1
@@ -0,0 +1,77 @@
+
+# Jim (Dimitrios) Andrakakis
+# dandraka.com
+# December 2020
+
+param([int]$pSpaceGB = $fschkSpaceGB, 
+	[int]$pSpacePercent = $fschkSpacePercent, 
+    [string]$pDrives = $fschkDrives)
+
+# ================= PARAMETERS, CONSTANTS ETC =================
+
+$ErrorActionPreference = "Stop"
+Clear-Host
+
+$win32_logicaldisk_LocalDiskDriveType = 3
+
+Write-Host "Parameters: SpaceGB '$pSpaceGB'"
+Write-Host "Parameters: SpacePercent '$pSpacePercent'"
+Write-Host "Parameters: Drives '$pDrives'"
+
+[bool]$checkSpaceAbsolute = $false
+[bool]$checkSpacePercent = $false
+[bool]$checkAllDrives = $true
+$driveList = New-Object System.Collections.ArrayList
+
+# ================= SANITY CHECKS =================
+
+$allDrives = get-wmiobject -class win32_logicaldisk | Where-Object { $_.DriveType -eq $win32_logicaldisk_LocalDiskDriveType } 
+Write-Host "Drives found in the system: $($allDrives | ForEach-Object { $_.DeviceID })"
+
+if ($pSpaceGB -gt 0) {
+    $checkSpaceAbsolute = $true
+    Write-Host "Will check that space > $pSpaceGB"
+}
+
+if ($pSpacePercent -gt 0) {
+    $checkSpacePercent = $true
+    Write-Host "Will check that space > $pSpacePercent %"
+}
+
+if ((-not $checkSpaceAbsolute) -and (-not $checkSpacePercent)) {
+    Write-Error "Neither Space(GB) nor Space(%) check was specified. Please specify at least one."
+}
+
+if ([string]::IsNullOrWhiteSpace($pDrives)) {
+    foreach($d in $allDrives) { $driveList.Add($d) | Out-Null }
+    Write-Host "Will check all fixed drives $($driveList | ForEach-Object { $_.DeviceID + " " })"
+}
+else {
+    $checkAllDrives = $false
+    foreach($d in $allDrives) { if ($pDrives.Contains($d.DeviceID)) { $driveList.Add($d) | Out-Null | Out-Null } }
+    Write-Host "Will check fixed drives $($driveList | ForEach-Object { $_.DeviceID + " " })"
+}
+
+if ($driveList.Count -eq 0) {
+    Write-Error "No drives were found or, most likely, the drive list parameter does not contain any of the existing drives."
+}
+
+# ================= RUN CHECKS =================
+foreach($d in $driveList) {
+    $driveDescr = "$($d.DeviceID) [$($d.VolumeName)]"
+    $pDrivespaceGBFree = [Math]::Round(($d.FreeSpace / [Math]::Pow(1024,3)), 1)
+    $pDrivespaceGBTotal = [Math]::Round(($d.Size / [Math]::Pow(1024,3)), 1)
+    $pDrivespacePercentFree = [Math]::Round($pDrivespaceGBFree / $pDrivespaceGBTotal,1) * 100
+    Write-Host "Drive $driveDescr : Free $pDrivespaceGBFree GB ($pDrivespacePercentFree%), Total $pDrivespaceGBTotal GB"
+
+    if ($checkSpaceAbsolute) {
+        if ($pDrivespaceGBFree -lt $pSpaceGB) { 
+            Write-Error "Drive $driveDescr has less than the required space ($pSpaceGB GB)"
+        }
+    }
+    if ($checkSpacePercent) {
+        if ($pDrivespacePercentFree -lt $pSpacePercent) { 
+            Write-Error "Drive $driveDescr has less than the required space ($pSpacePercent %)"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/file-system-clean-asp-net-temp-files/metadata.json b/src/step-templates/file-system-clean-asp-net-temp-files/metadata.json
new file mode 100644
index 000000000..52c0e4ba6
--- /dev/null
+++ b/src/step-templates/file-system-clean-asp-net-temp-files/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "47fa89d0-fffd-4686-978d-4d54d944df55",
+  "Name": "File System - Clean ASP.NET Temp Files",
+  "Description": "Most ASP.NET websites today make use of dynamic compilation. \nThe dynamically compiled assemblies are stored in the Temporary ASP.NET files directory.\nHowever, files in this directory are not automatically removed and may build up over time.\nThis script will clean out all files in this directory.\nYou should note that this may cause running websites to be restarted.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "FrameworkVersion",
+      "Label": "Framework version",
+      "HelpText": "This is the framework version to target. \nSpecifying `All` will clean out the temp files for each installed version of the framework.\nIf you need to target a specific version, you can specify either the bit-ness, version or both.\n\nExample values:\n`Framework`\n`Framework64`\n`v4`\n`v2.0.50727`\n`v2.0.50727`\n`Framework\\v4.0.30319`\n`Framework64\\v4.0.30319`\n`Framework64\\v2`\n\nSpecifying a bit-ness value will match all versions.\nSpecifying only a version will match that version regarless of bit-ness.\nA fully specified framework version will match only that value.",
+      "DefaultValue": "All",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DaysToKeep",
+      "Label": "Days to keep",
+      "HelpText": "Number of days since last write time to keep temporary files.\n\nNote that this is the write time of the top level folder.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2014-08-24T22:12:29.8990000-07:00",
+  "LastModifiedBy": "Lavinski",
+  "$Meta": {
+    "ExportedAt": "2014-08-24T22:12:40.7500000-07:00",
+    "OctopusVersion": "2.4.0.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-clean-asp-net-temp-files/scriptbody.ps1 b/src/step-templates/file-system-clean-asp-net-temp-files/scriptbody.ps1
new file mode 100644
index 000000000..ef77878f9
--- /dev/null
+++ b/src/step-templates/file-system-clean-asp-net-temp-files/scriptbody.ps1
@@ -0,0 +1,133 @@
+# Running outside octopus
+param(
+	[string]$frameworkVersion,
+	[int]$daysToKeep,
+	[switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+	$result = $null
+	
+	if ($OctopusParameters -ne $null) {
+		$result = $OctopusParameters[$Name]
+	}
+
+	if ($result -eq $null) {
+		$variable = Get-Variable $Name -EA SilentlyContinue	
+		if ($variable -ne $null) {
+			$result = $variable.Value
+		}
+	}
+	
+	if ($result -eq $null) {
+		if ($Required) {
+			throw "Missing parameter value $Name"
+		} else {
+			$result = $Default
+		}
+	}
+
+	return $result
+}
+
+function RemoveSafely-Item($folder, $Old, [switch]$whatIf) {
+	
+	if ($folder.LastWriteTime -lt $old) {
+		
+		try {
+			Write-Host "Removing: $($folder.FullName)"
+			$folder | Remove-Item -Recurse -Force -WhatIf:$whatIf -EA Stop
+		} catch {
+			$message = $_.Exception.Message
+			Write-Host "Info: Could not remove $itemName. $message"
+		}
+	}
+}
+
+& {
+	param(
+		[string]$frameworkVersion,
+		[int]$daysToKeep
+	) 
+
+	Write-Host "Cleaning Temporary ASP.NET files directory"
+	
+	if ([string]::IsNullOrEmpty($frameworkVersion)) {
+		throw "You need to specify the frameworkVersion parameter"
+	}
+	
+	Write-Host "FrameworkVersion: $frameworkVersion"
+	
+	$dotnetPath = [System.Runtime.InteropServices.RuntimeEnvironment]::GetRuntimeDirectory() | Split-Path | Split-Path
+	$bitnessValues = @("Framework", "Framework64")
+	$versionStart = "v"
+	$versionFilter = "$versionStart"
+	$tempDir = "Temporary ASP.NET Files"
+	
+	$directoriesToClean = @()
+	
+	if ($frameworkVersion -ne "All") {
+	
+		# Starts with v
+		if ($frameworkVersion.StartsWith($versionStart, "CurrentCultureIgnoreCase")) {
+			$versionFilter = $frameworkVersion
+			if ($frameworkVersion -contains "\") {
+				throw "Framework version cannot contain '\'"
+			}
+		} else {
+		
+			# Includes one \
+			$firstSlash = $frameworkVersion.IndexOf("\")
+			
+			$NotAVersion = -1
+			if ($firstSlash -eq $NotAVersion) {
+				$bitnessValues = @($frameworkVersion)
+			} else {
+			
+				$secondSlash = $frameworkVersion.IndexOf("\", $firstSlash)
+				
+				$NoExtraSlash = -1
+				if ($secondSlash -ne $NoExtraSlash) {
+					
+					$bitnessValues = @($frameworkVersion | Split-Path)
+					$versionFilter = @($frameworkVersion | Split-Path -Leaf)
+
+				} else {
+					throw "Includes more than one '\'"
+				}
+			}
+		}
+	}
+	
+	if (!$versionFilter.StartsWith($versionStart, "CurrentCultureIgnoreCase")) {
+		throw "Version filter must start with '$versionStart'"
+	}
+	
+	foreach ($bitness in $bitnessValues) {
+		$fvPath = (Join-Path $dotnetPath $bitness)
+		if (Test-Path $fvPath) {
+			$directoriesToClean += (ls $fvPath -Filter "$versionFilter*")
+		}
+	}
+	
+	foreach ($dir in $directoriesToClean) {
+		$fullTempPath = Join-Path $dir.FullName $tempDir
+		
+		if (Test-Path $fullTempPath) {
+			$virtualDirectories = ls $fullTempPath
+			foreach ($virtualPathDir in $virtualDirectories) {
+				$old = (Get-Date).AddDays(-$daysToKeep)
+				
+				foreach ($siteDir in (Get-ChildItem $virtualPathDir.FullName)) {
+					RemoveSafely-Item $siteDir $old -WhatIf:$whatIf
+				}
+			}
+		}
+	}
+	
+ } `
+ (Get-Param 'frameworkVersion' -Required) `
+ (Get-Param 'daysToKeep' -Default 30) 
+ 
\ No newline at end of file
diff --git a/src/step-templates/file-system-clean-configuration-transforms/metadata.json b/src/step-templates/file-system-clean-configuration-transforms/metadata.json
new file mode 100644
index 000000000..d48a25eb7
--- /dev/null
+++ b/src/step-templates/file-system-clean-configuration-transforms/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "9a2b84db-2940-4d9a-b61f-c82df35cee6c",
+  "Name": "File System - Clean Configuration Transforms",
+  "Description": "Clean out configuration transform files from the installation directory after a deployment (e.g. Web.Release.config, YourApp.Production.config, etc.).",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "PathToClean",
+      "Label": "Path to clean",
+      "HelpText": "The path to clean.\n\nUsually you would set this to `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "EnvironmentName",
+      "Label": "Environment Name",
+      "HelpText": "If you want to nuke all config files i.e. `*.*.config` then leave with the default value `*`.\n\nOtherwise to just nuke `*.EnvironmentName.config` then set as the environment name: `#{Octopus.Environment.Name}`",
+      "DefaultValue": "*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-01-12T07:51:40.8890000-08:00",
+  "LastModifiedBy": "boro2g",
+  "$Meta": {
+    "ExportedAt": "2016-01-21T07:39:24.5270000-08:00",
+    "OctopusVersion": "3.1.4",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-clean-configuration-transforms/scriptbody.ps1 b/src/step-templates/file-system-clean-configuration-transforms/scriptbody.ps1
new file mode 100644
index 000000000..95057e8a1
--- /dev/null
+++ b/src/step-templates/file-system-clean-configuration-transforms/scriptbody.ps1
@@ -0,0 +1,74 @@
+# Running outside Octopus Deploy
+param(
+    [string]$pathToClean,
+    [string]$environmentName,
+    [switch]$whatIf
+)
+
+function GetParam($Name, [switch]$Required) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($Required -and [string]::IsNullOrEmpty($result)) {
+        throw "Missing parameter value $Name"
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$pathToClean,
+        [string]$environmentName
+    )
+
+    Write-Host "Cleaning Configuration Transform files from $pathToClean and environment: $environmentName"
+
+    if (Test-Path $pathToClean) {
+        Write-Host "Scanning directory $pathToClean"
+        $regexFilter = "*.$environmentName.config" 
+        Write-Host "Filter $regexFilter"
+
+        if ($pathToClean -eq "\" -or $pathToClean -eq "/") {
+            throw "Cannot clean root directory"
+        }
+
+        $filesToDelete = Get-ChildItem $pathToClean -Filter $regexFilter -Recurse | `
+                         Where-Object {!$_.PsIsContainer -and ($_.Name -NotMatch "((?i)(^.*\.exe\.config$|.*\.dll\.config$)$)")}
+
+        if (!$filesToDelete -or $filesToDelete.Count -eq 0) {
+            Write-Warning "There were no files matching the criteria"
+        } else {
+
+            Write-Host "Deleting files"
+            if ($whatIf) {
+                Write-Host "What if: Performing the operation `"Remove File`" on targets"
+            }
+
+            foreach ($file in $filesToDelete)
+            {
+                Write-Host "Deleting file $($file.FullName)"
+                
+                if (!$whatIf) {
+                    Remove-Item $file.FullName -Force
+                }
+            }
+        }
+
+    } else {
+        Write-Warning "Could not locate path `"$pathToClean`""
+    }
+
+} `
+(GetParam 'PathToClean' -Required) `
+(GetParam 'EnvironmentName' -Required)
diff --git a/src/step-templates/file-system-clean-directory/metadata.json b/src/step-templates/file-system-clean-directory/metadata.json
new file mode 100644
index 000000000..29ce536fb
--- /dev/null
+++ b/src/step-templates/file-system-clean-directory/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "e56aafe2-0d59-453b-9449-d7384914468d",
+  "Name": "File System - Clean Directory",
+  "Description": "Clean out unwanted files from the installation directory after a deployment.",
+  "ActionType": "Octopus.Script",
+  "Version": 27,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "PathsToClean",
+      "Label": "Paths to clean",
+      "HelpText": "A semicolon-separated list of paths to clean.\n\nUsually you would set this to `Octopus.Action[StepName].Output.Package.InstallationDirectoryPath`.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "CleanInclude",
+      "Label": "Files to remove",
+      "HelpText": "A semicolon-separated list of path expressions that match files to be removed.\n\nExamples:  \n\n    - *.jpg\n    - web.*.config\n    - **\\*.dll\n    - \\Logs\\**\\*.txt\n    - web.*.config;*.txt\n\n`\\**\\` denotes a recursive search",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "CleanIgnore",
+      "Label": "Files to ignore",
+      "HelpText": "A semicolon-separated list of path expressions that will be not be removed.\n\nExamples:  \n\n    - web.log4net.config\n    - img\\needed.jpg\n    - **\\*.dll\n    - web.config;Release Notes.txt\n\n`\\**\\` denotes a recursive search",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-08-19T23:59:52.5790000-07:00",
+    "OctopusVersion": "2.4.0.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-clean-directory/scriptbody.ps1 b/src/step-templates/file-system-clean-directory/scriptbody.ps1
new file mode 100644
index 000000000..89e14c730
--- /dev/null
+++ b/src/step-templates/file-system-clean-directory/scriptbody.ps1
@@ -0,0 +1,141 @@
+# Running outside octopus
+param(
+	[string]$cleanInclude,
+	[string]$cleanIgnore,
+	[string]$pathsToClean,
+	[switch]$whatIf
+) 
+
+function ExpandPathExpressions($workingDirectory, $fileExpressionList) {
+	return @($fileExpressionList.Split(@(";"), "RemoveEmptyEntries")) | 
+	% { $_.Trim() } |
+	% { ExpandPathExpression $workingDirectory $_ }
+}
+
+function ExpandPathExpression($workingDirectory, $FileExpression) {
+
+	# \**\ denotes a recursive search
+	$recurse = "**"
+
+	# Scope the clean!
+	$fileExpression = Join-Path $workingDirectory $fileExpression
+
+	$headSegments = Split-Path $fileExpression
+	$lastSegment = Split-Path $fileExpression -Leaf
+	$secondLastSegment = $(if($headSegments -ne "") {Split-Path $headSegments -Leaf} else {$null}) 
+
+	$path = "\"
+	$recursive = $false
+	$filter = "*"
+	
+	if ($lastSegment -eq $recurse) {	
+	
+		$path = $headSegments
+		$recursive = $true
+		
+	} elseif ($secondLastSegment -eq $recurse) {
+		
+		$path = Split-Path $headSegments
+		$recursive = $true
+		$filter = $lastSegment	
+	
+	} else {
+		
+		$path = $headSegments
+		$filter = $lastSegment 
+	}
+
+	return Get-ChildItem -Path $path -Filter $filter -Recurse:$recursive | ? { !$_.PSIsContainer }
+}
+
+function GetParam($Name, [switch]$Required) {
+	$result = $null
+	
+	if ($OctopusParameters -ne $null) {
+		$result = $OctopusParameters[$Name]
+	}
+
+	if ($result -eq $null) {
+		$variable = Get-Variable $Name -EA SilentlyContinue	
+		if ($variable -ne $null) {
+			$result = $variable.Value
+		}
+	}
+	
+	if ($Required -and $result -eq $null) {
+		throw "Missing parameter value $Name"
+	}
+	
+	return $result
+}
+
+& {
+	param(
+		[string]$cleanInclude,
+		[string]$cleanIgnore,
+		[string]$pathsToClean
+	) 
+
+	Write-Host "Cleaning files from installation directory"
+	Write-Host "Include: $cleanInclude"
+	Write-Host "Ignore: $cleanIgnore"
+	Write-Host "Paths To Clean: $pathsToClean"
+	
+	if (!$cleanInclude) {
+		throw "You must specify files to include"
+	}
+	
+	if (!$pathsToClean) {
+		throw "You must specify the paths to clean"
+	}
+	
+	$paths = @($pathsToClean.Split(@(";"), "RemoveEmptyEntries")) | 
+	% { $_.Trim() }
+	
+	foreach ($pathToClean in $paths) {
+		
+		if (Test-Path $pathToClean) {
+			Write-Host "Scanning directory $pathToClean"
+			
+			if ($pathToClean -eq "\" -or $pathToClean -eq "/") {
+				throw "Cannot clean root directory"
+			}
+			
+			cd $pathToClean
+			
+			$include = ExpandPathExpressions $pathToClean $cleanInclude
+			$exclude = ExpandPathExpressions $pathToClean $cleanIgnore
+			
+			if ($include -eq $null -or $exclude -eq $null) {
+				$deleteSet = $include
+			} else {
+				$exclude = $exclude | % {$_}
+				$deleteSet = Compare-Object $include $exclude | ? { $_.SideIndicator -eq "<=" } | % { $_.InputObject }
+			}
+			
+			if (!$deleteSet -or $deleteSet.Count -eq 0) {
+				Write-Warning "There were no files matching the criteria"
+			} else {
+				
+				Write-Host "Deleting files"
+				if ($whatIf) {
+					Write-Host "What if: Performing the operation `"Remove File`" on targets"
+				}
+				
+				$deleteSet | Write-Host
+				
+				if (!$whatIf) {
+					$deleteSet | % { $_.FullName } | Remove-Item -Force -Recurse -WhatIf:$whatIf
+				}
+			}
+		
+		} else {
+			
+			Write-Warning "Could not locate path `"$pathToClean`""
+		}
+	}
+ } `
+ (GetParam 'CleanInclude' -Required) `
+ (GetParam 'CleanIgnore') `
+ (GetParam 'PathsToClean')
+ 
\ No newline at end of file
diff --git a/step-templates/file-system-combine-files.json b/src/step-templates/file-system-combine-files/metadata.json
similarity index 56%
rename from step-templates/file-system-combine-files.json
rename to src/step-templates/file-system-combine-files/metadata.json
index 74cab7034..dec1bd4fc 100644
--- a/step-templates/file-system-combine-files.json
+++ b/src/step-templates/file-system-combine-files/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$sourceDirectoryPath = $OctopusParameters[\"CombineFiles.Directory.Source\"]\n$sourceDirectoryPackagePath = $OctopusParameters[\"CombineFiles.Directory.PackageSource\"]\n$sourceDirectoryFilter = $OctopusParameters[\"CombineFiles.Directory.Filter\"]\n$destinationFile = $OctopusParameters[\"CombineFiles.Destination.FileName\"]\n$createArtifact = $OctopusParameters[\"CombineFiles.Destination.CreateArtifact\"]\n$commentCharacters = $OctopusParameters[\"CombineFiles.Destination.CommentCharacters\"]\n\nif ([string]::IsNullOrWhiteSpace($sourceDirectoryPackagePath) -eq $false){\n\tWrite-Host \"A previous package path was specified, grabing that\"\n\t$sourceDirectory = $OctopusParameters[\"Octopus.Action[$sourceDirectoryPackagePath].Output.Package.InstallationDirectoryPath\"]\n    $sourceDirectory = \"$sourceDirectory\\$sourceDirectoryPath\"\n}\nelse {\n\t$sourceDirectory = \"$sourceDirectoryPath\"\n}\n\nWrite-Host \"Source Directory: $sourceDirectory\"\nWrite-Host \"Source File Filter: $sourceDirectoryFilter\"\nWrite-Host \"Combined File Name: $destinationFile\"\nWrite-Host \"Create Artifact: $createArtifact\"\nWrite-Host \"Comment Characters: $commentCharacters\"\n\nif ([string]::IsNullOrWhiteSpace($sourceDirectory)){\n\tthrow-exception \"The source directory variable is required.\"\n}\n\nif ((Test-Path $sourceDirectory) -eq $false){\n\tWrite-Host \"The directory $sourceDirectory was not found, skipping\"\n\texit 0\n}\n\nif ((Test-Path $destinationFile) -eq $false){\n\tWrite-Host \"Creating the file: $destinationFile\"\n\tNew-Item -Path $destinationFile -ItemType \"file\"\n}\nelse {\n\tWrite-Host \"The file $destinationFile already exists\"\n}\n\nif ([string]::IsNullOrWhiteSpace($sourceDirectoryFilter)){\n\tWrite-Host \"Source directory filter not specified, grabbing all files\"\n\t$filePath = \"$sourceDirectory\\*\"\n}\nelse {\n\tWrite-Host \"Source directory filter specified, grabbing filtered files\"\n\t$filePath = \"$sourceDirectory\\*\"\n}\n\nWrite-Host \"Getting child items using $filePath\"\n$filesToCombine = Get-ChildItem -Path $filePath -File | Sort-Object -Property Name\n\nforeach ($file in $filesToCombine)\n{\n\tWrite-Host \"Adding content to $changeScript from $file\"\n\n\tif ([string]::IsNullOrWhiteSpace($commentCharacters) -eq $false){    \n\t\tAdd-Content -Path $destinationFile -Value \"$commentCharacters Contents from $file\"\n    }\n    \n\tAdd-Content -Path $destinationFile -Value (Get-Content $file)        \n} \n\nif ($createArtifact -eq \"True\"){\t \n  New-OctopusArtifact -Path \"$destinationFile\"\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -76,7 +76,7 @@
   "LastModifiedOn": "2018-11-07T14:34Z",
   "LastModifiedBy": "octobob",
   "$Meta": {
-    "ExportedAt": "2018-10-12T18:54:49.750Z",
+    "ExportedAt": "2018-10-12T18:54:49.7500000Z",
     "OctopusVersion": "2018.8.8",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/file-system-combine-files/scriptbody.ps1 b/src/step-templates/file-system-combine-files/scriptbody.ps1
new file mode 100644
index 000000000..6589c6d11
--- /dev/null
+++ b/src/step-templates/file-system-combine-files/scriptbody.ps1
@@ -0,0 +1,65 @@
+$sourceDirectoryPath = $OctopusParameters["CombineFiles.Directory.Source"]
+$sourceDirectoryPackagePath = $OctopusParameters["CombineFiles.Directory.PackageSource"]
+$sourceDirectoryFilter = $OctopusParameters["CombineFiles.Directory.Filter"]
+$destinationFile = $OctopusParameters["CombineFiles.Destination.FileName"]
+$createArtifact = $OctopusParameters["CombineFiles.Destination.CreateArtifact"]
+$commentCharacters = $OctopusParameters["CombineFiles.Destination.CommentCharacters"]
+
+if ([string]::IsNullOrWhiteSpace($sourceDirectoryPackagePath) -eq $false){
+	Write-Host "A previous package path was specified, grabing that"
+	$sourceDirectory = $OctopusParameters["Octopus.Action[$sourceDirectoryPackagePath].Output.Package.InstallationDirectoryPath"]
+    $sourceDirectory = "$sourceDirectory\$sourceDirectoryPath"
+}
+else {
+	$sourceDirectory = "$sourceDirectoryPath"
+}
+
+Write-Host "Source Directory: $sourceDirectory"
+Write-Host "Source File Filter: $sourceDirectoryFilter"
+Write-Host "Combined File Name: $destinationFile"
+Write-Host "Create Artifact: $createArtifact"
+Write-Host "Comment Characters: $commentCharacters"
+
+if ([string]::IsNullOrWhiteSpace($sourceDirectory)){
+	throw-exception "The source directory variable is required."
+}
+
+if ((Test-Path $sourceDirectory) -eq $false){
+	Write-Host "The directory $sourceDirectory was not found, skipping"
+	exit 0
+}
+
+if ((Test-Path $destinationFile) -eq $false){
+	Write-Host "Creating the file: $destinationFile"
+	New-Item -Path $destinationFile -ItemType "file"
+}
+else {
+	Write-Host "The file $destinationFile already exists"
+}
+
+if ([string]::IsNullOrWhiteSpace($sourceDirectoryFilter)){
+	Write-Host "Source directory filter not specified, grabbing all files"
+	$filePath = "$sourceDirectory\*"
+}
+else {
+	Write-Host "Source directory filter specified, grabbing filtered files"
+	$filePath = "$sourceDirectory\*"
+}
+
+Write-Host "Getting child items using $filePath"
+$filesToCombine = Get-ChildItem -Path $filePath -File | Sort-Object -Property Name
+
+foreach ($file in $filesToCombine)
+{
+	Write-Host "Adding content to $changeScript from $file"
+
+	if ([string]::IsNullOrWhiteSpace($commentCharacters) -eq $false){    
+		Add-Content -Path $destinationFile -Value "$commentCharacters Contents from $file"
+    }
+    
+	Add-Content -Path $destinationFile -Value (Get-Content $file)        
+} 
+
+if ($createArtifact -eq "True"){	 
+  New-OctopusArtifact -Path "$destinationFile"
+}
\ No newline at end of file
diff --git a/src/step-templates/file-system-copy-file/metadata.json b/src/step-templates/file-system-copy-file/metadata.json
new file mode 100644
index 000000000..0f3e15fa4
--- /dev/null
+++ b/src/step-templates/file-system-copy-file/metadata.json
@@ -0,0 +1,46 @@
+{
+  "Id": "072c2939-2c77-4ed1-abd2-e41cb8a57661",
+  "Name": "File System - Copy File",
+  "Description": "Copies a file in the file system.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "80271c96-5190-4cc6-93c0-6e28c4aba6f1",
+      "Name": "sourcePath",
+      "Label": "File source path",
+      "HelpText": "The full path of the file you wish to copy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "702e4cfd-6633-4206-94df-8fa4fa47e564",
+      "Name": "destinationPath",
+      "Label": "File destionation path",
+      "HelpText": "The full path for the destination of the file. You can rename the file by giving it a new name in the path. If the file already exists at the destination it is overwritten.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2018-03-16T12:58:03.4010000Z",
+  "LastModifiedBy": "Jens-H-Eriksen",
+  "$Meta": {
+    "ExportedAt": "2018-03-16T12:58:03.4010000Z",
+    "OctopusVersion": "2018.2.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-copy-file/scriptbody.ps1 b/src/step-templates/file-system-copy-file/scriptbody.ps1
new file mode 100644
index 000000000..e23d9e08d
--- /dev/null
+++ b/src/step-templates/file-system-copy-file/scriptbody.ps1
@@ -0,0 +1,69 @@
+function Test-FileLocked([string]$filePath)
+{
+  $fileExists = Test-Path -Path $filePath
+  if (!$fileExists)
+  {
+    return (1 -eq 0) #false
+  }
+  Rename-Item $filePath $filePath -ErrorVariable errs -ErrorAction SilentlyContinue
+  return ($errs.Count -ne 0)
+}
+
+function Wait-ForFileUnlock([string]$filePath)
+{ 
+  Write-Host "Destinationfile at $filePath is locked"
+    
+  for ($attemptNo = 1; $attemptNo -lt 6; $attemptNo++) {
+    Write-Host "Waiting for the file to become unlocked $attemptNo/5"
+
+    Start-Sleep -Seconds 10
+
+    $fileIsLocked = Test-FileLocked($filePath)
+
+    if (!$fileIsLocked)
+    {
+      return
+    }
+
+    if ($attemptNo -eq 5) {
+      Write-Error "destinationfile at location $filePath is locked and cannot be overwritten."
+
+      return
+    }
+  }
+}
+
+#
+#script starts here
+#
+
+$filePath = $OctopusParameters['sourcePath']
+$newFilePath = $OctopusParameters['destinationPath']
+
+$fileExists = Test-Path -Path $filePath
+
+if (!$fileExists)
+{
+  Write-Error "Sourcefile not found at $filePath"
+
+  return
+}
+
+$fileIsLocked = Test-FileLocked($newFilePath)
+
+
+if ($fileIsLocked)
+{
+  Wait-ForFileUnlock($newFilePath)
+}
+
+
+$fileIsLocked = Test-FileLocked($newFilePath)
+if ($fileIsLocked)
+{
+    return
+}
+
+Copy-Item -Path $filePath -Destination $newFilePath -Force
+
+Write-Host "Successfully copied file at location: $filePath to $newFilePath"
\ No newline at end of file
diff --git a/step-templates/file-system-create-file.json b/src/step-templates/file-system-create-file/metadata.json
similarity index 78%
rename from step-templates/file-system-create-file.json
rename to src/step-templates/file-system-create-file/metadata.json
index 2a537d94d..95ce918c1 100644
--- a/step-templates/file-system-create-file.json
+++ b/src/step-templates/file-system-create-file/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$filePath = $OctopusParameters['FilePath']\n$fileContent = $OctopusParameters['FileContent']\n$encoding = $OctopusParameters['Encoding']\n\nNew-Item -ItemType file -Path $filePath -Value '' -force\n\nif(![string]::IsNullOrEmpty($fileContent))\n{\n  Set-Content -path $filePath -value $fileContent -encoding $encoding\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -42,10 +42,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2017-04-28T10:48:34.361Z",
+  "LastModifiedOn": "2017-04-28T10:48:34.3610000Z",
   "LastModifiedBy": "carlpett",
   "$Meta": {
-    "ExportedAt": "2017-04-28T10:48:34.361Z",
+    "ExportedAt": "2017-04-28T10:48:34.3610000Z",
     "OctopusVersion": "3.11.15",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/file-system-create-file/scriptbody.ps1 b/src/step-templates/file-system-create-file/scriptbody.ps1
new file mode 100644
index 000000000..8013e7165
--- /dev/null
+++ b/src/step-templates/file-system-create-file/scriptbody.ps1
@@ -0,0 +1,10 @@
+$filePath = $OctopusParameters['FilePath']
+$fileContent = $OctopusParameters['FileContent']
+$encoding = $OctopusParameters['Encoding']
+
+New-Item -ItemType file -Path $filePath -Value '' -force
+
+if(![string]::IsNullOrEmpty($fileContent))
+{
+  Set-Content -path $filePath -value $fileContent -encoding $encoding
+}
\ No newline at end of file
diff --git a/src/step-templates/file-system-create-folder/metadata.json b/src/step-templates/file-system-create-folder/metadata.json
new file mode 100644
index 000000000..a25afc583
--- /dev/null
+++ b/src/step-templates/file-system-create-folder/metadata.json
@@ -0,0 +1,66 @@
+{
+  "Id": "b7211497-59ea-41e9-b466-c9a46b4c76b3",
+  "Name": "File System - Create Folder",
+  "Description": "Creates a folder structure that is passed in.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "FolderPath",
+      "Label": "The folder path to create on the filesystem.",
+      "HelpText": "The entire path to the folder, this step will also created nested folders.  For example \"D:\\one\\two\" will create two folders ('one', and then 'two' under folder 'one').  This script will not remove items from the folders.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "becbcbd1-7026-40f0-a655-eb5861d53557",
+      "Name": "ReadPermissionsTo",
+      "Label": "Read Users",
+      "HelpText": "A comma separated list of users to grant read permissions to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "029ea466-4907-460a-a3f4-c00b23ad1a96",
+      "Name": "WritePermissionsTo",
+      "Label": "Write Users",
+      "HelpText": "A comma separated list of users to grant write permissions to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "860e0480-db8d-4669-9b25-00f1ce33d0ac",
+      "Name": "ModifyPermissionsTo",
+      "Label": "Modify Users",
+      "HelpText": "A comma separated list of users to grant modify permissions to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2017-04-05T12:30:02.1270000Z",
+    "OctopusVersion": "3.4.11",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-create-folder/scriptbody.ps1 b/src/step-templates/file-system-create-folder/scriptbody.ps1
new file mode 100644
index 000000000..16c73cac8
--- /dev/null
+++ b/src/step-templates/file-system-create-folder/scriptbody.ps1
@@ -0,0 +1,75 @@
+$item = $OctopusParameters['FolderPath']
+$readPermissionsTo = $OctopusParameters['ReadPermissionsTo']
+$writePermissionsTo = $OctopusParameters['WritePermissionsTo']
+$modifyPermissionsTo = $OctopusParameters['ModifyPermissionsTo']
+
+
+Write-Host "Creating folder $item with permissions."
+
+if((Test-Path $item))
+{
+    Write-Host "Folder $item already exists"
+}
+else
+{
+    New-Item -ItemType directory -Path $item -force
+}
+
+# Check item exists
+if(!(Test-Path $item))
+{
+    throw "$item does not exist"
+}
+
+# Assign read permissions
+
+if($readPermissionsTo)
+{
+    $users = $readPermissionsTo.Split(",")
+    foreach($user in $users)
+    {
+        Write-Host "Adding read permissions for $user"
+        $acl = Get-Acl $item
+        $acl.SetAccessRuleProtection($False, $False)
+        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(
+                $user, "Read", "ContainerInherit, ObjectInherit", "None", "Allow")
+        $acl.AddAccessRule($rule)
+        Set-Acl $item $acl
+    }
+}
+
+# Assign write permissions
+
+if($writePermissionsTo)
+{
+    $users = $writePermissionsTo.Split(",")
+    foreach($user in $users)
+    {
+        Write-Host "Adding write permissions for $user"
+        $acl = Get-Acl $item
+        $acl.SetAccessRuleProtection($False, $False)
+        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(
+                $user, "Write", "ContainerInherit, ObjectInherit", "None", "Allow")
+        $acl.AddAccessRule($rule)
+        Set-Acl $item $acl
+    }
+}
+
+# Assign modify permissions
+
+if($modifyPermissionsTo)
+{
+    $users = $modifyPermissionsTo.Split(",")
+    foreach($user in $users)
+    {
+        Write-Host "Adding modify permissions for $user"
+        $acl = Get-Acl $item
+        $acl.SetAccessRuleProtection($False, $False)
+        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(
+                $user, "Modify", "ContainerInherit, ObjectInherit", "None", "Allow")
+        $acl.AddAccessRule($rule)
+        Set-Acl $item $acl
+    }
+}
+
+Write-Host "Complete"
\ No newline at end of file
diff --git a/src/step-templates/file-system-create-folders/metadata.json b/src/step-templates/file-system-create-folders/metadata.json
new file mode 100644
index 000000000..d1c64f598
--- /dev/null
+++ b/src/step-templates/file-system-create-folders/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "7eaad6c2-fd5c-40a4-b880-350c983dc51d",
+  "Name": "File System - Create Folders",
+  "Description": "Ensure/Create multiple folders separated by ;",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "FolderPaths",
+      "Label": "Folder Paths",
+      "HelpText": "A list of folders to create separated by a ;",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "ContinueOnError",
+      "Label": "Continue On Error",
+      "HelpText": "When this is selected the script will log failures but continue and succeed in octopus.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-07-02T06:40:37.5230000-07:00",
+  "LastModifiedBy": "jbennett",
+  "$Meta": {
+    "ExportedAt": "2015-07-02T06:47:00.3050000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-create-folders/scriptbody.ps1 b/src/step-templates/file-system-create-folders/scriptbody.ps1
new file mode 100644
index 000000000..7b3d5d9c0
--- /dev/null
+++ b/src/step-templates/file-system-create-folders/scriptbody.ps1
@@ -0,0 +1,70 @@
+# Running outside octopus
+param(
+    [string]$FolderPaths,
+    [string]$ContinueOnError
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$FolderPaths,
+        [string]$ContinueOnError
+    ) 
+
+    Write-Host "File System - Create Folders"
+    Write-Host "FolderPaths: $FolderPaths"
+    
+    $isContinueOnError = $ContinueOnError.ToLower() -match "(y|yes|true)"
+
+    $FolderPaths.Split(";") | ForEach {
+        $path = $_.Trim()
+
+        if($path.Length -lt 1){
+            break;
+        }
+
+        Write-Host "Trying to ensure directory structure for $path."
+        try {
+            $newFolder = New-Item -ItemType directory -Path $path -force
+            Write-Host "SUCCESS" -ForegroundColor Green
+        } catch {
+            $errorMessage = "FAILED - $_.Exception.Message"
+            
+            if($isContinueOnError){
+                Write-Host $errorMessage  -ForegroundColor Red
+            } else {
+                throw $errorMessage
+            }
+        }
+        
+    }
+
+ } `
+ (Get-Param 'FolderPaths' -Required) `
+ (Get-Param 'ContinueOnError')
\ No newline at end of file
diff --git a/src/step-templates/file-system-create-symlink/metadata.json b/src/step-templates/file-system-create-symlink/metadata.json
new file mode 100644
index 000000000..32d9d0d35
--- /dev/null
+++ b/src/step-templates/file-system-create-symlink/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "f0cae939-caef-4979-93ac-6c9b3a3c4986",
+  "Name": "File System - Create Symlink",
+  "Description": "Creates a Symbolic Link",
+  "ActionType": "Octopus.Script",
+  "Version": 23,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "link_path",
+      "Label": "LinkPath",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "target_path",
+      "Label": "TargetPath",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2014-08-26T08:58:31.6230000-07:00",
+  "LastModifiedBy": "diegoavanzini",
+  "$Meta": {
+    "ExportedAt": "2014-08-26T08:58:34.2420000-07:00",
+    "OctopusVersion": "2.5.7.384",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-create-symlink/scriptbody.ps1 b/src/step-templates/file-system-create-symlink/scriptbody.ps1
new file mode 100644
index 000000000..1f8086388
--- /dev/null
+++ b/src/step-templates/file-system-create-symlink/scriptbody.ps1
@@ -0,0 +1,83 @@
+function New-Symlink {
+    <#
+    .SYNOPSIS
+        Creates a symbolic link.
+    #>
+    param (
+        [Parameter(Position=0, Mandatory=$true)]
+        [string] $Link,
+        [Parameter(Position=1, Mandatory=$true)]
+        [string] $Target
+    )
+
+    Write-Host "New-Symlink $Link to $Target"
+    
+    Invoke-MKLINK -Link $Link -Target $Target
+}
+
+function Invoke-MKLINK {
+    <#
+    .SYNOPSIS
+        Creates a symbolic link.
+    #>
+    param (
+        [Parameter(Position=0, Mandatory=$true)]
+        [string] $Link,
+        [Parameter(Position=1, Mandatory=$true)]
+        [string] $Target
+    )
+    
+    # Resolve the paths incase a relative path was passed in.
+    $Link = (Force-Resolve-Path $Link)
+    $Target = (Force-Resolve-Path $Target)
+
+    # Ensure target exists.
+    if (-not(Test-Path $Target)) {
+        throw "Target does not exist.`nTarget: $Target"
+    }
+
+    # Ensure link does not exist.
+    if (Test-Path $Link) {
+        Write-Host "A file or directory already exists at the link path.`nLink: $Link"
+        return
+    }
+
+    $isDirectory = (Get-Item $Target).PSIsContainer
+
+    # Capture the MKLINK output so we can return it properly.
+    # Includes a redirect of STDERR to STDOUT so we can capture it as well.
+    $output = cmd /c mklink /D `"$Link`" `"$Target`" 2>&1
+    
+    Write-Host "output : $output"
+    if ($lastExitCode -ne 0) {
+        Write-Host "MKLINK failed. Exit code: $lastExitCode`n$output"
+        throw "MKLINK failed. Exit code: $lastExitCode`n$output"
+    }
+    else {
+        Write-Output $output
+    }
+}
+
+function Force-Resolve-Path {
+    <#
+    .SYNOPSIS
+        Calls Resolve-Path but works for files that don't exist.
+    .REMARKS
+        From http://devhawk.net/2010/01/21/fixing-powershells-busted-resolve-path-cmdlet/
+    #>
+    param (
+        [string] $FileName
+    )
+    
+    $FileName = Resolve-Path $FileName -ErrorAction SilentlyContinue `
+                                       -ErrorVariable _frperror
+    if (-not($FileName)) {
+        $FileName = $_frperror[0].TargetObject
+    }
+    
+    return $FileName
+}
+
+New-Symlink $link_path $target_path
+
+
diff --git a/src/step-templates/file-system-find-and-replace/metadata.json b/src/step-templates/file-system-find-and-replace/metadata.json
new file mode 100644
index 000000000..fc4a0d5b5
--- /dev/null
+++ b/src/step-templates/file-system-find-and-replace/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "87cbaa94-4477-4474-a9c3-7943b5668d30",
+  "Name": "File System - Find and Replace",
+  "Description": "Find and replace text in one or more files.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "FRCandidatePathGlobs",
+      "Label": "Files",
+      "HelpText": "The files to search. Wildcards `*` and `**` are supported. Paths must be fully-qualified, e.g. `C:\\MyApp\\**\\*.xml`. Separate multiple paths with `;` semicolons.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FRFindText",
+      "Label": "Find",
+      "HelpText": "The text to find in the target files.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FRReplaceText",
+      "Label": "Replace with",
+      "HelpText": "The replacement text to insert in place of each occurrence of _Find_.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FRIgnoreCase",
+      "Label": "Ignore case",
+      "HelpText": "If **True**, variations on the character case of _Find_ will be considered a match, for example `Bar` will match `BAR` and `bar`. If **False** only exact matches will be considered.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-13T22:38:42.0410000-07:00",
+    "OctopusVersion": "2.4.4.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-find-and-replace/scriptbody.ps1 b/src/step-templates/file-system-find-and-replace/scriptbody.ps1
new file mode 100644
index 000000000..6d4818933
--- /dev/null
+++ b/src/step-templates/file-system-find-and-replace/scriptbody.ps1
@@ -0,0 +1,67 @@
+function Execute-FindReplace($target, $find, $replace, $ignoreCase) {
+    $options = [System.Text.RegularExpressions.RegexOptions]::None
+    if ($ignoreCase) {
+        $options = [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
+    }
+    
+    Write-Output "Searching $target..."
+    $orig = [System.IO.File]::ReadAllText($target)
+    
+    $escFind = [System.Text.RegularExpressions.Regex]::Escape($find)
+    $regex = new-object System.Text.RegularExpressions.Regex($escFind, $options)
+    $removed = $regex.Replace($orig, '')
+    
+    $occurrences = ($orig.Length - $removed.Length) / $find.Length
+    if ($occurrences -gt 0) {
+        Write-Output "Found $occurrences occurrence(s), replacing..."
+        
+        $escReplace = $replace.Replace('$', '$$')
+        $replaced = $regex.Replace($orig, $escReplace)
+        [System.IO.File]::WriteAllText($target, $replaced)
+    }
+}
+
+if ([string]::IsNullOrEmpty($FRFindText)) {
+    throw "A non-empty 'Find' text block is required"
+}
+
+Write-Output "Replacing occurrences of '$FRFindText' with '$FRReplaceText'"
+if ([Boolean] $FRIgnoreCase) {
+    Write-Output "Case will be ignored"
+}
+
+$FRCandidatePathGlobs.Split(";") | foreach {
+    $glob = $_.Trim()
+    Write-Output "Searching for files that match $glob..."
+
+    $matches = $null
+    $splits = $glob.Split(@('/**/'), [System.StringSplitOptions]::RemoveEmptyEntries)
+
+    if ($splits.Length -eq 1) {
+        $splits = $glob.Split(@('\**\'), [System.StringSplitOptions]::RemoveEmptyEntries)
+    }
+    
+    if ($splits.Length -eq 1) {
+        $matches = ls $glob
+    } else {
+        if ($splits.Length -eq 2) {
+            pushd $splits[0]
+            $matches = ls $splits[1] -Recurse
+            popd
+        } else {
+            $splits
+            throw "The segment '**' can only appear once, as a directory name, in the glob expression"
+
+        }
+    }
+
+    $matches | foreach {
+        
+        $target = $_.FullName
+
+        Execute-FindReplace -target $target -find $FRFindText -replace $FRReplaceText -ignoreCase ([Boolean] $FRIgnoreCase)
+    }
+}
+
+
+Write-Output "Done."
\ No newline at end of file
diff --git a/src/step-templates/file-system-grant-permissions/metadata.json b/src/step-templates/file-system-grant-permissions/metadata.json
new file mode 100644
index 000000000..9c6608fda
--- /dev/null
+++ b/src/step-templates/file-system-grant-permissions/metadata.json
@@ -0,0 +1,71 @@
+{
+  "Id": "b77d55ae-7f54-45ab-ba57-7afff97c93a2",
+  "Name": "File System - Grant Permissions",
+  "Description": "Grant read, write and modify permissions to folders or files",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "e67e2b43-b1e4-482d-bb5d-e4b6acb2b90f",
+      "Name": "Items",
+      "Label": "Items",
+      "HelpText": "A comma seperated list of full paths to the files or folders",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b830e92e-ceaa-472e-b1ac-e70a19d9386b",
+      "Name": "ReadPermissionsTo",
+      "Label": "Read Users",
+      "HelpText": "A comma separated list of users to grant read permissions to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "141f465e-6998-4715-be65-6d5df2604239",
+      "Name": "WritePermissionsTo",
+      "Label": "Write Users",
+      "HelpText": "A comma separated list of users to grant write permissions to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c150331e-ea88-4170-8bca-52a8cfd30220",
+      "Name": "ModifyPermissionsTo",
+      "Label": "Modify Users",
+      "HelpText": "A comma separated list of users to grant modify permissions to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2017-10-26T07:11:38.8510000Z",
+  "LastModifiedBy": "mcfozzy",
+  "$Meta": {
+    "ExportedAt": "2017-10-26T07:11:38.8510000Z",
+    "OctopusVersion": "3.15.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-grant-permissions/scriptbody.ps1 b/src/step-templates/file-system-grant-permissions/scriptbody.ps1
new file mode 100644
index 000000000..0f641e6f0
--- /dev/null
+++ b/src/step-templates/file-system-grant-permissions/scriptbody.ps1
@@ -0,0 +1,89 @@
+$itemsParameter = $OctopusParameters['Items']
+$readPermissionsTo = $OctopusParameters['ReadPermissionsTo']
+$writePermissionsTo = $OctopusParameters['WritePermissionsTo']
+$modifyPermissionsTo = $OctopusParameters['ModifyPermissionsTo']
+
+if($readPermissionsTo)
+{
+    $readUsers = $readPermissionsTo.Split(",")
+}
+
+if($writePermissionsTo)
+{
+    $writeUsers = $writePermissionsTo.Split(",")
+}
+
+if($modifyPermissionsTo)
+{
+    $modifyUsers = $modifyPermissionsTo.Split(",")
+}
+
+$items = $itemsParameter.Split(",")
+foreach($item in $items) 
+{
+    # Check path exists
+    if(!(Test-Path $item))
+    {
+        throw "$item does not exist"
+    }
+
+    Write-Host "Path: $item"
+    # Assign read permissions
+    foreach($user in $readUsers)
+    {
+        Write-Host "  Adding read permissions for $user"
+        $acl = (Get-Item $item).GetAccessControl('Access')
+        $acl.SetAccessRuleProtection($False, $False)
+        $rule = 
+            if ($acl -is [System.Security.AccessControl.DirectorySecurity])
+                {
+                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, "Read", "ContainerInherit, ObjectInherit", "None", "Allow")
+                }
+                else
+                {
+                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, "Read", "Allow")
+                }
+        $acl.AddAccessRule($rule)
+        Set-Acl $item $acl
+    }
+
+    # Assign write permissions
+    foreach($user in $writeUsers)
+    {
+        Write-Host "  Adding write permissions for $user"
+        $acl = (Get-Item $item).GetAccessControl('Access')
+        $acl.SetAccessRuleProtection($False, $False)
+        $rule = 
+            if ($acl -is [System.Security.AccessControl.DirectorySecurity])
+                {
+                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, "Write", "ContainerInherit, ObjectInherit", "None", "Allow")
+                }
+                else
+                {
+                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, "Write", "Allow")
+                }
+        $acl.AddAccessRule($rule)
+        Set-Acl $item $acl
+    }
+
+    # Assign modify permissions
+    foreach($user in $modifyUsers)
+    {
+        Write-Host "  Adding modify permissions for $user"
+        $acl = (Get-Item $item).GetAccessControl('Access')
+        $acl.SetAccessRuleProtection($False, $False)
+        $rule = 
+            if ($acl -is [System.Security.AccessControl.DirectorySecurity])
+                {
+                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, "Modify", "ContainerInherit, ObjectInherit", "None", "Allow")
+                }
+                else
+                {
+                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, "Modify", "Allow")
+                }
+        $acl.AddAccessRule($rule)
+        Set-Acl $item $acl
+    }
+}
+
+Write-Host "Complete"
diff --git a/src/step-templates/file-system-regular-expression-find-and-replace/metadata.json b/src/step-templates/file-system-regular-expression-find-and-replace/metadata.json
new file mode 100644
index 000000000..96e504921
--- /dev/null
+++ b/src/step-templates/file-system-regular-expression-find-and-replace/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "0bef8c07-5739-4030-8c04-287ceeb51153",
+  "Name": "File System - Regular Expression Find and Replace (Updated)",
+  "Description": "Find and replace text matching a regular expression in one or more files. Now with working $ replacement.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "RFRCandidatePathGlobs",
+      "Label": "Files",
+      "HelpText": "The files to search. Wildcards `*` and `**` are supported. Paths must be fully-qualified, e.g. `C:\\MyApp\\**\\*.xml`. Separate multiple paths with `;` semicolons.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RFRFindRegex",
+      "Label": "Pattern",
+      "HelpText": "The regular expression to find in the target files.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RFRSubstitution",
+      "Label": "Substitution",
+      "HelpText": "The text to insert in place of each occurrence of _Pattern_. Regular expression [substitutions](http://msdn.microsoft.com/en-us/library/ewy2t5e0.aspx) are supported, so any literal `$` in the substitution pattern must be escaped by doubling (`$$`).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RFROptions",
+      "Label": "Options",
+      "HelpText": "A space-separated list of options from the [RegexOptions](http://msdn.microsoft.com/en-us/library/system.text.regularexpressions.regexoptions.aspx) enumeration.",
+      "DefaultValue": "ExplicitCapture",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2015-10-26T14:24:18.7560000-07:00",
+    "OctopusVersion": "3.0.10.2278",
+    "Type": "ActionTemplate"
+  },
+  "Category": "filesystem"
+}
diff --git a/src/step-templates/file-system-regular-expression-find-and-replace/scriptbody.ps1 b/src/step-templates/file-system-regular-expression-find-and-replace/scriptbody.ps1
new file mode 100644
index 000000000..e33a54d70
--- /dev/null
+++ b/src/step-templates/file-system-regular-expression-find-and-replace/scriptbody.ps1
@@ -0,0 +1,66 @@
+function Execute-RegexFindReplace($target, $find, $replace, $options) {
+    Write-Output "Searching $target..."
+    $orig = [System.IO.File]::ReadAllText($target)
+    
+    $regex = new-object System.Text.RegularExpressions.Regex($find, $options)
+    if ([string]::IsNullOrEmpty($replace)) {        
+$replace = ''
+    }
+    
+    $occurrences = $regex.Matches($orig).Count
+    if ($occurrences -gt 0) {
+        Write-Output "Found $occurrences occurrence(s), replacing..."
+        
+        $replaced = $regex.Replace($orig, $replace)
+        [System.IO.File]::WriteAllText($target, $replaced)
+    }
+}
+
+if ([string]::IsNullOrEmpty($RFRFindRegex)) {
+    throw "A non-empty 'Pattern' is required"
+}
+
+$options = [System.Text.RegularExpressions.RegexOptions]::None
+$RFROptions.Split(' ') | foreach {
+    $opt = $_.Trim()
+    $flag = [System.Enum]::Parse([System.Text.RegularExpressions.RegexOptions], $opt)
+    $options = $options -bor $flag
+}
+
+Write-Output "Replacing occurrences of '$RFRFindRegex' with '$RFRSubstitution' applying options $RFROptions"
+
+$RFRCandidatePathGlobs.Split(";") | foreach {
+    $glob = $_.Trim()
+    Write-Output "Searching for files that match $glob..."
+
+    $matches = $null
+    $splits = $glob.Split(@('/**/'), [System.StringSplitOptions]::RemoveEmptyEntries)
+
+    if ($splits.Length -eq 1) {
+        $splits = $glob.Split(@('\**\'), [System.StringSplitOptions]::RemoveEmptyEntries)
+    }
+    
+    if ($splits.Length -eq 1) {
+        $matches = ls $glob
+    } else {
+        if ($splits.Length -eq 2) {
+            pushd $splits[0]
+            $matches = ls $splits[1] -Recurse
+            popd
+        } else {
+            $splits
+            throw "The segment '**' can only appear once, as a directory name, in the glob expression"
+
+        }
+    }
+
+    $matches | foreach {
+        
+        $target = $_.FullName
+
+        Execute-RegexFindReplace -target $target -find $RFRFindRegex -replace $RFRSubstitution -options $options
+    }
+}
+
+
+Write-Output "Done."
\ No newline at end of file
diff --git a/step-templates/file-system-rename-file.json b/src/step-templates/file-system-rename-file/metadata.json
similarity index 52%
rename from step-templates/file-system-rename-file.json
rename to src/step-templates/file-system-rename-file/metadata.json
index 634622cb4..ae0a56484 100644
--- a/step-templates/file-system-rename-file.json
+++ b/src/step-templates/file-system-rename-file/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$filePath = $OctopusParameters['FilePath']\r\n$newName = $OctopusParameters['NewName']\r\n\r\nfunction Test-FileLocked([string]$filePath)\r\n{\r\n  Rename-Item $filePath $filePath -ErrorVariable errs -ErrorAction SilentlyContinue\r\n  return ($errs.Count -ne 0)\r\n}\r\n\r\n$fileExists = Test-Path -Path $filePath\r\n\r\nif (!$fileExists)\r\n{\r\n  Write-Warning \"File not found at $filePath\"\r\n\r\n  return\r\n}\r\n\r\n$fileIsLocked = Test-FileLocked($filePath)\r\n\r\nfunction Wait-ForFileUnlock\r\n{\r\n  for ($attemptNo = 1; $attemptNo -lt 6; $attemptNo++) {\r\n    Write-Host \"Waiting for the file to become unlocked $attemptNo/5\"\r\n\r\n    Start-Sleep -Seconds 10\r\n\r\n    $fileIsLocked = Test-FileLocked($filePath)\r\n\r\n    if (!$fileIsLocked)\r\n    {\r\n      return\r\n    }\r\n\r\n    if ($attemptNo -eq 5) {\r\n      Write-Error \"File at location $filePath is locked and cannot be renamed\"\r\n\r\n      return\r\n    }\r\n  }\r\n}\r\n\r\nif ($fileIsLocked)\r\n{\r\n  Wait-ForFileUnlock\r\n}\r\n\r\nRename-Item -Path $filePath -NewName $newName\r\n\r\nWrite-Host \"Successfully renamed file at location: $filePath to $newName\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -42,9 +42,9 @@
   ],
   "LastModifiedBy": "daviesaus",
   "$Meta": {
-    "ExportedAt": "2017-06-01T11:11:00.134Z",
+    "ExportedAt": "2017-06-01T11:11:00.1340000Z",
     "OctopusVersion": "3.11.11",
     "Type": "ActionTemplate"
   },
   "Category": "filesystem"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/file-system-rename-file/scriptbody.ps1 b/src/step-templates/file-system-rename-file/scriptbody.ps1
new file mode 100644
index 000000000..61b29fa09
--- /dev/null
+++ b/src/step-templates/file-system-rename-file/scriptbody.ps1
@@ -0,0 +1,50 @@
+$filePath = $OctopusParameters['FilePath']
+$newName = $OctopusParameters['NewName']
+
+function Test-FileLocked([string]$filePath)
+{
+  Rename-Item $filePath $filePath -ErrorVariable errs -ErrorAction SilentlyContinue
+  return ($errs.Count -ne 0)
+}
+
+$fileExists = Test-Path -Path $filePath
+
+if (!$fileExists)
+{
+  Write-Warning "File not found at $filePath"
+
+  return
+}
+
+$fileIsLocked = Test-FileLocked($filePath)
+
+function Wait-ForFileUnlock
+{
+  for ($attemptNo = 1; $attemptNo -lt 6; $attemptNo++) {
+    Write-Host "Waiting for the file to become unlocked $attemptNo/5"
+
+    Start-Sleep -Seconds 10
+
+    $fileIsLocked = Test-FileLocked($filePath)
+
+    if (!$fileIsLocked)
+    {
+      return
+    }
+
+    if ($attemptNo -eq 5) {
+      Write-Error "File at location $filePath is locked and cannot be renamed"
+
+      return
+    }
+  }
+}
+
+if ($fileIsLocked)
+{
+  Wait-ForFileUnlock
+}
+
+Rename-Item -Path $filePath -NewName $newName
+
+Write-Host "Successfully renamed file at location: $filePath to $newName"
\ No newline at end of file
diff --git a/step-templates/F5-API-enable-disable-member.json b/step-templates/F5-API-enable-disable-member.json
deleted file mode 100644
index a979d97b6..000000000
--- a/step-templates/F5-API-enable-disable-member.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "Id": "45d3003a-9443-42a0-aa71-38398eb4f9d6",
-  "Name": "F5 API Enable, Disable and Force Offline pool member",
-  "Description": "Enable, Disable and to Force Offline F5 pool member via API.\nThis step not require iControl snap-in installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "#octopus variables\n$node = \"#{node}\"\n$pool = \"#{pool}\"\n$f5pass = \"#{f5pass}\"\n$f5user = \"#{f5user}\"\n$f5ipv4 = \"#{f5ipv4}\"\n$numconn = \"#{numconn}\"\n$timeout = \"#{timeout}\"\n$action= \"#{action}\"\n$f5_ip=$f5ipv4.split(',')\n\n#whitout ssl certificate\nif (-not ([System.Management.Automation.PSTypeName]'ServerCertificateValidationCallback').Type)\n{\n$certCallback=@\"\n    using System;\n    using System.Net;\n    using System.Net.Security;\n    using System.Security.Cryptography.X509Certificates;\n    public class ServerCertificateValidationCallback\n    {\n        public static void Ignore()\n        {\n            if(ServicePointManager.ServerCertificateValidationCallback ==null)\n            {\n                ServicePointManager.ServerCertificateValidationCallback += \n                    delegate\n                    (\n                        Object obj, \n                        X509Certificate certificate, \n                        X509Chain chain, \n                        SslPolicyErrors errors\n                    )\n                    {\n                        return true;\n                    };\n            }\n        }\n    }\n\"@\n    Add-Type $certCallback\n }\n[ServerCertificateValidationCallback]::Ignore();\n\n#F5 Credentials\n$username= $f5user\n$password= $f5pass | ConvertTo-SecureString -AsPlainText -Force\n$cred= New-Object System.Management.Automation.PSCredential $username, $password\nWrite-Output \"Cred: $cred\"\n\n#retrieve Active F5 server\nfunction Get-StatusF5{\n    param(\n        $ipserver,\n        $credential\n    )\n    $result=Invoke-WebRequest -Uri \"https://$ipserver/mgmt/tm/cm/failover-status\" -Credential $credential -ErrorAction Ignore -UseBasicParsing\n    $items=$result.Content | ConvertFrom-Json\n    $status=$items.entries.'https://localhost/mgmt/tm/cm/failover-status/0'.nestedStats.entries.status\n    return $status\n}\n\nforeach($ipv4 in $f5_ip){\n    $state=Get-StatusF5 -ipserver $ipv4 -credential $cred\n    if (($state.description) -like \"ACTIVE\"){\n        $master=$ipv4\n        Write-Output \"F5 master ACTIVE: $master\"\n    }\n    else{\n        Write-Output \"$ipv4 is not master active\"\n    }\n}\nif (!$master){\n    Write-Error \"ATTENTION - F5 servers are incorrect\"\n}\n\n#retrieve informations\n$result=Invoke-WebRequest -Uri \"https://$master/mgmt/tm/ltm/pool/$pool/members\" -Credential $cred -UseBasicParsing\n$items=$result.Content | ConvertFrom-Json\n$items.items\n$name=($items.items | where{$_.name -like \"*$node*\"}).name\nWrite-Host \"Nome del nodo: $name\"\n\n#action based on $action\nif($action -like \"Enable\"){\n    $state ='{\"state\": \"user-up\", \"session\": \"user-enabled\"}' ###ENABLED\n    Write-Output \"Action: Enable $name\"\n    Invoke-WebRequest -Uri \"https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name\"  -Credential $cred -ContentType application/json -Method PUT -Body $state  -Verbose -UseBasicParsing\n}\nelse{\n    if($action -like \"Disable\"){\n        $state ='{\"state\": \"user-up\", \"session\": \"user-disabled\"}' ###Disabled\n        Write-Output \"Action: Enable $name\"\n        Invoke-WebRequest -Uri \"https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name\"  -Credential $cred -ContentType application/json -Method PUT -Body $state  -Verbose -UseBasicParsing\n    }\n    else{\n        if($action -like \"Offline\"){\n            $state ='{\"state\": \"user-down\", \"session\": \"user-disabled\"}' ###FORCEDOFFLINE\n            Invoke-WebRequest -Uri \"https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name\"  -Credential $cred -ContentType application/json -Method PUT -Body $state  -Verbose -UseBasicParsing\n            $current_conn=$numconn + 00\n\n            [int]$time = 0\n            Write-Output \"Connections accepted: $numconn\"\n            while($current_conn -gt $numconn){\n                if($second -ne $timeout){\n                    $url=\"https://$master/mgmt/tm/ltm/pool/$pool/members/~Common~$name\" + '/stats?$select=serverside.curConns'\n                    Start-Sleep 1\n                    [int]$second = $time++\n                    $result= Invoke-WebRequest -Uri $url -Credential $cred -UseBasicParsing\n                    $item=$result.Content | ConvertFrom-Json\n                    $current_conn=($item.entries.'serverside.curConns').value\n                    Write-Host \"Second: $second - Connections: $current_conn\"\n                }\n                else{\n                    Write-Output \"Timeout - $current_conn connections stopped\"\n                    $current_conn= 0\n                }\n            }\n    }\n        else{\n            Write-Error \"ACTION IS NOT ACCEPTED\"\n        }\n}\n}\nStart-sleep 10\nWrite-Host \"Go to next step\"\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "c011969a-80e9-47d1-8bd3-d3da6a41ec34",
-      "Name": "node",
-      "Label": "Node Member Pool",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "313cf4d5-1006-4e54-9f4a-e4f719ca7988",
-      "Name": "pool",
-      "Label": "Pool Name",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9619ce36-f913-4fa9-91be-9ac650e0d168",
-      "Name": "f5user",
-      "Label": "F5 Username",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6374f90c-ca46-4c13-94df-bb374c9b33f9",
-      "Name": "f5pass",
-      "Label": "F5 password",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e6402134-71af-4b31-b6a4-f2112edb7e25",
-      "Name": "f5ipv4",
-      "Label": "F5 Server",
-      "HelpText": "comma separated (without spaces).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "1f402f2b-5907-44ec-87f0-d74bb1901dbd",
-      "Name": "numconn",
-      "Label": "Connections limit",
-      "HelpText": null,
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6b419071-5710-4c47-a1e5-da8434ba190a",
-      "Name": "timeout",
-      "Label": "Timeout limit",
-      "HelpText": null,
-      "DefaultValue": "60",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e85c607e-3511-4ae9-8f90-272964fd080f",
-      "Name": "action",
-      "Label": "Action member node",
-      "HelpText": "Change the status of member pool:\n- Enabled;\n- Disabled;\n- Forced Offline.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Enable|Member Enabled in GUI\nDisable|Member Disabled in GUI\nOffline|Member Forced Offline in GUI"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "fedelemattia",
-  "$Meta": {
-    "ExportedAt": "2016-12-16T14:01:28.267Z",
-    "OctopusVersion": "3.5.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "F5"
-}
diff --git a/step-templates/azure-create-resource-group-az-module.json b/step-templates/azure-create-resource-group-az-module.json
deleted file mode 100644
index cc8aa66ed..000000000
--- a/step-templates/azure-create-resource-group-az-module.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "Id": "c2b850f7-2d9a-4cda-ab3c-ff3d229eca8e",
-    "Name": "Create Resource Group If Not Exists (AZ Module)",
-    "Description": "This step uses the new `az` modules to create a resource group if it doesn't exist.  \n\nRequires `Octopus Deploy 2020.1` or later.  Requires a worker with the `az` module installed on it.  That module is not bundled with Octopus Deploy.",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "Author": "octobob",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "OctopusUseBundledTooling": "False",
-      "Octopus.Action.Azure.AccountId": "#{CreateResourceGroup.Azure.Account}",
-      "Octopus.Action.Script.ScriptBody": "$resourceGroupName = $OctopusParameters[\"CreateResourceGroup.ResourceGroup.Name\"]\n$resourceGroupLocationAbbr = $OctopusParameters[\"CreateResourceGroup.ResourceGroup.Location.Abbr\"]\n\n$existingResourceGroups = (az group list --query \"[?location=='$resourceGroupLocationAbbr']\") | ConvertFrom-JSON\n\n$createResourceGroup = $true\nforeach ($resourceGroupFound in $existingResourceGroups)\n{\t\n\tWrite-Host \"Checking if current resource group $($resourceGroupFound.name) matches $resourceGroupName\"\n    if ($resourceGroupFound.name -eq $resourceGroupName)\n    {\n    \t$createResourceGroup = $false\n    \tWrite-Highlight \"Resource group already exists, skipping creation\"\n    \tbreak\n    }\n}\n\nif ($createResourceGroup)\n{\n\tWrite-Host \"Creating the $resourceGroupName because it was not found in $resourceGroupLocationAbbr\"\n\taz group create -l $resourceGroupLocationAbbr -n $resourceGroupName\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "b854aba4-4acb-428d-b981-79d1f2f50537",
-        "Name": "CreateResourceGroup.Azure.Account",
-        "Label": "Azure Account",
-        "HelpText": "The Azure Account with the necessary permissions to create resource groups.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "c7e43d70-f9ac-43cb-95a8-6a0e75ad40c6",
-        "Name": "CreateResourceGroup.ResourceGroup.Name",
-        "Label": "Resource Group Name",
-        "HelpText": "The name of the resource group to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e1bd7e57-5ad0-445b-9d11-6642acc55b88",
-        "Name": "CreateResourceGroup.ResourceGroup.Location.Abbr",
-        "Label": "The Resource Group Abbreviated Location",
-        "HelpText": "The abbreviated resource group location, for example: centralus",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "centralus|Americas - Central US\neastus|Americas - East US\neastus2|Americas - East US 2\nnorthcentralus|Americas - North Central US\nsouthcentralus|Americas - South Central US\nwestus|Americas - West US\nwestus2|Americas - West US 2\nwestcentralus|Americas - West Central US\ncanadacentral|Americas - Canada Central\ncanadaeast|Americas - Canada East\nbrazilsouth|Americas - Brazil South\neastasia|Asia Pacific - East Asia\nsoutheastasia|Asia Pacific - Southeast Asia\naustraliacentral|Asia Pacific - Australia Central\naustraliacentral2|Asia Pacific - Australia Central 2\naustraliaeast|Asia Pacific - Australia East\naustraliasoutheast|Asia Pacific - Australia Southeast\nchinaeast|Asia Pacific - China East\nchinaeast2|Asia Pacific - China East 2\nchinanorth|Asia Pacific - China North\nchinanorth2|Asia Pacific - China North 2\ncentralindia|Asia Pacific - Central India\nsouthindia|Asia Pacific - South India\nwestindia|Asia Pacific - West India\njapaneast|Asia Pacific - Japan East\njapanwest|Asia Pacific - Japan West\nkoreacentral|Asia Pacific - Korea Central\nkoreasouth|Asia Pacific - Korea South\nnortheurope|Europe - North Europe\nwesteurope|Europe - West Europe\nfrancecentral|Europe - France Central\nfrancesouth|Europe - France South\ngermanynorth|Europe - Germany North\ngermanywestcentral|Europe - Germany West Central\nnorwayeast|Europe - Norway East\nnorwaywest|Europe - Norway West\nspaincentral|Europe - Spain Central\nswitzerlandnorth|Europe - Switzerland North\nswitzerlandwest|Europe - Switzerland West\nuksouth|Europe - UK South\nukwest|Europe - UK West\nsouthafricanorth|Middle East and Africa - South Africa North\nsouthafricawest|Middle East and Africa - South Africa West\nuaecentral|Middle East and Africa - UAE Central\nuaenorth|Middle East and Africa - UAE North"
-        }
-      }
-    ],
-    "LastModifiedBy": "octobob",
-    "$Meta": {
-      "ExportedAt": "2020-04-13T15:37:29.866Z",
-      "OctopusVersion": "2020.1.10",
-      "Type": "ActionTemplate"
-    },
-    "Category": "azure"
-  }
diff --git a/step-templates/azure-create-staging-deployment-slot.json b/step-templates/azure-create-staging-deployment-slot.json
deleted file mode 100644
index f2da88bc5..000000000
--- a/step-templates/azure-create-staging-deployment-slot.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "Id": "10f6021e-27bd-47c5-9f10-4a1599182d8a",
-    "Name": "Create Azure Staging Deployment Slot",
-    "Description": "This template will create an azure deployment slot. This step template should be placed before the \"Deploy an Azure App\" Octopus Deploy template and be used with its sister step \"Switch Azure RM Deployment Slot\"\n\nThis should be used for green-blue deployments, as referenced in this document: https://octopus.com/docs/deploying-applications/deploying-to-azure/deploying-a-package-to-an-azure-web-app/using-deployment-slots-with-azure-web-apps\n\nNB: This step will promote your web app service plan to standard if it is currently using free, shared or basic tier",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Properties": {
-      "Octopus.Action.Azure.AccountId": "#{AzureAccount}",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.ScriptBody": "###############################################\r\n# Create Azure RM Staging Deployment Slot\r\n###############################################\r\n##Step1: Get Variables\r\n$ResourceGroupName             = $OctopusParameters[\"ResourceGroupName\"] \r\n$AppName                       = $OctopusParameters[\"AppName\"] \r\n$stagingSlotName               = $OctopusParameters[\"SlotName\"]\r\n$AppServicePlanName            = $OctopusParameters[\"AppServicePlanName\"] \r\n###############################################\r\n###############################################\r\nFunction Add-DeploymentSlotFunctionaility\r\n{\r\n    [cmdletbinding()]\r\n    param\r\n    (   \r\n        [string]$ResourceGroupName,\r\n        [string]$AppName,\r\n        [string]$AppServicePlanName\r\n    )\r\n    try \r\n    {\r\n        write-output \"Will make sure the service plan can support deployment slots\"\r\n        $servicePlan = Get-AzureRmAppServicePlan -ResourceGroupName $ResourceGroupName -Name $AppServicePlanName\r\n    \r\n        if(($servicePlan.Sku.Tier.ToLower() -eq \"free\" ) -or ($servicePlan.Sku.Tier.ToLower() -eq \"shared\" ) -or ($servicePlan.Sku.Tier.ToLower() -eq \"basic\" ))\r\n        {\r\n            Write-Warning \"Service plan does not currently support deployment slots, will now scale to standard tier\"\r\n            $planUpdate = Set-AzureRmAppServicePlan -ResourceGroupName $ResourceGroupName -Name $AppServicePlanName -Tier \"Standard\"\r\n            Write-Output \"Plan updated\"\r\n            $planUpdate | Out-String | Write-Verbose\r\n            write-output \"Plan Tier now set to:\"\r\n            $planUpdate.Sku | Out-String | Write-Output\r\n        }\r\n        else \r\n        {\r\n            Write-Output \"Service plan already supports deployment slots\"    \r\n        }       \r\n    }\r\n    catch \r\n    {\r\n        throw \"Error adding Deployment Slot functionailty. $_\"    \r\n    }\r\n}\r\n\r\nFunction Invoke-RequiredVariablesCheck\r\n{\r\n    if([string]::IsNullOrEmpty($ResourceGroupName))\r\n    {\r\n        Write-Error \"ResourceGroupName variable is not set\"\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($AppName))\r\n    {\r\n        write-error \"AppName variable is not set\"\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($stagingSlotName))\r\n    {\r\n        write-error \"stagingSlotName variable is not set\"\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($AppServicePlanName))\r\n    {\r\n        write-error \"AppServicePlanName variable is not set\"\r\n    }\r\n    Write-Verbose \"Variables in use are:\"\r\n    write-verbose \"ResourceGroupName:$ResourceGroupName\"\r\n    write-verbose \"AppName:$AppName\"\r\n    write-verbose \"stagingSlotName:$stagingSlotName\"\r\n    write-verbose \"AppServicePlanName:$AppServicePlanName\"\r\n}\r\n\r\n$ErrorActionPreference = \"Stop\"\r\n\r\ntry \r\n{\r\n    Invoke-RequiredVariablesCheck\r\n    Add-DeploymentSlotFunctionaility -ResourceGroupName $ResourceGroupName -AppName $AppName -AppServicePlanName $AppServicePlanName\r\n    Write-output \"Preparing Deployment Staging slot\"\r\n    $deploymentSlot = Get-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName -ErrorAction SilentlyContinue\r\n    if($deploymentSlot.Id -eq $null)\r\n    {\r\n        Write-output \"No current deployment slot created, will create one now\"\r\n        New-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName\r\n    }\r\n    else \r\n    {   \r\n        Write-Verbose \"Current slot exists, will remove to speed up deployment\"\r\n        Remove-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName -Force\r\n        Write-Verbose \"Slot removed\"\r\n        New-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $stagingSlotName   \r\n    }\r\n    Write-Output \"Deployment slot $stagingSlotName created\"\r\n}\r\ncatch \r\n{\r\n    Write-Error \"Error in Create Azure RM Staging Deployment Slot step. $_\"    \r\n}",
-      "Octopus.Action.Package.FeedId": null,
-      "Octopus.Action.Script.ScriptFileName": null,
-      "Octopus.Action.Package.PackageId": null
-    },
-    "Parameters": [
-      {
-        "Id": "37e14646-c52f-497a-a17b-2f17e9b1a629",
-        "Name": "ResourceGroupName",
-        "Label": "ResourceGroupName",
-        "HelpText": "Enter the name of the resource group you are deploying this Web App into",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "46bf87cd-342d-4095-bd2f-78d6a495faf5",
-        "Name": "AppServicePlanName",
-        "Label": "AppServicePlanName",
-        "HelpText": "Enter the name of the app service plan",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "54b04906-e716-4b1d-93c9-965f3a412c28",
-        "Name": "AppName",
-        "Label": "AppName",
-        "HelpText": "Enter the name of your web/api/etc app",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "15176529-6bc9-4e0f-82ab-b2e004959d9e",
-        "Name": "AzureAccount",
-        "Label": "AzureAccount",
-        "HelpText": "Enter the SPN used to connect to Azure",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "30da9c4b-1fb4-425e-a5f4-2338d24ca23b",
-        "Name": "SlotName",
-        "Label": "SlotName",
-        "HelpText": "Enter the name you wish to call your deployment slot",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      }
-    ],
-    "LastModifiedOn": "2018-02-27T11:23:00.000+00:00",
-    "LastModifiedBy": "MarkDordoy",
-    "$Meta": {
-      "ExportedAt": "2018-02-27T11:24:00.844Z",
-      "OctopusVersion": "3.16.2",
-      "Type": "ActionTemplate"
-    },
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-database-import-create-new-vcpu.json b/step-templates/azure-database-import-create-new-vcpu.json
deleted file mode 100644
index 677c5a22c..000000000
--- a/step-templates/azure-database-import-create-new-vcpu.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-    "Id": "4f03ce31-a9ce-4aff-8c7b-5144af5401a1",
-    "Name": "Azure Database - Import Create New vcpu",
-    "Description": "Restores a bacpac to a new database\n\n*Depends on az cli*\n\n*Source database requires 'Allow Azure services and resources to access this server' option turn on in the SQL server firewall*",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "#get variables into easy to use format\n\n# vCPU vars\n$family = $OctopusParameters[\"azDbImportNewVCPU.family\"] # Gen4 is being phased out.\n$computeModel = $OctopusParameters[\"azDbImportNewVCPU.computeModel\"]\n$readReplicaCount = $OctopusParameters[\"azDbImportNewVCPU.readReplicaCount\"]\n$edition = $OctopusParameters[\"azDbImportNewVCPU.edition\"]\n$capacity = $OctopusParameters[\"azDbImportNewVCPU.coreCount\"] -as [int]\n\n# Create DB Variables\n$databaseName = $OctopusParameters[\"azDbImportNewVCPU.dbName\"]\n$sqlServer = $OctopusParameters[\"azDbImportNewVCPU.server\"]\n$rgName = $OctopusParameters[\"azDbImportNewVCPU.resourceGroup\"]\n$elasticPool = $OctopusParameters[\"azDbImportNewVCPU.elasticPool\"]\n$readScaleTruthy = $OctopusParameters[\"azDbImportNewVCPU.readScale\"]\n\n$tags = $OctopusParameters[\"azDbImportNewVCPU.tags\"]\n$zoneRedundant = $OctopusParameters[\"azDbImportNewVCPU.zoneRedundant\"]\n$maxSize = $OctopusParameters[\"azDbImportNewVCPU.maxSize\"]\n\n# Import bacpac variables\n$adminName = $OctopusParameters[\"azDbImportNewVCPU.adminName\"]\n$adminPwd = $OctopusParameters[\"azDbImportNewVCPU.adminPwd\"]\n$accessKey = $OctopusParameters[\"azDbImportNewVCPU.blobAccessKey\"]\n$accessKeyType = $OctopusParameters[\"azDbImportNewVCPU.accessKeyType\"]\n$containerUri = $OctopusParameters[\"azDbImportNewVCPU.ContainerUri\"]\n$backupName = $OctopusParameters[\"azDbImportNewVCPU.backupName\"]\n$backupUri = \"$containerUri/$backupName.bacpac\"\n\n$readScaleValue = \"Disabled\"\n\nif($readScaleTruthy -eq \"true\") { $readScalevalue = \"Enabled\" }\n$maxAvailableSize = 1TB\n\n$gen5VcpuCount = 2,4,6,8,10,12,14,16,18,20,24,32,40,80\n$gen5VcpuCountSvrless = 1,2,4,6,8,10,12,14,16,18,20,24,32,40\n\n#validate parameters\n\nif($null -eq (az sql server list --query \"[?Name==$sqlServer]\" | ConvertFrom-Json))\n{\n    throw \"$sqlServer doesn't exist or the selected azure account doesn't have access to it.\"\n}\n\nif($null -ne (az sql db list --resource-group $rgName --server $sqlServer --query \"[?Name==$databaseName]\" | ConvertFrom-Json))\n{\n    throw \"$database already exists\"\n}\n\n# max size for all databases (except GP serverless) is 1TB\n\nif([string]::IsNullOrEmpty($rgName))\n{\n\tthrow \"resource group name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($sqlServer))\n{\n\tthrow \"sql server name is not provided\"\n}\n\nif([string]::IsNullOrEmpty($databaseName))\n{\n\tthrow \"database name not provided\"\n}\n\n# admin name, password and access key will not be validated in favor of security\n\nif([string]::IsNullOrEmpty($accessKeyType))\n{\n\tthrow \"access key type not provided\"\n}\n\nif([string]::IsNullOrEmpty($containerUri))\n{\n\tthrow \"containerUri not provided\"\n}\n\nif([string]::IsNullOrEmpty($backupName))\n{\n\tthrow \"backup name not provided\"\n}\n\nswitch($edition)\n{\n    \"GeneralPurpose\"\n    {\n        switch($computeModel)\n        {\n            \"Provisioned\"\n            {\n                switch($family)\n                {\n                    \"Gen5\"\n                    {\n                    \twrite-verbose \"Capacity set to: $capacity\"\n                        if($capacity -lt 2)\n                        {\n                        \tWrite-Warning \"Minimum vCPU for provisioned is 2\"\n                            Write-Warning \"setting vCPU to 2\"\n                            $capacity = 2\n                        }\n                        if(!$gen5VcpuCount.Contains($capacity))\n                        {\n                            throw \"Invalid max vCPU count entered valid values for Gen5 hardware is: $gen5VcpuCount\"\n                        }\n                        $maxAvailableSize = 1TB\n                    }\n                    \"FSv2\"\n                    {\n                        $capacity = 72\n                        $maxAvailableSize = 4TB\n                    }\n                    \"Default\"\n                    {\n                        throw \"Invalid hardware family selected for General purpose\"\n                    }\n                }\n            }\n            \"Serverless\"\n            {\n                if($capacity -gt 40)\n                {\n                    Write-Warning \"Max vCPUs for serverless is 40\"\n                    Write-Warning \"Setting max vCPU to 40\"\n                    $capacity = 40\n                }\n\n                if($family -ne \"Gen5\") {throw \"Only Gen5 hardware family available for serverless\"}\n\n                if(!$gen5VcpuCountSvrless.Contains($capacity))\n                {\n                    throw \"Invalid max vCPU count entered valid values for serverless Gen5 hardware is: $gen5VcpuCountSvrless\"\n                }\n                $maxAvailableSize = 512GB\n            }\n        }\n    }\n    \"Hyperscale\"\n    {\n        if($family -ne \"Gen5\") {throw \"Only Gen5 hardware family available for Hyperscale\"}\n\n        if($capacity -lt 2)\n        {\n            Write-Warning \"Minimum vCPU for provisioned is 2\"\n            Write-Warning \"setting vCPU to 2\"\n            $capacity = 2\n        }\n\n        if(!$gen5VcpuCount.Contains($capacity))\n        {\n            throw \"Invalid max vCPU count entered valid values for Gen5 hardware is: $gen5VcpuCount\"\n        }\n    }\n    \"BusinessCritical\"\n    {\n        switch ($family)\n        {\n            \"Gen5\"\n            {\n                if($capacity -lt 2)\n                {\n                    Write-Warning \"Minimum vCPU for provisioned is 2\"\n                    Write-Warning \"setting vCPU to 2\"\n                    $capacity = 2\n                }\n\n                if(!$gen5VcpuCount.Contains($capacity))\n                {\n                    throw \"Invalid max vCPU count entered valid values for Gen5 hardware is: $gen5VcpuCount\"\n                }\n                $maxAvailableSize = 1TB\n            }\n            \"M\"\n            {\n                $capacity = 128\n                $maxAvailableSize = 4TB\n                if($zoneRedundant -eq \"true\")\n                {\n                    Write-Warning \"Zone redundant not available for M-Series hardware configuration\"\n                    Write-Warning \"Setting zone redundant to false\"\n                    $zoneRedundant = \"false\"\n                }\n            }\n        }\n    }\n}\n\nif(($maxSize / 1GB) -gt ($maxAvailableSize / 1GB))\n{\n    Write-Warning \"Desired max size of $($maxSize / 1GB)GB exceeds available max size of $($maxAvailableSize / 1GB)GB\"\n    Write-Warning \"Setting max size to $($maxAvailableSize / 1GB)GB\"\n    $maxSize = $maxAvailableSize\n}\n\n$cliArgs = \"--name $databaseName --resource-group $rgName --server $sqlServer\"\n\nif($elasticPool) {$cliArgs += \" --elastic-pool $elasticPool\"}\nelse {$cliArgs += \" --edition $edition --family $family --capacity $capacity\"}\n\nif((!$edition -eq \"Hyperscale\") -and $maxSize) {$cliArgs += \" --max-size $maxSize\"}\nif($edition -eq \"GeneralPurpose\") {$cliArgs += \" --compute-model $computeModel\"}\nif($edition -eq \"Hyperscale\") {cliArgs += \" --read-replicas $readReplicaCount\"}\nif($tags) {$cliArgs += \" --tags $tags\"}\nif($edition -eq \"BusinessCritical\") {$cliArgs += \" --read-scale $readScaleValue --zone-redundant $zoneRedundant\"}\nif($elasticPool) {$cliArgs += \" --elastic-pool $elasticPool\"}\n\n$cmd = \"az sql db create $cliArgs\"\n\nwrite-verbose \"cmd is: $cmd\"\n\nWrite-Host \"Creating Database\"\ninvoke-expression \"$cmd\"\n\nwrite-host \"starting db import\"\nwrite-verbose \"import cmd az sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri\"\n\naz sql db import --resource-group $rgname --server $sqlServer --name $databaseName --admin-password $adminPwd --admin-user $adminName --storage-key $accessKey --storage-key-type $accessKeyType --storage-uri $backupUri\n",
-      "Octopus.Action.Azure.AccountId": "#{azDbImportNewVCPU.azAccount}"
-    },
-    "Parameters": [
-      {
-        "Id": "a7ee5061-2e7a-4b1a-876c-21bee392e455",
-        "Name": "azDbImportNewVCPU.azAccount",
-        "Label": "Azure Account",
-        "HelpText": "Azure account with permissions to the subscription and resource group",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "0f280e95-7f8b-4864-bd1d-6af9930257ec",
-        "Name": "azDbImportNewVCPU.resourceGroup",
-        "Label": "Resource Group",
-        "HelpText": "Resource group name housing the target SQL server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "12c084b7-1a60-4076-91e4-6471a57f8978",
-        "Name": "azDbImportNewVCPU.server",
-        "Label": "SQL Server",
-        "HelpText": "Name of the Azure SQL server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7e8e96ee-63d6-4b6b-ab69-da69bf35a798",
-        "Name": "azDbImportNewVCPU.dbName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database that will be created",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a7db94c4-7954-4bbb-af9f-b25f0d282978",
-        "Name": "azDbImportNewVCPU.edition",
-        "Label": "Edition",
-        "HelpText": "The edition component of the sku",
-        "DefaultValue": "GeneralPurpose",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "GeneralPurpose|General Purpose\nBusinessCritical|Business Critical\nHyperscale|Hyperscale"
-        }
-      },
-      {
-        "Id": "20568782-31c5-496a-8885-f69f4240a9b4",
-        "Name": "azDbImportNewVCPU.computeModel",
-        "Label": "Compute Model",
-        "HelpText": "The compute model of the database.  Only applicable for general purpose instances",
-        "DefaultValue": "Provisioned",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Provisioned|Provisioned\nServerless|Serverless"
-        }
-      },
-      {
-        "Id": "c99d1edc-62c4-4d3a-9896-8a7647a42783",
-        "Name": "azDbImportNewVCPU.family",
-        "Label": "Hardware Configuration",
-        "HelpText": "Select Between Gen5, Fsv2 , or M-Series.  Please note the documented vCPU overrides if listed.",
-        "DefaultValue": "Gen5",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Gen5|Gen5\nFsv2|Fsv2 (General Purpose, Compute Optimized 72 vCPUs)\nM|M-Series (Business Critical, Memory Opimized 128 vCPUs)"
-        }
-      },
-      {
-        "Id": "d869775f-4bf4-4497-a1eb-c83fddf4c215",
-        "Name": "azDbImportNewVCPU.coreCount",
-        "Label": "vCPU Core Count",
-        "HelpText": "the number of vCores to use.\n*General purpose FSv2 hardware is set to 72*",
-        "DefaultValue": "2",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "1|1 (Only available for general purpose, serverless instances)\n2|2\n4|4\n6|6\n8|8\n10|10\n12|12\n14|14\n16|16\n18|18\n20|20\n24|24\n32|32\n40|40\n80|80 (Not available for general purpose, serverless instances)"
-        }
-      },
-      {
-        "Id": "fd690b8e-8467-4872-a8b9-b6b046f8c91d",
-        "Name": "azDbImportNewVCPU.maxsize",
-        "Label": "Max Storage Size",
-        "HelpText": "The max storage size.  If no unit is specified, defaults to bytes (B)",
-        "DefaultValue": "1GB",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ff278593-3b7a-4923-b15e-3dc958c87496",
-        "Name": "azDbImportNewVCPU.elasticPool",
-        "Label": "Elastic Pool",
-        "HelpText": "The name or resource id of the elastic pool to create the database in",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "26414a8b-d167-4b94-9142-fa9bf1c984fe",
-        "Name": "azDbImportNewVCPU.zoneRedundant",
-        "Label": "Zone Redundant",
-        "HelpText": "Specifies whether to enable zone redundancy.  This property is only applied to Business Critical databases.",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "a2e4e51d-8a3b-4447-92f4-39e83f82339e",
-        "Name": "azDbImportNewVCPU.readScale",
-        "Label": "Read Scale",
-        "HelpText": "If enabled, connections that have application intent set to read only in their connection string may be routed to a read only secondary replica.  This property is only applied to Business Critical databases.",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "61ef6953-b59c-44f4-80a4-a005feba912c",
-        "Name": "azDbImportNewVCPU.readReplicaCount",
-        "Label": "Read Reaplica Count",
-        "HelpText": "The number of readonly replicas to provision for the database. This property is only applied to hyperscale databases.",
-        "DefaultValue": "0",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "0|0\n1|1\n2|2\n3|3\n4|4"
-        }
-      },
-      {
-        "Id": "713515d2-9dd1-4d63-8a66-14cfd08a7065",
-        "Name": "azDbImportNewVCPU.tags",
-        "Label": "Tags",
-        "HelpText": "Space-separated tags.  `key[=value] key[=value]`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "53913bf4-b70e-455f-8dbe-7002e3584ef0",
-        "Name": "azDbImportNewVCPU.blobAccessKey",
-        "Label": "Azure Blob Access Key",
-        "HelpText": "the access key (Shared Access Key or Storage Access Key) to grant access to the storage account",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "9c7cdde5-e5a1-4566-80f2-f9f5391c398b",
-        "Name": "azDbImportNewVCPU.accessKeyType",
-        "Label": "Access Key Type",
-        "HelpText": "The type of key the access key represents",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "SharedAccessKey|Shared Access Key\nStorageAccessKey|Storage Access Key"
-        }
-      },
-      {
-        "Id": "fda41fbc-36cc-47b2-864f-2670144ad3e7",
-        "Name": "azDbImportNewVCPU.ContainerUri",
-        "Label": "Container Uri",
-        "HelpText": "The URI of the container to save the exported database in.  Format is: `https://{StorageAccountName}.blob.core.windows.net/{ContainerName}`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0a0da7eb-afee-4595-a073-993a9e951838",
-        "Name": "azDbImportNewVCPU.backupName",
-        "Label": "Backup Name",
-        "HelpText": "The name of the file being saved.  Defaults to DB Name",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8a601118-6e0d-4340-badd-c66d5c8101dd",
-        "Name": "azDbImportNewVCPU.adminName",
-        "Label": "SQL Server Admin Name",
-        "HelpText": "The admin name of the SQL server containing the database you wish to import",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f3f441ba-e92e-4cf2-bab9-0477591bc907",
-        "Name": "azDbImportNewVCPU.adminPwd",
-        "Label": "SQL Server Admin Password",
-        "HelpText": "The admin password of the SQL server containing the database you wish to import",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-06-23T20:13:26.129Z",
-      "OctopusVersion": "2020.2.10",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "Your GitHub Username",
-    "Category": "other"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-delete-from-webapp.json b/step-templates/azure-delete-from-webapp.json
deleted file mode 100644
index 4dd64b9f8..000000000
--- a/step-templates/azure-delete-from-webapp.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Id": "7a3caa63-8312-4e6e-aeb9-674022e5da2f",
-  "Name": "Azure Web App - Delete Files",
-  "Description": "Provides the ability to delete files and folders from an Azure Web App through the kudu API.",
-  "Category": "azure",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Resource Group Name: $($ResourceGroupName)\"\nWrite-Host \"Web App Name: $($WebAppName)\"\nWrite-Host \"Slot Name: $($SlotName)\"\n\nfunction Get-AzureRmWebAppPublishingCredentials($ResourceGroupName, $WebAppName, $SlotName = $null){\t\n\t\n\tif ([string]::IsNullOrWhiteSpace($SlotName)) {\n\t\t$resourceType = \"Microsoft.Web/sites/config\"\n\t\t$resourceName = \"$WebAppName/publishingcredentials\"\n\t} else {\n\t\t$resourceType = \"Microsoft.Web/sites/slots/config\"\n\t\t$resourceName = \"$WebAppName/$SlotName/publishingcredentials\"\n\t}\n\n\t$publishingCredentials = Invoke-AzureRmResourceAction -ResourceGroupName $ResourceGroupName -ResourceType $resourceType -ResourceName $resourceName -Action list -ApiVersion 2015-08-01 -Force\n    \n    return $publishingCredentials\n\n}\n\nfunction Get-KuduApiAuthorisationHeaderValue($ResourceGroupName, $WebAppName, $SlotName = $null) {\n\n    $publishingCredentials = Get-AzureRmWebAppPublishingCredentials $ResourceGroupName $WebAppName $SlotName\n\n    return (\"Basic {0}\" -f [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $publishingCredentials.Properties.PublishingUserName, $publishingCredentials.Properties.PublishingPassword))))\n\n}\n\nfunction Delete-PathFromWebApp($ResourceGroupName, $WebAppName, $SlotName = $null, $kuduPath) {\n\t\n    $kuduApiAuthorisationToken = Get-KuduApiAuthorisationHeaderValue $ResourceGroupName $WebAppName $SlotName\n    \n    Write-Host \"Kudu Auth Token\":\n    Write-Host $kuduApiAuthorisationToken\n    \n    if ([string]::IsNullOrWhiteSpace($SlotName)) {\n        $kuduApiUrl = \"https://$WebAppName.scm.azurewebsites.net/api/vfs\"\n    } else {\n        $kuduApiUrl = \"https://$WebAppName`-$SlotName.scm.azurewebsites.net/api/vfs\"\n    }\n    \n    Write-Host \"API Url: $($kuduApiUrl)\"\n    Write-Host \"File Path: $($kuduPath)\"\n    \n    Invoke-RestMethod -Uri \"$kuduApiUrl/site/wwwroot/$kuduPath\" `\n                      -Headers @{\"Authorization\"=$kuduApiAuthorisationToken;\"If-Match\"=\"*\"} `\n                      -Method DELETE \n}\n\nfunction Delete-FilesAndFoldersFromWebApp($ResourceGroupName, $WebAppName, $SlotName, $FilesList, $RetryAttempts = 3) {\n\n    $list = $FilesList.Split([Environment]::NewLine)\n\n    foreach($item in $list) {\n        if(![string]::IsNullOrWhiteSpace($item)) {\n\n            $retryCount = $RetryAttempts\n            $retry = $true\n\n            while ($retryCount -gt 0 -and $retry) {\n                try {\n                    $retryCount = $retryCount -1\n\n                    Delete-PathFromWebApp $ResourceGroupName $WebAppName $SlotName $item\n\n                    $retry = $false\n                } catch {\n                    $retry = $true\n                    if($retryCount -eq 0) {\n                        throw (\"Exceeded retry attempts \" + $RetryAttempts + \" for \" + $item)\n                    }\n                }\n            }\n        }\n    }\n}\n\nDelete-FilesAndFoldersFromWebApp $ResourceGroupName $WebAppName $SlotName $FilesList $RetryAttempts",
-    "Octopus.Action.Azure.AccountId": "#{AzureAccount}"
-  },
-  "Parameters": [
-    {
-      "Id": "a575296c-babf-4c73-9023-d5a4c9cc84bf",
-      "Name": "FilesList",
-      "Label": "List of Files & Folders to Delete",
-      "HelpText": "List each file/folder on a new line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "7643ed88-ed04-46d2-ae74-1d65b94f03f9",
-      "Name": "AzureAccount",
-      "Label": "Azure Account",
-      "HelpText": "Must exactly match the name of a configured Azure account.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ac5e4147-8b41-4aa5-82d0-ad5cf5e23499",
-      "Name": "ResourceGroupName",
-      "Label": "Resource Group Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6a833494-e3e6-4b8d-8639-c03f37d6d347",
-      "Name": "WebAppName",
-      "Label": "Web App Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0186edda-110a-4cb7-a270-bdc92e55ea1e",
-      "Name": "SlotName",
-      "Label": "Slot Name",
-      "HelpText": "Optional. If you want to target a specific slot, enter it's name.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ffeb3047-63d5-4ce7-9c90-81f117106a93",
-      "Name": "RetryAttempts",
-      "Label": "Retry Attempts",
-      "HelpText": "Number of delete attempts before failing. This should be set higher than 1, as the Azure Kudu API often fails on the first request.",
-      "DefaultValue": "3",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "matt-byrne",
-  "$Meta": {
-    "ExportedAt": "2018-08-17T02:46:48.536Z",
-    "OctopusVersion": "2018.6.14",
-    "Type": "ActionTemplate"
-  }
-}
\ No newline at end of file
diff --git a/step-templates/azure-delete-resource-group.json b/step-templates/azure-delete-resource-group.json
deleted file mode 100644
index fc4f72cac..000000000
--- a/step-templates/azure-delete-resource-group.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "Id": "18ed1352-b0be-4669-aa9a-35309a669aff",
-    "Name": "Delete Azure Resource Group - AzureRM",
-    "Description": "Step to delete an Azure Resource Group using the bundled AzureRM cmdlets with Octopus Deploy.  It will first check to see if the resource group exists, and if it does exist, it will delete it.",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "Author": "octobob",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Azure.AccountId": "#{DeleteResourceGroup.Azure.Account}",
-      "Octopus.Action.Script.ScriptBody": "$resourceGroupName = $OctopusParameters[\"DeleteResourceGroup.ResourceGroup.Name\"]\n$resourceGroupLocation = $OctopusParameters[\"DeleteResourceGroup.ResourceGroup.Location\"]\n\n$deleteResourceGroup = $false\nTry {\n\tWrite-Host \"Getting list of existing resource groups\"\n\t$resourceGroupList = Get-AzureRmResourceGroup -Location \"$resourceGroupLocation\"    \n    \n    Write-Host \"Looping through resource group list\"\n    foreach ($resourceGroupItem in $resourceGroupList)\n    {\n    \tWrite-Host \"Checking if current resource group $($resourceGroupItem.ResourceGroupName) matches $resourceGroupName\"\n    \tif ($resourceGroupItem.ResourceGroupName -eq $resourceGroupName)\n        {\n    \t\t$deleteResourceGroup = $true\n            Write-Highlight \"Found resource group to delete\"\n            break\n        }\n    }\n    \n} Catch {\n\t$deleteResourceGroup = $true\n}\n\nif ($deleteResourceGroup -eq $true){\n\tWrite-Host \"Resource group exists, deleting it\"\n    Remove-AzureRMResourceGroup -Name $resourceGroupName -Force\t\n}\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "d0ff0ef9-90c8-4646-85ac-99e3aa8aa051",
-        "Name": "DeleteResourceGroup.Azure.Account",
-        "Label": "Azure Account",
-        "HelpText": "The Azure Account to authenticate with to delete the resource group",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "a2a3bc84-1be8-46c1-8d9b-2669edd33721",
-        "Name": "DeleteResourceGroup.ResourceGroup.Name",
-        "Label": "Resource Group Name",
-        "HelpText": "The name of the resource group to delete",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f0ca9228-92a6-4392-808e-5f767c62e2c7",
-        "Name": "DeleteResourceGroup.ResourceGroup.Location",
-        "Label": "Resource Group Location",
-        "HelpText": "The location where this resource group is located",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Central US|Americas - Central US\nEast US|Americas - East US\nEast US 2|Americas - East US 2\nNorth Central US|Americas - North Central US\nSouth Central US|Americas - South Central US\nWest US|Americas - West US\nWest US 2|Americas - West US 2\nWest Central US|Americas - West Central US\nCanada Central|Americas - Canada Central\nCanada East|Americas - Canada East\nBrazil South|Americas - Brazil South\nEast Asia|Asia Pacific - East Asia\nSoutheast Asia|Asia Pacific - Southeast Asia\nAustralia Central|Asia Pacific - Australia Central\nAustralia Central 2|Asia Pacific - Australia Central 2\nAustralia East|Asia Pacific - Australia East\nAustralia Southeast|Asia Pacific - Australia Southeast\nChina East|Asia Pacific - China East\nChina East 2|Asia Pacific - China East 2\nChina North|Asia Pacific - China North\nChina North 2|Asia Pacific - China North 2\nCentral India|Asia Pacific - Central India\nSouth India|Asia Pacific - South India\nWest India|Asia Pacific - West India\nJapan East|Asia Pacific - Japan East\nJapan West|Asia Pacific - Japan West\nKorea Central|Asia Pacific - Korea Central\nKorea South|Asia Pacific - Korea South\nNorth Europe|Europe - North Europe\nWest Europe|Europe - West Europe\nFrance Central|Europe - France Central\nFrance South|Europe - France South\nGermany North|Europe - Germany North\nGermany West Central|Europe - Germany West Central\nNorway East|Europe - Norway East\nNorway West|Europe - Norway West\nSpain Central|Europe - Spain Central\nSwitzerland North|Europe - Switzerland North\nSwitzerland West|Europe - Switzerland West\nUK South|Europe - UK South\nUK West|Europe - UK West\nSouth Africa North|Middle East and Africa - South Africa North\nSouth Africa West|Middle East and Africa - South Africa West\nUAE Central|Middle East and Africa - UAE Central\nUAE North|Middle East and Africa - UAE North"
-        }
-      }
-    ],
-    "LastModifiedBy": "octobob",
-    "$Meta": {
-      "ExportedAt": "2020-04-13T15:27:10.581Z",
-      "OctopusVersion": "2020.1.10",
-      "Type": "ActionTemplate"
-    },
-    "Category": "azure"
-  }
diff --git a/step-templates/azure-deploy-containerapp.json b/step-templates/azure-deploy-containerapp.json
deleted file mode 100644
index 73badf7f2..000000000
--- a/step-templates/azure-deploy-containerapp.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-  "Id": "db701b9a-5dbe-477e-b820-07f9e354f634",
-  "Name": "Azure - Deploy Container App",
-  "Description": "Deploys a container to an Azure Container App Environment",
-  "ActionType": "Octopus.Script",
-  "Version": 9,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "636b2191-09f6-4f86-a59c-97e1891475db",
-      "Name": "Template.Azure.Container.Image",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "NotAcquired",
-      "Properties": {
-        "Extract": "False",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Template.Azure.Container.Image",
-        "Purpose": ""
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-	  "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Write-Host \"Saving module $PowerShellModuleName to temporary folder ...\"\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n    Write-Host \"Save successful!\"\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n     Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Check to see if it's running on Windows\nif ($IsWindows)\n{\n\t# Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PWD/modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([IO.Path]::PathSeparator)$env:PSModulePath\"\n$azureModule = \"Az.App\"\n\n# Get variables\n$templateAzureAccountClient = $OctopusParameters['Template.Azure.Account.ClientId']\n$templateAzureAccountPassword = $OctopusParameters['Template.Azure.Account.Password']\n$templateAzureAccountTenantId = $OctopusParameters['Template.Azure.Account.TenantId']\n$templateAzureResourceGroup = $OctopusParameters['Template.Azure.ResourceGroup.Name']\n$templateAzureSubscriptionId = $OctopusParameters['Template.Azure.Account.SubscriptionId']\n$templateEnvironmentName = $OctopusParameters['Template.ContainerApp.Environment.Name']\n$templateAzureLocation = $OctopusParameters['Template.Azure.Location.Name']\n$templateAzureContainer = $OctopusParameters['Template.Azure.Container.Image']\n$templateAzureContainerIngressPort = $OctopusParameters['Template.Azure.Container.Ingress.Port']\n$templateAzureContainerIngressExternal = $OctopusParameters['Template.Azure.Container.ExternalIngress']\n$vmMetaData = $null\n$secretRef = @()\n$templateAzureContainerSecrets = $null\n$templateAzureJWTToken = $OctopusParameters['Template.Azure.Account.JWTToken']\n\nif (![string]::IsNullOrWhitespace($OctopusParameters['Template.Azure.Container.Variables']))\n{\n    $templateAzureContainerEnvVars = ($OctopusParameters['Template.Azure.Container.Variables'] | ConvertFrom-JSON)\n}\nelse\n{\n\t$templateAzureContainerEnvVars = $null\n}\n\nif (![string]::IsNullOrWhitespace($OctopusParameters['Template.Azure.Container.Secrets']))\n{\n    $templateAzureContainerSecrets = ($OctopusParameters['Template.Azure.Container.Secrets'] | ConvertFrom-JSON)\n}\nelse\n{\n\t$templateAzureContainerSecrets = $null\n}\n\n$templateAzureContainerCPU = $OctopusParameters['Template.Azure.Container.Cpu']\n$templateAzureContainerMemory = $OctopusParameters['Template.Azure.Container.Memory']\n\n# Check for required PowerShell module\nWrite-Host \"Checking for module $azureModule ...\"\n\nif ((Get-ModuleInstalled -PowerShellModuleName $azureModule) -eq $false)\n{\n\t# Install the module\n    Install-PowerShellModule -PowerShellModuleName $azureModule -LocalModulesPath $LocalModules\n}\n\n# Import the necessary module\nWrite-Host \"Importing module $azureModule ...\"\nImport-Module $azureModule\n\n# Check to see if the account was specified\nif (![string]::IsNullOrWhitespace($templateAzureAccountClient))\n{\n\t# Login using the provided account\n    Write-Host \"Logging in as specified account ...\"\n\n    # Check to see if the jtw token was given\n    if (![string]::IsNullOrWhitespace($templateAzureJWTToken))\n    {\n      # Log in with OIDC\n      Write-Host \"Logging in using OIDC ...\"\n\n      \n      # Log in\n      Connect-AzAccount -FederatedToken $templateAzureJWTToken -ApplicationId $templateAzureAccountClient -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null    \n    }\n\n    if (![string]::IsNullOrWhitespace($templateAzureAccountPassword))\n    {\n        # Log in with Azure Service Principal\n        Write-Host \"Logging in with Azure Service Principal ...\"\n        \n        # Create credential object for az module\n\t    $securePassword = ConvertTo-SecureString $templateAzureAccountPassword -AsPlainText -Force\n\t    $azureCredentials = New-Object System.Management.Automation.PSCredential ($templateAzureAccountClient, $securePassword)  \n\n        Connect-AzAccount -Credential $azureCredentials -ServicePrincipal -Tenant $templateAzureAccountTenantId -Subscription $templateAzureSubscriptionId | Out-Null\n    }    \n    \n    Write-Host \"Login successful!\"\n}\nelse\n{\n\tWrite-Host \"Using machine Managed Identity ...\"\n    $vmMetaData = Invoke-RestMethod -Headers @{\"Metadata\"=\"true\"} -Method GET -Uri \"http://169.254.169.254/metadata/instance?api-version=2021-02-01\"\n    \n    Connect-AzAccount -Identity\n    \n    # Get Identity context\n    $identityContext = Get-AzContext\n    \n    # Set variables\n    $templateAzureSubscriptionId = $vmMetaData.compute.subscriptionId\n    \n    if ([string]::IsNullOrWhitespace($templateAzureAccountTenantId))\n    {\n    \t$templateAzureAccountTenantId = $identityContext.Tenant\n    }\n    \n    Set-AzContext -Tenant $templateAzureAccountTenantId | Out-Null\n\tWrite-Host \"Successfully set context for Managed Identity!\"\n}\n\n# Check to see if the environment name is a / in it\nif ($templateEnvironmentName.Contains(\"/\") -ne $true)\n{\n\t# Lookup environment id by name\n    Write-Host \"Looking up Managed Environment by Name ...\"\n    $templateEnvironmentName = (Get-AzContainerAppManagedEnv -ResourceGroupName $templateAzureResourceGroup -EnvName $templateEnvironmentName -SubscriptionId $templateAzureSubscriptionId).Id\n}\n\n# Build parameter list to pass to New-AzContainerAppTemplateObject\n$PSBoundParameters.Add(\"Image\", $OctopusParameters[\"Octopus.Action.Package[Template.Azure.Container.Image].Image\"])\n$PSBoundParameters.Add(\"Name\", $OctopusParameters[\"Template.Azure.Container.Name\"])\n\nif (![string]::IsNullOrWhitespace($templateAzureContainerCPU))\n{\n    $PSBoundParameters.Add(\"ResourceCpu\", \"$templateAzureContainerCPU\")\n}\n\nif (![string]::IsNullOrWhitespace($templateAzureContainerMemory))\n{\n    $PSBoundParameters.Add(\"ResourceMemory\", \"$templateAzureContainerMemory\")\n}\n\nif ($null -ne $templateAzureContainerEnvVars)\n{\n    # Loop through list\n    $envVars = @()\n    foreach ($envVar in $templateAzureContainerEnvVars)\n    {\n    \t$envEntry = @{}\n        $envEntry.Add(\"Name\", $envVar.Name)\n        \n        # Check for specific property\n        if ($envVar.SecretRef)\n        {\n        \t$envEntry.Add(\"SecretRef\", $envVar.SecretRef)\n        }\n        else\n        {\n        \t$envEntry.Add(\"Value\", $envVar.Value)\n        }\n        \n        # Add to collection\n        $envVars += $envEntry\n    }\n    \n    $PSBoundParameters.Add(\"Env\", $envVars)\n}\n\nif ($null -ne $templateAzureContainerSecrets)\n{\n\t# Loop through list\n    foreach ($secret in $templateAzureContainerSecrets)\n    {\n        # Create new secret object and add to array\n        $secretRef += New-AzContainerAppSecretObject -Name $secret.Name -Value $secret.Value\n    }\n}\n\n# Create new container app\n$containerDefinition = New-AzContainerAppTemplateObject @PSBoundParameters\n$PSBoundParameters.Clear()\n\n# Define ingress components\nif (![string]::IsNullOrWhitespace($templateAzureContainerIngressPort))\n{\n\t$PSBoundParameters.Add(\"IngressExternal\", [System.Convert]::ToBoolean($templateAzureContainerIngressExternal))\n    $PSBoundParameters.Add(\"IngressTargetPort\", $templateAzureContainerIngressPort)\n}\n\n# Check the image\nif ($OctopusParameters[\"Octopus.Action.Package[Template.Azure.Container.Image].Image\"].Contains(\"azurecr.io\"))\n{\n\t# Define local parameters\n    $registryCredentials = @{}\n    $registrySecret = @{}\n    \n    # Accessing an ACR repository, configure credentials\n    if (![string]::IsNullOrWhitespace($templateAzureAccountClient))\n    {\n\n\t\t# Use configured client, name must be lower case\n        $registryCredentials.Add(\"Username\", $templateAzureAccountClient)\n        $registryCredentials.Add(\"PasswordSecretRef\", \"clientpassword\")\n\n\t\t$secretRef += New-AzContainerAppSecretObject -Name \"clientpassword\" -Value $templateAzureAccountPassword\n    }\n    else\n    {\n    \t# Using Managed Identity\n        $registryCredentials.Add(\"Identity\", \"system\")\n        \n    }\n    \n    $registryServer = $OctopusParameters[\"Octopus.Action.Package[Template.Azure.Container.Image].Image\"]\n    $registryServer = $registryServer.Substring(0, $registryServer.IndexOf(\"/\"))\n    $registryCredentials.Add(\"Server\", $registryServer)\n       \n    # Add credentials\n    $PSBoundParameters.Add(\"Registry\", $registryCredentials)\n}\n\n# Define secrets component\nif ($secretRef.Count -gt 0)\n{\n\t# Add to parameters\n    $PSBoundParameters.Add(\"Secret\", $secretRef)\n}\n\n# Create new configuration object\nWrite-Host \"Creating new Configuration Object ...\"\n$configurationObject = New-AzContainerAppConfigurationObject @PSBoundParameters\n$PSBoundParameters.Clear()\n\n# Define parameters\n$PSBoundParameters.Add(\"Name\", $OctopusParameters[\"Template.Azure.Container.Name\"])\n$PSBoundParameters.Add(\"TemplateContainer\", $containerDefinition)\n$PSBoundParameters.Add(\"ResourceGroupName\", $templateAzureResourceGroup)\n$PSBoundParameters.Add(\"Configuration\", $configurationObject)\n\n\n# Check to see if the container app already exists\n$containerApps = Get-AzContainerApp -ResourceGroupName $templateAzureResourceGroup\n\nif ($null -eq $containerApps)\n{\n  $containerApp = $null\n}\nelse\n{\n  $containerApp = ($containerApps | Where-Object {$_.Name -eq $OctopusParameters[\"Template.Azure.Container.Name\"]})\n}\n\nif ($null -eq $containerApp)\n{\n\t# Add parameters required for creating container app\n\t$PSBoundParameters.Add(\"EnvironmentId\", $templateEnvironmentName)\n\t$PSBoundParameters.Add(\"Location\", $templateAzureLocation)\n\t\n\t# Deploy container\n    Write-Host \"Creating new container app ...\"\n\tNew-AzContainerApp @PSBoundParameters\n}\nelse\n{\n\tWrite-Host \"Updating existing container app ...\"\n    Update-AzContainerApp @PSBoundParameters\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "a1ae1b6c-99d0-4ee5-9c3c-08c345966842",
-      "Name": "Template.Azure.ResourceGroup.Name",
-      "Label": "Azure Resource Group Name",
-      "HelpText": "Provide the resource group name to create the environment in.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fb92b5d7-5e48-485d-9222-dc2c97b58535",
-      "Name": "Template.Azure.Account.SubscriptionId",
-      "Label": "Azure Account Subscription Id",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `SubscriptionNumber` property to for this entry.  Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.SubscriptionNumber}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e1ce647f-956e-48d1-8002-44d958f1c8a4",
-      "Name": "Template.Azure.Account.ClientId",
-      "Label": "Azure Account Client Id",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Client` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Client}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a02e3fd0-9d91-4106-84a4-ff0d68e5de7c",
-      "Name": "Template.Azure.Account.TenantId",
-      "Label": "Azure Account Tenant Id",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `TenantId` property to for this entry.   If blank, it will use the Managed Identity tenant.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.TenantId}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7bd73320-1889-41eb-a1c0-c8788e5eed9d",
-      "Name": "Template.Azure.Account.Password",
-      "Label": "Azure Account Password",
-      "HelpText": "The subscription ID of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `Password` property to for this entry.   Leave blank to use the Managed Identity.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Password}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "79b217e1-f2c4-476b-a37a-02a549731e1a",
-      "Name": "Template.Azure.Account.JWTToken",
-      "Label": "Azure Account JWT Token",
-      "HelpText": "The JWT token of the Azure account to use.  This value can be retrieved from an Azure Account variable type.  Add an Azure Account to your project , then assign the `OpenIdConnect.Jwt` property to for this entry.   Leave blank if you're using an Azure Service Principal account type.\n\nFor example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.OpenIdConnect.Jwt}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f7fafc7e-2658-4a6f-ac30-7d9f738b9f52",
-      "Name": "Template.ContainerApp.Environment.Name",
-      "Label": "Container App Environment Name",
-      "HelpText": "The name or ID of the container app environment to deploy to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "31f02b7e-4822-49de-97dc-ee981b12268c",
-      "Name": "Template.Azure.Location.Name",
-      "Label": "Azure Location",
-      "HelpText": "The location in which to create the container app environment.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d74123b0-4104-45b9-ae12-b1f808b8b948",
-      "Name": "Template.Azure.Container.Name",
-      "Label": "Container Name",
-      "HelpText": "The name of the container to create/update.  If you want to use the image name, specify `#{Octopus.Action.Package[Template.Azure.Container.Image].PackageId | Replace \"/\" \"-\"}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1bdb6d31-4b97-4eab-aca3-5a60891b3455",
-      "Name": "Template.Azure.Container.Image",
-      "Label": "Container Image",
-      "HelpText": "Select the container image to deploy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "9e7aa5cf-9bab-4303-a851-1b8757f2f486",
-      "Name": "Template.Azure.Container.Variables",
-      "Label": "Environment variables",
-      "HelpText": "JSON formatted key/value pair of environment variables to pass to the container.  This supports use of OctoStache.\n\n```\n[\n  {\n    \"name\": \"ConnectionStrings__CatalogConnection\",\n    \"value\": \"Server=#{Project.SQL.DNS},1433;Integrated Security=true;Initial Catalog=#{Project.Catalog.Database.Name};User Id=#{Project.SQL.Admin.Username};Password=#{Project.SQL.Admin.Password};Trusted_Connection=false;Trust Server Certificate=True;\"\n  },\n {\n  \"name\": \"MyPasswordFromSecret\",\n  \"secretref\": \"Name of my secret\"\n },\n ...\n]\n```",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "498f308d-a94c-4364-b0be-8d739ac63f4e",
-      "Name": "Template.Azure.Container.Secrets",
-      "Label": "Secrets",
-      "HelpText": "JSON formatted key/value pair of secrets to create/update.  This supports use of OctoStache.\n\n**Note:** The name of the secret must be lowercase.\n\n```\n[\n  {\n    \"name\": \"mysecret\",\n    \"value\": \"#{Project.SQL.Admin.Password}\"\n  },\n ...\n]\n```",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "20e3e428-62b9-4eef-9cdc-780a0eedee79",
-      "Name": "Template.Azure.Container.Cpu",
-      "Label": "Resource CPU",
-      "HelpText": "The amount of CPU to allocate to the container app.\n\nExample: 0.5",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d804f749-625e-4ca5-9bef-13fc2c2a463c",
-      "Name": "Template.Azure.Container.Memory",
-      "Label": "Resource Memory",
-      "HelpText": "The amount of memory to allocate to the container app.\n\nExamples: 250Mb or 4.0Gi",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a506b328-4e10-49fe-947b-6623d4d392c1",
-      "Name": "Template.Azure.Container.Ingress.Port",
-      "Label": "Container Ingress Port",
-      "HelpText": "The port to allow traffic to the container.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "682d68a4-f1eb-469c-9557-9577ed9f1505",
-      "Name": "Template.Azure.Container.ExternalIngress",
-      "Label": "External Ingress",
-      "HelpText": "Whether the ingress is externally accessible or not.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2026-01-28T18:05:42.201Z",
-    "OctopusVersion": "2026.1.5902",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "azure"
-}
diff --git a/step-templates/azure-devops-build-pipeline.json b/step-templates/azure-devops-build-pipeline.json
deleted file mode 100644
index 5f3bf1ca5..000000000
--- a/step-templates/azure-devops-build-pipeline.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "Id": "405e97d7-e7ad-4d62-81cd-5d5fc751ef42",
-    "Name": "Run Azure DevOps Build Pipeline",
-    "Description": "Will trigger a build pipeline in Azure DevOps for a specified branch using the [Azure DevOps REST API](https://docs.microsoft.com/en-us/rest/api/azure/devops/?view=azure-devops-rest-6.1).",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "Author": "adamoctoclose",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$AzureDevOpsAccessKey = $AzureDevOpsAccessKey\n$AzureDevOpsOrganizationName = $AzureDevOpsOrganizationName\n$AzureDevOpsProjectName = $AzureDevOpsProjectName\n$AzureDevOpsPipelineName = $AzureDevOpsPipelineName\n$AzureDevOpsBranch = $AzureDevOpsBranch\n$AzureDevOpsWaitUntilCompletion = $AzureDevOpsWaitUntilCompletion\n$AzureDevOpsVariables = $AzureDevOpsVariables\n\nfunction Test-RequiredValues\n{\n\tparam (\n    \t[PSVariable]$variableToCheck\n    )\n    if ([string]::IsNullOrWhiteSpace($variableToCheck.Value) -eq $true)\n    {\n    \tWrite-Host \"$($variableToCheck.Name) is required.\"\n        return $false\n    }\n    return $true\n}\nfunction Get-BuildPipelineId \n{\n    param (\n        $defaultUrl,\n        $pipeline\n    )\n    try {\n        Write-Host \"Getting list of available pipelines\"\n        $url = \"$defaultUrl/_apis/pipelines?api-version=6.0-preview.1\"\n        $pipelines = Invoke-RestMethod -Uri $url -Method GET -Headers $azureDevOpsAuthenticationHeader\n        if([string]::IsNullOrWhiteSpace($pipelines) -eq $true)\n        {\n            Write-Error \"Couldn't find any pipelines in $AzureDevOpsPipelineName\"\n            Exit 1\n        }\n        $pipelineId = ($pipelines.value | Where-Object {$_.name -eq $pipeline}).id\n        if([string]::IsNullOrWhiteSpace($pipelineId) -eq $true)\n        {\n            Write-Error \"Found ${$pipelines.count} pipelines in project $AzureDevOpsProjectName but couldn't find $AzureDevOpsPipelineName\"\n            Exit 1\n        }\n        return $pipelineId\n    }\n    catch \n    {\n        Write-Error \"An error occurred while getting the pipelines:`n$($_.Exception.Message)\"\n        Exit 1\n    }\n}\nfunction Invoke-BuildPipeline \n{\n    param (\n        $defaultUrl,\n        $pipelineId,\n        $body\n    )\n    try {\n        $url = \"$defaultUrl/_apis/pipelines/$pipelineId/runs?api-version=6.0-preview.1\"\n        $pipeline = Invoke-RestMethod -Uri $url -Body $body -ContentType \"application/json\" -Method POST -Headers $azureDevOpsAuthenticationHeader\n        return $pipeline       \n    }\n    catch {\n        Write-Error \"An error occurred while invoking the pipeline:`n$($_.Exception.Message)\"\n        Exit 1\n    }    \n}\nfunction Get-BuildPipelineStatus \n{\n    param (\n        $defaultUrl,\n        $pipelineId,\n        $runId\n    )\n    try {\n        $url = \"$defaultUrl/_apis/pipelines/$pipelineId/runs/$($runId)?api-version=6.0-preview.1\"\n        return Invoke-RestMethod -Uri $url -Method GET -Headers $azureDevOpsAuthenticationHeader\n    }\n    catch {\n        Write-Error \"An error occurred while getting the pipeline status:`n$($_.Exception.Message)\"\n        Exit 1\n    }  \n}\n$verificationPassed = @()\n$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsAccessKey)\n$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsOrganizationName)\n$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsProjectName) \n$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsPipelineName)\n$verificationPassed += Test-RequiredValues -variableToCheck (Get-Variable AzureDevOpsBranch)\n\nif ($verificationPassed -contains $false)\n{\n\tWrite-Error \"Required values missing. Please see output for further details.\"\n\tExit 1\n}\n\n$azureDevOpsAuthenticationHeader = @{Authorization = 'Basic ' + [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(\":$($AzureDevOpsAccessKey)\")) }\n\nWrite-Host \"Azure DevOps Organization Name: $AzureDevOpsOrganizationName\"\nWrite-Host \"Azure DevOps Project Name: $AzureDevOpsProjectName\"\nWrite-Host \"Azure DevOps Pipeline Name: $AzureDevOpsPipelineName\"\nWrite-Host \"Azure DevOps Branch: $AzureDevOpsBranch\"\nWrite-Host \"Azure DevOps Wait Until Completion: $AzureDevOpsWaitUntilCompletion\"\n\n$defaultUrl = \"https://dev.azure.com/$AzureDevOpsOrganizationName/$AzureDevOpsProjectName\"\n\n$buildPipelineId = Get-BuildPipelineId -defaultUrl $defaultUrl -pipeline $AzureDevOpsPipelineName\n\n$body = @\"\n{\n    \"resources\": {\n      \"repositories\": {\n        \"self\": {\n          \"refName\": \"refs/heads/$AzureDevOpsBranch\"\n        }\n      }\n    },\n    \"variables\": {\n        $AzureDevOpsVariables\n    }\n  }\n\"@\n\n$run = Invoke-BuildPipeline -defaultUrl $defaultUrl -pipelineId $buildPipelineId -body $body\n\nWrite-Highlight \"The pipeline was successfully invoked, you can access the pipeline [here]($($run._links.web.href)).\"\n\nif ($run.state -ne \"completed\" -and $AzureDevOpsWaitUntilCompletion -eq $true)\n{\n    do \n    {\n        Write-Host \"Waiting for pipeline completion...\"\n        Start-Sleep 30\n        $status = Get-BuildPipelineStatus -defaultUrl $defaultUrl -pipelineId $buildPipelineId -runId $run.id\n        Write-Host \"Current Status: $($status.state)\"\n    }\n    while ($status.state -ne \"completed\") \n    if ($status.result -ne \"succeeded\")\n    {\n        Write-Error \"The Azure DevOps pipeline failed to complete successfully\"\n        Exit 1\n    }\n}\nelse \n{\n   Write-Host \"Azure DevOps pipeline status unknown. Update process to wait until completion for status updates.\"\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "5f4bdb73-ce24-4d5d-8541-82efae04b9f5",
-        "Name": "AzureDevOpsAccessKey",
-        "Label": "Azure DevOps Access Key",
-        "HelpText": "A [personal access token (PAT)](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=preview-page) is used as an alternate password to authenticate into Azure DevOps. Learn how to create, use, modify, and revoke PATs for Azure DevOps.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "63dd21d5-3d38-4bc2-9b09-9e2e4efa5974",
-        "Name": "AzureDevOpsOrganizationName",
-        "Label": "Azure DevOps Organization Name",
-        "HelpText": "The name of the Azure DevOps [organization](https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/organization-management?view=azure-devops).",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0d641c0c-bd5f-408a-9d9a-6ac710bd134c",
-        "Name": "AzureDevOpsProjectName",
-        "Label": "Azure DevOps Project Name",
-        "HelpText": "Project ID or project name",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b5e6ea31-5679-48b6-a5ec-4c7274dbb398",
-        "Name": "AzureDevOpsPipelineName",
-        "Label": "Azure DevOps Pipeline Name",
-        "HelpText": "The name of the pipeline you want to run in your Azure DevOps project\n\nExample: helloword-ci",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "62f3eab8-9785-4b96-9c52-a0a12f794e12",
-        "Name": "AzureDevOpsBranch",
-        "Label": "Azure DevOps Branch",
-        "HelpText": "Source branch to build from",
-        "DefaultValue": "Main",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ea425cd0-110e-45de-b38f-1c07b82cb390",
-        "Name": "AzureDevOpsWaitUntilCompletion",
-        "Label": "Azure DevOps Wait Until Completion",
-        "HelpText": "Wait for the pipeline to finish. If selected then the step will wait until the build pipeline is completed before finishing the step. If the build pipeline fails then the step will also fail.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "a3d3830b-87ca-40ab-aca0-e243f0080dda",
-        "Name": "AzureDevOpsVariables",
-        "Label": "AzureDevOpsVariables",
-        "HelpText": "Azure DevOps pipeline variables should be passed in as JSON. Example... \"TestEnv\": {\"isSecret\": false,\"value\": \"true\"},\"ProdEnv\": {\"isSecret\": false,\"value\": \"false\"}",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-03-25T13:12:50.932Z",
-      "OctopusVersion": "2020.5.5",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "adamoctoclose",
-    "Category": "azure-devops"
-  }
diff --git a/step-templates/azure-function-set-appsettings-from-azconfig.json b/step-templates/azure-function-set-appsettings-from-azconfig.json
deleted file mode 100644
index 444baf04f..000000000
--- a/step-templates/azure-function-set-appsettings-from-azconfig.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "Id": "67fcc93c-509c-4c13-bc24-645eff53c5c2",
-  "Name": "Azure Function - Set AppSettings from Azure AppConfig",
-  "Description": "This step retrieves one or more key/values from an Azure App Configuration store and adds them to an Azure App Function's AppSettings.\n\nYou can retrieve individual keys that match a specific name, and you can choose a custom setting name for each key.\n\nWildcard search is also supported using the `*` notation in the **Key Names** parameter. Note: Combining a wildcard search with custom setting names is not supported.\n\nYou can also combine retrieved values with additional parameters passed into the step using the `Additional AppSettings` parameter.\n\nAuthentication is performed using an Azure Service Principal.\n\n---\n\n**Required:** \n- An Azure account with permission to both retrieve values from the Azure App Config store and publish to the App Function.\n- The `az` CLI on the target or worker. If the CLI can't be found, the step will fail. \n\nNotes:\n\n- Tested on Octopus `2024.1` using az version `2.38.0`\n- Tested with both Windows PowerShell and PowerShell Core (on Linux).\n- Slot Settings are not currently supported.",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# KV Variables\n$global:AzureAppConfigStoreName = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreName\"]\n$global:AzureAppConfigStoreEndpoint = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreEndpoint\"]\n$global:AzureAppConfigRetrievalMethod = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.RetrievalMethod\"]\n$ConfigStoreKeyNames = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.KeyNames\"]\n$global:ConfigStoreLabels = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.Labels\"]\n$global:SuppressWarnings = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.SuppressWarnings\"] -ieq \"True\"\n$global:TreatWarningsAsErrors = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.TreatWarningsAsErrors\"] -ieq \"True\"\n\n# Function Variables\n$FunctionName = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.FunctionName\"]\n$ResourceGroup = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.ResourceGroup\"]\n$AdditionalSettingsValues = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.AdditionalSettingsValues\"]\n$Slot = $OctopusParameters[\"AzFunction.SetAppSettings.FromAzAppConfig.Slot\"]\n\n# KV params validation\nif ([string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName) -and [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {\n    throw \"Either parameter ConfigStoreName or ConfigStoreEndpoint not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($global:AzureAppConfigRetrievalMethod)) {\n    throw \"Required parameter AzFunction.SetAppSettings.FromAzAppConfig.RetrievalMethod not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($ConfigStoreKeyNames) -and [string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {\n    throw \"Either AzFunction.SetAppSettings.FromAzAppConfig.KeyNames or AzFunction.SetAppSettings.FromAzAppConfig.Labels not specified\"\n}\n\n# Function params validation\nif ([string]::IsNullOrWhiteSpace($FunctionName)) {\n    throw \"Required parameter AzureFunction.ConfigureAppSettings.FunctionName not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($ResourceGroup)) {\n    throw \"Required parameter AzureFunction.ConfigureAppSettings.ResourceGroup not specified\"\n}\n\n$RetrieveAllKeys = $global:AzureAppConfigRetrievalMethod -ieq \"all\"\n$global:ConfigStoreParameters = \"\"\nif (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {\n    $global:ConfigStoreParameters += \" --name \"\"$global:AzureAppConfigStoreName\"\"\"\n}\nif (-not [string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {\n    $global:ConfigStoreParameters += \" --endpoint \"\"$global:AzureAppConfigStoreEndpoint\"\"\"\n}\n\n### Helper functions\nfunction Test-ForAzCLI() {\n    $oldPreference = $ErrorActionPreference\n    $ErrorActionPreference = \"Stop\"\n    try { \n        if (Get-Command \"az\") {\n            return $True\n        }\n    }\n    catch { \n        return $false\n    }\n    finally { \n        $ErrorActionPreference = $oldPreference \n    }\n}\n\n\nfunction Write-OctopusWarning(\n    [string] $Message\n) {\n    if ($global:TreatWarningsAsErrors) {\n        throw \"Error: $Message\"\n    }\n    else {\n        if ($global:SuppressWarnings -eq $False) {\n            Write-Warning -Message $Message\n        }\n        else {\n            Write-Verbose -Message $Message\n        }\n    }\n}\n\nfunction Save-AppSetting(\n    [string]$settingName, \n    [string]$settingValue) {\n\n    $global:Settings += [PsCustomObject]@{name = $settingName; value = $settingValue; slotSetting = $false }\n}\n\nfunction Find-AzureAppConfigMatchesFromKey(\n    [string]$KeyName,\n    [bool]$IsWildCard,\n    [string]$settingName,\n    [PsCustomObject]$AppConfigValues) {\n\n    if ($IsWildCard -eq $False) {\n        Write-Verbose \"Finding exact match for: $keyName\"\n        $matchingAppConfigKeys = $appConfigValues | Where-Object { $_.key -ieq $keyName }\n        if ($null -eq $matchingAppConfigKeys -or $matchingAppConfigKeys.Count -eq 0) {\n            Write-OctopusWarning \"Unable to find a matching key in Azure App Config for: $keyName\"\n        }\n        else {\n\n            if ($matchingAppConfigKeys.Count -gt 1) {\n                Write-OctopusWarning \"Found multiple matching keys ($($matchingAppConfigKeys.Count)) in Azure App Config for: $keyName. This is usually due to multiple values with labels\"\n\n                foreach ($matchingAppConfigKey in $matchingAppConfigKeys) {\n                    Write-Verbose \"Found match for $keyName $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {\"($($matchingAppConfigKey.content_type))\"})\"\n                    $settingValue = $matchingAppConfigKey.value\n        \n                    if ([string]::IsNullOrWhiteSpace($settingName)) {\n                        $settingName = $keyName.Trim()\n                    }\n                    if (![string]::IsNullOrWhiteSpace($matchingAppConfigKey.label)) {\n                        $settingName = \"$($keyName.Trim())-$($matchingAppConfigKey.label)\"\n                        Write-Verbose \"Appending label to setting name to avoid duplicate setting: $settingName\"\n                    }\n        \n                    Save-AppSetting -settingName $settingName -settingValue $settingValue\n                }\n            } \n            else {\n                $matchingAppConfigKey = $matchingAppConfigKeys | Select-Object -First 1\n                Write-Verbose \"Found match for $keyName $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {\"($($matchingAppConfigKey.content_type))\"})\"\n                $settingValue = $matchingAppConfigKey.value\n    \n                if ([string]::IsNullOrWhiteSpace($settingName)) {\n                    $settingName = $keyName.Trim()\n                }\n    \n                Save-AppSetting -settingName $settingName -settingValue $settingValue\n            }\n        }\n    }\n    else {\n        Write-Verbose \"Finding wildcard match for: $keyName\"\n        $matchingAppConfigKeys = @($appConfigValues | Where-Object { $_.key -ilike $keyName })\n        if ($matchingAppConfigKeys.Count -eq 0) {\n            Write-OctopusWarning \"Unable to find any matching keys in Azure App Config for wildcard: $keyName\"\n        }\n        else {\n            foreach ($match in $matchingAppConfigKeys) {\n                # Have to explicitly set settings as they are wildcard matches\n                $settingName = $match.key\n                $settingValue = $match.value\n                Write-Verbose \"Found wildcard match '$settingName' $(if(![string]::IsNullOrWhiteSpace($matchingAppConfigKey.content_type)) {\"($($matchingAppConfigKey.content_type))\"})\"\n                Save-AppSetting -settingName $settingName -settingValue $settingValue\n            }\n        }\n    }\n}\n\nfunction Find-AzureAppConfigMatchesFromLabels() {\n    \n    Write-Verbose \"Retrieving values matching labels: $global:ConfigStoreLabels\"\n    $command = \"az appconfig kv list $global:ConfigStoreParameters --label \"\"$global:ConfigStoreLabels\"\" --auth-mode login\"\n            \n    Write-Verbose \"Invoking expression: $command\"\n    $appConfigResponse = Invoke-Expression -Command $command\n    $ExitCode = $LastExitCode\n    Write-Verbose \"az exit code: $ExitCode\"\n    if ($ExitCode -ne 0) {\n        throw \"Error retrieving appsettings. ExitCode: $ExitCode\"\n    }\n\n    if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {\n        Write-OctopusWarning \"Null or empty response received from Azure App Configuration service\"\n    }\n    else {\n        $appConfigValues = $appConfigResponse | ConvertFrom-Json\n        if ($appConfigValues.Count -eq 0) {\n            Write-OctopusWarning \"Unable to find any matching keys in Azure App Config for labels: $global:ConfigStoreLabels\"\n        }\n        else {\n            Write-Verbose \"Finding match(es) for labels: $global:ConfigStoreLabels\"\n            foreach ($appConfigValue in $appConfigValues) {\n                # Have to explicitly set setting Name here as its a match based on label alone\n                $settingName = $appConfigValue.key\n                Write-Verbose \"Found label match '$($appConfigValue.key)' $(if(![string]::IsNullOrWhiteSpace($appConfigValue.content_type)) {\"($($appConfigValue.content_type))\"})\"\n                if (![string]::IsNullOrWhiteSpace($appConfigValue.label)) {\n                    $settingName = \"$($settingName)-$($appConfigValue.label)\"\n                    Write-Verbose \"Appending label to setting to avoid duplicate name: $settingName\"\n                }\n                $settingValue = $appConfigValue.value\n                \n                Save-AppSetting -settingName $settingName -settingValue $settingValue\n            }\n        }\n    }\n}\n\n# Check if Az cli is installed.\n$azCliAvailable = Test-ForAzCLI\nif ($azCliAvailable -eq $False) {\n    throw \"Cannot find the Azure CLI (az) on the machine. This must be available to continue.\"\t\n}\n\n# Begin KV Retrieval\n$Keys = @()\n$global:Settings = @()\n\n# Extract key names+optional custom setting name\n@(($ConfigStoreKeyNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $keyDefinition = ($_ -Split \"\\|\")\n        $keyName = $keyDefinition[0].Trim()\n        $KeyIsWildcard = $keyName.EndsWith(\"*\")\n        $settingName = $null\n        if ($keyDefinition.Count -gt 1) {\n            if ($KeyIsWildcard) {\n                throw \"Key definition: '$_' evaluated as a wildcard with a custom setting name. This is not supported.\"\n            }\n            $settingName = $keyDefinition[1].Trim()\n        }\n\n        if ([string]::IsNullOrWhiteSpace($keyName)) {\n            throw \"Unable to establish key name from: '$_'\"\n        }\n\n        $key = [PsCustomObject]@{\n            KeyName       = $keyName\n            KeyIsWildcard = $KeyIsWildcard\n            SettingName   = if (![string]::IsNullOrWhiteSpace($settingName)) { $settingName } else { \"\" }\n        }\n        $Keys += $key\n    }\n}\n\n$LabelsArray = $global:ConfigStoreLabels -Split \",\" | Where-Object { [string]::IsNullOrWhiteSpace($_) -eq $False }\n\nWrite-Verbose \"Azure AppConfig Retrieval Method: $global:AzureAppConfigRetrievalMethod\"\nif (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreName)) {\n    Write-Verbose \"Azure AppConfig Store Name: $global:AzureAppConfigStoreName\"\n}\nif (![string]::IsNullOrWhiteSpace($global:AzureAppConfigStoreEndpoint)) {\n    Write-Verbose \"Azure AppConfig Store Endpoint: $global:AzureAppConfigStoreEndpoint\"\n}\nWrite-Verbose \"Suppress warnings: $global:SuppressWarnings\"\nWrite-Verbose \"Treat warnings as errors: $global:TreatWarningsAsErrors\"\nWrite-Verbose \"Keys to retrieve: $($Keys.Count)\"\nWrite-Verbose \"Labels to retrieve: $($LabelsArray.Count)\"\n\n$appConfigResponse = $null\n\n# Retrieving all keys should be more performant, but may have a larger payload response.\nif ($RetrieveAllKeys) {\n    \n    if ($Keys.Count -gt 0) {\n        Write-Host \"Retrieving ALL config values from store\"\n        $command = \"az appconfig kv list $global:ConfigStoreParameters --all --auth-mode login\"\n    \n        if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {\n            $command += \" --label \"\"$global:ConfigStoreLabels\"\" \"\n        }\n        Write-Verbose \"Invoking expression: $command\"\n        $appConfigResponse = Invoke-Expression -Command $command\n        $ExitCode = $LastExitCode\n        Write-Verbose \"az exit code: $ExitCode\"\n        if ($ExitCode -ne 0) {\n            throw \"Error retrieving appsettings. ExitCode: $ExitCode\"\n        }\n    \n        if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {\n            Write-OctopusWarning \"Null or empty response received from Azure App Configuration service\"\n        }\n        else {\n            $appConfigValues = $appConfigResponse | ConvertFrom-Json\n        }\n\n        foreach ($key in $Keys) {\n            $keyName = $key.KeyName\n            $KeyIsWildcard = $key.KeyIsWildcard\n            $SettingName = $key.SettingName\n        \n            Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -SettingName $SettingName -AppConfigValues $appConfigValues\n        }\n    }\n    # Possible that ONLY labels have been provided\n    elseif ($LabelsArray.Count -gt 0) {\n        Find-AzureAppConfigMatchesFromLabels \n    }\n}\n# Loop through and get keys based on the supplied names\nelse {\n    \n    Write-Host \"Retrieving keys based on supplied names...\"\n    if ($Keys.Count -gt 0) {\n        foreach ($key in $Keys) {\n            $keyName = $key.KeyName\n            $KeyIsWildcard = $key.KeyIsWildcard\n            $settingName = $key.SettingName\n\n            if ([string]::IsNullOrWhiteSpace($settingName)) {\n                $settingName = \"$($keyName.Trim())\"\n            }\n\n            Write-Verbose \"Retrieving values matching key: $keyName from store\"\n            $command = \"az appconfig kv list $global:ConfigStoreParameters --key \"\"$keyName\"\" --auth-mode login\"\n            \n            if (![string]::IsNullOrWhiteSpace($global:ConfigStoreLabels)) {\n                $command += \" --label \"\"$global:ConfigStoreLabels\"\" \"\n            }\n            Write-Verbose \"Invoking expression: $command\"\n\n            $appConfigResponse = Invoke-Expression -Command $command\n            $ExitCode = $LastExitCode\n            Write-Verbose \"az exit code: $ExitCode\"\n            if ($ExitCode -ne 0) {\n                throw \"Error retrieving appsettings. ExitCode: $ExitCode\"\n            }\n\n            if ([string]::IsNullOrWhiteSpace($appConfigResponse)) {\n                Write-OctopusWarning \"Null or empty response received from Azure App Configuration service\"\n            }\n            else {\n                $appConfigValues = $appConfigResponse | ConvertFrom-Json\n                if ($appConfigValues.Count -eq 0) {\n                    Write-OctopusWarning \"Unable to find a matching key in Azure App Config for: $keyName\"\n                }\n                else {\n                    Write-Verbose \"Finding match(es) for: $keyName\"\n                    Find-AzureAppConfigMatchesFromKey -KeyName $keyName -IsWildcard $KeyIsWildcard -SettingName $settingName -AppConfigValues $appConfigValues\n                }\n            }\n        }\n    }\n}\n# End KV Retrieval\n\n# Begin AZ Function set\n\n$AdditionalSettings = @()\n#$SlotSettings = @()\n\n# Extract additional settings values\nif (-not [string]::IsNullOrWhiteSpace($AdditionalSettingsValues)) {\n    @(($AdditionalSettingsValues -Split \"`n\").Trim()) | ForEach-Object {\n        if (![string]::IsNullOrWhiteSpace($_)) {\n            Write-Verbose \"Working on: '$_'\"\n            if (-not $_.Contains(\"|\")) {\n                throw \"Setting '$_' doesnt contain the '|' delimiter. Multi-line values aren't supported.\"\n            }\n            $settingDefinition = ($_ -Split \"\\|\")\n            $settingName = $settingDefinition[0].Trim()\n            $settingValue = \"\"\n            if ($settingDefinition.Count -gt 1) {\n                $settingValue = $settingDefinition[1].Trim()\n            }\n            if ([string]::IsNullOrWhiteSpace($settingName)) {\n                throw \"Unable to establish additional setting name from: '$_'\"\n            }\n            $setting = [PsCustomObject]@{\n                name        = $settingName\n                value       = $settingValue\n                slotSetting = $false\n            }\n            $AdditionalSettings += $setting\n        }\n    }\n}\n\n\nif ($Settings.Count -gt 0 -or $AdditionalSettings.Count -gt 0) {\n    Write-Host \"Settings found to publish to App Function: $FunctionName\"\n\n    Write-Verbose \"Function Name: $FunctionName\"\n    Write-Verbose \"Resource Group: $ResourceGroup\"\n    Write-Verbose \"Slot: $Slot\"\n    Write-Verbose \"Settings: $($Settings.Count)\"\n    Write-Verbose \"Additional Settings: $($AdditionalSettings.Count)\"\n    if ($AdditionalSettings.Count -gt 0) {\n        Write-Verbose \"Combining additional settings with settings retrieved from Azure App Config\"\n        $Settings = $Settings + $AdditionalSettings\n    }\n\n    $settingsFile = $null\n\n    try {\n\n        $command = \"az functionapp config appsettings set --name=\"\"$Functionname\"\" --resource-group \"\"$ResourceGroup\"\" \"\n        if (-not([string]::IsNullOrWhiteSpace($Slot))) {\n            $command += \" --slot \"\"$Slot\"\" \"\n        }\n\n        if ($Settings.Count -ge 1) {\n            $settingsFile = [System.IO.Path]::GetRandomFileName()\n            $ConvertToJsonParameters = @{}\n            if ($PSVersionTable.PSVersion.Major -ge 6) {\n                $ConvertToJsonParameters.Add(\"AsArray\", $True)\n            }\n            $Settings | ConvertTo-Json @ConvertToJsonParameters | Set-Content -Path $settingsFile\n            $command += \" --settings '@$settingsFile'\"\n        }\n\n        Write-Verbose \"Invoking expression: $command\"\n        Write-Host \"##octopus[stderr-progress]\"\n        $settingsUpdateResponse = Invoke-Expression -Command $command\n        $ExitCode = $LastExitCode\n        Write-Verbose \"FunctionApp update ExitCode: $ExitCode\"\n        if ($ExitCode -ne 0) {\n            throw \"Error configuring appsettings for function app '$FunctionName'. ExitCode: $ExitCode\"\n        }\n        Write-Host \"##octopus[stderr-default]\"\n        if ($null -ne $settingsUpdateResponse) {\n            Write-Host \"Update of function '$FunctionName' was successful\"\n            try {\n                $functionSettings = $settingsUpdateResponse | ConvertFrom-Json\n                if ($null -ne $functionSettings) {\n                    $settingsCount = @($functionSettings | Where-Object { $_.slotSetting -eq $False }).Count\n                    $slotSettingsCount = @($functionSettings | Where-Object { $_.slotSetting -eq $True }).Count\n                    Write-Verbose \"Function '$FunctionName' has $settingsCount setting(s) and $slotSettingsCount slot setting(s).\"\n                }\n            }\n            catch {}\n        }\n        \n    }\n    catch { throw }\n    finally {\n        if (-not([string]::IsNullOrWhiteSpace($settingsFile))) {\n            Write-Verbose \"Removing temporary settings file $settingsFile\"\n            Remove-Item -Path $settingsFile -Force -ErrorAction Ignore\n        }\n        if (-not([string]::IsNullOrWhiteSpace($slotSettingsFile))) {\n            Write-Verbose \"Removing temporary slot settings file $slotSettingsFile\"\n            Remove-Item -Path $slotSettingsFile -Force -ErrorAction Ignore\n        }\n    }\n}\nelse {\n    Write-Host \"No settings found to publish to the Azure App function\"\n}",
-    "Octopus.Action.Azure.AccountId": "#{AzFunction.SetAppSettings.FromAzAppConfig.AzureAccount}"
-  },
-  "Parameters": [
-    {
-      "Id": "b4c7f413-9341-4602-b5f4-5d69365e6cff",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.AzureAccount",
-      "Label": "Azure Account",
-      "HelpText": "An Azure account with permission to both retrieve values from the Azure App Config store and publish to the App Function",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "fcf6f1fd-1b3c-47d2-8037-802224c76452",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreName",
-      "Label": "Config Store Name",
-      "HelpText": "The name of the Azure App Configuration store. Provide this or the **Config store endpoint**.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7d6b9332-9c13-42b1-83b5-a8e84fc593f0",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.ConfigStoreEndpoint",
-      "Label": "Config Store Endpoint",
-      "HelpText": "The endpoint for the Azure App Configuration Store. Provide this or the **Config store name**.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c25b6875-2007-4d55-97a1-7ec7b061b06b",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.RetrievalMethod",
-      "Label": "Retrieval Method",
-      "HelpText": "Choose how the step calls the az cli. Either:\n- `All`: Retrieve all configuration values in one call\n- `Individually`: Retrieve configuration values in multiple calls; one for each key specified in the **Key Names** parameter.\n\nDefault: `All`",
-      "DefaultValue": "all",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "all|All\nindividual|Individually"
-      }
-    },
-    {
-      "Id": "cf069635-3027-47a4-8965-d229c8e64afd",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.KeyNames",
-      "Label": "Key Names",
-      "HelpText": "Specify the names of the keys to be returned from Azure App Configuration in the format `KeyName | CustomSettingName` where:\n\n- `KeyName` is the key to retrieve. Wildcards are supported by adding `*` at the end of the key name.\n- `CustomSettingName` is the _optional_ name to set for the AppSetting value in the App Function. *If this value isn't specified, the original key will be used.*.\n\n**Note:** Multiple keys can be retrieved by entering each one on a new line. Note: Combining a wildcard search with custom setting names is not supported.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "13007305-0fa2-468c-b7de-3c5317bd8611",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.Labels",
-      "Label": "Labels",
-      "HelpText": "Labels are an attribute on keys. Provide one or more labels in the format `label1,label2` to retrieve only selected keys tagged with those labels.\n\n**Note:** You can include both label values *and* specify key names if you want.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a7e79ba3-5ea3-40ab-9759-aa281e3c02f9",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.SuppressWarnings",
-      "Label": "Suppress warnings",
-      "HelpText": "Suppress warnings from being written to the task log. For example, when a supplied key can't be found in the Azure App Configuration store.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "62d8f95f-8a57-4908-b789-c3ecabd7c6dd",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.TreatWarningsAsErrors",
-      "Label": "Treat Warnings as Errors",
-      "HelpText": "Treats warnings as errors. If enabled the **Suppress Warnings** parameter is ignored. ",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "c8c1c14d-a515-47e7-b117-6a69644b78af",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.FunctionName",
-      "Label": "Azure Function App Name",
-      "HelpText": "The name of the Azure App function.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "07fcb750-13a1-4272-b6b6-a5cdd120a15f",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.ResourceGroup",
-      "Label": "Resource Group",
-      "HelpText": "The name of the resource group where the Function App is located.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fbd1b5bf-e1ce-415c-b7db-9c9d49e9f8e3",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.Slot",
-      "Label": "Slot",
-      "HelpText": "\nThe name of the slot. Defaults to the production slot if not specified.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "21e9c8b3-50ce-4006-83a7-86d7803c31ee",
-      "Name": "AzFunction.SetAppSettings.FromAzAppConfig.AdditionalSettingsValues",
-      "Label": "Additional AppSettings",
-      "HelpText": "Specify the name and values of any **additional** settings to be applied to the Azure App Function in the format `KEY | VALUE` where:\n\n- `KEY` is the name of the app setting to add\n- `VALUE` is the value to be used. [Octopus variables](https://octopus.com/docs/projects/variables) can be used here.\n\n\n**Note:** Multiple settings can be added by entering each one on a new line. As a result, values that span multiple lines will result in an error.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AzurePowerShell",
-  "$Meta": {
-    "ExportedAt": "2023-11-30T16:25:08.828Z",
-    "OctopusVersion": "2024.1.2558",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedAt": "2023-11-30T16:25:08.828Z",
-  "LastModifiedBy": "harrisonmeister",
-  "Category": "azure"
-}
diff --git a/step-templates/azure-keyvault-retrieve-secrets.json b/step-templates/azure-keyvault-retrieve-secrets.json
deleted file mode 100644
index 4702b485a..000000000
--- a/step-templates/azure-keyvault-retrieve-secrets.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "Id": "6f59f8aa-b2db-4f7a-b02d-a72c13d386f0",
-    "Name": "Azure Key Vault - Retrieve Secrets",
-    "Description": "This step retrieves one or more secrets from an Azure Key Vault and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nYou can retrieve secrets with a specific version, and you can choose a custom output variable name for each secret.\n\n---\n\n**Required:** \n- An azure account with permissions to retrieve secrets from the Azure Key Vault.\n- The`Az.KeyVault` PowerShell module installed on the target or worker. If the module can't be found, the step will fail. *The `Az` module(s) can be installed from the [PowerShell gallery](https://www.powershellgallery.com/packages/Az)*\n\nNotes:\n\n- Tested on Octopus `2021.1`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.\n\n",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "OctopusUseBundledTooling": "False",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$AzVaultModuleName = \"Az.KeyVault\"\n$AzureKeyVaultName = $OctopusParameters[\"Azure.KeyVault.RetrieveSecrets.VaultName\"]\n$VaultSecretNames = $OctopusParameters[\"Azure.KeyVault.RetrieveSecrets.VaultSecrets\"]\n$AzVaultModuleSpecificVersion = $OctopusParameters[\"Azure.KeyVault.RetrieveSecrets.AzModule.SpecificVersion\"]\n$AzVaultModuleCustomInstallLocation = $OctopusParameters[\"Azure.KeyVault.RetrieveSecrets.AzModule.CustomInstallLocation\"]\n$PrintVariableNames = $OctopusParameters[\"Azure.KeyVault.RetrieveSecrets.PrintVariableNames\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($AzureKeyVaultName)) {\n    throw \"Required parameter Azure.KeyVault.RetrieveSecrets.VaultName not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VaultSecretNames)) {\n    throw \"Required parameter Azure.KeyVault.RetrieveSecrets.VaultSecrets not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($AzVaultModuleSpecificVersion) -eq $False) {\n    $requiredVersion = [Version]$AzVaultModuleSpecificVersion\n}\n\n# Cross-platform bits\n$WindowsPowerShell = $True\nif ($PSEdition -eq \"Core\") {\n    $WindowsPowerShell = $False\n}\n\n### Helper functions\nfunction Get-Module-CrossPlatform {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $Name\n    )\n\n    $module = Get-Module -Name $Name -ListAvailable\n    if($WindowsPowerShell -eq $True -and $null -eq $module) {\n        $module = Get-InstalledModule -Name $Name\n    }\n\n    return $module\n}\n\n$PowerShellModuleName = $AzVaultModuleName\n\n# Check for Custom install location specified for AzVaultModule\nif ([string]::IsNullOrWhiteSpace($AzVaultModuleCustomInstallLocation) -eq $false) {\n    if ((Test-Path $AzVaultModuleCustomInstallLocation -IsValid) -eq $false) {\n        throw \"The path $AzVaultModuleCustomInstallLocation is not valid, please use a relative or absolute path.\"\n    }\n    \n    $AzVaultModulesFolder = [System.IO.Path]::GetFullPath($AzVaultModuleCustomInstallLocation)            \n    $LocalModules = (New-Item \"$AzVaultModulesFolder\" -ItemType Directory -Force).FullName\n    $env:PSModulePath = $LocalModules + [System.IO.Path]::PathSeparator + $env:PSModulePath\n\n    # Check to see if there\n    if ((Test-Path -Path \"$LocalModules/$AzVaultModuleName\") -eq $true)\n    {\n        # Use specific location\n        $PowerShellModuleName = \"$LocalModules/$PowerShellModuleName\"\n    }\n}\n\n# Import module\nif([string]::IsNullOrWhiteSpace($AzVaultModuleSpecificVersion)) {\n    Write-Host \"Importing module $PowerShellModuleName ...\"\n    Import-Module -Name $PowerShellModuleName\n}\nelse {\n    Write-Host \"Importing module $PowerShellModuleName ($AzVaultModuleSpecificVersion)...\"\n    Import-Module -Name $PowerShellModuleName -RequiredVersion $requiredVersion\n}\n\n# Check if Az.Vault Module is installed.\n$azVaultModule = Get-Module-CrossPlatform -Name $AzVaultModuleName\t\nif ($null -eq $azVaultModule) {\n    throw \"Cannot find the '$AzVaultModuleName' module on the machine. If you think it is installed, try restarting the Tentacle service for it to be detected.\"\t\n}\n\n$Secrets = @()\n$VariablesCreated = 0\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Extract secret names+versions \n@(($VaultSecretNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $secretDefinition = ($_ -Split \"\\|\")\n        $secretName = $secretDefinition[0].Trim()\n        $secretNameAndVersion = ($secretName -Split \" \")\n        $secretVersion = $null\n        if($secretNameAndVersion.Count -gt 1) {\n        \t$secretName = $secretNameAndVersion[0].Trim()\n            $secretVersion = $secretNameAndVersion[1].Trim()\n        }\n        if([string]::IsNullOrWhiteSpace($secretName)) {\n            throw \"Unable to establish secret name from: '$($_)'\"\n        }\n        $secret = [PsCustomObject]@{\n            Name         = $secretName\n            SecretVersion= $secretVersion\n            VariableName = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { \"\" }\n        }\n        $Secrets += $secret\n    }\n}\n\nWrite-Verbose \"Vault Name: $AzureKeyVaultName\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"Az Version specified: $AzVaultModuleSpecificVersion\"\nWrite-Verbose \"Az Custom Install Dir: $AzVaultModuleCustomInstallLocation\"\n\n# Retrieve Secrets\nforeach($secret in $secrets) {\n    $name = $secret.Name\n    $secretVersion = $secret.SecretVersion\n    $variableName = $secret.VariableName\n    if ([string]::IsNullOrWhiteSpace($variableName)) {\n        $variableName = \"$($AzureKeyVaultName.Trim()).$($name.Trim())\"\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($secretVersion)) {\n    \t$azSecretValue = Get-AzKeyVaultSecret -VaultName $AzureKeyVaultName -Name $name -AsPlainText    \n    }\n    else {\n    \t$azSecretValue = Get-AzKeyVaultSecret -VaultName $AzureKeyVaultName -Name $name -Version $secretVersion -AsPlainText\n    }\n    \n    Set-OctopusVariable -Name $variableName -Value $azSecretValue -Sensitive\n\n    if($PrintVariableNames -eq $True) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n    }\n    $VariablesCreated += 1\n}\n\nWrite-Host \"Created $variablesCreated output variables\"",
-      "Octopus.Action.Azure.AccountId": "#{Azure.KeyVault.RetrieveSecrets.Account}"
-    },
-    "Parameters": [
-      {
-        "Id": "5b05337d-a62d-44f4-a702-95b45a400160",
-        "Name": "Azure.KeyVault.RetrieveSecrets.Account",
-        "Label": "Azure Account",
-        "HelpText": "An Azure account with permissions to retrieve secrets from the Azure Key Vault.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "9b09b2b3-3c4d-4cbb-a065-8955f62448ad",
-        "Name": "Azure.KeyVault.RetrieveSecrets.VaultName",
-        "Label": "Vault Name",
-        "HelpText": "The name of the Azure Key Vault to retrieve secrets from.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "43949afd-1049-41fc-bd01-e878476f5952",
-        "Name": "Azure.KeyVault.RetrieveSecrets.VaultSecrets",
-        "Label": "Vault Secrets to retrieve",
-        "HelpText": "Specify the names of the Secrets to be returned from Azure Key Vault, in the format `SecretName SecretVersion | OutputVariableName` where:\n\n- `SecretName` is the name of the Secret to retrieve.\n- `SecretVersion` is the _optional_ version of the Secret to retrieve. *If this value isn't specified, the latest version will be retrieved*.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "46842344-405e-4633-a63f-115baaff7774",
-        "Name": "Azure.KeyVault.RetrieveSecrets.PrintVariableNames",
-        "Label": "Print output variable names",
-        "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "0c20c004-c792-4acc-81c5-62ecceecf6ac",
-        "Name": "Azure.KeyVault.RetrieveSecrets.AzModule.SpecificVersion",
-        "Label": "Az PowerShell Module version (optional)",
-        "HelpText": "If you wish to use a specific version of the `Az` PowerShell module (rather than the default), enter the version number here. e.g. `5.9.0`.\n\n**Note:** The version specified must exist on the machine.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d4d93a9a-72e1-48be-9ed6-78986bbfaa06",
-        "Name": "Azure.KeyVault.RetrieveSecrets.AzModule.CustomInstallLocation",
-        "Label": "Az PowerShell Install Location (optional)",
-        "HelpText": "If you wish to provide a custom path to the `Az` PowerShell module (rather than the default), enter the value here.\n\n**Note:** The Module must exist at the specified location on the machine. This step template will not download the Module.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedAt": "2021-06-02T08:34:02.548Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2021-06-02T08:34:02.548Z",
-      "OctopusVersion": "2021.1.7236",
-      "Type": "ActionTemplate"
-    },
-    "Category": "azure-keyvault"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-remove-resource-group-deployments.json b/step-templates/azure-remove-resource-group-deployments.json
deleted file mode 100644
index 666436efa..000000000
--- a/step-templates/azure-remove-resource-group-deployments.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "Id": "7351a3e7-df59-4e0c-863a-dca6f33ad2e1",
-  "Name": "Azure - Remove Resource Group Deployments",
-  "Description": "There is a cap in Azure that prevents having more than 800 deployments in the history at any given time: link to microsoft docs\n\nThis script helps alleviate this issue by limiting how many deployments are allowed exist, keeps the latest specified number of deployments, and will remove the rest.\n\nWhat it does: Logs into Azure, selects the resource group of the app. Based on how many deployments it wants to keep, it will keep the latest X deployments and remove the rest. If there are less deployments than X to keep, the script will skip.",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Azure.AccountId": "#{AzureSubscriptionAccount}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($null -ne $OctopusParameters) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($null -eq $result) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($null -ne $variable) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($null -eq $result) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n        else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nFunction Get-Deployments {\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$resourceGroupName\n    )\n    $listOfDeployments = Get-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName\n    $azureDeploymentNameAndDate = @()\n    $listOfDeployments | ForEach-Object { $azureDeploymentNameAndDate += [PSCustomObject]@{DeploymentName = $_.DeploymentName; Time = $_.Timestamp } }\n\n    return $azureDeploymentNameAndDate\n}\n\nFunction Remove-AzureRmResourceDeployments {\n\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$resourceGroupName,\n\n        [ValidateRange(0, 800)]\n        [int]$numberOfDeploymentsToKeep,\n\n        [int]$numberOfDaysToKeep\n    )\n\n    if ($null -ne $($numberOfDaysToKeep) -and $($numberOfDaysToKeep) -gt 0) {\n        $azureDeploymentNameAndDate = Get-Deployments $resourceGroupName\n\n        Write-Output \"Found $($azureDeploymentNameAndDate.Count) deployments from the $resourceGroupName resource group\"\n\n        $itemsToRemove = $azureDeploymentNameAndDate | Where-Object { $_.Time -lt ((get-date).AddDays( - $($numberOfDaysToKeep))) }\n        $numberOfItemsToRemove = $itemsToRemove | Measure-Object\n\n        if ($numberOfitemsToRemove.Count -eq 0) {\n            Write-Output \"There are no deployments older than $($numberOfDaysToKeep) days old in $($resourceGroupName)... skipping\"\n        }\n        else {\n            Write-Output \"Deleting $($numberOfitemsToRemove.Count) deployment(s) from $($resourceGroupName) as they are more than $($numberOfDaysToKeep) days old.\"\n            $itemsToRemove | ForEach-Object { Write-Output \"Deleting $($_.DeploymentName)\"; Remove-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName -name $_.DeploymentName }\n        }\n    }\n\n    if ($null -ne $($numberOfDeploymentsToKeep) -and $($numberOfDeploymentsToKeep) -gt 0) {\n        $azureDeploymentNameAndDate = Get-Deployments $resourceGroupName\n\n        Write-Output \"Found $($azureDeploymentNameAndDate.Count) deployments from the $resourceGroupName resource group\"\n\n        $itemsToRemove = $azureDeploymentNameAndDate | Sort-Object Time -Descending | select-object -skip $numberOfDeploymentsToKeep\n        $numberOfItemsToRemove = $itemsToRemove | Measure-Object\n\n        if ($numberOfitemsToRemove.Count -eq 0) {\n            Write-Output \"Max number of deployments set to keep is $numberOfDeploymentsToKeep... skipping\"\n        }\n        else {\n            Write-Output \"Maximum number of deployments exceeded. Deleting $($numberOfitemsToRemove.Count) deployment(s) from $($resourceGroupName)\"\n            $itemsToRemove | ForEach-Object { Write-Output \"Deleting $($_.DeploymentName)\"; Remove-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName -name $_.DeploymentName }\n        }\n    }\n}\n\n## --------------------------------------------------------------------------------------\n## Input\n## --------------------------------------------------------------------------------------\n\n$resourceGroupName = Get-Param 'Azure.RemoveResourceGroupDeployments.ResourceGroupName' -Required\n$numberOfDeploymentsToKeep = Get-Param 'Azure.RemoveResourceGroupDeployments.NumberOfDeploymentsToKeep' -Default 0\n$numberOfDaysToKeep = Get-Param 'Azure.RemoveResourceGroupDeployments.NumberOfDaysToKeep' -Default 0\n\nRemove-AzureRmResourceDeployments -resourceGroupName $resourceGroupName -numberOfDeploymentsToKeep $numberOfDeploymentsToKeep -numberOfDaysToKeep $numberOfDaysToKeep -Verbose\n"
-  },
-  "Parameters": [
-    {
-      "Id": "30a798bd-db11-44d3-82bd-28c3b13e77a5",
-      "Name": "AzureSubscriptionAccount",
-      "Label": "Azure Subscription Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "27c68d1f-7fdc-4e10-aa4a-77a0ff55eb29",
-      "Name": "Azure.RemoveResourceGroupDeployments.ResourceGroupName",
-      "Label": "Resource Group Name",
-      "HelpText": "Enter the name of the resource group.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2adcf1a9-d319-4ed3-80e7-4c533ddbe5cd",
-      "Name": "Azure.RemoveResourceGroupDeployments.NumberOfDeploymentsToKeep",
-      "Label": "Number Of Deployments To Keep",
-      "HelpText": "Number Of Deployments To Keep. Defaults to empty and will not be used.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c5ce930b-ea04-42b8-8ade-d167a26dab2a",
-      "Name": "Azure.RemoveResourceGroupDeployments.NumberOfDaysToKeep",
-      "Label": "Number Of Days To Keep.",
-      "HelpText": "Number Of Days To Keep. Defaults to empty and will not be used.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "Category": "Azure",
-  "SpaceId": "Spaces-1",
-  "LastModifiedBy": "bmdixon",
-  "$Meta": {
-    "ExportedAt": "2019-04-25T13:33:59.856Z",
-    "OctopusVersion": "2019.4.2",
-    "Type": "ActionTemplate"
-  }
-}
diff --git a/step-templates/azure-switch-staging-deployment-slot.json b/step-templates/azure-switch-staging-deployment-slot.json
deleted file mode 100644
index 13f3908d8..000000000
--- a/step-templates/azure-switch-staging-deployment-slot.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "Id": "7c39a530-6d16-4294-8ff5-74663ea13131",
-    "Name": "Switch Azure Staging Deployment Slot",
-    "Description": "This template will warm up your deployment slot then swap it with production. This step template should be placed after \"\"Deploy an Azure Web App\" Octopus Deploy template and be used with its sister step \"Create Azure RM Deployment Slot\"\n\nThis should be used for green-blue deployments, as referenced in this document: https://octopus.com/docs/deploying-applications/deploying-to-azure/deploying-a-package-to-an-azure-web-app/using-deployment-slots-with-azure-web-apps",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Properties": {
-      "Octopus.Action.Azure.AccountId": "#{AzureAccount}",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.ScriptBody": "###############################################\r\n# Switch Azure RM Staging Deployment Slot\r\n###############################################\r\n###############################################\r\n##Step1: Get Variables\r\n$ResourceGroupName             = $OctopusParameters[\"ResourceGroupName\"] \r\n$AppName                       = $OctopusParameters[\"AppName\"] \r\n$StagingSlotName               = $OctopusParameters[\"SlotName\"]\r\n$SmokeTestResponseCode         = $OctopusParameters[\"SmokeTestResponseCode\"]\r\n$smokeTestTimeoutSecs          = $OctopusParameters[\"smokeTestTimeoutSecs\"]\r\n###############################################\r\n###############################################\r\n$ErrorActionPreference = \"Stop\"\r\n\r\nFunction Invoke-RequiredVariablesCheck\r\n{\r\n    if([string]::IsNullOrEmpty($ResourceGroupName))\r\n    {\r\n        Write-Error \"ResourceGroupName variable is not set\"\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($AppName))\r\n    {\r\n        write-error \"AppName variable is not set\"\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($stagingSlotName))\r\n    {\r\n        write-error \"stagingSlotName variable is not set\"\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($smokeTestTimeoutSecs))\r\n    {\r\n        Write-Output \"Smoke test timeout not set, will use default of 180 seconds\"\r\n        $smokeTestTimeoutSecs = 180\r\n    }\r\n\r\n    if([string]::IsNullOrEmpty($SmokeTestResponseCode))\r\n    {\r\n        Write-Output \"Smoke test respose code not specfied will detail to 200\"\r\n        $SmokeTestResponseCode = \"200\"\r\n    }\r\n\r\n    Write-Verbose \"Variables in use are:\"\r\n    write-verbose \"ResourceGroupName:$ResourceGroupName\"\r\n    write-verbose \"AppName:$AppName\"\r\n    write-verbose \"stagingSlotName:$stagingSlotName\"\r\n    Write-Verbose \"smokeTestTimeoutSecs: $smokeTestTimeoutSecs\"\r\n    Write-Verbose \"SmokeTestResponseCode: $SmokeTestResponseCode\"\r\n}\r\n\r\nFunction Invoke-SlotWarmup\r\n{\r\n    [cmdletbinding()]\r\n    param\r\n    (\r\n        [parameter(Mandatory=$true)]\r\n        [string]$httpEndpoint,\r\n        [parameter(Mandatory=$true)]\r\n        [int32]$timeout\r\n    )\r\n    try \r\n    {\r\n        $response = (Invoke-WebRequest -UseBasicParsing -Uri $httpEndpoint -TimeoutSec $timeout).statusCode\r\n    }\r\n    catch \r\n    {\r\n        $response = $_.Exception.Response.StatusCode.Value__\r\n    }\r\n    return $response\r\n}\r\n\r\ntry \r\n{\r\n    Invoke-RequiredVariablesCheck\r\n    Write-Output \"Will attempt to warm up staging slot\"\r\n    $slotDetails = Get-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -Slot $StagingSlotName\r\n    \r\n    $hostname = $slotDetails.EnabledHostNames | select-object -First 1\r\n\r\n    Write-Output \"Performing default smoke test to warm up deployment slot\"\r\n    \r\n    $returnStatusCode = Invoke-SlotWarmup -httpEndpoint \"https://$hostname\" -timeout $smokeTestTimeoutSecs\r\n\r\n    if($returnStatusCode -ne $SmokeTestResponseCode)\r\n    {\r\n        Write-Error \"Response code to https://$hostname was $returnStatusCode and did not match the expected response code of $SmokeTestResponseCode. Deployment canceled\"\r\n    }\r\n    else \r\n    {\r\n        Write-Output \"Staging slot (https://$hostname) warmed up and responding ok\"\r\n    }\r\n\r\n    Write-Output \"Will now switch staging slot to production\"\r\n    Switch-AzureRmWebAppSlot -ResourceGroupName $ResourceGroupName -Name $AppName -SourceSlotName $StagingSlotName -DestinationSlotName \"Production\"\r\n    Write-Output \"Deployment slot switch complete\"\r\n}\r\ncatch \r\n{\r\n    Write-Error \"Error in Switch Azure RM Staging Deployment Slot Script. $_\"    \r\n}",
-      "Octopus.Action.Package.FeedId": null,
-      "Octopus.Action.Script.ScriptFileName": null,
-      "Octopus.Action.Package.PackageId": null
-    },
-    "Parameters": [
-      {
-        "Id": "4eb022c3-2d12-4f5b-acb0-80eaec2ce26c",
-        "Name": "ResourceGroupName",
-        "Label": "ResourceGroupName",
-        "HelpText": "Enter the name of the resource group you are deploying this Web App into",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "e44dbd73-6c0a-4c9f-b190-47396ea2534e",
-        "Name": "AppName",
-        "Label": "AppName",
-        "HelpText": "Enter the name of your app",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "c66cc42c-88e6-4008-8289-a45913dc36df",
-        "Name": "AzureAccount",
-        "Label": "AzureAccount",
-        "HelpText": "Enter the SPN used to connect to Azure",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "e9559ca6-751a-4939-888a-cbf76ce5c91d",
-        "Name": "SlotName",
-        "Label": "SlotName",
-        "HelpText": "Enter the name you wish to call your deployment slot",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "ed1fd1cf-479a-4aa6-beb5-404565a51ca7",
-        "Name": "SmokeTestResponseCode",
-        "Label": "SmokeTestResponseCode(Optional)",
-        "HelpText": "This is the response code that comes back from your web app. The default value is set to 200, if your app will respond with a different status code such as a 401 then please update the value.",
-        "DefaultValue": "200",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      },
-      {
-        "Id": "c906639e-f40d-4ab0-903c-d46462d8a8ae",
-        "Name": "smokeTestTimeoutSecs",
-        "Label": "smokeTestTimeoutSecs(Optional)",
-        "HelpText": "The timeout setting for waking up your web app. The default value is 180 seconds.",
-        "DefaultValue": "180",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        },
-        "Links": {}
-      }
-    ],
-    "LastModifiedOn": "2018-03-14T16:21:25.000+00:00",
-    "LastModifiedBy": "MarkDordoy",
-    "$Meta": {
-      "ExportedAt": "2018-03-14T16:21:25.214Z",
-      "OctopusVersion": "3.16.2",
-      "Type": "ActionTemplate"
-    },
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-web-app-disable-appoffline.json b/step-templates/azure-web-app-disable-appoffline.json
deleted file mode 100644
index 1c3f1d5f1..000000000
--- a/step-templates/azure-web-app-disable-appoffline.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "Id": "143ba6fd-968f-4f24-980b-49e47aa98f71",
-    "Name": "Azure Web App - Disable app_offline",
-    "Description": "This step template will remove an app_offline file from an Azure WebApp to safely bring the app domain online following a deployment.\n\nIt requires a set of [deployment credentials](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) for the Azure Web App.\n\n**Required:** \n- Credentials with access to the [Kudu VFS API](https://github.com/projectkudu/kudu/wiki/REST-API#vfs)\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$AzWebAppName = $OctopusParameters[\"AzWebApp.DisableAppOffline.AzWebAppName\"]\n$Filename = $OctopusParameters[\"AzWebApp.DisableAppOffline.Filename\"]\n$DeployUsername = $OctopusParameters[\"AzWebApp.DisableAppOffline.Deployment.Username\"]\n$DeployPassword = $OctopusParameters[\"AzWebApp.DisableAppOffline.Deployment.Password\"]\n$DeploymentUrl = $OctopusParameters[\"AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($AzWebAppName)) {\n    throw \"Required parameter AzWebApp.DisableAppOffline.AzWebAppName not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($Filename)) {\n    throw \"Required parameter AzWebApp.DisableAppOffline.Filename not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($DeployUsername)) {\n    throw \"Required parameter AzWebApp.DisableAppOffline.Deployment.Username not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($DeployPassword)) {\n    throw \"Required parameter AzWebApp.DisableAppOffline.Deployment.Password not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($DeploymentUrl)) {\n    throw \"Required parameter AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl not specified\"\n}\n\n$DeploymentUrl = $DeploymentUrl.TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\nWrite-Verbose \"AzWebApp.DisableAppOffline.AzWebAppName: $AzWebAppName\"\nWrite-Verbose \"AzWebApp.DisableAppOffline.Filename: $FileName\"\nWrite-Verbose \"AzWebApp.DisableAppOffline.Deployment.Username: $DeployUsername\"\nWrite-Verbose \"AzWebApp.DisableAppOffline.Deployment.Password: ********\"\nWrite-Verbose \"AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl: $DeploymentUrl\"\n\nWrite-Verbose \"Step Name: $StepName\"\n\ntry {\n    $credPair = \"$($DeployUsername):$($DeployPassword)\"\n    $encodedCredentials = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($credPair))\n    $headers = @{ \n        Authorization = \"Basic $encodedCredentials\"\n        # Ignore E-Tag\n        \"If-Match\"    = \"*\" \n    }\n\n    $filePathUri = \"$DeploymentUrl/site/wwwroot/$filename\"\n    Write-Host \"Invoking Delete request for '$filePathUri'\"\n    $response = Invoke-RestMethod -Method Delete -Uri $filePathUri -Headers $headers\n\n    Write-Verbose \"Response: $response\"\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorDetails = $_.ErrorDetails.Message\n    $Message = \"An error occurred invoking the Azure Web App REST API: $ExceptionMessage\"\n    if (![string]::IsNullOrWhiteSpace($ErrorDetails)) {\n        $Message += \"`nDetail: $ErrorDetails\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "b847fd97-bc71-4c89-99fb-bd5c2327027a",
-        "Name": "AzWebApp.DisableAppOffline.AzWebAppName",
-        "Label": "Azure Web App name",
-        "HelpText": "Provide the Azure Web App name.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0b2edf69-da0d-4750-882a-4036c67f0129",
-        "Name": "AzWebApp.DisableAppOffline.Filename",
-        "Label": "AppOffline file name",
-        "HelpText": "*Optional:* Choose the variation of the name of the app offline file. Default: `app_offline.htm`\n\nAvailable options:\n\n- `app_offline.htm`\n- `app_offline.html`",
-        "DefaultValue": "app_offline.htm",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "app_offline.htm|app_offline.htm\napp_offline.html|app_offline.html"
-        }
-      },
-      {
-        "Id": "c873f396-0ca1-4df9-b083-860541d24b61",
-        "Name": "AzWebApp.DisableAppOffline.Deployment.Username",
-        "Label": "Deployment username",
-        "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) username for the Azure Web App. Default: `$#{AzWebApp.DisableAppOffline.WebAppName}`.",
-        "DefaultValue": "$#{AzWebApp.DisableAppOffline.WebAppName}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1c18f666-c91d-411c-a86b-b92d0bddc4ed",
-        "Name": "AzWebApp.DisableAppOffline.Deployment.Password",
-        "Label": "Deployment password",
-        "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) password for the Azure Web App.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "023c4e13-2a25-4e29-916f-aaafea1d8284",
-        "Name": "AzWebApp.DisableAppOffline.Deployment.KuduRestApiUrl",
-        "Label": "Deployment REST API Url",
-        "HelpText": "*Optional:* Provide a custom deployment REST API URL. Default is: `https://#{AzWebApp.DisableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs`.",
-        "DefaultValue": "https://#{AzWebApp.DisableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-09-17T17:52:46.792Z",
-      "OctopusVersion": "2021.2.7536",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-web-app-enable-appoffline.json b/step-templates/azure-web-app-enable-appoffline.json
deleted file mode 100644
index 85e348cbb..000000000
--- a/step-templates/azure-web-app-enable-appoffline.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "Id": "852b78ae-eb32-43c0-bf55-0a5bdd7bebc8",
-    "Name": "Azure Web App - Enable app_offline",
-    "Description": "This step template will take a provided app_offline file from a package and upload it to an Azure Web App to enable a way to safely bring down the app domain for a subsequent deployment.\n\nIt requires a set of [deployment credentials](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) for the Azure Web App.\n\n**Required:** \n- Credentials with access to the [Kudu VFS API](https://github.com/projectkudu/kudu/wiki/REST-API#vfs)\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-      {
-        "Id": "ff7d24cc-7288-428f-985a-155c467d63ff",
-        "Name": "AzWebApp.EnableAppOffline.SourcePackage",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "AzWebApp.EnableAppOffline.SourcePackage"
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$SourcePackage = \"AzWebApp.EnableAppOffline.SourcePackage\"\n$AzWebAppName = $OctopusParameters[\"AzWebApp.EnableAppOffline.AzWebAppName\"]\n$FilePath = $OctopusParameters[\"AzWebApp.EnableAppOffline.FilePath\"]\n$Filename = $OctopusParameters[\"AzWebApp.EnableAppOffline.Filename\"]\n$DeployUsername = $OctopusParameters[\"AzWebApp.EnableAppOffline.Deployment.Username\"]\n$DeployPassword = $OctopusParameters[\"AzWebApp.EnableAppOffline.Deployment.Password\"]\n$DeploymentUrl = $OctopusParameters[\"AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($AzWebAppName)) {\n    throw \"Required parameter AzWebApp.EnableAppOffline.AzWebAppName not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Filename)) {\n    throw \"Required parameter AzWebApp.EnableAppOffline.Filename not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($DeployUsername)) {\n    throw \"Required parameter AzWebApp.EnableAppOffline.Deployment.Username not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($DeployPassword)) {\n    throw \"Required parameter AzWebApp.EnableAppOffline.Deployment.Password not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($DeploymentUrl)) {\n    throw \"Required parameter AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl not specified\"\n}\n\n$DeploymentUrl = $DeploymentUrl.TrimEnd('/')\n$ExtractPathKey = \"Octopus.Action.Package[$($SourcePackage)].ExtractedPath\"\n\n$ExtractPath = $OctopusParameters[$ExtractPathKey]\n$FilePath = Join-Path -Path $ExtractPath -ChildPath $FilePath\nif (!(Test-Path $FilePath)) {\n    throw \"Either the local or package extraction folder $FilePath does not exist or the Octopus Tentacle does not have permission to access it.\"\n}\n\n$sourceFilePath = Join-Path -Path $FilePath -ChildPath $Filename\n\nif (!(Test-Path $sourceFilePath)) {\n    throw \"The file located at '$sourceFilePath' does not exist or the Octopus Tentacle does not have permission to access it.\"\n}\n$destinationFilePathUri = \"$DeploymentUrl/site/wwwroot/$filename\"\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\nWrite-Verbose \"AzWebApp.EnableAppOffline.AzWebAppName: $AzWebAppName\"\nWrite-Verbose \"AzWebApp.EnableAppOffline.FilePath: $FilePath\"\nWrite-Verbose \"AzWebApp.EnableAppOffline.Filename: $FileName\"\nWrite-Verbose \"AzWebApp.EnableAppOffline.Deployment.Username: $DeployUsername\"\nWrite-Verbose \"AzWebApp.EnableAppOffline.Deployment.Password: ********\"\nWrite-Verbose \"AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl: $DeploymentUrl\"\n\nWrite-Verbose \"Step Name: $StepName\"\n\ntry {\n    $credPair = \"$($DeployUsername):$($DeployPassword)\"\n    $encodedCredentials = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($credPair))\n    $headers = @{ \n        Authorization = \"Basic $encodedCredentials\"\n        # Ignore E-Tag\n        \"If-Match\" = \"*\" \n    }\n    \n    Write-Host \"Invoking Put request for '$sourceFilePath' to '$destinationFilePathUri'\"\n    $response = Invoke-RestMethod -Method Put -Infile $sourceFilePath -Uri $destinationFilePathUri -Headers $headers -UserAgent 'powershell/1.0' -ContentType 'application/json'\n    \n    Write-Verbose \"Response: $response\"\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorDetails = $_.ErrorDetails.Message\n    $Message = \"An error occurred invoking the Azure Web App REST API: $ExceptionMessage\"\n    if (![string]::IsNullOrWhiteSpace($ErrorDetails)) {\n        $Message += \"`nDetail: $ErrorDetails\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "b847fd97-bc71-4c89-99fb-bd5c2327027a",
-        "Name": "AzWebApp.EnableAppOffline.AzWebAppName",
-        "Label": "Azure Web App name",
-        "HelpText": "Provide the Azure Web App name.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e15156cc-1fbd-439f-bbea-5eb1f5da8f2f",
-        "Name": "AzWebApp.EnableAppOffline.SourcePackage",
-        "Label": "AppOffline package source",
-        "HelpText": "Provide the package to source the `app_offline.htm` file from. ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "22fdf143-fd7b-48d8-ba52-eed69268b61c",
-        "Name": "AzWebApp.EnableAppOffline.FilePath",
-        "Label": "AppOffline file path",
-        "HelpText": "Provide the path (relative to the package) for the app offline file to be uploaded.\n\n*Note:* If left blank or empty, the file will be sourced from the root of the package.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0b2edf69-da0d-4750-882a-4036c67f0129",
-        "Name": "AzWebApp.EnableAppOffline.Filename",
-        "Label": "AppOffline file name",
-        "HelpText": "*Optional:* Choose the variation of the name of the app offline file. Default: `app_offline.htm`\n\nAvailable options:\n\n- `app_offline.htm`\n- `app_offline.html`",
-        "DefaultValue": "app_offline.htm",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "app_offline.htm|app_offline.htm\napp_offline.html|app_offline.html"
-        }
-      },
-      {
-        "Id": "c873f396-0ca1-4df9-b083-860541d24b61",
-        "Name": "AzWebApp.EnableAppOffline.Deployment.Username",
-        "Label": "Deployment username",
-        "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) username for the Azure Web App. Default: `$#{AzWebApp.EnableAppOffline.WebAppName}`.",
-        "DefaultValue": "$#{AzWebApp.EnableAppOffline.WebAppName}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1c18f666-c91d-411c-a86b-b92d0bddc4ed",
-        "Name": "AzWebApp.EnableAppOffline.Deployment.Password",
-        "Label": "Deployment password",
-        "HelpText": "Provide the user or application-scoped [deployment](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) password for the Azure Web App.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "023c4e13-2a25-4e29-916f-aaafea1d8284",
-        "Name": "AzWebApp.EnableAppOffline.Deployment.KuduRestApiUrl",
-        "Label": "Deployment REST API Url",
-        "HelpText": "*Optional:* Provide a custom deployment REST API URL. Default is: `https://#{AzWebApp.EnableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs`.",
-        "DefaultValue": "https://#{AzWebApp.EnableAppOffline.AzWebAppName}.scm.azurewebsites.net/api/vfs",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-09-17T17:45:50.539Z",
-      "OctopusVersion": "2021.2.7536",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-web-app-get-deployment-user.json b/step-templates/azure-web-app-get-deployment-user.json
deleted file mode 100644
index 37d0924d4..000000000
--- a/step-templates/azure-web-app-get-deployment-user.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "Id": "f87564d3-50e0-4265-8ed7-d95e3e21f869",
-    "Name": "Azure Web App - Get Deployment User",
-    "Description": "This step template will retrieve a set of [deployment credentials](https://docs.microsoft.com/en-gb/azure/app-service/deploy-configure-credentials) for an Azure Web App.\n\nIt will create two Octopus [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for use in other deployment or runbook steps. They will be named:\n\n- `userName` - the username from the provided deployment credentials.\n- `userPwd` - the password from the provided deployment credentials.\n\n**Required:** \n- An azure account with permissions to retrieve deployment credentials for the named Azure Web App.\n- The Azure CLI (`az`) is required to run this script. If running on a worker or deployment target, ensure this is installed.\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$resourceGroupName = $OctopusParameters[\"AzWebApp.DeploymentCreds.AzResourceGroup\"]\n$WebAppName = $OctopusParameters[\"AzWebApp.DeploymentCreds.AzWebAppName\"]\n$PublishCredentialType = $OctopusParameters[\"AzWebApp.DeploymentCreds.PublishCredentialType\"]\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($resourceGroupName)) {\n    throw \"Required parameter AzWebApp.DeploymentCreds.AzResourceGroup not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($WebAppName)) {\n    throw \"Required parameter AzWebApp.DeploymentCreds.AzWebAppName not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($PublishCredentialType)) {\n    throw \"Required parameter AzWebApp.DeploymentCreds.PublishCredentialType not specified\"\n}\n    \nWrite-Verbose \"Azure Resource Group Name: $resourceGroupName\"\nWrite-Verbose \"Azure Web App Name: $WebAppName\"\nWrite-Verbose \"Publish Credential Type: $PublishCredentialType\"\n\nWrite-Host \"Getting $PublishCredentialType publish profile deployment credentials...\"\n\n$profiles = az webapp deployment list-publishing-profiles --resource-group $resourceGroupName --name $WebAppName | ConvertFrom-Json | where { $_.publishMethod -ieq $PublishCredentialType } \n\nSet-OctopusVariable -name \"userName\" -value $profiles.userName -Sensitive\nWrite-Highlight \"Created output variable: ##{Octopus.Action[$StepName].Output.userName}\"\nSet-OctopusVariable -name \"userPWD\" -value $profiles.userPWD -Sensitive\nWrite-Highlight \"Created output variable: ##{Octopus.Action[$StepName].Output.userPWD}\"\n\nWrite-Host \"Output variables generated for deployment credentials!\"",
-      "Octopus.Action.Azure.AccountId": "#{AzWebApp.DeploymentCreds.AzAccount}",
-      "OctopusUseBundledTooling": "False"
-    },
-    "Parameters": [
-      {
-        "Id": "7f36b854-6cc8-4a64-a7b4-c3110044cd4b",
-        "Name": "AzWebApp.DeploymentCreds.AzWebAppName",
-        "Label": "Azure Web App name",
-        "HelpText": "Provide the Azure Web App name.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "41c6ca57-2078-4cbb-8e92-26c2207a3ef7",
-        "Name": "AzWebApp.DeploymentCreds.AzResourceGroup",
-        "Label": "Azure Resource Group",
-        "HelpText": "Provide Azure resource group.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "149ef6c1-716c-4738-9985-ea47e5fc6e9b",
-        "Name": "AzWebApp.DeploymentCreds.AzAccount",
-        "Label": "Azure Account",
-        "HelpText": "Provide Azure Account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "9ac94483-5e3b-49b3-9014-eb4875b95798",
-        "Name": "AzWebApp.DeploymentCreds.PublishCredentialType",
-        "Label": "Deployment credential type",
-        "HelpText": "Choose type of Deployment credentials should be retrieved. Default is: `MSDeploy`\n\nAvailable options are:\n\n- `MSDeploy`\n- `FTP`\n- `ZipDeploy`",
-        "DefaultValue": "MSDeploy",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "MSDeploy|MSDeploy\nFTP|FTP\nZipDeploy|ZipDeploy"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-09-17T17:13:19.362Z",
-      "OctopusVersion": "2021.2.7536",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "adamoctoclose",
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-web-app-restart.json b/step-templates/azure-web-app-restart.json
deleted file mode 100644
index 7caf08dee..000000000
--- a/step-templates/azure-web-app-restart.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "1f40e418-17bf-4b3e-bbe7-c6d41cbded93",
-  "Name": "Azure Web App - Restart",
-  "Description": "Restarts an azure web app.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the running machine</p>*",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Azure.AccountId": "#{azWebApp.AzureAcct}",
-    "Octopus.Action.Script.ScriptBody": "try {az --version}\ncatch\n{\n    throw \"az CLI not installed\"\n}\n\n$webApp = $OctopusParameters[\"Octopus.Action.Azure.WebAppName\"]\n$resourceGroup = $OctopusParameters[\"Octopus.Action.Azure.ResourceGroupName\"]\n$startIfStopped = $OctopusParameters[\"azWebApp.StartIfStopped\"]\n\nWrite-Host \"Checking webapp $webApp status in resource group $resourceGroup\"\n\n$appState = az webapp list --resource-group $resourceGroup --query \"[?name=='$webApp'].{state: state, hostName: defaultHostName}\" | ConvertFrom-Json\nif($appState.state -eq \"stopped\")\n{\n    if($startIfStopped -eq 'true')\n    {\n        Write-Host \"Webapp is not running. Starting...\" -NoNewline\n    \taz webapp start --name $webApp --resource-group $resourceGroup\n        Write-Host \"Done\"\n    }\n    else\n    {\n      Throw \"Webapp is not running.\"\n    }\n}\n\nWrite-Host \"Webapp running, restarting\"\n\nelse\n{\n\tWrite-Host \"Restarting $webApp in resource group $resourceGroup\"\n\taz webapp restart --name $webApp --resource-group $resourceGroup\n}\n\nStart-Sleep -s 5\n\n$appState = az webapp list --resource-group $resourceGroup --query \"[?name=='$webApp'].{state: state, hostName: defaultHostName}\" | ConvertFrom-Json\n\nif($appState.state -ne \"running\")\n{\n\tThrow \"Webapp failed to start.  Check the app's activity/error log\"\n}\n\nwrite-host \"Webapp $webApp running. Check at: $($appState.hostName)\"\n"
-  },
-  "Parameters": [
-    {
-      "Id": "e732ddaa-a43b-4369-8813-065286069d65",
-      "Name": "azWebApp.AzureAcct",
-      "Label": "Azure Account",
-      "HelpText": "The azure account that has access to the web app",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "901ec60b-0ffd-4d08-be6f-fa9e8aec457a",
-      "Name": "azWebApp.StartIfStopped",
-      "Label": "Start if stopped",
-      "HelpText": "If the web app is stopped, start it",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2022-05-17T10:59:12.694Z",
-    "OctopusVersion": "2022.1.2495",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "zogamorph",
-  "Category": "azure"
-}
\ No newline at end of file
diff --git a/step-templates/azure-web-app-rolling-restart.json b/step-templates/azure-web-app-rolling-restart.json
deleted file mode 100644
index 7283b86c3..000000000
--- a/step-templates/azure-web-app-rolling-restart.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "Id": "43cfc12d-5ae9-425d-ab01-7124ffdd9ee6",
-    "Name": "Azure Web App - Rolling Restart",
-    "Description": "Performs a delayed rolling restart of all instances within an Azure Web App\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the running machine</p>*",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "OctopusUseBundledTooling": "False",
-      "Octopus.Action.Azure.AccountId": "#{azWebApp.AzureAcct}",
-      "Octopus.Action.Script.ScriptBody": "try {az --version}\ncatch\n{\n    throw \"az CLI not installed\"\n}\n\n$webAppName = $OctopusParameters[\"azWebApp.WebAppName\"]\n$resourceGroup = $OctopusParameters[\"azWebApp.ResourceGroup\"]\n$restartDelay = $OctopusParameters[\"azWebApp.RestartDelay\"]\n\n\n\nWrite-Host \"Web App Name: $webAppName\"\nWrite-Host \"Resource Group: $resourceGroup\"\nWrite-Host \"Restart Delay: $restartDelay\"\n\nWrite-Host \"Checking $webAppName status in resource group $resourceGroup\"\n\n$appState = az webapp list --resource-group $resourceGroup --query \"[?name=='$webAppName'].{state: state, hostName: defaultHostName}\" | ConvertFrom-Json\n\n# only execute if running\nif($appState.state -eq \"running\")\n{\n    $appInstances = az webapp list-instances -n $webAppName --resource-group $resourceGroup --query '[].{Id: id}' | ConvertFrom-Json\n    Write-Host \"\" $appInstances.Count \"Instance(s) found`r`n\" -ForegroundColor Green\n\n    if($appInstances.count -gt 0){\n        foreach ($instance in $appInstances){\n            Write-Host \"Restarting Instance: $instance\"\n            az webapp restart --ids $instance.Id\n            Write-Host \"Pausing $restartDelay second(s)`r`n\" -ForegroundColor Yellow\n            Start-Sleep -Seconds $restartDelay\n        }\n    }\n}\n"
-    },
-    "Parameters": [
-      {
-        "Id": "6670dc01-4323-41b8-87f4-a824608bad71",
-        "Name": "azWebApp.AzureAcct",
-        "Label": "Azure Account",
-        "HelpText": "The azure account that has access to the web app",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "56dc3fcb-237d-4618-944a-441bd3d089c5",
-        "Name": "azWebApp.WebAppName",
-        "Label": "App Service Name",
-        "HelpText": "The azure web app name",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7fc59af9-00cf-4e3f-995d-1ccca3057324",
-        "Name": "azWebApp.ResourceGroup",
-        "Label": "Azure Resource Group",
-        "HelpText": "The azure resource group",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8fda8110-e3bb-4881-89dc-c148a7bd1943",
-        "Name": "azWebApp.RestartDelay",
-        "Label": "Restart Delay",
-        "HelpText": "Delay between instance restart",
-        "DefaultValue": "30",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-04-08T20:19:36.856Z",
-      "OctopusVersion": "2020.5.6",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "tekguy",
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/azure-web-app-set-app-settings.json b/step-templates/azure-web-app-set-app-settings.json
deleted file mode 100644
index 214207cf3..000000000
--- a/step-templates/azure-web-app-set-app-settings.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "Id": "850667b2-567d-46ba-a87d-d85dc31ebc83",
-    "Name": "Azure Web App - Set App Settings",
-    "Description": "Sets the Azure web app settings of a targeted Azure web app deployment target.  Will use the deployment slot if defined.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target</p>*\n*<p>Depends on Azure CLI and powershell to be installed on the worker</p>*",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Azure.AccountId": "#{azureWebAppSettings.azAccount}",
-      "Octopus.Action.Script.ScriptBody": "$webAppName = $OctopusParameters[\"Octopus.Action.Azure.WebAppName\"]\n$rg = $OctopusParameters[\"Octopus.Action.Azure.ResourceGroupName\"]\n$slot = $OctopusParameters[\"Octopus.Action.Azure.DeploymentSlot\"]\n$isSlotSettings = $OctopusParameters[\"azureWebAppSettings.isSlotSettings\"]\n\n$settingsType = \"settings\"\n\n$appSettings = $OctopusParameters[\"azureWebAppSettings.settings\"]\n\n$settings = \"\"\n\nWrite-Host \"Parsing Settings\"\n\n$appSettings -split \"`n\" | ForEach-Object { $settings += \"$_ \"}\n\n$settings = $settings.TrimEnd(' ')\n\n$cmdArgs = \"--name $webAppName --resource-group $rg\"\n\nif(![string]::IsNullOrEmpty($slot))\n{\n\tif($isSlotSettings -eq 'true')\n    {\n    \t$settingsType = \"slot-settings\"\n    }\n    \n\t$settings += \" --slot $slot\"\n}\n\n$settingsArgs = \" --$settingsType $settings\"\n\nWrite-Host \"Setting app settings\"\n\n$cmd = \"az webapp config appsettings set $cmdArgs $settingsArgs\"\n\nwrite-verbose \"command to execute: $cmd\"\n\nInvoke-Expression $cmd\n"
-    },
-    "Parameters": [
-      {
-        "Id": "598025e6-2d89-49bf-8abb-fda6da181de5",
-        "Name": "azureWebAppSettings.azAccount",
-        "Label": "Azure Account",
-        "HelpText": "An Azure account with permissions to the subscription and web app being modified",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "5d232cfd-8e9f-4b3e-8c4e-7bf3a75ced19",
-        "Name": "azureWebAppSettings.settings",
-        "Label": "Web App Settings",
-        "HelpText": "The web app settings to append or update.  Each new setting should be on a new line as a key value pair using the template `key=value`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "9bbee2cf-c57c-45db-8a7f-62a752779b56",
-        "Name": "azureWebAppSettings.isSlotSettings",
-        "Label": "Is Slot Settings",
-        "HelpText": "This is used to distinguish what settings are slot specific and which one are not.  Slot setting do not follow the deployed app when the slot is swapped.",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-06-30T15:48:06.905Z",
-      "OctopusVersion": "2020.2.10",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "xtreampb",
-    "Category": "azure"
-}
\ No newline at end of file
diff --git a/step-templates/azure-web-app-set-traffic.json b/step-templates/azure-web-app-set-traffic.json
deleted file mode 100644
index d1323333b..000000000
--- a/step-templates/azure-web-app-set-traffic.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "Id": "36791d2d-aa55-4bc7-bee4-a0d12d73f78e",
-    "Name": "Azure Web App - Set Traffic",
-    "Description": "Sets the traffic distribution between multiple web app slots.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target, but will not use the slot defined. </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the worker</p>*",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Azure.AccountId": "#{azWebAppSetTraffic.AzureAcct}",
-      "Octopus.Action.Script.ScriptBody": "$webAppName = $OctopusParameters[\"Octopus.Action.Azure.WebAppName\"]\n$rg = $OctopusParameters[\"Octopus.Action.Azure.ResourceGroupName\"]\n\n$trafficDistro = $OctopusParameters[\"azWebAppSetTraffic.trafficDistro\"]\n\n$cmdArgs = \"--name $webAppName --resource-group $rg\" \n\n$cmdAction = \"clear\"\n\nwrite-host \"Checking distribution\"\nif(![string]::IsNullOrEmpty($trafficDistro))\n{\n\t$distribution = \"\"\n\n\t$trafficDistro -split \"`n\" | ForEach-Object { $distribution += \"$_ \"}\n\n\t$distribution = $distribution.TrimEnd(' ')\n    \n    $cmdArgs += \" --distribution $distribution\"\n    \n    $cmdAction = \"set\"\n}\n\n\n$cmd = \"az webapp traffic-routing $cmdAction $cmdArgs\"\n\nwrite-verbose \"cmd to invoke: $cmd\"\n\nwrite-host \"setting distributions\"\ninvoke-expression $cmd\n"
-    },
-    "Parameters": [
-      {
-        "Id": "53d1306d-691c-4739-a09a-8fc9d66c60d3",
-        "Name": "azWebAppSetTraffic.AzureAcct",
-        "Label": "Azure Account",
-        "HelpText": "An Azure account with permissions to the subscription and web app being modified",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "1f788822-9980-44cc-9e9c-f87db5998dd5",
-        "Name": "azWebAppSetTraffic.trafficDistro",
-        "Label": "Traffic Distribution",
-        "HelpText": "<p>\nThe distribution of traffic in percent (0-100). Each web app slot should be defined on a separate line. Any remaining percentage will automatically be applied to production.\n</p><p>\n*Example*\n```\nmyOtherSlot=10\nstage=30\n```\n</p>",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-06-29T16:52:24.007Z",
-      "OctopusVersion": "2020.2.10",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "xtreampb",
-    "Category": "azure"
-}
diff --git a/step-templates/azure-web-app-slot-swap.json b/step-templates/azure-web-app-slot-swap.json
deleted file mode 100644
index d617f2f04..000000000
--- a/step-templates/azure-web-app-slot-swap.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "Id": "f256502a-4143-4d29-914e-80e541b05783",
-    "Name": "Azure Web App - Slot Swap",
-    "Description": "Swaps an azure web app slot. Defaults to the deployment slot defined in the web app target.\n<hr />\n\n*<p>Note This template is designed to run against an azure web app octopus target </p>*\n*<p>Depends on Azure CLI and powershell to be installed on the running machine</p>*",
-    "ActionType": "Octopus.AzurePowerShell",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$rg = $OctopusParameters[\"Octopus.Action.Azure.ResourceGroupName\"]\n$webAppName = $OctopusParameters[\"Octopus.Action.Azure.WebAppName\"]\n$destinationSlot = $OctopusParameters[\"azWebAppSwap.targetSlot\"]\n$sourceSlot = $OctopusParameters[\"azWebAppSwap.sourceSlot\"]\n\nif([string]::IsNullOrEmpty($sourceSlot))\n{\n\tthrow \"value for source slot must be provided\"\n}\n\n$cmdArgs = \"-g $rg -n $webAppName -s $sourceSlot\"\n\nif(![string]::IsNullOrEmpty($destinationSlot)) {$cmdArgs += \" --target-slot $destinationSlot\"}\n\n$cmd = \"az webapp deployment slot swap $cmdArgs\"\n\nwrite-verbose \"command being invoked: $cmd\"\n\nInvoke-Expression $cmd",
-      "Octopus.Action.Azure.AccountId": "#{azureWebAppSwap.AzAccount}"
-    },
-    "Parameters": [
-      {
-        "Id": "a204505b-f995-40ff-95b3-300638d9b9df",
-        "Name": "azureWebAppSwap.AzAccount",
-        "Label": "Azure Account",
-        "HelpText": null,
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "0b3383f9-31ae-402c-af57-be3b82a3d5b9",
-        "Name": "azWebAppSwap.targetSlot",
-        "Label": "Target Slot",
-        "HelpText": null,
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7e4ed213-d5bb-4725-b13f-78e366535479",
-        "Name": "azWebAppSwap.sourceSlot",
-        "Label": "Source Slot",
-        "HelpText": null,
-        "DefaultValue": "#{Octopus.Action.Azure.DeploymentSlot}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-06-25T15:05:37.259Z",
-      "OctopusVersion": "2020.2.10",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedAt": "2020-08-21T08:42:48.772Z",
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "azure"
-  }
\ No newline at end of file
diff --git a/step-templates/bitwarden-secrets-manager-retrieve-secrets.json b/step-templates/bitwarden-secrets-manager-retrieve-secrets.json
deleted file mode 100644
index 36b2550a1..000000000
--- a/step-templates/bitwarden-secrets-manager-retrieve-secrets.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "740fb4a1-e863-4e81-ab54-ef28292334e4",
-  "Name": "Bitwarden Secrets Manager - Retrieve Secrets",
-  "Description": "This step retrieves one or more secrets from [Bitwarden Secrets Manager](https://bitwarden.com/products/secrets-manager/), and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nYou can choose a custom output variable name for each secret, or one will be chosen for you.\n\n---\n\n**Required:** \n- PowerShell **5.1** or higher.\n- The Bitwarden Secrets Manager (`bws`) CLI installed on the target or worker. If the CLI can't be found, the step will fail.\n- A machine account [access token](https://bitwarden.com/help/access-tokens/) with permissions to retrieve secrets from the specified project.\n\nNotes:\n\n- Tested on Octopus **2025.4**.\n- Tested on both Windows Server 2022 and Ubuntu 24.04.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$BwsServerUrl = $OctopusParameters[\"Bitwarden.SecretsManager.RetrieveSecrets.ServerUrl\"]\n$ProjectName = $OctopusParameters[\"Bitwarden.SecretsManager.RetrieveSecrets.ProjectName\"]\n$BwsAccessToken = $OctopusParameters[\"Bitwarden.SecretsManager.RetrieveSecrets.AccessToken\"]\n$SecretNames = $OctopusParameters[\"Bitwarden.SecretsManager.RetrieveSecrets.SecretNames\"]\n$PrintVariableNames = $OctopusParameters[\"Bitwarden.SecretsManager.RetrieveSecrets.PrintVariableNames\"]\n\nWrite-Output \"Verifying 'bws' command availability...\"\nif (-not (Get-Command bws -ErrorAction SilentlyContinue)) {\n    throw \"The 'bws' (Bitwarden Secrets Manager CLI) command was not found. Please ensure it is installed and available in the system's PATH.\"\n}\nWrite-Output \"'bws' command found.\"\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($ProjectName)) {\n    throw \"Required parameter Bitwarden.SecretsManager.RetrieveSecrets.ProjectName not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($BwsServerUrl)) {\n    throw \"Required parameter Bitwarden.SecretsManager.RetrieveSecrets.ServerURL not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($BwsAccessToken)) {\n    throw \"Required parameter Bitwarden.SecretsManager.RetrieveSecrets.AccessToken not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($SecretNames)) {\n    throw \"Required parameter Bitwarden.SecretsManager.RetrieveSecrets.SecretNames not specified.\"\n}\n\n# Functions\nfunction Save-OctopusVariable {\n    Param(\n        [string] $name,\n        [string] $value\n    )\n    if ($script:storedVariables -icontains $name) {\n        Write-Warning \"A variable with name '$name' has already been created. Check your secret name parameters as this will likely cause unexpected behavior and should be investigated.\"\n    }\n    Set-OctopusVariable -Name $name -Value $value -Sensitive\n    $script:storedVariables += $name\n\n    if ($PrintVariableNames -eq $True) {\n        Write-Output \"Created output variable: ##{Octopus.Action[$StepName].Output.$name}\"\n    }\n}\n\nfunction Get-BwsProjectIdByName {\n    param(\n        [Parameter(Mandatory = $true)]\n        [string]$Name,\n        [Parameter(Mandatory = $true)]\n        [string]$AccessToken\n    )\n    \n    # 1. API Call: Retrieve all projects in JSON format (1st API Call)\n    $ProjectJson = bws project list `\n        --access-token $AccessToken `\n        --server-url $BwsServerUrl `\n        --output json | Out-String\n\n    # 2. Convert to PowerShell objects and filter by name\n    $Projects = $ProjectJson | ConvertFrom-Json\n\n    # 3. Find the ID of the matching project\n    $ProjectObject = $Projects | Where-Object { $_.name -eq $Name }\n\n    if (-not $ProjectObject) {\n        throw \"Error: Project '$Name' not found.\"\n    }\n\n    # Handle the case where the project name might not be unique\n    if ($ProjectObject.Count -gt 1) {\n        Write-Warning \"Multiple projects found with name '$Name'. Using the first ID found.\"\n    }\n\n    # Return the ID\n    return $ProjectObject.id\n}\n\n# End Functions\n\n$script:storedVariables = @()\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$Secrets = @()\n\n# Extract secret names\n@(($SecretNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $secretDefinition = ($_ -Split \"\\|\")\n        $secretName = $secretDefinition[0].Trim()\n        \n        if ([string]::IsNullOrWhiteSpace($secretName)) {\n            throw \"Unable to establish secret name from: '$($_)'\"\n        }\n        $secret = [PsCustomObject]@{\n            Name         = $secretName\n            VariableName = if ($secretDefinition.Count -gt 1 -and ![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { $secretName } # If VariableName is blank, use SecretName\n        }\n        $Secrets += $secret\n    }\n}\n\nWrite-Verbose \"Project Name: $ProjectName\"\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\n\ntry {\n\n    # 1. Get the Project ID from the friendly name\n    Write-Output \"Looking up project ID for '$ProjectName'\"\n    $ProjectID = Get-BwsProjectIdByName -Name $ProjectName -AccessToken $BwsAccessToken\n    \n    Write-Output \"Project ID found: $ProjectID\"\n    \n    # 2. Retrieve all secrets from the found project (The single efficient call)\n    Write-Output \"Fetching all secrets from project.\"\n    $SecretNamesToQuery = @($Secrets | Select-Object -ExpandProperty Name)\n\n    # Use the projectId to get all secrets in that project\n    $SecretsJson = bws secret list $ProjectID `\n        --access-token $BwsAccessToken `\n        --server-url $BwsServerUrl `\n        --output json | Out-String\n    $AllSecrets = $SecretsJson | ConvertFrom-Json\n\n    # 3. Filter the local objects to only include the desired secret names\n    Write-Output \"Filtering for desired secrets: $($SecretNamesToQuery -join ', ').\"\n    $FilteredSecrets = $AllSecrets | Where-Object { $_.key -in $SecretNamesToQuery } | Select-Object -Property key, value\n    \n    foreach ($secret in $FilteredSecrets) {\n        # Find the VariableName associated with the secret key\n        $variableName = ($Secrets | Where-Object { $_.Name -eq $secret.key }).VariableName    \n        \n        # Save the secret value to the output variable\n        Save-OctopusVariable -name $variableName -value $secret.value\n    }\n}\ncatch {\n    throw \"An error occurred while retrieving secrets: $($_.Exception.Message)\"\n}\n\nWrite-Output \"Created $($script:storedVariables.Count) output variables\""
-  },
-  "Parameters": [
-    {
-      "Id": "2a500677-eb3e-4e1c-93bd-0fa896aad9fd",
-      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.ServerUrl",
-      "Label": "Server Url",
-      "HelpText": "Provide the Server Url for retrieving secrets. Default: `https://vault.bitwarden.eu`",
-      "DefaultValue": "https://vault.bitwarden.eu",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "18b7321d-803e-4217-993d-6416dd6eb5f7",
-      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.ProjectName",
-      "Label": "Project Name",
-      "HelpText": "Provide the name of the project from which to retrieve secrets.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0dada9ac-3a35-4215-b03f-9024486ee7a2",
-      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.AccessToken",
-      "Label": "Machine Account Access Token",
-      "HelpText": "Provide the machine account [access token](https://bitwarden.com/help/access-tokens/) used to authenticate to retrieve secrets.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "b10f61d8-dedc-4a91-add3-451de0cfd47d",
-      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.SecretNames",
-      "Label": "Secret names to retrieve",
-      "HelpText": "Specify the names of the secrets to be returned from Secret Manager in Google Cloud, in the format:\n\n`SecretName | OutputVariableName` where:\n\n- `SecretName` is the name of the secret to retrieve.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "0a98e37e-7907-4e49-919a-5e50c7765469",
-      "Name": "Bitwarden.SecretsManager.RetrieveSecrets.PrintVariableNames",
-      "Label": "Print output variable names",
-      "HelpText": "Write out the names of the Octopus [output variables](https://octopus.com/docs/projects/variables/output-variables) in the task log. Default: `False`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-10-09T16:22:38.417Z",
-    "OctopusVersion": "2025.4.3435",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "harrisonmeister",
-  "Category": "bitwarden"
-}
diff --git a/step-templates/block-progression.json b/step-templates/block-progression.json
deleted file mode 100644
index d6c92cca7..000000000
--- a/step-templates/block-progression.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "Id": "78a182b3-5369-4e13-9292-b7f991295ad1",
-    "Name": "Block Release Progression",
-    "Description": "Step template to block the release progression of an Octopus Deploy release so it cannot be promoted beyond the current environment.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$apiKey = $OctopusParameters[\"Block.Octopus.Api.Key\"]\n$previousReleaseId = $OctopusParameters[\"Block.Octopus.Previous.Release.Id\"]\n$reason = $OctopusParameters[\"Block.Octopus.Reason\"]\n$octopusBaseUrl = $OctopusParameters[\"Block.Octopus.Url\"]\n$spaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n\n$body = @{\n\tDescription = $reason\n}\n$bodyAsJson = $body | ConvertTo-JSON -Depth 10\n\n$headers = @{\"X-Octopus-ApiKey\"=\"$apiKey\"}\n    \nWrite-Host \"Blocking the release $previousReleaseId from progressing\"\nInvoke-RestMethod -Uri \"$($octopusBaseUrl)/api/$($spaceId)/releases/$($previousReleaseId)/defects\" -Method POST -Headers $headers -Body $bodyAsJSON -ContentType 'application/json; charset=utf-8'"
-    },
-    "Parameters": [
-      {
-        "Id": "fc366d69-e56b-476b-8005-5431f1ce8c05",
-        "Name": "Block.Octopus.Url",
-        "Label": "Octopus Url",
-        "HelpText": "The base url (`https://samples.octopus.app`) of your Octopus Server.  Defaults to `Octopus.Web.BaseUrl`.",
-        "DefaultValue": "#{Octopus.Web.BaseUrl}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f03e6e96-f1d5-4b91-9ae6-f67fd8ba043c",
-        "Name": "Block.Octopus.Api.Key",
-        "Label": "Octopus API Key",
-        "HelpText": "The API key of a user who has permission to block releases.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "cdcbd826-e075-476c-b67a-ddf0e75a576c",
-        "Name": "Block.Octopus.Previous.Release.Id",
-        "Label": "Release Id to Block",
-        "HelpText": "The Octopus ID (`Releases-123`) of the release to block.  Defaults to `Octopus.Release.CurrentForEnvironment.Id`",
-        "DefaultValue": "#{Octopus.Release.CurrentForEnvironment.Id}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5c9c1d6a-ec08-4d79-b442-180f9d0460c6",
-        "Name": "Block.Octopus.Reason",
-        "Label": "Reason",
-        "HelpText": "The reason why this release is being blocked.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-09-13T16:14:01.845Z",
-      "OctopusVersion": "2021.2.7428",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "bobjwalker",
-    "Category": "octopus"
-  }
\ No newline at end of file
diff --git a/step-templates/calculate-deployment-mode.json b/step-templates/calculate-deployment-mode.json
deleted file mode 100644
index 7f489c291..000000000
--- a/step-templates/calculate-deployment-mode.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "Id": "d166457a-1421-4731-b143-dd6766fb95d5",
-    "Name": "Calculate Deployment Mode",
-    "Description": "This step uses Octopus [System Variables](https://octopus.com/docs/projects/variables/system-variables) to calculate the deployment mode.  \n\n# Deployment Mode\nThe potential modes are:\n- **Deploy**: A newer version is being deployed to the target environment.  For example, `2021.1.4` is being deployed to **Production** to replace `2021.0.5`.\n- **Rollback**: An older version is being deployed to the target environment. For example, `2021.0.5` is being deployed to **Production** to replace `2021.1.4`.\n- **Redeploy**: The same version is being deployed to the target environment.  For example, `2021.1.4` is being deployed to **Production** which already has `2021.1.4`.\n\n**Please note**: This step template uses the release numbers to calculate the deployment mode.  It doesn't look at any packages.\n\n# Version Difference\nAfter calculating the deployment mode, the step template will calculate the version difference.  The potential options are:\n- **Identical**: No differences between the previous release and the current release were found.\n- **Major**: The first number (2021 in 2021.1.2.10) is different between the previous release and the current release.\n- **Minor**: The second number (1 in 2021.1.2.10) is different between the previous release and the current release.\n- **Build**: The third number (2 in 2021.1.2.10) is different between the previous release and the current release.\n- **Revision**: The fourth number (10 in 2021.1.2.10) is different between the previous release and the current release.\n\n# Manual or Automatic Trigger\nThe step template will also determine if the deployment was caused by a trigger or is a manual deployment.  Potential values are `True` (caused by a trigger) or `False` (manual deployment).\n\n# Output Variables\n\nThe following output variables will be set:\n- **DeploymentMode**: Will either be `Deploy`, `Rollback` or `Redeploy`.\n- **Trigger**: Will either be `True` or `False`.  Indicates if this deployment was caused by a trigger (scheduled or deployment target).\n- **VersionChange**: Will either be `Identical`, `Major`, `Minor`, `Build`, or `Revision`.\n\n## Variable Run Condition Output Variables\nTo make it easier to use, the step template will set a number of run condition output variables.  \n\n### Variable Run Condition Usage\nVariable Run Conditions will _always_ be evaluated.  Even if there is an error.  If the run condition comes back as **Truthy** it will run the step.  \n\nTo limit when the step runs, wrap the output variable with an if/then or unless clause:\n- **Always Run**: `#{Octopus.Action[Calculate Deployment Mode].Output.RunOnDeploy}`  \n- **Success**: Only run when previous steps succeeds `#{unless Octopus.Deployment.Error}#{Octopus.Action[Calculate Deployment Mode].Output.RunOnDeploy}#{/unless}`\n- **Failure**: Only run when previous steps fail `#{if Octopus.Deployment.Error}#{Octopus.Action[Calculate Deployment Mode].Output.RunOnDeploy}#{/if}`\n\n**Hint:** Replace **RunOnDeploy** from the above examples with one of the variables from below.\n\n### Deployment Mode Run Conditions\n- **RunOnDeploy**: Only run the step when the **DeploymentMode** is `Deploy`.\n- **RunOnRollback**: Only run the step when the **DeploymentMode** is `Rollback`.\n- **RunOnRedeploy**: Only run the step when the **DeploymentMode** is `Redeploy`.\n- **RunOnDeployOrRollback**: Only run the step when the **DeploymentMode** is`Deploy` or `Rollback`.\n- **RunOnDeployOrRedeploy**: Only run the step when the **DeploymentMode** is`Deploy` or `Redeploy`.\n- **RunOnRedeployOrRollback**: Only run the step when the **DeploymentMode** is `Redeploy` or `Rollback`.\n\n### Version Change Run Conditions\n- **RunOnMajorVersionChange**: Only run the step when the **VersionChange** is `Major`.\n- **RunOnMinorVersionChange**: Only run the step when the **VersionChange** is `Minor`.\n- **RunOnMajorOrMinorVersionChange**: Only run the step when the **VersionChange** is `Major` or `Minor`.\n- **RunOnBuildVersionChange**: Only run the step when the **VersionChange** is `Build`.\n- **RunOnRevisionVersionChange**: Only run the step when the **VersionChange** is `Revision`.\n\n# Usage \n\n**Important:** This step template is designed for deployment processes only.  Runbooks have no concept of deployments, redeployments, or rollbacks.\n\nThis step was designed to run on a worker (or the Octopus Server).  It can run on targets, but the output variables will all be the same; running on targets will do nothing but waste compute cycles.",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$currentReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$previousReleaseNumber = $OctopusParameters[\"Octopus.Release.CurrentForEnvironment.Number\"]\n$lastAttemptedReleaseNumber = $OctopusParameters[\"Octopus.Release.PreviousForEnvironment.Number\"]\n$stepName = $OctopusParameters[\"Octopus.Action.StepName\"]\n$triggerName = $OctopusParameters[\"Octopus.Deployment.Trigger.Name\"]\n\nWrite-Host \"The current release number is $currentReleaseNumber\"\nWrite-Host \"The last succesful release to this environment was $previousReleaseNumber\"\nWrite-Host \"The last release that was attempted on this environment was $lastAttemptedReleaseNumber\"\nWrite-Host \"The deployment name is $deploymentName\"\n\nif ($previousReleaseNumber -like \"*-*\")\n{\n\t$previousReleaseNumber = $previousReleaseNumber.SubString(0, $previousReleaseNumber.IndexOf(\"-\"))\n}\n\nif ($currentReleaseNumber -like \"*-*\")\n{\n\t$currentReleaseNumber = $currentReleaseNumber.SubString(0, $currentReleaseNumber.IndexOf(\"-\"))\n}\n\nif ($lastAttemptedReleaseNumber -like \"*-*\")\n{\n\t$lastAttemptedReleaseNumber = $lastAttemptedReleaseNumber.SubString(0, $lastAttemptedReleaseNumber.IndexOf(\"-\"))\n}\n\nWrite-Host \"The non-pre release tag previous version for the environment was $previousReleaseNumber\"\nWrite-Host \"The non-pre release tag current release number is $currentReleaseNumber\"\nWrite-Host \"The non-pre release tag of the last attempted version for the environment was $lastAttemptedReleaseNumber\"\n\n$currentVersion = [System.Version]$currentReleaseNumber\n$previousVersion = [System.Version]$previousReleaseNumber\n$lastAttemptedVersion = [System.Version]$lastAttemptedReleaseNumber\n\n$differentVersions = $false\n$versionToCompare = $previousVersion\nif ($currentVersion -gt $previousVersion)\n{\n\tWrite-Host \"The current release number $currentReleaseNumber is greater than the previous successful release number $previousReleaseNumber.\"\n\tif ($currentVersion -lt $lastAttemptedVersion)\n    {\n    \tWrite-Host \"The current release number $currentReleaseNumber is less than the last attempted release number $lastAttemptedReleaseNumber.  Setting deployment mode to rollback.\"\n\t    $deploymentMode = \"Rollback\"\n        $versionToCompare = $lastAttemptedVersion\n    }\n    else\n    {\n    \tWrite-Host \"The current release number $curentReleaseNumber is greater than the last attempted release number $lastAttemptedReleaseNumber.  Setting deployment mode to deploy.\"\n        $deploymentMode = \"Deploy\"\n    }\n}\nelseif ($currentVersion -lt $previousVersion)\n{\n\tWrite-Host \"The current release number $currentReleaseNumber is less than the previous successful release number $previousReleaseNumber.  Setting deployment mode to rollback.\"\n    $deploymentMode = \"Rollback\"\n    $differentVersions = $true\n}\nelseif ($currentVersion -lt $lastAttemptedVersion)\n{\n\tWrite-Host \"The current release number $currentReleaseNumber is less than the last attempted release number $lastAttemptedReleaseNumber.  Setting the deployment mode to rollback.\"\n    $deploymentMode = \"Rollback\"\n    $differentVersions = $true\n    $versionToCompare = $lastAttemptedVersion\n}\nelse\n{\n\tWrite-Host \"The current release number $currentReleaseNumber matches the previous release number $previousReleaseNumber.  Setting deployment mode to redeployment.\"\n    $deploymentMode = \"Redeploy\"\n}\n\n$differenceKind = \"Identical\"\nif ($differentVersions)\n{\n\tif ($currentVersion.Major -ne $versionToCompare.Major)\n    {\n    \tWrite-Host \"$currentReleaseNumber is a major version change from $versionToCompare\"\n    \t$differenceKind = \"Major\"\n    }\n    elseif ($currentVersion.Minor -ne $versionToCompare.Minor)\n    {\n    \tWrite-Host \"$currentReleaseNumber is a minor version change from $versionToCompare\"\n    \t$differenceKind = \"Minor\"\n    }\n    elseif ($currentVersion.Build -ne $versionToCompare.Build)\n    {\n    \tWrite-Host \"$currentReleaseNumber is a build version change from $versionToCompare\"\n    \t$differenceKind = \"Build\"\n    }\n    elseif ($currentVersion.Revision -ne $versionToCompare.Revision)\n    {\n    \tWrite-Host \"$currentReleaseNumber is a revision version change from $versionToCompare\"\n    \t$differenceKind = \"Revision\"\n    }\n}\n\n$trigger = $false\nif ([string]::IsNullOrWhiteSpace($triggerName) -eq $false)\n{\n\tWrite-Host \"This task was created by trigger $triggerName.\"\n    $trigger = $true\n}\n\nSet-OctopusVariable -Name \"DeploymentMode\" -Value $deploymentMode\nSet-OctopusVariable -Name \"VersionChange\" -Value $differenceKind\nSet-OctopusVariable -Name \"Trigger\" -Value $trigger\n\nWrite-Highlight @\"\nOutput Variables Created:\n   \t- Octopus.Action[$($stepName)].Output.DeploymentMode - Set to '$deploymentMode'\n    - Octopus.Action[$($stepName)].Output.VersionChange - Set to '$differenceKind'\n    - Octopus.Action[$($stepName)].Output.Trigger - Set to '$trigger'\n\nDeployment Mode Run Conditions Output Variables:\n   \t- Octopus.Action[$($stepName)].Output.RunOnRollback\n    - Octopus.Action[$($stepName)].Output.RunOnDeploy\n    - Octopus.Action[$($stepName)].Output.RunOnRedeploy\n    - Octopus.Action[$($stepName)].Output.RunOnDeployOrRollback\n    - Octopus.Action[$($stepName)].Output.RunOnDeployOrRedeploy\n    - Octopus.Action[$($stepName)].Output.RunOnRollbackOrRedeploy\n\nVersion Change Run Conditions Output Variables:\n   \t- Octopus.Action[$($stepName)].Output.RunOnMajorVersionChange\n    - Octopus.Action[$($stepName)].Output.RunOnMinorVersionChange\n    - Octopus.Action[$($stepName)].Output.RunOnMajorOrMinorVersionChange\n    - Octopus.Action[$($stepName)].Output.RunOnBuildVersionChange\n    - Octopus.Action[$($stepName)].Output.RunOnRevisionVersionChange\n  \nVariable run conditions are always evaluated, even if there is an error.  Use the following examples to control when your step runs.  Replace RunOnDeploy from below examples with one of the variables from above.  \n- Always Run: `#{Octopus.Action[$stepName].Output.RunOnDeploy}`  \n- Success: Only run when previous steps succeeds `##{unless Octopus.Deployment.Error}#{Octopus.Action[$stepName].Output.RunOnDeploy}##{/unless}`\n- Failure: Only run when previous steps fail `##{if Octopus.Deployment.Error}#{Octopus.Action[$stepName].Output.RunOnDeploy}##{/if}`\n\n\"@\n\n$runOnRollback = \"#{if Octopus.Action[$($stepName)].Output.DeploymentMode == \"\"Rollback\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRollback' so you can use it as a run condition\"\nWrite-Verbose $runOnRollback\nSet-OctopusVariable -Name \"RunOnRollback\" -Value $runOnRollback\n\n$runOnDeploy = \"#{if Octopus.Action[$($stepName)].Output.DeploymentMode == \"\"Deploy\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnDeploy' so you can use it as a run condition\"\nWrite-Verbose $runOnDeploy\nSet-OctopusVariable -Name \"RunOnDeploy\" -Value $runOnDeploy\n\n$runOnRedeploy = \"#{if Octopus.Action[$($stepName)].Output.DeploymentMode == \"\"Redeploy\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRedeploy' so you can use it as a run condition\"\nWrite-Verbose $runOnRedeploy\nSet-OctopusVariable -Name \"RunOnRedeploy\" -Value $runOnRedeploy\n\n$runOnDeployOrRollback = \"#{if Octopus.Action[$($stepName)].Output.DeploymentMode != \"\"Redeploy\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnDeployOrRollback' so you can use it as a run condition\"\nWrite-Verbose $runOnDeployOrRollback\nSet-OctopusVariable -Name \"RunOnDeployOrRollback\" -Value $runOnDeployOrRollback\n\n$runOnDeployOrRedeploy = \"#{if Octopus.Action[$($stepName)].Output.DeploymentMode != \"\"Rollback\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnDeployOrRedeploy' so you can use it as a run condition\"\nWrite-Verbose $runOnDeployOrRedeploy\nSet-OctopusVariable -Name \"RunOnDeployOrRedeploy\" -Value $runOnDeployOrRedeploy\n\n$runOnRedeployOrRollback = \"#{if Octopus.Action[$($stepName)].Output.DeploymentMode != \"\"Deploy\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRedeployOrRollback' so you can use it as a run condition\"\nWrite-Verbose $runOnRedeployOrRollback\nSet-OctopusVariable -Name \"RunOnRedeployOrRollback\" -Value $runOnRedeployOrRollback\n\n$runOnMajorVersionChange = \"#{if Octopus.Action[$($stepName)].Output.VersionChange == \"\"Major\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnMajorVersionChange' so you can use it as a run condition\"\nWrite-Verbose $runOnMajorVersionChange\nSet-OctopusVariable -Name \"RunOnMajorVersionChange\" -Value $runOnMajorVersionChange\n\n$runOnMinorVersionChange = \"#{if Octopus.Action[$($stepName)].Output.VersionChange == \"\"Minor\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnMinorVersionChange' so you can use it as a run condition\"\nWrite-Verbose $runOnMinorVersionChange\nSet-OctopusVariable -Name \"RunOnMinorVersionChange\" -Value $runOnMinorVersionChange\n\n$runOnMajorOrMinorVersionChange = \"#{if Octopus.Action[$stepName].Output.VersionChange == \"\"Major\"\"}True#{else}#{if Octopus.Action[$stepName].Output.VersionChange == \"\"Minor\"\"}True#{else}False#{/if}#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnMajorOrMinorVersionChange' so you can use it as a run condition\"\nWrite-Verbose $runOnMajorOrMinorVersionChange\nSet-OctopusVariable -Name \"RunOnMajorOrMinorVersionChange\" -Value $runOnMajorOrMinorVersionChange\n\n$runOnBuildVersionChange = \"#{if Octopus.Action[$($stepName)].Output.VersionChange == \"\"Build\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnBuildVersionChange' so you can use it as a run condition\"\nWrite-Verbose $runOnBuildVersionChange\nSet-OctopusVariable -Name \"RunOnBuildVersionChange\" -Value $runOnBuildVersionChange\n\n$runOnRevisionVersionChange = \"#{if Octopus.Action[$($stepName)].Output.VersionChange == \"\"Revision\"\"}True#{else}False#{/if}\"\nWrite-Host \"Setting the output variable 'Octopus.Action[$($stepName)].Output.RunOnRevisionVersionChange' so you can use it as a run condition\"\nWrite-Verbose $runOnRevisionVersionChange\nSet-OctopusVariable -Name \"RunOnRevisionVersionChange\" -Value $runOnRevisionVersionChange"
-    },
-    "Parameters": [],
-    "$Meta": {
-      "ExportedAt": "2021-11-02T13:48:09.120Z",
-      "OctopusVersion": "2021.1.7738",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "BobJWalker",
-    "Category": "octopus"
-  }
\ No newline at end of file
diff --git a/step-templates/chef-run-cookbook.json b/step-templates/chef-run-cookbook.json
deleted file mode 100644
index 961ec5055..000000000
--- a/step-templates/chef-run-cookbook.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "877815ea-0cfb-4dfa-80a3-983140f8cf52",
-  "Name": "Chef - Run Cookbook",
-  "Description": "Runs a chef cookbook using chef-client.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "LastModifiedOn": "2018-10-16T14:31:14.894Z",
-  "LastModifiedBy": "margani",
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Package.DownloadOnTentacle": "False",
-    "Octopus.Action.Script.ScriptParameters": "-CookBookFolder #{CookBookDir}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$cookBookFolder = $OctopusParameters[\"CookBookDir\"]\n$overrideRunList = $OctopusParameters[\"OverrideRunList\"]\n\nif (-not $cookBookFolder -or -not $overrideRunList) {\n\tthrow \"The parameters are mandatory.\"\n}\n\n$ClientPath = Join-Path $cookBookFolder \"client.rb\"\n$WorkingPath = Join-Path $cookBookFolder \"temp\"\n$DatabagPath = Join-Path $WorkingPath \"data_bags\"\n$EnvironmentPath = Join-Path $WorkingPath \"environments\"\n$CookbooksPath = Join-Path $WorkingPath \"cookbooks\"\n$FileCachePath = Join-Path $WorkingPath \"cache\"\n\n$ClientContent = @\"\ndata_bag_path \"$($DatabagPath -replace '\\\\','/')\"\nenvironment_path \"$($EnvironmentPath -replace '\\\\','/')\"\ncookbook_path \"$($CookbooksPath -replace '\\\\','/')\"\nfile_cache_path \"$($FileCachePath -replace '\\\\','/')\"\nssl_verify_mode :verify_peer\n\"@\n\n[System.IO.File]::WriteAllText($ClientPath, $ClientContent)\n\n@($DatabagPath, $EnvironmentPath, $CookbooksPath, $FileCachePath) | %{\n\tif (!(Test-Path $_) ){ \n\t\tmkdir -p $_\n\t}\n}\n\nPush-Location $cookBookFolder\nRemove-Item *.lock\n&berks vendor $CookbooksPath\n&chef-client -z -c $ClientPath -o $overrideRunList\nPop-Location"
-  },
-  "Parameters": [
-    {
-      "Id": "dc6cfaed-3df0-4245-88a3-d59f14a64399",
-      "Name": "CookBookDir",
-      "Label": "Cookbook directory",
-      "HelpText": "The directory of the cookbook which has Berksfile",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6782c7cf-7562-48ff-93a2-fbeb99f0a088",
-      "Name": "OverrideRunList",
-      "Label": "Override run list",
-      "HelpText": "The list of cookbook/recipes which you want to run and override",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2018-10-16T14:31:14.894Z",
-    "OctopusVersion": "2018.6.2",
-    "Type": "ActionTemplate"
-  },
-  "Category": "chef"
-}
diff --git a/step-templates/chocolatey-ensure-installed.json b/step-templates/chocolatey-ensure-installed.json
deleted file mode 100644
index 673028055..000000000
--- a/step-templates/chocolatey-ensure-installed.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "Id": "c364b0a5-a0b7-48f8-a1a4-35e9f54a82d3",
-  "Name": "Chocolatey - Ensure Installed",
-  "Description": "Ensures that the Chocolatey package manager is installed on the system. The installer is downloaded from https://chocolatey.org if required.",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\nWrite-Output \"Ensuring the Chocolatey package manager is installed...\"\n\n$chocolateyBin = [Environment]::GetEnvironmentVariable(\"ChocolateyInstall\", \"Machine\") + \"\\bin\"\n$chocInstalled = Test-Path \"$chocolateyBin\\choco.exe\"\n\nif (-not $chocInstalled) {\n    Write-Output \"Chocolatey not found, installing...\"\n    \n    $installPs1 = ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))\n    Invoke-Expression $installPs1\n    \n    Write-Output \"Chocolatey installation complete.\"\n} else {\n    Write-Output \"Chocolatey was found at $chocolateyBin and won't be reinstalled.\"\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [],
-  "LastModifiedOn": "2020-07-28T13:42:22.284+00:00",
-  "LastModifiedBy": "pauby",
-  "$Meta": {
-    "ExportedAt": "2020-07-28T13:42:22.284+00:00",
-    "OctopusVersion": "2.4.7.85",
-    "Type": "ActionTemplate"
-  },
-  "Category": "chocolatey"
-}
diff --git a/step-templates/clickonce-from-deployed-package.json b/step-templates/clickonce-from-deployed-package.json
deleted file mode 100644
index 46dc69e99..000000000
--- a/step-templates/clickonce-from-deployed-package.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "Id": "1b7909be-4870-4f81-8957-8357b9342c0f",
-  "Name": "ClickOnce - Create from deployed package",
-  "Description": "Create binaries manifest & CO application and sign them with given code sign certificate ... using mage.exe.",
-  "ActionType": "Octopus.Script",
-  "Version": 28,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Building clickonce application ...\"\r\n\r\nfunction Validate-Parameter([REF]$f, $name, $value) {\r\n    if (!$value) {\r\n        throw ('Missing required value for parameter ''{0}''.' -f $name)\r\n    }\r\n    \r\n    $f.Value = $value\r\n    Write-Host \"Parameters [$name] has been initialized with : [$value]\"\r\n}\r\n\r\n### Parameters\r\n$deployStepName = $null\r\n$appName = $null\r\n$exeFileName = $null\r\n$destinationPath = $null\r\n$certFilePath = $null\r\n$certPassword = $null\r\n$publisher = $null\r\n$mageExe = $null\r\n$version = $null\r\n$binariesFolderPath = $null\r\n$coAppName = $null\r\n$iconFile = $null\r\n\r\nValidate-Parameter ([REF]$deployStepName) 'Deploy step name to read binaries from' $OctopusParameters['DeployStepName']\r\nValidate-Parameter ([REF]$appName) 'Project name' $OctopusParameters['Octopus.Project.Name']\r\nValidate-Parameter ([REF]$coAppName) 'Application display name' $OctopusParameters['DisplayName']\r\n\r\nValidate-Parameter ([REF]$exeFileName) 'Executable file name' $OctopusParameters['ExeFileName']\r\nValidate-Parameter ([REF]$destinationPath) 'Path to the directory where to deploy the ClickOnce package' $OctopusParameters['DestinationPath']\r\nValidate-Parameter ([REF]$certFilePath) 'Path to the certification file' $OctopusParameters['SignCertFilePath']\r\nValidate-Parameter ([REF]$certPassword) 'Password of the certification file' $OctopusParameters['SignCertPassword']\r\nValidate-Parameter ([REF]$publisher) 'Publisher name' $OctopusParameters['Publisher']\r\nValidate-Parameter ([REF]$mageExe) 'Path to the mage.exe' $OctopusParameters['MageExePath']\r\nValidate-Parameter ([REF]$iconFile) 'Icon file' $OctopusParameters['IconFile']\r\n\r\n### end of parameters\r\n\r\nValidate-Parameter ([REF]$version) 'Version number (from release)' $OctopusParameters['Octopus.Release.Number']\r\n\r\n$binariesFolderParameter = -join(\"Octopus.Action[\",$deployStepName,\"].Output.Package.InstallationDirectoryPath\")\r\nWrite-Host \"Trying to get Installation folder parameter value for : [$binariesFolderParameter]\"\r\n\r\n$binariesFolderPath = $OctopusParameters[$binariesFolderParameter]\r\nif(!$binariesFolderPath){\r\n     throw ('Unable to retrieve binaries path from previous step execution for step with name ''{0}''.' -f $deployStepName)\r\n}\r\n\r\n$appVersionAndNumber = -join($appName, \"_\", $version)\r\n$packageDestinationSubDirectory = -join (\"Application_Files/\", $appVersionAndNumber)\r\n$packageDestinationPath = -join ($destinationPath, \"/\", $packageDestinationSubDirectory) \r\n$appManifestRelativePath = -join (\"Application_Files/\",$appVersionAndNumber, \"/\", $exeFileName, \".manifest\")\r\n$appManifestFilePath = -join ($binariesFolderPath, \"/\", $exeFileName, \".manifest\")\r\n\r\n$coAppFilePath = -join($binariesFolderPath, \"\\\", $appName, \".application\")\r\n$coAppFilePathServer = -join($destinationPath, \"\\\", $appName, \".application\")\r\n\r\n### Create Application manifest\r\nWrite-Host \"Creating application manifest at \"$appManifestFilePath\r\n& $mageExe -New Application -t \"$appManifestFilePath\" -n \"$coAppName\" -v $version -p msil -fd \"$binariesFolderPath\" -tr FullTrust -a sha256RSA -if $iconFile\r\nWrite-Host \"Signing application manifest ...\"\r\n& $mageExe -Sign \"$appManifestFilePath\" -cf $certFilePath -pwd $certPassword\r\n\r\n### Create Deployment application\r\nWrite-Host \"Creating CO application [$coAppName] at \"$coAppFilePath\r\n& $mageExe -New Deployment -t \"$coAppFilePath\" -n \"$coAppName\" -v $version -p msil -appm $appManifestFilePath -ip true -i true -um true -pub $publisher -pu \"$coAppFilePathServer\" -appc $appManifestRelativePath -a sha256RSA\r\n\r\nWrite-Host \"Updating minimum version to force auto-update\"\r\n& $mageExe -Update $coAppFilePath -mv $version -pub $publisher -a sha256RSA\r\n\r\nWrite-Host \"Changing expiration max age => before application startup (hacking xml) of \"$coAppFilePath\r\n$content = Get-Content $coAppFilePath\r\n$content -replace \"<expiration maximumAge=`\"0`\" unit=`\"days`\" />\", \"<beforeApplicationStartup />\" | set-content $coAppFilePath\r\n\r\nWrite-Host \"Signing CO application [$coAppName] ...\"\r\n& $mageExe -Sign \"$coAppFilePath\" -cf $certFilePath -pwd $certPassword\r\n\r\n\r\nWrite-Host \"Copying binaries from \"$binariesFolderPath\r\nWrite-Host \"to destination \"$packageDestinationPath\r\n\r\n### Remove any existing files from the package destination folder\r\nRemove-Item $packageDestinationPath -Recurse -ErrorAction SilentlyContinue\r\n\r\n### Ensure target directory exists in order not to fail the copy\r\nNew-Item $packageDestinationPath -ItemType directory > $null\r\n\r\n### Copy binaries to destination folder\r\nCopy-Item $binariesFolderPath\"/*\" $packageDestinationPath -recurse -Force > $null\r\nCopy-Item $coAppFilePath $destinationPath -Force > $null\r\n\r\nWrite-Host \"Building clickonce application script completed.\"\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "DeployStepName",
-      "Label": "Deploy step to read binaries from",
-      "HelpText": "Name of the previous step used to deploy binaries that will be packed in CO package",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Name": "DestinationPath",
-      "Label": "Path to the directory where to deploy the ClickOnce package",
-      "HelpText": "Path to the target directory for the ClickOnce package. This will contain the created *.application file and the \"Application Files\" folder",
-      "DefaultValue": "\\\\MyServer\\MyClickOnceRepo\\#{Octopus.Project.Name}\\#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ExeFileName",
-      "Label": "Name of the target executable file",
-      "HelpText": "Name of the executable file of the application to pack",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Publisher",
-      "Label": "Publisher name",
-      "HelpText": "Publisher name to use when creating the CO package",
-      "DefaultValue": "MyCompany",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SignCertFilePath",
-      "Label": "Path to the certification file",
-      "HelpText": "Path to the certification pfx file",
-      "DefaultValue": "\\\\MyServer\\Auth\\cert\\my-cert.pfx",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SignCertPassword",
-      "Label": "Password of the certification file",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "MageExePath",
-      "Label": "Path to mage.exe",
-      "HelpText": "Path to mage.exe which is used to update manifest and .application files and sign them.",
-      "DefaultValue": "\\\\MyServer\\Tools\\Octopus\\Tentacles\\mage.exe",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "IconFile",
-      "Label": "Icon filename",
-      "HelpText": "Name of icon file in the package, eg. ApplicationIcon.ico",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "DisplayName",
-      "Label": "Application display name",
-      "HelpText": "Name which appears in the Start Menu",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2017-02-28T06:53:27.970+00:00",
-  "LastModifiedBy": "Grendizr",
-  "$Meta": {
-    "ExportedAt": "2016-09-15T06:53:27.970+00:00",
-    "OctopusVersion": "3.4.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "clickOnce"
-}
\ No newline at end of file
diff --git a/step-templates/clickonce-re-sign.json b/step-templates/clickonce-re-sign.json
deleted file mode 100644
index f73587eab..000000000
--- a/step-templates/clickonce-re-sign.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "a9e5843e-d382-44fd-84dd-d999dab54993",
-  "Name": "ClickOnceRe-Sign",
-  "Description": "This Template will help to re-sign the .application and manifest files. Finally add .deploy extenstion to the files",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$xml = [xml](Get-Content \"$baseDeployPath\\$AppName.application\")\r\n$manifestpath = $xml.assembly.dependency.dependentAssembly.codebase\r\n$ApplicationWithVersion = $manifestpath.Split('\\\\')[1]\r\n\r\n#Manifest Resign\r\n& \"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.0A\\bin\\NETFX 4.0 Tools\\mage.exe\" -Update \"$baseDeployPath\\$manifestpath\" -FromDirectory \"$baseDeployPath\\Application Files\\$ApplicationWithVersion\"\r\n& \"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.0A\\bin\\NETFX 4.0 Tools\\mage.exe\" -Sign \"$baseDeployPath\\$manifestpath\" -CertFile $signcertpath -Password $signCertPass\r\n\r\n#Application Resign\r\n& \"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Bin\\mage.exe\" -Update \"$baseDeployPath\\$AppName.application\" -AppManifest \"$baseDeployPath\\$manifestpath\"\r\n& \"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\Bin\\mage.exe\" -Sign \"$baseDeployPath\\$AppName.application\" -CertFile $signcertpath -Password $signCertPass\r\n\r\n#Rename files back to the .deploy extension, skipping the files that shouldn't be renamed\r\nGet-ChildItem -Path \"$baseDeployPath\\Application Files\\*\"  -Recurse | Where-Object {!$_.PSIsContainer -and $_.Name -notlike \"*.manifest\" -and $_.Name -notlike \"*.vsto\"} | Rename-Item -NewName {$_.Name + \".deploy\"} "
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "signcertpath",
-      "Label": "Signing Certificate Path",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "signCertPass",
-      "Label": "Signing Certificate Password",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "baseDeployPath",
-      "Label": "Deployment Path",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AppName",
-      "Label": "Application Name",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-10-20T12:44:19.041+00:00",
-  "LastModifiedBy": "mani0070",
-  "$Meta": {
-    "ExportedAt": "2015-10-20T20:26:27.693+00:00",
-    "OctopusVersion": "3.1.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "clickOnce"
-}
\ No newline at end of file
diff --git a/step-templates/clone-tenant.json b/step-templates/clone-tenant.json
deleted file mode 100644
index 12b1fcf8d..000000000
--- a/step-templates/clone-tenant.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "Id": "3b0f8df0-93b8-44eb-86dd-264d1283ae70",
-  "Name": "Clone Tenant",
-  "Description": "Clone an Octopus [tenant](https://octopus.com/docs/deployment-patterns/multi-tenant-deployments). The project connections and tenant tags will be cloned and the non-sensitive variables can optionally be cloned.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12\n[Net.ServicePointManager]::SecurityProtocol = $securityProtocol\n\n$octopusBaseUrl = $CloneTenantStep_OctopusUrl.Trim('/')\n$apiKey = $CloneTenantStep_ApiKey\n$tenantToClone = $CloneTenantStep_TenantIdToClone\n$tenantName = $CloneTenantStep_TenantName\n$cloneVariables = $CloneTenantStep_CloneVariables\n$cloneTags = $CloneTenantStep_CloneTags\n$spaceId = $CloneTenantStep_SpaceId\n\n$ErrorActionPreference = 'Stop'\n\nif ([string]::IsNullOrWhiteSpace($octopusBaseUrl)) {\n    throw \"The step parameter 'Octopus Base Url' was not found. This step requires the Octopus Server URL to function, please provide one and try again.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($apiKey)) {\n    throw \"The step parameter 'Octopus API Key' was not found. This step requires an API Key to function, please provide one and try again.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($tenantToClone)) {\n    throw \"The step parameter 'Id of Tenant to Clone' was not found. Please provide one and try again.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($tenantName)) {\n    throw \"The step parameter 'New Tenant Name' was not found. Please provide one and try again.\"\n}\n\nfunction Invoke-OctopusApi {\n    param(\n        [Parameter(Position = 0, Mandatory)]$Uri,\n        [ValidateSet(\"Get\", \"Post\", \"Put\", \"Delete\")]$Method = 'Get',\n        $Body\n    )\n    \n    $uriParts = @($octopusBaseUrl, $Uri.TrimStart('/'))    \n    $uri = ($uriParts -join '/')\n\n    Write-Verbose \"Uri: $uri\"\n    \n    $requestParameters = @{\n        Uri = $uri\n        Method = $Method\n        Headers = @{ \"X-Octopus-ApiKey\" = $apiKey }\n        UseBasicParsing = $true\n    }\n    \n    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }\n    \n    return Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json\n}\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-OctopusApi 'api/';\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif([string]::IsNullOrWhiteSpace($spaceId)) {\n\tif(Test-SpacesApi) {\n      \t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n      \tif([string]::IsNullOrWhiteSpace($spaceId)) {\n          \tthrow \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error or try providing the Space Id parameter.\";\n      \t}\n\t}\n}\n\n$apiPrefix = \"api/\"\n$tenantUrlBase = @($octopusBaseUrl, 'app#')\n\nif ($spaceId) {\n\t$apiPrefix += $spaceId\n    $tenantUrlBase += $spaceId\n}\n\nWrite-Host \"Fetching source tenant\"\n$tenant = Invoke-OctopusApi \"$apiPrefix/tenants/$tenantToClone\"\n\n$sourceTenantId = $tenant.Id\n$sourceTenantName = $tenant.Name\n$tenant.Id = $null\n$tenant.Name = $tenantName\n\nif ($cloneTags -ne $true) {\n\tWrite-Host \"Clearing tenant tags\"\n    $tenant.TenantTags = @()\n}\n\nWrite-Host \"Creating new tenant\"\n$newTenant = Invoke-OctopusApi \"$apiPrefix/tenants\" -Method Post -Body $tenant\n\nif ($cloneVariables -eq $true) {\n\tWrite-Host \"Cloning variables\"\n    $variables = Invoke-OctopusApi $tenant.Links.Variables\n    $variables.TenantId = $newTenant.Id\n    $variables.TenantName = $tenantName\n\n    Invoke-OctopusApi $newTenant.Links.Variables -Method Put -Body $variables | Out-Null\n}\n\n$tenantUrl = ($tenantUrlBase + \"tenants\" + $newTenant.Id + \"overview\") -join '/'\n$sourceTenantUrl = ($tenantUrlBase + \"tenants\" + $sourceTenantId + \"overview\") -join '/'\n\nWrite-Highlight \"New tenant [$tenantName]($tenantUrl) has been cloned from [$sourceTenantName]($sourceTenantUrl)\""
-  },
-  "Parameters": [
-    {
-      "Id": "cbedd129-210e-4bab-a446-3f89192653c7",
-      "Name": "CloneTenantStep_OctopusUrl",
-      "Label": "Octopus URL",
-      "HelpText": "The URL of the Octopus Server to clone the tenant to.",
-      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ea2614f0-bd41-4011-b263-7d2b12af5977",
-      "Name": "CloneTenantStep_ApiKey",
-      "Label": "Octopus API Key",
-      "HelpText": "The Octopus API Key to use for the API requests",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "b29e27fb-362e-45e2-a244-6d590875fb68",
-      "Name": "CloneTenantStep_TenantIdToClone",
-      "Label": "Id of Tenant to Clone",
-      "HelpText": "The Id of the tenant to clone. This will be in the format of *Tenants-1*",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b9b3a6c7-6c83-4a79-9a94-febc6c5818d3",
-      "Name": "CloneTenantStep_TenantName",
-      "Label": "New Tenant Name",
-      "HelpText": "The name of the tenant to create. *Note this must be unique*",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "be821ad4-b195-4b11-81c2-f432ff05b86d",
-      "Name": "CloneTenantStep_CloneVariables",
-      "Label": "Clone Variables?",
-      "HelpText": "Flag indicating whether the source tenant's variables should be cloned to the new tenant. *Note this does not copy sensitive variables*",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "831db28c-edc2-496b-b082-e6de827ca5df",
-      "Name": "CloneTenantStep_CloneTags",
-      "Label": "Clone Tags?",
-      "HelpText": "Flag indicating whether the source tenant's tags should be cloned.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "f9320a59-9752-43a5-b46a-a4d1486cfced",
-      "Name": "CloneTenantStep_SpaceId",
-      "Label": "Space Id",
-      "HelpText": "The Id of the Space used to clone the tenant. **Leave blank if you are using an Octopus version earlier than 2019.1 or if you wish to use the Octopus.Space.Id variable value.**",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-08-23T12:40:10.975Z",
-    "OctopusVersion": "2021.1.7687",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus",
-  "LastModifiedBy": "benjimac93"
-}
\ No newline at end of file
diff --git a/step-templates/com-component-register-unregister.json b/step-templates/com-component-register-unregister.json
deleted file mode 100644
index 2fde99ae8..000000000
--- a/step-templates/com-component-register-unregister.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "cf8634b6-313f-4435-bae6-88520c58d81d",
-  "Name": "Com Component - Register and Unregister using Regsvr32.exe",
-  "Description": "Uses regsvr32.exe to register com components",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$DllFilePaths,\r\n    [string]$Uninstall\r\n)\r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    param(\r\n        [string]$DllFilePaths,\r\n        [string]$Uninstall\r\n    ) \r\n\r\n    $isUninstall = $($Uninstall.ToLower() -eq 'true')\r\n\r\n    Write-Host \"COM Component - Register\"\r\n    Write-Host \"DllFilePaths: $DllFilePaths\"\r\n\r\n    $DllFilePaths.split(\";\") | ForEach {\r\n        $dllFilePath = $_.Trim();\r\n        Write-Host $dllFilePath\r\n        \r\n        if($dllFilePath.Length -lt 1){\r\n            break;\r\n        }\r\n        \r\n        Write-Host \"Attempting to register $dllFilePath\"\r\n\r\n        if(!(Test-Path \"$dllFilePath\"))\r\n        {\r\n            Write-Host \"FILE NOT FOUND $dllFilePath.\" -ForegroundColor Yellow;\r\n            return;\r\n        }\r\n\r\n         Write-Host \"Attempting to register $dllFilePath\"\r\n    \r\n        $pinfo = New-Object System.Diagnostics.ProcessStartInfo\r\n\r\n        $cmd = \"$env:windir\\System32\\regsvr32.exe\"\r\n\r\n        Write-Host \"Registering with: $env:windir\\System32\\regsvr32.exe\"\r\n\r\n        $pinfo.FileName = \"$cmd\"\r\n\r\n        $pinfo.RedirectStandardError = $true\r\n        $pinfo.RedirectStandardOutput = $true\r\n        $pinfo.UseShellExecute = $false\r\n        \r\n        if($isUninstall){\r\n            $args = \"/u\"\r\n        }\r\n        $args = \"$args /s `\"$dllFilePath`\"\"\r\n\r\n        $pinfo.Arguments = $args\r\n        \r\n        $p = New-Object System.Diagnostics.Process\r\n\r\n        $p.StartInfo = $pinfo\r\n\r\n        Write-Host \"Command:\"\r\n        Write-Host \"$cmd $args\"\r\n\r\n        if ($p.Start())\r\n        {\r\n            Write-Host $p.StandardOutput.ReadToEnd().ToString()\r\n\r\n            if($p.ExitCode -ne 0)\r\n            {\r\n                \r\n                Write-Host \"FAILED $($p.ExitCode) - Register\" -ForegroundColor Red \r\n                Write-Host $p.StandardError.ReadToEnd() -ForegroundColor Red\r\n                                \r\n                throw $p.StandardError.ReadToEnd()\r\n            }\r\n            \r\n            Write-Host \"SUCCESS- Register\" -ForegroundColor Green \r\n        }\r\n\r\n       \r\n    }\r\n\r\n } `\r\n (Get-Param 'DllFilePaths' -Required) `\r\n (Get-Param 'Uninstall' -Required)",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "DllFilePaths",
-      "Label": "DllFilePaths",
-      "HelpText": "List of dlls to be registered separated by a ; and can appear on separate lines",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "Uninstall",
-      "Label": "Un-register",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-06-29T20:18:21.590+00:00",
-  "LastModifiedBy": "jbennett",
-  "$Meta": {
-    "ExportedAt": "2015-06-30T18:55:08.050+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/configuration-encrypt-app-config-section.json b/step-templates/configuration-encrypt-app-config-section.json
deleted file mode 100644
index 9bedbeefb..000000000
--- a/step-templates/configuration-encrypt-app-config-section.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Id": "d80a7d9a-8c7b-4aa6-934e-0929bce606fe",
-  "Name": "Configuration - Encrypt App.config Section",
-  "Description": "Encrypts configuration sections for the specified executable.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\" \nfunction Get-Parameter($Name, $Default, [switch]$Required) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction HandleError($message) {\n\tif (!$whatIf) {\n\t\tthrow $message\n\t} else {\n\t\tWrite-Host $message -Foreground Yellow\n\t}\n}\n\n$appPath = Get-Parameter \"ExecutablePath\" -Required\n$sectionsToEncrypt = (Get-Parameter \"SectionsToEncrypt\" -Required) -split ',' | where {$_} | %{$_.Trim()}\n$provider = Get-Parameter \"Provider\" \"DataProtectionConfigurationProvider\"\n\nWrite-Host \"Configuration - Encrypt .config\"\nWrite-Host \"ExecutablePath: $appPath\"\nWrite-Host \"SectionToEncrypt: $sectionName\"\nWrite-Host \"Provider: $provider\"\n\nif (!(Test-Path $appPath)) {\n    HandleError \"The directory $appPath must exist\"\n}\n\n$configurationAssembly = \"System.Configuration, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a\"\n[void] [Reflection.Assembly]::Load($configurationAssembly)\n \n$configuration = [System.Configuration.ConfigurationManager]::OpenExeConfiguration($appPath)\n\nforeach ($sectionToEncrypt in $sectionsToEncrypt){\n\t$section = $configuration.GetSection($sectionToEncrypt)\n \n    if (-not $section.SectionInformation.IsProtected)\n    {\n        $section.SectionInformation.ProtectSection($provider);\n        $section.SectionInformation.ForceSave = [System.Boolean]::True;\n    }\n}\n\n$configuration.Save([System.Configuration.ConfigurationSaveMode]::Modified);",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ExecutablePath",
-      "Label": "Executable path",
-      "HelpText": "The path to the executable that has a corresponding `[Executable].exe.config` file. \n\nYou can get the InstallationDirectoryPath like so `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SectionsToEncrypt",
-      "Label": "Sections to encrypt",
-      "HelpText": "The name of the section in the App config to encrypt e.g. `appSettings`, `connectionStrings` etc. For multiple sections, separate with a comma (,)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Provider",
-      "Label": "Provider Name",
-      "HelpText": "The provider to use for encryption",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "kp-tseng",
-  "$Meta": {
-    "ExportedAt": "2016-12-13T07:19:21.741Z",
-    "OctopusVersion": "3.7.2",
-    "Type": "ActionTemplate"
-  },
-  "Category": "encrypt"
-}
diff --git a/step-templates/configuration-encrypt-app-or-web-config-section.json b/step-templates/configuration-encrypt-app-or-web-config-section.json
deleted file mode 100644
index 5da8f8ea3..000000000
--- a/step-templates/configuration-encrypt-app-or-web-config-section.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "c79b5e6b-88ac-47d5-8678-99e8ab2a1cd9",
-  "Name": "Configuration - Encrypt App or Web Config Section",
-  "Description": "Encrypts a configuration section for the specified executable.",
-  "ActionType": "Octopus.Script",
-  "Version": 17,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\" \nfunction Get-Parameter($Name, $Default, [switch]$Required) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    Write-Verbose \"Get-Parameter for '$($Name)' [value='$($result)' default='$($Default)']\"\n\n    return $result\n}\n\nfunction HandleError($message) {\n\tif (!$whatIf) {\n\t\tthrow $message\n\t} else {\n\t\tWrite-Host $message -Foreground Yellow\n\t}\n}\n\nfunction Invoke-EncryptAppConfigFile() {\n\n    if (!(Test-Path $appPath)) {\n        HandleError \"The directory $appPath must exist\"\n    }\n\n    $configurationAssembly = \"System.Configuration, Version=2.0.0.0, Culture=Neutral, PublicKeyToken=b03f5f7f11d50a3a\"\n    [void] [Reflection.Assembly]::Load($configurationAssembly)\n    $configuration = [System.Configuration.ConfigurationManager]::OpenExeConfiguration($appPath)\n\n    Invoke-ProtectSections $configuration\n}\n\nfunction Invoke-EncryptWebConfigFile() {\n    Import-module WebAdministration\n\n\t$IISPath = \"IIS:\\Sites\\$($webSiteName)$($appPath)\\\"\n\n    if (Test-Path $IISPath) { \n        Write-Verbose \"$webSiteName web site exists.\"\n\n        $configurationAssembly = \"System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\n        [void] [Reflection.Assembly]::Load($configurationAssembly)\n        $configuration = [System.Web.Configuration.WebConfigurationManager]::OpenWebConfiguration($appPath, $webSiteName)\n\n        Invoke-ProtectSections $configuration\n    }\n    else {\n        HandleError \"$webSiteName web site doesn't exists. Please check if the web site is installed.\"\n    }    \n}\n\nfunction Invoke-ProtectSections($configuration) {\n\n    $saveConfigFile = $false\n\n    foreach ($sectionName in $sections) {\n        $sectionName = $sectionName.Trim()      # compatible with Powershell 2.0 \n        $section = $configuration.GetSection($sectionName)\n        \n        if ($section) {\n            if (-not $section.SectionInformation.IsProtected)\n            {\n                Write-Verbose \"Encrypting $($section.SectionInformation.SectionName) section.\"\n                $section.SectionInformation.ProtectSection($provider);\n                $section.SectionInformation.ForceSave = [System.Boolean]::True;\n                $saveConfigFile = $true\n            }\n            else {\n                Write-Host \"Section $($section.SectionInformation.SectionName) is already protected.\"\n            }\n        }\n        else {\n            Write-Warning \"Section $($sectionName) doesn't exists in the configuratoin file.\"\n        }\n\n    }       \n\n    if ($saveConfigFile) {            \n        $configuration.Save([System.Configuration.ConfigurationSaveMode]::Modified);\n        Write-Host \"Encryption completed successfully.\"\n    }\n    else {\n        Write-Host \"No section(s) in the configuration were encrypted.\"\n    }\n}\n\n$appType = Get-Parameter \"ApplicationType\" -Required\nif ($appType -eq \"Web\") {\n    $appPath = Get-Parameter \"ExecutablePath\" \"/\"\n    $webSiteName = Get-Parameter \"WebSiteName\"\n}\nelse {\n    $appPath = Get-Parameter \"ExecutablePath\" -Required\n}\n$sectionName = Get-Parameter \"SectionToEncrypt\" -Required\n$sections = $sectionName.Split(',')         # adding .Trim() doesn't work on Powershell 2.0 or below\n$provider = Get-Parameter \"Provider\" \"DataProtectionConfigurationProvider\"\n\nWrite-Host \"Configuration - Encrypt config file\"\nWrite-Host \"Application Type: $appType\"\nWrite-Host \"Application Path: $appPath\"\nif ($appType -eq \"Web\") { Write-Host \"Web Site Name: $webSiteName\" }\nWrite-Host \"Section to Encrypt: $sectionName\"\nWrite-Host \"Provider: $provider\"\n\nif ($appType -eq \"Web\") {\n    Invoke-EncryptWebConfigFile\n}\nelse {\n    Invoke-EncryptAppConfigFile \n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "9ab1281d-cf2e-4248-a583-b08e9609c96d",
-      "Name": "ExecutablePath",
-      "Label": "Executable path",
-      "HelpText": "For Web:\nThe virtual path to the web site.\n\nFor Windows:\nThe path to the executable that has a corresponding `[Executable].exe.config` file.\n \nYou can get the InstallationDirectoryPath like so `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0cb4f8ec-5415-47e3-87f1-3e086cc1caa1",
-      "Name": "SectionToEncrypt",
-      "Label": "Section to encrypt",
-      "HelpText": "The name of the section(s) in the config to encrypt e.g. appSettings, connectionStrings etc.\n\nSeparate multiple sections with comma ','.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a30203d3-53d1-450d-bbcd-92a6eb31e906",
-      "Name": "Provider",
-      "Label": "Provider Name",
-      "HelpText": "The provider to use for encryption",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9116d4b3-b033-416f-844c-2a351d3bbc09",
-      "Name": "ApplicationType",
-      "Label": "Application Type",
-      "HelpText": "The application type would be web or windows.\nWeb will be used to encrypt web.config file.\nAnd Windows type application will encrypt file with \"exe.config\" or \"dll.config\" extension.",
-      "DefaultValue": "Web",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Web|Web Application\nWindows|Windows Service/Console App/Class Library (Dll)"
-      }
-    },
-    {
-      "Id": "90a1578e-efa2-44e4-84c0-34b037882cc5",
-      "Name": "WebSiteName",
-      "Label": "Web Site Name",
-      "HelpText": "Enter the web site name installed in IIS.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "KevinKelchen",
-  "$Meta": {
-    "ExportedAt": "2017-09-19T22:33:58.801Z",
-    "OctopusVersion": "3.12.4",
-    "Type": "ActionTemplate"
-  },
-  "Category": "encrypt"
-}
diff --git a/step-templates/configuration-encrypt-web-config-section.json b/step-templates/configuration-encrypt-web-config-section.json
deleted file mode 100644
index 854e18aaf..000000000
--- a/step-templates/configuration-encrypt-web-config-section.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "Id": "193628c4-2251-41e9-a782-225e632ef871",
-  "Name": "Configuration - Encrypt Section",
-  "Description": "Encrypts several configuration sections for the specified file in a given directory.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\" \nfunction Get-Parameter($Name, $Default, [switch]$Required) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction HandleError($message) {\n\tif (!$whatIf) {\n\t\tthrow $message\n\t} else {\n\t\tWrite-Host $message -Foreground Yellow\n\t}\n}\n\n$websiteDirectory = Get-Parameter \"WebsiteDirectory\" -Required\n$sectionsToEncrypt = (Get-Parameter \"SectionsToEncrypt\" -Required) -split ',' | where {$_} | %{$_.Trim()}\n$provider = Get-Parameter \"Provider\" \"\"\n$configFile = Get-Parameter \"ConfigFile\" \"web.config\"\n$otherFiles = (Get-Parameter \"OtherFiles\" \"\") -split ',' | where {$_} | %{$_.Trim()}\n\nWrite-Host \"Configuration - Encrypt .config\"\nWrite-Host \"WebsiteDirectory: $websiteDirectory\"\nWrite-Host \"SectionsToEncrypt: $sectionsToEncrypt\"\nWrite-Host \"Provider: $provider\"\nWrite-Host \"ConfigFile: $configFile\"\n\n\nif (!(Test-Path $websiteDirectory)) {\n\tHandleError \"The directory $websiteDirectory must exist\"\n}\n\n$configFilePath = Join-Path $websiteDirectory $configFile\nWrite-Host \"configFilePath: $configFilePath\"\nif (!(Test-Path $configFilePath)) {\n\tHandleError \"Specified file $configFile or a Web.Config file must exist in the directory $websiteDirectory\"\n}\n\n$frameworkPath = [System.Runtime.InteropServices.RuntimeEnvironment]::GetRuntimeDirectory();\n$regiis = \"$frameworkPath\\aspnet_regiis.exe\"\n\nif (!(Test-Path $regiis)) {\n\tHandleError \"The tool aspnet_regiis does not exist in the directory $frameworkPath\"\n}\n\n# Create a temp directory to work out of and copy our config file to web.config\n$tempPath = Join-Path $websiteDirectory $([guid]::NewGuid()).ToString()\nif (!$whatIf) {\n\tNew-Item $tempPath -ItemType \"directory\"\n} else {\n\tWrite-Host \"WhatIf: New-Item $tempPath -ItemType \"\"directory\"\"\" -Foreground Yellow\n}\n\n$tempFile = Join-Path $tempPath \"web.config\"\nif (!$whatIf) {\n    New-Item -ItemType File -Path $tempFile -Force\n\tCopy-Item $configFilePath $tempFile -Force\n} else {\n\tWrite-Host \"WhatIf: Copy-Item $configFilePath $tempFile\" -Foreground Yellow\n}\n\nForeach($fileName in $otherFiles){\n  if (!$whatIf) {\n     New-Item -ItemType File -Path (Join-Path $tempPath $fileName) -Force\n\t Copy-Item (Join-Path $websiteDirectory $fileName) (Join-Path $tempPath $fileName) -Force\n  } else {\n\t Write-Host \"WhatIf: Copy-Item $configFilePath $tempFile\" -Foreground Yellow\n  }\n}\n\nForeach($sectionToEncrypt in $sectionsToEncrypt){\n\t# Determine arguments\n\tif ($provider) {\n\t\t$args = \"-pef\", $sectionToEncrypt, $tempPath, \"-prov\", $provider\n\t} else {\n\t\t$args = \"-pef\", $sectionToEncrypt, $tempPath\n\t}\n\n\t# Encrypt Web.Config file in directory\n\tif (!$whatIf) {\n\t\t& $regiis $args\n\t\tif ($LASTEXITCODE) {\n\t\t    HandleError \"There was an error trying to encrypt section: $sectionToEncrypt\"\n\t\t}\n\t} else {\n\t\tWrite-Host \"WhatIf: $regiis $args\" -Foreground Yellow\n\t}\n}\n\n# Copy the web.config back to original file and delete the temp dir\nif (!$whatIf) {\n\tCopy-Item $tempFile $configFilePath -Force\n\n  Foreach($fileName in $otherFiles){\n    if (!$whatIf) {\n  \t Copy-Item (Join-Path $tempPath $fileName) (Join-Path $websiteDirectory $fileName) -Force\n    } else {\n  \t Write-Host \"WhatIf: Copy-Item $configFilePath $tempFile\" -Foreground Yellow\n    }\n  }\n\n  Remove-Item $tempPath -Recurse\n} else {\n\tWrite-Host \"WhatIf: Copy-Item $tempFile $configFilePath -Force\" -Foreground Yellow\n\tWrite-Host \"WhatIf: Remove-Item $tempPath -Recurse\" -Foreground Yellow\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "0cae0018-f915-47c5-a8d6-cdef437346df",
-      "Name": "WebsiteDirectory",
-      "Label": "Website directory",
-      "HelpText": "The path to the website physical directory that contains a `Web.Config` file. \n\nYou can get the InstallationDirectoryPath like so `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3d7e5485-106e-415e-83b7-cf12c59e776b",
-      "Name": "SectionsToEncrypt",
-      "Label": "Section to encrypt",
-      "HelpText": "The name of the section in the web config to encrypt e.g. `appSettings`, `connectionStrings` etc.\nFor multiple sections, separate with a comma (,)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "12a46b72-3835-4086-b8d6-bd5ad3f99f10",
-      "Name": "Provider",
-      "Label": "Provider Name",
-      "HelpText": "The provider to use for encryption",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "998aa949-74b6-4da6-a838-5637e7a5a322",
-      "Name": "ConfigFile",
-      "Label": "Configuration File",
-      "HelpText": "The configuration file to encrypt.",
-      "DefaultValue": "web.config",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "67415967-4722-449c-8d81-28eff7bf9876",
-      "Name": "OtherFiles",
-      "Label": "Other Files",
-      "HelpText": "A list of other files in the `#{WebsiteDirectory}` folder that should be included when encrypting the specified `#{SectionToEncrypt}`. For example, `connectionStrings.config`. Values should be separated by a comma.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "cjuroz",
-  "$Meta": {
-    "ExportedAt": "2016-12-27T03:36:42.383Z",
-    "OctopusVersion": "3.7.6",
-    "Type": "ActionTemplate"
-  },
-  "Category": "encrypt"
-}
\ No newline at end of file
diff --git a/step-templates/create-azure-website-staging-slot.json b/step-templates/create-azure-website-staging-slot.json
deleted file mode 100644
index 10267f35f..000000000
--- a/step-templates/create-azure-website-staging-slot.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "2f763d9e-81e1-4ce2-a897-3fe2c72ab9f0",
-  "Name": "Create Azure Website Staging Slot. Requires Azure PowerShell to be installed on Tentacle machine",
-  "Description": "Creates a staging slot for Azure Website. \n\nProvides Azure publish url as variable:\n\n     #{Octopus.Action[Create Staging Slot Step Name].Output.AzurePublishUrl}\n\nAnd Username/Password for publishing:\n\n    #{Octopus.Action[Create Staging Slot Step Name].Output.AzureUsername}\n    #{Octopus.Action[Create Staging Slot Step Name].Output.AzurePassword}",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Check if Windows Azure Powershell is avaiable \r\ntry{ \r\n    Import-Module Azure -ErrorAction Stop\r\n}catch{\r\n    throw \"Windows Azure Powershell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools\" \r\n}\r\n\r\n\r\n$stagingWebsite = Get-AzureWebsite -Name $AzureWebSite -Slot staging -ErrorAction SilentlyContinue\r\n\r\n\r\nif($stagingWebsite -eq $null)\r\n{\r\n    Write-Host \"Creating staging slot\"\r\n    $stagingWebsite = New-AzureWebsite -Name $AzureWebSite -Slot staging -Location $Location\r\n}\r\n\r\n\r\nSet-OctopusVariable -name \"AzurePassword\" -value $stagingWebsite.PublishingPassword\r\nSet-OctopusVariable -name \"AzureUsername\" -value $stagingWebsite.PublishingUsername\r\n\r\n$urlString = ($stagingWebsite.SiteProperties.Properties | ?{ $_.Name -eq \"RepositoryURI\" }).Value.ToString()\r\n$url = [System.Uri]$urlString\r\n\r\n\r\nSet-OctopusVariable -Name \"AzurePublishUrl\" -value $url.Host",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "AzureWebSite",
-      "Label": "Azure Web Site Name",
-      "HelpText": "Name of the web-site in Azure",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-03-25T08:42:32.838+00:00",
-  "LastModifiedBy": "trailmax",
-  "$Meta": {
-    "ExportedAt": "2015-03-25T08:51:15.660+00:00",
-    "OctopusVersion": "2.6.3.886",
-    "Type": "ActionTemplate"
-  },
-  "Category": "azure"
-}
\ No newline at end of file
diff --git a/step-templates/create-tenant.json b/step-templates/create-tenant.json
deleted file mode 100644
index 07ef86c57..000000000
--- a/step-templates/create-tenant.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Id": "581e7211-c9e2-4d7b-8934-bcdac421d022",
-  "Name": "Create Tenant",
-  "Description": "Create an Octopus [tenant](https://octopus.com/docs/deployment-patterns/multi-tenant-deployments) with optional tenant tags and project connections.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12\n[Net.ServicePointManager]::SecurityProtocol = $securityProtocol\n\n$ErrorActionPreference = 'Stop'\n\n$octopusBaseUrl = $CloneTenantStep_OctopusUrl.Trim('/')\n$apiKey = $CreateTenantStep_ApiKey\n$tenantName = $CreateTenantStep_TenantName\n$tenantTags = if ($CreateTenantStep_TenantTags -eq $null) { @() } else { $CreateTenantStep_TenantTags | ConvertFrom-Json }\n$projectEnvironments = if ($CreateTenantStep_ProjectEnvironments -eq $null) { @{} } else { $CreateTenantStep_ProjectEnvironments | ConvertFrom-Json }\n$spaceId = $CloneTenantStep_SpaceId\n\nif ([string]::IsNullOrWhiteSpace($octopusBaseUrl)) {\n    throw \"The step parameter 'Octopus Base Url' was not found. This step requires the Octopus Server URL to function, please provide one and try again.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($apiKey)) {\n    throw \"The step parameter 'Octopus API Key' was not found. This step requires an API Key to function, please provide one and try again.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($tenantName)) {\n    throw \"The step parameter 'Tenant Name' was not found. Please provide one and try again.\"\n}\n\nfunction Invoke-OctopusApi {\n    param(\n        [Parameter(Position = 0, Mandatory)]$Uri,\n        [ValidateSet(\"Get\", \"Post\", \"Put\", \"Delete\")]$Method = 'Get',\n        $Body\n    )\n    \n    $uriParts = @($octopusBaseUrl, $Uri.TrimStart('/'))    \n    $uri = ($uriParts -join '/')\n    \n    Write-Verbose \"Uri: $uri\"\n    \n    $requestParameters = @{\n        Uri = $uri\n        Method = $Method\n        Headers = @{ \"X-Octopus-ApiKey\" = $apiKey }\n        UseBasicParsing = $true\n    }\n    \n    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }\n    \n    return Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json\n}\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-OctopusApi 'api/';\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif([string]::IsNullOrWhiteSpace($spaceId)) {\n\tif(Test-SpacesApi) {\n      \t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n      \tif([string]::IsNullOrWhiteSpace($spaceId)) {\n          \tthrow \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error or try providing the Space Id parameter.\";\n      \t}\n\t}\n}\n\n$apiPrefix = \"api/\"\n$tenantUrlBase = @($octopusBaseUrl, 'app#')\n\nif ($spaceId) {\n\tWrite-Host \"Using Space $spaceId\"\n\t$apiPrefix += $spaceId\n    $tenantUrlBase += $spaceId\n}\n\n$body = @{\n\tId = $null\n    Name = $tenantName\n    TenantTags = @($tenantTags)\n    ProjectEnvironments = $projectEnvironments\n}\n\nWrite-Host \"Creating tenant $tenantName\"\n$tenant = Invoke-OctopusApi \"$apiPrefix/tenants\" -Method Post -Body $body\n$tenantUrl = ($tenantUrlBase + \"tenants\" + $tenant.Id + \"overview\") -join '/'\n\nWrite-Highlight \"New tenant [$tenantName]($tenantUrl) has been created.\""
-  },
-  "Parameters": [
-    {
-      "Id": "9c6ce5ed-e370-4150-88c0-880984531a48",
-      "Name": "CloneTenantStep_OctopusUrl",
-      "Label": "Octopus URL",
-      "HelpText": "The URL of the Octopus Server to create the tenant on.",
-      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a57b379b-a0dd-4d0e-8229-7bd358448766",
-      "Name": "CreateTenantStep_ApiKey",
-      "Label": "Octopus API Key",
-      "HelpText": "The Octopus API Key to use for the API requests",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "e02927d1-e2a3-4887-b5d3-c49b12a297a2",
-      "Name": "CreateTenantStep_TenantName",
-      "Label": "Tenant Name",
-      "HelpText": "The name of the tenant to create. *Note this must be unique*",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "3c3364b8-69f9-458f-9b34-efc591c8882e",
-      "Name": "CreateTenantStep_TenantTags",
-      "Label": "Tenant Tags JSON",
-      "HelpText": "The tenant tags in a JSON array format. Example below.\n\n*[\"TagSet1/Tag1\", \"TagSet2/Tag1\", \"TagSet2/Tag2\"]*",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a68945f1-7adc-4015-80da-dc3a3ce0b571",
-      "Name": "CreateTenantStep_ProjectEnvironments",
-      "Label": "Project and Environments JSON",
-      "HelpText": "The projects and environments to connect the tenant to in JSON format. Example below.\n\n*{ \"Projects-1\": [\"Environments-1\", \"Environments-2\"], \"Projects-2\": [\"Environments-1\", \"Environments-2\", \"Environments-3\"] }*",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5f80b46a-d09c-4092-8a0f-fcc96c49fde2",
-      "Name": "CloneTenantStep_SpaceId",
-      "Label": "Space Id",
-      "HelpText": "The Id of the Space used to clone the tenant. **Leave blank if you are using an Octopus version earlier than 2019.1 or if you wish to use the Octopus.Space.Id variable value.**",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-08-23T12:40:10.975Z",
-    "OctopusVersion": "2021.1.7687",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus",
-  "LastModifiedBy": "benjimac93"
-}
\ No newline at end of file
diff --git a/step-templates/cyberark-conjur-retrieve-secrets.json b/step-templates/cyberark-conjur-retrieve-secrets.json
deleted file mode 100644
index 195a07ef1..000000000
--- a/step-templates/cyberark-conjur-retrieve-secrets.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "Id": "522c7010-7189-4b2e-a3c8-36cb1759422a",
-    "Name": "CyberArk Conjur - Retrieve Secrets",
-    "Description": "This step retrieves one or more secrets from [CyberArk Conjur](https://www.conjur.org/) and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nThis step differs from the [CyberArk Conjur - Retrieve a Secret](https://library.octopus.com/step-templates/eafe9740-1008-4375-9e82-0d193109b669/actiontemplate-cyberark-conjur-retrieve-a-secret) step template as it offers the ability to retrieve multiple secrets (with optional version) and performs a batched call where possible - see below for further details.\n\n---\n\n**Retrieval Behavior:**\n\n- If any of the Conjur Variables have a version specified to retrieve, then the step template will retrieve **all** of the secrets individually using the [Conjur REST API - Secret Retrieve](https://docs.conjur.org/Latest/en/Content/Developer/Conjur_API_Retrieve_Secret.htm) endpoint.\n- If none of the Conjur Variables have a version specified (i.e. retrieve the latest version) then the step template will retrieve the secrets using the [Conjur REST API - Batch Retrieval](https://docs.conjur.org/Latest/en/Content/Developer/Conjur_API_Batch_Retrieve.htm) endpoint.\n\n*Hint:* If performance is important to you, don't include specific versions of Conjur Variables. It’s faster to fetch secrets in a batch than to fetch them one at a time.\n\n---\n\n**Required:** \n- PowerShell **5.1** or higher.\n- A set of credentials with permissions to retrieve secrets from CyberArk Conjur.\n- Access to the Conjur instance from the Worker or target where this step executes.\n\nNotes:\n\n- Tested on Conjur **v1.13.2** / API **v5.2.0**.\n- Tested on Octopus **2021.2**.\n- Tested on both Windows Server 2019 and Ubuntu 20.04.",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$ConjurUrl = $OctopusParameters[\"CyberArk.Conjur.RetrieveSecrets.Url\"]\n$ConjurAccount = $OctopusParameters[\"CyberArk.Conjur.RetrieveSecrets.Account\"]\n$ConjurLogin = $OctopusParameters[\"CyberArk.Conjur.RetrieveSecrets.Login\"]\n$ConjurApiKey = $OctopusParameters[\"CyberArk.Conjur.RetrieveSecrets.ApiKey\"]\n$ConjurSecretVariables = $OctopusParameters[\"CyberArk.Conjur.RetrieveSecrets.SecretVariables\"]\n$PrintVariableNames = $OctopusParameters[\"CyberArk.Conjur.RetrieveSecrets.PrintVariableNames\"]\n$ConjurTrustCertificate = [System.Convert]::ToBoolean($OctopusParameters['CyberArk.Conjur.TrustCertificate'])\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($ConjurUrl)) {\n    throw \"Required parameter CyberArk.Conjur.RetrieveSecrets.Url not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($ConjurAccount)) {\n    throw \"Required parameter CyberArk.Conjur.RetrieveSecrets.Account not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($ConjurLogin)) {\n    throw \"Required parameter CyberArk.Conjur.RetrieveSecrets.Login not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($ConjurApiKey)) {\n    throw \"Required parameter CyberArk.Conjur.RetrieveSecrets.ApiKey not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($ConjurSecretVariables)) {\n    throw \"Required parameter CyberArk.Conjur.RetrieveSecrets.SecretVariables not specified\"\n}\n\n### Helper functions\n\n# This function creates a URI and prevents Urls that have been Url encoded from being re-encoded.\n# Typically this happens on Windows (dynamic) workers in Octopus, and not PS Core.\n# Helpful background - https://stackoverflow.com/questions/25596564/percent-encoded-slash-is-decoded-before-the-request-dispatch\n# Function based from https://github.com/IISResetMe/PSdotNETRuntimeHacks/blob/trunk/Set-DontUnescapePathDotsAndSlashes.ps1\nfunction New-DontUnescapePathDotsAndSlashes-Uri {\n    param(\n        [Parameter(Mandatory = $true)]\n        [ValidateNotNull()]\n        [string]$SourceUri\n    )\n\n    $uri = New-Object System.Uri $SourceUri\n\n    # If running PS Core, not affected\n    if ($PSEdition -eq \"Core\") {\n        return $uri\n    }\n\n    # Retrieve the private Syntax field from the uri class,\n    # this is our indirect reference to the attached parser\n    $syntaxFieldInfo = $uri.GetType().GetField('m_Syntax', 'NonPublic,Instance')\n    if (-not $syntaxFieldInfo) {\n        throw [System.MissingFieldException]\"'m_Syntax' field not found\"\n    }\n\n    # Retrieve the private Flags field from the parser class,\n    # this is the value we're looking to update at runtime\n    $flagsFieldInfo = [System.UriParser].GetField('m_Flags', 'NonPublic,Instance')\n    if (-not $flagsFieldInfo) {\n        throw [System.MissingFieldException]\"'m_Flags' field not found\"\n    }\n\n    # Retrieve the actual instances\n    $uriParser = $syntaxFieldInfo.GetValue($uri)\n    $uriSyntaxFlags = $flagsFieldInfo.GetValue($uriParser)\n\n    # Define the bit flags we want to remove\n    $UnEscapeDotsAndSlashes = 0x2000000\n    $SimpleUserSyntax = 0x20000\n\n    # Clear the flags that we don't want\n    $uriSyntaxFlags = [int]$uriSyntaxFlags -band -bnot($UnEscapeDotsAndSlashes)\n    $uriSyntaxFlags = [int]$uriSyntaxFlags -band -bnot($SimpleUserSyntax)\n\n    # Overwrite the existing Flags field\n    $flagsFieldInfo.SetValue($uriParser, $uriSyntaxFlags)\n\n    return $uri\n}\n\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n    $rawResponse = \"\"\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n        }\n    }\n    else {\n        $rawResponse = $RequestError.ErrorDetails.Message\n    }\n\n    try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n    return $response\n}\n\nfunction Format-SecretName {\n    [CmdletBinding()]\n    Param(\n        [string] $Name,\n        [string] $Version\n    )\n    $displayName = \"'$Name'\"\n    if (![string]::IsNullOrWhiteSpace($Version)) {\n        $displayName += \" (v:$($Version))\"\n    }\n    return $displayName\n}\n\nfunction Invoke-CyberArk-Rest-Method\n{\n  # define parameters\n  [CmdletBinding()]\n  param(\n    $Url,\n    $Method,\n    $Headers,\n    $Body,\n    $TrustCertificate\n  )\n\n  # define working variables\n  $invokeArguments = @{\n    Uri = $Url\n    Method = $Method\n  }\n\n  # Check for the presence of variables\n  if (![string]::IsNullOrWhitespace($Headers))\n  {\n    $invokeArguments.Add(\"Headers\", $Headers)\n  }\n\n  if (![string]::IsNullOrWhitespace($Body))\n  {\n    $invokeArguments.Add(\"Body\", $Body)\n  }\n\n  if ($TrustCertificate -eq $true)\n  {\n    $invokeArguments.Add(\"SkipCertificateCheck\", $TrustCertificate)\n  }\n\n  return Invoke-RestMethod @invokeArguments\n}\n\n### End Helper function\n\n$Secrets = @()\n$VariablesCreated = 0\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$ConjurUrl = $ConjurUrl.TrimEnd(\"/\")\n\n\n# Extract secret names\n@(($ConjurSecretVariables -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $secretDefinition = ($_ -Split \"\\|\")\n        $secretName = $secretDefinition[0].Trim()\n        $secretNameAndVersion = ($secretName -Split \" \")\n        $secretVersion = \"\"\n        if ($secretNameAndVersion.Count -gt 1) {\n            $secretName = $secretNameAndVersion[0].Trim()\n            $secretVersion = $secretNameAndVersion[1].Trim()\n        }\n        if ([string]::IsNullOrWhiteSpace($secretName)) {\n            throw \"Unable to establish secret name from: '$($_)'\"\n        }\n\n        $UriEscapedName = [uri]::EscapeDataString($secretName)\n        $VariableIdPrefix = \"$($ConjurAccount):variable\"\n\n        $secret = [PsCustomObject]@{\n            Name                 = $secretName\n            UriEscapedName       = $uriEscapedName\n            Version              = $secretVersion\n            VariableName         = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { \"\" }\n            VariableId           = \"$($VariableIdPrefix):$($secretName)\"\n            UriEscapedVariableId = \"$($VariableIdPrefix):$($UriEscapedName)\"\n        }\n        $Secrets += $secret\n    }\n}\n$SecretsWithVersionSpecified = @($Secrets | Where-Object { ![string]::IsNullOrWhiteSpace($_.Version) })\n\nWrite-Verbose \"Conjur Url: $ConjurUrl\"\nWrite-Verbose \"Conjur Account: $ConjurAccount\"\nWrite-Verbose \"Conjur Login: $ConjurLogin\"\nWrite-Verbose \"Conjur API Key: ********\"\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"Secrets with Version specified: $($SecretsWithVersionSpecified.Count)\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\n\ntry {\n\n    $headers = @{\n        \"Content-Type\"    = \"application/json\"; \n        \"Accept-Encoding\" = \"base64\"\n    }\n\n    $body = $ConjurApiKey\n    $loginUriSegment = [uri]::EscapeDataString($ConjurLogin)\n    $authnUri = New-DontUnescapePathDotsAndSlashes-Uri -SourceUri \"$ConjurUrl/authn/$ConjurAccount/$loginUriSegment/authenticate\"\n    #$authToken = Invoke-RestMethod -Uri $authnUri -Method Post -Headers $headers -Body $body\n    $authToken = Invoke-CyberArk-Rest-Method -Url $authnUri -Method Post -Headers $headers -Body $body -TrustCertificate $ConjurTrustCertificate\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred logging in to Conjur: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.error) {\n            $AdditionalDetail = \"$($ErrorBody.error.code) - $($ErrorBody.error.message)\"\n        }\n        else {\n            $AdditionalDetail += $ErrorBody\n        }\n    }\n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`nDetail: $AdditionalDetail\"\n    }\n    \n    Write-Error $Message -Category AuthenticationError\n}\n\nif ([string]::IsNullOrWhiteSpace($authToken)) {\n    Write-Error \"Null or Empty token!\"\n    return\n}\n\n# Set token auth header\n$headers = @{\n    \"Authorization\" = \"Token token=`\"$($authToken)`\"\"; \n}\n\nif ($SecretsWithVersionSpecified.Count -gt 0) {\n    Write-Verbose \"Retrieving secrets individually as at least one has a version specified.\"\n    foreach ($secret in $Secrets) {\n        try {\n            $name = $secret.Name\n            $uriEscapedName = $secret.UriEscapedName\n            $secretVersion = $secret.Version\n            $variableName = $secret.VariableName\n            $displayName = Format-SecretName -Name $name -Version $secretVersion\n\n            if ([string]::IsNullOrWhiteSpace($variableName)) {\n                $variableName = \"$($name.Trim().Replace(\"/\",\".\"))\"\n            }\n            $secretUri = \"$ConjurUrl/secrets/$ConjurAccount/variable/$uriEscapedName\"\n            if (![string]::IsNullOrWhiteSpace($secretVersion)) {\n                $secretUri += \"?version=$($secretVersion)\"\n            }\n            $secretUri = New-DontUnescapePathDotsAndSlashes-Uri -SourceUri \"$secretUri\"\n            Write-Verbose \"Retrieving Secret $displayName\"\n            #$secretValue = Invoke-RestMethod -Uri $secretUri -Method Get -Headers $headers\n            $secretValue = Invoke-CyberArk-Rest-Method -Url $secretUri -Method Get -Headers $headers -TrustCertificate $ConjurTrustCertificate\n\n            if ([string]::IsNullOrWhiteSpace($secretValue)) {\n                Write-Error \"Error: Secret $displayName not found or has no versions.\"\n                break;\n            }\n    \n            Set-OctopusVariable -Name $variableName -Value $secretValue -Sensitive\n    \n            if ($PrintVariableNames -eq $True) {\n                Write-Output \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n            }\n            $VariablesCreated += 1\n        }\n        catch {\n            $ExceptionMessage = $_.Exception.Message\n            $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n            $Message = \"An error occurred retrieving secret $($displayName) from Conjur: $ExceptionMessage\"\n            $AdditionalDetail = \"\"\n            if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n                if ($null -ne $ErrorBody.error) {\n                    $AdditionalDetail = \"$($ErrorBody.error.code) - $($ErrorBody.error.message)\"\n                }\n                else {\n                    $AdditionalDetail += $ErrorBody\n                }\n            }\n        \n            if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n                $Message += \"`nDetail: $AdditionalDetail\"\n            }\n    \n            Write-Error $Message -Category ReadError\n            break;\n        }\n    }\n}\nelse {\n    Write-Verbose \"Retrieving secrets by batch as no versions specified.\"\n    $uriEscapedVariableIds = @($Secrets | ForEach-Object { \"$($_.UriEscapedVariableId)\" }) -Join \",\"\n\n    try {    \n        $secretsUri = New-DontUnescapePathDotsAndSlashes-Uri -SourceUri \"$ConjurUrl/secrets?variable_ids=$($uriEscapedVariableIds)\"\n        #$secretValues = Invoke-RestMethod -Uri $secretsUri -Method Get -Headers $headers\n        $secretValues = Invoke-CyberArk-Rest-Method -Url $secretsUri -Method Get -Headers $headers -TrustCertificate $ConjurTrustCertificate\n        $secretKeyValues = $secretValues | Get-Member | Where-Object { $_.MemberType -eq \"NoteProperty\" } | Select-Object -ExpandProperty \"Name\"\n        foreach ($secret in $Secrets) {\n            $name = $secret.Name\n            $variableId = $secret.VariableId\n            $variableName = $secret.VariableName\n\n            Write-Verbose \"Extracting Secret '$($name)' from Conjur batched response\"\n\n            if ([string]::IsNullOrWhiteSpace($variableName)) {\n                $variableName = \"$($name.Trim().Replace(\"/\",\".\"))\"\n            }\n            if ($secretKeyValues -inotcontains $variableId) {\n                Write-Error \"Secret '$name' not found in Conjur response.\"\n                return\n            }\n            \n            $variableValue = $secretValues.$variableId\n            Set-OctopusVariable -Name $variableName -Value $variableValue -Sensitive\n\n            if ($PrintVariableNames -eq $True) {\n                Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n            }\n            $VariablesCreated += 1\n        }\n    }\n    catch {\n        $ExceptionMessage = $_.Exception.Message\n        $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n        $Message = \"An error occurred retrieving batched secrets from Conjur: $ExceptionMessage\"\n        $AdditionalDetail = \"\"\n        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n            if ($null -ne $ErrorBody.error) {\n                $AdditionalDetail = \"$($ErrorBody.error.code) - $($ErrorBody.error.message)\"\n            }\n            else {\n                $AdditionalDetail += $ErrorBody\n            }\n        }\n        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n            $Message += \"`nDetail: $AdditionalDetail\"\n        }\n        \n        Write-Error $Message -Category AuthenticationError\n    }\n}\n\nWrite-Host \"Created $variablesCreated output variables\""
-  },
-    "Parameters": [
-      {
-        "Id": "66a70ea0-8d3a-4682-9575-c1dae8ad75e6",
-        "Name": "CyberArk.Conjur.RetrieveSecrets.Url",
-        "Label": "Conjur URL",
-        "HelpText": "The URL of the Conjur instance you are connecting to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8b77d118-197b-40be-9382-c8ee4d5aae1b",
-        "Name": "CyberArk.Conjur.TrustCertificate",
-        "Label": "Trust Server Certificate",
-        "HelpText": "Trust the server certificate when using an HTTPS connection and the caller cannot verify the Certificate Authority root.\n\nYou can use this option when using self-signed certificates.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "ceae6659-4643-490d-9d8d-f642c1c1b4a0",
-        "Name": "CyberArk.Conjur.RetrieveSecrets.Account",
-        "Label": "Conjur Account",
-        "HelpText": "The Conjur account. This is the Conjur appliance identifier provided during Conjur configuration.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0f501e04-207f-4a05-9d21-1e2462bf5b73",
-        "Name": "CyberArk.Conjur.RetrieveSecrets.Login",
-        "Label": "Conjur Login",
-        "HelpText": "The username (from the point of view of the authenticator) of the user or machine (host) requesting authentication. For a host, the id assigned when the host was created should be used, prepended with the literal `host/`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3985b74e-1ea8-4bda-affa-9e7b22056c58",
-        "Name": "CyberArk.Conjur.RetrieveSecrets.ApiKey",
-        "Label": "Conjur Api Key",
-        "HelpText": "The API Key corresponding to the user/host provided.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "eefe9594-7dd1-4fa4-9bb1-65ced026fdda",
-        "Name": "CyberArk.Conjur.RetrieveSecrets.SecretVariables",
-        "Label": "Conjur Secret Variable IDs",
-        "HelpText": "Specify the names of the secrets to be returned from Conjur, in the format:\n\n`VariableID Version | OutputVariableName` where:\n\n- `VariableID` is the Variable ID of the Conjur secret.\n- `Version` is the version of the secret to retrieve. *If this value isn't specified, the latest version will be retrieved*.\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple Variable IDs can be retrieved by entering each one on a new line.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "462f3385-dccd-4ac1-a30b-b06029fbfc18",
-        "Name": "CyberArk.Conjur.RetrieveSecrets.PrintVariableNames",
-        "Label": "Print output variable names",
-        "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2024-12-12T01:15:33.891Z",
-      "OctopusVersion": "2025.1.2648",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "cyberark"
-  }
diff --git a/step-templates/datadog-task-log.json b/step-templates/datadog-task-log.json
deleted file mode 100644
index 30fd2a789..000000000
--- a/step-templates/datadog-task-log.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "Id": "e8550a62-3ed7-4200-b5c7-ba91cbda5e2a",
-  "Name": "Datadog - Log Task",
-  "Description": "Log details of a task to Datadog, including error detail.\n\n**Configuration**: \n\n* In Datadog, add a [standard attribute](https://docs.datadoghq.com/logs/processing/attributes_naming_convention/#standard-attributes-and-aliasing) of `octopus.deployment.properties` to see and access JSON details of the task.  \n\n* When using the step, set the [run condition](https://octopus.com/docs/projects/steps/conditions) of the step to `Always run` to ensure logs are sent for errors as well as successful tasks.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "  \nfunction Send-DatadogEvent (\n    $datadog,\n    [string] $text,\n    [string] $level,\n    $properties = @{},\n    [string] $exception = $null,\n    [switch] $template) {\n    \n    \n    if (-not $level) {\n        $level = 'Information'\n    }\n\n    if (@('Verbose', 'Debug', 'Information', 'Warning', 'Error', 'Fatal') -notcontains $level) {\n        $level = 'Information'\n    }\n\n\n    $ddtags = \"project:$($properties.ProjectName),deploymentname:$($properties.DeploymentName),env:$($properties.EnvironmentName)\"\n    if ($properties[\"TaskType\"] -eq \"Runbook\") {\n        $ddtags += \",runbookname:$($properties.RunbookName),tasktype:runbook\"\n    }\n    else {\n        $ddtags += \",tasktype:deployment\"    \n    }\n\n    $body = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n    $body.Add(\"ddsource\", \"Octopus Deploy\")\n    $body.Add(\"ddtags\", $ddtags)\n    $body.Add(\"service\", $DatadogServiceName)\n    $body.Add(\"hostname\", \"https://octopus.the-crock.com/\")\n    $body.Add(\"http.url\", \"$($properties[\"TaskLink\"])\")\n    $body.Add(\"octopus.deployment.properties\", \"$($properties | ConvertTo-Json)\")\n\n    if ($exception) {\n        $body.Add(\"error.message\", \"$($properties[\"Error\"])\")\n        $body.Add(\"error.stack\", \"$($exception)\")\n    }\n    \n    $body.Add(\"level\", \"$($level)\")\n  \n    $headers = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n    $headers.Add(\"Content-Type\", \"application/json\")\n    $headers.Add(\"DD-APPLICATION-KEY\", \"$($DatadogApplicationKey)\")\n    $headers.Add(\"DD-API-KEY\", \"$($DatadogApiKey)\")\n\n    Invoke-RestMethod -Uri $DatadogUrl -Body $($body | ConvertTo-Json)  -ContentType \"application/json\" -Method POST -Headers $headers\n}\n\nfunction Set-ErrorDetails(){\n\n    $octopusAPIHeader = @{ \"X-Octopus-ApiKey\" = $DatadogOctopusAPIKey }\n    $taskDetailUri = \"$($OctopusParameters['Octopus.Web.ServerUri'])/api/tasks/$($OctopusParameters[\"Octopus.Task.Id\"])/details\"\n\n    $taskDetails = Invoke-RestMethod -Method Get -Uri $taskDetailUri -Headers $octopusAPIHeader \n    $errorMessage = \"\";\n    $errorFirstLine = \"\";\n    $isFirstLine = $true;\n\n    foreach ($activityLog in $taskDetails.ActivityLogs) {\n        foreach ($activityLogChild1 in $activityLog.Children) {\n            foreach ($activityLogChild2 in $activityLogChild1.Children) {\n                foreach ($logElement in $activityLogChild2.LogElements) {\n                    if ($logElement.Category -eq \"Error\") {\n                        if ($isFirstLine -eq $true) {\n                            $errorFirstLine = $logElement.MessageText;\n                            $isFirstLine = $false;\n                        }\n\n                        $errorMessage += $logElement.MessageText + \" `n\"\n                    }\n                }\n            }\n        }\n    }\n\n    $exInfo = @{\n        firstLine = $errorFirstLine\n        message = $errorMessage\n    }\n\n    return $exInfo;\n}\n\nfunction Set-TaskProperties(){\n    $taskProperties = @{\n        ProjectName     = $OctopusParameters['Octopus.Project.Name'];\n        Result          = \"succeeded\";\n        InstanceUrl     = $OctopusParameters['Octopus.Web.ServerUri'];\n        EnvironmentName = $OctopusParameters['Octopus.Environment.Name'];\n        DeploymentName  = $OctopusParameters['Octopus.Deployment.Name'];\n        TenantName      = $OctopusParameters[\"Octopus.Deployment.Tenant.Name\"]\n        TaskLink        = $taskLink\n    }\n    \n    if ([string]::IsNullOrEmpty($OctopusParameters[\"Octopus.Runbook.Id\"]) -eq $false) {\n        $taskProperties[\"TaskType\"] \t\t\t= \"Runbook\"\n        $taskProperties[\"RunbookSnapshotName\"] \t= $OctopusParameters[\"Octopus.RunbookSnapshot.Name\"]\n        $taskProperties[\"RunbookName\"]         \t= $OctopusParameters[\"Octopus.Runbook.Name\"]\n    }\n    else {\n        $taskProperties[\"TaskType\"] \t\t= \"Deployment\"\n        $taskProperties[\"ReleaseNumber\"] \t= $OctopusParameters['Octopus.Release.Number'];\n        $taskProperties[\"Channel\"]  \t\t= $OctopusParameters['Octopus.Release.Channel.Name'];\n    }\n\n    return $taskProperties;\n}\n\n#******************************************************************\n\n$taskLink = $OctopusParameters['Octopus.Web.ServerUri'] + \"/app#/\" + $OctopusParameters[\"Octopus.Space.Id\"] + \"/tasks/\" + $OctopusParameters[\"Octopus.Task.Id\"]\n$level = \"Information\"\n$exception = $null\n\nWrite-Output \"Logging the deployment result to Datadog at $DatadogServerUrl...\"\n\n$properties = Set-TaskProperties\n\nif ($OctopusParameters['Octopus.Deployment.Error']) {\n    $exceptionInfo = Set-ErrorDetails\n    $properties[\"Result\"] = \"failed\"\n    $properties[\"Error\"] = $exceptionInfo[\"firstLine\"]\n    $exception = $exceptionInfo[\"message\"]\n    $level = \"Error\"\n}\n\ntry {\n    Send-DatadogEvent $datadog \"A deployment of $($properties.ProjectName) release $($properties.ReleaseNumber) $($properties.Result) in $($properties.EnvironmentName)\" -level $level -template -properties $properties -exception $exception\n}\ncatch [Exception] {\n    Write-Error \"Unable to write task details to Datadog\"\n    $_.Exception | format-list -force\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "6a1f7310-294a-4593-898b-afc32bd93bb3",
-      "Name": "DatadogUrl",
-      "Label": "Datadog URL",
-      "HelpText": "The URL for POSTing log information",
-      "DefaultValue": "https://http-intake.logs.datadoghq.eu/v1/input",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2eb26500-3ced-466c-962e-18b91ce6ea46",
-      "Name": "DatadogAPIKey",
-      "Label": "Datadog API Key",
-      "HelpText": "[API Key](https://docs.datadoghq.com/account_management/api-app-keys/#api-keys) required for accessing API.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "289728cb-9442-41b3-a3be-17f4e8287380",
-      "Name": "DatadogApplicationKey",
-      "Label": "Datadog Application Key",
-      "HelpText": "Information on Datadog [Application Keys](https://docs.datadoghq.com/account_management/api-app-keys/#application-keys)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "6afbdc2a-3f85-4807-abff-d7f3e0dcba77",
-      "Name": "DatadogServiceName",
-      "Label": "Datadog Service Name",
-      "HelpText": null,
-      "DefaultValue": "Octopus Deploy",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "62b47d15-e05f-4e0b-a4b9-4a80b98b62f9",
-      "Name": "DatadogOctopusAPIKey",
-      "Label": "",
-      "HelpText": "Only used when an exception has occurred.\n\nOctopus instance [API Key](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key).   Requires at least `TaskView` [permission](https://octopus.com/docs/security/users-and-teams/system-and-space-permissions).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-03-04T11:25:36.400Z",
-    "OctopusVersion": "2020.5.249",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "octocrock",
-  "Category": "datadog"
-}
\ No newline at end of file
diff --git a/step-templates/deploy-child-project.json b/step-templates/deploy-child-project.json
deleted file mode 100644
index 9189e3753..000000000
--- a/step-templates/deploy-child-project.json
+++ /dev/null
@@ -1,273 +0,0 @@
-{
-  "Id": "0dac2fe6-91d5-4c05-bdfb-1b97adf1e12e",
-  "Name": "Deploy Child Octopus Deploy Project",
-  "Description": "This step will find the latest release in a source environment matching your criteria and deploy it.  \n\nUse cases:\n- As a user, I want to create a single parent release `2020.2.1`.  When I promote the parent release I want the latest child releases matching `2020.2.1.*` to be promoted to the next environment.\n- As a user, I want the latest release in the dev environment to be promoted to the test environment.  Not the most recently created release, the most recent release deployed that environment.\n- As a user, when we are finished with our QA process, we want to automatically push the latest releases from QA to Staging without having to manually promote each release.\n- As a user, I'd like to set up a nightly build to promote the latest releases from Dev to QA\n- As a user, I'd like to be able to deploy a suite of applications to a tenant.  If the tenant isn't assigned to the project then skip over.\n- As a user, I'd like to see what releases would go to production and approve those releases without having to manually verify and approve each one.\n- As a user, I'd like to be able to target specific machines in my parent project and only have child projects deploy associated with those machines.\n- As a user, I'd like to be able to exclude specific machines in my parent project and only have child projects deploy to the remaining machines.\n- As a user, I'd like to have a single deployment target trigger on my parent project and when I scale up my servers deploy the appropriate child projects.\n- As a user, I'd like to be able to approve the deployments and then schedule them to be deployed at 7 PM\n- As a user, I'd like to be able to have one space for orchestration projects and another space for developers to work in.\n\nThis step template also allows you to skip deployments to the destination environment if it has already been deployed.",
-  "ActionType": "Octopus.Script",
-  "Version": 29,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n\n# Supplied Octopus Parameters\n$parentReleaseId = $OctopusParameters[\"Octopus.Release.Id\"]\n$parentChannelId = $OctopusParameters[\"Octopus.Release.Channel.Id\"]\n$destinationSpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$specificMachines = $OctopusParameters[\"Octopus.Deployment.SpecificMachines\"]\n$excludeMachines = $OctopusParameters[\"Octopus.Deployment.ExcludedMachines\"]\n$deploymentMachines = $OctopusParameters[\"Octopus.Deployment.Machines\"]\n$parentDeploymentTaskId = $OctopusParameters[\"Octopus.Task.Id\"]\n$parentProjectName = $OctopusParameters[\"Octopus.Project.Name\"]\n$parentReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$parentEnvironmentName = $OctopusParameters[\"Octopus.Environment.Name\"]\n$parentEnvironmentId = $OctopusParameters[\"Octopus.Environment.Id\"]\n$parentSpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n\n# User Parameters\n$octopusApiKey = $OctopusParameters[\"ChildProject.Api.Key\"]\n$projectName = $OctopusParameters[\"ChildProject.Project.Name\"]\n$channelName = $OctopusParameters[\"ChildProject.Channel.Name\"]\n$releaseNumber = $OctopusParameters[\"ChildProject.Release.Number\"]\n$environmentName = $OctopusParameters[\"ChildProject.Destination.EnvironmentName\"]\n$sourceEnvironmentName = $OctopusParameters[\"ChildProject.SourceEnvironment.Name\"]\n$formValues = $OctopusParameters[\"ChildProject.Prompted.Variables\"]\n$destinationSpaceName = $OctopusParameters[\"ChildProject.Space.Name\"]\n$whatIfValue = $OctopusParameters[\"ChildProject.WhatIf.Value\"]\n$waitForFinishValue = $OctopusParameters[\"ChildProject.WaitForFinish.Value\"]\n$enableEnhancedLoggingValue = $OctopusParameters['ChildProject.EnableEnhancedLogging.Value']\n$deploymentCancelInSeconds = $OctopusParameters[\"ChildProject.CancelDeployment.Seconds\"]\n$ignoreSpecificMachineMismatchValue = $OctopusParameters[\"ChildProject.Deployment.IgnoreSpecificMachineMismatch\"]\n$autoapproveChildManualInterventionsValue = $OctopusParameters[\"ChildProject.ManualInterventions.UseApprovalsFromParent\"]\n$saveReleaseNotesAsArtifactValue = $OctopusParameters[\"ChildProject.ReleaseNotes.SaveAsArtifact\"]\n$futureDeploymentDate = $OctopusParameters[\"ChildProject.Deployment.FutureTime\"]\n$errorHandleForNoRelease = $OctopusParameters[\"ChildProject.Release.NotFoundError\"]\n$approvalEnvironmentName = $OctopusParameters[\"ChildProject.ManualIntervention.EnvironmentToUse\"]\n$approvalTenantName = $OctopusParameters[\"ChildProject.ManualIntervention.Tenant.Name\"]\n$refreshVariableSnapShot = $OctopusParameters[\"ChildProject.RefreshVariableSnapShots.Option\"]\n$deploymentMode = $OctopusParameters[\"ChildProject.DeploymentMode.Value\"]\n$targetMachines = $OctopusParameters[\"ChildProject.Target.MachineNames\"]\n$deploymentTenantName = $OctopusParameters[\"ChildProject.Tenant.Name\"]\n$defaultUrl = $OctopusParameters[\"ChildProject.Web.ServerUrl\"]\n\n$cachedResults = @{}\n\nfunction Write-OctopusVerbose\n{\n    param($message)\n    \n    Write-Verbose $message  \n}\n\nfunction Write-OctopusInformation\n{\n    param($message)\n    \n    Write-Host $message  \n}\n\nfunction Write-OctopusSuccess\n{\n    param($message)\n\n    Write-Highlight $message \n}\n\nfunction Write-OctopusWarning\n{\n    param($message)\n\n    Write-Warning \"$message\" \n}\n\nfunction Write-OctopusCritical\n{\n    param ($message)\n\n    Write-Error \"$message\" \n}\n\nfunction Test-RequiredValues\n{\n\tparam (\n    \t$variableToCheck,\n        $variableName\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($variableToCheck) -eq $true)\n    {\n    \tWrite-OctopusCritical \"$variableName is required.\"\n        return $false\n    }\n    \n    return $true\n}\n\nfunction Invoke-OctopusApi\n{\n    param\n    (\n        $octopusUrl,\n        $endPoint,\n        $spaceId,\n        $apiKey,\n        $method,\n        $item,\n        $ignoreCache     \n    )\n\n    if ([string]::IsNullOrWhiteSpace($SpaceId))\n    {\n        $url = \"$OctopusUrl/api/$EndPoint\"\n    }\n    else\n    {\n        $url = \"$OctopusUrl/api/$spaceId/$EndPoint\"    \n    }  \n\n    try\n    {        \n        if ($null -ne $item)\n        {\n            $body = $item | ConvertTo-Json -Depth 10\n            Write-OctopusVerbose $body\n\n            Write-OctopusInformation \"Invoking $method $url\"\n            return Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -Body $body -ContentType 'application/json; charset=utf-8' \n        }\n\n        if (($null -eq $ignoreCache -or $ignoreCache -eq $false) -and $method.ToUpper().Trim() -eq \"GET\")\n        {\n            Write-OctopusVerbose \"Checking to see if $url is already in the cache\"\n            if ($cachedResults.ContainsKey($url) -eq $true)\n            {\n                Write-OctopusVerbose \"$url is already in the cache, returning the result\"\n                return $cachedResults[$url]\n            }\n        }\n        else\n        {\n            Write-OctopusVerbose \"Ignoring cache.\"    \n        }\n\n        Write-OctopusVerbose \"No data to post or put, calling bog standard invoke-restmethod for $url\"\n        $result = Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -ContentType 'application/json; charset=utf-8'\n\n        if ($cachedResults.ContainsKey($url) -eq $true)\n        {\n            $cachedResults.Remove($url)\n        }\n        Write-OctopusVerbose \"Adding $url to the cache\"\n        $cachedResults.add($url, $result)\n\n        return $result\n\n               \n    }\n    catch\n    {\n        if ($null -ne $_.Exception.Response)\n        {\n            if ($_.Exception.Response.StatusCode -eq 401)\n            {\n                Write-OctopusCritical \"Unauthorized error returned from $url, please verify API key and try again\"\n            }\n            elseif ($_.Exception.Response.statusCode -eq 403)\n            {\n                Write-OctopusCritical \"Forbidden error returned from $url, please verify API key and try again\"\n            }\n            else\n            {                \n                Write-OctopusVerbose -Message \"Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )\"\n            }            \n        }\n        else\n        {\n            Write-OctopusVerbose $_.Exception\n        }\n    }\n\n    Throw \"There was an error calling the Octopus API please check the log for more details\"\n}\n\nfunction Get-ListFromOctopusApi\n{\n    param (\n        $octopusUrl,\n        $endPoint,\n        $spaceId,\n        $apiKey,\n        $propertyName\n    )\n\n    $rawItemList = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint $endPoint -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n\n    $returnList = @($rawItemList.$propertyName)\n\n    Write-OctopusVerbose \"The endpoint $endPoint returned a list with $($returnList.Count) items\"\n\n    return ,$returnList\n}\n\nfunction Get-FilteredOctopusItem\n{\n    param(\n        $itemList,\n        $itemName\n    )\n\n    if ($itemList.Count -eq 0)\n    {\n        Write-OctopusCritical \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        Exit 1\n    }  \n\n    $item = $itemList | Where-Object { $_.Name.ToLower().Trim() -eq $itemName.ToLower().Trim() }      \n\n    if ($null -eq $item)\n    {\n        Write-OctopusCritical \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        exit 1\n    }\n\n    return $item\n}\n\nfunction Test-PhaseContainsEnvironmentId\n{\n    param (\n        $phase,\n        $environmentId\n    )\n\n    Write-OctopusVerbose \"Checking to see if $($phase.Name) automatic deployment environments $($phase.AutomaticDeploymentTargets) contains $environmentId\"\n    if ($phase.AutomaticDeploymentTargets -contains $environmentId)\n    {\n        Write-OctopusVerbose \"It does, returning true\"\n        return $true\n    } \n    \n    Write-OctopusVerbose \"Checking to see if $($phase.Name) optional deployment environments $($phase.OptionalDeploymentTargets) contains $environmentId\"\n    if ($phase.OptionalDeploymentTargets -contains $environmentId)\n    {\n        Write-OctopusVerbose \"It does, returning true\"\n        return $true\n    }\n\n    Write-OctopusVerbose \"The phase does not contain the environment returning false\"\n    return $false\n}\n\nfunction Get-OctopusItemByName\n{\n    param(\n        $itemName,\n        $itemType,\n        $endpoint,\n        $defaultValue,\n        $spaceId,\n        $defaultUrl,\n        $octopusApiKey\n    )\n\n    if ([string]::IsNullOrWhiteSpace($itemName) -or $itemName -like \"#{Octopus*\")\n    {\n        Write-OctopusVerbose \"The item name passed in was $itemName, returning the default value for $itemType\"\n        return $defaultValue\n    }\n\n    Write-OctopusInformation \"Attempting to find $itemType with the name of $itemName\"\n    \n    $itemList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint \"$($endPoint)?partialName=$([uri]::EscapeDataString($itemName))&skip=0&take=100\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\" -propertyName \"Items\"   \n    $item = Get-FilteredOctopusItem -itemList $itemList -itemName $itemName\n\n    Write-OctopusInformation \"Successfully found $itemName with id of $($item.Id)\"\n\n    return $item\n}\n\nfunction Get-OctopusItemById\n{\n    param(\n        $itemId,\n        $itemType,\n        $endpoint,\n        $defaultValue,\n        $spaceId,\n        $defaultUrl,\n        $octopusApiKey\n    )\n\n    if ([string]::IsNullOrWhiteSpace($itemId))\n    {\n        return $defaultValue\n    }\n\n    Write-OctopusInformation \"Attempting to find $itemType with the id of $itemId\"\n    \n    $item = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"$endPoint/$itemId\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"        \n\n    if ($null -eq $item)\n    {\n        Write-OctopusCritical \"Unable to find $itemType with the id of $itemId\"\n        exit 1\n    }\n    else \n    {\n        Write-OctopusInformation \"Successfully found $itemId with name of $($item.Name)\"    \n    }\n    \n    return $item\n}\n\nfunction Get-OctopusSpaceIdByName\n{\n\tparam(\n    \t$spaceName,\n        $spaceId,\n        $defaultUrl,\n        $octopusApiKey    \n    )\n    \n    if ([string]::IsNullOrWhiteSpace($spaceName))\n    {\n    \treturn $spaceId\n    }\n\n    $space = Get-OctopusItemByName -itemName $spaceName -itemType \"Space\" -endpoint \"spaces\" -defaultValue $spaceId -spaceId $null -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n    \n    return $space.Id\n}\n\nfunction Get-OctopusProjectByName\n{\n    param (\n        $projectName,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    return Get-OctopusItemByName -itemName $projectName -itemType \"Project\" -endpoint \"projects\" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey    \n}\n\nfunction Get-OctopusEnvironmentByName\n{\n    param (\n        $environmentName,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    return Get-OctopusItemByName -itemName $environmentName -itemType \"Environment\" -endpoint \"environments\" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey    \n}\n\nfunction Get-OctopusTenantByName\n{\n    param (\n        $tenantName,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    return Get-OctopusItemByName -itemName $tenantName -itemType \"Tenant\" -endpoint \"tenants\" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey    \n}\n\nfunction Get-OctopusApprovalTenant\n{\n    param (\n        $tenantToDeploy,\n        $approvalTenantName,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    Write-OctopusInformation \"Checking to see if there is an approval tenant to consider\"\n\n    if ($null -eq $tenantToDeploy)\n    {\n        Write-OctopusInformation \"Not doing tenant deployments, skipping this check\"    \n        return $null\n    }\n\n    if ([string]::IsNullOrWhiteSpace($approvalTenantName) -eq $true -or $approvalTenantName -eq \"#{Octopus.Deployment.Tenant.Name}\")\n    {\n        Write-OctopusInformation \"No approval tenant was provided, returning $($tenantToDeploy.Id)\"\n        return $tenantToDeploy\n    }\n\n    if ($approvalTenantName.ToLower().Trim() -eq $tenantToDeploy.Name.ToLower().Trim())\n    {\n        Write-OctopusInformation \"The approval tenant name matches the deployment tenant name, using the current tenant\"\n        return $tenantToDeploy\n    }\n\n    return Get-OctopusTenantByName -tenantName $approvalTenantName -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n}\n\nfunction Get-OctopusChannel\n{\n    param (\n        $channelName,\n        $project,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    Write-OctopusInformation \"Attempting to find the channel information for project $projectName matching the channel name $channelName\"\n    $channelList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint \"projects/$($project.Id)/channels?skip=0&take=1000\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\" -propertyName \"Items\"\n    $channelToUse = $null\n    foreach ($channel in $channelList)\n    {\n        if ([string]::IsNullOrWhiteSpace($channelName) -eq $true -and $channel.IsDefault -eq $true)\n        {\n            Write-OctopusVerbose \"The channel name specified is null or empty and the current channel $($channel.Name) is the default, using that\"\n            $channelToUse = $channel\n            break\n        }\n\n        if ([string]::IsNullOrWhiteSpace($channelName) -eq $false -and $channel.Name.Trim().ToLowerInvariant() -eq $channelName.Trim().ToLowerInvariant())\n        {\n            Write-OctopusVerbose \"The channel name specified $channelName matches the the current channel $($channel.Name) using that\"\n            $channelToUse = $channel\n            break\n        }\n    }\n\n    if ($null -eq $channelToUse)\n    {\n        Write-OctopusCritical \"Unable to find a channel to use.  Exiting with an exit code of 1.\"\n        exit 1\n    }\n\n    return $channelToUse\n}\n\nfunction Get-OctopusLifecyclePhases\n{\n    param (\n        $channel,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $project\n    )\n\n    Write-OctopusInformation \"Attempting to find the lifecycle information $($channel.Name)\"\n    if ($null -eq $channel.LifecycleId)\n    {\n        return Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint \"lifecycles/$($project.LifecycleId)/preview\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\" -propertyName \"Phases\"\n    }\n    else\n    {\n        return Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint \"lifecycles/$($channel.LifecycleId)/preview\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\" -propertyName \"Phases\"\n    }\n}\n\nfunction Get-SourceDestinationEnvironmentInformation\n{\n    param (\n        $phaseList,\n        $targetEnvironment,\n        $sourceEnvironment,\n        $isPromotionMode,\n        $isAlwaysLatestMode\n    )\n\n    Write-OctopusVerbose \"Attempting to pull the environment ids from the source and destination phases\"\n\n    $destTargetEnvironmentInfo = @{        \n        TargetEnvironment = $targetEnvironment\n        SourceEnvironmentList = @()\n        FirstLifecyclePhase = $false\n        HasRequiredPhase = $false\n    }\n\n    if ($isPromotionMode -eq $false)\n    {\n        if ($isAlwaysLatestMode -eq $true)\n        {\n            Write-OctopusInformation \"Currently running in AlwaysLatest mode, setting the source environment to the target environment.\"\n        }\n        else\n        {\n            Write-OctopusInformation \"Currently running in redeploy mode, setting the source environment to the target environment.\"\n\n        }\n        $destTargetEnvironmentInfo.SourceEnvironmentList = $targetEnvironment.Id\n\n        return $destTargetEnvironmentInfo\n    }\n\n    $indexOfTargetEnvironment = $null\n    for ($i = 0; $i -lt $phaseList.Length; $i++)\n    {\n        Write-OctopusInformation \"Checking to see if lifecycle phase $($phaseList[$i].Name) contains the target environment id $($targetEnvironment.Id)\"\n\n        if (Test-PhaseContainsEnvironmentId -phase $phaseList[$i] -environmentId $targetEnvironment.Id)    \n        {            \n            Write-OctopusVerbose \"The phase $($phaseList[$i].Name) has the environment $($targetEnvironment.Name).\"\n            $indexOfTargetEnvironment = $i\n            break\n        }\n    }\n\n    if ($null -eq $indexOfTargetEnvironment)\n    {\n        Write-OctopusCritical \"Unable to find the target phase in this lifecycle attached to this channel.  Exiting with exit code of 1\"\n        Exit 1\n    }\n\n    if ($indexOfTargetEnvironment -eq 0)\n    {\n        Write-OctopusInformation \"This is the first phase in the lifecycle.  The current mode is promotion.  Going to get the latest release created that matches the release number rules for the channel.\"\n        $destTargetEnvironmentInfo.FirstLifecyclePhase = $true        \n        $destTargetEnvironmentInfo.SourceEnvironmentList += $targetEnvironment.Id\n\n        return $destTargetEnvironmentInfo\n    }\n    \n    if ($null -ne $sourceEnvironment)\n    {\n        Write-OctopusInformation \"The source environment $($sourceEnvironment.Name) was provided, using that as the source environment\"\n        $destTargetEnvironmentInfo.SourceEnvironmentList += $sourceEnvironment.Id\n\n        return $destTargetEnvironmentInfo\n    }\n\n    Write-OctopusVerbose \"Looping through all the previous phases until a required phase is found.\"\n    $startingIndex = ($indexOfTargetEnvironment - 1)\n    for($i = $startingIndex; $i -ge 0; $i--)\n    {\n        $previousPhase = $phaseList[$i]\n        Write-OctopusInformation \"Adding environments from the phase $($previousPhase.Name)\"\n        foreach ($environmentId in $previousPhase.AutomaticDeploymentTargets)\n        {\n            $destTargetEnvironmentInfo.SourceEnvironmentList += $environmentId\n        }\n\n        foreach ($environmentId in $previousPhase.OptionalDeploymentTargets)\n        {\n            $destTargetEnvironmentInfo.SourceEnvironmentList += $environmentId\n        }\n\n        if ($previousPhase.IsOptionalPhase -eq $false)\n        {\n            Write-OctopusVerbose \"The phase $($previousPhase.Name) is a required phase, exiting previous phase loop\"\n            $destTargetEnvironmentInfo.HasRequiredPhase = $true\n            break\n        }\n        elseif ($i -gt 0)\n        {\n            Write-OctopusVerbose \"The phase $($previousPhase.Name) is an optional phase, continuing going to check the next phase\"    \n        }\n        else\n        {\n            Write-OctopusVerbose \"The phase $($previousPhase.Name) is an optional phase.  This is the last phase so I'm stopping now.\"    \n        }\n    }\n\n    return $destTargetEnvironmentInfo             \n}\n\nfunction Get-ReleaseCanBeDeployedToTargetEnvironment\n{\n    param (\n        $release,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $sourceDestinationEnvironmentInfo,\n        $tenantToDeploy,\n        $isPromotionMode,\n        $isAlwaysLatestMode\n    )\n\n    if ($isPromotionMode -eq $false -and $isAlwaysLatestMode -eq $false)\n    {\n        Write-OctopusInformation \"The current mode is redeploy.  Of course the release can be deployed to the target environment, no need to recheck it.\"\n        return $true\n    }\n\n    Write-OctopusInformation \"Pulling the deployment template information for release $($release.Version)\"\n    $releaseDeploymentTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$($release.Id)/deployments/template\" -spaceId $spaceId -method GET -apiKey $octopusApiKey\n\n    $releaseCanBeDeployedToDestination = $false    \n    Write-OctopusInformation \"Looping through deployment template list for $($release.Version) to see if it can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).\"\n    foreach ($promoteToEnvironment in $releaseDeploymentTemplate.PromoteTo)\n    {\n        if ($promoteToEnvironment.Id -eq $sourceDestinationEnvironmentInfo.TargetEnvironment.Id)\n        {\n            Write-OctopusInformation \"The environment $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name) was found in the list of environments to promote to\"\n            $releaseCanBeDeployedToDestination = $true\n            break\n        }\n    }    \n\n    if ($null -eq $tenantToDeploy -or $releaseDeploymentTemplate.TenantPromotions.Length -le 0)\n    {\n        return $releaseCanBeDeployedToDestination\n    }\n\n    $releaseCanBeDeployedToDestination = $false\n    Write-OctopusInformation \"The tenant id was supplied, looping through the tenant templates to see if it can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).\"\n    foreach ($tenantPromotion in $releaseDeploymentTemplate.TenantPromotions)\n    {\n        if ($tenantPromotion.Id -ne $tenantToDeploy.Id)\n        {\n            Write-OctopusVerbose \"The tenant ids $($tenantPromotion.Id) and $($tenantToDeploy.Id) don't match, moving onto the next one\"\n            continue\n        }\n\n        Write-OctopusVerbose \"The tenant Id matches checking to see if the environment can be promoted to.\"\n        foreach ($promoteToEnvironment in $tenantPromotion.PromoteTo)\n        {\n            if ($promoteToEnvironment.Id -ne $sourceDestinationEnvironmentInfo.TargetEnvironment.Id)\n            {\n                Write-OctopusVerbose \"The environmentIds $($promoteToEnvironment.Id) and $($sourceDestinationEnvironmentInfo.TargetEnvironment.Id) don't match, moving onto the next one.\"\n                continue\n            }\n\n            Write-OctopusInformation \"The environment $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name) was found in the list of environments tenant $($tenantToDeploy.Id) can be promoted to\"\n            $releaseCanBeDeployedToDestination = $true\n        }\n    }\n\n    return $releaseCanBeDeployedToDestination\n}\n\nfunction Get-DeploymentPreview\n{\n    param (\n        $releaseToDeploy,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $targetEnvironment,\n        $deploymentTenant\n    )\n\n    if ($null -eq $deploymentTenant)\n    {\n        Write-OctopusInformation \"The deployment tenant id was not sent in, generating a preview by hitting releases/$($releaseToDeploy.Id)/deployments/preview/$($targetEnvironment.Id)?includeDisabledSteps=true\"    \n        return Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$($releaseToDeploy.Id)/deployments/preview/$($targetEnvironment.Id)?includeDisabledSteps=true\" -apiKey $octopusApiKey -method \"GET\" -spaceId $spaceId\n    }\n\n    Write-OctopusInformation \"The deployment tenant id was sent in, generating a preview by hitting releases/$($releaseToDeploy.Id)/deployments/previews\" \n    $requestBody = @{\n    \t\tDeploymentPreviews = @(\n    \t\t\t@{\n                \tTenantId = $deploymentTenant.Id;\n            \t\tEnvironmentId = $targetEnvironment.Id\n                 }\n            )\n    }\n    return Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$($releaseToDeploy.Id)/deployments/previews\" -apiKey $octopusApiKey -method \"POST\" -spaceId $spaceId -item $requestBody -itemIsArray $true\n}\n\nfunction Get-ValuesForPromptedVariables\n{\n    param (\n        $deploymentPreview,\n        $formValues\n    )\n\n    $deploymentFormValues = @{}\n    if ([string]::IsNullOrWhiteSpace($formValues) -eq $true)\n    {\n        return $deploymentFormValues\n    }   \n    \n    $promptedValueList = @(($formValues -Split \"`n\").Trim())\n    Write-OctopusVerbose $promptedValueList.Length\n    \n    foreach($element in $deploymentPreview.Form.Elements)\n    {\n        $nameToSearchFor = $element.Control.Name\n        $uniqueName = $element.Name\n        $isRequired = $element.Control.Required\n        \n        $promptedVariablefound = $false\n        \n        Write-OctopusVerbose \"Looking for the prompted variable value for $nameToSearchFor\"\n        foreach ($promptedValue in $promptedValueList)\n        {\n            $splitValue = $promptedValue -Split \"::\"\n            Write-OctopusVerbose \"Comparing $nameToSearchFor with provided prompted variable $($promptedValue[0])\"\n            if ($splitValue.Length -gt 1)\n            {\n                if ($nameToSearchFor.ToLower().Trim() -eq $splitValue[0].ToLower().Trim())\n                {\n                    Write-OctopusVerbose \"Found the prompted variable value $nameToSearchFor\"\n                    $deploymentFormValues[$uniqueName] = $splitValue[1]\n                    $promptedVariableFound = $true\n                    break\n                }\n            }\n        }\n        \n        if ($promptedVariableFound -eq $false -and $isRequired -eq $true)\n        {\n            Write-OctopusCritical \"Unable to find a value for the required prompted variable $nameToSearchFor, exiting\"\n            Exit 1\n        }\n    }\n    \n    return $deploymentFormValues\n}\n\nfunction Test-ProjectTenantSettings\n{\n    param (\n        $tenantToDeploy,\n        $project,\n        $targetEnvironment\n    )\n\n    Write-OctopusVerbose \"About to check if $tenantToDeploy is not null and tenant deploy mode on the project $($project.TenantedDeploymentMode) <> Untenanted\"\n    if ($null -eq $tenantToDeploy)\n    {\n        Write-OctopusInformation \"Not doing a tenanted deployment, no need to check if the project supports tenanted deployments.\"\n        return $null\n    }\n\n    if ($project.TenantedDeploymentMode -eq \"Untenanted\")\n    {\n        Write-OctopusInformation \"The project is not tenanted, but we are doing a tenanted deployment, removing the tenant from the equation\"\n        return $null\n    }\n\n    Write-OctopusInformation \"Found the tenant $($tenantToDeploy.Name) checking to see if $($project.Name) is assigned to it.\"\n        \n    Write-OctopusVerbose \"Checking to see if $($tenantToDeploy.ProjectEnvironments) has $($project.Id) as a property.\"\n    if ($null -eq (Get-Member -InputObject $tenantToDeploy.ProjectEnvironments -Name $project.Id -MemberType Properties))\n    {\n        Write-OctopusSuccess \"The tenant $($tenantToDeploy.Name) is not assigned to $($project.Name).  Exiting.\"\n        Insert-EmptyOutputVariables -releaseToDeploy $null\n        \n        Exit 0\n    }\n\n    Write-OctopusInformation \"The tenant $($tenantToDeploy.Name) is assigned to $($project.Name).  Now checking to see if it can be deployed to the target environment.\"\n    $tenantProjectId = $project.Id\n    \n    Write-OctopusVerbose \"Checking to see if $($tenantToDeploy.ProjectEnvironments.$tenantProjectId) has $($targetEnvironment.Id)\"    \n    if ($tenantToDeploy.ProjectEnvironments.$tenantProjectId -notcontains $targetEnvironment.Id)\n    {\n        Write-OctopusSuccess \"The tenant $($tenantToDeploy.Name) is assigned to $($project.Name), but not to the environment $($targetEnvironment.Name).  Exiting.\"\n        Insert-EmptyOutputVariables -releaseToDeploy $null\n        \n        Exit 0\n    } \n    \n    return $tenantToDeploy\n}\n\nfunction Test-ReleaseToDeploy\n{\n\tparam (\n    \t$releaseToDeploy,\n        $errorHandleForNoRelease,\n        $releaseNumber,        \n        $sourceDestinationEnvironmentInfo, \n        $environmentList\n    )\n    \n    if ($null -ne $releaseToDeploy)\n    {\n    \treturn\n    }\n        \n    $errorMessage = \"No releases were found in environment(s)\" \n\n    $environmentMessage = @()\n    foreach ($environmentId in $sourceDestinationEnvironmentInfo.SourceEnvironmentList)\n    {\n        $environment = $environmentList | Where-Object {$_.Id -eq $environmentId }\n\n        if ($null -ne $environment)\n        {\n            $environmentMessage += $environment.Name\n        }\n    }\n\n    $errorMessage += \" $($environmentMessage -join \",\")\"\n    \n    if ([string]::IsNullOrWhitespace($releaseNumber) -eq $false)\n    {\n    \t$errorMessage = \"$errorMessage matching $releaseNumber\"\n    }\n    \n    $errorMessage = \"$errorMessage that can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)\"\n    \n    if ($errorHandleForNoRelease -eq \"Error\")\n    {\n    \tWrite-OctopusCritical $errorMessage\n        exit 1\n    }\n    \n    Insert-EmptyOutputVariables -releaseToDeploy $null\n    \n    if ($errorHandleForNoRelease -eq \"Skip\")\n    {\n    \tWrite-OctopusInformation $errorMessage\n        exit 0\n    }\n    \n    Write-OctopusSuccess $errorMessage\n    exit 0\n}\n\nfunction Get-TenantIsAssignedToPreviousEnvironments\n{\n    param (\n        $tenantToDeploy,\n        $sourceDestinationEnvironmentInfo,\n        $projectId,\n        $isPromotionMode\n    )\n\n    if ($null -eq $tenantToDeploy)\n    {\n        Write-OctopusVerbose \"The tenant is null, skipping the check to see if it is assigned to the previous environment list.\"\n        return $false\n    }\n\n    if ($isPromotionMode -eq $false)\n    {\n        Write-OctopusVerbose \"The current mode is redeploy, the source and destination environment are the same, no need to check.\"\n        return $true\n    }\n\n    Write-OctopusVerbose \"Checking to see if $($tenantToDeploy.Name) is assigned to the previous environments.\"     \n    Write-OctopusVerbose \"Checking to see if $($tenantToDeploy.ProjectEnvironments.$projectId) is assigned to the source environments(s) $($sourceDestinationEnvironmentInfo.SourceEnvironmentList)\"\n\n    foreach ($environmentId in $tenantToDeploy.ProjectEnvironments.$projectId)\n    {\n        Write-OctopusVerbose \"Checking to see if $environmentId appears in $($sourceDestinationEnvironmentInfo.SourceEnvironmentList)\"\n        if ($sourceDestinationEnvironmentInfo.SourceEnvironmentList -contains $environmentId)\n        {\n            Write-OctopusVerbose \"Found the environment $environmentId assigned to $($tenantToDeploy.Name), attempting to find the latest release for this tenant\"\n            return $true\n        }\n    }\n\n    Write-OctopusVerbose \"The tenant is not assigned to any environment in the source environments $($sourceDestinationEnvironmentInfo.SourceEnvironmentList), pulling the latest release to the environment regardless of tenant.\"\n    return $false\n}\n\nfunction Create-NewOctopusDeployment\n{\n\tparam (\n    \t$releaseToDeploy,\n        $targetEnvironment,\n        $createdDeployment,\n        $project,\n        $waitForFinish,\n        $enableEnhancedLogging,\n        $deploymentCancelInSeconds,\n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId,\n        $parentDeploymentApprovers,\n        $parentProjectName,\n        $parentReleaseNumber, \n        $parentEnvironmentName, \n        $parentDeploymentTaskId,\n        $autoapproveChildManualInterventions,\n        $approvalTenant\n    )\n    \n    Write-OctopusSuccess \"Deploying $($releaseToDeploy.Version) to $($targetEnvironment.Name)\"\n\n    $createdDeploymentResponse = Invoke-OctopusApi -method \"POST\" -endPoint \"deployments\" -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -item $createdDeployment\n    Write-OctopusInformation \"The task id for the new deployment is $($createdDeploymentResponse.TaskId)\"\n\n    Write-OctopusSuccess \"Deployment was successfully invoked, you can access the deployment [here]($defaultUrl/app#/$spaceId/projects/$($project.Slug)/deployments/releases/$($releaseToDeploy.Version)/deployments/$($createdDeploymentResponse.Id)?activeTab=taskSummary)\"\n    \n    if ($null -ne $createdDeployment.QueueTime -and $waitForFinish -eq $true)\n    {\n    \tWrite-OctopusWarning \"The option to wait for the deployment to finish was set to yes AND a future deployment date was set to a future value.  Ignoring the wait for finish option and exiting.\"\n        return\n    }\n    \n    if ($waitForFinish -eq $true)\n    {\n        Write-OctopusSuccess \"Waiting until deployment has finished\"\n        $startTime = Get-Date\n        $currentTime = Get-Date\n        $dateDifference = $currentTime - $startTime\n        $lastEnhancedLoggingWriteTime = [datetime]::MinValue\n\n        $numberOfWaits = 0    \n\n        While ($dateDifference.TotalSeconds -lt $deploymentCancelInSeconds)\n        {\n\t        $numberOfWaits += 1\n        \n            Write-Host \"Waiting 5 seconds to check status\"\n            Start-Sleep -Seconds 5\n            $taskStatusResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint \"tasks/$($createdDeploymentResponse.TaskId)\" -method \"GET\" -ignoreCache $true   \n            $taskStatusResponseState = $taskStatusResponse.State\n\n            if ($taskStatusResponseState -eq \"Success\")\n            {\n                if ($enableEnhancedLogging -eq $true)\n                {\n                    $lastEnhancedLoggingWriteTime = Get-TaskDetails -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -taskId $createdDeploymentResponse.TaskId -lastEnhancedLoggingWriteTime $lastEnhancedLoggingWriteTime\n                }\n                Write-OctopusSuccess \"The task has finished with a status of Success\"\n                exit 0            \n            }\n            elseif($taskStatusResponseState -eq \"Failed\" -or $taskStatusResponseState -eq \"Canceled\")\n            {\n                Write-OctopusSuccess \"The task has finished with a status of $taskStatusResponseState status, stopping the deployment\"\n                exit 1            \n            }\n            elseif($taskStatusResponse.HasPendingInterruptions -eq $true)\n            {\n            \tif ($autoapproveChildManualInterventions -eq $true)\n                {\n                \tSubmit-ChildProjectDeploymentForAutoApproval -createdDeployment $createdDeploymentResponse -parentDeploymentApprovers $parentDeploymentApprovers -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -parentProjectName $parentProjectName -parentReleaseNumber $parentReleaseNumber -parentEnvironmentName $parentEnvironmentName -parentDeploymentTaskId $parentDeploymentTaskId -approvalTenant $approvalTenant\n                }\n                else\n                {\n                \tif ($numberOfWaits -ge 10)\n                    {\n                \t\tWrite-OctopusSuccess \"The child project has pending manual intervention(s).  Unless you approve it, this task will time out.\"\n                    }\n                    else\n                    {\n                    \tWrite-OctopusInformation \"The child project has pending manual intervention(s).  Unless you approve it, this task will time out.\"                        \n                    }\n                }\n            }\n            \n            if ($numberOfWaits -ge 10)\n            {\n                if ($enableEnhancedLogging -eq $true)\n                {\n                    $lastEnhancedLoggingWriteTime = Get-TaskDetails -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -taskId $createdDeploymentResponse.TaskId -lastEnhancedLoggingWriteTime $lastEnhancedLoggingWriteTime\n                }\n                else\n                {\n                    Write-OctopusSuccess \"The task state is currently $taskStatusResponseState\"\n                    $numberOfWaits = 0\n                }\n            }\n            else\n            {\n                if ($enableEnhancedLogging -eq $true)\n                {\n                    $lastEnhancedLoggingWriteTime = Get-TaskDetails -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -taskId $createdDeploymentResponse.TaskId -lastEnhancedLoggingWriteTime $lastEnhancedLoggingWriteTime\n                }\n                else\n                {\n                    Write-OctopusInformation \"The task state is currently $taskStatusResponseState\"\n                }\n            }  \n\n            $startTime = $taskStatusResponse.StartTime\n            if ($null -eq $startTime -or [string]::IsNullOrWhiteSpace($startTime) -eq $true)\n            {        \n                Write-Host \"The task is still queued, let's wait a bit longer\"\n                $startTime = Get-Date\n            }\n            $startTime = [DateTime]$startTime\n\n            $currentTime = Get-Date\n            $dateDifference = $currentTime - $startTime        \n        }\n\n        Write-OctopusCritical \"The cancel timeout has been reached, cancelling the deployment\"\n        Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -method \"POST\" -endPoint \"tasks/$($createdDeploymentResponse.TaskId)/cancel\"    \n        Write-OctopusInformation \"Exiting with an error code of 1 because we reached the timeout\"\n        exit 1\n    }\n}\n\nfunction Get-ChildDeploymentSpecificMachines\n{\n    param (\n        $deploymentPreview,\n        $deploymentMachines,\n        $specificMachineDeployment\n    )\n\n    if ($specificMachineDeployment -eq $false)\n    {\n        Write-OctopusVerbose \"Not doing specific machine deployments, returning any empty list of specific machines to deploy to\"\n        return @()\n    }\n\n    $filteredList = @()\n    $deploymentMachineList = $deploymentMachines -split \",\"\n\n    Write-OctopusInformation \"Doing a specific machine deployment, comparing the machines being targeted with the machines the child project can deploy to.  The number of machines being targeted is $($deploymentMachineList.Count)\"\n\n    foreach ($deploymentMachine in $deploymentMachineList)\n    {\n        $deploymentMachineLowerTrim = $deploymentMachine.Trim().ToLower()           \n\n        foreach ($step in $deploymentPreview.StepsToExecute)\n        {\n            foreach ($machine in $step.Machines)\n            {   \n                $machineLowerTrim = $machine.Id.Trim().ToLower()\n                \n                Write-OctopusVerbose \"Comparing $deploymentMachineLowerTrim with $machineLowerTrim\"\n                if ($deploymentMachineLowerTrim -ne $machineLowerTrim)\n                {\n                    Write-OctopusVerbose \"The two machine ids do not match, moving on to the next machine\"\n                    continue\n                }\n\n                Write-OctopusVerbose \"Checking to see if $machineLowerTrim is already in the filtered list.\"\n                if ($filteredList -notcontains $machine.Id)\n                {\n                    Write-OctopusVerbose \"The machine is not in the list, adding it to the list.\"\n                    $filteredList += $machine.Id\n                }\n            }\n        }\n    }\n\n    if ($filteredList.Count -gt 0)\n    {\n        Write-OctopusSuccess \"The machines applicable to this project are $filteredList.\"\n    }    \n\n    return $filteredList\n}\n\nfunction Test-ChildProjectDeploymentCanProceed\n{\n\tparam (\n    \t$releaseToDeploy,\n        $specificMachineDeployment,                        \n        $environmentName,\n        $childDeploymentSpecificMachines,\n        $project,\n        $ignoreSpecificMachineMismatch,\n        $deploymentMachines,\n        $releaseHasAlreadyBeenDeployed,\n        $isPromotionMode       \n    )\n    \n\tif ($releaseHasAlreadyBeenDeployed -eq $true -and $isPromotionMode -eq $true)\n    {\t     \t \n    \tWrite-OctopusSuccess \"Release $($releaseToDeploy.Version) is the most recent version deployed to $environmentName.  The deployment mode is Promote.  If you wish to redeploy this release then set the deployment mode to Redeploy.  Skipping this project.\"\n        \n        if ($specificMachineDeployment -eq $true -and $childDeploymentSpecificMachines.Length -gt 0)\n        {\n            Write-OctopusSuccess \"$($project.Name) can deploy to $childDeploymentSpecificMachines but redeployments are not allowed.\"\n        }\n        \n        Insert-EmptyOutputVariables -releaseToDeploy $releaseToDeploy\n\n        exit 0\n    }\n    \n    if ($childDeploymentSpecificMachines.Length -le 0 -and $specificMachineDeployment -eq $true -and $ignoreSpecificMachineMismatch -eq $false)\n    {\n        Write-OctopusSuccess \"$($project.Name) does not deploy to $($deploymentMachines -replace \",\", \" OR \").  The value for \"\"Ignore specific machine mismatch\"\" is set to \"\"No\"\".  Skipping this project.\"\n        \n        Insert-EmptyOutputVariables -releaseToDeploy $releaseToDeploy\n        \n        Exit 0\n    }\n\n    if ($childDeploymentSpecificMachines.Length -le 0 -and $specificMachineDeployment -eq $true -and $ignoreSpecificMachineMismatch -eq $true)\n    {\n        Write-OctopusSuccess \"You are doing a deployment for specific machines but $($project.Name) does not deploy to $($deploymentMachines -replace \",\", \" OR \").  You have set the value for \"\"Ignore specific machine mismatch\"\" to \"\"Yes\"\".  The child project will be deployed to, but it will do this for all machines, not any specific machines.\"\n    }\n}\n\nfunction Get-ParentDeploymentApprovers\n{\n    param (\n        $parentDeploymentTaskId,\n        $spaceId,\n        $defaultUrl,\n        $octopusApiKey\n    )\n    \n    $approverList = @()\n    if ($null -eq $parentDeploymentTaskId)\n    {\n    \tWrite-OctopusInformation \"The deployment task id to pull the approvers from is null, return an empty approver list\"\n    \treturn $approverList\n    }\n\n    Write-OctopusInformation \"Getting all the events from the parent project\"\n    $parentDeploymentEvents = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"events?regardingAny=$parentDeploymentTaskId&spaces=$spaceId&includeSystem=true\" -apiKey $octopusApiKey -method \"GET\"\n    \n    foreach ($parentDeploymentEvent in $parentDeploymentEvents.Items)\n    {\n        Write-OctopusVerbose \"Checking $($parentDeploymentEvent.Message) for manual intervention\"\n        if ($parentDeploymentEvent.Message -like \"Submitted interruption*\")\n        {\n            Write-OctopusVerbose \"The event $($parentDeploymentEvent.Id) is a manual intervention approval event which was approved by $($parentDeploymentEvent.Username).\"\n\n            $approverExists = $approverList | Where-Object {$_.Id -eq $parentDeploymentEvent.UserId}        \n\n            if ($null -eq $approverExists)\n            {\n                $approverInformation = @{\n                    Id = $parentDeploymentEvent.UserId;\n                    Username = $parentDeploymentEvent.Username;\n                    Teams = @()\n                }\n\n                $approverInformation.Teams = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"teammembership?userId=$($approverInformation.Id)&spaces=$spaceId&includeSystem=true\" -apiKey $octopusApiKey -method \"GET\"            \n\n                Write-OctopusVerbose \"Adding $($approverInformation.Id) to the approval list\"\n                $approverList += $approverInformation\n            }        \n        }\n    }\n\n    return $approverList\n}\n\nfunction Submit-ChildProjectDeploymentForAutoApproval\n{\n    param (\n        $createdDeployment,\n        $parentDeploymentApprovers,\n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId,\n        $parentProjectName,\n        $parentReleaseNumber,\n        $parentEnvironmentName,\n        $parentDeploymentTaskId,\n        $approvalTenant\n    )\n\n    Write-OctopusSuccess \"The task has a pending manual intervention.  Checking parent approvals.\"    \n    $manualInterventionInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"interruptions?regarding=$($createdDeployment.TaskId)\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId -ignoreCache $true\n    foreach ($manualIntervention in $manualInterventionInformation.Items)\n    {\n        if ($manualIntervention.IsPending -eq $false)\n        {\n            Write-OctopusInformation \"This manual intervention has already been approved.  Proceeding onto the next one.\"\n            continue\n        }\n\n        if ($manualIntervention.CanTakeResponsibility -eq $false)\n        {\n            Write-OctopusSuccess \"The user associated with the API key doesn't have permissions to take responsibility for the manual intervention.\"\n            Write-OctopusSuccess \"If you wish to leverage the auto-approval functionality give the user permissions.\"\n            continue\n        }        \n\n        $automaticApprover = $null\n        Write-OctopusVerbose \"Checking to see if one of the parent project approvers is assigned to one of the manual intervention teams $($manualIntervention.ResponsibleTeamIds)\"\n        foreach ($approver in $parentDeploymentApprovers)\n        {\n            foreach ($approverTeam in $approver.Teams)\n            {\n                Write-OctopusVerbose \"Checking to see if $($manualIntervention.ResponsibleTeamIds) contains $($approverTeam.TeamId)\"\n                if ($manualIntervention.ResponsibleTeamIds -contains $approverTeam.TeamId)\n                {\n                    $automaticApprover = $approver\n                    break\n                }\n            }\n\n            if ($null -ne $automaticApprover)\n            {\n                break\n            }\n        }\n\n        if ($null -ne $automaticApprover)\n        {\n            Write-OctopusVerbose \"Found matching approvers, attempting to auto approve.\"\n            if ($manualIntervention.HasResponsibility -eq $false)\n            {\n                Write-OctopusInformation \"Taking over responsibility for this manual intervention.\"\n                $takeResponsiblilityResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"interruptions/$($manualIntervention.Id)/responsible\" -method \"PUT\" -apiKey $octopusApiKey -spaceId $spaceId -ignoreCache $true\n                Write-OctopusVerbose \"Response from taking responsibility $($takeResponsiblilityResponse.Id)\"\n            }\n            \n            if ($null -ne $approvalTenant)\n            {\n                $approvalMessage = \"Parent project $parentProjectName release $parentReleaseNumber to $parentEnvironmentName for the tenant $($approvalTenant.Name) with the task id $parentDeploymentTaskId was approved by $($automaticApprover.UserName).\"\n            }\n            else\n            {\n                $approvalMessage = \"Parent project $parentProjectName release $parentReleaseNumber to $parentEnvironmentName with the task id $parentDeploymentTaskId was approved by $($automaticApprover.UserName).\"\n            }\n\n            $submitApprovalBody = @{\n                Instructions = $null;\n                Notes = \"Auto-approving this deployment. $approvalMessage That user is a member of one of the teams this manual intervention requires.  You can view that deployment $defaultUrl/app#/$spaceId/tasks/$parentDeploymentTaskId\";\n                Result = \"Proceed\"\n            }\n            $submitResult = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"interruptions/$($manualIntervention.Id)/submit\" -method \"POST\" -apiKey $octopusApiKey -item $submitApprovalBody -spaceId $spaceId -ignoreCache $true\n            Write-OctopusSuccess \"Successfully auto approved the manual intervention $($submitResult.Id)\"\n        }\n        else\n        {\n            Write-OctopusSuccess \"Couldn't find an approver to auto-approve the child project.  Waiting until timeout or child project is approved.\"    \n        }\n    }\n}\n\nfunction Get-ReleaseNotes\n{\n\tparam (\n    \t$releaseToDeploy,\n        $deploymentPreview,\n        $channel,\n        $spaceId,\n        $defaultUrl,\n        $octopusApiKey\n    )\n            \n    $releaseNotes = @(\"\")\n    $releaseNotes += \"**Release Information**\"\n    $releaseNotes += \"\"\n\n    $packageVersionAdded = @()\n    $workItemsAdded = @()\n    $commitsAdded = @()\n\n    if ($null -ne $releaseToDeploy.BuildInformation -and $releaseToDeploy.BuildInformation.Count -gt 0)\n    {\n        $releaseNotes += \"- Package Versions\"\n        foreach ($change in $deploymentPreview.Changes)\n        {        \n            foreach ($package in $change.BuildInformation)\n            {\n                $packageInformation = \"$($package.PackageId).$($package.Version)\"\n                if ($packageVersionAdded -notcontains $packageInformation)\n                {\n                    $releaseNotes += \"  - $packageInformation\"\n                    $packageVersionAdded += $packageInformation\n                }\n            }\n        }\n\n\t\t$releaseNotes += \"\"\n        $releaseNotes += \"- Work Items\"\n        foreach ($change in $deploymentPreview.Changes)\n        {        \n            foreach ($workItem in $change.WorkItems)\n            {            \n                if ($workItemsAdded -notcontains $workItem.Id)\n                {\n                    $workItemInformation = \"[$($workItem.Id)]($($workItem.LinkUrl)) - $($workItem.Description)\"\n                    $releaseNotes += \"  - $workItemInformation\"\n                    $workItemsAdded += $workItem.Id\n                }\n            }\n        }\n\n\t\t$releaseNotes += \"\"\n        $releaseNotes += \"- Commits\"\n        foreach ($change in $deploymentPreview.Changes)\n        {        \n            foreach ($commit in $change.Commits)\n            {            \n                if ($commitsAdded -notcontains $commit.Id)\n                {\n                    $commitInformation = \"[$($commit.Id)]($($commit.LinkUrl)) - $($commit.Comment)\"\n                    $releaseNotes += \"  - $commitInformation\"\n                    $commitsAdded += $commit.Id\n                }\n            }\n        }            \n    }\n    else\n    {\n        $releaseNotes += $releaseToDeploy.ReleaseNotes\n        $releaseNotes += \"\"\n        $releaseNotes += \"Package Versions\"  \n        \n        $releaseDeploymentTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"deploymentprocesses/$($releaseToDeploy.ProjectDeploymentProcessSnapshotId)/template?channel=$($channel.Id)&releaseId=$($releaseToDeploy.Id)\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId\n        \n        foreach ($package in $releaseToDeploy.SelectedPackages)\n        {\n        \tWrite-OctopusVerbose \"Attempting to find $($package.StepName) and $($package.ActionName)\"\n            \n            $deploymentProcessPackageInformation = $releaseDeploymentTemplate.Packages | Where-Object {$_.StepName -eq $package.StepName -and $_.actionName -eq $package.ActionName}\n            if ($null -ne $deploymentProcessPackageInformation)\n            {\n                $packageInformation = \"$($deploymentProcessPackageInformation.PackageId).$($package.Version)\"\n                if ($packageVersionAdded -notcontains $packageInformation)\n                {\n                    $releaseNotes += \"  - $packageInformation\"\n                    $packageVersionAdded += $packageInformation\n                }\n            }\n        }\n    }\n\n    return $releaseNotes -join \"`n\"\n}\n\nfunction Get-QueueDate\n{\n\tparam ( \n    \t$futureDeploymentDate\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($futureDeploymentDate) -or $futureDeploymentDate -eq \"N/A\")\n    {\n    \treturn $null\n    }\n    \n    [datetime]$outputDate = New-Object DateTime\n    $currentDate = Get-Date\n\n    if ([datetime]::TryParse($futureDeploymentDate, [ref]$outputDate) -eq $false)\n    {\n        Write-OctopusCritical \"The suppplied date $futureDeploymentDate cannot be parsed by DateTime.TryParse.  Please verify format and try again.  Please [refer to Microsoft's Documentation](https://docs.microsoft.com/en-us/dotnet/api/system.datetime.tryparse) on supported formats.\"\n        exit 1\n    }\n    \n    if ($currentDate -gt $outputDate)\n    {\n    \tWrite-OctopusCritical \"The supplied date $futureDeploymentDate is set for the past.  All queued deployments must be in the future.\"\n        exit 1\n    }\n    \n    return $outputDate\n}\n\nfunction Get-QueueExpiryDate\n{\n\tparam (\n    \t$queueDate\n    )\n    \n    if ($null -eq $queueDate)\n    {\n    \treturn $null\n    }\n    \n    return $queueDate.AddHours(1)\n}\n\nfunction Insert-EmptyOutputVariables\n{\n\tparam (\n    \t$releaseToDeploy\n    )\n    \n\tif ($null -ne $releaseToDeploy)\n    {\n\t\tSet-OctopusVariable -Name \"ReleaseToPromote\" -Value $($releaseToDeploy.Version)\n        Set-OctopusVariable -Name \"ReleaseNotes\" -value \"Release already deployed to destination environment.\"\n    }\n    else\n    {\n    \tSet-OctopusVariable -Name \"ReleaseToPromote\" -Value \"N/A\"\n        Set-OctopusVariable -Name \"ReleaseNotes\" -value \"No release found\"\n    }        \n    \n    Write-OctopusInformation \"Setting the output variable ChildReleaseToDeploy to $false\"\n    Set-OctopusVariable -Name \"ChildReleaseToDeploy\" -Value $false\n}\n\nfunction Get-ApprovalDeploymentTaskId\n{\n\tparam (\n    \t$autoapproveChildManualInterventions,\n        $parentDeploymentTaskId,\n        $parentReleaseId,\n        $parentEnvironmentName,\n        $approvalEnvironmentName,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $parentChannelId,    \n        $parentEnvironmentId,\n        $approvalTenant,\n        $parentProject\n    )\n    \n    if ($autoapproveChildManualInterventions -eq $false)\n    {\n    \tWrite-OctopusInformation \"Auto approvals are disabled, skipping pulling the approval deployment task id\"\n        return $null\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($approvalEnvironmentName) -eq $true)\n    {\n    \tWrite-OctopusInformation \"Approval environment not supplied, using the current environment id for approvals.\"\n        return $parentDeploymentTaskId\n    }\n    \n    if ($approvalEnvironmentName.ToLower().Trim() -eq $parentEnvironmentName.ToLower().Trim())\n    {\n        Write-OctopusInformation \"The approval environment is the same as the current environment, using the current task id $parentDeploymentTaskId\"\n        return $parentDeploymentTaskId\n    }\n    \n    $approvalEnvironment = Get-OctopusEnvironmentByName -environmentName $approvalEnvironmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n    $releaseDeploymentList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$parentReleaseId/deployments?skip=0&take=1000\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId -propertyName \"Items\"\n    \n    $lastDeploymentTime = $(Get-Date).AddYears(-50)\n    $approvalTaskId = $null\n    foreach ($deployment in $releaseDeploymentList)\n    {\n        if ($deployment.EnvironmentId -ne $approvalEnvironment.Id)\n        {\n            Write-OctopusInformation \"The deployment $($deployment.Id) deployed to $($deployment.EnvironmentId) which doesn't match $($approvalEnvironment.Id).  Moving onto the next deployment.\"\n            continue\n        }\n\n        if ($null -ne $approvalTenant -and $null -ne $deployment.TenantId -and $deployment.TenantId -ne $approvalTenant.Id)\n        {\n            Write-OctopusInformation \"The deployment $($deployment.Id) was deployed to the correct environment, $($approvalEnvironment.Id), but the deployment tenant $($deployment.TenantId) doesn't match the approval tenant $($approvalTenant.Id).  Moving onto the next deployment.\"\n            continue\n        }\n        \n        Write-OctopusInformation \"The deployment $($deployment.Id) was deployed to the approval environment $($approvalEnvironment.Id).\"\n\n        $deploymentTask = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $null -endPoint \"tasks/$($deployment.TaskId)\" -apiKey $octopusApiKey -Method \"Get\"\n        if ($deploymentTask.IsCompleted -eq $false)\n        {\n            Write-OctopusInformation \"The deployment $($deployment.Id) is being deployed to the approval environment, but it hasn't completed, moving onto the next deployment.\"\n            continue\n        }\n\n        if ($deploymentTask.IsCompleted -eq $true -and $deploymentTask.FinishedSuccessfully -eq $false)\n        {\n            Write-Information \"The deployment $($deployment.Id) was deployed to the approval environment, but it encountered a failure, moving onto the next deployment.\"\n            continue\n        }\n\n        if ($deploymentTask.StartTime -gt $lastDeploymentTime)\n        {\n            $approvalTaskId = $deploymentTask.Id\n            $lastDeploymentTime = $deploymentTask.StartTime\n        }\n    }        \n\n    if ($null -eq $approvalTaskId)\n    {\n    \tWrite-OctopusVerbose \"Unable to find a deployment to the environment, determining if it should've happened already.\"\n        $channelInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"channels/$parentChannelId\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId\n        $lifecyclePhases = Get-OctopusLifeCyclePhases -channel $channelInformation -defaultUrl $defaultUrl -spaceId $spaceId -OctopusApiKey $octopusApiKey -project $parentProject        \n        \n        $foundDestinationFirst = $false\n        $foundApprovalFirst = $false\n        \n        foreach ($phase in $lifecyclePhases)\n        {\n        \tif (Test-PhaseContainsEnvironmentId -phase $phase -environmentId $parentEnvironmentId)\n            {\n            \tif ($foundApprovalFirst -eq $false)\n                {\n                \t$foundDestinationFirst = $true\n                }\n            }\n            \n            if (Test-PhaseContainsEnvironmentId -phase $phase -environmentId $approvalEnvironment.Id)\n            {\n            \tif ($foundDestinationFirst -eq $false)\n                {\n                \t$foundApprovalFirst = $true\n                }\n            }\n        }\n        \n        $messageToLog = \"Unable to find a deployment for the environment $approvalEnvironmentName.  Auto approvals are disabled.\"\n        if ($foundApprovalFirst -eq $true)\n        {\n        \tWrite-OctopusWarning $messageToLog\n        }\n        else\n        {\n        \tWrite-OctopusInformation $messageToLog\n        }\n        \n        return $null\n    }\n\n    return $approvalTaskId\n}\n\nfunction Invoke-RefreshVariableSnapshot\n{\n\tparam (\n    \t$refreshVariableSnapShot,\n        $whatIf,\n        $releaseToDeploy,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n    \n    Write-OctopusVerbose \"Checking to see if variable snapshot will be updated.\"\n    \n    if ($refreshVariableSnapShot -eq \"No\")\n    {\n    \tWrite-OctopusVerbose \"Refreshing variables is set to no, skipping\"\n    \treturn\n    }\n    \n    $releaseDeploymentTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$($releaseToDeploy.Id)/deployments/template\" -spaceId $spaceId -method GET -apiKey $octopusApiKey\n    \n    if ($releaseDeploymentTemplate.IsVariableSetModified -eq $false -and $releaseDeploymentTemplate.IsLibraryVariableSetModified -eq $false)\n    {\n    \tWrite-OctopusVerbose \"Variables have not been updated since release creation, skipping\"\n        return\n    }\n    \n    if ($whatIf -eq $true)\n    {\n    \tWrite-OctopusSuccess \"Variables have been updated since release creation, whatif set to true, no update will occur.\"\n        return\n    }\n    \n    $snapshotVariables = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$($releaseToDeploy.Id)/snapshot-variables\" -spaceId $spaceId -method \"POST\" -apiKey $octopusApiKey\n    Write-OctopusSuccess \"Variables have been modified since release creation.  Variable snapshot was updated on $($snapshotVariables.LastModifiedOn)\"\n}\n\nfunction Get-MatchingOctopusDeploymentTasks\n{\n    param (\n        $spaceId,\n        $project,\n        $tenantToDeploy,\n        $tenantIsAssignedToPreviousEnvironments,\n        $sourceDestinationEnvironmentInfo,\n        $defaultUrl,\n        $octopusApiKey\n    )\n\n    $taskEndPoint = \"tasks?skip=0&take=100&spaces=$spaceId&includeSystem=false&project=$($project.Id)&name=Deploy&states=Success\"\n\n    if ($null -ne $tenantToDeploy -and $tenantIsAssignedToPreviousEnvironments -eq $true)\n    {\n        $taskEndPoint += \"&tenant=$($tenantToDeploy.Id)\"\n    }\n\n    $taskList = @()\n\n    foreach ($sourceEnvironmentId in $sourceDestinationEnvironmentInfo.SourceEnvironmentList)\n    {\n        $octopusTaskList = Get-ListFromOctopusApi -octopusUrl $DefaultUrl -endPoint \"$($taskEndPoint)&environment=$sourceEnvironmentId\" -spaceId $null -apiKey $octopusApiKey -method \"GET\" -propertyName \"Items\"\n        $taskList += $octopusTaskList\n    }\n\n    $orderedTaskList = @($taskList | Sort-Object -Property StartTime -Descending)\n    Write-OctopusVerbose \"We have $($orderedTaskList.Count) number of tasks to loop through\"\n\n    return $orderedTaskList\n}\n\nfunction Get-TaskDetails\n{\n    param (\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $taskId,\n        $lastEnhancedLoggingWriteTime\n    )\n\n    $taskDetails = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint \"tasks/$taskId/details\" -method 'GET' -ignoreCache $true\n    $activityLogs = $taskDetails.ActivityLogs\n    $writeStepName = $writeTargetName = $true\n    $returnTime = [datetime]::MinValue\n\n    foreach ($step in $activityLogs.Children)\n    {\n        foreach ($target in $step.Children)\n        {\n            foreach ($logElement in $target.LogElements)\n            {\n                $occurredAt = [datetime]($logElement.OccurredAt)\n                if ($occurredAt -gt $lastEnhancedLoggingWriteTime)\n                {\n                    if ($writeStepName -eq $true)\n                    {\n                        $trailingCount = 66 - $step.Name.Length\n                        if ($trailingCount -lt 0) { $trailingCount = 0 }\n                        Write-OctopusInformation \"╔═ $($step.Name) $(\"═\" * $trailingCount)\"\n                        $writeStepName = $false\n                    }\n                    if ($writeTargetName -eq $true)\n                    {\n                        $trailingCount = 64 - $target.Name.Length\n                        if ($trailingCount -lt 0) { $trailingCount = 0 }\n                        Write-OctopusInformation \"║ ┌─ $($target.Name) $('─' * $trailingCount)\"\n                        $writeTargetName = $false\n                    }\n                    Write-OctopusInformation \"║ │ $($logElement.MessageText)\"\n                    if ($occurredAt -gt $returnTime) { $returnTime = $occurredAt}\n                }\n            }\n            if ($writeTargetName -eq $false)\n            {\n                Write-OctopusInformation \"║ └$('─' * 67)\"\n                $writeTargetName = $true\n            }\n        }\n        if ($writeStepName -eq $false)\n        {\n            Write-OctopusInformation \"╚$('═' * 69)\"\n            $writeStepName = $true\n        }\n    }\n\n    return $returnTime\n}\n\nfunction Get-ReleaseToDeployFromTaskList\n{\n    param (\n        $taskList,\n        $channel,\n        $releaseNumber,\n        $tenantToDeploy,\n        $sourceDestinationEnvironmentInfo,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $isPromotionMode\n    )\n    \n    foreach ($task in $taskList)\n    {\n        Write-OctopusVerbose \"Pulling the deployment information for $($task.Id)\"\n        $deploymentInformation = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"deployments/$($task.Arguments.DeploymentId)\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n\n        if ($deploymentInformation.ChannelId -ne $channel.Id)\n        {\n            Write-OctopusInformation \"The deployment was not for the channel we want to deploy to, moving onto next task.\"\n            continue\n        }\n\n        Write-OctopusVerbose \"Pulling the release information for $($deploymentInformation.Id)\"\n        $releaseInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"releases/$($deploymentInformation.ReleaseId)\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n        \n        if ($isPromotionMode -eq $false)\n        {\n            Write-OctopusInformation \"Current mode is set to redeploy, the release is for the correct channel and was successful, using it.\"            \n            return $releaseInformation\n        }\n\n        if ([string]::IsNullOrWhiteSpace($releaseNumber) -eq $false -and $releaseInformation.Version -notlike $releaseNumber)\n        {\n            Write-OctopusInformation \"The release version $($releaseInformation.Version) does not match $releaseNumber.  Moving onto the next task.\"\n            continue\n        }\n\n        $releaseCanBeDeployed = Get-ReleaseCanBeDeployedToTargetEnvironment -defaultUrl $defaultUrl -release $releaseInformation -spaceId $spaceId -octopusApiKey $octopusApiKey -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -tenantToDeploy $tenantToDeploy -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n\n        if ($releaseCanBeDeployed -eq $true)\n        {\n            Write-OctopusInformation \"The release $($releaseInformation.Version) can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).\"\n            return $releaseInformation                                    \n        }\n\n        Write-OctopusInformation \"The release $($releaseInformation.Version) cannot be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).  Moving onto next task\"\n    } \n    \n    return $null\n}\n\nfunction Get-ReleaseToDeployFromChannel\n{\n    param (\n        $channel,\n        $releaseNumber,\n        $tenantToDeploy,\n        $sourceDestinationEnvironmentInfo,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey,\n        $isPromotionMode,\n        $isAlwaysLatestMode\n    )\n\n    if ([string]::IsNullOrWhiteSpace($releaseNumber) -eq $false)\n    {        \n        $urlReleaseNumber = $releaseNumber.Replace(\"*\", \"\")\n        Write-OctopusInformation \"The release number was sent in, sending $urlReleaseNumber to the channel endpoint to have the server filter on that number first.\"\n        $releaseChannelList = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"channels/$($channel.Id)/releases?skip=0&take=100&searchByVersion=$urlReleaseNumber\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"    \n    }\n    else\n    {\n        Write-OctopusInformation \"The release number was not sent in, attempting to find the latest release from the channel to deploy.\"\n        $releaseChannelList = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"channels/$($channel.Id)/releases?skip=0&take=100\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"    \n    }\n    \n    Write-OctopusInformation \"There are $($releaseChannelList.Items.Count) potential releases to go through.\"\n\n    foreach ($releaseInformation in $releaseChannelList.Items)\n    {\n        if ([string]::IsNullOrWhiteSpace($releaseNumber) -eq $false -and $releaseInformation.Version -notlike $releaseNumber)\n        {\n            Write-OctopusInformation \"The release version $($releaseInformation.Version) does not match $releaseNumber.  Moving onto the next release in the channel.\"\n            continue\n        }\n\n        $releaseCanBeDeployed = Get-ReleaseCanBeDeployedToTargetEnvironment -defaultUrl $defaultUrl -release $releaseInformation -spaceId $spaceId -octopusApiKey $octopusApiKey -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -tenantToDeploy $tenantToDeploy -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n\n        if ($releaseCanBeDeployed -eq $true)\n        {\n            Write-OctopusInformation \"The release $($releaseInformation.Version) can be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).\"\n            return $releaseInformation                                    \n        }\n\n        Write-OctopusInformation \"The release $($releaseInformation.Version) cannot be deployed to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).  Moving onto next release in the channel.\"\n    }\n\n    return $null\n}\n\nfunction Get-ReleaseHasAlreadyBeenPromotedToTargetEnvironment\n{\n    param (\n        $releaseToDeploy,\n        $tenantToDeploy,\n        $sourceDestinationEnvironmentInfo,\n        $isPromotionMode,\n        $isAlwaysLatestMode,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    if ($isPromotionMode -eq $false -and $isAlwaysLatestMode -eq $false)\n    {\n        Write-OctopusInformation \"Currently in redeploy mode, of course the release has already been deployed to the target environment.  Exiting the Release Has Already Been Promoted To Target Environment check.\"\n        return $true\n    }\n\n    Write-OctopusVerbose \"Pulling the last release for the target environment to see if the release to deploy is the latest one in that environment.\"\n    $taskEndPoint = \"tasks?skip=0&take=1&spaces=$spaceId&includeSystem=false&project=$($releaseToDeploy.ProjectId)&name=Deploy&states=Success&environment=$($sourceDestinationEnvironmentInfo.TargetEnvironment.Id)\"\n\n    if ($null -ne $tenantToDeploy)\n    {\n        $taskEndPoint += \"&tenant=$($tenantToDeploy.Id)\"\n    }\n\n    $octopusTaskList = Get-ListFromOctopusApi -octopusUrl $DefaultUrl -endPoint \"$taskEndPoint\" -spaceId $null -apiKey $octopusApiKey -method \"GET\" -propertyName \"Items\"\n\n    if ($octopusTaskList.Count -eq 0)\n    {\n        Write-OctopusInformation \"There have been no releases to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name) for this project.\"\n        return $false\n    }\n\n    $task = $octopusTaskList[0]\n    $deploymentInformation = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"deployments/$($task.Arguments.DeploymentId)\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n\n    if ($releaseToDeploy.Id -eq $deploymentInformation.ReleaseId)\n    {\n        Write-OctopusInformation \"The release to deploy $($release.ReleaseNumber) is the last successful release to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)\"\n        return $true\n    }\n\n    Write-OctopusInformation \"The release to deploy $($release.ReleaseNumber) is different than the last successful release to $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name)\"\n    return $false\n}\n\nfunction Get-MachineIdsFromMachineNames\n{\n    param (\n        $targetMachines,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    $targetMachineList = $targetMachines -split \",\"\n    $translatedList = @()\n\n    foreach ($machineName in $targetMachineList)\n    {\n    \t$trimmedMachineName = $machineName.Trim()\n        Write-OctopusVerbose \"Translating $trimmedMachineName into an Octopus Id\"\n    \tif ($trimmedMachineName -like \"Machines-*\")\n        {\n        \tWrite-OctopusVerbose \"$trimmedMachineName is already an Octopus Id, adding it to the list\"\n        \t$translatedList += $machineName\n            continue\n        }\n        \n        $machineObject = Get-OctopusItemByName -itemName $trimmedMachineName -itemType \"Deployment Target\" -endpoint \"machines\" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n\n        $translatedList += $machineObject.Id\n    }\n\n    return $translatedList -join \",\"\n}\n\nfunction Write-ReleaseInformation\n{\n    param (\n        $releaseToDeploy,\n        $environmentList\n    )\n\n    $releaseDeployments = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"releases/$($releaseToDeploy.Id)/deployments\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n    $releaseEnvironmentList = @()\n\n    foreach ($deployment in $releaseDeployments.Items)\n    {        \n        $releaseEnvironment = $environmentList | Where-Object {$_.Id -eq $deployment.EnvironmentId }\n        \n        if ($null -ne $releaseEnvironment -and $releaseEnvironmentList -notcontains $releaseEnvironment.Name)\n        {\n            Write-OctopusVerbose \"Adding $($releaseEnvironment.Name) to the list of environments this release has been deployed to\"\n            $releaseEnvironmentList += $releaseEnvironment.Name\n        }                \n    }\n    \n    if ($releaseEnvironmentList.Count -gt 0)\n    {\n        Write-OctopusSuccess \"The release to deploy is $($releaseToDeploy.Version) which has been deployed to $($releaseEnvironmentList -join \",\")\"\n    }\n    else\n    {\n        Write-OctopusSuccess \"The release to deploy is $($releaseToDeploy.Version) which currently has no deployments.\"    \n    }\n}\n\nfunction Get-GuidedFailureMode\n{\n\tparam (\n    \t$projectToDeploy,\n        $environmentToDeployTo\n    )\n    \n    Write-OctopusInformation \"Checking $($projectToDeploy.DefaultGuidedFailureMode) and $($environmentToDeployTo.UseGuidedFailure) to determine guided failure mode.\"\n    \n    if ($projectToDeploy.DefaultGuidedFailureMode -eq \"EnvironmentDefault\" -and $environmentToDeployTo.UseGuidedFailure -eq $true)\n    {\n    \tWrite-OctopusInformation \"Guided failure for the project is set to environment default, and destination environment says to use guided failure.  Setting guided failure to true.\"\n        return $true\n    }\n    \n    if ($projectToDeploy.DefaultGuidedFailureMode -eq \"On\")\n    {\n    \tWrite-OctopusInformation \"Guided failure for the project is set to always use guided falure.  Setting guided failure to true.\"\n        return $true\n    }\n    \n    Write-OctopusInformation \"Guided failure is not turned on for the project nor the environment.  Setting to false.\"\n    return $false\n}\n\nWrite-OctopusInformation \"Octopus SpaceId: $destinationSpaceId\"\nWrite-OctopusInformation \"Octopus Deployment Task Id: $parentDeploymentTaskId\"\nWrite-OctopusInformation \"Octopus Project Name: $parentProjectName\"\nWrite-OctopusInformation \"Octopus Release Number: $parentReleaseNumber\"\nWrite-OctopusInformation \"Octopus Release Id: $parentReleaseId\"\nWrite-OctopusInformation \"Octopus Environment Name: $parentEnvironmentName\"\nWrite-OctopusInformation \"Octopus Release Channel Id: $parentChannelId\"\nWrite-OctopusInformation \"Octopus Specific deployment machines: $specificMachines\"\nWrite-OctopusInformation \"Octopus Exclude deployment machines: $excludeMachines\"\nWrite-OctopusInformation \"Octopus deployment machines: $deploymentMachines\"\n\nWrite-OctopusInformation \"Child Project Name: $projectName\"\nWrite-OctopusInformation \"Child Project Space Name: $destinationSpaceName\"\nWrite-OctopusInformation \"Child Project Channel Name: $channelName\"\nWrite-OctopusInformation \"Child Project Release Number: $releaseNumber\"\nWrite-OctopusInformation \"Child Project Error Handle No Release Found: $errorHandleForNoRelease\"\nWrite-OctopusInformation \"Destination Environment Name: $environmentName\"\nWrite-OctopusInformation \"Source Environment Name: $sourceEnvironmentName\"\nWrite-OctopusInformation \"Ignore specific machine mismatch: $ignoreSpecificMachineMismatchValue\"\nWrite-OctopusInformation \"Save release notes as artifact: $saveReleaseNotesAsArtifactValue\"\nWrite-OctopusInformation \"What If: $whatIfValue\"\nWrite-OctopusInformation \"Wait for finish: $waitForFinishValue\"\nWrite-OctopusInformation \"Cancel deployment in seconds: $deploymentCancelInSeconds\"\nWrite-OctopusInformation \"Scheduling: $futureDeploymentDate\"\nWrite-OctopusInformation \"Auto-Approve Child Project Manual Interventions: $autoapproveChildManualInterventionsValue\"\nWrite-OctopusInformation \"Approval Environment: $approvalEnvironmentName\"\nWrite-OctopusInformation \"Approval Tenant: $approvalTenantName\"\nWrite-OctopusInformation \"Refresh Variable Snapshot: $refreshVariableSnapShot\"\nWrite-OctopusInformation \"Deployment Mode: $deploymentMode\"\nWrite-OctopusInformation \"Target Machine Names: $targetMachines\"\nWrite-OctopusInformation \"Deployment Tenant Name: $deploymentTenantName\"\n\n$whatIf = $whatIfValue -eq \"Yes\"\n$waitForFinish = $waitForFinishValue -eq \"Yes\"\n$enableEnhancedLogging = $enableEnhancedLoggingValue -eq \"Yes\"\n$ignoreSpecificMachineMismatch = $ignoreSpecificMachineMismatchValue -eq \"Yes\"\n$autoapproveChildManualInterventions = $autoapproveChildManualInterventionsValue -eq \"Yes\"\n$saveReleaseNotesAsArtifact = $saveReleaseNotesAsArtifactValue -eq \"Yes\"\n\n$verificationPassed = @()\n$verificationPassed += Test-RequiredValues -variableToCheck $octopusApiKey -variableName \"Octopus API Key\"\n$verificationPassed += Test-RequiredValues -variableToCheck $destinationSpaceName -variableName \"Child Project Space\"\n$verificationPassed += Test-RequiredValues -variableToCheck $projectName -variableName \"Child Project Name\"\n$verificationPassed += Test-RequiredValues -variableToCheck $environmentName -variableName \"Destination Environment Name\"\n\nif ($verificationPassed -contains $false)\n{\n\tWrite-OctopusInformation \"Required values missing\"\n\tExit 1\n}\n\n$isPromotionMode = $deploymentMode -eq \"Promote\"\n$isAlwaysLatestMode = $deploymentMode -eq 'AlwaysLatest'\n$spaceId = Get-OctopusSpaceIdByName -spaceName $destinationSpaceName -spaceId $destinationSpaceId -defaultUrl $defaultUrl -OctopusApiKey $octopusApiKey    \n\nWrite-OctopusSuccess \"The current mode of the step template is $deploymentMode\"\n\nif ($isAlwaysLatestMode -eq $true)\n{\n    Write-OctopusSuccess \"Currently in AlwaysLatest mode, release number filter will be ignored, source environment will be set to the target environment, all redeployment checks will be ignored.\"\n}\n\nif ($isPromotionMode -eq $false -and $isAlwaysLatestMode -eq $false)\n{\n    Write-OctopusSuccess \"Currently in redeploy mode, release number filter will be ignored, source environment will be set to the target environment, all redeployment checks will be ignored.\"\n}\n\nif ($isPromotionMode -eq $true -and [string]::IsNullOrWhiteSpace($sourceEnvironmentName) -eq $false -and $sourceEnvironmentName.ToLower().Trim() -eq $environmentName.ToLower().Trim())\n{\n    Write-OctopusSuccess \"The current mode is promotion.  Both the source environment and destination environment are the same.  You cannot promote from the same environment as the source environment.  Exiting.  Change the deployment mode value to redeploy if you want to redeploy.\"\n    Exit 0\n}\n\n$specificMachineDeployment = $false\nif ([string]::IsNullOrWhiteSpace($specificMachines) -eq $false)\n{\n\tWrite-OctopusSuccess \"This deployment is targeting the specific machines $specificMachines.\"\n\t$specificMachineDeployment = $true\n}\n\nif ([string]::IsNullOrWhiteSpace($excludeMachines) -eq $false)\n{\n\tWrite-OctopusSuccess \"This deployment is excluding the specific machines $excludeMachines.  The machines being deployed to are: $deploymentMachines.\"\n    $specificMachineDeployment = $true\n}\n\nif ([string]::IsNullOrWhiteSpace($targetMachines) -eq $false -and $targetMachines -ne \"N/A\")\n{\n    Write-OctopusSuccess \"You have specified specific machines to target in this deployment.  Ignoring the machines that triggered this deployment.\"\n    $specificMachineDeployment = $true\n    $deploymentMachines = Get-MachineIdsFromMachineNames -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -targetMachines $targetMachines\n}\n\n$project = Get-OctopusProjectByName -projectName $projectName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n$parentProject = Get-OctopusProjectByName -projectName $parentProjectName -defaultUrl $defaultUrl -spaceId $parentSpaceId -octopusApiKey $octopusApiKey\n$tenantToDeploy = Get-OctopusTenantByName -tenantName $deploymentTenantName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n$targetEnvironment = Get-OctopusEnvironmentByName -environmentName $environmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n$tenantToDeploy = Test-ProjectTenantSettings -tenantToDeploy $tenantToDeploy -project $project -targetEnvironment $targetEnvironment\n\n$sourceEnvironment = Get-OctopusEnvironmentByName -environmentName $sourceEnvironmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n$channel = Get-OctopusChannel -channelName $channelName -defaultUrl $defaultUrl -project $project -spaceId $spaceId -octopusApiKey $octopusApiKey\n$phaseList = Get-OctopusLifecyclePhases -channel $channel -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -project $project\n$sourceDestinationEnvironmentInfo = Get-SourceDestinationEnvironmentInformation -phaseList $phaseList -targetEnvironment $targetEnvironment -sourceEnvironment $sourceEnvironment -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n\nif ($deploymentMode -eq 'AlwaysLatest')\n{\n    Write-OctopusInformation \"Finding the latest release that can be deployed.\"\n    $releaseToDeploy = Get-ReleaseToDeployFromChannel -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n}\nelseif ($sourceDestinationEnvironmentInfo.FirstLifecyclePhase -eq $false)\n{\n    $tenantIsAssignedToPreviousEnvironments = Get-TenantIsAssignedToPreviousEnvironments -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -projectId $project.Id -isPromotionMode $isPromotionMode\n    $taskList = Get-MatchingOctopusDeploymentTasks -spaceId $spaceId -project $project -tenantToDeploy $tenantToDeploy -tenantIsAssignedToPreviousEnvironments $tenantIsAssignedToPreviousEnvironments -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n    $releaseToDeploy = Get-ReleaseToDeployFromTaskList -taskList $taskList -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $DefaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode    \n\n    if ($null -eq $releaseToDeploy -and $sourceDestinationEnvironmentInfo.HasRequiredPhase -eq $false)\n    {\n        Write-OctopusInformation \"No release was found that has been deployed.  However, all the phases prior to the destination phase is optional.  Checking to see if any releases exist at the channel level that haven't been deployed.\"\n        $releaseToDeploy = Get-ReleaseToDeployFromChannel -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n    }\n}\nelse\n{\n    $releaseToDeploy = Get-ReleaseToDeployFromChannel -channel $channel -releaseNumber $releaseNumber -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n}\n\n$environmentList = Get-ListFromOctopusApi -octopusUrl $defaultUrl -endPoint \"environments?skip=0&take=1000\" -spaceId $spaceId -propertyName \"Items\" -apiKey $octopusApiKey\n\nTest-ReleaseToDeploy -releaseToDeploy $releaseToDeploy -errorHandleForNoRelease $errorHandleForNoRelease -releaseNumber $releaseNumber -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -environmentList $environmentList\n\nif ($null -ne $releaseToDeploy)\n{\n    Write-ReleaseInformation -releaseToDeploy $releaseToDeploy -environmentList $environmentList\n}\n\n$releaseHasAlreadyBeenDeployed = Get-ReleaseHasAlreadyBeenPromotedToTargetEnvironment -releaseToDeploy $releaseToDeploy -tenantToDeploy $tenantToDeploy -sourceDestinationEnvironmentInfo $sourceDestinationEnvironmentInfo -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -isPromotionMode $isPromotionMode -isAlwaysLatestMode $isAlwaysLatestMode\n\n$deploymentPreview = Get-DeploymentPreview -releaseToDeploy $releaseToDeploy -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -targetEnvironment $targetEnvironment -deploymentTenant $tenantToDeploy\n$childDeploymentSpecificMachines = Get-ChildDeploymentSpecificMachines -deploymentPreview $deploymentPreview -deploymentMachines $deploymentMachines -specificMachineDeployment $specificMachineDeployment\n$deploymentFormValues = Get-ValuesForPromptedVariables -formValues $formValues -deploymentPreview $deploymentPreview\n\n$queueDate = Get-QueueDate -futureDeploymentDate $futureDeploymentDate\n$queueExpiryDate = Get-QueueExpiryDate -queueDate $queueDate\n$useGuidedFailure = Get-GuidedFailureMode -projectToDeploy $project -environmentToDeployTo $targetEnvironment\n\n$createdDeployment = @{\n    EnvironmentId = $targetEnvironment.Id;\n    ExcludeMachineIds = @();\n    ForcePackageDownload = $false;\n    ForcePackageRedeployment = $false;\n    FormValues = $deploymentFormValues;\n    QueueTime = $queueDate;\n    QueueTimeExpiry = $queueExpiryDate;\n    ReleaseId = $releaseToDeploy.Id;\n    SkipActions = @();\n    SpecificMachineIds = @($childDeploymentSpecificMachines);\n    TenantId = $null;\n    UseGuidedFailure = $useGuidedFailure\n}\n\nif ($null -ne $tenantToDeploy -and $project.TenantedDeploymentMode -ne \"Untenanted\")\n{\n    $createdDeployment.TenantId = $tenantToDeploy.Id\n}\n\nif ($whatIf -eq $true)\n{    \t\n    Write-OctopusVerbose \"Would have done a POST to /api/$spaceId/deployments with the body:\"\n    Write-OctopusVerbose $($createdDeployment | ConvertTo-JSON)        \n    \n    Write-OctopusSuccess \"What If set to true.\"\n    Write-OctopusSuccess \"Setting the output variable ReleaseToPromote to $($releaseToDeploy.Version).\"            \n\tSet-OctopusVariable -Name \"ReleaseToPromote\" -Value ($releaseToDeploy.Version)       \n}\n\nWrite-OctopusVerbose \"Getting the release notes\"\n$releaseNotes = Get-ReleaseNotes -releaseToDeploy $releaseToDeploy -deploymentPreview $deploymentPreview -channel $channel -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\nWrite-OctopusSuccess \"Setting the output variable ReleaseNotes which contains the release notes from the child project\"\nSet-OctopusVariable -Name \"ReleaseNotes\" -value $releaseNotes\n\nTest-ChildProjectDeploymentCanProceed -releaseToDeploy $releaseToDeploy -specificMachineDeployment $specificMachineDeployment -environmentName $environmentName -childDeploymentSpecificMachines $childDeploymentSpecificMachines -project $project -ignoreSpecificMachineMismatch $ignoreSpecificMachineMismatch -deploymentMachines $deploymentMachines -releaseHasAlreadyBeenDeployed $releaseHasAlreadyBeenDeployed -isPromotionMode $isPromotionMode\n\nif ($saveReleaseNotesAsArtifact -eq $true)\n{\n\t$releaseNotes | Out-File \"ReleaseNotes.txt\"\n    $currentDate = Get-Date\n\t$currentDateFormatted = $currentDate.ToString(\"yyyy_MM_dd_HH_mm\")\n    $artifactName = \"$($project.Name) $($releaseToDeploy.Version) $($sourceDestinationEnvironmentInfo.TargetEnvironment.Name).ReleaseNotes_$($currentDateFormatted).txt\"\n    Write-OctopusInformation \"Creating the artifact $artifactName\"\n    \n\tNew-OctopusArtifact -Path \"ReleaseNotes.txt\" -Name $artifactName\n}\n\nInvoke-RefreshVariableSnapshot -refreshVariableSnapShot $refreshVariableSnapShot -whatIf $whatIf -releaseToDeploy $releaseToDeploy -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n\nif ($whatif -eq $true)\n{\n    Write-OctopusSuccess \"Exiting because What If set to true.\"\n    Write-OctopusInformation \"Setting the output variable ChildReleaseToDeploy to $true\"\n    Set-OctopusVariable -Name \"ChildReleaseToDeploy\" -Value $true\n    Exit 0\n}\n\n$approvalTenant = Get-OctopusApprovalTenant -tenantToDeploy $tenantToDeploy -approvalTenantName $approvalTenantName -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n$approvalDeploymentTaskId = Get-ApprovalDeploymentTaskId -autoapproveChildManualInterventions $autoapproveChildManualInterventions  -parentDeploymentTaskId $parentDeploymentTaskId -parentReleaseId $parentReleaseId -parentEnvironmentName $parentEnvironmentName -approvalEnvironmentName $approvalEnvironmentName -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -parentChannelId $parentChannelId -parentEnvironmentId $parentEnvironmentId -approvalTenant $approvalTenant -parentProject $parentProject\n$parentDeploymentApprovers = Get-ParentDeploymentApprovers -parentDeploymentTaskId $approvalDeploymentTaskId -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n\nCreate-NewOctopusDeployment -releaseToDeploy $releaseToDeploy -targetEnvironment $targetEnvironment -createdDeployment $createdDeployment -project $project -waitForFinish $waitForFinish -enableEnhancedLogging $enableEnhancedLogging -deploymentCancelInSeconds $deploymentCancelInSeconds -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -parentDeploymentApprovers $parentDeploymentApprovers -parentProjectName $parentProjectName -parentReleaseNumber $parentReleaseNumber -parentEnvironmentName $approvalEnvironmentName -parentDeploymentTaskId $approvalDeploymentTaskId -autoapproveChildManualInterventions $autoapproveChildManualInterventions -approvalTenant $approvalTenant"
-  },
-  "Parameters": [
-    {
-      "Id": "311597af-b1d5-42c1-bb8b-88c20d322989",
-      "Name": "ChildProject.Web.ServerUrl",
-      "Label": "Octopus Base Url",
-      "HelpText": "**Required**\n\nThe base URL of your instance. For example `https://samples.octopus.app`.  Defaults to the system variable [Octopus.Web.ServerUri](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server).",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f7357d18-33c3-4f1e-883d-613e13e098cd",
-      "Name": "ChildProject.Api.Key",
-      "Label": "Octopus API Key",
-      "HelpText": "*Required* \n\n\nThe API key of the user authorized to query and promote releases.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "e3337365-c83f-4f73-a7d0-c3f36469a70d",
-      "Name": "ChildProject.Space.Name",
-      "Label": "Child Project Space",
-      "HelpText": "*Required*\n\nThe name of the space the child project is located in.  Defaults to the current space name",
-      "DefaultValue": "#{Octopus.Space.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d9afe2db-720a-40d0-928e-6d1763286fc9",
-      "Name": "ChildProject.Project.Name",
-      "Label": "Child Project Name",
-      "HelpText": "*Required* \n\n\nThe name of the child project you wish to deploy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "dfe2c259-11c4-491f-900a-db7c37d82836",
-      "Name": "ChildProject.Release.Number",
-      "Label": "Child Project Release Number",
-      "HelpText": "*Optional* \n\n\nThe release number to filter on.  This field accepts:\n- *No value (default)* - the most recent release for the channel in the calculated previous environment or specified previous environment\n- *Wild card* - Example: `2020.2.*` will find the most recent release with a major version of 2020 and a minor version of 2.  Please note the period is important, if you enter `2020.1*` you could end up with 2020.10 releases.\n- *Specific version* - Example: `2020.2.1.2` will deploy that specific version.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c64e9163-ce84-4f56-8509-af849262a9be",
-      "Name": "ChildProject.Release.NotFoundError",
-      "Label": "Child Project Release Not Found Error Handle",
-      "HelpText": "What this step should do when a matching release cannot be found.\n\n- `Error` - Stops the deployment when no matching release is found.  For example, you specified `2021.1.2.*`, but there is no release in the child project matching that pattern.  Or, matching releases have been found but they cannot be promoted to the destination environment.\n- `Warning` - Stops this step with a warning.  The rest of the deployment continues.\n- `Skip` - Stops this with no error or warning. Logs an information message.  The rest of the deployment continues.\n\nThe default is `Warning`.",
-      "DefaultValue": "Warning",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Error|Error\nWarning|Warning\nSkip|Skip"
-      }
-    },
-    {
-      "Id": "04b2e549-888f-4a10-811c-f325690b3a80",
-      "Name": "ChildProject.Destination.EnvironmentName",
-      "Label": "Destination Environment Name",
-      "HelpText": "*Required*\n\nThe name of the destination environment.  \n\nExamples: `Development`, `Test`, or `Production`\n\n\nThe parent project and child project do *NOT* have to have the same lifecycle.  The only requirement is all the previous phases' requirements in the child project must be met.  For example, if the child project's life cycle is Dev->Test->Staging->Prod and the parent project lifecycle is Staging->Prod and you wish to deploy to staging, then the child project's release must go through Dev and Test first.",
-      "DefaultValue": "#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e439fdb3-0697-4ea1-8b2c-8e343bfaa5af",
-      "Name": "ChildProject.SourceEnvironment.Name",
-      "Label": "Source Environment Name",
-      "HelpText": "*Optional* \n\n\nThe name of the source environment.  When blank the source environment will be calculated using the channel's lifecycle.  \n\n\nExamples: `Development`, `Test`, or `Production`\n\n\n**Please Note:** The most recently created release will be selected when the destination environment is the first phase of the child project's lifecycle.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "789a658e-ee7f-4bf2-aaa3-cf1a998adf57",
-      "Name": "ChildProject.Channel.Name",
-      "Label": "Child Project Channel",
-      "HelpText": "*Optional* \n\n\nThe name of the channel in the child project tied to the release you wish to deploy.  If left blank it will look at the project's default channel.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d462feb8-1911-401c-8329-b7c9775ac4fd",
-      "Name": "ChildProject.Tenant.Name",
-      "Label": "Tenant Name",
-      "HelpText": "*Optional*\n\nThe name of the tenant you wish to deploy.",
-      "DefaultValue": "#{Octopus.Deployment.Tenant.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4f9b232a-43ce-484c-9b30-0d3b195ddb15",
-      "Name": "ChildProject.Prompted.Variables",
-      "Label": "Child Project Prompted Variables",
-      "HelpText": "*Optional*\n\n\nValues for any prompted variables for the release. Each new line represents a new variable. This will only work with string variable types, text, and sensitive values.\n\n\nUse the format Name::Value \n\n\nFor example:\n\n\n```\nPromptedVariableName::My Super Awesome Value\nOtherPromptedVariable::Other Super Awesome Value\n```",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "3149fde0-05dc-4582-ac85-8539220fc09b",
-      "Name": "ChildProject.DeploymentMode.Value",
-      "Label": "Deployment Mode",
-      "HelpText": "**Required**\n\nIndicates if the step template will promote a release from one environment to another, or it will redeploy an existing release.  \n\nOptions:\n- `Promote`: the step template will promote the release from one environment to another\n- `Redeploy`: the step template will take whatever the last release deployed to the target environment and redeploy it.  Useful when you are rebuilding a server.\n- `AlwaysLatest`: the step template will find the latest release available to the target environment and deploy it, regardless if it has already been deployed or not.\n\nDefault is `Promote`\n",
-      "DefaultValue": "Promote",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Promote|Promote\nRedeploy|Redeploy\nAlwaysLatest|AlwaysLatest"
-      }
-    },
-    {
-      "Id": "f231c791-d431-493f-8802-64adcb6a6de1",
-      "Name": "ChildProject.RefreshVariableSnapShots.Option",
-      "Label": "Refresh Variables Snapshots",
-      "HelpText": "Allows you to choose if/when variable snapshots will be refreshed.\n\n- `Yes`: Variable snapshot is refreshed when a change is detected\n- `No`: Never refresh the variable snapshot\n\nDefault is `No`.  Recommend configuring a prompted variable to control this option at deployment time.  When What If is set to `Yes` this will report a change has been made, but the snapshot refresh will not run.\n",
-      "DefaultValue": "No",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "No|No\nYes|Yes"
-      }
-    },
-    {
-      "Id": "6b587acb-7278-45ea-bda5-3bd8f4ecc211",
-      "Name": "ChildProject.Target.MachineNames",
-      "Label": "Specific Deployment Target",
-      "HelpText": "**Optional**\n\nA comma-separated list of deployment targets names or ids you want to deploy to.  If using an id, it must start with `Machines-`.\n\nPlease note: this step template will filter out any targets your child project cannot deploy to.  If you provide a list of 5 machines and the child project can only deploy to 3 of them, then the child project will get 3 machines sent to it.\n\nThis will overwrite the machines sent in via a deployment target trigger.\n\nDefaults `N/A`.  If you do want to use this parameter the recommendation is to use prompted variables where you pass in specific machine names.",
-      "DefaultValue": "N/A",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "02805228-fde7-4c1d-853f-acad7e819ba3",
-      "Name": "ChildProject.Deployment.IgnoreSpecificMachineMismatch",
-      "Label": "Ignore specific machine mismatch",
-      "HelpText": "When the parent project is deploying to specific machines and the child project isn't associated with those machines the step will ignore it.  \n\nExamples:\n- A deployment target trigger fires for a newly created machine.  Only 1 out of 5 child projects deploy to that newly created machine's roles.\n- A redeployment needs to occur, but only for a specific machine.  Only 2 out of the 4 child projects deploy to that specific machine's roles.    \n\nIn both those examples, the default behavior of this step template is to skip those child projects not tied to the machine's roles.  When the child project is invoked, the specific matching machines will be sent to the child project.\n\nSet to `Yes` to ignore the difference.  Default is `No`.  Warning, setting to `Yes` could result in a failed deployment.",
-      "DefaultValue": "No",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "No|No\nYes|Yes"
-      }
-    },
-    {
-      "Id": "aefc5d01-907c-47f6-a1d6-efaf97eefb6c",
-      "Name": "ChildProject.ReleaseNotes.SaveAsArtifact",
-      "Label": "Save release notes as artifact",
-      "HelpText": "This step will pull the release notes (or build information) from the child project and will save it to the output variable `ReleaseNotes`.\n\nThis option allows you to save those release notes as an artifact.  The default is `No`.",
-      "DefaultValue": "No",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "No|No\nYes|Yes"
-      }
-    },
-    {
-      "Id": "563136dd-b848-49f8-b9ef-57acc879dbc2",
-      "Name": "ChildProject.WhatIf.Value",
-      "Label": "What If",
-      "HelpText": "By default, this step will trigger a deployment.\n\n\nSetting this value to Yes will perform all the work up to triggering the deployment.  This is useful for approval steps, you can run this step (or set of steps) to get the list of child releases to deploy, and then verify them via a manual intervention.\n\n\nWhen this is set to `Yes` it will set an output variable `ReleaseToPromote`.",
-      "DefaultValue": "No",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-      }
-    },
-    {
-      "Id": "d1d42293-e6fc-425e-a81c-973cc81eaa1d",
-      "Name": "ChildProject.WaitForFinish.Value",
-      "Label": "Wait for finish",
-      "HelpText": "Set to `Yes` to avoid waiting for the deployment to finish.  Will only be used when *What If* is set to `No`.",
-      "DefaultValue": "Yes",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-      }
-    },
-    {
-      "Id": "52a65ba4-4ded-4f55-82e0-dc5a8c71a2f8",
-      "Name": "ChildProject.EnableEnhancedLogging.Value",
-      "Label": "Enable Enhanced Logging",
-      "HelpText": "Set to `Yes` to retrieve output of the child release while waiting for the deployment to finish. Will only be used when *What If* is set to `No` and *Wait for finish* is set to `Yes`.",
-      "DefaultValue": "No",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-      }
-    },
-    {
-      "Id": "fd04d6fc-cc78-4a4f-9373-e48c349c9b07",
-      "Name": "ChildProject.CancelDeployment.Seconds",
-      "Label": "Wait for Deployment",
-      "HelpText": "Amount of time, in seconds, to wait for the deployment to finish.  Default is 1800 seconds, or 30 minutes.",
-      "DefaultValue": "1800",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7c3e75d3-a91c-47a1-acaa-1c6ea9f0699d",
-      "Name": "ChildProject.Deployment.FutureTime",
-      "Label": "Scheduling",
-      "HelpText": "**Optional**\n\nSchedule the deployment for the future.  Please note, if this is set, the `Wait for Deployment` option is ignored.\n\nUses `DateTime.TryParse` to determine the value sent in.  Supported formats:\n\n- `7:00 PM` will deploy at 7:00 PM today\n- `21:00` will deploy at 21:00 hours or 9 PM today\n- `YYYY-MM-DD HH:mm:ss` or `2021-01-14 21:00:00` will deploy at 9 PM on the 14th of January, 2021\n- `YYYY/MM/DD HH:mm:ss` or `2021/03/20 22:00:00` will deploy at 10 PM on the 20th of March, 2021\n- `MM/DD/YYYY HH:mm:ss` or `06/25/2021 19:00:00` will deploy at 7 PM on the 25th of June, 2021\n- `DD MMM YYYY HH:mm:ss` or `01 Jan 2021 18:00:00` will deploy at 6 PM on the 1st of January, 2021\n\nUses the Octopus Server's Timezone.  The queue expiry time will be set to 1 hour from the supplied date.\n\nDefault is `N/A` or not applicable.  ",
-      "DefaultValue": "N/A",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5789f25c-6efb-4bbc-9236-2939faf7c553",
-      "Name": "ChildProject.ManualInterventions.UseApprovalsFromParent",
-      "Label": "Auto-Approve Child Project Manual Interventions",
-      "HelpText": "If the child project has manual interventions the step will look for manual interventions in the parent project.\n\nWhen a manual intervention in the parent project is found it will check that user's assigned teams.  If that user's assigned teams can approve the child project it will do so.\n\nPlease note, the user associated with the API key must be able to approve the child project manual interventions as well.  \n\nThe default is `Yes`, allow this to happen.  Set it to `No` to skip this functionality.",
-      "DefaultValue": "Yes",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "No|No\nYes|Yes"
-      }
-    },
-    {
-      "Id": "2a93a2e9-562f-4985-8933-acbf1b0e6df6",
-      "Name": "ChildProject.ManualIntervention.EnvironmentToUse",
-      "Label": "Approval Environment",
-      "HelpText": "*Optional*\n\nThe name of the environment you wish to pull the approvals from for the parent project.   It will look at all the deployments for the current release of the parent project and select the latest deployment to the specified environment.\n\nUsed when you are deploying to `Production` but want to pull the approvals from `Staging` or a `Prod Approval` environment.\n\nDefaults to the current environment name.",
-      "DefaultValue": "#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "11101484-c68a-4a8b-aa4d-3f0a31e36ae2",
-      "Name": "ChildProject.ManualIntervention.Tenant.Name",
-      "Label": "Approval Tenant",
-      "HelpText": "*Optional*\n\nThe name of the tenant you wish to pull the approvals from for the parent project.   It will look at all the deployments for the current release of the parent project and select the latest deployment to the specified environment.\n\nUsed when you are deploying to `Production` but want to pull the approvals from `Staging` or a `Prod Approval` environment.\n\nDefaults to the current tenant name.  Will be skipped when doing a non-tenanted deployment.",
-      "DefaultValue": "#{Octopus.Deployment.Tenant.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-11-17T03:06:39.613Z",
-    "OctopusVersion": "2023.2.13113",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "REOScotte",
-  "Category": "octopus"
-}
diff --git a/step-templates/determine-rolling-deploy-window-size.json b/step-templates/determine-rolling-deploy-window-size.json
deleted file mode 100644
index 743bb33c4..000000000
--- a/step-templates/determine-rolling-deploy-window-size.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "Id": "cb1b825e-d945-43e4-a572-d945654ca9cc",
-  "Name": "Determine Rolling Deploy Window Size",
-  "Description": "Determine Window Size for Rolling Deploy.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "#region Verify variables\n\n#No need to verify PerformRollingDeploy as this is a checkbox and will always have a boolean value. Report value back for logging.\nTry\n{\n  $performRollingDeploy = [System.Convert]::ToBoolean($OctopusParameters['DRDWSPerformRollingDeploy'])\n  Write-Host ('Perform Rolling Deploy: ' + $performRollingDeploy)\n}\nCatch\n{\n  Throw \"Cannot convert Perform Rolling Deploy: '\" + $OctopusParameters['DRDWSPerformRollingDeploy'] + \"' to boolean value. Try having the expression or variable evaluate to 'True' or 'False'.\"\n}\n\n#Verify ServerPercentageToDeploy can be converted to integer.\nIf ([string]::IsNullOrEmpty($OctopusParameters['DRDWSServerPercentageToDeploy']))\n{\n  Throw 'Server percentage to deploy cannot be null.'\n}\n\n[int]$serverPercentageToDeploy = 0\n[bool]$result = [int]::TryParse($OctopusParameters['DRDWSServerPercentageToDeploy'], [ref]$serverPercentageToDeploy)\n\nIf ($result)\n{\n  Write-Host ('Server percentage to deploy: ' + $serverPercentageToDeploy + '%')\n  $serverPercentToDisconnect = $serverPercentageToDeploy / 100\n}\nElse\n{\n  Throw \"Cannot convert Server percentage to deploy: '\" + $OctopusParameters['DRDWSServerPercentageToDeploy'] + \"' to integer.\"\n}\n\n#Verify ServerRole is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['DRDWSServerRole']))\n{\n  Throw 'Server Role for Rolling Deploy cannot be null.'\n}\n$role = $OctopusParameters['DRDWSServerRole']\nWrite-Host ('Server Role for Rolling Deploy: ' + $role)\n\n#endregion\n\n\n#region Process\n\n$serverCountToDeployTo = 9999\n\nIf ($performRollingDeploy)\n{\n  $servers = $OctopusParameters['Octopus.Environment.MachinesInRole[' + $role + ']']\n  $totalMachines = If ([string]::IsNullOrEmpty($servers)) { 0 } else { ($servers.Split(',')).Count }\n  $serverCountToDeployTo = [math]::Round(($totalMachines * $serverPercentToDisconnect))\n\n  Write-Host ('Total machines: ' + $totalMachines)\n\n  If ($serverCountToDeployTo -eq 0)\n  {\n    $serverCountToDeployTo++\n  }\n}\n\nWrite-Host ('Window Size: ' + $serverCountToDeployTo)\n\n#To use this value, set Window size value to: #{Octopus.Action[Determine Rolling Deploy Window Size].Output.WindowSize}\nSet-OctopusVariable -name \"WindowSize\" -value $serverCountToDeployTo\n\n#endregion\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "561333cc-14ea-44be-aca2-ccb06e0c582f",
-      "Name": "DRDWSPerformRollingDeploy",
-      "Label": "Perform Rolling Deploy?",
-      "HelpText": "If checkbox is unchecked, all servers will be deployed to.  \nNOTE: This can be set to use a variable or expression.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ecf32591-130c-41cb-b8f5-405e3b1c5d28",
-      "Name": "DRDWSServerPercentageToDeploy",
-      "Label": "Server percentage to deploy",
-      "HelpText": "Percentage of servers to perform rolling deploy on at a time. Enter as whole number.  \nExample for 25%: 25",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "bed9618f-6ede-4c6b-a4b1-a6f0d0a685d4",
-      "Name": "DRDWSServerRole",
-      "Label": "Server Role for Rolling Deploy",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "LastModifiedBy": "mcasperson",
-  "$Meta": {
-    "ExportedAt": "2023-08-15T07:55:04.446Z",
-    "OctopusVersion": "2023.3.11489",
-    "Type": "ActionTemplate"
-  },
-  "Category": "Octopus"
-}
diff --git a/step-templates/docker-install-windows.json b/step-templates/docker-install-windows.json
deleted file mode 100644
index a96c69134..000000000
--- a/step-templates/docker-install-windows.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "Id": "3f78a32f-d074-43cc-a009-793f72b204f3",
-  "Name": "Install Docker on Windows Server",
-  "Description": "Automates the steps from [here](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/set-up-environment?tabs=Windows-Server#install-docker).\n\nThis step reboots the machine.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Find-PackageProvider -Name 'Nuget' -ForceBootstrap -IncludeDependencies\n\n$DockerModule = Get-Module -ListAvailable -Name DockerMsftProvider \nif (-Not $DockerModule) {\n    Write-Host \"Installing DockerMsftProvider module\"\n    Install-Module -Name DockerMsftProvider -Repository PSGallery -Force\n} else {\n    Write-Host \"DockerMsftProvider module already installed\"\n}\n\ntry {\n\t$DockerPackage = Get-Package -Name docker\n} catch [Exception] {}\n\nif (-Not $DockerPackage) {\n    Write-Host \"Installing docker package\"\n    Install-Package -Name docker -ProviderName DockerMsftProvider -Force\n\n    Write-Host \"Restarting machine...\"\n    Restart-Computer -Force\n} else {\n    Write-Host \"docker package already installed\"\n}"
-  },
-  "Parameters": [],
-  "$Meta": {
-    "ExportedAt": "2020-05-19T03:10:21.233Z",
-    "OctopusVersion": "2020.2.4",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "MJRichardson",
-  "Category": "docker"
-}
\ No newline at end of file
diff --git a/step-templates/dsc-windows-service.json b/step-templates/dsc-windows-service.json
deleted file mode 100644
index db0c4606a..000000000
--- a/step-templates/dsc-windows-service.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "Id": "1cdf63ce-50c8-45a8-cce2-f6ca2d6d617b",
-  "Name": "DSC Windows Service",
-  "Description": "Starts/stops one or more services asynchronously, and then waits for them to align to the specified state",
-  "ActionType": "Octopus.Script",
-  "Version": 15,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "\n    $ServicesToManage = $OctopusParameters['Services']\n    $ServicesToIgnore = $OctopusParameters['ServicesToIgnore']\n    $TimeoutSeconds = $OctopusParameters['TimeoutSeconds']\n    $DesiredState = $OctopusParameters['DesiredState']\n\n    # Gather information about the list of services\n    $services_status = @{}\n\n    # For each \"service to manage\" or wildcard specified ...\n    $ServicesToManage -split \",\" |% `\n    {\n        $service = $_\n    \n        # ... retrieve all the services that match that name or wildcard ...\n        $service_states = Get-Service |? { $_.Name -match $service }\n    \n        # ... and add them into an array; we use a key/value array so that services only get added to the array once, even if they are\n        # matched by multiple wildcard specifications\n        $service_states |% { $services_status[$_.Name] = $_.Status }\n    }\n    \n    # For each \"service to ignore\" or wildcard specified ...\n    $ServicesToIgnore -split \",\" |% `\n    {\n        $service = $_\n        \n        # Copy the keys within services_status, since we will need to change services_status as we enumerate them\n        $keys = @()\n        $services_status.Keys |% { $keys += $_ }\n        \n        $keys |% `\n        {\n           $key = $_\n \n           if ($key -match $service -and $service -match \"[a-z]+\")\n           {\n                $services_status.Remove($_)\n           }\n        }\n    }\n\n    Write-Host \"Matched the following set of services, along with their current status:\"\n    $services_status\n\n    # Now act as required to bring the services to the desired configuration state\n    [DateTime]$startTime = [DateTime]::Now\n    \n    # State to pass to sc\n    $state_type = if ($DesiredState -match \"Stopped\") { \"stop\" } else { \"start\" }\n\n\t$unaligned_services = ($services_status.Keys |? { $services_status[$_] -notmatch $DesiredState })\n\t# Attempt to align the remaining services\n\t$unaligned_services |% `\n\t{ \n\t\tWrite-Host \"Attempting to $state_type service: $_\"\n\t\tStart-Process -FilePath \"cmd\" -ArgumentList \"/c sc.exe $state_type `\"$_`\"\"\n\t}\t\n   \n   while ($startTime.AddSeconds($TimeoutSeconds) -gt [DateTime]::Now)\n    {\n\t\t# Attempt to align the remaining services\n\t\t$unaligned_services |% `\n\t\t{ \n\t\t\tWrite-Host \"Attempting to $state_type service: $_\"\n\t\t\t$services_status[$_] = Get-Service $_ | Select-Object -Property \"Status\"\n\t\t}\t\n\t\t$unaligned_services = ($services_status.Keys |? { $services_status[$_] -notmatch $DesiredState })\n\t\tWrite-Host \"$([DateTime]::Now): $($unaligned_services.Count) services of $($services_status.Count) not yet at status: $DesiredState\"\n\t\t\n        if ($unaligned_services.Count -eq 0)\n        {\n            Write-Host \"All services now at desired state; exiting\"\n            exit 0\n        }\n\n          \n        # Pause for a second\n        [System.Threading.Thread]::Sleep(1000)\n    }\n\n    throw \"Error: not all services reached the desired state within the specified timeframe: $unaligned_services\"\n\n\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Services",
-      "Label": "Services to align",
-      "HelpText": "A comma delimited list of services or wildcards (eg. \"Sky\") to align",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ServicesToIgnore",
-      "Label": "Services to ignore",
-      "HelpText": "A comma delimited list of services or wildcards (eg. \"Sky\") to ignore",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "DesiredState",
-      "Label": "Desired state",
-      "HelpText": "The desired state of the service/s. Specify either \"Started\" or \"Stopped\"",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Running|Started\nStopped|Stopped"
-      }
-    },
-    {
-      "Name": "TimeoutSeconds",
-      "Label": "Timeout in seconds",
-      "HelpText": "The number of seconds to wait for the service/s to align before timing out and throwing an exception",
-      "DefaultValue": "300",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2017-06-20T14:00:00.000+00:00",
-  "LastModifiedBy": "dunedinsoftware",
-  "$Meta": {
-    "ExportedAt": "2017-06-20T14:35:09.389Z",
-    "OctopusVersion": "3.1.5",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/dyn-create-an-A-record.json b/step-templates/dyn-create-an-A-record.json
deleted file mode 100644
index eb2f038c1..000000000
--- a/step-templates/dyn-create-an-A-record.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "Id": "5e359c05-89a0-4a13-98a4-d54b0415bb45",
-  "Name": "Dyn - Create an A Record",
-  "Description": "Creates an A record in the specified zone with the specified details. \n\nNOTE: The API User MUST have the follow permissions:\n\t- UserLogin\n\t- UserChangepw\n\t- RecordAdd\n\t- RecordUpdate\n        - RecordGet\n\t- ZoneGet\n\t- ZoneAddNode\n\t- ZonePublish\n\t- ZoneChangeset\n",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#--------------------------------------------------------------------\r\n#Log In Variables\r\n\r\n$dynLogInURI = \"https://api.dynect.net/REST/Session/\"\r\n\r\n$dynCustomerName = $OctopusParameters[\"dynCustomerName\"] \r\n\r\n$dynUserName = $OctopusParameters[\"dynUserName\"] \r\n\r\n$dynPassword = $OctopusParameters[\"dynPassword\"] \r\n\r\n#--------------------------------------------------------------------\r\n#Get A Record Variables\r\n\r\n$dynARecordURI = \"https://api.dynect.net/REST/ARecord\"\r\n\r\n$dynZone = $OctopusParameters[\"dynZone\"]\r\n\r\n$dynFQDN = $OctopusParameters[\"dynFQDN\"] \r\n\r\n#--------------------------------------------------------------------\r\n#A Record information to check\r\n\r\n$createNewARecord = $FALSE\r\n\r\n$UpdateARecord = $FALSE\r\n\r\n$dynCorrectTTL = $OctopusParameters[\"dynCorrectTTL\"]\r\n\r\n$dynCorrectIPAddress = $OctopusParameters[\"dynCorrectIPAddress\"] \r\n\r\n\r\n#--------------------------------------------------------------------\r\n#Publish Zone Variables\r\n\r\n$dynPublishURI = \"https://api.dynect.net/REST/Zone\"\r\n\r\n$publishZone = $FALSE\r\n\r\n\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#Log In and Retrieve Token for this session\r\n\r\nWrite-Output \"Logging into Dyn and retrieving session Authentication Token.\"\r\n\r\n$dynCredentials = @{}\r\n\r\n$dynCredentials.Add(\"customer_name\", $dynCustomerName)\r\n$dynCredentials.Add(\"user_name\", $dynUserName)\r\n$dynCredentials.Add(\"password\", $dynPassword)\r\n\r\n$dynCredentialsJSON = ConvertTo-Json -InputObject $dynCredentials\r\n\r\n$dynLoginResults = Invoke-RestMethod -Uri $dynLogInURI -Body $dynCredentialsJSON -ContentType 'application/json' -Method Post\r\n\r\nif($dynLoginResults.status -ne \"success\")\r\n{\r\n    Write-Error \"Invalid Log In Details. Please try again.\" -ErrorId E4\r\n}\r\nelse\r\n{\r\n    Write-Output \"`nLog in was successful.\"\r\n}\r\n\r\n\r\n\r\n$dynSessionToken = @{}\r\n\r\n$dynSessionToken.Add(\"Auth-Token\", $dynLoginResults.data.token)\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#Get A Record \r\n\r\nWrite-Output \"Retrieving specified A record information.`n\"\r\n\r\n#get and search all records to get the correct record ID (not a unique id) for existing A Records\r\n#this is done to check if a A Record does not exist already. This is the only way to do it without getting an error.\r\n$dynAllRecordsURI = \"https://api.dynect.net/REST/AllRecord/$dynZone\"\r\n\r\n \r\n$dynAllRecordResults = Invoke-RestMethod -Uri $dynAllRecordsURI -Headers $dynSessionToken -ContentType 'application/json' -Method Get \r\n\r\nfor($i = 0; $i -lt $dynAllRecordResults.data.Length; $i++)\r\n{\r\n    \r\n    $a = $dynAllRecordResults.data.Get($i)\r\n\r\n    $result = $a.contains($dynFQDN)\r\n\r\n    if($result -eq $TRUE)\r\n    {\r\n        $dynARecordString = $dynAllRecordResults.data.Get($i)\r\n\r\n        $dynARecordExists = $TRUE\r\n\r\n        $i = $dynAllRecordResults.data.Length\r\n    }\r\n    else\r\n    {\r\n        $dynARecordExists = $FALSE\r\n    }\r\n}\r\n\r\n\r\n\r\n#checks to see if there is more than one A record with the same name.\r\nif($dynARecordExists -eq $TRUE)\r\n{\r\n    $dynARecordURI = \"$dynARecordURI/$dynZone/$dynFQDN\" \r\n \r\n    $dynARecordResults = Invoke-RestMethod -Uri $dynARecordURI -Headers $dynSessionToken -ContentType 'application/json' -Method Get \r\n\r\n    if($dynARecordResults.data.Length -gt 1)\r\n    {\r\n        Write-Error \"`nThere is more than one A record with the Fully Qualified Domain Name (FQDN) of $dynFQDN. `nThis script does not handle more than one A record witht the same FQDN\" -ErrorId E1\r\n    }\r\n\r\n    if($dynARecordResults.status -ne \"success\")\r\n    {\r\n        Write-Error \"Error occurred while trying to retrieve the A Record. Please check the host name and the Fully Qualified Domain Name are correct.\" -ErrorId E1\r\n    }\r\n}\r\n\r\n\r\n\r\n#Checks if the an A record was returned or needs to be created\r\nif(($dynARecordResults.data.Length -eq 0) -or ($dynARecordExists -eq $FALSE))\r\n{\r\n    $createNewARecord = $TRUE\r\n\r\n    Write-Warning \"$dynFQDN does not exists. Creating $dynFQDN now.\"\r\n}\r\nelse\r\n{\r\n    #get information for the specified record\r\n    $dynARecordString = $dynARecordResults.data\r\n\r\n    $dynARecordURI = \"https://api.dynect.net$dynARecordString/\"\r\n\r\n    $dynARecord = Invoke-RestMethod -Uri $dynARecordURI -Headers $dynSessionToken -ContentType 'application/json' -Method Get \r\n\r\n    $dynARecord = $dynARecord.data\r\n\r\n    Write-Output \"`n$dynFQDN has successfully been retrieved.\"\r\n    \r\n    Write-Output \"`n-------------------------`n\"\r\n\r\n}\r\n\r\n#--------------------------------------------------------------------\r\n#create new A record\r\n\r\nif($createNewARecord -eq $TRUE)\r\n{\r\n    $dynCreateURI = \"https://api.dynect.net/REST/ARecord/$dynZone/$dynFQDN\"   \r\n\r\n    $rData = @{}\r\n\r\n    $rData.Add(\"address\", $dynCorrectIPAddress)\r\n\r\n    $dynCreateARecord = @{}\r\n\r\n    $dynCreateARecord.Add(\"ttl\", $dynCorrectTTL)\r\n    $dynCreateARecord.Add(\"rdata\", $rData)\r\n\r\n    $dynCreateARecordJSON = ConvertTo-Json -InputObject $dynCreateARecord\r\n\r\n    $dynCreateResult = Invoke-RestMethod -Uri $dynCreateURI -ContentType 'application/json' -Headers $dynSessionToken -Body $dynCreateARecordJSON  -Method Post\r\n\r\n    if($dynCreateResult.status -ne \"success\")\r\n    {\r\n        Write-Error \"An error occurred while creating the new A Record. Please check the details that have been entered are correct and try again.\" -ErrorId E4\r\n\r\n    }\r\n    else\r\n    {\r\n        Write-Output \"$dynFQDN has successfully been added to the $dynZone zone in Dyn.\"\r\n\r\n        $publishZone = $TRUE\r\n    }\r\n\r\n    Write-Output \"`n-------------------------`n\"\r\n\r\n\r\n}\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#checking specified A Record to see if it is correct if it exists\r\nif($createNewARecord -eq $FALSE)\r\n{\r\n    Write-Output \"Checking to see if $dynFQDN is current and contains the correct information.\"\r\n\r\n    if($dynARecord.rdata.address -ne $dynCorrectIPAddress)\r\n    {\r\n        $UpdateARecord = $TRUE\r\n\r\n        Write-Warning \"`n$dynFQDN is out of date. Updating now\"\r\n\r\n    }\r\n\r\n    if($UpdateARecord -eq $FALSE)\r\n    {\r\n        Write-Output \"`n$dynFQDN is up-to-date\"\r\n    }\r\n\r\n    Write-Output \"`n-------------------------`n\"\r\n}\r\n#--------------------------------------------------------------------\r\n#Update A record\r\n\r\nif($UpdateARecord -eq $TRUE)\r\n{\r\n    Write-Output \"Updating $dynFQDN so that is matches the current information saved in the system.\"\r\n\r\n    $dynUpdateURI = $dynARecordURI\r\n\r\n    $rData = @{}\r\n\r\n    $rData.Add(\"address\", $dynCorrectIPAddress)\r\n\r\n    $dynUpdatedARecord = @{}\r\n\r\n    \r\n    $dynUpdatedARecord.Add(\"ttl\", $dynCorrectTTL)\r\n    $dynUpdatedARecord.Add(\"rdata\", $rData)\r\n\r\n    $dynUpdatedARecord = ConvertTo-Json -InputObject $dynUpdatedARecord\r\n\r\n    $dynUpdateResult = Invoke-RestMethod -Uri $dynUpdateURI -ContentType 'application/json' -Headers $dynSessionToken -Body $dynUpdatedARecord -Method Put\r\n    \r\n    if($dynUpdateResult.status -ne \"success\")\r\n    {\r\n        Write-Error \"An error occured while trying to update the $dynFQDN record\"\r\n    }\r\n    else\r\n    {\r\n        Write-Output \"`nUpdate was successful. Just needs to be published to make it offical.\"\r\n        \r\n        $publishZone = $TRUE\r\n\r\n    }\r\n\r\n\r\n    Write-Output \"`n-------------------------`n\"\r\n\r\n}\r\n\r\n#--------------------------------------------------------------------\r\n#publish update or creation of A Record\r\n\r\nif($publishZone -eq $TRUE)\r\n{\r\n\r\n    Write-Output \"Publishing changes made to $dynZone\"\r\n\r\n    $publish = @{}\r\n    $publish.Add(\"publish\", 'true')\r\n\r\n    $publish = ConvertTo-Json -InputObject $publish\r\n\r\n    $dynPublishURI = \"$dynPublishURI/$dynZone/\"\r\n\r\n    $dynPublishResults = Invoke-RestMethod -Uri $dynPublishURI -ContentType 'application/json' -Headers $dynSessionToken -Body $publish -Method Put\r\n\r\n    if($dynPublishResults.status -ne \"success\")\r\n    {\r\n        Write-Error \"An error occurred during the publication of the $dynZone zone.\" -ErrorId E4\r\n    }\r\n    else\r\n    {\r\n        Write-Output \"`n$dynZone has successfully been published.\"\r\n    }\r\n\r\n        Write-Output \"`n-------------------------`n\"\r\n\r\n}\r\n\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#Log Out of session\r\n\r\nWrite-Output \"Logging out and deleting this session's authentication token\"\r\n\r\n$dynLogOutResults = Invoke-RestMethod -Uri $dynLogInURI -ContentType 'application/json' -Headers $dynSessionToken -Method Delete\r\n\r\nWhile(($dynLogOutResults.status -ne \"success\") -and ($tries -lt 10))\r\n{\r\n    Write-Output \"`nWaiting to log out of Dyn\"\r\n    $tries++\r\n    Start-Sleep -Seconds 1\r\n}\r\n\r\nif($dynLogOutResults.status -eq \"success\")\r\n{\r\n    $dynSessionToken.Clear()\r\n    Write-Output $dynSessionToken\r\n    Write-Output \"`nThis session has been ended successfully and the authentication token has been deleted.\"\r\n    \r\n}\r\nelse\r\n{\r\n    Write-Error \"`nAn error occurred while logging out.\" -ErrorId E4\r\n}\r\n\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "dynCustomerName",
-      "Label": "Dyn Customer Name",
-      "HelpText": "The Dyn customer name,  usually the company name",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "dynUserName",
-      "Label": "Dyn User Name",
-      "HelpText": "User Name of the user that will perform this step\n\nNOTE: The API User MUST have the follow permissions:\n\t- UserLogin\n\t- UserChangepw\n\t- RecordAdd\n\t- RecordUpdate\n        - RecordGet\n\t- ZoneGet\n\t- ZoneAddNode\n\t- ZonePublish\n\t- ZoneChangeset",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "dynPassword",
-      "Label": "Password",
-      "HelpText": "Password of the user to access Dyn",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "dynZone",
-      "Label": "Dyn Zone",
-      "HelpText": "The name of the Zone, where you want the A record to be created\n\nFor example: myzone.com",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "dynFQDN",
-      "Label": "Fully Qualified Domain Name",
-      "HelpText": "The name of the A record that is being created in Fully Qualified Domain Name format\n\nFor example: newrecord.myzone.com",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "dynCorrectTTL",
-      "Label": "Time to Live",
-      "HelpText": "Limits the lifespan or lifetime of data in a computer network",
-      "DefaultValue": "0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "dynCorrectIPAddress",
-      "Label": "IPv4 Address",
-      "HelpText": "The IPv4 address of the new A record",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-26T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-27T06:25:11.275+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "dyn"
-}
\ No newline at end of file
diff --git a/step-templates/edgecast-cdn-purge.json b/step-templates/edgecast-cdn-purge.json
deleted file mode 100644
index 9a1fedc0e..000000000
--- a/step-templates/edgecast-cdn-purge.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "d97ff2d4-250a-4a1a-bd5e-36644893888c",
-  "Name": "Clear EdgeCast CDN Cache",
-  "Description": "This step will clear (purge) the EdgeCast CDN Cache",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Clear-EdgeCastCache\n{\n    [CmdletBinding()]\n    Param\n    (\n        # CDN Account number, can be found in MCC\n        [Parameter(Mandatory=$true)]\n        $AccountNumber,\n\n        # API Token\n        [Parameter(Mandatory=$true)]\n        [string]$ApiToken,\n\n         # A string that indicates the CDN or edge CNAME URL for the asset or the location that will be purged from our edge servers. Make sure to include the proper protocol (i.e., http:// or rtmp://).\n        [Parameter(Mandatory=$true)]\n        [string]\n        $MediaPath,\n\n        #An integer that indicates the service for which an asset will be purged. It should be replaced with the ID associated with the desired service., default is 3. HTTP Large\n        [ValidateSet(2,3,8,14)]\n        [int]\n        $MediaType=3\n    )\n\n    Begin\n    {\n        $uri = \"https://api.edgecast.com/v2/mcc/customers/$AccountNumber/edge/purge\"\n\n        $headers = @{\n            'Authorization' = \"tok:\" + $ApiToken\n            'Accept' = 'Application/JSON'\n            'Content-Type' = 'Application/JSON'\n            }\n        $RequestParameters = @{\n            'MediaPath'=$MediaPath\n            'MediaType'=$MediaType\n        }\n\n        $body = ConvertTo-Json $RequestParameters\n\n    }\n    Process\n    {\n        Write-Verbose \"Request body $body\"\n    \t$request = Invoke-RestMethod -Method PUT -Uri $uri -Headers $headers -Body $body -DisableKeepAlive\n        $request\n\n    }\n    End\n    {\n    }\n}\n\nClear-EdgeCastCache -AccountNumber $AccountNumber -ApiToken $ApiToken -MediaPath $MediaPath -MediaType $MediaType -Verbose\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "AccountNumber",
-      "Label": null,
-      "HelpText": "CDN Account number, can be found in MCC",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApiToken",
-      "Label": null,
-      "HelpText": "API token for accessing the EdgeCast API for the account",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "MediaPath",
-      "Label": null,
-      "HelpText": "A string that indicates the CDN or edge CNAME URL for the asset or the location that will be purged from our edge servers. Make sure to include the proper protocol (i.e., http:// or rtmp://).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "MediaType",
-      "Label": "MediaType",
-      "HelpText": "An integer that indicates the service for which an asset will be purged. It should be replaced with the ID associated with the desired service., default is 3. HTTP Large",
-      "DefaultValue": "3",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-02-20T13:45:59.125+00:00",
-  "LastModifiedBy": "yooakim",
-  "$Meta": {
-    "ExportedAt": "2015-02-20T16:10:46.008+00:00",
-    "OctopusVersion": "2.6.2.845",
-    "Type": "ActionTemplate"
-  },
-  "Category": "edgecast"
-}
\ No newline at end of file
diff --git a/step-templates/epplus-register-dll-gac.json b/step-templates/epplus-register-dll-gac.json
deleted file mode 100644
index 123166059..000000000
--- a/step-templates/epplus-register-dll-gac.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "Id": "137d2be3-a329-4c65-bde9-0c062f056889",
-    "Name": "Register EPPlus DLL in the GAC",
-    "Description": "This script registers EPPlus dll to the GAC",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::Load(\"System.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\")\n\nfunction Expand-ZIPFile($file, $destination)\n{\n    $shell = new-object -com shell.application\n    $zip = $shell.NameSpace($file)\n    foreach($item in $zip.items())\n    {\n        $shell.Namespace($destination).copyhere($item)\n    }\n}\n\n$TempFolder = \"\\TempNupkg\"\n$ExpandedFolder = \"\\expanded\"\n\n$FileDestinationPath = $RegisteringDllFolderPath + \"\\\" + $DllName \n$FileSourcePath = $RegisteringDllFolderPath + $TempFolder + $ExpandedFolder + $DllPathInExpanded + \"\\\" + $DllName\n\n$TempPath = $RegisteringDllFolderPath + $TempFolder\n$NupkgPath = $RegisteringDllFolderPath + $TempFolder + \"\\temp.zip\"\n$ExpandedTempPath = $RegisteringDllFolderPath + $TempFolder + $ExpandedFolder\n\n$DllUrl = \"https://www.nuget.org/api/v2/package/\"+ $PackageName +\"/\" + $PackageVersion\n\nif (!(Test-Path $ExpandedTempPath -PathType Container)) {\n    New-Item -ItemType Directory -Force -Path $ExpandedTempPath\n}\n\nWrite-Host \"Allow SecurityProtocol TLS, TLS 1.1 and TLS 1.2 ...\"\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12\nWrite-Host \"Dowloading package ...\"\nInvoke-WebRequest -Uri $DllUrl -OutFile $NupkgPath\n\nWrite-Host \"Expanding Archive ...\"\nExpand-ZIPFile –File $NupkgPath –Destination $ExpandedTempPath\n\nWrite-Host \"Copying to destination folder ...\"\nCopy-Item $FileSourcePath -Destination $FileDestinationPath\n\nRemove-Item -Recurse -Force $TempPath\nWrite-Host \"Deleteing temp folders ...\"\n\nWrite-Host \"Library Found\"\n\n#Note that you should be running PowerShell as an Administrator\nWrite-Host \"Installing to GAC ...\"\n$publish = New-Object System.EnterpriseServices.Internal.Publish\n$publish.GacInstall($fileDestinationPath)\nWrite-Host \"Installed to GAC\""
-    },
-    "Parameters": [
-      {
-        "Id": "5ee60108-20e4-4010-95cc-c13eb40c618f",
-        "Name": "RegisteringDllFolderPath",
-        "Label": "Path of the registering dll",
-        "HelpText": null,
-        "DefaultValue": "C:\\dll",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "4817d840-5b87-4d8b-bdac-53711f093ae4",
-        "Name": "DllPathInExpanded",
-        "Label": "Regintering dll path inside NuGet archive",
-        "HelpText": null,
-        "DefaultValue": "\\lib\\net40",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c5e7cff7-e67d-48a4-adb6-6019d06ba249",
-        "Name": "DllName",
-        "Label": "Dll file name",
-        "HelpText": null,
-        "DefaultValue": "EPPlus.dll",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c326490c-ea29-4b2b-99e7-37027233bd06",
-        "Name": "PackageName",
-        "Label": "NuGet gallery package name",
-        "HelpText": null,
-        "DefaultValue": "EPPlus",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ea04aa17-5fea-4e06-82e8-d344c797547c",
-        "Name": "PackageVersion",
-        "Label": "Registering dll version",
-        "HelpText": null,
-        "DefaultValue": "4.1.0.0",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedBy": "fabiozanella",
-    "$Meta": {
-        "ExportedAt": "2020-11-03T09:07:40.202Z",
-        "OctopusVersion": "2020.4.5",
-        "Type": "ActionTemplate"
-      },
-    "Category": "dll"    
-  }
diff --git a/step-templates/f5-enable-disable-multiple-pools.json b/step-templates/f5-enable-disable-multiple-pools.json
deleted file mode 100644
index 1310c2aeb..000000000
--- a/step-templates/f5-enable-disable-multiple-pools.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "Id": "b3d76f46-e074-47ff-b800-3020c3f47866",
-  "Name": "F5 - Enable or Disable Multiple Pools",
-  "Description": "F5 - Enable, Disable, or Force Offline multiple pools with optional wait for connections to drop",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "#region Verify variables\n\n#Verify RunCondition can be converted to boolean.\n$runCondition = $false\nIf ([string]::IsNullOrEmpty($OctopusParameters['RunCondition'])){\n    Throw \"Run Condition cannot be null.\"\n}\nElse{\n    Try{\n        $runCondition = [System.Convert]::ToBoolean($OctopusParameters['RunCondition'])\n        Write-Host (\"Run Condition: '\" + $OctopusParameters['RunCondition'] + \"' converts to boolean: \" + $runCondition + \".\")\n\n        #If run condition evaluates to false, just return/stop processing.\n        If (!$runCondition){\n            Write-Host \"Skipping step.\"\n            return\n        }\n    }\n    Catch{\n        Throw \"Cannot convert Run Condition: '\" + $OctopusParameters['RunCondition'] + \"' to boolean value.\"\n    }\n}\n\n#No need to verify WaitForConnections as this is a checkbox and will always have a boolean value. Report value back for logging.\nWrite-Host (\"Wait for connections to drop to 0: \" + $OctopusParameters['WaitForConnections'])\n\n#Verify MaxWaitTime can be converted to integer.\nIf ([string]::IsNullOrEmpty($OctopusParameters['MaxWaitTime'])){\n    Throw \"Maximum wait time in seconds cannot be null.\"\n}\n\n[int]$maxWaitTime = 0\n[bool]$result = [int]::TryParse($OctopusParameters['MaxWaitTime'], [ref]$maxWaitTime )\n\nIf ($result){\n    Write-Host (\"Maximum wait time in seconds: \" + $maxWaitTime)\n}\nElse{\n    Throw \"Cannot convert Maximum wait time in seconds: '\" + $OctopusParameters['MaxWaitTime'] + \"' to integer.\"\n}\n\n#No need to verify LtmStatus as this is a drop down box and will always have a value. Report back for logging.\nWrite-Host (\"LTM Status: \" + $OctopusParameters['LtmStatus'])\n\n<#\nVerify List of LTM info.\nLTM Info should contain a list of all Pools, IPs, and Ports. Each set should be delmited by carriage returns, each valude delimited by pipe (|).\nHere is an example:\nPool_192.168.103.226_443|192.168.103.174|443 \nPool_192.168.103.226_80|192.168.103.174|80\n#>\nIf ([string]::IsNullOrEmpty($OctopusParameters['LtmInfo'])){\n    Throw \"List of LTM info cannot be null.\"\n}\n#Write out LTM info. If the project is using variables (and it most likely is), it may be difficult to debug without seeing what it evaluated to.\nWrite-Host (\"List of LTM info: \" + [Environment]::NewLine + $OctopusParameters['LtmInfo'])\n$f5Pools = ($OctopusParameters['LtmInfo']).Split([Environment]::NewLine)\nForeach ($f5Pool in $f5Pools){\n    #Validate 3 values are passed in per line.\n    $poolInfo = $f5Pool.Split(\"|\")\n    If ($poolInfo.Count -ne 3){\n        Throw (\"Invalid pool info. Expecting 'PoolName|IpAddress|Port': '\" + $f5Pool + \"'.\")\n    }\n    \n    #Validate that each value is not null.\n    Foreach ($f5Parm in $poolInfo){\n        If ([string]::IsNullOrEmpty($f5Parm)){\n            Throw (\"Invalid pool info. Expecting 'PoolName|IpAddress|Port': '\" + $f5Pool + \"'. None can be empty.\")\n        }\n    }\n    \n    #Validate IP Address (second value).\n    If ( !($poolInfo[1] -as [ipaddress]) ){\n        Throw (\"Invalid IP Address: '\" + $poolInfo[1] + \"'.\")\n    }\n\n    #Validate Port (third value).\n    [int]$port = 0\n    [bool]$result = [int]::TryParse($poolInfo[2], [ref]$port )\n    \n    If ( !($result) ){\n        Throw (\"Invalid port (expecting integer): '\" + $poolInfo[2] + \"'.\")\n    }\n}\n\n#Verify HostName is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['HostName'])){\n    Throw \"LTM Host name cannot be null.\"\n}\nWrite-Host (\"LTM Host: \" + $OctopusParameters['HostName'])\n\n#Verify Username is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['Username'])){\n    Throw \"LTM username cannot be null.\"\n}\nWrite-Host (\"Username: \" + $OctopusParameters['Username'])\n\n#Verify Password is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['Password'])){\n    Throw \"LTM password cannot be null.\"\n}\n\n#Verify ConnectionCount can be converted to integer.\nIf ([string]::IsNullOrEmpty($OctopusParameters['ConnectionCount'])){\n    Throw \"Kill connections when less than or equal to cannot be null.\"\n}\n\n[int]$killConnectionWhenLE = 0\n[bool]$result = [int]::TryParse($OctopusParameters['ConnectionCount'], [ref]$killConnectionWhenLE )\n\nIf ($result){\n    Write-Host (\"Kill connections when less than or equal to: \" + $killConnectionWhenLE)\n}\nElse{\n    Throw \"Cannot convert Kill connections when less than or equal to: '\" + $OctopusParameters['ConnectionCount'] + \"' to integer.\"\n}\n\n#endregion\n\n#region Functions\n\nFunction Set-F5PoolState{\n    param(\n        $f5Pools,\n        [switch]$forceOffline\n    )\n    \n    Foreach ($f5Pool in $f5Pools){\n        $poolInfo = $f5Pool.Split(\"|\")\n        \n        $poolName = $poolInfo[0]\n        $ipAddress = $poolInfo[1]\n        $port = $poolInfo[2]\n        \n        $member = ($ipAddress + \":\" + $port)\n        \n        $state = $OctopusParameters['LtmStatus']\n        If ($forceOffline){\n            $state = \"Offline\"\n        }\n        \n        Write-Host \"Setting '$ipAddress' to '$state' in '$poolName' pool.\"\n        Set-F5.LTMPoolMemberState -Pool $poolName -Member $member -state $state\n    }\n}\n\nFunction Wait-ConnectionCount(){\n    param(\n        $f5Pools,\n        [int]$maxWaitTime,\n        [int]$connectionCount\n    )\n    \n    #Start stop watch now.\n    $elapsed = [System.Diagnostics.Stopwatch]::StartNew()\n    \n    Foreach ($f5Pool in $f5Pools){\n        $poolInfo = $f5Pool.Split(\"|\")\n        \n        $poolName = $poolInfo[0]\n        $ipAddress = $poolInfo[1]\n        $port = $poolInfo[2]\n        \n        $MemberDef = New-Object -TypeName iControl.CommonIPPortDefinition\n        $MemberDef.address = $ipAddress\n        $MemberDef.port = $port\n        $MemberDefAofA = New-Object -TypeName \"iControl.CommonIPPortDefinition[][]\" 1,1\n        $MemberDefAofA[0][0] = $MemberDef\n        $cur_connections = 100\n        \n        Write-Host (\"Pool name: \" + $poolName)\n        Write-Host (\"IP Address: \" + $ipAddress)\n        Write-Host (\"Port: \" + $port)\n\n        While ($cur_connections -gt $connectionCount -and $elapsed.ElapsedMilliseconds -lt ($maxWaitTime * 1000)){\n            $MemberStatisticsA = (Get-F5.iControl).LocalLBPoolMember.get_statistics( (, $poolName), $MemberDefAofA)\n            $MemberStatisticEntry = $MemberStatisticsA[0].statistics[0]\n            $Statistics = $MemberStatisticEntry.statistics\n            \n            Foreach ($Statistic in $Statistics){\n                $type = $Statistic.type;\n                $value = $Statistic.value;\n                If ( $type -eq \"STATISTIC_SERVER_SIDE_CURRENT_CONNECTIONS\" ){\n                    #Just use the low value.  Odds are there aren't over 2^32 current connections. If your site is this big, you'll have to convert this to a 64 bit number.\n                    $cur_connections = $value.low; \n                    Write-Host \"Current Connections: $cur_connections\"\n                }\n            }\n            \n            If ($cur_connections -gt $connectionCount -and $elapsed.ElapsedMilliseconds -lt ($maxWaitTime * 1000)){\n                Start-Sleep -Seconds 5\n            }\n        }\n    }\n}\n\n#endregion\n\n#region Process\n\n#Load the F5 powershell iControl snapin\nAdd-PSSnapin iControlSnapin\nInitialize-F5.iControl -HostName $OctopusParameters['HostName'] -Username $OctopusParameters['Username'] -Password $OctopusParameters['Password']\n\nSet-F5PoolState -f5Pools $f5Pools\n\nIf (($OctopusParameters['LtmStatus'] -ne \"Enabled\") -and ($OctopusParameters['WaitForConnections'] -eq \"True\"))\n{\n    Write-Host \"Waiting for connections to drain before deploying.  This could take a while...\"\n    Wait-ConnectionCount -f5Pools $f5Pools -maxWaitTime $maxWaitTime -connectionCount $killConnectionWhenLE\n    \n    #We have now waited the desired amount, go ahead and force offline and move on with deployment.\n    Set-F5PoolState -f5Pools $f5Pools -forceOffline\n}\n\n\n#endregion\n\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "83c45726-806c-4d06-8ae3-22b13b89d5a7",
-      "Name": "RunCondition",
-      "Label": "Run Condition",
-      "HelpText": "Boolean value or expression that determines if this step should run.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fb610f88-0d64-40cf-a74d-0bb8405755c8",
-      "Name": "WaitForConnections",
-      "Label": "Wait for connections to drop to 0?",
-      "HelpText": "If checked, the deployment won't continue until current connections on the node = 0",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "af92387f-ba2d-4b44-a8f1-7ebccf01032a",
-      "Name": "MaxWaitTime",
-      "Label": "Maximum wait time in seconds",
-      "HelpText": "Maximum wait time (in seconds) before killing connections and moving on.",
-      "DefaultValue": "300",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d8c955b3-6c75-49cf-9396-25dc0fffb611",
-      "Name": "LtmStatus",
-      "Label": "LTM Status",
-      "HelpText": "State member will be put into (Enabled, Disabled, Offline)  \n\n- **Disabled** continues to process persistent and active connections. It can accept new connections only if the connections belong to an existing persistence session.  \n\n- **Offline** allows existing connections to time out, but no new connections are allowed.",
-      "DefaultValue": "Disabled",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Enabled|Enable\nDisabled|Disable\nOffline|Forced Offline"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "57b114a3-fa6a-40d6-9c42-38ba80127fca",
-      "Name": "LtmInfo",
-      "Label": "List of LTM info",
-      "HelpText": "Enter list of all Pools, IPs, and Ports. Each set delimited by carriage returns, each value delimited by pipe (|). Here is an example:\n\nPool\\_192.168.103.226\\_443|192.168.103.174|443  \nPool\\_192.168.103.226\\_80|192.168.103.174|80",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3fdbf9bc-9ee8-4610-9c34-24f1975cf8c7",
-      "Name": "HostName",
-      "Label": "LTM Host name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "61480ba0-f715-46ef-b5ad-1c6b6f580273",
-      "Name": "ConnectionCount",
-      "Label": "Kill connections when less than or equal to",
-      "HelpText": "The default is to wait until there are no connections left on the node.  If you don't want to wait for zero connections before deploying, you can put a value here and when that number of connections is reached the deployment will happen killing the rest of the connected sessions.",
-      "DefaultValue": "0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d0f276b6-ce27-4006-b3c2-00c669bfc42d",
-      "Name": "Username",
-      "Label": "LTM username",
-      "HelpText": "Credential used to access F5 Soap API",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "921b6a08-0ffe-4945-91c3-8520a3052ce9",
-      "Name": "Password",
-      "Label": "LTM password",
-      "HelpText": "Credential used to access F5 Soap API",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "tbrasch",
-  "$Meta": {
-    "ExportedAt": "2017-06-02T14:54:52.840Z",
-    "OctopusVersion": "3.13.6",
-    "Type": "ActionTemplate"
-  },
-  "Category": "F5"
-}
-
-
diff --git a/step-templates/file-system-add-hosts-entry.json b/step-templates/file-system-add-hosts-entry.json
deleted file mode 100644
index fa2e5a153..000000000
--- a/step-templates/file-system-add-hosts-entry.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Id": "0ad0ad00-adad-adad-adad-000000000001",
-  "Name": "File System - Add entry to hosts file",
-  "Description": "Adds an entry to etc/hosts file with the specified host name and optional ip address",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nParam(\n    [string] $AD_AddHostsEntry_HostName,\n    [string] $AD_AddHostsEntry_IpAddress = \"127.0.0.1\",\n    [Int16] $AD_AddHostsEntry_Attempts = 5,\n    [switch] $WhatIf\n)\n\n$ErrorActionPreference = \"Stop\"\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($null -ne $OctopusParameters) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($null -eq $result) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($null -ne $variable) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($null -eq $result) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n        else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Execute(\n    [Parameter(Mandatory = $true)][string] $HostName,\n    [Parameter(Mandatory = $false)][string] $IpAddress = \"127.0.0.1\",\n    [Parameter(Mandatory = $false)][Int16] $Attempts = 5\n) {\n    $attemptCount = 0\n    $operationIncomplete = $true\n    $maxFailures = $Attempts\n    $sleepBetweenFailures = 1\n\n    $hostsFile = \"$($env:windir)\\system32\\Drivers\\etc\\hosts\"\n    $entry = \"$IpAddress $HostName\"\n    $regexMatch = \"^\\s*$IpAddress\\s+$HostName\"\n    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {\n        $attemptCount = ($attemptCount + 1)\n        if ($attemptCount -ge 2) {\n            Write-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\n            Start-Sleep -s $sleepBetweenFailures\n            Write-Output \"Retrying...\"\n            $sleepBetweenFailures = ($sleepBetweenFailures * 2)\n        }\n        try {\n            $matchingEntries = @(Get-Content $hostsFile) -match ($regexMatch)\n            if (-Not $matchingEntries) {\n                Write-Output \"Entry '$entry' doesn't exist - ADDING...\"\n                if (-Not ($WhatIf)) {\n                    $formattedEntry = [environment]::newline + $entry\n                    [System.IO.File]::AppendAllText($hostsFile, $formattedEntry)\n                }\n                Write-Output \"Entry '$entry' - ADDED\"\n            }\n            else {\n                Write-Output \"Entry '$entry' already exists - SKIPPING\"\n            }\n            $operationIncomplete = $false\n        }\n        catch [System.Exception] {\n            if ($attemptCount -lt ($maxFailures)) {\n                Write-Host (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\n            }\n            else {\n                throw\n            }\n        }\n    }\n}\n& Execute `\n(Get-Param 'AD_AddHostsEntry_HostName' -Required)`\n(Get-Param 'AD_AddHostsEntry_IpAddress')`\n(Get-Param 'AD_AddHostsEntry_Attempts')\n"
-  },
-  "Parameters": [
-    {
-      "Name": "AD_AddHostsEntry_HostName",
-      "Label": "Host name",
-      "HelpText": "The host name",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddHostsEntry_IpAddress",
-      "Label": "IP address",
-      "HelpText": "The optional IP address",
-      "DefaultValue": "127.0.0.1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddHostsEntry_Attempts",
-      "Label": "Nr of attempts",
-      "HelpText": "Optional number of attempts before failing",
-      "DefaultValue": "5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "anatolie-darii",
-  "$Meta": {
-    "ExportedAt": "2018-07-16T12:37:14.428Z",
-    "OctopusVersion": "2018.2.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
diff --git a/step-templates/file-system-check-disk-space.json b/step-templates/file-system-check-disk-space.json
deleted file mode 100644
index d164aba21..000000000
--- a/step-templates/file-system-check-disk-space.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "Id": "e74ff6a3-65ce-4a3a-8cbd-2224653af3a2",
-  "Name": "File System - Check Disk Space",
-  "Description": "Checks all or specified fixed drives for free space, either as an absolute number (GB) or relative (%).\nIf the available disk space does not meet the minimum requirements, as set in the parameters, as error is thrown.\n\nAuthor: Jim (Dimitrios) Andrakakis, [dandraka.com](https://dandraka.com)",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "\n# Jim (Dimitrios) Andrakakis\n# dandraka.com\n# December 2020\n\nparam([int]$pSpaceGB = $fschkSpaceGB, \n\t[int]$pSpacePercent = $fschkSpacePercent, \n    [string]$pDrives = $fschkDrives)\n\n# ================= PARAMETERS, CONSTANTS ETC =================\n\n$ErrorActionPreference = \"Stop\"\nClear-Host\n\n$win32_logicaldisk_LocalDiskDriveType = 3\n\nWrite-Host \"Parameters: SpaceGB '$pSpaceGB'\"\nWrite-Host \"Parameters: SpacePercent '$pSpacePercent'\"\nWrite-Host \"Parameters: Drives '$pDrives'\"\n\n[bool]$checkSpaceAbsolute = $false\n[bool]$checkSpacePercent = $false\n[bool]$checkAllDrives = $true\n$driveList = New-Object System.Collections.ArrayList\n\n# ================= SANITY CHECKS =================\n\n$allDrives = get-wmiobject -class win32_logicaldisk | Where-Object { $_.DriveType -eq $win32_logicaldisk_LocalDiskDriveType } \nWrite-Host \"Drives found in the system: $($allDrives | ForEach-Object { $_.DeviceID })\"\n\nif ($pSpaceGB -gt 0) {\n    $checkSpaceAbsolute = $true\n    Write-Host \"Will check that space > $pSpaceGB\"\n}\n\nif ($pSpacePercent -gt 0) {\n    $checkSpacePercent = $true\n    Write-Host \"Will check that space > $pSpacePercent %\"\n}\n\nif ((-not $checkSpaceAbsolute) -and (-not $checkSpacePercent)) {\n    Write-Error \"Neither Space(GB) nor Space(%) check was specified. Please specify at least one.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($pDrives)) {\n    foreach($d in $allDrives) { $driveList.Add($d) | Out-Null }\n    Write-Host \"Will check all fixed drives $($driveList | ForEach-Object { $_.DeviceID + \" \" })\"\n}\nelse {\n    $checkAllDrives = $false\n    foreach($d in $allDrives) { if ($pDrives.Contains($d.DeviceID)) { $driveList.Add($d) | Out-Null | Out-Null } }\n    Write-Host \"Will check fixed drives $($driveList | ForEach-Object { $_.DeviceID + \" \" })\"\n}\n\nif ($driveList.Count -eq 0) {\n    Write-Error \"No drives were found or, most likely, the drive list parameter does not contain any of the existing drives.\"\n}\n\n# ================= RUN CHECKS =================\nforeach($d in $driveList) {\n    $driveDescr = \"$($d.DeviceID) [$($d.VolumeName)]\"\n    $pDrivespaceGBFree = [Math]::Round(($d.FreeSpace / [Math]::Pow(1024,3)), 1)\n    $pDrivespaceGBTotal = [Math]::Round(($d.Size / [Math]::Pow(1024,3)), 1)\n    $pDrivespacePercentFree = [Math]::Round($pDrivespaceGBFree / $pDrivespaceGBTotal,1) * 100\n    Write-Host \"Drive $driveDescr : Free $pDrivespaceGBFree GB ($pDrivespacePercentFree%), Total $pDrivespaceGBTotal GB\"\n\n    if ($checkSpaceAbsolute) {\n        if ($pDrivespaceGBFree -lt $pSpaceGB) { \n            Write-Error \"Drive $driveDescr has less than the required space ($pSpaceGB GB)\"\n        }\n    }\n    if ($checkSpacePercent) {\n        if ($pDrivespacePercentFree -lt $pSpacePercent) { \n            Write-Error \"Drive $driveDescr has less than the required space ($pSpacePercent %)\"\n        }\n    }\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "640be7e1-aa4f-4cc8-b01c-4fe6ef1a3757",
-      "Name": "fschkSpaceGB",
-      "Label": "Required Disk Space (GB)",
-      "HelpText": "Number, integer.\nThe minimum required space in GB.\nZero means do not check GB.\nExample: 2\nwhich means 2GB.",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0d28eda8-4fd0-47c5-8faf-6d1bd27a7247",
-      "Name": "fschkSpacePercent",
-      "Label": "Required Disk Space (%)",
-      "HelpText": "Number, integer.\nThe minimum required space in % of the total space.\nZero means do not check %.\nExample: 10\nwhich means 10%.",
-      "DefaultValue": "0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "00037224-9932-46e3-9cfb-5723e0b8d702",
-      "Name": "fschkDrives",
-      "Label": "Drives",
-      "HelpText": "Comma separated list of drive names to check.\nPlease use the drive label, i.e. the drive letter and a colon (C: , D: etc).\nExample: C:,D:,H:\nwhich means, the check will be done on C:, D: and H:, if they exist; if some of them do not exist in the system, they will be ignored; if none of them exist, an error is thrown.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2020-12-14T11:00:00.000+00:00",
-  "LastModifiedBy": "dandraka",
-  "Category": "filesystem",
-  "$Meta": {
-    "ExportedAt": "2020-12-14T09:37:17.680Z",
-    "OctopusVersion": "2020.1.16",
-    "Type": "ActionTemplate"
-  }
-}
diff --git a/step-templates/file-system-clean-asp-net-temp-files.json b/step-templates/file-system-clean-asp-net-temp-files.json
deleted file mode 100644
index 27a9540c8..000000000
--- a/step-templates/file-system-clean-asp-net-temp-files.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "47fa89d0-fffd-4686-978d-4d54d944df55",
-  "Name": "File System - Clean ASP.NET Temp Files",
-  "Description": "Most ASP.NET websites today make use of dynamic compilation. \nThe dynamically compiled assemblies are stored in the Temporary ASP.NET files directory.\nHowever, files in this directory are not automatically removed and may build up over time.\nThis script will clean out all files in this directory.\nYou should note that this may cause running websites to be restarted.",
-  "ActionType": "Octopus.Script",
-  "Version": 9,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n\t[string]$frameworkVersion,\r\n\t[int]$daysToKeep,\r\n\t[switch]$whatIf\r\n) \r\n\r\n$ErrorActionPreference = \"Stop\"\r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n\t$result = $null\r\n\t\r\n\tif ($OctopusParameters -ne $null) {\r\n\t\t$result = $OctopusParameters[$Name]\r\n\t}\r\n\r\n\tif ($result -eq $null) {\r\n\t\t$variable = Get-Variable $Name -EA SilentlyContinue\t\r\n\t\tif ($variable -ne $null) {\r\n\t\t\t$result = $variable.Value\r\n\t\t}\r\n\t}\r\n\t\r\n\tif ($result -eq $null) {\r\n\t\tif ($Required) {\r\n\t\t\tthrow \"Missing parameter value $Name\"\r\n\t\t} else {\r\n\t\t\t$result = $Default\r\n\t\t}\r\n\t}\r\n\r\n\treturn $result\r\n}\r\n\r\nfunction RemoveSafely-Item($folder, $Old, [switch]$whatIf) {\r\n\t\r\n\tif ($folder.LastWriteTime -lt $old) {\r\n\t\t\r\n\t\ttry {\r\n\t\t\tWrite-Host \"Removing: $($folder.FullName)\"\r\n\t\t\t$folder | Remove-Item -Recurse -Force -WhatIf:$whatIf -EA Stop\r\n\t\t} catch {\r\n\t\t\t$message = $_.Exception.Message\r\n\t\t\tWrite-Host \"Info: Could not remove $itemName. $message\"\r\n\t\t}\r\n\t}\r\n}\r\n\r\n& {\r\n\tparam(\r\n\t\t[string]$frameworkVersion,\r\n\t\t[int]$daysToKeep\r\n\t) \r\n\r\n\tWrite-Host \"Cleaning Temporary ASP.NET files directory\"\r\n\t\r\n\tif ([string]::IsNullOrEmpty($frameworkVersion)) {\r\n\t\tthrow \"You need to specify the frameworkVersion parameter\"\r\n\t}\r\n\t\r\n\tWrite-Host \"FrameworkVersion: $frameworkVersion\"\r\n\t\r\n\t$dotnetPath = [System.Runtime.InteropServices.RuntimeEnvironment]::GetRuntimeDirectory() | Split-Path | Split-Path\r\n\t$bitnessValues = @(\"Framework\", \"Framework64\")\r\n\t$versionStart = \"v\"\r\n\t$versionFilter = \"$versionStart\"\r\n\t$tempDir = \"Temporary ASP.NET Files\"\r\n\t\r\n\t$directoriesToClean = @()\r\n\t\r\n\tif ($frameworkVersion -ne \"All\") {\r\n\t\r\n\t\t# Starts with v\r\n\t\tif ($frameworkVersion.StartsWith($versionStart, \"CurrentCultureIgnoreCase\")) {\r\n\t\t\t$versionFilter = $frameworkVersion\r\n\t\t\tif ($frameworkVersion -contains \"\\\") {\r\n\t\t\t\tthrow \"Framework version cannot contain '\\'\"\r\n\t\t\t}\r\n\t\t} else {\r\n\t\t\r\n\t\t\t# Includes one \\\r\n\t\t\t$firstSlash = $frameworkVersion.IndexOf(\"\\\")\r\n\t\t\t\r\n\t\t\t$NotAVersion = -1\r\n\t\t\tif ($firstSlash -eq $NotAVersion) {\r\n\t\t\t\t$bitnessValues = @($frameworkVersion)\r\n\t\t\t} else {\r\n\t\t\t\r\n\t\t\t\t$secondSlash = $frameworkVersion.IndexOf(\"\\\", $firstSlash)\r\n\t\t\t\t\r\n\t\t\t\t$NoExtraSlash = -1\r\n\t\t\t\tif ($secondSlash -ne $NoExtraSlash) {\r\n\t\t\t\t\t\r\n\t\t\t\t\t$bitnessValues = @($frameworkVersion | Split-Path)\r\n\t\t\t\t\t$versionFilter = @($frameworkVersion | Split-Path -Leaf)\r\n\r\n\t\t\t\t} else {\r\n\t\t\t\t\tthrow \"Includes more than one '\\'\"\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\t\r\n\tif (!$versionFilter.StartsWith($versionStart, \"CurrentCultureIgnoreCase\")) {\r\n\t\tthrow \"Version filter must start with '$versionStart'\"\r\n\t}\r\n\t\r\n\tforeach ($bitness in $bitnessValues) {\r\n\t\t$fvPath = (Join-Path $dotnetPath $bitness)\r\n\t\tif (Test-Path $fvPath) {\r\n\t\t\t$directoriesToClean += (ls $fvPath -Filter \"$versionFilter*\")\r\n\t\t}\r\n\t}\r\n\t\r\n\tforeach ($dir in $directoriesToClean) {\r\n\t\t$fullTempPath = Join-Path $dir.FullName $tempDir\r\n\t\t\r\n\t\tif (Test-Path $fullTempPath) {\r\n\t\t\t$virtualDirectories = ls $fullTempPath\r\n\t\t\tforeach ($virtualPathDir in $virtualDirectories) {\r\n\t\t\t\t$old = (Get-Date).AddDays(-$daysToKeep)\r\n\t\t\t\t\r\n\t\t\t\tforeach ($siteDir in (Get-ChildItem $virtualPathDir.FullName)) {\r\n\t\t\t\t\tRemoveSafely-Item $siteDir $old -WhatIf:$whatIf\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\t\r\n } `\r\n (Get-Param 'frameworkVersion' -Required) `\r\n (Get-Param 'daysToKeep' -Default 30) \r\n ",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "FrameworkVersion",
-      "Label": "Framework version",
-      "HelpText": "This is the framework version to target. \nSpecifying `All` will clean out the temp files for each installed version of the framework.\nIf you need to target a specific version, you can specify either the bit-ness, version or both.\n\nExample values:\n`Framework`\n`Framework64`\n`v4`\n`v2.0.50727`\n`v2.0.50727`\n`Framework\\v4.0.30319`\n`Framework64\\v4.0.30319`\n`Framework64\\v2`\n\nSpecifying a bit-ness value will match all versions.\nSpecifying only a version will match that version regarless of bit-ness.\nA fully specified framework version will match only that value.",
-      "DefaultValue": "All",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "DaysToKeep",
-      "Label": "Days to keep",
-      "HelpText": "Number of days since last write time to keep temporary files.\n\nNote that this is the write time of the top level folder.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2014-08-25T05:12:29.899+00:00",
-  "LastModifiedBy": "Lavinski",
-  "$Meta": {
-    "ExportedAt": "2014-08-25T05:12:40.750+00:00",
-    "OctopusVersion": "2.4.0.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
\ No newline at end of file
diff --git a/step-templates/file-system-clean-configuration-transforms.json b/step-templates/file-system-clean-configuration-transforms.json
deleted file mode 100644
index 10431ea31..000000000
--- a/step-templates/file-system-clean-configuration-transforms.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "9a2b84db-2940-4d9a-b61f-c82df35cee6c",
-  "Name": "File System - Clean Configuration Transforms",
-  "Description": "Clean out configuration transform files from the installation directory after a deployment (e.g. Web.Release.config, YourApp.Production.config, etc.).",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside Octopus Deploy\nparam(\n    [string]$pathToClean,\n    [string]$environmentName,\n    [switch]$whatIf\n)\n\nfunction GetParam($Name, [switch]$Required) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($Required -and [string]::IsNullOrEmpty($result)) {\n        throw \"Missing parameter value $Name\"\n    }\n\n    return $result\n}\n\n& {\n    param(\n        [string]$pathToClean,\n        [string]$environmentName\n    )\n\n    Write-Host \"Cleaning Configuration Transform files from $pathToClean and environment: $environmentName\"\n\n    if (Test-Path $pathToClean) {\n        Write-Host \"Scanning directory $pathToClean\"\n        $regexFilter = \"*.$environmentName.config\" \n        Write-Host \"Filter $regexFilter\"\n\n        if ($pathToClean -eq \"\\\" -or $pathToClean -eq \"/\") {\n            throw \"Cannot clean root directory\"\n        }\n\n        $filesToDelete = Get-ChildItem $pathToClean -Filter $regexFilter -Recurse | `\n                         Where-Object {!$_.PsIsContainer -and ($_.Name -NotMatch \"((?i)(^.*\\.exe\\.config$|.*\\.dll\\.config$)$)\")}\n\n        if (!$filesToDelete -or $filesToDelete.Count -eq 0) {\n            Write-Warning \"There were no files matching the criteria\"\n        } else {\n\n            Write-Host \"Deleting files\"\n            if ($whatIf) {\n                Write-Host \"What if: Performing the operation `\"Remove File`\" on targets\"\n            }\n\n            foreach ($file in $filesToDelete)\n            {\n                Write-Host \"Deleting file $($file.FullName)\"\n                \n                if (!$whatIf) {\n                    Remove-Item $file.FullName -Force\n                }\n            }\n        }\n\n    } else {\n        Write-Warning \"Could not locate path `\"$pathToClean`\"\"\n    }\n\n} `\n(GetParam 'PathToClean' -Required) `\n(GetParam 'EnvironmentName' -Required)\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "PathToClean",
-      "Label": "Path to clean",
-      "HelpText": "The path to clean.\n\nUsually you would set this to `#{Octopus.Action[StepName].Output.Package.InstallationDirectoryPath}`.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "EnvironmentName",
-      "Label": "Environment Name",
-      "HelpText": "If you want to nuke all config files i.e. `*.*.config` then leave with the default value `*`.\n\nOtherwise to just nuke `*.EnvironmentName.config` then set as the environment name: `#{Octopus.Environment.Name}`",
-      "DefaultValue": "*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-01-12T15:51:40.889+00:00",
-  "LastModifiedBy": "boro2g",
-  "$Meta": {
-    "ExportedAt": "2016-01-21T15:39:24.527+00:00",
-    "OctopusVersion": "3.1.4",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
diff --git a/step-templates/file-system-clean-directory.json b/step-templates/file-system-clean-directory.json
deleted file mode 100644
index d1d36721c..000000000
--- a/step-templates/file-system-clean-directory.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "e56aafe2-0d59-453b-9449-d7384914468d",
-  "Name": "File System - Clean Directory",
-  "Description": "Clean out unwanted files from the installation directory after a deployment.",
-  "ActionType": "Octopus.Script",
-  "Version": 27,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n\t[string]$cleanInclude,\r\n\t[string]$cleanIgnore,\r\n\t[string]$pathsToClean,\r\n\t[switch]$whatIf\r\n) \r\n\r\nfunction ExpandPathExpressions($workingDirectory, $fileExpressionList) {\r\n\treturn @($fileExpressionList.Split(@(\";\"), \"RemoveEmptyEntries\")) | \r\n\t% { $_.Trim() } |\r\n\t% { ExpandPathExpression $workingDirectory $_ }\r\n}\r\n\r\nfunction ExpandPathExpression($workingDirectory, $FileExpression) {\r\n\r\n\t# \\**\\ denotes a recursive search\r\n\t$recurse = \"**\"\r\n\r\n\t# Scope the clean!\r\n\t$fileExpression = Join-Path $workingDirectory $fileExpression\r\n\r\n\t$headSegments = Split-Path $fileExpression\r\n\t$lastSegment = Split-Path $fileExpression -Leaf\r\n\t$secondLastSegment = $(if($headSegments -ne \"\") {Split-Path $headSegments -Leaf} else {$null}) \r\n\r\n\t$path = \"\\\"\r\n\t$recursive = $false\r\n\t$filter = \"*\"\r\n\t\r\n\tif ($lastSegment -eq $recurse) {\t\r\n\t\r\n\t\t$path = $headSegments\r\n\t\t$recursive = $true\r\n\t\t\r\n\t} elseif ($secondLastSegment -eq $recurse) {\r\n\t\t\r\n\t\t$path = Split-Path $headSegments\r\n\t\t$recursive = $true\r\n\t\t$filter = $lastSegment\t\r\n\t\r\n\t} else {\r\n\t\t\r\n\t\t$path = $headSegments\r\n\t\t$filter = $lastSegment \r\n\t}\r\n\r\n\treturn Get-ChildItem -Path $path -Filter $filter -Recurse:$recursive | ? { !$_.PSIsContainer }\r\n}\r\n\r\nfunction GetParam($Name, [switch]$Required) {\r\n\t$result = $null\r\n\t\r\n\tif ($OctopusParameters -ne $null) {\r\n\t\t$result = $OctopusParameters[$Name]\r\n\t}\r\n\r\n\tif ($result -eq $null) {\r\n\t\t$variable = Get-Variable $Name -EA SilentlyContinue\t\r\n\t\tif ($variable -ne $null) {\r\n\t\t\t$result = $variable.Value\r\n\t\t}\r\n\t}\r\n\t\r\n\tif ($Required -and $result -eq $null) {\r\n\t\tthrow \"Missing parameter value $Name\"\r\n\t}\r\n\t\r\n\treturn $result\r\n}\r\n\r\n& {\r\n\tparam(\r\n\t\t[string]$cleanInclude,\r\n\t\t[string]$cleanIgnore,\r\n\t\t[string]$pathsToClean\r\n\t) \r\n\r\n\tWrite-Host \"Cleaning files from installation directory\"\r\n\tWrite-Host \"Include: $cleanInclude\"\r\n\tWrite-Host \"Ignore: $cleanIgnore\"\r\n\tWrite-Host \"Paths To Clean: $pathsToClean\"\r\n\t\r\n\tif (!$cleanInclude) {\r\n\t\tthrow \"You must specify files to include\"\r\n\t}\r\n\t\r\n\tif (!$pathsToClean) {\r\n\t\tthrow \"You must specify the paths to clean\"\r\n\t}\r\n\t\r\n\t$paths = @($pathsToClean.Split(@(\";\"), \"RemoveEmptyEntries\")) | \r\n\t% { $_.Trim() }\r\n\t\r\n\tforeach ($pathToClean in $paths) {\r\n\t\t\r\n\t\tif (Test-Path $pathToClean) {\r\n\t\t\tWrite-Host \"Scanning directory $pathToClean\"\r\n\t\t\t\r\n\t\t\tif ($pathToClean -eq \"\\\" -or $pathToClean -eq \"/\") {\r\n\t\t\t\tthrow \"Cannot clean root directory\"\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tcd $pathToClean\r\n\t\t\t\r\n\t\t\t$include = ExpandPathExpressions $pathToClean $cleanInclude\r\n\t\t\t$exclude = ExpandPathExpressions $pathToClean $cleanIgnore\r\n\t\t\t\r\n\t\t\tif ($include -eq $null -or $exclude -eq $null) {\r\n\t\t\t\t$deleteSet = $include\r\n\t\t\t} else {\r\n\t\t\t\t$exclude = $exclude | % {$_}\r\n\t\t\t\t$deleteSet = Compare-Object $include $exclude | ? { $_.SideIndicator -eq \"<=\" } | % { $_.InputObject }\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tif (!$deleteSet -or $deleteSet.Count -eq 0) {\r\n\t\t\t\tWrite-Warning \"There were no files matching the criteria\"\r\n\t\t\t} else {\r\n\t\t\t\t\r\n\t\t\t\tWrite-Host \"Deleting files\"\r\n\t\t\t\tif ($whatIf) {\r\n\t\t\t\t\tWrite-Host \"What if: Performing the operation `\"Remove File`\" on targets\"\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\t$deleteSet | Write-Host\r\n\t\t\t\t\r\n\t\t\t\tif (!$whatIf) {\r\n\t\t\t\t\t$deleteSet | % { $_.FullName } | Remove-Item -Force -Recurse -WhatIf:$whatIf\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\r\n\t\t} else {\r\n\t\t\t\r\n\t\t\tWrite-Warning \"Could not locate path `\"$pathToClean`\"\"\r\n\t\t}\r\n\t}\r\n } `\r\n (GetParam 'CleanInclude' -Required) `\r\n (GetParam 'CleanIgnore') `\r\n (GetParam 'PathsToClean')\r\n ",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "PathsToClean",
-      "Label": "Paths to clean",
-      "HelpText": "A semicolon-separated list of paths to clean.\n\nUsually you would set this to `Octopus.Action[StepName].Output.Package.InstallationDirectoryPath`.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "CleanInclude",
-      "Label": "Files to remove",
-      "HelpText": "A semicolon-separated list of path expressions that match files to be removed.\n\nExamples:  \n\n    - *.jpg\n    - web.*.config\n    - **\\*.dll\n    - \\Logs\\**\\*.txt\n    - web.*.config;*.txt\n\n`\\**\\` denotes a recursive search",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "CleanIgnore",
-      "Label": "Files to ignore",
-      "HelpText": "A semicolon-separated list of path expressions that will be not be removed.\n\nExamples:  \n\n    - web.log4net.config\n    - img\\needed.jpg\n    - **\\*.dll\n    - web.config;Release Notes.txt\n\n`\\**\\` denotes a recursive search",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-08-20T06:59:52.579+00:00",
-    "OctopusVersion": "2.4.0.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
diff --git a/step-templates/file-system-copy-file.json b/step-templates/file-system-copy-file.json
deleted file mode 100644
index 6d136f50b..000000000
--- a/step-templates/file-system-copy-file.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "Id": "072c2939-2c77-4ed1-abd2-e41cb8a57661",
-  "Name": "File System - Copy File",
-  "Description": "Copies a file in the file system.",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "function Test-FileLocked([string]$filePath)\n{\n  $fileExists = Test-Path -Path $filePath\n  if (!$fileExists)\n  {\n    return (1 -eq 0) #false\n  }\n  Rename-Item $filePath $filePath -ErrorVariable errs -ErrorAction SilentlyContinue\n  return ($errs.Count -ne 0)\n}\n\nfunction Wait-ForFileUnlock([string]$filePath)\n{ \n  Write-Host \"Destinationfile at $filePath is locked\"\n    \n  for ($attemptNo = 1; $attemptNo -lt 6; $attemptNo++) {\n    Write-Host \"Waiting for the file to become unlocked $attemptNo/5\"\n\n    Start-Sleep -Seconds 10\n\n    $fileIsLocked = Test-FileLocked($filePath)\n\n    if (!$fileIsLocked)\n    {\n      return\n    }\n\n    if ($attemptNo -eq 5) {\n      Write-Error \"destinationfile at location $filePath is locked and cannot be overwritten.\"\n\n      return\n    }\n  }\n}\n\n#\n#script starts here\n#\n\n$filePath = $OctopusParameters['sourcePath']\n$newFilePath = $OctopusParameters['destinationPath']\n\n$fileExists = Test-Path -Path $filePath\n\nif (!$fileExists)\n{\n  Write-Error \"Sourcefile not found at $filePath\"\n\n  return\n}\n\n$fileIsLocked = Test-FileLocked($newFilePath)\n\n\nif ($fileIsLocked)\n{\n  Wait-ForFileUnlock($newFilePath)\n}\n\n\n$fileIsLocked = Test-FileLocked($newFilePath)\nif ($fileIsLocked)\n{\n    return\n}\n\nCopy-Item -Path $filePath -Destination $newFilePath -Force\n\nWrite-Host \"Successfully copied file at location: $filePath to $newFilePath\""
-  },
-  "Parameters": [
-    {
-      "Id": "80271c96-5190-4cc6-93c0-6e28c4aba6f1",
-      "Name": "sourcePath",
-      "Label": "File source path",
-      "HelpText": "The full path of the file you wish to copy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "702e4cfd-6633-4206-94df-8fa4fa47e564",
-      "Name": "destinationPath",
-      "Label": "File destionation path",
-      "HelpText": "The full path for the destination of the file. You can rename the file by giving it a new name in the path. If the file already exists at the destination it is overwritten.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2018-03-16T12:58:03.401Z",
-  "LastModifiedBy": "Jens-H-Eriksen",
-  "$Meta": {
-    "ExportedAt": "2018-03-16T12:58:03.401Z",
-    "OctopusVersion": "2018.2.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
diff --git a/step-templates/file-system-create-folder.json b/step-templates/file-system-create-folder.json
deleted file mode 100644
index cbee3c2d7..000000000
--- a/step-templates/file-system-create-folder.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "Id": "b7211497-59ea-41e9-b466-c9a46b4c76b3",
-  "Name": "File System - Create Folder",
-  "Description": "Creates a folder structure that is passed in.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$item = $OctopusParameters['FolderPath']\n$readPermissionsTo = $OctopusParameters['ReadPermissionsTo']\n$writePermissionsTo = $OctopusParameters['WritePermissionsTo']\n$modifyPermissionsTo = $OctopusParameters['ModifyPermissionsTo']\n\n\nWrite-Host \"Creating folder $item with permissions.\"\n\nif((Test-Path $item))\n{\n    Write-Host \"Folder $item already exists\"\n}\nelse\n{\n    New-Item -ItemType directory -Path $item -force\n}\n\n# Check item exists\nif(!(Test-Path $item))\n{\n    throw \"$item does not exist\"\n}\n\n# Assign read permissions\n\nif($readPermissionsTo)\n{\n    $users = $readPermissionsTo.Split(\",\")\n    foreach($user in $users)\n    {\n        Write-Host \"Adding read permissions for $user\"\n        $acl = Get-Acl $item\n        $acl.SetAccessRuleProtection($False, $False)\n        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(\n                $user, \"Read\", \"ContainerInherit, ObjectInherit\", \"None\", \"Allow\")\n        $acl.AddAccessRule($rule)\n        Set-Acl $item $acl\n    }\n}\n\n# Assign write permissions\n\nif($writePermissionsTo)\n{\n    $users = $writePermissionsTo.Split(\",\")\n    foreach($user in $users)\n    {\n        Write-Host \"Adding write permissions for $user\"\n        $acl = Get-Acl $item\n        $acl.SetAccessRuleProtection($False, $False)\n        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(\n                $user, \"Write\", \"ContainerInherit, ObjectInherit\", \"None\", \"Allow\")\n        $acl.AddAccessRule($rule)\n        Set-Acl $item $acl\n    }\n}\n\n# Assign modify permissions\n\nif($modifyPermissionsTo)\n{\n    $users = $modifyPermissionsTo.Split(\",\")\n    foreach($user in $users)\n    {\n        Write-Host \"Adding modify permissions for $user\"\n        $acl = Get-Acl $item\n        $acl.SetAccessRuleProtection($False, $False)\n        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(\n                $user, \"Modify\", \"ContainerInherit, ObjectInherit\", \"None\", \"Allow\")\n        $acl.AddAccessRule($rule)\n        Set-Acl $item $acl\n    }\n}\n\nWrite-Host \"Complete\"",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "FolderPath",
-      "Label": "The folder path to create on the filesystem.",
-      "HelpText": "The entire path to the folder, this step will also created nested folders.  For example \"D:\\one\\two\" will create two folders ('one', and then 'two' under folder 'one').  This script will not remove items from the folders.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "becbcbd1-7026-40f0-a655-eb5861d53557",
-      "Name": "ReadPermissionsTo",
-      "Label": "Read Users",
-      "HelpText": "A comma separated list of users to grant read permissions to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "029ea466-4907-460a-a3f4-c00b23ad1a96",
-      "Name": "WritePermissionsTo",
-      "Label": "Write Users",
-      "HelpText": "A comma separated list of users to grant write permissions to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "860e0480-db8d-4669-9b25-00f1ce33d0ac",
-      "Name": "ModifyPermissionsTo",
-      "Label": "Modify Users",
-      "HelpText": "A comma separated list of users to grant modify permissions to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2017-04-05T12:30:02.127Z",
-    "OctopusVersion": "3.4.11",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
\ No newline at end of file
diff --git a/step-templates/file-system-create-folders.json b/step-templates/file-system-create-folders.json
deleted file mode 100644
index b8ead96d9..000000000
--- a/step-templates/file-system-create-folders.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "7eaad6c2-fd5c-40a4-b880-350c983dc51d",
-  "Name": "File System - Create Folders",
-  "Description": "Ensure/Create multiple folders separated by ;",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$FolderPaths,\r\n    [string]$ContinueOnError\r\n) \r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    param(\r\n        [string]$FolderPaths,\r\n        [string]$ContinueOnError\r\n    ) \r\n\r\n    Write-Host \"File System - Create Folders\"\r\n    Write-Host \"FolderPaths: $FolderPaths\"\r\n    \r\n    $isContinueOnError = $ContinueOnError.ToLower() -match \"(y|yes|true)\"\r\n\r\n    $FolderPaths.Split(\";\") | ForEach {\r\n        $path = $_.Trim()\r\n\r\n        if($path.Length -lt 1){\r\n            break;\r\n        }\r\n\r\n        Write-Host \"Trying to ensure directory structure for $path.\"\r\n        try {\r\n            $newFolder = New-Item -ItemType directory -Path $path -force\r\n            Write-Host \"SUCCESS\" -ForegroundColor Green\r\n        } catch {\r\n            $errorMessage = \"FAILED - $_.Exception.Message\"\r\n            \r\n            if($isContinueOnError){\r\n                Write-Host $errorMessage  -ForegroundColor Red\r\n            } else {\r\n                throw $errorMessage\r\n            }\r\n        }\r\n        \r\n    }\r\n\r\n } `\r\n (Get-Param 'FolderPaths' -Required) `\r\n (Get-Param 'ContinueOnError')",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "FolderPaths",
-      "Label": "Folder Paths",
-      "HelpText": "A list of folders to create separated by a ;",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "ContinueOnError",
-      "Label": "Continue On Error",
-      "HelpText": "When this is selected the script will log failures but continue and succeed in octopus.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-07-02T13:40:37.523+00:00",
-  "LastModifiedBy": "jbennett",
-  "$Meta": {
-    "ExportedAt": "2015-07-02T13:47:00.305+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
\ No newline at end of file
diff --git a/step-templates/file-system-create-symlink.json b/step-templates/file-system-create-symlink.json
deleted file mode 100644
index f40340ab8..000000000
--- a/step-templates/file-system-create-symlink.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "f0cae939-caef-4979-93ac-6c9b3a3c4986",
-  "Name": "File System - Create Symlink",
-  "Description": "Creates a Symbolic Link",
-  "ActionType": "Octopus.Script",
-  "Version": 23,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function New-Symlink {\n    <#\n    .SYNOPSIS\n        Creates a symbolic link.\n    #>\n    param (\n        [Parameter(Position=0, Mandatory=$true)]\n        [string] $Link,\n        [Parameter(Position=1, Mandatory=$true)]\n        [string] $Target\n    )\n\n    Write-Host \"New-Symlink $Link to $Target\"\n    \n    Invoke-MKLINK -Link $Link -Target $Target\n}\n\nfunction Invoke-MKLINK {\n    <#\n    .SYNOPSIS\n        Creates a symbolic link.\n    #>\n    param (\n        [Parameter(Position=0, Mandatory=$true)]\n        [string] $Link,\n        [Parameter(Position=1, Mandatory=$true)]\n        [string] $Target\n    )\n    \n    # Resolve the paths incase a relative path was passed in.\n    $Link = (Force-Resolve-Path $Link)\n    $Target = (Force-Resolve-Path $Target)\n\n    # Ensure target exists.\n    if (-not(Test-Path $Target)) {\n        throw \"Target does not exist.`nTarget: $Target\"\n    }\n\n    # Ensure link does not exist.\n    if (Test-Path $Link) {\n        Write-Host \"A file or directory already exists at the link path.`nLink: $Link\"\n        return\n    }\n\n    $isDirectory = (Get-Item $Target).PSIsContainer\n\n    # Capture the MKLINK output so we can return it properly.\n    # Includes a redirect of STDERR to STDOUT so we can capture it as well.\n    $output = cmd /c mklink /D `\"$Link`\" `\"$Target`\" 2>&1\n    \n    Write-Host \"output : $output\"\n    if ($lastExitCode -ne 0) {\n        Write-Host \"MKLINK failed. Exit code: $lastExitCode`n$output\"\n        throw \"MKLINK failed. Exit code: $lastExitCode`n$output\"\n    }\n    else {\n        Write-Output $output\n    }\n}\n\nfunction Force-Resolve-Path {\n    <#\n    .SYNOPSIS\n        Calls Resolve-Path but works for files that don't exist.\n    .REMARKS\n        From http://devhawk.net/2010/01/21/fixing-powershells-busted-resolve-path-cmdlet/\n    #>\n    param (\n        [string] $FileName\n    )\n    \n    $FileName = Resolve-Path $FileName -ErrorAction SilentlyContinue `\n                                       -ErrorVariable _frperror\n    if (-not($FileName)) {\n        $FileName = $_frperror[0].TargetObject\n    }\n    \n    return $FileName\n}\n\nNew-Symlink $link_path $target_path\n\n\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "link_path",
-      "Label": "LinkPath",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "target_path",
-      "Label": "TargetPath",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2014-08-26T15:58:31.623+00:00",
-  "LastModifiedBy": "diegoavanzini",
-  "$Meta": {
-    "ExportedAt": "2014-08-26T15:58:34.242+00:00",
-    "OctopusVersion": "2.5.7.384",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
\ No newline at end of file
diff --git a/step-templates/file-system-find-and-replace.json b/step-templates/file-system-find-and-replace.json
deleted file mode 100644
index bbfe87687..000000000
--- a/step-templates/file-system-find-and-replace.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "87cbaa94-4477-4474-a9c3-7943b5668d30",
-  "Name": "File System - Find and Replace",
-  "Description": "Find and replace text in one or more files.",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Execute-FindReplace($target, $find, $replace, $ignoreCase) {\n    $options = [System.Text.RegularExpressions.RegexOptions]::None\n    if ($ignoreCase) {\n        $options = [System.Text.RegularExpressions.RegexOptions]::IgnoreCase\n    }\n    \n    Write-Output \"Searching $target...\"\n    $orig = [System.IO.File]::ReadAllText($target)\n    \n    $escFind = [System.Text.RegularExpressions.Regex]::Escape($find)\n    $regex = new-object System.Text.RegularExpressions.Regex($escFind, $options)\n    $removed = $regex.Replace($orig, '')\n    \n    $occurrences = ($orig.Length - $removed.Length) / $find.Length\n    if ($occurrences -gt 0) {\n        Write-Output \"Found $occurrences occurrence(s), replacing...\"\n        \n        $escReplace = $replace.Replace('$', '$$')\n        $replaced = $regex.Replace($orig, $escReplace)\n        [System.IO.File]::WriteAllText($target, $replaced)\n    }\n}\n\nif ([string]::IsNullOrEmpty($FRFindText)) {\n    throw \"A non-empty 'Find' text block is required\"\n}\n\nWrite-Output \"Replacing occurrences of '$FRFindText' with '$FRReplaceText'\"\nif ([Boolean] $FRIgnoreCase) {\n    Write-Output \"Case will be ignored\"\n}\n\n$FRCandidatePathGlobs.Split(\";\") | foreach {\n    $glob = $_.Trim()\n    Write-Output \"Searching for files that match $glob...\"\n\n    $matches = $null\n    $splits = $glob.Split(@('/**/'), [System.StringSplitOptions]::RemoveEmptyEntries)\n\n    if ($splits.Length -eq 1) {\n        $splits = $glob.Split(@('\\**\\'), [System.StringSplitOptions]::RemoveEmptyEntries)\n    }\n    \n    if ($splits.Length -eq 1) {\n        $matches = ls $glob\n    } else {\n        if ($splits.Length -eq 2) {\n            pushd $splits[0]\n            $matches = ls $splits[1] -Recurse\n            popd\n        } else {\n            $splits\n            throw \"The segment '**' can only appear once, as a directory name, in the glob expression\"\n\n        }\n    }\n\n    $matches | foreach {\n        \n        $target = $_.FullName\n\n        Execute-FindReplace -target $target -find $FRFindText -replace $FRReplaceText -ignoreCase ([Boolean] $FRIgnoreCase)\n    }\n}\n\n\nWrite-Output \"Done.\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "FRCandidatePathGlobs",
-      "Label": "Files",
-      "HelpText": "The files to search. Wildcards `*` and `**` are supported. Paths must be fully-qualified, e.g. `C:\\MyApp\\**\\*.xml`. Separate multiple paths with `;` semicolons.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FRFindText",
-      "Label": "Find",
-      "HelpText": "The text to find in the target files.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FRReplaceText",
-      "Label": "Replace with",
-      "HelpText": "The replacement text to insert in place of each occurrence of _Find_.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FRIgnoreCase",
-      "Label": "Ignore case",
-      "HelpText": "If **True**, variations on the character case of _Find_ will be considered a match, for example `Bar` will match `BAR` and `bar`. If **False** only exact matches will be considered.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-14T05:38:42.041+00:00",
-    "OctopusVersion": "2.4.4.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
\ No newline at end of file
diff --git a/step-templates/file-system-grant-permissions.json b/step-templates/file-system-grant-permissions.json
deleted file mode 100644
index 50539ee86..000000000
--- a/step-templates/file-system-grant-permissions.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "Id": "b77d55ae-7f54-45ab-ba57-7afff97c93a2",
-  "Name": "File System - Grant Permissions",
-  "Description": "Grant read, write and modify permissions to folders or files",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$itemsParameter = $OctopusParameters['Items']\n$readPermissionsTo = $OctopusParameters['ReadPermissionsTo']\n$writePermissionsTo = $OctopusParameters['WritePermissionsTo']\n$modifyPermissionsTo = $OctopusParameters['ModifyPermissionsTo']\n\nif($readPermissionsTo)\n{\n    $readUsers = $readPermissionsTo.Split(\",\")\n}\n\nif($writePermissionsTo)\n{\n    $writeUsers = $writePermissionsTo.Split(\",\")\n}\n\nif($modifyPermissionsTo)\n{\n    $modifyUsers = $modifyPermissionsTo.Split(\",\")\n}\n\n$items = $itemsParameter.Split(\",\")\nforeach($item in $items) \n{\n    # Check path exists\n    if(!(Test-Path $item))\n    {\n        throw \"$item does not exist\"\n    }\n\n    Write-Host \"Path: $item\"\n    # Assign read permissions\n    foreach($user in $readUsers)\n    {\n        Write-Host \"  Adding read permissions for $user\"\n        $acl = (Get-Item $item).GetAccessControl('Access')\n        $acl.SetAccessRuleProtection($False, $False)\n        $rule = \n            if ($acl -is [System.Security.AccessControl.DirectorySecurity])\n                {\n                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, \"Read\", \"ContainerInherit, ObjectInherit\", \"None\", \"Allow\")\n                }\n                else\n                {\n                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, \"Read\", \"Allow\")\n                }\n        $acl.AddAccessRule($rule)\n        Set-Acl $item $acl\n    }\n\n    # Assign write permissions\n    foreach($user in $writeUsers)\n    {\n        Write-Host \"  Adding write permissions for $user\"\n        $acl = (Get-Item $item).GetAccessControl('Access')\n        $acl.SetAccessRuleProtection($False, $False)\n        $rule = \n            if ($acl -is [System.Security.AccessControl.DirectorySecurity])\n                {\n                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, \"Write\", \"ContainerInherit, ObjectInherit\", \"None\", \"Allow\")\n                }\n                else\n                {\n                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, \"Write\", \"Allow\")\n                }\n        $acl.AddAccessRule($rule)\n        Set-Acl $item $acl\n    }\n\n    # Assign modify permissions\n    foreach($user in $modifyUsers)\n    {\n        Write-Host \"  Adding modify permissions for $user\"\n        $acl = (Get-Item $item).GetAccessControl('Access')\n        $acl.SetAccessRuleProtection($False, $False)\n        $rule = \n            if ($acl -is [System.Security.AccessControl.DirectorySecurity])\n                {\n                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, \"Modify\", \"ContainerInherit, ObjectInherit\", \"None\", \"Allow\")\n                }\n                else\n                {\n                    New-Object System.Security.AccessControl.FileSystemAccessRule($user, \"Modify\", \"Allow\")\n                }\n        $acl.AddAccessRule($rule)\n        Set-Acl $item $acl\n    }\n}\n\nWrite-Host \"Complete\"\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "e67e2b43-b1e4-482d-bb5d-e4b6acb2b90f",
-      "Name": "Items",
-      "Label": "Items",
-      "HelpText": "A comma seperated list of full paths to the files or folders",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b830e92e-ceaa-472e-b1ac-e70a19d9386b",
-      "Name": "ReadPermissionsTo",
-      "Label": "Read Users",
-      "HelpText": "A comma separated list of users to grant read permissions to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "141f465e-6998-4715-be65-6d5df2604239",
-      "Name": "WritePermissionsTo",
-      "Label": "Write Users",
-      "HelpText": "A comma separated list of users to grant write permissions to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c150331e-ea88-4170-8bca-52a8cfd30220",
-      "Name": "ModifyPermissionsTo",
-      "Label": "Modify Users",
-      "HelpText": "A comma separated list of users to grant modify permissions to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2017-10-26T07:11:38.851Z",
-  "LastModifiedBy": "mcfozzy", 
-  "$Meta": {
-    "ExportedAt": "2017-10-26T07:11:38.851Z",
-    "OctopusVersion": "3.15.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
diff --git a/step-templates/file-system-regular-expression-find-and-replace.json b/step-templates/file-system-regular-expression-find-and-replace.json
deleted file mode 100644
index 3c857207d..000000000
--- a/step-templates/file-system-regular-expression-find-and-replace.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "0bef8c07-5739-4030-8c04-287ceeb51153",
-  "Name": "File System - Regular Expression Find and Replace (Updated)",
-  "Description": "Find and replace text matching a regular expression in one or more files. Now with working $ replacement.",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Execute-RegexFindReplace($target, $find, $replace, $options) {\n    Write-Output \"Searching $target...\"\n    $orig = [System.IO.File]::ReadAllText($target)\n    \n    $regex = new-object System.Text.RegularExpressions.Regex($find, $options)\n    if ([string]::IsNullOrEmpty($replace)) {        \n$replace = ''\n    }\n    \n    $occurrences = $regex.Matches($orig).Count\n    if ($occurrences -gt 0) {\n        Write-Output \"Found $occurrences occurrence(s), replacing...\"\n        \n        $replaced = $regex.Replace($orig, $replace)\n        [System.IO.File]::WriteAllText($target, $replaced)\n    }\n}\n\nif ([string]::IsNullOrEmpty($RFRFindRegex)) {\n    throw \"A non-empty 'Pattern' is required\"\n}\n\n$options = [System.Text.RegularExpressions.RegexOptions]::None\n$RFROptions.Split(' ') | foreach {\n    $opt = $_.Trim()\n    $flag = [System.Enum]::Parse([System.Text.RegularExpressions.RegexOptions], $opt)\n    $options = $options -bor $flag\n}\n\nWrite-Output \"Replacing occurrences of '$RFRFindRegex' with '$RFRSubstitution' applying options $RFROptions\"\n\n$RFRCandidatePathGlobs.Split(\";\") | foreach {\n    $glob = $_.Trim()\n    Write-Output \"Searching for files that match $glob...\"\n\n    $matches = $null\n    $splits = $glob.Split(@('/**/'), [System.StringSplitOptions]::RemoveEmptyEntries)\n\n    if ($splits.Length -eq 1) {\n        $splits = $glob.Split(@('\\**\\'), [System.StringSplitOptions]::RemoveEmptyEntries)\n    }\n    \n    if ($splits.Length -eq 1) {\n        $matches = ls $glob\n    } else {\n        if ($splits.Length -eq 2) {\n            pushd $splits[0]\n            $matches = ls $splits[1] -Recurse\n            popd\n        } else {\n            $splits\n            throw \"The segment '**' can only appear once, as a directory name, in the glob expression\"\n\n        }\n    }\n\n    $matches | foreach {\n        \n        $target = $_.FullName\n\n        Execute-RegexFindReplace -target $target -find $RFRFindRegex -replace $RFRSubstitution -options $options\n    }\n}\n\n\nWrite-Output \"Done.\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "RFRCandidatePathGlobs",
-      "Label": "Files",
-      "HelpText": "The files to search. Wildcards `*` and `**` are supported. Paths must be fully-qualified, e.g. `C:\\MyApp\\**\\*.xml`. Separate multiple paths with `;` semicolons.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RFRFindRegex",
-      "Label": "Pattern",
-      "HelpText": "The regular expression to find in the target files.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RFRSubstitution",
-      "Label": "Substitution",
-      "HelpText": "The text to insert in place of each occurrence of _Pattern_. Regular expression [substitutions](http://msdn.microsoft.com/en-us/library/ewy2t5e0.aspx) are supported, so any literal `$` in the substitution pattern must be escaped by doubling (`$$`).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RFROptions",
-      "Label": "Options",
-      "HelpText": "A space-separated list of options from the [RegexOptions](http://msdn.microsoft.com/en-us/library/system.text.regularexpressions.regexoptions.aspx) enumeration.",
-      "DefaultValue": "ExplicitCapture",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2015-10-26T21:24:18.756+00:00",
-    "OctopusVersion": "3.0.10.2278",
-    "Type": "ActionTemplate"
-  },
-  "Category": "filesystem"
-}
\ No newline at end of file

From b0025d14ebea0eb5ed6e2f40e0dc870d12a03b69 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 00:51:07 -0700
Subject: [PATCH 09/21] refactor: migrate step template batch 3 to src

---
 .../Jenkins-Queue-Job/metadata.json           |  153 +++
 .../Jenkins-Queue-Job/scriptbody.ps1          |  154 +++
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   13 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   28 +
 .../flyway-database-migrations/metadata.json  |  323 +++++
 .../flyway-database-migrations/scriptbody.ps1 |  605 +++++++++
 .../metadata.json                             |  192 +++
 .../scriptbody.ps1                            |  450 +++++++
 .../ftp-uploadfiles-package/metadata.json     |  146 ++
 .../ftp-uploadfiles-package/scriptbody.ps1    |  325 +++++
 .../ftp-uploadfiles/metadata.json             |  122 ++
 .../ftp-uploadfiles/scriptbody.ps1            |  230 ++++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   78 ++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   78 ++
 .../ghostinspector-runsuite/metadata.json     |    8 +-
 .../ghostinspector-runsuite/scriptbody.ps1    |   65 +
 .../metadata.json                             |  114 ++
 .../scriptbody.ps1                            |  273 ++++
 .../git-clone-copy-push-package/metadata.json |  100 ++
 .../scriptbody.ps1                            |  261 ++++
 .../git-clone-copy-push/metadata.json         |   84 ++
 .../git-clone-copy-push/scriptbody.ps1        |  272 ++++
 .../git-create-pull-request/metadata.json     |   85 ++
 .../git-create-pull-request/scriptbody.ps1    |  178 +++
 .../git-pull-https/metadata.json              |   58 +
 .../git-pull-https/scriptbody.ps1             |   65 +
 .../git-push-https/metadata.json              |   67 +
 .../git-push-https/scriptbody.ps1             |  132 ++
 .../git-tag-repository/metadata.json          |   75 ++
 .../git-tag-repository/scriptbody.ps1         |  193 +++
 .../github-report-deployment/metadata.json    |   94 ++
 .../github-report-deployment/scriptbody.ps1   |  137 ++
 .../github-tag-release/metadata.json          |    6 +-
 .../github-tag-release/scriptbody.ps1         |   32 +
 .../gitlab-create-tag/metadata.json           |    6 +-
 .../gitlab-create-tag/scriptbody.ps1          |   80 ++
 .../grate-database-migration/metadata.json    |  251 ++++
 .../grate-database-migration/scriptbody.ps1   |  523 ++++++++
 .../metadata.json                             |   95 ++
 .../scriptbody.ps1                            |  107 ++
 .../metadata.json                             |   85 ++
 .../scriptbody.ps1                            |  106 ++
 .../metadata.json                             |   95 ++
 .../scriptbody.ps1                            |  155 +++
 .../metadata.json                             |   75 ++
 .../scriptbody.ps1                            |  127 ++
 .../metadata.json                             |  106 ++
 .../scriptbody.ps1                            |  510 +++++++
 .../hashicorp-vault-jwt-login/metadata.json   |   85 ++
 .../hashicorp-vault-jwt-login/scriptbody.ps1  |  105 ++
 .../metadata.json                             |  116 ++
 .../scriptbody.ps1                            |  282 ++++
 .../metadata.json                             |  126 ++
 .../scriptbody.ps1                            |  289 ++++
 .../hashicorp-vault-ldap-login/metadata.json  |   85 ++
 .../hashicorp-vault-ldap-login/scriptbody.ps1 |  102 ++
 .../hg-get-changelog/metadata.json            |    8 +-
 .../hg-get-changelog/scriptbody.ps1           |   13 +
 .../hipchat-notify-api-v1/metadata.json       |   67 +
 .../hipchat-notify-api-v1/scriptbody.ps1      |   28 +
 .../hipchat-notify/metadata.json              |   58 +
 .../hipchat-notify/scriptbody.ps1             |   43 +
 .../hockeyapp-upload-mobile-app/metadata.json |  157 +++
 .../scriptbody.ps1                            |  334 +++++
 .../http-invoke-url/metadata.json             |   31 +
 .../http-invoke-url/scriptbody.ps1            |   50 +
 .../http-post-form/metadata.json              |    8 +-
 .../http-post-form/scriptbody.ps1             |    1 +
 .../http-test-url/metadata.json               |  114 ++
 .../http-test-url/scriptbody.ps1              |  130 ++
 .../metadata.json                             |   40 +
 .../scriptbody.ps1                            |   84 ++
 .../iis-app-create/metadata.json              |  205 +++
 .../iis-app-create/scriptbody.ps1             |  257 ++++
 .../iis-app-remove/metadata.json              |   40 +
 .../iis-app-remove/scriptbody.ps1             |  110 ++
 .../metadata.json                             |   64 +
 .../scriptbody.ps1                            |   77 ++
 .../iis-app-update-property/metadata.json     |   62 +
 .../iis-app-update-property/scriptbody.ps1    |   77 ++
 .../iis-apppool-create/metadata.json          |    6 +-
 .../iis-apppool-create/scriptbody.ps1         |  169 +++
 .../iis-apppool-delete/metadata.json          |   31 +
 .../iis-apppool-delete/scriptbody.ps1         |   51 +
 .../iis-apppool-restart/metadata.json         |    8 +-
 .../iis-apppool-restart/scriptbody.ps1        |   18 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |    6 +
 .../iis-apppool-start/metadata.json           |    8 +-
 .../iis-apppool-start/scriptbody.ps1          |   10 +
 .../iis-apppool-stop/metadata.json            |   48 +
 .../iis-apppool-stop/scriptbody.ps1           |   41 +
 .../iis-apppool-update-property/metadata.json |   49 +
 .../scriptbody.ps1                            |   73 +
 .../metadata.json                             |  103 ++
 .../scriptbody.ps1                            |  129 ++
 .../iis-autostartprovider-add/metadata.json   |   40 +
 .../iis-autostartprovider-add/scriptbody.ps1  |   68 +
 .../metadata.json                             |   24 +
 .../scriptbody.ps1                            |   20 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |    6 +
 .../iis-bindings-backup/metadata.json         |   39 +
 .../iis-bindings-backup/scriptbody.ps1        |   77 ++
 .../iis-bindings-enable-ssl-ccs/metadata.json |   54 +
 .../scriptbody.ps1                            |   40 +
 .../iis-bindings-restore/metadata.json        |   39 +
 .../iis-bindings-restore/scriptbody.ps1       |   95 ++
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   34 +
 .../iis-configure-compression/metadata.json   |   40 +
 .../iis-configure-compression/scriptbody.ps1  |   43 +
 .../iis-list-sites/metadata.json              |   21 +
 .../iis-list-sites/scriptbody.ps1             |   28 +
 .../iis-redirect-to-https/metadata.json       |   58 +
 .../iis-redirect-to-https/scriptbody.ps1      |   25 +
 .../step-templates/iis-reset/metadata.json    |    6 +-
 src/step-templates/iis-reset/scriptbody.ps1   |   24 +
 .../metadata.json                             |   60 +
 .../scriptbody.ps1                            |   56 +
 .../iis-set-http-redirect/metadata.json       |   85 ++
 .../iis-set-http-redirect/scriptbody.ps1      |   79 ++
 .../iis-vdir-create/metadata.json             |   86 ++
 .../iis-vdir-create/scriptbody.ps1            |  154 +++
 .../metadata.json                             |   84 ++
 .../scriptbody.ps1                            |  126 ++
 .../metadata.json                             |   40 +
 .../scriptbody.ps1                            |   51 +
 .../metadata.json                             |   51 +
 .../scriptbody.ps1                            |   76 ++
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   19 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   19 +
 .../iis-website-create/metadata.json          |  112 ++
 .../iis-website-create/scriptbody.ps1         |  226 ++++
 .../iis-website-delete/metadata.json          |   31 +
 .../iis-website-delete/scriptbody.ps1         |   80 ++
 .../iis-website-restart/metadata.json         |    8 +-
 .../iis-website-restart/scriptbody.ps1        |   13 +
 .../iis-website-set-ip-security/metadata.json |   70 +
 .../scriptbody.ps1                            |   73 +
 .../iis-website-set-log-format/metadata.json  |  275 ++++
 .../iis-website-set-log-format/scriptbody.ps1 |  137 ++
 .../iis-website-start/metadata.json           |    6 +-
 .../iis-website-start/scriptbody.ps1          |   18 +
 .../iis-website-stop/metadata.json            |   52 +
 .../iis-website-stop/scriptbody.ps1           |   38 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   17 +
 .../iis-website-update-property/metadata.json |   52 +
 .../scriptbody.ps1                            |   76 ++
 .../metadata.json                             |  134 ++
 .../scriptbody.ps1                            |  101 ++
 .../import-databricks-workbooks/metadata.json |   76 ++
 .../scriptbody.ps1                            |  128 ++
 .../jasper-clear-cache/metadata.json          |    8 +-
 .../jasper-clear-cache/scriptbody.ps1         |   24 +
 .../jira-transition-issues/metadata.json      |   75 ++
 .../jira-transition-issues/scriptbody.ps1     |  179 +++
 .../jira-update-version/metadata.json         |  103 ++
 .../jira-update-version/scriptbody.ps1        |  211 +++
 src/step-templates/json-merge/metadata.json   |   67 +
 src/step-templates/json-merge/scriptbody.ps1  |   80 ++
 .../jwt-generate-json-web-token/metadata.json |  135 ++
 .../scriptbody.ps1                            |  508 +++++++
 .../metadata.json                             |   83 ++
 .../scriptbody.ps1                            |  122 ++
 .../k8s-deploy-kustomize/metadata.json        |    4 +-
 .../k8s-deploy-kustomize/scriptbody.sh        |   16 +
 .../metadata.json                             |    4 +-
 .../scriptbody.sh                             |   54 +
 .../k8s-inspect-resource-pwsh/metadata.json   |   76 ++
 .../k8s-inspect-resource-pwsh/scriptbody.ps1  |  144 ++
 .../metadata.json                             |   75 ++
 .../scriptbody.ps1                            |  185 +++
 .../metadata.json                             |   72 +
 .../scriptbody.ps1                            |    5 +
 .../letsencrypt-azure-dns/metadata.json       |  113 ++
 .../letsencrypt-azure-dns/scriptbody.ps1      |  337 +++++
 .../letsencrypt-cloudflare/metadata.json      |  114 ++
 .../letsencrypt-cloudflare/scriptbody.ps1     |  333 +++++
 .../letsencrypt-dnsimple/metadata.json        |  114 ++
 .../letsencrypt-dnsimple/scriptbody.ps1       |  345 +++++
 .../letsencrypt-google-cloud/metadata.json    |  104 ++
 .../letsencrypt-google-cloud/scriptbody.ps1   |  328 +++++
 .../letsencrypt-route-53/metadata.json        |  103 ++
 .../letsencrypt-route-53/scriptbody.ps1       |  327 +++++
 .../letsencrypt-selfhosted-http/metadata.json |  123 ++
 .../scriptbody.ps1                            |  368 +++++
 .../metadata.json                             |   54 +
 .../scriptbody.sh                             |  103 ++
 .../liquibase-apply-changeset/metadata.json   |  188 +++
 .../liquibase-apply-changeset/scriptbody.ps1  |  473 +++++++
 .../liquibase-run-command/metadata.json       |  240 ++++
 .../liquibase-run-command/scriptbody.ps1      | 1180 +++++++++++++++++
 step-templates/Jenkins-Queue-Job.json         |  153 ---
 .../flyway-database-migrations.json           |  323 -----
 .../flyway-state-based-migration.json         |  192 ---
 step-templates/ftp-uploadfiles-package.json   |  146 --
 step-templates/ftp-uploadfiles.json           |  122 --
 .../git-clone-copy-push-another-repo.json     |  114 --
 .../git-clone-copy-push-package.json          |  100 --
 step-templates/git-clone-copy-push.json       |   84 --
 step-templates/git-create-pull-request.json   |   85 --
 step-templates/git-pull-https.json            |   58 -
 step-templates/git-push-https.json            |   67 -
 step-templates/git-tag-repository.json        |   75 --
 step-templates/github-report-deployment.json  |   94 --
 step-templates/grate-database-migration.json  |  251 ----
 ...rp-vault-approle-get-wrapped-secretid.json |   95 --
 .../hashicorp-vault-approle-login.json        |   85 --
 ...p-vault-approle-unwrap-secretid-login.json |   95 --
 ...shicorp-vault-approle-unwrap-secretid.json |   75 --
 .../hashicorp-vault-generate-jwt.json         |  106 --
 step-templates/hashicorp-vault-jwt-login.json |   85 --
 ...rp-vault-keyvalue-v1-retrieve-secrets.json |  116 --
 ...rp-vault-keyvalue-v2-retrieve-secrets.json |  126 --
 .../hashicorp-vault-ldap-login.json           |   85 --
 step-templates/hipchat-notify-api-v1.json     |   67 -
 step-templates/hipchat-notify.json            |   58 -
 .../hockeyapp-upload-mobile-app.json          |  157 ---
 step-templates/http-invoke-url.json           |   31 -
 step-templates/http-test-url.json             |  114 --
 .../iis-add-isapicgirestrictionexception.json |   40 -
 step-templates/iis-app-create.json            |  206 ---
 step-templates/iis-app-remove.json            |   40 -
 .../iis-app-set-connect-as-credential.json    |   64 -
 step-templates/iis-app-update-property.json   |   62 -
 step-templates/iis-apppool-delete.json        |   31 -
 step-templates/iis-apppool-stop.json          |   48 -
 .../iis-apppool-update-property.json          |   49 -
 .../iis-apppool-update-recycle-settings.json  |  103 --
 step-templates/iis-autostartprovider-add.json |   40 -
 .../iis-backup-iis-configuration.json         |   24 -
 step-templates/iis-bindings-backup.json       |   39 -
 .../iis-bindings-enable-ssl-ccs.json          |   54 -
 step-templates/iis-bindings-restore.json      |   40 -
 step-templates/iis-configure-compression.json |   40 -
 step-templates/iis-list-sites.json            |   21 -
 step-templates/iis-redirect-to-https.json     |   58 -
 .../iis-set-authentication.steptemplate.json  |   60 -
 step-templates/iis-set-http-redirect.json     |   85 --
 step-templates/iis-vdir-create.json           |   86 --
 .../iis-website-add-http-s-bindings.json      |   84 --
 ...add-release-number-to-response-header.json |   40 -
 ...is-website-add-windows-auth-providers.json |   51 -
 step-templates/iis-website-create.json        |  112 --
 step-templates/iis-website-delete.json        |   31 -
 .../iis-website-set-ip-security.json          |   70 -
 .../iis-website-set-log-format.json           |  275 ----
 step-templates/iis-website-stop.json          |   51 -
 .../iis-website-update-property.json          |   52 -
 .../import-cert-from-azure-keyvault.json      |  134 --
 .../import-databricks-workbooks.json          |   76 --
 step-templates/jira-transition-issues.json    |   75 --
 step-templates/jira-update-version.json       |  103 --
 step-templates/json-merge.json                |   67 -
 .../jwt-generate-json-web-token.json          |  135 --
 .../k8s-create-serviceaccount-and-target.json |   83 --
 step-templates/k8s-inspect-resource-pwsh.json |   76 --
 ...eeper-secretsmanager-retrieve-secrets.json |   75 --
 .../launchdarkly-toggle-feature-flag.json     |   72 -
 step-templates/letsencrypt-azure-dns.json     |  113 --
 step-templates/letsencrypt-cloudflare.json    |  113 --
 step-templates/letsencrypt-dnsimple.json      |  116 --
 step-templates/letsencrypt-google-cloud.json  |  103 --
 step-templates/letsencrypt-route-53.json      |  102 --
 .../letsencrypt-selfhosted-http.json          |  123 --
 .../linux-service-start-stop-restart.json     |   54 -
 step-templates/liquibase-apply-changeset.json |  188 ---
 step-templates/liquibase-run-command.json     |  240 ----
 276 files changed, 22168 insertions(+), 7243 deletions(-)
 create mode 100644 src/step-templates/Jenkins-Queue-Job/metadata.json
 create mode 100644 src/step-templates/Jenkins-Queue-Job/scriptbody.ps1
 rename step-templates/file-system-restore-directory.json => src/step-templates/file-system-restore-directory/metadata.json (64%)
 create mode 100644 src/step-templates/file-system-restore-directory/scriptbody.ps1
 rename step-templates/file-system-zip-directory-contents.json => src/step-templates/file-system-zip-directory-contents/metadata.json (59%)
 create mode 100644 src/step-templates/file-system-zip-directory-contents/scriptbody.ps1
 create mode 100644 src/step-templates/flyway-database-migrations/metadata.json
 create mode 100644 src/step-templates/flyway-database-migrations/scriptbody.ps1
 create mode 100644 src/step-templates/flyway-state-based-migration/metadata.json
 create mode 100644 src/step-templates/flyway-state-based-migration/scriptbody.ps1
 create mode 100644 src/step-templates/ftp-uploadfiles-package/metadata.json
 create mode 100644 src/step-templates/ftp-uploadfiles-package/scriptbody.ps1
 create mode 100644 src/step-templates/ftp-uploadfiles/metadata.json
 create mode 100644 src/step-templates/ftp-uploadfiles/scriptbody.ps1
 rename step-templates/gcp-secret-manager-retrieve-secret-oidc.json => src/step-templates/gcp-secret-manager-retrieve-secret-oidc/metadata.json (65%)
 create mode 100644 src/step-templates/gcp-secret-manager-retrieve-secret-oidc/scriptbody.ps1
 rename step-templates/gcp-secret-manager-retrieve-secrets.json => src/step-templates/gcp-secret-manager-retrieve-secrets/metadata.json (63%)
 create mode 100644 src/step-templates/gcp-secret-manager-retrieve-secrets/scriptbody.ps1
 rename step-templates/ghostinspector-runsuite.json => src/step-templates/ghostinspector-runsuite/metadata.json (50%)
 create mode 100644 src/step-templates/ghostinspector-runsuite/scriptbody.ps1
 create mode 100644 src/step-templates/git-clone-copy-push-another-repo/metadata.json
 create mode 100644 src/step-templates/git-clone-copy-push-another-repo/scriptbody.ps1
 create mode 100644 src/step-templates/git-clone-copy-push-package/metadata.json
 create mode 100644 src/step-templates/git-clone-copy-push-package/scriptbody.ps1
 create mode 100644 src/step-templates/git-clone-copy-push/metadata.json
 create mode 100644 src/step-templates/git-clone-copy-push/scriptbody.ps1
 create mode 100644 src/step-templates/git-create-pull-request/metadata.json
 create mode 100644 src/step-templates/git-create-pull-request/scriptbody.ps1
 create mode 100644 src/step-templates/git-pull-https/metadata.json
 create mode 100644 src/step-templates/git-pull-https/scriptbody.ps1
 create mode 100644 src/step-templates/git-push-https/metadata.json
 create mode 100644 src/step-templates/git-push-https/scriptbody.ps1
 create mode 100644 src/step-templates/git-tag-repository/metadata.json
 create mode 100644 src/step-templates/git-tag-repository/scriptbody.ps1
 create mode 100644 src/step-templates/github-report-deployment/metadata.json
 create mode 100644 src/step-templates/github-report-deployment/scriptbody.ps1
 rename step-templates/github-tag-release.json => src/step-templates/github-tag-release/metadata.json (68%)
 create mode 100644 src/step-templates/github-tag-release/scriptbody.ps1
 rename step-templates/gitlab-create-tag.json => src/step-templates/gitlab-create-tag/metadata.json (52%)
 create mode 100644 src/step-templates/gitlab-create-tag/scriptbody.ps1
 create mode 100644 src/step-templates/grate-database-migration/metadata.json
 create mode 100644 src/step-templates/grate-database-migration/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-approle-login/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-approle-login/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-approle-unwrap-secretid/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-approle-unwrap-secretid/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-generate-jwt/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-generate-jwt/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-jwt-login/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-jwt-login/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/scriptbody.ps1
 create mode 100644 src/step-templates/hashicorp-vault-ldap-login/metadata.json
 create mode 100644 src/step-templates/hashicorp-vault-ldap-login/scriptbody.ps1
 rename step-templates/hg-get-changelog.json => src/step-templates/hg-get-changelog/metadata.json (71%)
 create mode 100644 src/step-templates/hg-get-changelog/scriptbody.ps1
 create mode 100644 src/step-templates/hipchat-notify-api-v1/metadata.json
 create mode 100644 src/step-templates/hipchat-notify-api-v1/scriptbody.ps1
 create mode 100644 src/step-templates/hipchat-notify/metadata.json
 create mode 100644 src/step-templates/hipchat-notify/scriptbody.ps1
 create mode 100644 src/step-templates/hockeyapp-upload-mobile-app/metadata.json
 create mode 100644 src/step-templates/hockeyapp-upload-mobile-app/scriptbody.ps1
 create mode 100644 src/step-templates/http-invoke-url/metadata.json
 create mode 100644 src/step-templates/http-invoke-url/scriptbody.ps1
 rename step-templates/http-post-form.json => src/step-templates/http-post-form/metadata.json (52%)
 create mode 100644 src/step-templates/http-post-form/scriptbody.ps1
 create mode 100644 src/step-templates/http-test-url/metadata.json
 create mode 100644 src/step-templates/http-test-url/scriptbody.ps1
 create mode 100644 src/step-templates/iis-add-isapicgirestrictionexception/metadata.json
 create mode 100644 src/step-templates/iis-add-isapicgirestrictionexception/scriptbody.ps1
 create mode 100644 src/step-templates/iis-app-create/metadata.json
 create mode 100644 src/step-templates/iis-app-create/scriptbody.ps1
 create mode 100644 src/step-templates/iis-app-remove/metadata.json
 create mode 100644 src/step-templates/iis-app-remove/scriptbody.ps1
 create mode 100644 src/step-templates/iis-app-set-connect-as-credential/metadata.json
 create mode 100644 src/step-templates/iis-app-set-connect-as-credential/scriptbody.ps1
 create mode 100644 src/step-templates/iis-app-update-property/metadata.json
 create mode 100644 src/step-templates/iis-app-update-property/scriptbody.ps1
 rename step-templates/iis-apppool-create.json => src/step-templates/iis-apppool-create/metadata.json (50%)
 create mode 100644 src/step-templates/iis-apppool-create/scriptbody.ps1
 create mode 100644 src/step-templates/iis-apppool-delete/metadata.json
 create mode 100644 src/step-templates/iis-apppool-delete/scriptbody.ps1
 rename step-templates/iis-apppool-restart.json => src/step-templates/iis-apppool-restart/metadata.json (51%)
 create mode 100644 src/step-templates/iis-apppool-restart/scriptbody.ps1
 rename step-templates/iis-apppool-set-managed-pipeline-mode.json => src/step-templates/iis-apppool-set-managed-pipeline-mode/metadata.json (76%)
 create mode 100644 src/step-templates/iis-apppool-set-managed-pipeline-mode/scriptbody.ps1
 rename step-templates/iis-apppool-start.json => src/step-templates/iis-apppool-start/metadata.json (65%)
 create mode 100644 src/step-templates/iis-apppool-start/scriptbody.ps1
 create mode 100644 src/step-templates/iis-apppool-stop/metadata.json
 create mode 100644 src/step-templates/iis-apppool-stop/scriptbody.ps1
 create mode 100644 src/step-templates/iis-apppool-update-property/metadata.json
 create mode 100644 src/step-templates/iis-apppool-update-property/scriptbody.ps1
 create mode 100644 src/step-templates/iis-apppool-update-recycle-settings/metadata.json
 create mode 100644 src/step-templates/iis-apppool-update-recycle-settings/scriptbody.ps1
 create mode 100644 src/step-templates/iis-autostartprovider-add/metadata.json
 create mode 100644 src/step-templates/iis-autostartprovider-add/scriptbody.ps1
 create mode 100644 src/step-templates/iis-backup-iis-configuration/metadata.json
 create mode 100644 src/step-templates/iis-backup-iis-configuration/scriptbody.ps1
 rename step-templates/iis-bind-ssl-certificate-with-sni-enabled.json => src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/metadata.json (67%)
 create mode 100644 src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/scriptbody.ps1
 create mode 100644 src/step-templates/iis-bindings-backup/metadata.json
 create mode 100644 src/step-templates/iis-bindings-backup/scriptbody.ps1
 create mode 100644 src/step-templates/iis-bindings-enable-ssl-ccs/metadata.json
 create mode 100644 src/step-templates/iis-bindings-enable-ssl-ccs/scriptbody.ps1
 create mode 100644 src/step-templates/iis-bindings-restore/metadata.json
 create mode 100644 src/step-templates/iis-bindings-restore/scriptbody.ps1
 rename step-templates/iis-change-app-offline-online.json => src/step-templates/iis-change-app-offline-online/metadata.json (57%)
 create mode 100644 src/step-templates/iis-change-app-offline-online/scriptbody.ps1
 create mode 100644 src/step-templates/iis-configure-compression/metadata.json
 create mode 100644 src/step-templates/iis-configure-compression/scriptbody.ps1
 create mode 100644 src/step-templates/iis-list-sites/metadata.json
 create mode 100644 src/step-templates/iis-list-sites/scriptbody.ps1
 create mode 100644 src/step-templates/iis-redirect-to-https/metadata.json
 create mode 100644 src/step-templates/iis-redirect-to-https/scriptbody.ps1
 rename step-templates/iis-reset.json => src/step-templates/iis-reset/metadata.json (60%)
 create mode 100644 src/step-templates/iis-reset/scriptbody.ps1
 create mode 100644 src/step-templates/iis-set-authentication.steptemplate/metadata.json
 create mode 100644 src/step-templates/iis-set-authentication.steptemplate/scriptbody.ps1
 create mode 100644 src/step-templates/iis-set-http-redirect/metadata.json
 create mode 100644 src/step-templates/iis-set-http-redirect/scriptbody.ps1
 create mode 100644 src/step-templates/iis-vdir-create/metadata.json
 create mode 100644 src/step-templates/iis-vdir-create/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-add-http-s-bindings/metadata.json
 create mode 100644 src/step-templates/iis-website-add-http-s-bindings/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-add-release-number-to-response-header/metadata.json
 create mode 100644 src/step-templates/iis-website-add-release-number-to-response-header/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-add-windows-auth-providers/metadata.json
 create mode 100644 src/step-templates/iis-website-add-windows-auth-providers/scriptbody.ps1
 rename step-templates/iis-website-appfabric-application-start.json => src/step-templates/iis-website-appfabric-application-start/metadata.json (55%)
 create mode 100644 src/step-templates/iis-website-appfabric-application-start/scriptbody.ps1
 rename step-templates/iis-website-appfabric-application-stop.json => src/step-templates/iis-website-appfabric-application-stop/metadata.json (55%)
 create mode 100644 src/step-templates/iis-website-appfabric-application-stop/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-create/metadata.json
 create mode 100644 src/step-templates/iis-website-create/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-delete/metadata.json
 create mode 100644 src/step-templates/iis-website-delete/scriptbody.ps1
 rename step-templates/iis-website-restart.json => src/step-templates/iis-website-restart/metadata.json (56%)
 create mode 100644 src/step-templates/iis-website-restart/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-set-ip-security/metadata.json
 create mode 100644 src/step-templates/iis-website-set-ip-security/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-set-log-format/metadata.json
 create mode 100644 src/step-templates/iis-website-set-log-format/scriptbody.ps1
 rename step-templates/iis-website-start.json => src/step-templates/iis-website-start/metadata.json (51%)
 create mode 100644 src/step-templates/iis-website-start/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-stop/metadata.json
 create mode 100644 src/step-templates/iis-website-stop/scriptbody.ps1
 rename step-templates/iis-website-update-iis-log-path.json => src/step-templates/iis-website-update-iis-log-path/metadata.json (52%)
 create mode 100644 src/step-templates/iis-website-update-iis-log-path/scriptbody.ps1
 create mode 100644 src/step-templates/iis-website-update-property/metadata.json
 create mode 100644 src/step-templates/iis-website-update-property/scriptbody.ps1
 create mode 100644 src/step-templates/import-cert-from-azure-keyvault/metadata.json
 create mode 100644 src/step-templates/import-cert-from-azure-keyvault/scriptbody.ps1
 create mode 100644 src/step-templates/import-databricks-workbooks/metadata.json
 create mode 100644 src/step-templates/import-databricks-workbooks/scriptbody.ps1
 rename step-templates/jasper-clear-cache.json => src/step-templates/jasper-clear-cache/metadata.json (55%)
 create mode 100644 src/step-templates/jasper-clear-cache/scriptbody.ps1
 create mode 100644 src/step-templates/jira-transition-issues/metadata.json
 create mode 100644 src/step-templates/jira-transition-issues/scriptbody.ps1
 create mode 100644 src/step-templates/jira-update-version/metadata.json
 create mode 100644 src/step-templates/jira-update-version/scriptbody.ps1
 create mode 100644 src/step-templates/json-merge/metadata.json
 create mode 100644 src/step-templates/json-merge/scriptbody.ps1
 create mode 100644 src/step-templates/jwt-generate-json-web-token/metadata.json
 create mode 100644 src/step-templates/jwt-generate-json-web-token/scriptbody.ps1
 create mode 100644 src/step-templates/k8s-create-serviceaccount-and-target/metadata.json
 create mode 100644 src/step-templates/k8s-create-serviceaccount-and-target/scriptbody.ps1
 rename step-templates/k8s-deploy-kustomize.json => src/step-templates/k8s-deploy-kustomize/metadata.json (73%)
 create mode 100644 src/step-templates/k8s-deploy-kustomize/scriptbody.sh
 rename step-templates/k8s-eksctl-create-cluster-bash.json => src/step-templates/k8s-eksctl-create-cluster-bash/metadata.json (63%)
 create mode 100644 src/step-templates/k8s-eksctl-create-cluster-bash/scriptbody.sh
 create mode 100644 src/step-templates/k8s-inspect-resource-pwsh/metadata.json
 create mode 100644 src/step-templates/k8s-inspect-resource-pwsh/scriptbody.ps1
 create mode 100644 src/step-templates/keeper-secretsmanager-retrieve-secrets/metadata.json
 create mode 100644 src/step-templates/keeper-secretsmanager-retrieve-secrets/scriptbody.ps1
 create mode 100644 src/step-templates/launchdarkly-toggle-feature-flag/metadata.json
 create mode 100644 src/step-templates/launchdarkly-toggle-feature-flag/scriptbody.ps1
 create mode 100644 src/step-templates/letsencrypt-azure-dns/metadata.json
 create mode 100644 src/step-templates/letsencrypt-azure-dns/scriptbody.ps1
 create mode 100644 src/step-templates/letsencrypt-cloudflare/metadata.json
 create mode 100644 src/step-templates/letsencrypt-cloudflare/scriptbody.ps1
 create mode 100644 src/step-templates/letsencrypt-dnsimple/metadata.json
 create mode 100644 src/step-templates/letsencrypt-dnsimple/scriptbody.ps1
 create mode 100644 src/step-templates/letsencrypt-google-cloud/metadata.json
 create mode 100644 src/step-templates/letsencrypt-google-cloud/scriptbody.ps1
 create mode 100644 src/step-templates/letsencrypt-route-53/metadata.json
 create mode 100644 src/step-templates/letsencrypt-route-53/scriptbody.ps1
 create mode 100644 src/step-templates/letsencrypt-selfhosted-http/metadata.json
 create mode 100644 src/step-templates/letsencrypt-selfhosted-http/scriptbody.ps1
 create mode 100644 src/step-templates/linux-service-start-stop-restart/metadata.json
 create mode 100644 src/step-templates/linux-service-start-stop-restart/scriptbody.sh
 create mode 100644 src/step-templates/liquibase-apply-changeset/metadata.json
 create mode 100644 src/step-templates/liquibase-apply-changeset/scriptbody.ps1
 create mode 100644 src/step-templates/liquibase-run-command/metadata.json
 create mode 100644 src/step-templates/liquibase-run-command/scriptbody.ps1
 delete mode 100644 step-templates/Jenkins-Queue-Job.json
 delete mode 100644 step-templates/flyway-database-migrations.json
 delete mode 100644 step-templates/flyway-state-based-migration.json
 delete mode 100644 step-templates/ftp-uploadfiles-package.json
 delete mode 100644 step-templates/ftp-uploadfiles.json
 delete mode 100644 step-templates/git-clone-copy-push-another-repo.json
 delete mode 100644 step-templates/git-clone-copy-push-package.json
 delete mode 100644 step-templates/git-clone-copy-push.json
 delete mode 100644 step-templates/git-create-pull-request.json
 delete mode 100644 step-templates/git-pull-https.json
 delete mode 100644 step-templates/git-push-https.json
 delete mode 100644 step-templates/git-tag-repository.json
 delete mode 100644 step-templates/github-report-deployment.json
 delete mode 100644 step-templates/grate-database-migration.json
 delete mode 100644 step-templates/hashicorp-vault-approle-get-wrapped-secretid.json
 delete mode 100644 step-templates/hashicorp-vault-approle-login.json
 delete mode 100644 step-templates/hashicorp-vault-approle-unwrap-secretid-login.json
 delete mode 100644 step-templates/hashicorp-vault-approle-unwrap-secretid.json
 delete mode 100644 step-templates/hashicorp-vault-generate-jwt.json
 delete mode 100644 step-templates/hashicorp-vault-jwt-login.json
 delete mode 100644 step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets.json
 delete mode 100644 step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets.json
 delete mode 100644 step-templates/hashicorp-vault-ldap-login.json
 delete mode 100644 step-templates/hipchat-notify-api-v1.json
 delete mode 100644 step-templates/hipchat-notify.json
 delete mode 100644 step-templates/hockeyapp-upload-mobile-app.json
 delete mode 100644 step-templates/http-invoke-url.json
 delete mode 100644 step-templates/http-test-url.json
 delete mode 100644 step-templates/iis-add-isapicgirestrictionexception.json
 delete mode 100644 step-templates/iis-app-create.json
 delete mode 100644 step-templates/iis-app-remove.json
 delete mode 100644 step-templates/iis-app-set-connect-as-credential.json
 delete mode 100644 step-templates/iis-app-update-property.json
 delete mode 100644 step-templates/iis-apppool-delete.json
 delete mode 100644 step-templates/iis-apppool-stop.json
 delete mode 100644 step-templates/iis-apppool-update-property.json
 delete mode 100644 step-templates/iis-apppool-update-recycle-settings.json
 delete mode 100644 step-templates/iis-autostartprovider-add.json
 delete mode 100644 step-templates/iis-backup-iis-configuration.json
 delete mode 100644 step-templates/iis-bindings-backup.json
 delete mode 100644 step-templates/iis-bindings-enable-ssl-ccs.json
 delete mode 100644 step-templates/iis-bindings-restore.json
 delete mode 100644 step-templates/iis-configure-compression.json
 delete mode 100644 step-templates/iis-list-sites.json
 delete mode 100644 step-templates/iis-redirect-to-https.json
 delete mode 100644 step-templates/iis-set-authentication.steptemplate.json
 delete mode 100644 step-templates/iis-set-http-redirect.json
 delete mode 100644 step-templates/iis-vdir-create.json
 delete mode 100644 step-templates/iis-website-add-http-s-bindings.json
 delete mode 100644 step-templates/iis-website-add-release-number-to-response-header.json
 delete mode 100644 step-templates/iis-website-add-windows-auth-providers.json
 delete mode 100644 step-templates/iis-website-create.json
 delete mode 100644 step-templates/iis-website-delete.json
 delete mode 100644 step-templates/iis-website-set-ip-security.json
 delete mode 100644 step-templates/iis-website-set-log-format.json
 delete mode 100644 step-templates/iis-website-stop.json
 delete mode 100644 step-templates/iis-website-update-property.json
 delete mode 100644 step-templates/import-cert-from-azure-keyvault.json
 delete mode 100644 step-templates/import-databricks-workbooks.json
 delete mode 100644 step-templates/jira-transition-issues.json
 delete mode 100644 step-templates/jira-update-version.json
 delete mode 100644 step-templates/json-merge.json
 delete mode 100644 step-templates/jwt-generate-json-web-token.json
 delete mode 100644 step-templates/k8s-create-serviceaccount-and-target.json
 delete mode 100644 step-templates/k8s-inspect-resource-pwsh.json
 delete mode 100644 step-templates/keeper-secretsmanager-retrieve-secrets.json
 delete mode 100644 step-templates/launchdarkly-toggle-feature-flag.json
 delete mode 100644 step-templates/letsencrypt-azure-dns.json
 delete mode 100644 step-templates/letsencrypt-cloudflare.json
 delete mode 100644 step-templates/letsencrypt-dnsimple.json
 delete mode 100644 step-templates/letsencrypt-google-cloud.json
 delete mode 100644 step-templates/letsencrypt-route-53.json
 delete mode 100644 step-templates/letsencrypt-selfhosted-http.json
 delete mode 100644 step-templates/linux-service-start-stop-restart.json
 delete mode 100644 step-templates/liquibase-apply-changeset.json
 delete mode 100644 step-templates/liquibase-run-command.json

diff --git a/src/step-templates/Jenkins-Queue-Job/metadata.json b/src/step-templates/Jenkins-Queue-Job/metadata.json
new file mode 100644
index 000000000..391b3e794
--- /dev/null
+++ b/src/step-templates/Jenkins-Queue-Job/metadata.json
@@ -0,0 +1,153 @@
+{
+  "Id": "ccb7ad4c-a19e-426f-822e-cd0e0243bda3",
+  "Name": "Jenkins - Queue Job",
+  "Description": "Trigger a job in Jenkins",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b8337514-3989-4b33-930c-b5ebde5b4be0",
+      "Name": "jqj_JobUrl",
+      "Label": "Job Url",
+      "HelpText": "e.g. job/jobname",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a52f7318-6f45-4e9f-b825-b3ae767608f8",
+      "Name": "jqj_FailBuild",
+      "Label": "Fail Deployment",
+      "HelpText": "Fail the deployment if the job fails or time-out occurs.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a59c57d3-0177-470c-80e0-f103e57f30d3",
+      "Name": "jqj_JobTimeout",
+      "Label": "Timeout Duration(secs)",
+      "HelpText": "e.g. 60. Specify in secs how long to check for the job status before timing out.",
+      "DefaultValue": "0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "be446e7d-a1db-41e1-9df2-be2246d93052",
+      "Name": "jqj_WaitForComplete",
+      "Label": "Wait for complete",
+      "HelpText": "Wait until the job has completed, overrides `Timeout Duration`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "70e9cf06-3712-4950-a174-a5c5c7bd5858",
+      "Name": "jqj_BuildParam",
+      "Label": "Build Param",
+      "HelpText": "To use build parameters, update `/build` to `/buildWithParameters`\ne.g. ?Param=Value or ?delay=10sec\n",
+      "DefaultValue": "/build",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "da8cdc0a-3cd8-4b34-9e5d-13245f77002c",
+      "Name": "jqj_JenkinsServer",
+      "Label": "Jenkins Server",
+      "HelpText": null,
+      "DefaultValue": "http://jenkins:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1e43a971-d6a2-4692-8dd2-d8b5344b706c",
+      "Name": "jqj_JenkinsUserName",
+      "Label": "Jenkins User Name",
+      "HelpText": "(Optional) User name  to use to connect to the Jenkins Server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fba79fa0-9221-4cd1-9259-5d59e716f0db",
+      "Name": "jqj_JenkinsUserPasword",
+      "Label": "Jenkins User Password",
+      "HelpText": "(Optional) The password to use to connect to the Jenkins Server.  In newer versions of Jenkins, this needs to be the API token for the user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9fea70e1-ff39-4cc1-8937-7cc19b959e17",
+      "Name": "jqj_checkInterval",
+      "Label": "Check Interval",
+      "HelpText": "The sleep time between checking if the job is running in seconds",
+      "DefaultValue": "20",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "432dbaed-512e-4d29-9b4d-814a8b7c4846",
+      "Name": "jqj_FetchBuildWait",
+      "Label": "Fetch Build URL Wait(secs)",
+      "HelpText": "e.g. 10 Used when getting the build URL. Useful if Jenkins is busy and can't schedule job immediately or there are connection issues. Helps limit excess calls to /api",
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cd222e86-cb94-495c-8a5a-8d4cd8b20d86",
+      "Name": "jqj_FetchBuildLimit",
+      "Label": "Fetch Build URL Limit",
+      "HelpText": "e.g. 5. Used to limit the number of times the script asks for the build URL. Used in with FetchBuildURLWait to limit the calls made to /api for build URL.",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5d1a7a9a-f4cc-40fc-93a8-760797cb1cc4",
+      "Name": "jqj_AttachBuildLog",
+      "Label": "Attach build log",
+      "HelpText": "Attaches the build log from Jenkins as an [Artifact](https://octopus.com/docs/projects/deployment-process/artifacts).  This feature will only work when `Wait for complete` is also enabled.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2024-07-16T18:49:59.8950000Z",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2025-02-11T22:39:29.8590000Z",
+    "OctopusVersion": "2024.4.7147",
+    "Type": "ActionTemplate"
+  },
+  "Category": "jenkins"
+}
diff --git a/src/step-templates/Jenkins-Queue-Job/scriptbody.ps1 b/src/step-templates/Jenkins-Queue-Job/scriptbody.ps1
new file mode 100644
index 000000000..8b88763ba
--- /dev/null
+++ b/src/step-templates/Jenkins-Queue-Job/scriptbody.ps1
@@ -0,0 +1,154 @@
+$jenkinsServer = $OctopusParameters['jqj_JenkinsServer'] 
+$jenkinsUserName = $OctopusParameters['jqj_JenkinsUserName']
+$jenkinsUserPassword = $OctopusParameters['jqj_JenkinsUserPasword']
+$jobURL = $jenkinsServer + $OctopusParameters['jqj_JobUrl']
+$failBuild = [System.Convert]::ToBoolean($OctopusParameters['jqj_FailBuild'])
+$jobTimeout = $OctopusParameters['jqj_JobTimeout']
+$buildParam = $OctopusParameters['jqj_BuildParam']
+$checkIntervals = $OctopusParameters['jqj_checkInterval']
+$fetchBuildWait = $OctopusParameters['jqj_FetchBuildWait']
+$fetchBuildLimit = $OctopusParameters['jqj_FetchBuildLimit']
+$waitForComplete = $OctopusParameters['jqj_WaitForComplete']
+$attachBuildLog = ([System.Convert]::ToBoolean($OctopusParameters['jqj_AttachBuildLog']))
+
+$jobUrlWithParams = "$jobURL$buildParam"
+
+Write-Host "job url: " $jobUrlWithParams 
+
+function Get-JenkinsAuth
+{
+    $params = @{}
+    if (![string]::IsNullOrWhiteSpace($jenkinsUserName)) {
+        $securePwd = ConvertTo-SecureString $jenkinsUserPassword -AsPlainText -Force 
+        $credential = New-Object System.Management.Automation.PSCredential ($jenkinsUserName, $securePwd) 
+        $head = @{"Authorization" = "Basic " + [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($jenkinsUserName + ":" + $jenkinsUserPassword ))}
+        $params = @{
+            Headers = $head;
+            Credential = $credential;
+            ContentType = "text/plain";
+        }
+    }
+
+    # If your Jenkins uses the "Prevent Cross Site Request Forgery exploits" security option (which it should), 
+    # when you make a POST request, you have to send a CSRF protection token as an HTTP request header.
+    # https://wiki.jenkins.io/display/JENKINS/Remote+access+API
+    try {
+        $tokenUrl = $jenkinsServer + "crumbIssuer/api/json?tree=crumbRequestField,crumb"
+        $crumbResult = Invoke-WebRequest -Uri $tokenUrl -Method Get @params -UseBasicParsing | ConvertFrom-Json
+        Write-Host "CSRF protection is enabled, adding CSRF token to request headers"
+        $params.Headers += @{$crumbResult.crumbRequestField = $crumbResult.crumb}
+    } catch {
+        Write-Host "Failed to get CSRF token, CSRF may not be enabled"
+        Write-Host $Error[0]
+    }
+    return $params
+}
+
+try {
+    Write-Host "Fetching Jenkins auth params"
+    $authParams = Get-JenkinsAuth
+
+    Write-Host "Start the build"
+    $returned = Invoke-WebRequest -Uri $jobUrlWithParams  -Method Post -UseBasicParsing @authParams
+    Write-Host "Job URL Link: $($returned.Headers['Location'])"
+    $jobResult = "$($returned.Headers['Location'])/api/json"
+    $response = Invoke-RestMethod -Uri $jobResult -Method Get @authParams
+    $buildUrl = $Response.executable.url
+    $result = ""
+    $c = 0
+    while (($null -eq $buildUrl -or $buildUrl -eq "") -and ($c -lt $fetchBuildLimit) ) {
+        $c += 1
+        $response = Invoke-RestMethod -Uri $jobResult -Method Get @authParams
+        $buildUrl = $Response.executable.url
+        Start-Sleep -s $fetchBuildWait
+    }
+    Write-Host "Build Number is: $($Response.executable.number)"
+    #Write-Host "Job URL Is: $($buildUrl)"
+    Write-Highlight "Job URL Is: [$($buildUrl)]($($buildUrl))"
+    $buildResult = "$buildUrl/api/json?tree=result,number,building"
+        
+    $isBuilding = "True"
+       
+    if ($waitForComplete -eq "True")
+    {
+      while ($isBuilding -eq "True") {       
+          Write-Host "waiting $checkIntervals secs for build to complete"
+          Start-Sleep -s $checkIntervals
+          $retyJobStatus = Invoke-RestMethod -Uri $buildResult -Method Get @authParams
+
+          $isBuilding = $retyJobStatus[0].building
+          $result = $retyJobStatus[0].result
+          $buildNumber = $retyJobStatus[0].number
+          
+          Write-Host "Retry Job Status: " $result " BuildNumber: "  $buildNumber  " IsBuilding: "  $isBuilding 
+      }
+
+        # Get log from Jenkins
+        $buildLog = (Invoke-WebRequest -Uri "$($buildUrl)/logText/progressiveText?start=0"  -Method Post -UseBasicParsing @authParams)
+
+        Write-Host "$buildLog"
+
+        # Check to see if the log needs to be attached
+        if ($attachBuildLog)
+        {
+           # Send the build log to a file
+          Write-Host "Getting log file ..."
+          Set-Content -Path "$PWD/#{Octopus.Step.Name}.log" -Value $buildLog
+  
+          # Attach build log as artifact
+          Write-Host "Attaching log file as artifact ..."
+          New-OctopusArtifact -Path "$PWD/#{Octopus.Step.Name}.log" -Name "#{Octopus.Step.Name}.log"       
+        }
+    }
+    else
+    {
+    
+      $i = 0
+      Write-Host "Estimate Job Duration: " $jobTimeout
+      while ($isBuilding -eq "True" -and $i -lt $jobTimeout) {       
+          $i += 5
+          Write-Host "waiting $checkIntervals secs for build to complete"
+          Start-Sleep -s $checkIntervals
+          $retyJobStatus = Invoke-RestMethod -Uri $buildResult -Method Get @authParams
+
+          $isBuilding = $retyJobStatus[0].building
+          $result = $retyJobStatus[0].result
+          $buildNumber = $retyJobStatus[0].number
+          Write-Host "Retry Job Status: " $result " BuildNumber: "  $buildNumber  " IsBuilding: "  $isBuilding 
+      }     
+    }
+
+
+     
+    if ($failBuild) {
+        if ($result -ne "SUCCESS") {
+            if (![string]::IsNullOrWhitespace($result))
+            {
+              Write-Host "Build ended with status: $result"
+            }
+            else
+            {
+              Write-Host "BUILD FAILURE: build status could not be obtained."
+            }
+            exit 1
+        }
+    }
+  else
+  {
+    if ([string]::IsNullOrWhitespace($result))
+    {
+      Write-Warning "Time-out expired before a status was returned."
+    }
+    else
+    {
+      Write-host "Process ended with status: $result."
+    }
+  }
+}
+catch {
+    Write-Host "Exception in jenkins job: $($_.Exception.Message)"
+    exit 1
+}
+
+
+
diff --git a/step-templates/file-system-restore-directory.json b/src/step-templates/file-system-restore-directory/metadata.json
similarity index 64%
rename from step-templates/file-system-restore-directory.json
rename to src/step-templates/file-system-restore-directory/metadata.json
index bd077c66b..8d790be98 100644
--- a/step-templates/file-system-restore-directory.json
+++ b/src/step-templates/file-system-restore-directory/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$source = $OctopusParameters['Source']\r\n$destination = $OctopusParameters['Destination']\r\n\r\nif(Test-Path $destination)\r\n{\r\n    ## Clean the destination folder\r\n    Write-Host \"Cleaning $destination\"\r\n    Remove-Item $destination -Recurse\r\n}\r\n\r\n## Copy recursively\r\nWrite-Host \"Copying from $source to $destination\"\r\nCopy-Item $source $destination -Recurse",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -29,11 +29,11 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-12-06T00:00:00.000+00:00",
+    "ExportedAt": "2015-12-05T16:00:00.0000000-08:00",
     "Type": "ActionTemplate"
   },
   "Category": "filesystem"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/file-system-restore-directory/scriptbody.ps1 b/src/step-templates/file-system-restore-directory/scriptbody.ps1
new file mode 100644
index 000000000..db4491a33
--- /dev/null
+++ b/src/step-templates/file-system-restore-directory/scriptbody.ps1
@@ -0,0 +1,13 @@
+$source = $OctopusParameters['Source']
+$destination = $OctopusParameters['Destination']
+
+if(Test-Path $destination)
+{
+    ## Clean the destination folder
+    Write-Host "Cleaning $destination"
+    Remove-Item $destination -Recurse
+}
+
+## Copy recursively
+Write-Host "Copying from $source to $destination"
+Copy-Item $source $destination -Recurse
\ No newline at end of file
diff --git a/step-templates/file-system-zip-directory-contents.json b/src/step-templates/file-system-zip-directory-contents/metadata.json
similarity index 59%
rename from step-templates/file-system-zip-directory-contents.json
rename to src/step-templates/file-system-zip-directory-contents/metadata.json
index 24137c746..7da9fda62 100644
--- a/step-templates/file-system-zip-directory-contents.json
+++ b/src/step-templates/file-system-zip-directory-contents/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 12,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$SourceDirectoryName = $OctopusParameters['SourceDirectoryName']\r\n$DestinationArchiveFileName = $OctopusParameters['DestinationArchiveFileName']\r\n$CompressionLevel = $OctopusParameters['CompressionLevel']\r\n$IncludeBaseDirectory = $OctopusParameters['IncludeBaseDirectory']\r\n$OverwriteDestination = $OctopusParameters['OverwriteDestination']\r\n\r\nif (!$SourceDirectoryName)\r\n{\r\n    Write-Error \"No Source Directory name was specified. Please specify the name of the directory to that will be zipped.\"\r\n    exit -2\r\n}\r\n\r\nif (!$DestinationArchiveFileName)\r\n{\r\n    Write-Error \"No Destination Archive File name was specified. Please specify the name of the zip file to be created.\"\r\n    exit -2\r\n}\r\n\r\nif (($OverwriteDestination) -and (Test-Path $DestinationArchiveFileName))\r\n{\r\n    Write-Host \"$DestinationArchiveFileName already exists. Will delete it before we create a new zip file with the same name.\"\r\n    Remove-Item $DestinationArchiveFileName\r\n}\r\n\r\nWrite-Host \"Creating Zip file $DestinationArchiveFileName with the contents of directory $SourceDirectoryName using compression level $CompressionLevel\"\r\n\r\n$assembly = [Reflection.Assembly]::LoadWithPartialName(\"System.IO.Compression.FileSystem\")\r\n[System.IO.Compression.ZipFile]::CreateFromDirectory($SourceDirectoryName, $DestinationArchiveFileName, $CompressionLevel, $IncludeBaseDirectory)\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -57,10 +57,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2018-02-08T22:24:00.817+00:00",
+  "LastModifiedOn": "2018-02-08T14:24:00.8170000-08:00",
   "LastModifiedBy": "curiousdev",
   "$Meta": {
-    "ExportedAt": "2018-02-08T22:24:00.817+00:00",
+    "ExportedAt": "2018-02-08T14:24:00.8170000-08:00",
     "OctopusVersion": "2.5.8.447",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/file-system-zip-directory-contents/scriptbody.ps1 b/src/step-templates/file-system-zip-directory-contents/scriptbody.ps1
new file mode 100644
index 000000000..83fab38a1
--- /dev/null
+++ b/src/step-templates/file-system-zip-directory-contents/scriptbody.ps1
@@ -0,0 +1,28 @@
+$SourceDirectoryName = $OctopusParameters['SourceDirectoryName']
+$DestinationArchiveFileName = $OctopusParameters['DestinationArchiveFileName']
+$CompressionLevel = $OctopusParameters['CompressionLevel']
+$IncludeBaseDirectory = $OctopusParameters['IncludeBaseDirectory']
+$OverwriteDestination = $OctopusParameters['OverwriteDestination']
+
+if (!$SourceDirectoryName)
+{
+    Write-Error "No Source Directory name was specified. Please specify the name of the directory to that will be zipped."
+    exit -2
+}
+
+if (!$DestinationArchiveFileName)
+{
+    Write-Error "No Destination Archive File name was specified. Please specify the name of the zip file to be created."
+    exit -2
+}
+
+if (($OverwriteDestination) -and (Test-Path $DestinationArchiveFileName))
+{
+    Write-Host "$DestinationArchiveFileName already exists. Will delete it before we create a new zip file with the same name."
+    Remove-Item $DestinationArchiveFileName
+}
+
+Write-Host "Creating Zip file $DestinationArchiveFileName with the contents of directory $SourceDirectoryName using compression level $CompressionLevel"
+
+$assembly = [Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
+[System.IO.Compression.ZipFile]::CreateFromDirectory($SourceDirectoryName, $DestinationArchiveFileName, $CompressionLevel, $IncludeBaseDirectory)
diff --git a/src/step-templates/flyway-database-migrations/metadata.json b/src/step-templates/flyway-database-migrations/metadata.json
new file mode 100644
index 000000000..1dc526584
--- /dev/null
+++ b/src/step-templates/flyway-database-migrations/metadata.json
@@ -0,0 +1,323 @@
+{
+  "Id": "ccebac39-79a8-4ab4-b55f-19ea570d9ebc",
+  "Name": "Flyway Database Migrations",
+  "Description": "Step template to leverage Flyway to deploy migration scripts.  This is the latest and greatest Flyway step template that leverages all the newest features of both Flyway and Octopus Deploy.\n\n- You can include the flyway executables in your package, if you include the `flyway` (Linux) or `flyway.cmd` (Windows) in the root of the package this step template will automatically find them.\n- You can use this with an execution container, negating the need to include Flyway in the package. If Flyway isn't found in the package it will attempt to find `/flyway/flyway` (when using Linux containers) or `flyway` in the environment path and use that.\n- Support for all Flyway commands, including the `undo` command.\n- Support for flyway community, teams, enterprise, and pro editions.  \n\nPlease note this requires Octopus Deploy **2019.10.0** or newer along with PowerShell Core installed on the machines running this step.\nAWS EC2 IAM Authentication requires the AWS CLI to be installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 15,
+  "Packages": [
+    {
+      "Name": "Flyway.Package.Value",
+      "Id": "0c0d333c-d794-4a16-a3a2-4bbba4550763",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Flyway.Package.Value"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.PowerShell.Edition": "Core",
+    "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows"
+  },
+  "Parameters": [
+    {
+      "Id": "a4ba9557-61d3-4d93-99d9-9937abaded9c",
+      "Name": "Flyway.Package.Value",
+      "Label": "Flyway Package",
+      "HelpText": "**Required**\n\nThe package containing the migration scripts you want Flyway to run.  Please refer to [documentation](https://flywaydb.org/documentation/concepts/migrations) for core concepts and naming conventions.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "02d50d4c-02f9-44c2-8ee0-3fc69a21a165",
+      "Name": "Flyway.Executable.Path",
+      "Label": "Flyway Executable Path",
+      "HelpText": "**Optional**\n\nThe path of the flyway executable.  It can either be a relative path or an absolute path.\n\nWhen not provided, this step template will test for the following.  The step template places precedence on the version of the flyway included in the package. If Flyway is NOT found in the package, it will attempt to see if it is installed on the server by checking common paths.\n\nRunning on `Linux`:\n- `.flyway`: the package being deployed includes flyway and is running on Linux\n- `/flyway/flyway`: The default path for the Linux execution container.\n\nRunning on Windows:\n- `\\.flyway.cmd`: the package being deployed includes flyway and is running on Windows\n- `flyway`: the package is in the path on the Windows VM or Windows Execution container.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6e6e98ae-7e57-4bf7-a280-7c4a6bc57760",
+      "Name": "Flyway.Command.Value",
+      "Label": "Flyway Command",
+      "HelpText": "**Required**\n\nThe [flyway command](https://flywaydb.org/documentation/usage/commandline/) you wish to run.\n\n- `Migrate`: Migrates the schema to the latest version\n- `Migrate Dry Run`: Does a migration dry run and saves the results to a file that is uploaded as an artifact.  This works for the `Teams` version of Flyway only.\n- `Check Changes`: Produces a report indicating differences between applied migration scripts on your target database and pending migrations scripts (ie. the set of instructions you want to use to change your target database).  This will report on the differences and perform a dry-run migration.  Check Redgate's documentation to ensure your server technology is supported.  Available to `Enterprise` licenses only.\n- `Check Drift`: Produces a report indicating differences between the structure of your target database and the structure created by the migrations applied by Flyway. Available to `Enterprise` licenses only.\n- `Check Dry Run`: Produces a report listing out the migration scripts to run.  Use this to perform a dry run check or if you have a `Teams` license.\n- `Info`: Prints the details and status information about all migrations.  \n- `Validate`: Validates applied migrations against resolved ones (on the filesystem or classpath) to detect accidental changes that may prevent the schema(s) from being recreated precisely.\n- `Undo`: Undoes the most recently applied versioned migration.  You must provide a Flyway `Teams` or `Enterprise` license key for this to work.\n- `Repair`: Repairs the Flyway schema history table by removing any failed migrations and realigning the checksums, descriptions and types of the applied migrations with the ones of the available migrations\n- `Clean`: It will effectively give you a fresh start, by wiping your configured schemas completely clean. All objects (tables, views, procedures, …) will be dropped.  **DO NOT USE AGAINST A PRODUCTION DB!!!**\n- `Baseline`:  Introducing Flyway to existing databases by baselining them at a specific version. This will cause Migrate to ignore all migrations up to and including the baseline version. Newer migrations will then be applied as usual.\n- `Snapshot`: Creates a file containing the schema of the specified database for subsequent use with the `Check Drift` option.  Available to `Enterprise` licenses only.\n",
+      "DefaultValue": "migrate",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "migrate|Migrate\nmigrate dry run|Migrate Dry Run\ncheck changes|Check Changes\ncheck drift|Check Drift\ncheck dry run|Check Dry Run\ninfo|Info\nvalidate|Validate\nundo|Undo\nrepair|Repair\nclean|Clean\nbaseline|Baseline\nsnapshot|Snapshot"
+      }
+    },
+    {
+      "Id": "e648821f-221c-4b8b-85fb-654f0d7379c5",
+      "Name": "Flyway.License.Key",
+      "Label": "License Key (deprecated)",
+      "HelpText": "**Optional**\n\nThe [Flyway Teams](https://flywaydb.org/download) or `Enterprise` license key will enable undo functionality and the ability to dry run a migration.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "99b59d45-5f58-4d04-b4b1-6ccfeda42136",
+      "Name": "Flyway.Email.Address",
+      "Label": "Email address",
+      "HelpText": "The email address associated with the Personal Access Token (PAT).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7fb0cb33-950f-47f5-8678-323e62c90770",
+      "Name": "Flyway.PersonalAccessToken",
+      "Label": "Personal Access Token (PAT)",
+      "HelpText": "The Personal Access Token (PAT) to authenticate with for Enterprise features.  \n\nReplaces the License Key.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "bb9d99ac-96b4-4d46-ae8f-87e5a7214278",
+      "Name": "Flyway.Target.Url",
+      "Label": "-Url",
+      "HelpText": "**Required**\n\nThe [URL](https://flywaydb.org/documentation/configuration/parameters/url) parameter used in Flyway.  This is the URL of the database to run the migration scripts on in the format specified in the default flyway.conf file.\n\nExamples:\n- SQL Server: `jdbc:sqlserver://host:port;databaseName=database`\n- Oracle: `jdbc:oracle:thin:@//host:port/service` or `jdbc:oracle:thin:@tns_entry`\n- MySQL: `jdbc:mysql://host:port/database`\n- PostgreSQL: `jdbc:postgresql://host:port/database`\n- SQLite: `jdbc:sqlite:database`\n\nPlease refer to [documentation](https://flywaydb.org/documentation/database/sqlserver) for further examples.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e9dccda1-4045-4e8e-b93e-4fac8d66630a",
+      "Name": "Flyway.Authentication.Method",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the database server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "e1cb49a8-b965-4827-9f8e-01724d263541",
+      "Name": "Flyway.Database.User",
+      "Label": "-User",
+      "HelpText": "**Optional**\n\nThe [user](https://flywaydb.org/documentation/configuration/parameters/user) used to connect to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "51fab335-82b2-4e58-8d4a-e2640ba66296",
+      "Name": "Flyway.Database.User.Password",
+      "Label": "-Password",
+      "HelpText": "**Optional**\n\nThe [password](https://flywaydb.org/documentation/configuration/parameters/password) used to connect to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f8787222-c404-47ca-9f0f-32fad6c656e7",
+      "Name": "Flyway.Command.Schemas",
+      "Label": "-Schemas",
+      "HelpText": "**Optional**\n\nComma-separated case-sensitive list of [schemas](https://flywaydb.org/documentation/configuration/parameters/schemas) managed by Flyway. \n\nExample: `schema1,schema2`\n\nFlyway will attempt to create these schemas if they do not already exist and will clean them in the order of this list. If Flyway created them, then the schemas themselves will be dropped when cleaning.\n\nThe first schema in the list will act as the default schema.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "27a4fafe-8e8b-4d6d-b25a-0953535ef2c9",
+      "Name": "Flyway.Command.Target",
+      "Label": "-Target",
+      "HelpText": "**Optional** for `migrate`, `info`, `validate`, `check`, and `undo`.  **Ignored** for all other commands\n\nThe [target version](https://flywaydb.org/documentation/configuration/parameters/target) up to which Flyway should consider migrations. If set to a value other than current or latest, this must be a valid migration version (e.g. `2.1`).\n\nWhen migrating forwards, Flyway will apply all migrations up to and including the target version. Migrations with a higher version number will be ignored. If the target is `current`, then no versioned migrations will be applied but repeatable migrations will be, together with any callbacks.\n\nWhen undoing migrations, Flyway will apply all undo scripts up to and including the target version. Undo scripts with a lower version number will be ignored. Specifying a target version should be done with care, as undo scripts typically destroy database objects.\n\nSpecial Values:\n- `current`: designates the current version of the schema\n- `latest`: the latest version of the schema, as defined by the migration with the highest version\n\nDefault is: `latest`.  When running the `undo` command, this will switch to `current` if `latest` is supplied.",
+      "DefaultValue": "latest",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1b0b700e-6686-4474-a630-8a89aea9b1d5",
+      "Name": "Flyway.Command.CherryPick",
+      "Label": "-CherryPick",
+      "HelpText": "**Optional** for `migrate`, `info`, `check`, and `validate`.  **Ignored** for all other commands.\n\nA Comma separated list of migrations that Flyway should consider when migrating, undoing, or repairing. Migrations are considered in the order that they are supplied, overriding the default ordering. Leave blank to consider all discovered migrations.\n\nEach item in the list must either be a valid migration version (e.g `2.1`) or a valid migration description (e.g. `create_table`).\n\nSee [documentation](https://flywaydb.org/documentation/configuration/parameters/cherryPick) for more details.\n\nThe default is an empty string, meaning this command-line argument will be skipped.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "79a5ed66-eae8-4b0b-89fa-5da10850bb8d",
+      "Name": "Flyway.Command.OutOfOrder",
+      "Label": "-OutOfOrder",
+      "HelpText": "**Optional** for `migrate`, `info`, `check`, and `validate`.  **Ignored** for all other commands.\n\nAllows migrations to be run “out of order”.\n\nIf you already have versions `1.0` and `3.0` applied, and now a version `2.0` is found, it will be applied too instead of being ignored.\n\nSee [documentation](https://flywaydb.org/documentation/configuration/parameters/outOfOrder) for more details.\n\nThe default is `False`.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "true|True\nfalse|False"
+      }
+    },
+    {
+      "Id": "1d234d38-35d7-4b5e-a3fb-7ed81fa41d46",
+      "Name": "Flyway.Command.SkipExecutingMigrations",
+      "Label": "-SkipExecutingMigrations",
+      "HelpText": "**Optional** for `migrate`.  **Ignored** for all other commands.\n\nWhether Flyway should skip migration execution. The remainder of the operation will run as normal - including updating the schema history table, callbacks, and so on.\n\n`skipExecutingMigrations` essentially allows you to mimic a migration being executed, because the schema history table is still updated as normal.\n\n`skipExecutingMigrations` can be used to bring an out-of-process change into Flyway’s change control process. For instance, a script run against the database outside of Flyway (like a hotfix) can be turned into a migration. The hotfix migration can be deployed with Flyway with `skipExecutingMigrations=true`. The schema history table will be updated with the new migration, but the script itself won’t be executed again.\n\n`skipExecutingMigrations` can be used with cherryPick to skip specific migrations.\n\nSee [documentation](https://flywaydb.org/documentation/configuration/parameters/skipExecutingMigrations) for more details.\n\nThe default value is `False`.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "true|True\nfalse|False"
+      }
+    },
+    {
+      "Id": "7e00397a-e18e-44b8-bb4d-e89b7c70d760",
+      "Name": "Flyway.Command.PlaceHolders",
+      "Label": "-PlaceHolders",
+      "HelpText": "**Optional** for `migrate`, `info`, `validate`, `undo`, `check`, and `repair`.  **Ignored** for all other commands.\n\n[Placeholders](https://flywaydb.org/documentation/configuration/placeholder) to replace in SQL migrations.\n\nEach new line represents a new placeholder.  This will only work with string variable types, text and sensitive values.    \n\nImagine this SQL Script\n\n```\nINSERT INTO ${Key1} (name) VALUES ('Mr. T')\nGRANT SELECT ON SCHEMA ${flyway:defaultSchema} TO ${Key2}\n```\n\nUse the format **Name::Value**  for example:\n\n```\nKey1::My Super Awesome Value\n\nKey2::Other Super Awesome Value\n```\n\nThis will replace `${Key1}` with `My Super Awesome Value` and `${Key2}` with `Other Super Awesome Value`.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3703d1da-1750-4c4f-89ba-04f5297ba0b9",
+      "Name": "Flyway.Command.InfoSinceDate",
+      "Label": "-InfoSinceDate",
+      "HelpText": "**Optional** with the `info` command and [Flyway Teams](https://flywaydb.org/documentation/usage/commandline/info#filtering-output) and Flyway Enterprise editions.  **Ignored** for all other commands.\n\nLimits info to show only migrations applied after this date, and any unapplied migrations. Must be in the format `dd/MM/yyyy HH:mm` (e.g. `01/12/2020 13:00`)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0bfecdcd-ad27-4908-949c-a54745aa85f0",
+      "Name": "Flyway.Command.InfoSinceVersion",
+      "Label": "-InfoSinceVersion",
+      "HelpText": "**Optional** with the `info` command and [Flyway Teams](https://flywaydb.org/documentation/usage/commandline/info#filtering-output) and Flyway Enterprise editions.  **Ignored** for all other commands.\n\nLimits info to show only migrations greater than or equal to this version, and any repeatable migrations. (e.g `1.1`)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4d4c2fc6-f4a4-4c68-bb79-9ef4d28e2f53",
+      "Name": "Flyway.Command.BaseLineOnMigrate",
+      "Label": "-baselineOnMigrate",
+      "HelpText": "**Optional** when using `migrate`.  **Ignored** for all other commands.\n\nWhether to automatically call baseline when migrate is executed against a non-empty schema with no metadata table. This schema will then be baselined with the baselineVersion before executing the migrations. Only migrations above baselineVersion will then be applied.\n\nThis is useful for initial Flyway production deployments on projects with an existing DB.\n\nBe careful when enabling this as it removes the safety net that ensures Flyway does not migrate the wrong database in case of a configuration mistake!",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "true|True\nfalse|False"
+      }
+    },
+    {
+      "Id": "f7e23a32-73a8-4118-8996-354d48f176cb",
+      "Name": "Flyway.Command.BaselineVersion",
+      "Label": "-baselineVersion",
+      "HelpText": "**Required** when using `Baseline` or when `BaselineOnMigrate` is set to `True`.  **Ignored** for all other commands.\n\nThe version to tag an existing schema with when executing [baseline](https://flywaydb.org/documentation/command/baseline).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c8a118ef-bdc4-4e2f-966b-596662321d1c",
+      "Name": "Flyway.Command.BaselineDescription",
+      "Label": "-baseLineDescription",
+      "HelpText": "**Required** when using `Baseline`.  **Ignored** for all other commands.\n\nThe Description to tag an existing schema with when executing [baseline](https://flywaydb.org/documentation/command/baseline).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d3bbe139-2bd4-4242-be70-a6f05510042b",
+      "Name": "Flyway.Command.Locations",
+      "Label": "-Locations",
+      "HelpText": "**Optional** with the `info`,  `migrate`, `repair`, `undo`, `check`, and `validate` commands. \n\nSpecifies the location of the script files to execute.  If left blank, the `Extracted Path` of the package will be used.\n\nExample: filesystem:`#{Octopus.Action.Package[Flyway.Package.Value].ExtractedPath}/MySubFolder`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "57611c50-3f3f-4a9d-a6c4-02517d2f238e",
+      "Name": "Flyway.Command.CheckBuildUrl",
+      "Label": "-check.BuildUrl",
+      "HelpText": "**Required** when using `Check Changes` or `Check Drift` commands and `-snapshot.FileName` is empty.  \n\n**Please Note:** When `-snapshot.FileName` is not empty, this parameter is ignored.\n\nFlyway uses the URL to an existing database as a temporary database to perform the check logic against.  Flyway will clean this database, so if you specify a full database, you must ensure it is okay for Flyway to erase its schema.\n\nExamples:\n- SQL Server: `jdbc:sqlserver://host:port;databaseName=database`\n- Oracle: `jdbc:oracle:thin:@//host:port/service` or `jdbc:oracle:thin:@tns_entry`\n- MySQL: `jdbc:mysql://host:port/database`\n- PostgreSQL: `jdbc:postgresql://host:port/database`\n- SQLite: `jdbc:sqlite:database`\n\nPlease refer to [documentation](https://flywaydb.org/documentation/database/sqlserver) for further examples.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b52238f0-a7e6-4cfa-851f-f1f9fdb70c65",
+      "Name": "Flyway.Database.Check.User",
+      "Label": "-check.BuildUser",
+      "HelpText": "**Optional**\n\nThe username of the user for the build database.  Use this if the build database needs a separate username and password from the authentication information supplied above.\n\n**Please Note:** When `-snapshot.FileName` is not empty, this parameter is ignored.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "14f7c856-6ca2-4319-84b3-e96a40d65c10",
+      "Name": "Flyway.Database.Check.User.Password",
+      "Label": "-check.BuildPassword",
+      "HelpText": "**Optional**\n\nThe password of the user for the build database.  Use this if the build database needs a separate username and password from the authentication information supplied above.\n\n**Please Note:** When `-snapshot.FileName` is not empty, this parameter is ignored.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "4bcdced9-2397-4423-bdc2-776ff80f78f3",
+      "Name": "Flyway.Command.FailOnDrift",
+      "Label": "-check.failOnDrift",
+      "HelpText": "**Required** when using `Check Drift`.  Ignored for all other commands.\n\nIndicates if Flyway will terminate with a non-zero return code if drift is detected.  When using `Check Drift` with a snapshot and you want to see the changes, set this to `false`",
+      "DefaultValue": "true",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "true|True\nfalse|False"
+      }
+    },
+    {
+      "Id": "22bb9c1b-1ce4-4f63-b618-d642c804d3ac",
+      "Name": "Flyway.Command.Snapshot.FileName",
+      "Label": "-snapshot.FileName",
+      "HelpText": "**Required** when using `Snapshot`.  **Optional** when using the `Check Drift` command.  **Ignored** for all other commands.\n\nThe name, including the path, of the snapshot file to create or use.  \n\nIf this parameter is populated the `-check.BuildUser`, `check.BuildPassword`, and `-check.BuildUrl` parameters are all ignored.\n\n**Hint:** If executing this step in an execution container, consider `../../../` as the path prefix as the script will execute in `/etc/octopus/default/Work/[Random Folder Name]/Flyway.Package.Value`.  `/etc/octopus/default` is mounted as a volume.  Or leverage a NAS or other file share.\n\n**Important:** You will need this file for future steps. It must be stored in a non-temporary location.  By default, Octopus runs this script in a temporary location on a worker.  That location is deleted automatically once this step is complete.  If you do not supply a path, the file will be deleted.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ff9a4e49-d3f0-45ff-891a-3e5f6b72806d",
+      "Name": "Flyway.Additional.Arguments",
+      "Label": "Additional arguments",
+      "HelpText": "Any additional arguments that need to be passed (ie `-table=\"MyTable\")",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2024-10-28T15:04:11.3090000Z",
+    "OctopusVersion": "2024.3.12899",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "flyway"
+}
diff --git a/src/step-templates/flyway-database-migrations/scriptbody.ps1 b/src/step-templates/flyway-database-migrations/scriptbody.ps1
new file mode 100644
index 000000000..d6af43cf6
--- /dev/null
+++ b/src/step-templates/flyway-database-migrations/scriptbody.ps1
@@ -0,0 +1,605 @@
+$VerboseActionPreference="Continue"
+
+function Get-FlywayExecutablePath
+{
+	param (
+    	$providedPath
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($providedPath) -eq $false)
+    {
+    	Write-Host "The executable path was provided, testing to see if it is absolute or relative"
+		if ([IO.Path]::IsPathRooted($providedPath))
+        {
+        	Write-Host "The provided path is absolute, using that"
+            
+        	return $providedPath
+        }
+        
+        Write-Host "The provided path was relative, combining $(Get-Location) with $providedPath"
+        return Join-Path $(Get-Location) $providedPath
+    }
+    
+    Write-Host "Checking to see if we are currently running on Linux"
+    if ($IsLinux)    
+    {
+    	Write-Host "Currently running on Linux"
+    	Write-Host "Checking to see if flyway was included with the package"
+    	if (Test-Path "./flyway")
+        {
+        	Write-Host "It was, using that version of flyway"
+        	return "flyway"
+        }
+        
+        Write-Host "Testing to see if we are on an execution container with /flyway/flyway as the path"
+    	if (Test-Path "/flyway/flyway")
+        {
+        	Write-Host "We are, using /flyway/flyway"
+        	return "/flyway/flyway"
+        }               
+    }
+    
+    Write-Host "Currently running on Windows"
+    
+    Write-Host "Testing to see if flyway.cmd was included with the package"
+    if (Test-Path ".\flyway.cmd")
+    {
+    	Write-Host "It was, using that version."
+    	return ".\flyway.cmd"
+    }
+    
+    Write-Host "Testing to see if flyway can be found in the env path"
+    $flywayExecutable = (Get-Command "flyway" -ErrorAction SilentlyContinue)
+    if ($null -ne $flywayExecutable)
+    {
+    	Write-Host "The flyway folder is part of the environment path"
+        return $flywayExecutable.Source
+    }
+    
+    Fail-Step "Unable to find flyway executable.  Please include it as part of the package, or provide the path to it."
+}
+
+function Test-AddParameterToCommandline
+{
+	param (
+    	$acceptedCommands,
+        $selectedCommand,
+        $parameterValue,
+        $defaultValue,
+        $parameterName
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($parameterValue) -eq $true)
+    {    	
+    	Write-Verbose "$parameterName is empty, returning false"
+    	return $false
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($defaultValue) -eq $false -and $parameterValue.ToLower().Trim() -eq $defaultValue.ToLower().Trim())
+    {
+    	Write-Verbose "$parameterName is matches the default value, returning false"
+    	return $false
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($acceptedCommands) -eq $true -or $acceptedCommands -eq "any")
+    {
+    	Write-Verbose "$parameterName has a value and this is for any command, returning true"
+    	return $true
+    }
+    
+    $acceptedCommandArray = $acceptedCommands -split ","
+    foreach ($command in $acceptedCommandArray)
+    {
+    	if ($command.ToLower().Trim() -eq $selectedCommand.ToLower().Trim())
+        {
+        	Write-Verbose "$parameterName has a value and the current command $selectedCommand matches the accepted command $command, returning true"
+        	return $true
+        }
+    }
+    
+    Write-Verbose "$parameterName has a value but is not accepted in the current command, returning false"
+    return $false
+}
+
+function Get-ParsedUrl
+{
+	# Define parameters
+    param (
+    	$ConnectionUrl
+    )
+    
+    # Remove the 'jdbc:' portion from the $ConnectionUrl parameter
+    $ConnectionUrl = $ConnectionUrl.ToLower().Replace("jdbc:", "")
+    
+    # Parse and return the url
+    return [System.Uri]$ConnectionUrl
+}
+
+# Declaring the path to the NuGet package
+$flywayPackagePath = $OctopusParameters["Octopus.Action.Package[Flyway.Package.Value].ExtractedPath"]
+$flywayUrl = $OctopusParameters["Flyway.Target.Url"]
+$flywayUser = $OctopusParameters["Flyway.Database.User"]
+$flywayUserPassword = $OctopusParameters["Flyway.Database.User.Password"]
+$flywayCommand = $OctopusParameters["Flyway.Command.Value"]
+$flywayLicenseKey = $OctopusParameters["Flyway.License.Key"]
+$flywayLicenseEmail = $OctopusParameters["Flyway.Email.Address"]
+$flywayLicensePAT = $OctopusParameters["Flyway.PersonalAccessToken"]
+$flywayExecutablePath = $OctopusParameters["Flyway.Executable.Path"]
+$flywaySchemas = $OctopusParameters["Flyway.Command.Schemas"]
+$flywayTarget = $OctopusParameters["Flyway.Command.Target"]
+$flywayInfoSinceDate = $OctopusParameters["Flyway.Command.InfoSinceDate"]
+$flywayInfoSinceVersion = $OctopusParameters["Flyway.Command.InfoSinceVersion"]
+$flywayLicensedEdition = $OctopusParameters["Flyway.License.Version"]
+$flywayCherryPick = $OctopusParameters["Flyway.Command.CherryPick"]
+$flywayOutOfOrder = $OctopusParameters["Flyway.Command.OutOfOrder"]
+$flywaySkipExecutingMigrations = $OctopusParameters["Flyway.Command.SkipExecutingMigrations"]
+$flywayPlaceHolders = $OctopusParameters["Flyway.Command.PlaceHolders"]
+$flywayBaseLineVersion = $OctopusParameters["Flyway.Command.BaselineVersion"]
+$flywayBaselineDescription = $OctopusParameters["Flyway.Command.BaselineDescription"]
+$flywayAuthenticationMethod = $OctopusParameters["Flyway.Authentication.Method"]
+$flywayLocations = $OctopusParameters["Flyway.Command.Locations"]
+$flywayAdditionalArguments = $OctopusParameters["Flyway.Additional.Arguments"]
+$flywayStepName = $OctopusParameters["Octopus.Action.StepName"]
+$flywayEnvironment = $OctopusParameters["Octopus.Environment.Name"]
+$flywayCheckBuildUrl = $OctopusParameters["Flyway.Command.CheckBuildUrl"]
+$flywayCheckBuildUsername = $OctopusParameters["Flyway.Database.Check.User"]
+$flywayCheckBuildPassword = $OctopusParameters["Flyway.Database.Check.User.Password"]
+$flywayBaselineOnMigrate = $OctopusParameters["Flyway.Command.BaseLineOnMigrate"]
+$flywaySnapshotFileName = $OctopusParameters["Flyway.Command.Snapshot.FileName"]
+$flywayCheckFailOnDrift = $OctopusParameters["Flyway.Command.FailOnDrift"]
+
+if ([string]::IsNullOrWhitespace($flywayLocations))
+{
+	$flywayLocations = "filesystem:$flywayPackagePath"
+}
+
+
+# Logging for troubleshooting
+Write-Host "*******************************************"
+Write-Host "Logging variables:"
+Write-Host " - - - - - - - - - - - - - - - - - - - - -"
+Write-Host "PackagePath: $flywayPackagePath"
+Write-Host "Flyway Executable Path: $flywayExecutablePath"
+Write-Host "Flyway Command: $flywayCommand"
+Write-Host "-url: $flywayUrl"
+Write-Host "-user: $flywayUser"
+Write-Host "-schemas: $flywaySchemas"
+Write-Host "-target: $flywayTarget"
+Write-Host "-cherryPick: $flywayCherryPick"
+Write-Host "-outOfOrder: $flywayOutOfOrder"
+Write-Host "-skipExecutingMigrations: $flywaySkipExecutingMigrations"
+Write-Host "-infoSinceDate: $flywayInfoSinceDate"
+Write-Host "-infoSinceVersion: $flywayInfoSinceVersion"
+Write-Host "-baselineOnMigrate: $flywayBaselineOnMigrate"
+Write-Host "-baselineVersion: $flywayBaselineVersion"
+Write-Host "-baselineDescription: $flywayBaselineDescription"
+Write-Host "-locations: $flywayLocations"
+Write-Host "-check.BuildUrl: $flywayCheckBuildUrl"
+Write-Host "-check.failOnDrift: $flywayCheckFailOnDrift"
+Write-Host "-snapshot.FileName OR check.DeployedSnapshot: $flywaySnapshotFileName"
+Write-Host "Additional Arguments: $flywayAdditionalArguments"
+Write-Host "placeHolders: $flywayPlaceHolders"
+Write-Host "*******************************************"
+
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Write-Host "Setting execution location to: $flywayPackagePath"
+Set-Location $flywayPackagePath
+
+$flywayCmd = Get-FlywayExecutablePath -providedPath $flywayExecutablePath
+
+$commandToUse = $flywayCommand
+if ($flywayCommand -eq "migrate dry run")
+{
+	$commandToUse = "migrate"
+}
+
+if ($flywayCommand -eq "check dry run" -or $flywayCommand -eq "check changes" -or $flywayCommand -eq "check drift")
+{
+	$commandToUse = "check"
+}
+
+$arguments = @(
+	$commandToUse    
+)
+
+if ($flywayCommand -eq "check dry run")
+{
+	$arguments += "-dryrun"
+}
+
+if ($flywayCommand -eq "check changes")
+{
+	$arguments += "-changes"
+    $arguments += "-dryrun"
+}
+
+if ($flywayCommand -eq "check drift")
+{
+	$arguments += "-drift"
+}
+
+# Deteremine authentication method
+switch ($flywayAuthenticationMethod)
+{
+	"awsiam"
+    {
+		# Check to see if OS is Windows and running in a container
+        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)
+        {
+        	throw "IAM Role authentication is not supported in a Windows container."
+        }
+
+		# Get parsed connection string url
+        $parsedUrl = Get-ParsedUrl -ConnectionUrl $flywayUrl
+        
+        # Region is part of the RDS endpoint, extract
+        $region = ($parsedUrl.Host.Split("."))[2]
+
+		Write-Host "Generating AWS IAM token ..."
+		$flywayUserPassword = (aws rds generate-db-auth-token --hostname $parsedUrl.Host --region $region --port $parsedUrl.Port --username $flywayUser)
+
+		$arguments += "-user=`"$flywayUser`""
+    	$arguments += "-password=`"$flywayUserPassword`""
+
+		break
+    }
+	"azuremanagedidentity"
+    {
+		# Check to see if OS is Windows and running in a container
+        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)
+        {
+        	throw "Azure Managed Identity is not supported in a Windows container."
+        }
+        
+        # SQL Server driver doesn't assign password
+        if (!$flywayUrl.ToLower().Contains("jdbc:sqlserver:"))
+        {        
+          # Get login token
+          Write-Host "Generating Azure Managed Identity token ..."
+          $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"} -UseBasicParsing
+
+          $flywayUserPassword = $token.access_token
+          $arguments += "-password=`"$flywayUserPassword`""
+          $arguments += "-user=`"$flywayUser`""
+        }
+        else
+        {
+            
+			# Check to see if the querstring parameter for Azure Managed Identity is present
+            if (!$flywayUrl.ToLower().Contains("authentication=activedirectorymsi"))
+            {
+                # Add the authentication piece to the jdbc url
+                if (!$flywayUrl.EndsWith(";"))
+                {
+                	# Add the separator
+                    $flywayUrl += ";"
+                }
+                
+                # Add authentication piece
+                $flywayUrl += "Authentication=ActiveDirectoryMSI"
+            }
+        }
+        
+        break
+    }
+    "gcpserviceaccount"
+    {
+		# Check to see if OS is Windows and running in a container
+        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)
+        {
+        	throw "GCP Service Account authentication is not supported in a Windows container."
+        }
+    
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google"}
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header -UseBasicParsing
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object {$_.ToLower().Contains("iam.gserviceaccount.com") }
+
+		Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header -UseBasicParsing
+        
+        $flywayUserPassword = $token.access_token
+        
+        $arguments += "-user=`"$flywayUser`""
+        $arguments += "-password=`"$flywayUserPassword`""
+        #$env:FLYWAY_PASSWORD = $flywayUserPassword
+        
+        break
+    }   
+    "usernamepassword"
+    {
+    	# Add password
+        Write-Host "Testing for parameters that can be applied to any command"
+        if (Test-AddParameterToCommandline -parameterValue $flywayUser -acceptedCommands "any" -selectedCommand $flywayCommand -parameterName "-user")
+        {
+            Write-Host "User provided, adding user and password command line argument"
+            $arguments += "-user=`"$flywayUser`""
+            $arguments += "-password=`"$flywayUserPassword`""
+        }
+        
+        break
+    }
+    "windowsauthentication"
+    {
+    	# Display to the user they've selected windows authentication.  Though this is dictated by the jdbc url, this is added to make sure the user knows that's what is
+        # being used
+        Write-Host "Using Windows Authentication"
+        
+        # Check for integratedauthentication=true in url
+        if (!$flywayUrl.ToLower().Contains("integratedsecurity=true"))
+        {
+        	# Check to see if the connection url ends with a ;
+            if (!$flywayUrl.EndsWith(";"))
+            {
+            	# Add the ;
+                $flywayUrl += ";"
+            }
+            
+            $flywayUrl += "integratedSecurity=true;"
+        }
+        break
+    }
+}
+
+$arguments += "-url=`"$flywayUrl`""
+$arguments += "-locations=`"$flywayLocations`""
+
+if (Test-AddParameterToCommandline -parameterValue $flywaySchemas -acceptedCommands "any" -selectedCommand $flywayCommand -parameterName "-schemas")
+{
+	Write-Host "Schemas provided, adding schemas command line argument"
+	$arguments += "-schemas=`"$flywaySchemas`""    
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayLicenseKey -acceptedCommands "any" -selectedCommand $flywayCommand -parameterName "-licenseKey")
+{
+	Write-Host "License key provided, adding -licenseKey command line argument"
+    Write-Host "*****WARNING***** Use of the License Key has been deprecated by Redgate and will be removed in future versions, use the Personal Access Token method instead."
+	$arguments += "-licenseKey=`"$flywayLicenseKey`""                  
+}
+
+if (![string]::IsNullOrWhiteSpace($flywayLicenseEmail) -and ![string]::IsNullOrWhiteSpace($flywayLicensePAT))
+{
+    if (Test-AddParameterToCommandline -parameterValue $flywayLicensePAT -acceptedCommands "any" -selectedCommand $flywayCommand -parameterName "-token")
+    {
+        Write-Host "Personal Access Token provided, adding -email and -token command line arguments"
+        $arguments += @("-email=`"$flywayLicenseEmail`"", "-token=`"$flywayLicensePAT`"")
+    }
+}
+
+Write-Host "Finished testing for parameters that can be applied to any command, moving onto command specific parameters"
+
+if (Test-AddParameterToCommandline -parameterValue $flywayCherryPick -acceptedCommands "migrate,info,validate,check" -selectedCommand $flywayCommand -parameterName "-cherryPick")
+{
+	Write-Host "Cherry pick provided, adding cherry pick command line argument"
+	$arguments += "-cherryPick=`"$flywayCherryPick`""    
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayOutOfOrder -defaultValue "false" -acceptedCommands "migrate,info,validate,check" -selectedCommand $commandToUse -parameterName "-outOfOrder")
+{
+	Write-Host "Out of order is not false, adding out of order command line argument"
+	$arguments += "-outOfOrder=`"$flywayOutOfOrder`""    
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayPlaceHolders -acceptedCommands "migrate,info,validate,undo,repair,check" -selectedCommand $commandToUse -parameterName "-placeHolders")
+{
+	Write-Host "Placeholder parameter provided, adding them to the command line arguments"
+    
+    $placeHolderValueList = @(($flywayPlaceHolders -Split "`n").Trim())
+    foreach ($placeHolder in $placeHolderValueList)
+    {
+    	$placeHolderSplit = $placeHolder -Split "::"
+        $placeHolderKey = $placeHolderSplit[0]
+        $placeHolderValue = $placeHolderSplit[1]
+        Write-Host "Adding -placeHolders.$placeHolderKey = $placeHolderValue to the argument list"
+        
+        $arguments += "-placeholders.$placeHolderKey=`"$placeHolderValue`""    
+    }   	
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayTarget -acceptedCommands "migrate,info,validate,undo,check" -selectedCommand $commandToUse -parameterName "-target")
+{
+	Write-Host "Target provided, adding target command line argument"
+
+	if ($flywayTarget.ToLower().Trim() -eq "latest" -and $flywayCommand -eq "undo")
+	{
+		Write-Host "The current target is latest, but the command is undo, changing the target to be current"
+		$flywayTarget = "current"
+	}
+
+	$arguments += "-target=`"$flywayTarget`""    
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywaySkipExecutingMigrations -defaultValue "false" -acceptedCommands "migrate" -selectedCommand $flywayCommand -parameterName "-skipExecutingMigrations")
+{
+	Write-Host "Skip executing migrations is not false, adding skip executing migrations command line argument"
+	$arguments += "-skipExecutingMigrations=`"$flywaySkipExecutingMigrations`""    
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayBaselineOnMigrate -defaultValue "false" -acceptedCommands "migrate" -selectedCommand $flywayCommand -parameterName "-baselineOnMigrate")
+{
+	Write-Host "Baseline on migrate is not false, adding the baseline on migrate argument"
+	$arguments += "-baselineOnMigrate=`"$flywayBaselineOnMigrate`""    
+    
+    if (Test-AddParameterToCommandline -parameterValue $flywayBaselineVersion -acceptedCommands "migrate" -selectedCommand $flywayCommand -parameterName "-baselineVersion")
+    {
+    	Write-Host "Baseline version has been specified, adding baseline version argument"
+		$arguments += "-baselineVersion=`"$flywayBaselineVersion`""  
+    }
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayBaselineVersion -acceptedCommands "baseline" -selectedCommand $flywayCommand -parameterName "-baselineVersion")
+{
+	Write-Host "Doing a baseline, adding baseline version and description"
+	$arguments += "-baselineVersion=`"$flywayBaselineVersion`""    
+    $arguments += "-baselineDescription=`"$flywayBaselineDescription`""    
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayInfoSinceDate -acceptedCommands "info" -selectedCommand $flywayCommand -parameterName "-infoSinceDate")
+{
+	Write-Host "Info since date has been provided, adding that to the command line arguments"
+	$arguments += "-infoSinceDate=`"$flywayInfoSinceDate`""
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayInfoSinceVersion -acceptedCommands "info" -selectedCommand $flywayCommand -parameterName "-infoSinceVersion")
+{
+	Write-Host "Info since version has been provided, adding that to the command line arguments"
+	$arguments += "-infoSinceVersion=`"$flywayInfoSinceVersion`""
+} 
+
+if (Test-AddParameterToCommandline -parameterValue $flywaySnapshotFileName -acceptedCommands "snapshot" -selectedCommand $commandToUse -parameterName "-snapshot.filename")
+{
+	Write-Host "Snapshot filename has been provided, adding that to the command line arguments"
+    $folderName = Split-Path -Parent $flywaySnapshotFileName
+    if ((test-path $folderName) -eq $false)
+    {
+    	New-Item $folderName -ItemType Directory
+    }
+    $arguments += "-snapshot.filename=`"$flywaySnapshotFileName`""
+}
+
+$snapshotFileNameforCheckProvided = $false
+if (Test-AddParameterToCommandline -parameterValue $flywaySnapshotFileName -acceptedCommands "check" -selectedCommand $commandToUse -parameterName "-check.deployedSnapshot")
+{
+	Write-Host "Snapshot filename has been provided for the check command, adding that to the command line arguments"
+    $folderName = Split-Path -Parent $flywaySnapshotFileName
+    if ((test-path $folderName) -eq $false)
+    {
+    	New-Item $folderName -ItemType Directory
+    }
+    $arguments += "-check.deployedSnapshot=`"$flywaySnapshotFileName`""
+    $snapshotFileNameforCheckProvided = $true
+}
+
+if ((Test-AddParameterToCommandline -parameterValue $flywayCheckBuildUrl -acceptedCommands "check" -selectedCommand $commandToUse -parameterName "-check.buildUrl") -eq $true -and $snapshotFileNameforCheckProvided -eq $false)
+{
+	Write-Host "Check build URL has been provided, adding that to the command line arguments"
+	$arguments += "-check.buildUrl=`"$flywayCheckBuildUrl`""
+}
+
+Write-Host "Checking to see if the check username and password were supplied"
+if ((Test-AddParameterToCommandline -parameterValue $flywayCheckBuildUsername -acceptedCommands "check" -selectedCommand $commandToUse -parameterName "-user")  -eq $true -and $snapshotFileNameforCheckProvided -eq $false)
+{
+	Write-Host "Check User provided, adding check user and check password command line argument"
+	$arguments += "-check.buildUser=`"$flywayCheckBuildUsername`""
+	$arguments += "-check.buildPassword=`"$flywayCheckBuildPassword`""
+}
+
+if (Test-AddParameterToCommandline -parameterValue $flywayCheckFailOnDrift -acceptedCommands "check drift" -selectedCommand $flywayCommand -parameterName "-check.failOnDrift")
+{
+	Write-Host "Doing a check drift command, adding the fail on drift"
+	$arguments += "-check.failOnDrift=`"$flywayCheckFailOnDrift`""
+}
+
+
+Write-Host "Finished checking for command specific parameters, moving onto execution"
+$dryRunOutputFile = ""
+
+if ($flywayCommand -eq "migrate dry run")
+{
+	$dryRunOutputFile = Join-Path $(Get-Location) "dryRunOutput"
+    Write-Host "Adding the argument dryRunOutput so Flyway will perform a dry run and not an actual migration."
+    $arguments += "-dryRunOutput=`"$dryRunOutputFile`""
+}
+
+# Check to see if there's any additional arguments to add
+if (![string]::IsNullOrWhitespace($flywayAdditionalArguments))
+{
+	# Split on space
+    $flywayAdditionalArgumentsArray = ($flywayAdditionalArguments.Split(" ", [System.StringSplitOptions]::RemoveEmptyEntries))
+
+    # Loop through array
+    foreach ($newArgument in $flywayAdditionalArgumentsArray)
+    {
+    	# Add the arguments
+    	$arguments += $newArgument
+    }
+}
+
+# Display what's going to be run
+if (![string]::IsNullOrWhitespace($flywayUserPassword))
+{
+    $flywayDisplayArguments = $arguments.PSObject.Copy()
+    $arrayIndex = 0
+    for ($i = 0; $i -lt $flywayDisplayArguments.Count; $i++)
+    {
+        if ($null -ne $flywayDisplayArguments[$i])
+        {
+            if ($flywayDisplayArguments[$i].Contains($flywayUserPassword))
+            {
+                $flywayDisplayArguments[$i] = $flywayDisplayArguments[$i].Replace($flywayUserPassword, "****")
+            }
+        }
+    }
+
+    Write-Host "Executing the following command: $flywayCmd $flywayDisplayArguments"
+}
+else
+{
+    Write-Host "Executing the following command: $flywayCmd $arguments"
+}
+
+# Attempt to find driver path for java
+$driverPath = (Get-ChildItem -Path (Get-ChildItem -Path $flywayCmd).Directory -Recurse | Where-Object {$_.PSIsContainer -eq $true -and $_.Name -eq "drivers"})
+
+# If found, add driver path to the PATH environment varaible
+if ($null -ne $driverPath)
+{
+	$env:PATH += "$([IO.Path]::PathSeparator)$($driverPath.FullName)"
+}
+
+# Adjust call to flyway command based on OS
+if ($IsLinux)
+{
+    & bash $flywayCmd $arguments
+}
+else
+{
+    & $flywayCmd $arguments
+}
+
+# Check exit code
+if ($lastExitCode -ne 0)
+{
+	# Fail the step
+    Write-Error "Execution of Flyway failed!"
+}
+
+$currentDate = Get-Date
+$currentDateFormatted = $currentDate.ToString("yyyyMMdd_HHmmss")
+
+# Check to see if the dry run variable has a value
+if (![string]::IsNullOrWhitespace($dryRunOutputFile))
+{     
+    $sqlDryRunFile = "$($dryRunOutputFile).sql"
+    $htmlDryRunFile = "$($dryRunOutputFile).html"
+    
+    if (Test-Path $sqlDryRunFile)
+    {
+    	New-OctopusArtifact -Path $sqlDryRunFile -Name "$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted)_dryRunOutput.sql"
+    }
+    
+    if (Test-Path $htmlDryRunFile)
+    {
+    	New-OctopusArtifact -Path $htmlDryRunFile -Name "$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted)_dryRunOutput.html"
+    }
+}
+
+$reportFile = Join-Path $(Get-Location) "report.html"
+    
+if (Test-Path $reportFile)
+{
+  	New-OctopusArtifact -Path $reportFile -Name "$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted)_report.html"
+}
\ No newline at end of file
diff --git a/src/step-templates/flyway-state-based-migration/metadata.json b/src/step-templates/flyway-state-based-migration/metadata.json
new file mode 100644
index 000000000..28420d272
--- /dev/null
+++ b/src/step-templates/flyway-state-based-migration/metadata.json
@@ -0,0 +1,192 @@
+{
+  "Id": "67a28755-049e-4cec-b45c-3e5047350d8d",
+  "Name": "Flyway State Based Migration",
+  "Description": "Step template to leverage Flyway to deploy migration scripts.  This is the latest and greatest Flyway step template that leverages all the newest features of both Flyway and Octopus Deploy.\n\n- You can include the flyway executables in your package, if you include the `flyway` (Linux) or `flyway.cmd` (Windows) in the root of the package this step template will automatically find them.\n- You can use this with an execution container, negating the need to include Flyway in the package. If Flyway isn't found in the package it will attempt to find `/flyway/flyway` (when using Linux containers) or `flyway` in the environment path and use that.\n- Support for Flyway State Based commands, including the `undo` command.\n- Support for flyway community, teams, enterprise, and pro editions.  \n\nPlease note this requires Octopus Deploy **2019.10.0** or newer along with PowerShell Core installed on the machines running this step.\nAWS EC2 IAM Authentication requires the AWS CLI to be installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "0c0d333c-d794-4a16-a3a2-4bbba4550763",
+      "Name": "Flyway.Package.Value",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Flyway.Package.Value"
+      }
+    }
+  ],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.PowerShell.Edition": "Core",
+    "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows"
+  },
+  "Parameters": [
+    {
+      "Id": "5952088c-d399-4050-9474-d93aef737a8d",
+      "Name": "Flyway.Package.Value",
+      "Label": "Flyway Package",
+      "HelpText": "**Required**\n\nThe package containing the migration scripts you want Flyway to run.  Please refer to [documentation](https://flywaydb.org/documentation/concepts/migrations) for core concepts and naming conventions.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "1a2c32aa-5bf5-41ef-a916-4fa5c4039748",
+      "Name": "Flyway.Executable.Path",
+      "Label": "Flyway Executable Path",
+      "HelpText": "**Optional**\n\nThe path of the flyway executable.  It can either be a relative path or an absolute path.\n\nWhen not provided, this step template will test for the following.  The step template places precedence on the version of the flyway included in the package. If Flyway is NOT found in the package, it will attempt to see if it is installed on the server by checking common paths.\n\nRunning on `Linux`:\n- `.flyway`: the package being deployed includes flyway and is running on Linux\n- `/flyway/flyway`: The default path for the Linux execution container.\n\nRunning on Windows:\n- `\\.flyway.cmd`: the package being deployed includes flyway and is running on Windows\n- `flyway`: the package is in the path on the Windows VM or Windows Execution container.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ce396114-d0e6-433f-a160-6ea92b26b1b2",
+      "Name": "Flyway.Command.Value",
+      "Label": "Flyway Command",
+      "HelpText": "**Required**\n\nThe [flyway command](https://flywaydb.org/documentation/usage/commandline/) you wish to run.\n\n- `Check`: Produces a report of changes from the `schema model` against the target `environment`\n- `Deploy`: Executes the scripts generated to make the target database look like the model.\n- `Prepare`: Compares the schema model against the target database and generates scripts to make the database conform to the model.\n",
+      "DefaultValue": "prepare",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "check|Check\ndeploy|Deploy\nprepare|Prepare"
+      }
+    },
+    {
+      "Id": "b05cb50e-1e34-4c2d-bf3f-b7bbdc555f05",
+      "Name": "Flyway.Email.Address",
+      "Label": "Email address",
+      "HelpText": "The email address associated with the Personal Access Token (PAT).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "24c6fe79-6fbd-4f19-9f74-a36cda746ced",
+      "Name": "Flyway.PersonalAccessToken",
+      "Label": "Personal Access Token (PAT)",
+      "HelpText": "The Personal Access Token (PAT) to authenticate with for Enterprise features.  \n\nReplaces the License Key.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "522f4dc8-3a0a-486d-a9cd-9c2ef94d1a8e",
+      "Name": "Flyway.Target.Url",
+      "Label": "-Url",
+      "HelpText": "**Required**\n\nThe [URL](https://flywaydb.org/documentation/configuration/parameters/url) parameter used in Flyway.  This is the URL of the database to run the migration scripts on in the format specified in the default flyway.conf file.\n\nExamples:\n- SQL Server: `jdbc:sqlserver://host:port;databaseName=database`\n- Oracle: `jdbc:oracle:thin:@//host:port/service` or `jdbc:oracle:thin:@tns_entry`\n- MySQL: `jdbc:mysql://host:port/database`\n- PostgreSQL: `jdbc:postgresql://host:port/database`\n- SQLite: `jdbc:sqlite:database`\n\nPlease refer to [documentation](https://flywaydb.org/documentation/database/sqlserver) for further examples.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "349f8a5f-5a18-4d23-a717-1c74a03029eb",
+      "Name": "Flyway.Source.Schema.Model",
+      "Label": "Source Schema Model (optional).",
+      "HelpText": "Name of the source schema model used for the comparison operation.  Not all database technologies, such as MSSQL, use this option.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "195e2486-f286-4a72-a97a-f40b7a44a609",
+      "Name": "Flyway.Target.Schema",
+      "Label": "Target Schema (optional)",
+      "HelpText": "Name of the target schema to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "16d4243a-28b0-4e8d-beec-854ca4c781b0",
+      "Name": "Flyway.Authentication.Method",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the database server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "3f733c39-c99a-40d0-9dfd-e67d72c87883",
+      "Name": "Flyway.Database.User",
+      "Label": "-User",
+      "HelpText": "**Optional**\n\nThe [user](https://flywaydb.org/documentation/configuration/parameters/user) used to connect to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7509e8ee-c781-4ca2-bbe4-6e5e348d3d44",
+      "Name": "Flyway.Database.User.Password",
+      "Label": "-Password",
+      "HelpText": "**Optional**\n\nThe [password](https://flywaydb.org/documentation/configuration/parameters/password) used to connect to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "6d4946a4-0746-40e9-9b6e-c85c220c2dbe",
+      "Name": "Flyway.Command.Schemas",
+      "Label": "-Schemas",
+      "HelpText": "**Optional**\n\nComma-separated case-sensitive list of [schemas](https://flywaydb.org/documentation/configuration/parameters/schemas) managed by Flyway. \n\nExample: `schema1,schema2`\n\nFlyway will attempt to create these schemas if they do not already exist and will clean them in the order of this list. If Flyway created them, then the schemas themselves will be dropped when cleaning.\n\nThe first schema in the list will act as the default schema.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "12168dc6-261b-4853-89ea-ef4e36e17452",
+      "Name": "Flyway.Additional.Arguments",
+      "Label": "Additional arguments",
+      "HelpText": "Any additional arguments that need to be passed (ie `-table=\"MyTable\")",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7c7a8183-963d-40e5-94e9-b7a6aa2217df",
+      "Name": "Flyway.Transaction",
+      "Label": "Execute in transaction?",
+      "HelpText": "Tick this box if you want the deployment to execute within a transaction.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "291b9675-e737-4dfe-98fc-bbf303a87653",
+      "Name": "Flyway.Generate.Undo",
+      "Label": "Generate Undo Script?",
+      "HelpText": "Tick this box if you want Flwyay to generate an `Undo` script.  `Undo` scripts will be created as an output variable for `Prepare` and attached as an Octopus Artifact for `Deploy`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-01-20T22:39:29.5980000Z",
+    "OctopusVersion": "2025.4.10338",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "flyway"
+}
diff --git a/src/step-templates/flyway-state-based-migration/scriptbody.ps1 b/src/step-templates/flyway-state-based-migration/scriptbody.ps1
new file mode 100644
index 000000000..e4bb3233f
--- /dev/null
+++ b/src/step-templates/flyway-state-based-migration/scriptbody.ps1
@@ -0,0 +1,450 @@
+$VerboseActionPreference="Continue"
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+function Get-FlywayExecutablePath
+{
+	param (
+    	$providedPath
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($providedPath) -eq $false)
+    {
+    	Write-Host "The executable path was provided, testing to see if it is absolute or relative"
+		if ([IO.Path]::IsPathRooted($providedPath))
+        {
+        	Write-Host "The provided path is absolute, using that"
+            
+        	return $providedPath
+        }
+        
+        Write-Host "The provided path was relative, combining $(Get-Location) with $providedPath"
+        return Join-Path $(Get-Location) $providedPath
+    }
+    
+    Write-Host "Checking to see if we are currently running on Linux"
+    if ($IsLinux)    
+    {
+    	Write-Host "Currently running on Linux"
+    	Write-Host "Checking to see if flyway was included with the package"
+    	if (Test-Path "./flyway")
+        {
+        	Write-Host "It was, using that version of flyway"
+        	return "flyway"
+        }
+        
+        Write-Host "Testing to see if we are on an execution container with /flyway/flyway as the path"
+    	if (Test-Path "/flyway/flyway")
+        {
+        	Write-Host "We are, using /flyway/flyway"
+        	return "/flyway/flyway"
+        }               
+    }
+    
+    Write-Host "Currently running on Windows"
+    
+    Write-Host "Testing to see if flyway.cmd was included with the package"
+    if (Test-Path ".\flyway.cmd")
+    {
+    	Write-Host "It was, using that version."
+    	return ".\flyway.cmd"
+    }
+    
+    Write-Host "Testing to see if flyway can be found in the env path"
+    $flywayExecutable = (Get-Command "flyway" -ErrorAction SilentlyContinue)
+    if ($null -ne $flywayExecutable)
+    {
+    	Write-Host "The flyway folder is part of the environment path"
+        return $flywayExecutable.Source
+    }
+    
+    Fail-Step "Unable to find flyway executable.  Please include it as part of the package, or provide the path to it."
+}
+
+function Get-ParsedUrl
+{
+	# Define parameters
+    param (
+    	$ConnectionUrl
+    )
+    
+    # Remove the 'jdbc:' portion from the $ConnectionUrl parameter
+    $ConnectionUrl = $ConnectionUrl.ToLower().Replace("jdbc:", "")
+    
+    # Parse and return the url
+    return [System.Uri]$ConnectionUrl
+}
+
+function Execute-FlywayCommand
+{
+  # Define parameters
+  param(
+    $BinaryFilePath,
+    $CommandArguments
+  )
+
+  # Display what's going to be run
+  if (![string]::IsNullOrWhitespace($flywayUserPassword))
+  {
+      $flywayDisplayArguments = $CommandArguments.PSObject.Copy()
+      $arrayIndex = 0
+      for ($i = 0; $i -lt $flywayDisplayArguments.Count; $i++)
+      {
+        if ($null -ne $flywayDisplayArguments[$i])
+        {
+            if ($flywayDisplayArguments[$i].Contains($flywayUserPassword))
+            {
+                $flywayDisplayArguments[$i] = $flywayDisplayArguments[$i].Replace($flywayUserPassword, "****")
+            }
+        }
+    }
+
+    Write-Host "Executing the following command: $flywayCmd $flywayDisplayArguments"
+  }
+  else
+  {
+    Write-Host "Executing the following command: $flywayCmd $arguments"
+  }  
+
+  # Adjust call to flyway command based on OS
+  if ($IsLinux)
+  {
+    & bash $BinaryFilePath $CommandArguments
+  }
+  else
+  {
+    & $BinaryFilePath $CommandArguments
+  }  
+}
+
+# Declaring the path to the NuGet package
+$flywayPackagePath = $OctopusParameters["Octopus.Action.Package[Flyway.Package.Value].ExtractedPath"]
+$flywayUrl = $OctopusParameters["Flyway.Target.Url"]
+$flywayUser = $OctopusParameters["Flyway.Database.User"]
+$flywayUserPassword = $OctopusParameters["Flyway.Database.User.Password"]
+$flywayCommand = $OctopusParameters["Flyway.Command.Value"]
+$flywayLicenseEmail = $OctopusParameters["Flyway.Email.Address"]
+$flywayLicensePAT = $OctopusParameters["Flyway.PersonalAccessToken"]
+$flywayExecutablePath = $OctopusParameters["Flyway.Executable.Path"]
+$flywaySchemas = $OctopusParameters["Flyway.Command.Schemas"]
+$flywayAuthenticationMethod = $OctopusParameters["Flyway.Authentication.Method"]
+$flywayAdditionalArguments = $OctopusParameters["Flyway.Additional.Arguments"]
+$flywayStepName = $OctopusParameters["Octopus.Action.StepName"]
+$flywayEnvironment = $OctopusParameters["Octopus.Environment.Name"]
+$flywayTargetSchema = $OctopusParameters["Flyway.Target.Schema"]
+$flywaySourceSchema = $OctopusParameters["Flyway.Source.Schema.Model"]
+$flywayExecuteInTransaction = $OctopusParameters["Flyway.Transaction"]
+$flywayUndoScript = [System.Convert]::ToBoolean($OctopusParameters["Flyway.Generate.Undo"])
+
+
+# Logging for troubleshooting
+Write-Host "*******************************************"
+Write-Host "Logging variables:"
+Write-Host " - - - - - - - - - - - - - - - - - - - - -"
+Write-Host "PackagePath: $flywayPackagePath"
+Write-Host "Flyway Executable Path: $flywayExecutablePath"
+Write-Host "Flyway Command: $flywayCommand"
+Write-Host "-url: $flywayUrl"
+Write-Host "-user: $flywayUser"
+Write-Host "-schemas: $flywaySchemas"
+Write-Host "Source Schema Model: $flywaySourceSchema"
+Write-Host "Target Schema: $flywayTargetSchema"
+Write-Host "Execute in transaction: $flywayExecuteInTransaction"
+Write-Host "Additional Arguments: $flywayAdditionalArguments"
+Write-Host "Generate Undo script: $flywayUndoScript"
+Write-Host "*******************************************"
+
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Write-Host "Setting execution location to: $flywayPackagePath"
+Set-Location $flywayPackagePath
+
+$flywayCmd = Get-FlywayExecutablePath -providedPath $flywayExecutablePath
+
+$commandToUse = $flywayCommand
+
+$arguments = @()
+
+# Deteremine authentication method
+switch ($flywayAuthenticationMethod)
+{
+	"awsiam"
+    {
+		# Check to see if OS is Windows and running in a container
+        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)
+        {
+        	throw "IAM Role authentication is not supported in a Windows container."
+        }
+
+		# Get parsed connection string url
+        $parsedUrl = Get-ParsedUrl -ConnectionUrl $flywayUrl
+        
+        # Region is part of the RDS endpoint, extract
+        $region = ($parsedUrl.Host.Split("."))[2]
+
+		Write-Host "Generating AWS IAM token ..."
+		$flywayUserPassword = (aws rds generate-db-auth-token --hostname $parsedUrl.Host --region $region --port $parsedUrl.Port --username $flywayUser)
+
+		$arguments += "-user=`"$flywayUser`""
+    	$arguments += "-password=`"$flywayUserPassword`""
+
+		break
+    }
+	"azuremanagedidentity"
+    {
+		# Check to see if OS is Windows and running in a container
+        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)
+        {
+        	throw "Azure Managed Identity is not supported in a Windows container."
+        }
+        
+        # SQL Server driver doesn't assign password
+        if (!$flywayUrl.ToLower().Contains("jdbc:sqlserver:"))
+        {        
+          # Get login token
+          Write-Host "Generating Azure Managed Identity token ..."
+          $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"} -UseBasicParsing
+
+          $flywayUserPassword = $token.access_token
+          $arguments += "-password=`"$flywayUserPassword`""
+          $arguments += "-user=`"$flywayUser`""
+        }
+        else
+        {
+            
+			# Check to see if the querstring parameter for Azure Managed Identity is present
+            if (!$flywayUrl.ToLower().Contains("authentication=activedirectorymsi"))
+            {
+                # Add the authentication piece to the jdbc url
+                if (!$flywayUrl.EndsWith(";"))
+                {
+                	# Add the separator
+                    $flywayUrl += ";"
+                }
+                
+                # Add authentication piece
+                $flywayUrl += "Authentication=ActiveDirectoryMSI"
+            }
+        }
+        
+        break
+    }
+    "gcpserviceaccount"
+    {
+		# Check to see if OS is Windows and running in a container
+        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)
+        {
+        	throw "GCP Service Account authentication is not supported in a Windows container."
+        }
+    
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google"}
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header -UseBasicParsing
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object {$_.ToLower().Contains("iam.gserviceaccount.com") }
+
+		Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header -UseBasicParsing
+        
+        $flywayUserPassword = $token.access_token
+        
+        $arguments += "-user=`"$flywayUser`""
+        $arguments += "-password=`"$flywayUserPassword`""
+        #$env:FLYWAY_PASSWORD = $flywayUserPassword
+        
+        break
+    }   
+    "usernamepassword"
+    {
+        Write-Host "User provided, adding user and password command line argument"
+        $arguments += "-user=`"$flywayUser`""
+        $arguments += "-password=`"$flywayUserPassword`""
+        
+        break
+    }
+    "windowsauthentication"
+    {
+    	# Display to the user they've selected windows authentication.  Though this is dictated by the jdbc url, this is added to make sure the user knows that's what is
+        # being used
+        Write-Host "Using Windows Authentication"
+        
+        # Check for integratedauthentication=true in url
+        if (!$flywayUrl.ToLower().Contains("integratedsecurity=true"))
+        {
+        	# Check to see if the connection url ends with a ;
+            if (!$flywayUrl.EndsWith(";"))
+            {
+            	# Add the ;
+                $flywayUrl += ";"
+            }
+            
+            $flywayUrl += "integratedSecurity=true;"
+        }
+        break
+    }
+}
+
+$arguments += "-url=`"$flywayUrl`""
+
+if (![String]::IsNullOrWhitespace($flywaySchemas))
+{
+	Write-Host "Schemas provided, adding schemas command line argument"
+	$arguments += "-schemas=`"$flywaySchemas`""    
+}
+
+if (![string]::IsNullOrWhiteSpace($flywayLicenseEmail) -and ![string]::IsNullOrWhiteSpace($flywayLicensePAT))
+{
+    Write-Host "Personal Access Token provided, adding -email and -token command line arguments"
+    $arguments += @("-email=`"$flywayLicenseEmail`"", "-token=`"$flywayLicensePAT`"")
+}
+
+Write-Host "Performing diff of schema model against $($flywayUrl)/$($flywayDatabase) ..."
+
+# Locate schema-model folder
+$packageFolders = Get-ChildItem -Path $flywayPackagePath -Recurse | ?{ $_.PSIsContainer } | Where-Object {$_.Name -eq "schema-model"}
+
+if ($packageFolders -is [array])
+{
+  Write-Error "Multiple 'schema-model' folders found!"
+}
+
+$modelFolderPath = $packageFolders.FullName
+
+$arguments += "-environments.$flywayEnvironment.url=$flywayUrl"
+$arguments += "-environment=$flywayEnvironment"
+$arguments += "-schemaModelLocation=$modelFolderPath"
+if (![string]::IsNullOrWhitespace($flywaySourceSchema))
+{
+  $arguments += "-schemaModelSchemas=$flywaySourceSchema"
+}
+if (![string]::IsNullOrWhitespace($flywayTargetSchema))
+{
+  $arguments += "-environments.$flywayEnvironment.schemas=$flywayTargetSchema"
+}
+
+# Execute diff
+$diffArguments = @("diff")
+$diffArguments += $arguments
+$diffArguments += "-diff.source=schemaModel"
+$diffArguments += "-diff.target=env:$flywayEnvironment"
+$diffArguments += "-diff.artifactFilename=$flywayPackagePath/artifact.diff"
+
+Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $diffArguments
+
+# Check to see if there's any additional arguments to add
+if (![string]::IsNullOrWhitespace($flywayAdditionalArguments))
+{
+	# Split on space
+    $flywayAdditionalArgumentsArray = ($flywayAdditionalArguments.Split(" ", [System.StringSplitOptions]::RemoveEmptyEntries))
+
+    # Loop through array
+    foreach ($newArgument in $flywayAdditionalArgumentsArray)
+    {
+    	# Add the arguments
+    	$arguments += $newArgument
+    }
+}
+
+# Attempt to find driver path for java
+$driverPath = (Get-ChildItem -Path (Get-ChildItem -Path $flywayCmd).Directory -Recurse | Where-Object {$_.PSIsContainer -eq $true -and $_.Name -eq "drivers"})
+
+# If found, add driver path to the PATH environment varaible
+if ($null -ne $driverPath)
+{
+	$env:PATH += "$([IO.Path]::PathSeparator)$($driverPath.FullName)"
+}
+
+$currentDate = Get-Date
+$currentDateFormatted = $currentDate.ToString("yyyyMMdd_HHmmss")
+
+$prepareArguments = @("prepare")
+$prepareArguments += $arguments
+$prepareArguments += "-prepare.source=schemaModel"
+$prepareArguments += "-prepare.target=env:$flywayEnvironment"
+$prepareArguments += "-prepare.artifactFilename=$flywayPackagePath/artifact.diff"
+$prepareArguments += "-prepare.scriptFilename=$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql"
+
+if ($flywayUndoScript)
+{
+  $prepareArguments += "-prepare.undoFilename=$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql"
+  $prepareArguments += "-prepare.types=`"deploy,undo`""
+}
+
+switch($flywayCommand)
+{
+  "prepare"
+  {
+    Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $prepareArguments
+    if ((Test-Path -Path "$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql") -eq $true)
+    {
+      $fileContents = Get-Content -Path "$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql"
+      Set-OctopusVariable -name "ScriptFile" -value "$fileContents"
+      Write-Host "Output variable with script contents: #{Octopus.Action[$flywayStepName].Output.Scriptfile}"
+
+      if ($flywayUndoScript)
+      {
+        $fileContents = Get-Content -Path "$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql"
+        Set-OctopusVariable -name "UndoScriptFile" -value "$fileContents"
+        Write-Host "Output variable with script contents: #{Octopus.Action[$flywayStepName].Output.UndoScriptfile}"
+      }
+    }
+
+    break
+  }
+  "check"
+  {
+    # Create array for check arguments
+    $checkArguments = @("check", "-changes", "-check.changesSource=`"schemaModel`"")
+    $checkArguments += $arguments
+
+    # Execute command
+    Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $checkArguments
+
+    # Attach generated report as Octopus Artifact
+    if ((Test-Path -Path "$flywayPackagePath/report.html") -eq $true)
+    {
+      New-OctopusArtifact -Path "$flywayPackagePath/report.html" -Name "$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).report.html"     
+    }
+
+    break
+  }
+  "deploy"
+  {
+    Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $prepareArguments # Prepare has to be run first to produce the scripts deploy needs
+    if ((Test-Path -Path "$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql") -eq $true)
+    {
+      # Define deploy arguments
+      $deployArguments = @("deploy")
+      $deployArguments += $arguments
+      $deployArguments += "-deploy.scriptFilename=$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql"
+      $deployArguments += "-executeInTransaction=$flywayExecuteInTransaction"
+
+      Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $deployArguments
+
+      New-OctopusArtifact -Path "$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql" -Name "$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql"
+
+      if ($flywayUndoScript)
+      {
+        New-OctopusArtifact -Path "$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql" -Name "$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql"
+      }
+    }
+    else
+    {
+      Write-Host "Script file not found!"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/step-templates/ftp-uploadfiles-package/metadata.json b/src/step-templates/ftp-uploadfiles-package/metadata.json
new file mode 100644
index 000000000..06ce05809
--- /dev/null
+++ b/src/step-templates/ftp-uploadfiles-package/metadata.json
@@ -0,0 +1,146 @@
+{
+  "Id": "8b316926-0821-459b-9869-3ca98fd9087e",
+  "Name": "Upload files by FTP from package",
+  "Description": "Upload files to a remote server via File Transfer Protocol (SFTP or FTP) using WinSCP.\n\nThis step template uses the [WinSCP .NET Assembly](http://winscp.net/eng/docs/library#downloading_and_installing_the_assembly).  In the absence of WinSCP installed on the machine, it will attempt to make use of the WinSCP PowerShell module, downloading a temporary copy if not already present. \n\n# Notes on usage\n\nThis version uses a referenced package parameter and is able to be run on a Worker.\n\n## Cleaning up deployments\n\nIf you aren't deploying to an application host and don't want the deployment files to persist on the tentacle irrespective of the life cycle retention policy ensure that you set the \"Delete Previous Deployment\" to `true` and they will be removed.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "FtpPackage"
+      },
+      "Id": "76cedf6d-e8b0-4fc2-af04-a745ae6659ea",
+      "Name": "FtpPackage"
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "a884e52a-0e90-4b98-ba36-916dbbb7302c",
+      "Name": "PathToWinScp",
+      "Label": "Path to WinScp",
+      "HelpText": "The directory where you extracted the WinSCP .NET Assembly.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "09f9bb2d-2c7e-402c-8824-e91c6c7dd3e4",
+      "Name": "FtpHost",
+      "Label": "Host",
+      "HelpText": "The address of your FTP server. Example: `ftp.yourhost.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "81768a2a-9fbb-47d0-b584-91cb1c93fc28",
+      "Name": "FtpUsername",
+      "Label": "Username",
+      "HelpText": "If no username is specified, the well-known username `anonymous` will be used.",
+      "DefaultValue": "anonymous",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f36ea459-db54-4ff8-9f9f-f6917f56f330",
+      "Name": "FtpPassword",
+      "Label": "Password",
+      "HelpText": "If no password is specified, the well-known password `guest` will be used.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
+      "DefaultValue": "guest",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c970e25e-e1cf-4143-81e7-ab158f80b7bf",
+      "Name": "FtpHostKeyFingerprint",
+      "Label": "Host Key Fingerprint(s)",
+      "HelpText": "By supplying a host key fingerprint (or a semicolon separated list), you will force the deployment into SFTP mode, and automatically accept the host certificates.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4c4ace47-c5a0-46e3-9898-39fb722a524d",
+      "Name": "FtpPasskey",
+      "Label": "Passkey",
+      "HelpText": "Path to the PPK passkey file, leave blank if using a Password",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0ecfc143-7470-45a2-a099-f0c6f37f58e5",
+      "Name": "FtpPasskeyPhrase",
+      "Label": "Passkey Phrase",
+      "HelpText": "If your passkey is encrypted, please supply the pass phrase.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b2fa7e63-c46b-4539-8d3b-c1d7c41c71ea",
+      "Name": "FtpRemoteDirectory",
+      "Label": "Remote directory",
+      "HelpText": "The directory on your FTP server in which you want files to be placed. Example: `/site/wwwroot`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f02cbc65-dffb-40cc-a0b5-d87e19346b90",
+      "Name": "FtpDeleteUnrecognizedFiles",
+      "Label": "Delete unrecognized files",
+      "HelpText": "Files can exist on the FTP server that do not exist in the NuGet package. Examples may be binaries from a previous release, or uploaded images in a CMS. Use this option to choose how to treat these files.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "e7ca0ba2-02cc-4988-acef-0f0bb12094ad",
+      "Name": "DeleteDeploymentStep",
+      "Label": "Delete Deployment Step?",
+      "HelpText": "Should this script delete the deployment - for example, if you are running this on the Octopus Server, you might want to clean up the output of the previous package deploy step when this has completed.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b7a1af1a-0670-4817-a577-132fe1db01e5",
+      "Name": "FtpPackage",
+      "Label": "Package",
+      "HelpText": "Select the package to FTP",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-08T00:22:01.9210000Z",
+    "OctopusVersion": "2020.3.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "winscp"
+}
diff --git a/src/step-templates/ftp-uploadfiles-package/scriptbody.ps1 b/src/step-templates/ftp-uploadfiles-package/scriptbody.ps1
new file mode 100644
index 000000000..5f086a5ba
--- /dev/null
+++ b/src/step-templates/ftp-uploadfiles-package/scriptbody.ps1
@@ -0,0 +1,325 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+$PathToWinScp = $OctopusParameters['PathToWinScp']
+$FtpHost = $OctopusParameters['FtpHost']
+$FtpUsername = $OctopusParameters['FtpUsername']
+$FtpPassword = $OctopusParameters['FtpPassword']
+$FtpHostKeyFingerprint = $OctopusParameters['FtpHostKeyFingerprint']
+$FtpPasskey = $OctopusParameters['FtpPasskey']
+$FtpPasskeyPhrase = $OctopusParameters['FtpPasskeyPhrase']
+$FtpRemoteDirectory = $OctopusParameters['FtpRemoteDirectory']
+$FtpDeleteUnrecognizedFiles = $OctopusParameters['FtpDeleteUnrecognizedFiles']
+$DeleteDeploymentStep = $OctopusParameters['DeleteDeploymentStep']
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Helper for validating input parameters
+function Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {
+    if (! $parameterName -contains "Password")
+    {
+        Write-Host "${parameterName}: $foo"
+    }
+    if (! $foo) {
+        throw "No value was set for $parameterName, and it cannot be empty"
+    }
+}
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+
+    throw "No install location found for step: $stepName"
+}
+
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+# Session.FileTransferred event handler
+function FileTransferred
+{
+    param($e)
+
+    if ($e.Error -eq $Null)
+    {
+        Write-Host ("Upload of {0} succeeded" -f $e.FileName)
+    }
+    else
+    {
+        Write-Error ("Upload of {0} failed: {1}" -f $e.FileName, $e.Error)
+    }
+
+    if ($e.Chmod -ne $Null)
+    {
+        if ($e.Chmod.Error -eq $Null)
+        {
+            Write-Host "##octopus[stdout-verbose]"
+            Write-Host ("Permisions of {0} set to {1}" -f $e.Chmod.FileName, $e.Chmod.FilePermissions)
+            Write-Host "##octopus[stdout-default]"
+        }
+        else
+        {
+            Write-Error ("Setting permissions of {0} failed: {1}" -f $e.Chmod.FileName, $e.Chmod.Error)
+        }
+
+    }
+    else
+    {
+        Write-Host "##octopus[stdout-verbose]"
+        Write-Host ("Permissions of {0} kept with their defaults" -f $e.Destination)
+        Write-Host "##octopus[stdout-default]"
+    }
+
+    if ($e.Touch -ne $Null)
+    {
+        if ($e.Touch.Error -eq $Null)
+        {
+            Write-Host "##octopus[stdout-verbose]"
+            Write-Host ("Timestamp of {0} set to {1}" -f $e.Touch.FileName, $e.Touch.LastWriteTime)
+            Write-Host "##octopus[stdout-default]"
+        }
+        else
+        {
+            Write-Error ("Setting timestamp of {0} failed: {1}" -f $e.Touch.FileName, $e.Touch.Error)
+        }
+
+    }
+    else
+    {
+        # This should never happen during "local to remote" synchronization
+        Write-Host "##octopus[stdout-verbose]"
+        Write-Host ("Timestamp of {0} kept with its default (current time)" -f $e.Destination)
+        Write-Host "##octopus[stdout-default]"
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+$PowerShellModuleName = "WinSCP"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if $PathToWinScp is empty
+if ([string]::IsNullOrEmpty($PathToWinScp))
+{
+    # Check to see if WinSCP module is installed
+    if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+    {
+      # Tell user what we're doing
+      Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+      # Install temporary copy
+      Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+      
+      # Import module
+      Write-Output "Importing $PowerShellModuleName ..."
+      Import-Module $PowerShellModuleName
+    }
+	#Get-ChildItem -Path ([System.IO.Path]::GetDirectoryName((Get-Module $PowerShellModuleName).Path))
+	# Get the path to where the dll resides
+    #$PathToWinScp = [System.IO.Path]::GetDirectoryName((Get-Module $PowerShellModuleName).Path)
+}
+else
+{
+	Validate-Parameter $PathToWinScp -parameterName "Path to WinSCP .NET Assembly"
+    # Load WinSCP .NET assembly
+    $fullPathToWinScp = "$PathToWinScp\WinSCPnet.dll"
+    if(-not (Test-Path $fullPathToWinScp))
+    {
+        throw "$PathToWinScp does not contain the WinSCP .NET Assembly"
+    }
+    Add-Type -Path $fullPathToWinScp    
+}
+
+#Validate-Parameter $PathToWinScp -parameterName "Path to WinSCP .NET Assembly"
+Validate-Parameter $FtpHost -parameterName "Host"
+Validate-Parameter $FtpUsername -parameterName "Username"
+Validate-Parameter $FtpPassword -parameterName "Password"
+Validate-Parameter $FtpRemoteDirectory -parameterName "Remote directory"
+Validate-Parameter $FtpDeleteUnrecognizedFiles -parameterName "Delete unrecognized files"
+
+## --------------------------------------------------------------------------------------
+## Main script
+## --------------------------------------------------------------------------------------
+
+# Load WinSCP .NET assembly
+<#
+$fullPathToWinScp = "$PathToWinScp\WinSCPnet.dll"
+if(-not (Test-Path $fullPathToWinScp))
+{
+    throw "$PathToWinScp does not contain the WinSCP .NET Assembly"
+}
+Add-Type -Path $fullPathToWinScp
+#>
+$stepPath = ""
+
+$stepPath = $OctopusParameters["Octopus.Action.Package[FtpPackage].ExtractedPath"]
+
+Write-Host "Package was installed to: $stepPath"
+
+try
+{
+    $sessionOptions = New-Object WinSCP.SessionOptions
+
+    # WinSCP defaults to SFTP, but it's good to ensure that's the case
+    if (![string]::IsNullOrEmpty($FtpHostKeyFingerprint)) {
+      $sessionOptions.Protocol = [WinScp.Protocol]::Sftp
+      $sessionOptions.SshHostKeyFingerprint = $FtpHostKeyFingerprint
+    }
+    else {
+      $sessionOptions.Protocol = [WinSCP.Protocol]::Ftp
+    }
+    $sessionOptions.HostName = $FtpHost
+    $sessionOptions.UserName = $FtpUsername
+
+    
+
+    # If there is a path to the private key, use that instead of a password
+    if (![string]::IsNullOrEmpty($FtpPasskey)) {
+      Write-Host "Attempting to use passkey instead of password"
+
+      # Check key exists
+      if (!(Test-Path $FtpPasskey)) {
+        throw "Unable to locate passkey at: $FtpPasskey"
+      }
+
+      $sessionOptions.SshPrivateKeyPath = $FtpPasskey
+
+      # If the key requires a passphrase to access
+      if ($FtpPasskeyPhrase -ne "") {
+        $sessionOptions.PrivateKeyPassphrase = $FtpPasskeyPhrase
+      }
+    }
+    else {
+      $sessionOptions.Password = $FtpPassword
+    }
+
+    $session = New-Object WinSCP.Session
+    
+    if ([string]::IsNullOrEmpty($PathToWinScp))
+    {
+    	# Using PowerShell module, need to set the executable location
+        $session.ExecutablePath = "$([System.IO.Path]::GetDirectoryName((Get-Module $PowerShellModuleName).Path))\bin\winscp.exe"
+    }
+    
+    try
+    {
+    
+        # Will continuously report progress of synchronization
+        $session.add_FileTransferred( { FileTransferred($_) } )
+
+        # Connect
+        $session.Open($sessionOptions)
+
+        Write-Host "Beginning synchronization between $stepPath and $FtpRemoteDirectory on $FtpHost"
+
+        if (-not $session.FileExists($FtpRemoteDirectory))
+        {
+            Write-Host "Remote directory not found, creating $FtpRemoteDirectory"
+            $session.CreateDirectory($FtpRemoteDirectory);
+        }
+
+        # Synchronize files
+        $synchronizationResult = $session.SynchronizeDirectories(
+            [WinSCP.SynchronizationMode]::Remote, $stepPath, $FtpRemoteDirectory, $FtpDeleteUnrecognizedFiles)
+
+        # Throw on any error
+        $synchronizationResult.Check()
+    }
+    finally
+    {
+        # Disconnect, clean up
+        $session.Dispose()
+
+        if ($DeleteDeploymentStep) {
+          Remove-Item -Path $stepPath -Recurse
+        }
+    }
+
+    exit 0
+}
+catch [Exception]
+{
+    throw $_.Exception.Message
+}
+
diff --git a/src/step-templates/ftp-uploadfiles/metadata.json b/src/step-templates/ftp-uploadfiles/metadata.json
new file mode 100644
index 000000000..a61d72089
--- /dev/null
+++ b/src/step-templates/ftp-uploadfiles/metadata.json
@@ -0,0 +1,122 @@
+{
+  "Id": "3b534e57-e8b0-4a06-aa2c-9e7eba1f4337",
+  "Name": "Upload files by FTP",
+  "Description": "Upload files to a remote server via File Transfer Protocol (SFTP or FTP) using WinSCP.\n\nThis step template requires the [WinSCP .NET Assembly](http://winscp.net/eng/docs/library#downloading_and_installing_the_assembly) to be installed on the server running the deployment.\n\n# Notes on usage\n\nYou will need to have a \"Deploy a Package\" step before this step to supply the files to deploy. You can have this all happen on your Octopus Server rather than one of your web servers by following the steps at [Deploying Packages to your Octopus Server](https://octopus.com/docs/deployment-process/steps/how-to-run-steps-on-the-octopus-server#deploying-packages-to-your-octopus-server).\n\n## Cleaning up deployments\n\nIf you aren't deploying to an application host and don't want the deployment files to persist on the tentacle irrespective of the life cycle retention policy ensure that you set the \"Delete Previous Deployment\" to `true` and they will be removed.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "PathToWinScp",
+      "Label": "Path to WinScp",
+      "HelpText": "The directory where you extracted the WinSCP .NET Assembly.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FtpHost",
+      "Label": "Host",
+      "HelpText": "The address of your FTP server. Example: `ftp.yourhost.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FtpUsername",
+      "Label": "Username",
+      "HelpText": "If no username is specified, the well-known username `anonymous` will be used.",
+      "DefaultValue": "anonymous",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FtpPassword",
+      "Label": "Password",
+      "HelpText": "If no password is specified, the well-known password `guest` will be used.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
+      "DefaultValue": "guest",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "FtpHostKeyFingerprint",
+      "Label": "Host Key Fingerprint(s)",
+      "HelpText": "By supplying a host key fingerprint (or a semicolon separated list), you will force the deployment into SFTP mode, and automatically accept the host certificates.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FtpPasskey",
+      "Label": "Passkey",
+      "HelpText": "Path to the PPK passkey file, leave blank if using a Password",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FtpPasskeyPhrase",
+      "Label": "Passkey Phrase",
+      "HelpText": "If your passkey is encrypted, please supply the pass phrase.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "FtpRemoteDirectory",
+      "Label": "Remote directory",
+      "HelpText": "The directory on your FTP server in which you want files to be placed. Example: `/site/wwwroot`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "FtpPackageStepName",
+      "Label": "Package step name",
+      "HelpText": "Name of the previously-deployed package step that contains the files that you want to deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "FtpDeleteUnrecognizedFiles",
+      "Label": "Delete unrecognized files",
+      "HelpText": "Files can exist on the FTP server that do not exist in the NuGet package. Examples may be binaries from a previous release, or uploaded images in a CMS. Use this option to choose how to treat these files.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DeleteDeploymentStep",
+      "Label": "Delete Deployment Step?",
+      "HelpText": "Should this script delete the deployment - for example, if you are running this on the Octopus Server, you might want to clean up the output of the previous package deploy step when this has completed.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2018-07-05T15:12:39.2190000Z",
+  "LastModifiedBy": "Zhaph",
+  "$Meta": {
+    "ExportedAt": "2018-07-05T15:12:39.2190000Z",
+    "OctopusVersion": "2018.6.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "winscp"
+}
diff --git a/src/step-templates/ftp-uploadfiles/scriptbody.ps1 b/src/step-templates/ftp-uploadfiles/scriptbody.ps1
new file mode 100644
index 000000000..f034ab823
--- /dev/null
+++ b/src/step-templates/ftp-uploadfiles/scriptbody.ps1
@@ -0,0 +1,230 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+$PathToWinScp = $OctopusParameters['PathToWinScp']
+$FtpHost = $OctopusParameters['FtpHost']
+$FtpUsername = $OctopusParameters['FtpUsername']
+$FtpPassword = $OctopusParameters['FtpPassword']
+$FtpHostKeyFingerprint = $OctopusParameters['FtpHostKeyFingerprint']
+$FtpPasskey = $OctopusParameters['FtpPasskey']
+$FtpPasskeyPhrase = $OctopusParameters['FtpPasskeyPhrase']
+$FtpRemoteDirectory = $OctopusParameters['FtpRemoteDirectory']
+$FtpPackageStepName = $OctopusParameters['FtpPackageStepName']
+$FtpDeleteUnrecognizedFiles = $OctopusParameters['FtpDeleteUnrecognizedFiles']
+$DeleteDeploymentStep = $OctopusParameters['DeleteDeploymentStep']
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {
+    if (! $parameterName -contains "Password")
+    {
+        Write-Host "${parameterName}: $foo"
+    }
+    if (! $foo) {
+        throw "No value was set for $parameterName, and it cannot be empty"
+    }
+}
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+
+    throw "No install location found for step: $stepName"
+}
+
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+# Session.FileTransferred event handler
+function FileTransferred
+{
+    param($e)
+
+    if ($e.Error -eq $Null)
+    {
+        Write-Host ("Upload of {0} succeeded" -f $e.FileName)
+    }
+    else
+    {
+        Write-Error ("Upload of {0} failed: {1}" -f $e.FileName, $e.Error)
+    }
+
+    if ($e.Chmod -ne $Null)
+    {
+        if ($e.Chmod.Error -eq $Null)
+        {
+            Write-Host "##octopus[stdout-verbose]"
+            Write-Host ("Permisions of {0} set to {1}" -f $e.Chmod.FileName, $e.Chmod.FilePermissions)
+            Write-Host "##octopus[stdout-default]"
+        }
+        else
+        {
+            Write-Error ("Setting permissions of {0} failed: {1}" -f $e.Chmod.FileName, $e.Chmod.Error)
+        }
+
+    }
+    else
+    {
+        Write-Host "##octopus[stdout-verbose]"
+        Write-Host ("Permissions of {0} kept with their defaults" -f $e.Destination)
+        Write-Host "##octopus[stdout-default]"
+    }
+
+    if ($e.Touch -ne $Null)
+    {
+        if ($e.Touch.Error -eq $Null)
+        {
+            Write-Host "##octopus[stdout-verbose]"
+            Write-Host ("Timestamp of {0} set to {1}" -f $e.Touch.FileName, $e.Touch.LastWriteTime)
+            Write-Host "##octopus[stdout-default]"
+        }
+        else
+        {
+            Write-Error ("Setting timestamp of {0} failed: {1}" -f $e.Touch.FileName, $e.Touch.Error)
+        }
+
+    }
+    else
+    {
+        # This should never happen during "local to remote" synchronization
+        Write-Host "##octopus[stdout-verbose]"
+        Write-Host ("Timestamp of {0} kept with its default (current time)" -f $e.Destination)
+        Write-Host "##octopus[stdout-default]"
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+Validate-Parameter $PathToWinScp -parameterName "Path to WinSCP .NET Assembly"
+Validate-Parameter $FtpHost -parameterName "Host"
+Validate-Parameter $FtpUsername -parameterName "Username"
+Validate-Parameter $FtpPassword -parameterName "Password"
+Validate-Parameter $FtpRemoteDirectory -parameterName "Remote directory"
+Validate-Parameter $FtpPackageStepName -parameterName "Package step name"
+Validate-Parameter $FtpDeleteUnrecognizedFiles -parameterName "Delete unrecognized files"
+
+## --------------------------------------------------------------------------------------
+## Main script
+## --------------------------------------------------------------------------------------
+
+# Load WinSCP .NET assembly
+$fullPathToWinScp = "$PathToWinScp\WinSCPnet.dll"
+if(-not (Test-Path $fullPathToWinScp))
+{
+    throw "$PathToWinScp does not contain the WinSCP .NET Assembly"
+}
+Add-Type -Path $fullPathToWinScp
+
+$stepPath = ""
+if (-not [string]::IsNullOrEmpty($FtpPackageStepName)) {
+    Write-Host "Finding path to package step: $FtpPackageStepName"
+    $stepPath = Find-InstallLocation $FtpPackageStepName
+} else {
+    $stepPath = Find-SingleInstallLocation
+}
+Write-Host "Package was installed to: $stepPath"
+
+try
+{
+    $sessionOptions = New-Object WinSCP.SessionOptions
+
+    # WinSCP defaults to SFTP, but it's good to ensure that's the case
+    if ($FtpHostKeyFingerprint -ne "") {
+      $sessionOptions.Protocol = [WinScp.Protocol]::Sftp
+    }
+    else {
+      $sessionOptions.Protocol = [WinSCP.Protocol]::Ftp
+    }
+    $sessionOptions.HostName = $FtpHost
+    $sessionOptions.UserName = $FtpUsername
+
+    $sessionOptions.SshHostKeyFingerprint = $FtpHostKeyFingerprint
+
+    # If there is a path to the private key, use that instead of a password
+    if ($FtpPasskey -ne "") {
+      Write-Host "Attempting to use passkey instead of password"
+
+      # Check key exists
+      if (!(Test-Path $FtpPasskey)) {
+        throw "Unable to locate passkey at: $FtpPasskey"
+      }
+
+      $sessionOptions.SshPrivateKeyPath = $FtpPasskey
+
+      # If the key requires a passphrase to access
+      if ($FtpPasskeyPhrase -ne "") {
+        $sessionOptions.PrivateKeyPassphrase = $FtpPasskeyPhrase
+      }
+    }
+    else {
+      $sessionOptions.Password = $FtpPassword
+    }
+
+    $session = New-Object WinSCP.Session
+    try
+    {
+        # Will continuously report progress of synchronization
+        $session.add_FileTransferred( { FileTransferred($_) } )
+
+        # Connect
+        $session.Open($sessionOptions)
+
+        Write-Host "Beginning synchronization between $stepPath and $FtpRemoteDirectory on $FtpHost"
+
+        if (-not $session.FileExists($FtpRemoteDirectory))
+        {
+            Write-Host "Remote directory not found, creating $FtpRemoteDirectory"
+            $session.CreateDirectory($FtpRemoteDirectory);
+        }
+
+        # Synchronize files
+        $synchronizationResult = $session.SynchronizeDirectories(
+            [WinSCP.SynchronizationMode]::Remote, $stepPath, $FtpRemoteDirectory, $FtpDeleteUnrecognizedFiles)
+
+        # Throw on any error
+        $synchronizationResult.Check()
+    }
+    finally
+    {
+        # Disconnect, clean up
+        $session.Dispose()
+
+        if ($DeleteDeploymentStep) {
+          Remove-Item -Path $stepPath -Recurse
+        }
+    }
+
+    exit 0
+}
+catch [Exception]
+{
+    throw $_.Exception.Message
+}
diff --git a/step-templates/gcp-secret-manager-retrieve-secret-oidc.json b/src/step-templates/gcp-secret-manager-retrieve-secret-oidc/metadata.json
similarity index 65%
rename from step-templates/gcp-secret-manager-retrieve-secret-oidc.json
rename to src/step-templates/gcp-secret-manager-retrieve-secret-oidc/metadata.json
index bb9e3d4b9..1267aa431 100644
--- a/step-templates/gcp-secret-manager-retrieve-secret-oidc.json
+++ b/src/step-templates/gcp-secret-manager-retrieve-secret-oidc/metadata.json
@@ -16,7 +16,7 @@
     "Octopus.Action.GoogleCloud.Project": "#{GCP.SecretManager.RetrieveSecrets.Project}",
     "Octopus.Action.GoogleCloud.Region": "#{GCP.SecretManager.RetrieveSecrets.Region}",
     "Octopus.Action.GoogleCloud.Zone": "#{GCP.SecretManager.RetrieveSecrets.Zone}",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$SecretNames = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.SecretNames\"]\n$PrintVariableNames = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.PrintVariableNames\"]\n\n# GCP Project/Region/Zone\n$Project = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.Project\"]\n$Region = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.Region\"]\n$Zone = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.Zone\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($SecretNames)) {\n    throw \"Required parameter GCP.SecretManager.RetrieveSecrets.SecretNames not specified\"\n}\n\n$Secrets = @()\n$VariablesCreated = 0\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Extract secret names\n@(($SecretNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $secretDefinition = ($_ -Split \"\\|\")\n        $secretName = $secretDefinition[0].Trim()\n        $secretNameAndVersion = ($secretName -Split \" \")\n        $secretVersion = \"latest\"\n        if ($secretNameAndVersion.Count -gt 1) {\n            $secretName = $secretNameAndVersion[0].Trim()\n            $secretVersion = $secretNameAndVersion[1].Trim()\n        }\n        if ([string]::IsNullOrWhiteSpace($secretName)) {\n            throw \"Unable to establish secret name from: '$($_)'\"\n        }\n        $secret = [PsCustomObject]@{\n            Name          = $secretName\n            SecretVersion = $secretVersion\n            VariableName  = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { \"\" }\n        }\n        $Secrets += $secret\n    }\n}\n\nWrite-Verbose \"GCP Default Project: $Project\"\nWrite-Verbose \"GCP Default Region: $Region\"\nWrite-Verbose \"GCP Default Zone: $Zone\"\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\n\n# Retrieve Secrets\nforeach ($secret in $secrets) {\n    $name = $secret.Name\n    $secretVersion = $secret.SecretVersion\n    $variableName = $secret.VariableName\n    if ([string]::IsNullOrWhiteSpace($variableName)) {\n        $variableName = \"$($name.Trim())-$secretVersion\"\n    }\n    Write-Host \"Retrieving Secret '$name' (version: $secretVersion)\"\n    if ($secretVersion -ieq \"latest\") {\n        Write-Host \"Note: Retrieving the 'latest' version for secret '$name' isn't recommended. Consider choosing a specific version to retrieve.\"\n    }\n    \n    $secretValue = (gcloud secrets versions access $secretVersion --secret=\"$name\") -Join \"`n\"\n    \n    if ([string]::IsNullOrWhiteSpace($secretValue)) {\n        throw \"Error: Secret '$name' (version: $secretVersion) not found or has no versions.\"\n    }\n\n    Set-OctopusVariable -Name $variableName -Value $secretValue -Sensitive\n\n    if ($PrintVariableNames -eq $True) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n    }\n    $VariablesCreated += 1\n}\n\nWrite-Host \"Created $VariablesCreated output variables\"\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -82,7 +82,7 @@
   ],
   "StepPackageId": "Octopus.GoogleCloudScripting",
   "$Meta": {
-    "ExportedAt": "2025-09-18T12:25:52.896Z",
+    "ExportedAt": "2025-09-18T12:25:52.8960000Z",
     "OctopusVersion": "2025.4.1096",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/gcp-secret-manager-retrieve-secret-oidc/scriptbody.ps1 b/src/step-templates/gcp-secret-manager-retrieve-secret-oidc/scriptbody.ps1
new file mode 100644
index 000000000..82e43fb8c
--- /dev/null
+++ b/src/step-templates/gcp-secret-manager-retrieve-secret-oidc/scriptbody.ps1
@@ -0,0 +1,78 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$SecretNames = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.SecretNames"]
+$PrintVariableNames = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.PrintVariableNames"]
+
+# GCP Project/Region/Zone
+$Project = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.Project"]
+$Region = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.Region"]
+$Zone = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.Zone"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($SecretNames)) {
+    throw "Required parameter GCP.SecretManager.RetrieveSecrets.SecretNames not specified"
+}
+
+$Secrets = @()
+$VariablesCreated = 0
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Extract secret names
+@(($SecretNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $secretDefinition = ($_ -Split "\|")
+        $secretName = $secretDefinition[0].Trim()
+        $secretNameAndVersion = ($secretName -Split " ")
+        $secretVersion = "latest"
+        if ($secretNameAndVersion.Count -gt 1) {
+            $secretName = $secretNameAndVersion[0].Trim()
+            $secretVersion = $secretNameAndVersion[1].Trim()
+        }
+        if ([string]::IsNullOrWhiteSpace($secretName)) {
+            throw "Unable to establish secret name from: '$($_)'"
+        }
+        $secret = [PsCustomObject]@{
+            Name          = $secretName
+            SecretVersion = $secretVersion
+            VariableName  = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { "" }
+        }
+        $Secrets += $secret
+    }
+}
+
+Write-Verbose "GCP Default Project: $Project"
+Write-Verbose "GCP Default Region: $Region"
+Write-Verbose "GCP Default Zone: $Zone"
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "Print variables: $PrintVariableNames"
+
+# Retrieve Secrets
+foreach ($secret in $secrets) {
+    $name = $secret.Name
+    $secretVersion = $secret.SecretVersion
+    $variableName = $secret.VariableName
+    if ([string]::IsNullOrWhiteSpace($variableName)) {
+        $variableName = "$($name.Trim())-$secretVersion"
+    }
+    Write-Host "Retrieving Secret '$name' (version: $secretVersion)"
+    if ($secretVersion -ieq "latest") {
+        Write-Host "Note: Retrieving the 'latest' version for secret '$name' isn't recommended. Consider choosing a specific version to retrieve."
+    }
+    
+    $secretValue = (gcloud secrets versions access $secretVersion --secret="$name") -Join "`n"
+    
+    if ([string]::IsNullOrWhiteSpace($secretValue)) {
+        throw "Error: Secret '$name' (version: $secretVersion) not found or has no versions."
+    }
+
+    Set-OctopusVariable -Name $variableName -Value $secretValue -Sensitive
+
+    if ($PrintVariableNames -eq $True) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+    }
+    $VariablesCreated += 1
+}
+
+Write-Host "Created $VariablesCreated output variables"
diff --git a/step-templates/gcp-secret-manager-retrieve-secrets.json b/src/step-templates/gcp-secret-manager-retrieve-secrets/metadata.json
similarity index 63%
rename from step-templates/gcp-secret-manager-retrieve-secrets.json
rename to src/step-templates/gcp-secret-manager-retrieve-secrets/metadata.json
index 7416ead72..496a651e7 100644
--- a/step-templates/gcp-secret-manager-retrieve-secrets.json
+++ b/src/step-templates/gcp-secret-manager-retrieve-secrets/metadata.json
@@ -15,7 +15,7 @@
     "Octopus.Action.GoogleCloud.Project": "#{GCP.SecretManager.RetrieveSecrets.Project}",
     "Octopus.Action.GoogleCloud.Region": "#{GCP.SecretManager.RetrieveSecrets.Region}",
     "Octopus.Action.GoogleCloud.Zone": "#{GCP.SecretManager.RetrieveSecrets.Zone}",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$SecretNames = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.SecretNames\"]\n$PrintVariableNames = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.PrintVariableNames\"]\n\n# GCP Project/Region/Zone\n$Project = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.Project\"]\n$Region = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.Region\"]\n$Zone = $OctopusParameters[\"GCP.SecretManager.RetrieveSecrets.Zone\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($SecretNames)) {\n    throw \"Required parameter GCP.SecretManager.RetrieveSecrets.SecretNames not specified\"\n}\n\n$Secrets = @()\n$VariablesCreated = 0\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Extract secret names\n@(($SecretNames -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n        $secretDefinition = ($_ -Split \"\\|\")\n        $secretName = $secretDefinition[0].Trim()\n        $secretNameAndVersion = ($secretName -Split \" \")\n        $secretVersion = \"latest\"\n        if ($secretNameAndVersion.Count -gt 1) {\n            $secretName = $secretNameAndVersion[0].Trim()\n            $secretVersion = $secretNameAndVersion[1].Trim()\n        }\n        if ([string]::IsNullOrWhiteSpace($secretName)) {\n            throw \"Unable to establish secret name from: '$($_)'\"\n        }\n        $secret = [PsCustomObject]@{\n            Name          = $secretName\n            SecretVersion = $secretVersion\n            VariableName  = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { \"\" }\n        }\n        $Secrets += $secret\n    }\n}\n\nWrite-Verbose \"GCP Default Project: $Project\"\nWrite-Verbose \"GCP Default Region: $Region\"\nWrite-Verbose \"GCP Default Zone: $Zone\"\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"Print variables: $PrintVariableNames\"\n\n# Retrieve Secrets\nforeach ($secret in $secrets) {\n    $name = $secret.Name\n    $secretVersion = $secret.SecretVersion\n    $variableName = $secret.VariableName\n    if ([string]::IsNullOrWhiteSpace($variableName)) {\n        $variableName = \"$($name.Trim())-$secretVersion\"\n    }\n    Write-Host \"Retrieving Secret '$name' (version: $secretVersion)\"\n    if ($secretVersion -ieq \"latest\") {\n        Write-Host \"Note: Retrieving the 'latest' version for secret '$name' isn't recommended. Consider choosing a specific version to retrieve.\"\n    }\n    \n    $secretValue = (gcloud secrets versions access $secretVersion --secret=\"$name\") -Join \"`n\"\n    \n    if ([string]::IsNullOrWhiteSpace($secretValue)) {\n        throw \"Error: Secret '$name' (version: $secretVersion) not found or has no versions.\"\n    }\n\n    Set-OctopusVariable -Name $variableName -Value $secretValue -Sensitive\n\n    if ($PrintVariableNames -eq $True) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n    }\n    $VariablesCreated += 1\n}\n\nWrite-Host \"Created $variablesCreated output variables\"\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -80,7 +80,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2023-05-01T16:37:53.788Z",
+    "ExportedAt": "2023-05-01T16:37:53.7880000Z",
     "OctopusVersion": "2023.2.9229",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/gcp-secret-manager-retrieve-secrets/scriptbody.ps1 b/src/step-templates/gcp-secret-manager-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..efbd7f93a
--- /dev/null
+++ b/src/step-templates/gcp-secret-manager-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,78 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$SecretNames = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.SecretNames"]
+$PrintVariableNames = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.PrintVariableNames"]
+
+# GCP Project/Region/Zone
+$Project = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.Project"]
+$Region = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.Region"]
+$Zone = $OctopusParameters["GCP.SecretManager.RetrieveSecrets.Zone"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($SecretNames)) {
+    throw "Required parameter GCP.SecretManager.RetrieveSecrets.SecretNames not specified"
+}
+
+$Secrets = @()
+$VariablesCreated = 0
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Extract secret names
+@(($SecretNames -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+        $secretDefinition = ($_ -Split "\|")
+        $secretName = $secretDefinition[0].Trim()
+        $secretNameAndVersion = ($secretName -Split " ")
+        $secretVersion = "latest"
+        if ($secretNameAndVersion.Count -gt 1) {
+            $secretName = $secretNameAndVersion[0].Trim()
+            $secretVersion = $secretNameAndVersion[1].Trim()
+        }
+        if ([string]::IsNullOrWhiteSpace($secretName)) {
+            throw "Unable to establish secret name from: '$($_)'"
+        }
+        $secret = [PsCustomObject]@{
+            Name          = $secretName
+            SecretVersion = $secretVersion
+            VariableName  = if (![string]::IsNullOrWhiteSpace($secretDefinition[1])) { $secretDefinition[1].Trim() } else { "" }
+        }
+        $Secrets += $secret
+    }
+}
+
+Write-Verbose "GCP Default Project: $Project"
+Write-Verbose "GCP Default Region: $Region"
+Write-Verbose "GCP Default Zone: $Zone"
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "Print variables: $PrintVariableNames"
+
+# Retrieve Secrets
+foreach ($secret in $secrets) {
+    $name = $secret.Name
+    $secretVersion = $secret.SecretVersion
+    $variableName = $secret.VariableName
+    if ([string]::IsNullOrWhiteSpace($variableName)) {
+        $variableName = "$($name.Trim())-$secretVersion"
+    }
+    Write-Host "Retrieving Secret '$name' (version: $secretVersion)"
+    if ($secretVersion -ieq "latest") {
+        Write-Host "Note: Retrieving the 'latest' version for secret '$name' isn't recommended. Consider choosing a specific version to retrieve."
+    }
+    
+    $secretValue = (gcloud secrets versions access $secretVersion --secret="$name") -Join "`n"
+    
+    if ([string]::IsNullOrWhiteSpace($secretValue)) {
+        throw "Error: Secret '$name' (version: $secretVersion) not found or has no versions."
+    }
+
+    Set-OctopusVariable -Name $variableName -Value $secretValue -Sensitive
+
+    if ($PrintVariableNames -eq $True) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+    }
+    $VariablesCreated += 1
+}
+
+Write-Host "Created $variablesCreated output variables"
diff --git a/step-templates/ghostinspector-runsuite.json b/src/step-templates/ghostinspector-runsuite/metadata.json
similarity index 50%
rename from step-templates/ghostinspector-runsuite.json
rename to src/step-templates/ghostinspector-runsuite/metadata.json
index e34a53704..1ffc37aaf 100644
--- a/step-templates/ghostinspector-runsuite.json
+++ b/src/step-templates/ghostinspector-runsuite/metadata.json
@@ -6,7 +6,7 @@
   "Version": 8,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null -or $result -eq \"\") {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    param(\r\n\t\t[string]$suiteId,\r\n\t\t[string]$apiKey,\r\n\t\t[string]$siteUrl,\r\n\t\t[string]$httpAuthUser,\r\n\t\t[string]$httpAuthPass\r\n    ) \r\n\r\n\t$apiUrl = \"https://api.ghostinspector.com/v1/suites/$suiteId/execute/?immediate=1&apiKey=\" + $apiKey\r\n\r\n\tif(-! ([string]::IsNullOrEmpty($siteUrl)))\r\n\t{\r\n\t\t$apiUrl = $apiUrl + '&startUrl=' + $siteUrl\r\n\t}\r\n\t\r\n\tif(-! ([string]::IsNullOrEmpty($httpAuthUser) -and [string]::IsNullOrEmpty($httpAuthPass)))\r\n\t{\r\n\t\t$apiUrl = $apiUrl + '&httpAuthUsername=' + $httpAuthUser + '&httpAuthPassword=' + $httpAuthPass\r\n\t}\r\n\r\n\tWrite-Output \"Invoking API url: $apiUrl\" \r\n\t\r\n    try {\r\n\t\tInvoke-WebRequest $apiUrl -UseBasicParsing\r\n    } catch [Exception] {\r\n        Write-Host \"There was a problem invoking Url\"\r\n        Write-Host $_.Exception|format-list -force;\r\n    }\r\n    Write-Output $(\"Test Output can be viewed here: https://app.ghostinspector.com/suites/{0} -f $suiteId\")\r\n\r\n } `\r\n (Get-Param 'suiteId' -Required) `\r\n (Get-Param 'apiKey' - Required) `\r\n (Get-Param 'siteUrl') `\r\n (Get-Param 'httpAuthUser') `\r\n (Get-Param 'httpAuthPass')",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.NuGetFeedId": null,
@@ -59,12 +59,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2016-06-20T06:48:33.000+00:00",
+    "ExportedAt": "2016-06-19T23:48:33.0000000-07:00",
     "OctopusVersion": "3.3.11",
     "Type": "ActionTemplate"
   },
   "Category": "ghostinspector"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/ghostinspector-runsuite/scriptbody.ps1 b/src/step-templates/ghostinspector-runsuite/scriptbody.ps1
new file mode 100644
index 000000000..bb68ed72b
--- /dev/null
+++ b/src/step-templates/ghostinspector-runsuite/scriptbody.ps1
@@ -0,0 +1,65 @@
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+		[string]$suiteId,
+		[string]$apiKey,
+		[string]$siteUrl,
+		[string]$httpAuthUser,
+		[string]$httpAuthPass
+    ) 
+
+	$apiUrl = "https://api.ghostinspector.com/v1/suites/$suiteId/execute/?immediate=1&apiKey=" + $apiKey
+
+	if(-! ([string]::IsNullOrEmpty($siteUrl)))
+	{
+		$apiUrl = $apiUrl + '&startUrl=' + $siteUrl
+	}
+	
+	if(-! ([string]::IsNullOrEmpty($httpAuthUser) -and [string]::IsNullOrEmpty($httpAuthPass)))
+	{
+		$apiUrl = $apiUrl + '&httpAuthUsername=' + $httpAuthUser + '&httpAuthPassword=' + $httpAuthPass
+	}
+
+	Write-Output "Invoking API url: $apiUrl" 
+	
+    try {
+		Invoke-WebRequest $apiUrl -UseBasicParsing
+    } catch [Exception] {
+        Write-Host "There was a problem invoking Url"
+        Write-Host $_.Exception|format-list -force;
+    }
+    Write-Output $("Test Output can be viewed here: https://app.ghostinspector.com/suites/{0} -f $suiteId")
+
+ } `
+ (Get-Param 'suiteId' -Required) `
+ (Get-Param 'apiKey' - Required) `
+ (Get-Param 'siteUrl') `
+ (Get-Param 'httpAuthUser') `
+ (Get-Param 'httpAuthPass')
\ No newline at end of file
diff --git a/src/step-templates/git-clone-copy-push-another-repo/metadata.json b/src/step-templates/git-clone-copy-push-another-repo/metadata.json
new file mode 100644
index 000000000..42da91328
--- /dev/null
+++ b/src/step-templates/git-clone-copy-push-another-repo/metadata.json
@@ -0,0 +1,114 @@
+{
+  "Id": "6db15b08-f6c6-4a6e-833c-773eb38ec0f0",
+  "Name": "Git - Clone, copy, push to another repo",
+  "Description": "Clones both a source and destination repository, copies files from the `Source Path` to the `Destination Path` then commits to the destination repository.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
+      "Name": "Template.Git.Source.Repo.Url",
+      "Label": "Source Git Repository URL",
+      "HelpText": "The URL used for the `git clone` operation.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
+      "Name": "Template.Git.Source.User.Name",
+      "Label": "Source Git Username",
+      "HelpText": "Username of the credentials to use to log into git.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
+      "Name": "Template.Git.Source.User.Password",
+      "Label": "Source Git User Password",
+      "HelpText": "Password for the git credential.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5c080713-029f-4f9b-8037-234c7dd579bc",
+      "Name": "Template.Git.Source.Path",
+      "Label": "Source Path",
+      "HelpText": "Relative path to the folder or items to copy.  This field can take wildcards, eg - `/MyPath/*`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5fa438c9-2aa7-476f-ae79-bd77cdc22ccc",
+      "Name": "Template.Git.Tag",
+      "Label": "Tag",
+      "HelpText": "**(Optional)** Checkout the code for `SourcePath` from a specific tag.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6d3f8f4f-8e02-48bc-b473-817693aaf835",
+      "Name": "Template.Git.Destination.Repo.Url",
+      "Label": "Destination Git Repository URL",
+      "HelpText": "The destination repository to copy and push files to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "59590dd8-6698-46f8-884c-78ad9f4b7c2e",
+      "Name": "Template.Git.Destination.User.Name",
+      "Label": "Destination Git Username",
+      "HelpText": "Username of the credentials to log into destination git repo.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d81e0a3d-5eb9-4dd3-a197-e5bf0c48cdf1",
+      "Name": "Template.Git.Destination.User.Password",
+      "Label": "Destination Git User Password",
+      "HelpText": "Password for the destination git credential.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f9a2141a-bcfa-4e53-862b-429b4f9892d9",
+      "Name": "Template.Git.Destination.Path",
+      "Label": "Destination Path",
+      "HelpText": "Relative path to the folder to copy items to.  This is the folder name only.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-12T15:32:07.1990000Z",
+    "OctopusVersion": "2023.4.2661",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "git"
+}
diff --git a/src/step-templates/git-clone-copy-push-another-repo/scriptbody.ps1 b/src/step-templates/git-clone-copy-push-another-repo/scriptbody.ps1
new file mode 100644
index 000000000..2f168347d
--- /dev/null
+++ b/src/step-templates/git-clone-copy-push-another-repo/scriptbody.ps1
@@ -0,0 +1,273 @@
+Function Invoke-Git
+{
+	# Define parameters
+    param (
+    	$GitRepositoryUrl,
+        $GitFolder,
+        $GitUsername,
+        $GitPassword,
+        $GitCommand,
+        $AdditionalArguments
+    )
+    
+    # Get current work folder
+    $workDirectory = Get-Location
+
+	# Check to see if GitFolder exists
+    if (![String]::IsNullOrWhitespace($GitFolder) -and (Test-Path -Path $GitFolder) -eq $false)
+    {
+    	# Create the folder
+        New-Item -Path $GitFolder -ItemType "Directory" -Force | Out-Null
+        
+        # Set the location to the new folder
+        Set-Location -Path $GitFolder
+    }
+    
+    # Create arguments array
+    $gitArguments = @()
+    $gitArguments += $GitCommand
+    
+    # Check for url
+    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))
+    {
+      # Convert url to URI object
+      $gitUri = [System.Uri]$GitRepositoryUrl
+      $gitUrl = "{0}://{1}:{2}@{3}:{4}{5}" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery
+      $gitArguments += $gitUrl
+
+      # Get the newly created folder name
+      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf("/") + 1)
+      if ($gitFolderName.Contains(".git"))
+      {
+          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf("."))
+      }
+    }
+   
+    
+    # Check for additional arguments
+    if ($null -ne $AdditionalArguments)
+    {
+ 		# Add the additional arguments
+        $gitArguments += $AdditionalArguments
+    }
+    
+    # Execute git command
+    $results = Execute-Command -commandPath "git" -commandArguments $gitArguments -workingDir $GitFolder
+    
+    Write-Host $results.stdout
+    Write-Host $results.stderr
+    
+    # Return the foldername
+    Set-Location -Path $workDirectory
+    
+    # Check to see if GitFolder is null
+    if ($null -ne $GitFolder)
+    {
+    	return Join-Path -Path $GitFolder -ChildPath $gitFolderName
+    }
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Function Copy-Files
+{
+	# Define parameters
+    param (
+    	$SourcePath,
+        $DestinationPath
+    )
+    
+    # Copy the items from source path to destination path
+    $copyArguments = @{}
+    $copyArguments.Add("Path", $SourcePath)
+    $copyArguments.Add("Destination", $DestinationPath)
+    
+    # Check to make sure destination exists
+    if ((Test-Path -Path $DestinationPath) -eq $false)
+    {
+    	# Create the destination path
+        New-Item -Path $DestinationPath -ItemType "Directory" | Out-Null
+    }
+    
+    # Check for wildcard
+    if ($SourcePath.EndsWith("/*") -or $SourcePath.EndsWith("\*"))
+    {
+		# Add recurse argument
+		$copyArguments.Add("Recurse", $true)
+    }
+    
+    # Force overwrite
+    $copyArguments.Add("Force", $true)
+    
+    # Copy files
+    Copy-Item @copyArguments
+}
+
+Function Execute-Command
+{
+	param (
+    	$commandPath,
+        $commandArguments,
+        $workingDir
+    )
+
+	$gitExitCode = 0
+    $executionResults = $null
+
+  Try {
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.WorkingDirectory = $workingDir
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+    $executionResults = [pscustomobject]@{
+        stdout = $p.StandardOutput.ReadToEnd()
+        stderr = $p.StandardError.ReadToEnd()
+        ExitCode = $null
+    }
+    $p.WaitForExit()
+    $gitExitCode = [int]$p.ExitCode
+    $executionResults.ExitCode = $gitExitCode
+    
+    if ($gitExitCode -ge 2) 
+    {
+		# Fail the step
+        throw
+    }
+    
+    return $executionResults
+  }
+  Catch {
+    # Check exit code
+    Write-Error -Message "$($executionResults.stderr)" -ErrorId $gitExitCode
+    exit $gitExitCode
+  }
+
+}
+
+Function Get-GitExecutable
+{
+	# Define parameters
+    param (
+    	$WorkingDirectory
+    )
+      
+    # Define variables
+    $gitExe = "PortableGit-2.41.0.3-64-bit.7z.exe"
+    $gitDownloadUrl = "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe"
+    $gitDownloadArguments = @{}
+    $gitDownloadArguments.Add("Uri", $gitDownloadUrl)
+    $gitDownloadArguments.Add("OutFile", "$WorkingDirectory/git/$gitExe")
+    
+    # This makes downloading faster
+    $ProgressPreference = 'SilentlyContinue'
+    
+    # Check to see if git subfolder exists
+    if ((Test-Path -Path "$WorkingDirectory/git") -eq $false)
+    {
+    	# Create subfolder
+        New-Item -Path "$WorkingDirectory/git"  -ItemType Directory
+    }
+    
+    # Check PowerShell version
+    if ($PSVersionTable.PSVersion.Major -lt 6)
+    {
+    	# Use basic parsing is required
+        $gitDownloadArguments.Add("UseBasicParsing", $true)
+    }
+    
+    # Download Git
+    Write-Host "Downloading Git ..."
+    Invoke-WebRequest @gitDownloadArguments
+    
+    # Extract Git
+    $gitExtractArguments = @()
+    $gitExtractArguments += "-o"
+    $gitExtractArguments += "$WorkingDirectory\git"
+    $gitExtractArguments += "-y"
+    $gitExtractArguments += "-bd"
+
+    Write-Host "Extracting Git download ..."
+    & "$WorkingDirectory\git\$gitExe" $gitExtractArguments
+
+    # Wait until unzip action is complete
+    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(".")))}))
+    {
+        Start-Sleep 5
+    }
+    
+    # Add bin folder to path
+    $env:PATH = "$WorkingDirectory\git\bin$([IO.Path]::PathSeparator)" + $env:PATH
+    
+    # Disable promopt for credential helper
+    Invoke-Git -GitCommand "config" -AdditionalArguments @("--system", "--unset", "credential.helper")
+}
+
+# Get variables
+$sourceGitUrl = $OctopusParameters['Template.Git.Source.Repo.Url']
+$destinationGitUrl = $OctopusParameters['Template.Git.Destination.Repo.Url']
+$gitSourceUser = $OctopusParameters['Template.Git.Source.User.Name']
+$gitSourcePassword = $OctopusParameters['Template.Git.Source.User.Password']
+$gitDestinationUser = $OctopusParameters['Template.Git.Destination.User.Name']
+$gitDestinationPassword = $OctopusParameters['Template.Git.Destination.User.Password']
+$sourceItems = $OctopusParameters['Template.Git.Source.Path']
+$destinationPath = $OctopusParameters['Template.Git.Destination.Path']
+$gitTag = $OctopusParameters['Template.Git.Tag']
+$gitSource = $null
+$gitDestination = $null
+
+# Check to see if it's Windows
+if ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq "Hosted Windows")
+{
+	# Dynamic worker don't have git, download portable version and add to path for execution
+    Write-Host "Detected usage of Windows Dynamic Worker ..."
+    Get-GitExecutable -WorkingDirectory $PWD
+}
+
+# Clone destination repository
+$destinationFolderName = Invoke-Git -GitRepositoryUrl $destinationGitUrl -GitUsername $gitDestinationUser -GitPassword $gitDestinationPassword -GitCommand "clone" -GitFolder "$($PWD)/destination/default"
+
+# Check for tag
+if (![String]::IsNullOrWhitespace($gitTag))
+{
+    $sourceFolderName = Invoke-Git -GitRepositoryUrl $sourceGitUrl -GitUsername $gitSourceUser -GitPassword $gitSourcePassword -GitCommand "clone" -GitFolder "$($PWD)/source/tags/$gitTag" -AdditionalArguments @("-b", "$gitTag")
+}
+else
+{
+	$sourceFolderName = Invoke-Git -GitRepositoryUrl $sourceGitUrl -GitUsername $gitSourceUser -GitPassword $gitSourcePassword -GitCommand "clone" -GitFolder "$($PWD)/source/default"
+}
+
+# Copy files from source to destination
+Copy-Files -SourcePath "$($sourceFolderName)$($sourceItems)" -DestinationPath "$($destinationFolderName)$($destinationPath)"
+
+# Set user
+$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']
+$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']
+
+# Check to see if user is system
+if ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq "System")
+{
+	# Initiated by the Octopus server via automated process, put something in for the email address
+    $gitAuthorEmail = "system@octopus.local"
+}
+
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.name", $gitAuthorName) -GitFolder "$($destinationFolderName)" | Out-Null
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.email", $gitAuthorEmail) -GitFolder "$($destinationFolderName)" | Out-Null
+
+# Commit changes
+Invoke-Git -GitCommand "add" -GitFolder "$destinationFolderName" -AdditionalArguments @(".") | Out-Null
+Invoke-Git -GitCommand "commit" -GitFolder "$destinationFolderName" -AdditionalArguments @("-m", "`"Commit from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`"") | Out-Null
+
+# Push the changes back to git
+Invoke-Git -GitCommand "push" -GitFolder "$destinationFolderName" | Out-Null
+
diff --git a/src/step-templates/git-clone-copy-push-package/metadata.json b/src/step-templates/git-clone-copy-push-package/metadata.json
new file mode 100644
index 000000000..01a2a3795
--- /dev/null
+++ b/src/step-templates/git-clone-copy-push-package/metadata.json
@@ -0,0 +1,100 @@
+{
+  "Id": "4d541683-4731-4f43-a342-5b9f6c915c4d",
+  "Name": "Git - Clone, copy, push from a Package",
+  "Description": "Clones a repository, copies files from the `Source Package` to the `Destination Path` then commits to the repository.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "88b1ab11-c878-4c7f-8227-610c3784311b",
+      "Name": "Template.Package.Reference",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Template.Package.Reference",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": "Octopus.Features.JsonConfigurationVariables",
+    "Octopus.Action.Package.JsonConfigurationVariablesTargets": "#{Template.VariableReplacement.Paths}"
+  },
+  "Parameters": [
+    {
+      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
+      "Name": "Template.Git.Repo.Url",
+      "Label": "Git Repository URL",
+      "HelpText": "The URL used for the `git clone` operation.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
+      "Name": "Template.Git.User.Name",
+      "Label": "Git Username",
+      "HelpText": "Username of the credentials to use to log into git.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
+      "Name": "Template.Git.User.Password",
+      "Label": "Git User Password",
+      "HelpText": "Password for the git credential.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "6d6b0662-22bd-4fbc-b0dd-15799b158abe",
+      "Name": "Template.Package.Reference",
+      "Label": "Package",
+      "HelpText": "Choose the package to copy files from into the Git repository.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "f9a2141a-bcfa-4e53-862b-429b4f9892d9",
+      "Name": "Template.Git.Destination.Path",
+      "Label": "Destination Path",
+      "HelpText": "Relative path to the folder to copy items to.  This is the folder name only.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e382b0db-0ea2-47bb-968b-2dae9a8b861d",
+      "Name": "Template.VariableReplacement.Paths",
+      "Label": "Structured Configuration Variables",
+      "HelpText": "Target files need to be new line seperated, relative to the package contents. Extended wildcard syntax is supported. E.g., appsettings.json, Config\\*.xml, **\\specific-folder\\*.yaml. Learn more about Structured Configuration Variables and view examples.",
+      "DefaultValue": " ",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-12T15:31:36.9000000Z",
+    "OctopusVersion": "2023.4.2661",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "git"
+}
diff --git a/src/step-templates/git-clone-copy-push-package/scriptbody.ps1 b/src/step-templates/git-clone-copy-push-package/scriptbody.ps1
new file mode 100644
index 000000000..6821f9d2b
--- /dev/null
+++ b/src/step-templates/git-clone-copy-push-package/scriptbody.ps1
@@ -0,0 +1,261 @@
+Function Invoke-Git
+{
+	# Define parameters
+    param (
+    	$GitRepositoryUrl,
+        $GitFolder,
+        $GitUsername,
+        $GitPassword,
+        $GitCommand,
+        $AdditionalArguments
+    )
+    
+    # Get current work folder
+    $workDirectory = Get-Location
+
+	# Check to see if GitFolder exists
+    if (![String]::IsNullOrWhitespace($GitFolder) -and (Test-Path -Path $GitFolder) -eq $false)
+    {
+    	# Create the folder
+        New-Item -Path $GitFolder -ItemType "Directory" -Force | Out-Null
+        
+        # Set the location to the new folder
+        Set-Location -Path $GitFolder
+    }
+    
+    # Create arguments array
+    $gitArguments = @()
+    $gitArguments += $GitCommand
+    
+    # Check for url
+    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))
+    {
+      # Convert url to URI object
+      $gitUri = [System.Uri]$GitRepositoryUrl
+      $gitUrl = "{0}://{1}:{2}@{3}:{4}{5}" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery
+      $gitArguments += $gitUrl
+
+      # Get the newly created folder name
+      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf("/") + 1)
+      if ($gitFolderName.Contains(".git"))
+      {
+          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf("."))
+      }
+    }
+   
+    
+    # Check for additional arguments
+    if ($null -ne $AdditionalArguments)
+    {
+ 		# Add the additional arguments
+        $gitArguments += $AdditionalArguments
+    }
+    
+    # Execute git command
+    $results = Execute-Command -commandPath "git" -commandArguments $gitArguments -workingDir $GitFolder
+    
+    Write-Host $results.stdout
+    Write-Host $results.stderr
+    
+    # Return the foldername
+    Set-Location -Path $workDirectory
+    
+    # Check to see if GitFolder is null
+    if ($null -ne $GitFolder)
+    {
+    	return Join-Path -Path $GitFolder -ChildPath $gitFolderName
+    }
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Function Copy-Files
+{
+	# Define parameters
+    param (
+    	$SourcePath,
+        $DestinationPath
+    )
+    
+    # Copy the items from source path to destination path
+    $copyArguments = @{}
+    $copyArguments.Add("Path", $SourcePath)
+    $copyArguments.Add("Destination", $DestinationPath)
+    
+    # Check to make sure destination exists
+    if ((Test-Path -Path $DestinationPath) -eq $false)
+    {
+    	# Create the destination path
+        New-Item -Path $DestinationPath -ItemType "Directory" | Out-Null
+    }
+    
+    # Check for wildcard
+    if ($SourcePath.EndsWith("/*") -or $SourcePath.EndsWith("\*"))
+    {
+		# Add recurse argument
+		$copyArguments.Add("Recurse", $true)
+    }
+    
+    $copyArguments.Add("Force", $true)
+    
+    # Copy files
+    Copy-Item @copyArguments
+}
+
+Function Execute-Command
+{
+	param (
+    	$commandPath,
+        $commandArguments,
+        $workingDir
+    )
+
+	$gitExitCode = 0
+    $executionResults = $null
+
+  Try {
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.WorkingDirectory = $workingDir
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+    $executionResults = [pscustomobject]@{
+        stdout = $p.StandardOutput.ReadToEnd()
+        stderr = $p.StandardError.ReadToEnd()
+        ExitCode = $null
+    }
+    $p.WaitForExit()
+    $gitExitCode = [int]$p.ExitCode
+    $executionResults.ExitCode = $gitExitCode
+    
+    if ($gitExitCode -ge 2) 
+    {
+		# Fail the step
+        throw
+    }
+    
+    return $executionResults
+  }
+  Catch {
+    # Check exit code
+    Write-Error -Message "$($executionResults.stderr)" -ErrorId $gitExitCode
+    exit $gitExitCode
+  }
+
+}
+
+Function Get-GitExecutable
+{
+	# Define parameters
+    param (
+    	$WorkingDirectory
+    )
+      
+    # Define variables
+    $gitExe = "PortableGit-2.41.0.3-64-bit.7z.exe"
+    $gitDownloadUrl = "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe"
+    $gitDownloadArguments = @{}
+    $gitDownloadArguments.Add("Uri", $gitDownloadUrl)
+    $gitDownloadArguments.Add("OutFile", "$WorkingDirectory/git/$gitExe")
+    
+    # This makes downloading faster
+    $ProgressPreference = 'SilentlyContinue'
+    
+    # Check to see if git subfolder exists
+    if ((Test-Path -Path "$WorkingDirectory/git") -eq $false)
+    {
+    	# Create subfolder
+        New-Item -Path "$WorkingDirectory/git"  -ItemType Directory
+    }
+    
+    # Check PowerShell version
+    if ($PSVersionTable.PSVersion.Major -lt 6)
+    {
+    	# Use basic parsing is required
+        $gitDownloadArguments.Add("UseBasicParsing", $true)
+    }
+    
+    # Download Git
+    Write-Host "Downloading Git ..."
+    Invoke-WebRequest @gitDownloadArguments
+    
+    # Extract Git
+    $gitExtractArguments = @()
+    $gitExtractArguments += "-o"
+    $gitExtractArguments += "$WorkingDirectory\git"
+    $gitExtractArguments += "-y"
+    $gitExtractArguments += "-bd"
+
+    Write-Host "Extracting Git download ..."
+    & "$WorkingDirectory\git\$gitExe" $gitExtractArguments
+
+    # Wait until unzip action is complete
+    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(".")))}))
+    {
+        Start-Sleep 5
+    }
+    
+    # Add bin folder to path
+    $env:PATH = "$WorkingDirectory\git\bin$([IO.Path]::PathSeparator)" + $env:PATH
+    
+    # Disable promopt for credential helper
+    Invoke-Git -GitCommand "config" -AdditionalArguments @("--system", "--unset", "credential.helper")
+}
+
+# Get variables
+$gitUrl = $OctopusParameters['Template.Git.Repo.Url']
+$gitUser = $OctopusParameters['Template.Git.User.Name']
+$gitPassword = $OctopusParameters['Template.Git.User.Password']
+$sourceItems = $OctopusParameters['Octopus.Action.Package[Template.Package.Reference].ExtractedPath']
+$destinationPath = $OctopusParameters['Template.Git.Destination.Path']
+$gitSource = $null
+$gitDestination = $null
+
+# Check to see if it's Windows
+if ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq "Hosted Windows")
+{
+	# Dynamic worker don't have git, download portable version and add to path for execution
+    Write-Host "Detected usage of Windows Dynamic Worker ..."
+    Get-GitExecutable -WorkingDirectory $PWD
+}
+
+# Clone repository
+$folderName = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand "clone" -GitFolder "$($PWD)/default"
+
+$gitSource = $sourceItems
+$gitDestination = $folderName
+
+# Copy files from source to destination
+Copy-Files -SourcePath "$($gitSource)/*" -DestinationPath "$($gitDestination)$($destinationPath)"
+
+# Set user
+$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']
+$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']
+
+# Check to see if user is system
+if ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq "System")
+{
+	# Initiated by the Octopus server via automated process, put something in for the email address
+    $gitAuthorEmail = "system@octopus.local"
+}
+
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.name", $gitAuthorName) -GitFolder "$($folderName)" | Out-Null
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.email", $gitAuthorEmail) -GitFolder "$($folderName)" | Out-Null
+
+# Commit changes
+Invoke-Git -GitCommand "add" -GitFolder "$folderName" -AdditionalArguments @(".") | Out-Null
+Invoke-Git -GitCommand "commit" -GitFolder "$folderName" -AdditionalArguments @("-m", "`"Commit from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`"") | Out-Null
+
+# Push the changes back to git
+Invoke-Git -GitCommand "push" -GitFolder "$folderName" | Out-Null
+
diff --git a/src/step-templates/git-clone-copy-push/metadata.json b/src/step-templates/git-clone-copy-push/metadata.json
new file mode 100644
index 000000000..66918fcf8
--- /dev/null
+++ b/src/step-templates/git-clone-copy-push/metadata.json
@@ -0,0 +1,84 @@
+{
+  "Id": "492dd5fe-26f5-4d12-800d-ad2cce008de6",
+  "Name": "Git - Clone, copy, push",
+  "Description": "Clones a repository, copies files from the `Source Path` to the `Destination Path` then commits to the repository.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
+      "Name": "Template.Git.Repo.Url",
+      "Label": "Git Repository URL",
+      "HelpText": "The URL used for the `git clone` operation.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
+      "Name": "Template.Git.User.Name",
+      "Label": "Git Username",
+      "HelpText": "Username of the credentials to use to log into git.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
+      "Name": "Template.Git.User.Password",
+      "Label": "Git User Password",
+      "HelpText": "Password for the git credential.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5c080713-029f-4f9b-8037-234c7dd579bc",
+      "Name": "Template.Git.Source.Path",
+      "Label": "Source Path",
+      "HelpText": "Relative path to the folder or items to copy.  This field can take wildcards, eg - `/MyPath/*`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f9a2141a-bcfa-4e53-862b-429b4f9892d9",
+      "Name": "Template.Git.Destination.Path",
+      "Label": "Destination Path",
+      "HelpText": "Relative path to the folder to copy items to.  This is the folder name only.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5fa438c9-2aa7-476f-ae79-bd77cdc22ccc",
+      "Name": "Template.Git.Tag",
+      "Label": "Tag",
+      "HelpText": "**(Optional)** Checkout the code for `SourcePath` from a specific tag.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-12T15:29:34.6280000Z",
+    "OctopusVersion": "2023.4.2661",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "git"
+}
diff --git a/src/step-templates/git-clone-copy-push/scriptbody.ps1 b/src/step-templates/git-clone-copy-push/scriptbody.ps1
new file mode 100644
index 000000000..89d27fcab
--- /dev/null
+++ b/src/step-templates/git-clone-copy-push/scriptbody.ps1
@@ -0,0 +1,272 @@
+Function Invoke-Git
+{
+	# Define parameters
+    param (
+    	$GitRepositoryUrl,
+        $GitFolder,
+        $GitUsername,
+        $GitPassword,
+        $GitCommand,
+        $AdditionalArguments
+    )
+    
+    # Get current work folder
+    $workDirectory = Get-Location
+
+	# Check to see if GitFolder exists
+    if (![String]::IsNullOrWhitespace($GitFolder) -and (Test-Path -Path $GitFolder) -eq $false)
+    {
+    	# Create the folder
+        New-Item -Path $GitFolder -ItemType "Directory" -Force | Out-Null
+        
+        # Set the location to the new folder
+        Set-Location -Path $GitFolder
+    }
+    
+    # Create arguments array
+    $gitArguments = @()
+    $gitArguments += $GitCommand
+    
+    # Check for url
+    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))
+    {
+      # Convert url to URI object
+      $gitUri = [System.Uri]$GitRepositoryUrl
+      $gitUrl = "{0}://{1}:{2}@{3}:{4}{5}" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery
+      $gitArguments += $gitUrl
+
+      # Get the newly created folder name
+      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf("/") + 1)
+      if ($gitFolderName.Contains(".git"))
+      {
+          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf("."))
+      }
+    }
+   
+    
+    # Check for additional arguments
+    if ($null -ne $AdditionalArguments)
+    {
+ 		# Add the additional arguments
+        $gitArguments += $AdditionalArguments
+    }
+    
+    # Execute git command
+    $results = Execute-Command -commandPath "git" -commandArguments $gitArguments -workingDir $GitFolder
+    
+    Write-Host $results.stdout
+    Write-Host $results.stderr
+    
+    # Return the foldername
+    Set-Location -Path $workDirectory
+    
+    # Check to see if GitFolder is null
+    if ($null -ne $GitFolder)
+    {
+    	return Join-Path -Path $GitFolder -ChildPath $gitFolderName
+    }
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Function Copy-Files
+{
+	# Define parameters
+    param (
+    	$SourcePath,
+        $DestinationPath
+    )
+    
+    # Copy the items from source path to destination path
+    $copyArguments = @{}
+    $copyArguments.Add("Path", $SourcePath)
+    $copyArguments.Add("Destination", $DestinationPath)
+    
+    # Check to make sure destination exists
+    if ((Test-Path -Path $DestinationPath) -eq $false)
+    {
+    	# Create the destination path
+        New-Item -Path $DestinationPath -ItemType "Directory" | Out-Null
+    }
+    
+    # Check for wildcard
+    if ($SourcePath.EndsWith("/*") -or $SourcePath.EndsWith("\*"))
+    {
+		# Add recurse argument
+		$copyArguments.Add("Recurse", $true)
+    }
+    
+    # Force overwrite
+    $copyArguments.Add("Force", $true)
+    
+    # Copy files
+    Copy-Item @copyArguments
+}
+
+Function Execute-Command
+{
+	param (
+    	$commandPath,
+        $commandArguments,
+        $workingDir
+    )
+
+	$gitExitCode = 0
+    $executionResults = $null
+
+  Try {
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.WorkingDirectory = $workingDir
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+    $executionResults = [pscustomobject]@{
+        stdout = $p.StandardOutput.ReadToEnd()
+        stderr = $p.StandardError.ReadToEnd()
+        ExitCode = $null
+    }
+    $p.WaitForExit()
+    $gitExitCode = [int]$p.ExitCode
+    $executionResults.ExitCode = $gitExitCode
+    
+    if ($gitExitCode -ge 2) 
+    {
+		# Fail the step
+        throw
+    }
+    
+    return $executionResults
+  }
+  Catch {
+    # Check exit code
+    Write-Error -Message "$($executionResults.stderr)" -ErrorId $gitExitCode
+    exit $gitExitCode
+  }
+
+}
+
+Function Get-GitExecutable
+{
+	# Define parameters
+    param (
+    	$WorkingDirectory
+    )
+      
+    # Define variables
+    $gitExe = "PortableGit-2.41.0.3-64-bit.7z.exe"
+    $gitDownloadUrl = "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe"
+    $gitDownloadArguments = @{}
+    $gitDownloadArguments.Add("Uri", $gitDownloadUrl)
+    $gitDownloadArguments.Add("OutFile", "$WorkingDirectory/git/$gitExe")
+    
+    # This makes downloading faster
+    $ProgressPreference = 'SilentlyContinue'
+    
+    # Check to see if git subfolder exists
+    if ((Test-Path -Path "$WorkingDirectory/git") -eq $false)
+    {
+    	# Create subfolder
+        New-Item -Path "$WorkingDirectory/git"  -ItemType Directory
+    }
+    
+    # Check PowerShell version
+    if ($PSVersionTable.PSVersion.Major -lt 6)
+    {
+    	# Use basic parsing is required
+        $gitDownloadArguments.Add("UseBasicParsing", $true)
+    }
+    
+    # Download Git
+    Write-Host "Downloading Git ..."
+    Invoke-WebRequest @gitDownloadArguments
+    
+    # Extract Git
+    $gitExtractArguments = @()
+    $gitExtractArguments += "-o"
+    $gitExtractArguments += "$WorkingDirectory\git"
+    $gitExtractArguments += "-y"
+    $gitExtractArguments += "-bd"
+
+    Write-Host "Extracting Git download ..."
+    & "$WorkingDirectory\git\$gitExe" $gitExtractArguments
+
+    # Wait until unzip action is complete
+    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(".")))}))
+    {
+        Start-Sleep 5
+    }
+    
+    # Add bin folder to path
+    $env:PATH = "$WorkingDirectory\git\bin$([IO.Path]::PathSeparator)" + $env:PATH
+    
+    # Disable promopt for credential helper
+    Invoke-Git -GitCommand "config" -AdditionalArguments @("--system", "--unset", "credential.helper")
+}
+
+# Get variables
+$gitUrl = $OctopusParameters['Template.Git.Repo.Url']
+$gitUser = $OctopusParameters['Template.Git.User.Name']
+$gitPassword = $OctopusParameters['Template.Git.User.Password']
+$sourceItems = $OctopusParameters['Template.Git.Source.Path']
+$destinationPath = $OctopusParameters['Template.Git.Destination.Path']
+$gitTag = $OctopusParameters['Template.Git.Tag']
+$gitSource = $null
+$gitDestination = $null
+
+# Check to see if it's Windows
+if ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq "Hosted Windows")
+{
+	# Dynamic worker don't have git, download portable version and add to path for execution
+    Write-Host "Detected usage of Windows Dynamic Worker ..."
+    Get-GitExecutable -WorkingDirectory $PWD
+}
+
+# Clone repository
+$folderName = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand "clone" -GitFolder "$($PWD)/default"
+
+# Check for tag
+if (![String]::IsNullOrWhitespace($gitTag))
+{
+	$gitDestination = $folderName
+    $gitSource = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand "clone" -GitFolder "$($PWD)/tags/$gitTag" -AdditionalArguments @("-b", "$gitTag")
+}
+else
+{
+	$gitSource = $folderName
+    $gitDestination = $folderName
+}
+
+# Copy files from source to destination
+Copy-Files -SourcePath "$($gitSource)$($sourceItems)" -DestinationPath "$($gitDestination)$($destinationPath)"
+
+# Set user
+$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']
+$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']
+
+# Check to see if user is system
+if ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq "System")
+{
+	# Initiated by the Octopus server via automated process, put something in for the email address
+    $gitAuthorEmail = "system@octopus.local"
+}
+
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.name", $gitAuthorName) -GitFolder "$($folderName)" | Out-Null
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.email", $gitAuthorEmail) -GitFolder "$($folderName)" | Out-Null
+
+# Commit changes
+Invoke-Git -GitCommand "add" -GitFolder "$folderName" -AdditionalArguments @(".") | Out-Null
+Invoke-Git -GitCommand "commit" -GitFolder "$folderName" -AdditionalArguments @("-m", "`"Commit from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`"") | Out-Null
+
+# Push the changes back to git
+Invoke-Git -GitCommand "push" -GitFolder "$folderName" | Out-Null
+
diff --git a/src/step-templates/git-create-pull-request/metadata.json b/src/step-templates/git-create-pull-request/metadata.json
new file mode 100644
index 000000000..12b8bd7a5
--- /dev/null
+++ b/src/step-templates/git-create-pull-request/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "a24c6354-5612-4e2c-a0ff-9b5a329fc0e9",
+  "Name": "Git - Create Pull Request",
+  "Description": "Create a Pull or Merge Request for the repository",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
+      "Name": "Template.Git.Repo.Url",
+      "Label": "Git Repository URL",
+      "HelpText": "The URL used for the `git clone` operation.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
+      "Name": "Template.Git.User.Name",
+      "Label": "Git Username",
+      "HelpText": "Username of the credentials to use to log into git.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
+      "Name": "Template.Git.User.Password",
+      "Label": "Git User Password",
+      "HelpText": "Password for the git credential.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "7cfa6ba5-76c6-4b15-a30c-593e2cd8f914",
+      "Name": "Template.Git.Source.Branch",
+      "Label": "Source Branch",
+      "HelpText": "The source branch name to compare the repository with.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2b0ee0d3-8542-4db2-87fc-52ee41e63cc6",
+      "Name": "Template.Git.Destination.Branch",
+      "Label": "Destination Branch",
+      "HelpText": "The destination branch to create the pull/merge request against.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "74d8fc6d-2a4c-49ad-b7f8-248dcf44fc0f",
+      "Name": "Template.Git.Repository.Technology",
+      "Label": "Source Control Technology",
+      "HelpText": "Select which source control technology to create the request on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "ado|Azure DevOps\nbitbucket|BitBucket\ngithub|GitHub\ngitlab|GitLab"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-12T15:32:53.4160000Z",
+    "OctopusVersion": "2023.4.2661",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "git"
+}
diff --git a/src/step-templates/git-create-pull-request/scriptbody.ps1 b/src/step-templates/git-create-pull-request/scriptbody.ps1
new file mode 100644
index 000000000..9a5dce6bc
--- /dev/null
+++ b/src/step-templates/git-create-pull-request/scriptbody.ps1
@@ -0,0 +1,178 @@
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Get variables
+$gitUrl = $OctopusParameters['Template.Git.Repo.Url']
+$gitUser = $OctopusParameters['Template.Git.User.Name']
+$gitPassword = $OctopusParameters['Template.Git.User.Password']
+$gitSourceBranch = $OctopusParameters['Template.Git.Source.Branch']
+$gitDestinationBranch = $OctopusParameters['Template.Git.Destination.Branch']
+$gitTech = $OctopusParameters['Template.Git.Repository.Technology']
+
+# Convert url into uri object
+$gitUri = [System.Uri]$gitUrl
+
+switch ($gitTech)
+{
+    "ado"
+    {
+
+		# Parse url
+        $gitOrganization = $gitUri.AbsolutePath
+        $gitOrganization = $gitOrganization.Substring(1)
+		$gitOrganization = $gitOrganization.Substring(0, $gitOrganization.IndexOf("/"))
+        
+        # Encode personal access token
+        $encodedPAT = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("`:$gitPassword"))
+        
+        # Construct Headers
+        $header = @{
+        	Authorization = "Basic $encodedPAT"
+        }
+                
+        $gitProject = $gitUri.AbsolutePath.Replace($gitOrganization, "").Replace("//", "")
+        $gitProject = $gitProject.Substring(0, $gitProject.IndexOf("/"))
+        
+		# Create pull request
+        $jsonBody = @{
+        	sourceRefName = "refs/heads/" + $gitSourceBranch
+            targetRefName = "refs/heads/" + $gitDestinationBranch
+            title = "PR from Octopus Deploy"
+            description = "PR from #{Octopus.Project.Name} release version #{Octopus.Release.Number}"
+        }
+        
+        # Construct API call
+        $adoApiUrl = "{0}://{1}:{2}/{3}/{4}/_apis/git/repositories/{4}/pullrequests" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitOrganization, $gitProject
+        Invoke-RestMethod -Method Post -Uri ($adoApiUrl + "?api-version=7.0") -Body ($jsonBody | ConvertTo-Json -Depth 10) -Headers $header -ContentType "application/json"
+    }
+    "bitbucket"
+    {
+		# Parse url
+        $gitOrganization = $gitUri.AbsolutePath
+        $gitOrganization = $gitOrganization.Substring(1)
+		$gitOrganization = $gitOrganization.Substring(0, $gitOrganization.IndexOf("/"))
+        $gitProject = $gitUri.AbsolutePath.Replace($gitOrganization, "").Replace("//", "")
+        
+        # Check to see if Repo Name ends with .git
+        if ($gitProject.EndsWith(".git"))
+        {
+        	# Strip off the last part
+            $gitProject = $gitProject.Replace(".git", "")
+        }
+
+        # Construct Headers
+        $header = @{
+        	Authorization = "Bearer $gitPassword"
+        }
+        
+        # Construct API url
+        $bitbucketApiUrl = "{0}://api.{1}:{2}/2.0/repositories/{3}/{4}/pullrequests" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitOrganization, $gitProject
+        
+		# Construct json body
+        $jsonBody = @{
+        	title = "PR from Octopus Deploy"
+            source = @{
+            	branch = @{
+                	name = $gitSourceBranch
+                }
+            }
+            destination = @{
+            	branch = @{
+                	name = $gitDestinationBranch
+                }
+            }
+        }
+        
+        # Create PR
+        Invoke-RestMethod -Method Post -Uri $bitbucketApiUrl -Headers $header -Body ($jsonBody | ConvertTo-Json -Depth 10) -ContentType "application/json"
+    }
+    "github"
+    {
+        # Parse URL
+        $gitRepoOwner = $gitUri.AbsolutePath.Substring(1, $gitUri.AbsolutePath.LastIndexOf("/") - 1)
+        $gitRepoName = $gitUri.AbsolutePath.Substring($gitUri.AbsolutePath.LastIndexOf("/") + 1 )
+        
+        # Check to see if Repo Name ends with .git
+        if ($gitRepoName.EndsWith(".git"))
+        {
+        	# Strip off the last part
+            $gitRepoName = $gitRepoName.Replace(".git", "")
+        }
+        
+        # Construct API endpoint
+        $githubApiUrl = "{0}://api.{1}:{2}/repos/{3}/{4}/pulls" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitRepoOwner, $gitRepoName
+        
+        # Construct Headers
+        $header = @{
+        	Authorization = "Bearer $gitPassword"
+            Accept = "application/vnd.github+json"
+            "X-Github-Api-Version" = "2022-11-28"
+        }
+        
+        # Construct body
+        $jsonBody = @{
+        	title = "PR from Octopus Deploy"
+            body = "PR from #{Octopus.Project.Name} release version #{Octopus.Release.Number}"
+            head = $gitSourceBranch
+            base = $gitDestinationBranch
+        }
+        
+        # Create the pull request
+        Invoke-RestMethod -Method Post -Uri $gitHubApiUrl -Headers $header -Body ($jsonBody | ConvertTo-Json -Depth 10)
+    }
+    "gitlab"
+    {
+		# Get project name
+        $gitlabProjectName = $gitUrl.SubString($gitUrl.LastIndexOf("/") + 1)
+        
+        # Parse uri
+        $gitlabApiUrl = "{0}://{1}:{2}/api/v4/users/{3}/projects" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitUser
+        
+        # Check to see if it ends in .git
+        if ($gitlabProjectName.EndsWith(".git"))
+        {
+        	# Strip that part off
+            $gitlabProjectName = $gitlabProjectName.Replace(".git", "")
+        }
+        
+        # Create header
+        $header = @{ "PRIVATE-TOKEN" = $gitPassword }
+        
+        # Get the project
+        $gitlabProject = (Invoke-RestMethod -Method Get -Uri $gitlabApiUrl -Headers $header) | Where-Object {$_.Name -eq $gitlabProjectName}
+        
+        # Create the merge request
+         $gitlabApiUrl = "{0}://{1}:{2}/api/v4/projects/{3}/merge_requests?source_branch={4}&target_branch={5}&target_project_id={3}&title={6}" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitlabProject.id, $gitSourceBranch, $gitDestinationBranch, "PR from #{Octopus.Project.Name} release version #{Octopus.Release.Number}"
+        Invoke-RestMethod -Method Post -Uri $gitlabApiUrl -Headers $header
+    }
+}
+
+<#
+# Set user
+$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']
+$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']
+
+# Check to see if user is system
+if ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq "System")
+{
+	# Initiated by the Octopus server via automated process, put something in for the email address
+    $gitAuthorEmail = "system@octopus.local"
+}
+
+# Configure user information
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.name", $gitAuthorName) #-GitFolder "$($PWD)/$($folderName)"
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.email", $gitAuthorEmail) #-GitFolder "$($PWD)/$($folderName)"
+
+
+# Push the new tag
+Invoke-Git -Gitcommand "request-pull" -AdditionalArguments @("$gitSourceBranch", $gitUrl, "$gitDestinationBranch") -GitFolder "$($PWD)/$($folderName)"    
+#>
\ No newline at end of file
diff --git a/src/step-templates/git-pull-https/metadata.json b/src/step-templates/git-pull-https/metadata.json
new file mode 100644
index 000000000..3d4887fdc
--- /dev/null
+++ b/src/step-templates/git-pull-https/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "5c08170d-e919-4afe-9da3-7616c797d42b",
+  "Name": "Git - Pull (HTTPS)",
+  "Description": "Gets the latest source for a Git repository.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "GitHttpsUrl",
+      "Label": "Clone URL",
+      "HelpText": "'https://' URL to the repository that will be cloned from.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Username to use when authenticating with the HTTPS server.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Password to use when authenticating with the HTTPS server. You should create a sensitive variable in your project variables, and then bind this value.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "GitHttpsBranchName",
+      "Label": "Branch name",
+      "HelpText": "Name of the Git branch to clone",
+      "DefaultValue": "master",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-15T17:23:33.2820000-07:00",
+    "OctopusVersion": "2.4.4.43",
+    "Type": "ActionTemplate"
+  },
+  "Category": "git"
+}
diff --git a/src/step-templates/git-pull-https/scriptbody.ps1 b/src/step-templates/git-pull-https/scriptbody.ps1
new file mode 100644
index 000000000..c985665fd
--- /dev/null
+++ b/src/step-templates/git-pull-https/scriptbody.ps1
@@ -0,0 +1,65 @@
+[System.Reflection.Assembly]::LoadWithPartialName("System.Web")
+function Format-UriWithCredentials($url, $username, $password) {
+    $uri = New-Object "System.Uri" $url
+    
+    $url = $uri.Scheme + "://"
+    if (-not [string]::IsNullOrEmpty($username)) {
+        $url = $url + [System.Web.HttpUtility]::UrlEncode($username)
+        
+        if (-not [string]::IsNullOrEmpty($password)) {
+            $url = $url + ":" + [System.Web.HttpUtility]::UrlEncode($password)  
+        }
+        
+        $url = $url + "@"    
+    } elseif (-not [string]::IsNullOrEmpty($uri.UserInfo)) {
+        $url = $uri.UserInfo + "@"
+    }
+
+    $url = $url + $uri.Host + $uri.PathAndQuery
+    return $url
+}
+
+function Test-LastExit($cmd) {
+    if ($LastExitCode -ne 0) {
+        Write-Host "##octopus[stderr-error]"
+        write-error "$cmd failed with exit code: $LastExitCode"
+    }
+}
+
+$tempDirectoryPath = $OctopusParameters['Octopus.Tentacle.Agent.ApplicationDirectoryPath']
+$tempDirectoryPath = join-path $tempDirectoryPath "GitPull" 
+$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Environment.Name']
+$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Project.Name']
+$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Action.Name']
+
+Write-Host "Repository will be cloned to: $tempDirectoryPath"
+
+# Step 1: Ensure we have the latest version of the repository
+mkdir $tempDirectoryPath -ErrorAction SilentlyContinue
+cd $tempDirectoryPath
+
+Write-Host "##octopus[stderr-progress]"
+
+git init
+Test-LastExit "git init"
+
+$url = Format-UriWithCredentials -url $OctopusParameters['GitHttpsUrl'] -username $OctopusParameters['Username'] -password $OctopusParameters['Password']
+
+$branch = $OctopusParameters['GitHttpsBranchName']
+
+# We might have already run before, so we need to reset the origin
+git remote remove origin
+git remote add origin $url
+Test-LastExit "git remote add origin"
+
+Write-Host "Fetching remote repository"
+git fetch origin
+Test-LastExit "git fetch origin"
+
+Write-Host "Check out branch $branch"
+git reset --hard "origin/$branch"
+Test-LastExit "git reset --hard"
+
+Set-OctopusVariable -name "RepositoryDirectory" -value $tempDirectoryPath
+Write-Verbose "Directory path '$tempDirectoryPath' available in 'RepositoryDirectory' output variable"
+Write-Host "Repository successfully cloned to: $tempDirectoryPath"
\ No newline at end of file
diff --git a/src/step-templates/git-push-https/metadata.json b/src/step-templates/git-push-https/metadata.json
new file mode 100644
index 000000000..065246561
--- /dev/null
+++ b/src/step-templates/git-push-https/metadata.json
@@ -0,0 +1,67 @@
+{
+  "Id": "85cc56f9-26cb-4b0e-8320-854e88a09a25",
+  "Name": "Git - Push (HTTPS)",
+  "Description": "Deploy a package using Git to a HTTPS server. Performs a clone, overwrites the repository with the files from your package, then pushes. Great for deploying to AppHarbor and Windows Azure websites.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "GitHttpsUrl",
+      "Label": "Clone URL",
+      "HelpText": "`https://` URL to the repository that will be cloned from and pushed to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Username to use when authenticating with the HTTPS server.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Password to use when authenticating with the HTTPS server. You should create a sensitive variable in your project variables, and then bind this value.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "GitHttpsPackageStepName",
+      "Label": "Package step name",
+      "HelpText": "Name of the previously-deployed package step that contains the files that you want to push.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "GitHttpsBranchName",
+      "Label": "Branch name",
+      "HelpText": "Name of the Git branch to clone/push",
+      "DefaultValue": "master",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-10-24T07:59:45.2950000-07:00",
+    "OctopusVersion": "2.5.11.614",
+    "Type": "ActionTemplate"
+  },
+  "Category": "git"
+}
diff --git a/src/step-templates/git-push-https/scriptbody.ps1 b/src/step-templates/git-push-https/scriptbody.ps1
new file mode 100644
index 000000000..1913602e2
--- /dev/null
+++ b/src/step-templates/git-push-https/scriptbody.ps1
@@ -0,0 +1,132 @@
+[System.Reflection.Assembly]::LoadWithPartialName("System.Web")
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+ 
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+function Format-UriWithCredentials($url, $username, $password) {
+    $uri = New-Object "System.Uri" $url
+    
+    $url = $uri.Scheme + "://"
+    if (-not [string]::IsNullOrEmpty($username)) {
+        $url = $url + [System.Web.HttpUtility]::UrlEncode($username)
+        
+        if (-not [string]::IsNullOrEmpty($password)) {
+            $url = $url + ":" + [System.Web.HttpUtility]::UrlEncode($password)  
+        }
+        
+        $url = $url + "@"    
+    } elseif (-not [string]::IsNullOrEmpty($uri.UserInfo)) {
+        $url = $uri.UserInfo + "@"
+    }
+
+    $url = $url + $uri.Host + $uri.PathAndQuery
+    return $url
+}
+
+function Test-LastExit($cmd) {
+    if ($LastExitCode -ne 0) {
+        Write-Host "##octopus[stderr-error]"
+        write-error "$cmd failed with exit code: $LastExitCode"
+    }
+}
+
+$tempDirectoryPath = $OctopusParameters['Octopus.Tentacle.Agent.ApplicationDirectoryPath']
+$tempDirectoryPath = join-path $tempDirectoryPath "GitPush" 
+$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Environment.Name']
+$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Project.Name']
+$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Action.Name']
+
+$stepName = $OctopusParameters['GitHttpsPackageStepName']
+
+$stepPath = ""
+if (-not [string]::IsNullOrEmpty($stepName)) {
+    Write-Host "Finding path to package step: $stepName"
+    $stepPath = Find-InstallLocation $stepName
+} else {
+    $stepPath = Find-SingleInstallLocation
+}
+Write-Host "Package was installed to: $stepPath"
+
+Write-Host "Repository will be cloned to: $tempDirectoryPath"
+
+# Step 1: Ensure we have the latest version of the repository
+mkdir $tempDirectoryPath -ErrorAction SilentlyContinue
+cd $tempDirectoryPath
+
+Write-Host "##octopus[stderr-progress]"
+ 
+git init
+Test-LastExit "git init"
+
+$url = Format-UriWithCredentials -url $OctopusParameters['GitHttpsUrl'] -username $OctopusParameters['Username'] -password $OctopusParameters['Password']
+
+$branch = $OctopusParameters['GitHttpsBranchName']
+
+# We might have already run before, so we need to reset the origin
+git remote remove origin
+git remote add origin $url
+Test-LastExit "git remote add origin"
+
+Write-Host "Fetching remote repository"
+git fetch origin
+Test-LastExit "git fetch origin"
+
+Write-Host "Check out branch $branch"
+git reset --hard "origin/$branch"
+
+# Step 2: Overwrite the contents
+write-host "Synchronizing package contents with local git repository using Robocopy"
+& robocopy $stepPath $tempDirectoryPath /MIR /xd ".git"
+if ($lastexitcode -ge 5) {
+    write-error "Unable to copy files from the package to the local cloned Git repository. See the Robocopy errors above for details."
+}
+
+# Step 3: Push the results
+$deploymentName = $OctopusParameters['Octopus.Deployment.Name']
+$releaseName = $OctopusParameters['Octopus.Release.Number']
+$projName = $OctopusParameters['Octopus.Project.Name']
+
+git add . -A
+Test-LastExit "git add"
+
+git diff-index --quiet HEAD
+if ($lastexitcode -ne 0) {
+    git commit -m "$projName release $releaseName - $deploymentName"
+    Test-LastExit "git commit"
+}
+
+git push origin $branch
+Test-LastExit "git push"
diff --git a/src/step-templates/git-tag-repository/metadata.json b/src/step-templates/git-tag-repository/metadata.json
new file mode 100644
index 000000000..29817f4a7
--- /dev/null
+++ b/src/step-templates/git-tag-repository/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "dd76dee1-f5b1-4974-a5ae-bde643cf67af",
+  "Name": "Git - Tag repository",
+  "Description": "Tags a git repository with the specified tag",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
+      "Name": "Template.Git.Repo.Url",
+      "Label": "Git Repository URL",
+      "HelpText": "The URL used for the `git clone` operation.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
+      "Name": "Template.Git.User.Name",
+      "Label": "Git Username",
+      "HelpText": "Username of the credentials to use to log into git.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
+      "Name": "Template.Git.User.Password",
+      "Label": "Git User Password",
+      "HelpText": "Password for the git credential.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "7cfa6ba5-76c6-4b15-a30c-593e2cd8f914",
+      "Name": "Template.Git.Tag",
+      "Label": "Tag",
+      "HelpText": "The tag name to tag the repository with.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b7ae407f-f926-4478-af72-74397025e4b6",
+      "Name": "Template.Git.Action",
+      "Label": "Action if tag already exists",
+      "HelpText": "Select the action if the tag already exsists.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "delete|Delete and recreate\nfail|Fail\nignore|Ignore"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-09-12T15:33:15.2380000Z",
+    "OctopusVersion": "2023.4.2661",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "git"
+}
diff --git a/src/step-templates/git-tag-repository/scriptbody.ps1 b/src/step-templates/git-tag-repository/scriptbody.ps1
new file mode 100644
index 000000000..9768cb807
--- /dev/null
+++ b/src/step-templates/git-tag-repository/scriptbody.ps1
@@ -0,0 +1,193 @@
+Function Invoke-Git
+{
+	# Define parameters
+    param (
+    	$GitRepositoryUrl,
+        $GitFolder,
+        $GitUsername,
+        $GitPassword,
+        $GitCommand,
+        $AdditionalArguments,
+        $SupressOutput = $false
+    )
+    
+    # Get current work folder
+    $workDirectory = Get-Location
+    
+    # Create arguments array
+    $gitArguments = @()
+    $gitArguments += $GitCommand
+    
+    # Check for url
+    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))
+    {
+      # Convert url to URI object
+      $gitUri = [System.Uri]$GitRepositoryUrl
+      $gitUrl = "{0}://{1}:{2}@{3}:{4}{5}" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery
+      $gitArguments += $gitUrl
+
+      # Get the newly created folder name
+      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf("/") + 1)
+      if ($gitFolderName.Contains(".git"))
+      {
+          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf("."))
+      }
+    }
+   
+    
+    # Check for additional arguments
+    if ($null -ne $AdditionalArguments)
+    {
+ 		# Add the additional arguments
+        $gitArguments += $AdditionalArguments
+    }
+    
+    # Execute git command
+    $results = Execute-Command "git" $gitArguments $GitFolder
+    
+    # Check to see if output is supposed to be suppressed
+    if ($SupressOutput -ne $true)
+    {
+    	Write-Host $results.stdout
+    }
+
+	# Always display error messages
+    Write-Host $results.stderr
+    
+    # Store results into file
+    Add-Content -Path "$PWD/$($GitCommand).txt" -Value $results.stdout
+    
+    # Return the foldername
+   	return $gitFolderName
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Function Execute-Command
+{
+	param (
+    	$commandPath,
+        $commandArguments,
+        $workingDir
+    )
+
+	$gitExitCode = 0
+    $executionResults = $null
+
+  Try {
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.WorkingDirectory = $workingDir
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+    $executionResults = [pscustomobject]@{
+        stdout = $p.StandardOutput.ReadToEnd()
+        stderr = $p.StandardError.ReadToEnd()
+        ExitCode = $null
+    }
+    $p.WaitForExit()
+    $gitExitCode = [int]$p.ExitCode
+    $executionResults.ExitCode = $gitExitCode
+    
+    if ($gitExitCode -ge 2) 
+    {
+		# Fail the step
+        throw
+    }
+    
+    return $executionResults
+  }
+  Catch {
+    # Check exit code
+    Write-Error -Message "$($executionResults.stderr)" -ErrorId $gitExitCode
+    exit $gitExitCode
+  }
+
+}
+
+
+# Get variables
+$gitUrl = $OctopusParameters['Template.Git.Repo.Url']
+$gitUser = $OctopusParameters['Template.Git.User.Name']
+$gitPassword = $OctopusParameters['Template.Git.User.Password']
+$gitTag = $OctopusParameters['Template.Git.Tag']
+$gitAction = $OctopusParameters['Template.Git.Action']
+
+# Clone repository
+$folderName = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand "clone"
+
+# Set user
+$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']
+$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']
+
+# Check to see if user is system
+if ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq "System")
+{
+	# Initiated by the Octopus server via automated process, put something in for the email address
+    $gitAuthorEmail = "system@octopus.local"
+}
+
+# Configure user information
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.name", $gitAuthorName) -GitFolder "$($PWD)/$($folderName)"
+Invoke-Git -GitCommand "config" -AdditionalArguments @("user.email", $gitAuthorEmail) -GitFolder "$($PWD)/$($folderName)"
+
+# Record existing tags, if any
+Invoke-Git -GitCommand "tag" -GitFolder "$($PWD)/$($folderName)" -SupressOutput $true
+
+# Check the file
+$existingTags = Get-Content "$PWD/tag.txt"
+
+if (![String]::IsNullOrWhitespace($existingTags))
+{
+	# Parse
+    $existingTags = $existingTags.Split("`n",[System.StringSplitOptions]::RemoveEmptyEntries)
+    
+    # Check to see if tag already exists
+    if ($null -ne ($existingTags | Where-Object {$_ -eq $gitTag}))
+    {
+		# Check the selected action
+        switch ($gitAction)
+        {
+        	"delete"
+            {
+                # Delete the tag locally
+                Write-Host "Deleting tag $gitTag from cloned repository ..."
+                Invoke-Git -GitCommand "tag" -AdditionalArguments @("--delete", "$gitTag") -GitFolder "$($PWD)/$($folderName)"
+                
+                # Delete the tag on remote
+                Write-Host "Deleting tag from remote repository ..."
+                Invoke-Git -GitCommand "push" -AdditionalArguments @(":refs/tags/$gitTag") -GitFolder "$($PWD)/$($folderName)" -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword
+                
+                break
+            }
+            "ignore"
+            {
+            	# Ignore and continue
+                Write-Host "$gitTag already exists on $gitUrl.  Selected action is Ignore, exiting."
+                
+                exit 0
+            }
+            "fail"
+            {
+				# Error, tag already exists
+        		Write-Error "Error: $gitTag already exists on $gitUrl!"
+            }
+        }
+    }
+}
+
+# Tag the repo
+Invoke-Git -GitCommand "tag" -AdditionalArguments @("-a", $gitTag, "-m", "`"Tag from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`"") -GitFolder "$($PWD)/$($folderName)"
+
+# Push the new tag
+Invoke-Git -Gitcommand "push" -AdditionalArguments @("--tags") -GitFolder "$($PWD)/$($folderName)"
\ No newline at end of file
diff --git a/src/step-templates/github-report-deployment/metadata.json b/src/step-templates/github-report-deployment/metadata.json
new file mode 100644
index 000000000..0e43baef6
--- /dev/null
+++ b/src/step-templates/github-report-deployment/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "fb3137e5-f062-4dcd-9a56-b15321072a21",
+  "Name": "GitHub - Report Deployment",
+  "Description": "Creates or updates a deployment using [GitHub Deployments API](https://developer.github.com/v3/repos/deployments/)",
+  "ActionType": "Octopus.Script",
+  "Version": 45,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "51ba3ed4-5a81-46b8-af97-eec3de9fcec8",
+      "Name": "GitHubUserName",
+      "Label": "GitHub user",
+      "HelpText": "A username to be used to access GitHub.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7e0ae992-f878-473f-b51a-f53ead92ff4f",
+      "Name": "GitHubPassword",
+      "Label": "GitHub password",
+      "HelpText": "Password (access token) used to access GitHub. Use https://github.com/settings/tokens to generate a token. **repo_deployment** is the required scope for the token.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "230e8590-63d7-4125-aee8-71d25e66d7d1",
+      "Name": "GitHubRepoName",
+      "Label": "GitHub repository",
+      "HelpText": "Name of your GitHub repository.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9a47c6db-11bd-489d-a904-cf31dc7fe0b2",
+      "Name": "GitHubOwner",
+      "Label": "GitHub owner",
+      "HelpText": "Owner of the repository (organization or user).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "56fca421-bb10-4bef-b10f-4a83c9ea1675",
+      "Name": "GitHubHash",
+      "Label": "GitHub hash",
+      "HelpText": "Commit hash used to create the deployment for.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c9cbf161-e537-46a1-8edf-5d4c34fb3744",
+      "Name": "GitHubDeploymentId",
+      "Label": "GitHub deployment id (optional)",
+      "HelpText": "Optional github deployment id. If not set, a new deployment will be created and exported",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a94f5a5b-4747-4738-8ab2-714b991a178d",
+      "Name": "GitHubStatus",
+      "Label": "GitHub deployment status (optional)",
+      "HelpText": "If not specified, will be either `error` or `success` depending on the current build status.\n\nThe state of the status. Can be one of `error,` `failure`, `inactive`, `in_progress`, `queued`, `pending`, or `success`.\n\nSee docu for details: https://developer.github.com/v3/repos/deployments/#parameters-2",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "\ninactive\npending\nqueued\nin_progress\nerror\nfailure\nsuccess\n"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "github",
+  "LastModifiedBy": "benjimac93"
+}
diff --git a/src/step-templates/github-report-deployment/scriptbody.ps1 b/src/step-templates/github-report-deployment/scriptbody.ps1
new file mode 100644
index 000000000..769575fa7
--- /dev/null
+++ b/src/step-templates/github-report-deployment/scriptbody.ps1
@@ -0,0 +1,137 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function InputParameters-Check() {
+    If ([string]::IsNullOrEmpty($OctopusParameters["GitHubHash"])) {
+        Write-Host "No github hash was specified, there's nothing to report then."
+        exit
+    }
+
+    If ([string]::IsNullOrEmpty($OctopusParameters["GitHubUserName"])) {
+        Write-Host "GitHubUserName is not set up, can't report without authentication."
+        exit
+    }
+
+    If ([string]::IsNullOrEmpty($OctopusParameters["GitHubPassword"])) {
+        Write-Host "GitHubPassword is not set up, can't report without authentication."
+        exit
+    }
+
+    If ([string]::IsNullOrEmpty($OctopusParameters["GitHubOwner"])) {
+        Write-Host "GitHubOwner is not set up, can't report without knowing the owner."
+        exit
+    }
+
+
+    If ([string]::IsNullOrEmpty($OctopusParameters["GitHubRepoName"])) {
+        Write-Host "GitHubRepoName is not set up, can't report without knowing the repo."
+        exit
+    }
+}
+
+function Headers-Create ([String] $username, [String] $password) {
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("${username}:${password}"))
+
+    $headers = @{
+      Authorization=("Basic {0}" -f $base64AuthInfo);
+      Accept="application/vnd.github.ant-man-preview+json, application/vnd.github.flash-preview+json";
+    }
+    return $headers
+}
+
+function GithubDeployment-Create ([String] $owner, [String] $repository, [String] $gitHubHash, [String] $environment, [String] $username, [String] $password) {
+    $fullRepoName = $owner + "/" + $repository
+    $projectDeploymentsUrl = "https://api.github.com/repos/$fullRepoName/deployments"
+    Write-Host "Creating a deployment on GitHub on behalf of $username for repo $fullRepoName"
+    $headers = Headers-Create -username $username -password $password
+
+    $deploymentCreatePayload = @{
+        "ref"=$gitHubHash;
+        "auto_merge"=$False;
+        "environment"=$environment;
+        "description"="Octopus Deploy";
+    }
+
+    Write-Host "Calling $projectDeploymentsUrl"
+    Write-Host "Payload:"
+    Write-Host ($deploymentCreatePayload | Format-Table | Out-String)
+
+    $newDeployment = Invoke-RestMethod $projectDeploymentsUrl -Method Post -Body ($deploymentCreatePayload|ConvertTo-Json) -Headers $headers
+    $deploymentId=$newDeployment.id
+    return $deploymentId
+}
+
+function GithubDeployment-UpdateStatus ([String] $owner, [String] $repository, [String] $deploymentId, [String] $environment, [String] $newStatus, [String] $logLink) {
+    $fullRepoName = $owner + "/" + $repository
+    $projectDeploymentsUrl = "https://api.github.com/repos/$fullRepoName/deployments"
+    Write-Host "Setting statuses to $newStatus on $projectDeploymentsUrl"
+    $headers = Headers-Create -username $username -password $password
+
+    $statusUpdatePayload = @{
+        "environment"=$environment;
+        "state"=$newStatus;
+        "description"="Octopus Deploy";
+        "log_url"=$logLink;
+        "environment_url"=$logLink;
+        "auto_inactive"=$True;
+    }
+
+    $statusesUrl = "$projectDeploymentsUrl/$deploymentId/statuses"
+
+    Write-Host "Calling $statusesUrl"
+    Write-Host "Payload:"
+    Write-Host ($statusUpdatePayload | Format-Table | Out-String)
+
+    $statusResult = Invoke-RestMethod $statusesUrl -Method Post -Body ($statusUpdatePayload|ConvertTo-Json) -Headers $headers
+
+    Write-Host "Call result:"
+    Write-Host ($statusResult | Format-Table | Out-String)
+
+}
+
+function Status-Create() {
+    If ([string]::IsNullOrEmpty($OctopusParameters["GitHubStatus"])) {
+        $octopusError=$OctopusParameters["Octopus.Deployment.Error"]
+        $octopusErrorDetail=$OctopusParameters["Octopus.Deployment.ErrorDetail"]
+
+        Write-Host "Desired status is not specified. Reporting either success or error."
+        Write-Host "Current Octopus.Deployment.Error is $octopusError"
+        Write-Host "Current Octopus.Deployment.ErrorDetail is $octopusErrorDetail"
+        $newStatus = If ([string]::IsNullOrEmpty($octopusError)) { "success" } Else { "failure" }
+        Write-Host "Based on that, the status is going to be $newStatus"
+        return $newStatus
+    }
+    else {
+        Write-Host "Desired status of $newStatus is specified, using it."
+        return $OctopusParameters["GitHubStatus"]
+    }
+}
+
+$repoOwner=$OctopusParameters["GitHubOwner"]
+$repoName=$OctopusParameters["GitHubRepoName"]
+$gitHubHash=$OctopusParameters["GitHubHash"]
+$username=$OctopusParameters["GitHubUserName"]
+$password=$OctopusParameters["GitHubPassword"]
+$environment=$OctopusParameters["Octopus.Environment.Name"]
+$deploymentLink=$OctopusParameters["Octopus.Web.DeploymentLink"]
+$serverUrl=$OctopusParameters["#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}"] -replace "http://", "https://"
+$fullDeploymentLink="$serverUrl$deploymentLink"
+$newStatus=$OctopusParameters["GitHubStatus"]
+$deploymentId=$OctopusParameters["GitHubDeploymentId"]
+
+InputParameters-Check
+
+If ([string]::IsNullOrEmpty($deploymentId)) {
+    Write-Host "No deployment id is provided."
+    $deploymentId = GithubDeployment-Create -owner $repoOwner -repository $repoName -gitHubHash $gitHubHash -environment $environment -username $username -password $password
+
+    Write-Host "Created a deployment on GitHub: #($deploymentId). Exported it as GitHubDeploymentId"
+    Set-OctopusVariable -name "GitHubDeploymentId" -value $deploymentId
+}
+
+Write-Host "Using deployment id $deploymentId."
+
+$status = Status-Create
+Write-Host ""
+Write-Host ""
+
+GithubDeployment-UpdateStatus -owner $repoOwner -repository $repoName -deploymentId $deploymentId -environment $environment -newStatus $status -logLink $fullDeploymentLink
diff --git a/step-templates/github-tag-release.json b/src/step-templates/github-tag-release/metadata.json
similarity index 68%
rename from step-templates/github-tag-release.json
rename to src/step-templates/github-tag-release/metadata.json
index e3fc30c3a..b1389cb69 100644
--- a/step-templates/github-tag-release.json
+++ b/src/step-templates/github-tag-release/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 5,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$formattedVersionNumber = [string]::Format(\"v{0}\", $versionNumber)\n$isDraft = [bool]::Parse($draft)\n$isPrerelease = [bool]::Parse($preRelease)\n\n$releaseData = @{\n    tag_name = $formattedVersionNumber;\n    target_commitish = $commitId;\n    name = $formattedVersionNumber;\n    body = $releaseNotes;\n    draft = $isDraft;\n    prerelease = $isPrerelease;\n}\n$json = (ConvertTo-Json $releaseData -Compress)\n$releaseParams = @{\n    Uri = \"https://api.github.com/repos/$gitHubUsername/$gitHubRepository/releases\";\n    Method = 'POST';\n    Headers = @{\n        Authorization = 'Basic ' + [Convert]::ToBase64String(\n            [Text.Encoding]::ASCII.GetBytes($gitHubApiKey + \":x-oauth-basic\")\n        );\n    }\n    ContentType = 'application/json; charset=utf-8';\n    Body = [System.Text.Encoding]::UTF8.GetBytes($json)\n}\n\nWrite-Host \"Creating release $formattedVersionNumber for $commitId.\"\n$result = Invoke-RestMethod @releaseParams\n\nWrite-Host \"Release successfully created.\"\n$result",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -83,10 +83,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2020-06-09T08:00:00.000+00:00",
+  "LastModifiedOn": "2020-06-09T01:00:00.0000000-07:00",
   "LastModifiedBy": "dario-l",
   "$Meta": {
-    "ExportedAt": "2018-02-28T02:37:27.534+00:00",
+    "ExportedAt": "2018-02-27T18:37:27.5340000-08:00",
     "OctopusVersion": "2018.2.6",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/github-tag-release/scriptbody.ps1 b/src/step-templates/github-tag-release/scriptbody.ps1
new file mode 100644
index 000000000..5b7f92660
--- /dev/null
+++ b/src/step-templates/github-tag-release/scriptbody.ps1
@@ -0,0 +1,32 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$formattedVersionNumber = [string]::Format("v{0}", $versionNumber)
+$isDraft = [bool]::Parse($draft)
+$isPrerelease = [bool]::Parse($preRelease)
+
+$releaseData = @{
+    tag_name = $formattedVersionNumber;
+    target_commitish = $commitId;
+    name = $formattedVersionNumber;
+    body = $releaseNotes;
+    draft = $isDraft;
+    prerelease = $isPrerelease;
+}
+$json = (ConvertTo-Json $releaseData -Compress)
+$releaseParams = @{
+    Uri = "https://api.github.com/repos/$gitHubUsername/$gitHubRepository/releases";
+    Method = 'POST';
+    Headers = @{
+        Authorization = 'Basic ' + [Convert]::ToBase64String(
+            [Text.Encoding]::ASCII.GetBytes($gitHubApiKey + ":x-oauth-basic")
+        );
+    }
+    ContentType = 'application/json; charset=utf-8';
+    Body = [System.Text.Encoding]::UTF8.GetBytes($json)
+}
+
+Write-Host "Creating release $formattedVersionNumber for $commitId."
+$result = Invoke-RestMethod @releaseParams
+
+Write-Host "Release successfully created."
+$result
\ No newline at end of file
diff --git a/step-templates/gitlab-create-tag.json b/src/step-templates/gitlab-create-tag/metadata.json
similarity index 52%
rename from step-templates/gitlab-create-tag.json
rename to src/step-templates/gitlab-create-tag/metadata.json
index a69b997ac..ac7648c8f 100644
--- a/step-templates/gitlab-create-tag.json
+++ b/src/step-templates/gitlab-create-tag/metadata.json
@@ -7,7 +7,7 @@
   "CommunityActionTemplateId": null,
   "Packages": [],
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#fix for bug with encode and powershell 4\n#https://stackoverflow.com/questions/43129163/powershell-invoke-webrequest-to-a-url-with-literal-2f-in-it\nfunction fixUri($uri){\n  $UnEscapeDotsAndSlashes = 0x2000000;\n  $SimpleUserSyntax = 0x20000;\n\n  $type = $uri.GetType();\n  $fieldInfo = $type.GetField(\"m_Syntax\", ([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic));\n\n  $uriParser = $fieldInfo.GetValue($uri);\n  $typeUriParser = $uriParser.GetType().BaseType;\n  $fieldInfo = $typeUriParser.GetField(\"m_Flags\", ([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic -bor [System.Reflection.BindingFlags]::FlattenHierarchy));\n  $uriSyntaxFlags = $fieldInfo.GetValue($uriParser);\n\n  $uriSyntaxFlags = $uriSyntaxFlags -band (-bnot $UnEscapeDotsAndSlashes);\n  $uriSyntaxFlags = $uriSyntaxFlags -band (-bnot $SimpleUserSyntax);\n  $fieldInfo.SetValue($uriParser, $uriSyntaxFlags);\n}\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\nAdd-Type -AssemblyName System.Web\n\n$projectIdOrProjectPathEncoded = [System.Web.HttpUtility]::UrlEncode($projectIdOrProjectPath) \n$messageEncoded = [System.Web.HttpUtility]::UrlEncode($message) \n$releaseDescriptionEncoded = [System.Web.HttpUtility]::UrlEncode($releaseDescription) \n\n$getTagUri = New-Object System.Uri \"$gitlabUrl/api/v4/projects/$projectIdOrProjectPathEncoded/repository/tags?tag_name=$tagName\"\nfixUri $getTagUri\n$getTagRequest = @{\n    Uri = $getTagUri;\n    Method = 'GET';\n    Headers = @{'PRIVATE-TOKEN' = $personalAccessToken; }\n    ContentType = 'application/json';\n}\n\n\"Checking if tag $tagName exists.\"\ntry {\n    $resultTag = Invoke-RestMethod @getTagRequest\n    Write-Host \"Tag info received.\"\n}\ncatch {\n    $statusCode = $_.Exception.Response.StatusCode.value__\n    Write-Host \"Error while tag info receive.\"\n    $_.Exception | Format-List -Force\n    throw\n}\nif ($resultTag.name -eq $tagName) {\n    Write-Host \"Tag already exists, skip creation\"\n    exit\n}\n\n$createTagUri = New-Object System.Uri \"$gitlabUrl/api/v4/projects/$projectIdOrProjectPathEncoded/repository/tags?tag_name=$tagName&ref=$vcsReference&message=$messageEncoded&release_description=$releaseDescriptionEncoded\"\nfixUri $createTagUri\n\n$createTagRequest = @{\n    Uri = $createTagUri;\n    Method = 'POST';\n    Headers = @{'PRIVATE-TOKEN' = $personalAccessToken; }\n    ContentType = 'application/json';\n}\n\n\"Creating tag $tagName for $vcsReference.\"\n\n$createTagRequestLines = $createTagRequest | Out-String -Width 1000\n$createTagRequestHeaderLines = $createTagRequest.Headers | Out-String -Width 1000\nWrite-Host \"Request is $createTagRequestLines\"\nWrite-Host \"Headers is $createTagRequestHeaderLines\"\n\ntry {\n    $result = Invoke-RestMethod @createTagRequest\n    Write-Host \"Tag successfully created.\"\n}\ncatch {\n    Write-Host \"Error while tag creating.\"\n    $_.Exception | Format-List -Force\n    throw\n}\n\n\n$result",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
@@ -83,10 +83,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2019-11-06T16:31:39.759Z",
+    "ExportedAt": "2019-11-06T16:31:39.7590000Z",
     "OctopusVersion": "2019.10.1",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/gitlab-create-tag/scriptbody.ps1 b/src/step-templates/gitlab-create-tag/scriptbody.ps1
new file mode 100644
index 000000000..bea2cb08d
--- /dev/null
+++ b/src/step-templates/gitlab-create-tag/scriptbody.ps1
@@ -0,0 +1,80 @@
+#fix for bug with encode and powershell 4
+#https://stackoverflow.com/questions/43129163/powershell-invoke-webrequest-to-a-url-with-literal-2f-in-it
+function fixUri($uri){
+  $UnEscapeDotsAndSlashes = 0x2000000;
+  $SimpleUserSyntax = 0x20000;
+
+  $type = $uri.GetType();
+  $fieldInfo = $type.GetField("m_Syntax", ([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic));
+
+  $uriParser = $fieldInfo.GetValue($uri);
+  $typeUriParser = $uriParser.GetType().BaseType;
+  $fieldInfo = $typeUriParser.GetField("m_Flags", ([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic -bor [System.Reflection.BindingFlags]::FlattenHierarchy));
+  $uriSyntaxFlags = $fieldInfo.GetValue($uriParser);
+
+  $uriSyntaxFlags = $uriSyntaxFlags -band (-bnot $UnEscapeDotsAndSlashes);
+  $uriSyntaxFlags = $uriSyntaxFlags -band (-bnot $SimpleUserSyntax);
+  $fieldInfo.SetValue($uriParser, $uriSyntaxFlags);
+}
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+Add-Type -AssemblyName System.Web
+
+$projectIdOrProjectPathEncoded = [System.Web.HttpUtility]::UrlEncode($projectIdOrProjectPath) 
+$messageEncoded = [System.Web.HttpUtility]::UrlEncode($message) 
+$releaseDescriptionEncoded = [System.Web.HttpUtility]::UrlEncode($releaseDescription) 
+
+$getTagUri = New-Object System.Uri "$gitlabUrl/api/v4/projects/$projectIdOrProjectPathEncoded/repository/tags?tag_name=$tagName"
+fixUri $getTagUri
+$getTagRequest = @{
+    Uri = $getTagUri;
+    Method = 'GET';
+    Headers = @{'PRIVATE-TOKEN' = $personalAccessToken; }
+    ContentType = 'application/json';
+}
+
+"Checking if tag $tagName exists."
+try {
+    $resultTag = Invoke-RestMethod @getTagRequest
+    Write-Host "Tag info received."
+}
+catch {
+    $statusCode = $_.Exception.Response.StatusCode.value__
+    Write-Host "Error while tag info receive."
+    $_.Exception | Format-List -Force
+    throw
+}
+if ($resultTag.name -eq $tagName) {
+    Write-Host "Tag already exists, skip creation"
+    exit
+}
+
+$createTagUri = New-Object System.Uri "$gitlabUrl/api/v4/projects/$projectIdOrProjectPathEncoded/repository/tags?tag_name=$tagName&ref=$vcsReference&message=$messageEncoded&release_description=$releaseDescriptionEncoded"
+fixUri $createTagUri
+
+$createTagRequest = @{
+    Uri = $createTagUri;
+    Method = 'POST';
+    Headers = @{'PRIVATE-TOKEN' = $personalAccessToken; }
+    ContentType = 'application/json';
+}
+
+"Creating tag $tagName for $vcsReference."
+
+$createTagRequestLines = $createTagRequest | Out-String -Width 1000
+$createTagRequestHeaderLines = $createTagRequest.Headers | Out-String -Width 1000
+Write-Host "Request is $createTagRequestLines"
+Write-Host "Headers is $createTagRequestHeaderLines"
+
+try {
+    $result = Invoke-RestMethod @createTagRequest
+    Write-Host "Tag successfully created."
+}
+catch {
+    Write-Host "Error while tag creating."
+    $_.Exception | Format-List -Force
+    throw
+}
+
+
+$result
\ No newline at end of file
diff --git a/src/step-templates/grate-database-migration/metadata.json b/src/step-templates/grate-database-migration/metadata.json
new file mode 100644
index 000000000..b70ac1253
--- /dev/null
+++ b/src/step-templates/grate-database-migration/metadata.json
@@ -0,0 +1,251 @@
+{
+  "Id": "ca23d18f-ab03-403d-bfb8-3ff74d3ddab3",
+  "Name": "grate Database Migrations",
+  "Description": "Database migrations using [grate](https://github.com/grate-devs/grate).\nWith this template you can either include grate with your package or use the `Download grate?` feature to download it at deploy time.  If you're downloading, you can choose the version by specifying it in the `Version of grate`.\n\nNOTE: \n - AWS EC2 IAM Role authentication requires the AWS CLI be installed.\n - To run on Linux, the machine must have both PowerShell Core and .NET Core 3.1 installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 11,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "e0d1bcb0-4a7e-41dc-ab53-2799d6f2b051",
+      "Name": "gratePackage",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "gratePackage",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "5d54012a-1f10-4b3c-bbfd-fe70bf843904",
+      "Name": "gratePackage",
+      "Label": "grate Package",
+      "HelpText": "The package containing the scripts for grate to deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "57a43e61-86c0-46a3-8446-aacbb67cf596",
+      "Name": "grateServerName",
+      "Label": "Database Server Name",
+      "HelpText": "Name or IP address of the server being deployed to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ba3705a1-e620-4fb1-b494-2b9e65fbb194",
+      "Name": "grateServerPort",
+      "Label": "Database Server Port",
+      "HelpText": "Port number for the database server.  Uses default server port if left blank.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c3a7c802-babd-470b-8447-5f6159128b4c",
+      "Name": "grateAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the database server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "c955ad8c-9686-419c-a1cf-129ffbe0acb4",
+      "Name": "grateDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0438580a-8825-40db-a782-569a35144f4b",
+      "Name": "grateSsl",
+      "Label": "Force SSL",
+      "HelpText": "Check this box for force connection string to use SSL.  Only applicable to MariaDB, MySQL, SQL Server, and PostgreSQL database types.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "e007d182-88f5-4e1f-906f-c85ff955c51e",
+      "Name": "grateVersion",
+      "Label": "Database Version",
+      "HelpText": "Version number of your database migration.  Default value is the version of the grate package.",
+      "DefaultValue": "#{Octopus.Action.Package[gratePackage].PackageVersion}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "58ceec6b-f374-4c2e-83bb-fbd7ce26dc05",
+      "Name": "grateUsername",
+      "Label": "Database Username",
+      "HelpText": "Username of the account with sufficient permissions to execute scripts.  (Leave blank for Integrated Authentication.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "29f6bb35-c076-4b5d-98cf-8ee8494cb38b",
+      "Name": "grateUserPassword",
+      "Label": "Database User Password",
+      "HelpText": "Password for the Database Username account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5e5d68f1-fdc8-41ce-8cd3-ab082278218d",
+      "Name": "grateDatabaseServerType",
+      "Label": "Database Server Type",
+      "HelpText": "The database technology being deployed to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "mariadb|MariaDB\nmysql|MySQL\noracle|Oracle\npostgresql|PostgreSQL\nsqlserver|SQL Server"
+      }
+    },
+    {
+      "Id": "67c016c3-d779-4300-b3d1-e11463bb9fc4",
+      "Name": "grateWithTransaction",
+      "Label": "Use Transaction?",
+      "HelpText": "Check this box if you want all scripts to be run within the same transaction.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "29a4f568-23f7-4bb2-a5ba-910b922c5406",
+      "Name": "grateDryRun",
+      "Label": "Dry Run?",
+      "HelpText": "Check this box if you want to perform a dry run.  Results are recorded and attached as deployment artifacts if you check Record Output.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "eaad7639-05d8-46ed-bab3-b72b8ad81d5a",
+      "Name": "grateRecordOutput",
+      "Label": "Record Output?",
+      "HelpText": "Check this box to record the output of the run.  Useful for gathering what would be changed for approval purposes.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "84b46c25-6762-44c2-8ec6-4ba30ff599f5",
+      "Name": "grateCommandTimeout",
+      "Label": "Command Timeout",
+      "HelpText": "Customizable command timeout (in seconds). Default is 60",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3382a212-f467-409e-950b-317f05f59ea5",
+      "Name": "grateBaseline",
+      "Label": "Use Baseline",
+      "HelpText": "Check this box if you want grate to mark the scripts as run, but not to actually run anything against the database. [More information about this option can be found here](https://erikbra.github.io/grate/configuration-options/)",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "60dc1e2a-93ec-4bc9-abde-aacf6aeba0a7",
+      "Name": "grateSqlScriptFolder",
+      "Label": "SQL Script folder",
+      "HelpText": "Script location to use for grate (if not in the root of the package)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b792092e-e3c1-487b-8349-e17832506f12",
+      "Name": "grateLogVerbosity",
+      "Label": "Log Level",
+      "HelpText": "Configure log level when running Grate.",
+      "DefaultValue": "information",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "critical|Critical\ndebug|Debug\nerror|Error\ninformation|Information\nnone|None\ntrace|Trace\nwarning|Warning"
+      }
+    },
+    {
+      "Id": "b8a17064-900f-4d77-9354-e5de1d3057f0",
+      "Name": "grateDownloadNuget",
+      "Label": "Download grate?",
+      "HelpText": "Check this box if you want the template to download RoundhousE and use the downloaded version for deployment.  Requires .NET Core be installed on the machine executing the deployment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "409bd29d-79cf-4209-a005-ce768714eb64",
+      "Name": "grateNugetVersion",
+      "Label": "Version of grate",
+      "HelpText": "Version of grate to download (used with Download grate option), leave blank for latest.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d9660ee0-8376-4f9b-8d1d-99f3b4701a42",
+      "Name": "grateEnvironment",
+      "Label": "Grate environment",
+      "HelpText": "The environment specific scripts that grate will execute",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a93b61a7-74ae-471e-ace3-d09cdfab8858",
+      "Name": "grateSchema",
+      "Label": "Grate schema for migration tables",
+      "HelpText": "Useful if migrating from RoundhousE.",
+      "DefaultValue": "grate",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-03-13T22:25:53.4780000Z",
+    "OctopusVersion": "2026.1.11242",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "grate"
+}
diff --git a/src/step-templates/grate-database-migration/scriptbody.ps1 b/src/step-templates/grate-database-migration/scriptbody.ps1
new file mode 100644
index 000000000..6cda290c4
--- /dev/null
+++ b/src/step-templates/grate-database-migration/scriptbody.ps1
@@ -0,0 +1,523 @@
+# Configure template
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+	Write-Host "Determining Operating System..."
+    switch ([System.Environment]::OSVersion.Platform)
+    {
+    	"Win32NT"
+        {
+        	# Set variable
+            $IsWindows = $true
+            $IsLinux = $false
+        }
+        "Unix"
+        {
+        	$IsWindows = $false
+            $IsLinux = $true
+        }
+    }
+}
+
+if ($IsWindows)
+{
+	$ProgressPreference = 'SilentlyContinue'
+}
+
+# Define parameters
+$grateExecutable = ""
+$grateOutputPath = [System.IO.Path]::Combine($OctopusParameters["Octopus.Action.Package[gratePackage].ExtractedPath"], "output")
+$grateSsl = [System.Convert]::ToBoolean($grateSsl)
+
+Function Get-LatestVersionDownloadUrl {
+    # Define parameters
+    param(
+        $Repository,
+        $Version
+    )
+    
+    # Define local variables
+    $releases = "https://api.github.com/repos/$Repository/releases"
+    
+    # Get latest version
+    Write-Host "Determining latest release of $Repository ..."
+    
+    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)
+    
+    if ($null -ne $Version) {
+        # Get specific version
+        $tags = ($tags | Where-Object { $_.tag_name.EndsWith($Version) })
+
+        # Check to see if nothing was returned
+        if ($null -eq $tags) {
+            # Not found
+            Write-Host "No release found matching version $Version, getting highest version using Major.Minor syntax..."
+
+            # Get the tags
+            $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)
+
+            # Parse the version number into a version object
+            $parsedVersion = [System.Version]::Parse($Version)
+            $partialVersion = "$($parsedVersion.Major).$($parsedVersion.Minor)"
+
+            # Filter tags to ones matching only Major.Minor of version specified
+            $tags = ($tags | Where-Object { $_.tag_name.Contains("$partialVersion.") -and $_.draft -eq $false })
+            
+            # Grab the latest
+            if ($null -eq $tags)
+            {
+            	# decrement minor version
+                $minorVersion = [int]$parsedVersion.Minor
+                $minorVersion --
+                
+                # Check to make sure that minor version isn't negative
+                if ($minorVersion -ge 0)
+                {
+                	# return the urls
+                	return (Get-LatestVersionDownloadUrl -Repository $Repository -Version "$($parsedVersion.Major).$($minorVersion)")
+                }
+                else
+                {
+                	# Display error
+                    Write-Error "Unable to find a version within the major version of $($parsedVersion.Major)!"
+                }
+            }
+        }
+    }
+
+    # Find the latest version with a downloadable asset
+    foreach ($tag in $tags) {
+        if ($tag.assets.Count -gt 0) {
+            return $tag.assets.browser_download_url
+        }
+    }
+
+    # Return the version
+    return $null
+}
+
+# Change the location to the extract path
+Set-Location -Path $OctopusParameters["Octopus.Action.Package[gratePackage].ExtractedPath"]
+
+$grateVersionNumber = $null
+
+# Check to see if download is specified
+if ([System.Boolean]::Parse($grateDownloadNuget))
+{
+    # Set secure protocols
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+    $downloadUrls = @()
+
+	# Check to see if version number specified
+    if ([string]::IsNullOrWhitespace($grateNugetVersion))
+    {
+    	# Get the latest version number
+        $downloadUrls = Get-LatestVersionDownloadUrl -Repository "grate-devs/grate"
+    }
+    else
+    {
+    	# Get specific version
+        $downloadUrls = Get-LatestVersionDownloadUrl -Repository "grate-devs/grate" -Version $grateNugetVersion
+    }
+
+	# Check to make sure something was returned
+    if ($null -ne $downloadUrls -and $downloadUrls.Length -gt 0)
+	{
+    
+      # Check for download folder
+      if ((Test-Path -Path "$PSSCriptRoot/grate") -eq $false)
+      {
+          # Create the folder
+          New-Item -ItemType Directory -Path "$PSSCriptRoot/grate"
+      }
+
+      # Get version from the url
+      $grateVersionNumber = $(([Uri]$downloadUrls[0]).Segments[-2])
+      $grateVersionNumber = [Version]$grateVersionNumber.Replace("/", "")
+
+      # Version 1.6.1 was the last version they used the grate-dotnet-tool name for the asset
+      if ($grateVersionNumber -le [Version]"1.6.1")
+      {
+        # Get URL of grate-dotnet-tool
+        $downloadUrl = $downloadUrls | Where-Object {$_.Contains("grate-dotnet-tool")}
+      }
+      else
+      {
+        if ([Environment]::Is64BitOperatingSystem)
+        {
+          $osArchitectureBit = "64"  
+        }
+        else
+        {
+          $osArchitectureBit = "32"
+        }
+
+        if ($isLinux)
+        {
+          $osType = "linux"
+        }
+        else
+        {
+          $osType = "win"
+        }
+        
+        $downloadUrl = $downloadUrls | Where-Object {$_.Contains("grate-$($osType)-x$($osArchitectureBit)-self-contained-$($grateVersionNumber)")}
+      }
+      
+      # Check to see if something was returned
+      if ($null -eq $downloadUrl)
+      {
+      	# Attempt to get nuget package
+        Write-Host "An asset with grate-dotnet-tool was not found, attempting to locate nuget package ..."
+        $downloadUrl = $downloadUrls | Where-Object {$_.Contains(".nupkg")}
+        
+        # Check to see if something was returned
+        if ($null -eq $downloadUrl)
+        {
+        	Write-Error "Unable to find appropriate asset for download."
+        }
+      }
+
+      # Download nuget package
+      Write-Output "Downloading $downloadUrl ..."
+
+      # Get download file name
+      $downloadFile = $downloadUrl.Substring($downloadUrl.LastIndexOf("/") + 1)
+
+      # Download the file
+      Invoke-WebRequest -Uri $downloadUrl -OutFile "$PSSCriptRoot/grate/$downloadFile"
+
+      # Check the extension
+      if ($downloadFile.EndsWith(".zip"))
+      {
+          # Extract the file
+          Write-Host "Extracting $downloadFile ..."
+          Expand-Archive -Path "$PSSCriptRoot/grate/$downloadFile" -Destination "$PSSCriptRoot/grate"
+
+          # Delete the downloaded .zip
+          Remove-Item -Path "$PSSCriptRoot/grate/$downloadFile"
+
+          # Get extracted files
+          $extractedFiles = Get-ChildItem -Path "$PSSCriptRoot/grate"
+
+          # Check to see if what was extracted was simply a nuget file
+          if ($extractedFiles.Count -eq 1 -and $extractedFiles[0].Extension -eq ".nupkg")
+          {
+              # Zip file contained a nuget package </facepalm>
+              Write-Host "Archive contained a NuGet package, extracting package ..."
+              $nugetPackage = $extractedFiles[0]
+              $nugetPackage | Rename-Item -NewName $nugetPackage.Name.Replace(".nupkg", ".zip")
+              Expand-Archive -Path $nugetPackage.FullName.Replace(".nupkg", ".zip") -Destination "$PSSCriptRoot/grate"
+          }
+      }
+
+      if ($downloadFile.EndsWith(".nupkg"))
+      {
+          # Zip file contained a nuget package </facepalm>
+          $nugetPackage = Get-ChildItem -Path "$PSSCriptRoot/grate/$($downloadFile)"
+          $nugetPackage | Rename-Item -NewName $nugetPackage.Name.Replace(".nupkg", ".zip")
+          Expand-Archive -Path "$PSSCriptRoot/grate/$($downloadFile.Replace(".nupkg", ".zip"))" -Destination "$PSSCriptRoot/grate"    
+      }
+    }
+    else
+    {
+    	Write-Error "No download url returned!"
+    }
+}
+
+
+
+if ([string]::IsNullOrWhitespace($grateExecutable))
+{
+    # Version 1.6.1 was the last version they used the grate-dotnet-tool name for the asset
+    if ($grateVersionNumber -le [Version]"1.6.1")
+    {
+      # Look for just grate.dll
+      $grateExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq "grate.dll"}
+    }
+    else
+    {
+      # Look for executable depending on OS
+      if ($isLinux)
+      {
+        $grateExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq "grate"} | Where-Object { ! $_.PSIsContainer }
+      }
+      else
+      {
+        $grateExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq "grate.exe"}
+      }
+    }
+    
+    # Check for multiple results
+    if ($grateExecutable -is [array])
+    {
+        # choose one that matches highest version of .net
+		$dotnetVersions = (dotnet --list-runtimes) | Where-Object {$_ -like "*.NetCore*"}
+
+		$maxVersion = $null
+		foreach ($dotnetVersion in $dotnetVersions)
+		{
+    		$parsedVersion = $dotnetVersion.Split(" ")[1]
+    		if ($null -eq $maxVersion -or [System.Version]::Parse($parsedVersion) -gt [System.Version]::Parse($maxVersion))
+    		{
+        		$maxVersion = $parsedVersion
+    		}
+		}
+        
+        $grateExecutable = $grateExecutable | Where-Object {$_.FullName -like "*net$(([System.Version]::Parse($maxVersion).Major))*"}
+    }
+}
+
+if ([string]::IsNullOrWhitespace($grateExecutable))
+{
+    # Couldn't find grate
+    Write-Error "Couldn't find the grate executable!"
+}
+
+# Build the arguments
+$grateSwitches = @()
+
+# Update the connection string based on authentication method
+switch ($grateAuthenticationMethod)
+{
+    "awsiam"
+    {
+        # Region is part of the RDS endpoint, extract
+        $region = ($grateServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $grateUserPassword = (aws rds generate-db-auth-token --hostname $grateServerName --region $region --port $grateServerPort --username $grateUserName)       
+        $grateUserInfo = "Uid=$grateUserName;Pwd=$grateUserPassword;"
+
+        break
+    }
+	
+    "azuremanagedidentity"
+    {
+    	# SQL Server driver doesn't assign password
+        if ($grateDatabaseServerType -ne "sqlserver")
+        {
+          # Get login token
+          Write-Host "Generating Azure Managed Identity token ..."
+          $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"}
+
+          $grateUserPassword = $token.access_token
+          $grateUserInfo = "Uid=$grateUserName;Pwd=$grateUserPassword;"
+        }
+        
+        break
+    }
+
+    "gcpserviceaccount"
+    {
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google"}
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object {$_.Contains("iam.gserviceaccount.com") }
+
+		Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+        $grateUserPassword = $token.access_token
+        
+        # Append remaining portion of connection string
+        $grateUserInfo = "Uid=$grateUserName;Pwd=$grateUserPassword;"
+    }
+
+
+    "usernamepassword"
+    {
+    	# Append remaining portion of connection string
+        $grateUserInfo = "Uid=$grateUserName;Pwd=$grateUserPassword;"
+
+		break    
+	}
+
+    "windowsauthentication"
+    {
+      # Append remaining portion of connection string
+	  $grateUserInfo = "integrated security=true;"
+      
+      # Append username (required for non
+      $grateUserInfo += "Uid=$grateUserName;"
+    }
+    
+}
+
+# Configure connnection string based on technology
+switch ($grateDatabaseServerType)
+{
+    "sqlserver"
+    {
+        # Check to see if port has been defined
+        if (![string]::IsNullOrEmpty($grateServerPort))
+        {
+            # Append to servername
+            $grateServerName += ",$grateServerPort"
+
+            # Empty the port
+            $grateServerPort = [string]::Empty
+        }
+    }
+    "mariadb"
+    {
+    	$grateServerPort = "Port=$grateServerPort;Allow User Variables=true;"
+    }
+    "mysql"
+    {
+    	# Use the MySQL client
+        $grateDatabaseServerType = "mariadb"
+        $grateServerPort = "Port=$grateServerPort;Allow User Variables=true;"
+    }
+    "oracle"
+    {
+    	# Oracle connection strings are built different than all others
+        $grateServerConnectionString = "--connectionstring=`"Data source=$($grateServerName):$($grateServerPort)/$grateDatabaseName;$($grateUserInfo.Replace("Uid", "User Id").Replace("Pwd", "Password")) "
+    }
+    default
+    {
+        $grateServerPort = "Port=$grateServerPort;"
+    }
+}
+
+# Build base connection string
+if ([string]::IsNullOrWhitespace($grateServerConnectionString))
+{
+	$grateServerConnectionString = "--connectionstring=`"Server=$grateServerName;$grateServerPort $grateUserInfo Database=$grateDatabaseName;"
+}
+
+# Check for SQL Server and Azure Managed Identity
+if (($grateDatabaseServerType -eq "sqlserver") -and ($grateAuthenticationMethod -eq "azuremanagedidentity"))
+{
+	# Append AD component to connection string
+    $grateServerConnectionString += "Authentication=Active Directory Default;"
+}
+
+if ($grateSsl -eq $true)
+{
+	if (($grateDatabaseServerType -eq "mariadb") -or ($grateDatabaseServerType -eq "mysql") -or ($grateDatabaseServerType -eq "postgres"))
+    {
+    	# Add sslmode
+        $grateServerConnectionString += "SslMode=Require;Trust Server Certificate=true;"
+    }
+    elseif ($grateDatabaseServerType -eq "sqlserver")
+    {
+    	$grateServerConnectionString += "Trust Server Certificate=true;"
+    }
+    else
+    {
+    	Write-Warning "Invalid Database Server Type selection for SSL, ignoring setting."
+    }
+}
+
+# Add terminating double quote to connection string
+$grateServerConnectionString += "`""
+
+$grateSwitches += $grateServerConnectionString
+
+$grateSwitches += "--databasetype=$grateDatabaseServerType"
+$grateSwitches += "--silent"
+
+if ([System.Boolean]::Parse($grateDryRun))
+{
+    $grateSwitches += "--dryrun"
+}
+
+if ([System.Boolean]::Parse($grateRecordOutput))
+{
+    $grateSwitches += "--outputPath=$grateOutputPath"
+    
+    # Check to see if path exists
+    if ((Test-Path -Path $grateOutputPath) -eq $false)
+    {
+    	# Create folder
+        New-Item -Path $grateOutputPath -ItemType "Directory"
+    }
+}
+
+# Add transaction switch
+$grateSwitches += "--transaction=$($grateWithTransaction.ToLower())"
+
+# Add Command Timeout
+if (![string]::IsNullOrEmpty($grateCommandTimeout)){
+    $grateSwitches += "--commandtimeout=$([int]$grateCommandTimeout)"
+}
+
+# Add Baseline switch
+if ([System.Boolean]::Parse($grateBaseline)) {
+    $grateSwitches += "--baseline"
+}
+
+# Add SQL Files Directory parameter
+if (![string]::IsNullOrEmpty($grateSqlScriptFolder)) {
+    # Add up folder
+    $grateSwitches += "--sqlfilesdirectory=$grateSqlScriptFolder"
+}
+
+# Add log verbosity flag
+if (![string]::IsNullOrEmpty($grateLogVerbosity)) {
+    # Add up folder
+    $grateSwitches += "--verbosity=$grateLogVerbosity"
+}
+
+
+# Check for version
+if (![string]::IsNullOrEmpty($grateVersion))
+{
+    # Add version
+    $grateSwitches += "--version=$grateVersion"
+}
+
+# Set grate environment
+if (![string]::IsNullOrEmpty($grateEnvironment))
+{
+    # Add environment
+    $grateSwitches += "--environment=$grateEnvironment"
+}
+
+# Set grate schema. Especially useful when migrating from RoundhousE
+if (![string]::IsNullOrEmpty($grateSchema))
+{
+    # Add schema
+    $grateSwitches += "--schema=$grateSchema"
+}
+
+# Display what's going to be run
+if (![string]::IsNullOrWhitespace($grateUserPassword))
+{
+	Write-Host "Executing $($grateExecutable.FullName) with $($grateSwitches.Replace($grateUserPassword, "****"))"
+}
+else
+{
+	Write-Host "Executing $($grateExecutable.FullName) with $($grateSwitches)"
+}
+
+# Execute grate
+if ($grateExecutable.FullName.EndsWith(".dll"))
+{
+	& dotnet $grateExecutable.FullName $grateSwitches
+}
+else
+{
+	& $grateExecutable.FullName $grateSwitches
+}
+
+# If the output path was specified, attach artifacts
+if ([System.Boolean]::Parse($grateRecordOutput))
+{    
+    # Zip up output folder content
+    Add-Type -Assembly 'System.IO.Compression.FileSystem'
+    
+    $zipFile = "$($OctopusParameters["Octopus.Action.Package[gratePackage].ExtractedPath"])/output.zip"
+    
+	[System.IO.Compression.ZipFile]::CreateFromDirectory($grateOutputPath, $zipFile)
+    New-OctopusArtifact -Path "$zipFile" -Name "output.zip"
+}
diff --git a/src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/metadata.json b/src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/metadata.json
new file mode 100644
index 000000000..11caba98a
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/metadata.json
@@ -0,0 +1,95 @@
+{
+  "Id": "76827264-af27-46d0-913a-e093a4f0db48",
+  "Name": "HashiCorp Vault - AppRole Get Wrapped Secret ID",
+  "Description": "This step generates a response-wrapped Secret ID for an [AppRole](https://www.vaultproject.io/docs/auth/approle) from a HashiCorp Vault server.\n\n---\n\nTwo properties from the response will be made available as [sensitive Output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables):\n\n- `wrap_info.token` named `WrappedToken` - This is the wrapped token used to retrieve the actual Secret ID from Vault.\n- `wrap_info.creation_path` named `WrappedTokenCreationPath` - This is the creation path of the token to allow you to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- The full path where the AppRole auth method is mounted.\n- A `RoleName`.\n- A TTL for the wrapped token (Default: `120s`).\n- The [Auth token](https://www.vaultproject.io/docs/auth/token) used to authenticate with Vault. This token should be of limited scope and should only retrieve wrapped SecretIDs. See the [HashiCorp documentation](https://learn.hashicorp.com/tutorials/vault/pattern-approle?in=vault/recommended-patterns#vault-returns-a-token) for further information.\n\n---\n\n*Optional*\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\n---\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "bbf1cf96-066a-43e8-8387-24131fa63feb",
+      "Name": "Vault.AppRole.WrappedSecretID.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bd6ca2f2-2102-40e0-a1e0-36e526393203",
+      "Name": "Vault.AppRole.WrappedSecretID.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "30366827-71f8-42cc-ac0a-d05300ae6c8d",
+      "Name": "Vault.AppRole.WrappedSecretID.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "67c5d1c7-6373-4342-b02b-a7a6fa69402b",
+      "Name": "Vault.AppRole.WrappedSecretID.AppRolePath",
+      "Label": "App Role Path",
+      "HelpText": "The path where the approle auth method was mounted. The default path is `/auth/approle`. If the AppRole auth method was mounted at a different path, for example `my-path`, then specify `/my-path` instead.",
+      "DefaultValue": "/auth/approle",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4c8ab1b0-36e3-4d19-9a45-557300bb0f06",
+      "Name": "Vault.AppRole.WrappedSecretID.RoleName",
+      "Label": "Role Name",
+      "HelpText": "The role name of the [AppRole](https://www.vaultproject.io/api/auth/approle).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cc4afac6-6dc4-4c9f-bcb8-0ab9c2049523",
+      "Name": "Vault.AppRole.WrappedSecretID.TTL",
+      "Label": "Time-to-live (TTL)",
+      "HelpText": "The TTL of the [response-wrapping token](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-tokens) itself. Enter a value in seconds. The default is: `120s`",
+      "DefaultValue": "120s",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "297871f1-a145-4dde-97ba-d7a9a0690cc6",
+      "Name": "Vault.AppRole.WrappedSecretID.AuthToken",
+      "Label": "Auth token",
+      "HelpText": "The [Auth token](https://www.vaultproject.io/docs/auth/token) used to authenticate with Vault to generate a [response-wrapped](https://www.vaultproject.io/docs/concepts/response-wrapping) Secret ID.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-18T08:56:29.0220000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-18T08:56:29.0220000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/scriptbody.ps1 b/src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/scriptbody.ps1
new file mode 100644
index 000000000..e520c4ae0
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-get-wrapped-secretid/scriptbody.ps1
@@ -0,0 +1,107 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS = $OctopusParameters["Vault.AppRole.WrappedSecretID.VaultAddress"]
+$VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION = $OctopusParameters["Vault.AppRole.WrappedSecretID.ApiVersion"]
+$VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE = $OctopusParameters["Vault.AppRole.WrappedSecretID.Namespace"]
+$VAULT_APPROLE_WRAPPED_SECRETID_PATH = $OctopusParameters["Vault.AppRole.WrappedSecretID.AppRolePath"]
+$VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME = $OctopusParameters["Vault.AppRole.WrappedSecretID.RoleName"]
+$VAULT_APPROLE_WRAPPED_SECRETID_TTL = $OctopusParameters["Vault.AppRole.WrappedSecretID.TTL"]
+$VAULT_APPROLE_WRAPPED_SECRETID_TOKEN = $OctopusParameters["Vault.AppRole.WrappedSecretID.AuthToken"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS)) {
+   throw "Required parameter VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION)) {
+	throw "Required parameter VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_PATH)) {
+	throw "Required parameter VAULT_APPROLE_WRAPPED_SECRETID_AUTH_PATH not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME)) {
+	throw "Required parameter VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_TOKEN)) {
+	throw "Required parameter VAULT_APPROLE_WRAPPED_SECRETID_TOKEN not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try {$response = $rawResponse | ConvertFrom-Json} catch {$response=$rawResponse}
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+###############################################################################
+
+$VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS = $VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS.TrimEnd('/')
+$VAULT_APPROLE_WRAPPED_SECRETID_PATH = $VAULT_APPROLE_WRAPPED_SECRETID_PATH.TrimStart('/').TrimEnd('/')
+$VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME = $VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME.TrimStart('/').TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+try
+{
+	$headers = @{
+        "X-Vault-Token" = $VAULT_APPROLE_WRAPPED_SECRETID_TOKEN
+        "X-Vault-Wrap-Ttl" = $VAULT_APPROLE_WRAPPED_SECRETID_TTL
+    }
+    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE)) {
+        Write-Verbose "Setting 'X-Vault-Namespace' header to: $VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE"
+        $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE)
+    }
+    
+    $uri = "$VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS/$VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION/$VAULT_APPROLE_WRAPPED_SECRETID_PATH/role/$([uri]::EscapeDataString($VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME))/secret-id"
+    Write-Verbose "Making Put request to $uri"
+    $response = Invoke-RestMethod -Uri $uri -Headers $headers -Method Put
+    
+    if($null -ne $response) {
+    	Set-OctopusVariable -Name "WrappedToken" -Value $response.wrap_info.token -Sensitive
+        Set-OctopusVariable -Name "WrappedTokenCreationPath" -Value $response.wrap_info.creation_path -Sensitive
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.WrappedToken}"
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.WrappedTokenCreationPath}"
+    }
+    else {
+    	Write-Error "Null or Empty response returned from Vault server" -Category InvalidResult
+    }
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred getting a wrapped secretid: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.errors) {
+            $AdditionalDetail = $ErrorBody.errors -Join ","   
+        }
+        else {
+            $errorDetails = $null
+            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+        }
+    }
+    
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`n`tDetail: $AdditionalDetail"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-approle-login/metadata.json b/src/step-templates/hashicorp-vault-approle-login/metadata.json
new file mode 100644
index 000000000..4b432dd24
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-login/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "e04a9cec-f04a-4da2-849b-1aed0fd408f0",
+  "Name": "HashiCorp Vault - AppRole Login",
+  "Description": "This step logs into a HashiCorp Vault server with the [AppRole](https://www.vaultproject.io/docs/auth/approle) auth method.\n\nThe `client_token` from the response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `AppRoleAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- You must supply the full path where the AppRole auth method is mounted.\n- You must supply both a `RoleId` and `SecretId`.\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.\n",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "bbf1cf96-066a-43e8-8387-24131fa63feb",
+      "Name": "Vault.AppRole.Login.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bd6ca2f2-2102-40e0-a1e0-36e526393203",
+      "Name": "Vault.AppRole.Login.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "49dc9994-778b-40ad-afe5-80ed34e45056",
+      "Name": "Vault.AppRole.Login.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "67c5d1c7-6373-4342-b02b-a7a6fa69402b",
+      "Name": "Vault.AppRole.Login.AppRolePath",
+      "Label": "App Role Path",
+      "HelpText": "The path where the approle auth method was mounted. The default path is `/auth/approle`. If the AppRole auth method was mounted at a different path, for example `my-path`, then specify `/my-path` instead.",
+      "DefaultValue": "/auth/approle",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "297871f1-a145-4dde-97ba-d7a9a0690cc6",
+      "Name": "Vault.AppRole.Login.RoleID",
+      "Label": "Role ID",
+      "HelpText": "The [RoleID](https://www.vaultproject.io/docs/auth/approle#roleid) of the AppRole.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "4c8ab1b0-36e3-4d19-9a45-557300bb0f06",
+      "Name": "Vault.AppRole.Login.SecretID",
+      "Label": "Secret ID",
+      "HelpText": "The [Secret ID](https://www.vaultproject.io/docs/auth/approle#secretid) of the AppRole.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-16T19:37:08.1770000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-16T19:37:08.1770000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-approle-login/scriptbody.ps1 b/src/step-templates/hashicorp-vault-approle-login/scriptbody.ps1
new file mode 100644
index 000000000..3eb678762
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-login/scriptbody.ps1
@@ -0,0 +1,106 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$VAULT_APPROLE_LOGIN_ADDRESS = $OctopusParameters["Vault.AppRole.Login.VaultAddress"]
+$VAULT_APPROLE_LOGIN_API_VERSION = $OctopusParameters["Vault.AppRole.Login.ApiVersion"]
+$VAULT_APPROLE_LOGIN_APPROLE_PATH = $OctopusParameters["Vault.AppRole.Login.AppRolePath"]
+$VAULT_APPROLE_LOGIN_ROLEID = $OctopusParameters["Vault.AppRole.Login.RoleID"]
+$VAULT_APPROLE_LOGIN_SECRETID = $OctopusParameters["Vault.AppRole.Login.SecretID"]
+
+# Optional variables
+$VAULT_APPROLE_LOGIN_NAMESPACE = $OctopusParameters["Vault.AppRole.Login.Namespace"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_ADDRESS)) {
+    throw "Required parameter VAULT_APPROLE_LOGIN_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_API_VERSION)) {
+    throw "Required parameter VAULT_APPROLE_LOGIN_API_VERSION not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_APPROLE_PATH)) {
+    throw "Required parameter VAULT_APPROLE_LOGIN_APPROLE_PATH not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_ROLEID)) {
+    throw "Required parameter VAULT_APPROLE_LOGIN_ROLEID not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_SECRETID)) {
+    throw "Required parameter VAULT_APPROLE_LOGIN_SECRETID not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+###############################################################################
+
+$VAULT_APPROLE_LOGIN_ADDRESS = $VAULT_APPROLE_LOGIN_ADDRESS.TrimEnd('/')
+$VAULT_APPROLE_LOGIN_APPROLE_PATH = $VAULT_APPROLE_LOGIN_APPROLE_PATH.TrimStart('/').TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+try {
+    $payload = @{
+        role_id   = $VAULT_APPROLE_LOGIN_ROLEID
+        secret_id = $VAULT_APPROLE_LOGIN_SECRETID
+    }
+
+    $Headers = @{}
+    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_NAMESPACE)) {
+        Write-Verbose "Setting 'X-Vault-Namespace' header to: $VAULT_APPROLE_LOGIN_NAMESPACE"
+        $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_LOGIN_NAMESPACE)
+    }
+
+    $uri = "$VAULT_APPROLE_LOGIN_ADDRESS/$VAULT_APPROLE_LOGIN_API_VERSION/$([uri]::EscapeDataString($VAULT_APPROLE_LOGIN_APPROLE_PATH))/login"
+    Write-Verbose "Making request to $uri"
+    $response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers
+    
+    if ($null -ne $response) {
+        Set-OctopusVariable -Name "AppRoleAuthToken" -Value $response.auth.client_token -Sensitive
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.AppRoleAuthToken}"
+    }
+    else {
+        Write-Error "Null or Empty response returned from Vault server" -Category InvalidResult
+    }
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred logging in with AppRole: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.errors) {
+            $AdditionalDetail = $ErrorBody.errors -Join ","   
+        }
+        else {
+            $errorDetails = $null
+            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+        }
+    }
+    
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`n`tDetail: $AdditionalDetail"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/metadata.json b/src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/metadata.json
new file mode 100644
index 000000000..99f83c16a
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/metadata.json
@@ -0,0 +1,95 @@
+{
+  "Id": "aa113393-e615-40ed-9c5a-f95f471d728f",
+  "Name": "HashiCorp Vault - AppRole Unwrap Secret ID and Login",
+  "Description": "This step combines two Vault operations into one:\n1. It retrieves (and unwraps) a Secret ID for an [AppRole](https://www.vaultproject.io/docs/auth/approle) using a wrapped auth token from a HashiCorp Vault server.\n2. It logs into the HashiCorp Vault server using a supplied Role ID and the unwrapped Secret ID.\n\nThe `client_token` from the login response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `AppRoleAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- The full path where the AppRole auth method is mounted.\n- The [RoleID](https://www.vaultproject.io/docs/auth/approle#roleid) of the AppRole.\n- The wrapped [auth token](https://www.vaultproject.io/docs/auth/token) used to retrieve the unwrapped Secret ID. \n\n---\n\n*Optional*\n- The creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\n---\n\nNotes:\n\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.\n- See the HashiCorp [AppRole patterns documentation](https://learn.hashicorp.com/tutorials/vault/pattern-approle?in=vault/recommended-patterns#vault-returns-a-token) for further information.\n",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "a0078913-4e0b-4b01-b8eb-f410138951e8",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6b441222-26f8-4e68-bb96-fdabd0ebcc59",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "f973d44c-4840-4559-9331-6b2d91c130f3",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6fd4b775-5b97-43c7-bc53-5dc3e2353287",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.AppRolePath",
+      "Label": "App Role Path",
+      "HelpText": "The path where the approle auth method was mounted. The default path is `/auth/approle`. If the AppRole auth method was mounted at a different path, for example `my-path`, then specify `/my-path` instead.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a8c0824c-3e1a-4014-8060-96a703d52365",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.RoleID",
+      "Label": "Role ID",
+      "HelpText": "The [RoleID](https://www.vaultproject.io/docs/auth/approle#roleid) of the AppRole.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "8ba05c24-215f-4ca0-9edc-bca38c43d7b5",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.WrappedToken",
+      "Label": "Wrapped Token",
+      "HelpText": "This is the wrapped token used to retrieve the actual Secret ID from Vault.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "3d94ac28-e7b6-4da2-8ff4-af506d5ded95",
+      "Name": "Vault.AppRole.UnwrapSecretID.Login.WrappedTokenCreationPath",
+      "Label": "Token Creation Path",
+      "HelpText": "*Optional* - the creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-18T09:07:46.5360000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-18T09:07:46.5360000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/scriptbody.ps1 b/src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/scriptbody.ps1
new file mode 100644
index 000000000..13a8658c4
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-unwrap-secretid-login/scriptbody.ps1
@@ -0,0 +1,155 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.VaultAddress"]
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.ApiVersion"]
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.Namespace"]
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.AppRolePath"]
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.RoleID"]
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.WrappedToken"]
+
+# Optional Variables
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN_CREATION_PATH = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Login.WrappedTokenCreationPath"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+###############################################################################
+
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS.TrimEnd('/')
+$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH.TrimStart('/').TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+try {
+    
+    Write-Verbose "X-Vault-Namespace header: $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE"
+    
+    # Should we validate lookup token's creation path?
+    if (![string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN_CREATION_PATH)) {
+        $uri = "$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION/sys/wrapping/lookup"    
+        $payload = @{
+            token = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN
+        }
+
+        $Headers = @{}
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)
+        }
+
+        Write-Verbose "Making Post request to $uri"
+        $response = Invoke-RestMethod -Uri $uri -Method Post -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers
+
+        if ($null -ne $response) {
+            Write-Verbose "Validating Wrapped token creation path."
+            $Lookup_CreationPath = $response.data.creation_path
+            if ($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN_CREATION_PATH -ne $Lookup_CreationPath) {
+                throw "Supplied Wrapped token creation path failed lookup validation. Check the creation path value and retry."
+            }
+        }
+        else {
+            Write-Error "Null or Empty response returned from Vault server lookup" -Category InvalidResult
+        }
+    }
+
+    # Call to unwrap secret id from wrapped token.
+    $Headers = @{
+        "X-Vault-Token" = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN
+    }
+    
+    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)) {
+        $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)
+    }
+    
+    $uri = "$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION/sys/wrapping/unwrap"
+    Write-Verbose "Making Post request to $uri"
+    $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method Post
+    
+    if ($null -ne $response) {
+
+        $payload = @{
+            role_id   = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID
+            secret_id = $response.data.secret_id
+        }
+
+        $Headers = @{}
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)
+        }
+
+        $uri = "$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION/$([uri]::EscapeDataString($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH))/login"
+        Write-Verbose "Making Post request to $uri"
+        $login_response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers
+        
+        if ($null -ne $login_response) {
+            Set-OctopusVariable -Name "AppRoleAuthToken" -Value $login_response.auth.client_token -Sensitive
+            Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.AppRoleAuthToken}"
+        }
+        else {
+            Write-Error "Null or Empty response returned from Vault server" -Category InvalidResult
+        }
+    }
+    else {
+        throw "Null or Empty response returned from Vault server unwrap"
+    }
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred unwrapping secretid: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.errors) {
+            $AdditionalDetail = $ErrorBody.errors -Join ","   
+        }
+        else {
+            $errorDetails = $null
+            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+        }
+    }
+    
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`n`tDetail: $AdditionalDetail"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-approle-unwrap-secretid/metadata.json b/src/step-templates/hashicorp-vault-approle-unwrap-secretid/metadata.json
new file mode 100644
index 000000000..aaa45f5ba
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-unwrap-secretid/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "c1f56030-0bcd-458d-bc70-b4f43ec0d30f",
+  "Name": "HashiCorp Vault - AppRole Unwrap Secret ID",
+  "Description": "This step retrieves (and unwraps) a Secret ID for an [AppRole](https://www.vaultproject.io/docs/auth/approle) using a wrapped auth token from a HashiCorp Vault server.\n\n---\n\nOne property from the response will be made available as a [sensitive Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables):\n\n- `data.secret_id` - This is the unwrapped Secret ID from Vault. The output variable name will be `UnwrappedSecretID`.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- The wrapped [auth token](https://www.vaultproject.io/docs/auth/token) used to retrieve the unwrapped Secret ID. \n\n---\n\n*Optional*\n- The creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault).\n\n---\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.\n- See the HashiCorp [AppRole patterns documentation](https://learn.hashicorp.com/tutorials/vault/pattern-approle?in=vault/recommended-patterns#vault-returns-a-token) for further information.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b30bafd3-a5b6-4c26-8eea-af938f5ba7da",
+      "Name": "Vault.AppRole.UnwrapSecretID.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a810fce1-3180-4eb8-b342-8b2d76a39667",
+      "Name": "Vault.AppRole.UnwrapSecretID.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "e60b5c0b-dacc-4a99-8907-82e57eb9f573",
+      "Name": "Vault.AppRole.UnwrapSecretID.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6fd2fe01-9600-4ccc-a3f2-f733af79a255",
+      "Name": "Vault.AppRole.UnwrapSecretID.WrappedToken",
+      "Label": "Wrapped Token",
+      "HelpText": "This is the wrapped token used to retrieve the actual Secret ID from Vault.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "6dc8f829-c89c-403f-805c-350710d8d855",
+      "Name": "Vault.AppRole.UnwrapSecretID.WrappedTokenCreationPath",
+      "Label": "Token Creation Path",
+      "HelpText": "*Optional* - the creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-18T09:22:26.1560000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-18T09:22:26.1560000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-approle-unwrap-secretid/scriptbody.ps1 b/src/step-templates/hashicorp-vault-approle-unwrap-secretid/scriptbody.ps1
new file mode 100644
index 000000000..5ee369473
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-approle-unwrap-secretid/scriptbody.ps1
@@ -0,0 +1,127 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS = $OctopusParameters["Vault.AppRole.UnwrapSecretID.VaultAddress"]
+$VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION = $OctopusParameters["Vault.AppRole.UnwrapSecretID.ApiVersion"]
+$VAULT_APPROLE_UNWRAP_SECRETID_TOKEN = $OctopusParameters["Vault.AppRole.UnwrapSecretID.WrappedToken"]
+
+# Optional Variables
+$VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE = $OctopusParameters["Vault.AppRole.UnwrapSecretID.Namespace"]
+$VAULT_APPROLE_UNWRAP_SECRETID_TOKEN_CREATION_PATH = $OctopusParameters["Vault.AppRole.UnwrapSecretID.WrappedTokenCreationPath"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_TOKEN)) {
+    throw "Required parameter VAULT_APPROLE_UNWRAP_SECRETID_TOKEN not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+###############################################################################
+
+$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS = $VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS.TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+try {
+
+    Write-Verbose "X-Vault-Namespace header: $VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE"
+
+    # Should we validate lookup token's creation path?
+    if (![string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_TOKEN_CREATION_PATH)) {
+        $uri = "$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION/sys/wrapping/lookup"    
+        $payload = @{
+            token = $VAULT_APPROLE_UNWRAP_SECRETID_TOKEN
+        }
+
+        $Headers = @{}
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)
+        }
+
+        Write-Verbose "Making Post request to $uri"
+        $response = Invoke-RestMethod -Uri $uri -Method Post -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers
+
+        if ($null -ne $response) {
+            Write-Verbose "Validating Wrapped token creation path."
+            $Lookup_CreationPath = $response.data.creation_path
+            if ($VAULT_APPROLE_UNWRAP_SECRETID_TOKEN_CREATION_PATH -ne $Lookup_CreationPath) {
+                throw "Supplied Wrapped token creation path failed lookup validation. Check the creation path value and retry."
+            }
+        }
+        else {
+            Write-Error "Null or Empty response returned from Vault server lookup" -Category InvalidResult
+        }
+    }
+
+    # Call to unwrap secret id from wrapped token.
+    $Headers = @{
+        "X-Vault-Token" = $VAULT_APPROLE_UNWRAP_SECRETID_TOKEN
+    }
+
+    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)) {
+        $Headers.Add("X-Vault-Namespace", $VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)
+    }
+    
+    $uri = "$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION/sys/wrapping/unwrap"
+    Write-Verbose "Making Post request to $uri"
+    $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method Post
+    
+    if ($null -ne $response) {
+        Set-OctopusVariable -Name "UnwrappedSecretID" -Value $response.data.secret_id -Sensitive
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.UnwrappedSecretID}"
+    }
+    else {
+        Write-Error "Null or Empty response returned from Vault server unwrap" -Category InvalidResult
+    }
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred unwrapping secretid: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.errors) {
+            $AdditionalDetail = $ErrorBody.errors -Join ","   
+        }
+        else {
+            $errorDetails = $null
+            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+        }
+    }
+    
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`n`tDetail: $AdditionalDetail"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-generate-jwt/metadata.json b/src/step-templates/hashicorp-vault-generate-jwt/metadata.json
new file mode 100644
index 000000000..57ceb657a
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-generate-jwt/metadata.json
@@ -0,0 +1,106 @@
+{
+  "Id": "e72fd23a-3bfd-4758-a720-2462d5206f65",
+  "Name": "HashiCorp Vault - Generate JWT",
+  "Description": "This step template generates a [Json Web Token (JWT)](https://en.wikipedia.org/wiki/JSON_Web_Token) for use with HashiCorp Vault.\n\nThe step is based on the existing [JWT - Generate JSON Web Token](https://library.octopus.com/step-templates/1ca0401c-dfca-420e-81ca-1f4b7cf02d2d/actiontemplate-jwt-generate-json-web-token) step template.\n\nHowever, it differs as it offers less flexibility in choosing the fields to use in the generated JWT and is opinionated towards support for Vault [entities and groups](https://learn.hashicorp.com/tutorials/vault/identity).\n\nThe resulting JWT will be stored as a [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) called **JWT**.\n\nA private key needs to be provided that will sign the combined JWT header and payload.\n\nCurrently, the following three signing algorithms are supported:\n\n1. `RS256` - RSASSA-PKCS1-v1_5 using SHA-256\n2. `RS384` - RSASSA-PKCS1-v1_5 using SHA-384\n3. `RS512` - RSASSA-PKCS1-v1_5 using SHA-512\n\nThe default is `RS256`.\n\n**Notes:**\n- Tested on Windows and Linux (PowerShell Core)\n- Tested with Octopus **2020.1**",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "71bacc82-21d7-4d08-a944-15dacd0a3405",
+      "Name": "Vault.Generate.JWT.PrivateKey",
+      "Label": "JWT Private signing key",
+      "HelpText": "Provide the private key in PEM format to be used to sign the JWT.\n\nAccepted headers: \n\n- `----BEGIN RSA PRIVATE KEY-----`\n- `-----BEGIN PRIVATE KEY----`\n\n**Note:** It's recommended to use a sensitive variable to provide this value. If you instead enter the private key directly, the step template will attempt to detect this by replacing spaces with new lines ``n`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "84759ecc-a3f6-4822-a678-833269a8bf0d",
+      "Name": "Vault.Generate.JWT.Signing.Algorithm",
+      "Label": "JWT signing algorithm",
+      "HelpText": "The JWA [algorithm](https://datatracker.ietf.org/doc/html/rfc7518#section-3.1) to use when signing the JWT. The default is `RS256` (RSASSA-PKCS1-v1_5 using SHA-256).\n\nThis value is also used for the `alg` [algorithm header](https://datatracker.ietf.org/doc/html/rfc7515#section-4.1.1).",
+      "DefaultValue": "RS256",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "RS256|RS256: RSASSA-PKCS1-v1_5 using SHA-256\nRS384|RS384: RSASSA-PKCS1-v1_5 using SHA-384\nRS512|RS512: RSASSA-PKCS1-v1_5 using SHA-512"
+      }
+    },
+    {
+      "Id": "76d289c5-f6f9-4cfb-b876-13515745f03f",
+      "Name": "Vault.Generate.JWT.ExpiresAfterMinutes",
+      "Label": "JWT expiry time in minutes",
+      "HelpText": "The number of minutes after the JWT is created that it expires. This value is used for the `exp` [expiration time claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4). The default is `20` minutes.",
+      "DefaultValue": "20",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "20d57320-15e4-4777-916b-8563192a326d",
+      "Name": "Vault.Generate.JWT.Issuer",
+      "Label": "JWT Issuer claim",
+      "HelpText": "The `iss` [isuer claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.1) identifies the principal that issued the JWT.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "12a68971-8e0b-4b90-9a27-4c81413d0fb7",
+      "Name": "Vault.Generate.JWT.Audience",
+      "Label": "JWT Audience claim",
+      "HelpText": "The `aud` [audience claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3) identifies the recipients that the JWT is intended for. This is typically the base address of the resource being accessed, such as `https://example-domain.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "e7026958-60cb-4652-9fe0-2ef2965de951",
+      "Name": "Vault.Generate.JWT.Subject",
+      "Label": "JWT Subject claim",
+      "HelpText": "Choose from a defined list of values for the `sub` [subject claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.2) of the JWT.\n\nAvailable options start from least granular to most granular: \n\n- Octopus Server Uri\n- Octopus Server Uri, and Project Group name\n- Octopus Server Uri, Project Group, and Project name\n- Octopus Server Uri, Project Group, Project and Environment name\n\n*Note:* If the **Server Uri** property has not been set for the Octopus instance, the `Octopus.Web.ServerUri` variable will resolve to an empty string.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "serveruri|Octopus Server Uri\nprojectgroup|Octopus Server Uri, and Project Group\nproject|Octopus Server Uri, Project Group, and Project\nenvironment|Octopus Server Uri, Project Group, Project, and Environment"
+      }
+    },
+    {
+      "Id": "1bd2294c-64a3-4dad-bb9f-1a4cce5eaff5",
+      "Name": "Vault.Generate.JWT.Groups",
+      "Label": "JWT Groups claim",
+      "HelpText": "Choose from a defined list of values for the `groups` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies groups associated with this JWT. \n\nAvailable options start from least granular to most granular: \n\n- Octopus Server Uri\n- Octopus Server Uri, and Project Group name\n- Octopus Server Uri, Project Group, and Project name\n- Octopus Server Uri, Project Group, Project and Environment name\n\n*Note:* If the **Server Uri** property has not been set for the Octopus instance, the `Octopus.Web.ServerUri` variable will resolve to an empty string.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "serveruri|Octopus Server Uri\nprojectgroup|Octopus Server Uri, and Project Group\nproject|Octopus Server Uri, Project Group, and Project\nenvironment|Octopus Server Uri, Project Group, Project, and Environment"
+      }
+    },
+    {
+      "Id": "88298719-27ac-48c6-8c13-c40a3aaceb6c",
+      "Name": "Vault.Generate.JWT.IdentityPrefix",
+      "Label": "JWT Identity Prefix (optional)",
+      "HelpText": "*Optional* - A prefix to be added to the values used in **both** the `sub` and `groups` claims.\n\nIf no value is provided, the prefix is not included.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-10T12:55:30.0880000Z",
+    "OctopusVersion": "2021.2.7090",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-generate-jwt/scriptbody.ps1 b/src/step-templates/hashicorp-vault-generate-jwt/scriptbody.ps1
new file mode 100644
index 000000000..a2ca9b1fa
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-generate-jwt/scriptbody.ps1
@@ -0,0 +1,510 @@
+$ErrorActionPreference = 'Stop'
+
+# Helper functions
+###############################################################################
+
+function ConvertTo-JwtBase64 {
+    param (
+        $Value
+    )
+    if ($Value -is [string]) {
+        $ConvertedValue = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($Value)) -replace '\+', '-' -replace '/', '_' -replace '='
+    }
+    elseif ($Value -is [byte[]]) {
+        $ConvertedValue = [Convert]::ToBase64String($Value) -replace '\+', '-' -replace '/', '_' -replace '='
+    }
+
+    return $ConvertedValue
+}
+
+function ConvertTo-Subject {
+    param ([string]$Subject, [string]$IdentityPrefix)
+    return ConvertTo-Identity -IdentityValue $Subject -IdentityPrefix $IdentityPrefix
+}
+
+function ConvertTo-Groups {
+    param ([string]$Groups, [string]$IdentityPrefix)
+    return ConvertTo-Identity -IdentityValue $Groups -IdentityPrefix $IdentityPrefix
+}
+
+function ConvertTo-Identity {
+    param (
+        [string]$IdentityValue, 
+        [string]$IdentityPrefix
+    )
+    $ServerUri = $OctopusParameters["Octopus.Web.ServerUri"].ToLower() -Replace "http://" -Replace "https://"
+    $ProjectGroup = $OctopusParameters["Octopus.ProjectGroup.Name"].ToLower() -Replace " ", "-"
+    $Project = $OctopusParameters["Octopus.Project.Name"].ToLower() -Replace " ", "-"
+    $Environment = $OctopusParameters["Octopus.Environment.Name"].ToLower() -Replace " ", "-"
+    $identity = ""
+    switch ($VAULT_GENERATE_JWT_SUBJECT) {
+        "serveruri" {
+            $identity = $ServerUri
+        }
+        "projectgroup" {
+            $identity = "$ServerUri/$ProjectGroup"
+        }
+        "project" {
+            $identity = "$ServerUri/$ProjectGroup/$Project"
+        }
+        "environment" {
+            $identity = "$ServerUri/$ProjectGroup/$Project/$Environment"
+        }
+    }
+    if (![string]::IsNullOrWhiteSpace($IdentityPrefix)) {
+        $identity = "$IdentityPrefix$identity"
+    }
+    return $identity
+}
+
+###############################################################################
+
+# Variables
+$VAULT_GENERATE_JWT_PRIVATE_KEY = $OctopusParameters["Vault.Generate.JWT.PrivateKey"]
+$VAULT_GENERATE_JWT_ALGORITHM = $OctopusParameters["Vault.Generate.JWT.Signing.Algorithm"]
+$VAULT_GENERATE_JWT_EXPIRES_MINS = $OctopusParameters["Vault.Generate.JWT.ExpiresAfterMinutes"]
+$VAULT_GENERATE_JWT_ISSUER = $OctopusParameters["Vault.Generate.JWT.Issuer"]
+$VAULT_GENERATE_JWT_SUBJECT = $OctopusParameters["Vault.Generate.JWT.Subject"]
+$VAULT_GENERATE_JWT_GROUPS = $OctopusParameters["Vault.Generate.JWT.Groups"]
+$VAULT_GENERATE_JWT_AUDIENCE = $OctopusParameters["Vault.Generate.JWT.Audience"]
+
+# Optional 
+$VAULT_GENERATE_JWT_IDENTITY_PREFIX = $OctopusParameters["Vault.Generate.JWT.IdentityPrefix"]
+
+$subject = ConvertTo-Subject -Groups $VAULT_GENERATE_JWT_GROUPS -IdentityPrefix $VAULT_GENERATE_JWT_IDENTITY_PREFIX
+$groups = ConvertTo-Groups -Groups $VAULT_GENERATE_JWT_GROUPS -IdentityPrefix $VAULT_GENERATE_JWT_IDENTITY_PREFIX
+
+$audiences = @()
+if (![string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_AUDIENCE)) {
+    @(($VAULT_GENERATE_JWT_AUDIENCE -Split "`n").Trim()) | ForEach-Object {
+        if (![string]::IsNullOrWhiteSpace($_)) {
+            $audiences += $_
+        }
+    }
+}
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_PRIVATE_KEY)) {
+    throw "Required parameter Vault.Generate.JWT.PrivateKey not specified."
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_ALGORITHM)) {
+    throw "Required parameter Vault.Generate.JWT.Signing.Algorithm not specified."
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_EXPIRES_MINS)) {
+    throw "Required parameter Vault.Generate.JWT.ExpiresAfterMinutes not specified."
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_ISSUER)) {
+    throw "Required parameter Vault.Generate.JWT.Issuer not specified."
+}
+if ($audiences.Length -le 0) {
+    throw "Required parameter Vault.Generate.JWT.Audience not specified."
+}
+if ([string]::IsNullOrWhiteSpace($subject)) {
+    throw "Required parameter Vault.Generate.JWT.Subject not specified."
+}
+if ([string]::IsNullOrWhiteSpace($groups)) {
+    throw "Required parameter Vault.Generate.JWT.Groups not specified."
+}
+
+
+# Signing functions
+###############################################################################
+
+$RsaPrivateKey_Header = "-----BEGIN RSA PRIVATE KEY-----"
+$RsaPrivateKey_Footer = "-----END RSA PRIVATE KEY-----"
+$Pkcs8_PrivateKey_Header = "-----BEGIN PRIVATE KEY-----"
+$Pkcs8_PrivateKey_Footer = "-----END PRIVATE KEY-----"
+
+function ExtractPemData {
+    param (
+        [string]$Pem,
+        [string]$Header,
+        [string]$Footer
+    )
+
+    $Start = $Pem.IndexOf($Header) + $Header.Length
+    $End = $Pem.IndexOf($Footer, $Start) - $Start
+    $EncodedPem = ($Pem.Substring($Start, $End).Trim()) -Replace " ", "`n"
+    
+    $PemData = [Convert]::FromBase64String($EncodedPem)
+    return [byte[]]$PemData
+}
+
+function DecodeIntSize {
+    param (
+        [System.IO.BinaryReader]$BinaryReader
+    )
+    
+    [byte]$byteValue = $BinaryReader.ReadByte()
+    
+    # If anything other than 0x02, an ASN.1 integer follows.
+    if ($byteValue -ne 0x02) {
+        return 0;
+    }
+    
+    $byteValue = $BinaryReader.ReadByte()
+    # 0x81 == Data size in next byte.
+    if ($byteValue -eq 0x81) { 
+        $size = $BinaryReader.ReadByte()
+    }
+    # 0x82 == Data size in next 2 bytes.
+    else {
+        if ($byteValue -eq 0x82) {
+            [byte]$high = $BinaryReader.ReadByte()
+            [byte]$low = $BinaryReader.ReadByte()
+            $byteValues = [byte[]]@($low, $high, 0x00, 0x00)
+            $size = [System.BitConverter]::ToInt32($byteValues, 0)
+        }
+        else {
+            # Otherwise, data size has already been read above.
+            $size = $byteValue
+        }
+    }
+    # Remove high-order zeros in data
+    $byteValue = $BinaryReader.ReadByte()
+    while ($byteValue -eq 0x00) {
+        $byteValue = $BinaryReader.ReadByte()
+        $size -= 1
+    }
+
+    $BinaryReader.BaseStream.Seek(-1, [System.IO.SeekOrigin]::Current) | Out-Null
+    return $size
+}
+
+function PadByteArray {
+    param (
+        [byte[]]$Bytes,
+        [int]$Size
+    )
+
+    if ($Bytes.Length -eq $Size) {
+        return $Bytes
+    }
+    if ($Bytes.Length -gt $Size) {
+        throw "Specified size '$Size' to pad is too small for byte array of size '$($Bytes.Length)'."
+    }
+
+    [byte[]]$PaddedBytes = New-Object Byte[] $Size
+    [System.Array]::Copy($Bytes, 0, $PaddedBytes, $Size - $bytes.Length, $bytes.Length) | Out-Null
+    return $PaddedBytes
+}
+
+function Compare-ByteArrays {
+    param (
+        [byte[]]$First,
+        [byte[]]$Second
+    )
+    if ($First.Length -ne $Second.Length) {
+        return $False
+    }
+    [int]$i = 0
+    foreach ($byte in $First) {
+        if ($byte -ne $Second[$i]) {
+            return $False
+        }
+        $i = $i + 1
+    }
+    return $True
+}
+
+function CreateRSAFromPkcs8 {
+    param (
+        [byte[]]$KeyBytes
+    )
+    Write-Verbose "Reading RSA Pkcs8 private key bytes"
+
+    # The encoded OID sequence for PKCS #1 rsaEncryption szOID_RSA_RSA = "1.2.840.113549.1.1.1"
+    # this byte[] includes the sequence byte and terminal encoded null 
+    [byte[]]$SeqOID = 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00
+    [byte[]]$Seq = New-Object byte[] 15
+
+    # Have to wrap $KeyBytes in another array :|
+    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) 
+    $reader = New-Object System.IO.BinaryReader($MemoryStream)
+    $StreamLength = [int]$MemoryStream.Length
+    
+    try {
+        [UInt16]$Bytes = $reader.ReadUInt16()
+
+        if ($Bytes -eq 0x8130) {
+            $reader.ReadByte() | Out-Null
+        }
+        elseif ($Bytes -eq 0x8230) {
+            $reader.ReadInt16() | Out-Null
+        }
+        else {
+            return $null
+        }
+        
+        [byte]$byteValue = $reader.ReadByte()
+
+        if ($byteValue -ne 0x02) {
+            return $null
+        }
+
+        $Bytes = $reader.ReadUInt16()
+
+        if ($Bytes -ne 0x0001) {
+            return $null
+        }
+
+        # Read the Sequence OID
+        $Seq = $reader.ReadBytes(15)
+        $SequenceMatches = Compare-ByteArrays -First $Seq -Second $SeqOID
+        if ($SequenceMatches -eq $False) {
+            Write-Verbose "Sequence OID doesnt match"
+            return $null
+        }
+
+        $byteValue = $reader.ReadByte()
+        # Next byte should be a Octet string
+        if ($byteValue -ne 0x04) {
+            return $null
+        }
+        # Read next byte / 2 bytes. 
+        # Should be either: 0x81 or 0x82; otherwise it's the byte count.
+        $byteValue = $reader.ReadByte()
+        if ($byteValue -eq 0x81) {
+            $reader.ReadByte() | Out-Null
+        }
+        else {
+            if ($byteValue -eq 0x82) {
+                $reader.ReadUInt16() | Out-Null
+            }
+        }
+
+        # Remaining sequence *should* be the RSA Pkcs1 private Key bytes
+        [byte[]]$RsaKeyBytes = $reader.ReadBytes([int]($StreamLength - $MemoryStream.Position))
+        Write-Verbose "Attempting to create RSA object from remaining Pkcs1 bytes"
+        $rsa = CreateRSAFromPkcs1 -KeyBytes $RsaKeyBytes
+        return $rsa
+    }
+    catch {
+        Write-Warning "CreateRSAFromPkcs8: Exception occurred - $($_.Exception.Message)"
+        return $null
+    }
+    finally {
+        if ($null -ne $reader) { $reader.Close() }
+        if ($null -ne $MemoryStream) { $MemoryStream.Close() }
+    }
+}
+
+function CreateRSAFromPkcs1 {
+    param (
+        [byte[]]$KeyBytes
+    )
+    Write-Verbose "Reading RSA Pkcs1 private key bytes"
+    # Have to wrap $KeyBytes in another array :|
+    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) 
+    $reader = New-Object System.IO.BinaryReader($MemoryStream)
+    try {
+               
+        [UInt16]$Bytes = $reader.ReadUInt16()
+
+        if ($Bytes -eq 0x8130) {
+            $reader.ReadByte() | Out-Null
+        }
+        elseif ($Bytes -eq 0x8230) {
+            $reader.ReadInt16() | Out-Null
+        }
+        else {
+            return $null
+        }
+    
+        $Bytes = $reader.ReadUInt16()
+        if ($Bytes -ne 0x0102) {
+            return $null
+        }
+    
+        [byte]$byteValue = $reader.ReadByte()
+        if ($byteValue -ne 0x00) {
+            return $null
+        }
+
+        # Private key parameters are integer sequences.
+        # For a summary of the RSA Parameters fields, 
+        # See https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.rsaparameters#summary-of-fields
+        
+        $Modulus_Size = DecodeIntSize -BinaryReader $reader
+        $Modulus = $reader.ReadBytes($Modulus_Size)
+
+        $E_Size = DecodeIntSize -BinaryReader $reader
+        $E = $reader.ReadBytes($E_Size)
+
+        $D_Size = DecodeIntSize -BinaryReader $reader
+        $D = $reader.ReadBytes($D_Size)
+
+        $P_Size = DecodeIntSize -BinaryReader $reader
+        $P = $reader.ReadBytes($P_Size)
+
+        $Q_Size = DecodeIntSize -BinaryReader $reader
+        $Q = $reader.ReadBytes($Q_Size)
+
+        $DP_Size = DecodeIntSize -BinaryReader $reader
+        $DP = $reader.ReadBytes($DP_Size)
+
+        $DQ_Size = DecodeIntSize -BinaryReader $reader
+        $DQ = $reader.ReadBytes($DQ_Size)
+
+        $IQ_Size = DecodeIntSize -BinaryReader $reader
+        $IQ = $reader.ReadBytes($IQ_Size)
+
+        $rsa = New-Object System.Security.Cryptography.RSACryptoServiceProvider
+        $rsaParameters = New-Object System.Security.Cryptography.RSAParameters
+        $rsaParameters.Modulus = $Modulus
+        $rsaParameters.Exponent = $E
+        $rsaParameters.P = $P
+        $rsaParameters.Q = $Q
+        # Some RSAParameter values dont play well with byte buffers having leading zeroes removed.
+        $rsaParameters.D = PadByteArray -Bytes $D -Size $Modulus.Length
+        $rsaParameters.DP = PadByteArray -Bytes $DP -Size $P.Length
+        $rsaParameters.DQ = PadByteArray -Bytes $DQ -Size $Q.Length
+        $rsaParameters.InverseQ = PadByteArray -Bytes $IQ -Size $Q.Length
+        $rsa.ImportParameters($rsaParameters)
+
+        Write-Verbose "Completed RSA object creation"
+        return $rsa
+    }
+    catch {
+        Write-Warning "CreateRSA-FromPkcs1: Exception occurred - $($_.Exception.Message)"
+        return $null
+    }
+    finally {
+        if ($null -ne $reader) { $reader.Close() }
+        if ($null -ne $MemoryStream) { $MemoryStream.Close() }
+    }
+}
+
+function CreateSigningKey {
+    param (
+        [string]$Key
+    )
+    try {
+        $Key = $Key.Trim()
+        switch -Wildcard($Key) {
+            "$Pkcs8_PrivateKey_Header*" {
+                $KeyBytes = ExtractPemData -PEM $Key -Header $Pkcs8_PrivateKey_Header -Footer $Pkcs8_PrivateKey_Footer
+                $SigningKey = CreateRSAFromPkcs8 -KeyBytes $KeyBytes
+                return $SigningKey
+            }
+            "$RsaPrivateKey_Header*" {
+                $KeyBytes = ExtractPemData -PEM $Key -Header $RsaPrivateKey_Header -Footer $RsaPrivateKey_Footer
+                $SigningKey = CreateRSAFromPkcs1 -KeyBytes $KeyBytes
+                return $SigningKey
+            }
+            default {
+                Write-Verbose "The PEM header could not be found. Accepted headers: 'BEGIN PRIVATE KEY', 'BEGIN RSA PRIVATE KEY'"
+                return $null
+            }
+        }
+    }
+    catch {
+        Write-Warning "Couldn't create signing key: $($_.Exception.Message)"
+        return $null
+    }
+}
+
+###############################################################################
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$OutputVariableName = "JWT"
+
+Write-Verbose "Vault.Generate.JWT.Signing.Algorithm: $VAULT_GENERATE_JWT_ALGORITHM"
+Write-Verbose "Vault.Generate.JWT.ExpiresAfterMinutes: $VAULT_GENERATE_JWT_EXPIRES_MINS"
+Write-Verbose "Vault.Generate.JWT.Issuer: $VAULT_GENERATE_JWT_ISSUER"
+Write-Verbose "Vault.Generate.JWT.Audience(s): $($audiences -Join ",")"
+Write-Verbose "Vault.Generate.JWT.Subject: $subject"
+Write-Verbose "Vault.Generate.JWT.Groups: $groups"
+Write-Verbose "Vault.Generate.JWT.IdentityPrefix: $VAULT_GENERATE_JWT_IDENTITY_PREFIX"
+Write-Verbose "Step Name: $StepName"
+
+try {
+
+    # Created + Expires
+    $Created = (Get-Date).ToUniversalTime()
+    $Expires = $Created.AddMinutes([int]$VAULT_GENERATE_JWT_EXPIRES_MINS)
+
+    $createDate = [Math]::Floor([decimal](Get-Date($Created) -UFormat "%s"))
+    $expiryDate = [Math]::Floor([decimal](Get-Date($Expires) -UFormat "%s"))
+
+    $JwtHeader = @{
+        alg = $VAULT_GENERATE_JWT_ALGORITHM;
+        typ = "JWT";
+    } | ConvertTo-Json -Compress
+    
+    $JwtPayload = [Ordered]@{
+        iat = [long]$createDate;
+        exp = [long]$expiryDate;
+        iss = $VAULT_GENERATE_JWT_ISSUER;
+        aud = $audiences;
+        sub = $subject;
+        groups = $groups;
+    }
+
+    $JwtPayload = $JwtPayload | ConvertTo-Json -Compress
+
+    $base64Header = ConvertTo-JwtBase64 -Value $JwtHeader
+    $base64Payload = ConvertTo-JwtBase64 -Value $JwtPayload
+
+    $Jwt = $base64Header + '.' + $base64Payload
+
+    $JwtBytes = [System.Text.Encoding]::UTF8.GetBytes($Jwt)
+    $JwtSignature = $null
+    
+    switch ($VAULT_GENERATE_JWT_ALGORITHM) {
+        "RS256" {
+            try { 
+
+                $rsa = CreateSigningKey -Key $VAULT_GENERATE_JWT_PRIVATE_KEY
+                if ($null -eq $rsa) {
+                    throw "Couldn't create RSA object"
+                }
+                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA256, [Security.Cryptography.RSASignaturePadding]::Pkcs1) 
+                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature
+            }
+            catch { throw "Signing with SHA256 and Pkcs1 padding failed using private key: $($_.Exception.Message)" }
+            finally { if ($null -ne $rsa) { $rsa.Dispose() } }
+            
+        }
+        "RS384" {
+            try { 
+                $rsa = CreateSigningKey -Key $VAULT_GENERATE_JWT_PRIVATE_KEY
+                if ($null -eq $rsa) {
+                    throw "Couldn't create RSA object"
+                }
+                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA384, [Security.Cryptography.RSASignaturePadding]::Pkcs1) 
+                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature
+            }
+            catch { throw "Signing with SHA384 and Pkcs1 padding failed using private key: $($_.Exception.Message)" }
+            finally { if ($null -ne $rsa) { $rsa.Dispose() } }
+        }
+        "RS512" {
+            try { 
+                $rsa = CreateSigningKey -Key $VAULT_GENERATE_JWT_PRIVATE_KEY
+                if ($null -eq $rsa) {
+                    throw "Couldn't create RSA object"
+                }
+                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA512, [Security.Cryptography.RSASignaturePadding]::Pkcs1) 
+                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature
+            }
+            catch { throw "Signing with SHA512 and Pkcs1 padding failed using private key: $($_.Exception.Message)" }
+            finally { if ($null -ne $rsa) { $rsa.Dispose() } }
+        }
+        default {
+            throw "The algorithm is not one of the supported: 'RS256', 'RS384', 'RS512'"
+        }
+    }
+    if ([string]::IsNullOrWhiteSpace($JwtSignature) -eq $True) {
+        throw "JWT signature empty."
+    }
+
+    $Jwt = "$Jwt.$JwtSignature"
+    Set-OctopusVariable -Name $OutputVariableName -Value $Jwt -Sensitive
+    Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}"
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $Message = "An error occurred generating a JWT: $ExceptionMessage"
+    Write-Error $Message -Category InvalidResult
+}
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-jwt-login/metadata.json b/src/step-templates/hashicorp-vault-jwt-login/metadata.json
new file mode 100644
index 000000000..f8bce14bd
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-jwt-login/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "d49bc861-cd36-4624-960c-77613a54b139",
+  "Name": "HashiCorp Vault - JWT Login",
+  "Description": "This step logs into a HashiCorp Vault server using the [JWT](https://www.vaultproject.io/docs/auth/jwt) auth method.\n\nThe `client_token` from the response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `JWTAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api/auth/ldap#login-with-ldap-user), so no other dependencies are needed. \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- You must supply the full path where the JWT auth method is mounted.\n- You must supply a valid Vault [JWT role](https://www.vaultproject.io/api/auth/jwt#create-role).\n- You must supply a valid, non-expired [JWT token](https://en.wikipedia.org/wiki/JSON_Web_Token).\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "37bec45d-aac8-4962-a8e8-1ccf38ab3038",
+      "Name": "Vault.JWT.Login.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c4dc7abc-d659-42c3-9bc5-99c12049b9a6",
+      "Name": "Vault.JWT.Login.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "d2a19b73-36fe-445d-be9b-13d0b54adbfa",
+      "Name": "Vault.JWT.Login.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "16272d7f-aac5-49c4-86f3-36725b05c750",
+      "Name": "Vault.JWT.Login.AuthPath",
+      "Label": "JWT Auth Login path",
+      "HelpText": "The path that the JWT method is mounted at. The default is `/auth/jwt`. If the JWT auth method was enabled at a different path, for example `my-path`, then specify `/my-path` instead.\n",
+      "DefaultValue": "/auth/jwt",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "379393d6-98c8-4114-af56-4ecfe29517f3",
+      "Name": "Vault.JWT.Login.Role",
+      "Label": "JWT role",
+      "HelpText": "The Vault [JWT role](https://www.vaultproject.io/api/auth/jwt#create-role).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "75e6eb74-180c-4aa0-bc47-f7a33b0e9fb4",
+      "Name": "Vault.JWT.Token",
+      "Label": "JWT Token",
+      "HelpText": "The signed [JSON Web Token](https://tools.ietf.org/html/rfc7519) (JWT) to login with.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-21T19:20:21.1000000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-21T19:20:21.1000000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-jwt-login/scriptbody.ps1 b/src/step-templates/hashicorp-vault-jwt-login/scriptbody.ps1
new file mode 100644
index 000000000..ac719d656
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-jwt-login/scriptbody.ps1
@@ -0,0 +1,105 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$VAULT_JWT_LOGIN_ADDRESS = $OctopusParameters["Vault.JWT.Login.VaultAddress"]
+$VAULT_JWT_LOGIN_API_VERSION = $OctopusParameters["Vault.JWT.Login.ApiVersion"]
+$VAULT_JWT_LOGIN_AUTH_PATH = $OctopusParameters["Vault.JWT.Login.AuthPath"]
+$VAULT_JWT_LOGIN_ROLE = $OctopusParameters["Vault.JWT.Login.Role"]
+$VAULT_JWT_LOGIN_TOKEN = $OctopusParameters["Vault.JWT.Token"]
+
+# Optional
+$VAULT_JWT_LOGIN_NAMESPACE = $OctopusParameters["Vault.JWT.Login.Namespace"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_ADDRESS)) {
+    throw "Required parameter Vault.JWT.Login.VaultAddress not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_API_VERSION)) {
+    throw "Required parameter Vault.JWT.Login.ApiVersion not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_AUTH_PATH)) {
+    throw "Required parameter Vault.JWT.Login.AuthPath not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_ROLE)) {
+    throw "Required parameter Vault.JWT.Login.Role not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_TOKEN)) {
+    throw "Required parameter Vault.JWT.Token not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+###############################################################################
+
+$VAULT_JWT_LOGIN_ADDRESS = $VAULT_JWT_LOGIN_ADDRESS.TrimEnd('/')
+$VAULT_JWT_LOGIN_AUTH_PATH = $VAULT_JWT_LOGIN_AUTH_PATH.TrimStart('/').TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+try {
+    $payload = @{
+        role = $VAULT_JWT_LOGIN_ROLE;
+        jwt  = $VAULT_JWT_LOGIN_TOKEN;
+    }
+
+    $Headers = @{}
+    if (-not [string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_NAMESPACE)) {
+        Write-Verbose "Setting 'X-Vault-Namespace' header to: $VAULT_JWT_LOGIN_NAMESPACE"
+        $Headers.Add("X-Vault-Namespace", $VAULT_JWT_LOGIN_NAMESPACE)
+    }
+    
+    $uri = "$VAULT_JWT_LOGIN_ADDRESS/$VAULT_JWT_LOGIN_API_VERSION/$VAULT_JWT_LOGIN_AUTH_PATH/login"
+    Write-Verbose "Making request to $uri"
+    $response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers
+    if ($null -ne $response) {
+        Set-OctopusVariable -Name "JWTAuthToken" -Value $response.auth.client_token -Sensitive
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.JWTAuthToken}"
+    }
+    else {
+        Write-Error "Null or Empty response returned from Vault server" -Category InvalidResult
+    }
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred logging in with JWT: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.errors) {
+            $AdditionalDetail = $ErrorBody.errors -Join ","   
+        }
+        else {
+            $errorDetails = $null
+            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+        }
+    }
+    
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`n`tDetail: $AdditionalDetail"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/metadata.json b/src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..638ed87e6
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/metadata.json
@@ -0,0 +1,116 @@
+{
+  "Id": "9aab9522-25e0-4539-841c-8b726e6b1520",
+  "Name": "HashiCorp Vault - Key Value (v1) retrieve secrets",
+  "Description": "This step retrieves one or more secrets in a v1 Key/Value secrets engine stored within a HashiCorp Vault server using a previously obtained authentication token.\n\nThis step template uses the [Rest API](https://www.vaultproject.io/api-docs/secret/kv/kv-v1), so no other dependencies are needed. \n\n---\n\n**Authentication Tokens**\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.\n\n---\n**Secrets Path:**\n\nSpecify the full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\nThis value should contain:\n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v1).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config`, then the value you would enter is:\n\n`/my-secrets/config`\n\n---\n\n**Retrieval methods:**\n\nThe step template operates in one of 2 retrieval modes that control how many Vault Key values are returned. The options are:\n- `Single vault key` - a single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#read-secret) method.\n- `Multiple vault keys` - multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#list-secrets) method.\n\nThe default is `Single vault key`.\n\n---\n\n**Optional field names:**\n\nChoose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this parameter is not set, all fields found from secret keys will be returned.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n\n---\n\n**Sensitive output variables:**\n\nFor each vault key's field values, an Octopus [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) will be created for use in other steps.\n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- An authentication [token](https://www.vaultproject.io/docs/auth/token). \n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault).\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "13d0b003-63ef-45d0-969d-e032ba5b41ee",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e167ab26-3959-4e51-93fb-39c4a1ac76db",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "5f904ca6-299e-4591-a47b-a998c5aa9a9c",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "66a8d06e-08ac-4c9f-9e3a-a1727f2e0898",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.AuthToken",
+      "Label": "Auth Token",
+      "HelpText": "The [Auth Token](https://www.vaultproject.io/docs/auth/token) used to authenticate to retrieve secrets.\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "2534a01a-db65-4bc5-9766-68c6567ed5f6",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.SecretsPath",
+      "Label": "Secrets Path",
+      "HelpText": "The full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\n**This value should contain:** \n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v1).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config` then the value you would enter is:\n\n`/my-secrets/config`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "01ca54f6-269a-447a-9193-d7de9195b164",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.RetrievalMethod",
+      "Label": "Secrets retrieval method",
+      "HelpText": "This controls how many Vault Key values are returned. The options are:\n- A single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#read-secret) method.\n- Multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#list-secrets) method.\n\nThe default is `Single vault key`.",
+      "DefaultValue": "Get",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Get|Single vault key \nList|Multiple vault keys"
+      }
+    },
+    {
+      "Id": "ab4e36f5-96d9-4969-a8a8-7c1c7a2de9ff",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.RecursiveSearch",
+      "Label": "Recursive retrieval",
+      "HelpText": "If the path is being enumerated, should any secrets included in sub-folders also be retrieved? The default is: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "20ae7130-dd7c-4abf-af2a-675c039df7a5",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.FieldValues",
+      "Label": "Field names",
+      "HelpText": "Choose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this value is not present, any fields found within secrets from the specified path will be retrieved.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3885d50e-3be5-4bc2-bb97-6e2b23459b07",
+      "Name": "Vault.Retrieve.KV.V1.Secrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-21T17:01:25.4050000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-21T17:01:25.4050000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/scriptbody.ps1 b/src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..0a4547f73
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,282 @@
+### Set TLS 1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Required Variables
+$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.VaultAddress"]
+$VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.ApiVersion"]
+$VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.AuthToken"]
+$VAULT_RETRIEVE_KV_V1_SECRETS_PATH = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.SecretsPath"]
+$VAULT_RETRIEVE_KV_V1_SECRETS_METHOD = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.RetrievalMethod"]
+$VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.RecursiveSearch"]
+$VAULT_RETRIEVE_KV_V1_PRINT_VARIABLE_NAMES = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.PrintVariableNames"]
+
+# Optional variables
+$VAULT_RETRIEVE_KV_V1_SECRETS_FIELD_VALUES = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.FieldValues"]
+$VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE = $OctopusParameters["Vault.Retrieve.KV.V1.Secrets.Namespace"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_PATH)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_PATH not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_METHOD)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_METHOD not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try {$response = $rawResponse | ConvertFrom-Json} catch {$response=$rawResponse}
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+function Get-VaultSecret {
+    param (
+        [string]$SecretEnginePath,
+        [string]$SecretPath,
+        $Fields
+    )
+    try {
+        # Local variables
+        $VariablesCreated = 0
+        $FieldsSpecified = ($Fields.Count -gt 0)
+        $SecretPath = $SecretPath.TrimStart("/")
+        $WorkingPath = "$($SecretEnginePath)/$($SecretPath)"
+        $RequestPath = "$SecretEnginePath/$($SecretPath)"
+
+        $uri = "$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))"
+        $Headers = @{"X-Vault-Token" = $VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN }
+        
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)           
+        }
+
+        $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method GET
+
+        if ($null -ne $response) {
+            if ($FieldsSpecified -eq $True) {
+                foreach ($field in $Fields) {
+                    $fieldName = $field.Name
+                    $fieldVariableName = $field.VariableName
+                    $fieldValue = $response.data.$fieldName
+
+                    if ($null -ne $fieldValue) {
+                        if ([string]::IsNullOrWhiteSpace($fieldVariableName)) {
+                            $fieldVariableName = "$($WorkingPath.Replace("/",".")).$($fieldName.Trim())"
+                        }
+                        
+                        Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive
+                        if($VAULT_RETRIEVE_KV_V1_PRINT_VARIABLE_NAMES -eq $True) {
+                            Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}"
+                        }
+                        $VariablesCreated += 1
+                    }
+                }
+            } 
+            # No fields specified, iterate through each one.
+            else {
+                $secretFieldNames = $response.data | Get-Member | Where-Object { $_.MemberType -eq "NoteProperty" } | Select-Object -ExpandProperty "Name"
+                foreach ($fieldName in $secretFieldNames) {
+                    $fieldVariableName = "$($WorkingPath.Replace("/",".")).$($fieldName.Trim())"
+                    $fieldValue = $response.data.$fieldName
+                    
+                    Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive                    
+                    if($VAULT_RETRIEVE_KV_V1_PRINT_VARIABLE_NAMES -eq $True) {
+                        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}"
+                    }
+                    $VariablesCreated += 1
+                }
+            }
+            return $VariablesCreated
+        }  
+    }
+    catch {
+        $ExceptionMessage = $_.Exception.Message
+        $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+        $Message = "An error occurred logging in with AppRole: $ExceptionMessage"
+        $AdditionalDetail = ""
+        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+            if ($null -ne $ErrorBody.errors) {
+                $AdditionalDetail = $ErrorBody.errors -Join ","   
+            }
+            else {
+                $errorDetails = $null
+                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+            }
+        }
+        
+        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+            $Message += "`n`tDetail: $AdditionalDetail"
+        }
+    
+        Write-Error $Message -Category ConnectionError
+    }
+}
+
+function List-VaultSecrets {
+    param (
+        [string]$SecretEnginePath,
+        [string]$SecretPath
+    )
+    try {
+        $SecretPath = $SecretPath.TrimStart("/")
+        $RequestPath = "$SecretEnginePath/$SecretPath"
+
+        # Vault uses the 'LIST' HTTP verb, which is only supported in PowerShell 6.0+ using -CustomMethod.
+        # Adding ?list=true will allow support for Windows Desktop PowerShell.
+        # See https://www.vaultproject.io/api#api-operations for further details/
+        $uri = "$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))?list=true"
+        $Headers = @{"X-Vault-Token" = $VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN }
+        
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)           
+        }
+
+        $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method GET
+
+        return $response
+    }
+    catch {
+        $ExceptionMessage = $_.Exception.Message
+        $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+        $Message = "An error occurred logging in with AppRole: $ExceptionMessage"
+        $AdditionalDetail = ""
+        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+            if ($null -ne $ErrorBody.errors) {
+                $AdditionalDetail = $ErrorBody.errors -Join ","   
+            }
+            else {
+                $errorDetails = $null
+                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+            }
+        }
+        
+        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+            $Message += "`n`tDetail: $AdditionalDetail"
+        }
+    
+        Write-Error $Message -Category ConnectionError
+    }
+}
+
+function Recursive-GetVaultSecrets {
+    param(
+        [string]$SecretEnginePath,
+        [string]$SecretPath
+    )
+    $VariablesCreated = 0
+    $SecretPath = $SecretPath.TrimStart("/")
+    $SecretPath = $SecretPath.TrimEnd("/")
+
+    Write-Verbose "Executing Recursive-GetVaultSecrets"
+    
+    # Get list of secrets for path
+    $VaultKeysResponse = List-VaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath 
+    
+    if ($null -ne $VaultKeysResponse) {
+        $keys = $VaultKeysResponse.data.keys
+        if ($null -ne $keys) {
+            $secretKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and !$_.EndsWith("/") }
+            foreach ($secretKey in $secretKeys) {
+                $secretKeyPath = "$($SecretPath)/$secretKey"
+                $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $secretKeyPath -Fields $Fields
+            }
+
+            if ($VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE -eq $True) {
+                $folderKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and $_.EndsWith("/") }
+                foreach ($folderKey in $folderKeys) {
+                    $Depth = $Depth += 1
+                    $folderPath = "$($SecretPath)/$folderKey"
+                    $VariablesCreated += Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $folderPath
+                }
+            }
+        }
+    }
+    return $VariablesCreated
+}
+
+###############################################################################
+$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS = $VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS.TrimEnd('/')
+$VAULT_RETRIEVE_KV_V1_SECRETS_PATH = $VAULT_RETRIEVE_KV_V1_SECRETS_PATH.TrimStart('/')
+
+# Local variables
+$RetrieveMultipleKeys = $VAULT_RETRIEVE_KV_V1_SECRETS_METHOD.ToUpper().Trim() -ne "GET"
+$SecretPathItems = ($VAULT_RETRIEVE_KV_V1_SECRETS_PATH -Split "/")
+$SecretEnginePath = ($SecretPathItems | Select-Object -First 1)
+$SecretPath = ($SecretPathItems | Select-Object -Skip 1) -Join "/"
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+$Fields = @()
+$VariablesCreated = 0
+
+if (![string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_FIELD_VALUES)) {
+    
+    @(($VAULT_RETRIEVE_KV_V1_SECRETS_FIELD_VALUES -Split "`n").Trim()) | ForEach-Object {
+        if (![string]::IsNullOrWhiteSpace($_)) {
+            Write-Verbose "Working on: '$_'"
+            $fieldDefinition = ($_ -Split "\|")
+            $name = $fieldDefinition[0].Trim()
+            if([string]::IsNullOrWhiteSpace($name)) {
+                throw "Unable to establish fieldname from: '$($_)'"
+            }
+            $field = [PsCustomObject]@{
+                Name         = $name
+                VariableName = if (![string]::IsNullOrWhiteSpace($fieldDefinition[1])) { $fieldDefinition[1].Trim() } else { "" }
+            }
+            $Fields += $field
+        }
+    }
+}
+$FieldsSpecified = ($Fields.Count -gt 0)
+
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS: $VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS"
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION: $VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION"
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN: '********'"
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_PATH: $VAULT_RETRIEVE_KV_V1_SECRETS_PATH"
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_METHOD: $VAULT_RETRIEVE_KV_V1_SECRETS_METHOD"
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE: $VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE"
+Write-Verbose "VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE: $VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE"
+Write-Verbose "RetrieveMultipleKeys: $RetrieveMultipleKeys"
+Write-Verbose "Fields Specified: $($FieldsSpecified)"
+Write-Verbose "Engine Path: $SecretEnginePath"
+Write-Verbose "Secret Path: $SecretPath"
+
+$variablesCreated = 0
+
+if ($RetrieveMultipleKeys -eq $false) {
+    $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Fields $Fields
+}
+else {
+    $variablesCreated = Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Depth 0
+}
+Write-Host "Created $variablesCreated output variables"
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/metadata.json b/src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..53d2852bd
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/metadata.json
@@ -0,0 +1,126 @@
+{
+  "Id": "337f1b67-cdb0-4f33-9e08-6bf804f672d2",
+  "Name": "HashiCorp Vault - Key Value (v2) retrieve secrets",
+  "Description": "This step retrieves one or more secrets in a v2 Key/Value secrets engine stored within a HashiCorp Vault server.\n\nThis step template uses the [Rest API](https://www.vaultproject.io/api-docs/secret/kv/kv-v2), so no other dependencies are needed. \n\n---\n\n**Authentication Tokens**\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.\n\n---\n**Secrets Path:**\n\nSpecify the full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\nThis value should contain:\n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v2).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config`, then the value you would enter is:\n\n`/my-secrets/config`\n\n---\n\n**Retrieval methods:**\n\nThe step template operates in one of 2 retrieval modes that control how many Vault Key values are returned. The options are:\n- `Single vault key` - a single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#read-secret) method.\n- `Multiple vault keys` - multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#list-secrets) method.\n\nThe default is `Single vault key`.\n\n---\n\n**Optional field names:**\n\nChoose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this parameter is not set, all fields found from secret keys will be returned.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n\n---\n\n**Optional: Specific version of secret:**\n\n_Optional:_ The default behavior of this step is to retrieve the latest version of secrets.\n\nHowever, to retrieve a specific version of a secret:\n- Include the version of the secret you wish to retrieve. For example, if you want version 2 of all field values in a secret, enter `2`.\n\nNote: This parameter only works with the `Secrets Retrieval method` = `Single Vault key`.\n\nTo retrieve multiple vault keys with specific versions, use this step template in multiple steps.\n\n---\n\n**Sensitive output variables:**\n\nFor each vault key's field values, an Octopus [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) will be created for use in other steps.\n\n--- \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- An authentication [token](https://www.vaultproject.io/docs/auth/token).\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault).\n\nNotes:\n\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "a38edf0b-0e90-4421-97d3-688391887f9c",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0ab319fd-2d90-4f61-b529-cd682bc590a3",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "25fec34d-3627-4240-9532-6caf4558ac39",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b4922053-38da-4092-ac45-fc1551c65254",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.AuthToken",
+      "Label": "Auth Token",
+      "HelpText": "The [Auth Token](https://www.vaultproject.io/docs/auth/token) used to authenticate to retrieve secrets.\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5e62f123-d034-490b-a16f-c0ab7176974a",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.SecretsPath",
+      "Label": "Secrets Path",
+      "HelpText": "The full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\n**This value should contain:** \n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v2).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config` then the value you would enter is:\n\n`/my-secrets/config`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "01c2b07e-40e5-4251-b246-1be0a514a09c",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.RetrievalMethod",
+      "Label": "Secrets retrieval method",
+      "HelpText": "This controls how many Vault Key values are returned. The options are:\n- A single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#read-secret) method.\n- Multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#list-secrets) method.\n\nThe default is `Single vault key`.",
+      "DefaultValue": "Get",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Get|Single vault key \nList|Multiple vault keys"
+      }
+    },
+    {
+      "Id": "f997fbcc-bfc3-4a38-9571-58957062873d",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.RecursiveSearch",
+      "Label": "Recursive retrieval",
+      "HelpText": "If the path is being enumerated (indicated by `Secrets retrieval method = Multiple`), should any secrets included in sub-folders also be retrieved? The default is: `False`.\n\nNote: This value is ignored when `Secrets retrieval method = Single`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b9db3c54-f1f8-4241-b997-c6440c12489d",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.SecretVersion",
+      "Label": "Secret Version",
+      "HelpText": "_Optional_ version specifier of a secret to retrieve. For example, if you wanted version 2 of all field values in a secret, enter the value `2`\n\nNote: This parameter only works with the `Secrets Retrieval method` = `Single Vault key`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b446cb03-d57a-4869-8b9e-a9c12ed5646a",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.FieldValues",
+      "Label": "Field names",
+      "HelpText": "Choose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this value is not present, any fields found within secrets from the specified path will be retrieved.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "52630c04-8fb3-4afb-a02e-ed7e2d20e34e",
+      "Name": "Vault.Retrieve.KV.V2.Secrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-21T17:01:25.4050000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-21T17:01:25.4050000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/scriptbody.ps1 b/src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..431cf9978
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,289 @@
+### Set TLS 1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Required Variables
+$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.VaultAddress"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.ApiVersion"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.AuthToken"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_PATH = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.SecretsPath"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_METHOD = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.RetrievalMethod"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.RecursiveSearch"]
+$VAULT_RETRIEVE_KV_V2_PRINT_VARIABLE_NAMES = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.PrintVariableNames"]
+
+# Optional variables
+$VAULT_RETRIEVE_KV_V2_SECRETS_FIELD_VALUES = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.FieldValues"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.SecretVersion"]
+$VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE = $OctopusParameters["Vault.Retrieve.KV.V2.Secrets.Namespace"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_PATH)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_PATH not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_METHOD)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_METHOD not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE)) {
+    throw "Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+function Get-VaultSecret {
+    param (
+        [string]$SecretEnginePath,
+        [string]$SecretPath,
+        $Fields
+    )
+    try {
+        # Local variables
+        $VariablesCreated = 0
+        $FieldsSpecified = ($Fields.Count -gt 0)
+        $SecretPath = $SecretPath.TrimStart("/")
+        $WorkingPath = "$($SecretEnginePath)/$($SecretPath)"
+        $RequestPath = "$SecretEnginePath/data/$($SecretPath)"
+
+        $uri = "$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))"
+        if (![string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION) -and $RetrieveMultipleKeys -eq $False) {
+            $uri = "$($uri)?version=$VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION"
+        }
+        
+        $headers = @{"X-Vault-Token" = $VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN }
+        
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)           
+        }
+        
+        Write-Verbose "Making request to $uri"
+        $response = Invoke-RestMethod -Uri $uri -Headers $headers -Method GET
+
+        if ($null -ne $response) {
+            if ($FieldsSpecified -eq $True) {
+                foreach ($field in $Fields) {
+                    $fieldName = $field.Name
+                    $fieldVariableName = $field.VariableName
+                    $fieldValue = $response.data.data.$fieldName
+
+                    if ($null -ne $fieldValue) {
+                        if ([string]::IsNullOrWhiteSpace($fieldVariableName)) {
+                            $fieldVariableName = "$($WorkingPath.Replace("/",".")).$($fieldName.Trim())"
+                        }
+                        
+                        Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive
+                        if ($VAULT_RETRIEVE_KV_V2_PRINT_VARIABLE_NAMES -eq $True) {
+                            Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}"
+                        }
+                        $VariablesCreated += 1
+                    }
+                }
+            } 
+            # No fields specified, iterate through each one.
+            else {
+                $secretFieldNames = $response.data.data | Get-Member | Where-Object { $_.MemberType -eq "NoteProperty" } | Select-Object -ExpandProperty "Name"
+                foreach ($fieldName in $secretFieldNames) {
+                    $fieldVariableName = "$($WorkingPath.Replace("/",".")).$($fieldName.Trim())"
+                    $fieldValue = $response.data.data.$fieldName
+                    
+                    Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive
+                    if ($VAULT_RETRIEVE_KV_V2_PRINT_VARIABLE_NAMES -eq $True) {
+                        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}"
+                    }
+                    $VariablesCreated += 1
+                }
+            }
+            return $VariablesCreated
+        }  
+    }
+    catch {
+        $ExceptionMessage = $_.Exception.Message
+        $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+        $Message = "An error occurred logging in with AppRole: $ExceptionMessage"
+        $AdditionalDetail = ""
+        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+            if ($null -ne $ErrorBody.errors) {
+                $AdditionalDetail = $ErrorBody.errors -Join ","   
+            }
+            else {
+                $errorDetails = $null
+                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+            }
+        }
+        
+        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+            $Message += "`n`tDetail: $AdditionalDetail"
+        }
+    
+        Write-Error $Message -Category ConnectionError
+    }
+}
+
+function List-VaultSecrets {
+    param (
+        [string]$SecretEnginePath,
+        [string]$SecretPath
+    )
+    try {
+        $SecretPath = $SecretPath.TrimStart("/")
+        $RequestPath = "$SecretEnginePath/metadata/$SecretPath"
+
+        # Vault uses the 'LIST' HTTP verb, which is only supported in PowerShell 6.0+ using -CustomMethod.
+        # Adding ?list=true will allow support for Windows Desktop PowerShell.
+        # See https://www.vaultproject.io/api#api-operations for further details/
+        $uri = "$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))?list=true"
+        $headers = @{"X-Vault-Token" = $VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN }
+        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)) {
+            $Headers.Add("X-Vault-Namespace", $VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)
+        }
+
+        Write-Verbose "Making request to $uri"
+        $response = Invoke-RestMethod -Uri $uri -Headers $headers -Method GET
+
+        return $response
+    }
+    catch {
+        $ExceptionMessage = $_.Exception.Message
+        $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+        $Message = "An error occurred logging in with AppRole: $ExceptionMessage"
+        $AdditionalDetail = ""
+        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+            if ($null -ne $ErrorBody.errors) {
+                $AdditionalDetail = $ErrorBody.errors -Join ","   
+            }
+            else {
+                $errorDetails = $null
+                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+            }
+        }
+        
+        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+            $Message += "`n`tDetail: $AdditionalDetail"
+        }
+    
+        Write-Error $Message -Category ConnectionError
+    }
+}
+
+function Recursive-GetVaultSecrets {
+    param(
+        [string]$SecretEnginePath,
+        [string]$SecretPath
+    )
+    $VariablesCreated = 0
+    $SecretPath = $SecretPath.TrimStart("/")
+    $SecretPath = $SecretPath.TrimEnd("/")
+
+    Write-Verbose "Executing Recursive-GetVaultSecrets"
+    
+    # Get list of secrets for path
+    $VaultKeysResponse = List-VaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath 
+    
+    if ($null -ne $VaultKeysResponse) {
+        $keys = $VaultKeysResponse.data.keys
+        if ($null -ne $keys) {
+            $secretKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and !$_.EndsWith("/") }
+            foreach ($secretKey in $secretKeys) {
+                $secretKeyPath = "$($SecretPath)/$secretKey"
+                $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $secretKeyPath -Fields $Fields
+            }
+
+            if ($VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE -eq $True) {
+                $folderKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and $_.EndsWith("/") }
+                foreach ($folderKey in $folderKeys) {
+                    $Depth = $Depth += 1
+                    $folderPath = "$($SecretPath)/$folderKey"
+                    $VariablesCreated += Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $folderPath
+                }
+            }
+        }
+    }
+    return $VariablesCreated
+}
+
+###############################################################################
+$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS = $VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS.TrimEnd('/')
+$VAULT_RETRIEVE_KV_V2_SECRETS_PATH = $VAULT_RETRIEVE_KV_V2_SECRETS_PATH.TrimStart('/')
+
+# Local variables
+$RetrieveMultipleKeys = $VAULT_RETRIEVE_KV_V2_SECRETS_METHOD.ToUpper().Trim() -ne "GET"
+$SecretPathItems = ($VAULT_RETRIEVE_KV_V2_SECRETS_PATH -Split "/")
+$SecretEnginePath = ($SecretPathItems | Select-Object -First 1)
+$SecretPath = ($SecretPathItems | Select-Object -Skip 1) -Join "/"
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+$Fields = @()
+$VariablesCreated = 0
+
+if (![string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_FIELD_VALUES)) {
+    
+    @(($VAULT_RETRIEVE_KV_V2_SECRETS_FIELD_VALUES -Split "`n").Trim()) | ForEach-Object {
+        if (![string]::IsNullOrWhiteSpace($_)) {
+            Write-Verbose "Working on: '$_'"
+            $fieldDefinition = ($_ -Split "\|")
+            $name = $fieldDefinition[0].Trim()
+            if ([string]::IsNullOrWhiteSpace($name)) {
+                throw "Unable to establish fieldname from: '$($_)'"
+            }
+            $field = [PsCustomObject]@{
+                Name         = $name
+                VariableName = if (![string]::IsNullOrWhiteSpace($fieldDefinition[1])) { $fieldDefinition[1].Trim() } else { "" }
+            }
+            $Fields += $field
+        }
+    }
+}
+$FieldsSpecified = ($Fields.Count -gt 0)
+
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS: $VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION: $VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN: '********'"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_PATH: $VAULT_RETRIEVE_KV_V2_SECRETS_PATH"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_METHOD: $VAULT_RETRIEVE_KV_V2_SECRETS_METHOD"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE: $VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION: $VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION"
+Write-Verbose "VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE: $VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE"
+Write-Verbose "RetrieveMultipleKeys: $RetrieveMultipleKeys"
+Write-Verbose "Fields Specified: $($FieldsSpecified)"
+Write-Verbose "Engine Path: $SecretEnginePath"
+Write-Verbose "Secret Path: $SecretPath"
+
+$variablesCreated = 0
+
+if ($RetrieveMultipleKeys -eq $false) {
+    $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Fields $Fields
+}
+else {
+    $variablesCreated = Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Depth 0
+}
+Write-Host "Created $variablesCreated output variables"
\ No newline at end of file
diff --git a/src/step-templates/hashicorp-vault-ldap-login/metadata.json b/src/step-templates/hashicorp-vault-ldap-login/metadata.json
new file mode 100644
index 000000000..5d9f9dd93
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-ldap-login/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "de807003-3b05-4649-9af3-11a2c7722b3f",
+  "Name": "HashiCorp Vault - LDAP Login",
+  "Description": "This step logs into a HashiCorp Vault server using the [LDAP](https://www.vaultproject.io/docs/auth/ldap) auth method.\n\nThe `client_token` from the response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `LDAPAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api/auth/ldap#login-with-ldap-user), so no other dependencies are needed. \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- You must supply the full path where the LDAP auth method is mounted.\n- You must supply both a `Username` and `Password`.\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d0e95468-4f9e-4272-9dfa-d964c610a279",
+      "Name": "Vault.LDAP.Login.VaultAddress",
+      "Label": "Vault Server URL",
+      "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "98d2a264-0466-4e0d-b5a3-4d172c81f405",
+      "Name": "Vault.LDAP.Login.ApiVersion",
+      "Label": "API version",
+      "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
+      "DefaultValue": "v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v1|v1"
+      }
+    },
+    {
+      "Id": "74fa0a75-0ab4-4a9d-a417-c9b9b391c640",
+      "Name": "Vault.LDAP.Login.Namespace",
+      "Label": "Namespace (Optional)",
+      "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c56afe5a-6506-497f-99b0-ae8776f03269",
+      "Name": "Vault.LDAP.Login.AuthPath",
+      "Label": "LDAP Auth Login path",
+      "HelpText": "The path that the LDAP method is mounted at. The default is `/auth/ldap`. If the LDAP auth method was enabled at a different path, for example `my-path`, then specify `/my-path` instead.\n",
+      "DefaultValue": "/auth/ldap",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7803e08c-026f-4d59-b902-f75a0992be48",
+      "Name": "Vault.LDAP.Login.Username",
+      "Label": "Username",
+      "HelpText": "The LDAP Username.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7a00c426-43f1-4229-a036-37b018d089a6",
+      "Name": "Vault.LDAP.Login.Password",
+      "Label": "LDAP Password",
+      "HelpText": "The LDAP Password.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedAt": "2022-09-18T08:25:57.1320000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-09-18T08:25:57.1320000Z",
+    "OctopusVersion": "2022.4.2266",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hashicorp-vault"
+}
diff --git a/src/step-templates/hashicorp-vault-ldap-login/scriptbody.ps1 b/src/step-templates/hashicorp-vault-ldap-login/scriptbody.ps1
new file mode 100644
index 000000000..0aeba2f2e
--- /dev/null
+++ b/src/step-templates/hashicorp-vault-ldap-login/scriptbody.ps1
@@ -0,0 +1,102 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Variables
+$VAULT_LDAP_LOGIN_ADDRESS = $OctopusParameters["Vault.LDAP.Login.VaultAddress"]
+$VAULT_LDAP_LOGIN_API_VERSION = $OctopusParameters["Vault.LDAP.Login.ApiVersion"]
+$VAULT_LDAP_LOGIN_NAMESPACE = $OctopusParameters["Vault.LDAP.Login.Namespace"]
+$VAULT_LDAP_LOGIN_AUTH_PATH = $OctopusParameters["Vault.LDAP.Login.AuthPath"]
+$VAULT_LDAP_LOGIN_USERNAME = $OctopusParameters["Vault.LDAP.Login.Username"]
+$VAULT_LDAP_LOGIN_PASSWORD = $OctopusParameters["Vault.LDAP.Login.Password"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_ADDRESS)) {
+    throw "Required parameter VAULT_LDAP_LOGIN_ADDRESS not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_API_VERSION)) {
+    throw "Required parameter VAULT_LDAP_LOGIN_API_VERSION not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_AUTH_PATH)) {
+    throw "Required parameter VAULT_LDAP_LOGIN_AUTH_PATH not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_USERNAME)) {
+    throw "Required parameter VAULT_LDAP_LOGIN_USERNAME not specified"
+}
+if ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_PASSWORD)) {
+    throw "Required parameter VAULT_LDAP_LOGIN_PASSWORD not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+###############################################################################
+
+$VAULT_LDAP_LOGIN_ADDRESS = $VAULT_LDAP_LOGIN_ADDRESS.TrimEnd('/')
+$VAULT_LDAP_LOGIN_AUTH_PATH = $VAULT_LDAP_LOGIN_AUTH_PATH.TrimStart('/').TrimEnd('/')
+
+# Local variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+try {
+    $payload = @{
+        password = $VAULT_LDAP_LOGIN_PASSWORD
+    }
+    
+    $Headers = @{}
+    if (-not [string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_NAMESPACE)) {
+        Write-Verbose "Setting 'X-Vault-Namespace' header to: $VAULT_LDAP_LOGIN_NAMESPACE"
+        $Headers.Add("X-Vault-Namespace", $VAULT_LDAP_LOGIN_NAMESPACE)
+    }
+    
+    $uri = "$VAULT_LDAP_LOGIN_ADDRESS/$VAULT_LDAP_LOGIN_API_VERSION/$VAULT_LDAP_LOGIN_AUTH_PATH/login/$([uri]::EscapeDataString($VAULT_LDAP_LOGIN_USERNAME))"
+    Write-Verbose "Making request to $uri"
+    $response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers
+    if ($null -ne $response) {
+        Set-OctopusVariable -Name "LDAPAuthToken" -Value $response.auth.client_token -Sensitive
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.LDAPAuthToken}"
+    }
+    else {
+        Write-Error "Null or Empty response returned from Vault server" -Category InvalidResult
+    }
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $ErrorBody = Get-WebRequestErrorBody -RequestError $_
+    $Message = "An error occurred logging in with LDAP: $ExceptionMessage"
+    $AdditionalDetail = ""
+    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {
+        if ($null -ne $ErrorBody.errors) {
+            $AdditionalDetail = $ErrorBody.errors -Join ","   
+        }
+        else {
+            $errorDetails = $null
+            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}
+            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join "," } else { $ErrorBody } 
+        }
+    }
+    
+    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {
+        $Message += "`n`tDetail: $AdditionalDetail"
+    }
+
+    Write-Error $Message -Category ConnectionError
+}
\ No newline at end of file
diff --git a/step-templates/hg-get-changelog.json b/src/step-templates/hg-get-changelog/metadata.json
similarity index 71%
rename from step-templates/hg-get-changelog.json
rename to src/step-templates/hg-get-changelog/metadata.json
index 81ee6a6ef..68d7f8322 100644
--- a/step-templates/hg-get-changelog.json
+++ b/src/step-templates/hg-get-changelog/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "If ($OctopusParameters[\"Octopus.Release.CurrentForEnvironment.Number\"]) {\n    $prm = @('log',\n    \t'-r',\"ancestors('release-$($OctopusParameters[\"Octopus.Release.Number\"])') - ancestors('release-$($OctopusParameters[\"Octopus.Release.CurrentForEnvironment.Number\"])')\",\n    \t'-T',$Template,\n    \t'--repository',$HgRepository)\n    Write-Host Getting changelog on $prm[6] '[' $prm[2] ']'\n    $changelog = & hg $prm\n}\nElse {\n    $changelog = \"<li><i>(no changelog available)</i></li>\"\n}\nWrite-Verbose $changelog\nSet-OctopusVariable -name \"Changelog\" -value $changelog",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -35,12 +35,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2016-09-19T18:10:00.000+00:00",
+  "LastModifiedOn": "2016-09-19T11:10:00.0000000-07:00",
   "LastModifiedBy": "avonwyss",
   "$Meta": {
-    "ExportedAt": "2016-09-19T18:10:27.463+00:00",
+    "ExportedAt": "2016-09-19T11:10:27.4630000-07:00",
     "OctopusVersion": "3.4.9",
     "Type": "ActionTemplate"
   },
   "Category": "mercurial"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/hg-get-changelog/scriptbody.ps1 b/src/step-templates/hg-get-changelog/scriptbody.ps1
new file mode 100644
index 000000000..d685771f2
--- /dev/null
+++ b/src/step-templates/hg-get-changelog/scriptbody.ps1
@@ -0,0 +1,13 @@
+If ($OctopusParameters["Octopus.Release.CurrentForEnvironment.Number"]) {
+    $prm = @('log',
+    	'-r',"ancestors('release-$($OctopusParameters["Octopus.Release.Number"])') - ancestors('release-$($OctopusParameters["Octopus.Release.CurrentForEnvironment.Number"])')",
+    	'-T',$Template,
+    	'--repository',$HgRepository)
+    Write-Host Getting changelog on $prm[6] '[' $prm[2] ']'
+    $changelog = & hg $prm
+}
+Else {
+    $changelog = "<li><i>(no changelog available)</i></li>"
+}
+Write-Verbose $changelog
+Set-OctopusVariable -name "Changelog" -value $changelog
\ No newline at end of file
diff --git a/src/step-templates/hipchat-notify-api-v1/metadata.json b/src/step-templates/hipchat-notify-api-v1/metadata.json
new file mode 100644
index 000000000..198473dff
--- /dev/null
+++ b/src/step-templates/hipchat-notify-api-v1/metadata.json
@@ -0,0 +1,67 @@
+{
+  "Id": "c37ccd22-2b31-4263-8389-9e63868519b4",
+  "Name": "HipChat - Notify (API v1)",
+  "Description": "Send a success notification when this step is executed.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "HipChatRoomId",
+      "Label": "Room Id",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HipChatAuthToken",
+      "Label": "Auth token",
+      "HelpText": "For API version 1.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HipChatFrom",
+      "Label": "From name",
+      "HelpText": null,
+      "DefaultValue": "Octopus Deploy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HipChatColor",
+      "Label": "Color",
+      "HelpText": "HipChat message color",
+      "DefaultValue": "green",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HipChatMessage",
+      "Label": "Message",
+      "HelpText": "You can use variables here. Leave blank for the default build notification format.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-06-10T19:21:16.7870000-07:00",
+    "OctopusVersion": "2.4.7.85",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hipchat"
+}
diff --git a/src/step-templates/hipchat-notify-api-v1/scriptbody.ps1 b/src/step-templates/hipchat-notify-api-v1/scriptbody.ps1
new file mode 100644
index 000000000..699bb1918
--- /dev/null
+++ b/src/step-templates/hipchat-notify-api-v1/scriptbody.ps1
@@ -0,0 +1,28 @@
+$message = if ($OctopusParameters['HipChatMessage']) { $OctopusParameters['HipChatMessage'] } else { "(successful) " + $OctopusParameters['Octopus.Project.Name'] + " [v$($OctopusParameters['Octopus.Release.Number'])] deployed to $($OctopusParameters['Octopus.Environment.Name'])  on $($OctopusParameters['Octopus.Machine.Name'])" } 
+#---------
+$apitoken = $OctopusParameters['HipChatAuthToken']
+$roomid = $OctopusParameters['HipChatRoomId']
+$from = $OctopusParameters['HipChatFrom']
+$colour = $OctopusParameters['HipChatColor']
+
+Try 
+{
+	#Do the HTTP POST to HipChat
+	$post = "auth_token=$apitoken&room_id=$roomid&from=$from&color=$colour&message=$message&notify=1&message_format=text"
+	$webRequest = [System.Net.WebRequest]::Create("https://api.hipchat.com/v1/rooms/message")
+	$webRequest.ContentType = "application/x-www-form-urlencoded"
+	$postStr = [System.Text.Encoding]::UTF8.GetBytes($post)
+	$webrequest.ContentLength = $postStr.Length
+	$webRequest.Method = "POST"
+	$requestStream = $webRequest.GetRequestStream()
+	$requestStream.Write($postStr, 0,$postStr.length)
+	$requestStream.Close()
+	
+	[System.Net.WebResponse] $resp = $webRequest.GetResponse();
+	$rs = $resp.GetResponseStream();
+	[System.IO.StreamReader] $sr = New-Object System.IO.StreamReader -argumentList $rs;
+	$sr.ReadToEnd();					
+}
+catch [Exception] {
+	"Woah!, wasn't expecting to get this exception. `r`n $_.Exception.ToString()"
+}
\ No newline at end of file
diff --git a/src/step-templates/hipchat-notify/metadata.json b/src/step-templates/hipchat-notify/metadata.json
new file mode 100644
index 000000000..0d85ba615
--- /dev/null
+++ b/src/step-templates/hipchat-notify/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "6a6ce997-c91b-4e06-b237-4484417efc89",
+  "Name": "HipChat - Notify",
+  "Description": "Notifies a HipChat room of a deployment outcome.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "AuthToken",
+      "Label": "API Auth Token",
+      "HelpText": "HipChat authentication token for a user who can post notifications to rooms",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RoomId",
+      "Label": "Room",
+      "HelpText": "The room name that you wish to post a notification to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NotificationText",
+      "Label": "Notification Text",
+      "HelpText": "An optional text override for the notification. Default is: <(succeeded) or (failed)> (Project) v(Release) deployed to (Environment) on (Machine)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NotificationColor",
+      "Label": "Notification Color",
+      "HelpText": "The color for the notification for the room. Default messages will receive green success, and red failure.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2014-07-28T18:53:13.3190000-07:00",
+  "LastModifiedBy": "stephengodbold",
+  "$Meta": {
+    "ExportedAt": "2014-07-28T18:56:04.6930000-07:00",
+    "OctopusVersion": "2.5.5.318",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hipchat"
+}
diff --git a/src/step-templates/hipchat-notify/scriptbody.ps1 b/src/step-templates/hipchat-notify/scriptbody.ps1
new file mode 100644
index 000000000..ff2c525e4
--- /dev/null
+++ b/src/step-templates/hipchat-notify/scriptbody.ps1
@@ -0,0 +1,43 @@
+#--------- Notify-Hipchat
+$apitoken = $OctopusParameters['AuthToken']
+$roomid = $OctopusParameters['RoomId']
+$messageText = "(successful)"
+$color = 'green'
+
+if ($OctopusParameters['Octopus.Deployment.Error']) {
+    $messageText = "(failed)"
+    $color = 'red'
+}
+
+$messageValue = "$messageText $($OctopusParameters['Octopus.Project.Name']) [v$($OctopusParameters['Octopus.Release.Number'])] deployed to $($OctopusParameters['Octopus.Environment.Name'])    on $($OctopusParameters['Octopus.Machine.Name'])"
+
+if ($OctopusParameters['NotificationText']) {
+    $messageValue = $OctopusParameters['NotificationText']
+    $color = $OctopusParameters['NotificationColor']
+}
+
+$message = New-Object PSObject 
+$message | Add-Member -MemberType NoteProperty -Name color -Value $color
+$message | Add-Member -MemberType NoteProperty -Name message -Value $messageValue
+$message | Add-Member -MemberType NoteProperty -Name notify -Value $false
+$message | Add-Member -MemberType NoteProperty -Name message_format -Value text
+
+#Do the HTTP POST to HipChat
+$uri = "https://api.hipchat.com/v2/room/$roomid/notification?auth_token=$apitoken"
+$postBody = ConvertTo-Json -InputObject $message
+$postStr = [System.Text.Encoding]::UTF8.GetBytes($postBody)
+
+$webRequest = [System.Net.WebRequest]::Create($uri)
+$webRequest.ContentType = "application/json"
+$webrequest.ContentLength = $postStr.Length
+$webRequest.Method = "POST"
+
+$requestStream = $webRequest.GetRequestStream()
+$requestStream.Write($postStr, 0,$postStr.length)
+$requestStream.Close()
+
+[System.Net.WebResponse] $resp = $webRequest.GetResponse()
+$rs = $resp.GetResponseStream()
+
+[System.IO.StreamReader] $sr = New-Object System.IO.StreamReader -argumentList $rs
+$sr.ReadToEnd()
\ No newline at end of file
diff --git a/src/step-templates/hockeyapp-upload-mobile-app/metadata.json b/src/step-templates/hockeyapp-upload-mobile-app/metadata.json
new file mode 100644
index 000000000..3f3a19ec5
--- /dev/null
+++ b/src/step-templates/hockeyapp-upload-mobile-app/metadata.json
@@ -0,0 +1,157 @@
+{
+  "Id": "5667710e-60b8-4067-bfa5-87196faafdda",
+  "Name": "HockeyApp - Upload Mobile App",
+  "Description": "This script uploads a new version of an existing app package to the [HockeyApp](http://hockeyapp.net/features/) services.",
+  "ActionType": "Octopus.Script",
+  "Version": 20,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "HockeyAppApiToken",
+      "Label": "HockeyApp Api Token",
+      "HelpText": "HockeyApp requires an access token for their API as show in the [HockeyApp API Authentication Documentation](http://support.hockeyapp.net/kb/api/api-basics-and-authentication#authentication). Logged in users can generate tokens under [API Tokens](https://rink.hockeyapp.net/manage/auth_tokens) in the account menu.\n\nYou should generate an application specific token for this purpose.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppAppID",
+      "Label": "HockeyApp App ID",
+      "HelpText": "The ID of your App in HockeyApp. This is visible on the [Manage Apps](https://rink.hockeyapp.net/manage/apps) management page for your target app.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "MobileAppPackageStepName",
+      "Label": "Package Step Name",
+      "HelpText": "Name of the previously-deployed package step that contains the App that you want to deploy.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "PackageFileName",
+      "Label": "Package File Name",
+      "HelpText": "The value is optional.\n\nIf no value is provided the scrip will search for exactly one *.apk, *.ipa, or *.appx file in the nupgk package files. Zero or multiple matches will result in an error.\n\nIf a value is provided, it will be used directly instead of searching. Use this to specify a mobile app to upload in the case of multiple apps, such as a signed and unsigned apk, or an apk and ipa in a single Nuget package.\n\nThis value must be the path and filename relative to the root of the nupkg file. You may use octopus parameters if needed, but the passed value must be the combined relative path with full filename for the package.\n\nFor creating the nupkg, the following *.nuspec example will package ALL matching Ipa, Apk (signed), and Appx files. If you have a single package as build output, the Nuget package should work by default.\n\n\t<?xml version=\"1.0\"?>\n\t<package>\n\t  <metadata>\n\t\t<id>$id$</id>\n\t\t<title>$id$</title>\n\t\t<version>$version$</version>\n\t\t<description>Mobile project packaged for Octopus deploy. $description$</description>\n\t  </metadata>\n\t  <files>\n\t\t<!-- Matches mobile package files. Note this will only include the platform being built,\n\t\t\t and should match only a single file. -->\n\n\t\t<!-- Android, Signed only -->\n\t\t<file src=\"**/Release/**/*-Signed.apk\" target=\"\" />\n\n\t\t<!-- iOS -->\n\t\t<file src=\"**/Release/**/*.ipa\" target=\"\" />\n\n\t\t<!-- Windows App -->\n\t\t<file src=\"**/*.appx\" exclude=\"**/Dependencies/**\" target=\"\" />\n\t  </files>\n\t</package>",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppNotes",
+      "Label": "HockeyApp Notes",
+      "HelpText": "optional, release notes as Textile or Markdown\n\nAs an example, you could use the Octopus variables from the Nuget package extract step as like this:\n\nDeployed from Nuget Package #{Octopus.Action[Nuget Package Extract].Package.NuGetPackageId}, Version  #{Octopus.Action[Nuget Package Extract].Package.NuGetPackageVersion}\n\nAnd get Hockey App notes like:\n\nDeployed from Nuget Package MyiOSPackage, Version 1.2.3.4\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppNotesType",
+      "Label": "HockeyApp Notes Type",
+      "HelpText": "optional, type of release notes:\n\n- 0 - Textile\n- 1 - Markdown\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppNotify",
+      "Label": "HockeyApp Notify",
+      "HelpText": "optional, notify testers (can only be set with full-access tokens):\n\n- 0 - Don't notify testers\n- 1 - Notify all testers that can install this app\n- 2 - Notify all testers\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppStatus",
+      "Label": "HockeyApp Status",
+      "HelpText": "optional, download status (can only be set with full-access tokens):\n\n- 1: Don't allow users to download or install the version\n- 2: Available for download or installation\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": "2",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppTags",
+      "Label": "HockeyApp Tags",
+      "HelpText": "optional, restrict download to comma-separated list of tags\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppTeams",
+      "Label": "HockeyApp Teams",
+      "HelpText": "optional, restrict download to comma-separated list of team IDs; example:\n\nteams=12,23,42 with 12, 23, and 42 being the database IDs of your teams\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppUsers",
+      "Label": "HockeyApp Users",
+      "HelpText": "optional, restrict download to comma-separated list of user IDs; example:\n\n    1224,5678\nwith 1224 and 5678 being the database IDs of your users\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppMandatory",
+      "Label": "HockeyApp Mandatory",
+      "HelpText": "optional, set version as mandatory:\n\n- 0 - no\n- 1 - yes\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppCommitSha",
+      "Label": "HockeyApp Commit Sha",
+      "HelpText": "optional, set to the git commit sha for this build\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppBuildServerUrl",
+      "Label": "HockeyApp Build Server Url",
+      "HelpText": "optional, set to the URL of the build job on your build server\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HockeyAppRepositoryUrl",
+      "Label": "HockeyApp Repository Url",
+      "HelpText": "optional, set to your source repository\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2015-11-30T16:11:50.8150000-08:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "hockeyapp"
+}
diff --git a/src/step-templates/hockeyapp-upload-mobile-app/scriptbody.ps1 b/src/step-templates/hockeyapp-upload-mobile-app/scriptbody.ps1
new file mode 100644
index 000000000..80b97affe
--- /dev/null
+++ b/src/step-templates/hockeyapp-upload-mobile-app/scriptbody.ps1
@@ -0,0 +1,334 @@
+# Hockey App Upload script
+#
+# Uploads a mobile platform application package to Hockey App from a Nuget file
+#  extracted in a previous Octopus Deploy step. Allows a variety of parameters.
+#
+# v0.5 - Turns out Invoke-WebRequest was a memory hog, casuing high memory usage and
+#         out-of-memory errors. Switched to dot net native web request and streams.
+# v0.4 - Package location search is now recursive, as required by *.nuspec example.
+#        Added default description to pass along nuget version to notes.
+# v0.3 - Now supports windows .appx packages
+# v0.2 - Added extra parameters
+# v0.1 - Initial version, basic upload
+# 
+#
+# The following *.nuspec example will package ALL matching Ipa, Apk (signed), and Appx files.
+# The upload script requires exactly one match (or specifying the exact file)
+# 
+# Specify specific package path relative to the nuspec file location (or overriden basepath)
+#
+# https://docs.nuget.org/create/nuspec-reference#file-element-examples
+#
+# In some cases the ID, Version, and Description may need manually specified.
+#
+
+<#
+
+    <?xml version="1.0"?>
+    <package>
+      <metadata>
+        <id>$id$</id>
+        <title>$id$</title>
+        <version>$version$</version>
+        <description>Mobile project packaged for Octopus deploy. $description$</description>
+      </metadata>
+      <files>
+        <!-- Matches mobile package files. Note this will only include the platform being built,
+	         and should match only a single file. -->
+
+        <!-- Android, Signed only -->
+        <file src="**/Release/**/*-Signed.apk" target="" />
+
+        <!-- iOS -->
+        <file src="**/Release/**/*.ipa" target="" />
+
+        <!-- Windows App -->
+        <file src="**/*.appx" exclude="**/Dependencies/**" target="" />
+      </files>
+    </package>
+
+#>
+
+# Hockey App API reference
+#
+# General API reference: http://support.hockeyapp.net/kb/api
+# Auth reference (tokens): http://support.hockeyapp.net/kb/api/api-basics-and-authentication
+# Upload App Version reference: http://support.hockeyapp.net/kb/api/api-versions#upload-version
+
+#############################
+# Debug Parameter Overrides #
+#############################
+
+# These values are set explicitly durring debugging so that the script can
+#   be run in the editor.
+# For local debugging, uncomment these values and fill in appropriately.
+
+<#
+
+$OctopusParameters = @{
+"HockeyAppApiToken" = "YourApiKeyhere";
+"HockeyAppAppID" = "YourAppIdHere";
+"PackageFileName" = "MyAppFile-1.2.3.4.ipa"; # app file name
+"HockeyAppNotify" = "1";
+"HockeyAppStatus" = "2";
+}
+
+# debug folder with app files
+$stepPath = "C:\Temp\HockeyAppScript\"
+
+
+# #>
+
+###################################
+# Octopus Deploy common functions #
+###################################
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+#####################
+# Utility functions #
+#####################
+
+function Get-ExactlyOneMobilePackageFileInfo($searchPath)
+{
+    $apkFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.apk #Android
+    $ipaFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.ipa #iOS
+    $appxFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.appx # windows
+
+    $apkCount = $apkFiles.count
+
+    $ipaCount = $ipaFiles.count
+
+    $appxCount = $appxFiles.count
+
+    $totalCount = $apkCount + $ipaCount + $appxCount
+
+    if($totalCount -ne 1)
+    {
+        throw "Did not find exactly one (1) mobile application package. Found $apkCount APK file(s), $ipaCount IPA file(s), and $appxCount Appx file(s)."
+    }
+
+    if($apkCount -eq 1)
+    {
+        return $apkFiles
+    }
+
+    if($ipaCount -eq 1)
+    {
+        return $ipaFiles
+    }
+
+    if($appxCount -eq 1)
+    {
+        return $appxFiles
+    }
+
+    throw "Unable to find mobile application packages (fallback error - not expected)"
+}
+
+function AddToHashIfExists([HashTable]$table, $value, $name)
+{
+    if(-not [String]::IsNullOrWhiteSpace($value))
+    {
+        $table.Add($name, $value)
+    }
+}
+
+function GetMultipartFormSectionString($key,$value)
+{
+    return @"
+Content-Disposition: form-data; name="$key"
+
+$value
+"@
+}
+
+####################
+# Basic Parameters #
+####################
+
+$apiToken = $OctopusParameters['HockeyAppApiToken']
+$appId = $OctopusParameters['HockeyAppAppID']
+
+$octopusFilePathOverride = $OctopusParameters['PackageFileName']
+
+$stepName = $OctopusParameters['MobileAppPackageStepName']
+
+# set step path, if not already set
+If([string]::IsNullOrEmpty($stepPath))
+{
+    if (![string]::IsNullOrEmpty($stepName)) {
+        Write-Host "Finding path to package step: $stepName"
+        $stepPath = Find-InstallLocation $stepName
+    } else {
+        $stepPath = Find-SingleInstallLocation
+    }
+}
+
+Write-Host "Package is located in folder: $stepPath"
+Write-Host "##octopus[stderr-progress]"
+
+# if we were not provided a file name, search for a single package file
+if([string]::IsNullOrWhiteSpace($octopusFilePathOverride))
+{
+    $appFileInfo = Get-ExactlyOneMobilePackageFileInfo $stepPath
+    $appFullFilePath = $appFileInfo.FullName
+}
+else
+{
+    $appFullFilePath = Join-Path $stepPath $octopusFilePathOverride
+}
+
+$fileName = [System.IO.Path]::GetFileName($appFullFilePath)
+
+$apiUploadUri = "https://rink.hockeyapp.net/api/2/apps/$appId/app_versions/upload"
+
+# Request token details
+$uniqueBoundaryToken = [Guid]::NewGuid().ToString()
+
+$contentType = "multipart/form-data; boundary=$uniqueBoundaryToken"
+
+################################
+# Set up Hockey App parameters #
+################################
+
+$HockeyAppParameters = @{} # parameters are a hash table.
+
+# add parameters that have values - See docs at http://support.hockeyapp.net/kb/api/api-versions#upload-version
+
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppNotes']          "notes"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppNotesType']      "notes_type"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppNotify']         "notify"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppStatus']         "status"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppTags']           "tags"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppTeams']          "teams"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppUsers']          "users"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppMandatory']      "mandatory"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppCommitSha']      "commit_sha"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppBuildServerUrl'] "build_server_url"
+AddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppRepositoryUrl']  "repository_url"
+
+$formSectionSeparator = @"
+
+--$uniqueBoundaryToken
+
+"@
+
+if($HockeyAppParameters.Count -gt 0)
+{
+    $parameterSectionsString = [String]::Join($formSectionSeparator,($HockeyAppParameters.GetEnumerator() | %{GetMultipartFormSectionString $_.Key $_.Value}))
+}
+
+############################
+# Prepare request wrappers #
+############################
+
+# Standard for multipart form data
+# http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4
+
+$stringEncoding = [System.Text.Encoding]::ASCII
+
+# Note the hard-coded "ipa" name here is per HockeyApp API documentation
+#  and it applies to ALL platform application files.
+
+$preFileBytes = $stringEncoding.GetBytes(
+$parameterSectionsString + 
+$formSectionSeparator +
+@"
+Content-Disposition: form-data; name="ipa"; filename="$fileName"
+Content-Type: application/octet-stream
+
+
+"@)
+
+# file bytes will go in between
+
+$postFileBytes = $stringEncoding.GetBytes(@"
+
+--$uniqueBoundaryToken--
+"@)
+
+######################
+# Invoke the request #
+######################
+
+# Note, previous approach was Invoke-RestMethod based. It worked, but was NOT memory
+# efficient, leading to high memory usage and "out of memory" errors.
+
+# Based on examples from
+# http://stackoverflow.com/questions/566462/upload-files-with-httpwebrequest-multipart-form-data
+# and 
+# https://gist.github.com/nolim1t/271018
+
+# Uses a dot net WebRequest and streaming to limit memory usage
+
+$WebRequest = [System.Net.WebRequest]::Create("$apiUploadUri")
+
+$WebRequest.ContentType = $contentType
+$WebRequest.Method = "POST"
+$WebRequest.KeepAlive = $true;
+$WebRequest.Headers.Add("X-HockeyAppToken",$apiToken)
+
+$RequestStream = $WebRequest.GetRequestStream()
+
+# before file bytes
+$RequestStream.Write($preFileBytes, 0, $preFileBytes.Length);
+
+#files bytes
+
+$fileMode = [System.IO.FileMode]::Open
+$fileAccess = [System.IO.FileAccess]::Read
+
+$fileStream = New-Object IO.FileStream $appFullFilePath,$fileMode,$fileAccess
+$bufferSize = 4096 # 4k at a time
+$byteBuffer = New-Object Byte[] ($bufferSize)
+
+# read bytes. While bytes are read...
+while(($bytesRead = $fileStream.Read($byteBuffer,0,$byteBuffer.Length)) -ne 0)
+{
+    # write those byes to the request stream
+    $RequestStream.Write($byteBuffer, 0, $bytesRead)
+}
+
+$fileStream.Close()
+
+# after file bytes
+$RequestStream.Write($postFileBytes, 0, $postFileBytes.Length);
+
+$RequestStream.Close()
+
+$response = $WebRequest.GetResponse();
diff --git a/src/step-templates/http-invoke-url/metadata.json b/src/step-templates/http-invoke-url/metadata.json
new file mode 100644
index 000000000..8a1029e82
--- /dev/null
+++ b/src/step-templates/http-invoke-url/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "bb2a8fef-1407-405b-9251-a259c1868bad",
+  "Name": "HTTP - Invoke URL",
+  "Description": "Invoke HTTP Get request using provided url. Doesn't throw exception when request fails.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "url",
+      "Label": "Url",
+      "HelpText": "Web request Url",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-08-31T05:06:43.6810000-07:00",
+  "LastModifiedBy": "jmalczak",
+  "$Meta": {
+    "ExportedAt": "2015-08-31T05:25:19.9230000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "http"
+}
diff --git a/src/step-templates/http-invoke-url/scriptbody.ps1 b/src/step-templates/http-invoke-url/scriptbody.ps1
new file mode 100644
index 000000000..cfce14c5f
--- /dev/null
+++ b/src/step-templates/http-invoke-url/scriptbody.ps1
@@ -0,0 +1,50 @@
+# Running outside octopus
+param(
+    [string]$url,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$url
+    ) 
+
+    Write-Host "Invoke Url: $url"
+
+    try {
+    
+        Invoke-WebRequest -Uri $url -Method Get -UseBasicParsing
+
+    } catch {
+        Write-Host "There was a problem invoking Url"    
+    }
+
+ } `
+ (Get-Param 'url' -Required)
\ No newline at end of file
diff --git a/step-templates/http-post-form.json b/src/step-templates/http-post-form/metadata.json
similarity index 52%
rename from step-templates/http-post-form.json
rename to src/step-templates/http-post-form/metadata.json
index d9226083b..7889b45d7 100644
--- a/step-templates/http-post-form.json
+++ b/src/step-templates/http-post-form/metadata.json
@@ -1,6 +1,6 @@
 {
   "$Meta": {
-    "ExportedAt": "2015-11-13T21:57:26.839+00:00",
+    "ExportedAt": "2015-11-13T13:57:26.8390000-08:00",
     "OctopusVersion": "3.1.1",
     "Type": "ActionTemplate"
   },
@@ -8,7 +8,7 @@
   "Description": "Execute a simple form POST via HTTP. The script will construct a body in \"application/x-www-form-urlencoded\" format by extracting Octopus variables with a specified prefix (from the \"HTTP.PostForm.Prefix\" parameter). Variable names and values are encoded accordingly.\n\nFor instance, if \"HTTP.PostForm.Prefix\" is \"foo.\", then the Octopus variable \"foo.Bar\"=\"baz\" will be translated to \"Bar=baz\" in the request body.",
   "Id": "3c7a59bd-d66e-4dc6-9509-895b4a5d98c8",
   "LastModifiedBy": "kburdett",
-  "LastModifiedOn": "2015-11-13T22:01:45.000+00:00",
+  "LastModifiedOn": "2015-11-13T14:01:45.0000000-08:00",
   "Name": "HTTP - Post Form",
   "Parameters": [
     {
@@ -31,10 +31,10 @@
     }
   ],
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "try {\r    $uri = $OctopusParameters[\"HTTP.PostForm.URI\"]\r    $prefix = $OctopusParameters[\"HTTP.PostForm.Prefix\"]\r    $body = \"\"\r\r    # Ensure URI is populated\r    if ([string]::IsNullOrEmpty($uri)) {\r        Write-Error \"HTTP.PostForm.URI is required and cannot be empty\"\r        return\r    }\r\r    # Construct the body\r    if (![string]::IsNullOrEmpty($prefix)) {\r        $params = $OctopusParameters.Keys |\r            Where-Object { $_.StartsWith($prefix) } |\r            Foreach-Object {\r                $key = [uri]::EscapeDataString($_.Substring($prefix.Length))\r                $val = [uri]::EscapeDataString($OctopusParameters[$_])\r                Write-Verbose \"Found parameter ${key}=${val}\"\r                \"${key}=${val}\"\r            }\r    \r        if ($params.Length -gt 0) {\r            $body = $params -join \"&\"\r        }\r    }\r    \r    # Execute the request\r    Write-Host \"Executing trigger: ${uri}\"\r    Write-Host \"Body: ${body}\"\r    Invoke-WebRequest -Method Post -Uri $uri -Body $body -ContentType \"application/x-www-form-urlencoded\"\r} catch {\r    $ErrorMessage = $_.Exception.Message\r    Write-Error $ErrorMessage\r}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
   "Version": 2,
   "Category": "http"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/http-post-form/scriptbody.ps1 b/src/step-templates/http-post-form/scriptbody.ps1
new file mode 100644
index 000000000..268156f27
--- /dev/null
+++ b/src/step-templates/http-post-form/scriptbody.ps1
@@ -0,0 +1 @@
+try {
    $uri = $OctopusParameters["HTTP.PostForm.URI"]
    $prefix = $OctopusParameters["HTTP.PostForm.Prefix"]
    $body = ""

    # Ensure URI is populated
    if ([string]::IsNullOrEmpty($uri)) {
        Write-Error "HTTP.PostForm.URI is required and cannot be empty"
        return
    }

    # Construct the body
    if (![string]::IsNullOrEmpty($prefix)) {
        $params = $OctopusParameters.Keys |
            Where-Object { $_.StartsWith($prefix) } |
            Foreach-Object {
                $key = [uri]::EscapeDataString($_.Substring($prefix.Length))
                $val = [uri]::EscapeDataString($OctopusParameters[$_])
                Write-Verbose "Found parameter ${key}=${val}"
                "${key}=${val}"
            }
    
        if ($params.Length -gt 0) {
            $body = $params -join "&"
        }
    }
    
    # Execute the request
    Write-Host "Executing trigger: ${uri}"
    Write-Host "Body: ${body}"
    Invoke-WebRequest -Method Post -Uri $uri -Body $body -ContentType "application/x-www-form-urlencoded"
} catch {
    $ErrorMessage = $_.Exception.Message
    Write-Error $ErrorMessage
}
\ No newline at end of file
diff --git a/src/step-templates/http-test-url/metadata.json b/src/step-templates/http-test-url/metadata.json
new file mode 100644
index 000000000..67ebe7d80
--- /dev/null
+++ b/src/step-templates/http-test-url/metadata.json
@@ -0,0 +1,114 @@
+{
+  "Id": "f5cebc0a-cc16-4876-9f72-bfbd513e6fdd",
+  "Name": "HTTP - Test URL",
+  "Description": "Makes a GET request to a HTTP(S) end point and verifies that a particular status code and (optional) response is returned within a specified period of time.",
+  "ActionType": "Octopus.Script",
+  "Version": 18,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "ca7c3e92-c243-4115-a326-7693eb830214",
+      "Name": "Uri",
+      "Label": "URI",
+      "HelpText": "The full Uri of the endpoint",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0d760ed5-81ed-46d9-b833-74f75df08bfc",
+      "Name": "CustomHostHeader",
+      "Label": "Custom HOST header",
+      "HelpText": "An optional custom HOST header which will be passed with the request",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b4e57984-01df-4438-96e5-75e74c2c6188",
+      "Name": "SecurityProtocol",
+      "Label": "Security Protocol",
+      "HelpText": "The optional security protocol version to use for HTTPS requests.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "SystemDefault\nSsl3\nTls\nTls11\nTls12"
+      }
+    },
+    {
+      "Id": "8f47469e-3b6d-4915-a710-3a601debeb8a",
+      "Name": "ExpectedCode",
+      "Label": "Expected code",
+      "HelpText": "The expected HTTP status code",
+      "DefaultValue": "200",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7c96b2b3-53dd-4281-ae1a-ef67cbc0eb72",
+      "Name": "TimeoutSeconds",
+      "Label": "Timeout (Seconds)",
+      "HelpText": "The number of seconds before the step fails and times out",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ac0b303c-0c59-4776-be21-d93ebe9e28e7",
+      "Name": "AuthUsername",
+      "Label": "Username",
+      "HelpText": "Username for authentication. Leave blank to use Anonymous.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "38eae17a-3098-48df-b8dc-96c3185f9f40",
+      "Name": "AuthPassword",
+      "Label": "Password",
+      "HelpText": "Password for authentication. Leave blank for Anonymous.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "60fe87fe-e96d-448e-94fa-f2ce4bfbaf3a",
+      "Name": "UseWindowsAuth",
+      "Label": "Use Windows Authentication",
+      "HelpText": "Should the request be made passing windows authentication (kerberos) credentials otherwise uses basic authentication",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "47c779b5-c515-49f9-a122-f692b0f12ff7",
+      "Name": "ExpectedResponse",
+      "Label": "Expected Response",
+      "HelpText": "The response should be this text",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2020-06-16T08:03:12.5740000Z",
+    "OctopusVersion": "2020.2.13",
+    "Type": "ActionTemplate"
+  },
+  "Category": "http"
+}
diff --git a/src/step-templates/http-test-url/scriptbody.ps1 b/src/step-templates/http-test-url/scriptbody.ps1
new file mode 100644
index 000000000..b490da424
--- /dev/null
+++ b/src/step-templates/http-test-url/scriptbody.ps1
@@ -0,0 +1,130 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$uri = $OctopusParameters['Uri']
+$customHostHeader = $OctopusParameters['CustomHostHeader']
+$expectedCode = [int] $OctopusParameters['ExpectedCode']
+$timeoutSeconds = [int] $OctopusParameters['TimeoutSeconds']
+$Username = $OctopusParameters['AuthUsername']
+$Password = $OctopusParameters['AuthPassword']
+$UseWindowsAuth = [System.Convert]::ToBoolean($OctopusParameters['UseWindowsAuth'])
+$ExpectedResponse = $OctopusParameters['ExpectedResponse']
+$securityProtocol = $OctopusParameters['SecurityProtocol']
+
+Write-Host "Starting verification request to $uri"
+if ($customHostHeader)
+{
+    Write-Host "Using custom host header $customHostHeader"
+}
+
+Write-Host "Expecting response code $expectedCode."
+Write-Host "Expecting response: $ExpectedResponse."
+
+if ($securityProtocol)
+{
+    Write-Host "Using security protocol $securityProtocol"
+    [Net.ServicePointManager]::SecurityProtocol = [Enum]::parse([Net.SecurityProtocolType], $securityProtocol) 
+}
+
+$timer = [System.Diagnostics.Stopwatch]::StartNew()
+$success = $false
+do
+{
+    try
+    {
+        if ($Username -and $Password -and $UseWindowsAuth)
+        {
+            Write-Host "Making request to $uri using windows authentication for user $Username"
+            $request = [system.Net.WebRequest]::Create($uri)
+            $Credential = New-Object System.Management.Automation.PSCredential -ArgumentList $Username, $(ConvertTo-SecureString -String $Password -AsPlainText -Force)
+            $request.Credentials = $Credential 
+            
+            if ($customHostHeader)
+            {
+                $request.Host = $customHostHeader
+            }
+
+            try
+            {
+                $response = $request.GetResponse()
+            }
+            catch [System.Net.WebException]
+            {
+                Write-Host "Request failed :-( System.Net.WebException"
+                Write-Host $_.Exception
+                $response = $_.Exception.Response
+            }
+            
+        }
+		elseif ($Username -and $Password)
+        {
+            Write-Host "Making request to $uri using basic authentication for user $Username"
+            $Credential = New-Object System.Management.Automation.PSCredential -ArgumentList $Username, $(ConvertTo-SecureString -String $Password -AsPlainText -Force)
+            if ($customHostHeader)
+            {
+                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -Credential $Credential -Headers @{"Host" = $customHostHeader} -TimeoutSec $timeoutSeconds
+            }
+            else 
+            {
+                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -Credential $Credential -TimeoutSec $timeoutSeconds
+            }
+        }
+		else
+        {
+            Write-Host "Making request to $uri using anonymous authentication"
+            if ($customHostHeader)
+            {
+                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -Headers @{"Host" = $customHostHeader} -TimeoutSec $timeoutSeconds
+            }
+            else 
+            {
+                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -TimeoutSec $timeoutSeconds
+            }
+        }
+        
+        $code = $response.StatusCode
+        $body = $response.Content;
+        Write-Host "Recieved response code: $code"
+        Write-Host "Recieved response: $body"
+
+        if($response.StatusCode -eq $expectedCode)
+        {
+            $success = $true
+        }
+        if ($success -and $ExpectedResponse)
+        {
+            $success = ($ExpectedResponse -eq $body)
+        }
+    }
+    catch
+    {
+        # Anything other than a 200 will throw an exception so
+        # we check the exception message which may contain the 
+        # actual status code to verify
+        
+        Write-Host "Request failed :-("
+        Write-Host $_.Exception
+
+        if($_.Exception -like "*($expectedCode)*")
+        {
+            $success = $true
+        }
+    }
+
+    if(!$success)
+    {
+        Write-Host "Trying again in 5 seconds..."
+        Start-Sleep -s 5
+    }
+}
+while(!$success -and $timer.Elapsed -le (New-TimeSpan -Seconds $timeoutSeconds))
+
+$timer.Stop()
+
+# Verify result
+
+if(!$success)
+{
+    throw "Verification failed - giving up."
+}
+
+Write-Host "Sucesss! Found status code $expectedCode"
\ No newline at end of file
diff --git a/src/step-templates/iis-add-isapicgirestrictionexception/metadata.json b/src/step-templates/iis-add-isapicgirestrictionexception/metadata.json
new file mode 100644
index 000000000..bf42290c9
--- /dev/null
+++ b/src/step-templates/iis-add-isapicgirestrictionexception/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "47e1a39c-65f3-43aa-ad5e-ea1946bbf368",
+  "Name": "IIS - Add an Allow ISAPI And CGI Restriction Exception",
+  "Description": "Adds an IIS Server Allow exception to the ISAPI/CGI Restrictions in IIS 7 and above.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "cgiIsapiExtensionPath",
+      "Label": "CGI/ISAPI Extension Path",
+      "HelpText": "The full path to the ISAPI/CGI extension to allow.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "description",
+      "Label": "Description",
+      "HelpText": "A description for the ISAPI/CGI Restriction allowance exception.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-01-13T13:28:56.0400000-08:00",
+  "LastModifiedBy": "ekrapfl",
+  "$Meta": {
+    "ExportedAt": "2016-01-13T13:28:56.0400000-08:00",
+    "OctopusVersion": "3.2.14",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-add-isapicgirestrictionexception/scriptbody.ps1 b/src/step-templates/iis-add-isapicgirestrictionexception/scriptbody.ps1
new file mode 100644
index 000000000..eaec79e36
--- /dev/null
+++ b/src/step-templates/iis-add-isapicgirestrictionexception/scriptbody.ps1
@@ -0,0 +1,84 @@
+Param
+(
+    [Parameter(Position = 0)]
+    [ValidateNotNullOrEmpty()]
+    [string] $cgiIsapiExtensionPath,
+    [Parameter(Position = 1)]
+    [string] $description = [string]::Empty
+)
+
+$ErrorActionPrefrence = "Stop"
+
+
+function Get-Param($Name, [switch]$Required, $Default) 
+{
+    $result = $null
+
+    if ($OctopusParameters -ne $null) 
+    {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) 
+    {
+        $variable = Get-Variable $Name -EA SilentlyContinue    
+        if ($variable -ne $null) 
+        {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) 
+    {
+        if ($Required) 
+        {
+            throw "Missing parameter value $Name"
+        } 
+        else 
+        {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    Param
+    (
+        [Parameter(Mandatory=$True, Position = 0)]
+        [ValidateNotNullOrEmpty()]
+        [string] $cgiIsapiExtensionPath,
+        [Parameter(Position = 1)]
+        [string] $description = [string]::Empty
+    )
+
+    Import-Module "WebAdministration"
+
+    $cgiIsapiConfiguration = Get-WebConfiguration -Filter "/system.webServer/security/isapiCgiRestriction/add" -PSPath "IIS:\"
+
+    $cgiIsapiExtensionFullPath = [System.Environment]::ExpandEnvironmentVariables($cgiIsapiExtensionPath)
+    $cgiIsapiExtensionFullPath = Resolve-Path -Path $cgiIsapiExtensionFullPath
+
+    $restrictionFound = $false
+    $cgiIsapiConfiguration | ForEach-Object {
+        $itemFullPath = [System.Environment]::ExpandEnvironmentVariables($_.path)
+        $itemFullPath = Resolve-Path -Path $itemFullPath
+
+        if ($itemFullPath.Path -eq $cgiIsapiExtensionFullPath.Path)
+        {
+           $restrictionFound = $true
+        }
+    }
+
+    if ($restrictionFound -eq $false)
+    {
+        Add-WebConfiguration -PSPath 'MACHINE/WEBROOT/APPHOST' -Filter "system.webServer/security/isapiCgiRestriction" -value @{description="$description";path="$cgiIsapiExtensionPath";allowed='True'}
+    }
+    else
+    {
+        Write-Host "Allowed CGI/ISAPI Restriction for '$cgiIsapiExtensionPath' already exists."
+    }
+} `
+(Get-Param 'cgiIsapiExtensionPath' -Required) `
+(Get-Param 'description')
\ No newline at end of file
diff --git a/src/step-templates/iis-app-create/metadata.json b/src/step-templates/iis-app-create/metadata.json
new file mode 100644
index 000000000..84b232337
--- /dev/null
+++ b/src/step-templates/iis-app-create/metadata.json
@@ -0,0 +1,205 @@
+{
+  "Id": "5b3e7576-44f8-4852-ae09-a45bd985c549",
+  "Name": "IIS Application - Create",
+  "Description": "Create an IIS virtual application (a virtual directory with an application pool)",
+  "ActionType": "Octopus.Script",
+  "Version": 37,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "679da415-996c-4ad3-87d5-bb8ce4e1f8d0",
+      "Name": "VirtualPath",
+      "Label": "Virtual path",
+      "HelpText": "The name of the application to create. For example, to serve an application that will be available at `/myapp`, enter `myapp`. To create an application under a parent virtual directory or application, separate with slashes - for example: `/applications/myapp`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3eecef84-fe72-4efc-98bf-42aa41a2d488",
+      "Name": "PhysicalPath",
+      "Label": "Physical path",
+      "HelpText": "Physical folder that the application will serve files from. Example: `C:\\MyApp`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f2b3a7ef-4d83-4692-a328-fc18cb85fd3e",
+      "Name": "ParentSite",
+      "Label": "Parent site",
+      "HelpText": "The name of the IIS web site to attach the application to. For example, to put the application under the default web site, enter:\n\n    Default Web Site",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3cb9971e-a7f2-47e7-8201-fb25c3080bd0",
+      "Name": "ApplicationPoolName",
+      "Label": "Application pool",
+      "HelpText": "The name of the application pool that the application will run under.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2a5d18bf-50ad-43c4-882b-9314ee2551b4",
+      "Name": "BindingProtocols",
+      "Label": "Protocols",
+      "HelpText": "The protocols to use for the application",
+      "DefaultValue": "http",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "07d979ef-c343-4c9c-8681-d3c06f451539",
+      "Name": "RequireSSL",
+      "Label": "Require SSL",
+      "HelpText": "Web site SSL settings",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3a3a8fe8-9fb0-4db5-85c9-04141f33f32d",
+      "Name": "ClientCertificate",
+      "Label": "Client certificate",
+      "HelpText": "_(Require SSL)_ Defines how to handle client certificates if SSL is required.",
+      "DefaultValue": "Ignore",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Ignore\nAccept\nRequire"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "174299e5-38dc-4fe9-b25a-6a5bdad05b34",
+      "Name": "PreloadEnabled",
+      "Label": "Preload Enabled",
+      "HelpText": "If true, sets the application to enable preloading.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1641d3e2-a1e5-4933-b993-6528f1764557",
+      "Name": "EnableAnonymous",
+      "Label": "Enable Anonymous authentication",
+      "HelpText": "Whether IIS should allow anonymous authentication",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3a52b977-3ea6-482b-8e55-62efd0198b14",
+      "Name": "EnableBasic",
+      "Label": "Enable Basic authentication",
+      "HelpText": "Whether IIS should allow basic authentication with a 401 challenge.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "085a3183-30bc-499e-90bf-9b5bcdf0842a",
+      "Name": "EnableWindows",
+      "Label": "Enable Windows authentication",
+      "HelpText": "Whether IIS should allow integrated Windows authentication with a 401 challenge.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "de7b8dee-bf5a-48ea-99bc-f5b86fcdf118",
+      "Name": "SetApplicationPoolSettings",
+      "Label": "Set Application Pool Settings",
+      "HelpText": "If true, this will allow you to set the Application Pool CLR Version, identity using the .NET CLR Version, Identity, Username, and Password parameters.  If false, the other four parameters will be ignored.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "dd301881-0cd6-40bf-98b4-36e13a587fe2",
+      "Name": "ApplicationPoolFrameworkVersion",
+      "Label": "Application Pool .NET CLR Version",
+      "HelpText": "The version of the .NET common language runtime that this application pool will use.",
+      "DefaultValue": "v4.0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "v2.0|CLR v2.0 (.NET 2.0, 3.0, 3.5)\nv4.0|CLR v4.0 (.NET 4.0, 4.5, 4.6)\nNo Managed Code"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "92cb9de4-f65f-4855-bc88-d89e6a748f3c",
+      "Name": "ApplicationPoolIdentityType",
+      "Label": "Application Pool Identity",
+      "HelpText": "Which built-in account will the application pool run under.",
+      "DefaultValue": "ApplicationPoolIdentity",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "ApplicationPoolIdentity|Application Pool Identity\nLocalService|Local Service\nLocalSystem|Local System\nNetworkService|Network Service\nSpecificUser|Custom user ..."
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7cbeec84-7fad-46dd-98de-ed61531f8bb3",
+      "Name": "ApplicationPoolUsername",
+      "Label": "Application Pool Username",
+      "HelpText": "The Windows/domain account of the custom user that the application pool will run under. Example: YOURDOMAIN\\\\YourAccount. You will need to ensure that this user has permissions to run as an application pool.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "748a99a2-a9f4-46b2-b9b5-283a864171d3",
+      "Name": "ApplicationPoolPassword",
+      "Label": "Application Pool Password",
+      "HelpText": "The password for the custom account given above.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2017-04-10T15:13:10.6530000Z",
+    "OctopusVersion": "3.12.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-app-create/scriptbody.ps1 b/src/step-templates/iis-app-create/scriptbody.ps1
new file mode 100644
index 000000000..5a77799f9
--- /dev/null
+++ b/src/step-templates/iis-app-create/scriptbody.ps1
@@ -0,0 +1,257 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+
+$virtualPath = $OctopusParameters['VirtualPath']
+$physicalPath = $OctopusParameters['PhysicalPath']
+$applicationPoolName = $OctopusParameters['ApplicationPoolName']
+$setApplicationPoolSettings = [boolean]::Parse($OctopusParameters['SetApplicationPoolSettings'])
+$appPoolFrameworkVersion = $OctopusParameters["ApplicationPoolFrameworkVersion"]
+$applicationPoolIdentityType = $OctopusParameters["ApplicationPoolIdentityType"]
+$applicationPoolUsername = $OctopusParameters["ApplicationPoolUsername"]
+$applicationPoolPassword = $OctopusParameters["ApplicationPoolPassword"]
+
+$parentSite = $OctopusParameters['ParentSite']
+$bindingProtocols = $OctopusParameters['BindingProtocols']
+$authentication = $OctopusParameters['AuthenticationType']
+$requireSSL = $OctopusParameters['RequireSSL']
+$clientCertificate = $OctopusParameters['ClientCertificate']
+
+$preloadEnabled = [boolean]::Parse($OctopusParameters['PreloadEnabled'])
+$enableAnonymous = [boolean]::Parse($OctopusParameters['EnableAnonymous'])
+$enableBasic = [boolean]::Parse($OctopusParameters['EnableBasic'])
+$enableWindows = [boolean]::Parse($OctopusParameters['EnableWindows'])
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Validate-Parameter($foo, [string[]]$validInput, $parameterName) {
+    Write-Host "${parameterName}: ${foo}"
+    if (! $foo) {
+        throw "$parameterName cannot be empty, please specify a value"
+    }
+    
+    if ($validInput) {
+        @($foo) | % { 
+                if ($validInput -notcontains $_) {
+                    throw "'$_' is not a valid input for '$parameterName'"
+                }
+             }  
+        }   
+}
+
+# Helper to run a block with a retry if things go wrong
+$maxFailures = 5
+$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+function Execute-WithRetry([ScriptBlock] $command) {
+    $attemptCount = 0
+    $operationIncomplete = $true
+
+    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+        $attemptCount = ($attemptCount + 1)
+
+        if ($attemptCount -ge 2) {
+            Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+            Start-Sleep -s $sleepBetweenFailures
+            Write-Output "Retrying..."
+        }
+
+        try {
+            & $command
+
+            $operationIncomplete = $false
+        } catch [System.Exception] {
+            if ($attemptCount -lt ($maxFailures)) {
+                Write-Output ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+            
+            }
+            else {
+                throw "Failed to execute command"
+            }
+        }
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+Validate-Parameter $virtualPath -parameterName "Virtual path"
+Validate-Parameter $physicalPath -parameterName "Physical path"
+Validate-Parameter $applicationPoolName -parameterName "Application pool"
+Validate-Parameter $parentSite -parameterName "Parent site"
+
+
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+
+## --------------------------------------------------------------------------------------
+## Run
+## --------------------------------------------------------------------------------------
+
+Write-Host "Getting web site $parentSite"
+# Workaround to bug in Get-WebSite cmdlet which would return all sites
+# See http://forums.iis.net/p/1167298/1943273.aspx / http://stackoverflow.com/a/6832577/785750
+$site = Get-WebSite  | where { $_.Name -eq $parentSite }
+if (!$site) {
+    throw "The web site '$parentSite' does not exist. Please create the site first."
+}
+
+$path = $site.PhysicalPath;
+$parts = $virtualPath -split "[/\\]"
+$name = ""
+
+for ($i = 0; $i -lt $parts.Length; $i++) {
+    $name = $name + "/" + $parts[$i]
+    $name = $name.TrimStart('/').TrimEnd('/')
+    if ($i -eq $parts.Length - 1) {
+        
+    }
+    elseif ([string]::IsNullOrEmpty($name) -eq $false -and $name -ne "") {
+        Write-Host "Ensuring parent exists: $name"
+        
+        $path = [IO.Path]::Combine($path, $parts[$i])
+        $app = Get-WebApplication -Name $name -Site $parentSite
+
+        if (!$app) {
+            $vdir = Get-WebVirtualDirectory -Name $name -site $parentSite
+            if (!$vdir) {
+                Write-Verbose "The application or virtual directory '$name' does not exist"
+                if([IO.Directory]::Exists([System.Environment]::ExpandEnvironmentVariables($path)) -eq $true)
+                {
+                    Write-Verbose "Using physical path '$path' as parent"
+                }
+                else
+                {
+                    throw "Failed to ensure parent"
+                }
+            }
+            else
+            {
+                $path = $vdir.PhysicalPath
+            }
+        }
+        else
+        {
+            $path = $app.PhysicalPath
+        }
+    }
+}
+
+$existing = Get-WebApplication -site $parentSite -Name $name
+
+# Set App Pool
+Execute-WithRetry { 
+	Write-Verbose "Loading Application pool"
+	$pool = Get-Item "IIS:\AppPools\$ApplicationPoolName" -ErrorAction SilentlyContinue
+	if (!$pool) { 
+		Write-Host "Application pool `"$ApplicationPoolName`" does not exist, creating..." 
+		new-item "IIS:\AppPools\$ApplicationPoolName" -confirm:$false
+		$pool = Get-Item "IIS:\AppPools\$ApplicationPoolName"
+	} else {
+		Write-Host "Application pool `"$ApplicationPoolName`" already exists"
+	}
+}
+
+# Set App Pool Identity
+Execute-WithRetry { 
+	if($setApplicationPoolSettings)
+    {
+        Write-Host "Set application pool identity: $applicationPoolIdentityType"
+        if ($applicationPoolIdentityType -eq "SpecificUser") {
+            Set-ItemProperty "IIS:\AppPools\$ApplicationPoolName" -name processModel -value @{identitytype="SpecificUser"; username="$applicationPoolUsername"; password="$applicationPoolPassword"}
+        } else {
+            Set-ItemProperty "IIS:\AppPools\$ApplicationPoolName" -name processModel -value @{identitytype="$applicationPoolIdentityType"}
+        }
+    }
+}
+
+# Set .NET Framework
+Execute-WithRetry { 
+    if($setApplicationPoolSettings)
+    {
+        Write-Host "Set .NET framework version: $appPoolFrameworkVersion" 
+        if($appPoolFrameworkVersion -eq "No Managed Code")
+        {
+            Set-ItemProperty "IIS:\AppPools\$ApplicationPoolName" managedRuntimeVersion ""
+        }
+        else
+        {
+            Set-ItemProperty "IIS:\AppPools\$ApplicationPoolName" managedRuntimeVersion $appPoolFrameworkVersion
+        }
+    }
+}
+
+Execute-WithRetry { 
+    ## Check if the physical path exits
+    if(!(Test-Path -Path $physicalPath)) {
+        Write-Host "Creating physical path '$physicalPath'"
+        New-Item -ItemType directory -Path $physicalPath
+    }
+
+    if (!$existing) {
+        Write-Host "Creating web application '$name'"
+        New-WebApplication -Site $parentSite -Name $name -ApplicationPool $applicationPoolName -PhysicalPath $physicalPath
+        Write-Host "Web application created"
+    } else {
+        Write-Host "The web application '$name' already exists. Updating physical path:"
+
+        Set-ItemProperty IIS:\\Sites\\$parentSite\\$name -name physicalPath -value $physicalPath
+        Write-Host "Physical path changed to: $physicalPath"
+
+        Set-ItemProperty IIS:\\Sites\\$parentSite\\$name -Name applicationPool -Value $applicationPoolName
+        Write-Output "ApplicationPool changed to: $applicationPoolName"
+    }
+    
+    Write-Host "Enabling '$bindingProtocols' protocols"
+    Set-ItemProperty IIS:\\Sites\\$parentSite\\$name -name enabledProtocols -value $bindingProtocols
+
+    $enabledIisAuthenticationOptions = $Authentication -split '\\s*[,;]\\s*'
+
+    try {
+
+    Execute-WithRetry { 
+        Write-Output "Anonymous authentication enabled: $enableAnonymous"
+        Set-WebConfigurationProperty -filter /system.webServer/security/authentication/anonymousAuthentication -name enabled -value "$enableAnonymous" -PSPath IIS:\\ -location $parentSite/$virtualPath
+    }    
+    
+    Execute-WithRetry { 
+        Write-Output "Windows authentication enabled: $enableWindows"
+        Set-WebConfigurationProperty -filter /system.WebServer/security/authentication/windowsAuthentication -name enabled -value "$enableWindows" -PSPath IIS:\\ -location $parentSite/$virtualPath
+    }
+
+    Execute-WithRetry { 
+        Write-Output "Basic authentication enabled: $enableBasic"
+        Set-WebConfigurationProperty -filter /system.webServer/security/authentication/basicAuthentication -name enabled -value "$enableBasic" -PSPath IIS:\\ -location $parentSite/$virtualPath
+    }
+
+    } catch [System.Exception] {
+        Write-Output "Authentication options could not be set. This can happen when there is a problem with your application's web.config. For example, you might be using a section that requires an extension that is not installed on this web server (such as URL Rewriting). It can also happen when you have selected an authentication option and the appropriate IIS module is not installed (for example, for Windows authentication, you need to enable the Windows Authentication module in IIS/Windows first)"
+        throw
+    }
+
+    Set-WebConfiguration -value "None" -filter "system.webserver/security/access" -location $parentSite/$virtualPath -PSPath IIS:\\ 
+    if ($requireSSL -ieq "True")
+    {
+        Write-Output "Require SSL enabled: $requireSSL"
+        Set-WebConfiguration -value "Ssl" -filter "system.webserver/security/access" -location $parentSite/$virtualPath -PSPath IIS:\\ 
+        Write-Output "Client certificate mode: $clientCertificate"
+        if ($clientCertificate -ieq "Accept") {
+           Set-WebConfigurationProperty -filter "system.webServer/security/access" -location $parentSite/$virtualPath -PSPath IIS:\\ -name "sslFlags" -value "Ssl,SslNegotiateCert"
+        }
+        if ($clientCertificate -ieq "Require") {
+           Set-WebConfigurationProperty -filter "system.webServer/security/access" -location $parentSite/$virtualPath -PSPath IIS:\\ -name "sslFlags" -value "Ssl,SslNegotiateCert,SslRequireCert"
+        }
+    }
+    
+    try {
+        Set-ItemProperty IIS:\\Sites\\$parentSite\\$name -name preloadEnabled -value $preloadEnabled
+        Write-Output "Preload Enabled: $preloadEnabled"
+    } catch [System.Exception] {
+       if ($preloadEnabled) {
+            Write-Output "Preload Enabled: $preloadEnabled Could not be set. You may to install the Application Initialization feature"
+            throw
+       }
+    }
+}
diff --git a/src/step-templates/iis-app-remove/metadata.json b/src/step-templates/iis-app-remove/metadata.json
new file mode 100644
index 000000000..b14f595db
--- /dev/null
+++ b/src/step-templates/iis-app-remove/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "a3edf679-e65a-4758-88a8-ec45a6c77563",
+  "Name": "IIS Application - Remove",
+  "Description": "Removes an IIS virtual application (a virtual directory with an application pool)",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "VirtualPath",
+      "Label": "Virtual path",
+      "HelpText": "The name of the application to remove. For example, if the application that will be removed is at `/myapp`, enter `myapp`. To remove an application under a parent virtual directory or application, separate with slashes - for example: `/applications/myapp`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ParentSite",
+      "Label": "Parent site",
+      "HelpText": "The name of the IIS web site to remove the application from. For example, to remove the application under the default web site, enter:\n\n    Default Web Site",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-05-20T13:25:09.7140000-07:00",
+  "LastModifiedBy": "lukerogers",
+  "$Meta": {
+    "ExportedAt": "2015-05-20T13:27:33.2620000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-app-remove/scriptbody.ps1 b/src/step-templates/iis-app-remove/scriptbody.ps1
new file mode 100644
index 000000000..1ad42a932
--- /dev/null
+++ b/src/step-templates/iis-app-remove/scriptbody.ps1
@@ -0,0 +1,110 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+
+$virtualPath = $OctopusParameters['VirtualPath']
+$parentSite = $OctopusParameters['ParentSite']
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {
+    Write-Host "${parameterName}: $foo"
+    if (! $foo) {
+        throw "No value was set for $parameterName, and it cannot be empty"
+    }
+    
+    if ($validInput) {
+        if (! $validInput -contains $foo) {
+            throw "'$input' is not a valid input for '$parameterName'"
+        }
+    }
+    
+}
+
+# Helper to run a block with a retry if things go wrong
+$maxFailures = 5
+$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+function Execute-WithRetry([ScriptBlock] $command) {
+	$attemptCount = 0
+	$operationIncomplete = $true
+
+	while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+		$attemptCount = ($attemptCount + 1)
+
+		if ($attemptCount -ge 2) {
+			Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+			Start-Sleep -s $sleepBetweenFailures
+			Write-Output "Retrying..."
+		}
+
+		try {
+			& $command
+
+			$operationIncomplete = $false
+		} catch [System.Exception] {
+			if ($attemptCount -lt ($maxFailures)) {
+				Write-Output ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+			
+			}
+			else {
+			    throw "Failed to execute command"
+			}
+		}
+	}
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+Validate-Parameter $virtualPath -parameterName "Virtual path"
+Validate-Parameter $parentSite -parameterName "Parent site"
+
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+## --------------------------------------------------------------------------------------
+## Run
+## --------------------------------------------------------------------------------------
+
+Write-Host "Getting web site $parentSite"
+$site = Get-Website -name $parentSite
+if (!$site) {
+    throw "The web site '$parentSite' does not exist. Please create the site first."
+}
+
+$parts = $virtualPath -split "[/\\]"
+$name = ""
+
+for ($i = 0; $i -lt $parts.Length; $i++) {
+    $name = $name + "/" + $parts[$i]
+    $name = $name.TrimStart('/').TrimEnd('/')
+    if ($i -eq $parts.Length - 1) {
+        
+    }
+    elseif ([string]::IsNullOrEmpty($name) -eq $false -and $name -ne "/") {
+        Write-Host "Ensuring parent exists: $name"
+
+        $app = Get-WebApplication -Name $name -Site $parentSite
+
+        if (!$app) {
+            $vdir = Get-WebVirtualDirectory -Name $name -site $parentSite
+            if (!$vdir) {
+                throw "The application or virtual directory '$name' does not exist"
+            }
+        }
+    }
+}
+
+$existing = Get-WebApplication -site $parentSite -Name $name
+
+Execute-WithRetry { 
+    if ($existing) {
+        Write-Host "Removing web application '$name'"
+		Remove-WebApplication -Name $name -Site $parentSite
+        Write-Host "Web application removed"
+    } else {
+        Write-Host "Web application doesn't exist, nothing to remove."
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-app-set-connect-as-credential/metadata.json b/src/step-templates/iis-app-set-connect-as-credential/metadata.json
new file mode 100644
index 000000000..b0c53e695
--- /dev/null
+++ b/src/step-templates/iis-app-set-connect-as-credential/metadata.json
@@ -0,0 +1,64 @@
+{
+  "Id": "1a482cf6-95ae-442f-92a4-c1e79d5c8e4b",
+  "Name": "IIS Application - Set Connect As credential",
+  "Description": "Sets the credential for the Connect As of an IIS application",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "cca187a4-2e55-4b71-98e8-87bf47b9744d",
+      "Name": "IISSiteName",
+      "Label": "Site Name",
+      "HelpText": "Name of the IIS site.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "381050b6-975b-4a10-b79c-a6fee9383cf2",
+      "Name": "IISApplicationName",
+      "Label": "Application Name",
+      "HelpText": "Name of the application to set the credential on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8b9f0aff-93d7-4bc0-b375-b30179835e17",
+      "Name": "ApplicationUserName",
+      "Label": "User name",
+      "HelpText": "Name of the credential to apply, leave blank to set to Pass-through authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "220c4021-727a-4f10-935b-101a3cc8a3bb",
+      "Name": "ApplicationUserPassword",
+      "Label": "Password",
+      "HelpText": "Password of the credential to set.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedOn": "2018-12-04T20:21:52.1230000Z",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2018-12-04T20:21:52.1230000Z",
+    "OctopusVersion": "2018.9.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-app-set-connect-as-credential/scriptbody.ps1 b/src/step-templates/iis-app-set-connect-as-credential/scriptbody.ps1
new file mode 100644
index 000000000..93155bdff
--- /dev/null
+++ b/src/step-templates/iis-app-set-connect-as-credential/scriptbody.ps1
@@ -0,0 +1,77 @@
+# Import the WebAdministration module
+Import-Module WebAdministration
+
+# Get reference to the site
+$iisSite = Get-IISSite | Where-Object {$_.Name -ieq $IISSiteName}
+
+# Check to make sure the site was found
+if ($null -eq $iisSite)
+{
+	# Throw an error
+    throw "$IISSiteName was not found."
+}
+
+# Check to see if $IISApplicationName starts with a /
+if ($IISApplicationName.StartsWith("/"))
+{
+	# Remove the beginning slash
+    $IISApplicationName = $IISApplicationName.SubString(1)
+}
+
+# Get reference to the application
+$application = $iisSite.Applications | Where-Object {$_.Path -ieq "/$IISApplicationName"}
+
+# Check to see if the application was found
+if ($null -eq $application)
+{
+	# Throw an error
+    throw "$IISApplicationName was not found."
+}
+
+# retrieve existing values
+$currentUserName = Get-WebConfigurationProperty "system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']" -name username
+$currentPassword = Get-WebConfigurationProperty "system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']" -name password
+
+# Check the value of $ApplicationUserName
+if ([string]::IsNullOrEmpty($ApplicationUserName))
+{
+    # Ensure $ApplicationUserName is an empty string
+    $ApplicationUserName = [string]::Empty
+}
+
+# Check the value of $ApplicationPassword
+if ([string]::IsNullOrEmpty($ApplicationUserPassword) -or $ApplicationUserName.EndsWith('$')) # Usernames ending in $ are an indication that an MSA is being used
+{
+	# Ensure $ApplicationPassword is empty string
+    $ApplicationPassword = [string]::Empty
+}
+
+# Compare username values
+if ($ApplicationUserName -ne $currentUserName.Value)
+{
+	# Display message
+    Write-Output "Updating username for $IISSiteName/$IISApplicationName to $ApplicationUserName Connect As property"
+    
+	# Update the property
+    Set-WebConfigurationProperty "system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']" -name username -value "$ApplicationUserName"
+}
+else
+{
+	# Display message
+    Write-Output "User already set to $ApplicationUserName for $IISSiteName/$IISApplicationName Connect As property"
+}
+
+# Compare password values
+if ($ApplicationUserPassword -ne $currentPassword.Value)
+{
+    # Display message
+    Write-Output "Updating password for $IISSiteName/$IISApplicationName Connect As property"
+    
+    # Set password property
+	Set-WebConfigurationProperty "system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']" -name password -value "$ApplicationUserPassword"
+}
+else
+{
+	# Display message
+    Write-Output "Password does not need updating for $IISSiteName/$IISApplicationName Connect As property"
+}
diff --git a/src/step-templates/iis-app-update-property/metadata.json b/src/step-templates/iis-app-update-property/metadata.json
new file mode 100644
index 000000000..ffde71d5d
--- /dev/null
+++ b/src/step-templates/iis-app-update-property/metadata.json
@@ -0,0 +1,62 @@
+{
+  "Id": "4eb08b60-142c-4443-92cf-2e069727f438",
+  "Name": "IIS App - Update Property",
+  "Description": "Updates property for specified application",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "41b1663e-f84a-4e8a-981a-fb86ec4176b9",
+      "Name": "webSiteName",
+      "Label": "Web site name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1d7a25f9-0900-4c5c-b76b-5afbb427249b",
+      "Name": "applicationName",
+      "Label": "Aplication name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b074c934-c903-45e3-a96b-6c5282840d60",
+      "Name": "propertyName",
+      "Label": "Name of the property to set",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cdc37d1e-8a16-44bd-b80b-5c83c9d3022f",
+      "Name": "propertyValue",
+      "Label": "Value of the property to set",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2018-12-03T17:04:14.7580000Z",
+  "LastModifiedBy": "micdenny",
+  "$Meta": {
+    "ExportedAt": "2018-12-03T17:04:14.7580000Z",
+    "OctopusVersion": "2018.9.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-app-update-property/scriptbody.ps1 b/src/step-templates/iis-app-update-property/scriptbody.ps1
new file mode 100644
index 000000000..e849f0ce0
--- /dev/null
+++ b/src/step-templates/iis-app-update-property/scriptbody.ps1
@@ -0,0 +1,77 @@
+# Running outside octopus
+param(
+    [string]$webSiteName,
+    [string]$applicationName,
+    [string]$propertyName,
+    [object]$propertyValue,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$webSiteName,
+        [string]$applicationName,
+        [string]$propertyName,
+        [object]$propertyValue
+    ) 
+
+    Write-Host "Setting $webSiteName\$applicationName property $propertyName to $propertyValue"
+
+    try {
+         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+         Import-Module WebAdministration -ErrorAction SilentlyContinue
+         
+         $oldValue = Get-ItemProperty "IIS:\Sites\$webSiteName\$applicationName" -Name $propertyName
+         $oldValueString = ""
+
+         if ($oldValue.GetType() -eq [Microsoft.IIs.PowerShell.Framework.ConfigurationAttribute])
+         {
+             $oldValueString = ($oldValue | Select-Object -ExpandProperty "Value")
+         }
+         elseif ($oldValue.GetType() -eq [System.String])
+         {
+             $oldValueString = $oldValue
+         }
+         elseif ($oldValue.GetType() -eq [System.Management.Automation.PSCustomObject])
+         {
+             $oldValueString = ($oldValue | Select-Object -ExpandProperty $propertyName)
+         }
+
+         Write-Host "Old value $oldValueString"
+         Set-ItemProperty "IIS:\Sites\$webSiteName\$applicationName" -Name $propertyName -Value $propertyValue
+         Write-Host "New value $propertyValue"
+         Write-Host "Done"
+    } catch {
+        Write-Host $_.Exception|format-list -force
+        Write-Host "There was a problem setting property"    
+    }
+
+ } `
+ (Get-Param 'webSiteName' -Required) (Get-Param 'applicationName' -Required) (Get-Param 'propertyName' -Required) (Get-Param 'propertyValue' -Required)
diff --git a/step-templates/iis-apppool-create.json b/src/step-templates/iis-apppool-create/metadata.json
similarity index 50%
rename from step-templates/iis-apppool-create.json
rename to src/step-templates/iis-apppool-create/metadata.json
index 82abc91a6..f304a99db 100644
--- a/step-templates/iis-apppool-create.json
+++ b/src/step-templates/iis-apppool-create/metadata.json
@@ -4,7 +4,7 @@
   "ActionType": "Octopus.Script",
   "Version": 14,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Validate-Parameter {\n    Param(\n        [Parameter(Position=0)][string]$Parameter,\n        [Parameter(Mandatory=$true, Position=1)][string]$ParameterName\n    )\n    if (!$ParameterName -contains 'Password') {\n        Write-Host ('{0}: {1}' -f ${ParameterName},$Parameter)\n    }\n    if (!$Parameter) {\n        Write-Error ('No value was set for {0}, and it cannot be empty' -f $ParameterName)\n    }\n}\n\nfunction Execute-Retry {\n    Param(\n        [Parameter(Mandatory=$true, Position=0)][ScriptBlock]$Command\n    )\n\t$attemptCount = 0\n\t$operationIncomplete = $true\n    $maxFailures = 5\n    $sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\n\twhile ($operationIncomplete -and $attemptCount -lt $maxFailures) {\n\t\t$attemptCount = ($attemptCount + 1)\n\t\tif ($attemptCount -ge 2) {\n\t\t\tWrite-Output ('Waiting for {0} seconds before retrying ...' -f $sleepBetweenFailures)\n\t\t\tStart-Sleep -s $sleepBetweenFailures\n\t\t\tWrite-Output 'Retrying ...'\n\t\t}\n\t\ttry {\n\t\t\t& $Command\n\t\t\t$operationIncomplete = $false\n\t\t} catch [System.Exception] {\n\t\t\tif ($attemptCount -lt ($maxFailures)) {\n\t\t\t\tWrite-Output ('Attempt {0} of {1} failed: {2}' -f $attemptCount,$maxFailures,$_.Exception.Message)\n\t\t\t}\n\t\t\telse {\n                Write-Host 'Failed to execute command'\n\t\t\t}\n\t\t}\n\t}\n}\n\nfunction Get-ScheduledTimes {\n    Param(\n        [Parameter(Position=0)][string]$Schedule\n    )\n    if (!$Schedule) {\n        return @()\n    }\n    $minutes = $Schedule.Split(',')\n    $minuteArrayList = New-Object System.Collections.ArrayList(,$minutes)\n    return $minuteArrayList\n}\n\n[System.Reflection.Assembly]::LoadWithPartialName('Microsoft.Web.Administration')\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\nImport-Module WebAdministration -ErrorAction SilentlyContinue\n\n$appPoolName = $OctopusParameters['AppPoolName']\n$appPoolIdentityType = $OctopusParameters['AppPoolIdentityType']\nif ($appPoolIdentityType -eq 3) {\n    $appPoolIdentityUser = $OctopusParameters['AppPoolIdentityUser']\n    $appPoolIdentityPassword = $OctopusParameters['AppPoolIdentityPassword']\n}\n$appPoolLoadUserProfile = [boolean]::Parse($OctopusParameters['AppPoolLoadUserProfile'])\n$appPoolAutoStart = [boolean]::Parse($OctopusParameters['AppPoolAutoStart'])\n$appPoolEnable32BitAppOnWin64 = [boolean]::Parse($OctopusParameters['AppPoolEnable32BitAppOnWin64'])\n$appPoolManagedRuntimeVersion = $OctopusParameters['AppPoolManagedRuntimeVersion']\n$appPoolManagedPipelineMode = $OctopusParameters['AppPoolManagedPipelineMode']\n$appPoolIdleTimeout = [TimeSpan]::FromMinutes($OctopusParameters['AppPoolIdleTimeoutMinutes'])\n$appPoolPeriodicRecycleTime = $OctopusParameters['AppPoolPeriodicRecycleTime']\n$appPoolMaxProcesses = [int]$OctopusParameters['AppPoolMaxProcesses']\n$appPoolRegularTimeInterval = [TimeSpan]::FromMinutes($OctopusParameters['AppPoolRegularTimeInterval'])\n$appPoolQueueLength = [int]$OctopusParameters['AppPoolQueueLength']\n$appPoolStartMode = $OctopusParameters['AppPoolStartMode']\n$appPoolCpuAction = $OctopusParameters['AppPoolCpuLimitAction']\n$appPoolCpuLimit = [int]$OctopusParameters['AppPoolCpuLimit']\n\nValidate-Parameter -Parameter $appPoolName -ParameterName 'Application Pool Name'\nValidate-Parameter -Parameter $appPoolIdentityType -ParameterName 'Identity Type'\nif ($appPoolIdentityType -eq 3) {\n    Validate-Parameter -Parameter $appPoolIdentityUser -ParameterName 'Identity UserName'\n    # If using Group Managed Serice Accounts, the password should be allowed to be empty\n}\nValidate-Parameter -Parameter $appPoolLoadUserProfile -parameterName 'Load User Profile'\nValidate-Parameter -Parameter $appPoolAutoStart -ParameterName 'AutoStart'\nValidate-Parameter -Parameter $appPoolEnable32BitAppOnWin64 -ParameterName 'Enable 32-Bit Apps on 64-bit Windows'\nValidate-Parameter -Parameter $appPoolManagedRuntimeVersion -ParameterName 'Managed Runtime Version'\nValidate-Parameter -Parameter $appPoolManagedPipelineMode -ParameterName 'Managed Pipeline Mode'\nValidate-Parameter -Parameter $appPoolIdleTimeout -ParameterName 'Process Idle Timeout'\nValidate-Parameter -Parameter $appPoolMaxProcesses -ParameterName 'Maximum Worker Processes'\nValidate-Parameter -Parameter $appPoolStartMode -parameterName 'Start Mode'\nValidate-Parameter -Parameter $appPoolCpuAction -parameterName 'CPU Limit Action'\nValidate-Parameter -Parameter $appPoolCpuLimit -parameterName 'CPU Limit (percent)'\n\n$iis = (New-Object Microsoft.Web.Administration.ServerManager)\n$pool = $iis.ApplicationPools | Where-Object {$_.Name -eq $appPoolName} | Select-Object -First 1\nif ($pool -eq $null) {\n    Write-Output ('Creating Application Pool {0}' -f $appPoolName)\n    Execute-Retry {\n        $iis = (New-Object Microsoft.Web.Administration.ServerManager)\n        $iis.ApplicationPools.Add($appPoolName)\n        $iis.CommitChanges()\n    }\n}\nelse {\n    Write-Output ('Application Pool {0} already exists, reconfiguring ...' -f $appPoolName)\n}\n$list = Get-ScheduledTimes -Schedule $appPoolPeriodicRecycleTime\nExecute-Retry {\n    $iis = (New-Object Microsoft.Web.Administration.ServerManager)\n    $pool = $iis.ApplicationPools | Where-Object {$_.Name -eq $appPoolName} | Select-Object -First 1\n    Write-Output ('Setting: AutoStart = {0}' -f $appPoolAutoStart)\n    $pool.AutoStart = $appPoolAutoStart\n    Write-Output ('Setting: Enable32BitAppOnWin64 = {0}' -f $appPoolEnable32BitAppOnWin64)\n    $pool.Enable32BitAppOnWin64 = $appPoolEnable32BitAppOnWin64\n    Write-Output ('Setting: IdentityType = {0}' -f $appPoolIdentityType)\n    $pool.ProcessModel.IdentityType = $appPoolIdentityType\n    if ($appPoolIdentityType -eq 3) {\n        Write-Output ('Setting: UserName = {0}' -f $appPoolIdentityUser)\n        $pool.ProcessModel.UserName = $appPoolIdentityUser\n        if (!$appPoolIdentityPassword) {\n            Write-Output ('Setting: Password = [empty]')\n        }\n        else {\n            Write-Output ('Setting: Password = [Omitted For Security]')\n        }\n        $pool.ProcessModel.Password = $appPoolIdentityPassword\n    }\n\tWrite-Output ('Setting: LoadUserProfile = {0}' -f $appPoolLoadUserProfile)\n    $pool.ProcessModel.LoadUserProfile = $appPoolLoadUserProfile\n    Write-Output ('Setting: ManagedRuntimeVersion = {0}' -f $appPoolManagedRuntimeVersion)\n    if ($appPoolManagedRuntimeVersion -eq 'No Managed Code') {\n        $pool.ManagedRuntimeVersion = ''\n    }\n    else {\n        $pool.ManagedRuntimeVersion = $appPoolManagedRuntimeVersion\n    }\n    Write-Output ('Setting: ManagedPipelineMode = {0}' -f $appPoolManagedPipelineMode)\n    $pool.ManagedPipelineMode = $appPoolManagedPipelineMode\n    Write-Output ('Setting: IdleTimeout = {0}' -f $appPoolIdleTimeout)\n    $pool.ProcessModel.IdleTimeout = $appPoolIdleTimeout\n    Write-Output ('Setting: MaxProcesses = {0}' -f $appPoolMaxProcesses)\n    $pool.ProcessModel.MaxProcesses = $appPoolMaxProcesses\n    Write-Output ('Setting: RegularTimeInterval = {0}' -f $appPoolRegularTimeInterval)\n    $pool.Recycling.PeriodicRestart.Time  = $appPoolRegularTimeInterval\n    Write-Output ('Setting: QueueLength = {0}' -f $appPoolQueueLength)\n    $pool.QueueLength  = $appPoolQueueLength\n    Write-Output ('Setting: CPU Limit (percent) = {0}' -f $appPoolCpuLimit)\n    ## Limit is stored in 1/1000s of one percent\n    $pool.Cpu.Limit = $appPoolCpuLimit * 1000\n    Write-Output ('Setting: CPU Limit Action = {0}' -f $appPoolCpuAction)\n    $pool.Cpu.Action = $appPoolCpuAction\n    Write-Output ('Setting: Schedule = {0}' -f $appPoolPeriodicRecycleTime)\n    $pool.Recycling.PeriodicRestart.Schedule.Clear()\n    foreach($timestamp in $list) {\n        $pool.Recycling.PeriodicRestart.Schedule.Add($timestamp)\n    }\n    if (Get-Member -InputObject $pool -Name StartMode -MemberType Properties)\n    {\n        Write-Output ('Setting: StartMode = {0}' -f $appPoolStartMode)\n        $pool.StartMode = $appPoolStartMode\n    }\n    else\n    {\n        Write-Output ('IIS does not support StartMode property, skipping this property...')\n    }\n    $iis.CommitChanges()\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.ScriptFileName": null,
@@ -207,10 +207,10 @@
   ],
   "LastModifiedBy": "droorda",
   "$Meta": {
-    "ExportedAt": "2018-09-18T04:42:42.009Z",
+    "ExportedAt": "2018-09-18T04:42:42.0090000Z",
     "OctopusVersion": "2018.7.14",
     "Type": "ActionTemplate"
   },
   "Id": "70a293d6-ee6a-4755-8e06-5f13d7e51fff",
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-apppool-create/scriptbody.ps1 b/src/step-templates/iis-apppool-create/scriptbody.ps1
new file mode 100644
index 000000000..4f4f8d577
--- /dev/null
+++ b/src/step-templates/iis-apppool-create/scriptbody.ps1
@@ -0,0 +1,169 @@
+function Validate-Parameter {
+    Param(
+        [Parameter(Position=0)][string]$Parameter,
+        [Parameter(Mandatory=$true, Position=1)][string]$ParameterName
+    )
+    if (!$ParameterName -contains 'Password') {
+        Write-Host ('{0}: {1}' -f ${ParameterName},$Parameter)
+    }
+    if (!$Parameter) {
+        Write-Error ('No value was set for {0}, and it cannot be empty' -f $ParameterName)
+    }
+}
+
+function Execute-Retry {
+    Param(
+        [Parameter(Mandatory=$true, Position=0)][ScriptBlock]$Command
+    )
+	$attemptCount = 0
+	$operationIncomplete = $true
+    $maxFailures = 5
+    $sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+	while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+		$attemptCount = ($attemptCount + 1)
+		if ($attemptCount -ge 2) {
+			Write-Output ('Waiting for {0} seconds before retrying ...' -f $sleepBetweenFailures)
+			Start-Sleep -s $sleepBetweenFailures
+			Write-Output 'Retrying ...'
+		}
+		try {
+			& $Command
+			$operationIncomplete = $false
+		} catch [System.Exception] {
+			if ($attemptCount -lt ($maxFailures)) {
+				Write-Output ('Attempt {0} of {1} failed: {2}' -f $attemptCount,$maxFailures,$_.Exception.Message)
+			}
+			else {
+                Write-Host 'Failed to execute command'
+			}
+		}
+	}
+}
+
+function Get-ScheduledTimes {
+    Param(
+        [Parameter(Position=0)][string]$Schedule
+    )
+    if (!$Schedule) {
+        return @()
+    }
+    $minutes = $Schedule.Split(',')
+    $minuteArrayList = New-Object System.Collections.ArrayList(,$minutes)
+    return $minuteArrayList
+}
+
+[System.Reflection.Assembly]::LoadWithPartialName('Microsoft.Web.Administration')
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+$appPoolName = $OctopusParameters['AppPoolName']
+$appPoolIdentityType = $OctopusParameters['AppPoolIdentityType']
+if ($appPoolIdentityType -eq 3) {
+    $appPoolIdentityUser = $OctopusParameters['AppPoolIdentityUser']
+    $appPoolIdentityPassword = $OctopusParameters['AppPoolIdentityPassword']
+}
+$appPoolLoadUserProfile = [boolean]::Parse($OctopusParameters['AppPoolLoadUserProfile'])
+$appPoolAutoStart = [boolean]::Parse($OctopusParameters['AppPoolAutoStart'])
+$appPoolEnable32BitAppOnWin64 = [boolean]::Parse($OctopusParameters['AppPoolEnable32BitAppOnWin64'])
+$appPoolManagedRuntimeVersion = $OctopusParameters['AppPoolManagedRuntimeVersion']
+$appPoolManagedPipelineMode = $OctopusParameters['AppPoolManagedPipelineMode']
+$appPoolIdleTimeout = [TimeSpan]::FromMinutes($OctopusParameters['AppPoolIdleTimeoutMinutes'])
+$appPoolPeriodicRecycleTime = $OctopusParameters['AppPoolPeriodicRecycleTime']
+$appPoolMaxProcesses = [int]$OctopusParameters['AppPoolMaxProcesses']
+$appPoolRegularTimeInterval = [TimeSpan]::FromMinutes($OctopusParameters['AppPoolRegularTimeInterval'])
+$appPoolQueueLength = [int]$OctopusParameters['AppPoolQueueLength']
+$appPoolStartMode = $OctopusParameters['AppPoolStartMode']
+$appPoolCpuAction = $OctopusParameters['AppPoolCpuLimitAction']
+$appPoolCpuLimit = [int]$OctopusParameters['AppPoolCpuLimit']
+
+Validate-Parameter -Parameter $appPoolName -ParameterName 'Application Pool Name'
+Validate-Parameter -Parameter $appPoolIdentityType -ParameterName 'Identity Type'
+if ($appPoolIdentityType -eq 3) {
+    Validate-Parameter -Parameter $appPoolIdentityUser -ParameterName 'Identity UserName'
+    # If using Group Managed Serice Accounts, the password should be allowed to be empty
+}
+Validate-Parameter -Parameter $appPoolLoadUserProfile -parameterName 'Load User Profile'
+Validate-Parameter -Parameter $appPoolAutoStart -ParameterName 'AutoStart'
+Validate-Parameter -Parameter $appPoolEnable32BitAppOnWin64 -ParameterName 'Enable 32-Bit Apps on 64-bit Windows'
+Validate-Parameter -Parameter $appPoolManagedRuntimeVersion -ParameterName 'Managed Runtime Version'
+Validate-Parameter -Parameter $appPoolManagedPipelineMode -ParameterName 'Managed Pipeline Mode'
+Validate-Parameter -Parameter $appPoolIdleTimeout -ParameterName 'Process Idle Timeout'
+Validate-Parameter -Parameter $appPoolMaxProcesses -ParameterName 'Maximum Worker Processes'
+Validate-Parameter -Parameter $appPoolStartMode -parameterName 'Start Mode'
+Validate-Parameter -Parameter $appPoolCpuAction -parameterName 'CPU Limit Action'
+Validate-Parameter -Parameter $appPoolCpuLimit -parameterName 'CPU Limit (percent)'
+
+$iis = (New-Object Microsoft.Web.Administration.ServerManager)
+$pool = $iis.ApplicationPools | Where-Object {$_.Name -eq $appPoolName} | Select-Object -First 1
+if ($pool -eq $null) {
+    Write-Output ('Creating Application Pool {0}' -f $appPoolName)
+    Execute-Retry {
+        $iis = (New-Object Microsoft.Web.Administration.ServerManager)
+        $iis.ApplicationPools.Add($appPoolName)
+        $iis.CommitChanges()
+    }
+}
+else {
+    Write-Output ('Application Pool {0} already exists, reconfiguring ...' -f $appPoolName)
+}
+$list = Get-ScheduledTimes -Schedule $appPoolPeriodicRecycleTime
+Execute-Retry {
+    $iis = (New-Object Microsoft.Web.Administration.ServerManager)
+    $pool = $iis.ApplicationPools | Where-Object {$_.Name -eq $appPoolName} | Select-Object -First 1
+    Write-Output ('Setting: AutoStart = {0}' -f $appPoolAutoStart)
+    $pool.AutoStart = $appPoolAutoStart
+    Write-Output ('Setting: Enable32BitAppOnWin64 = {0}' -f $appPoolEnable32BitAppOnWin64)
+    $pool.Enable32BitAppOnWin64 = $appPoolEnable32BitAppOnWin64
+    Write-Output ('Setting: IdentityType = {0}' -f $appPoolIdentityType)
+    $pool.ProcessModel.IdentityType = $appPoolIdentityType
+    if ($appPoolIdentityType -eq 3) {
+        Write-Output ('Setting: UserName = {0}' -f $appPoolIdentityUser)
+        $pool.ProcessModel.UserName = $appPoolIdentityUser
+        if (!$appPoolIdentityPassword) {
+            Write-Output ('Setting: Password = [empty]')
+        }
+        else {
+            Write-Output ('Setting: Password = [Omitted For Security]')
+        }
+        $pool.ProcessModel.Password = $appPoolIdentityPassword
+    }
+	Write-Output ('Setting: LoadUserProfile = {0}' -f $appPoolLoadUserProfile)
+    $pool.ProcessModel.LoadUserProfile = $appPoolLoadUserProfile
+    Write-Output ('Setting: ManagedRuntimeVersion = {0}' -f $appPoolManagedRuntimeVersion)
+    if ($appPoolManagedRuntimeVersion -eq 'No Managed Code') {
+        $pool.ManagedRuntimeVersion = ''
+    }
+    else {
+        $pool.ManagedRuntimeVersion = $appPoolManagedRuntimeVersion
+    }
+    Write-Output ('Setting: ManagedPipelineMode = {0}' -f $appPoolManagedPipelineMode)
+    $pool.ManagedPipelineMode = $appPoolManagedPipelineMode
+    Write-Output ('Setting: IdleTimeout = {0}' -f $appPoolIdleTimeout)
+    $pool.ProcessModel.IdleTimeout = $appPoolIdleTimeout
+    Write-Output ('Setting: MaxProcesses = {0}' -f $appPoolMaxProcesses)
+    $pool.ProcessModel.MaxProcesses = $appPoolMaxProcesses
+    Write-Output ('Setting: RegularTimeInterval = {0}' -f $appPoolRegularTimeInterval)
+    $pool.Recycling.PeriodicRestart.Time  = $appPoolRegularTimeInterval
+    Write-Output ('Setting: QueueLength = {0}' -f $appPoolQueueLength)
+    $pool.QueueLength  = $appPoolQueueLength
+    Write-Output ('Setting: CPU Limit (percent) = {0}' -f $appPoolCpuLimit)
+    ## Limit is stored in 1/1000s of one percent
+    $pool.Cpu.Limit = $appPoolCpuLimit * 1000
+    Write-Output ('Setting: CPU Limit Action = {0}' -f $appPoolCpuAction)
+    $pool.Cpu.Action = $appPoolCpuAction
+    Write-Output ('Setting: Schedule = {0}' -f $appPoolPeriodicRecycleTime)
+    $pool.Recycling.PeriodicRestart.Schedule.Clear()
+    foreach($timestamp in $list) {
+        $pool.Recycling.PeriodicRestart.Schedule.Add($timestamp)
+    }
+    if (Get-Member -InputObject $pool -Name StartMode -MemberType Properties)
+    {
+        Write-Output ('Setting: StartMode = {0}' -f $appPoolStartMode)
+        $pool.StartMode = $appPoolStartMode
+    }
+    else
+    {
+        Write-Output ('IIS does not support StartMode property, skipping this property...')
+    }
+    $iis.CommitChanges()
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-apppool-delete/metadata.json b/src/step-templates/iis-apppool-delete/metadata.json
new file mode 100644
index 000000000..52343765b
--- /dev/null
+++ b/src/step-templates/iis-apppool-delete/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "a7120f3e-6676-4bbb-b848-1413b03a35e8",
+  "Name": "IIS AppPool - Delete",
+  "Description": "Deletes an IIS Application Pool. \nCAUTION: Delete will proceed even if applications are using the Application Pool.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "AppPoolName",
+      "Label": "Application pool name",
+      "HelpText": "The name of the application pool that will be deleted.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2014-07-29T10:01:39.1050000-07:00",
+  "LastModifiedBy": "zagrophyte",
+  "$Meta": {
+    "ExportedAt": "2014-07-29T10:06:59.2690000-07:00",
+    "OctopusVersion": "2.5.5.318",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-apppool-delete/scriptbody.ps1 b/src/step-templates/iis-apppool-delete/scriptbody.ps1
new file mode 100644
index 000000000..e4b957ce3
--- /dev/null
+++ b/src/step-templates/iis-apppool-delete/scriptbody.ps1
@@ -0,0 +1,51 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+
+$appPoolName = $OctopusParameters['AppPoolName']
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {
+    IF (! $parameterName -contains "Password") 
+    { 
+        Write-Host "${parameterName}: $foo" 
+    }
+    if (! $foo) {
+        throw "No value was set for $parameterName, and it cannot be empty"
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+Validate-Parameter $appPoolName -parameterName "Application Pool Name"
+
+#Load Web Admin DLL
+[System.Reflection.Assembly]::LoadFrom( "C:\windows\system32\inetsrv\Microsoft.Web.Administration.dll" )
+
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+
+## --------------------------------------------------------------------------------------
+## Run
+## --------------------------------------------------------------------------------------
+
+$iis = (New-Object Microsoft.Web.Administration.ServerManager)
+
+$appPool = $iis.ApplicationPools | Where {$_.Name -eq $appPoolName} | Select-Object -First 1
+
+IF ($appPool -eq $null)
+{
+    Write-Output "Could not find an Application Pool named '$appPoolName'"
+}
+ELSE
+{
+    Write-Output "Removing Application Pool '$appPoolName'"
+    $iis.ApplicationPools.Remove($appPool)
+    $iis.CommitChanges()
+}
+
diff --git a/step-templates/iis-apppool-restart.json b/src/step-templates/iis-apppool-restart/metadata.json
similarity index 51%
rename from step-templates/iis-apppool-restart.json
rename to src/step-templates/iis-apppool-restart/metadata.json
index e74aa95dd..7fcc0ba97 100644
--- a/step-templates/iis-apppool-restart.json
+++ b/src/step-templates/iis-apppool-restart/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 9,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Load IIS module:\nImport-Module WebAdministration\n\n# Get AppPool Name\n$appPoolName = $OctopusParameters['appPoolName']\n\n# Check if exists\nif (Test-Path IIS:\\AppPools\\$appPoolName){\n    # Start App Pool if stopped else restart\nif ((Get-WebAppPoolState($appPoolName)).Value -eq \"Stopped\"){\n    Write-Output \"Starting IIS app pool $appPoolName\"\n    Start-WebAppPool $appPoolName\n}\nelse {\n    Write-Output \"Restarting IIS app pool $appPoolName\"\n    Restart-WebAppPool $appPoolName\n}\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-16T06:09:22.242+00:00",
+    "ExportedAt": "2014-05-15T23:09:22.2420000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-apppool-restart/scriptbody.ps1 b/src/step-templates/iis-apppool-restart/scriptbody.ps1
new file mode 100644
index 000000000..89c30d9c4
--- /dev/null
+++ b/src/step-templates/iis-apppool-restart/scriptbody.ps1
@@ -0,0 +1,18 @@
+# Load IIS module:
+Import-Module WebAdministration
+
+# Get AppPool Name
+$appPoolName = $OctopusParameters['appPoolName']
+
+# Check if exists
+if (Test-Path IIS:\AppPools\$appPoolName){
+    # Start App Pool if stopped else restart
+if ((Get-WebAppPoolState($appPoolName)).Value -eq "Stopped"){
+    Write-Output "Starting IIS app pool $appPoolName"
+    Start-WebAppPool $appPoolName
+}
+else {
+    Write-Output "Restarting IIS app pool $appPoolName"
+    Restart-WebAppPool $appPoolName
+}
+}
diff --git a/step-templates/iis-apppool-set-managed-pipeline-mode.json b/src/step-templates/iis-apppool-set-managed-pipeline-mode/metadata.json
similarity index 76%
rename from step-templates/iis-apppool-set-managed-pipeline-mode.json
rename to src/step-templates/iis-apppool-set-managed-pipeline-mode/metadata.json
index f5ef776be..3d2a9687d 100644
--- a/step-templates/iis-apppool-set-managed-pipeline-mode.json
+++ b/src/step-templates/iis-apppool-set-managed-pipeline-mode/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$AppPoolName = $OctopusParameters[\"AppPoolName\"]\r\n$Mode = $OctopusParameters[\"PiplelineMode\"]\r\n\r\nImport-Module WebAdministration\r\n\r\nGet-ChildItem IIS:\\AppPools | ?{$_.Name -eq $AppPoolName} | Select-Object -ExpandProperty PSPath | %{ Set-ItemProperty $_ managedPipelineMode $Mode -Verbose}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -38,10 +38,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2017-02-14T00:00:00.386+00:00",
+  "LastModifiedOn": "2017-02-13T16:00:00.3860000-08:00",
   "LastModifiedBy": "drobison",
   "$Meta": {
-    "ExportedAt": "2017-02-14T21:55:44.314Z",
+    "ExportedAt": "2017-02-14T21:55:44.3140000Z",
     "OctopusVersion": "3.5.1",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/iis-apppool-set-managed-pipeline-mode/scriptbody.ps1 b/src/step-templates/iis-apppool-set-managed-pipeline-mode/scriptbody.ps1
new file mode 100644
index 000000000..a0f8673dc
--- /dev/null
+++ b/src/step-templates/iis-apppool-set-managed-pipeline-mode/scriptbody.ps1
@@ -0,0 +1,6 @@
+$AppPoolName = $OctopusParameters["AppPoolName"]
+$Mode = $OctopusParameters["PiplelineMode"]
+
+Import-Module WebAdministration
+
+Get-ChildItem IIS:\AppPools | ?{$_.Name -eq $AppPoolName} | Select-Object -ExpandProperty PSPath | %{ Set-ItemProperty $_ managedPipelineMode $Mode -Verbose}
\ No newline at end of file
diff --git a/step-templates/iis-apppool-start.json b/src/step-templates/iis-apppool-start/metadata.json
similarity index 65%
rename from step-templates/iis-apppool-start.json
rename to src/step-templates/iis-apppool-start/metadata.json
index b703721ea..e25315258 100644
--- a/step-templates/iis-apppool-start.json
+++ b/src/step-templates/iis-apppool-start/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 4,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Load IIS module:\nImport-Module WebAdministration\n\n# Get AppPool Name\n$appPoolName = $OctopusParameters['appPoolName']\n\nWrite-Output \"Starting IIS app pool $appPoolName\"\nStart-WebAppPool $appPoolName\n\n\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-16T06:09:53.938+00:00",
+    "ExportedAt": "2014-05-15T23:09:53.9380000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-apppool-start/scriptbody.ps1 b/src/step-templates/iis-apppool-start/scriptbody.ps1
new file mode 100644
index 000000000..5f7404620
--- /dev/null
+++ b/src/step-templates/iis-apppool-start/scriptbody.ps1
@@ -0,0 +1,10 @@
+# Load IIS module:
+Import-Module WebAdministration
+
+# Get AppPool Name
+$appPoolName = $OctopusParameters['appPoolName']
+
+Write-Output "Starting IIS app pool $appPoolName"
+Start-WebAppPool $appPoolName
+
+
diff --git a/src/step-templates/iis-apppool-stop/metadata.json b/src/step-templates/iis-apppool-stop/metadata.json
new file mode 100644
index 000000000..5e03b34b9
--- /dev/null
+++ b/src/step-templates/iis-apppool-stop/metadata.json
@@ -0,0 +1,48 @@
+{
+  "Id": "3aaf34a5-90eb-4ea1-95db-15ec93c1e54d",
+  "Name": "IIS AppPool - Stop",
+  "Description": "Stops an IIS Application Pool",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "Parameters": [
+    {
+      "Name": "AppPoolName",
+      "Label": "Application pool name",
+      "HelpText": "The name of the application pool in IIS.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AppPoolCheckDelay",
+      "Label": "Status check interval",
+      "HelpText": "The delay, in milliseconds, between each attempt to query the application pool to see if its status is \"Stopped\"",
+      "DefaultValue": "500",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AppPoolCheckRetries",
+      "Label": "Status check retries",
+      "HelpText": "The number of retries before an error is thrown.",
+      "DefaultValue": "20",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2017-04-10T11:41:25.0000000-07:00",
+    "OctopusVersion": "3.12.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-apppool-stop/scriptbody.ps1 b/src/step-templates/iis-apppool-stop/scriptbody.ps1
new file mode 100644
index 000000000..83a495bb9
--- /dev/null
+++ b/src/step-templates/iis-apppool-stop/scriptbody.ps1
@@ -0,0 +1,41 @@
+# Load IIS module:
+Import-Module WebAdministration
+
+# Get AppPool Name
+$appPoolName = $OctopusParameters['appPoolName']
+# Get the number of retries
+$retries = $OctopusParameters['appPoolCheckRetries']
+# Get the number of attempts
+$delay = $OctopusParameters['appPoolCheckDelay']
+
+# Check if exists
+if(Test-Path IIS:\AppPools\$appPoolName) {
+
+    # Stop App Pool if not already stopped
+    if ((Get-WebAppPoolState $appPoolName).Value -ne "Stopped") {
+        Write-Output "Stopping IIS app pool $appPoolName"
+        Stop-WebAppPool $appPoolName
+
+        $state = (Get-WebAppPoolState $appPoolName).Value
+        $counter = 1
+
+        # Wait for the app pool to the "Stopped" before proceeding
+        do{
+            $state = (Get-WebAppPoolState $appPoolName).Value
+            Write-Output "$counter/$retries Waiting for IIS app pool $appPoolName to shut down completely. Current status: $state"
+            $counter++
+            Start-Sleep -Milliseconds $delay
+        }
+        while($state -ne "Stopped" -and $counter -le $retries)
+
+        # Throw an error if the app pool is not stopped
+        if($counter -gt $retries) {
+            throw "Could not shut down IIS app pool $appPoolName. `nTry to increase the number of retries ($retries) or delay between attempts ($delay milliseconds)." }
+    }
+    else {
+        Write-Output "$appPoolName already Stopped"
+    }
+}
+else {
+    Write-Output "IIS app pool $appPoolName doesn't exist"
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-apppool-update-property/metadata.json b/src/step-templates/iis-apppool-update-property/metadata.json
new file mode 100644
index 000000000..3310cdc45
--- /dev/null
+++ b/src/step-templates/iis-apppool-update-property/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "183c1676-cb8e-44e8-a348-bbcb2b77536e",
+  "Name": "IIS AppPool - Update Property",
+  "Description": "Updates property for specified AppPool, useful for example to change startMode to AlwaysRunning.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "appPoolName",
+      "Label": "Application pool name",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "propertyName",
+      "Label": "Name of the property to set",
+      "HelpText": "",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "propertyValue",
+      "Label": "Value of the property to set",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-09-04T17:59:58.6620000-07:00",
+  "LastModifiedBy": "olsh",
+  "$Meta": {
+    "ExportedAt": "2015-10-22T19:15:10.7320000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-apppool-update-property/scriptbody.ps1 b/src/step-templates/iis-apppool-update-property/scriptbody.ps1
new file mode 100644
index 000000000..3cab36179
--- /dev/null
+++ b/src/step-templates/iis-apppool-update-property/scriptbody.ps1
@@ -0,0 +1,73 @@
+# Running outside octopus
+param(
+    [string]$appPoolName,
+    [string]$propertyName,
+    [object]$propertyValue,
+    [switch]$whatIf
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$appPoolName,
+        [string]$propertyName,
+        [object]$propertyValue
+    )
+
+    Write-Host "Setting $appPoolName property $propertyName to $propertyValue"
+
+    try {
+         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+         Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+         $oldValue = Get-ItemProperty "IIS:\AppPools\$appPoolName" -Name $propertyName
+         $oldValueString = ""
+
+         if ($oldValue.GetType() -eq [Microsoft.IIs.PowerShell.Framework.ConfigurationAttribute])
+         {
+             $oldValueString = ($oldValue | Select-Object -ExpandProperty "Value");
+             $convertedValue = $propertyValue -as $oldValueString.GetType();
+         }
+         else
+         {
+             $oldValueString = $oldValue;
+             $convertedValue = $propertyValue -as $oldValue.GetType();
+         }
+
+         Write-Host "Old value $oldValueString"
+         Set-ItemProperty "IIS:\AppPools\$appPoolName" -Name $propertyName -Value $convertedValue
+         Write-Host "New value $propertyValue"
+         Write-Host "Done"
+    } catch {
+        Write-Host $_.Exception|format-list -force
+        Write-Host "There was a problem setting property"
+    }
+
+ } `
+ (Get-Param 'appPoolName' -Required) (Get-Param 'propertyName' -Required) (Get-Param 'propertyValue' -Required)
diff --git a/src/step-templates/iis-apppool-update-recycle-settings/metadata.json b/src/step-templates/iis-apppool-update-recycle-settings/metadata.json
new file mode 100644
index 000000000..6edc4fcc7
--- /dev/null
+++ b/src/step-templates/iis-apppool-update-recycle-settings/metadata.json
@@ -0,0 +1,103 @@
+{
+  "Id": "5d771fd0-710c-41a7-9969-10bc75d00307",
+  "Name": "IIS AppPool - Update Recycle Settings",
+  "Description": "Update the worker process and app pool timeout/recycle times.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "0fd90579-79b4-4086-8c7c-602cf21f9f10",
+      "Name": "ApplicationPoolName",
+      "Label": "Application pool",
+      "HelpText": "The name of the application pool to modify. The application pool must already exist.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4c1c4df5-4282-43f4-9119-e514016b4230",
+      "Name": "IdleTimeoutMinutes",
+      "Label": "Process idle timeout",
+      "HelpText": "Amount of time (in minutes) a worker process will remain idle before it shuts down. A value of 0 means the process does not shut down after an idle timeout.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "516e588b-b9e3-43cc-8342-7f50c97e138b",
+      "Name": "RegularTimeIntervalMinutes",
+      "Label": "Application pool recycle time interval",
+      "HelpText": "Period of time (in minutes) after which the application pool will recycle. A value of 0 means the application pool does not recycle on a regular interval.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a8121270-e728-4fe5-bf1b-f75cb5075516",
+      "Name": "PeriodicRecycleTime",
+      "Label": "Application pool periodic recycle time",
+      "HelpText": "A specific local time, in minutes after midnight, when the application pool is recycled. Seperate multiple times by using a ,\n\nExample: \"30\" for half an hour past midnight. or \"0, 360\" for midnight and 6 am.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fd4fe130-1bed-41ee-a1b5-73a080cc3ca5",
+      "Name": "RecycleEventsToLog",
+      "Label": "Recycle Events To Log",
+      "HelpText": "Event Log entries can be generated when an application pool is recycled. Select the Recycling events to log. The Options are **Time**, **Requests**, **Schedule**, **Memory**, **IsapiUnhealthy**, **OnDemand**, **ConfigChange**,  **PrivateMemory**. These should be entered in a comma separated list. \n\nExample: \"OnDemand,ConfigChange\"",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "334a24ee-d347-4fd8-bc97-43be090fd5c1",
+      "Name": "PrivateMemoryLimitKB",
+      "Label": "Private memory limit in KB",
+      "HelpText": "Maximum amount of private memory (in KB) a worker process can consume before causing the application pool to recycle. A value of 0 means there is no limit.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "bb164dea-1843-4655-a0e2-b29f990b44b7",
+      "Name": "EmptyClearsValue",
+      "Label": "Empty values reset",
+      "HelpText": "When checked, if the values are not set it will remove the setting from IIS.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2025-05-22T12:45:32.0000000Z",
+  "LastModifiedBy": "janv8000",
+  "$Meta": {
+    "ExportedAt": "2017-07-05T23:25:56.5980000Z",
+    "OctopusVersion": "3.14.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-apppool-update-recycle-settings/scriptbody.ps1 b/src/step-templates/iis-apppool-update-recycle-settings/scriptbody.ps1
new file mode 100644
index 000000000..34a1b9947
--- /dev/null
+++ b/src/step-templates/iis-apppool-update-recycle-settings/scriptbody.ps1
@@ -0,0 +1,129 @@
+Import-Module WebAdministration
+
+function Update-IISAppPool-PeriodicRestart($appPool, $periodicRestart) {
+    Write-Output "Setting worker process periodic restart time to $periodicRestart for AppPool $appPoolName."
+    $appPool.Recycling.PeriodicRestart.Time = [TimeSpan]::FromMinutes($periodicRestart)
+    $appPool | Set-Item
+}
+
+function Update-IISAppPool-IdleTimeout($appPool, $appPoolName, $idleTimeout) {
+    Write-Output "Setting worker process idle timeout to $idleTimeout for AppPool $appPoolName."
+    $appPool.ProcessModel.IdleTimeout = [TimeSpan]::FromMinutes($idleTimeout)
+    $appPool | Set-Item
+}
+
+function Update-IISAppPool-ScheduledTimes($appPool, $appPoolName, $schedule) {
+    $minutes = $periodicRecycleTimes.Split(",")
+    $minuteArrayList = New-Object System.Collections.ArrayList
+
+    foreach ($minute in $minutes) {
+        $minute = $minute.trim()
+
+        if ($minute -eq "-1") {
+            break
+        }
+        if ($minute -lt 0) {
+            continue
+        }
+
+        $minuteArrayList.Add([TimeSpan]::FromMinutes($minute))
+    }
+
+    Write-Output "Setting worker process scheduled restart times to $minuteArrayList for AppPool $appPoolName."
+
+    $settingName = "recycling.periodicRestart.schedule"
+    Clear-ItemProperty $appPool.PSPath -Name $settingName
+
+    $doneOne = $false
+    foreach ($minute in $minuteArrayList) {
+        if ($doneOne -eq $false) {
+            Set-ItemProperty $appPool.PSPath -Name $settingName -Value @{value=$minute}
+            $doneOne = $true
+        }
+        else {
+            New-ItemProperty $appPool.PSPath -Name $settingName -Value @{value=$minute}
+        }
+    }
+}
+
+function Update-IISAppPool-RecycleEventsToLog($appPool, $appPoolName, $events) {
+    $settingName = "Recycling.logEventOnRecycle"
+    Write-Output "Setting $settingName for AppPool $appPoolName to $events."
+
+    Clear-ItemProperty $appPool.PSPath -Name $settingName
+    if ($events -ne "-") {
+        Set-ItemProperty $appPool.PSPath -Name $settingName -Value $events
+    }
+}
+
+function Update-IISAppPool-PrivateMemoryLimit($appPool, $appPoolName, $privateMemoryLimitKB) {
+    Write-Output "Setting private memory limit to $privateMemoryLimitKB KB for AppPool $appPoolName."
+    $appPool.Recycling.PeriodicRestart.PrivateMemory = $privateMemoryLimitKB
+    $appPool | Set-Item
+}
+
+function Run {
+    $OctopusParameters = $OctopusParameters
+    if ($null -eq $OctopusParameters) {
+        write-host "Using test values"
+        $OctopusParameters = New-Object "System.Collections.Hashtable"
+        $OctopusParameters["ApplicationPoolName"]="DefaultAppPool"
+        $OctopusParameters["IdleTimeoutMinutes"]=""
+        $OctopusParameters["RegularTimeIntervalMinutes"]="10"
+        $OctopusParameters["PeriodicRecycleTime"]="14,15,16"
+        $OctopusParameters["RecycleEventsToLog"]="Time, Requests, Schedule, Memory, IsapiUnhealthy, OnDemand, ConfigChange, PrivateMemory"
+        $OctopusParameters["PrivateMemoryLimitKB"]="1024000"
+        $OctopusParameters["EmptyClearsValue"]=$true
+    }
+
+    $applicationPoolName = $OctopusParameters["ApplicationPoolName"]
+    $idleTimeout = $OctopusParameters["IdleTimeoutMinutes"]
+    $periodicRestart = $OctopusParameters["RegularTimeIntervalMinutes"]
+    $periodicRecycleTimes = $OctopusParameters["PeriodicRecycleTime"]
+    $recycleEventsToLog = $OctopusParameters["RecycleEventsToLog"]
+    $privateMemoryLimitKB = $OctopusParameters["PrivateMemoryLimitKB"]
+    $emptyClearsValue = $OctopusParameters["EmptyClearsValue"]
+
+    if ([string]::IsNullOrEmpty($applicationPoolName)) {
+        throw "Application pool name is required."
+    }
+
+    $appPool = Get-Item IIS:\AppPools\$applicationPoolName
+
+    if ($emptyClearsValue -eq $true) {
+        Write-Output "Empty values will reset to default"
+        if ([string]::IsNullOrEmpty($idleTimeout)) {
+            $idleTimeout = "0"
+        }
+        if ([string]::IsNullOrEmpty($periodicRestart)) {
+            $periodicRestart = "0"
+        }
+        if ([string]::IsNullOrEmpty($periodicRecycleTimes)) {
+            $periodicRecycleTimes = "-1"
+        }
+        if ([string]::IsNullOrEmpty($recycleEventsToLog)) {
+            $recycleEventsToLog = "-"
+        }
+        if ([string]::IsNullOrEmpty($privateMemoryLimitKB)) {
+            $privateMemoryLimitKB = "0"
+        }
+    }
+
+    if (![string]::IsNullOrEmpty($periodicRestart)) {
+        Update-IISAppPool-PeriodicRestart              -appPool $appPool -appPoolName $appPool.Name -PeriodicRestart $periodicRestart
+    }
+    if (![string]::IsNullOrEmpty($idleTimeout)) {
+        Update-IISAppPool-IdleTimeout                  -appPool $appPool -appPoolName $appPool.Name -idleTimeout $idleTimeout
+    }
+    if (![string]::IsNullOrEmpty($periodicRecycleTimes)) {
+        Update-IISAppPool-ScheduledTimes               -appPool $appPool -appPoolName $appPool.Name -Schedule $periodicRecycleTimes
+    }
+    if(![string]::IsNullOrEmpty($recycleEventsToLog)){
+        Update-IISAppPool-RecycleEventsToLog           -appPool $appPool -appPoolName $appPool.Name -Events $recycleEventsToLog
+    }
+    if (![string]::IsNullOrEmpty($privateMemoryLimitKB)) {
+        Update-IISAppPool-PrivateMemoryLimit           -appPool $appPool -appPoolName $appPool.Name -PrivateMemoryLimitKB $privateMemoryLimitKB
+    }
+}
+
+Run
diff --git a/src/step-templates/iis-autostartprovider-add/metadata.json b/src/step-templates/iis-autostartprovider-add/metadata.json
new file mode 100644
index 000000000..c1651219b
--- /dev/null
+++ b/src/step-templates/iis-autostartprovider-add/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "20b8c2fd-9194-47e3-948e-badc6c2a30d5",
+  "Name": "IIS AutoStartProvider - Add",
+  "Description": "Add autostartprovider entry so type can be used to warm up applicaiton. Final changes in applicationHost.config look like that:\n\n<serviceAutoStartProviders>\n    <add name=\"ApplicationPreload\" type=\"WebApplication1.ApplicationPreload, WebApplication1\" />\n</serviceAutoStartProviders>\n\nwhere name and type are taken from parameters.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "serviceName",
+      "Label": "Name of autostart service",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "serviceType",
+      "Label": "Type which implements IProcessHostPreloadClient",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-10-22T18:06:20.7890000-07:00",
+  "LastModifiedBy": "jmalczak",
+  "$Meta": {
+    "ExportedAt": "2015-10-22T19:23:21.6610000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-autostartprovider-add/scriptbody.ps1 b/src/step-templates/iis-autostartprovider-add/scriptbody.ps1
new file mode 100644
index 000000000..9787a5fb6
--- /dev/null
+++ b/src/step-templates/iis-autostartprovider-add/scriptbody.ps1
@@ -0,0 +1,68 @@
+# Running outside octopus
+param(
+        [string]$serviceName,
+        [string]$serviceType,
+        [switch]$whatIf
+     ) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+        if ($OctopusParameters -ne $null) {
+            $result = $OctopusParameters[$Name]
+        }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+            if ($variable -ne $null) {
+                $result = $variable.Value
+            }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+            [string]$serviceName,
+            [string]$serviceType
+         ) 
+
+        Write-Host "Setting $serviceName, $serviceType service autostart provider"
+
+        try {
+            Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+            Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+            $oldValue = Get-WebConfiguration -filter /system.applicationHost/serviceAutoStartProviders/add | 
+                        Where-Object { $_.Name -eq $serviceName }
+
+            if ($oldValue -eq $null) {
+                Write-Host "Adding new service type provider $serviceName, $serviceType"
+                Add-WebConfiguration -filter /system.applicationHost/serviceAutoStartProviders -Value @{name=$serviceName; type=$serviceType}
+            } 
+            elseif ($oldValue.Type -eq $serviceType) { 
+                Write-Host "Service provider with the same name and type exists"
+            } else {
+                $oldValueType = $oldValue.Type
+                Write-Host "Replacing service type from $oldValueType to $serviceType"
+                Set-WebConfiguration -filter "/system.applicationHost/serviceAutoStartProviders/add[@name='$serviceName']" -Value @{"type" = "$serviceType"}
+            }
+
+            Write-Host "Done"
+        } catch {
+            Write-Host $_.Exception|format-list -force
+            Write-Host "There was a problem setting property"    
+        }
+} `
+(Get-Param 'serviceName' -Required) (Get-Param 'serviceType' -Required) 
diff --git a/src/step-templates/iis-backup-iis-configuration/metadata.json b/src/step-templates/iis-backup-iis-configuration/metadata.json
new file mode 100644
index 000000000..9af5226be
--- /dev/null
+++ b/src/step-templates/iis-backup-iis-configuration/metadata.json
@@ -0,0 +1,24 @@
+{
+  "Id": "e1006e45-bbde-42e3-b6b9-16d804772684",
+  "Name": "IIS - Backup IIS Configuration",
+  "Description": "This backs up the entire IIS configuration for the server (does not include website files). Note that all prior configurations on that IIS server will be cleared out.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [],
+  "LastModifiedBy": "jjaffery",
+  "$Meta": {
+    "ExportedAt": "2016-11-23T21:07:51.4160000Z",
+    "OctopusVersion": "3.4.15",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-backup-iis-configuration/scriptbody.ps1 b/src/step-templates/iis-backup-iis-configuration/scriptbody.ps1
new file mode 100644
index 000000000..aa2f89b8e
--- /dev/null
+++ b/src/step-templates/iis-backup-iis-configuration/scriptbody.ps1
@@ -0,0 +1,20 @@
+<#
+This script will take the existing configuration (does not include website files) and back it up on the IIS Server, which can then be later restored if needed.
+
+To view existing backups for restore operation, find the latest backup here:
+    $env:Windir\System32\inetsrv\backup
+
+To restore, use the following commands:
+    Restore-WebConfiguration -Name "IISConfigBackup"
+    iisreset
+
+Reference Articles:
+https://technet.microsoft.com/en-us/library/hh867851(v=wps.630).aspx
+https://technet.microsoft.com/en-us/library/hh867862(v=wps.630).aspx
+#>
+
+# clear all backed up configurations first
+Remove-WebConfigurationBackup
+
+# perform backup
+Backup-WebConfiguration -Name "IISConfigBackup"
diff --git a/step-templates/iis-bind-ssl-certificate-with-sni-enabled.json b/src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/metadata.json
similarity index 67%
rename from step-templates/iis-bind-ssl-certificate-with-sni-enabled.json
rename to src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/metadata.json
index 96f4affd1..7e91b419f 100644
--- a/step-templates/iis-bind-ssl-certificate-with-sni-enabled.json
+++ b/src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 10,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$WebsiteName = $OctopusParameters['WebsiteName']\r\n$SSLBindingHost = $OctopusParameters['SSLBindingHost']\r\n$CertificateThumbPrint = $OctopusParameters['CertificateThumbPrint']\r\n\r\nnew-webbinding -Name $WebsiteName -Protocol \"https\" -Port 443 -HostHeader $SSLBindingHost -SslFlags 1\r\nnetsh http add sslcert hostnameport=$($SSLBindingHost):443 certhash=$CertificateThumbPrint appid='{58ee6009-4e61-400b-80cf-dedc242faf63}' certstorename=MY\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -38,12 +38,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-10-23T14:40:38.823+00:00",
+    "ExportedAt": "2014-10-23T07:40:38.8230000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/scriptbody.ps1 b/src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/scriptbody.ps1
new file mode 100644
index 000000000..a031823b4
--- /dev/null
+++ b/src/step-templates/iis-bind-ssl-certificate-with-sni-enabled/scriptbody.ps1
@@ -0,0 +1,6 @@
+$WebsiteName = $OctopusParameters['WebsiteName']
+$SSLBindingHost = $OctopusParameters['SSLBindingHost']
+$CertificateThumbPrint = $OctopusParameters['CertificateThumbPrint']
+
+new-webbinding -Name $WebsiteName -Protocol "https" -Port 443 -HostHeader $SSLBindingHost -SslFlags 1
+netsh http add sslcert hostnameport=$($SSLBindingHost):443 certhash=$CertificateThumbPrint appid='{58ee6009-4e61-400b-80cf-dedc242faf63}' certstorename=MY
diff --git a/src/step-templates/iis-bindings-backup/metadata.json b/src/step-templates/iis-bindings-backup/metadata.json
new file mode 100644
index 000000000..6a981e32d
--- /dev/null
+++ b/src/step-templates/iis-bindings-backup/metadata.json
@@ -0,0 +1,39 @@
+{
+  "Id": "0225e445-fe89-4cad-b495-4e26ba0b3ed0",
+  "Name": "IIS Bindings - Backup",
+  "Description": "Backs up IIS bindings for a given site so they can be restored in later steps. This is very useful if we we have any existing bindings on IIS server since Octopus wipes all existing bindings when create new ones.",
+  "ActionType": "Octopus.Script",
+  "Version": 13,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "webSiteName",
+      "Label": "Web Site Name",
+      "HelpText": "Name of the web site for which we should backup bindings",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "backupFolder",
+      "Label": "Folder where backed up binding file will be stored",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "jmalczak",
+  "$Meta": {
+    "ExportedAt": "2016-01-04T06:42:14.1310000-08:00",
+    "OctopusVersion": "3.2.13",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-bindings-backup/scriptbody.ps1 b/src/step-templates/iis-bindings-backup/scriptbody.ps1
new file mode 100644
index 000000000..b8be390fb
--- /dev/null
+++ b/src/step-templates/iis-bindings-backup/scriptbody.ps1
@@ -0,0 +1,77 @@
+# Running outside octopus
+param(
+    [string]$webSiteName,
+    [string]$backupFolder,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Get-File-Name($backupFolder, $webSiteName) {
+    $folder = Join-Path -Path $backupFolder -ChildPath $webSiteName
+
+    if((Test-Path $folder) -eq $false) {
+        mkdir $folder | Out-Null
+    }
+
+    $fullPath = $null;
+
+    if($OctopusParameters -eq $null) {
+         $fullPath = Join-Path -Path $folder -ChildPath "site_backup.xml"
+    } else {
+         $fileName = $OctopusParameters["Octopus.Release.Number"] + "_" + $OctopusParameters["Octopus.Environment.Name"] + ".xml"
+         $fullPath = Join-Path -Path $folder -ChildPath $fileName
+    }
+
+    return $fullPath
+}
+
+& {
+    param(
+        [string]$webSiteName,
+        [string]$backupFolder
+    ) 
+
+    Write-Host "Save $webSiteName bindings to bindings variable"
+
+    try {
+         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+         Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+         $currentBindings = Get-WebBinding -Name $webSiteName
+         $bindingsBackupFile = Get-File-Name $backupFolder $webSiteName
+         $currentBindings | Export-CliXML $bindingsBackupFile
+
+         Write-Host "Done"
+    } catch {
+        Write-Host $_.Exception|format-list -force
+        Write-Host "There was a problem saving bindings"    
+    }
+
+ } `
+ (Get-Param 'webSiteName' -Required) (Get-Param 'backupFolder' -Required)
diff --git a/src/step-templates/iis-bindings-enable-ssl-ccs/metadata.json b/src/step-templates/iis-bindings-enable-ssl-ccs/metadata.json
new file mode 100644
index 000000000..1f8f55978
--- /dev/null
+++ b/src/step-templates/iis-bindings-enable-ssl-ccs/metadata.json
@@ -0,0 +1,54 @@
+{
+  "Name": "IIS - Add CCS HTTPS bindings based on HTTP bindings",
+  "Description": "Add IIS Centralized Certificate Store (CCS) SSL bindings to a website based on HTTP bindings (binds to same IP and hostname but different port and protocol).\n\nThis is used to enable CCS on IIS websites created with the normal Octopus IIS website creation step.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e17b143f-d26c-458b-be41-6afca9e2666f",
+      "Name": "IisCcsWebSiteName",
+      "Label": "Website Name",
+      "HelpText": "Name of the website, can be retrieved from a IIS website deployment step: `#{Octopus.Action[*].IISWebSite.WebSiteName}`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "de1633dd-5dcd-4d8f-8c69-d031a6b32434",
+      "Name": "IisCcsSNI",
+      "Label": "Enable SNI",
+      "HelpText": "Enable SNI for the binding(s), default is enabled.",
+      "DefaultValue": "true",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "e6faf04c-441b-4ef2-8ad6-2ce0b4dc93df",
+      "Name": "IisCcsPortMap",
+      "Label": "Port mapping",
+      "HelpText": "Mapping of HTTP to HTTPS ports as list of integer parts. Default is `80:443` (multiple mappings may be added, separated by spaces).",
+      "DefaultValue": "80:443",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2019-09-14T22:53:52.7930000Z",
+    "OctopusVersion": "2019.7.1",
+    "Type": "ActionTemplate"
+  },
+  "Id": "0f21bd9a-2dea-4432-a1a1-2dee302ca418",
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-bindings-enable-ssl-ccs/scriptbody.ps1 b/src/step-templates/iis-bindings-enable-ssl-ccs/scriptbody.ps1
new file mode 100644
index 000000000..839854b43
--- /dev/null
+++ b/src/step-templates/iis-bindings-enable-ssl-ccs/scriptbody.ps1
@@ -0,0 +1,40 @@
+$WebSiteName = $OctopusParameters['IisCcsWebSiteName'];
+[bool]$SNI = $false;
+if (-not [bool]::TryParse($OctopusParameters['IisCcsSNI'], [ref]$SNI)) {
+    $SNI = $true;
+}
+$SslFlags = 2; # Use CCS
+if ($SNI) {
+	$SslFlags = 3; # Use SNI CCS
+}
+$PortMap = [System.Collections.Generic.Dictionary[int,int]]::new();
+foreach ($mapping in [regex]::Matches($OctopusParameters['IisCcsPortMap'],"([0-9]+):([0-9]+)")) {
+    $PortMap.Add([int]$mapping.Groups[1].Value, [int]$mapping.Groups[2].Value);
+}
+$httpBindings = Get-WebBinding -Name $WebSiteName -Protocol http | Foreach-Object { $_.bindingInformation };
+if (-not $httpBindings) {
+    Write-Error "The site $WebSiteName does not exist, or it has not HTTP binding"
+}
+foreach ($binding in (Get-WebBinding -Name $WebSiteName -Protocol http | Foreach-Object { $_.bindingInformation })) {
+    $parts = $binding.Split(":");
+    $IPAddress = $parts[0];
+    $HostHeader = $parts[2];
+    [int]$Port = 0;
+    if ([string]::IsNullOrEmpty($HostHeader)) {
+        Write-Warning "The binding $binding has no hostname, skipping";
+    } elseif (-not $PortMap.TryGetValue([int]$parts[1], [ref]$Port)) {
+        Write-Warning "There is no port mapping for the binding $binding, skipping";
+    } else {
+        Write-Verbose "Binding HTTP $binding to HTTPS $($IPAddress):$($Port):$($HostHeader)";
+        $existingBinding = Get-WebBinding -Name $WebSiteName -Protocol https -IPAddress $IPAddress -Port $Port -HostHeader $HostHeader;
+        if ($existingBinding) {
+            if ($existingBinding.sslFlags -ne $SslFlags) {
+                Write-Host "Change SSL flags of binding $($IPAddress):$($Port):$($HostHeader)";
+                Set-WebBinding -Name $WebSiteName -IPAddress $IPAddress -Port $Port -HostHeader $HostHeader -PropertyName SslFlags -Value $SslFlags;
+            }
+        } else {
+            Write-Host "Create HTTPS binding $($IPAddress):$($Port):$($HostHeader)";
+            New-WebBinding -Name $WebSiteName -Protocol https -IPAddress $IPAddress -Port $Port -HostHeader $HostHeader -SslFlags $SslFlags;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-bindings-restore/metadata.json b/src/step-templates/iis-bindings-restore/metadata.json
new file mode 100644
index 000000000..a57893d5d
--- /dev/null
+++ b/src/step-templates/iis-bindings-restore/metadata.json
@@ -0,0 +1,39 @@
+{
+  "Id": "9d357886-1896-4240-a89f-118c7ca8ec05",
+  "Name": "IIS Bindings - Restore",
+  "Description": "This step will restore IIS bindings from backup taken in IIS Bindings - Backup step. Only bindings which doesn't exist will be restored.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "webSiteName",
+      "Label": "Web Site Name",
+      "HelpText": "Name of the web site for which bindings will be restored from backup taken in previous IIS Bindings - Backup task. Only bindings which doesn't already exist will be restored.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "backupFolder",
+      "Label": "Folder where backed up binding file is stored",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "krusoleo",
+  "$Meta": {
+    "ExportedAt": "2023-01-30T13:19:56.3310000Z",
+    "OctopusVersion": "2019.6.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-bindings-restore/scriptbody.ps1 b/src/step-templates/iis-bindings-restore/scriptbody.ps1
new file mode 100644
index 000000000..237af8201
--- /dev/null
+++ b/src/step-templates/iis-bindings-restore/scriptbody.ps1
@@ -0,0 +1,95 @@
+# Running outside octopus
+param(
+    [string]$webSiteName,
+    [string]$backupFolder,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Get-File-Name($backupFolder, $webSiteName) {
+    $folder = Join-Path -Path $backupFolder -ChildPath $webSiteName
+
+    if((Test-Path $folder) -eq $false) {
+        mkdir $folder | Out-Null
+    }
+
+    $fullPath = $null;
+
+    if($OctopusParameters -eq $null) {
+         $fullPath = Join-Path -Path $folder -ChildPath "site_backup.xml"
+    } else {
+         $fileName = $OctopusParameters["Octopus.Release.Number"] + "_" + $OctopusParameters["Octopus.Environment.Name"] + ".xml"
+         $fullPath = Join-Path -Path $folder -ChildPath $fileName
+    }
+
+    return $fullPath
+}
+
+& {
+    param(
+        [string]$webSiteName,
+        [string]$backupFolder
+    ) 
+
+    Write-Host "Restore $webSiteName bindings from bindings variable"
+
+    try {
+        Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+        Import-Module WebAdministration -ErrorAction SilentlyContinue
+         
+        $bindingsBackupFile = Get-File-Name $backupFolder $webSiteName
+        $currentBindings = Import-CliXML $bindingsBackupFile 
+
+        if($currentBindings -eq $null) {
+            Write-Host "There is no saved bindings, you have to run IIS save bindings before"
+        } else {
+            foreach($binding in $currentBindings) {
+                $bindingArray = $binding.bindingInformation.Split(":")
+                $existing = Get-WebBinding -Name $webSiteName -Protocol $binding.protocol | Where-Object { $_.bindingInformation -eq $binding.bindingInformation }
+
+                if($existing -eq $null) {
+                    Write-Host "Adding binding" $binding.protocol $binding.bindingInformation                    
+                    New-WebBinding -Name $webSiteName -Protocol $binding.protocol -IPAddress $bindingArray[0] -Port $bindingArray[1] -HostHeader $bindingArray[2] -SslFlags $binding.sslFlags
+                    if ($binding.protocol -eq "https" -and $binding.certificateHash) {
+                        $newBinding = Get-WebBinding -Name $webSiteName -Protocol $binding.protocol -IPAddress $bindingArray[0] -Port $bindingArray[1] -HostHeader $bindingArray[2]
+                        Write-Host "Assigning certificate" $binding.certificateHash "to binding"
+                        $newBinding.AddSslCertificate($binding.certificateHash, $binding.certificateStoreName)
+                    }
+                }
+            }
+        }
+
+        Write-Host "Done"
+    } catch {
+        Write-Host $_.Exception|format-list -force
+        Write-Host "There was a problem restoring bindings"    
+    }
+
+ } `
+ (Get-Param 'webSiteName' -Required) (Get-Param 'backupFolder' -Required)
diff --git a/step-templates/iis-change-app-offline-online.json b/src/step-templates/iis-change-app-offline-online/metadata.json
similarity index 57%
rename from step-templates/iis-change-app-offline-online.json
rename to src/step-templates/iis-change-app-offline-online/metadata.json
index 3e9c861ad..f2d574881 100644
--- a/step-templates/iis-change-app-offline-online.json
+++ b/src/step-templates/iis-change-app-offline-online/metadata.json
@@ -6,7 +6,7 @@
   "Version": 8,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$offlineHtml = Join-Path $OctopusParameters[\"InstallationFolder\"] $OctopusParameters[\"AppOfflineFileName\"]\n$onlineHtml = Join-Path $OctopusParameters[\"InstallationFolder\"] $OctopusParameters[\"AppOnlineFileName\"]\n\n#If neither file exists, throw a fit\nif ($OctopusParameters[\"ChangeAppOffline.CheckForFile\"] -eq $True -and !(Test-Path($offlineHtml)) -and !(Test-Path($onlineHtml)))\n{\n\tWrite-Error \"Missing both online and offline files!\"\n    return\n}\n\n\nif (\"#{ChangeMode}\" -eq \"Online\")\n{\n    #Offline exists and so does online - remove offline\n    if ((Test-Path($offlineHtml)) -and (Test-Path($onlineHtml)))\n    {\n        Remove-Item $offlineHtml\n    }\n    \n    #Offline exists and online doesn't - move offline to online\n    if ((Test-Path($offlineHtml)) -and !(Test-Path($onlineHtml)))\n    {\n        Move-Item $offlineHtml $onlineHtml\n    }\n}\n\nif (\"#{ChangeMode}\" -eq \"Offline\")\n{\n    #Online exists and offline doesn't - move online to offline\n    if ((Test-Path($onlineHtml)) -and !(Test-Path($offlineHtml)))\n    {\n        Move-Item $onlineHtml $offlineHtml\n    }\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -57,10 +57,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-12-03T00:14:51.509+00:00",
+  "LastModifiedOn": "2021-12-02T16:14:51.5090000-08:00",
   "LastModifiedBy": "kseinyar-stcu",
   "$Meta": {
-    "ExportedAt": "2015-12-09T16:23:35.320+00:00",
+    "ExportedAt": "2015-12-09T08:23:35.3200000-08:00",
     "OctopusVersion": "3.2.8",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/iis-change-app-offline-online/scriptbody.ps1 b/src/step-templates/iis-change-app-offline-online/scriptbody.ps1
new file mode 100644
index 000000000..f11628130
--- /dev/null
+++ b/src/step-templates/iis-change-app-offline-online/scriptbody.ps1
@@ -0,0 +1,34 @@
+$offlineHtml = Join-Path $OctopusParameters["InstallationFolder"] $OctopusParameters["AppOfflineFileName"]
+$onlineHtml = Join-Path $OctopusParameters["InstallationFolder"] $OctopusParameters["AppOnlineFileName"]
+
+#If neither file exists, throw a fit
+if ($OctopusParameters["ChangeAppOffline.CheckForFile"] -eq $True -and !(Test-Path($offlineHtml)) -and !(Test-Path($onlineHtml)))
+{
+	Write-Error "Missing both online and offline files!"
+    return
+}
+
+
+if ("#{ChangeMode}" -eq "Online")
+{
+    #Offline exists and so does online - remove offline
+    if ((Test-Path($offlineHtml)) -and (Test-Path($onlineHtml)))
+    {
+        Remove-Item $offlineHtml
+    }
+    
+    #Offline exists and online doesn't - move offline to online
+    if ((Test-Path($offlineHtml)) -and !(Test-Path($onlineHtml)))
+    {
+        Move-Item $offlineHtml $onlineHtml
+    }
+}
+
+if ("#{ChangeMode}" -eq "Offline")
+{
+    #Online exists and offline doesn't - move online to offline
+    if ((Test-Path($onlineHtml)) -and !(Test-Path($offlineHtml)))
+    {
+        Move-Item $onlineHtml $offlineHtml
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-configure-compression/metadata.json b/src/step-templates/iis-configure-compression/metadata.json
new file mode 100644
index 000000000..9bc0a31e0
--- /dev/null
+++ b/src/step-templates/iis-configure-compression/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "66dc7184-8736-4ab8-be65-51cb3933eaef",
+  "Name": "IIS - Configure Compression",
+  "Description": "Configures the MIME types used in static and dynamic compression e.g. The application/json MIME type can be configured to be served using GZIP compression.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "StaticMimeTypes",
+      "Label": "Static Compression MIME Types",
+      "HelpText": "The MIME types to be added for static compression separated by commas. Example: _application/json,application/xml_",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DynamicMimeTypes",
+      "Label": "Dynamic Compression MIME Types",
+      "HelpText": "The MIME types to be added for dynamic compression separated by commas. Example: _application/json,application/xml_",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2016-01-22T02:27:42.8480000-08:00",
+    "OctopusVersion": "3.2.19",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-configure-compression/scriptbody.ps1 b/src/step-templates/iis-configure-compression/scriptbody.ps1
new file mode 100644
index 000000000..47cf3e70a
--- /dev/null
+++ b/src/step-templates/iis-configure-compression/scriptbody.ps1
@@ -0,0 +1,43 @@
+$psPath = 'MACHINE/WEBROOT/APPHOST';
+
+if ($StaticMimeTypes)
+{
+    $filter = "system.webServer/httpCompression/staticTypes";
+    
+    $existingStaticMimeTypes = (Get-WebConfigurationProperty -pspath $psPath -filter $filter -name ".").Collection;
+    foreach ($staticMimeType in $StaticMimeTypes.split(","))
+    {
+        if ($staticMimeType)
+        {
+            if (($existingStaticMimeTypes | ? { $_.mimeType -eq $staticMimeType }).Count -ne 0)
+            {
+                Remove-WebConfigurationProperty -pspath $psPath -filter $filter -name "." -AtElement @{mimeType=$staticMimeType};
+                Write-Output "Static MIME type $staticMimeType removed.";
+            }
+            
+            Add-WebConfigurationProperty -pspath $psPath -filter $filter -name "." -value @{mimeType=$staticMimeType;enabled='True'};
+            Write-Output "Static MIME type $staticMimeType added.";
+        }
+    }
+}
+
+if ($DynamicMimeTypes)
+{
+    $filter = "system.webServer/httpCompression/dynamicTypes";
+    
+    $existingDynamicMimeTypes = (Get-WebConfigurationProperty -pspath $psPath -filter $filter -name ".").Collection;
+    foreach ($dynamicMimeType in $DynamicMimeTypes.split(","))
+    {
+        if ($dynamicMimeType)
+        {
+            if (($existingDynamicMimeTypes | ? { $_.mimeType -eq $dynamicMimeType }).Count -ne 0)
+            {
+                Remove-WebConfigurationProperty -pspath $psPath -filter $filter -name "." -AtElement @{mimeType=$dynamicMimeType};
+                Write-Output "Dynamic MIME type $dynamicMimeType removed.";
+            }
+            
+            Add-WebConfigurationProperty -pspath $psPath -filter $filter -name "." -value @{mimeType=$dynamicMimeType;enabled='True'};
+            Write-Output "Dynamic MIME type $dynamicMimeType added.";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-list-sites/metadata.json b/src/step-templates/iis-list-sites/metadata.json
new file mode 100644
index 000000000..25c8e933f
--- /dev/null
+++ b/src/step-templates/iis-list-sites/metadata.json
@@ -0,0 +1,21 @@
+{
+  "Id": "05e87da8-a9df-449f-bdbb-98fa44740b46",
+  "Name": "IIS - List Sites",
+  "Description": "List sites on the server.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [],
+  "LastModifiedOn": "2016-12-19T15:20:00.0000000-08:00",
+  "LastModifiedBy": "BrettJaner",
+  "$Meta": {
+    "ExportedAt": "2016-12-19T15:20:00.0000000-08:00",
+    "OctopusVersion": "2.4.7.85",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-list-sites/scriptbody.ps1 b/src/step-templates/iis-list-sites/scriptbody.ps1
new file mode 100644
index 000000000..584111463
--- /dev/null
+++ b/src/step-templates/iis-list-sites/scriptbody.ps1
@@ -0,0 +1,28 @@
+try {
+	$iisFeature = Get-WindowsFeature Web-WebServer -ErrorAction Stop
+	if ($iisFeature -eq $null -or $iisFeature.Installed -eq $false) {
+		Write-Error "It looks like IIS is not installed on this server and the deployment is likely to fail."
+		Write-Error "Tip: You can use PowerShell to ensure IIS is installed: 'Install-WindowsFeature Web-WebServer'"
+		Write-Error "     You are likely to want more IIS features than just the web server. Run 'Get-WindowsFeature *web*' to see all of the features you can install."
+		exit 1
+	}
+} catch {
+	Write-Verbose "Call to `Get-WindowsFeature Web-WebServer` failed."
+	Write-Verbose "Unable to determine if IIS is installed on this server but will optimistically continue."
+}
+
+try {
+	Add-PSSnapin WebAdministration -ErrorAction Stop
+} catch {
+    try {
+		 Import-Module WebAdministration -ErrorAction Stop
+		} catch {
+			Write-Warning "We failed to load the WebAdministration module. This usually resolved by doing one of the following:"
+			Write-Warning "1. Install .NET Framework 3.5.1"
+			Write-Warning "2. Upgrade to PowerShell 3.0 (or greater)"
+			Write-Warning "3. On Windows 2008 you might need to install PowerShell SnapIn for IIS from http://www.iis.net/downloads/microsoft/powershell#additionalDownloads"
+			throw ($error | Select-Object -First 1)
+    }
+}
+
+Get-WebSite
\ No newline at end of file
diff --git a/src/step-templates/iis-redirect-to-https/metadata.json b/src/step-templates/iis-redirect-to-https/metadata.json
new file mode 100644
index 000000000..ccdddf69d
--- /dev/null
+++ b/src/step-templates/iis-redirect-to-https/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "929f72d3-e1c3-4b97-bac9-d84434ca63c3",
+  "Name": "IIS Website - HTTP to HTTPS Redirect",
+  "Description": "Adds either a global or site specific rule which redirects from http to https",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "4cb5e060-d027-465f-aa17-29d806f7cb6f",
+      "Name": "Site",
+      "Label": "Name of Website",
+      "HelpText": "Set the rule for a specific website.\nIf not supplied, a global rule will be created.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2854ab2d-a000-48dd-9b20-6930c73c96fb",
+      "Name": "EnableProxyRules",
+      "Label": "Enable proxy rules",
+      "HelpText": "If the website is running behind a proxy, this setting most likely need to be checked.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4f341e5c-0694-471c-ac04-3ce525fefad5",
+      "Name": "Disabled",
+      "Label": "Disable",
+      "HelpText": "Disable adding rules.\nThis will remove any rules mathing current values.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "perosb",
+  "$Meta": {
+    "ExportedAt": "2017-02-20T12:37:13.7240000Z",
+    "OctopusVersion": "3.7.4",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-redirect-to-https/scriptbody.ps1 b/src/step-templates/iis-redirect-to-https/scriptbody.ps1
new file mode 100644
index 000000000..81be52a40
--- /dev/null
+++ b/src/step-templates/iis-redirect-to-https/scriptbody.ps1
@@ -0,0 +1,25 @@
+$Name = "HTTP to HTTPS Redirect (Octopus Deploy)"
+$PsPath = "MACHINE/WEBROOT/APPHOST"
+$Filter = "system.webserver/rewrite/GlobalRules"
+
+Clear-WebConfiguration -pspath $PsPath -filter "$Filter/rule[@name='$Name']"
+if ($Site) {
+    $Filter = "system.webserver/rewrite/rules"
+    Clear-WebConfiguration -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']"
+}
+
+if ($Disabled -eq "true") {
+    exit
+}
+
+#Clear-WebConfiguration -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']"
+Add-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter" -name "." -value @{name=$Name; patternSyntax='ECMAScript'; stopProcessing='True'}
+Set-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']/match" -name url -value "(.*)"
+Add-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']/conditions" -name "." -value @{input="{HTTPS}"; pattern='^OFF$'}
+if ($EnableProxyRules -eq "true") {
+    Add-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']/conditions" -name "." -value @{input="{HTTP_X_FORWARDED_PROTO}"; pattern='^HTTP$'}
+}
+
+Set-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']/action" -name "type" -value "Redirect"
+Set-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']/action" -name "url" -value "https://{HTTP_HOST}/{R:1}"
+Set-WebConfigurationProperty -location $Site -pspath $PsPath -filter "$Filter/rule[@name='$Name']/action" -name "redirectType" -value "Permanent" 
\ No newline at end of file
diff --git a/step-templates/iis-reset.json b/src/step-templates/iis-reset/metadata.json
similarity index 60%
rename from step-templates/iis-reset.json
rename to src/step-templates/iis-reset/metadata.json
index b6c2625bb..59fc12425 100644
--- a/step-templates/iis-reset.json
+++ b/src/step-templates/iis-reset/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$wait = $OctopusParameters[\"iisWait\"] -and [boolean]::Parse($OctopusParameters[\"iisWait\"])\n$action = $OctopusParameters[\"iisAction\"]\n$errorAction = $OctopusParameters[\"iisErrorAction\"]\nif ($Action -eq \"/RESTART\") { Write-Host \"Restarting IIS\" }\nelseif ($Action -eq \"/START\") { Write-Host \"Starting IIS\" }\nelseif ($Action -eq \"/STOP\") { Write-Host \"Stopping IIS\" }\nelse {\n    Write-Error \"Unknown action $action\"\n    exit 1\n}\n\nif (($errorAction -ne \"Stop\") -and ($errorAction -ne \"Continue\") -and ($errorAction -ne \"SilentlyContinue\")) {\n    Write-Error \"Unknown ErrorAction $errorAction\"\n    exit 1\n}\n\nif ($wait) {\n    Write-Host \"Running with wait\"\n    Start-Process -FilePath \"iisreset\" -ArgumentList $Action -ErrorAction $OctopusParameters[\"iisErrorAction\"] -Wait\n}\nelse {\n    Write-Host \"Running without wait\"\n    Start-Process -FilePath \"iisreset\" -ArgumentList $Action -ErrorAction $OctopusParameters[\"iisErrorAction\"]\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -51,10 +51,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2017-07-31T09:33:19.272Z",
+  "LastModifiedOn": "2017-07-31T09:33:19.2720000Z",
   "LastModifiedBy": "zappy-shu",
   "$Meta": {
-    "ExportedAt": "2017-07-31T09:29:18.058Z",
+    "ExportedAt": "2017-07-31T09:29:18.0580000Z",
     "OctopusVersion": "3.12.4",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/iis-reset/scriptbody.ps1 b/src/step-templates/iis-reset/scriptbody.ps1
new file mode 100644
index 000000000..82a8881d3
--- /dev/null
+++ b/src/step-templates/iis-reset/scriptbody.ps1
@@ -0,0 +1,24 @@
+$wait = $OctopusParameters["iisWait"] -and [boolean]::Parse($OctopusParameters["iisWait"])
+$action = $OctopusParameters["iisAction"]
+$errorAction = $OctopusParameters["iisErrorAction"]
+if ($Action -eq "/RESTART") { Write-Host "Restarting IIS" }
+elseif ($Action -eq "/START") { Write-Host "Starting IIS" }
+elseif ($Action -eq "/STOP") { Write-Host "Stopping IIS" }
+else {
+    Write-Error "Unknown action $action"
+    exit 1
+}
+
+if (($errorAction -ne "Stop") -and ($errorAction -ne "Continue") -and ($errorAction -ne "SilentlyContinue")) {
+    Write-Error "Unknown ErrorAction $errorAction"
+    exit 1
+}
+
+if ($wait) {
+    Write-Host "Running with wait"
+    Start-Process -FilePath "iisreset" -ArgumentList $Action -ErrorAction $OctopusParameters["iisErrorAction"] -Wait
+}
+else {
+    Write-Host "Running without wait"
+    Start-Process -FilePath "iisreset" -ArgumentList $Action -ErrorAction $OctopusParameters["iisErrorAction"]
+}
diff --git a/src/step-templates/iis-set-authentication.steptemplate/metadata.json b/src/step-templates/iis-set-authentication.steptemplate/metadata.json
new file mode 100644
index 000000000..74a2f9bd4
--- /dev/null
+++ b/src/step-templates/iis-set-authentication.steptemplate/metadata.json
@@ -0,0 +1,60 @@
+{
+  "Id": "d3aa2e7b-d716-4f66-8d85-068cacedbb4f",
+  "Name": "IIS - Enable or Disable Authentication Methods",
+  "Description": "Step template to set the desired IIS Authentication (Anonymous, Windows, Digest) State for IIS site(s)",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "AnonymousAuth",
+      "Label": "Anonymous Authentication",
+      "HelpText": "Enable Anonymous Authentication.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "WindowsAuth",
+      "Label": "Windows Authentication",
+      "HelpText": "Enable Windows Authentication.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DigestAuth",
+      "Label": "Digest Authentication",
+      "HelpText": "Enable Digest Authentication.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "IISSitePaths",
+      "Label": "IIS Site name(s)",
+      "HelpText": "The IIS site(s) which will have security permissions transformed. Multiple values are to be new-line separated.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "HumanPrinter",
+  "$Meta": {
+    "ExportedAt": "2017-06-28T04:48:00.0000000-07:00",
+    "OctopusVersion": "3.3.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-set-authentication.steptemplate/scriptbody.ps1 b/src/step-templates/iis-set-authentication.steptemplate/scriptbody.ps1
new file mode 100644
index 000000000..b2527c919
--- /dev/null
+++ b/src/step-templates/iis-set-authentication.steptemplate/scriptbody.ps1
@@ -0,0 +1,56 @@
+#requires -version 3
+
+function Update-IISSiteAuthentication {
+    param
+    (
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [boolean]$State,
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$SitePath,
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$AuthMethod
+    )
+    
+    # check if WebAdministration module exists on the server
+    $cmd = (Get-Command "Get-Website" -errorAction SilentlyContinue)
+    if ($null -eq $cmd) {
+        throw "The Windows PowerShell snap-in 'WebAdministration' is not installed on this server. Details can be found at https://technet.microsoft.com/en-us/library/ee790599.aspx."
+    }
+    
+    $IISSecurityPath = "/system.WebServer/security/authentication/$AuthMethod"
+    $separator = "`r","`n",","
+    $IISSites = $sitepath.split($separator, [System.StringSplitOptions]::RemoveEmptyEntries).Trim(' ')
+
+    $IISValidSites = New-Object System.Collections.ArrayList
+	foreach ($website in Get-Website) {
+        $IISValidSites.Add($website.name)
+        foreach ($app in Get-WebApplication -Site $website.name) {
+			$path = $website.name + $app.path
+			$IISValidSites.Add($path)
+		}
+	}
+
+    $IISValidSiteNames = $IISValidSites -join ', '
+
+    foreach($Site in $IISSites) {
+        $IISSiteAvailable = $IISValidSites | Where-Object { $_ -eq $Site }
+
+        if ($IISSiteAvailable) {
+            Set-WebConfigurationProperty -Filter $IISSecurityPath -Name Enabled -Value $State -PSPath IIS:\\ -Location $Site
+            Write-Output "$AuthMethod for site '$Site' set successfully to '$State'."
+        }
+        else {
+            Write-Output "The IISSitePath '$Site' cannot be found. The valid sites are $IISValidSiteNames"
+            throw "The IISSitePath '$Site' cannot be found. The valid sites are $IISValidSiteNames"
+        }
+    }
+}
+
+if (Test-Path Variable:OctopusParameters) {
+    Update-IISSiteAuthentication -State ($AnonymousAuth -eq "True") -SitePath $IISSitePaths -AuthMethod "AnonymousAuthentication"
+    Update-IISSiteAuthentication -State ($WindowsAuth -eq "True") -SitePath $IISSitePaths -AuthMethod "WindowsAuthentication"
+    Update-IISSiteAuthentication -State ($DigestAuth -eq "True") -SitePath $IISSitePaths -AuthMethod "DigestAuthentication"
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-set-http-redirect/metadata.json b/src/step-templates/iis-set-http-redirect/metadata.json
new file mode 100644
index 000000000..561480967
--- /dev/null
+++ b/src/step-templates/iis-set-http-redirect/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "684b2249-a274-4518-ba73-e254eed037ac",
+  "Name": "IIS - Set HTTP Redirect on Site or Application",
+  "Description": "Configure a redirect for an IIS Site or Web Application",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "aba6b325-6d4e-4ebf-8c68-17b345db261d",
+      "Name": "iisSiteName",
+      "Label": "IIS Site Name",
+      "HelpText": "Name of the site to configure",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "97526f94-11ac-4050-b9b2-0af0a83e4095",
+      "Name": "iisApplicationName",
+      "Label": "IIS Web Application Name",
+      "HelpText": "Name of the Web Application on the IIS Site to configure the redirect on.  Leave blank if setting the redirect at the Site level.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "89af1c5d-17ee-476b-ada6-49ad5b0b3dc9",
+      "Name": "redirectUrl",
+      "Label": "Redirect URL",
+      "HelpText": "URL that the redirect points to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d76bd7c1-6075-4d14-b841-8c098e223bfd",
+      "Name": "enableRedirect",
+      "Label": "Enable Redirect",
+      "HelpText": "Boolean value for whether to enable or disable the redirect.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4b8f8b38-d449-40c7-b2c9-050f10645ae4",
+      "Name": "exactDesintation",
+      "Label": "Exact Destination",
+      "HelpText": "Boolean value to redirect all requests to exact destination (instead of relative to destination)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "25ab7952-c2ff-43f8-9b96-14ad24fac282",
+      "Name": "httpResponseStatus",
+      "Label": "Status Code",
+      "HelpText": "Web Response code sent to the client when redirecting.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Found|Found\nPermanent|Permanent\nTemporary|Temporary\nPermRedirect|Permanent Redirect\n"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-01-23T17:34:26.1090000Z",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2019-01-23T17:34:26.1090000Z",
+    "OctopusVersion": "2018.12.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-set-http-redirect/scriptbody.ps1 b/src/step-templates/iis-set-http-redirect/scriptbody.ps1
new file mode 100644
index 000000000..fbd7efa47
--- /dev/null
+++ b/src/step-templates/iis-set-http-redirect/scriptbody.ps1
@@ -0,0 +1,79 @@
+# Set temporary location for PowerShell modules
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+$iisPath = "IIS:\Sites\$iisSiteName"
+
+# Convert checkbox variables into true Boolean object types
+$enableRedirect = [System.Convert]::ToBoolean($enableRedirect)
+$exactDestination = [System.Convert]::ToBoolean($exactDestination)
+
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Get list of installed modules
+    $installedModules = Get-Module -ListAvailable
+
+    # Check to see if the module is installed
+    if ($null -ne ($installedModules | Where-Object {$_.Name -eq $PowerShellModuleName}))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-TemporaryPowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+# Check to see if WebAdministration module installed
+if (!(Get-ModuleInstalled -PowerShellModuleName "WebAdministration"))
+{
+    # Temporarily install module
+    Write-Output "Tempoarily installing PowerShell module WebAdministration."
+
+    Install-TemporaryPowerShellModule -PowerShellModuleName "WebAdministration" -LocalModulesPath $LocalModules
+}
+
+# Import the WebAdministartion module
+Import-Module -Name "WebAdministration"
+
+# Verify the site exists
+if ($null -eq (Get-WebSite -Name $iisSiteName))
+{
+    # Throw error
+    throw "Site $iisSiteName not found!"
+}
+
+# Check to see if the an application was specified
+if (!([string]::IsNullOrEmpty($iisApplicationName)))
+{
+    # Verify the appliation exists
+    if ($null -eq (Get-WebApplication -Site $iisSiteName -Name $iisApplicationName))
+    {
+        # Throw error
+        throw "Web application $iisApplicationName not found on site $iisSiteName!"
+    }
+
+    # Append application name to iis path
+    $iisPath += "\$iisApplicationName"
+}
+
+# Set redirect on application
+Set-WebConfiguration system.webserver/httpRedirect -PSPath $iisPath -Value @{enabled="$enableRedirect";destination="$redirectUrl";exactDestination="$exactDestination";httpResponseStatus="$httpResponseStatus"}
diff --git a/src/step-templates/iis-vdir-create/metadata.json b/src/step-templates/iis-vdir-create/metadata.json
new file mode 100644
index 000000000..5d4131844
--- /dev/null
+++ b/src/step-templates/iis-vdir-create/metadata.json
@@ -0,0 +1,86 @@
+{
+  "Id": "2cfbcd72-cf43-43fd-8291-9bb564cc512c",
+  "Name": "IIS Virtual Directory - Create",
+  "Description": "Create an IIS virtual directory.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "VirtualPath",
+      "Label": "Virtual path",
+      "HelpText": "The full path to the virtual directory you wish to create. Do not include the application (if any) the directory will be created under. The path, not including the virtual directory itself must already exist. Eg. If the virtual directory is to be created under `myapp/someFolder/myVdir` enter: `someFolder/myVdir`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApplicationName",
+      "Type": "String",
+      "Label": "Application",
+      "HelpText": "Name of the IIS application to create the virtual directory under (not required).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "PhysicalPath",
+      "Label": "Physical path",
+      "HelpText": "Physical folder that the application will serve files from. Example: `C:\\MyApp`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "CreatePhysicalPath",
+      "Label": "Create Physical Path (If not exists)",
+      "HelpText": "Create the physical path if it does not exist.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "ParentSite",
+      "Label": "Parent site",
+      "HelpText": "The name of the IIS web site to attach the application to. For example, to put the application under the default web site, enter:\n\n    Default Web Site",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Pass-through authentication username",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Pass-through authentication password",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedOn": "2017-03-21T16:56:11.0000000-07:00",
+  "LastModifiedBy": "jaymickey",
+  "$Meta": {
+    "ExportedAt": "2015-08-25T06:55:15.5180000-07:00",
+    "OctopusVersion": "3.0.9.2259",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-vdir-create/scriptbody.ps1 b/src/step-templates/iis-vdir-create/scriptbody.ps1
new file mode 100644
index 000000000..b75ce6492
--- /dev/null
+++ b/src/step-templates/iis-vdir-create/scriptbody.ps1
@@ -0,0 +1,154 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+
+$virtualPath = $OctopusParameters['VirtualPath'].TrimStart('/',' ').TrimEnd('/', ' ')
+$physicalPath = $OctopusParameters['PhysicalPath']
+$parentSite = $OctopusParameters['ParentSite']
+$application = $OctopusParameters['ApplicationName']
+$username = $OctopusParameters['Username']
+$password = $OctopusParameters['Password']
+$createPhysicalPath = $OctopusParameters['CreatePhysicalPath']
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Confirm-Parameter([string]$parameterInput, [string[]]$validInput, $parameterName) {
+    Write-Host "${parameterName}: $parameterInput"
+    if (! $parameterInput) {
+        throw "No value was set for $parameterName, and it cannot be empty"
+    }
+
+    if ($validInput) {
+        if (! $validInput -contains $parameterInput) {
+            throw "'$input' is not a valid input for '$parameterName'"
+        }
+    }
+
+}
+
+# Helper to run a block with a retry if things go wrong
+$maxFailures = 5
+$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+function Invoke-CommandWithRetry([ScriptBlock] $command) {
+    $attemptCount = 0
+    $operationIncomplete = $true
+
+    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+        $attemptCount = ($attemptCount + 1)
+
+        if ($attemptCount -ge 2) {
+            Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+            Start-Sleep -s $sleepBetweenFailures
+            Write-Output "Retrying..."
+        }
+
+        try {
+            & $command
+
+            $operationIncomplete = $false
+        } catch [System.Exception] {
+            if ($attemptCount -lt ($maxFailures)) {
+                Write-Output ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+
+            }
+            else {
+                throw "Failed to execute command"
+            }
+        }
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+Confirm-Parameter $virtualPath -parameterName "Virtual path"
+Confirm-Parameter $physicalPath -parameterName "Physical path"
+Confirm-Parameter $parentSite -parameterName "Parent site"
+
+if (![string]::IsNullOrEmpty($application)) {
+    $application = $application.TrimStart('/',' ').TrimEnd('/',' ')
+}
+
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+
+## --------------------------------------------------------------------------------------
+## Run
+## --------------------------------------------------------------------------------------
+
+Write-Host "Getting web site $parentSite"
+$site = Get-Website -name $parentSite
+if (!$site) {
+    throw "The web site '$parentSite' does not exist. Please create the site first."
+}
+
+$virtualFullPath = $virtualPath
+
+if ($application) {
+    Write-Host "Verifying existance of application $application"
+    $app = Get-WebApplication -site $parentSite -name $application
+    if (!$app) {
+        throw "The application '$parentSite' does not exist. Please create the application first."
+    } else {
+        $virtualFullPath = $application + '/' + $virtualPath
+    }
+}
+
+# If the physical path down not exist and $createPhysicalPath is true,
+# then attempt create it, otherwise throw an error.
+if (!(Test-Path $physicalPath)) {
+    if ($createPhysicalPath) {
+        try {
+            Write-Host "Attempting to create physical path '$physicalPath'"
+            New-Item -Type Directory -Path $physicalPath -Force
+        } catch {
+            throw "Couldn't create physical path!"
+        }
+    } else {
+        throw "Physical path does not exist!"
+    }
+}
+
+# This needs to be improved, especially given applicaltions can be nested.
+if ($application) {
+    $existing = Get-WebVirtualDirectory -site $parentSite -Application $application -Name $virtualPath
+} else {
+    $existing = Get-WebVirtualDirectory -site $parentSite -Name $virtualPath
+}
+
+Invoke-CommandWithRetry {
+
+    $virtualDirectoryPath = "IIS:\Sites\$parentSite\$virtualFullPath"
+
+    if (!$existing) {
+        Write-Host "Creating virtual directory '$virtualPath'"
+
+        New-Item $virtualDirectoryPath -type VirtualDirectory -physicalPath $physicalPath
+
+        Write-Host "Virtual directory created"
+    }
+    else {
+        Write-Host "The virtual directory '$virtualPath' already exists. Checking physical path."
+
+        $currentPath = (Get-ItemProperty $virtualDirectoryPath).physicalPath
+        Write-Host "Physical path currently set to $currentPath"
+
+        if ([string]::Compare($currentPath, $physicalPath, $True) -ne 0) {
+            Set-ItemProperty $virtualDirectoryPath -name physicalPath -value $physicalPath
+            Write-Host "Physical path changed to $physicalPath"
+        }
+    }
+
+    ## Set vdir pass-through credentails, if applicable
+    if (![string]::IsNullOrEmpty($username) -and ![string]::IsNullOrEmpty($password)) {
+        Write-Host "Setting Pass-through credentials for username '$username'"
+
+        Set-ItemProperty $virtualDirectoryPath -Name userName -Value $username
+        Set-ItemProperty $virtualDirectoryPath -Name password -Value $password
+
+        Write-Host "Pass-through credentials set"
+    }
+}
diff --git a/src/step-templates/iis-website-add-http-s-bindings/metadata.json b/src/step-templates/iis-website-add-http-s-bindings/metadata.json
new file mode 100644
index 000000000..9759963c4
--- /dev/null
+++ b/src/step-templates/iis-website-add-http-s-bindings/metadata.json
@@ -0,0 +1,84 @@
+{
+  "Id": "0ad0ad00-adad-adad-adad-000000000003",
+  "Name": "IIS - Add HTTP(S) Bindings",
+  "Description": "Adds HTTP and HTTPS bindings to a website using the specified host name, port numbers, Certificate Location, and SSL Thumbprint",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Name": "AD_AddBinding_WebsiteName",
+      "Label": "Website name",
+      "HelpText": "The website name to apply the binding to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddBinding_HostName",
+      "Label": "Host name",
+      "HelpText": "The host name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddBinding_HttpPort",
+      "Label": "Http Port",
+      "HelpText": "Optional HTTP port number",
+      "DefaultValue": "80",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddBinding_HttpsPort",
+      "Label": "HTTPS Port",
+      "HelpText": "Optional HTTPS port number",
+      "DefaultValue": "443",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddBinding_SSLThumbprint",
+      "Label": "SSL Thumbprint",
+      "HelpText": "The SSL certificate thumbprint(no spaces)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddBinding_SSLCertificateLocation",
+      "Label": "Certificate Store Location",
+      "HelpText": "Optional Certificate Store location, Defaults to \"My\"",
+      "DefaultValue": "My",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_AddBinding_Attempts",
+      "Label": "Nr of attempts",
+      "HelpText": "Optional number of attempts before failing",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "hasherdk",
+  "$Meta": {
+    "ExportedAt": "2020-07-17T05:49:27.2800000Z",
+    "OctopusVersion": "2019.8.6",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-add-http-s-bindings/scriptbody.ps1 b/src/step-templates/iis-website-add-http-s-bindings/scriptbody.ps1
new file mode 100644
index 000000000..bea15a827
--- /dev/null
+++ b/src/step-templates/iis-website-add-http-s-bindings/scriptbody.ps1
@@ -0,0 +1,126 @@
+# Running outside octopus
+Param(
+    [string] $AD_AddBinding_WebsiteName,
+    [string] $AD_AddBinding_HostName,
+    [UInt32] $AD_AddBinding_HttpPort = 80,
+    [UInt32] $AD_AddBinding_HttpsPort = 443,
+    [string] $AD_AddBinding_SSLThumbprint = $null,
+    [string] $AD_AddBinding_SSLCertificateLocation = "My",
+    [Int16] $AD_AddBinding_Attempts = 5,
+    [switch] $WhatIf
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($null -ne $OctopusParameters) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($null -eq $result) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($null -ne $variable) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($null -eq $result) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        }
+        else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Execute(
+    [Parameter(Mandatory = $true)][string] $WebsiteName,
+    [Parameter(Mandatory = $true)][string] $HostName,
+    [Parameter(Mandatory = $false)][uint32] $HttpPort = 80,
+    [Parameter(Mandatory = $false)][uint32] $HttpsPort = 443,
+    [Parameter(Mandatory = $false)][string] $SSLThumbprint = $null,
+    [Parameter(Mandatory = $false)][string] $SSLCertificateLocation = "My",
+    [Parameter(Mandatory = $false)][Int16] $Attempts = 5
+) {
+    Import-Module WebAdministration
+
+    $attemptCount = 0
+    $operationIncomplete = $true
+    $maxFailures = $Attempts
+    $sleepBetweenFailures = 1
+
+    $appId = '{00112233-4455-6677-8899-AABBCCDDEEFF}'
+
+    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+        $attemptCount = ($attemptCount + 1)
+        if ($attemptCount -ge 2) {
+            Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+            Start-Sleep -s $sleepBetweenFailures
+            Write-Output "Retrying..."
+            $sleepBetweenFailures = ($sleepBetweenFailures * 2)
+        }
+        try {
+            $protocol = "http"
+            $otherProtocol = "https"
+
+            $existingBinding = Get-WebBinding -Name $WebsiteName -Port $HttpPort -HostHeader $HostName
+            $msg = "Binding '{0} *:{1}:{2} sslFlags=0' on '{3}'" -f $protocol, $HttpPort, $HostName, $WebsiteName
+            if ($null -eq $existingBinding) {
+                Write-Output "$msg doesn't exist - ADDING..."
+                if (-Not ($WhatIf)) {
+                    New-WebBinding -Name $WebsiteName -Protocol $protocol -Port $HttpPort -HostHeader $HostName -SslFlags 0
+                }
+                Write-Output "$msg - ADDED"
+            }
+            elseif ($existingBinding.protocol -contains $protocol) {
+                Write-Output "$msg  already exists - SKIPING"
+            }
+            else {
+                Write-Error "$msg can't be added because it already exists on $otherProtocol"
+            }
+            Write-Output "SSL is : $SSLThumbprint"
+            if (-Not ([string]::IsNullOrWhitespace($SSLThumbprint))) {
+                $protocol = "https"
+                $otherProtocol = "http"
+                $existingBinding = Get-WebBinding -Name $WebsiteName -Port $HttpsPort -HostHeader $HostName
+                $msg = "Binding '{0} *:{1}:{2} sslFlags=1' on '{3}'" -f $protocol, $HttpsPort, $HostName, $WebsiteName
+                if ($null -eq $existingBinding) {
+                    Write-Output "$msg doesn't exist - ADDING..."
+                    if (-Not ($WhatIf)) {
+                        New-WebBinding -Name $WebsiteName -Protocol $protocol -Port $HttpsPort -HostHeader $HostName -SslFlags 1
+                        netsh http add sslcert hostnameport=$($HostName):$HttpsPort certhash=$SSLThumbprint appid=$appId certstorename=$SSLCertificateLocation
+                    }
+                    Write-Output "$msg - ADDED"
+                }
+                elseif ($existingBinding.protocol -contains $protocol) {
+                    Write-Output "$msg  already exists - SKIPING"
+                }
+                else {
+                    Write-Error "$msg can't be added because it already exists on $otherProtocol"
+                }
+            }
+            $operationIncomplete = $false
+        }
+        catch [System.Exception] {
+            if ($attemptCount -lt ($maxFailures)) {
+                Write-Host ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+            }
+            else {
+                throw
+            }
+        }
+    }
+}
+& Execute `
+(Get-Param 'AD_AddBinding_WebsiteName' -Required)`
+(Get-Param 'AD_AddBinding_HostName' -Required)`
+(Get-Param 'AD_AddBinding_HttpPort')`
+(Get-Param 'AD_AddBinding_HttpsPort')`
+(Get-Param 'AD_AddBinding_SSLThumbprint')`
+(Get-Param 'AD_AddBinding_SSLCertificateLocation')`
+(Get-Param 'AD_AddBinding_Attempts')
diff --git a/src/step-templates/iis-website-add-release-number-to-response-header/metadata.json b/src/step-templates/iis-website-add-release-number-to-response-header/metadata.json
new file mode 100644
index 000000000..81e0fdb4d
--- /dev/null
+++ b/src/step-templates/iis-website-add-release-number-to-response-header/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "7b51887e-1ad2-4133-b3a3-37688bb49b01",
+  "Name": "IIS Website - Add Release Number to Response Header",
+  "Description": "Adds the Octopus Deploy Release number to the IIS response header. When you browse your site you can look at the response header to verify the build number that is running.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "headerFieldName",
+      "Label": "Field name",
+      "HelpText": "The name of the custom header field with the release information.",
+      "DefaultValue": "Release",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "headerWebsiteName",
+      "Label": "Website name",
+      "HelpText": "The name of the website in IIS.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-03-19T16:25:56.9460000Z",
+  "LastModifiedBy": "geeeyetee",
+  "$Meta": {
+    "ExportedAt": "2019-03-19T16:25:56.9460000Z",
+    "OctopusVersion": "2019.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-add-release-number-to-response-header/scriptbody.ps1 b/src/step-templates/iis-website-add-release-number-to-response-header/scriptbody.ps1
new file mode 100644
index 000000000..bd3a5a1f6
--- /dev/null
+++ b/src/step-templates/iis-website-add-release-number-to-response-header/scriptbody.ps1
@@ -0,0 +1,51 @@
+Write-Host "Adding release number to response header"
+
+function Get-IISServerManager
+{
+    [CmdletBinding()]
+    [OutputType([System.Object])]
+    param ()
+
+    $iisInstallPath = (Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\INetStp' -Name InstallPath).InstallPath
+    if (-not $iisInstallPath)
+    {
+        throw ('IIS installation path not found')
+    }
+    $assyPath = Join-Path -Path $iisInstallPath -ChildPath 'Microsoft.Web.Administration.dll' -Resolve -ErrorAction:SilentlyContinue
+    if (-not $assyPath)
+    {
+        throw 'IIS version of Microsoft.Web.Administration.dll not found'
+    }
+    $assy = [System.Reflection.Assembly]::LoadFrom($assyPath)
+    return [System.Activator]::CreateInstance($assy.FullName, 'Microsoft.Web.Administration.ServerManager').Unwrap()
+}
+
+$iis = Get-IISServerManager
+$config = $iis.GetWebConfiguration($OctopusParameters['headerWebsiteName'])
+$httpProtocolSection = $config.GetSection("system.webServer/httpProtocol")
+$customHeadersCollection = $httpProtocolSection.GetCollection("customHeaders")
+
+$update = $true
+
+foreach($path in $customHeadersCollection.GetCollection()) { 
+    if ($path.GetAttributeValue("name") -eq $OctopusParameters['headerFieldName']) {
+        write-host "Release number is already in the response header, skipping"
+        $update = $false
+        break
+    }
+}
+
+if ($update)
+{
+    $fieldName = $OctopusParameters['headerFieldName']
+    $releaseNumber = $OctopusParameters['Octopus.Release.Number']
+    
+    Write-Host "Adding release number $releaseNumber to custom header $fieldName"
+    
+    $addElement = $customHeadersCollection.CreateElement("add")
+    $addElement["name"] = $fieldName
+    $addElement["value"] = $releaseNumber
+    $customHeadersCollection.Add($addElement)
+    
+    $iis.CommitChanges() | Write-Host
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-website-add-windows-auth-providers/metadata.json b/src/step-templates/iis-website-add-windows-auth-providers/metadata.json
new file mode 100644
index 000000000..e72559fa1
--- /dev/null
+++ b/src/step-templates/iis-website-add-windows-auth-providers/metadata.json
@@ -0,0 +1,51 @@
+{
+  "Id": "f3cf7831-d47c-4b5f-8f76-6bc649d59dd9",
+  "Name": "Explicitly Add IIS WindowsAuthentication Providers",
+  "Description": "Clears the WindowsAuthentication Providers, and explicitly adds the ones provided.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "add-windows-authentication-providers.is-enabled",
+      "Label": "Add Windows Authentication Providers",
+      "HelpText": "If enabled, This step will clear the Windows Authentication Providers, and then add the ones listed in the\n    Windows Authentication Providers\nfield.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "add-windows-authentication-providers.website-name",
+      "Label": "Web Site name",
+      "HelpText": "The display name of the IIS web site to add Windows Authentication providers to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "add-windows-authentication-providers.providers",
+      "Label": "Windows Authentication Providers",
+      "HelpText": "A comma- or newline-separated list of Windows Authentication Providers to add.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "KShanafelt",
+  "$Meta": {
+    "ExportedAt": "2016-05-26T18:18:58.0410000-07:00",
+    "OctopusVersion": "3.3.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-add-windows-auth-providers/scriptbody.ps1 b/src/step-templates/iis-website-add-windows-auth-providers/scriptbody.ps1
new file mode 100644
index 000000000..6ba944082
--- /dev/null
+++ b/src/step-templates/iis-website-add-windows-auth-providers/scriptbody.ps1
@@ -0,0 +1,76 @@
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+
+$isEnabled = $OctopusParameters["add-windows-authentication-providers.is-enabled"]
+if (!$isEnabled -or ![boolean]::Parse($isEnabled))
+{
+   exit 0
+}
+
+try {
+    Add-PSSnapin WebAdministration
+} catch {
+    try {
+        Import-Module WebAdministration
+    } catch {
+		Write-Warning "We failed to load the WebAdministration module. This usually resolved by doing one of the following:"
+		Write-Warning "1. Install .NET Framework 3.5.1"
+		Write-Warning "2. Upgrade to PowerShell 3.0 (or greater)"
+        throw ($error | Select-Object -First 1)
+    }
+}
+
+$webSiteName = $OctopusParameters["add-windows-authentication-providers.website-name"]
+$providersString = $OctopusParameters["add-windows-authentication-providers.providers"]
+$providers = ($providersString.Split("`r`n,") | % {$_.Trim() } | ? {$_})
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+$maxFailures = 5
+$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+function Execute-WithRetry([ScriptBlock] $command) {
+    $attemptCount = 0
+    $operationIncomplete = $true
+
+    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+        $attemptCount = ($attemptCount + 1)
+
+        if ($attemptCount -ge 2) {
+            Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+            Start-Sleep -s $sleepBetweenFailures
+            Write-Output "Retrying..."
+        }
+
+        try {
+            & $command
+
+            $operationIncomplete = $false
+        } catch [System.Exception] {
+            if ($attemptCount -lt ($maxFailures)) {
+                Write-Output ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+            }
+            else {
+                throw "Failed to execute command"
+            }
+        }
+    }
+}
+
+## --------------------------------------------------------------------------------------
+## Run
+## --------------------------------------------------------------------------------------
+Execute-WithRetry { 
+    Write-Host "Clearing Windows Authentication Providers for $webSiteName"
+    Remove-WebConfigurationProperty -PSPath IIS:\ -Location "$webSiteName" -filter system.webServer/security/authentication/windowsAuthentication/providers -name "."
+}
+
+$providersPrintedString = $providers -join ", "
+Write-Host "Providers to add: $providersPrintedString"
+foreach ($provider in $providers) {
+    Write-Host "Windows Authentication Provider $provider"
+    Execute-WithRetry { 
+        Add-WebConfiguration -Filter system.webServer/security/authentication/windowsAuthentication/providers -PSPath IIS:\ -Location "$webSiteName" -Value "$provider"
+    }
+}
\ No newline at end of file
diff --git a/step-templates/iis-website-appfabric-application-start.json b/src/step-templates/iis-website-appfabric-application-start/metadata.json
similarity index 55%
rename from step-templates/iis-website-appfabric-application-start.json
rename to src/step-templates/iis-website-appfabric-application-start/metadata.json
index f0c04d7bc..b18b3385a 100644
--- a/step-templates/iis-website-appfabric-application-start.json
+++ b/src/step-templates/iis-website-appfabric-application-start/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 11,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Import-Module WebAdministration\n\n$webSiteName = $OctopusParameters['WebSiteName']\n$applicationName = $OctopusParameters['ApplicationName']\n\nif (!$webSiteName)\n{\n    Write-Error \"No Website name was specified. Please specify the name of the Website that contains the AppFabric application.\"\n    exit -2\n}\n\nif (!$applicationName)\n{\n    Write-Error \"No Application name was specified. Please specify the name of the AppFabric Application contained in the Website.\"\n    exit -2\n}\n\nWrite-Output \"Starting IIS AppFabric application $applicationName in website $webSiteName\"\nStart-AsApplication $webSiteName $applicationName\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -29,12 +29,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2014-09-20T21:03:29.922+00:00",
+  "LastModifiedOn": "2014-09-20T14:03:29.9220000-07:00",
   "LastModifiedBy": "caioproiete",
   "$Meta": {
-    "ExportedAt": "2014-09-20T21:16:03.171+00:00",
+    "ExportedAt": "2014-09-20T14:16:03.1710000-07:00",
     "OctopusVersion": "2.5.8.447",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-website-appfabric-application-start/scriptbody.ps1 b/src/step-templates/iis-website-appfabric-application-start/scriptbody.ps1
new file mode 100644
index 000000000..0c17d2aa5
--- /dev/null
+++ b/src/step-templates/iis-website-appfabric-application-start/scriptbody.ps1
@@ -0,0 +1,19 @@
+Import-Module WebAdministration
+
+$webSiteName = $OctopusParameters['WebSiteName']
+$applicationName = $OctopusParameters['ApplicationName']
+
+if (!$webSiteName)
+{
+    Write-Error "No Website name was specified. Please specify the name of the Website that contains the AppFabric application."
+    exit -2
+}
+
+if (!$applicationName)
+{
+    Write-Error "No Application name was specified. Please specify the name of the AppFabric Application contained in the Website."
+    exit -2
+}
+
+Write-Output "Starting IIS AppFabric application $applicationName in website $webSiteName"
+Start-AsApplication $webSiteName $applicationName
diff --git a/step-templates/iis-website-appfabric-application-stop.json b/src/step-templates/iis-website-appfabric-application-stop/metadata.json
similarity index 55%
rename from step-templates/iis-website-appfabric-application-stop.json
rename to src/step-templates/iis-website-appfabric-application-stop/metadata.json
index f9417cee6..9aaac7e92 100644
--- a/step-templates/iis-website-appfabric-application-stop.json
+++ b/src/step-templates/iis-website-appfabric-application-stop/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 6,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Import-Module WebAdministration\n\n$webSiteName = $OctopusParameters['WebSiteName']\n$applicationName = $OctopusParameters['ApplicationName']\n\nif (!$webSiteName)\n{\n    Write-Error \"No Website name was specified. Please specify the name of the Website that contains the AppFabric application.\"\n    exit -2\n}\n\nif (!$applicationName)\n{\n    Write-Error \"No Application name was specified. Please specify the name of the AppFabric Application contained in the Website.\"\n    exit -2\n}\n\nWrite-Output \"Stopping IIS AppFabric application $applicationName in website $webSiteName\"\nStop-AsApplication $webSiteName $applicationName\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -29,12 +29,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2014-09-20T21:03:33.663+00:00",
+  "LastModifiedOn": "2014-09-20T14:03:33.6630000-07:00",
   "LastModifiedBy": "caioproiete",
   "$Meta": {
-    "ExportedAt": "2014-09-20T21:19:58.914+00:00",
+    "ExportedAt": "2014-09-20T14:19:58.9140000-07:00",
     "OctopusVersion": "2.5.8.447",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-website-appfabric-application-stop/scriptbody.ps1 b/src/step-templates/iis-website-appfabric-application-stop/scriptbody.ps1
new file mode 100644
index 000000000..e4461c062
--- /dev/null
+++ b/src/step-templates/iis-website-appfabric-application-stop/scriptbody.ps1
@@ -0,0 +1,19 @@
+Import-Module WebAdministration
+
+$webSiteName = $OctopusParameters['WebSiteName']
+$applicationName = $OctopusParameters['ApplicationName']
+
+if (!$webSiteName)
+{
+    Write-Error "No Website name was specified. Please specify the name of the Website that contains the AppFabric application."
+    exit -2
+}
+
+if (!$applicationName)
+{
+    Write-Error "No Application name was specified. Please specify the name of the AppFabric Application contained in the Website."
+    exit -2
+}
+
+Write-Output "Stopping IIS AppFabric application $applicationName in website $webSiteName"
+Stop-AsApplication $webSiteName $applicationName
diff --git a/src/step-templates/iis-website-create/metadata.json b/src/step-templates/iis-website-create/metadata.json
new file mode 100644
index 000000000..5c40d3f54
--- /dev/null
+++ b/src/step-templates/iis-website-create/metadata.json
@@ -0,0 +1,112 @@
+{
+  "Id": "74c6ab38-f56c-4637-918c-1b46b4e24049",
+  "Name": "IIS Website - Create",
+  "Description": "Creates a new website in IIS",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "WebsiteName",
+      "Label": "Website name",
+      "HelpText": "The display name of the IIS website to create.\n\nExample: Default Web Site",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WebRoot",
+      "Label": "Relative home directory",
+      "HelpText": "The directory which will be used as the home directory of the IIS website. This should be bound to the installation directory of a previous step.\n\nExample: C:\\inetpub\\wwwroot",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApplicationPoolName",
+      "Label": "Application pool name",
+      "HelpText": "Name of the application pool in IIS to use for the new website",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BindingProtocol",
+      "Label": "Protocol",
+      "HelpText": "The protocol to use for the new website",
+      "DefaultValue": "http",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BindingPort",
+      "Label": "Port",
+      "HelpText": "The port to use for the new website",
+      "DefaultValue": "80",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BindingIpAddress",
+      "Label": "IP address",
+      "HelpText": "The IP address to use for the new website",
+      "DefaultValue": "*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BindingHost",
+      "Label": "Host Header",
+      "HelpText": "The host name to use for the new website\n\nExample: company.example.com",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BindingSslThumbprint",
+      "Label": "Thumbprint",
+      "HelpText": "The thumbprint of the SSL certificate to use for the new website when using the HTTPS protocol\n\nExample: 7c003ac253aa41e89976f139c11edd7b",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "IisAuthentication",
+      "Label": "IIS Authentication",
+      "HelpText": "The authentication mode to use for the new website (can be Anonymous, Basic or Windows), specify multiple modes by entering the modes required separated by a ',' or ';'",
+      "DefaultValue": "Anonymous",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WebsiteStart",
+      "Label": "Start the Website",
+      "HelpText": "Uncheck if you don't want the website started after it is created.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2016-02-03T17:00:46.7710000-08:00",
+    "OctopusVersion": "3.2.19",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-create/scriptbody.ps1 b/src/step-templates/iis-website-create/scriptbody.ps1
new file mode 100644
index 000000000..9a5703016
--- /dev/null
+++ b/src/step-templates/iis-website-create/scriptbody.ps1
@@ -0,0 +1,226 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+
+$webSiteName = $OctopusParameters['WebSiteName']
+$applicationPoolName = $OctopusParameters["ApplicationPoolName"]
+$bindingProtocol = $OctopusParameters["BindingProtocol"]
+$bindingPort = $OctopusParameters["BindingPort"]
+$bindingIpAddress = $OctopusParameters["BindingIpAddress"]
+$bindingHost = $OctopusParameters["BindingHost"]
+$bindingSslThumbprint = $OctopusParameters["BindingSslThumbprint"]
+$webRoot = $OctopusParameters["WebRoot"]
+$iisAuthentication = $OctopusParameters["IisAuthentication"]
+$webSiteStart = $OctopusParameters["WebsiteStart"]
+
+
+$anonymousAuthentication = "Anonymous"
+$basicAuthentication = "Basic"
+$windowsAuthentication = "Windows"
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Validate-Parameter($foo, [string[]]$validInput, $parameterName) {
+    Write-Host "${parameterName}: ${foo}"
+    if (! $foo) {
+        throw "$parameterName cannot be empty, please specify a value"
+    }
+    
+    if ($validInput) {
+        @($foo) | % { 
+                if ($validInput -notcontains $_) {
+                    throw "'$_' is not a valid input for '$parameterName'"
+                }
+             }  
+        }   
+}
+
+# Helper to run a block with a retry if things go wrong
+$maxFailures = 5
+$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+function Execute-WithRetry([ScriptBlock] $command) {
+	$attemptCount = 0
+	$operationIncomplete = $true
+
+	while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+		$attemptCount = ($attemptCount + 1)
+
+		if ($attemptCount -ge 2) {
+			Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+			Start-Sleep -s $sleepBetweenFailures
+			Write-Output "Retrying..."
+		}
+
+		try {
+			& $command
+
+			$operationIncomplete = $false
+		} catch [System.Exception] {
+			if ($attemptCount -lt ($maxFailures)) {
+				Write-Output ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+			
+			}
+			else {
+			    throw "Failed to execute command"
+			}
+		}
+	}
+}
+
+## --------------------------------------------------------------------------------------
+## Validate Input
+## --------------------------------------------------------------------------------------
+
+Write-Output "Validating paramters..."
+Validate-Parameter $webSiteName -parameterName "Web Site Name"
+Validate-Parameter $applicationPoolName -parameterName "Application Pool Name"
+Validate-Parameter $bindingProtocol -validInput @("HTTP", "HTTPS") -parameterName "Protocol"
+Validate-Parameter $bindingPort -parameterName "Port"
+if($bindingProtocol.ToLower() -eq "https") {
+    Validate-Parameter $bindingSslThumbprint -parameterName "SSL Thumbprint"
+}
+
+$enabledIisAuthenticationOptions = $iisAuthentication -split '\s*[,;]\s*'
+
+Validate-Parameter $enabledIisAuthenticationOptions -validInput @($anonymousAuthentication, $basicAuthentication, $windowsAuthentication) -parameterName "IIS Authentication"
+
+$enableAnonymous = $enabledIisAuthenticationOptions -contains $anonymousAuthentication
+$enableBasic = $enabledIisAuthenticationOptions -contains $basicAuthentication
+$enableWindows = $enabledIisAuthenticationOptions -contains $windowsAuthentication
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+if (! $webRoot) {
+	$webRoot = (Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\InetStp' -name PathWWWRoot).PathWWWRoot
+}
+$webRoot = (resolve-path $webRoot).ProviderPath
+Validate-Parameter $webRoot -parameterName "Relative Home Directory"
+
+$bindingInformation = "${bindingIpAddress}:${bindingPort}:${bindingHost}"
+
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+$wsBindings = new-object System.Collections.ArrayList
+$wsBindings.Add(@{ protocol=$bindingProtocol;bindingInformation=$bindingInformation }) | Out-Null
+if (! [string]::IsNullOrEmpty($bindingSslThumbprint)) {
+    $wsBindings.Add(@{ thumbprint=$bindingSslThumbprint }) | Out-Null
+    
+    $sslCertificateThumbprint = $bindingSslThumbprint.Trim()
+    Write-Output "Finding SSL certificate with thumbprint $sslCertificateThumbprint"
+    
+    $certificate = Get-ChildItem Cert:\LocalMachine -Recurse | Where-Object { $_.Thumbprint -eq $sslCertificateThumbprint -and $_.HasPrivateKey -eq $true } | Select-Object -first 1
+    if (! $certificate) 
+    {
+        throw "Could not find certificate under Cert:\LocalMachine with thumbprint $sslCertificateThumbprint. Make sure that the certificate is installed to the Local Machine context and that the private key is available."
+    }
+
+    Write-Output ("Found certificate: " + $certificate.Subject)
+
+    if ((! $bindingIpAddress) -or ($bindingIpAddress -eq '*')) {
+        $bindingIpAddress = "0.0.0.0"
+    }
+    $port = $bindingPort
+
+    $sslBindingsPath = ("IIS:\SslBindings\" + $bindingIpAddress + "!" + $port)
+
+	Execute-WithRetry { 
+		$sslBinding = get-item $sslBindingsPath -ErrorAction SilentlyContinue
+		if (! $sslBinding) {
+			New-Item $sslBindingsPath -Value $certificate | Out-Null
+		} else {
+			Set-Item $sslBindingsPath -Value $certificate | Out-Null
+		}		
+	}
+}
+
+## --------------------------------------------------------------------------------------
+## Run
+## --------------------------------------------------------------------------------------
+
+pushd IIS:\
+
+$appPoolPath = ("IIS:\AppPools\" + $applicationPoolName)
+
+Execute-WithRetry { 
+    Write-Output "Finding application pool $applicationPoolName"
+	$pool = Get-Item $appPoolPath -ErrorAction SilentlyContinue
+	if (!$pool) { 
+		throw "Application pool $applicationPoolName does not exist" 
+	}
+}
+
+$sitePath = ("IIS:\Sites\" + $webSiteName)
+
+Write-Output $sitePath
+
+$site = Get-Item $sitePath -ErrorAction SilentlyContinue
+if (!$site) { 
+	Write-Output "Creating web site $webSiteName"
+    Execute-WithRetry {
+		$id = (dir iis:\sites | foreach {$_.id} | sort -Descending | select -first 1) + 1
+		new-item $sitePath -bindings ($wsBindings[0]) -id $id -physicalPath $webRoot -confirm:$false
+    }
+} else {
+	write-host "Web site $webSiteName already exists"
+}
+
+$cmd = { 
+	Write-Output "Assigning website to application pool: $applicationPoolName"
+	Set-ItemProperty $sitePath -name applicationPool -value $applicationPoolName
+}
+Execute-WithRetry -Command $cmd
+
+Execute-WithRetry { 
+	Write-Output "Setting home directory: $webRoot"
+	Set-ItemProperty $sitePath -name physicalPath -value "$webRoot"
+}
+
+try {
+	Execute-WithRetry { 
+		Write-Output "Anonymous authentication enabled: $enableAnonymous"
+		Set-WebConfigurationProperty -filter /system.webServer/security/authentication/anonymousAuthentication -name enabled -value "$enableAnonymous" -location $WebSiteName -PSPath "IIS:\"
+	}
+
+	Execute-WithRetry { 
+		Write-Output "Basic authentication enabled: $enableBasic"
+		Set-WebConfigurationProperty -filter /system.webServer/security/authentication/basicAuthentication -name enabled -value "$enableBasic" -location $WebSiteName -PSPath "IIS:\"
+	}
+
+	Execute-WithRetry { 
+		Write-Output "Windows authentication enabled: $enableWindows"
+		Set-WebConfigurationProperty -filter /system.webServer/security/authentication/windowsAuthentication -name enabled -value "$enableWindows" -location $WebSiteName -PSPath "IIS:\"
+	}
+} catch [System.Exception] {
+	Write-Output "Authentication options could not be set. This can happen when there is a problem with your application's web.config. For example, you might be using a section that requires an extension that is not installed on this web server (such as URL Rewriting). It can also happen when you have selected an authentication option and the appropriate IIS module is not installed (for example, for Windows authentication, you need to enable the Windows Authentication module in IIS/Windows first)"
+	throw
+}
+
+# It can take a while for the App Pool to come to life
+Start-Sleep -s 1
+
+Execute-WithRetry { 
+	$state = Get-WebAppPoolState $applicationPoolName
+	if ($state.Value -eq "Stopped") {
+		Write-Output "Application pool is stopped. Attempting to start..."
+		Start-WebAppPool $applicationPoolName
+	}
+}
+
+if($webSiteStart -eq $true) {
+    Execute-WithRetry { 
+    	$state = Get-WebsiteState $webSiteName
+    	if ($state.Value -eq "Stopped") {
+    		Write-Output "Web site is stopped. Attempting to start..."
+    		Start-Website $webSiteName
+    	}
+    }
+} else {
+	write-host "Not starting Web site $webSiteName"
+}
+
+popd
+
+Write-Output "IIS configuration complete"
\ No newline at end of file
diff --git a/src/step-templates/iis-website-delete/metadata.json b/src/step-templates/iis-website-delete/metadata.json
new file mode 100644
index 000000000..261264cbd
--- /dev/null
+++ b/src/step-templates/iis-website-delete/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "a032159b-0742-4982-95f4-59877a31fba3",
+  "Name": "IIS Website - Delete",
+  "Description": "Deletes a website in IIS.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "WebsiteName",
+      "Label": "Website name",
+      "HelpText": "The name of the website in IIS to delete.\n\nExample: Default Web Site",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2021-04-22T14:41:30.2520000Z",
+    "OctopusVersion": "2020.4.6",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-delete/scriptbody.ps1 b/src/step-templates/iis-website-delete/scriptbody.ps1
new file mode 100644
index 000000000..fa608ab64
--- /dev/null
+++ b/src/step-templates/iis-website-delete/scriptbody.ps1
@@ -0,0 +1,80 @@
+$webSiteName = $OctopusParameters['WebSiteName']
+if (! $webSiteName) {
+    throw "Web Site Name cannot be empty, please specify the web site to delete"
+}
+
+# Helper to run a block with a retry if things go wrong
+$maxFailures = 5
+$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4
+function Execute-WithRetry([ScriptBlock] $command) {
+	$attemptCount = 0
+	$operationIncomplete = $true
+
+	while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+		$attemptCount = ($attemptCount + 1)
+
+		if ($attemptCount -ge 2) {
+			Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+			Start-Sleep -s $sleepBetweenFailures
+			Write-Output "Retrying..."
+		}
+
+		try {
+			& $command
+
+			$operationIncomplete = $false
+		} catch [System.Exception] {
+			if ($attemptCount -lt ($maxFailures)) {
+				Write-Output ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+			
+			}
+			else {
+			    throw "Failed to execute command"
+			}
+		}
+	}
+}
+
+Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+Import-Module WebAdministration -ErrorAction SilentlyContinue
+
+pushd IIS:\
+
+try {
+    Write-Output "Deleting web site $webSiteName"
+    $sitePath = ("IIS:\Sites\" + $webSiteName)
+    
+    Write-Output $sitePath
+    
+    $site = Get-Item $sitePath -ErrorAction SilentlyContinue
+    if (! $site) {
+        Write-Output "$webSiteName does not exist"
+    }
+    else {
+        
+        Execute-WithRetry {
+            $state = Get-WebSiteState $webSiteName
+            if($state.Value -eq "Started") {
+                Write-Output "Web site is running. Attempting to stop..."
+                Stop-WebSite $webSiteName
+            }
+        }
+        
+        Write-Output "Attempting to delete $webSiteName..."
+        Execute-WithRetry {
+            Write-Output "Removing SSL Bindings..."
+            #Skipping default binding (Hostname $null) as it will break all sites which depend on this binding (non-SNI enabled sites will be grouped on the default binding! Remove-WebSite can handle this properly.)
+            Get-Item 'IIS:\SslBindings\' | Get-ChildItem | select $_.Sites | Where-Object { ($_.Sites -contains $webSiteName) -and ($_.Hostname -ne $null) } | Remove-Item
+            Write-Output "Removing Web Bindings..."
+            Get-WebBinding -Name $webSiteName | Remove-WebBinding
+            Write-Output "Removing web site..."
+            Remove-WebSite $webSiteName
+        }
+    }
+} catch [System.Exception] {
+    throw ("Failed to execute command" + $_.Exception.Message)
+}
+
+popd
+
+Write-Output "IIS Configuration complete"
\ No newline at end of file
diff --git a/step-templates/iis-website-restart.json b/src/step-templates/iis-website-restart/metadata.json
similarity index 56%
rename from step-templates/iis-website-restart.json
rename to src/step-templates/iis-website-restart/metadata.json
index b999d4495..67bf4a23d 100644
--- a/step-templates/iis-website-restart.json
+++ b/src/step-templates/iis-website-restart/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 12,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Load IIS module:\nImport-Module WebAdministration\n\n# Set a name of the site we want to restart\n$webSiteName = $OctopusParameters['webSiteName']\n\n# Get web site object\n$webSite = Get-Item \"IIS:\\Sites\\$webSiteName\"\n\nWrite-Output \"Stopping IIS web site $webSiteName\"\n$webSite.Stop()\nWrite-Output \"Starting IIS web site $webSiteName\"\n$webSite.Start()\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-16T06:21:11.211+00:00",
+    "ExportedAt": "2014-05-15T23:21:11.2110000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-website-restart/scriptbody.ps1 b/src/step-templates/iis-website-restart/scriptbody.ps1
new file mode 100644
index 000000000..a1b6049f6
--- /dev/null
+++ b/src/step-templates/iis-website-restart/scriptbody.ps1
@@ -0,0 +1,13 @@
+# Load IIS module:
+Import-Module WebAdministration
+
+# Set a name of the site we want to restart
+$webSiteName = $OctopusParameters['webSiteName']
+
+# Get web site object
+$webSite = Get-Item "IIS:\Sites\$webSiteName"
+
+Write-Output "Stopping IIS web site $webSiteName"
+$webSite.Stop()
+Write-Output "Starting IIS web site $webSiteName"
+$webSite.Start()
diff --git a/src/step-templates/iis-website-set-ip-security/metadata.json b/src/step-templates/iis-website-set-ip-security/metadata.json
new file mode 100644
index 000000000..3b5dd9e87
--- /dev/null
+++ b/src/step-templates/iis-website-set-ip-security/metadata.json
@@ -0,0 +1,70 @@
+{
+  "Id": "2aab8e8b-6a55-462c-91ca-3c2a395e82a5",
+  "Name": "IIS Website - Set IP Security",
+  "Description": "Takes a list of ip/mask and allow them in ipsecurity",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "357e87c7-908c-4cdb-af63-8818cef5bd23",
+      "Name": "Site",
+      "Label": "Name of Website",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9db7ed01-c348-48ee-868b-ebcd0d87cce1",
+      "Name": "IpAddresses",
+      "Label": "List of ip addresses",
+      "HelpText": "A newline separated list of IP addresses and/or IP address and subnet mask pairs in the format <IPAddress>/<SubnetMask>.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2854ab2d-a000-48dd-9b20-6930c73c96fb",
+      "Name": "EnableProxyMode",
+      "Label": "Enable proxy mode",
+      "HelpText": "If the website is running behind a proxy, this setting most likely need to be checked.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7d8cc90e-281e-4718-a0e9-b1daa522d5c9",
+      "Name": "SetDeny",
+      "Label": "Set deny",
+      "HelpText": "If checked, IIS will be changed to \"Deny\" all IP addresses not added to the list.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "olsh",
+  "$Meta": {
+    "ExportedAt": "2021-03-01T11:24:20.6800000Z",
+    "OctopusVersion": "3.7.4",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-set-ip-security/scriptbody.ps1 b/src/step-templates/iis-website-set-ip-security/scriptbody.ps1
new file mode 100644
index 000000000..bc3459fbf
--- /dev/null
+++ b/src/step-templates/iis-website-set-ip-security/scriptbody.ps1
@@ -0,0 +1,73 @@
+$existingRules = Get-WebConfiguration /system.webServer/security/ipSecurity/* -location $Site -pspath IIS://;
+[Object[]]$newRules = @();
+
+$ips = $IpAddresses -split '\n';
+$ips = $ips.Trim('\r');
+foreach ($u in $ips) {
+    $a = $u.Split("/");
+    $newRules += [Object]@{ ipAddress = $a[0]; subnetMask = $a[1]; allowed = $true };
+}
+
+if ($EnableProxyMode -eq "true") {
+    Write-Output "Enabling proxy mode"
+    set-webconfigurationproperty -Filter /system.webServer/security/ipSecurity -location $Site -Name "enableProxyMode" -Value "true"
+}
+
+if ($SetDeny -eq "true") {
+    Write-Output "Setting Deny rule"
+    set-webconfigurationproperty -Filter /system.webServer/security/ipSecurity -location $Site -Name "allowUnlisted" -Value "false"
+}
+
+function addRules([string]$website, [Object[]]$newRules, [Object[]]$oldRules) {
+
+    foreach ($rule in $newRules) {
+        if (ruleExists $rule $oldRules) {
+            Write-Host "Rule $($rule.ipAddress)/$($rule.subnetMask) already exists";
+
+            continue;
+        }
+
+        $value = @{ipAddress = $($rule.ipAddress); allowed = "true" }
+        if ([string]::IsNullOrEmpty($rule.subnetMask)) {
+            Write-Output "Adding ip $($rule.ipAddress) to allow"
+        }
+        else {
+            Write-Output "Adding ip $($rule.ipAddress)/$($rule.subnetMask) to allow"
+            $value.subnetMask = $rule.subnetMask;
+        }
+
+        add-webconfiguration /system.webServer/security/ipSecurity -location $website -value $value -pspath IIS://
+    }    
+}
+
+function clearRules([string]$website, [Object[]]$newRules, [Object[]]$oldRules) {
+
+    foreach ($rule in $oldRules) {
+        if (ruleExists $rule $newRules) {
+            continue;
+        }
+
+        Write-Host "Rule $($rule.ipAddress)/$($rule.subnetMask) is not exists, remove it";
+
+        Clear-WebConfiguration -Filter $rule.ItemXPath -location $rule.Location
+    }    
+}
+
+function ruleExists([Object]$rule, [Object[]]$rules) {
+    foreach ($r in $rules) {
+        if ($r.ipAddress -eq $rule.ipAddress -and $r.allowed -eq $rule.allowed) {
+            if ($r.subnetMask -eq $rule.subnetMask) {
+                return $true;
+            }
+
+            if (([string]::IsNullOrEmpty($r.subnetMask) -or $r.subnetMask -eq "255.255.255.255") -and ([string]::IsNullOrEmpty($rule.subnetMask) -or $rule.subnetMask -eq "255.255.255.255")) {
+                return $true;
+            }
+        }
+    }
+
+    return $false;
+}
+
+addRules $Site $newRules $existingRules;
+clearRules $Site $newRules $existingRules;
diff --git a/src/step-templates/iis-website-set-log-format/metadata.json b/src/step-templates/iis-website-set-log-format/metadata.json
new file mode 100644
index 000000000..12007a630
--- /dev/null
+++ b/src/step-templates/iis-website-set-log-format/metadata.json
@@ -0,0 +1,275 @@
+{
+  "Id": "e46aad55-5484-48a7-a90d-970d40129893",
+  "Name": "IIS Website - Set log format",
+  "Description": "Sets fields included in IIS logging. Uses named checkboxes where the names are identical to the naming scheme in IIS Manager.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "1a1520b9-58b1-44ae-b9df-991b34f6b62b",
+      "Name": "SiteName",
+      "Label": "SiteName",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "66d6d9d2-3cc0-47f3-bcd1-6b1d9f0846dc",
+      "Name": "iisLogDirectory",
+      "Label": "Where should the logs be placed?",
+      "HelpText": "",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "61656b11-a130-494d-aac4-a352db00a405",
+      "Name": "Date",
+      "Label": "Date (date)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "0c9f888f-5187-4218-b69b-e3b02f5f84d0",
+      "Name": "Time",
+      "Label": "Time (time)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "816117df-bedb-4c2b-8b17-046be5f04954",
+      "Name": "ClientIP",
+      "Label": "ClientIP IP Address (c-ip)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "8b56b533-52b2-4c90-9c8c-bff00e05104c",
+      "Name": "UserName",
+      "Label": "User Name (cs-username)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "97c865b4-cd9f-4e7c-9163-eb3bafdf7a31",
+      "Name": "ServiceName",
+      "Label": "Service Name (s-sitename)",
+      "HelpText": "",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d84fd363-736d-4f2f-94df-48833c240c32",
+      "Name": "ComputerName",
+      "Label": "ServerName (s-computername)",
+      "HelpText": null,
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "52514137-54a9-4f7c-b701-3f16b0702ff7",
+      "Name": "ServerIP",
+      "Label": "Server IP Address (s-ip)",
+      "HelpText": "",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "66c3b111-8c40-4100-bae2-df4cee69c7a4",
+      "Name": "Method",
+      "Label": "Method (cs-method)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c049ab95-a33b-401e-be55-1e5a4f216eab",
+      "Name": "UriStem",
+      "Label": "UriStem (cs-uri-stem)",
+      "HelpText": null,
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ed535131-6fcd-440c-bf41-9356cc1a6b2f",
+      "Name": "UriQuery",
+      "Label": "Uri query (cs-uri-query)",
+      "HelpText": null,
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "2d2d5072-8d94-4098-99a9-646918128f1a",
+      "Name": "HttpStatus",
+      "Label": "Protocol Status (sc-status)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "26839cc3-d338-4637-ba34-09134378dbc9",
+      "Name": "Win32Status",
+      "Label": "Win32 Status (sc-win32-status)",
+      "HelpText": null,
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b3ddf483-63c6-4f5d-a3db-7e7fc802d8f5",
+      "Name": "HttpSubStatus",
+      "Label": "Protocol Substatus (sc-substatus)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "cc63cdc5-6ce0-4476-960e-aa59eb064095",
+      "Name": "BytesSent",
+      "Label": "Bytes sent (sc-bytes)",
+      "HelpText": "",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "cd121c63-7f76-4259-92aa-d013c7fedb97",
+      "Name": "BytesRecv",
+      "Label": "Bytes received (cs-bytes)",
+      "HelpText": null,
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "da122f26-639e-49fa-b49c-25c281d24bc6",
+      "Name": "TimeTaken",
+      "Label": "Time taken (time-taken)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "1343443a-d3d9-4d84-a16b-76ed7d07d668",
+      "Name": "ProtocolVersion",
+      "Label": "Protocol version (cs-version)",
+      "HelpText": null,
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "7ba34ff4-b677-4d4d-8302-a42b6a774295",
+      "Name": "Host",
+      "Label": "Host (cs-host)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "96379a19-d9c8-4808-9e2c-29a7e13f89a9",
+      "Name": "UserAgent",
+      "Label": "User agent (cs(UserAgent))",
+      "HelpText": null,
+      "DefaultValue": "true",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c8d37be1-16e7-46de-92e0-c037c5227aa0",
+      "Name": "Cookie",
+      "Label": "Cookie (cs(Cookie))",
+      "HelpText": "",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4b4877b4-80f0-46fd-b272-26781706d717",
+      "Name": "Referer",
+      "Label": "Referer (cs(Referer))",
+      "HelpText": null,
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "986223cd-eb82-4744-a27c-3dfba3d8c87a",
+      "Name": "ServerPort",
+      "Label": "Server Port (s-port)",
+      "HelpText": "",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "779b89aa-8631-443f-9108-a44acd92f5ef",
+      "Name": "OriginalIP",
+      "Label": "Original IP",
+      "HelpText": "From X-FORWARDED-FOR in request.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "arnodenuijl",
+  "$Meta": {
+    "ExportedAt": "2017-12-22T14:56:00.0000000Z",
+    "OctopusVersion": "3.4.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-set-log-format/scriptbody.ps1 b/src/step-templates/iis-website-set-log-format/scriptbody.ps1
new file mode 100644
index 000000000..b3f5a3f07
--- /dev/null
+++ b/src/step-templates/iis-website-set-log-format/scriptbody.ps1
@@ -0,0 +1,137 @@
+Import-Module "WebAdministration" -ErrorAction Stop
+
+function SetIisLogPath {
+    param($logPath, $IISsitename)
+    write-host "#Updating IIS Log path"
+    
+    if (!(Test-Path "IIS:\Sites\$($IISsitename)")) {
+        write-host "$IISsitename does not exist in IIS"
+    } else {
+        Set-ItemProperty IIS:\Sites\$($IISsitename) -name logFile.directory -value $logPath
+        write-host "IIS LogPath updated to $logPath"
+    }
+}
+
+function AdvancedLogging-GenerateAppCmdScriptToConfigureAndRun
+{
+    param([string] $site) 
+
+    #Clear existing log definition if it exists. We use site name to make it apparent where it belongs.
+    clear-WebConfiguration -PSPath IIS:\ -Filter "system.webServer/advancedLogging/server/logDefinitions/logDefinition[@baseFileName='$site']"
+
+    #Get current powershell execution folder
+    $currentLocation = Get-Location
+
+    #Create an empty bat which will be populated with appcmd instructions
+    $stream = [System.IO.StreamWriter] "$currentLocation\$site.bat"
+
+    $stream.WriteLine("%systemroot%\system32\inetsrv\appcmd.exe clear config ""$site"" -section:system.webServer/advancedLogging/server /commit:apphost")
+
+    #Create site specific log definition
+    $stream.WriteLine("%systemroot%\system32\inetsrv\appcmd.exe set config ""$site"" -section:system.webServer/advancedLogging/server /+`"logDefinitions.[baseFileName='$site',enabled='True',logRollOption='Schedule',schedule='Daily',publishLogEvent='False']`" /commit:apphost")
+
+    #Get all available fields for logging
+    $availableFields = Get-WebConfiguration "system.webServer/advancedLogging/server/fields"
+
+    $targetFields = ((GetIisLogFields).iisHeader)
+    Write-Host "Target fields: " (($targetFields) -join ',')
+    #Add appcmd instruction to add all the selected fields above to be logged as part of the logging
+    #The below section can be extended to filter out any unwanted fields
+    foreach ($field in $targetFields) {
+    	$f = (($availableFields.Collection) |Where-Object {$_.logHeaderName -eq "$field"})
+    	Write-Host "Appending " $f.iisHeader $f.id
+        $stream.WriteLine("C:\windows\system32\inetsrv\appcmd.exe set config ""$site"" -section:system.webServer/advancedLogging/server /+`"logDefinitions.[baseFileName='$site'].selectedFields.[id='$($f.id)',logHeaderName='$($f.logHeaderName)']`" /commit:apphost")
+    }
+
+    $stream.close()
+
+    # execute the batch file create to configure the site specific Advanced Logging
+    Start-Process -FilePath $currentLocation\$site.bat
+    Start-Sleep -Seconds 10
+}
+
+function GetIisLogFields {
+    $IisLogFields = @()
+    if ($OctopusParameters['Date'] -eq "True") 		    { $IisLogFields += New-Object PSObject -Property @{id = "Date"; iisHeader = "date" } }
+    if ($OctopusParameters['Time'] -eq "True") 		    { $IisLogFields += New-Object PSObject -Property @{id = "Time"; iisHeader = "time" } }
+    if ($OctopusParameters['ClientIP'] -eq "True")      	{ $IisLogFields += New-Object PSObject -Property @{id = "ClientIP"; iisHeader = "c-ip"} }
+    if ($OctopusParameters['UserName'] -eq "True")     	{ $IisLogFields += New-Object PSObject -Property @{id = "UserName"; iisHeader = "cs-username" } }
+    if ($OctopusParameters['SiteName'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "SiteName"; iisHeader = "s-sitename" } }
+    if ($OctopusParameters['ComputerName'] -eq "True")     { $IisLogFields += New-Object PSObject -Property @{id = "ComputerName"; iisHeader = "s-computername" } }
+    if ($OctopusParameters['ServerIP'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "ServerIP"; iisHeader = "s-ip" } }
+    if ($OctopusParameters['ServerPort'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "ServerPort"; iisHeader = "s-port" } }
+    if ($OctopusParameters['Method'] -eq "True")    		{ $IisLogFields += New-Object PSObject -Property @{id = "Method"; iisHeader = "cs-method" } }
+    if ($OctopusParameters['UriStem'] -eq "True") 	    	{ $IisLogFields += New-Object PSObject -Property @{id = "UriStem"; iisHeader = "cs-uri-stem" } }
+    if ($OctopusParameters['UriQuery'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "UriQuery"; iisHeader = "cs-uri-query" } }
+    if ($OctopusParameters['HttpStatus'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "HttpStatus"; iisHeader = "sc-status" } }
+    if ($OctopusParameters['HttpSubStatus'] -eq "True") 	{ $IisLogFields += New-Object PSObject -Property @{id = "HttpSubStatus"; iisHeader = "sc-substatus" } }
+    if ($OctopusParameters['Win32Status'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "Win32Status"; iisHeader = "sc-win32-status" } }
+    if ($OctopusParameters['BytesSent'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "BytesSent"; iisHeader = "sc-bytes" } }
+    if ($OctopusParameters['BytesRecv'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "BytesRecv"; iisHeader = "cs-bytes" } }
+    if ($OctopusParameters['TimeTaken'] -eq "True")     	{ $IisLogFields += New-Object PSObject -Property @{id = "TimeTaken"; iisHeader = "TimeTakenMS" } }
+    if ($OctopusParameters['ProtocolVersion'] -eq "True") 	{ $IisLogFields += New-Object PSObject -Property @{id = "ProtocolVersion"; iisHeader = "cs-version" } }
+    if ($OctopusParameters['Host'] -eq "True") 		    { $IisLogFields += New-Object PSObject -Property @{id = "Host"; iisHeader = "cs(Host)" } }
+    if ($OctopusParameters['UserAgent'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "UserAgent"; iisHeader = "cs(User-Agent)" } }
+    if ($OctopusParameters['Cookie'] -eq "True")    		{ $IisLogFields += New-Object PSObject -Property @{id = "Cookie"; iisHeader = "cs(Cookie)" } }
+    if ($OctopusParameters['Referer'] -eq "True") 		    { $IisLogFields += New-Object PSObject -Property @{id = "Referer"; iisHeader = "cs(Referer)" } }
+    if ($OctopusParameters['OriginalIP'] -eq "True") 	    { $IisLogFields += New-Object PSObject -Property @{id = "OriginalIP"; iisHeader = "x-forwarded-for" } }
+    return $IisLogFields    
+}
+
+function SetForIISAboveV7 {
+    param($SiteName)
+    [System.Collections.ArrayList]$logFields = ((GetIisLogFields).id)
+    $filter = "/system.applicationHost/sites/site[@Name=""$SiteName""]/logFile"
+    write-host "Filter: $filter"
+    
+    #Clear all existing custom fields...
+    clear-WebConfiguration -PSPath IIS:\ -Filter "$filter/customFields"
+    
+    if ($logFields.Contains("OriginalIP")) { 
+      add-WebConfiguration -PSPath IIS:\ -Filter "$filter/customFields" -Value @{logFieldName='OriginalIP';sourceType='RequestHeader';sourceName='X-FORWARDED-FOR'}
+    }
+    
+    Write-Host (($logFields) -join ',')
+    # This is part of extended logging and cannot be set using the syntax below.
+    $logFields.Remove("OriginalIP")
+    Set-WebConfigurationProperty -Filter $filter -Value (($logFields) -join ',') -Name "LogExtFileFlags"
+}
+
+function SetForIISV7 {
+    param($site, $logDirectory)
+    Write-Host 'Disables http logging module'
+    Set-WebConfigurationProperty -Filter system.webServer/httpLogging -PSPath machine/webroot/apphost -Name dontlog -Value true
+    Write-Host 'Adding X-Forwarded-For as OriginalIP to advanced logging'
+    if (Get-WebConfigurationProperty "system.webServer/advancedLogging/server/fields" -Name Collection |Where-Object {$_.id -eq "OriginalID"}) {
+	write-host "OriginalID field already exists. Will not modify existing definition."
+    } else {
+        Add-WebConfiguration "system.webServer/advancedLogging/server/fields" -value @{id="OriginalID";sourceName="X-Forwarded-For";sourceType="RequestHeader";logHeaderName="X-Forwarded-For";category="Default";loggingDataType="TypeLPCSTR"}
+    }
+    # Disables the default advanced logging config
+    Set-WebConfigurationProperty -Filter "system.webServer/advancedLogging/server/logDefinitions/logDefinition[@baseFileName='%COMPUTERNAME%-Server']" -name enabled -value false
+    # Enable Advanced Logging
+    Set-WebConfigurationProperty -Filter system.webServer/advancedLogging/server -PSPath machine/webroot/apphost -Name enabled -Value true
+    
+    # Set log directory at server level
+    Set-WebConfigurationProperty -Filter system.applicationHost/advancedLogging/serverLogs -PSPath machine/webroot/apphost -Name directory -Value $logDirectory
+    
+    # Set log directory at site default level
+    Set-WebConfigurationProperty -Filter system.applicationHost/sites/siteDefaults/advancedLogging -PSPath machine/webroot/apphost -Name directory -Value $logDirectory	
+
+    AdvancedLogging-GenerateAppCmdScriptToConfigureAndRun $site	
+}
+
+Write-Host "Value of UriQuery parameter " $OctopusParameters['UriQuery']
+$logPath = $OctopusParameters['IISLogPath']
+$IISsitename = $OctopusParameters['webSiteName']
+$iisMajorVersion = (get-itemproperty HKLM:\SOFTWARE\Microsoft\InetStp\ |select MajorVersion).MajorVersion
+if ($iisMajorVersion -gt 7) {
+  SetForIISAboveV7 $OctopusParameters['SiteName'] 
+  SetIisLogPath $OctopusParameters['iisLogDirectory'] $OctopusParameters['SiteName']
+} elseif ($iisMajorVersion -lt 7) {
+   Write-Host 'Cannot handle IIS versions below 7. Found IIS version ' $iisMajorVersion
+   exit 1
+} else {
+    SetForIISV7 $OctopusParameters['SiteName'] $OctopusParameters['iisLogDirectory']
+}
+
diff --git a/step-templates/iis-website-start.json b/src/step-templates/iis-website-start/metadata.json
similarity index 51%
rename from step-templates/iis-website-start.json
rename to src/step-templates/iis-website-start/metadata.json
index f3d6f1bad..ad9558d8c 100644
--- a/step-templates/iis-website-start.json
+++ b/src/step-templates/iis-website-start/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 8,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Load IIS module:\nImport-Module WebAdministration\n\n# Set a name of the site we want to start\n$webSiteName = $OctopusParameters['webSiteName']\n\n# Get web site object\ntry {\n$webSite = Get-Item \"IIS:\\Sites\\$webSiteName\"\n}\nCatch [System.IO.FileNotFoundException]{\n\t# Some OS bug out if Default Web Site is deleted.\n# So we need to call this 2 times.\n$webSite = Get-Item \"IIS:\\Sites\\$webSiteName\"\n}\n\nWrite-Output \"Starting IIS web site $webSiteName\"\n$webSite.Start()\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,10 +20,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2020-11-10T07:29:37.424Z",
+    "ExportedAt": "2020-11-10T07:29:37.4240000Z",
     "OctopusVersion": "2019.13.7",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/iis-website-start/scriptbody.ps1 b/src/step-templates/iis-website-start/scriptbody.ps1
new file mode 100644
index 000000000..7e8727be5
--- /dev/null
+++ b/src/step-templates/iis-website-start/scriptbody.ps1
@@ -0,0 +1,18 @@
+# Load IIS module:
+Import-Module WebAdministration
+
+# Set a name of the site we want to start
+$webSiteName = $OctopusParameters['webSiteName']
+
+# Get web site object
+try {
+$webSite = Get-Item "IIS:\Sites\$webSiteName"
+}
+Catch [System.IO.FileNotFoundException]{
+	# Some OS bug out if Default Web Site is deleted.
+# So we need to call this 2 times.
+$webSite = Get-Item "IIS:\Sites\$webSiteName"
+}
+
+Write-Output "Starting IIS web site $webSiteName"
+$webSite.Start()
diff --git a/src/step-templates/iis-website-stop/metadata.json b/src/step-templates/iis-website-stop/metadata.json
new file mode 100644
index 000000000..3b02df18f
--- /dev/null
+++ b/src/step-templates/iis-website-stop/metadata.json
@@ -0,0 +1,52 @@
+{
+  "Id": "9eb40453-ac5d-4cb0-8666-046ff6305a3a",
+  "Name": "IIS Website - Stop",
+  "Description": "Stops a website in IIS.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "WebsiteName",
+      "Label": "Website name",
+      "HelpText": "The name of the site in IIS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WebSiteCheckDelay",
+      "Label": "Status check interval",
+      "HelpText": "The delay, in milliseconds, between each attempt to query the website to see if its status is \"Stopped\"",
+      "DefaultValue": "500",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WebSiteCheckRetries",
+      "Label": "Status check retries",
+      "HelpText": "The number of retries before an error is thrown.",
+      "DefaultValue": "20",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2017-02-09T23:04:46.4400000Z",
+    "OctopusVersion": "3.3.17",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-stop/scriptbody.ps1 b/src/step-templates/iis-website-stop/scriptbody.ps1
new file mode 100644
index 000000000..195558455
--- /dev/null
+++ b/src/step-templates/iis-website-stop/scriptbody.ps1
@@ -0,0 +1,38 @@
+# Load IIS module:
+Import-Module WebAdministration
+
+# Get WebSite Name
+$webSiteName = $OctopusParameters['webSiteName']
+# Get the number of retries
+$retries = $OctopusParameters['webSiteCheckRetries']
+# Get the number of attempts
+$delay = $OctopusParameters['webSiteCheckDelay']
+
+# Check if exists
+if(Test-Path IIS:\Sites\$webSiteName) {
+
+    # Stop Website if not already stopped
+    if ((Get-WebSiteState $webSiteName).Value -ne "Stopped") {
+        Write-Output "Stopping IIS Website $webSiteName"
+        Stop-WebSite $webSiteName
+    
+        $state = (Get-WebSiteState $webSiteName).Value
+        $counter = 1
+        
+        # Wait for the Website to the "Stopped" before proceeding
+        do{ 
+            $state = (Get-WebSiteState $webSiteName).Value
+            Write-Output "$counter/$retries Waiting for IIS Website $webSiteName to shut down completely. Current status: $state"
+            $counter++
+            Start-Sleep -Milliseconds $delay
+        }
+        while($state -ne "Stopped" -and $counter -le $retries)  
+        
+        # Throw an error if the Website is not stopped
+        if($counter -gt $retries) { 
+            throw "Could not shut down IIS Website $webSiteName. `nTry to increase the number of retries ($retries) or delay between attempts ($delay milliseconds)." }
+    }
+}
+else {
+    Write-Output "IIS Website $webSiteName doesn't exist"
+}
\ No newline at end of file
diff --git a/step-templates/iis-website-update-iis-log-path.json b/src/step-templates/iis-website-update-iis-log-path/metadata.json
similarity index 52%
rename from step-templates/iis-website-update-iis-log-path.json
rename to src/step-templates/iis-website-update-iis-log-path/metadata.json
index ab17e9e09..cfbb49588 100644
--- a/step-templates/iis-website-update-iis-log-path.json
+++ b/src/step-templates/iis-website-update-iis-log-path/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 5,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "write-host \"#Updating IIS Log path\"\n\nImport-Module \"WebAdministration\" -ErrorAction Stop\n\n$logPath = $OctopusParameters['LogPath']\n$IISsitename = $OctopusParameters['webSiteName']\n\nif (!(Test-Path \"IIS:\\Sites\\$($IISsitename)\")) {\n    write-host \"$IISsitename does not exist in IIS\"\n} else {\n    $currentLogPath = (Get-ItemProperty IIS:\\Sites\\$($IISsitename)).logFile.directory\n    write-host \"IIS LogPath currently set to $currentLogPath\"\n    if ([string]::Compare($currentLogPath, $logPath, $True) -ne 0) {\n        Set-ItemProperty IIS:\\Sites\\$($IISsitename) -name logFile.directory -value $logPath\n        write-host \"IIS LogPath updated to $logPath\"\n    }\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -29,12 +29,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-05-05T09:23:23.465+00:00",
+    "ExportedAt": "2015-05-05T02:23:23.4650000-07:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "iis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/iis-website-update-iis-log-path/scriptbody.ps1 b/src/step-templates/iis-website-update-iis-log-path/scriptbody.ps1
new file mode 100644
index 000000000..a0e4d34a7
--- /dev/null
+++ b/src/step-templates/iis-website-update-iis-log-path/scriptbody.ps1
@@ -0,0 +1,17 @@
+write-host "#Updating IIS Log path"
+
+Import-Module "WebAdministration" -ErrorAction Stop
+
+$logPath = $OctopusParameters['LogPath']
+$IISsitename = $OctopusParameters['webSiteName']
+
+if (!(Test-Path "IIS:\Sites\$($IISsitename)")) {
+    write-host "$IISsitename does not exist in IIS"
+} else {
+    $currentLogPath = (Get-ItemProperty IIS:\Sites\$($IISsitename)).logFile.directory
+    write-host "IIS LogPath currently set to $currentLogPath"
+    if ([string]::Compare($currentLogPath, $logPath, $True) -ne 0) {
+        Set-ItemProperty IIS:\Sites\$($IISsitename) -name logFile.directory -value $logPath
+        write-host "IIS LogPath updated to $logPath"
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/iis-website-update-property/metadata.json b/src/step-templates/iis-website-update-property/metadata.json
new file mode 100644
index 000000000..beec495e1
--- /dev/null
+++ b/src/step-templates/iis-website-update-property/metadata.json
@@ -0,0 +1,52 @@
+{
+  "Id": "34118a0e-f872-435a-8522-d3c7f8515cb8",
+  "Name": "IIS WebSite - Update Property",
+  "Description": "Updates property for specified WebSite",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "webSiteName",
+      "Label": "Web site name",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "propertyName",
+      "Label": "Name of the property to set",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "propertyValue",
+      "Label": "Value of the property to set",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-05-30T04:42:50.4290000-07:00",
+  "LastModifiedBy": "ylashin",
+  "$Meta": {
+    "ExportedAt": "2016-05-30T04:42:50.4290000-07:00",
+    "OctopusVersion": "3.3.15",
+    "Type": "ActionTemplate"
+  },
+  "Category": "iis"
+}
diff --git a/src/step-templates/iis-website-update-property/scriptbody.ps1 b/src/step-templates/iis-website-update-property/scriptbody.ps1
new file mode 100644
index 000000000..93f7ccdab
--- /dev/null
+++ b/src/step-templates/iis-website-update-property/scriptbody.ps1
@@ -0,0 +1,76 @@
+# Running outside octopus
+param(
+    [string]$webSiteName,
+    [string]$propertyName,
+    [string]$propertyValue,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$webSiteName,
+        [string]$propertyName,
+        [string]$propertyValue
+    ) 
+
+    Write-Host "Setting $webSiteName property $propertyName to $propertyValue"
+
+    try {
+         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue
+         Import-Module WebAdministration -ErrorAction SilentlyContinue
+         
+         $oldValue = Get-ItemProperty "IIS:\Sites\$webSiteName" -Name $propertyName
+         $oldValueString = ""
+
+         
+         if ($oldValue.GetType() -eq [Microsoft.IIs.PowerShell.Framework.ConfigurationAttribute])
+         {
+             $oldValueString = ($oldValue | Select-Object -ExpandProperty "Value")
+         }
+         elseif ($oldValue.GetType() -eq [System.String])
+         {
+             $oldValueString = $oldValue
+         }
+         elseif ($oldValue.GetType() -eq [System.Management.Automation.PSCustomObject])
+         {
+             $oldValueString = ($oldValue | Select-Object -ExpandProperty $propertyName)
+         }
+
+         Write-Host "Old value $oldValueString"
+         Set-ItemProperty "IIS:\Sites\$webSiteName" -Name $propertyName -Value $propertyValue
+         Write-Host "New value $propertyValue"
+         Write-Host "Done"
+    } catch {
+        Write-Host $_.Exception|format-list -force
+        Write-Host "There was a problem setting property"    
+    }
+
+ } `
+ (Get-Param 'webSiteName' -Required) (Get-Param 'propertyName' -Required) (Get-Param 'propertyValue' -Required)
diff --git a/src/step-templates/import-cert-from-azure-keyvault/metadata.json b/src/step-templates/import-cert-from-azure-keyvault/metadata.json
new file mode 100644
index 000000000..6eceff448
--- /dev/null
+++ b/src/step-templates/import-cert-from-azure-keyvault/metadata.json
@@ -0,0 +1,134 @@
+{
+  "Id": "e06e7e2a-5510-4b6d-bd46-22d3bc01291d",
+  "Name": "Import Certificate from Azure Key Vault",
+  "Description": "Imports a certificate from Azure Key Vault to the tentacle",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "70c9f9dd-22b6-4285-8d8a-f64278de0dc1",
+      "Name": "Azure.GetKeyVaultCertificate.SubscriptionId",
+      "Label": "Azure Service Principal SubscriptionId",
+      "HelpText": "Azure SubscriptionId for the Service Principal account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9a421884-0f63-417e-b2a9-b1039a1e8bf8",
+      "Name": "Azure.GetKeyVaultCertificate.TenantId",
+      "Label": "Azure Active Directory Tenant Id",
+      "HelpText": "The Azure Active Directory Tenant Id associated with the Service Principal account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "bfb4a0a1-dab2-4c8f-bcb8-51033c35f633",
+      "Name": "Azure.GetKeyVaultCertificate.ClientId",
+      "Label": "Azure Service Principal Client Id",
+      "HelpText": "The Client Id associated with the Service Principal account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "49857bcc-f3a1-4984-a2b1-ddeeca52114a",
+      "Name": "Azure.GetKeyVaultCertificate.Password",
+      "Label": "Azure Service Principal Password",
+      "HelpText": "The password or \"key\" for the Service Principal account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "220d17f6-070c-4a3d-b742-205d56b27f47",
+      "Name": "Azure.GetKeyVaultCertificate.KeyVaultName",
+      "Label": "Key Vault Name",
+      "HelpText": "The name of the Azure Key Vault",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "930e6703-3df4-40bb-b3ae-6d367bf5cc5d",
+      "Name": "Azure.GetKeyVaultCertificate.CertificateName",
+      "Label": "Certificate Name",
+      "HelpText": "The name of the certificate to retrieve from the Key Vault",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b3616901-a27a-4960-984c-59b2388b243e",
+      "Name": "Azure.GetKeyVaultCertificate.CertificateVersion",
+      "Label": "Certificate Version",
+      "HelpText": "_[Optional]_ Enter the specific version of the certificate. Defaults to `latest`.",
+      "DefaultValue": "latest",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "840f8939-4d87-42c7-9d6e-232d4617b90f",
+      "Name": "Azure.GetKeyVaultCertificate.CertificateStoreName",
+      "Label": "Certificate Store Name",
+      "HelpText": "Certificate store name. E.g. `My`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "My|My\nCertificateAuthority|CertificateAuthority\nRoot|Root\nTrustedPeople|TrustedPeople\nTrustedPublisher|TrustedPublisher"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "15916c8a-709b-4f14-af36-63ee5d3265e9",
+      "Name": "Azure.GetKeyVaultCertificate.CertificateStoreLocation",
+      "Label": "Certificate Store Location",
+      "HelpText": "Certificate store location. E.g. \"LocalMachine\"",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "LocalMachine|LocalMachine\nCurrentUser|CurrentUser"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3915f38e-947f-4313-b207-4e88b5f63969",
+      "Name": "Azure.GetKeyVaultCertificate.CertificateFriendlyName",
+      "Label": "Certificate Friendly Name",
+      "HelpText": "_[Optional]_ A friendly name to give the certificate when importing. E.g. `Client Auth Cert for FooService`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "nshenoy",
+  "$Meta": {
+    "ExportedAt": "2018-04-17T20:24:57.7570000Z",
+    "OctopusVersion": "2018.3.13",
+    "Type": "ActionTemplate"
+  },
+  "Category": "azure"
+}
diff --git a/src/step-templates/import-cert-from-azure-keyvault/scriptbody.ps1 b/src/step-templates/import-cert-from-azure-keyvault/scriptbody.ps1
new file mode 100644
index 000000000..9070bbefb
--- /dev/null
+++ b/src/step-templates/import-cert-from-azure-keyvault/scriptbody.ps1
@@ -0,0 +1,101 @@
+Import-Module AzureRM.Profile
+Import-Module AzureRM.KeyVault
+
+Function Validate-Parameter($parameterValue, [string[]]$validInput, $parameterName) {
+    Write-Host "${parameterName}: ${parameterValue}"
+    if (! $parameterValue) {
+        throw "$parameterName cannot be empty, please specify a value"
+    }
+}
+
+Function Install-AzureKeyVaultCertificate {
+    Param(
+        [string]$keyVaultName,
+        [string]$certificateName,
+        [string]$certificateVersion,
+        [string]$certificateStoreName,
+        [string]$certificateStoreLocation,
+        [string]$certificateFriendlyName
+    )
+    
+    Write-Output "Retrieving '$certificateName' from '$keyVaultName' ..."
+    $getSecretParams = @{
+    	VaultName = $keyVaultName
+        Name = $certificateName
+    }
+
+	if($certificateVersion -notmatch "latest") {
+        $getSecretParams["Version"] = $certificateVersion
+    }
+    
+	$cert = Get-AzureKeyVaultSecret @getSecretParams
+    $b64 = [System.Convert]::FromBase64String($cert.SecretValueText)
+    $pfx = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($b64, "", "MachineKeySet,PersistKeySet")
+    Write-Output "Certificate information:"
+    Write-Output ($pfx | fl | Out-String)
+    
+    $certPath = "Cert:\$certificateStoreLocation\$certificateStoreName\$($pfx.Thumbprint)"
+    if (Test-Path $certPath) {
+        "A certificate with thumbprint '$($pfx.Thumbprint)' appears to already exist in the certificate store. Skipping..."
+    }
+    else {
+        Write-Output "Opening certificate store '$certificateStoreName' in '$certificateStoreLocation' ..."
+        $store = New-Object System.Security.Cryptography.X509Certificates.X509Store($certificateStoreName, $certificateStoreLocation)
+        $store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)
+
+		if($certificateFriendlyName) {
+          Write-Output "Setting certificate friendly name to '$certificateFriendlyName'..."
+          $pfx.FriendlyName = $certificateFriendlyName
+		}
+        
+        Write-Output "Adding certificate..."
+        $store.Add($pfx)
+        $store.Close()
+        Write-Output "Certificate added."
+
+        Write-Output "Verifying - searching certificate store for thumbprint '$($pfx.Thumbprint)'..."
+        if (Test-Path $certPath) {
+            Write-Output "Certificate is successfully imported!"
+        }
+        else {
+            Write-Error "ERROR: Certificate with thumbprint '$($pfx.Thumbprint)' was not found in certificate store '$certificateStoreName' in '$certificateStoreLocation'"
+        }
+    }
+}
+
+$azureSubscriptionId = $OctopusParameters['Azure.GetKeyVaultCertificate.SubscriptionId']
+$azureTenantId = $OctopusParameters['Azure.GetKeyVaultCertificate.TenantId']
+$azureClientId = $OctopusParameters['Azure.GetKeyVaultCertificate.ClientId']
+$azurePassword = $OctopusParameters['Azure.GetKeyVaultCertificate.Password']
+$keyVaultName = $OctopusParameters['Azure.GetKeyVaultCertificate.KeyVaultName']
+$certificateName = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateName']
+$certificateVersion = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateVersion']
+$certificateStoreName = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateStoreName']
+$certificateStoreLocation = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateStoreLocation']
+$certificateFriendlyName = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateFriendlyName']
+
+# Validate that all parameters have values
+Write-Output "Validating parameters..."
+Validate-Parameter $azureSubscriptionId -parameterName "azureSubscriptionId"
+Validate-Parameter $azureTenantId -parameterName "azureTenantId"
+Validate-Parameter $azureClientId -parameterName "azureClientId"
+Validate-Parameter $azurePassword -parameterName "azurePassword"
+Validate-Parameter $keyVaultName -parameterName "keyVaultName"
+Validate-Parameter $certificateName -parameterName "certificateName"
+Validate-Parameter $certificateVersion -parameterName "certificateVersion"
+Validate-Parameter $certificateStoreName -parameterName "certificateStoreName"
+Validate-Parameter $certificateStoreLocation -parameterName "certificateStoreLocation"
+
+$azureCreds = New-Object System.Management.Automation.PSCredential($azureClientId, (ConvertTo-SecureString -String $azurePassword -AsPlainText -Force))
+Login-AzureRmAccount -ServicePrincipal -SubscriptionId $azureSubscriptionId -TenantId $azureTenantId -Credential $azureCreds
+
+$params = @{
+    keyVaultName             = $keyVaultName
+    certificateName          = $certificateName
+    certificateVersion       = $certificateVersion
+    certificateStoreName     = $certificateStoreName
+    certificateStoreLocation = $certificateStoreLocation
+    certificateFriendlyName     = $certificateFriendlyName
+}
+
+Install-AzureKeyVaultCertificate @params
\ No newline at end of file
diff --git a/src/step-templates/import-databricks-workbooks/metadata.json b/src/step-templates/import-databricks-workbooks/metadata.json
new file mode 100644
index 000000000..4295e2709
--- /dev/null
+++ b/src/step-templates/import-databricks-workbooks/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "0bbe289c-3ea9-47f8-970c-caa946878f49",
+  "Name": "Import Databricks Workbooks",
+  "Description": "Import Databricks workbooks (current supported files `.ipynb` and `.scala`) to a databricks instance",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "7885715a-c3e8-492a-ba61-23c34d2e9447",
+      "Name": "DeployDataBricksWorkBookPackage",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "DeployDataBricksWorkBookPackage"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b8cd5d73-29d9-4ba2-bdfa-86cc1316a16f",
+      "Name": "DeployDataBricksWorkBookPackage",
+      "Label": "DataBricks WorkBook Package",
+      "HelpText": "The Databricks workbook package",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "f81b9ccb-beea-4d8f-a049-ee9ea6da643e",
+      "Name": "DataBricksInstanceUri",
+      "Label": "Databricks Instance Uri",
+      "HelpText": "The Databricks Instance URL",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6c1aed25-f9a6-4c1f-b8e9-d50cc8669f2d",
+      "Name": "DataBricksAccessToken",
+      "Label": "Databricks Access Token",
+      "HelpText": "The access token to authenticate against the Databricks instance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c95af088-180b-419e-8c44-ce3fb4d96f57",
+      "Name": "DatabricksImportFolder",
+      "Label": "Databricks Workbook Import Folder",
+      "HelpText": "Databricks Workbook import folder location",
+      "DefaultValue": "/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-10-05T09:38:27.4450000Z",
+    "OctopusVersion": "2021.2.7428",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "Zogamorph",
+  "Category": "databricks"
+}
diff --git a/src/step-templates/import-databricks-workbooks/scriptbody.ps1 b/src/step-templates/import-databricks-workbooks/scriptbody.ps1
new file mode 100644
index 000000000..20d4985d2
--- /dev/null
+++ b/src/step-templates/import-databricks-workbooks/scriptbody.ps1
@@ -0,0 +1,128 @@
+$ErrorActionPreference = "Stop" #region fucntions
+function Set-DatabricksWorkBook
+{
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [String]
+        $AccessToken, 
+        [Parameter()]
+        [String]
+        $DataBricksInstanceUri,
+        [Parameter()]
+        [String]
+        $WorkbooksUploadPath,
+        [Parameter()]
+        [String]
+        $DatabrickImportFolder
+    )
+
+    $headers = @{
+        'Authorization' = ("Bearer {0}" -f $AccessToken )
+    }
+    $APIVersion = '/api/2.0'
+    $APICommand = '/workspace/import'
+    $Uri = "https://$DataBricksInstanceUri$APIVersion$APICommand"
+        
+    Get-ChildItem -Path $WorkbooksUploadPath -Recurse -File | ForEach-Object{ $currentWorkBook = $_
+        Write-Host ("Importing Workbook:{0}" -f $currentWorkBook.FullName)
+ 		$workbookContent =  [Convert]::ToBase64String((Get-Content -path $currentWorkBook.FullName -Encoding byte))
+    
+        if($DatabrickImportFolder.EndsWith("/"))
+    	{
+    		$workbookPath   = "{0}{1}" -f $DatabrickImportFolder , $currentWorkBook.BaseName
+    	}
+    	else 
+    	{
+        	$workbookPath   = "{0}/{1}" -f $DatabrickImportFolder , $currentWorkBook.BaseName
+    	}
+        
+        switch ($currentWorkBook.Extension.ToLower()) 
+        {
+            '.ipynb' { 
+                $workbookLanguage = "PYTHON" 
+                $workbookFormat   = "JUPYTER"
+                break
+            }
+            '.scala' {
+                $workbookLanguage = "SCALA"
+                $workbookFormat   = "SOURCE"
+                break
+        }
+        Default 
+            {
+                $workbookLanguage = "SQL"
+                $workbookFormat   = "SOURCE"
+            }
+        }
+        $requestBody = ConvertTo-Json -InputObject @{ 
+            content = $workbookContent
+            path = $workbookPath
+            language = $workbookLanguage
+            format = $workbookFormat
+            overwrite = $true
+            }
+        
+        $apiResponse = Invoke-RestMethod -Method Post  -Uri  $Uri -Headers $headers -Body $requestBody
+        return $apiResponse
+    }
+}
+
+
+function Set-DatabricksWorkspaceFolder
+{
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [String]
+        $AccessToken, 
+        [Parameter()]
+        [String]
+        $DataBricksInstanceUri,
+        [Parameter()]
+        [String]
+        $DatabrickFolder
+    )
+
+    $headers = @{
+        'Authorization' = ("Bearer {0}" -f $AccessToken )
+    }
+    $APIVersion = '/api/2.0'
+    $APIListCommand = '/workspace/list'
+    $APIMkdirsCommand = '/workspace/mkdirs'
+    $ListUri = "https://$DataBricksInstanceUri$APIVersion$APIListCommand"
+    $MkdirsUri = "https://$DataBricksInstanceUri$APIVersion$APIMkdirsCommand"
+
+    $pathRoute = $DatabrickFolder.Substring(1) -split '/'
+    $basePath = "/"
+    foreach($path in $pathRoute)
+    {
+        $requestBody = @{ 
+            path = $basePath
+        }
+        $apiResponse = Invoke-RestMethod -Uri $ListUri -Headers $headers -Body $requestBody -ContentType application/json  
+        $workSpaceFolder = $apiResponse.objects | Where-Object {$_.object_type -eq "DIRECTORY" -and $_.path -eq ( "{0}{1}" -f $basePath , $path) } 
+        if($null -eq $workSpaceFolder)
+        {
+            $requestBody = ConvertTo-Json -InputObject  @{ 
+                path = ( "{0}{1}" -f $basePath , $path)
+            } 
+            Invoke-RestMethod -Method Post -Uri $MkdirsUri -Headers $headers -Body $requestBody
+        }
+        $basePath = "{0}/{1}/" -f $basePath , $path
+        if($basePath.StartsWith("//"))
+        {
+            $basePath = $basePath.Substring(1)
+        }
+    }
+}
+
+#endregion fucntions
+
+
+$DatabrickWorkBookImportFolder = $OctopusParameters["Octopus.Action.Package[DeployDataBricksWorkBookPackage].ExtractedPath"]
+
+Write-Host "Checking WorkSpace Folders"
+Set-DatabricksWorkspaceFolder  -AccessToken $DataBricksAccessToken -DataBricksInstanceUri $DataBricksInstanceUri -DatabrickFolder $DatabricksImportFolder
+Write-Host "Importing Databricks Workbooks"
+Set-DatabricksWorkBook -AccessToken $DataBricksAccessToken -DataBricksInstanceUri $DataBricksInstanceUri -WorkbooksUploadPath $DatabrickWorkBookImportFolder -DatabrickImportFolder $DatabricksImportFolder
diff --git a/step-templates/jasper-clear-cache.json b/src/step-templates/jasper-clear-cache/metadata.json
similarity index 55%
rename from step-templates/jasper-clear-cache.json
rename to src/step-templates/jasper-clear-cache/metadata.json
index a6c30aac6..1da5a92d9 100644
--- a/step-templates/jasper-clear-cache.json
+++ b/src/step-templates/jasper-clear-cache/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 3,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Name: ClearCache.ps1\r\n# Author: Matt Smith\r\n# Created Date: 28 July 2014\r\n# Modified Date: 13 October 2014\r\n# Version: 1.3\r\n\r\n$servers = $OctopusParameters['fqdn'] -split \";\"\r\n\r\nforeach ($server in $servers)\r\n{\r\n    Write-Host 'Clearing cache in '$server\r\n    $url = 'http://' + $server + '/' + $OctopusParameters['environment'] + '_web/report/meta'\r\n\r\n    Function ClearCache($type)\r\n    { \r\n      return Invoke-WebRequest -Uri $url/$type -Method GET -Headers @{\"Authorization\" = \"Basic \"+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($OctopusParameters['username']+\":\"+$OctopusParameters['password'] ))}\r\n    }\r\n  \r\n    # Clear cache\r\n    $reportresult = ClearCache -type 'reportcache?CLEAR=Clear+Cache'\r\n    $templateresult =  ClearCache -type 'templatecache?CLEAR=Clear+Cache'\r\n    $imageresult =  ClearCache -type 'imagescache?CLEAR=Clear+Cache'\r\n\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -47,12 +47,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-09-01T16:24:16.807+00:00",
+  "LastModifiedOn": "2015-09-01T09:24:16.8070000-07:00",
   "LastModifiedBy": "matt40k",
   "$Meta": {
-    "ExportedAt": "2015-07-09T12:17:59.666+00:00",
+    "ExportedAt": "2015-07-09T05:17:59.6660000-07:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "jasper"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/jasper-clear-cache/scriptbody.ps1 b/src/step-templates/jasper-clear-cache/scriptbody.ps1
new file mode 100644
index 000000000..a3486cde8
--- /dev/null
+++ b/src/step-templates/jasper-clear-cache/scriptbody.ps1
@@ -0,0 +1,24 @@
+# Name: ClearCache.ps1
+# Author: Matt Smith
+# Created Date: 28 July 2014
+# Modified Date: 13 October 2014
+# Version: 1.3
+
+$servers = $OctopusParameters['fqdn'] -split ";"
+
+foreach ($server in $servers)
+{
+    Write-Host 'Clearing cache in '$server
+    $url = 'http://' + $server + '/' + $OctopusParameters['environment'] + '_web/report/meta'
+
+    Function ClearCache($type)
+    { 
+      return Invoke-WebRequest -Uri $url/$type -Method GET -Headers @{"Authorization" = "Basic "+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($OctopusParameters['username']+":"+$OctopusParameters['password'] ))}
+    }
+  
+    # Clear cache
+    $reportresult = ClearCache -type 'reportcache?CLEAR=Clear+Cache'
+    $templateresult =  ClearCache -type 'templatecache?CLEAR=Clear+Cache'
+    $imageresult =  ClearCache -type 'imagescache?CLEAR=Clear+Cache'
+
+}
\ No newline at end of file
diff --git a/src/step-templates/jira-transition-issues/metadata.json b/src/step-templates/jira-transition-issues/metadata.json
new file mode 100644
index 000000000..8669eff9f
--- /dev/null
+++ b/src/step-templates/jira-transition-issues/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "f0730d85-6ada-44d9-bd95-63b5c236e716",
+  "Name": "JIRA - Transition Issues",
+  "Description": "Transitions JIRA issues as the code they are associated with gets deployed.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9da7c3ad-e06f-4727-8519-3860fbee6420",
+      "Name": "Jira.Transition.Url",
+      "Label": "JIRA URL",
+      "HelpText": "The base URL of the JIRA Server (e.g. http://tempuri.org/jira)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b37a4dde-f7f4-4e30-b992-3ebf6a6d6963",
+      "Name": "Jira.Transition.Username",
+      "Label": "Username",
+      "HelpText": "The username of the account that will be used to run the transition. The account should have sufficient permissions in JIRA to run the transition.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1f28d6cd-3d73-4ac2-b5ab-750b9efaabff",
+      "Name": "Jira.Transition.Password",
+      "Label": "Password",
+      "HelpText": "The password of the account that will be used to run the transaction.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "38aaca97-9fdc-4eef-8c90-8dfd2cf2844e",
+      "Name": "Jira.Transition.Name",
+      "Label": "Transition",
+      "HelpText": "The name of the transition that should be applied to the JIRA tickets. If an issue does not have the named transition, it will be ignored.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e16422bb-fd58-401e-bc25-a3817bab65e3",
+      "Name": "Jira.Transition.Query",
+      "Label": "JQL",
+      "HelpText": "The JIRA query that should be used to select issues that will be transitioned (e.g. status = Completed AND fixVersion = 1.2.3)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "LastModifiedBy": "octopus-hideaki",
+  "$Meta": {
+    "ExportedAt": "2025-09-17T21:41:52.1400000Z",
+    "OctopusVersion": "2025.3.14271",
+    "Type": "ActionTemplate"
+  },
+  "Category": "jira"
+}
diff --git a/src/step-templates/jira-transition-issues/scriptbody.ps1 b/src/step-templates/jira-transition-issues/scriptbody.ps1
new file mode 100644
index 000000000..451b7ab1a
--- /dev/null
+++ b/src/step-templates/jira-transition-issues/scriptbody.ps1
@@ -0,0 +1,179 @@
+$ErrorActionPreference = "Stop"
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
+
+$Uri = $OctopusParameters["Jira.Transition.Url"]
+$Jql = $OctopusParameters["Jira.Transition.Query"]
+$Transition = $OctopusParameters["Jira.Transition.Name"]
+$User = $OctopusParameters["Jira.Transition.Username"]
+$Password = $OctopusParameters["Jira.Transition.Password"]
+
+if ([string]::IsNullOrWhitespace($Uri)) {
+    throw "Missing parameter value for 'Jira.Transition.Url'"
+}
+if ([string]::IsNullOrWhitespace($Jql)) {
+    throw "Missing parameter value for 'Jira.Transition.Query'"
+}
+if ([string]::IsNullOrWhitespace($Transition)) {
+    throw "Missing parameter value for 'Jira.Transition.Name'"
+}
+if ([string]::IsNullOrWhitespace($User)) {
+    throw "Missing parameter value for 'Jira.Transition.Username'"
+}
+if ([string]::IsNullOrWhitespace($Password)) {
+    throw "Missing parameter value for 'Jira.Transition.Password'"
+}
+
+function Create-Uri {
+    Param (
+        $BaseUri,
+        $ChildUri
+    )
+
+    if ([string]::IsNullOrWhitespace($BaseUri)) {
+        throw "BaseUri is null or empty!"
+    }
+    if ([string]::IsNullOrWhitespace($ChildUri)) {
+        throw "ChildUri is null or empty!"
+    }
+    $CombinedUri = "$($BaseUri.TrimEnd("/"))/$($ChildUri.TrimStart("/"))"
+    return New-Object -TypeName System.Uri $CombinedUri
+}
+
+function Jira-QueryApi {
+    Param (
+        [Uri]$Query,
+        [string]$Username,
+        [string]$Password
+    );
+
+    Write-Output "Querying JIRA API $($Query.AbsoluteUri)"
+
+    # Prepare the Basic Authorization header - PSCredential doesn't seem to work
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $Username, $Password)))
+    $headers = @{Authorization = ("Basic {0}" -f $base64AuthInfo) }
+
+    # Execute the query
+    Invoke-RestMethod -Uri $Query -Headers $headers
+}
+
+function Jira-ExecuteApi {
+    Param (
+        [Uri]$Query,
+        [string]$Body,
+        [string]$Username,
+        [string]$Password
+    );
+
+    Write-Output "Posting JIRA API $($Query.AbsoluteUri)"
+
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $Username, $Password)))
+    $headers = @{Authorization = ("Basic {0}" -f $base64AuthInfo) }
+
+    Invoke-RestMethod -Uri $Query -Headers $headers -UseBasicParsing -Body $Body -Method Post -ContentType "application/json"
+}
+
+function Jira-GetTransitions {
+    Param (
+        [Uri]$TransitionsUri,
+        [string]$Username,
+        [string]$Password
+    );
+
+    $transitions = Jira-QueryApi -Query $TransitionsUri -Username $Username -Password $Password
+    $transitions.transitions
+}
+
+function Jira-PostTransition {
+    Param (
+        [Uri]$TransitionsUri,
+        [string]$Username,
+        [string]$Password,
+        [string]$Body
+    );
+
+    Jira-ExecuteApi -Query $TransitionsUri -Body $body -Username $Username -Password $Password
+}
+
+function Jira-TransitionTicket {
+    Param (
+        [Uri]$IssueUri,
+        [string]$Username,
+        [string]$Password,
+        [string]$Transition
+    );
+
+    $query = $IssueUri.AbsoluteUri + "/transitions"
+    $uri = [System.Uri] $query
+
+    $transitions = Jira-GetTransitions -TransitionsUri $uri -Username $Username -Password $Password
+    $match = $transitions | Where-Object name -eq $Transition | Select-Object -First 1
+    $comment = "Status automatically updated via Octopus Deploy with release {0} of {1} to {2}" -f $OctopusParameters['Octopus.Action.Package.PackageVersion'], $OctopusParameters['Octopus.Project.Name'], $OctopusParameters['Octopus.Environment.Name'] 
+    
+    If ($null -ne $match) {
+        $transitionId = $match.id
+        $body = "{ ""update"": { ""comment"": [ { ""add"" : { ""body"" : ""$comment"" } } ] }, ""transition"": { ""id"": ""$transitionId"" } }"
+
+        Jira-PostTransition -TransitionsUri $uri -Body $body -Username $Username -Password $Password
+    }
+}
+
+function Jira-TransitionTickets {
+    Param (
+        [string]$BaseUri,
+        [string]$Username,
+        [string]$Password,
+        [string]$Jql,
+        [string]$Transition
+    );
+
+    try {
+        # Try the newer JQL search endpoint first
+        $childUri = ("/rest/api/2/search/jql?jql=" + $Jql)
+        $queryUri = Create-Uri -BaseUri $BaseUri -ChildUri $childUri
+        
+        $json = Jira-QueryApi -Query $queryUri -Username $Username -Password $Password
+        Set-Content -Path "./header.txt" -Value $json.issues
+        If ($json.issues.Count -eq 0) {
+            Write-Output "No issues were found that matched your query : $Jql"
+            return
+        }
+    }
+    catch {
+        # Fallback to the older search endpoint if the newer one fails
+        Write-Output "Falling back to older JQL search endpoint"
+        $childUri = ("/rest/api/2/search?jql=" + $Jql)
+        $queryUri = Create-Uri -BaseUri $BaseUri -ChildUri $childUri
+        
+        $json = Jira-QueryApi -Query $queryUri -Username $Username -Password $Password
+        If ($json.total -eq 0) {
+            Write-Output "No issues were found that matched your query : $Jql"
+            return
+        }
+    }
+
+    ForEach ($issue in $json.issues) {
+        $issuePath = ("/rest/api/2/issue/" + $issue.id)
+        $queryUri = Create-Uri -BaseUri $BaseUri -ChildUri $issuePath
+        Jira-TransitionTicket -IssueUri $queryUri -Transition $Transition -Username $Username -Password $Password
+    }
+}
+
+Write-Output "JIRA - Create Transition"
+Write-Output "  JIRA URL   : $Uri"
+Write-Output "  JIRA JQL   : $Jql"
+Write-Output "  Transition : $Transition"
+Write-Output "  Username   : $User"
+
+# Some sample values:
+#   $uri = "http://tempuri.org"
+#   $Jql = "fixVersion = 11.3.1 AND status = Completed"
+#   $Ttransition = "Deploy"
+#   $User = "admin"
+#   $Pass = "admin"
+
+try {
+    Jira-TransitionTickets -BaseUri $Uri -Jql $Jql -Transition $Transition -Username $User -Password $Password
+}
+catch {
+    Write-Error "An error occurred while attempting to transition the JIRA issues: $($_.Exception)"
+}
\ No newline at end of file
diff --git a/src/step-templates/jira-update-version/metadata.json b/src/step-templates/jira-update-version/metadata.json
new file mode 100644
index 000000000..57abf7d58
--- /dev/null
+++ b/src/step-templates/jira-update-version/metadata.json
@@ -0,0 +1,103 @@
+{
+  "Id": "c691729f-685a-4339-bba9-716633b221ae",
+  "Name": "JIRA - Update Version Number",
+  "Description": "Update version to Jira tickets based on release number being deployed",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4f231879-328a-4ea0-986c-aa6a2abf8e40",
+      "Name": "Jira.Version.Url",
+      "Label": "JIRA URL",
+      "HelpText": "The base URL of the JIRA Server (e.g. https://company.atlassian.net)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b16ac5da-e984-4f46-8cbd-793401be3a9b",
+      "Name": "Jira.Version.Username",
+      "Label": "Username",
+      "HelpText": "The username of the account that will be used to update Jira ticket. The account should have sufficient permissions in JIRA to update ticket.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "056b87ba-930c-4607-81e4-557503daa237",
+      "Name": "Jira.Version.Password",
+      "Label": "Password",
+      "HelpText": "The password of the account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "458dcb98-1843-41c7-bf22-c451a18aa693",
+      "Name": "Jira.Version.Name",
+      "Label": "Version",
+      "HelpText": "The version that needs to updated to Fix Versions field in Jira ticket. If the version is not found, a new version will be created under respective project",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d7f0fddd-9518-4070-9c78-166b2dc67197",
+      "Name": "Jira.Version.Query",
+      "Label": "JQL",
+      "HelpText": "The JIRA query that should be used to select issues that will be updated with Fix Versions (e.g. status = Completed AND Status = \"Ready for Test Deploy\")",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "30334b2e-db2f-4a3e-878b-511686a58c9f",
+      "Name": "Jira.Version.ProjectKey",
+      "Label": "Project Key",
+      "HelpText": "The project where version to be created",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d858e2de-4dcc-4b1f-bd56-f0cb4d11b347",
+      "Name": "Jira.Version.GetVersionsAPIURL",
+      "Label": "Get Versions API URL",
+      "HelpText": "API URL to get all the versions from a particular project.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9747a96d-788e-45c7-816c-ee1bf91a6665",
+      "Name": "Jira.Version.CreateVersionAPIURL",
+      "Label": "Create Version API URL",
+      "HelpText": "API URL to create version on a particular project.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2019-03-26T19:05:07.1400000Z",
+    "OctopusVersion": "2018.10.2",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/jira-update-version/scriptbody.ps1 b/src/step-templates/jira-update-version/scriptbody.ps1
new file mode 100644
index 000000000..f97b690b4
--- /dev/null
+++ b/src/step-templates/jira-update-version/scriptbody.ps1
@@ -0,0 +1,211 @@
+#require version 3.0
+
+param (
+    [System.Uri]$Uri,
+    [string]$Jql,
+    [string]$Version,
+    [string]$User,
+    [string]$Password,
+    [string]$ProjectKey    
+)
+
+$ErrorActionPreference = "Stop"
+$AllProtocols = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'
+[Net.ServicePointManager]::SecurityProtocol = $AllProtocols
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue    
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Jira-QueryApi
+{
+    Param (
+        [Uri]$Query,
+        [string]$Username,
+        [string]$Password
+    );
+
+    Write-Host "Querying JIRA API $($Query.AbsoluteUri)"
+
+    # Prepare the Basic Authorization header - PSCredential doesn't seem to work
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $Username,$Password)))
+    $headers = @{Authorization=("Basic {0}" -f $base64AuthInfo)}
+
+    # Execute the query
+    Invoke-RestMethod -Uri $Query -Headers $headers
+}
+
+function Jira-ExecuteApi
+{
+    Param (
+        [Uri]$Query,
+        [string]$Body,
+        [string]$Username,
+        [string]$Password
+    );
+
+    Write-Host "Updating ticket : $($Query.AbsoluteUri)"
+
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $Username,$Password)))
+    $headers = @{Authorization=("Basic {0}" -f $base64AuthInfo)}
+    Invoke-RestMethod -Uri $Query -Headers $headers -UseBasicParsing -Body $Body -Method Put -ContentType "application/json"
+}
+
+function Jira-CreateVersion
+{
+    Param (
+        [Uri]$Query,
+        [string]$Body,
+        [string]$Username,
+        [string]$Password
+    );
+
+    Write-Host "Creating a version $($Query.AbsoluteUri)"
+
+    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(("{0}:{1}" -f $Username,$Password)))
+    $headers = @{Authorization=("Basic {0}" -f $base64AuthInfo)}
+    Invoke-RestMethod -Uri $Query -Headers $headers -UseBasicParsing -Body $Body -Method Post -ContentType "application/json"
+}
+
+function Jira-GetVersions
+{
+    Param (
+        [Uri]$VersionsUri,
+        [string]$Username,
+        [string]$Password
+    );
+
+    $versions = Jira-QueryApi -Query $VersionsUri -Username $Username -Password $Password    
+    $versions
+}
+
+function Jira-PostUpdate
+{
+    Param (
+        [Uri]$IssueUri,
+        [string]$Username,
+        [string]$Password,
+        [string]$Body
+    );
+
+    Jira-ExecuteApi -Query $IssueUri -Body $body -Username $Username -Password $Password
+}
+
+function Jira-UpdateTicket
+{
+    Param (
+    	[Uri]$BaseUri,
+        [Uri]$IssueUri,
+        [string]$Username,
+        [string]$Password,
+        [string]$Version,
+        [string]$ProjectKey,
+        [System.Uri]$GetVersionsAPIURL,
+        [System.Uri]$CreateVersionAPIURL          
+    );
+
+    $query = $IssueUri.AbsoluteUri
+    $uri = [System.Uri] $query
+	
+    $versionuri = $GetVersionsAPIURL
+    $createversionuri = $CreateVersionAPIURL
+       
+    $versions = Jira-GetVersions -VersionsUri $versionuri -Username $Username -Password $Password
+               
+    $match = $versions | Where name -eq $Version | Select -First 1   
+    
+    If ($match -ne $null)
+    {                      
+		$body = "{ ""update"" : { ""fixVersions"" : [ {""add"" : {""name"" : ""$Version""} } ] } }"
+        Jira-PostUpdate -IssueUri $uri -Body $body -Username $Username -Password $Password      
+    }    
+    else
+    {
+    	$body = "{ ""name"": ""$Version"",	""project"": ""$ProjectKey""}"
+     	Jira-CreateVersion -Query $createversionuri -Body $body -Username $Username -Password $Password
+        
+        $body = "{ ""update"" : { ""fixVersions"" : [ {""add"" : {""name"" : ""$Version""} } ] } }"
+        Jira-PostUpdate -IssueUri $uri -Body $body -Username $Username -Password $Password  
+    }
+}
+
+function Jira-UpdateTickets
+{
+    Param (
+        [Uri]$BaseUri,
+        [string]$Username,
+        [string]$Password,
+        [string]$Jql,
+        [string]$Version,
+        [string]$ProjectKey,
+        [System.Uri]$GetVersionsAPIURL,
+        [System.Uri]$CreateVersionAPIURL        
+    );
+
+    $api = New-Object -TypeName System.Uri -ArgumentList $BaseUri, ("/rest/api/2/search?jql=" + $Jql)
+    $json = Jira-QueryApi -Query $api -Username $Username -Password $Password
+
+    If ($json.total -eq 0)
+    {
+        Write-Output "No issues were found that matched your query : $Jql"
+    }
+    Else
+    {
+        ForEach ($issue in $json.issues)
+        {
+            Jira-UpdateTicket -BaseUri $BaseUri -IssueUri $issue.self -Version $Version -Username $Username -Password $Password -ProjectKey $ProjectKey -GetVersionsAPIURL $GetVersionsAPIURL -CreateVersionAPIURL $CreateVersionAPIURL
+        }
+    }
+}
+
+& {
+    param(
+        [System.Uri]$Uri,
+        [string]$Jql,
+        [string]$Version,
+        [string]$User,
+        [string]$Password,
+        [string]$ProjectKey,
+        [System.Uri]$GetVersionsAPIURL,
+        [System.Uri]$CreateVersionAPIURL
+    )
+
+    Write-Host "JIRA - Update Version Number"
+    Write-Host " Updating Fix Versions to : $Version"
+
+    try     {
+        Jira-UpdateTickets -BaseUri $Uri -Jql $Jql -Version $Version -Username $User -Password $Password -ProjectKey $ProjectKey -GetVersionsAPIURL $GetVersionsAPIURL -CreateVersionAPIURL $CreateVersionAPIURL
+    } catch {
+        Write-Host -ForegroundColor Red "An error occurred while attempting to update Fix Versions in JIRA issues"
+        Write-Host -ForegroundColor Red $_.Exception | Format-List -Force
+    }
+} `
+(Get-Param "Jira.Version.Url" -Required) `
+(Get-Param "Jira.Version.Query" -Required) `
+(Get-Param "Jira.Version.Name" -Required) `
+(Get-Param "Jira.Version.Username" -Required) `
+(Get-Param "Jira.Version.Password" -Required) `
+(Get-Param "Jira.Version.ProjectKey" -Required) `
+(Get-Param "Jira.Version.GetVersionsAPIURL" -Required) `
+(Get-Param "Jira.Version.CreateVersionAPIURL" -Required)
diff --git a/src/step-templates/json-merge/metadata.json b/src/step-templates/json-merge/metadata.json
new file mode 100644
index 000000000..86d23550d
--- /dev/null
+++ b/src/step-templates/json-merge/metadata.json
@@ -0,0 +1,67 @@
+{
+  "Id": "6bb1fb50-de38-4380-a5ef-7f21ac3a3e6f",
+  "Name": "JSON - Merge Files",
+  "Description": "Merge JSON files",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "ff6ebb11-b388-460b-835e-5cf98ae394ed",
+      "Name": "jmf_SourceFile",
+      "Label": "Source file",
+      "HelpText": "Path to the source file",
+      "DefaultValue": "Required",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f4695bf4-817a-4029-92b8-3e0c9f7da324",
+      "Name": "jmf_TransformFile",
+      "Label": "Transform file",
+      "HelpText": "Path to the file with the changes",
+      "DefaultValue": "Required",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8b5e7f58-a167-46c9-9260-6c49f4945943",
+      "Name": "jmf_FailIfTransformFileMissing",
+      "Label": "Fail if transform file missing",
+      "HelpText": "Should the script fail if the transformation file is missing?",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "16e43e45-5bc7-4e13-a0d1-4c699cadd259",
+      "Name": "jmf_OutputFile",
+      "Label": "Output file",
+      "HelpText": "Path to the output file",
+      "DefaultValue": "Required",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "jonasjanusauskas",
+  "$Meta": {
+    "ExportedAt": "2019-01-31T13:01:36.3860000Z",
+    "OctopusVersion": "2018.2.3",
+    "Type": "ActionTemplate"
+  },
+  "Category": "json"
+}
diff --git a/src/step-templates/json-merge/scriptbody.ps1 b/src/step-templates/json-merge/scriptbody.ps1
new file mode 100644
index 000000000..169e26630
--- /dev/null
+++ b/src/step-templates/json-merge/scriptbody.ps1
@@ -0,0 +1,80 @@
+function Get-RequiredParam($Name) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue    
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+		throw "Missing parameter value $Name"
+    }
+
+    return $result
+}
+
+function Merge-Objects($file1, $file2) {
+    $propertyNames = $($file2 | Get-Member -MemberType *Property).Name
+    foreach ($propertyName in $propertyNames) {
+		# Check if property already exists
+        if ($file1.PSObject.Properties.Match($propertyName).Count) {
+            if ($file1.$propertyName.GetType().Name -eq 'PSCustomObject') {
+				# Recursively merge subproperties
+                $file1.$propertyName = Merge-Objects $file1.$propertyName $file2.$propertyName
+            } else {
+				# Overwrite Property
+                $file1.$propertyName = $file2.$propertyName
+            }
+        } else {
+			# Add property
+            $file1 | Add-Member -MemberType NoteProperty -Name $propertyName -Value $file2.$propertyName
+        }
+    }
+    return $file1
+}
+
+function Merge-Json($sourcePath, $transformPath, $failIfTransformMissing, $outputPath) {
+	if(!(Test-Path $sourcePath)) {
+		Write-Host "Source file $sourcePath does not exist!"
+		Exit 1
+	}
+	
+	$sourceObject = (Get-Content -Path $sourcePath -Encoding UTF8) -join "`n" | ConvertFrom-Json
+	$mergedObject = $sourceObject
+	
+	if (!(Test-Path $transformPath)) {
+		Write-Host "Transform file $transformPath does not exist!"
+		if ([System.Convert]::ToBoolean($failIfTransformMissing)) {
+			Exit 1
+		}
+		Write-Host 'Source file will be written to output without changes'
+	} else {
+		Write-Host 'Applying transformations'
+		$transformObject = (Get-Content -Path $transformPath -Encoding UTF8) -join "`n" | ConvertFrom-Json
+		$mergedObject = Merge-Objects $sourceObject $transformObject
+	}
+	
+	Write-Host "Writing merged JSON to $outputPath..."
+	$mergedJson = $mergedObject | ConvertTo-Json -Depth 200
+	[System.IO.File]::WriteAllLines($outputPath, $mergedJson)
+}
+
+$ErrorActionPreference = 'Stop'
+
+if($OctopusParameters -eq $null) {
+    Write-Host 'OctopusParameters is null...exiting with 1'
+    Exit 1    
+}
+
+$sourceFilePath = Get-RequiredParam 'jmf_SourceFile'
+$transformFilePath = Get-RequiredParam 'jmf_TransformFile'
+$failIfTransformFileMissing = Get-RequiredParam 'jmf_FailIfTransformFileMissing'
+$outputFilePath = Get-RequiredParam 'jmf_OutputFile'
+
+Merge-Json $sourceFilePath $transformFilePath $failIfTransformFileMissing $outputFilePath
\ No newline at end of file
diff --git a/src/step-templates/jwt-generate-json-web-token/metadata.json b/src/step-templates/jwt-generate-json-web-token/metadata.json
new file mode 100644
index 000000000..f39db9eb0
--- /dev/null
+++ b/src/step-templates/jwt-generate-json-web-token/metadata.json
@@ -0,0 +1,135 @@
+{
+  "Id": "1ca0401c-dfca-420e-81ca-1f4b7cf02d2d",
+  "Name": "JWT - Generate JSON Web Token",
+  "Description": "Generates a [Json Web Token (JWT)](https://en.wikipedia.org/wiki/JSON_Web_Token) for use with applications that require a JWT token. The resulting JWT will be stored as a [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) called **JWT**.\n\nA private key needs to be provided that will sign the combined JWT header and payload.\n\nCurrently, the following three signing algorithms are supported:\n\n1. `RS256` - RSASSA-PKCS1-v1_5 using SHA-256\n2. `RS384` - RSASSA-PKCS1-v1_5 using SHA-384\n3. `RS512` - RSASSA-PKCS1-v1_5 using SHA-512\n\nThe default is `RS256`.\n\n**Notes:**\n- Tested on Windows and Linux (PowerShell Core)\n- Tested with Octopus **2020.1**",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "71bacc82-21d7-4d08-a944-15dacd0a3405",
+      "Name": "Generate.JWT.PrivateKey",
+      "Label": "Private key used to sign the JWT",
+      "HelpText": "Provide the private key in PEM format to be used to sign the JWT.\n\nAccepted headers: \n\n- `----BEGIN RSA PRIVATE KEY-----`\n- `-----BEGIN PRIVATE KEY----`\n\n**Note:** It's recommended to use a sensitive variable to provide this value. If you instead enter the private key directly, the step template will attempt to detect this by replacing spaces with new lines ``n`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "84759ecc-a3f6-4822-a678-833269a8bf0d",
+      "Name": "Generate.JWT.Signing.Algorithm",
+      "Label": "JWT signing algorithm",
+      "HelpText": "The JWA [algorithm](https://datatracker.ietf.org/doc/html/rfc7518#section-3.1) to use when signing the JWT. The default is `RS256` (RSASSA-PKCS1-v1_5 using SHA-256).\n\nThis value is also used for the `alg` [algorithm header](https://datatracker.ietf.org/doc/html/rfc7515#section-4.1.1).",
+      "DefaultValue": "RS256",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "RS256|RS256: RSASSA-PKCS1-v1_5 using SHA-256\nRS384|RS384: RSASSA-PKCS1-v1_5 using SHA-384\nRS512|RS512: RSASSA-PKCS1-v1_5 using SHA-512"
+      }
+    },
+    {
+      "Id": "76d289c5-f6f9-4cfb-b876-13515745f03f",
+      "Name": "Generate.JWT.ExpiresAfterMinutes",
+      "Label": "JWT expiry time in minutes",
+      "HelpText": "The number of minutes after the JWT is created that it expires. This value is used for the `exp` [expiration time claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4). The default is `20` minutes.",
+      "DefaultValue": "20",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "20d57320-15e4-4777-916b-8563192a326d",
+      "Name": "Generate.JWT.Issuer",
+      "Label": "JWT Issuer (optional)",
+      "HelpText": "*Optional* - The `iss` [isuer claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.1) identifies the principal that issued the JWT.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e7026958-60cb-4652-9fe0-2ef2965de951",
+      "Name": "Generate.JWT.Subject",
+      "Label": "JWT Subject (optional)",
+      "HelpText": "*Optional* subject (`sub`) of the JWT.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "12a68971-8e0b-4b90-9a27-4c81413d0fb7",
+      "Name": "Generate.JWT.Audience",
+      "Label": "Audience claims (optional)",
+      "HelpText": "*Optional* - The `aud` [audience claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3) identifies the recipients that the JWT is intended for. This is typically the base address of the resource being accessed, such as `https://example-domain.com`\n\n*Note:* \n- For multiple audiences, enter each entry on a new line. \n- Any entries that are an empty string will be ignored.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "1bd2294c-64a3-4dad-bb9f-1a4cce5eaff5",
+      "Name": "Generate.JWT.Groups",
+      "Label": "Group claims (optional)",
+      "HelpText": "*Optional* - A `groups` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies groups associated with this JWT. \n\n*Note:* \n- For multiple groups, enter each entry on a new line. \n- Any entries that are an empty string will be ignored.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "cdc3fe41-4669-48c8-8e65-1265faa79361",
+      "Name": "Generate.JWT.TTL",
+      "Label": "TTL claim (optional)",
+      "HelpText": "*Optional* - A `ttl` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies the time-to-live for the JWT.\n\nThis value can be useful when authenticating with a Secrets Manager and the `ttl` value is mapped through to a resulting token used for authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "51b2ec44-1a8d-43ce-8e06-4d0262eed45e",
+      "Name": "Generate.JWT.TTL.Max",
+      "Label": "Max TTL claim (optional)",
+      "HelpText": "*Optional* - A `max_ttl` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies the time-to-live for the JWT.\n\nThis value can be useful when authenticating with a Secrets Manager and the `max_ttl` value is mapped through to a resulting token used for authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "028ec077-a40f-4aa3-8099-2e873ab710a5",
+      "Name": "Generate.JWT.PrivateClaim.Name",
+      "Label": "Custom private claim name (optional)",
+      "HelpText": "*Optional* - The name of a custom [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that can be included in this JWT. \n\n**Note:** \n\n- Don't include the value for the private claim. Set the value in the `Generate.JWT.PrivateClaim.Value` parameter instead.\n- If this value is null or an empty string, the private claim won't be added to the JWT payload.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "84a50912-284b-4c8a-bfee-87cd7cbc527e",
+      "Name": "Generate.JWT.PrivateClaim.Value",
+      "Label": "Custom private claim value (optional)",
+      "HelpText": "*Optional* - The value for the custom [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) as specified in the parameter `Generate.JWT.PrivateClaim.Name` to be included in this JWT.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2021-08-09T11:51:09.7720000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-08-09T11:51:09.7720000Z",
+    "OctopusVersion": "2020.1.7316",
+    "Type": "ActionTemplate"
+  },
+  "Category": "jwt"
+}
diff --git a/src/step-templates/jwt-generate-json-web-token/scriptbody.ps1 b/src/step-templates/jwt-generate-json-web-token/scriptbody.ps1
new file mode 100644
index 000000000..93bd29d28
--- /dev/null
+++ b/src/step-templates/jwt-generate-json-web-token/scriptbody.ps1
@@ -0,0 +1,508 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$GENERATE_JWT_PRIVATE_KEY = $OctopusParameters["Generate.JWT.PrivateKey"]
+$GENERATE_JWT_ALGORITHM = $OctopusParameters["Generate.JWT.Signing.Algorithm"]
+$GENERATE_JWT_EXPIRES_MINS = $OctopusParameters["Generate.JWT.ExpiresAfterMinutes"]
+
+# Optional 
+$GENERATE_JWT_ISSUER = $OctopusParameters["Generate.JWT.Issuer"]
+$GENERATE_JWT_SUBJECT = $OctopusParameters["Generate.JWT.Subject"]
+$GENERATE_JWT_GROUPS = $OctopusParameters["Generate.JWT.Groups"]
+$GENERATE_JWT_AUDIENCE = $OctopusParameters["Generate.JWT.Audience"]
+$GENERATE_JWT_TTL = $OctopusParameters["Generate.JWT.TTL"]
+$GENERATE_JWT_MAX_TTL = $OctopusParameters["Generate.JWT.TTL.Max"]
+$GENERATE_JWT_PRIVATE_CLAIM_NAME = $OctopusParameters["Generate.JWT.PrivateClaim.Name"]
+$GENERATE_JWT_PRIVATE_CLAIM_VALUE = $OctopusParameters["Generate.JWT.PrivateClaim.Value"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_KEY)) {
+    throw "Required parameter Generate.JWT.PrivateKey not specified."
+}
+if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_ALGORITHM)) {
+    throw "Required parameter Generate.JWT.Signing.Algorithm not specified."
+}
+if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_EXPIRES_MINS)) {
+    throw "Required parameter Generate.JWT.ExpiresAfterMinutes not specified."
+}
+if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_AUDIENCE)) {
+    throw "Required parameter Generate.JWT.Audience not specified."
+}
+
+# Optional fields that require validation
+if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_CLAIM_NAME) -eq $False) {
+    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_CLAIM_VALUE)) {
+        throw "A private claim name has been specified with no value found in Generate.JWT.PrivateClaim.Value."
+    }
+}
+
+# Helper functions
+###############################################################################
+
+function ConvertTo-JwtBase64 {
+    param (
+        $Value
+    )
+    if ($Value -is [string]) {
+        $ConvertedValue = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($Value)) -replace '\+', '-' -replace '/', '_' -replace '='
+    }
+    elseif ($Value -is [byte[]]) {
+        $ConvertedValue = [Convert]::ToBase64String($Value) -replace '\+', '-' -replace '/', '_' -replace '='
+    }
+
+    return $ConvertedValue
+}
+
+###############################################################################
+
+# Signing functions
+###############################################################################
+
+$RsaPrivateKey_Header = "-----BEGIN RSA PRIVATE KEY-----"
+$RsaPrivateKey_Footer = "-----END RSA PRIVATE KEY-----"
+$Pkcs8_PrivateKey_Header = "-----BEGIN PRIVATE KEY-----"
+$Pkcs8_PrivateKey_Footer = "-----END PRIVATE KEY-----"
+
+function ExtractPemData {
+    param (
+        [string]$Pem,
+        [string]$Header,
+        [string]$Footer
+    )
+
+    $Start = $Pem.IndexOf($Header) + $Header.Length
+    $End = $Pem.IndexOf($Footer, $Start) - $Start
+    $EncodedPem = ($Pem.Substring($Start, $End).Trim())  -Replace " ", "`n"
+    
+    $PemData = [Convert]::FromBase64String($EncodedPem)
+    return [byte[]]$PemData
+}
+
+function DecodeIntSize {
+    param (
+        [System.IO.BinaryReader]$BinaryReader
+    )
+    
+    [byte]$byteValue = $BinaryReader.ReadByte()
+    
+    # If anything other than 0x02, an ASN.1 integer follows.
+    if ($byteValue -ne 0x02) {
+        return 0;
+    }
+    
+    $byteValue = $BinaryReader.ReadByte()
+    # 0x81 == Data size in next byte.
+    if ($byteValue -eq 0x81) { 
+        $size = $BinaryReader.ReadByte()
+    }
+    # 0x82 == Data size in next 2 bytes.
+    else {
+        if ($byteValue -eq 0x82) {
+            [byte]$high = $BinaryReader.ReadByte()
+            [byte]$low = $BinaryReader.ReadByte()
+            $byteValues = [byte[]]@($low, $high, 0x00, 0x00)
+            $size = [System.BitConverter]::ToInt32($byteValues, 0)
+        }
+        else {
+            # Otherwise, data size has already been read above.
+            $size = $byteValue
+        }
+    }
+    # Remove high-order zeros in data
+    $byteValue = $BinaryReader.ReadByte()
+    while ($byteValue -eq 0x00) {
+        $byteValue = $BinaryReader.ReadByte()
+        $size -= 1
+    }
+
+    $BinaryReader.BaseStream.Seek(-1, [System.IO.SeekOrigin]::Current) | Out-Null
+    return $size
+}
+
+function PadByteArray {
+    param (
+        [byte[]]$Bytes,
+        [int]$Size
+    )
+
+    if ($Bytes.Length -eq $Size) {
+        return $Bytes
+    }
+    if ($Bytes.Length -gt $Size) {
+        throw "Specified size '$Size' to pad is too small for byte array of size '$($Bytes.Length)'."
+    }
+
+    [byte[]]$PaddedBytes = New-Object Byte[] $Size
+    [System.Array]::Copy($Bytes, 0, $PaddedBytes, $Size - $bytes.Length, $bytes.Length) | Out-Null
+    return $PaddedBytes
+}
+
+function Compare-ByteArrays {
+    param (
+        [byte[]]$First,
+        [byte[]]$Second
+    )
+    if ($First.Length -ne $Second.Length) {
+        return $False
+    }
+    [int]$i = 0
+    foreach ($byte in $First) {
+        if ($byte -ne $Second[$i]) {
+            return $False
+        }
+        $i = $i + 1
+    }
+    return $True
+}
+
+function CreateRSAFromPkcs8 {
+    param (
+        [byte[]]$KeyBytes
+    )
+    Write-Verbose "Reading RSA Pkcs8 private key bytes"
+
+    # The encoded OID sequence for PKCS #1 rsaEncryption szOID_RSA_RSA = "1.2.840.113549.1.1.1"
+    # this byte[] includes the sequence byte and terminal encoded null 
+    [byte[]]$SeqOID = 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00
+    [byte[]]$Seq = New-Object byte[] 15
+
+    # Have to wrap $KeyBytes in another array :|
+    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) 
+    $reader = New-Object System.IO.BinaryReader($MemoryStream)
+    $StreamLength = [int]$MemoryStream.Length
+    
+    try {
+        [UInt16]$Bytes = $reader.ReadUInt16()
+
+        if ($Bytes -eq 0x8130) {
+            $reader.ReadByte() | Out-Null
+        }
+        elseif ($Bytes -eq 0x8230) {
+            $reader.ReadInt16() | Out-Null
+        }
+        else {
+            return $null
+        }
+        
+        [byte]$byteValue = $reader.ReadByte()
+
+        if ($byteValue -ne 0x02) {
+            return $null
+        }
+
+        $Bytes = $reader.ReadUInt16()
+
+        if ($Bytes -ne 0x0001) {
+            return $null
+        }
+
+        # Read the Sequence OID
+        $Seq = $reader.ReadBytes(15)
+        $SequenceMatches = Compare-ByteArrays -First $Seq -Second $SeqOID
+        if ($SequenceMatches -eq $False) {
+            Write-Verbose "Sequence OID doesnt match"
+            return $null
+        }
+
+        $byteValue = $reader.ReadByte()
+        # Next byte should be a Octet string
+        if ($byteValue -ne 0x04) {
+            return $null
+        }
+        # Read next byte / 2 bytes. 
+        # Should be either: 0x81 or 0x82; otherwise it's the byte count.
+        $byteValue = $reader.ReadByte()
+        if ($byteValue -eq 0x81) {
+            $reader.ReadByte() | Out-Null
+        }
+        else {
+            if ($byteValue -eq 0x82) {
+                $reader.ReadUInt16() | Out-Null
+            }
+        }
+
+        # Remaining sequence *should* be the RSA Pkcs1 private Key bytes
+        [byte[]]$RsaKeyBytes = $reader.ReadBytes([int]($StreamLength - $MemoryStream.Position))
+        Write-Verbose "Attempting to create RSA object from remaining Pkcs1 bytes"
+        $rsa = CreateRSAFromPkcs1 -KeyBytes $RsaKeyBytes
+        return $rsa
+    }
+    catch {
+        Write-Warning "CreateRSAFromPkcs8: Exception occurred - $($_.Exception.Message)"
+        return $null
+    }
+    finally {
+        if ($null -ne $reader) { $reader.Close() }
+        if ($null -ne $MemoryStream) { $MemoryStream.Close() }
+    }
+}
+
+function CreateRSAFromPkcs1 {
+    param (
+        [byte[]]$KeyBytes
+    )
+    Write-Verbose "Reading RSA Pkcs1 private key bytes"
+    # Have to wrap $KeyBytes in another array :|
+    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) 
+    $reader = New-Object System.IO.BinaryReader($MemoryStream)
+    try {
+               
+        [UInt16]$Bytes = $reader.ReadUInt16()
+
+        if ($Bytes -eq 0x8130) {
+            $reader.ReadByte() | Out-Null
+        }
+        elseif ($Bytes -eq 0x8230) {
+            $reader.ReadInt16() | Out-Null
+        }
+        else {
+            return $null
+        }
+    
+        $Bytes = $reader.ReadUInt16()
+        if ($Bytes -ne 0x0102) {
+            return $null
+        }
+    
+        [byte]$byteValue = $reader.ReadByte()
+        if ($byteValue -ne 0x00) {
+            return $null
+        }
+
+        # Private key parameters are integer sequences.
+        # For a summary of the RSA Parameters fields, 
+        # See https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.rsaparameters#summary-of-fields
+        
+        $Modulus_Size = DecodeIntSize -BinaryReader $reader
+        $Modulus = $reader.ReadBytes($Modulus_Size)
+
+        $E_Size = DecodeIntSize -BinaryReader $reader
+        $E = $reader.ReadBytes($E_Size)
+
+        $D_Size = DecodeIntSize -BinaryReader $reader
+        $D = $reader.ReadBytes($D_Size)
+
+        $P_Size = DecodeIntSize -BinaryReader $reader
+        $P = $reader.ReadBytes($P_Size)
+
+        $Q_Size = DecodeIntSize -BinaryReader $reader
+        $Q = $reader.ReadBytes($Q_Size)
+
+        $DP_Size = DecodeIntSize -BinaryReader $reader
+        $DP = $reader.ReadBytes($DP_Size)
+
+        $DQ_Size = DecodeIntSize -BinaryReader $reader
+        $DQ = $reader.ReadBytes($DQ_Size)
+
+        $IQ_Size = DecodeIntSize -BinaryReader $reader
+        $IQ = $reader.ReadBytes($IQ_Size)
+
+        $rsa = New-Object System.Security.Cryptography.RSACryptoServiceProvider
+        $rsaParameters = New-Object System.Security.Cryptography.RSAParameters
+        $rsaParameters.Modulus = $Modulus
+        $rsaParameters.Exponent = $E
+        $rsaParameters.P = $P
+        $rsaParameters.Q = $Q
+        # Some RSAParameter values dont play well with byte buffers having leading zeroes removed.
+        $rsaParameters.D = PadByteArray -Bytes $D -Size $Modulus.Length
+        $rsaParameters.DP = PadByteArray -Bytes $DP -Size $P.Length
+        $rsaParameters.DQ = PadByteArray -Bytes $DQ -Size $Q.Length
+        $rsaParameters.InverseQ = PadByteArray -Bytes $IQ -Size $Q.Length
+        $rsa.ImportParameters($rsaParameters)
+
+        Write-Verbose "Completed RSA object creation"
+        return $rsa
+    }
+    catch {
+        Write-Warning "CreateRSA-FromPkcs1: Exception occurred - $($_.Exception.Message)"
+        return $null
+    }
+    finally {
+        if ($null -ne $reader) { $reader.Close() }
+        if ($null -ne $MemoryStream) { $MemoryStream.Close() }
+    }
+}
+
+function CreateSigningKey {
+    param (
+        [string]$Key
+    )
+    try {
+        $Key = $Key.Trim()
+        switch -Wildcard($Key) {
+            "$Pkcs8_PrivateKey_Header*" {
+                $KeyBytes = ExtractPemData -PEM $Key -Header $Pkcs8_PrivateKey_Header -Footer $Pkcs8_PrivateKey_Footer
+                $SigningKey = CreateRSAFromPkcs8 -KeyBytes $KeyBytes
+                return $SigningKey
+            }
+            "$RsaPrivateKey_Header*" {
+                $KeyBytes = ExtractPemData -PEM $Key -Header $RsaPrivateKey_Header -Footer $RsaPrivateKey_Footer
+                $SigningKey = CreateRSAFromPkcs1 -KeyBytes $KeyBytes
+                return $SigningKey
+            }
+            default {
+                Write-Verbose "The PEM header could not be found. Accepted headers: 'BEGIN PRIVATE KEY', 'BEGIN RSA PRIVATE KEY'"
+                return $null
+            }
+        }
+    }
+    catch {
+        Write-Warning "Couldn't create signing key: $($_.Exception.Message)"
+        return $null
+    }
+}
+
+###############################################################################
+
+# Local variables
+$audiences = @()
+if (![string]::IsNullOrWhiteSpace($GENERATE_JWT_AUDIENCE)) {
+    @(($GENERATE_JWT_AUDIENCE -Split "`n").Trim()) | ForEach-Object {
+        if (![string]::IsNullOrWhiteSpace($_)) {
+            $audiences += $_
+        }
+    }
+}
+
+$groups = @()
+if (![string]::IsNullOrWhiteSpace($GENERATE_JWT_GROUPS)) {
+    @(($GENERATE_JWT_GROUPS -Split "`n").Trim()) | ForEach-Object {
+        if (![string]::IsNullOrWhiteSpace($_)) {
+            $groups += $_
+        }
+    }
+}
+
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$OutputVariableName = "JWT"
+
+Write-Verbose "Generate.JWT.Signing.Algorithm: $GENERATE_JWT_ALGORITHM"
+Write-Verbose "Generate.JWT.ExpiresAfterMinutes: $GENERATE_JWT_EXPIRES_MINS"
+Write-Verbose "Generate.JWT.Issuer: $GENERATE_JWT_ISSUER"
+Write-Verbose "Generate.JWT.Subject: $GENERATE_JWT_SUBJECT"
+Write-Verbose "Generate.JWT.Audience(s): $($audiences -Join ",")"
+Write-Verbose "Generate.JWT.Group(s): $($groups -Join ",")"
+Write-Verbose "Generate.JWT.TTL: $GENERATE_JWT_TTL"
+Write-Verbose "Generate.JWT.TTL.Max: $GENERATE_JWT_MAX_TTL"
+Write-Verbose "Generate.JWT.PrivateClaim.Name: $GENERATE_JWT_PRIVATE_CLAIM_NAME"
+Write-Verbose "Generate.JWT.PrivateClaim.Value: $GENERATE_JWT_PRIVATE_CLAIM_VALUE"
+Write-Verbose "Step Name: $StepName"
+
+try {
+
+    # Created + Expires
+    $Created = (Get-Date).ToUniversalTime()
+    $Expires = $Created.AddMinutes([int]$GENERATE_JWT_EXPIRES_MINS)
+
+    $createDate = [Math]::Floor([decimal](Get-Date($Created) -UFormat "%s"))
+    $expiryDate = [Math]::Floor([decimal](Get-Date($Expires) -UFormat "%s"))
+
+    $JwtHeader = @{
+        alg = $GENERATE_JWT_ALGORITHM;
+        typ = "JWT";
+    } | ConvertTo-Json -Compress
+    
+    $JwtPayload = [Ordered]@{
+        iat = [long]$createDate;
+        exp = [long]$expiryDate;
+    }
+
+    # Check for optional issuer: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.1
+    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_ISSUER) -eq $False) {
+        $JwtPayload | Add-Member -NotePropertyName iss -NotePropertyValue $GENERATE_JWT_ISSUER
+    }
+
+    # Check for optional subject: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.2
+    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_SUBJECT) -eq $False) {
+        $JwtPayload | Add-Member -NotePropertyName sub -NotePropertyValue $GENERATE_JWT_SUBJECT
+    }
+
+    # Check for optional audience: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3
+    if ($audiences.Length -gt 0) {
+        $JwtPayload | Add-Member -NotePropertyName aud -NotePropertyValue $audiences
+    }
+    # Check for optional "groups" field
+    if ($groups.Length -gt 0) {
+        $JwtPayload | Add-Member -NotePropertyName groups -NotePropertyValue $groups
+    }
+
+    # Check for optional ttl field
+    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_TTL) -eq $False) {
+        $JwtPayload | Add-Member -NotePropertyName ttl -NotePropertyValue $GENERATE_JWT_TTL
+    }
+    # Check for optional max_ttl field
+    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_MAX_TTL) -eq $False) {
+        $JwtPayload | Add-Member -NotePropertyName max_ttl -NotePropertyValue $GENERATE_JWT_MAX_TTL
+    }
+
+    # Check for an optional private claim name and value: https://datatracker.ietf.org/doc/html/rfc7519#section-4.3
+    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_CLAIM_NAME) -eq $False) {
+        $JwtPayload | Add-Member -NotePropertyName $GENERATE_JWT_PRIVATE_CLAIM_NAME -NotePropertyValue $GENERATE_JWT_PRIVATE_CLAIM_VALUE
+    } 
+
+    $JwtPayload = $JwtPayload | ConvertTo-Json -Compress
+
+    $base64Header = ConvertTo-JwtBase64 -Value $JwtHeader
+    $base64Payload = ConvertTo-JwtBase64 -Value $JwtPayload
+
+    $Jwt = $base64Header + '.' + $base64Payload
+
+    $JwtBytes = [System.Text.Encoding]::UTF8.GetBytes($Jwt)
+    $JwtSignature = $null
+    
+    switch ($GENERATE_JWT_ALGORITHM) {
+        "RS256" {
+            try { 
+
+                $rsa = CreateSigningKey -Key $GENERATE_JWT_PRIVATE_KEY
+                if ($null -eq $rsa) {
+                    throw "Couldn't create RSA object"
+                }
+                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA256, [Security.Cryptography.RSASignaturePadding]::Pkcs1) 
+                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature
+            }
+            catch { throw "Signing with SHA256 and Pkcs1 padding failed using private key: $($_.Exception.Message)" }
+            finally { if ($null -ne $rsa) { $rsa.Dispose() } }
+            
+        }
+        "RS384" {
+            try { 
+                $rsa = CreateSigningKey -Key $GENERATE_JWT_PRIVATE_KEY
+                if ($null -eq $rsa) {
+                    throw "Couldn't create RSA object"
+                }
+                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA384, [Security.Cryptography.RSASignaturePadding]::Pkcs1) 
+                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature
+            }
+            catch { throw "Signing with SHA384 and Pkcs1 padding failed using private key: $($_.Exception.Message)" }
+            finally { if ($null -ne $rsa) { $rsa.Dispose() } }
+        }
+        "RS512" {
+            try { 
+                $rsa = CreateSigningKey -Key $GENERATE_JWT_PRIVATE_KEY
+                if ($null -eq $rsa) {
+                    throw "Couldn't create RSA object"
+                }
+                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA512, [Security.Cryptography.RSASignaturePadding]::Pkcs1) 
+                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature
+            }
+            catch { throw "Signing with SHA512 and Pkcs1 padding failed using private key: $($_.Exception.Message)" }
+            finally { if ($null -ne $rsa) { $rsa.Dispose() } }
+        }
+        default {
+            throw "The algorithm is not one of the supported: 'RS256', 'RS384', 'RS512'"
+        }
+    }
+    if ([string]::IsNullOrWhiteSpace($JwtSignature) -eq $True) {
+        throw "JWT signature empty."
+    }
+
+    $Jwt = "$Jwt.$JwtSignature"
+    Set-OctopusVariable -Name $OutputVariableName -Value $Jwt -Sensitive
+    Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}"
+}
+catch {
+    $ExceptionMessage = $_.Exception.Message
+    $Message = "An error occurred generating a JWT: $ExceptionMessage"
+    Write-Error $Message -Category InvalidResult
+}
\ No newline at end of file
diff --git a/src/step-templates/k8s-create-serviceaccount-and-target/metadata.json b/src/step-templates/k8s-create-serviceaccount-and-target/metadata.json
new file mode 100644
index 000000000..e5760d01f
--- /dev/null
+++ b/src/step-templates/k8s-create-serviceaccount-and-target/metadata.json
@@ -0,0 +1,83 @@
+{
+  "Id": "05d2d9a8-3862-49ff-97d6-5f08935f6fa3",
+  "Name": "Kubernetes - Create Service Account and Target",
+  "Description": "Create a service account with a role granting full access to everything in the namespace, and create a Kubernetes target with the new account in Octopus",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 14,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "66047c5e-8827-4bce-85ef-98466e656d0e",
+      "Name": "CreateK8sTargetName",
+      "Label": "Target name",
+      "HelpText": "The optional name of the target. Defaults to \"<namespace>-k8s\" if no value is defined.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1505ab59-1b6b-497e-9aa5-888f583c2cb2",
+      "Name": "CreateK8sTargetRole",
+      "Label": "Target Role",
+      "HelpText": "The role to assign to the new Kubernetes target",
+      "DefaultValue": "k8s",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e0dc3fc2-b422-4b27-8353-efee0233cf7f",
+      "Name": "CreateK8sTargetNamespace",
+      "Label": "Target Namespace",
+      "HelpText": "The namespace that the service account is granted access to, as well as the default namespace on the target.",
+      "DefaultValue": "#{Octopus.Environment.Name | ToLower}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "34a94173-611f-4cbf-b30a-66fb9456d1cf",
+      "Name": "CreateK8sTargetNamespaceAnnotations",
+      "Label": "Namespace annotations",
+      "HelpText": "An optional list of annotations to apply to the namespace",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "f14880f9-5a57-4469-85d7-5e68e090ed43",
+      "Name": "CreateK8sTargetContainerImageFeed",
+      "Label": "Container Image Feed",
+      "HelpText": "The optional name of the Docker feed where the container image is sourced from.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8d8d4317-af86-4a2a-9c04-eef1d8624e4a",
+      "Name": "CreateK8sTargetContainerImage",
+      "Label": "Container image",
+      "HelpText": "The optional name of the health check container image.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2023-03-07T11:26:30.7530000Z",
+    "OctopusVersion": "2023.1.9608",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "isaaccalligeros",
+  "Category": "k8s"
+}
diff --git a/src/step-templates/k8s-create-serviceaccount-and-target/scriptbody.ps1 b/src/step-templates/k8s-create-serviceaccount-and-target/scriptbody.ps1
new file mode 100644
index 000000000..9368204aa
--- /dev/null
+++ b/src/step-templates/k8s-create-serviceaccount-and-target/scriptbody.ps1
@@ -0,0 +1,122 @@
+if ([string]::IsNullOrWhitespace($CreateK8sTargetNamespace)) {
+	Write-Error "The namespace variable must be defined"
+    exit 1
+}
+
+if ([string]::IsNullOrWhitespace($CreateK8sTargetRole)) {
+	Write-Error "The role variable must be defined"
+    exit 1
+}
+
+$target = if ([string]::IsNullOrEmpty($CreateK8sTargetName)) {"$($CreateK8sTargetNamespace)-k8s"} else {$CreateK8sTargetName}
+$serviceaccount = "$($CreateK8sTargetNamespace)-deployer"
+$rolename = "$($CreateK8sTargetNamespace)-deployer-role"
+$binding = "$($CreateK8sTargetNamespace)-deployer-binding"
+
+$count = (kubectl get namespaces -o json |
+	ConvertFrom-JSON |
+    Select-Object -ExpandProperty items |
+    ? {$_.metadata.name -eq $CreateK8sTargetNamespace}).Count
+    
+if ($count -eq 0) {
+  Set-Content -Path namespace.yaml -Value @"
+  apiVersion: v1
+  kind: Namespace
+  metadata:
+    name: $CreateK8sTargetNamespace
+"@
+
+  if (![string]::IsNullOrWhitespace($CreateK8sTargetNamespaceAnnotations)) {
+  	Add-Content -Path namespace.yaml -Value @"
+    annotations:
+"@
+	$annotations = ($CreateK8sTargetNamespaceAnnotations -split '\r?\n').Trim()
+    foreach ($annotation in $annotations) {
+        Add-Content -Path namespace.yaml -Value @"
+      $annotation
+"@
+    }
+  }
+
+  kubectl apply -f namespace.yaml
+}
+
+Set-Content -Path serviceaccount.yaml -Value @"
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: $serviceaccount
+  namespace: $CreateK8sTargetNamespace 
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  namespace: $CreateK8sTargetNamespace 
+  name: $rolename
+rules:
+- apiGroups: ["*"]
+  resources: ["*"]
+  verbs: ["*"]
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: $binding
+  namespace: $CreateK8sTargetNamespace 
+subjects:
+- kind: ServiceAccount
+  name: $serviceaccount
+  apiGroup: ""
+roleRef:
+  kind: Role
+  name: $rolename
+  apiGroup: ""
+"@
+
+kubectl apply -f serviceaccount.yaml
+ 
+Set-Content -Path secret.yaml -Value @"
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/service-account-token
+metadata:
+  name: $serviceaccount
+  namespace: $CreateK8sTargetNamespace
+  annotations:
+    kubernetes.io/service-account.name: "$serviceaccount"
+"@
+
+kubectl apply -f secret.yaml
+
+$data = kubectl get secret $serviceaccount -o jsonpath="{.data.token}" --namespace=$CreateK8sTargetNamespace 
+
+$token = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($data))
+$url = (kubectl config view -o json | ConvertFrom-Json).clusters[0].cluster.server
+
+New-OctopusTokenAccount -Name $target -token $token -updateIfExisting
+
+if ([string]::IsNullOrEmpty("#{Octopus.Action.Kubernetes.CertificateAuthority}") -or "#{Octopus.Action.Kubernetes.AksAdminLogin}" -ieq "True") {
+	New-OctopusKubernetesTarget `
+		-name $target `
+		-clusterUrl $url `
+		-octopusRoles $CreateK8sTargetRole `
+		-octopusAccountIdOrName $target `
+		-namespace $CreateK8sTargetNamespace `
+		-updateIfExisting `
+		-skipTlsVerification True `
+		-octopusDefaultWorkerPoolIdOrName "#{Octopus.WorkerPool.Id}" `
+        -healthCheckContainerImageFeedIdOrName "$CreateK8sTargetContainerImageFeed" `
+    	-healthCheckContainerImage "$CreateK8sTargetContainerImage"
+} else {
+	New-OctopusKubernetesTarget `
+		-name $target `
+		-clusterUrl $url `
+		-octopusRoles $CreateK8sTargetRole `
+		-octopusAccountIdOrName $target `
+		-namespace $CreateK8sTargetNamespace `
+		-updateIfExisting `
+        -octopusServerCertificateIdOrName "#{Octopus.Action.Kubernetes.CertificateAuthority}" `
+		-octopusDefaultWorkerPoolIdOrName "#{Octopus.WorkerPool.Id}" `
+        -healthCheckContainerImageFeedIdOrName "$CreateK8sTargetContainerImageFeed" `
+    	-healthCheckContainerImage "$CreateK8sTargetContainerImage"
+}
\ No newline at end of file
diff --git a/step-templates/k8s-deploy-kustomize.json b/src/step-templates/k8s-deploy-kustomize/metadata.json
similarity index 73%
rename from step-templates/k8s-deploy-kustomize.json
rename to src/step-templates/k8s-deploy-kustomize/metadata.json
index 43b71230f..34725fe26 100644
--- a/step-templates/k8s-deploy-kustomize.json
+++ b/src/step-templates/k8s-deploy-kustomize/metadata.json
@@ -23,7 +23,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# kubectl is required\nif ! [ -x \"$(command -v kubectl)\" ]; then\n\tfail_step 'kubectl command not found'\nfi\n\nREFERENCED_PACKAGE_NAME=\"K8sKustomize.DeploymentConfiguration\"\nKUSTOMIZE_OVERLAY_PATH=$(get_octopusvariable \"K8sKustomize.OverlayPath\")\n\necho \"Referenced package name:$REFERENCED_PACKAGE_NAME\"\necho \"Overlay path: $KUSTOMIZE_OVERLAY_PATH\"\n\nPACKAGE_LOCATION=$(get_octopusvariable \"Octopus.Action.Package[\"$REFERENCED_PACKAGE_NAME\"].ExtractedPath\")\necho \"Extracted package location: $PACKAGE_LOCATION\"\n\ncd $PACKAGE_LOCATION\nkubectl apply -k $KUSTOMIZE_OVERLAY_PATH"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -49,7 +49,7 @@
   ],
   "StepPackageId": "Octopus.KubernetesRunScript",
   "$Meta": {
-    "ExportedAt": "2022-03-08T14:51:57.629Z",
+    "ExportedAt": "2022-03-08T14:51:57.6290000Z",
     "OctopusVersion": "2021.3.12258",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/k8s-deploy-kustomize/scriptbody.sh b/src/step-templates/k8s-deploy-kustomize/scriptbody.sh
new file mode 100644
index 000000000..1463bb812
--- /dev/null
+++ b/src/step-templates/k8s-deploy-kustomize/scriptbody.sh
@@ -0,0 +1,16 @@
+# kubectl is required
+if ! [ -x "$(command -v kubectl)" ]; then
+	fail_step 'kubectl command not found'
+fi
+
+REFERENCED_PACKAGE_NAME="K8sKustomize.DeploymentConfiguration"
+KUSTOMIZE_OVERLAY_PATH=$(get_octopusvariable "K8sKustomize.OverlayPath")
+
+echo "Referenced package name:$REFERENCED_PACKAGE_NAME"
+echo "Overlay path: $KUSTOMIZE_OVERLAY_PATH"
+
+PACKAGE_LOCATION=$(get_octopusvariable "Octopus.Action.Package["$REFERENCED_PACKAGE_NAME"].ExtractedPath")
+echo "Extracted package location: $PACKAGE_LOCATION"
+
+cd $PACKAGE_LOCATION
+kubectl apply -k $KUSTOMIZE_OVERLAY_PATH
\ No newline at end of file
diff --git a/step-templates/k8s-eksctl-create-cluster-bash.json b/src/step-templates/k8s-eksctl-create-cluster-bash/metadata.json
similarity index 63%
rename from step-templates/k8s-eksctl-create-cluster-bash.json
rename to src/step-templates/k8s-eksctl-create-cluster-bash/metadata.json
index c4d57da13..005c4daf6 100644
--- a/step-templates/k8s-eksctl-create-cluster-bash.json
+++ b/src/step-templates/k8s-eksctl-create-cluster-bash/metadata.json
@@ -13,7 +13,7 @@
     "Octopus.Action.AwsAccount.UseInstanceRole": "False",
     "OctopusUseBundledTooling": "False",
     "Octopus.Action.AwsAccount.Variable": "eksctl.account",
-    "Octopus.Action.Script.ScriptBody": "clusterName='#{eksctl.cluster.name}'\nregion='#{eksctl.region}'\nkubeConfig='eks-sandbox.yaml'\neksctlYaml='eksctl.yaml'\n\n\n# eksctl is required\nif ! [ -x \"$(command -v eksctl)\" ]; then\n\tfail_step 'eksctl command not found'\nfi\n\n# yq is required\nif ! [ -x \"$(command -v yq)\" ]; then\n\tfail_step 'yq command not found'\nfi\n\ncat >\"./$eksctlYaml\" <<EOL\n#{eksctl.yaml}\nEOL\n\n# Check to see if the cluster exists\necho \"Checking to see if cluster '$clusterName' exists\"\neksctl get cluster --name $clusterName --region $region 2>&1\n\nif [ $? -ne 0 ]\nthen\n\techo \"Cluster does not exist. Creating cluster...\"\n    eksctl create cluster -f $eksctlYaml --kubeconfig $kubeConfig\nelse\n\techo \"Cluster exists. Reading cluster details...\"\n    eksctl utils write-kubeconfig --cluster $clusterName --kubeconfig $kubeConfig \nfi\n\nif [ ! -f $kubeConfig ]\nthen\n\techo \"$kubeConfig does not exist, so the Kubernetes target can not be created!\"\n\texit 1\nfi\n\naccountId=$(get_octopusvariable '#{eksctl.account}')\nworkerPool=$(get_octopusvariable 'eksctl.octopus.target.defaultWorkerPool')\nclusterUrl=$(yq r $kubeConfig 'clusters[0].cluster.server')\n\n# Write service message to create the k8s target\necho \"##octopus[create-kubernetestarget \\\n    name=\\\"$(encode_servicemessagevalue '#{eksctl.octopus.target.name}')\\\" \\\n    octopusRoles=\\\"$(encode_servicemessagevalue '#{eksctl.octopus.target.roles}')\\\" \\\n    clusterName=\\\"$(encode_servicemessagevalue \"$clusterName\")\\\" \\\n    clusterUrl=\\\"$(encode_servicemessagevalue \"$clusterUrl\")\\\" \\\n    octopusAccountIdOrName=\\\"$(encode_servicemessagevalue \"$accountId\")\\\" \\\n    namespace=\\\"$(encode_servicemessagevalue 'default')\\\" \\\n    octopusDefaultWorkerPoolIdOrName=\\\"$(encode_servicemessagevalue \"$workerPool\")\\\" \\\n    updateIfExisting=\\\"$(encode_servicemessagevalue 'True')\\\" \\\n    skipTlsVerification=\\\"$(encode_servicemessagevalue 'True')\\\"]\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
     "Octopus.Action.Aws.Region": "#{eksctl.region}"
   },
   "Parameters": [
@@ -89,7 +89,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-05-02T15:04:09.845Z",
+    "ExportedAt": "2020-05-02T15:04:09.8450000Z",
     "OctopusVersion": "2020.1.15",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/k8s-eksctl-create-cluster-bash/scriptbody.sh b/src/step-templates/k8s-eksctl-create-cluster-bash/scriptbody.sh
new file mode 100644
index 000000000..d95fb2003
--- /dev/null
+++ b/src/step-templates/k8s-eksctl-create-cluster-bash/scriptbody.sh
@@ -0,0 +1,54 @@
+clusterName='#{eksctl.cluster.name}'
+region='#{eksctl.region}'
+kubeConfig='eks-sandbox.yaml'
+eksctlYaml='eksctl.yaml'
+
+
+# eksctl is required
+if ! [ -x "$(command -v eksctl)" ]; then
+	fail_step 'eksctl command not found'
+fi
+
+# yq is required
+if ! [ -x "$(command -v yq)" ]; then
+	fail_step 'yq command not found'
+fi
+
+cat >"./$eksctlYaml" <<EOL
+#{eksctl.yaml}
+EOL
+
+# Check to see if the cluster exists
+echo "Checking to see if cluster '$clusterName' exists"
+eksctl get cluster --name $clusterName --region $region 2>&1
+
+if [ $? -ne 0 ]
+then
+	echo "Cluster does not exist. Creating cluster..."
+    eksctl create cluster -f $eksctlYaml --kubeconfig $kubeConfig
+else
+	echo "Cluster exists. Reading cluster details..."
+    eksctl utils write-kubeconfig --cluster $clusterName --kubeconfig $kubeConfig 
+fi
+
+if [ ! -f $kubeConfig ]
+then
+	echo "$kubeConfig does not exist, so the Kubernetes target can not be created!"
+	exit 1
+fi
+
+accountId=$(get_octopusvariable '#{eksctl.account}')
+workerPool=$(get_octopusvariable 'eksctl.octopus.target.defaultWorkerPool')
+clusterUrl=$(yq r $kubeConfig 'clusters[0].cluster.server')
+
+# Write service message to create the k8s target
+echo "##octopus[create-kubernetestarget \
+    name=\"$(encode_servicemessagevalue '#{eksctl.octopus.target.name}')\" \
+    octopusRoles=\"$(encode_servicemessagevalue '#{eksctl.octopus.target.roles}')\" \
+    clusterName=\"$(encode_servicemessagevalue "$clusterName")\" \
+    clusterUrl=\"$(encode_servicemessagevalue "$clusterUrl")\" \
+    octopusAccountIdOrName=\"$(encode_servicemessagevalue "$accountId")\" \
+    namespace=\"$(encode_servicemessagevalue 'default')\" \
+    octopusDefaultWorkerPoolIdOrName=\"$(encode_servicemessagevalue "$workerPool")\" \
+    updateIfExisting=\"$(encode_servicemessagevalue 'True')\" \
+    skipTlsVerification=\"$(encode_servicemessagevalue 'True')\"]"
\ No newline at end of file
diff --git a/src/step-templates/k8s-inspect-resource-pwsh/metadata.json b/src/step-templates/k8s-inspect-resource-pwsh/metadata.json
new file mode 100644
index 000000000..ca94ae5a2
--- /dev/null
+++ b/src/step-templates/k8s-inspect-resource-pwsh/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "53fe7e02-d003-4860-bf15-1122a128d7c0",
+  "Name": "Kubernetes - Inspect Resources",
+  "Category": "k8s",
+  "LastModifiedBy": "mcasperson",
+  "Description": "Inspect K8S resources with common actions like get, describe and logs. Optionally create artifacts containing the output.",
+  "ActionType": "Octopus.KubernetesRunScript",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.KubernetesContainers.Namespace": "#{if K8SInspectNamespace}#{K8SInspectNamespace}#{/if}#{unless K8SInspectNamespace}#{Octopus.Action.Kubernetes.Namespace}#{/unless}"
+  },
+  "Parameters": [
+    {
+      "Id": "8a1ebc8c-ddf3-42bb-be49-9b36ee417f5d",
+      "Name": "K8SInspectResource",
+      "Label": "Resource",
+      "HelpText": "The type of Kubernetes resource to inspect. The list provided is not comprehensive, and any resource can be used if the field is bound.",
+      "DefaultValue": "pod",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "pod|Pod\nservice|Service\ningress|Ingress\ndeployment|Deployment\nstatefulset|StatefulSet\ndaemonset|DaemonSet\nreplicaset|ReplicaSet\nconfigmap|ConfigMap\nsecret|Secret\nnode|Node\nvirtualservice|VirtualService\ngateway|Gateway\npersistentvolume|PersistentVolume\nserviceaccount|Service Account\nrolebinding|Role Binding\nclusterrolebinding|Cluster Role Binding\nrole|Role\nclusterrole|Cluster Role"
+      }
+    },
+    {
+      "Id": "735e2fa4-4f9a-4183-aafe-653f3f6fb103",
+      "Name": "K8SInspectKubectlVerb",
+      "Label": "Kubectl Verb",
+      "HelpText": "The action used to inspect the Kubernetes resource.",
+      "DefaultValue": "get",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "get|Get\nget json|Get JSON\nget yaml|Get YAML\nlogs|Pod Logs\nlogs tail|Pod Logs Tail\nprevious logs|Previous Pod Logs\nprevious logs tail|Previous Pod Logs Tail\ndescribe|Describe"
+      }
+    },
+    {
+      "Id": "9c9dcd65-07eb-4e7d-a61a-370d35d1cf76",
+      "Name": "K8SInspectNames",
+      "Label": "Resource Names",
+      "HelpText": "An optional line break separated list of resources to inspect. If left blank, all resources are inspected. An asterisk can be used as a wildcard.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "4805afba-9ff9-45a6-b2c2-764c2d0e5240",
+      "Name": "K8SInspectCreateArtifact",
+      "Label": "Create Artifact",
+      "HelpText": "Check this to create an artifact capturing the output of the kubectl command.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "da70800b-0ec2-4bef-918c-08ef88c9f411",
+      "Name": "K8SInspectNamespace",
+      "Label": "Namespace",
+      "HelpText": "The Kubernetes namespace to inspect. Leave blank to use the default namespace of the Kubernetes target.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-04-22T01:41:35.0120000Z",
+    "OctopusVersion": "2020.2.4-ci0070",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/k8s-inspect-resource-pwsh/scriptbody.ps1 b/src/step-templates/k8s-inspect-resource-pwsh/scriptbody.ps1
new file mode 100644
index 000000000..eaeff6fe4
--- /dev/null
+++ b/src/step-templates/k8s-inspect-resource-pwsh/scriptbody.ps1
@@ -0,0 +1,144 @@
+<#
+    This script provides a general purpose method for querying Kubernetes resources. It supports common operations
+    like get, describe, logs and output formats like yaml and json. Output can be captured as artifacts.
+#>
+
+<#
+.Description
+Execute an application, capturing the output. Based on https://stackoverflow.com/a/33652732/157605
+#>
+Function Execute-Command ($commandPath, $commandArguments)
+{
+  Write-Host "Executing: $commandPath $($commandArguments -join " ")"
+  
+  Try {
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+    [pscustomobject]@{
+        stdout = $p.StandardOutput.ReadToEnd()
+        stderr = $p.StandardError.ReadToEnd()
+        ExitCode = $p.ExitCode
+    }
+    $p.WaitForExit()
+  }
+  Catch {
+     exit
+  }
+}
+
+<#
+.Description
+Find any resource names that match a wildcard input if one was specified
+#>
+function Get-Resources() 
+{
+    $names = $OctopusParameters["K8SInspectNames"] -Split "`n" | % {$_.Trim()}
+    
+    if ($OctopusParameters["K8SInspectNames"] -match '\*' )
+    {
+        return Execute-Command kubectl (@("-o", "json", "get", $OctopusParameters["K8SInspectResource"])) |
+            # Select the stdout property from the execution
+            Select-Object -ExpandProperty stdout |
+            # Convert the output from JSON
+            ConvertFrom-JSON | 
+            # Get the items object from the kubectl response
+            % {if ((Get-Member -InputObject $_ -Name items).Count -ne 0) {Select-Object -InputObject $_ -ExpandProperty items} else {$_}} |
+            # Extract the name
+            % {$_.metadata.name} |
+            # Find any matching resources
+            ? {$k8sName = $_; ($names | ? {$k8sName -like $_}).Count -ne 0}
+    }
+    else
+    {
+        return $names
+    }
+}
+
+<#
+.Description
+Get the kubectl arguments for a given action
+#>
+function Get-KubectlVerb() 
+{
+    switch($OctopusParameters["K8SInspectKubectlVerb"])
+    {
+        "get json" {return ,@("-o", "json", "get")}
+        "get yaml" {return ,@("-o", "yaml", "get")}
+        "describe" {return ,@("describe")}
+        "logs" {return ,@("logs")}
+        "logs tail" {return ,@("logs", "--tail", "100")}
+        "previous logs" {return ,@("logs", "--previous")}
+        "previous logs tail" {return ,@("logs", "--previous", "--tail", "100")}
+        default {return ,@("get")}
+    }
+}
+
+<#
+.Description
+Get an appropiate file extension based on the selected action
+#>
+function Get-ArtifactExtension() 
+{
+   switch($OctopusParameters["K8SInspectKubectlVerb"])
+    {
+        "get json" {"json"}
+        "get yaml" {"yaml"}
+        default {"txt"}
+    }
+}
+
+if ($OctopusParameters["K8SInspectKubectlVerb"] -like "*logs*") 
+{
+    if ( -not @($OctopusParameters["K8SInspectResource"]) -like "pod*")
+    {
+        Write-Error "Logs can only be returned for pods, not $($OctopusParameters["K8SInspectResource"])"
+    }
+    else
+    {
+        Execute-Command kubectl (@("-o", "json", "get", "pods") + (Get-Resources)) |
+            # Select the stdout property from the execution
+            Select-Object -ExpandProperty stdout |
+            # Convert the output from JSON
+            ConvertFrom-JSON | 
+            # Get the items object from the kubectl response
+            % {if ((Get-Member -InputObject $_ -Name items).Count -ne 0) {Select-Object -InputObject $_ -ExpandProperty items} else {$_}} |
+            # Get the pod logs for each container
+            % {
+                $podDetails = $_
+                @{
+                    logs=$podDetails.spec.containers | % {$logs=""} {$logs += (Select-Object -InputObject (Execute-Command kubectl ((Get-KubectlVerb) + @($podDetails.metadata.name, "-c", $_.name))) -ExpandProperty stdout)} {$logs}; 
+                    name=$podDetails.metadata.name
+                }                
+            } |
+            # Write the output
+            % {Write-Host $_.logs; $_} |
+            # Optionally capture the artifact
+            % {
+                if ($OctopusParameters["K8SInspectCreateArtifact"] -ieq "true") 
+                {
+                    Set-Content -Path "$($_.name).$(Get-ArtifactExtension)" -Value $_.logs
+                    New-OctopusArtifact "$($_.name).$(Get-ArtifactExtension)"
+                }
+            }
+    }      
+}
+else
+{
+    Execute-Command kubectl ((Get-KubectlVerb) + @($OctopusParameters["K8SInspectResource"]) + (Get-Resources)) |
+        % {Select-Object -InputObject $_ -ExpandProperty stdout} |
+        % {Write-Host $_; $_} |
+        % {
+            if ($OctopusParameters["K8SInspectCreateArtifact"] -ieq "true") 
+            {
+                Set-Content -Path "output.$(Get-ArtifactExtension)" -Value $_
+                New-OctopusArtifact "output.$(Get-ArtifactExtension)"
+            }
+        }
+}
diff --git a/src/step-templates/keeper-secretsmanager-retrieve-secrets/metadata.json b/src/step-templates/keeper-secretsmanager-retrieve-secrets/metadata.json
new file mode 100644
index 000000000..d548621c4
--- /dev/null
+++ b/src/step-templates/keeper-secretsmanager-retrieve-secrets/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "95a35cf6-ce95-4b81-b8de-0892cffca4c4",
+  "Name": "Keeper Secrets Manager - Retrieve Secrets",
+  "Description": "This step retrieves one or more secrets from a Keeper Vault and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nYou can retrieve secrets using Keeper Notation URIs, and you can choose a custom output variable name for each secret.\n\n---\n\n**Required:** \n- A [Keeper Secrets Manager](https://docs.keeper.io/secrets-manager/) application with permissions to retrieve secrets from the Keeper Vault.\n- The `SecretManagement.Keeper.Extension` PowerShell module installed on the target or worker. If the module can't be found, the step will fail. *The `SecretManagement.Keeper` module(s) can be installed from the [PowerShell gallery](https://www.powershellgallery.com/packages/SecretManagement.Keeper)*\n\nNotes:\n\n- Tested on Octopus `2022.4`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.\n\n",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "7daedc7d-7623-47b8-98ba-747290f04372",
+      "Name": "Keeper.SecretsManager.RetrieveSecrets.Config",
+      "Label": "Keeper Secrets Manager Configuration",
+      "HelpText": "Keeper Secrets Manager [configuration](https://docs.keeper.io/secrets-manager/secrets-manager/about/secrets-manager-configuration) for [KSM Application](https://docs.keeper.io/secrets-manager/secrets-manager/quick-start-guide) with permissions to retrieve secrets from the Keeper Vault. To generate KSM Configuration in Web Vault: Secrets Manager - KSM Application Name - Devices - Edit - Add Device, and switch to Method: Configuration File, preferably in Base64 format",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "10df4954-8683-434c-b708-cd25b3b395ff",
+      "Name": "Keeper.SecretsManager.RetrieveSecrets.VaultSecrets",
+      "Label": "Vault Secrets to retrieve",
+      "HelpText": "Use [Secrets Manager Notation URIs](https://docs.keeper.io/secrets-manager/secrets-manager/about/keeper-notation) to specify the Secrets to be returned from Keeper Vault, in the format `SecretsManagerNotation URI | OutputVariableName` where:\n\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "15bd51e5-72be-4600-85ba-7b4cf1a8e157",
+      "Name": "Keeper.SecretsManager.RetrieveSecrets.PrintVariableNames",
+      "Label": "Print output variable names",
+      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "6888b6b2-8916-4f88-9c7a-d811654e5a2b",
+      "Name": "Keeper.SecretsManager.RetrieveSecrets.KsmModule.SpecificVersion",
+      "Label": "SecretManagement.Keeper.Extension PowerShell Module version (optional)",
+      "HelpText": "If you wish to use a specific version of the `SecretManagement.Keeper.Extension` PowerShell module (rather than the default), enter the version number here. e.g. `16.5.0`.\n\n**Note:** The version specified must exist on the machine. Version 16.5.0 is the lowest supported version\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0a2b750b-0ad3-48fc-9d68-e133746226a9",
+      "Name": "Keeper.SecretsManager.RetrieveSecrets.KsmModule.CustomInstallLocation",
+      "Label": "SecretManagement.Keeper.Extension PowerShell Install Location (optional)",
+      "HelpText": "If you wish to provide a custom path to the `SecretManagement.Keeper.Extension` PowerShell module (rather than the default), enter the value here.\n\n**Note:** The Module must exist at the specified location on the machine. This step template will not download the Module.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "idimov-keeper",
+  "LastModifiedAt": "2024-06-12T00:54:34.7240000Z",
+  "$Meta": {
+    "ExportedAt": "2024-06-12T00:54:34.7240000Z",
+    "OctopusVersion": "2022.4.8319",
+    "Type": "ActionTemplate"
+  },
+  "Category": "keeper-secretsmanager"
+}
diff --git a/src/step-templates/keeper-secretsmanager-retrieve-secrets/scriptbody.ps1 b/src/step-templates/keeper-secretsmanager-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..07137c2f1
--- /dev/null
+++ b/src/step-templates/keeper-secretsmanager-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,185 @@
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$KsmModuleName = "SecretManagement.Keeper.Extension"
+$KsmParentModuleName = "SecretManagement.Keeper"
+$KsmConfig = $OctopusParameters["Keeper.SecretsManager.RetrieveSecrets.Config"]
+$VaultSecrets = $OctopusParameters["Keeper.SecretsManager.RetrieveSecrets.VaultSecrets"]
+$KsmModuleSpecificVersion = $OctopusParameters["Keeper.SecretsManager.RetrieveSecrets.KsmModule.SpecificVersion"]
+$KsmModuleCustomInstallLocation = $OctopusParameters["Keeper.SecretsManager.RetrieveSecrets.KsmModule.CustomInstallLocation"]
+$PrintVariableNames = $OctopusParameters["Keeper.SecretsManager.RetrieveSecrets.PrintVariableNames"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($VaultSecrets)) {
+    throw "Required parameter Keeper.SecretsManager.RetrieveSecrets.VaultSecrets not specified"
+}
+
+if ([string]::IsNullOrWhiteSpace($KsmModuleSpecificVersion) -eq $False) {
+    $requiredVersion = [Version]$KdmModuleSpecificVersion
+}
+
+# Cross-platform bits
+$WindowsPowerShell = $True
+if ($PSEdition -eq "Core") {
+    $WindowsPowerShell = $False
+}
+
+### Helper functions
+function Get-Module-CrossPlatform {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $Name
+    )
+
+    $module = Get-Module -Name $Name -ListAvailable
+    if($WindowsPowerShell -eq $True -and $null -eq $module) {
+        $module = Get-InstalledModule -Name $Name
+    }
+
+    return $module
+}
+
+function Load-Module {
+    Param(
+        [Parameter(Mandatory = $true)][string] $name
+    )
+
+    $retVal = $true
+    if (!(Get-Module -Name $name)) {
+        $isAvailable = Get-Module -ListAvailable | where { $_.Name -eq $name }
+        if ($isAvailable) {
+            try {
+                Import-Module $name -ErrorAction SilentlyContinue
+            } catch {
+                $retVal = $false
+            }
+        } else {
+            $retVal = $false
+        }
+    }
+    return $retVal
+}
+
+$PowerShellModuleName = $KsmModuleName
+
+# Check for Custom install location specified for KsmModule
+if ([string]::IsNullOrWhiteSpace($KsmModuleCustomInstallLocation) -eq $false) {
+    if ((Test-Path $KsmModuleCustomInstallLocation -IsValid) -eq $false) {
+        throw "The path $KsmModuleCustomInstallLocation is not valid, please use a relative or absolute path."
+    }
+    
+    $KsmModulesFolder = [System.IO.Path]::GetFullPath($KsmModuleCustomInstallLocation)
+    $LocalModules = (New-Item "$KsmModulesFolder" -ItemType Directory -Force).FullName
+    $env:PSModulePath = $LocalModules + [System.IO.Path]::PathSeparator + $env:PSModulePath
+
+    # Check to see if there
+    if ((Test-Path -Path "$LocalModules/$KsmModuleName") -eq $true)
+    {
+        # Use specific location
+        $PowerShellModuleName = "$LocalModules/$PowerShellModuleName"
+    }
+}
+
+# Import module
+if([string]::IsNullOrWhiteSpace($KsmModuleSpecificVersion)) {
+    Write-Host "Importing module $PowerShellModuleName ..."
+    if ((Load-Module -Name $PowerShellModuleName) -eq $false) {
+        Write-Host "Extension module not found $PowerShellModuleName - trying to find sub-module in parent $KsmParentModuleName"
+        if (Get-Module -ListAvailable -Name $KsmParentModuleName) {
+            $KsmParentModuleDir = Split-Path -Path (Get-Module -ListAvailable -Name $KsmParentModuleName).Path
+            $KsmModuleFolder = [System.IO.Path]::GetFullPath($KsmParentModuleDir)
+            $LocalModules = (New-Item "$KsmModuleFolder" -ItemType Directory -Force).FullName
+            $env:PSModulePath = $LocalModules + [System.IO.Path]::PathSeparator + $env:PSModulePath
+
+            if ((Test-Path -Path "$LocalModules/$KsmModuleName") -eq $true)
+            {
+                $PowerShellModuleName = "$LocalModules/$PowerShellModuleName"
+                try {
+                    Import-Module -Name $PowerShellModuleName -ErrorAction SilentlyContinue
+                    Write-Host "Imported sub-module $PowerShellModuleName ..."
+                } catch {
+                    Write-Host "Failed to import sub-module $PowerShellModuleName ..."
+                }
+            }
+        } else {
+            Write-Host "Module does not exist"
+        }
+    }
+}
+else {
+    Write-Host "Importing module $PowerShellModuleName ($KsmModuleSpecificVersion)..."
+    Import-Module -Name $PowerShellModuleName -RequiredVersion $requiredVersion
+}
+
+# Check if SecretManagement.Keeper.Extension Module is installed.
+$ksmVaultModule = Get-Module-CrossPlatform -Name $KsmModuleName
+if ($null -eq $ksmVaultModule) {
+    throw "Cannot find the '$KsmModuleName' module on the machine. If you think it is installed, try restarting the Tentacle service for it to be detected."
+}
+
+$Secrets = @()
+$VariablesCreated = 0
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Extract lines and split into notations and variables
+$index = 0
+$usedNames = @()
+@(($VaultSecrets -Split "`n").Trim()) | ForEach-Object {
+    if (![string]::IsNullOrWhiteSpace($_)) {
+        Write-Verbose "Working on: '$_'"
+
+        # Split 'Notation | VariableName' and generate new var name if needed
+        $notation = $_
+        $variableName = ""
+        $n = $_.LastIndexOf("|")
+        if ($n -ge 0) {
+            if ($n -lt $notation.Length-1) {
+                $variableName = $notation.SubString($n+1).Trim()
+            }
+            $notation = $notation.SubString(0, $n).Trim()
+        }
+        if ([string]::IsNullOrWhiteSpace($variableName)) {
+            do {
+                $index++
+                $variableName = "KsmSecret" + $index
+            } while ($usedNames.Contains($variableName))
+        }
+        # Duplicate var - either overlapping KsmSecretN or another user variable
+        if($usedNames.Contains($variableName)) {
+            throw "Duplicate variable name: '$variableName'"
+        }
+        $usedNames += $variableName
+
+        if([string]::IsNullOrWhiteSpace($notation)) {
+            throw "Unable to establish notation URI from: '$($_)'"
+        }
+        $secret = [PsCustomObject]@{
+            Notation         = $notation
+            VariableName = $variableName
+        }
+        $Secrets += $secret
+    }
+}
+
+Write-Verbose "Print variables: $PrintVariableNames"
+Write-Verbose "Secrets to retrieve: $($Secrets.Count)"
+Write-Verbose "KSM Version specified: $KsmModuleSpecificVersion"
+Write-Verbose "KSM Custom Install Dir: $KsmModuleCustomInstallLocation"
+
+# Retrieve Secrets
+foreach($secret in $secrets) {
+    $notation = $secret.Notation
+    $variableName = $secret.VariableName
+
+    $ksmSecretValue = Get-Notation -Notation $notation -Config $KsmConfig
+
+    Set-OctopusVariable -Name $variableName -Value $ksmSecretValue -Sensitive
+
+    if($PrintVariableNames -eq $True) {
+        Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+    }
+    $VariablesCreated += 1
+}
+
+Write-Host "Created $variablesCreated output variables"
diff --git a/src/step-templates/launchdarkly-toggle-feature-flag/metadata.json b/src/step-templates/launchdarkly-toggle-feature-flag/metadata.json
new file mode 100644
index 000000000..878cb82dd
--- /dev/null
+++ b/src/step-templates/launchdarkly-toggle-feature-flag/metadata.json
@@ -0,0 +1,72 @@
+{
+  "Id": "bf51e357-8b88-4cfb-8568-550fe0a2d68a",
+  "Name": "LaunchDarkly - Toggle a feature flag",
+  "Description": "Toggle a LaunchDarkly feature flag on or off ",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "6504527d-cdb9-43d5-be88-45f942a4ac8d",
+      "Name": "launchdarkly-access-token",
+      "Label": "Access Token",
+      "HelpText": "Your LaunchDarkly access token",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2cc43e76-7d49-48ad-922a-9b2ddfaa2098",
+      "Name": "launchdarkly-project-key",
+      "Label": "Project key",
+      "HelpText": "The key of the project containing this feature flag",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "01c4084a-368f-4bc0-9eb9-8b7764905a90",
+      "Name": "launchdarkly-environment-key",
+      "Label": "Environment key",
+      "HelpText": "The key of the environment to change this feature flag value in",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cfa20800-262b-47d8-b9d0-a50283d08f37",
+      "Name": "launchdarkly-flag-key",
+      "Label": "Feature flag key",
+      "HelpText": "The key of the feature flag you want to toggle",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b91bcc79-3672-4679-b82b-2bd616f455f8",
+      "Name": "launchdarkly-flag-value",
+      "Label": "Feature flag enabled",
+      "HelpText": "Enable targeting for this feature flag?",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "AndyMDoyle",
+  "$Meta": {
+    "ExportedAt": "2018-07-09T09:48:16.6000000Z",
+    "OctopusVersion": "2018.5.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "launchdarkly"
+}
diff --git a/src/step-templates/launchdarkly-toggle-feature-flag/scriptbody.ps1 b/src/step-templates/launchdarkly-toggle-feature-flag/scriptbody.ps1
new file mode 100644
index 000000000..9b024f713
--- /dev/null
+++ b/src/step-templates/launchdarkly-toggle-feature-flag/scriptbody.ps1
@@ -0,0 +1,5 @@
+$headers = @{ Authorization = "#{launchdarkly-access-token}"; "content-type" = "application/json" }
+$body = @( @{ op = "replace"; path = "/environments/#{launchdarkly-environment-key}/on"; value = #{if launchdarkly-flag-value}$true#{/if}#{unless launchdarkly-flag-value}$false#{/unless} } )
+$bodyAsJson = ConvertTo-Json -InputObject $body -Compress
+
+Invoke-RestMethod 'https://app.launchdarkly.com/api/v2/flags/#{launchdarkly-project-key}/#{launchdarkly-flag-key}' -Method Patch -Body $bodyAsJson -Headers $headers
\ No newline at end of file
diff --git a/src/step-templates/letsencrypt-azure-dns/metadata.json b/src/step-templates/letsencrypt-azure-dns/metadata.json
new file mode 100644
index 000000000..a15992c5e
--- /dev/null
+++ b/src/step-templates/letsencrypt-azure-dns/metadata.json
@@ -0,0 +1,113 @@
+{
+  "Id": "79e0dd12-6222-4f8a-a8dc-bcbe579ed729",
+  "Name": "Lets Encrypt - Azure DNS",
+  "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [Azure DNS](https://azure.microsoft.com/en-us/services/dns/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.Enabled": "True"
+  },
+  "Parameters": [
+    {
+      "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
+      "Name": "LE_AzureDNS_CertificateDomain",
+      "Label": "Certificate Domain",
+      "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
+      "Name": "LE_AzureDNS_PfxPassword",
+      "Label": "PFX Password",
+      "HelpText": "Password to use when converting to / from PFX. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
+      "Name": "LE_AzureDNS_ReplaceIfExpiresInDays",
+      "Label": "Replace expiring certificate before N days",
+      "HelpText": "Replace the certificate if it expiries within N days",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2935998d-d030-4af6-ad42-39e8b85e2dce",
+      "Name": "LE_AzureDNS_AzureAccount",
+      "Label": "Azure account",
+      "HelpText": "An Azure Account that has API access to make DNS changes. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "85af482d-e577-40b8-94e5-626e545adab5",
+      "Name": "LE_AzureDNS_Octopus_APIKey",
+      "Label": "Octopus Deploy API key",
+      "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
+      "Name": "LE_AzureDNS_Use_Staging",
+      "Label": "Use Lets Encrypt Staging",
+      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
+      "Name": "LE_AzureDNS_ContactEmailAddress",
+      "Label": "Contact Email Address",
+      "HelpText": "Email Address",
+      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
+      "Name": "LE_AzureDNS_CreateWildcardSAN",
+      "Label": "Create Wildcard SAN",
+      "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "36451c6b-f61d-4e00-b1f6-956341c9691d",
+      "Name": "LE_AzureDNS_DnsAlias",
+      "Label": "DNS Alias",
+      "HelpText": "Use a CNAME alias for the TXT challenge.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-11T14:51:42.8150000Z",
+    "OctopusVersion": "2025.3.14236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "farhanalam",
+  "Category": "lets-encrypt"
+}
diff --git a/src/step-templates/letsencrypt-azure-dns/scriptbody.ps1 b/src/step-templates/letsencrypt-azure-dns/scriptbody.ps1
new file mode 100644
index 000000000..7bed634e1
--- /dev/null
+++ b/src/step-templates/letsencrypt-azure-dns/scriptbody.ps1
@@ -0,0 +1,337 @@
+###############################################################################
+# TLS 1.2
+###############################################################################
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+###############################################################################
+# Required Modules folder
+###############################################################################
+Write-Host "Checking for required powershell modules folder"
+$ModulesFolder = "$HOME\Documents\WindowsPowerShell\Modules"
+if ($PSEdition -eq "Core") {
+    if ($PSVersionTable.Platform -eq "Unix") {
+        $ModulesFolder = "$HOME/.local/share/powershell/Modules"
+    }
+    else {
+        $ModulesFolder = "$HOME\Documents\PowerShell\Modules"
+    }
+}
+$PSModuleFolderExists = (Test-Path $ModulesFolder)
+if ($PSModuleFolderExists -eq $False) {
+	Write-Host "Creating directory: $ModulesFolder"
+	New-Item $ModulesFolder -ItemType Directory -Force
+    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath
+}
+
+###############################################################################
+# Required Modules
+###############################################################################
+Write-Host "Checking for required modules."
+$required_posh_acme_version = 3.12.0
+$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }
+
+if (-not ($module_check)) {
+    Write-Host "Ensuring NuGet provider is bootstrapped."
+    Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+    Write-Host "Installing Posh-ACME."
+    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force
+}
+
+Import-Module Posh-ACME
+
+###############################################################################
+# Constants
+###############################################################################
+$LE_AzureDNS_CertificateDomain = $OctopusParameters["LE_AzureDNS_CertificateDomain"]
+$LE_AzureDNS_CertificateName = "Lets Encrypt - $($LE_AzureDNS_CertificateDomain)"
+
+# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt
+$LE_AzureDNS_Fake_Issuers = @("Fake LE Intermediate X1", "(STAGING) Artificial Apricot R3", "(STAGING) Ersatz Edamame E1", "(STAGING) Pseudo Plum E5", "(STAGING) False Fennel E6", "(STAGING) Puzzling Parsnip E7", "(STAGING) Mysterious Mulberry E8", "(STAGING) Fake Fig E9", "(STAGING) Counterfeit Cashew R10", "(STAGING) Wannabe Watercress R11", "(STAGING) Riddling Rhubarb R12", "(STAGING) Tenuous Tomato R13", "(STAGING) Not Nectarine R14")
+$LE_AzureDNS_Issuers = @("Let's Encrypt Authority X3", "E1", "E2", "E7", "E8", "R3", "R4", "R5", "R6", "R10", "R11", "R12", "R13")
+
+# (Optional) CNAME DNS alias. If specified, the alias will be used for the TXT challenge.
+# https://poshac.me/docs/v4/Guides/Using-DNS-Challenge-Aliases/
+$LE_AzureDNS_DnsAlias = $OctopusParameters["LE_AzureDNS_DnsAlias"]
+
+###############################################################################
+# Helpers
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $response = $reader.ReadToEnd()
+
+            return $response | ConvertFrom-Json
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+###############################################################################
+# Functions
+###############################################################################
+function Get-LetsEncryptCertificate {
+    Write-Debug "Entering: Get-LetsEncryptCertificate"
+
+    if ($OctopusParameters["LE_AzureDNS_Use_Staging"] -eq $True) {
+        Write-Host "Using Lets Encrypt Server: Staging"
+        Set-PAServer LE_STAGE;
+    }
+    else {
+        Write-Host "Using Lets Encrypt Server: Production"
+        Set-PAServer LE_PROD;
+    }
+
+    # Clobber account if it exists.
+    $le_account = Get-PAAccount
+    if ($le_account) {
+        Remove-PAAccount $le_account.Id -Force
+    }
+
+    $azure_password = ConvertTo-SecureString -String $OctopusParameters["LE_AzureDNS_AzureAccount.Password"] -AsPlainText -Force
+    $azure_credential = New-Object System.Management.Automation.PSCredential($OctopusParameters["LE_AzureDNS_AzureAccount.Client"], $azure_password)
+    $azure_params = @{
+        AZSubscriptionId = $OctopusParameters["LE_AzureDNS_AzureAccount.SubscriptionNumber"];
+        AZTenantId       = $OctopusParameters["LE_AzureDNS_AzureAccount.TenantId"];
+        AZAppCred        = $azure_credential
+    }
+
+    try {
+
+        $DnsPlugins = @("Azure")
+        $DomainList = @($LE_AzureDNS_CertificateDomain)
+        
+        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.
+        if ($LE_AzureDNS_CertificateDomain -match "\*." -and $OctopusParameters["LE_AzureDNS_CreateWildcardSAN"] -eq $True) {
+            $LE_AzureDNS_Certificate_SAN = $LE_AzureDNS_CertificateDomain.Replace("*.","")
+            $DomainList += $LE_AzureDNS_Certificate_SAN
+            # Include additional DnsPlugin of same type to suppress warning.
+            $DnsPlugins += "Azure"
+        }
+
+        $Cert_Params = @{
+            Domain = $DomainList
+            AcceptTOS = $True;
+            Contact = $OctopusParameters["LE_AzureDNS_ContactEmailAddress"];
+            DnsPlugin = $DnsPlugins;
+            PluginArgs = $azure_params;
+            PfxPass = $OctopusParameters["LE_AzureDNS_PfxPassword"];
+            Force = $True;
+        }
+        
+        if ($LE_AzureDNS_DnsAlias) {
+            $Cert_Params += @{DnsAlias = @($LE_AzureDNS_DnsAlias, $LE_AzureDNS_DnsAlias)} # Adding the value twice to avoid the warning "Fewer DnsAlias values than names in the order."
+        }
+
+        return New-PACertificate @Cert_Params
+    }
+    catch {
+        Write-Host "Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_AzureDNS_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_AzureDNS_CertificateDomain)"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        # We don't want to confuse Production and Staging Lets Encrypt Certificates.
+        $possible_issuers = $LE_AzureDNS_Issuers
+        if ($OctopusParameters["LE_AzureDNS_Use_Staging"] -eq $True) {
+            $possible_issuers = $LE_AzureDNS_Fake_Issuers
+        }
+
+        return $certificates_search | Where-Object {
+            $_.SubjectCommonName -eq $LE_AzureDNS_CertificateDomain -and
+            $possible_issuers -contains $_.IssuerCommonName -and
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Publish-OctopusCertificate {
+    param (
+        [string] $JsonBody
+    )
+
+    Write-Debug "Entering: Publish-OctopusCertificate"
+
+    if (-not ($JsonBody)) {
+        Write-Host "Existing Certificate is required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_AzureDNS_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Published $($LE_AzureDNS_CertificateDomain) certificate to the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Host "Failed to publish $($LE_AzureDNS_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Update-OctopusCertificate {
+    param (
+        [string]$Certificate_Id,
+        [string]$JsonBody
+    )
+
+    Write-Debug "Entering: Update-OctopusCertificate"
+
+    if (-not ($Certificate_Id -and $JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_AzureDNS_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Replaced $($LE_AzureDNS_CertificateDomain) certificate in the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Error "Failed to replace $($LE_AzureDNS_CertificateDomain) certificate. Error: $($_.Exception.Message)"
+        exit 1
+    }
+}
+
+function Get-NewCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-NewCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        Name = "$LE_AzureDNS_CertificateName";
+        Notes             = "";
+        CertificateData   = @{
+            HasValue = $true;
+            NewValue = $certificate_base64;
+        };
+        Password          = @{
+            HasValue = $true;
+            NewValue = $OctopusParameters["LE_AzureDNS_PfxPassword"];
+        };
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+function Get-ReplaceCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-ReplaceCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        CertificateData = $certificate_base64;
+        Password        = $OctopusParameters["LE_AzureDNS_PfxPassword"];
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+###############################################################################
+# DO THE THING | MAIN |
+###############################################################################
+Write-Debug "Do the Thing"
+
+Write-Host "Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store."
+$certificates = Get-OctopusCertificates
+
+# Check for PFX & PEM
+if ($certificates) {
+
+    # Handle weird behavior between Powershell 5 and Powershell 6+
+    $certificate_count = 1
+    if ($certificates.Count -ge 1) {
+        $certificate_count = $certificates.Count
+    }
+
+    Write-Host "Found $certificate_count for $($LE_AzureDNS_CertificateDomain)."
+    Write-Host "Checking to see if any expire within $($OctopusParameters["LE_AzureDNS_ReplaceIfExpiresInDays"]) days."
+
+    # Check Expiry Dates
+    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters["LE_AzureDNS_ReplaceIfExpiresInDays"]) }
+
+    if ($expiring_certificates) {
+        Write-Host "Found certificates that expire with $($OctopusParameters["LE_AzureDNS_ReplaceIfExpiresInDays"]) days. Requesting new certificates for $($LE_AzureDNS_CertificateDomain) from Lets Encrypt"
+        $le_certificate = Get-LetsEncryptCertificate
+
+        # PFX
+        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq "Pkcs12" } | Select-Object -First 1
+        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate
+        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json
+    }
+    else {
+        Write-Host "Nothing to do here..."
+    }
+
+    exit 0
+}
+
+# No existing Certificates - Lets get some new ones.
+Write-Host "No existing certificates found for $($LE_AzureDNS_CertificateDomain)."
+Write-Host "Request New Certificate for $($LE_AzureDNS_CertificateDomain) from Lets Encrypt"
+
+# New Certificate..
+$le_certificate = Get-LetsEncryptCertificate
+
+Write-Host "Publishing: LetsEncrypt - $($LE_AzureDNS_CertificateDomain) (PFX)"
+$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate
+Publish-OctopusCertificate -JsonBody $certificate_as_json
+
+Write-Host "GREAT SUCCESS"
diff --git a/src/step-templates/letsencrypt-cloudflare/metadata.json b/src/step-templates/letsencrypt-cloudflare/metadata.json
new file mode 100644
index 000000000..05563548f
--- /dev/null
+++ b/src/step-templates/letsencrypt-cloudflare/metadata.json
@@ -0,0 +1,114 @@
+{
+  "Id": "cfb61368-7a85-480a-9770-b6d268f77a13",
+  "Name": "Lets Encrypt - Cloudflare",
+  "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [Cloudflare DNS](https://www.cloudflare.com/en-au/dns/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
+  "ActionType": "Octopus.Script",
+  "Version": 12,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.Enabled": "True"
+  },
+  "Parameters": [
+    {
+      "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
+      "Name": "LE_Cloudflare_CertificateDomain",
+      "Label": "Certificate Domain",
+      "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
+      "Name": "LE_Cloudflare_PfxPassword",
+      "Label": "PFX Password",
+      "HelpText": "Password to use when converting to / from PFX. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
+      "Name": "LE_Cloudflare_ReplaceIfExpiresInDays",
+      "Label": "Replace expiring certificate before N days",
+      "HelpText": "Replace the certificate if it expiries within N days",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fc4f6877-2412-4af6-b87a-652da484cb5e",
+      "Name": "LE_Cloudflare_PrimaryToken",
+      "Label": "Primary Cloudflare API Token (Edit Permissions)",
+      "HelpText": "[Cloudflare API Token](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys) with the appropriate [Zone Edit](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/Cloudflare-Readme.md) permissions.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e01cc404-2631-4f88-9a1a-9e860bc98e58",
+      "Name": "LE_Cloudflare_SecondaryToken",
+      "Label": "Secondary Cloudflare API Token",
+      "HelpText": "[Cloudflare API Token](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys) with the appropriate [Zone Read](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/Cloudflare-Readme.md) permissions.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "85af482d-e577-40b8-94e5-626e545adab5",
+      "Name": "LE_Cloudflare_Octopus_APIKey",
+      "Label": "Octopus Deploy API key",
+      "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
+      "Name": "LE_Cloudflare_Use_Staging",
+      "Label": "Use Lets Encrypt Staging",
+      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
+      "Name": "LE_Cloudflare_ContactEmailAddress",
+      "Label": "Contact Email Address",
+      "HelpText": "Email Address",
+      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
+      "Name": "LE_Cloudflare_CreateWildcardSAN",
+      "Label": "Create Wildcard SAN",
+      "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-11T14:51:42.8150000Z",
+    "OctopusVersion": "2025.3.14236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "lets-encrypt"
+}
diff --git a/src/step-templates/letsencrypt-cloudflare/scriptbody.ps1 b/src/step-templates/letsencrypt-cloudflare/scriptbody.ps1
new file mode 100644
index 000000000..bba753d33
--- /dev/null
+++ b/src/step-templates/letsencrypt-cloudflare/scriptbody.ps1
@@ -0,0 +1,333 @@
+###############################################################################
+# TLS 1.2
+###############################################################################
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+###############################################################################
+# Required Modules folder
+###############################################################################
+Write-Host "Checking for required powershell modules folder"
+$ModulesFolder = "$HOME\Documents\WindowsPowerShell\Modules"
+if ($PSEdition -eq "Core") {
+    if ($PSVersionTable.Platform -eq "Unix") {
+        $ModulesFolder = "$HOME/.local/share/powershell/Modules"
+    }
+    else {
+        $ModulesFolder = "$HOME\Documents\PowerShell\Modules"
+    }
+}
+$PSModuleFolderExists = (Test-Path $ModulesFolder)
+if ($PSModuleFolderExists -eq $False) {
+	Write-Host "Creating directory: $ModulesFolder"
+	New-Item $ModulesFolder -ItemType Directory -Force
+    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath
+}
+
+###############################################################################
+# Required Modules
+###############################################################################
+Write-Host "Checking for required modules."
+$required_posh_acme_version = 3.12.0
+$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }
+
+if (-not ($module_check)) {
+    Write-Host "Ensuring NuGet provider is bootstrapped."
+    Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+    Write-Host "Installing Posh-ACME."
+    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force
+}
+
+Import-Module Posh-ACME
+
+###############################################################################
+# Constants
+###############################################################################
+$LE_Cloudflare_CertificateDomain = $OctopusParameters["LE_Cloudflare_CertificateDomain"]
+$LE_Cloudflare_CertificateName = "Lets Encrypt - $($LE_Cloudflare_CertificateDomain)"
+
+# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt
+$LE_Cloudflare_Fake_Issuers = @("Fake LE Intermediate X1", "(STAGING) Artificial Apricot R3", "(STAGING) Ersatz Edamame E1", "(STAGING) Pseudo Plum E5", "(STAGING) False Fennel E6", "(STAGING) Puzzling Parsnip E7", "(STAGING) Mysterious Mulberry E8", "(STAGING) Fake Fig E9", "(STAGING) Counterfeit Cashew R10", "(STAGING) Wannabe Watercress R11", "(STAGING) Riddling Rhubarb R12", "(STAGING) Tenuous Tomato R13", "(STAGING) Not Nectarine R14")
+$LE_Cloudflare_Issuers = @("Let's Encrypt Authority X3", "E1", "E2", "E7", "E8", "R3", "R4", "R5", "R6", "R10", "R11", "R12", "R13")
+
+###############################################################################
+# Helpers
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $response = $reader.ReadToEnd()
+
+            return $response | ConvertFrom-Json
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+###############################################################################
+# Functions
+###############################################################################
+function Get-LetsEncryptCertificate {
+    Write-Debug "Entering: Get-LetsEncryptCertificate"
+
+    if ($OctopusParameters["LE_Cloudflare_Use_Staging"] -eq $True) {
+        Write-Host "Using Lets Encrypt Server: Staging"
+        Set-PAServer LE_STAGE;
+    }
+    else {
+        Write-Host "Using Lets Encrypt Server: Production"
+        Set-PAServer LE_PROD;
+    }
+
+    # Clobber account if it exists.
+    $le_account = Get-PAAccount
+    if ($le_account) {
+        Remove-PAAccount $le_account.Id -Force
+    }
+
+    # Cloudflare API tokens require some special wrangling.
+    $cloudflare_token = ConvertTo-SecureString -String $OctopusParameters["LE_Cloudflare_PrimaryToken"] -AsPlainText -Force
+    $cloudflare_args = @{
+        CFToken = $cloudflare_token
+    }
+
+    if ($OctopusParameters["LE_Cloudflare_SecondaryToken"]) {
+        Write-Debug "LE_Cloudflare_SecondaryToken has a value. Passing it to the Cloudflare DNS plugin as a Read All Token."
+        $cloudflare_token_secondary = ConvertTo-SecureString -String $OctopusParameters["LE_Cloudflare_SecondaryToken"] -AsPlainText -Force
+        $cloudflare_args.CFTokenReadAll = $cloudflare_token_secondary
+    }
+
+    try {
+
+        $DnsPlugins = @("Cloudflare")
+        $DomainList = @($LE_Cloudflare_CertificateDomain)
+        
+        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.
+        if ($LE_Cloudflare_CertificateDomain -match "\*." -and $OctopusParameters["LE_Cloudflare_CreateWildcardSAN"] -eq $True) {
+            $LE_Cloudflare_Certificate_SAN = $LE_Cloudflare_CertificateDomain.Replace("*.","")
+            $DomainList += $LE_Cloudflare_Certificate_SAN
+            # Include additional DnsPlugin of same type to suppress warning.
+            $DnsPluginList += "Cloudflare"
+        }
+
+        $Cert_Params = @{
+            Domain = $DomainList
+            AcceptTOS = $True;
+            Contact = $OctopusParameters["LE_Cloudflare_ContactEmailAddress"];
+            DnsPlugin = $DnsPlugins;
+            PluginArgs = $cloudflare_args;
+            PfxPass = $OctopusParameters["LE_Cloudflare_PfxPassword"];
+            Force = $True;
+        }
+
+        return New-PACertificate @Cert_Params
+    }
+    catch {
+        Write-Host "Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_Cloudflare_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_Cloudflare_CertificateDomain)"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        # We don't want to confuse Production and Staging Lets Encrypt Certificates.
+        $possible_issuers = $LE_Cloudflare_Issuers
+        if ($OctopusParameters["LE_Cloudflare_Use_Staging"] -eq $True) {
+            $possible_issuers = $LE_Cloudflare_Fake_Issuers
+        }
+
+        return $certificates_search | Where-Object {
+            $_.SubjectCommonName -eq $LE_Cloudflare_CertificateDomain -and
+            $possible_issuers -contains $_.IssuerCommonName -and
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Publish-OctopusCertificate {
+    param (
+        [string] $JsonBody
+    )
+
+    Write-Debug "Entering: Publish-OctopusCertificate"
+
+    if (-not ($JsonBody)) {
+        Write-Host "Existing Certificate is required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_Cloudflare_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Published $($LE_Cloudflare_CertificateDomain) certificate to the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Host "Failed to publish $($LE_Cloudflare_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Update-OctopusCertificate {
+    param (
+        [string]$Certificate_Id,
+        [string]$JsonBody
+    )
+
+    Write-Debug "Entering: Update-OctopusCertificate"
+
+    if (-not ($Certificate_Id -and $JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_Cloudflare_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Replaced $($LE_Cloudflare_CertificateDomain) certificate in the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Error "Failed to replace $($LE_Cloudflare_CertificateDomain) certificate. Error: $($_.Exception.Message)"
+        exit 1
+    }
+}
+
+function Get-NewCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-NewCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        Name            = "$LE_Cloudflare_CertificateName";
+        Notes           = "";
+        CertificateData = @{
+            HasValue = $true;
+            NewValue = $certificate_base64;
+        };
+        Password        = @{
+            HasValue = $true;
+            NewValue = $OctopusParameters["LE_Cloudflare_PfxPassword"];
+        };
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+function Get-ReplaceCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-ReplaceCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        CertificateData = $certificate_base64;
+        Password        = $OctopusParameters["LE_Cloudflare_PfxPassword"];
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+###############################################################################
+# DO THE THING | MAIN |
+###############################################################################
+Write-Debug "Do the Thing"
+
+Write-Host "Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store."
+$certificates = Get-OctopusCertificates
+
+# Check for PFX & PEM
+if ($certificates) {
+
+    # Handle weird behavior between Powershell 5 and Powershell 6+
+    $certificate_count = 1
+    if ($certificates.Count -ge 1) {
+        $certificate_count = $certificates.Count
+    }
+
+    Write-Host "Found $certificate_count for $($LE_Cloudflare_CertificateDomain)."
+    Write-Host "Checking to see if any expire within $($OctopusParameters["LE_Cloudflare_ReplaceIfExpiresInDays"]) days."
+
+    # Check Expiry Dates
+    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters["LE_Cloudflare_ReplaceIfExpiresInDays"]) }
+
+    if ($expiring_certificates) {
+        Write-Host "Found certificates that expire with $($OctopusParameters["LE_Cloudflare_ReplaceIfExpiresInDays"]) days. Requesting new certificates for $($LE_Cloudflare_CertificateDomain) from Lets Encrypt"
+        $le_certificate = Get-LetsEncryptCertificate
+
+        # PFX
+        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq "Pkcs12" } | Select-Object -First 1
+        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate
+        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json
+    }
+    else {
+        Write-Host "Nothing to do here..."
+    }
+
+    exit 0
+}
+
+# No existing Certificates - Lets get some new ones.
+Write-Host "No existing certificates found for $($LE_Cloudflare_CertificateDomain)."
+Write-Host "Request New Certificate for $($LE_Cloudflare_CertificateDomain) from Lets Encrypt"
+
+# New Certificate..
+$le_certificate = Get-LetsEncryptCertificate
+
+Write-Host "Publishing: LetsEncrypt - $($LE_Cloudflare_CertificateDomain) (PFX)"
+$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate
+Publish-OctopusCertificate -JsonBody $certificate_as_json
+
+Write-Host "GREAT SUCCESS"
diff --git a/src/step-templates/letsencrypt-dnsimple/metadata.json b/src/step-templates/letsencrypt-dnsimple/metadata.json
new file mode 100644
index 000000000..970801f43
--- /dev/null
+++ b/src/step-templates/letsencrypt-dnsimple/metadata.json
@@ -0,0 +1,114 @@
+{
+  "Id": "21583723-1283-46aa-bb7b-121d365837cb",
+  "Name": "Lets Encrypt - DNSimple",
+  "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [DNSimple](https://dnsimple.com/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.Enabled": "True"
+  },
+  "Parameters": [
+    {
+      "Id": "d0984e44-0783-4ddc-8a57-8008997edb2a",
+      "Name": "LE_DNSimple_CertificateDomain",
+      "Label": "Certificate Domain",
+      "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c68389d4-17e4-491b-a6ce-ee6b09ae1579",
+      "Name": "LE_DNSimple_PfxPassword",
+      "Label": "PFX Password",
+      "HelpText": "Password to use when converting to / from PFX. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "0bce1a67-4981-474d-8b93-873fa3b28712",
+      "Name": "LE_DNSimple_ReplaceIfExpiresInDays",
+      "Label": "Replace expiring certificate before N days",
+      "HelpText": "Replace the certificate if it expiries within N days",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f1f25997-9733-4882-a546-ef6c76b7c7f1",
+      "Name": "LE_DNSimple_Token",
+      "Label": "DNSimple API Token",
+      "HelpText": "DNSimple API Token created from your [DNSimple account](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/DNSimple-Readme.md#setup)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "1addd2e6-782d-4a1f-bd12-480a9dd964cd",
+      "Name": "LE_DNSimple_Octopus_APIKey",
+      "Label": "Octopus Deploy API key",
+      "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ad07684b-93ea-4d65-b2a8-395e3bbfdaf8",
+      "Name": "LE_DNSimple_Use_Staging",
+      "Label": "Use Lets Encrypt Staging",
+      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "9a358e2e-07df-42d1-9f0a-04cbc800dacf",
+      "Name": "LE_DNSimple_ContactEmailAddress",
+      "Label": "Contact Email Address",
+      "HelpText": "Email Address",
+      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3a9e5773-9fbb-4dd4-a9c2-0f66a36b74a2",
+      "Name": "LE_DNSimple_Debug_Output",
+      "Label": "Debug Output",
+      "HelpText": "Tick this to provide debug information in the output",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
+      "Name": "LE_DNSimple_CreateWildcardSAN",
+      "Label": "Create Wildcard SAN",
+      "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-11T14:51:42.8150000Z",
+    "OctopusVersion": "2025.3.14236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "lets-encrypt"
+}
diff --git a/src/step-templates/letsencrypt-dnsimple/scriptbody.ps1 b/src/step-templates/letsencrypt-dnsimple/scriptbody.ps1
new file mode 100644
index 000000000..c8abfcba4
--- /dev/null
+++ b/src/step-templates/letsencrypt-dnsimple/scriptbody.ps1
@@ -0,0 +1,345 @@
+###############################################################################
+# TLS 1.2
+###############################################################################
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+###############################################################################
+# Required Modules folder
+###############################################################################
+Write-Host "Checking for required powershell modules folder"
+$ModulesFolder = "$HOME\Documents\WindowsPowerShell\Modules"
+if ($PSEdition -eq "Core") {
+    if ($PSVersionTable.Platform -eq "Unix") {
+        $ModulesFolder = "$HOME/.local/share/powershell/Modules"
+    }
+    else {
+        $ModulesFolder = "$HOME\Documents\PowerShell\Modules"
+    }
+}
+$PSModuleFolderExists = (Test-Path $ModulesFolder)
+if ($PSModuleFolderExists -eq $False) {
+	Write-Host "Creating directory: $ModulesFolder"
+	New-Item $ModulesFolder -ItemType Directory -Force
+    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath
+}
+
+###############################################################################
+# Required Modules
+###############################################################################
+Write-Host "Checking for required modules."
+$required_posh_acme_version = 3.12.0
+$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }
+
+if (-not ($module_check)) {
+    Write-Host "Ensuring NuGet provider is bootstrapped."
+    Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+    Write-Host "Installing Posh-ACME."
+    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force
+}
+
+Import-Module Posh-ACME
+
+###############################################################################
+# DebugOutput
+###############################################################################
+if ($OctopusParameters["LE_DNSimple_Debug_Output"] -eq $True) {
+	Write-Host "Setting DebugPreference to Continue"
+    $DebugPreference = 'Continue'
+}
+
+###############################################################################
+# Constants
+###############################################################################
+$LE_DNSimple_CertificateDomain = $OctopusParameters["LE_DNSimple_CertificateDomain"]
+$LE_DNSimple_CertificateName = "Lets Encrypt - $($LE_DNSimple_CertificateDomain)"
+
+# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt
+$LE_DNSimple_Fake_Issuers = @("Fake LE Intermediate X1", "(STAGING) Artificial Apricot R3", "(STAGING) Ersatz Edamame E1", "(STAGING) Pseudo Plum E5", "(STAGING) False Fennel E6", "(STAGING) Puzzling Parsnip E7", "(STAGING) Mysterious Mulberry E8", "(STAGING) Fake Fig E9", "(STAGING) Counterfeit Cashew R10", "(STAGING) Wannabe Watercress R11", "(STAGING) Riddling Rhubarb R12", "(STAGING) Tenuous Tomato R13", "(STAGING) Not Nectarine R14")
+$LE_DNSimple_Issuers = @("Let's Encrypt Authority X3", "E1", "E2", "E7", "E8", "R3", "R4", "R5", "R6", "R10", "R11", "R12", "R13")
+
+
+###############################################################################
+# Helpers
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $response = $reader.ReadToEnd()
+
+            return $response | ConvertFrom-Json
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+###############################################################################
+# Functions
+###############################################################################
+function Get-LetsEncryptCertificate {
+    Write-Debug "Entering: Get-LetsEncryptCertificate"
+
+    if ($OctopusParameters["LE_DNSimple_Use_Staging"] -eq $True) {
+        Write-Host "Using Lets Encrypt Server: Staging"
+        Set-PAServer LE_STAGE;
+    }
+    else {
+        Write-Host "Using Lets Encrypt Server: Production"
+        Set-PAServer LE_PROD;
+    }
+
+    # Clobber account if it exists.
+    $le_account = Get-PAAccount
+    if ($le_account) {
+        Remove-PAAccount $le_account.Id -Force
+    }
+
+	$dnsimple_args = @{}
+    # DNSimple requires a token. If it's windows, Secure-String is supported.
+    if ($IsWindows -and 'Desktop' -eq $PSEdition) {
+        $token = ConvertTo-SecureString -String $OctopusParameters["LE_DNSimple_Token"] -AsPlainText -Force
+    	$dnsimple_args = @{
+        	DSToken = $token
+    	}
+    }
+    else {
+    	$token = $OctopusParameters["LE_DNSimple_Token"]
+    	$dnsimple_args = @{
+        	DSTokenInsecure = $token
+    	}
+    }
+       
+    try {
+
+        $DnsPlugins = @("DNSimple")
+        $DomainList = @($LE_DNSimple_CertificateDomain)
+        
+        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.
+        if ($LE_DNSimple_CertificateDomain -match "\*." -and $OctopusParameters["LE_DNSimple_CreateWildcardSAN"] -eq $True) {
+            $LE_DNSimple_Certificate_SAN = $LE_DNSimple_CertificateDomain.Replace("*.","")
+            $DomainList += $LE_DNSimple_Certificate_SAN
+            # Include additional DnsPlugin of same type to surpress warning.
+            $DnsPlugins += "DNSimple"
+        }
+
+        $Cert_Params = @{
+            Domain = $DomainList
+            AcceptTOS = $True;
+            Contact = $OctopusParameters["LE_DNSimple_ContactEmailAddress"];
+            DnsPlugin = $DnsPlugins;
+            PluginArgs = $dnsimple_args;
+            PfxPass = $OctopusParameters["LE_DNSimple_PfxPassword"];
+            Force = $True;
+        }
+
+        return New-PACertificate @Cert_Params
+    }
+    catch {
+        Write-Host "Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_DNSimple_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_DNSimple_CertificateDomain)"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        # We don't want to confuse Production and Staging Lets Encrypt Certificates.
+        $possible_issuers = $LE_DNSimple_Issuers
+        if ($OctopusParameters["LE_DNSimple_Use_Staging"] -eq $True) {
+            $possible_issuers = $LE_DNSimple_Fake_Issuers
+        }
+
+        return $certificates_search | Where-Object {
+            $_.SubjectCommonName -eq $LE_DNSimple_CertificateDomain -and
+            $possible_issuers -contains $_.IssuerCommonName -and
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Publish-OctopusCertificate {
+    param (
+        [string] $JsonBody
+    )
+
+    Write-Debug "Entering: Publish-OctopusCertificate"
+
+    if (-not ($JsonBody)) {
+        Write-Host "Existing Certificate is required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_DNSimple_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Published $($LE_DNSimple_CertificateDomain) certificate to the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Host "Failed to publish $($LE_DNSimple_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Update-OctopusCertificate {
+    param (
+        [string]$Certificate_Id,
+        [string]$JsonBody
+    )
+
+    Write-Debug "Entering: Update-OctopusCertificate"
+
+    if (-not ($Certificate_Id -and $JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_DNSimple_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Replaced $($LE_DNSimple_CertificateDomain) certificate in the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Error "Failed to replace $($LE_DNSimple_CertificateDomain) certificate. Error: $($_.Exception.Message)"
+        exit 1
+    }
+}
+
+function Get-NewCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-NewCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        Name            = "$LE_DNSimple_CertificateName";
+        Notes           = "";
+        CertificateData = @{
+            HasValue = $true;
+            NewValue = $certificate_base64;
+        };
+        Password        = @{
+            HasValue = $true;
+            NewValue = $OctopusParameters["LE_DNSimple_PfxPassword"];
+        };
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+function Get-ReplaceCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-ReplaceCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        CertificateData = $certificate_base64;
+        Password        = $OctopusParameters["LE_DNSimple_PfxPassword"];
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+###############################################################################
+# DO THE THING | MAIN |
+###############################################################################
+Write-Debug "Do the Thing"
+
+Write-Host "Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store."
+$certificates = Get-OctopusCertificates
+
+# Check for PFX & PEM
+if ($certificates) {
+
+    # Handle weird behavior between Powershell 5 and Powershell 6+
+    $certificate_count = 1
+    if ($certificates.Count -ge 1) {
+        $certificate_count = $certificates.Count
+    }
+
+    Write-Host "Found $certificate_count for $($LE_DNSimple_CertificateDomain)."
+    Write-Host "Checking to see if any expire within $($OctopusParameters["LE_DNSimple_ReplaceIfExpiresInDays"]) days."
+
+    # Check Expiry Dates
+    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters["LE_DNSimple_ReplaceIfExpiresInDays"]) }
+
+    if ($expiring_certificates) {
+        Write-Host "Found certificates that expire with $($OctopusParameters["LE_DNSimple_ReplaceIfExpiresInDays"]) days. Requesting new certificates for $($LE_DNSimple_CertificateDomain) from Lets Encrypt"
+        $le_certificate = Get-LetsEncryptCertificate
+
+        # PFX
+        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq "Pkcs12" } | Select-Object -First 1
+        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate
+        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json
+    }
+    else {
+        Write-Host "Nothing to do here..."
+    }
+
+    exit 0
+}
+
+# No existing Certificates - Lets get some new ones.
+Write-Host "No existing certificates found for $($LE_DNSimple_CertificateDomain)."
+Write-Host "Request New Certificate for $($LE_DNSimple_CertificateDomain) from Lets Encrypt"
+
+# New Certificate..
+$le_certificate = Get-LetsEncryptCertificate
+
+Write-Host "Publishing: LetsEncrypt - $($LE_DNSimple_CertificateDomain) (PFX)"
+$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate
+Publish-OctopusCertificate -JsonBody $certificate_as_json
+
+Write-Host "GREAT SUCCESS"
diff --git a/src/step-templates/letsencrypt-google-cloud/metadata.json b/src/step-templates/letsencrypt-google-cloud/metadata.json
new file mode 100644
index 000000000..df64f6525
--- /dev/null
+++ b/src/step-templates/letsencrypt-google-cloud/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "0ea316b3-562e-4782-8611-ce82f5224eff",
+  "Name": "Lets Encrypt - Google Cloud DNS",
+  "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [Google Cloud DNS](https://cloud.google.com/dns) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
+  "ActionType": "Octopus.Script",
+  "Version": 13,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.Enabled": "True"
+  },
+  "Parameters": [
+    {
+      "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
+      "Name": "LE_GCloudDNS_CertificateDomain",
+      "Label": "Certificate Domain",
+      "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
+      "Name": "LE_GCloudDNS_PfxPassword",
+      "Label": "PFX Password",
+      "HelpText": "Password to use when converting to / from PFX. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
+      "Name": "LE_GCloudDNS_ReplaceIfExpiresInDays",
+      "Label": "Replace expiring certificate before N days",
+      "HelpText": "Replace the certificate if it expiries within N days",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d346e12a-4f9f-4317-8399-469c4b71b0a5",
+      "Name": "LE_GCloudDNS_JSON",
+      "Label": "Google Cloud IAM Json",
+      "HelpText": "Google Cloud IAM JSON with the [appropriate permissions](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/GCloud-Readme.md).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "85af482d-e577-40b8-94e5-626e545adab5",
+      "Name": "LE_GCloudDNS_Octopus_APIKey",
+      "Label": "Octopus Deploy API key",
+      "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
+      "Name": "LE_GCloudDNS_Use_Staging",
+      "Label": "Use Lets Encrypt Staging",
+      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
+      "Name": "LE_GCloudDNS_ContactEmailAddress",
+      "Label": "Contact Email Address",
+      "HelpText": "Email Address",
+      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
+      "Name": "LE_GCloudDNS_CreateWildcardSAN",
+      "Label": "Create Wildcard SAN",
+      "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-11T14:51:42.8150000Z",
+    "OctopusVersion": "2025.3.14236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "lets-encrypt"
+}
diff --git a/src/step-templates/letsencrypt-google-cloud/scriptbody.ps1 b/src/step-templates/letsencrypt-google-cloud/scriptbody.ps1
new file mode 100644
index 000000000..e03282858
--- /dev/null
+++ b/src/step-templates/letsencrypt-google-cloud/scriptbody.ps1
@@ -0,0 +1,328 @@
+###############################################################################
+# TLS 1.2
+###############################################################################
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+###############################################################################
+# Required Modules folder
+###############################################################################
+Write-Host "Checking for required powershell modules folder"
+$ModulesFolder = "$HOME\Documents\WindowsPowerShell\Modules"
+if ($PSEdition -eq "Core") {
+    if ($PSVersionTable.Platform -eq "Unix") {
+        $ModulesFolder = "$HOME/.local/share/powershell/Modules"
+    }
+    else {
+        $ModulesFolder = "$HOME\Documents\PowerShell\Modules"
+    }
+}
+$PSModuleFolderExists = (Test-Path $ModulesFolder)
+if ($PSModuleFolderExists -eq $False) {
+	Write-Host "Creating directory: $ModulesFolder"
+	New-Item $ModulesFolder -ItemType Directory -Force
+    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath
+}
+
+###############################################################################
+# Required Modules
+###############################################################################
+Write-Host "Checking for required modules."
+$required_posh_acme_version = 3.12.0
+$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }
+
+if (-not ($module_check)) {
+    Write-Host "Ensuring NuGet provider is bootstrapped."
+    Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+    Write-Host "Installing Posh-ACME."
+    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force
+}
+
+Import-Module Posh-ACME
+
+###############################################################################
+# Constants
+###############################################################################
+$LE_GCloudDNS_CertificateDomain = $OctopusParameters["LE_GCloudDNS_CertificateDomain"]
+$LE_GCloudDNS_CertificateName = "Lets Encrypt - $($LE_GCloudDNS_CertificateDomain)"
+
+# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt
+$LE_GCloudDNS_Fake_Issuers = @("Fake LE Intermediate X1", "(STAGING) Artificial Apricot R3", "(STAGING) Ersatz Edamame E1", "(STAGING) Pseudo Plum E5", "(STAGING) False Fennel E6", "(STAGING) Puzzling Parsnip E7", "(STAGING) Mysterious Mulberry E8", "(STAGING) Fake Fig E9", "(STAGING) Counterfeit Cashew R10", "(STAGING) Wannabe Watercress R11", "(STAGING) Riddling Rhubarb R12", "(STAGING) Tenuous Tomato R13", "(STAGING) Not Nectarine R14")
+$LE_GCloudDNS_Issuers = @("Let's Encrypt Authority X3", "E1", "E2", "E7", "E8", "R3", "R4", "R5", "R6", "R10", "R11", "R12", "R13")
+
+###############################################################################
+# Helpers
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $response = $reader.ReadToEnd()
+
+            return $response | ConvertFrom-Json
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+###############################################################################
+# Functions
+###############################################################################
+function Get-LetsEncryptCertificate {
+    Write-Debug "Entering: Get-LetsEncryptCertificate"
+
+    if ($OctopusParameters["LE_GCloudDNS_Use_Staging"] -eq $True) {
+        Write-Host "Using Lets Encrypt Server: Staging"
+        Set-PAServer LE_STAGE;
+    }
+    else {
+        Write-Host "Using Lets Encrypt Server: Production"
+        Set-PAServer LE_PROD;
+    }
+
+    # Clobber account if it exists.
+    $le_account = Get-PAAccount
+    if ($le_account) {
+        Remove-PAAccount $le_account.Id -Force
+    }
+
+    # Google Cloud requires JSON data to be passed in.
+    $gcloud_json = "$(New-Guid).json"
+    Set-Content -Path $gcloud_json -Value $OctopusParameters["LE_GCloudDNS_JSON"]
+
+    $gcloud_args = @{
+        GCKeyFile = $gcloud_json
+    }
+
+    try {
+        $DnsPlugins = @("GCloud")
+        $DomainList = @($LE_GCloudDNS_CertificateDomain)
+        
+        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.
+        if ($LE_GCloudDNS_CertificateDomain -match "\*." -and $OctopusParameters["LE_GCloudDNS_CreateWildcardSAN"] -eq $True) {
+            $LE_GCloudDNS_Certificate_SAN = $LE_GCloudDNS_CertificateDomain.Replace("*.","")
+            $DomainList += $LE_GCloudDNS_Certificate_SAN
+            # Include additional DnsPlugin of same type to surpress warning.
+            $DnsPlugins += "GCloud"
+        }
+
+        $Cert_Params = @{
+            Domain = $DomainList
+            AcceptTOS = $True;
+            Contact = $OctopusParameters["LE_GCloudDNS_ContactEmailAddress"];
+            DnsPlugin = $DnsPlugins;
+            PluginArgs = $gcloud_args;
+            PfxPass = $OctopusParameters["LE_GCloudDNS_PfxPassword"];
+            Force = $True;
+        }
+
+        return New-PACertificate @Cert_Params
+    }
+    catch {
+        Write-Host "Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_GCloudDNS_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_GCloudDNS_CertificateDomain)"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        # We don't want to confuse Production and Staging Lets Encrypt Certificates.
+        $possible_issuers = $LE_GCloudDNS_Issuers
+        if ($OctopusParameters["LE_GCloudDNS_Use_Staging"] -eq $True) {
+            $possible_issuers = $LE_GCloudDNS_Fake_Issuers
+        }
+
+        return $certificates_search | Where-Object {
+            $_.SubjectCommonName -eq $LE_GCloudDNS_CertificateDomain -and
+            $possible_issuers -contains $_.IssuerCommonName -and
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Publish-OctopusCertificate {
+    param (
+        [string] $JsonBody
+    )
+
+    Write-Debug "Entering: Publish-OctopusCertificate"
+
+    if (-not ($JsonBody)) {
+        Write-Host "Existing Certificate is required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_GCloudDNS_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Published $($LE_GCloudDNS_CertificateDomain) certificate to the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Host "Failed to publish $($LE_GCloudDNS_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Update-OctopusCertificate {
+    param (
+        [string]$Certificate_Id,
+        [string]$JsonBody
+    )
+
+    Write-Debug "Entering: Update-OctopusCertificate"
+
+    if (-not ($Certificate_Id -and $JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_GCloudDNS_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Replaced $($LE_GCloudDNS_CertificateDomain) certificate in the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Error "Failed to replace $($LE_GCloudDNS_CertificateDomain) certificate. Error: $($_.Exception.Message)"
+        exit 1
+    }
+}
+
+function Get-NewCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-NewCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        Name            = "$LE_GCloudDNS_CertificateName";
+        Notes           = "";
+        CertificateData = @{
+            HasValue = $true;
+            NewValue = $certificate_base64;
+        };
+        Password        = @{
+            HasValue = $true;
+            NewValue = $OctopusParameters["LE_GCloudDNS_PfxPassword"];
+        };
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+function Get-ReplaceCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-ReplaceCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        CertificateData = $certificate_base64;
+        Password        = $OctopusParameters["LE_GCloudDNS_PfxPassword"];
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+###############################################################################
+# DO THE THING | MAIN |
+###############################################################################
+Write-Debug "Do the Thing"
+
+Write-Host "Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store."
+$certificates = Get-OctopusCertificates
+
+# Check for PFX & PEM
+if ($certificates) {
+
+    # Handle weird behavior between Powershell 5 and Powershell 6+
+    $certificate_count = 1
+    if ($certificates.Count -ge 1) {
+        $certificate_count = $certificates.Count
+    }
+
+    Write-Host "Found $certificate_count for $($LE_GCloudDNS_CertificateDomain)."
+    Write-Host "Checking to see if any expire within $($OctopusParameters["LE_GCloudDNS_ReplaceIfExpiresInDays"]) days."
+
+    # Check Expiry Dates
+    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters["LE_GCloudDNS_ReplaceIfExpiresInDays"]) }
+
+    if ($expiring_certificates) {
+        Write-Host "Found certificates that expire with $($OctopusParameters["LE_GCloudDNS_ReplaceIfExpiresInDays"]) days. Requesting new certificates for $($LE_GCloudDNS_CertificateDomain) from Lets Encrypt"
+        $le_certificate = Get-LetsEncryptCertificate
+
+        # PFX
+        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq "Pkcs12" } | Select-Object -First 1
+        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate
+        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json
+    }
+    else {
+        Write-Host "Nothing to do here..."
+    }
+
+    exit 0
+}
+
+# No existing Certificates - Lets get some new ones.
+Write-Host "No existing certificates found for $($LE_GCloudDNS_CertificateDomain)."
+Write-Host "Request New Certificate for $($LE_GCloudDNS_CertificateDomain) from Lets Encrypt"
+
+# New Certificate..
+$le_certificate = Get-LetsEncryptCertificate
+
+Write-Host "Publishing: LetsEncrypt - $($LE_GCloudDNS_CertificateDomain) (PFX)"
+$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate
+Publish-OctopusCertificate -JsonBody $certificate_as_json
+
+Write-Host "GREAT SUCCESS"
diff --git a/src/step-templates/letsencrypt-route-53/metadata.json b/src/step-templates/letsencrypt-route-53/metadata.json
new file mode 100644
index 000000000..bff1636a2
--- /dev/null
+++ b/src/step-templates/letsencrypt-route-53/metadata.json
@@ -0,0 +1,103 @@
+{
+  "Id": "55b654f4-3e01-424f-b299-f99beddf0501",
+  "Name": "Lets Encrypt - Route53",
+  "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [AWS Route53](https://aws.amazon.com/route53/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.Enabled": "True"
+  },
+  "Parameters": [
+    {
+      "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
+      "Name": "LE_Route53_CertificateDomain",
+      "Label": "Certificate Domain",
+      "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
+      "Name": "LE_Route53_PfxPassword",
+      "Label": "PFX Password",
+      "HelpText": "Password to use when converting to / from PFX. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
+      "Name": "LE_Route53_ReplaceIfExpiresInDays",
+      "Label": "Replace expiring certificate before N days",
+      "HelpText": "Replace the certificate if it expiries within N days",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2935998d-d030-4af6-ad42-39e8b85e2dce",
+      "Name": "LE_Route53_AWSAccount",
+      "Label": "AWS account",
+      "HelpText": "An AWS Account that has API access to make Route53 changes. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    },
+    {
+      "Id": "85af482d-e577-40b8-94e5-626e545adab5",
+      "Name": "LE_Route53_Octopus_APIKey",
+      "Label": "Octopus Deploy API key",
+      "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
+      "Name": "LE_Route53_Use_Staging",
+      "Label": "Use Lets Encrypt Staging",
+      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
+      "Name": "LE_Route53_ContactEmailAddress",
+      "Label": "Contact Email Address",
+      "HelpText": "Email Address",
+      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
+      "Name": "LE_Route53_CreateWildcardSAN",
+      "Label": "Create Wildcard SAN",
+      "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-11T14:51:42.8150000Z",
+    "OctopusVersion": "2025.3.14236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "lets-encrypt"
+}
diff --git a/src/step-templates/letsencrypt-route-53/scriptbody.ps1 b/src/step-templates/letsencrypt-route-53/scriptbody.ps1
new file mode 100644
index 000000000..6230cdb9d
--- /dev/null
+++ b/src/step-templates/letsencrypt-route-53/scriptbody.ps1
@@ -0,0 +1,327 @@
+###############################################################################
+# TLS 1.2
+###############################################################################
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+###############################################################################
+# Required Modules folder
+###############################################################################
+Write-Host "Checking for required powershell modules folder"
+$ModulesFolder = "$HOME\Documents\WindowsPowerShell\Modules"
+if ($PSEdition -eq "Core") {
+    if ($PSVersionTable.Platform -eq "Unix") {
+        $ModulesFolder = "$HOME/.local/share/powershell/Modules"
+    }
+    else {
+        $ModulesFolder = "$HOME\Documents\PowerShell\Modules"
+    }
+}
+$PSModuleFolderExists = (Test-Path $ModulesFolder)
+if ($PSModuleFolderExists -eq $False) {
+	Write-Host "Creating directory: $ModulesFolder"
+	New-Item $ModulesFolder -ItemType Directory -Force
+    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath
+}
+
+###############################################################################
+# Required Modules
+###############################################################################
+Write-Host "Checking for required modules."
+$required_posh_acme_version = 3.12.0
+$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }
+
+if (-not ($module_check)) {
+    Write-Host "Ensuring NuGet provider is bootstrapped."
+    Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+    Write-Host "Installing Posh-ACME."
+    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force
+}
+
+Import-Module Posh-ACME
+
+###############################################################################
+# Constants
+###############################################################################
+$LE_Route53_CertificateDomain = $OctopusParameters["LE_Route53_CertificateDomain"]
+$LE_Route53_CertificateName = "Lets Encrypt - $($LE_Route53_CertificateDomain)"
+
+# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt
+$LE_Route53_Fake_Issuers = @("Fake LE Intermediate X1", "(STAGING) Artificial Apricot R3", "(STAGING) Ersatz Edamame E1", "(STAGING) Pseudo Plum E5", "(STAGING) False Fennel E6", "(STAGING) Puzzling Parsnip E7", "(STAGING) Mysterious Mulberry E8", "(STAGING) Fake Fig E9", "(STAGING) Counterfeit Cashew R10", "(STAGING) Wannabe Watercress R11", "(STAGING) Riddling Rhubarb R12", "(STAGING) Tenuous Tomato R13", "(STAGING) Not Nectarine R14")
+$LE_Route53_Issuers = @("Let's Encrypt Authority X3", "E1", "E2", "E7", "E8", "R3", "R4", "R5", "R6", "R10", "R11", "R12", "R13")
+
+###############################################################################
+# Helpers
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $response = $reader.ReadToEnd()
+
+            return $response | ConvertFrom-Json
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+###############################################################################
+# Functions
+###############################################################################
+function Get-LetsEncryptCertificate {
+    Write-Debug "Entering: Get-LetsEncryptCertificate"
+
+    if ($OctopusParameters["LE_Route53_Use_Staging"] -eq $True) {
+        Write-Host "Using Lets Encrypt Server: Staging"
+        Set-PAServer LE_STAGE;
+    }
+    else {
+        Write-Host "Using Lets Encrypt Server: Production"
+        Set-PAServer LE_PROD;
+    }
+
+    # Clobber account if it exists.
+    $le_account = Get-PAAccount
+    if ($le_account) {
+        Remove-PAAccount $le_account.Id -Force
+    }
+
+    $aws_secret_key = ConvertTo-SecureString -String $OctopusParameters["LE_Route53_AWSAccount.SecretKey"] -AsPlainText -Force
+    $route53_params = @{
+        R53AccessKey = $OctopusParameters["LE_Route53_AWSAccount.AccessKey"];
+        R53SecretKey = $aws_secret_key
+    }
+
+    try {
+        $DnsPlugins = @("Route53")
+        $DomainList = @($LE_Route53_CertificateDomain)
+        
+        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.
+        if ($LE_Route53_CertificateDomain -match "\*." -and $OctopusParameters["LE_Route53_CreateWildcardSAN"] -eq $True) {
+            $LE_Route53_Certificate_SAN = $LE_Route53_CertificateDomain.Replace("*.","")
+            $DomainList += $LE_Route53_Certificate_SAN
+            # Include additional DnsPlugin of same type to surpress warning.
+            $DnsPlugins += "Route53"
+        }
+
+        $Cert_Params = @{
+            Domain = $DomainList
+            AcceptTOS = $True;
+            Contact = $OctopusParameters["LE_Route53_ContactEmailAddress"];
+            DnsPlugin = $DnsPlugins;
+            PluginArgs = $route53_params;
+            PfxPass = $OctopusParameters["LE_Route53_PfxPassword"];
+            Force = $True;
+        }
+
+        return New-PACertificate @Cert_Params
+    }
+    catch {
+        Write-Host "Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_Route53_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_Route53_CertificateDomain)"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        # We don't want to confuse Production and Staging Lets Encrypt Certificates.
+        $possible_issuers = $LE_Route53_Issuers
+        if ($OctopusParameters["LE_Route53_Use_Staging"] -eq $True) {
+            $possible_issuers = $LE_Route53_Fake_Issuers
+        }
+
+        return $certificates_search | Where-Object {
+            $_.SubjectCommonName -eq $LE_Route53_CertificateDomain -and
+            $possible_issuers -contains $_.IssuerCommonName -and
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Publish-OctopusCertificate {
+    param (
+        [string] $JsonBody
+    )
+
+    Write-Debug "Entering: Publish-OctopusCertificate"
+
+    if (-not ($JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_Route53_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Published $($LE_Route53_CertificateDomain) certificate to the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Host "Failed to publish $($LE_Route53_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Update-OctopusCertificate {
+    param (
+        [string]$Certificate_Id,
+        [string]$JsonBody
+    )
+
+    Write-Debug "Entering: Update-OctopusCertificate"
+
+    if (-not ($Certificate_Id -and $JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        exit 1
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["LE_Route53_Octopus_APIKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Replaced $($LE_Route53_CertificateDomain) certificate in the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Error "Failed to replace $($LE_Route53_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        exit 1
+    }
+}
+
+function Get-NewCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-NewCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        Name = "$LE_Route53_CertificateName";
+        Notes            = "";
+        CertificateData  = @{
+            HasValue = $true;
+            NewValue = $certificate_base64;
+        };
+        Password         = @{
+            HasValue = $true;
+            NewValue = $OctopusParameters["LE_Route53_PfxPassword"];
+        };
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+function Get-ReplaceCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-ReplaceCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit 1
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        CertificateData = $certificate_base64;
+        Password        = $OctopusParameters["LE_Route53_PfxPassword"];
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+###############################################################################
+# DO THE THING | MAIN |
+###############################################################################
+Write-Debug "Do the Thing"
+
+Write-Host "Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store."
+$certificates = Get-OctopusCertificates
+
+# Check for PFX & PEM
+if ($certificates) {
+
+    # Handle weird behavior between Powershell 5 and Powershell 6+
+    $certificate_count = 1
+    if ($certificates.Count -ge 1) {
+        $certificate_count = $certificates.Count
+    }
+
+    Write-Host "Found $certificate_count for $($LE_Route53_CertificateDomain)."
+    Write-Host "Checking to see if any expire within $($OctopusParameters["LE_Route53_ReplaceIfExpiresInDays"]) days."
+
+    # Check Expiry Dates
+    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters["LE_Route53_ReplaceIfExpiresInDays"]) }
+
+    if ($expiring_certificates) {
+        Write-Host "Found certificates that expire with $($OctopusParameters["LE_Route53_ReplaceIfExpiresInDays"]) days. Requesting new certificates for $($LE_Route53_CertificateDomain) from Lets Encrypt"
+        $le_certificate = Get-LetsEncryptCertificate
+
+        # PFX
+        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq "Pkcs12" } | Select-Object -First 1
+        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate
+        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json
+    }
+    else {
+        Write-Host "Nothing to do here..."
+    }
+
+    exit 0
+}
+
+# No existing Certificates - Lets get some new ones.
+Write-Host "No existing certificates found for $($LE_Route53_CertificateDomain)."
+Write-Host "Request New Certificate for $($LE_Route53_CertificateDomain) from Lets Encrypt"
+
+# New Certificate..
+$le_certificate = Get-LetsEncryptCertificate
+
+Write-Host "Publishing: LetsEncrypt - $($LE_Route53_CertificateDomain) (PFX)"
+$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate
+Publish-OctopusCertificate -JsonBody $certificate_as_json
+
+Write-Host "GREAT SUCCESS"
diff --git a/src/step-templates/letsencrypt-selfhosted-http/metadata.json b/src/step-templates/letsencrypt-selfhosted-http/metadata.json
new file mode 100644
index 000000000..eab6d0d57
--- /dev/null
+++ b/src/step-templates/letsencrypt-selfhosted-http/metadata.json
@@ -0,0 +1,123 @@
+{
+  "Id": "e3614dd6-3a78-4220-97f0-b0e44415e58c",
+  "Name": "Lets Encrypt - Self-Hosted HTTP Challenge",
+  "Description": "Request (or renew) an X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/) using the Self-hosted HTTP Challenge Listener provided by the [Posh-ACME](https://github.com/rmbolger/Posh-ACME/) PowerShell Module.\n\n---\n#### Please Note\n\nIt's generally a better idea to use one of the Posh-ACME [DNS providers](https://github.com/rmbolger/Posh-ACME/wiki/List-of-Supported-DNS-Providers) for Let's Encrypt.\n\nThere are a number of Octopus Step templates in the [Community Library](https://library.octopus.com/listing/letsencrypt) that support DNS providers.\n\n---\n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com).\n- [Self-hosted HTTP Challenge](https://github.com/rmbolger/Posh-ACME/wiki/How-To-Self-Host-HTTP-Challenges) Challenge for TLD, CNAME, and Wildcard domains. \n- _Optionally_ Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates).\n- _Optionally_ import SSL Certificate into the local machine store. \n- _Optionally_ Export PFX (PKCS#12) SSL Certificate to a supplied file path.\n- Verified to work on Windows and Linux deployment targets\n\n#### Pre-requisites\n\n- There are specific requirements when [running on Windows](https://github.com/rmbolger/Posh-ACME/wiki/How-To-Self-Host-HTTP-Challenges#windows-only-prerequisites).\n- HTTP Challenge Listener must be available on Port 80.\n- When updating the Octopus Certificate Store, access to the Octopus Server from where the script template runs e.g. deployment target or worker is required.",
+  "ActionType": "Octopus.Script",
+  "Version": 12,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "3d7e44e3-8a29-4458-b3ba-c09817566492",
+      "Name": "LE_SelfHosted_CertificateDomain",
+      "Label": "Certificate Domain",
+      "HelpText": "Domain (TLD, CNAME, or Wildcard) to create a certificate for.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7f882a93-511d-4c8c-a946-832d69739773",
+      "Name": "LE_SelfHosted_ContactEmailAddress",
+      "Label": "Contact Email Address",
+      "HelpText": "The Email address used when requesting the SSL certificate. _Default: `#{Octopus.Deployment.CreatedBy.EmailAddress}`_.",
+      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c91935f5-64cb-48c3-940b-981fcbfb942a",
+      "Name": "LE_SelfHosted_PfxPass",
+      "Label": "PFX Password",
+      "HelpText": "The password to use when converting to/from PFX.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "dd75b10a-17ca-4859-ae8d-adf0de74dbce",
+      "Name": "LE_SelfHosted_Use_Staging",
+      "Label": "Use Lets Encrypt Staging",
+      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure? _Default: `False`_.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "9a5d53f9-c5e5-4c83-9769-43b987ba04b0",
+      "Name": "LE_SelfHosted_HttpListenerTimeout",
+      "Label": "Http Listener Timeout",
+      "HelpText": "Self-Hosted Http Listener Timeout in Seconds. _Default: 120 seconds_.",
+      "DefaultValue": "120",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7d8c49b8-684e-49d3-95aa-353c6e087843",
+      "Name": "LE_Self_Hosted_UpdateOctopusCertificateStore",
+      "Label": "Update Octopus Certificate Store?",
+      "HelpText": "Should any generated certificate be updated in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates) _Default: `True`_.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "83e2d3cf-66a6-47b4-bae8-e207a6918048",
+      "Name": "LE_SelfHosted_Octopus_APIKey",
+      "Label": "Octopus Deploy API key",
+      "HelpText": "An Octopus Deploy API key with access to change Certificates in the Certificate Store. \n\n**Note:** Required if `LE_Self_Hosted_UpdateOctopusCertificateStore` is set to `True`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "95ff51cc-2390-4b5d-89b0-bd62e83bb4f8",
+      "Name": "LE_SelfHosted_ReplaceIfExpiresInDays",
+      "Label": "Replace expiring certificate before N days",
+      "HelpText": "Replace the certificate if it expiries within N days. _Default: 30 days_.\n\n**Note:** Required if `LE_Self_Hosted_UpdateOctopusCertificateStore` is set to `True`.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d429561f-cf00-41f6-9956-e994f623696a",
+      "Name": "LE_SelfHosted_Install",
+      "Label": "Install Certificate?",
+      "HelpText": "Installs the certificate in the local store. _Default: `False`_.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f8abcf14-c9a1-4e15-87dc-95004f2216e6",
+      "Name": "LE_SelfHosted_ExportFilePath",
+      "Label": "PFX Export Filepath",
+      "HelpText": "Exports the full certificate chain as PKCS#12 archive (.PFX used by Windows and IIS) e.g. C:\\Temp\\octopus.com.pfx",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2025-09-11T14:51:42.8150000Z",
+    "OctopusVersion": "2025.3.14236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "lets-encrypt"
+}
diff --git a/src/step-templates/letsencrypt-selfhosted-http/scriptbody.ps1 b/src/step-templates/letsencrypt-selfhosted-http/scriptbody.ps1
new file mode 100644
index 000000000..cd33ee52c
--- /dev/null
+++ b/src/step-templates/letsencrypt-selfhosted-http/scriptbody.ps1
@@ -0,0 +1,368 @@
+# TLS 1.2
+Write-Host "Enabling TLS 1.2 for script execution"
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12
+
+###############################################################################
+# Required Modules folder
+###############################################################################
+Write-Host "Checking for required powershell modules folder"
+$ModulesFolder = "$HOME\Documents\WindowsPowerShell\Modules"
+if ($PSEdition -eq "Core") {
+    if ($PSVersionTable.Platform -eq "Unix") {
+        $ModulesFolder = "$HOME/.local/share/powershell/Modules"
+    }
+    else {
+        $ModulesFolder = "$HOME\Documents\PowerShell\Modules"
+    }
+}
+$PSModuleFolderExists = (Test-Path $ModulesFolder)
+if ($PSModuleFolderExists -eq $False) {
+	Write-Host "Creating directory: $ModulesFolder"
+	New-Item $ModulesFolder -ItemType Directory -Force
+    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath
+}
+
+###############################################################################
+# Required Modules
+###############################################################################
+Write-Host "Checking for required modules."
+$required_posh_acme_version = 3.12.0
+$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }
+
+if (-not ($module_check)) {
+    Write-Host "Ensuring NuGet provider is bootstrapped."
+    Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+    Write-Host "Installing Posh-ACME."
+    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force
+}
+
+Write-Host "Importing Posh-ACME"
+Import-Module Posh-ACME
+
+# Variables
+$LE_SelfHosted_CertificateDomain = $OctopusParameters["LE_SelfHosted_CertificateDomain"]
+$LE_SelfHosted_Contact = $OctopusParameters["LE_SelfHosted_ContactEmailAddress"]
+$LE_SelfHosted_PfxPass = $OctopusParameters["LE_SelfHosted_PfxPass"]
+$LE_SelfHosted_Use_Staging = $OctopusParameters["LE_SelfHosted_Use_Staging"]
+$LE_SelfHosted_HttpListenerTimeout = $OctopusParameters["LE_SelfHosted_HttpListenerTimeout"]
+$LE_Self_Hosted_UpdateOctopusCertificateStore = $OctopusParameters["LE_Self_Hosted_UpdateOctopusCertificateStore"]
+$LE_SelfHosted_Octopus_APIKey = $OctopusParameters["LE_SelfHosted_Octopus_APIKey"]
+$LE_SelfHosted_ReplaceIfExpiresInDays = $OctopusParameters["LE_SelfHosted_ReplaceIfExpiresInDays"]
+$LE_SelfHosted_Install = $OctopusParameters["LE_SelfHosted_Install"]
+$LE_SelfHosted_ExportFilePath = $OctopusParameters["LE_SelfHosted_ExportFilePath"]
+$LE_SelfHosted_Export = -not [System.String]::IsNullOrWhiteSpace($LE_SelfHosted_ExportFilePath)
+$LE_SelfHosted_TempFileLocation=[System.IO.Path]::GetTempFileName()
+
+# Consts
+$LE_SelfHosted_Certificate_Name = "Lets Encrypt - $LE_SelfHosted_CertificateDomain"
+
+# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt
+$LE_SelfHosted_Fake_Issuers = @("Fake LE Intermediate X1", "(STAGING) Artificial Apricot R3", "(STAGING) Ersatz Edamame E1", "(STAGING) Pseudo Plum E5", "(STAGING) False Fennel E6", "(STAGING) Puzzling Parsnip E7", "(STAGING) Mysterious Mulberry E8", "(STAGING) Fake Fig E9", "(STAGING) Counterfeit Cashew R10", "(STAGING) Wannabe Watercress R11", "(STAGING) Riddling Rhubarb R12", "(STAGING) Tenuous Tomato R13", "(STAGING) Not Nectarine R14")
+$LE_SelfHosted_Issuers = @("Let's Encrypt Authority X3", "E1", "E2", "E7", "E8", "R3", "R4", "R5", "R6", "R10", "R11", "R12", "R13")
+
+# Helper(s)
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $response = $reader.ReadToEnd()
+            return $response | ConvertFrom-Json
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+function Clean-TempFiles {
+	if(Test-Path -Path $LE_SelfHosted_TempFileLocation) {
+		Write-Debug "Removing temporary file..."
+		Remove-Item $LE_SelfHosted_TempFileLocation -Force
+	}
+}
+
+function Exit-Failure {
+  	Clean-TempFiles
+	Exit 1
+}
+
+function Exit-Success {
+  	Clean-TempFiles
+	Exit 0
+}
+
+# Functions
+function Get-LetsEncryptCertificate {
+    Write-Debug "Entering: Get-LetsEncryptCertificate"
+
+    if ($LE_SelfHosted_Use_Staging -eq $True) {
+        Write-Host "Using Lets Encrypt Server: Staging"
+        Set-PAServer LE_STAGE;
+    }
+    else {
+        Write-Host "Using Lets Encrypt Server: Production"
+        Set-PAServer LE_PROD;
+    }
+
+    $le_account = Get-PAAccount
+    if ($le_account) {
+        Write-Host "Removing existing PA-Account..."
+        Remove-PAAccount $le_account.Id -Force
+    }
+    
+    Write-Host "Assigning new PA-Account..."
+    $le_account = New-PAAccount -Contact $LE_SelfHosted_Contact -AcceptTOS -Force
+    
+    Write-Host "Requesting new order for $LE_SelfHosted_CertificateDomain..."
+    $order = New-PAOrder -Domain $LE_SelfHosted_CertificateDomain -PfxPass $LE_SelfHosted_PfxPass -Force
+    
+    try {
+    	Write-Host "Invoking Self-Hosted HttpChallengeListener with timeout of $LE_SelfHosted_HttpListenerTimeout seconds..."
+    	Invoke-HttpChallengeListener -Verbose -ListenerTimeout $LE_SelfHosted_HttpListenerTimeout
+        	
+        Write-Host "Getting validated certificate..."
+        $pArgs = @{ManualNonInteractive=$True}
+        $cert = New-PACertificate $LE_SelfHosted_CertificateDomain -PluginArgs $pArgs
+        
+        if ($LE_SelfHosted_Install -eq $True) {
+        	if (-not $IsWindows -and 'Desktop' -ne $PSEdition) {
+              Write-Host "Installing certificate currently only works on Windows"
+          	}
+            else {
+              Write-Host "Installing certificate to local store..."
+              $cert | Install-PACertificate
+            }
+    	}
+        
+        # Linux showed weird $null issues using the .PfxFullChain path
+        if(Test-Path -Path $LE_SelfHosted_TempFileLocation) {
+        	Write-Debug "Creating temp copy of certificate to: $LE_SelfHosted_TempFileLocation"
+        	$bytes = [System.IO.File]::ReadAllBytes($cert.PfxFullChain)
+            New-Item -Path $LE_SelfHosted_TempFileLocation -ItemType "file" -Force
+            [System.IO.File]::WriteAllBytes($LE_SelfHosted_TempFileLocation, $bytes)
+        }
+        
+        if($LE_SelfHosted_Export -eq $True) {
+        	Write-Host "Exporting certificate to: $LE_SelfHosted_ExportFilePath"
+        	$bytes = [System.IO.File]::ReadAllBytes($LE_SelfHosted_TempFileLocation)
+            New-Item -Path $LE_SelfHosted_ExportFilePath -ItemType "file" -Force
+            [System.IO.File]::WriteAllBytes($LE_SelfHosted_ExportFilePath, $bytes)
+    	}
+
+        return $cert
+    }
+    catch {
+        Write-Host "Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        Exit-Failure
+    }
+}
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $LE_SelfHosted_Octopus_APIKey }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$LE_SelfHosted_CertificateDomain"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        # We don't want to confuse Production and Staging Lets Encrypt Certificates.
+        $possible_issuers = $LE_SelfHosted_Issuers
+        if ($LE_SelfHosted_Use_Staging -eq $True) {
+            $possible_issuers = $LE_SelfHosted_Fake_Issuers
+        }
+
+        return $certificates_search | Where-Object {
+            $_.SubjectCommonName -eq $LE_SelfHosted_CertificateDomain -and
+            $possible_issuers -contains $_.IssuerCommonName -and
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        Exit-Failure
+    }
+}
+
+function Publish-OctopusCertificate {
+    param (
+        [string] $JsonBody
+    )
+
+    Write-Debug "Entering: Publish-OctopusCertificate"
+
+    if (-not ($JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        Exit-Failure
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $LE_SelfHosted_Octopus_APIKey }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates"
+	Write-Verbose "Preparing to publish to: $octopus_certificates_uri"
+    
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Published $LE_SelfHosted_CertificateDomain certificate to the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Host "Failed to publish $LE_SelfHosted_CertificateDomain certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        Exit-Failure
+    }
+}
+
+function Update-OctopusCertificate {
+    param (
+        [string]$Certificate_Id,
+        [string]$JsonBody
+    )
+
+    Write-Debug "Entering: Update-OctopusCertificate"
+
+    if (-not ($Certificate_Id -and $JsonBody)) {
+        Write-Host "Existing Certificate Id and a replace Certificate are required."
+        Exit-Failure
+    }
+
+    $octopus_uri = $OctopusParameters["Octopus.Web.ServerUri"]
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $LE_SelfHosted_Octopus_APIKey }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace"
+
+    try {
+        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing
+        Write-Host "Replaced $LE_SelfHosted_CertificateDomain certificate in the Octopus Deploy Certificate Store."
+    }
+    catch {
+        Write-Error "Failed to replace $LE_SelfHosted_CertificateDomain certificate. Error: $($_.Exception.Message). See Debug output for details."
+        Write-Debug (Get-WebRequestErrorBody -RequestError $_)
+        Exit-Failure
+    }
+}
+
+function Get-NewCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-NewCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit-Failure
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($LE_SelfHosted_TempFileLocation)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        Name = "$LE_SelfHosted_CertificateDomain";
+        Notes            = "";
+        CertificateData  = @{
+            HasValue = $true;
+            NewValue = $certificate_base64;
+        };
+        Password         = @{
+            HasValue = $true;
+            NewValue = $LE_SelfHosted_PfxPass;
+        };
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+function Get-ReplaceCertificatePFXAsJson {
+    param (
+        $Certificate
+    )
+
+    Write-Debug "Entering: Get-ReplaceCertificatePFXAsJson"
+
+    if (-not ($Certificate)) {
+        Write-Host "Certificate is required."
+        Exit-Failure
+    }
+
+    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($LE_SelfHosted_TempFileLocation)
+    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)
+
+    $certificate_body = @{
+        CertificateData = $certificate_base64;
+        Password        = $LE_SelfHosted_PfxPass;
+    }
+
+    return $certificate_body | ConvertTo-Json
+}
+
+# Main Execution starts here
+
+Write-Debug "Running MAIN function..."
+
+if ($LE_Self_Hosted_UpdateOctopusCertificateStore -eq $True) {
+  Write-Host "Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store..."
+  $certificates = Get-OctopusCertificates
+
+  # Check for PFX & PEM
+  if ($certificates) {
+
+      # Handle behavior between Powershell 5 and Powershell 6+
+      $certificate_count = 1
+      if ($certificates.Count -ge 1) {
+          $certificate_count = $certificates.Count
+      }
+
+      Write-Host "Found $certificate_count for $LE_SelfHosted_CertificateDomain."
+      Write-Host "Checking to see if any expire within $LE_SelfHosted_ReplaceIfExpiresInDays days."
+
+      # Check Expiry Dates
+      $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($LE_SelfHosted_ReplaceIfExpiresInDays) }
+
+      if ($expiring_certificates) {
+          Write-Host "Found certificates that expire with $LE_SelfHosted_ReplaceIfExpiresInDays days. Requesting new certificates for $LE_SelfHosted_CertificateDomain from Lets Encrypt"
+          $le_certificate = Get-LetsEncryptCertificate
+
+          # PFX
+          $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq "Pkcs12" } | Select-Object -First 1
+          $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate
+          Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json
+      }
+      else {
+          Write-Host "Nothing to do here..."
+      }
+
+	Write-Host "Completed running..."
+    Exit-Success
+  }
+}
+
+Write-Host "Requesting New Certificate for $LE_SelfHosted_CertificateDomain from Lets Encrypt"
+
+$le_certificate = Get-LetsEncryptCertificate
+
+if($LE_Self_Hosted_UpdateOctopusCertificateStore -eq $True) {
+  Write-Host "Publishing new LetsEncrypt - $LE_SelfHosted_CertificateDomain (PFX) to Octopus Certificate Store"
+  $certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate
+  Publish-OctopusCertificate -JsonBody $certificate_as_json
+} 
+else {
+  Write-Host "Certificate generated..."
+  $le_certificate | fl
+}
+
+Write-Host "Completed running..."
+Exit-Success
\ No newline at end of file
diff --git a/src/step-templates/linux-service-start-stop-restart/metadata.json b/src/step-templates/linux-service-start-stop-restart/metadata.json
new file mode 100644
index 000000000..c678880ac
--- /dev/null
+++ b/src/step-templates/linux-service-start-stop-restart/metadata.json
@@ -0,0 +1,54 @@
+{
+  "Id": "cc2aa1d1-975b-4ac4-a145-094bbd92a2c9",
+  "Name": "Linux Service - Start, Stop, Restart",
+  "Description": null,
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "e8b2d399-ecad-4f25-bff5-f198b36a9de3",
+      "Name": "templateServiceName",
+      "Label": "Service Name",
+      "HelpText": "Name of the service",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3a1857db-c40e-4a18-8205-994fd30a9f9b",
+      "Name": "templateAction",
+      "Label": "Action",
+      "HelpText": "Action to take on the service",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "start|Start\nstop|Stop\nrestart|Restart"
+      }
+    },
+    {
+      "Id": "e42aff9e-776d-4046-9a6a-7979bf6acf82",
+      "Name": "templateSleepInSeconds",
+      "Label": "Sleep in seconds",
+      "HelpText": "Number of seconds to wait after starting, stopping, or restarting to make sure the action worked successfully.",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2020-03-04T18:52:00.6220000Z",
+    "OctopusVersion": "2019.13.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Linux"
+}
diff --git a/src/step-templates/linux-service-start-stop-restart/scriptbody.sh b/src/step-templates/linux-service-start-stop-restart/scriptbody.sh
new file mode 100644
index 000000000..f7a120c9e
--- /dev/null
+++ b/src/step-templates/linux-service-start-stop-restart/scriptbody.sh
@@ -0,0 +1,103 @@
+serviceName=$(get_octopusvariable "templateServiceName")
+action=$(get_octopusvariable "templateAction")
+sleepInSeconds=$(get_octopusvariable "templateSleepInSeconds")
+
+function get_service_running () {
+	local linuxService=$1
+    local state=$(systemctl is-active "$linuxService")
+
+
+    if [[ $state == "active" ]]
+    then
+        state=true
+    else
+        state=false
+    fi
+
+  	# Return the result
+    echo "$state"
+}
+
+function service_found () {
+	local serviceName=$1
+	local result=""
+
+	if [[ ! -z $(systemctl status $serviceName | grep "$serviceName") ]]
+	then
+		result=true
+	else
+		result=false
+	fi
+
+	echo "$result"
+}
+
+# Check for service
+if [[ $(service_found "$serviceName") == true ]]
+then
+	# Perform action
+	case $action in
+		start)
+			if [[ $(get_service_running "$serviceName") == false ]]
+			then 
+				echo "Starting service $serviceName..."
+				systemctl start $serviceName
+
+				sleep $sleepInSeconds
+
+				if [[ $(get_service_running "$serviceName") == true ]]
+				then
+					echo "$serviceName started successfully."
+				else
+					fail_step "$serviceName did not start within the specified wait time."
+				fi
+			else
+				fail_step "Service $serviceName is already running!"
+			fi
+			;;
+		stop)
+			if [[ $(get_service_running "$serviceName") == true ]]
+			then
+				echo "Stopping $serviceName..."
+				systemctl stop $serviceName
+
+				sleep $sleepInSeconds
+
+				if [[ $(get_service_running "$serviceName") == false ]]
+				then
+					echo "Stopped $serviceName successfully."
+				else
+					fail_step "$serviceName failed to stop within the specified wait time."
+				fi
+			else
+				fail_step "Service $serviceName is not running!"
+			fi
+			;;
+
+		restart)
+			if [[ $(get_service_running "$serviceName") == true ]]
+			then
+				echo "Restarting $serviceName..."
+				systemctl restart $serviceName
+
+				sleep $sleepInSeconds
+
+				if [[ $(get_service_running "$serviceName") == true ]]
+				then
+					echo "Restarted $serviceName successfully."
+				else
+					fail_step "$serviceName did not restart within the specified wait time"
+				fi
+			else
+				fail_step "$serviceName is stopped!"
+			fi
+			;;
+
+
+		*)
+			fail_step "Invalid action.  Valid actions are start|stop|restart."
+			;;
+	esac
+else
+	fail_step "Service $serviceName not found!"
+fi
\ No newline at end of file
diff --git a/src/step-templates/liquibase-apply-changeset/metadata.json b/src/step-templates/liquibase-apply-changeset/metadata.json
new file mode 100644
index 000000000..3726be903
--- /dev/null
+++ b/src/step-templates/liquibase-apply-changeset/metadata.json
@@ -0,0 +1,188 @@
+{
+  "Id": "6a276a58-d082-425f-a77a-ff7b3979ce2e",
+  "Name": "Liquibase - Apply changeset",
+  "Description": "Deploy database updates using Liquibase.  You can include Liquibase in the package itself or choose Download to download it during runtime.  Use the `Report only?` option to output the SQL it will run and upload it as an Artifact.  NOTE: `Report only?` does not work with NoSQL databases such as MongoDB \n\n**This template is now deprecated, please use `Liquibase - Run command`**",
+  "ActionType": "Octopus.Script",
+  "Version": 13,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "liquibaseChangeset"
+      },
+      "Id": "15eeeac8-d80d-46ba-bc52-413fddae36f3",
+      "Name": "liquibaseChangeset"
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "38e92902-4a82-41f3-a86a-3e467da0c454",
+      "Name": "liquibaseProLicenseKey",
+      "Label": "Pro license key",
+      "HelpText": "Enter your Liquibase Pro license key. [Request a free 30-day trial.](https://www.liquibase.com/trial) Leave blank to use the Community Edition.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4477651b-2b6d-4352-a1bd-9b9e46c31c75",
+      "Name": "liquibaseDatabaseType",
+      "Label": "Database type",
+      "HelpText": "Select the database type to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "MariaDB|MariaDB\nMongoDB|MongoDB\nMySQL|MySQL\nOracle|Oracle\nPostgreSQL|PostgreSQL\nSqlServer|SqlServer"
+      }
+    },
+    {
+      "Id": "4c738f97-c803-4a14-895e-ad6bacf09270",
+      "Name": "liquibaseChangeLogFileName",
+      "Label": "Change Log file name",
+      "HelpText": "Name of the changelog file in the package.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "25ee8ea4-f38b-42e6-a503-026d72cc83a2",
+      "Name": "liquibaseServerName",
+      "Label": "Server name",
+      "HelpText": "Name or IP address of the database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "592c5987-394a-41c2-bd82-1e234e470296",
+      "Name": "liquibaseServerPort",
+      "Label": "Server port",
+      "HelpText": "The port the database server listens on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8e43ac61-4623-4102-bb59-58a2571bfa42",
+      "Name": "liquibaseDatabaseName",
+      "Label": "Database name",
+      "HelpText": "Name of the database (or service name in case of Oracle) to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "93f218a0-8fb3-42ab-bcb9-500d9f68922b",
+      "Name": "liquibaseUsername",
+      "Label": "Username",
+      "HelpText": "Username of a user that has permission to make changes to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a2d1fee4-7161-4f8c-8d81-c00780acb79e",
+      "Name": "liquibasePassword",
+      "Label": "Password",
+      "HelpText": "Password for the user with permissions to make changes to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "42741eb0-3768-4b99-8ad2-668b92db0c77",
+      "Name": "liquibaseQueryStringParameters",
+      "Label": "Connection query string parameters",
+      "HelpText": "Add additional parameters to the connection string URL. Example: ?useUnicode=true",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1d907292-d8c6-4afc-bc26-34125b1f66ec",
+      "Name": "liquibaseClassPath",
+      "Label": "Database driver path",
+      "HelpText": "Filepath to the location of the .jar driver for the database type.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "49c3a944-b727-4487-b2b1-493527177f5d",
+      "Name": "liquibaseExecutablePath",
+      "Label": "Executable file path",
+      "HelpText": "File path to the Liquibase executable.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6e2c9b48-9e67-4bed-aafa-3dc5257f9f62",
+      "Name": "liquibaseReport",
+      "Label": "Report only?",
+      "HelpText": "This option will generate the SQL statements, save them to a file, then attach them to the step as an artifact.  This option only generates the statement, it will not run them.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "35500312-a25b-4a05-ac1e-68a7f51afd1e",
+      "Name": "liquibaseDownload",
+      "Label": "Download Liquibase?",
+      "HelpText": "Use this option to download the software necessary to deploy a Liquibase changeset.  This will download Liquibase, java, and the appropriate driver for the selected database type.  Using this option overrides the `Database driver path` and `Executable file path` inputs.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "3602d6ce-94af-4d59-acc9-ae8a84bafd01",
+      "Name": "liquibaseVersion",
+      "Label": "Liquibase version",
+      "HelpText": "Used with `Download Liquibase` to specify the version of Liquibase to use.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "235f6187-0fbf-409a-820f-61d81cea3722",
+      "Name": "liquibaseChangeset",
+      "Label": "Changeset package",
+      "HelpText": "Select the package with the changeset.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-02-25T23:33:12.8710000Z",
+    "OctopusVersion": "2020.6.0-rc0003",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "Category": "liquibase"
+}
diff --git a/src/step-templates/liquibase-apply-changeset/scriptbody.ps1 b/src/step-templates/liquibase-apply-changeset/scriptbody.ps1
new file mode 100644
index 000000000..9e0aae0df
--- /dev/null
+++ b/src/step-templates/liquibase-apply-changeset/scriptbody.ps1
@@ -0,0 +1,473 @@
+# Configure template
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Disable progress bar for PowerShell
+$ProgressPreference = 'SilentlyContinue'
+
+# Downloads and extracts liquibase to the work folder
+Function Get-Liquibase
+{
+    # Define parameters
+    param ($Version) 
+
+	$repositoryName = "liquibase/liquibase"
+
+    # Check to see if version wasn't specified
+    if ([string]::IsNullOrEmpty($Version))
+    {
+        # Get the latest version download url
+        $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object {$_.EndsWith(".zip")})
+    }
+    else
+    {
+    	$downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $Version | Where-Object {$_.EndsWith(".zip")})
+    }
+
+    # Check for download folder
+    if ((Test-Path -Path "$PSSCriptRoot\liquibase") -eq $false)
+    {
+        # Create the folder
+        New-Item -ItemType Directory -Path "$PSSCriptRoot\liquibase"
+    }
+
+    # Download the zip file
+    Write-Output "Downloading Liquibase from $downloadUrl ..."
+    $liquibaseZipFile = "$PSScriptroot\liquibase\$($downloadUrl.Substring($downloadUrl.LastIndexOf("/")))"
+    Invoke-WebRequest -Uri $downloadUrl -OutFile $liquibaseZipFile -UseBasicParsing
+    
+
+    # Extract package
+    Write-Output "Extracting Liqbuibase ..."
+    Expand-Archive -Path $liquibaseZipFile -DestinationPath "$PSSCriptRoot\liquibase"
+}
+
+# Downloads and extracts Java to the work folder, then adds the location of java.exe to the $env:PATH variabble so it can be called
+Function Get-Java
+{
+    # Check to see if a folder needs to be created
+    if((Test-Path -Path "$PSScriptRoot\jdk") -eq $false)
+    {
+        # Create new folder
+        New-Item -ItemType Directory -Path "$PSSCriptRoot\jdk"
+    }
+
+    # Download java
+    Write-Output "Downloading Java ... "
+    Invoke-WebRequest -Uri "https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL/openjdk-14.0.2_windows-x64_bin.zip" -OutFile "$PSScriptroot\jdk\openjdk-14.0.2_windows-x64_bin.zip" -UseBasicParsing
+
+    # Extract
+    Write-Output "Extracting Java ... "
+    Expand-Archive -Path "$PSScriptroot\jdk\openjdk-14.0.2_windows-x64_bin.zip" -DestinationPath "$PSSCriptRoot\jdk"
+
+    # Get Java executable
+    $javaExecutable = Get-ChildItem -Path "$PSScriptRoot\jdk" -Recurse | Where-Object {$_.Name -eq "java.exe"}
+
+    # Add path to current session
+    $env:PATH += ";$($javaExecutable.Directory)"
+}
+
+# Gets download url of latest release with an asset
+Function Get-LatestVersionDownloadUrl
+{
+    # Define parameters
+    param(
+    	$Repository,
+        $Version
+    )
+    
+    # Define local variables
+    $releases = "https://api.github.com/repos/$Repository/releases"
+    
+    # Get latest version
+    Write-Host "Determining latest release ..."
+    
+    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)
+    
+    if ($null -ne $Version)
+    {
+    	$tags = ($tags | Where-Object {$_.name.EndsWith($Version)})
+    }
+
+    # Find the latest version with a downloadable asset
+    foreach ($tag in $tags)
+    {
+        if ($tag.assets.Count -gt 0)
+        {
+            return $tag.assets.browser_download_url
+        }
+    }
+
+    # Return the version
+    return $null
+}
+
+# Finds the specified changelog file
+Function Get-ChangeLog
+{
+    # Define parameters
+    param ($FileName)
+    
+    # Find file
+    $fileReference = (Get-ChildItem -Path $OctopusParameters["Octopus.Action.Package[liquibaseChangeSet].ExtractedPath"] -Recurse | Where-Object {$_.Name -eq $FileName})
+
+    # Check to see if something weas returned
+    if ($null -eq $fileReference)
+    {
+        # Not found
+        Write-Error "$FileName was not found in $PSScriptRoot or subfolders."
+    }
+
+    # Return the reference
+    return $fileReference
+}
+
+# Downloads the appropriate JDBC driver
+Function Get-DatabaseJar
+{
+    # Define parameters
+    param ($DatabaseType)
+
+    # Declare local variables
+    $driverPath = ""
+
+    # Check to see if a folder needs to be created
+    if((Test-Path -Path "$PSScriptRoot\DatabaseDriver") -eq $false)
+    {
+        # Create new folder
+        New-Item -ItemType Directory -Path "$PSSCriptRoot\DatabaseDriver" | Out-Null
+    }
+
+    # Download the driver for the selected type
+    switch ($DatabaseType)
+    {
+        "MariaDB"
+        {
+            # Download MariaDB driver
+            Write-Host "Downloading MariaDB driver ..."
+            $driverPath = "$PSScriptroot\DatabaseDriver\mariadb-java-client-2.6.2.jar"
+            Invoke-WebRequest -Uri "https://downloads.mariadb.com/Connectors/java/connector-java-2.6.2/mariadb-java-client-2.6.2.jar" -OutFile $driverPath -UseBasicParsing
+             
+            break
+        }
+        "MongoDB"
+        {
+        	# Set repo name
+            $repositoryName = "liquibase/liquibase-mongodb"
+            
+            # Download MongoDB driver
+            Write-Host "Downloading Maven MongoDB driver ..."
+            $driverPath = "$PSScriptroot\DatabaseDriver\mongo-java-driver-3.12.7.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/mongodb/mongo-java-driver/3.12.7/mongo-java-driver-3.12.7.jar" -Outfile $driverPath -UseBasicParsing
+            
+            if ([string]::IsNullOrEmpty($liquibaseVersion))
+            {
+            	# Get the latest version for the extension
+            	$downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object {$_.EndsWith(".jar")})
+           	}
+            else
+            {
+            	# Download version matching extension
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object {$_.EndsWith(".jar")})
+            }
+                        
+			Write-Host "Downloading MongoDB Liquibase extension from $downloadUrl ..."
+            $extensionPath = "$PSScriptroot\$($downloadUrl.Substring($downloadUrl.LastIndexOf("/")))"
+            
+            Invoke-WebRequest -Uri $downloadUrl -Outfile $extensionPath -UseBasicParsing
+                        
+            # Make driver path null
+            $driverPath = "$driverPath;$extensionPath"
+            
+            break
+        }
+        "MySQL"
+        {
+            # Download MariaDB driver
+            Write-Host "Downloading MySQL driver ..."
+            Invoke-WebRequest -Uri "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.21.zip" -OutFile "$PSScriptroot\DatabaseDriver\mysql-connector-java-8.0.21.zip" -UseBasicParsing
+
+            # Extract package
+            Write-Host "Extracting MySQL driver ..."
+            Expand-Archive -Path "$PSScriptroot\DatabaseDriver\mysql-connector-java-8.0.21.zip" -DestinationPath "$PSSCriptRoot\DatabaseDriver"
+
+            # Find driver
+            $driverPath = (Get-ChildItem -Path "$PSScriptRoot\DatabaseDriver" -Recurse | Where-Object {$_.Name -eq "mysql-connector-java-8.0.21.jar"}).FullName
+
+            break
+        }
+        "Oracle"
+        {
+            # Download Oracle driver
+            Write-Host "Downloading Oracle driver ..."
+            $driverPath = "$PSScriptroot\DatabaseDriver\ojdbc10.jar"
+            Invoke-WebRequest -Uri "https://download.oracle.com/otn-pub/otn_software/jdbc/211/ojdbc11.jar" -OutFile $driverPath -UseBasicParsing
+
+            break
+        }
+        "SqlServer"
+        {
+            # Download Microsoft driver
+            Write-Host "Downloading Sql Server driver ..."
+            Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=2137600" -OutFile "$PSScriptroot\DatabaseDriver\sqljdbc_8.4.0.0_enu.zip" -UseBasicParsing
+
+            # Extract package
+            Write-Host "Extracting SqlServer driver ..."
+            Expand-Archive -Path "$PSScriptroot\DatabaseDriver\sqljdbc_8.4.0.0_enu.zip" -DestinationPath "$PSSCriptRoot\DatabaseDriver"
+
+            # Find driver
+            $driverPath = (Get-ChildItem -Path "$PSSCriptRoot\DatabaseDriver" -Recurse | Where-Object {$_.Name -eq "mssql-jdbc-8.4.1.jre14.jar"}).FullName
+
+			break
+        }
+        "PostgreSQL"
+        {
+            # Download PostgreSQL driver
+            Write-Host "Downloading PostgreSQL driver ..."
+            $driverPath = "$PSScriptroot\DatabaseDriver\postgresql-42.2.12.jar"
+            Invoke-WebRequest -Uri "https://jdbc.postgresql.org/download/postgresql-42.2.12.jar" -OutFile $driverPath -UseBasicParsing
+
+            break
+        }
+        default
+        {
+            # Display error
+            Write-Error "Unknown database type: $DatabaseType."
+        }
+    }
+
+    # Return the driver location
+    return $driverPath
+}
+
+# Returns the driver name for the liquibase call
+Function Get-DatabaseDriverName
+{
+    # Define parameters
+    param ($DatabaseType)
+
+    # Declare local variables
+    $driverName = ""
+
+    # Download the driver for the selected type
+    switch ($DatabaseType)
+    {
+        "MariaDB"
+        {
+            $driverName = "org.mariadb.jdbc.Driver"
+            break
+        }
+        "MongoDB"
+        {
+        	$driverName = $null
+            break
+        }
+        "MySQL"
+        {
+            $driverName = "com.mysql.cj.jdbc.Driver"
+            break
+        }
+        "Oracle"
+        {
+            $driverName = "oracle.jdbc.OracleDriver"
+            break
+        }
+        "SqlServer"
+        {
+            $driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+            break
+        }
+        "PostgreSQL"
+        {
+            $driverName = "org.postgresql.Driver"
+            break
+        }
+        default
+        {
+            # Display error
+            Write-Error "Unkonwn database type: $DatabaseType."
+        }
+    }
+
+    # Return the driver location
+    return $driverName
+}
+
+# Returns the connection string formatted for the database type
+Function Get-ConnectionUrl
+{
+    # Define parameters
+    param ($DatabaseType, 
+    	$ServerPort, 
+        $ServerName, 
+        $DatabaseName, 
+        $QueryStringParameters)
+
+    # Define local variables
+    $connectioUrl = ""
+
+    # Download the driver for the selected type
+    switch ($DatabaseType)
+    {
+        "MariaDB"
+        {
+            $connectionUrl = "jdbc:mariadb://{0}:{1}/{2}"
+            break
+        }
+        "MongoDB"
+        {
+        	$connectionUrl = "mongodb://{0}:{1}/{2}"            
+            break
+        }
+        "MySQL"
+        {
+            $connectionUrl = "jdbc:mysql://{0}:{1}/{2}"
+            break
+        }
+        "Oracle"
+        {
+            $connectionUrl = "jdbc:oracle:thin:@{0}:{1}:{2}"
+            break
+        }
+        "SqlServer"
+        {
+            $connectionUrl = "jdbc:sqlserver://{0}:{1};database={2};"
+            break
+        }
+        "PostgreSQL"
+        {
+            $connectionUrl = "jdbc:postgresql://{0}:{1}/{2}"
+            break
+        }
+        default
+        {
+            # Display error
+            Write-Error "Unkonwn database type: $DatabaseType."
+        }
+    }
+
+    if (![string]::IsNullOrEmpty($QueryStringParameters))
+    {
+        if ($QueryStringParameters.StartsWith("?") -eq $false)
+        {
+            # Add the question mark
+            $connectionUrl += "?"
+        }
+        $connectionUrl += "$QueryStringParameters"
+    }
+
+    # Return the url
+    return ($connectionUrl -f $ServerName, $ServerPort, $DatabaseName)
+}
+
+# Create array for arguments
+$liquibaseArguments = @()
+
+# Check for license key
+if (![string]::IsNullOrEmpty($liquibaseProLicenseKey))
+{
+	# Add key to arguments
+    $liquibaseArguments += "--liquibaseProLicenseKey=$liquibaseProLicenseKey"
+}
+
+# Find Change log
+$changeLogFile = (Get-ChangeLog -FileName $liquibaseChangeLogFileName)
+$liquibaseArguments += "--changeLogFile=$($changeLogFile.Name)"
+
+# Check to see if it needs to be downloaed to machine
+if ($liquibaseDownload -eq $true)
+{
+    # Download and extract liquibase
+    Get-Liquibase -Version $liquibaseVersion -DownloadFolder $workingFolder
+
+    # Download and extract java and add it to PATH environment variable
+    Get-Java
+
+    # Get the driver
+    $driverPath = Get-DatabaseJar -DatabaseType $liquibaseDatabaseType
+
+	if (![string]::IsNullOrEmpty($driverPath))
+    {
+    	# Add to arguments
+    	$liquibaseArguments += "--classpath=$driverPath"
+    }
+}
+else
+{
+    if (![string]::IsNullOrEmpty($liquibaseClassPath))
+    {
+    	$liquibaseArguments += "--classpath=$liquibaseClassPath"
+    }
+}
+
+# Check to see if liquibase path has been defined
+if ([string]::IsNullOrEmpty($liquibaseExecutablePath))
+{
+    # Assign root
+    $liquibaseExecutablePath = $PSSCriptRoot
+}
+
+# Get the executable location
+$liquibaseExecutable = Get-ChildItem -Path $liquibaseExecutablePath -Recurse | Where-Object {$_.Name -eq "liquibase.bat"}
+
+# Add path to current session
+$env:PATH += ";$($liquibaseExecutable.Directory)"
+
+# Check to make sure it was found
+if ([string]::IsNullOrEmpty($liquibaseExecutable))
+{
+    # Could not find the executable
+    Write-Error "Unable to find liquibase.bat in $PSScriptRoot or subfolders."
+}
+
+# Add argument for driver
+#$databaseDriver = Get-DatabaseDriverName -DatabaseType $liquibaseDatabaseType
+#if (![string]::IsNullOrEmpty($databaseDriver))
+#{
+#	$liquibaseArguments += "--driver=$databaseDriver"
+#}
+
+# Add connection Url
+$connectionUrl = Get-ConnectionUrl -DatabaseType $liquibaseDatabaseType -ServerPort $liquibaseServerPort -ServerName $liquibaseServerName -DatabaseName $liquibaseDatabaseName -QueryStringParameters $liquibaseQueryStringParameters
+$liquibaseArguments += "--url=$connectionUrl"
+
+# Add Username and password
+$liquibaseArguments += "--username=$liquibaseUsername"
+$liquibaseArguments += "--password=`"$liquibasePassword`""
+
+# Set the location to where the file is
+Set-Location -Path $changeLogFile.Directory
+
+# Check to see if it should run or just report
+if ($liquibaseReport -eq $true)
+{
+    # Set error action preference - updateSQL writes to stderr so this is to prevent errors from showing up
+    $ErrorActionPreference = "SilentlyContinue"
+    
+    # Add just report
+    $liquibaseArguments += "updateSQL"
+    
+    # Execute liquibase
+    $liquibaseProcess = Start-Process -FilePath $liquibaseExecutable.FullName -ArgumentList $liquibaseArguments -RedirectStandardError "$PSScriptRoot\stderr.txt" -RedirectStandardOutput "$PSScriptRoot\ChangeSet.sql" -Passthru -Wait
+	    
+    # Display standard error
+    foreach ($line in (Get-Content -Path "$PSScriptRoot\stderr.txt"))
+    {
+    	# Display
+        Write-Host "$line"
+    }
+    
+    # Check exit code
+    if ($liquibaseProcess.ExitCode -eq 0)
+    {
+    	# Attach artifact
+        New-OctopusArtifact -Path "$PSScriptRoot\ChangeSet.sql" -Name "ChangeSet.sql"
+    }
+}
+else
+{
+    $liquibaseArguments += "update"
+    & $liquibaseExecutable.FullName $liquibaseArguments
+}
+
diff --git a/src/step-templates/liquibase-run-command/metadata.json b/src/step-templates/liquibase-run-command/metadata.json
new file mode 100644
index 000000000..e6f043f11
--- /dev/null
+++ b/src/step-templates/liquibase-run-command/metadata.json
@@ -0,0 +1,240 @@
+{
+  "Id": "36df3e84-8501-4f2a-85cc-bd9eb22030d1",
+  "Name": "Liquibase - Run command",
+  "Description": "Run Liqbuibase commands against a database.  You can include Liquibase in the package itself or choose Download to download it during runtime.\n\nNote:\n- AWS EC2 IAM Authentication requires the AWS CLI to be installed.\n- Windows Authentication has been tested with \n  - Microsoft SQL Server \n  - PostgreSQL\n- SQL Anywhere only works with Username/Password authentication\n\nOnce the Liquibase commands have executed, the output is stored in an Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) called `LiquibaseCommandOutput` for use in subsequent Octopus deployment or runbook steps.\n\n**Downloading the database driver(s) is now a separate option called: Download database driver?**",
+  "ActionType": "Octopus.Script",
+  "Version": 30,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "Name": "liquibaseChangeset",
+      "Id": "15eeeac8-d80d-46ba-bc52-413fddae36f3",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "liquibaseChangeset"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "Parameters": [
+    {
+      "Id": "a5f6167a-3e45-4337-ad76-fdacf385ac9c",
+      "Name": "liquibaseProLicenseKey",
+      "Label": "Pro license key",
+      "HelpText": "Enter your Liquibase Pro license key. [Request a free 30-day trial.](https://www.liquibase.com/trial) Leave blank to use the Community Edition.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f56f8e65-bd97-4be4-a9e8-979a5d8e5208",
+      "Name": "liquibaseDatabaseType",
+      "Label": "Database type",
+      "HelpText": "Select the database type to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Cassandra|Cassandra\nCosmosDB|CosmosDB\nDB2|DB2\nMariaDB|MariaDB\nMongoDB|MongoDB\nMySQL|MySQL\nOracle|Oracle\nPostgreSQL|PostgreSQL\nSnowflake|Snowflake\nSqlAnywhere|SqlAnywhere\nSqlServer|SqlServer"
+      }
+    },
+    {
+      "Id": "e0e2ba23-69f4-4a82-8310-b06f9a485802",
+      "Name": "liquibaseCommand",
+      "Label": "Command",
+      "HelpText": "Use the drop down to select the command to execute.\nCommands with `*` have partial functionality with Community edition, full functionality with Pro edition.\n\nCommands with `**` are Pro only (all Pro only commands require the use of Additional switches).\n\nCommands with `***` require Additiona switches.\n\nAll commands that end in `SQL` will automatically add the `--outputFile` switch and include the generated output as an artifact.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "changelogSync|changelogSync\nchangelogSyncSQL|changelogSyncSQL\nclearCheckSums|clearCheckSums\ndeactivateChangeLog|deactivateChangeLog\ndropAll|dropAll*\nfutureRollbackSQL|futureRollbackSQL\nhistory|history\nrollbackOneChangeSet|rollbackOneChangeSet**\nrollbackOneChangeSetSQL|rollbackOneChangeSetSQL**\nrollbackOneUpdate|rollbackOneUpdate**\nrollbackOneUpdateSQL|rollbackOneUpdateSQL**\nrollbackToDate|rollbackToDate***\nrollbackToDateSQL|rollbackToDateSQL***\nstatus|status\ntag-exists|tag-exists\nupdateSQL|updateSQL\nupdate|update\nupdateTestingRollback|updateTestingRollback\nvalidate|validate"
+      }
+    },
+    {
+      "Id": "86049fa3-866d-4687-b128-25be358cc5aa",
+      "Name": "liquibaseCommandStyle",
+      "Label": "Command style",
+      "HelpText": "Select the style of command, Legacy or Modern.  Legacy will place the Liquibase command at the end of the call, Modern will place it at the beginning\n\nLegacy:\n`liquibase --switch1 command`\n\nModern:\n`liquibase command --switch1`",
+      "DefaultValue": "modern",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "legacy|Legacy\nmodern|Modern"
+      }
+    },
+    {
+      "Id": "0af1aaa8-0cfb-4018-85fc-c996fd450d8c",
+      "Name": "liquibaseCommandArguments",
+      "Label": "Command Arguments",
+      "HelpText": "Some commands require additional arguments, e.g. , `status --verbose`, `rollbackOneUpdate --force`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9f2a3e0c-1afd-4472-acc9-66bd8743ec37",
+      "Name": "liquibaseAdditionalSwitches",
+      "Label": "Additional switches",
+      "HelpText": "A list of additional switches to include for the command, one per line.  (I.e. `--logLevel=debug`)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "ef523320-65ec-44ce-a0cd-0e65a0fed9f9",
+      "Name": "liquibaseChangeLogFileName",
+      "Label": "Change Log file name",
+      "HelpText": "Name of the changelog file in the package.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2ff32870-827c-45c1-86f8-f31842ef547b",
+      "Name": "liquibaseChangeset",
+      "Label": "Changeset package",
+      "HelpText": "Select the package with the changeset.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "dbb7c649-f87b-42f3-b6c9-6db97df39a2f",
+      "Name": "liquibaseServerName",
+      "Label": "Server name",
+      "HelpText": "Name or IP address of the database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "481b1bd7-ed0a-40da-8ee6-81397c8d0769",
+      "Name": "liquibaseServerPort",
+      "Label": "Server port",
+      "HelpText": "The port the database server listens on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "56db5b8b-ceaa-4ee8-b231-df15ea7d9a43",
+      "Name": "liquibaseAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the database server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "8d4337f3-3e37-40e7-983b-b85cc630a720",
+      "Name": "liquibaseDatabaseName",
+      "Label": "Database name",
+      "HelpText": "Name of the database to deploy to.\n- Service name for Oracle\n- KeySpace for Cassandra",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0524f7f4-fb8e-4747-8f1b-679237e398a7",
+      "Name": "liquibaseUsername",
+      "Label": "Username",
+      "HelpText": "Username of a user that has permission to make changes to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d58b5a73-681b-434a-92a9-b373216fedc3",
+      "Name": "liquibasePassword",
+      "Label": "Password",
+      "HelpText": "Password for the user with permissions to make changes to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "bac7d86b-eb37-4b3f-a99c-0779ffae3fca",
+      "Name": "liquibaseQueryStringParameters",
+      "Label": "Connection query string parameters",
+      "HelpText": "Add additional parameters to the connection string URL. Example: ?useUnicode=true or ;AuthMech=1",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8f1c2bc5-6b39-4c95-8eb0-bd97b0fe62f0",
+      "Name": "liquibaseClassPath",
+      "Label": "Database driver path",
+      "HelpText": "Filepath to the location of the .jar driver for the database type.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cae0020d-595b-407c-a96b-02f7a6bc9788",
+      "Name": "liquibaseExecutablePath",
+      "Label": "Executable file path",
+      "HelpText": "File path to the Liquibase executable.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2eae1d4e-a12d-47dd-8a43-1a6e49983fd9",
+      "Name": "liquibaseDownload",
+      "Label": "Download Liquibase?",
+      "HelpText": "Use this option to download the software necessary to deploy a Liquibase changeset.  This will download Liquibase, java, and the appropriate driver for the selected database type.  Using this option overrides the `Database driver path` and `Executable file path` inputs.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "3f37288f-a4df-4ed7-b309-bb361a496572",
+      "Name": "liquibaseVersion",
+      "Label": "Liquibase version",
+      "HelpText": "Used with `Download Liquibase` to specify the version of Liquibase to use.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "964c851d-1ff3-4f45-81ca-b55bbb8a7ff8",
+      "Name": "liquibaseDownloadDatabaseDriver",
+      "Label": "Download database driver?",
+      "HelpText": "Use this option to download the driver(s) for the selected database type.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2026-03-13T22:05:40.7520000Z",
+    "OctopusVersion": "2026.1.11242",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "liquibase"
+}
diff --git a/src/step-templates/liquibase-run-command/scriptbody.ps1 b/src/step-templates/liquibase-run-command/scriptbody.ps1
new file mode 100644
index 000000000..775afd038
--- /dev/null
+++ b/src/step-templates/liquibase-run-command/scriptbody.ps1
@@ -0,0 +1,1180 @@
+# Configure template
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Downloads and extracts liquibase to the work folder
+Function Get-Liquibase {
+    # Define parameters
+    param ($Version) 
+
+    $repositoryName = "liquibase/liquibase"
+
+    # Check to see if version wasn't specified
+    if ([string]::IsNullOrEmpty($Version)) {
+        # Get the latest version download url
+        $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(".zip") })
+    }
+    else {
+        $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $Version | Where-Object { $_.EndsWith(".zip") })
+    }
+
+    # Extract the downloaded file
+    Expand-DownloadedFile -DownloadUrls $downloadUrl | Out-Null
+    
+    # Parse downloaded version
+    if ($downloadUrl -is [array]) {
+        $downloadedFileName = [System.IO.Path]::GetFileName($downloadUrl[0])
+    }
+    else {
+        $downloadedFileName = [System.IO.Path]::GetFileName($downloadUrl)
+    }
+
+    # Return the downloaded version
+    return $downloadedFileName.SubString($downloadedFileName.IndexOf("-") + 1).Replace(".zip", "")    
+}
+
+# Downloads the files
+Function Expand-DownloadedFile {
+    # Define parameters
+    param (
+        $DownloadUrls
+    )
+    
+    # Loop through results
+    foreach ($url in $DownloadUrls) {
+        # Download the zip file
+        $folderName = [System.IO.Path]::GetFileName("$PSScriptroot/$($url.Substring($url.LastIndexOf("/")))").Replace(".zip", "")
+        $zipFile = "$PSScriptroot/$folderName/$($url.Substring($url.LastIndexOf("/")))"
+        Write-Host "Downloading $zipFile from $url ..."
+        
+        if ((Test-Path -Path "$PSScriptroot/$folderName") -eq $false) {
+            # Create folder
+            New-Item -Path "$PSScriptroot/$folderName/" -ItemType Directory
+        }
+
+        # Download the zip file
+        Invoke-WebRequest -Uri $url -OutFile $zipFile -UseBasicParsing | Out-Null
+
+        # Extract package
+        Write-Host "Extracting $zipFile ..."
+        Expand-Archive -Path $zipFile -DestinationPath "$PSSCriptRoot/$folderName" | Out-Null
+    }
+}
+
+
+# Downloads and extracts Java to the work folder, then adds the location of java.exe to the $env:PATH variabble so it can be called
+Function Get-Java {
+    # Check to see if a folder needs to be created
+    if ((Test-Path -Path "$PSScriptRoot/jdk") -eq $false) {
+        # Create new folder
+        New-Item -ItemType Directory -Path "$PSSCriptRoot/jdk"
+    }
+
+    # Download java
+    Write-Output "Downloading Java ... "
+    
+    # Determine OS
+    if ($IsWindows) {
+        Invoke-WebRequest -Uri "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip" -OutFile "$PSScriptroot/jdk/openjdk-21.0.2_windows-x64_bin.zip" -UseBasicParsing
+
+        # Extract
+        Write-Output "Extracting Java ... "
+        Expand-Archive -Path "$PSScriptroot\jdk\openjdk-21.0.2_windows-x64_bin.zip" -DestinationPath "$PSSCriptRoot/jdk"
+
+        # Get Java executable
+        $javaExecutable = Get-ChildItem -Path "$PSScriptRoot\jdk" -Recurse | Where-Object { $_.Name -eq "java.exe" }
+    }
+    
+    if ($IsLinux) {
+        Invoke-WebRequest -Uri "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz" -OutFile "$PSScriptroot/jdk/openjdk-21.0.2_linux-x64_bin.tar.gz" -UseBasicParsing
+
+        # Extract
+        Write-Output "Extracting Java ... "
+        tar -xvzf "$PSScriptroot/jdk/openjdk-21.0.2_linux-x64_bin.tar.gz" --directory "$PSScriptRoot/jdk"
+
+        # Get Java executable
+        $javaExecutable = Get-ChildItem -Path "$PSScriptRoot/jdk" -Recurse | Where-Object { $_.Name -eq "java" }   
+    }
+    
+    # Add path to current session as first entry to bypass other versions of Java that may be installed.
+    $env:PATH = "$($javaExecutable.Directory)$([IO.Path]::PathSeparator)" + $env:PATH
+    
+}
+
+Function Get-DriverAssets {
+    # Define parameters
+    param (
+        $DownloadInfo
+    )
+
+    # Declare working variables
+    $assetFilePath = ""
+
+    # Check to see if there are multiple assets to download
+    if ($DownloadInfo -is [array]) {
+        # Declare local variables
+        $assetFiles = @()
+
+        # Loop through array
+        foreach ($url in $DownloadInfo) {
+            # Download the asset
+            Write-Host "Downloading asset from $url..."
+            $assetPath = "$PSScriptroot/$($url.Substring($url.LastIndexOf("/")))"
+            
+            # Skip test assets
+            if ($assetPath.EndsWith("tests.jar")) {
+                Write-Host "Asset is for testing, skipping ..."
+                continue
+            }
+            
+            Invoke-WebRequest -Uri $url -Outfile $assetPath -UseBasicParsing
+            $assetFiles += $assetPath
+        }
+
+        # Assign paths
+        $assetFilePath = $assetFiles -join "$([IO.Path]::PathSeparator)"
+    }
+    else {
+        # Download asset
+        Write-Host "Downloading asset from $DownloadInfo ..."
+        $assetFilePath = "$PSScriptroot/$($DownloadInfo.Substring($DownloadInfo.LastIndexOf("/")))"
+        Invoke-WebRequest -Uri $DownloadInfo -Outfile $assetFilePath -UseBasicParsing
+    }
+
+    # Return path
+    return $assetFilePath
+}
+
+# Gets download url of latest release with an asset
+Function Get-LatestVersionDownloadUrl {
+    # Define parameters
+    param(
+        $Repository,
+        $Version
+    )
+    
+    # Define local variables
+    $releases = "https://api.github.com/repos/$Repository/releases"
+    
+    # Get latest version
+    Write-Host "Determining latest release of $Repository ..."
+    
+    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)
+    
+    if ($null -ne $Version) {
+        # Get specific version
+        $tags = ($tags | Where-Object { $_.name.EndsWith($Version) })
+
+        # Check to see if nothing was returned
+        if ($null -eq $tags) {
+            # Not found
+            Write-Host "No release found matching version $Version, getting highest version using Major.Minor syntax..."
+
+            # Get the tags
+            $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)
+
+            # Parse the version number into a version object
+            $parsedVersion = [System.Version]::Parse($Version)
+            $partialVersion = "$($parsedVersion.Major).$($parsedVersion.Minor)"
+            
+            # Filter tags to ones matching only Major.Minor of version specified
+            $tags = ($tags | Where-Object { $_.name.Contains("$partialVersion.") -and $_.draft -eq $false })
+            
+            # Grab the latest
+            if ($null -eq $tags)
+            {
+            	# decrement minor version
+                $minorVersion = [int]$parsedVersion.Minor
+                $minorVersion --
+                
+                # return the urls
+                return (Get-LatestVersionDownloadUrl -Repository $Repository -Version "$($parsedVersion.Major).$($minorVersion)")
+            }
+        }
+    }
+
+    # Find the latest version with a downloadable asset
+    foreach ($tag in $tags) {
+        if ($tag.assets.Count -gt 0) {
+            return $tag.assets.browser_download_url
+        }
+    }
+
+    # Return the version
+    return $null
+}
+
+# Finds the specified changelog file
+Function Get-ChangeLog {
+    # Define parameters
+    param ($FileName)
+    
+    # Find file
+    $fileReference = (Get-ChildItem -Path $OctopusParameters["Octopus.Action.Package[liquibaseChangeSet].ExtractedPath"] -Recurse | Where-Object { $_.Name -eq $FileName })
+
+    # Check to see if something weas returned
+    if ($null -eq $fileReference) {
+        # Not found
+        Write-Error "$FileName was not found in $PSScriptRoot or subfolders."
+    }
+
+    # Return the reference
+    return $fileReference
+}
+
+# Downloads the appropriate JDBC driver
+Function Get-DatabaseJar {
+    # Define parameters
+    param ($DatabaseType)
+
+    # Declare local variables
+    $driverPath = ""
+
+    # Check to see if a folder needs to be created
+    if ((Test-Path -Path "$PSScriptRoot/DatabaseDriver") -eq $false) {
+        # Create new folder
+        New-Item -ItemType Directory -Path "$PSSCriptRoot/DatabaseDriver" | Out-Null
+    }
+
+    # Download the driver for the selected type
+    switch ($DatabaseType) {
+        "Cassandra" {
+
+			# Get the release download
+            Write-Host "Downloading Cassandra JDBC driver bundle ..."
+			$downloadUrl = Get-LatestVersionDownloadUrl -Repository "ing-bank/cassandra-jdbc-wrapper"
+           
+            # Find driver
+            $driverPath = (Get-DriverAssets -DownloadInfo $downloadUrl)
+
+            # Set repo name
+            $repositoryName = "liquibase/liquibase-cassandra"
+            
+            if ([string]::IsNullOrEmpty($liquibaseVersion)) {
+                # Get the latest version for the extension
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(".jar") })
+           	}
+            else {
+                # Download version matching extension
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object { $_.EndsWith(".jar") })
+            }           
+
+            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl
+            
+            # Make driver path null
+            $driverPath = "$driverPath$([IO.Path]::PathSeparator)$extensionPath"
+
+            break
+        }
+        "CosmosDB"
+        {
+			# Download the (long) list of dependencies
+            $driverPaths = @()
+
+			# Set repo name
+            $repositoryName = "liquibase/liquibase-cosmosdb"
+
+			if ([string]::IsNullOrEmpty($liquibaseVersion))
+            {
+            	# Get the latest version for the extension
+            	$downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object {$_.EndsWith(".jar")})
+           	}
+            else
+            {
+            	# Download version matching extension
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object {$_.EndsWith(".jar")})
+            }    
+            
+            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl
+                     
+			# Add to driver path
+            $driverPaths += $extensionPath
+            
+            Write-Host "Downloading azure-cosmos driver ..."
+            $driverVersion = "4.28.0"
+            $filePath = "$PSScriptroot/DatabaseDriver/azure-cosmos-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/azure/azure-cosmos/$driverVersion/azure-cosmos-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            # Add to driver path
+            $driverPaths += $filePath
+            
+            Write-Host "Downloading azure-core driver ..."
+            $driverVersion = "1.27.0"
+            $filePath = "$PSScriptroot/DatabaseDriver/azure-core-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/azure/azure-core/$driverVersion/azure-core-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            $files = Get-ChildItem -Path "$PSScriptRoot/DatabaseDriver"
+            
+            Write-Host "There are these $files"
+
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading jackson core driver ..."
+            $driverVersion = "2.13.2"
+            $filePath = "$PSScriptroot/DatabaseDriver/jackson-core-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/$driverVersion/jackson-core-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading slf4j core driver ..."
+            $driverVersion = "1.7.36"
+            $filePath = "$PSScriptroot/DatabaseDriver/slf4j-api-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/$driverVersion/slf4j-api-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty buffer driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-buffer-$driverVersion.final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-buffer/$driverVersion.Final/netty-buffer-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+			
+            Write-Host "Downloading reactor-core driver ..."
+            $driverVersion = "3.4.16"
+            $filePath = "$PSScriptroot/DatabaseDriver/reactor-core-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/projectreactor/reactor-core/$driverVersion/reactor-core-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading reactor-netty-core driver ..."
+            $driverVersion = "1.0.17"
+            $filePath = "$PSScriptroot/DatabaseDriver/reactor-core-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/projectreactor/netty/reactor-netty-core/$driverVersion/reactor-netty-core-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading reactor-netty-core driver ..."
+            $driverVersion = "1.0.17"
+            $filePath = "$PSScriptroot/DatabaseDriver/reactor-netty-http-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/projectreactor/netty/reactor-netty-http/$driverVersion/reactor-netty-http-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-resolver driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-resolver-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-resolver/$driverVersion.Final/netty-resolver-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing  | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-transport driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-transport-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-transport/$driverVersion.Final/netty-transport-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing  | Out-Null
+            
+            
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading reactivestreams driver ..."
+            $driverVersion = "1.0.3"
+            $filePath = "$PSScriptroot/DatabaseDriver/reactive-streams-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/$driverVersion/reactive-streams-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading jackson-databind driver ..."
+            $driverVersion = "2.13.2.1"
+            $filePath = "$PSScriptroot/DatabaseDriver/jackson-databind-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/$driverVersion/jackson-databind-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading jackson-annotations driver ..."
+            $driverVersion = "2.13.2"
+            $filePath = "$PSScriptroot/DatabaseDriver/jackson-annotations-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/$driverVersion/jackson-annotations-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+            
+            Write-Host "Downloading jackson-module-afterburner driver ..."
+            $driverVersion = "2.13.2"
+            $filePath = "$PSScriptroot/DatabaseDriver/jackson-module-afterburner-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-afterburner/$driverVersion/jackson-module-afterburner-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading reactor-netty driver ..."
+            $driverVersion = "1.0.17"
+            $filePath = "$PSScriptroot/DatabaseDriver/reactor-netty-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/projectreactor/netty/reactor-netty/$driverVersion/reactor-netty-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-transport-native-unix-common driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-transport-native-unix-common-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/$driverVersion.Final/netty-transport-native-unix-common-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-transport-native-epoll driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-transport-native-epoll-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-transport-native-epoll/$driverVersion.Final/netty-transport-native-epoll-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-tcnative-boringssl-static driver ..."
+            $driverVersion = "2.0.51"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-tcnative-boringssl-static-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/$driverVersion.Final/netty-tcnative-boringssl-static-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-resolver-dns driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-resolver-dns-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-resolver-dns/$driverVersion.Final/netty-resolver-dns-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-handler-proxy driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-handler-proxy-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-handler-proxy/$driverVersion.Final/netty-handler-proxy-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-handler driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-handler-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-handler/$driverVersion.Final/netty-handler-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-common driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-common-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-common/$driverVersion.Final/netty-common-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-codec-socks driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-codec-socks-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-codec-socks/$driverVersion.Final/netty-codec-socks-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-codec-http driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-codec-http-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-codec-http/$driverVersion.Final/netty-codec-http-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-codec-http2 driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-codec-http2-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/$driverVersion.Final/netty-codec-http2-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-codec-dns driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-codec-dns-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-codec-dns/$driverVersion.Final/netty-codec-dns-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-codec driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-codec-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-codec/$driverVersion.Final/netty-codec-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading micrometer-core driver ..."
+            $driverVersion = "1.8.4"
+            $filePath = "$PSScriptroot/DatabaseDriver/micrometer-core-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/micrometer/micrometer-core/$driverVersion/micrometer-core-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading metrics-core driver ..."
+            $driverVersion = "4.2.9"
+            $filePath = "$PSScriptroot/DatabaseDriver/metrics-core-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core/$driverVersion/metrics-core-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading LatencyUtils driver ..."
+            $driverVersion = "2.0.3"
+            $filePath = "$PSScriptroot/DatabaseDriver/LatencyUtils-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/latencyutils/LatencyUtils/$driverVersion/LatencyUtils-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading jackson-datatype-jsr310 driver ..."
+            $driverVersion = "2.12.5"
+            $filePath = "$PSScriptroot/DatabaseDriver/jackson-datatype-jsr310-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/$driverVersion/jackson-datatype-jsr310-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-tcnative-classes driver ..."
+            $driverVersion = "2.0.51"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-tcnative-classes-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/$driverVersion.Final/netty-tcnative-classes-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-transport-classes-kqueue driver ..."
+            $driverVersion = "4.1.73"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-transport-classes-kqueue-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue/$driverVersion.Final/netty-transport-classes-kqueue-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading slf4j-simple driver ..."
+            $driverVersion = "1.7.36"
+            $filePath = "$PSScriptroot/DatabaseDriver/slf4j-simple-$driverVersion.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/$driverVersion/slf4j-simple-$driverVersion.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-transport-classes-epoll driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-transport-classes-epoll-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/$driverVersion.Final/netty-transport-classes-epoll-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+            Write-Host "Downloading netty-transport-native-kqueue driver ..."
+            $driverVersion = "4.1.75"
+            $filePath = "$PSScriptroot/DatabaseDriver/netty-transport-native-kqueue-$driverVersion.Final.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/$driverVersion.Final/netty-transport-native-kqueue-$driverVersion.Final.jar" -Outfile $filePath -UseBasicParsing | Out-Null
+            
+
+            # Add to driver path
+            $driverPaths += $filePath
+
+			# Return driver list separated by system specific PathSeparator
+            $driverPath = ($driverPaths -join [IO.Path]::PathSeparator)
+            
+            $files = Get-ChildItem -Path "$PSScriptRoot/DatabaseDriver"
+            
+            #Write-Host "There are these $files"
+            
+       		break
+        }        
+        "DB2" {
+            # Use built-in driver
+            $driverPath = $null
+            break
+        }
+        "MariaDB" {
+            # Download MariaDB driver
+            Write-Host "Downloading MariaDB driver ..."
+            $driverPath = "$PSScriptroot/DatabaseDriver/mariadb-java-client-3.5.7.jar"
+            Invoke-WebRequest -Uri "https://dlm.mariadb.com/4550269/Connectors/java/connector-java-3.5.7/mariadb-java-client-3.5.7.jar" -OutFile $driverPath -UseBasicParsing
+             
+            break
+        }
+        "MongoDB" {
+            # Download MongoDB driver
+            Write-Host "Downloading Maven MongoDB driver ..."
+            $driverPath = "$PSScriptroot/DatabaseDriver/mongo-java-driver-3.12.7.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/mongodb/mongo-java-driver/3.12.7/mongo-java-driver-3.12.7.jar" -Outfile $driverPath -UseBasicParsing
+            
+            # Check to see if they are using a licenced version
+            if (![string]::IsNullOrWhitespace($liquibaseProLicenseKey)) {
+                # Set the paid version url
+                $mongoVersions = Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/org/liquibase/ext/liquibase-commercial-mongodb" -UseBasicParsing
+                
+                # Loop through links, look for ones that evaluate to version
+                $versions = @()
+                foreach ($link in $mongoVersions.Links) {
+                    Write-Verbose "Evaluating: $link"
+                    if (![string]::IsNullOrWhitespace($link.title)) {
+                        # Get the inner text
+                        $versionNumber = $link.title.Replace("/", "")
+
+                        # Check to see if $versionNumber can be parsed as a versionNumber
+                        $versionOut = $null
+                        if ([System.Version]::TryParse($versionNumber, [ref]$versionOut)) {
+                            $versions += $versionOut
+                        }
+                    }
+                }
+
+                # Get the highest version number
+                $info = ($versions | Measure-Object -Maximum)
+
+                $downloadUrl = "https://repo1.maven.org/maven2/org/liquibase/ext/liquibase-commercial-mongodb/$($info.Maximum)/liquibase-commercial-mongodb-$($info.Maximum).jar"                
+            }
+            else {
+                # Set repo name
+                $repositoryName = "liquibase/liquibase-mongodb"            
+                
+                # Download latest OSS version
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(".jar") })
+            }
+                        
+            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl
+            
+            # Make driver path null
+            $driverPath = "$driverPath$([IO.Path]::PathSeparator)$extensionPath"
+            
+            break
+        }
+        "MySQL" {
+            # Download MariaDB driver
+            Write-Host "Downloading MySQL driver ..."
+            Invoke-WebRequest -Uri "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.28.zip" -OutFile "$PSScriptroot/DatabaseDriver/mysql-connector-java-8.0.28.zip" -UseBasicParsing -UserAgent "curl/7.8.3.1"
+
+            # Extract package
+            Write-Host "Extracting MySQL driver ..."
+            Expand-Archive -Path "$PSScriptroot/DatabaseDriver/mysql-connector-java-8.0.28.zip" -DestinationPath "$PSSCriptRoot/DatabaseDriver"
+
+            # Find driver
+            $driverPath = (Get-ChildItem -Path "$PSScriptRoot/DatabaseDriver" -Recurse | Where-Object { $_.Name -eq "mysql-connector-java-8.0.28.jar" }).FullName
+
+            break
+        }
+        "Oracle" {
+            # Download Oracle driver
+            Write-Host "Downloading Oracle driver ..."
+            $driverPath = "$PSScriptroot/DatabaseDriver/ojdbc10.jar"
+            Invoke-WebRequest -Uri "https://download.oracle.com/otn-pub/otn_software/jdbc/211/ojdbc11.jar" -OutFile $driverPath -UseBasicParsing
+
+            break
+        }
+        "SqlAnywhere" {
+            Write-Host "Downloading jTds driver ..."
+            
+            $downloadUrl = (Get-LatestVersionDownloadUrl -Repository "milesibastos/jTDS" | Where-Object {$_.Contains("-dist")})
+            Invoke-WebRequest -Uri $downloadUrl -OutFile "$PSScriptroot/DatabaseDriver/jtds.zip" -UseBasicParsing
+
+            # Extract package
+            Write-Host "Extracting jTds driver ..."
+            Expand-Archive -Path "$PSScriptroot/DatabaseDriver/jtds.zip" -DestinationPath "$PSScriptRoot/DatabaseDriver"
+
+            # Find driver
+            $driverPath = (Get-ChildItem -Path "$PSScriptRoot/DatabaseDriver" -Recurse | Where-Object {$_.Name -like "jtds-*.jar"}).FullName
+
+            break
+        }
+        "SqlServer" {
+            # Download Microsoft driver
+            Write-Host "Downloading Sql Server driver ..."
+            Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=2186163" -OutFile "$PSScriptroot/DatabaseDriver/sqljdbc_10.2.0.0_enu.zip" -UseBasicParsing
+
+            # Extract package
+            Write-Host "Extracting SqlServer driver ..."
+            Expand-Archive -Path "$PSScriptroot/DatabaseDriver/sqljdbc_10.2.0.0_enu.zip" -DestinationPath "$PSSCriptRoot/DatabaseDriver"
+
+            # Find driver
+            $driverPath = (Get-ChildItem -Path "$PSSCriptRoot/DatabaseDriver" -Recurse | Where-Object { $_.Name -eq "mssql-jdbc-10.2.0.jre11.jar" }).FullName
+            
+            # Determine architecture
+            if ([System.Environment]::Is64BitOperatingSystem) {
+                # Locate auth dll
+                $authDll = Get-ChildItem -Path "$PSScriptRoot/DatabaseDriver" -Recurse | Where-Object { $_.Name -eq "mssql-jdbc_auth-10.2.0.x64.dll" }
+            }
+            else {
+                $authDll = Get-ChildItem -Path "$PSScriptRoot/DatabaseDriver" -Recurse | Where-Object { $_.Name -eq "mssql-jdbc_auth-10.2.0.x86.dll" }
+            }
+            
+            # Add the dll to the path so it can find it.
+            $env:PATH += "$([IO.Path]::PathSeparator)$($authDll.Directory)"
+            
+            break
+        }
+        "PostgreSQL" {
+            # Download PostgreSQL driver
+            Write-Host "Downloading PostgreSQL driver ..."
+            $driverPath = "$PSScriptroot/DatabaseDriver/postgresql-42.2.12.jar"
+            Invoke-WebRequest -Uri "https://jdbc.postgresql.org/download/postgresql-42.2.12.jar" -OutFile $driverPath -UseBasicParsing
+            
+            # Download the WAFFLE jna driver for Windows Authentication
+            $repositoryName = "waffle/waffle"
+            
+            # Latest version of Waffle (2.3.0) doesn't seem to work, can't find sspi method, specify version 1.9.0
+            $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version "1.9.0" | Where-Object { $_.EndsWith(".zip") })
+            Expand-DownloadedFile -DownloadUrls $downloadUrl | Out-Null
+            
+            # Get all waffle jars
+            $waffleFolder = (Get-ChildItem -Path "$PSScriptroot" -Recurse | Where-Object { $_.PSIsContainer -and $_.Name -like "Waffle*" })           
+            $waffleJars = (Get-ChildItem -Path $waffleFolder.FullName -Recurse | Where-Object { $_.Extension -eq ".jar" })
+            
+            foreach ($jar in $waffleJars) {
+                $driverPath += "$([IO.Path]::PathSeparator)$($jar.FullName)"
+            }
+
+
+            break
+        }
+        "Snowflake" {
+            # Set repo name
+            $repositoryName = "liquibase/liquibase-snowflake"
+
+            # Download Snowflake driver
+            Write-Host "Downloading Snowflake driver ..."
+            $driverPath = "$PSScriptroot/DatabaseDriver/snowflake-jdbc-3.9.2.jar"
+            Invoke-WebRequest -Uri "https://repo1.maven.org/maven2/net/snowflake/snowflake-jdbc/3.9.2/snowflake-jdbc-3.9.2.jar" -OutFile $driverPath -UseBasicParsing
+
+            if ([string]::IsNullOrEmpty($liquibaseVersion)) {
+                # Get the latest version for the extension
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(".jar") })
+           	}
+            else {
+                # Download version matching extension
+                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object { $_.EndsWith(".jar") })
+            }
+                        
+            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl
+            
+            # Make driver path null
+            $driverPath = "$driverPath$([IO.Path]::PathSeparator)$extensionPath"
+
+
+            break
+        }
+        default {
+            # Display error
+            Write-Error "Unknown database type: $DatabaseType."
+        }
+    }
+
+    # Return the driver location
+    return $driverPath
+}
+
+# Returns the connection string formatted for the database type
+Function Get-ConnectionUrl {
+    # Define parameters
+    param ($DatabaseType, 
+        $ServerPort, 
+        $ServerName, 
+        $DatabaseName, 
+        $QueryStringParameters)
+
+    # Define local variables
+    $connectionUrl = ""
+
+    # Download the driver for the selected type
+    switch ($DatabaseType) {
+        "Cassandra" {
+            #$connectionUrl = "jdbc:cassandra://{0}:{1};DefaultKeyspace={2}"
+            $connectionUrl = "jdbc:cassandra://{0}:{1}/{2}"
+            break
+        }
+        "CosmosDB"
+        {
+            $connectionUrl = "cosmosdb://{0}:$($liquibasePassword)@{0}:{1}/{2}" 
+            break
+        }        
+        "DB2" {
+            $connectionUrl = "jdbc:db2://{0}:{1}/{2}"
+            break
+        }
+        "MariaDB" {
+            $connectionUrl = "jdbc:mariadb://{0}:{1}/{2}"
+            
+            # Check for Windows Authentication type
+            if ($liquibaseAuthenticationMethod -eq "windowsauthentication") {
+                # Add querysting parameter
+                $connectionUrl += "?integratedSecurity=true"
+            }
+            
+            break
+        }
+        "MongoDB" {        
+            $connectionUrl = "mongodb://{0}:{1}/{2}"            
+            break
+        }
+        "MySQL" {
+        
+            $connectionUrl = "jdbc:mysql://{0}:{1}/{2}"
+            
+            # Check for Windows Authentication type
+            if ($liquibaseAuthenticationMethod -eq "windowsauthentication") {
+                # Add querysting parameter
+                $connectionUrl += "?integratedSecurity=true"
+            }
+            
+            break
+        }
+        "Oracle" {
+            $connectionUrl = "jdbc:oracle:thin:@{0}:{1}/{2}"
+            break
+        }
+        "SqlAnywhere" {
+            $connectionUrl = "jdbc:jtds:sybase://{0}:{1}/{2}"
+            break
+        }
+        "SqlServer" {
+            $connectionUrl = "jdbc:sqlserver://{0}:{1};database={2};"
+            
+            switch ($liquibaseAuthenticationMethod) {
+                "azuremanagedidentity" {
+                    # Add querystring parameter
+                    $connectionUrl += "Authentication=ActiveDirectoryMSI;"
+                    break
+                }
+                "windowsauthentication" {
+                    # Add querysting parameter
+                    $connectionUrl += "integratedSecurity=true;"
+                	
+                    break
+                }
+            }
+            
+            break
+        }
+        "PostgreSQL" {
+            $connectionUrl = "jdbc:postgresql://{0}:{1}/{2}"
+            
+            # Check for Windows Authentication type
+            if ($liquibaseAuthenticationMethod -eq "windowsauthentication") {
+                # Add querysting parameter
+                $connectionUrl += "?gsslib=sspi"
+            }
+            
+            break
+        }
+        "Snowflake" {
+            $connectionUrl = "jdbc:snowflake://{0}.snowflakecomputing.com?db={2}"
+            break
+        }
+        default {
+            # Display error
+            Write-Error "Unkonwn database type: $DatabaseType."
+        }
+    }
+
+    if (![string]::IsNullOrWhitespace($QueryStringParameters)) {       	
+        if ($connectionUrl.Contains("?")) {
+           	# Replace the ? with & in connection string parameters
+            $QueryStringParameters = $QueryStringParameters.Replace("?", "&")
+        }
+        
+        # Appen connecion string
+        $connectionUrl += "$QueryStringParameters"
+    }
+
+    # Return the url
+    return ($connectionUrl -f $ServerName, $ServerPort, $DatabaseName)
+}
+
+# Create array for arguments
+$liquibaseArguments = @()
+
+# Check to see if it's running on Windows
+if ($IsWindows) {
+    # Disable the progress bar so downloading files via Invoke-WebRequest are faster
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Check for license key
+if (![string]::IsNullOrWhitespace($liquibaseProLicenseKey)) {
+    # Add key to arguments
+    $liquibaseArguments += "--liquibaseProLicenseKey=$liquibaseProLicenseKey"
+}
+
+# Find Change log
+$changeLogFile = (Get-ChangeLog -FileName $liquibaseChangeLogFileName)
+$liquibaseArguments += "--changeLogFile=$($changeLogFile.Name)"
+
+# Set the location to where the file is
+Set-Location -Path $changeLogFile.Directory
+
+# Check to see if it needs to be downloaed to machine
+if ($liquibaseDownload -eq $true) {
+    # Download and extract liquibase - get the version for extensions that are version specific
+    $liquibaseVersion = Get-Liquibase -Version $liquibaseVersion -DownloadFolder $workingFolder
+
+    # Download and extract java and add it to PATH environment variable
+    Get-Java
+}
+else {
+    if (![string]::IsNullOrEmpty($liquibaseClassPath)) {
+        $liquibaseArguments += "--classpath=$liquibaseClassPath"
+    }
+}
+
+# Check to see if liquibase path has been defined
+if ([string]::IsNullOrWhitespace($liquibaseExecutablePath)) {
+
+	if ($env:IsContainer)
+    {
+    	$liquibaseExecutablePath = "/"	
+    }
+    else
+    {
+    	# Assign root
+    	$liquibaseExecutablePath = $PSSCriptRoot
+    }
+}
+
+# Get the executable location
+if ($IsWindows) {
+    $liquibaseExecutable = Get-ChildItem -Path $liquibaseExecutablePath -Recurse | Where-Object { $_.Name -eq "liquibase.bat" }
+}
+
+if ($IsLinux) {
+    $liquibaseExecutable = Get-ChildItem -Path $liquibaseExecutablePath -Recurse | Where-Object { $_.Name -eq "liquibase" }
+}
+
+# Add path to current session
+$env:PATH += "$([IO.Path]::PathSeparator)$($liquibaseExecutable.Directory)"
+
+# Check to make sure it was found
+if ([string]::IsNullOrEmpty($liquibaseExecutable)) {
+    # Could not find the executable
+    Write-Error "Unable to find liquibase.bat in $PSScriptRoot or subfolders."
+}
+
+# Get connection Url
+$connectionUrl = Get-ConnectionUrl -DatabaseType $liquibaseDatabaseType -ServerPort $liquibaseServerPort -ServerName $liquibaseServerName -DatabaseName $liquibaseDatabaseName -QueryStringParameters $liquibaseQueryStringParameters
+
+# Add username
+$liquibaseArguments += "--username=$liquibaseUsername"
+
+# Determine authentication method
+switch ($liquibaseAuthenticationMethod) {
+    "azuremanagedidentity" {
+        # SQL Server driver doesn't assign password
+        if ($liquibaseDatabaseType -ne "SqlServer") {
+            # Get login token
+            Write-Host "Generating Azure Managed Identity token ..."
+            $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true" } -UseBasicParsing
+
+            $liquibasePassword = $token.access_token
+            $liquibaseArguments += "--password=`"$liquibasePassword`""
+        }
+    }
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($liquibaseServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $liquibasePassword = (aws rds generate-db-auth-token --hostname $liquibaseServerName --region $region --port $liquibaseServerPort --username $liquibaseUsername)
+        $liquibaseArguments += "--password=`"$liquibasePassword`""
+
+        break
+    }
+    "gcpserviceaccount" {
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google" }
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header -UseBasicParsing
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains("iam.gserviceaccount.com") }
+
+        Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header -UseBasicParsing
+        
+        $liquibasePassword = $token.access_token
+        $liquibaseArguments += "--password=`"$liquibasePassword`""
+    }
+    "usernamepassword" {
+        # Add password
+        $liquibaseArguments += "--password=`"$liquibasePassword`""
+        
+        break
+    }
+}
+
+# Add connection url
+$liquibaseArguments += "--url=`"$connectionUrl`""
+
+# Determine if the output variable needs to be set
+if ($liquibaseCommand.EndsWith("SQL")) {
+    # Add the output variable as the command name
+    $liquibaseArguments += "--outputFile=`"$PSScriptRoot/artifacts/$($liquibaseCommand).sql`""
+    
+    # Create the folder
+    if ((Test-Path -Path "$PSScriptRoot/artifacts") -eq $false) {
+        New-Item -Path "$PSScriptRoot/artifacts" -ItemType "Directory"
+    }
+}
+
+
+# Add the additional switches
+foreach ($liquibaseSwitch in $liquibaseAdditionalSwitches) {
+    $liquibaseArguments += $liquibaseSwitch
+}
+
+switch ($liquibaseCommandStyle) {
+    "legacy" {
+        # Add the command to execute
+        $liquibaseArguments += $liquibaseCommand
+    }
+    "modern" {
+        # Insert the command at the beginning
+        $liquibaseArguments = @($liquibaseCommand) + $liquibaseArguments
+    }
+}
+
+# Add command arguments
+$liquibaseArguments += $liquibaseCommandArguments
+
+# Display what's going to be run
+if (![string]::IsNullOrWhitespace($liquibasePassword)) {
+    $liquibaseDisplayArguments = $liquibaseArguments.PSObject.Copy()
+    for ($i = 0; $i -lt $liquibaseDisplayArguments.Count; $i++) {
+        if ($null -ne $liquibaseDisplayArguments[$i]) {
+            if ($liquibaseDisplayArguments[$i].Contains($liquibasePassword)) {
+                $liquibaseDisplayArguments[$i] = $liquibaseDisplayArguments[$i].Replace($liquibasePassword, "****")
+            }
+        }
+    }
+    
+    Write-Host "Executing the following command: $($liquibaseExecutable.FullName) $liquibaseDisplayArguments"
+}
+else {
+    Write-Host "Executing the following command: $($liquibaseExecutable.FullName) $liquibaseArguments"
+}
+
+# Check to see if the user has specified the drivers need to be downloaded
+if ($liquibaseDownloadDatabaseDriver -eq $true)
+{
+	# Download any additional drivers based on the database technology being deployed to
+    $driverPath = Get-DatabaseJar -DatabaseType $liquibaseDatabaseType
+
+    # Check to see if it's null
+    if ($null -ne $driverPath) {
+        # Create folder to hold jar files to override
+        New-Item -Path "$PWD/liquibase_libs/" -ItemType Directory    
+
+        # Copy contents into liquibase_libs folder
+        $driverPaths = $driverPath.Split([IO.Path]::PathSeparator)
+
+        foreach ($driver in $driverPaths) {
+            # Copy the items
+            $files = Get-ChildItem -Path $driver
+
+            foreach ($file in $files) {
+                Write-Host "Copying $($file.FullName) to $PWD/liquibase_libs/$($file.Name)"
+                Copy-Item -Path $file.FullName -Destination "$PWD/liquibase_libs/$($file.Name)"
+            }
+            
+        }
+
+    }
+}
+
+
+
+# Declare variable to hold output from Tee-Object
+$liquibaseCommandOutput;
+
+# Redirection of stderr to stdout is done different on Windows versus Linux
+if ($IsWindows) {
+    # Batch file uses a find command which is located in c:\windows\system32 and not included in regular PowerShell sessions
+    $env:PATH = $env:PATH + ";c:\windows\system32"
+    $liquibaseArguments += "2>&1"
+    # Execute Liquibase
+    & $liquibaseExecutable.FullName $liquibaseArguments | Tee-Object -Variable liquibaseCommandOutput
+}
+
+if ($IsLinux) {
+    # Execute Liquibase
+    & $liquibaseExecutable.FullName $liquibaseArguments 2>&1 | Tee-Object -Variable liquibaseCommandOutput
+}
+
+Set-OctopusVariable -name "LiquibaseCommandOutput" -value $liquibaseCommandOutput
+
+# Check exit code
+if ($lastExitCode -ne 0) {
+    # Fail the step
+    Write-Error "Execution of Liquibase failed!"
+}
+
+# Check to see if there were any files output
+if ((Test-Path -Path "$PSScriptRoot/artifacts") -eq $true) {
+    # Loop through items
+    foreach ($item in (Get-ChildItem -Path "$PSScriptRoot/artifacts")) {
+        New-OctopusArtifact -Path $item.FullName -Name $item.Name
+    }
+}
\ No newline at end of file
diff --git a/step-templates/Jenkins-Queue-Job.json b/step-templates/Jenkins-Queue-Job.json
deleted file mode 100644
index 50521b453..000000000
--- a/step-templates/Jenkins-Queue-Job.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "Id": "ccb7ad4c-a19e-426f-822e-cd0e0243bda3",
-  "Name": "Jenkins - Queue Job",
-  "Description": "Trigger a job in Jenkins",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$jenkinsServer = $OctopusParameters['jqj_JenkinsServer'] \n$jenkinsUserName = $OctopusParameters['jqj_JenkinsUserName']\n$jenkinsUserPassword = $OctopusParameters['jqj_JenkinsUserPasword']\n$jobURL = $jenkinsServer + $OctopusParameters['jqj_JobUrl']\n$failBuild = [System.Convert]::ToBoolean($OctopusParameters['jqj_FailBuild'])\n$jobTimeout = $OctopusParameters['jqj_JobTimeout']\n$buildParam = $OctopusParameters['jqj_BuildParam']\n$checkIntervals = $OctopusParameters['jqj_checkInterval']\n$fetchBuildWait = $OctopusParameters['jqj_FetchBuildWait']\n$fetchBuildLimit = $OctopusParameters['jqj_FetchBuildLimit']\n$waitForComplete = $OctopusParameters['jqj_WaitForComplete']\n$attachBuildLog = ([System.Convert]::ToBoolean($OctopusParameters['jqj_AttachBuildLog']))\n\n$jobUrlWithParams = \"$jobURL$buildParam\"\n\nWrite-Host \"job url: \" $jobUrlWithParams \n\nfunction Get-JenkinsAuth\n{\n    $params = @{}\n    if (![string]::IsNullOrWhiteSpace($jenkinsUserName)) {\n        $securePwd = ConvertTo-SecureString $jenkinsUserPassword -AsPlainText -Force \n        $credential = New-Object System.Management.Automation.PSCredential ($jenkinsUserName, $securePwd) \n        $head = @{\"Authorization\" = \"Basic \" + [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($jenkinsUserName + \":\" + $jenkinsUserPassword ))}\n        $params = @{\n            Headers = $head;\n            Credential = $credential;\n            ContentType = \"text/plain\";\n        }\n    }\n\n    # If your Jenkins uses the \"Prevent Cross Site Request Forgery exploits\" security option (which it should), \n    # when you make a POST request, you have to send a CSRF protection token as an HTTP request header.\n    # https://wiki.jenkins.io/display/JENKINS/Remote+access+API\n    try {\n        $tokenUrl = $jenkinsServer + \"crumbIssuer/api/json?tree=crumbRequestField,crumb\"\n        $crumbResult = Invoke-WebRequest -Uri $tokenUrl -Method Get @params -UseBasicParsing | ConvertFrom-Json\n        Write-Host \"CSRF protection is enabled, adding CSRF token to request headers\"\n        $params.Headers += @{$crumbResult.crumbRequestField = $crumbResult.crumb}\n    } catch {\n        Write-Host \"Failed to get CSRF token, CSRF may not be enabled\"\n        Write-Host $Error[0]\n    }\n    return $params\n}\n\ntry {\n    Write-Host \"Fetching Jenkins auth params\"\n    $authParams = Get-JenkinsAuth\n\n    Write-Host \"Start the build\"\n    $returned = Invoke-WebRequest -Uri $jobUrlWithParams  -Method Post -UseBasicParsing @authParams\n    Write-Host \"Job URL Link: $($returned.Headers['Location'])\"\n    $jobResult = \"$($returned.Headers['Location'])/api/json\"\n    $response = Invoke-RestMethod -Uri $jobResult -Method Get @authParams\n    $buildUrl = $Response.executable.url\n    $result = \"\"\n    $c = 0\n    while (($null -eq $buildUrl -or $buildUrl -eq \"\") -and ($c -lt $fetchBuildLimit) ) {\n        $c += 1\n        $response = Invoke-RestMethod -Uri $jobResult -Method Get @authParams\n        $buildUrl = $Response.executable.url\n        Start-Sleep -s $fetchBuildWait\n    }\n    Write-Host \"Build Number is: $($Response.executable.number)\"\n    #Write-Host \"Job URL Is: $($buildUrl)\"\n    Write-Highlight \"Job URL Is: [$($buildUrl)]($($buildUrl))\"\n    $buildResult = \"$buildUrl/api/json?tree=result,number,building\"\n        \n    $isBuilding = \"True\"\n       \n    if ($waitForComplete -eq \"True\")\n    {\n      while ($isBuilding -eq \"True\") {       \n          Write-Host \"waiting $checkIntervals secs for build to complete\"\n          Start-Sleep -s $checkIntervals\n          $retyJobStatus = Invoke-RestMethod -Uri $buildResult -Method Get @authParams\n\n          $isBuilding = $retyJobStatus[0].building\n          $result = $retyJobStatus[0].result\n          $buildNumber = $retyJobStatus[0].number\n          \n          Write-Host \"Retry Job Status: \" $result \" BuildNumber: \"  $buildNumber  \" IsBuilding: \"  $isBuilding \n      }\n\n        # Get log from Jenkins\n        $buildLog = (Invoke-WebRequest -Uri \"$($buildUrl)/logText/progressiveText?start=0\"  -Method Post -UseBasicParsing @authParams)\n\n        Write-Host \"$buildLog\"\n\n        # Check to see if the log needs to be attached\n        if ($attachBuildLog)\n        {\n           # Send the build log to a file\n          Write-Host \"Getting log file ...\"\n          Set-Content -Path \"$PWD/#{Octopus.Step.Name}.log\" -Value $buildLog\n  \n          # Attach build log as artifact\n          Write-Host \"Attaching log file as artifact ...\"\n          New-OctopusArtifact -Path \"$PWD/#{Octopus.Step.Name}.log\" -Name \"#{Octopus.Step.Name}.log\"       \n        }\n    }\n    else\n    {\n    \n      $i = 0\n      Write-Host \"Estimate Job Duration: \" $jobTimeout\n      while ($isBuilding -eq \"True\" -and $i -lt $jobTimeout) {       \n          $i += 5\n          Write-Host \"waiting $checkIntervals secs for build to complete\"\n          Start-Sleep -s $checkIntervals\n          $retyJobStatus = Invoke-RestMethod -Uri $buildResult -Method Get @authParams\n\n          $isBuilding = $retyJobStatus[0].building\n          $result = $retyJobStatus[0].result\n          $buildNumber = $retyJobStatus[0].number\n          Write-Host \"Retry Job Status: \" $result \" BuildNumber: \"  $buildNumber  \" IsBuilding: \"  $isBuilding \n      }     \n    }\n\n\n     \n    if ($failBuild) {\n        if ($result -ne \"SUCCESS\") {\n            if (![string]::IsNullOrWhitespace($result))\n            {\n              Write-Host \"Build ended with status: $result\"\n            }\n            else\n            {\n              Write-Host \"BUILD FAILURE: build status could not be obtained.\"\n            }\n            exit 1\n        }\n    }\n  else\n  {\n    if ([string]::IsNullOrWhitespace($result))\n    {\n      Write-Warning \"Time-out expired before a status was returned.\"\n    }\n    else\n    {\n      Write-host \"Process ended with status: $result.\"\n    }\n  }\n}\ncatch {\n    Write-Host \"Exception in jenkins job: $($_.Exception.Message)\"\n    exit 1\n}\n\n\n\n"
-  },
-  "Parameters": [
-    {
-      "Id": "b8337514-3989-4b33-930c-b5ebde5b4be0",
-      "Name": "jqj_JobUrl",
-      "Label": "Job Url",
-      "HelpText": "e.g. job/jobname",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a52f7318-6f45-4e9f-b825-b3ae767608f8",
-      "Name": "jqj_FailBuild",
-      "Label": "Fail Deployment",
-      "HelpText": "Fail the deployment if the job fails or time-out occurs.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a59c57d3-0177-470c-80e0-f103e57f30d3",
-      "Name": "jqj_JobTimeout",
-      "Label": "Timeout Duration(secs)",
-      "HelpText": "e.g. 60. Specify in secs how long to check for the job status before timing out.",
-      "DefaultValue": "0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "be446e7d-a1db-41e1-9df2-be2246d93052",
-      "Name": "jqj_WaitForComplete",
-      "Label": "Wait for complete",
-      "HelpText": "Wait until the job has completed, overrides `Timeout Duration`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "70e9cf06-3712-4950-a174-a5c5c7bd5858",
-      "Name": "jqj_BuildParam",
-      "Label": "Build Param",
-      "HelpText": "To use build parameters, update `/build` to `/buildWithParameters`\ne.g. ?Param=Value or ?delay=10sec\n",
-      "DefaultValue": "/build",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "da8cdc0a-3cd8-4b34-9e5d-13245f77002c",
-      "Name": "jqj_JenkinsServer",
-      "Label": "Jenkins Server",
-      "HelpText": null,
-      "DefaultValue": "http://jenkins:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "1e43a971-d6a2-4692-8dd2-d8b5344b706c",
-      "Name": "jqj_JenkinsUserName",
-      "Label": "Jenkins User Name",
-      "HelpText": "(Optional) User name  to use to connect to the Jenkins Server",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fba79fa0-9221-4cd1-9259-5d59e716f0db",
-      "Name": "jqj_JenkinsUserPasword",
-      "Label": "Jenkins User Password",
-      "HelpText": "(Optional) The password to use to connect to the Jenkins Server.  In newer versions of Jenkins, this needs to be the API token for the user.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9fea70e1-ff39-4cc1-8937-7cc19b959e17",
-      "Name": "jqj_checkInterval",
-      "Label": "Check Interval",
-      "HelpText": "The sleep time between checking if the job is running in seconds",
-      "DefaultValue": "20",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "432dbaed-512e-4d29-9b4d-814a8b7c4846",
-      "Name": "jqj_FetchBuildWait",
-      "Label": "Fetch Build URL Wait(secs)",
-      "HelpText": "e.g. 10 Used when getting the build URL. Useful if Jenkins is busy and can't schedule job immediately or there are connection issues. Helps limit excess calls to /api",
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cd222e86-cb94-495c-8a5a-8d4cd8b20d86",
-      "Name": "jqj_FetchBuildLimit",
-      "Label": "Fetch Build URL Limit",
-      "HelpText": "e.g. 5. Used to limit the number of times the script asks for the build URL. Used in with FetchBuildURLWait to limit the calls made to /api for build URL.",
-      "DefaultValue": "5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5d1a7a9a-f4cc-40fc-93a8-760797cb1cc4",
-      "Name": "jqj_AttachBuildLog",
-      "Label": "Attach build log",
-      "HelpText": "Attaches the build log from Jenkins as an [Artifact](https://octopus.com/docs/projects/deployment-process/artifacts).  This feature will only work when `Wait for complete` is also enabled.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2024-07-16T18:49:59.8950000Z",
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2025-02-11T22:39:29.859Z",
-    "OctopusVersion": "2024.4.7147",
-    "Type": "ActionTemplate"
-  },
-  "Category": "jenkins"
-}
diff --git a/step-templates/flyway-database-migrations.json b/step-templates/flyway-database-migrations.json
deleted file mode 100644
index 3ea24f363..000000000
--- a/step-templates/flyway-database-migrations.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-  "Id": "ccebac39-79a8-4ab4-b55f-19ea570d9ebc",
-  "Name": "Flyway Database Migrations",
-  "Description": "Step template to leverage Flyway to deploy migration scripts.  This is the latest and greatest Flyway step template that leverages all the newest features of both Flyway and Octopus Deploy.\n\n- You can include the flyway executables in your package, if you include the `flyway` (Linux) or `flyway.cmd` (Windows) in the root of the package this step template will automatically find them.\n- You can use this with an execution container, negating the need to include Flyway in the package. If Flyway isn't found in the package it will attempt to find `/flyway/flyway` (when using Linux containers) or `flyway` in the environment path and use that.\n- Support for all Flyway commands, including the `undo` command.\n- Support for flyway community, teams, enterprise, and pro editions.  \n\nPlease note this requires Octopus Deploy **2019.10.0** or newer along with PowerShell Core installed on the machines running this step.\nAWS EC2 IAM Authentication requires the AWS CLI to be installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 15,
-  "Packages": [
-    {
-      "Name": "Flyway.Package.Value",
-      "Id": "0c0d333c-d794-4a16-a3a2-4bbba4550763",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Flyway.Package.Value"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$VerboseActionPreference=\"Continue\"\n\nfunction Get-FlywayExecutablePath\n{\n\tparam (\n    \t$providedPath\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($providedPath) -eq $false)\n    {\n    \tWrite-Host \"The executable path was provided, testing to see if it is absolute or relative\"\n\t\tif ([IO.Path]::IsPathRooted($providedPath))\n        {\n        \tWrite-Host \"The provided path is absolute, using that\"\n            \n        \treturn $providedPath\n        }\n        \n        Write-Host \"The provided path was relative, combining $(Get-Location) with $providedPath\"\n        return Join-Path $(Get-Location) $providedPath\n    }\n    \n    Write-Host \"Checking to see if we are currently running on Linux\"\n    if ($IsLinux)    \n    {\n    \tWrite-Host \"Currently running on Linux\"\n    \tWrite-Host \"Checking to see if flyway was included with the package\"\n    \tif (Test-Path \"./flyway\")\n        {\n        \tWrite-Host \"It was, using that version of flyway\"\n        \treturn \"flyway\"\n        }\n        \n        Write-Host \"Testing to see if we are on an execution container with /flyway/flyway as the path\"\n    \tif (Test-Path \"/flyway/flyway\")\n        {\n        \tWrite-Host \"We are, using /flyway/flyway\"\n        \treturn \"/flyway/flyway\"\n        }               \n    }\n    \n    Write-Host \"Currently running on Windows\"\n    \n    Write-Host \"Testing to see if flyway.cmd was included with the package\"\n    if (Test-Path \".\\flyway.cmd\")\n    {\n    \tWrite-Host \"It was, using that version.\"\n    \treturn \".\\flyway.cmd\"\n    }\n    \n    Write-Host \"Testing to see if flyway can be found in the env path\"\n    $flywayExecutable = (Get-Command \"flyway\" -ErrorAction SilentlyContinue)\n    if ($null -ne $flywayExecutable)\n    {\n    \tWrite-Host \"The flyway folder is part of the environment path\"\n        return $flywayExecutable.Source\n    }\n    \n    Fail-Step \"Unable to find flyway executable.  Please include it as part of the package, or provide the path to it.\"\n}\n\nfunction Test-AddParameterToCommandline\n{\n\tparam (\n    \t$acceptedCommands,\n        $selectedCommand,\n        $parameterValue,\n        $defaultValue,\n        $parameterName\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($parameterValue) -eq $true)\n    {    \t\n    \tWrite-Verbose \"$parameterName is empty, returning false\"\n    \treturn $false\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($defaultValue) -eq $false -and $parameterValue.ToLower().Trim() -eq $defaultValue.ToLower().Trim())\n    {\n    \tWrite-Verbose \"$parameterName is matches the default value, returning false\"\n    \treturn $false\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($acceptedCommands) -eq $true -or $acceptedCommands -eq \"any\")\n    {\n    \tWrite-Verbose \"$parameterName has a value and this is for any command, returning true\"\n    \treturn $true\n    }\n    \n    $acceptedCommandArray = $acceptedCommands -split \",\"\n    foreach ($command in $acceptedCommandArray)\n    {\n    \tif ($command.ToLower().Trim() -eq $selectedCommand.ToLower().Trim())\n        {\n        \tWrite-Verbose \"$parameterName has a value and the current command $selectedCommand matches the accepted command $command, returning true\"\n        \treturn $true\n        }\n    }\n    \n    Write-Verbose \"$parameterName has a value but is not accepted in the current command, returning false\"\n    return $false\n}\n\nfunction Get-ParsedUrl\n{\n\t# Define parameters\n    param (\n    \t$ConnectionUrl\n    )\n    \n    # Remove the 'jdbc:' portion from the $ConnectionUrl parameter\n    $ConnectionUrl = $ConnectionUrl.ToLower().Replace(\"jdbc:\", \"\")\n    \n    # Parse and return the url\n    return [System.Uri]$ConnectionUrl\n}\n\n# Declaring the path to the NuGet package\n$flywayPackagePath = $OctopusParameters[\"Octopus.Action.Package[Flyway.Package.Value].ExtractedPath\"]\n$flywayUrl = $OctopusParameters[\"Flyway.Target.Url\"]\n$flywayUser = $OctopusParameters[\"Flyway.Database.User\"]\n$flywayUserPassword = $OctopusParameters[\"Flyway.Database.User.Password\"]\n$flywayCommand = $OctopusParameters[\"Flyway.Command.Value\"]\n$flywayLicenseKey = $OctopusParameters[\"Flyway.License.Key\"]\n$flywayLicenseEmail = $OctopusParameters[\"Flyway.Email.Address\"]\n$flywayLicensePAT = $OctopusParameters[\"Flyway.PersonalAccessToken\"]\n$flywayExecutablePath = $OctopusParameters[\"Flyway.Executable.Path\"]\n$flywaySchemas = $OctopusParameters[\"Flyway.Command.Schemas\"]\n$flywayTarget = $OctopusParameters[\"Flyway.Command.Target\"]\n$flywayInfoSinceDate = $OctopusParameters[\"Flyway.Command.InfoSinceDate\"]\n$flywayInfoSinceVersion = $OctopusParameters[\"Flyway.Command.InfoSinceVersion\"]\n$flywayLicensedEdition = $OctopusParameters[\"Flyway.License.Version\"]\n$flywayCherryPick = $OctopusParameters[\"Flyway.Command.CherryPick\"]\n$flywayOutOfOrder = $OctopusParameters[\"Flyway.Command.OutOfOrder\"]\n$flywaySkipExecutingMigrations = $OctopusParameters[\"Flyway.Command.SkipExecutingMigrations\"]\n$flywayPlaceHolders = $OctopusParameters[\"Flyway.Command.PlaceHolders\"]\n$flywayBaseLineVersion = $OctopusParameters[\"Flyway.Command.BaselineVersion\"]\n$flywayBaselineDescription = $OctopusParameters[\"Flyway.Command.BaselineDescription\"]\n$flywayAuthenticationMethod = $OctopusParameters[\"Flyway.Authentication.Method\"]\n$flywayLocations = $OctopusParameters[\"Flyway.Command.Locations\"]\n$flywayAdditionalArguments = $OctopusParameters[\"Flyway.Additional.Arguments\"]\n$flywayStepName = $OctopusParameters[\"Octopus.Action.StepName\"]\n$flywayEnvironment = $OctopusParameters[\"Octopus.Environment.Name\"]\n$flywayCheckBuildUrl = $OctopusParameters[\"Flyway.Command.CheckBuildUrl\"]\n$flywayCheckBuildUsername = $OctopusParameters[\"Flyway.Database.Check.User\"]\n$flywayCheckBuildPassword = $OctopusParameters[\"Flyway.Database.Check.User.Password\"]\n$flywayBaselineOnMigrate = $OctopusParameters[\"Flyway.Command.BaseLineOnMigrate\"]\n$flywaySnapshotFileName = $OctopusParameters[\"Flyway.Command.Snapshot.FileName\"]\n$flywayCheckFailOnDrift = $OctopusParameters[\"Flyway.Command.FailOnDrift\"]\n\nif ([string]::IsNullOrWhitespace($flywayLocations))\n{\n\t$flywayLocations = \"filesystem:$flywayPackagePath\"\n}\n\n\n# Logging for troubleshooting\nWrite-Host \"*******************************************\"\nWrite-Host \"Logging variables:\"\nWrite-Host \" - - - - - - - - - - - - - - - - - - - - -\"\nWrite-Host \"PackagePath: $flywayPackagePath\"\nWrite-Host \"Flyway Executable Path: $flywayExecutablePath\"\nWrite-Host \"Flyway Command: $flywayCommand\"\nWrite-Host \"-url: $flywayUrl\"\nWrite-Host \"-user: $flywayUser\"\nWrite-Host \"-schemas: $flywaySchemas\"\nWrite-Host \"-target: $flywayTarget\"\nWrite-Host \"-cherryPick: $flywayCherryPick\"\nWrite-Host \"-outOfOrder: $flywayOutOfOrder\"\nWrite-Host \"-skipExecutingMigrations: $flywaySkipExecutingMigrations\"\nWrite-Host \"-infoSinceDate: $flywayInfoSinceDate\"\nWrite-Host \"-infoSinceVersion: $flywayInfoSinceVersion\"\nWrite-Host \"-baselineOnMigrate: $flywayBaselineOnMigrate\"\nWrite-Host \"-baselineVersion: $flywayBaselineVersion\"\nWrite-Host \"-baselineDescription: $flywayBaselineDescription\"\nWrite-Host \"-locations: $flywayLocations\"\nWrite-Host \"-check.BuildUrl: $flywayCheckBuildUrl\"\nWrite-Host \"-check.failOnDrift: $flywayCheckFailOnDrift\"\nWrite-Host \"-snapshot.FileName OR check.DeployedSnapshot: $flywaySnapshotFileName\"\nWrite-Host \"Additional Arguments: $flywayAdditionalArguments\"\nWrite-Host \"placeHolders: $flywayPlaceHolders\"\nWrite-Host \"*******************************************\"\n\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nWrite-Host \"Setting execution location to: $flywayPackagePath\"\nSet-Location $flywayPackagePath\n\n$flywayCmd = Get-FlywayExecutablePath -providedPath $flywayExecutablePath\n\n$commandToUse = $flywayCommand\nif ($flywayCommand -eq \"migrate dry run\")\n{\n\t$commandToUse = \"migrate\"\n}\n\nif ($flywayCommand -eq \"check dry run\" -or $flywayCommand -eq \"check changes\" -or $flywayCommand -eq \"check drift\")\n{\n\t$commandToUse = \"check\"\n}\n\n$arguments = @(\n\t$commandToUse    \n)\n\nif ($flywayCommand -eq \"check dry run\")\n{\n\t$arguments += \"-dryrun\"\n}\n\nif ($flywayCommand -eq \"check changes\")\n{\n\t$arguments += \"-changes\"\n    $arguments += \"-dryrun\"\n}\n\nif ($flywayCommand -eq \"check drift\")\n{\n\t$arguments += \"-drift\"\n}\n\n# Deteremine authentication method\nswitch ($flywayAuthenticationMethod)\n{\n\t\"awsiam\"\n    {\n\t\t# Check to see if OS is Windows and running in a container\n        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)\n        {\n        \tthrow \"IAM Role authentication is not supported in a Windows container.\"\n        }\n\n\t\t# Get parsed connection string url\n        $parsedUrl = Get-ParsedUrl -ConnectionUrl $flywayUrl\n        \n        # Region is part of the RDS endpoint, extract\n        $region = ($parsedUrl.Host.Split(\".\"))[2]\n\n\t\tWrite-Host \"Generating AWS IAM token ...\"\n\t\t$flywayUserPassword = (aws rds generate-db-auth-token --hostname $parsedUrl.Host --region $region --port $parsedUrl.Port --username $flywayUser)\n\n\t\t$arguments += \"-user=`\"$flywayUser`\"\"\n    \t$arguments += \"-password=`\"$flywayUserPassword`\"\"\n\n\t\tbreak\n    }\n\t\"azuremanagedidentity\"\n    {\n\t\t# Check to see if OS is Windows and running in a container\n        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)\n        {\n        \tthrow \"Azure Managed Identity is not supported in a Windows container.\"\n        }\n        \n        # SQL Server driver doesn't assign password\n        if (!$flywayUrl.ToLower().Contains(\"jdbc:sqlserver:\"))\n        {        \n          # Get login token\n          Write-Host \"Generating Azure Managed Identity token ...\"\n          $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"} -UseBasicParsing\n\n          $flywayUserPassword = $token.access_token\n          $arguments += \"-password=`\"$flywayUserPassword`\"\"\n          $arguments += \"-user=`\"$flywayUser`\"\"\n        }\n        else\n        {\n            \n\t\t\t# Check to see if the querstring parameter for Azure Managed Identity is present\n            if (!$flywayUrl.ToLower().Contains(\"authentication=activedirectorymsi\"))\n            {\n                # Add the authentication piece to the jdbc url\n                if (!$flywayUrl.EndsWith(\";\"))\n                {\n                \t# Add the separator\n                    $flywayUrl += \";\"\n                }\n                \n                # Add authentication piece\n                $flywayUrl += \"Authentication=ActiveDirectoryMSI\"\n            }\n        }\n        \n        break\n    }\n    \"gcpserviceaccount\"\n    {\n\t\t# Check to see if OS is Windows and running in a container\n        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)\n        {\n        \tthrow \"GCP Service Account authentication is not supported in a Windows container.\"\n        }\n    \n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header -UseBasicParsing\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object {$_.ToLower().Contains(\"iam.gserviceaccount.com\") }\n\n\t\tWrite-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header -UseBasicParsing\n        \n        $flywayUserPassword = $token.access_token\n        \n        $arguments += \"-user=`\"$flywayUser`\"\"\n        $arguments += \"-password=`\"$flywayUserPassword`\"\"\n        #$env:FLYWAY_PASSWORD = $flywayUserPassword\n        \n        break\n    }   \n    \"usernamepassword\"\n    {\n    \t# Add password\n        Write-Host \"Testing for parameters that can be applied to any command\"\n        if (Test-AddParameterToCommandline -parameterValue $flywayUser -acceptedCommands \"any\" -selectedCommand $flywayCommand -parameterName \"-user\")\n        {\n            Write-Host \"User provided, adding user and password command line argument\"\n            $arguments += \"-user=`\"$flywayUser`\"\"\n            $arguments += \"-password=`\"$flywayUserPassword`\"\"\n        }\n        \n        break\n    }\n    \"windowsauthentication\"\n    {\n    \t# Display to the user they've selected windows authentication.  Though this is dictated by the jdbc url, this is added to make sure the user knows that's what is\n        # being used\n        Write-Host \"Using Windows Authentication\"\n        \n        # Check for integratedauthentication=true in url\n        if (!$flywayUrl.ToLower().Contains(\"integratedsecurity=true\"))\n        {\n        \t# Check to see if the connection url ends with a ;\n            if (!$flywayUrl.EndsWith(\";\"))\n            {\n            \t# Add the ;\n                $flywayUrl += \";\"\n            }\n            \n            $flywayUrl += \"integratedSecurity=true;\"\n        }\n        break\n    }\n}\n\n$arguments += \"-url=`\"$flywayUrl`\"\"\n$arguments += \"-locations=`\"$flywayLocations`\"\"\n\nif (Test-AddParameterToCommandline -parameterValue $flywaySchemas -acceptedCommands \"any\" -selectedCommand $flywayCommand -parameterName \"-schemas\")\n{\n\tWrite-Host \"Schemas provided, adding schemas command line argument\"\n\t$arguments += \"-schemas=`\"$flywaySchemas`\"\"    \n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayLicenseKey -acceptedCommands \"any\" -selectedCommand $flywayCommand -parameterName \"-licenseKey\")\n{\n\tWrite-Host \"License key provided, adding -licenseKey command line argument\"\n    Write-Host \"*****WARNING***** Use of the License Key has been deprecated by Redgate and will be removed in future versions, use the Personal Access Token method instead.\"\n\t$arguments += \"-licenseKey=`\"$flywayLicenseKey`\"\"                  \n}\n\nif (![string]::IsNullOrWhiteSpace($flywayLicenseEmail) -and ![string]::IsNullOrWhiteSpace($flywayLicensePAT))\n{\n    if (Test-AddParameterToCommandline -parameterValue $flywayLicensePAT -acceptedCommands \"any\" -selectedCommand $flywayCommand -parameterName \"-token\")\n    {\n        Write-Host \"Personal Access Token provided, adding -email and -token command line arguments\"\n        $arguments += @(\"-email=`\"$flywayLicenseEmail`\"\", \"-token=`\"$flywayLicensePAT`\"\")\n    }\n}\n\nWrite-Host \"Finished testing for parameters that can be applied to any command, moving onto command specific parameters\"\n\nif (Test-AddParameterToCommandline -parameterValue $flywayCherryPick -acceptedCommands \"migrate,info,validate,check\" -selectedCommand $flywayCommand -parameterName \"-cherryPick\")\n{\n\tWrite-Host \"Cherry pick provided, adding cherry pick command line argument\"\n\t$arguments += \"-cherryPick=`\"$flywayCherryPick`\"\"    \n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayOutOfOrder -defaultValue \"false\" -acceptedCommands \"migrate,info,validate,check\" -selectedCommand $commandToUse -parameterName \"-outOfOrder\")\n{\n\tWrite-Host \"Out of order is not false, adding out of order command line argument\"\n\t$arguments += \"-outOfOrder=`\"$flywayOutOfOrder`\"\"    \n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayPlaceHolders -acceptedCommands \"migrate,info,validate,undo,repair,check\" -selectedCommand $commandToUse -parameterName \"-placeHolders\")\n{\n\tWrite-Host \"Placeholder parameter provided, adding them to the command line arguments\"\n    \n    $placeHolderValueList = @(($flywayPlaceHolders -Split \"`n\").Trim())\n    foreach ($placeHolder in $placeHolderValueList)\n    {\n    \t$placeHolderSplit = $placeHolder -Split \"::\"\n        $placeHolderKey = $placeHolderSplit[0]\n        $placeHolderValue = $placeHolderSplit[1]\n        Write-Host \"Adding -placeHolders.$placeHolderKey = $placeHolderValue to the argument list\"\n        \n        $arguments += \"-placeholders.$placeHolderKey=`\"$placeHolderValue`\"\"    \n    }   \t\n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayTarget -acceptedCommands \"migrate,info,validate,undo,check\" -selectedCommand $commandToUse -parameterName \"-target\")\n{\n\tWrite-Host \"Target provided, adding target command line argument\"\n\n\tif ($flywayTarget.ToLower().Trim() -eq \"latest\" -and $flywayCommand -eq \"undo\")\n\t{\n\t\tWrite-Host \"The current target is latest, but the command is undo, changing the target to be current\"\n\t\t$flywayTarget = \"current\"\n\t}\n\n\t$arguments += \"-target=`\"$flywayTarget`\"\"    \n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywaySkipExecutingMigrations -defaultValue \"false\" -acceptedCommands \"migrate\" -selectedCommand $flywayCommand -parameterName \"-skipExecutingMigrations\")\n{\n\tWrite-Host \"Skip executing migrations is not false, adding skip executing migrations command line argument\"\n\t$arguments += \"-skipExecutingMigrations=`\"$flywaySkipExecutingMigrations`\"\"    \n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayBaselineOnMigrate -defaultValue \"false\" -acceptedCommands \"migrate\" -selectedCommand $flywayCommand -parameterName \"-baselineOnMigrate\")\n{\n\tWrite-Host \"Baseline on migrate is not false, adding the baseline on migrate argument\"\n\t$arguments += \"-baselineOnMigrate=`\"$flywayBaselineOnMigrate`\"\"    \n    \n    if (Test-AddParameterToCommandline -parameterValue $flywayBaselineVersion -acceptedCommands \"migrate\" -selectedCommand $flywayCommand -parameterName \"-baselineVersion\")\n    {\n    \tWrite-Host \"Baseline version has been specified, adding baseline version argument\"\n\t\t$arguments += \"-baselineVersion=`\"$flywayBaselineVersion`\"\"  \n    }\n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayBaselineVersion -acceptedCommands \"baseline\" -selectedCommand $flywayCommand -parameterName \"-baselineVersion\")\n{\n\tWrite-Host \"Doing a baseline, adding baseline version and description\"\n\t$arguments += \"-baselineVersion=`\"$flywayBaselineVersion`\"\"    \n    $arguments += \"-baselineDescription=`\"$flywayBaselineDescription`\"\"    \n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayInfoSinceDate -acceptedCommands \"info\" -selectedCommand $flywayCommand -parameterName \"-infoSinceDate\")\n{\n\tWrite-Host \"Info since date has been provided, adding that to the command line arguments\"\n\t$arguments += \"-infoSinceDate=`\"$flywayInfoSinceDate`\"\"\n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayInfoSinceVersion -acceptedCommands \"info\" -selectedCommand $flywayCommand -parameterName \"-infoSinceVersion\")\n{\n\tWrite-Host \"Info since version has been provided, adding that to the command line arguments\"\n\t$arguments += \"-infoSinceVersion=`\"$flywayInfoSinceVersion`\"\"\n} \n\nif (Test-AddParameterToCommandline -parameterValue $flywaySnapshotFileName -acceptedCommands \"snapshot\" -selectedCommand $commandToUse -parameterName \"-snapshot.filename\")\n{\n\tWrite-Host \"Snapshot filename has been provided, adding that to the command line arguments\"\n    $folderName = Split-Path -Parent $flywaySnapshotFileName\n    if ((test-path $folderName) -eq $false)\n    {\n    \tNew-Item $folderName -ItemType Directory\n    }\n    $arguments += \"-snapshot.filename=`\"$flywaySnapshotFileName`\"\"\n}\n\n$snapshotFileNameforCheckProvided = $false\nif (Test-AddParameterToCommandline -parameterValue $flywaySnapshotFileName -acceptedCommands \"check\" -selectedCommand $commandToUse -parameterName \"-check.deployedSnapshot\")\n{\n\tWrite-Host \"Snapshot filename has been provided for the check command, adding that to the command line arguments\"\n    $folderName = Split-Path -Parent $flywaySnapshotFileName\n    if ((test-path $folderName) -eq $false)\n    {\n    \tNew-Item $folderName -ItemType Directory\n    }\n    $arguments += \"-check.deployedSnapshot=`\"$flywaySnapshotFileName`\"\"\n    $snapshotFileNameforCheckProvided = $true\n}\n\nif ((Test-AddParameterToCommandline -parameterValue $flywayCheckBuildUrl -acceptedCommands \"check\" -selectedCommand $commandToUse -parameterName \"-check.buildUrl\") -eq $true -and $snapshotFileNameforCheckProvided -eq $false)\n{\n\tWrite-Host \"Check build URL has been provided, adding that to the command line arguments\"\n\t$arguments += \"-check.buildUrl=`\"$flywayCheckBuildUrl`\"\"\n}\n\nWrite-Host \"Checking to see if the check username and password were supplied\"\nif ((Test-AddParameterToCommandline -parameterValue $flywayCheckBuildUsername -acceptedCommands \"check\" -selectedCommand $commandToUse -parameterName \"-user\")  -eq $true -and $snapshotFileNameforCheckProvided -eq $false)\n{\n\tWrite-Host \"Check User provided, adding check user and check password command line argument\"\n\t$arguments += \"-check.buildUser=`\"$flywayCheckBuildUsername`\"\"\n\t$arguments += \"-check.buildPassword=`\"$flywayCheckBuildPassword`\"\"\n}\n\nif (Test-AddParameterToCommandline -parameterValue $flywayCheckFailOnDrift -acceptedCommands \"check drift\" -selectedCommand $flywayCommand -parameterName \"-check.failOnDrift\")\n{\n\tWrite-Host \"Doing a check drift command, adding the fail on drift\"\n\t$arguments += \"-check.failOnDrift=`\"$flywayCheckFailOnDrift`\"\"\n}\n\n\nWrite-Host \"Finished checking for command specific parameters, moving onto execution\"\n$dryRunOutputFile = \"\"\n\nif ($flywayCommand -eq \"migrate dry run\")\n{\n\t$dryRunOutputFile = Join-Path $(Get-Location) \"dryRunOutput\"\n    Write-Host \"Adding the argument dryRunOutput so Flyway will perform a dry run and not an actual migration.\"\n    $arguments += \"-dryRunOutput=`\"$dryRunOutputFile`\"\"\n}\n\n# Check to see if there's any additional arguments to add\nif (![string]::IsNullOrWhitespace($flywayAdditionalArguments))\n{\n\t# Split on space\n    $flywayAdditionalArgumentsArray = ($flywayAdditionalArguments.Split(\" \", [System.StringSplitOptions]::RemoveEmptyEntries))\n\n    # Loop through array\n    foreach ($newArgument in $flywayAdditionalArgumentsArray)\n    {\n    \t# Add the arguments\n    \t$arguments += $newArgument\n    }\n}\n\n# Display what's going to be run\nif (![string]::IsNullOrWhitespace($flywayUserPassword))\n{\n    $flywayDisplayArguments = $arguments.PSObject.Copy()\n    $arrayIndex = 0\n    for ($i = 0; $i -lt $flywayDisplayArguments.Count; $i++)\n    {\n        if ($null -ne $flywayDisplayArguments[$i])\n        {\n            if ($flywayDisplayArguments[$i].Contains($flywayUserPassword))\n            {\n                $flywayDisplayArguments[$i] = $flywayDisplayArguments[$i].Replace($flywayUserPassword, \"****\")\n            }\n        }\n    }\n\n    Write-Host \"Executing the following command: $flywayCmd $flywayDisplayArguments\"\n}\nelse\n{\n    Write-Host \"Executing the following command: $flywayCmd $arguments\"\n}\n\n# Attempt to find driver path for java\n$driverPath = (Get-ChildItem -Path (Get-ChildItem -Path $flywayCmd).Directory -Recurse | Where-Object {$_.PSIsContainer -eq $true -and $_.Name -eq \"drivers\"})\n\n# If found, add driver path to the PATH environment varaible\nif ($null -ne $driverPath)\n{\n\t$env:PATH += \"$([IO.Path]::PathSeparator)$($driverPath.FullName)\"\n}\n\n# Adjust call to flyway command based on OS\nif ($IsLinux)\n{\n    & bash $flywayCmd $arguments\n}\nelse\n{\n    & $flywayCmd $arguments\n}\n\n# Check exit code\nif ($lastExitCode -ne 0)\n{\n\t# Fail the step\n    Write-Error \"Execution of Flyway failed!\"\n}\n\n$currentDate = Get-Date\n$currentDateFormatted = $currentDate.ToString(\"yyyyMMdd_HHmmss\")\n\n# Check to see if the dry run variable has a value\nif (![string]::IsNullOrWhitespace($dryRunOutputFile))\n{     \n    $sqlDryRunFile = \"$($dryRunOutputFile).sql\"\n    $htmlDryRunFile = \"$($dryRunOutputFile).html\"\n    \n    if (Test-Path $sqlDryRunFile)\n    {\n    \tNew-OctopusArtifact -Path $sqlDryRunFile -Name \"$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted)_dryRunOutput.sql\"\n    }\n    \n    if (Test-Path $htmlDryRunFile)\n    {\n    \tNew-OctopusArtifact -Path $htmlDryRunFile -Name \"$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted)_dryRunOutput.html\"\n    }\n}\n\n$reportFile = Join-Path $(Get-Location) \"report.html\"\n    \nif (Test-Path $reportFile)\n{\n  \tNew-OctopusArtifact -Path $reportFile -Name \"$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted)_report.html\"\n}",
-    "Octopus.Action.PowerShell.Edition": "Core",
-    "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows"
-  },
-  "Parameters": [
-    {
-      "Id": "a4ba9557-61d3-4d93-99d9-9937abaded9c",
-      "Name": "Flyway.Package.Value",
-      "Label": "Flyway Package",
-      "HelpText": "**Required**\n\nThe package containing the migration scripts you want Flyway to run.  Please refer to [documentation](https://flywaydb.org/documentation/concepts/migrations) for core concepts and naming conventions.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "02d50d4c-02f9-44c2-8ee0-3fc69a21a165",
-      "Name": "Flyway.Executable.Path",
-      "Label": "Flyway Executable Path",
-      "HelpText": "**Optional**\n\nThe path of the flyway executable.  It can either be a relative path or an absolute path.\n\nWhen not provided, this step template will test for the following.  The step template places precedence on the version of the flyway included in the package. If Flyway is NOT found in the package, it will attempt to see if it is installed on the server by checking common paths.\n\nRunning on `Linux`:\n- `.flyway`: the package being deployed includes flyway and is running on Linux\n- `/flyway/flyway`: The default path for the Linux execution container.\n\nRunning on Windows:\n- `\\.flyway.cmd`: the package being deployed includes flyway and is running on Windows\n- `flyway`: the package is in the path on the Windows VM or Windows Execution container.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6e6e98ae-7e57-4bf7-a280-7c4a6bc57760",
-      "Name": "Flyway.Command.Value",
-      "Label": "Flyway Command",
-      "HelpText": "**Required**\n\nThe [flyway command](https://flywaydb.org/documentation/usage/commandline/) you wish to run.\n\n- `Migrate`: Migrates the schema to the latest version\n- `Migrate Dry Run`: Does a migration dry run and saves the results to a file that is uploaded as an artifact.  This works for the `Teams` version of Flyway only.\n- `Check Changes`: Produces a report indicating differences between applied migration scripts on your target database and pending migrations scripts (ie. the set of instructions you want to use to change your target database).  This will report on the differences and perform a dry-run migration.  Check Redgate's documentation to ensure your server technology is supported.  Available to `Enterprise` licenses only.\n- `Check Drift`: Produces a report indicating differences between the structure of your target database and the structure created by the migrations applied by Flyway. Available to `Enterprise` licenses only.\n- `Check Dry Run`: Produces a report listing out the migration scripts to run.  Use this to perform a dry run check or if you have a `Teams` license.\n- `Info`: Prints the details and status information about all migrations.  \n- `Validate`: Validates applied migrations against resolved ones (on the filesystem or classpath) to detect accidental changes that may prevent the schema(s) from being recreated precisely.\n- `Undo`: Undoes the most recently applied versioned migration.  You must provide a Flyway `Teams` or `Enterprise` license key for this to work.\n- `Repair`: Repairs the Flyway schema history table by removing any failed migrations and realigning the checksums, descriptions and types of the applied migrations with the ones of the available migrations\n- `Clean`: It will effectively give you a fresh start, by wiping your configured schemas completely clean. All objects (tables, views, procedures, …) will be dropped.  **DO NOT USE AGAINST A PRODUCTION DB!!!**\n- `Baseline`:  Introducing Flyway to existing databases by baselining them at a specific version. This will cause Migrate to ignore all migrations up to and including the baseline version. Newer migrations will then be applied as usual.\n- `Snapshot`: Creates a file containing the schema of the specified database for subsequent use with the `Check Drift` option.  Available to `Enterprise` licenses only.\n",
-      "DefaultValue": "migrate",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "migrate|Migrate\nmigrate dry run|Migrate Dry Run\ncheck changes|Check Changes\ncheck drift|Check Drift\ncheck dry run|Check Dry Run\ninfo|Info\nvalidate|Validate\nundo|Undo\nrepair|Repair\nclean|Clean\nbaseline|Baseline\nsnapshot|Snapshot"
-      }
-    },
-    {
-      "Id": "e648821f-221c-4b8b-85fb-654f0d7379c5",
-      "Name": "Flyway.License.Key",
-      "Label": "License Key (deprecated)",
-      "HelpText": "**Optional**\n\nThe [Flyway Teams](https://flywaydb.org/download) or `Enterprise` license key will enable undo functionality and the ability to dry run a migration.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "99b59d45-5f58-4d04-b4b1-6ccfeda42136",
-      "Name": "Flyway.Email.Address",
-      "Label": "Email address",
-      "HelpText": "The email address associated with the Personal Access Token (PAT).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7fb0cb33-950f-47f5-8678-323e62c90770",
-      "Name": "Flyway.PersonalAccessToken",
-      "Label": "Personal Access Token (PAT)",
-      "HelpText": "The Personal Access Token (PAT) to authenticate with for Enterprise features.  \n\nReplaces the License Key.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "bb9d99ac-96b4-4d46-ae8f-87e5a7214278",
-      "Name": "Flyway.Target.Url",
-      "Label": "-Url",
-      "HelpText": "**Required**\n\nThe [URL](https://flywaydb.org/documentation/configuration/parameters/url) parameter used in Flyway.  This is the URL of the database to run the migration scripts on in the format specified in the default flyway.conf file.\n\nExamples:\n- SQL Server: `jdbc:sqlserver://host:port;databaseName=database`\n- Oracle: `jdbc:oracle:thin:@//host:port/service` or `jdbc:oracle:thin:@tns_entry`\n- MySQL: `jdbc:mysql://host:port/database`\n- PostgreSQL: `jdbc:postgresql://host:port/database`\n- SQLite: `jdbc:sqlite:database`\n\nPlease refer to [documentation](https://flywaydb.org/documentation/database/sqlserver) for further examples.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e9dccda1-4045-4e8e-b93e-4fac8d66630a",
-      "Name": "Flyway.Authentication.Method",
-      "Label": "Authentication Method",
-      "HelpText": "Method used to authenticate to the database server.",
-      "DefaultValue": "usernamepassword",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-      }
-    },
-    {
-      "Id": "e1cb49a8-b965-4827-9f8e-01724d263541",
-      "Name": "Flyway.Database.User",
-      "Label": "-User",
-      "HelpText": "**Optional**\n\nThe [user](https://flywaydb.org/documentation/configuration/parameters/user) used to connect to the database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "51fab335-82b2-4e58-8d4a-e2640ba66296",
-      "Name": "Flyway.Database.User.Password",
-      "Label": "-Password",
-      "HelpText": "**Optional**\n\nThe [password](https://flywaydb.org/documentation/configuration/parameters/password) used to connect to the database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "f8787222-c404-47ca-9f0f-32fad6c656e7",
-      "Name": "Flyway.Command.Schemas",
-      "Label": "-Schemas",
-      "HelpText": "**Optional**\n\nComma-separated case-sensitive list of [schemas](https://flywaydb.org/documentation/configuration/parameters/schemas) managed by Flyway. \n\nExample: `schema1,schema2`\n\nFlyway will attempt to create these schemas if they do not already exist and will clean them in the order of this list. If Flyway created them, then the schemas themselves will be dropped when cleaning.\n\nThe first schema in the list will act as the default schema.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "27a4fafe-8e8b-4d6d-b25a-0953535ef2c9",
-      "Name": "Flyway.Command.Target",
-      "Label": "-Target",
-      "HelpText": "**Optional** for `migrate`, `info`, `validate`, `check`, and `undo`.  **Ignored** for all other commands\n\nThe [target version](https://flywaydb.org/documentation/configuration/parameters/target) up to which Flyway should consider migrations. If set to a value other than current or latest, this must be a valid migration version (e.g. `2.1`).\n\nWhen migrating forwards, Flyway will apply all migrations up to and including the target version. Migrations with a higher version number will be ignored. If the target is `current`, then no versioned migrations will be applied but repeatable migrations will be, together with any callbacks.\n\nWhen undoing migrations, Flyway will apply all undo scripts up to and including the target version. Undo scripts with a lower version number will be ignored. Specifying a target version should be done with care, as undo scripts typically destroy database objects.\n\nSpecial Values:\n- `current`: designates the current version of the schema\n- `latest`: the latest version of the schema, as defined by the migration with the highest version\n\nDefault is: `latest`.  When running the `undo` command, this will switch to `current` if `latest` is supplied.",
-      "DefaultValue": "latest",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1b0b700e-6686-4474-a630-8a89aea9b1d5",
-      "Name": "Flyway.Command.CherryPick",
-      "Label": "-CherryPick",
-      "HelpText": "**Optional** for `migrate`, `info`, `check`, and `validate`.  **Ignored** for all other commands.\n\nA Comma separated list of migrations that Flyway should consider when migrating, undoing, or repairing. Migrations are considered in the order that they are supplied, overriding the default ordering. Leave blank to consider all discovered migrations.\n\nEach item in the list must either be a valid migration version (e.g `2.1`) or a valid migration description (e.g. `create_table`).\n\nSee [documentation](https://flywaydb.org/documentation/configuration/parameters/cherryPick) for more details.\n\nThe default is an empty string, meaning this command-line argument will be skipped.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "79a5ed66-eae8-4b0b-89fa-5da10850bb8d",
-      "Name": "Flyway.Command.OutOfOrder",
-      "Label": "-OutOfOrder",
-      "HelpText": "**Optional** for `migrate`, `info`, `check`, and `validate`.  **Ignored** for all other commands.\n\nAllows migrations to be run “out of order”.\n\nIf you already have versions `1.0` and `3.0` applied, and now a version `2.0` is found, it will be applied too instead of being ignored.\n\nSee [documentation](https://flywaydb.org/documentation/configuration/parameters/outOfOrder) for more details.\n\nThe default is `False`.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "true|True\nfalse|False"
-      }
-    },
-    {
-      "Id": "1d234d38-35d7-4b5e-a3fb-7ed81fa41d46",
-      "Name": "Flyway.Command.SkipExecutingMigrations",
-      "Label": "-SkipExecutingMigrations",
-      "HelpText": "**Optional** for `migrate`.  **Ignored** for all other commands.\n\nWhether Flyway should skip migration execution. The remainder of the operation will run as normal - including updating the schema history table, callbacks, and so on.\n\n`skipExecutingMigrations` essentially allows you to mimic a migration being executed, because the schema history table is still updated as normal.\n\n`skipExecutingMigrations` can be used to bring an out-of-process change into Flyway’s change control process. For instance, a script run against the database outside of Flyway (like a hotfix) can be turned into a migration. The hotfix migration can be deployed with Flyway with `skipExecutingMigrations=true`. The schema history table will be updated with the new migration, but the script itself won’t be executed again.\n\n`skipExecutingMigrations` can be used with cherryPick to skip specific migrations.\n\nSee [documentation](https://flywaydb.org/documentation/configuration/parameters/skipExecutingMigrations) for more details.\n\nThe default value is `False`.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "true|True\nfalse|False"
-      }
-    },
-    {
-      "Id": "7e00397a-e18e-44b8-bb4d-e89b7c70d760",
-      "Name": "Flyway.Command.PlaceHolders",
-      "Label": "-PlaceHolders",
-      "HelpText": "**Optional** for `migrate`, `info`, `validate`, `undo`, `check`, and `repair`.  **Ignored** for all other commands.\n\n[Placeholders](https://flywaydb.org/documentation/configuration/placeholder) to replace in SQL migrations.\n\nEach new line represents a new placeholder.  This will only work with string variable types, text and sensitive values.    \n\nImagine this SQL Script\n\n```\nINSERT INTO ${Key1} (name) VALUES ('Mr. T')\nGRANT SELECT ON SCHEMA ${flyway:defaultSchema} TO ${Key2}\n```\n\nUse the format **Name::Value**  for example:\n\n```\nKey1::My Super Awesome Value\n\nKey2::Other Super Awesome Value\n```\n\nThis will replace `${Key1}` with `My Super Awesome Value` and `${Key2}` with `Other Super Awesome Value`.\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "3703d1da-1750-4c4f-89ba-04f5297ba0b9",
-      "Name": "Flyway.Command.InfoSinceDate",
-      "Label": "-InfoSinceDate",
-      "HelpText": "**Optional** with the `info` command and [Flyway Teams](https://flywaydb.org/documentation/usage/commandline/info#filtering-output) and Flyway Enterprise editions.  **Ignored** for all other commands.\n\nLimits info to show only migrations applied after this date, and any unapplied migrations. Must be in the format `dd/MM/yyyy HH:mm` (e.g. `01/12/2020 13:00`)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0bfecdcd-ad27-4908-949c-a54745aa85f0",
-      "Name": "Flyway.Command.InfoSinceVersion",
-      "Label": "-InfoSinceVersion",
-      "HelpText": "**Optional** with the `info` command and [Flyway Teams](https://flywaydb.org/documentation/usage/commandline/info#filtering-output) and Flyway Enterprise editions.  **Ignored** for all other commands.\n\nLimits info to show only migrations greater than or equal to this version, and any repeatable migrations. (e.g `1.1`)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4d4c2fc6-f4a4-4c68-bb79-9ef4d28e2f53",
-      "Name": "Flyway.Command.BaseLineOnMigrate",
-      "Label": "-baselineOnMigrate",
-      "HelpText": "**Optional** when using `migrate`.  **Ignored** for all other commands.\n\nWhether to automatically call baseline when migrate is executed against a non-empty schema with no metadata table. This schema will then be baselined with the baselineVersion before executing the migrations. Only migrations above baselineVersion will then be applied.\n\nThis is useful for initial Flyway production deployments on projects with an existing DB.\n\nBe careful when enabling this as it removes the safety net that ensures Flyway does not migrate the wrong database in case of a configuration mistake!",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "true|True\nfalse|False"
-      }
-    },
-    {
-      "Id": "f7e23a32-73a8-4118-8996-354d48f176cb",
-      "Name": "Flyway.Command.BaselineVersion",
-      "Label": "-baselineVersion",
-      "HelpText": "**Required** when using `Baseline` or when `BaselineOnMigrate` is set to `True`.  **Ignored** for all other commands.\n\nThe version to tag an existing schema with when executing [baseline](https://flywaydb.org/documentation/command/baseline).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c8a118ef-bdc4-4e2f-966b-596662321d1c",
-      "Name": "Flyway.Command.BaselineDescription",
-      "Label": "-baseLineDescription",
-      "HelpText": "**Required** when using `Baseline`.  **Ignored** for all other commands.\n\nThe Description to tag an existing schema with when executing [baseline](https://flywaydb.org/documentation/command/baseline).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d3bbe139-2bd4-4242-be70-a6f05510042b",
-      "Name": "Flyway.Command.Locations",
-      "Label": "-Locations",
-      "HelpText": "**Optional** with the `info`,  `migrate`, `repair`, `undo`, `check`, and `validate` commands. \n\nSpecifies the location of the script files to execute.  If left blank, the `Extracted Path` of the package will be used.\n\nExample: filesystem:`#{Octopus.Action.Package[Flyway.Package.Value].ExtractedPath}/MySubFolder`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "57611c50-3f3f-4a9d-a6c4-02517d2f238e",
-      "Name": "Flyway.Command.CheckBuildUrl",
-      "Label": "-check.BuildUrl",
-      "HelpText": "**Required** when using `Check Changes` or `Check Drift` commands and `-snapshot.FileName` is empty.  \n\n**Please Note:** When `-snapshot.FileName` is not empty, this parameter is ignored.\n\nFlyway uses the URL to an existing database as a temporary database to perform the check logic against.  Flyway will clean this database, so if you specify a full database, you must ensure it is okay for Flyway to erase its schema.\n\nExamples:\n- SQL Server: `jdbc:sqlserver://host:port;databaseName=database`\n- Oracle: `jdbc:oracle:thin:@//host:port/service` or `jdbc:oracle:thin:@tns_entry`\n- MySQL: `jdbc:mysql://host:port/database`\n- PostgreSQL: `jdbc:postgresql://host:port/database`\n- SQLite: `jdbc:sqlite:database`\n\nPlease refer to [documentation](https://flywaydb.org/documentation/database/sqlserver) for further examples.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b52238f0-a7e6-4cfa-851f-f1f9fdb70c65",
-      "Name": "Flyway.Database.Check.User",
-      "Label": "-check.BuildUser",
-      "HelpText": "**Optional**\n\nThe username of the user for the build database.  Use this if the build database needs a separate username and password from the authentication information supplied above.\n\n**Please Note:** When `-snapshot.FileName` is not empty, this parameter is ignored.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "14f7c856-6ca2-4319-84b3-e96a40d65c10",
-      "Name": "Flyway.Database.Check.User.Password",
-      "Label": "-check.BuildPassword",
-      "HelpText": "**Optional**\n\nThe password of the user for the build database.  Use this if the build database needs a separate username and password from the authentication information supplied above.\n\n**Please Note:** When `-snapshot.FileName` is not empty, this parameter is ignored.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "4bcdced9-2397-4423-bdc2-776ff80f78f3",
-      "Name": "Flyway.Command.FailOnDrift",
-      "Label": "-check.failOnDrift",
-      "HelpText": "**Required** when using `Check Drift`.  Ignored for all other commands.\n\nIndicates if Flyway will terminate with a non-zero return code if drift is detected.  When using `Check Drift` with a snapshot and you want to see the changes, set this to `false`",
-      "DefaultValue": "true",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "true|True\nfalse|False"
-      }
-    },
-    {
-      "Id": "22bb9c1b-1ce4-4f63-b618-d642c804d3ac",
-      "Name": "Flyway.Command.Snapshot.FileName",
-      "Label": "-snapshot.FileName",
-      "HelpText": "**Required** when using `Snapshot`.  **Optional** when using the `Check Drift` command.  **Ignored** for all other commands.\n\nThe name, including the path, of the snapshot file to create or use.  \n\nIf this parameter is populated the `-check.BuildUser`, `check.BuildPassword`, and `-check.BuildUrl` parameters are all ignored.\n\n**Hint:** If executing this step in an execution container, consider `../../../` as the path prefix as the script will execute in `/etc/octopus/default/Work/[Random Folder Name]/Flyway.Package.Value`.  `/etc/octopus/default` is mounted as a volume.  Or leverage a NAS or other file share.\n\n**Important:** You will need this file for future steps. It must be stored in a non-temporary location.  By default, Octopus runs this script in a temporary location on a worker.  That location is deleted automatically once this step is complete.  If you do not supply a path, the file will be deleted.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ff9a4e49-d3f0-45ff-891a-3e5f6b72806d",
-      "Name": "Flyway.Additional.Arguments",
-      "Label": "Additional arguments",
-      "HelpText": "Any additional arguments that need to be passed (ie `-table=\"MyTable\")",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2024-10-28T15:04:11.309Z",
-    "OctopusVersion": "2024.3.12899",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "flyway"
-}
diff --git a/step-templates/flyway-state-based-migration.json b/step-templates/flyway-state-based-migration.json
deleted file mode 100644
index c584ab08f..000000000
--- a/step-templates/flyway-state-based-migration.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "Id": "67a28755-049e-4cec-b45c-3e5047350d8d",
-  "Name": "Flyway State Based Migration",
-  "Description": "Step template to leverage Flyway to deploy migration scripts.  This is the latest and greatest Flyway step template that leverages all the newest features of both Flyway and Octopus Deploy.\n\n- You can include the flyway executables in your package, if you include the `flyway` (Linux) or `flyway.cmd` (Windows) in the root of the package this step template will automatically find them.\n- You can use this with an execution container, negating the need to include Flyway in the package. If Flyway isn't found in the package it will attempt to find `/flyway/flyway` (when using Linux containers) or `flyway` in the environment path and use that.\n- Support for Flyway State Based commands, including the `undo` command.\n- Support for flyway community, teams, enterprise, and pro editions.  \n\nPlease note this requires Octopus Deploy **2019.10.0** or newer along with PowerShell Core installed on the machines running this step.\nAWS EC2 IAM Authentication requires the AWS CLI to be installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "0c0d333c-d794-4a16-a3a2-4bbba4550763",
-      "Name": "Flyway.Package.Value",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Flyway.Package.Value"
-      }
-    }
-  ],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$VerboseActionPreference=\"Continue\"\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\nfunction Get-FlywayExecutablePath\n{\n\tparam (\n    \t$providedPath\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($providedPath) -eq $false)\n    {\n    \tWrite-Host \"The executable path was provided, testing to see if it is absolute or relative\"\n\t\tif ([IO.Path]::IsPathRooted($providedPath))\n        {\n        \tWrite-Host \"The provided path is absolute, using that\"\n            \n        \treturn $providedPath\n        }\n        \n        Write-Host \"The provided path was relative, combining $(Get-Location) with $providedPath\"\n        return Join-Path $(Get-Location) $providedPath\n    }\n    \n    Write-Host \"Checking to see if we are currently running on Linux\"\n    if ($IsLinux)    \n    {\n    \tWrite-Host \"Currently running on Linux\"\n    \tWrite-Host \"Checking to see if flyway was included with the package\"\n    \tif (Test-Path \"./flyway\")\n        {\n        \tWrite-Host \"It was, using that version of flyway\"\n        \treturn \"flyway\"\n        }\n        \n        Write-Host \"Testing to see if we are on an execution container with /flyway/flyway as the path\"\n    \tif (Test-Path \"/flyway/flyway\")\n        {\n        \tWrite-Host \"We are, using /flyway/flyway\"\n        \treturn \"/flyway/flyway\"\n        }               \n    }\n    \n    Write-Host \"Currently running on Windows\"\n    \n    Write-Host \"Testing to see if flyway.cmd was included with the package\"\n    if (Test-Path \".\\flyway.cmd\")\n    {\n    \tWrite-Host \"It was, using that version.\"\n    \treturn \".\\flyway.cmd\"\n    }\n    \n    Write-Host \"Testing to see if flyway can be found in the env path\"\n    $flywayExecutable = (Get-Command \"flyway\" -ErrorAction SilentlyContinue)\n    if ($null -ne $flywayExecutable)\n    {\n    \tWrite-Host \"The flyway folder is part of the environment path\"\n        return $flywayExecutable.Source\n    }\n    \n    Fail-Step \"Unable to find flyway executable.  Please include it as part of the package, or provide the path to it.\"\n}\n\nfunction Get-ParsedUrl\n{\n\t# Define parameters\n    param (\n    \t$ConnectionUrl\n    )\n    \n    # Remove the 'jdbc:' portion from the $ConnectionUrl parameter\n    $ConnectionUrl = $ConnectionUrl.ToLower().Replace(\"jdbc:\", \"\")\n    \n    # Parse and return the url\n    return [System.Uri]$ConnectionUrl\n}\n\nfunction Execute-FlywayCommand\n{\n  # Define parameters\n  param(\n    $BinaryFilePath,\n    $CommandArguments\n  )\n\n  # Display what's going to be run\n  if (![string]::IsNullOrWhitespace($flywayUserPassword))\n  {\n      $flywayDisplayArguments = $CommandArguments.PSObject.Copy()\n      $arrayIndex = 0\n      for ($i = 0; $i -lt $flywayDisplayArguments.Count; $i++)\n      {\n        if ($null -ne $flywayDisplayArguments[$i])\n        {\n            if ($flywayDisplayArguments[$i].Contains($flywayUserPassword))\n            {\n                $flywayDisplayArguments[$i] = $flywayDisplayArguments[$i].Replace($flywayUserPassword, \"****\")\n            }\n        }\n    }\n\n    Write-Host \"Executing the following command: $flywayCmd $flywayDisplayArguments\"\n  }\n  else\n  {\n    Write-Host \"Executing the following command: $flywayCmd $arguments\"\n  }  \n\n  # Adjust call to flyway command based on OS\n  if ($IsLinux)\n  {\n    & bash $BinaryFilePath $CommandArguments\n  }\n  else\n  {\n    & $BinaryFilePath $CommandArguments\n  }  \n}\n\n# Declaring the path to the NuGet package\n$flywayPackagePath = $OctopusParameters[\"Octopus.Action.Package[Flyway.Package.Value].ExtractedPath\"]\n$flywayUrl = $OctopusParameters[\"Flyway.Target.Url\"]\n$flywayUser = $OctopusParameters[\"Flyway.Database.User\"]\n$flywayUserPassword = $OctopusParameters[\"Flyway.Database.User.Password\"]\n$flywayCommand = $OctopusParameters[\"Flyway.Command.Value\"]\n$flywayLicenseEmail = $OctopusParameters[\"Flyway.Email.Address\"]\n$flywayLicensePAT = $OctopusParameters[\"Flyway.PersonalAccessToken\"]\n$flywayExecutablePath = $OctopusParameters[\"Flyway.Executable.Path\"]\n$flywaySchemas = $OctopusParameters[\"Flyway.Command.Schemas\"]\n$flywayAuthenticationMethod = $OctopusParameters[\"Flyway.Authentication.Method\"]\n$flywayAdditionalArguments = $OctopusParameters[\"Flyway.Additional.Arguments\"]\n$flywayStepName = $OctopusParameters[\"Octopus.Action.StepName\"]\n$flywayEnvironment = $OctopusParameters[\"Octopus.Environment.Name\"]\n$flywayTargetSchema = $OctopusParameters[\"Flyway.Target.Schema\"]\n$flywaySourceSchema = $OctopusParameters[\"Flyway.Source.Schema.Model\"]\n$flywayExecuteInTransaction = $OctopusParameters[\"Flyway.Transaction\"]\n$flywayUndoScript = [System.Convert]::ToBoolean($OctopusParameters[\"Flyway.Generate.Undo\"])\n\n\n# Logging for troubleshooting\nWrite-Host \"*******************************************\"\nWrite-Host \"Logging variables:\"\nWrite-Host \" - - - - - - - - - - - - - - - - - - - - -\"\nWrite-Host \"PackagePath: $flywayPackagePath\"\nWrite-Host \"Flyway Executable Path: $flywayExecutablePath\"\nWrite-Host \"Flyway Command: $flywayCommand\"\nWrite-Host \"-url: $flywayUrl\"\nWrite-Host \"-user: $flywayUser\"\nWrite-Host \"-schemas: $flywaySchemas\"\nWrite-Host \"Source Schema Model: $flywaySourceSchema\"\nWrite-Host \"Target Schema: $flywayTargetSchema\"\nWrite-Host \"Execute in transaction: $flywayExecuteInTransaction\"\nWrite-Host \"Additional Arguments: $flywayAdditionalArguments\"\nWrite-Host \"Generate Undo script: $flywayUndoScript\"\nWrite-Host \"*******************************************\"\n\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nWrite-Host \"Setting execution location to: $flywayPackagePath\"\nSet-Location $flywayPackagePath\n\n$flywayCmd = Get-FlywayExecutablePath -providedPath $flywayExecutablePath\n\n$commandToUse = $flywayCommand\n\n$arguments = @()\n\n# Deteremine authentication method\nswitch ($flywayAuthenticationMethod)\n{\n\t\"awsiam\"\n    {\n\t\t# Check to see if OS is Windows and running in a container\n        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)\n        {\n        \tthrow \"IAM Role authentication is not supported in a Windows container.\"\n        }\n\n\t\t# Get parsed connection string url\n        $parsedUrl = Get-ParsedUrl -ConnectionUrl $flywayUrl\n        \n        # Region is part of the RDS endpoint, extract\n        $region = ($parsedUrl.Host.Split(\".\"))[2]\n\n\t\tWrite-Host \"Generating AWS IAM token ...\"\n\t\t$flywayUserPassword = (aws rds generate-db-auth-token --hostname $parsedUrl.Host --region $region --port $parsedUrl.Port --username $flywayUser)\n\n\t\t$arguments += \"-user=`\"$flywayUser`\"\"\n    \t$arguments += \"-password=`\"$flywayUserPassword`\"\"\n\n\t\tbreak\n    }\n\t\"azuremanagedidentity\"\n    {\n\t\t# Check to see if OS is Windows and running in a container\n        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)\n        {\n        \tthrow \"Azure Managed Identity is not supported in a Windows container.\"\n        }\n        \n        # SQL Server driver doesn't assign password\n        if (!$flywayUrl.ToLower().Contains(\"jdbc:sqlserver:\"))\n        {        \n          # Get login token\n          Write-Host \"Generating Azure Managed Identity token ...\"\n          $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"} -UseBasicParsing\n\n          $flywayUserPassword = $token.access_token\n          $arguments += \"-password=`\"$flywayUserPassword`\"\"\n          $arguments += \"-user=`\"$flywayUser`\"\"\n        }\n        else\n        {\n            \n\t\t\t# Check to see if the querstring parameter for Azure Managed Identity is present\n            if (!$flywayUrl.ToLower().Contains(\"authentication=activedirectorymsi\"))\n            {\n                # Add the authentication piece to the jdbc url\n                if (!$flywayUrl.EndsWith(\";\"))\n                {\n                \t# Add the separator\n                    $flywayUrl += \";\"\n                }\n                \n                # Add authentication piece\n                $flywayUrl += \"Authentication=ActiveDirectoryMSI\"\n            }\n        }\n        \n        break\n    }\n    \"gcpserviceaccount\"\n    {\n\t\t# Check to see if OS is Windows and running in a container\n        if ($IsWindows -and $env:DOTNET_RUNNING_IN_CONTAINER)\n        {\n        \tthrow \"GCP Service Account authentication is not supported in a Windows container.\"\n        }\n    \n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header -UseBasicParsing\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object {$_.ToLower().Contains(\"iam.gserviceaccount.com\") }\n\n\t\tWrite-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header -UseBasicParsing\n        \n        $flywayUserPassword = $token.access_token\n        \n        $arguments += \"-user=`\"$flywayUser`\"\"\n        $arguments += \"-password=`\"$flywayUserPassword`\"\"\n        #$env:FLYWAY_PASSWORD = $flywayUserPassword\n        \n        break\n    }   \n    \"usernamepassword\"\n    {\n        Write-Host \"User provided, adding user and password command line argument\"\n        $arguments += \"-user=`\"$flywayUser`\"\"\n        $arguments += \"-password=`\"$flywayUserPassword`\"\"\n        \n        break\n    }\n    \"windowsauthentication\"\n    {\n    \t# Display to the user they've selected windows authentication.  Though this is dictated by the jdbc url, this is added to make sure the user knows that's what is\n        # being used\n        Write-Host \"Using Windows Authentication\"\n        \n        # Check for integratedauthentication=true in url\n        if (!$flywayUrl.ToLower().Contains(\"integratedsecurity=true\"))\n        {\n        \t# Check to see if the connection url ends with a ;\n            if (!$flywayUrl.EndsWith(\";\"))\n            {\n            \t# Add the ;\n                $flywayUrl += \";\"\n            }\n            \n            $flywayUrl += \"integratedSecurity=true;\"\n        }\n        break\n    }\n}\n\n$arguments += \"-url=`\"$flywayUrl`\"\"\n\nif (![String]::IsNullOrWhitespace($flywaySchemas))\n{\n\tWrite-Host \"Schemas provided, adding schemas command line argument\"\n\t$arguments += \"-schemas=`\"$flywaySchemas`\"\"    \n}\n\nif (![string]::IsNullOrWhiteSpace($flywayLicenseEmail) -and ![string]::IsNullOrWhiteSpace($flywayLicensePAT))\n{\n    Write-Host \"Personal Access Token provided, adding -email and -token command line arguments\"\n    $arguments += @(\"-email=`\"$flywayLicenseEmail`\"\", \"-token=`\"$flywayLicensePAT`\"\")\n}\n\nWrite-Host \"Performing diff of schema model against $($flywayUrl)/$($flywayDatabase) ...\"\n\n# Locate schema-model folder\n$packageFolders = Get-ChildItem -Path $flywayPackagePath -Recurse | ?{ $_.PSIsContainer } | Where-Object {$_.Name -eq \"schema-model\"}\n\nif ($packageFolders -is [array])\n{\n  Write-Error \"Multiple 'schema-model' folders found!\"\n}\n\n$modelFolderPath = $packageFolders.FullName\n\n$arguments += \"-environments.$flywayEnvironment.url=$flywayUrl\"\n$arguments += \"-environment=$flywayEnvironment\"\n$arguments += \"-schemaModelLocation=$modelFolderPath\"\nif (![string]::IsNullOrWhitespace($flywaySourceSchema))\n{\n  $arguments += \"-schemaModelSchemas=$flywaySourceSchema\"\n}\nif (![string]::IsNullOrWhitespace($flywayTargetSchema))\n{\n  $arguments += \"-environments.$flywayEnvironment.schemas=$flywayTargetSchema\"\n}\n\n# Execute diff\n$diffArguments = @(\"diff\")\n$diffArguments += $arguments\n$diffArguments += \"-diff.source=schemaModel\"\n$diffArguments += \"-diff.target=env:$flywayEnvironment\"\n$diffArguments += \"-diff.artifactFilename=$flywayPackagePath/artifact.diff\"\n\nExecute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $diffArguments\n\n# Check to see if there's any additional arguments to add\nif (![string]::IsNullOrWhitespace($flywayAdditionalArguments))\n{\n\t# Split on space\n    $flywayAdditionalArgumentsArray = ($flywayAdditionalArguments.Split(\" \", [System.StringSplitOptions]::RemoveEmptyEntries))\n\n    # Loop through array\n    foreach ($newArgument in $flywayAdditionalArgumentsArray)\n    {\n    \t# Add the arguments\n    \t$arguments += $newArgument\n    }\n}\n\n# Attempt to find driver path for java\n$driverPath = (Get-ChildItem -Path (Get-ChildItem -Path $flywayCmd).Directory -Recurse | Where-Object {$_.PSIsContainer -eq $true -and $_.Name -eq \"drivers\"})\n\n# If found, add driver path to the PATH environment varaible\nif ($null -ne $driverPath)\n{\n\t$env:PATH += \"$([IO.Path]::PathSeparator)$($driverPath.FullName)\"\n}\n\n$currentDate = Get-Date\n$currentDateFormatted = $currentDate.ToString(\"yyyyMMdd_HHmmss\")\n\n$prepareArguments = @(\"prepare\")\n$prepareArguments += $arguments\n$prepareArguments += \"-prepare.source=schemaModel\"\n$prepareArguments += \"-prepare.target=env:$flywayEnvironment\"\n$prepareArguments += \"-prepare.artifactFilename=$flywayPackagePath/artifact.diff\"\n$prepareArguments += \"-prepare.scriptFilename=$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\"\n\nif ($flywayUndoScript)\n{\n  $prepareArguments += \"-prepare.undoFilename=$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql\"\n  $prepareArguments += \"-prepare.types=`\"deploy,undo`\"\"\n}\n\nswitch($flywayCommand)\n{\n  \"prepare\"\n  {\n    Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $prepareArguments\n    if ((Test-Path -Path \"$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\") -eq $true)\n    {\n      $fileContents = Get-Content -Path \"$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\"\n      Set-OctopusVariable -name \"ScriptFile\" -value \"$fileContents\"\n      Write-Host \"Output variable with script contents: #{Octopus.Action[$flywayStepName].Output.Scriptfile}\"\n\n      if ($flywayUndoScript)\n      {\n        $fileContents = Get-Content -Path \"$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql\"\n        Set-OctopusVariable -name \"UndoScriptFile\" -value \"$fileContents\"\n        Write-Host \"Output variable with script contents: #{Octopus.Action[$flywayStepName].Output.UndoScriptfile}\"\n      }\n    }\n\n    break\n  }\n  \"check\"\n  {\n    # Create array for check arguments\n    $checkArguments = @(\"check\", \"-changes\", \"-check.changesSource=`\"schemaModel`\"\")\n    $checkArguments += $arguments\n\n    # Execute command\n    Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $checkArguments\n\n    # Attach generated report as Octopus Artifact\n    if ((Test-Path -Path \"$flywayPackagePath/report.html\") -eq $true)\n    {\n      New-OctopusArtifact -Path \"$flywayPackagePath/report.html\" -Name \"$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).report.html\"     \n    }\n\n    break\n  }\n  \"deploy\"\n  {\n    Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $prepareArguments # Prepare has to be run first to produce the scripts deploy needs\n    if ((Test-Path -Path \"$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\") -eq $true)\n    {\n      # Define deploy arguments\n      $deployArguments = @(\"deploy\")\n      $deployArguments += $arguments\n      $deployArguments += \"-deploy.scriptFilename=$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\"\n      $deployArguments += \"-executeInTransaction=$flywayExecuteInTransaction\"\n\n      Execute-FlywayCommand -BinaryFilePath $flywayCmd -CommandArguments $deployArguments\n\n      New-OctopusArtifact -Path \"$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\" -Name \"$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).sql\"\n\n      if ($flywayUndoScript)\n      {\n        New-OctopusArtifact -Path \"$flywayPackagePath/$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql\" -Name \"$($flywayStepName)_$($flywayEnvironment)_$($currentDateFormatted).undo.sql\"\n      }\n    }\n    else\n    {\n      Write-Host \"Script file not found!\"\n    }\n  }\n}",
-    "Octopus.Action.PowerShell.Edition": "Core",
-    "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows"
-  },
-  "Parameters": [
-    {
-      "Id": "5952088c-d399-4050-9474-d93aef737a8d",
-      "Name": "Flyway.Package.Value",
-      "Label": "Flyway Package",
-      "HelpText": "**Required**\n\nThe package containing the migration scripts you want Flyway to run.  Please refer to [documentation](https://flywaydb.org/documentation/concepts/migrations) for core concepts and naming conventions.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "1a2c32aa-5bf5-41ef-a916-4fa5c4039748",
-      "Name": "Flyway.Executable.Path",
-      "Label": "Flyway Executable Path",
-      "HelpText": "**Optional**\n\nThe path of the flyway executable.  It can either be a relative path or an absolute path.\n\nWhen not provided, this step template will test for the following.  The step template places precedence on the version of the flyway included in the package. If Flyway is NOT found in the package, it will attempt to see if it is installed on the server by checking common paths.\n\nRunning on `Linux`:\n- `.flyway`: the package being deployed includes flyway and is running on Linux\n- `/flyway/flyway`: The default path for the Linux execution container.\n\nRunning on Windows:\n- `\\.flyway.cmd`: the package being deployed includes flyway and is running on Windows\n- `flyway`: the package is in the path on the Windows VM or Windows Execution container.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ce396114-d0e6-433f-a160-6ea92b26b1b2",
-      "Name": "Flyway.Command.Value",
-      "Label": "Flyway Command",
-      "HelpText": "**Required**\n\nThe [flyway command](https://flywaydb.org/documentation/usage/commandline/) you wish to run.\n\n- `Check`: Produces a report of changes from the `schema model` against the target `environment`\n- `Deploy`: Executes the scripts generated to make the target database look like the model.\n- `Prepare`: Compares the schema model against the target database and generates scripts to make the database conform to the model.\n",
-      "DefaultValue": "prepare",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "check|Check\ndeploy|Deploy\nprepare|Prepare"
-      }
-    },
-    {
-      "Id": "b05cb50e-1e34-4c2d-bf3f-b7bbdc555f05",
-      "Name": "Flyway.Email.Address",
-      "Label": "Email address",
-      "HelpText": "The email address associated with the Personal Access Token (PAT).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "24c6fe79-6fbd-4f19-9f74-a36cda746ced",
-      "Name": "Flyway.PersonalAccessToken",
-      "Label": "Personal Access Token (PAT)",
-      "HelpText": "The Personal Access Token (PAT) to authenticate with for Enterprise features.  \n\nReplaces the License Key.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "522f4dc8-3a0a-486d-a9cd-9c2ef94d1a8e",
-      "Name": "Flyway.Target.Url",
-      "Label": "-Url",
-      "HelpText": "**Required**\n\nThe [URL](https://flywaydb.org/documentation/configuration/parameters/url) parameter used in Flyway.  This is the URL of the database to run the migration scripts on in the format specified in the default flyway.conf file.\n\nExamples:\n- SQL Server: `jdbc:sqlserver://host:port;databaseName=database`\n- Oracle: `jdbc:oracle:thin:@//host:port/service` or `jdbc:oracle:thin:@tns_entry`\n- MySQL: `jdbc:mysql://host:port/database`\n- PostgreSQL: `jdbc:postgresql://host:port/database`\n- SQLite: `jdbc:sqlite:database`\n\nPlease refer to [documentation](https://flywaydb.org/documentation/database/sqlserver) for further examples.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "349f8a5f-5a18-4d23-a717-1c74a03029eb",
-      "Name": "Flyway.Source.Schema.Model",
-      "Label": "Source Schema Model (optional).",
-      "HelpText": "Name of the source schema model used for the comparison operation.  Not all database technologies, such as MSSQL, use this option.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "195e2486-f286-4a72-a97a-f40b7a44a609",
-      "Name": "Flyway.Target.Schema",
-      "Label": "Target Schema (optional)",
-      "HelpText": "Name of the target schema to deploy to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "16d4243a-28b0-4e8d-beec-854ca4c781b0",
-      "Name": "Flyway.Authentication.Method",
-      "Label": "Authentication Method",
-      "HelpText": "Method used to authenticate to the database server.",
-      "DefaultValue": "usernamepassword",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-      }
-    },
-    {
-      "Id": "3f733c39-c99a-40d0-9dfd-e67d72c87883",
-      "Name": "Flyway.Database.User",
-      "Label": "-User",
-      "HelpText": "**Optional**\n\nThe [user](https://flywaydb.org/documentation/configuration/parameters/user) used to connect to the database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7509e8ee-c781-4ca2-bbe4-6e5e348d3d44",
-      "Name": "Flyway.Database.User.Password",
-      "Label": "-Password",
-      "HelpText": "**Optional**\n\nThe [password](https://flywaydb.org/documentation/configuration/parameters/password) used to connect to the database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "6d4946a4-0746-40e9-9b6e-c85c220c2dbe",
-      "Name": "Flyway.Command.Schemas",
-      "Label": "-Schemas",
-      "HelpText": "**Optional**\n\nComma-separated case-sensitive list of [schemas](https://flywaydb.org/documentation/configuration/parameters/schemas) managed by Flyway. \n\nExample: `schema1,schema2`\n\nFlyway will attempt to create these schemas if they do not already exist and will clean them in the order of this list. If Flyway created them, then the schemas themselves will be dropped when cleaning.\n\nThe first schema in the list will act as the default schema.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "12168dc6-261b-4853-89ea-ef4e36e17452",
-      "Name": "Flyway.Additional.Arguments",
-      "Label": "Additional arguments",
-      "HelpText": "Any additional arguments that need to be passed (ie `-table=\"MyTable\")",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7c7a8183-963d-40e5-94e9-b7a6aa2217df",
-      "Name": "Flyway.Transaction",
-      "Label": "Execute in transaction?",
-      "HelpText": "Tick this box if you want the deployment to execute within a transaction.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "291b9675-e737-4dfe-98fc-bbf303a87653",
-      "Name": "Flyway.Generate.Undo",
-      "Label": "Generate Undo Script?",
-      "HelpText": "Tick this box if you want Flwyay to generate an `Undo` script.  `Undo` scripts will be created as an output variable for `Prepare` and attached as an Octopus Artifact for `Deploy`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2026-01-20T22:39:29.598Z",
-    "OctopusVersion": "2025.4.10338",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "flyway"
-}
diff --git a/step-templates/ftp-uploadfiles-package.json b/step-templates/ftp-uploadfiles-package.json
deleted file mode 100644
index b832d74d9..000000000
--- a/step-templates/ftp-uploadfiles-package.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "Id": "8b316926-0821-459b-9869-3ca98fd9087e",
-  "Name": "Upload files by FTP from package",
-  "Description": "Upload files to a remote server via File Transfer Protocol (SFTP or FTP) using WinSCP.\n\nThis step template uses the [WinSCP .NET Assembly](http://winscp.net/eng/docs/library#downloading_and_installing_the_assembly).  In the absence of WinSCP installed on the machine, it will attempt to make use of the WinSCP PowerShell module, downloading a temporary copy if not already present. \n\n# Notes on usage\n\nThis version uses a referenced package parameter and is able to be run on a Worker.\n\n## Cleaning up deployments\n\nIf you aren't deploying to an application host and don't want the deployment files to persist on the tentacle irrespective of the life cycle retention policy ensure that you set the \"Delete Previous Deployment\" to `true` and they will be removed.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Author": "twerthi",
-  "Packages": [
-    {
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "FtpPackage"
-      },
-      "Id": "76cedf6d-e8b0-4fc2-af04-a745ae6659ea",
-      "Name": "FtpPackage"
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\n## Input\n## --------------------------------------------------------------------------------------\n$PathToWinScp = $OctopusParameters['PathToWinScp']\n$FtpHost = $OctopusParameters['FtpHost']\n$FtpUsername = $OctopusParameters['FtpUsername']\n$FtpPassword = $OctopusParameters['FtpPassword']\n$FtpHostKeyFingerprint = $OctopusParameters['FtpHostKeyFingerprint']\n$FtpPasskey = $OctopusParameters['FtpPasskey']\n$FtpPasskeyPhrase = $OctopusParameters['FtpPasskeyPhrase']\n$FtpRemoteDirectory = $OctopusParameters['FtpRemoteDirectory']\n$FtpDeleteUnrecognizedFiles = $OctopusParameters['FtpDeleteUnrecognizedFiles']\n$DeleteDeploymentStep = $OctopusParameters['DeleteDeploymentStep']\n\n## --------------------------------------------------------------------------------------\n## Helpers\n## --------------------------------------------------------------------------------------\n\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Helper for validating input parameters\nfunction Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {\n    if (! $parameterName -contains \"Password\")\n    {\n        Write-Host \"${parameterName}: $foo\"\n    }\n    if (! $foo) {\n        throw \"No value was set for $parameterName, and it cannot be empty\"\n    }\n}\n\n# A collection of functions that can be used by script steps to determine where packages installed\n# by previous steps are located on the filesystem.\nfunction Find-InstallLocations {\n    $result = @()\n    $OctopusParameters.Keys | foreach {\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\n            $result += $OctopusParameters[$_]\n        }\n    }\n    return $result\n}\n\nfunction Find-InstallLocation($stepName) {\n    $result = $OctopusParameters.Keys | where {\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\n    } | select -first 1\n\n    if ($result) {\n        return $OctopusParameters[$result]\n    }\n\n    throw \"No install location found for step: $stepName\"\n}\n\nfunction Find-SingleInstallLocation {\n    $all = @(Find-InstallLocations)\n    if ($all.Length -eq 1) {\n        return $all[0]\n    }\n    if ($all.Length -eq 0) {\n        throw \"No package steps found\"\n    }\n    throw \"Multiple package steps have run; please specify a single step\"\n}\n\n# Session.FileTransferred event handler\nfunction FileTransferred\n{\n    param($e)\n\n    if ($e.Error -eq $Null)\n    {\n        Write-Host (\"Upload of {0} succeeded\" -f $e.FileName)\n    }\n    else\n    {\n        Write-Error (\"Upload of {0} failed: {1}\" -f $e.FileName, $e.Error)\n    }\n\n    if ($e.Chmod -ne $Null)\n    {\n        if ($e.Chmod.Error -eq $Null)\n        {\n            Write-Host \"##octopus[stdout-verbose]\"\n            Write-Host (\"Permisions of {0} set to {1}\" -f $e.Chmod.FileName, $e.Chmod.FilePermissions)\n            Write-Host \"##octopus[stdout-default]\"\n        }\n        else\n        {\n            Write-Error (\"Setting permissions of {0} failed: {1}\" -f $e.Chmod.FileName, $e.Chmod.Error)\n        }\n\n    }\n    else\n    {\n        Write-Host \"##octopus[stdout-verbose]\"\n        Write-Host (\"Permissions of {0} kept with their defaults\" -f $e.Destination)\n        Write-Host \"##octopus[stdout-default]\"\n    }\n\n    if ($e.Touch -ne $Null)\n    {\n        if ($e.Touch.Error -eq $Null)\n        {\n            Write-Host \"##octopus[stdout-verbose]\"\n            Write-Host (\"Timestamp of {0} set to {1}\" -f $e.Touch.FileName, $e.Touch.LastWriteTime)\n            Write-Host \"##octopus[stdout-default]\"\n        }\n        else\n        {\n            Write-Error (\"Setting timestamp of {0} failed: {1}\" -f $e.Touch.FileName, $e.Touch.Error)\n        }\n\n    }\n    else\n    {\n        # This should never happen during \"local to remote\" synchronization\n        Write-Host \"##octopus[stdout-verbose]\"\n        Write-Host (\"Timestamp of {0} kept with its default (current time)\" -f $e.Destination)\n        Write-Host \"##octopus[stdout-default]\"\n    }\n}\n\n## --------------------------------------------------------------------------------------\n## Configuration\n## --------------------------------------------------------------------------------------\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n$PowerShellModuleName = \"WinSCP\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if $PathToWinScp is empty\nif ([string]::IsNullOrEmpty($PathToWinScp))\n{\n    # Check to see if WinSCP module is installed\n    if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n    {\n      # Tell user what we're doing\n      Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n      # Install temporary copy\n      Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n      \n      # Import module\n      Write-Output \"Importing $PowerShellModuleName ...\"\n      Import-Module $PowerShellModuleName\n    }\n\t#Get-ChildItem -Path ([System.IO.Path]::GetDirectoryName((Get-Module $PowerShellModuleName).Path))\n\t# Get the path to where the dll resides\n    #$PathToWinScp = [System.IO.Path]::GetDirectoryName((Get-Module $PowerShellModuleName).Path)\n}\nelse\n{\n\tValidate-Parameter $PathToWinScp -parameterName \"Path to WinSCP .NET Assembly\"\n    # Load WinSCP .NET assembly\n    $fullPathToWinScp = \"$PathToWinScp\\WinSCPnet.dll\"\n    if(-not (Test-Path $fullPathToWinScp))\n    {\n        throw \"$PathToWinScp does not contain the WinSCP .NET Assembly\"\n    }\n    Add-Type -Path $fullPathToWinScp    \n}\n\n#Validate-Parameter $PathToWinScp -parameterName \"Path to WinSCP .NET Assembly\"\nValidate-Parameter $FtpHost -parameterName \"Host\"\nValidate-Parameter $FtpUsername -parameterName \"Username\"\nValidate-Parameter $FtpPassword -parameterName \"Password\"\nValidate-Parameter $FtpRemoteDirectory -parameterName \"Remote directory\"\nValidate-Parameter $FtpDeleteUnrecognizedFiles -parameterName \"Delete unrecognized files\"\n\n## --------------------------------------------------------------------------------------\n## Main script\n## --------------------------------------------------------------------------------------\n\n# Load WinSCP .NET assembly\n<#\n$fullPathToWinScp = \"$PathToWinScp\\WinSCPnet.dll\"\nif(-not (Test-Path $fullPathToWinScp))\n{\n    throw \"$PathToWinScp does not contain the WinSCP .NET Assembly\"\n}\nAdd-Type -Path $fullPathToWinScp\n#>\n$stepPath = \"\"\n\n$stepPath = $OctopusParameters[\"Octopus.Action.Package[FtpPackage].ExtractedPath\"]\n\nWrite-Host \"Package was installed to: $stepPath\"\n\ntry\n{\n    $sessionOptions = New-Object WinSCP.SessionOptions\n\n    # WinSCP defaults to SFTP, but it's good to ensure that's the case\n    if (![string]::IsNullOrEmpty($FtpHostKeyFingerprint)) {\n      $sessionOptions.Protocol = [WinScp.Protocol]::Sftp\n      $sessionOptions.SshHostKeyFingerprint = $FtpHostKeyFingerprint\n    }\n    else {\n      $sessionOptions.Protocol = [WinSCP.Protocol]::Ftp\n    }\n    $sessionOptions.HostName = $FtpHost\n    $sessionOptions.UserName = $FtpUsername\n\n    \n\n    # If there is a path to the private key, use that instead of a password\n    if (![string]::IsNullOrEmpty($FtpPasskey)) {\n      Write-Host \"Attempting to use passkey instead of password\"\n\n      # Check key exists\n      if (!(Test-Path $FtpPasskey)) {\n        throw \"Unable to locate passkey at: $FtpPasskey\"\n      }\n\n      $sessionOptions.SshPrivateKeyPath = $FtpPasskey\n\n      # If the key requires a passphrase to access\n      if ($FtpPasskeyPhrase -ne \"\") {\n        $sessionOptions.PrivateKeyPassphrase = $FtpPasskeyPhrase\n      }\n    }\n    else {\n      $sessionOptions.Password = $FtpPassword\n    }\n\n    $session = New-Object WinSCP.Session\n    \n    if ([string]::IsNullOrEmpty($PathToWinScp))\n    {\n    \t# Using PowerShell module, need to set the executable location\n        $session.ExecutablePath = \"$([System.IO.Path]::GetDirectoryName((Get-Module $PowerShellModuleName).Path))\\bin\\winscp.exe\"\n    }\n    \n    try\n    {\n    \n        # Will continuously report progress of synchronization\n        $session.add_FileTransferred( { FileTransferred($_) } )\n\n        # Connect\n        $session.Open($sessionOptions)\n\n        Write-Host \"Beginning synchronization between $stepPath and $FtpRemoteDirectory on $FtpHost\"\n\n        if (-not $session.FileExists($FtpRemoteDirectory))\n        {\n            Write-Host \"Remote directory not found, creating $FtpRemoteDirectory\"\n            $session.CreateDirectory($FtpRemoteDirectory);\n        }\n\n        # Synchronize files\n        $synchronizationResult = $session.SynchronizeDirectories(\n            [WinSCP.SynchronizationMode]::Remote, $stepPath, $FtpRemoteDirectory, $FtpDeleteUnrecognizedFiles)\n\n        # Throw on any error\n        $synchronizationResult.Check()\n    }\n    finally\n    {\n        # Disconnect, clean up\n        $session.Dispose()\n\n        if ($DeleteDeploymentStep) {\n          Remove-Item -Path $stepPath -Recurse\n        }\n    }\n\n    exit 0\n}\ncatch [Exception]\n{\n    throw $_.Exception.Message\n}\n\n",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "a884e52a-0e90-4b98-ba36-916dbbb7302c",
-      "Name": "PathToWinScp",
-      "Label": "Path to WinScp",
-      "HelpText": "The directory where you extracted the WinSCP .NET Assembly.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "09f9bb2d-2c7e-402c-8824-e91c6c7dd3e4",
-      "Name": "FtpHost",
-      "Label": "Host",
-      "HelpText": "The address of your FTP server. Example: `ftp.yourhost.com`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "81768a2a-9fbb-47d0-b584-91cb1c93fc28",
-      "Name": "FtpUsername",
-      "Label": "Username",
-      "HelpText": "If no username is specified, the well-known username `anonymous` will be used.",
-      "DefaultValue": "anonymous",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f36ea459-db54-4ff8-9f9f-f6917f56f330",
-      "Name": "FtpPassword",
-      "Label": "Password",
-      "HelpText": "If no password is specified, the well-known password `guest` will be used.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
-      "DefaultValue": "guest",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "c970e25e-e1cf-4143-81e7-ab158f80b7bf",
-      "Name": "FtpHostKeyFingerprint",
-      "Label": "Host Key Fingerprint(s)",
-      "HelpText": "By supplying a host key fingerprint (or a semicolon separated list), you will force the deployment into SFTP mode, and automatically accept the host certificates.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4c4ace47-c5a0-46e3-9898-39fb722a524d",
-      "Name": "FtpPasskey",
-      "Label": "Passkey",
-      "HelpText": "Path to the PPK passkey file, leave blank if using a Password",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0ecfc143-7470-45a2-a099-f0c6f37f58e5",
-      "Name": "FtpPasskeyPhrase",
-      "Label": "Passkey Phrase",
-      "HelpText": "If your passkey is encrypted, please supply the pass phrase.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "b2fa7e63-c46b-4539-8d3b-c1d7c41c71ea",
-      "Name": "FtpRemoteDirectory",
-      "Label": "Remote directory",
-      "HelpText": "The directory on your FTP server in which you want files to be placed. Example: `/site/wwwroot`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f02cbc65-dffb-40cc-a0b5-d87e19346b90",
-      "Name": "FtpDeleteUnrecognizedFiles",
-      "Label": "Delete unrecognized files",
-      "HelpText": "Files can exist on the FTP server that do not exist in the NuGet package. Examples may be binaries from a previous release, or uploaded images in a CMS. Use this option to choose how to treat these files.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "e7ca0ba2-02cc-4988-acef-0f0bb12094ad",
-      "Name": "DeleteDeploymentStep",
-      "Label": "Delete Deployment Step?",
-      "HelpText": "Should this script delete the deployment - for example, if you are running this on the Octopus Server, you might want to clean up the output of the previous package deploy step when this has completed.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "b7a1af1a-0670-4817-a577-132fe1db01e5",
-      "Name": "FtpPackage",
-      "Label": "Package",
-      "HelpText": "Select the package to FTP",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-08T00:22:01.921Z",
-    "OctopusVersion": "2020.3.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "harrisonmeister",
-  "Category": "winscp"
-}
\ No newline at end of file
diff --git a/step-templates/ftp-uploadfiles.json b/step-templates/ftp-uploadfiles.json
deleted file mode 100644
index 960342387..000000000
--- a/step-templates/ftp-uploadfiles.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "Id": "3b534e57-e8b0-4a06-aa2c-9e7eba1f4337",
-  "Name": "Upload files by FTP",
-  "Description": "Upload files to a remote server via File Transfer Protocol (SFTP or FTP) using WinSCP.\n\nThis step template requires the [WinSCP .NET Assembly](http://winscp.net/eng/docs/library#downloading_and_installing_the_assembly) to be installed on the server running the deployment.\n\n# Notes on usage\n\nYou will need to have a \"Deploy a Package\" step before this step to supply the files to deploy. You can have this all happen on your Octopus Server rather than one of your web servers by following the steps at [Deploying Packages to your Octopus Server](https://octopus.com/docs/deployment-process/steps/how-to-run-steps-on-the-octopus-server#deploying-packages-to-your-octopus-server).\n\n## Cleaning up deployments\n\nIf you aren't deploying to an application host and don't want the deployment files to persist on the tentacle irrespective of the life cycle retention policy ensure that you set the \"Delete Previous Deployment\" to `true` and they will be removed.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\n## Input\n## --------------------------------------------------------------------------------------\n$PathToWinScp = $OctopusParameters['PathToWinScp']\n$FtpHost = $OctopusParameters['FtpHost']\n$FtpUsername = $OctopusParameters['FtpUsername']\n$FtpPassword = $OctopusParameters['FtpPassword']\n$FtpHostKeyFingerprint = $OctopusParameters['FtpHostKeyFingerprint']\n$FtpPasskey = $OctopusParameters['FtpPasskey']\n$FtpPasskeyPhrase = $OctopusParameters['FtpPasskeyPhrase']\n$FtpRemoteDirectory = $OctopusParameters['FtpRemoteDirectory']\n$FtpPackageStepName = $OctopusParameters['FtpPackageStepName']\n$FtpDeleteUnrecognizedFiles = $OctopusParameters['FtpDeleteUnrecognizedFiles']\n$DeleteDeploymentStep = $OctopusParameters['DeleteDeploymentStep']\n\n## --------------------------------------------------------------------------------------\n## Helpers\n## --------------------------------------------------------------------------------------\n# Helper for validating input parameters\nfunction Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {\n    if (! $parameterName -contains \"Password\")\n    {\n        Write-Host \"${parameterName}: $foo\"\n    }\n    if (! $foo) {\n        throw \"No value was set for $parameterName, and it cannot be empty\"\n    }\n}\n\n# A collection of functions that can be used by script steps to determine where packages installed\n# by previous steps are located on the filesystem.\nfunction Find-InstallLocations {\n    $result = @()\n    $OctopusParameters.Keys | foreach {\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\n            $result += $OctopusParameters[$_]\n        }\n    }\n    return $result\n}\n\nfunction Find-InstallLocation($stepName) {\n    $result = $OctopusParameters.Keys | where {\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\n    } | select -first 1\n\n    if ($result) {\n        return $OctopusParameters[$result]\n    }\n\n    throw \"No install location found for step: $stepName\"\n}\n\nfunction Find-SingleInstallLocation {\n    $all = @(Find-InstallLocations)\n    if ($all.Length -eq 1) {\n        return $all[0]\n    }\n    if ($all.Length -eq 0) {\n        throw \"No package steps found\"\n    }\n    throw \"Multiple package steps have run; please specify a single step\"\n}\n\n# Session.FileTransferred event handler\nfunction FileTransferred\n{\n    param($e)\n\n    if ($e.Error -eq $Null)\n    {\n        Write-Host (\"Upload of {0} succeeded\" -f $e.FileName)\n    }\n    else\n    {\n        Write-Error (\"Upload of {0} failed: {1}\" -f $e.FileName, $e.Error)\n    }\n\n    if ($e.Chmod -ne $Null)\n    {\n        if ($e.Chmod.Error -eq $Null)\n        {\n            Write-Host \"##octopus[stdout-verbose]\"\n            Write-Host (\"Permisions of {0} set to {1}\" -f $e.Chmod.FileName, $e.Chmod.FilePermissions)\n            Write-Host \"##octopus[stdout-default]\"\n        }\n        else\n        {\n            Write-Error (\"Setting permissions of {0} failed: {1}\" -f $e.Chmod.FileName, $e.Chmod.Error)\n        }\n\n    }\n    else\n    {\n        Write-Host \"##octopus[stdout-verbose]\"\n        Write-Host (\"Permissions of {0} kept with their defaults\" -f $e.Destination)\n        Write-Host \"##octopus[stdout-default]\"\n    }\n\n    if ($e.Touch -ne $Null)\n    {\n        if ($e.Touch.Error -eq $Null)\n        {\n            Write-Host \"##octopus[stdout-verbose]\"\n            Write-Host (\"Timestamp of {0} set to {1}\" -f $e.Touch.FileName, $e.Touch.LastWriteTime)\n            Write-Host \"##octopus[stdout-default]\"\n        }\n        else\n        {\n            Write-Error (\"Setting timestamp of {0} failed: {1}\" -f $e.Touch.FileName, $e.Touch.Error)\n        }\n\n    }\n    else\n    {\n        # This should never happen during \"local to remote\" synchronization\n        Write-Host \"##octopus[stdout-verbose]\"\n        Write-Host (\"Timestamp of {0} kept with its default (current time)\" -f $e.Destination)\n        Write-Host \"##octopus[stdout-default]\"\n    }\n}\n\n## --------------------------------------------------------------------------------------\n## Configuration\n## --------------------------------------------------------------------------------------\nValidate-Parameter $PathToWinScp -parameterName \"Path to WinSCP .NET Assembly\"\nValidate-Parameter $FtpHost -parameterName \"Host\"\nValidate-Parameter $FtpUsername -parameterName \"Username\"\nValidate-Parameter $FtpPassword -parameterName \"Password\"\nValidate-Parameter $FtpRemoteDirectory -parameterName \"Remote directory\"\nValidate-Parameter $FtpPackageStepName -parameterName \"Package step name\"\nValidate-Parameter $FtpDeleteUnrecognizedFiles -parameterName \"Delete unrecognized files\"\n\n## --------------------------------------------------------------------------------------\n## Main script\n## --------------------------------------------------------------------------------------\n\n# Load WinSCP .NET assembly\n$fullPathToWinScp = \"$PathToWinScp\\WinSCPnet.dll\"\nif(-not (Test-Path $fullPathToWinScp))\n{\n    throw \"$PathToWinScp does not contain the WinSCP .NET Assembly\"\n}\nAdd-Type -Path $fullPathToWinScp\n\n$stepPath = \"\"\nif (-not [string]::IsNullOrEmpty($FtpPackageStepName)) {\n    Write-Host \"Finding path to package step: $FtpPackageStepName\"\n    $stepPath = Find-InstallLocation $FtpPackageStepName\n} else {\n    $stepPath = Find-SingleInstallLocation\n}\nWrite-Host \"Package was installed to: $stepPath\"\n\ntry\n{\n    $sessionOptions = New-Object WinSCP.SessionOptions\n\n    # WinSCP defaults to SFTP, but it's good to ensure that's the case\n    if ($FtpHostKeyFingerprint -ne \"\") {\n      $sessionOptions.Protocol = [WinScp.Protocol]::Sftp\n    }\n    else {\n      $sessionOptions.Protocol = [WinSCP.Protocol]::Ftp\n    }\n    $sessionOptions.HostName = $FtpHost\n    $sessionOptions.UserName = $FtpUsername\n\n    $sessionOptions.SshHostKeyFingerprint = $FtpHostKeyFingerprint\n\n    # If there is a path to the private key, use that instead of a password\n    if ($FtpPasskey -ne \"\") {\n      Write-Host \"Attempting to use passkey instead of password\"\n\n      # Check key exists\n      if (!(Test-Path $FtpPasskey)) {\n        throw \"Unable to locate passkey at: $FtpPasskey\"\n      }\n\n      $sessionOptions.SshPrivateKeyPath = $FtpPasskey\n\n      # If the key requires a passphrase to access\n      if ($FtpPasskeyPhrase -ne \"\") {\n        $sessionOptions.PrivateKeyPassphrase = $FtpPasskeyPhrase\n      }\n    }\n    else {\n      $sessionOptions.Password = $FtpPassword\n    }\n\n    $session = New-Object WinSCP.Session\n    try\n    {\n        # Will continuously report progress of synchronization\n        $session.add_FileTransferred( { FileTransferred($_) } )\n\n        # Connect\n        $session.Open($sessionOptions)\n\n        Write-Host \"Beginning synchronization between $stepPath and $FtpRemoteDirectory on $FtpHost\"\n\n        if (-not $session.FileExists($FtpRemoteDirectory))\n        {\n            Write-Host \"Remote directory not found, creating $FtpRemoteDirectory\"\n            $session.CreateDirectory($FtpRemoteDirectory);\n        }\n\n        # Synchronize files\n        $synchronizationResult = $session.SynchronizeDirectories(\n            [WinSCP.SynchronizationMode]::Remote, $stepPath, $FtpRemoteDirectory, $FtpDeleteUnrecognizedFiles)\n\n        # Throw on any error\n        $synchronizationResult.Check()\n    }\n    finally\n    {\n        # Disconnect, clean up\n        $session.Dispose()\n\n        if ($DeleteDeploymentStep) {\n          Remove-Item -Path $stepPath -Recurse\n        }\n    }\n\n    exit 0\n}\ncatch [Exception]\n{\n    throw $_.Exception.Message\n}\n",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "PathToWinScp",
-      "Label": "Path to WinScp",
-      "HelpText": "The directory where you extracted the WinSCP .NET Assembly.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FtpHost",
-      "Label": "Host",
-      "HelpText": "The address of your FTP server. Example: `ftp.yourhost.com`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FtpUsername",
-      "Label": "Username",
-      "HelpText": "If no username is specified, the well-known username `anonymous` will be used.",
-      "DefaultValue": "anonymous",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FtpPassword",
-      "Label": "Password",
-      "HelpText": "If no password is specified, the well-known password `guest` will be used.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
-      "DefaultValue": "guest",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "FtpHostKeyFingerprint",
-      "Label": "Host Key Fingerprint(s)",
-      "HelpText": "By supplying a host key fingerprint (or a semicolon separated list), you will force the deployment into SFTP mode, and automatically accept the host certificates.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FtpPasskey",
-      "Label": "Passkey",
-      "HelpText": "Path to the PPK passkey file, leave blank if using a Password",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FtpPasskeyPhrase",
-      "Label": "Passkey Phrase",
-      "HelpText": "If your passkey is encrypted, please supply the pass phrase.\n\nIf the password field is bound, the binding expression will be visible to other authorized users.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "FtpRemoteDirectory",
-      "Label": "Remote directory",
-      "HelpText": "The directory on your FTP server in which you want files to be placed. Example: `/site/wwwroot`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "FtpPackageStepName",
-      "Label": "Package step name",
-      "HelpText": "Name of the previously-deployed package step that contains the files that you want to deploy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Name": "FtpDeleteUnrecognizedFiles",
-      "Label": "Delete unrecognized files",
-      "HelpText": "Files can exist on the FTP server that do not exist in the NuGet package. Examples may be binaries from a previous release, or uploaded images in a CMS. Use this option to choose how to treat these files.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "DeleteDeploymentStep",
-      "Label": "Delete Deployment Step?",
-      "HelpText": "Should this script delete the deployment - for example, if you are running this on the Octopus Server, you might want to clean up the output of the previous package deploy step when this has completed.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2018-07-05T15:12:39.219Z",
-  "LastModifiedBy": "Zhaph",
-  "$Meta": {
-    "ExportedAt": "2018-07-05T15:12:39.219Z",
-    "OctopusVersion": "2018.6.2",
-    "Type": "ActionTemplate"
-  },
-  "Category": "winscp"
-}
diff --git a/step-templates/git-clone-copy-push-another-repo.json b/step-templates/git-clone-copy-push-another-repo.json
deleted file mode 100644
index 8f0037ce6..000000000
--- a/step-templates/git-clone-copy-push-another-repo.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "Id": "6db15b08-f6c6-4a6e-833c-773eb38ec0f0",
-  "Name": "Git - Clone, copy, push to another repo",
-  "Description": "Clones both a source and destination repository, copies files from the `Source Path` to the `Destination Path` then commits to the destination repository.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Invoke-Git\n{\n\t# Define parameters\n    param (\n    \t$GitRepositoryUrl,\n        $GitFolder,\n        $GitUsername,\n        $GitPassword,\n        $GitCommand,\n        $AdditionalArguments\n    )\n    \n    # Get current work folder\n    $workDirectory = Get-Location\n\n\t# Check to see if GitFolder exists\n    if (![String]::IsNullOrWhitespace($GitFolder) -and (Test-Path -Path $GitFolder) -eq $false)\n    {\n    \t# Create the folder\n        New-Item -Path $GitFolder -ItemType \"Directory\" -Force | Out-Null\n        \n        # Set the location to the new folder\n        Set-Location -Path $GitFolder\n    }\n    \n    # Create arguments array\n    $gitArguments = @()\n    $gitArguments += $GitCommand\n    \n    # Check for url\n    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))\n    {\n      # Convert url to URI object\n      $gitUri = [System.Uri]$GitRepositoryUrl\n      $gitUrl = \"{0}://{1}:{2}@{3}:{4}{5}\" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery\n      $gitArguments += $gitUrl\n\n      # Get the newly created folder name\n      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf(\"/\") + 1)\n      if ($gitFolderName.Contains(\".git\"))\n      {\n          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf(\".\"))\n      }\n    }\n   \n    \n    # Check for additional arguments\n    if ($null -ne $AdditionalArguments)\n    {\n \t\t# Add the additional arguments\n        $gitArguments += $AdditionalArguments\n    }\n    \n    # Execute git command\n    $results = Execute-Command -commandPath \"git\" -commandArguments $gitArguments -workingDir $GitFolder\n    \n    Write-Host $results.stdout\n    Write-Host $results.stderr\n    \n    # Return the foldername\n    Set-Location -Path $workDirectory\n    \n    # Check to see if GitFolder is null\n    if ($null -ne $GitFolder)\n    {\n    \treturn Join-Path -Path $GitFolder -ChildPath $gitFolderName\n    }\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nFunction Copy-Files\n{\n\t# Define parameters\n    param (\n    \t$SourcePath,\n        $DestinationPath\n    )\n    \n    # Copy the items from source path to destination path\n    $copyArguments = @{}\n    $copyArguments.Add(\"Path\", $SourcePath)\n    $copyArguments.Add(\"Destination\", $DestinationPath)\n    \n    # Check to make sure destination exists\n    if ((Test-Path -Path $DestinationPath) -eq $false)\n    {\n    \t# Create the destination path\n        New-Item -Path $DestinationPath -ItemType \"Directory\" | Out-Null\n    }\n    \n    # Check for wildcard\n    if ($SourcePath.EndsWith(\"/*\") -or $SourcePath.EndsWith(\"\\*\"))\n    {\n\t\t# Add recurse argument\n\t\t$copyArguments.Add(\"Recurse\", $true)\n    }\n    \n    # Force overwrite\n    $copyArguments.Add(\"Force\", $true)\n    \n    # Copy files\n    Copy-Item @copyArguments\n}\n\nFunction Execute-Command\n{\n\tparam (\n    \t$commandPath,\n        $commandArguments,\n        $workingDir\n    )\n\n\t$gitExitCode = 0\n    $executionResults = $null\n\n  Try {\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.WorkingDirectory = $workingDir\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n    $executionResults = [pscustomobject]@{\n        stdout = $p.StandardOutput.ReadToEnd()\n        stderr = $p.StandardError.ReadToEnd()\n        ExitCode = $null\n    }\n    $p.WaitForExit()\n    $gitExitCode = [int]$p.ExitCode\n    $executionResults.ExitCode = $gitExitCode\n    \n    if ($gitExitCode -ge 2) \n    {\n\t\t# Fail the step\n        throw\n    }\n    \n    return $executionResults\n  }\n  Catch {\n    # Check exit code\n    Write-Error -Message \"$($executionResults.stderr)\" -ErrorId $gitExitCode\n    exit $gitExitCode\n  }\n\n}\n\nFunction Get-GitExecutable\n{\n\t# Define parameters\n    param (\n    \t$WorkingDirectory\n    )\n      \n    # Define variables\n    $gitExe = \"PortableGit-2.41.0.3-64-bit.7z.exe\"\n    $gitDownloadUrl = \"https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe\"\n    $gitDownloadArguments = @{}\n    $gitDownloadArguments.Add(\"Uri\", $gitDownloadUrl)\n    $gitDownloadArguments.Add(\"OutFile\", \"$WorkingDirectory/git/$gitExe\")\n    \n    # This makes downloading faster\n    $ProgressPreference = 'SilentlyContinue'\n    \n    # Check to see if git subfolder exists\n    if ((Test-Path -Path \"$WorkingDirectory/git\") -eq $false)\n    {\n    \t# Create subfolder\n        New-Item -Path \"$WorkingDirectory/git\"  -ItemType Directory\n    }\n    \n    # Check PowerShell version\n    if ($PSVersionTable.PSVersion.Major -lt 6)\n    {\n    \t# Use basic parsing is required\n        $gitDownloadArguments.Add(\"UseBasicParsing\", $true)\n    }\n    \n    # Download Git\n    Write-Host \"Downloading Git ...\"\n    Invoke-WebRequest @gitDownloadArguments\n    \n    # Extract Git\n    $gitExtractArguments = @()\n    $gitExtractArguments += \"-o\"\n    $gitExtractArguments += \"$WorkingDirectory\\git\"\n    $gitExtractArguments += \"-y\"\n    $gitExtractArguments += \"-bd\"\n\n    Write-Host \"Extracting Git download ...\"\n    & \"$WorkingDirectory\\git\\$gitExe\" $gitExtractArguments\n\n    # Wait until unzip action is complete\n    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(\".\")))}))\n    {\n        Start-Sleep 5\n    }\n    \n    # Add bin folder to path\n    $env:PATH = \"$WorkingDirectory\\git\\bin$([IO.Path]::PathSeparator)\" + $env:PATH\n    \n    # Disable promopt for credential helper\n    Invoke-Git -GitCommand \"config\" -AdditionalArguments @(\"--system\", \"--unset\", \"credential.helper\")\n}\n\n# Get variables\n$sourceGitUrl = $OctopusParameters['Template.Git.Source.Repo.Url']\n$destinationGitUrl = $OctopusParameters['Template.Git.Destination.Repo.Url']\n$gitSourceUser = $OctopusParameters['Template.Git.Source.User.Name']\n$gitSourcePassword = $OctopusParameters['Template.Git.Source.User.Password']\n$gitDestinationUser = $OctopusParameters['Template.Git.Destination.User.Name']\n$gitDestinationPassword = $OctopusParameters['Template.Git.Destination.User.Password']\n$sourceItems = $OctopusParameters['Template.Git.Source.Path']\n$destinationPath = $OctopusParameters['Template.Git.Destination.Path']\n$gitTag = $OctopusParameters['Template.Git.Tag']\n$gitSource = $null\n$gitDestination = $null\n\n# Check to see if it's Windows\nif ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq \"Hosted Windows\")\n{\n\t# Dynamic worker don't have git, download portable version and add to path for execution\n    Write-Host \"Detected usage of Windows Dynamic Worker ...\"\n    Get-GitExecutable -WorkingDirectory $PWD\n}\n\n# Clone destination repository\n$destinationFolderName = Invoke-Git -GitRepositoryUrl $destinationGitUrl -GitUsername $gitDestinationUser -GitPassword $gitDestinationPassword -GitCommand \"clone\" -GitFolder \"$($PWD)/destination/default\"\n\n# Check for tag\nif (![String]::IsNullOrWhitespace($gitTag))\n{\n    $sourceFolderName = Invoke-Git -GitRepositoryUrl $sourceGitUrl -GitUsername $gitSourceUser -GitPassword $gitSourcePassword -GitCommand \"clone\" -GitFolder \"$($PWD)/source/tags/$gitTag\" -AdditionalArguments @(\"-b\", \"$gitTag\")\n}\nelse\n{\n\t$sourceFolderName = Invoke-Git -GitRepositoryUrl $sourceGitUrl -GitUsername $gitSourceUser -GitPassword $gitSourcePassword -GitCommand \"clone\" -GitFolder \"$($PWD)/source/default\"\n}\n\n# Copy files from source to destination\nCopy-Files -SourcePath \"$($sourceFolderName)$($sourceItems)\" -DestinationPath \"$($destinationFolderName)$($destinationPath)\"\n\n# Set user\n$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']\n$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']\n\n# Check to see if user is system\nif ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq \"System\")\n{\n\t# Initiated by the Octopus server via automated process, put something in for the email address\n    $gitAuthorEmail = \"system@octopus.local\"\n}\n\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.name\", $gitAuthorName) -GitFolder \"$($destinationFolderName)\" | Out-Null\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.email\", $gitAuthorEmail) -GitFolder \"$($destinationFolderName)\" | Out-Null\n\n# Commit changes\nInvoke-Git -GitCommand \"add\" -GitFolder \"$destinationFolderName\" -AdditionalArguments @(\".\") | Out-Null\nInvoke-Git -GitCommand \"commit\" -GitFolder \"$destinationFolderName\" -AdditionalArguments @(\"-m\", \"`\"Commit from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`\"\") | Out-Null\n\n# Push the changes back to git\nInvoke-Git -GitCommand \"push\" -GitFolder \"$destinationFolderName\" | Out-Null\n\n"
-  },
-  "Parameters": [
-    {
-      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
-      "Name": "Template.Git.Source.Repo.Url",
-      "Label": "Source Git Repository URL",
-      "HelpText": "The URL used for the `git clone` operation.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
-      "Name": "Template.Git.Source.User.Name",
-      "Label": "Source Git Username",
-      "HelpText": "Username of the credentials to use to log into git.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
-      "Name": "Template.Git.Source.User.Password",
-      "Label": "Source Git User Password",
-      "HelpText": "Password for the git credential.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "5c080713-029f-4f9b-8037-234c7dd579bc",
-      "Name": "Template.Git.Source.Path",
-      "Label": "Source Path",
-      "HelpText": "Relative path to the folder or items to copy.  This field can take wildcards, eg - `/MyPath/*`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5fa438c9-2aa7-476f-ae79-bd77cdc22ccc",
-      "Name": "Template.Git.Tag",
-      "Label": "Tag",
-      "HelpText": "**(Optional)** Checkout the code for `SourcePath` from a specific tag.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6d3f8f4f-8e02-48bc-b473-817693aaf835",
-      "Name": "Template.Git.Destination.Repo.Url",
-      "Label": "Destination Git Repository URL",
-      "HelpText": "The destination repository to copy and push files to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "59590dd8-6698-46f8-884c-78ad9f4b7c2e",
-      "Name": "Template.Git.Destination.User.Name",
-      "Label": "Destination Git Username",
-      "HelpText": "Username of the credentials to log into destination git repo.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d81e0a3d-5eb9-4dd3-a197-e5bf0c48cdf1",
-      "Name": "Template.Git.Destination.User.Password",
-      "Label": "Destination Git User Password",
-      "HelpText": "Password for the destination git credential.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "f9a2141a-bcfa-4e53-862b-429b4f9892d9",
-      "Name": "Template.Git.Destination.Path",
-      "Label": "Destination Path",
-      "HelpText": "Relative path to the folder to copy items to.  This is the folder name only.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-12T15:32:07.199Z",
-    "OctopusVersion": "2023.4.2661",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "git"
-}
diff --git a/step-templates/git-clone-copy-push-package.json b/step-templates/git-clone-copy-push-package.json
deleted file mode 100644
index 28ff0d1b4..000000000
--- a/step-templates/git-clone-copy-push-package.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "Id": "4d541683-4731-4f43-a342-5b9f6c915c4d",
-  "Name": "Git - Clone, copy, push from a Package",
-  "Description": "Clones a repository, copies files from the `Source Package` to the `Destination Path` then commits to the repository.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "88b1ab11-c878-4c7f-8227-610c3784311b",
-      "Name": "Template.Package.Reference",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Template.Package.Reference",
-        "Purpose": ""
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Invoke-Git\n{\n\t# Define parameters\n    param (\n    \t$GitRepositoryUrl,\n        $GitFolder,\n        $GitUsername,\n        $GitPassword,\n        $GitCommand,\n        $AdditionalArguments\n    )\n    \n    # Get current work folder\n    $workDirectory = Get-Location\n\n\t# Check to see if GitFolder exists\n    if (![String]::IsNullOrWhitespace($GitFolder) -and (Test-Path -Path $GitFolder) -eq $false)\n    {\n    \t# Create the folder\n        New-Item -Path $GitFolder -ItemType \"Directory\" -Force | Out-Null\n        \n        # Set the location to the new folder\n        Set-Location -Path $GitFolder\n    }\n    \n    # Create arguments array\n    $gitArguments = @()\n    $gitArguments += $GitCommand\n    \n    # Check for url\n    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))\n    {\n      # Convert url to URI object\n      $gitUri = [System.Uri]$GitRepositoryUrl\n      $gitUrl = \"{0}://{1}:{2}@{3}:{4}{5}\" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery\n      $gitArguments += $gitUrl\n\n      # Get the newly created folder name\n      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf(\"/\") + 1)\n      if ($gitFolderName.Contains(\".git\"))\n      {\n          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf(\".\"))\n      }\n    }\n   \n    \n    # Check for additional arguments\n    if ($null -ne $AdditionalArguments)\n    {\n \t\t# Add the additional arguments\n        $gitArguments += $AdditionalArguments\n    }\n    \n    # Execute git command\n    $results = Execute-Command -commandPath \"git\" -commandArguments $gitArguments -workingDir $GitFolder\n    \n    Write-Host $results.stdout\n    Write-Host $results.stderr\n    \n    # Return the foldername\n    Set-Location -Path $workDirectory\n    \n    # Check to see if GitFolder is null\n    if ($null -ne $GitFolder)\n    {\n    \treturn Join-Path -Path $GitFolder -ChildPath $gitFolderName\n    }\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nFunction Copy-Files\n{\n\t# Define parameters\n    param (\n    \t$SourcePath,\n        $DestinationPath\n    )\n    \n    # Copy the items from source path to destination path\n    $copyArguments = @{}\n    $copyArguments.Add(\"Path\", $SourcePath)\n    $copyArguments.Add(\"Destination\", $DestinationPath)\n    \n    # Check to make sure destination exists\n    if ((Test-Path -Path $DestinationPath) -eq $false)\n    {\n    \t# Create the destination path\n        New-Item -Path $DestinationPath -ItemType \"Directory\" | Out-Null\n    }\n    \n    # Check for wildcard\n    if ($SourcePath.EndsWith(\"/*\") -or $SourcePath.EndsWith(\"\\*\"))\n    {\n\t\t# Add recurse argument\n\t\t$copyArguments.Add(\"Recurse\", $true)\n    }\n    \n    $copyArguments.Add(\"Force\", $true)\n    \n    # Copy files\n    Copy-Item @copyArguments\n}\n\nFunction Execute-Command\n{\n\tparam (\n    \t$commandPath,\n        $commandArguments,\n        $workingDir\n    )\n\n\t$gitExitCode = 0\n    $executionResults = $null\n\n  Try {\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.WorkingDirectory = $workingDir\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n    $executionResults = [pscustomobject]@{\n        stdout = $p.StandardOutput.ReadToEnd()\n        stderr = $p.StandardError.ReadToEnd()\n        ExitCode = $null\n    }\n    $p.WaitForExit()\n    $gitExitCode = [int]$p.ExitCode\n    $executionResults.ExitCode = $gitExitCode\n    \n    if ($gitExitCode -ge 2) \n    {\n\t\t# Fail the step\n        throw\n    }\n    \n    return $executionResults\n  }\n  Catch {\n    # Check exit code\n    Write-Error -Message \"$($executionResults.stderr)\" -ErrorId $gitExitCode\n    exit $gitExitCode\n  }\n\n}\n\nFunction Get-GitExecutable\n{\n\t# Define parameters\n    param (\n    \t$WorkingDirectory\n    )\n      \n    # Define variables\n    $gitExe = \"PortableGit-2.41.0.3-64-bit.7z.exe\"\n    $gitDownloadUrl = \"https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe\"\n    $gitDownloadArguments = @{}\n    $gitDownloadArguments.Add(\"Uri\", $gitDownloadUrl)\n    $gitDownloadArguments.Add(\"OutFile\", \"$WorkingDirectory/git/$gitExe\")\n    \n    # This makes downloading faster\n    $ProgressPreference = 'SilentlyContinue'\n    \n    # Check to see if git subfolder exists\n    if ((Test-Path -Path \"$WorkingDirectory/git\") -eq $false)\n    {\n    \t# Create subfolder\n        New-Item -Path \"$WorkingDirectory/git\"  -ItemType Directory\n    }\n    \n    # Check PowerShell version\n    if ($PSVersionTable.PSVersion.Major -lt 6)\n    {\n    \t# Use basic parsing is required\n        $gitDownloadArguments.Add(\"UseBasicParsing\", $true)\n    }\n    \n    # Download Git\n    Write-Host \"Downloading Git ...\"\n    Invoke-WebRequest @gitDownloadArguments\n    \n    # Extract Git\n    $gitExtractArguments = @()\n    $gitExtractArguments += \"-o\"\n    $gitExtractArguments += \"$WorkingDirectory\\git\"\n    $gitExtractArguments += \"-y\"\n    $gitExtractArguments += \"-bd\"\n\n    Write-Host \"Extracting Git download ...\"\n    & \"$WorkingDirectory\\git\\$gitExe\" $gitExtractArguments\n\n    # Wait until unzip action is complete\n    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(\".\")))}))\n    {\n        Start-Sleep 5\n    }\n    \n    # Add bin folder to path\n    $env:PATH = \"$WorkingDirectory\\git\\bin$([IO.Path]::PathSeparator)\" + $env:PATH\n    \n    # Disable promopt for credential helper\n    Invoke-Git -GitCommand \"config\" -AdditionalArguments @(\"--system\", \"--unset\", \"credential.helper\")\n}\n\n# Get variables\n$gitUrl = $OctopusParameters['Template.Git.Repo.Url']\n$gitUser = $OctopusParameters['Template.Git.User.Name']\n$gitPassword = $OctopusParameters['Template.Git.User.Password']\n$sourceItems = $OctopusParameters['Octopus.Action.Package[Template.Package.Reference].ExtractedPath']\n$destinationPath = $OctopusParameters['Template.Git.Destination.Path']\n$gitSource = $null\n$gitDestination = $null\n\n# Check to see if it's Windows\nif ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq \"Hosted Windows\")\n{\n\t# Dynamic worker don't have git, download portable version and add to path for execution\n    Write-Host \"Detected usage of Windows Dynamic Worker ...\"\n    Get-GitExecutable -WorkingDirectory $PWD\n}\n\n# Clone repository\n$folderName = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand \"clone\" -GitFolder \"$($PWD)/default\"\n\n$gitSource = $sourceItems\n$gitDestination = $folderName\n\n# Copy files from source to destination\nCopy-Files -SourcePath \"$($gitSource)/*\" -DestinationPath \"$($gitDestination)$($destinationPath)\"\n\n# Set user\n$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']\n$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']\n\n# Check to see if user is system\nif ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq \"System\")\n{\n\t# Initiated by the Octopus server via automated process, put something in for the email address\n    $gitAuthorEmail = \"system@octopus.local\"\n}\n\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.name\", $gitAuthorName) -GitFolder \"$($folderName)\" | Out-Null\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.email\", $gitAuthorEmail) -GitFolder \"$($folderName)\" | Out-Null\n\n# Commit changes\nInvoke-Git -GitCommand \"add\" -GitFolder \"$folderName\" -AdditionalArguments @(\".\") | Out-Null\nInvoke-Git -GitCommand \"commit\" -GitFolder \"$folderName\" -AdditionalArguments @(\"-m\", \"`\"Commit from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`\"\") | Out-Null\n\n# Push the changes back to git\nInvoke-Git -GitCommand \"push\" -GitFolder \"$folderName\" | Out-Null\n\n",
-    "Octopus.Action.EnabledFeatures": "Octopus.Features.JsonConfigurationVariables",
-    "Octopus.Action.Package.JsonConfigurationVariablesTargets": "#{Template.VariableReplacement.Paths}"
-  },
-  "Parameters": [
-    {
-      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
-      "Name": "Template.Git.Repo.Url",
-      "Label": "Git Repository URL",
-      "HelpText": "The URL used for the `git clone` operation.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
-      "Name": "Template.Git.User.Name",
-      "Label": "Git Username",
-      "HelpText": "Username of the credentials to use to log into git.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
-      "Name": "Template.Git.User.Password",
-      "Label": "Git User Password",
-      "HelpText": "Password for the git credential.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "6d6b0662-22bd-4fbc-b0dd-15799b158abe",
-      "Name": "Template.Package.Reference",
-      "Label": "Package",
-      "HelpText": "Choose the package to copy files from into the Git repository.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "f9a2141a-bcfa-4e53-862b-429b4f9892d9",
-      "Name": "Template.Git.Destination.Path",
-      "Label": "Destination Path",
-      "HelpText": "Relative path to the folder to copy items to.  This is the folder name only.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e382b0db-0ea2-47bb-968b-2dae9a8b861d",
-      "Name": "Template.VariableReplacement.Paths",
-      "Label": "Structured Configuration Variables",
-      "HelpText": "Target files need to be new line seperated, relative to the package contents. Extended wildcard syntax is supported. E.g., appsettings.json, Config\\*.xml, **\\specific-folder\\*.yaml. Learn more about Structured Configuration Variables and view examples.",
-      "DefaultValue": " ",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-12T15:31:36.900Z",
-    "OctopusVersion": "2023.4.2661",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "git"
-}
diff --git a/step-templates/git-clone-copy-push.json b/step-templates/git-clone-copy-push.json
deleted file mode 100644
index d6928b16a..000000000
--- a/step-templates/git-clone-copy-push.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "Id": "492dd5fe-26f5-4d12-800d-ad2cce008de6",
-  "Name": "Git - Clone, copy, push",
-  "Description": "Clones a repository, copies files from the `Source Path` to the `Destination Path` then commits to the repository.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Invoke-Git\n{\n\t# Define parameters\n    param (\n    \t$GitRepositoryUrl,\n        $GitFolder,\n        $GitUsername,\n        $GitPassword,\n        $GitCommand,\n        $AdditionalArguments\n    )\n    \n    # Get current work folder\n    $workDirectory = Get-Location\n\n\t# Check to see if GitFolder exists\n    if (![String]::IsNullOrWhitespace($GitFolder) -and (Test-Path -Path $GitFolder) -eq $false)\n    {\n    \t# Create the folder\n        New-Item -Path $GitFolder -ItemType \"Directory\" -Force | Out-Null\n        \n        # Set the location to the new folder\n        Set-Location -Path $GitFolder\n    }\n    \n    # Create arguments array\n    $gitArguments = @()\n    $gitArguments += $GitCommand\n    \n    # Check for url\n    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))\n    {\n      # Convert url to URI object\n      $gitUri = [System.Uri]$GitRepositoryUrl\n      $gitUrl = \"{0}://{1}:{2}@{3}:{4}{5}\" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery\n      $gitArguments += $gitUrl\n\n      # Get the newly created folder name\n      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf(\"/\") + 1)\n      if ($gitFolderName.Contains(\".git\"))\n      {\n          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf(\".\"))\n      }\n    }\n   \n    \n    # Check for additional arguments\n    if ($null -ne $AdditionalArguments)\n    {\n \t\t# Add the additional arguments\n        $gitArguments += $AdditionalArguments\n    }\n    \n    # Execute git command\n    $results = Execute-Command -commandPath \"git\" -commandArguments $gitArguments -workingDir $GitFolder\n    \n    Write-Host $results.stdout\n    Write-Host $results.stderr\n    \n    # Return the foldername\n    Set-Location -Path $workDirectory\n    \n    # Check to see if GitFolder is null\n    if ($null -ne $GitFolder)\n    {\n    \treturn Join-Path -Path $GitFolder -ChildPath $gitFolderName\n    }\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nFunction Copy-Files\n{\n\t# Define parameters\n    param (\n    \t$SourcePath,\n        $DestinationPath\n    )\n    \n    # Copy the items from source path to destination path\n    $copyArguments = @{}\n    $copyArguments.Add(\"Path\", $SourcePath)\n    $copyArguments.Add(\"Destination\", $DestinationPath)\n    \n    # Check to make sure destination exists\n    if ((Test-Path -Path $DestinationPath) -eq $false)\n    {\n    \t# Create the destination path\n        New-Item -Path $DestinationPath -ItemType \"Directory\" | Out-Null\n    }\n    \n    # Check for wildcard\n    if ($SourcePath.EndsWith(\"/*\") -or $SourcePath.EndsWith(\"\\*\"))\n    {\n\t\t# Add recurse argument\n\t\t$copyArguments.Add(\"Recurse\", $true)\n    }\n    \n    # Force overwrite\n    $copyArguments.Add(\"Force\", $true)\n    \n    # Copy files\n    Copy-Item @copyArguments\n}\n\nFunction Execute-Command\n{\n\tparam (\n    \t$commandPath,\n        $commandArguments,\n        $workingDir\n    )\n\n\t$gitExitCode = 0\n    $executionResults = $null\n\n  Try {\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.WorkingDirectory = $workingDir\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n    $executionResults = [pscustomobject]@{\n        stdout = $p.StandardOutput.ReadToEnd()\n        stderr = $p.StandardError.ReadToEnd()\n        ExitCode = $null\n    }\n    $p.WaitForExit()\n    $gitExitCode = [int]$p.ExitCode\n    $executionResults.ExitCode = $gitExitCode\n    \n    if ($gitExitCode -ge 2) \n    {\n\t\t# Fail the step\n        throw\n    }\n    \n    return $executionResults\n  }\n  Catch {\n    # Check exit code\n    Write-Error -Message \"$($executionResults.stderr)\" -ErrorId $gitExitCode\n    exit $gitExitCode\n  }\n\n}\n\nFunction Get-GitExecutable\n{\n\t# Define parameters\n    param (\n    \t$WorkingDirectory\n    )\n      \n    # Define variables\n    $gitExe = \"PortableGit-2.41.0.3-64-bit.7z.exe\"\n    $gitDownloadUrl = \"https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe\"\n    $gitDownloadArguments = @{}\n    $gitDownloadArguments.Add(\"Uri\", $gitDownloadUrl)\n    $gitDownloadArguments.Add(\"OutFile\", \"$WorkingDirectory/git/$gitExe\")\n    \n    # This makes downloading faster\n    $ProgressPreference = 'SilentlyContinue'\n    \n    # Check to see if git subfolder exists\n    if ((Test-Path -Path \"$WorkingDirectory/git\") -eq $false)\n    {\n    \t# Create subfolder\n        New-Item -Path \"$WorkingDirectory/git\"  -ItemType Directory\n    }\n    \n    # Check PowerShell version\n    if ($PSVersionTable.PSVersion.Major -lt 6)\n    {\n    \t# Use basic parsing is required\n        $gitDownloadArguments.Add(\"UseBasicParsing\", $true)\n    }\n    \n    # Download Git\n    Write-Host \"Downloading Git ...\"\n    Invoke-WebRequest @gitDownloadArguments\n    \n    # Extract Git\n    $gitExtractArguments = @()\n    $gitExtractArguments += \"-o\"\n    $gitExtractArguments += \"$WorkingDirectory\\git\"\n    $gitExtractArguments += \"-y\"\n    $gitExtractArguments += \"-bd\"\n\n    Write-Host \"Extracting Git download ...\"\n    & \"$WorkingDirectory\\git\\$gitExe\" $gitExtractArguments\n\n    # Wait until unzip action is complete\n    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(\".\")))}))\n    {\n        Start-Sleep 5\n    }\n    \n    # Add bin folder to path\n    $env:PATH = \"$WorkingDirectory\\git\\bin$([IO.Path]::PathSeparator)\" + $env:PATH\n    \n    # Disable promopt for credential helper\n    Invoke-Git -GitCommand \"config\" -AdditionalArguments @(\"--system\", \"--unset\", \"credential.helper\")\n}\n\n# Get variables\n$gitUrl = $OctopusParameters['Template.Git.Repo.Url']\n$gitUser = $OctopusParameters['Template.Git.User.Name']\n$gitPassword = $OctopusParameters['Template.Git.User.Password']\n$sourceItems = $OctopusParameters['Template.Git.Source.Path']\n$destinationPath = $OctopusParameters['Template.Git.Destination.Path']\n$gitTag = $OctopusParameters['Template.Git.Tag']\n$gitSource = $null\n$gitDestination = $null\n\n# Check to see if it's Windows\nif ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq \"Hosted Windows\")\n{\n\t# Dynamic worker don't have git, download portable version and add to path for execution\n    Write-Host \"Detected usage of Windows Dynamic Worker ...\"\n    Get-GitExecutable -WorkingDirectory $PWD\n}\n\n# Clone repository\n$folderName = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand \"clone\" -GitFolder \"$($PWD)/default\"\n\n# Check for tag\nif (![String]::IsNullOrWhitespace($gitTag))\n{\n\t$gitDestination = $folderName\n    $gitSource = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand \"clone\" -GitFolder \"$($PWD)/tags/$gitTag\" -AdditionalArguments @(\"-b\", \"$gitTag\")\n}\nelse\n{\n\t$gitSource = $folderName\n    $gitDestination = $folderName\n}\n\n# Copy files from source to destination\nCopy-Files -SourcePath \"$($gitSource)$($sourceItems)\" -DestinationPath \"$($gitDestination)$($destinationPath)\"\n\n# Set user\n$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']\n$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']\n\n# Check to see if user is system\nif ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq \"System\")\n{\n\t# Initiated by the Octopus server via automated process, put something in for the email address\n    $gitAuthorEmail = \"system@octopus.local\"\n}\n\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.name\", $gitAuthorName) -GitFolder \"$($folderName)\" | Out-Null\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.email\", $gitAuthorEmail) -GitFolder \"$($folderName)\" | Out-Null\n\n# Commit changes\nInvoke-Git -GitCommand \"add\" -GitFolder \"$folderName\" -AdditionalArguments @(\".\") | Out-Null\nInvoke-Git -GitCommand \"commit\" -GitFolder \"$folderName\" -AdditionalArguments @(\"-m\", \"`\"Commit from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`\"\") | Out-Null\n\n# Push the changes back to git\nInvoke-Git -GitCommand \"push\" -GitFolder \"$folderName\" | Out-Null\n\n"
-  },
-  "Parameters": [
-    {
-      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
-      "Name": "Template.Git.Repo.Url",
-      "Label": "Git Repository URL",
-      "HelpText": "The URL used for the `git clone` operation.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
-      "Name": "Template.Git.User.Name",
-      "Label": "Git Username",
-      "HelpText": "Username of the credentials to use to log into git.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
-      "Name": "Template.Git.User.Password",
-      "Label": "Git User Password",
-      "HelpText": "Password for the git credential.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "5c080713-029f-4f9b-8037-234c7dd579bc",
-      "Name": "Template.Git.Source.Path",
-      "Label": "Source Path",
-      "HelpText": "Relative path to the folder or items to copy.  This field can take wildcards, eg - `/MyPath/*`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f9a2141a-bcfa-4e53-862b-429b4f9892d9",
-      "Name": "Template.Git.Destination.Path",
-      "Label": "Destination Path",
-      "HelpText": "Relative path to the folder to copy items to.  This is the folder name only.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5fa438c9-2aa7-476f-ae79-bd77cdc22ccc",
-      "Name": "Template.Git.Tag",
-      "Label": "Tag",
-      "HelpText": "**(Optional)** Checkout the code for `SourcePath` from a specific tag.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-12T15:29:34.628Z",
-    "OctopusVersion": "2023.4.2661",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "git"
-}
diff --git a/step-templates/git-create-pull-request.json b/step-templates/git-create-pull-request.json
deleted file mode 100644
index dc8ac1522..000000000
--- a/step-templates/git-create-pull-request.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "Id": "a24c6354-5612-4e2c-a0ff-9b5a329fc0e9",
-  "Name": "Git - Create Pull Request",
-  "Description": "Create a Pull or Merge Request for the repository",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Get variables\n$gitUrl = $OctopusParameters['Template.Git.Repo.Url']\n$gitUser = $OctopusParameters['Template.Git.User.Name']\n$gitPassword = $OctopusParameters['Template.Git.User.Password']\n$gitSourceBranch = $OctopusParameters['Template.Git.Source.Branch']\n$gitDestinationBranch = $OctopusParameters['Template.Git.Destination.Branch']\n$gitTech = $OctopusParameters['Template.Git.Repository.Technology']\n\n# Convert url into uri object\n$gitUri = [System.Uri]$gitUrl\n\nswitch ($gitTech)\n{\n    \"ado\"\n    {\n\n\t\t# Parse url\n        $gitOrganization = $gitUri.AbsolutePath\n        $gitOrganization = $gitOrganization.Substring(1)\n\t\t$gitOrganization = $gitOrganization.Substring(0, $gitOrganization.IndexOf(\"/\"))\n        \n        # Encode personal access token\n        $encodedPAT = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes(\"`:$gitPassword\"))\n        \n        # Construct Headers\n        $header = @{\n        \tAuthorization = \"Basic $encodedPAT\"\n        }\n                \n        $gitProject = $gitUri.AbsolutePath.Replace($gitOrganization, \"\").Replace(\"//\", \"\")\n        $gitProject = $gitProject.Substring(0, $gitProject.IndexOf(\"/\"))\n        \n\t\t# Create pull request\n        $jsonBody = @{\n        \tsourceRefName = \"refs/heads/\" + $gitSourceBranch\n            targetRefName = \"refs/heads/\" + $gitDestinationBranch\n            title = \"PR from Octopus Deploy\"\n            description = \"PR from #{Octopus.Project.Name} release version #{Octopus.Release.Number}\"\n        }\n        \n        # Construct API call\n        $adoApiUrl = \"{0}://{1}:{2}/{3}/{4}/_apis/git/repositories/{4}/pullrequests\" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitOrganization, $gitProject\n        Invoke-RestMethod -Method Post -Uri ($adoApiUrl + \"?api-version=7.0\") -Body ($jsonBody | ConvertTo-Json -Depth 10) -Headers $header -ContentType \"application/json\"\n    }\n    \"bitbucket\"\n    {\n\t\t# Parse url\n        $gitOrganization = $gitUri.AbsolutePath\n        $gitOrganization = $gitOrganization.Substring(1)\n\t\t$gitOrganization = $gitOrganization.Substring(0, $gitOrganization.IndexOf(\"/\"))\n        $gitProject = $gitUri.AbsolutePath.Replace($gitOrganization, \"\").Replace(\"//\", \"\")\n        \n        # Check to see if Repo Name ends with .git\n        if ($gitProject.EndsWith(\".git\"))\n        {\n        \t# Strip off the last part\n            $gitProject = $gitProject.Replace(\".git\", \"\")\n        }\n\n        # Construct Headers\n        $header = @{\n        \tAuthorization = \"Bearer $gitPassword\"\n        }\n        \n        # Construct API url\n        $bitbucketApiUrl = \"{0}://api.{1}:{2}/2.0/repositories/{3}/{4}/pullrequests\" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitOrganization, $gitProject\n        \n\t\t# Construct json body\n        $jsonBody = @{\n        \ttitle = \"PR from Octopus Deploy\"\n            source = @{\n            \tbranch = @{\n                \tname = $gitSourceBranch\n                }\n            }\n            destination = @{\n            \tbranch = @{\n                \tname = $gitDestinationBranch\n                }\n            }\n        }\n        \n        # Create PR\n        Invoke-RestMethod -Method Post -Uri $bitbucketApiUrl -Headers $header -Body ($jsonBody | ConvertTo-Json -Depth 10) -ContentType \"application/json\"\n    }\n    \"github\"\n    {\n        # Parse URL\n        $gitRepoOwner = $gitUri.AbsolutePath.Substring(1, $gitUri.AbsolutePath.LastIndexOf(\"/\") - 1)\n        $gitRepoName = $gitUri.AbsolutePath.Substring($gitUri.AbsolutePath.LastIndexOf(\"/\") + 1 )\n        \n        # Check to see if Repo Name ends with .git\n        if ($gitRepoName.EndsWith(\".git\"))\n        {\n        \t# Strip off the last part\n            $gitRepoName = $gitRepoName.Replace(\".git\", \"\")\n        }\n        \n        # Construct API endpoint\n        $githubApiUrl = \"{0}://api.{1}:{2}/repos/{3}/{4}/pulls\" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitRepoOwner, $gitRepoName\n        \n        # Construct Headers\n        $header = @{\n        \tAuthorization = \"Bearer $gitPassword\"\n            Accept = \"application/vnd.github+json\"\n            \"X-Github-Api-Version\" = \"2022-11-28\"\n        }\n        \n        # Construct body\n        $jsonBody = @{\n        \ttitle = \"PR from Octopus Deploy\"\n            body = \"PR from #{Octopus.Project.Name} release version #{Octopus.Release.Number}\"\n            head = $gitSourceBranch\n            base = $gitDestinationBranch\n        }\n        \n        # Create the pull request\n        Invoke-RestMethod -Method Post -Uri $gitHubApiUrl -Headers $header -Body ($jsonBody | ConvertTo-Json -Depth 10)\n    }\n    \"gitlab\"\n    {\n\t\t# Get project name\n        $gitlabProjectName = $gitUrl.SubString($gitUrl.LastIndexOf(\"/\") + 1)\n        \n        # Parse uri\n        $gitlabApiUrl = \"{0}://{1}:{2}/api/v4/users/{3}/projects\" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitUser\n        \n        # Check to see if it ends in .git\n        if ($gitlabProjectName.EndsWith(\".git\"))\n        {\n        \t# Strip that part off\n            $gitlabProjectName = $gitlabProjectName.Replace(\".git\", \"\")\n        }\n        \n        # Create header\n        $header = @{ \"PRIVATE-TOKEN\" = $gitPassword }\n        \n        # Get the project\n        $gitlabProject = (Invoke-RestMethod -Method Get -Uri $gitlabApiUrl -Headers $header) | Where-Object {$_.Name -eq $gitlabProjectName}\n        \n        # Create the merge request\n         $gitlabApiUrl = \"{0}://{1}:{2}/api/v4/projects/{3}/merge_requests?source_branch={4}&target_branch={5}&target_project_id={3}&title={6}\" -f $gitUri.Scheme, $gitUri.Host, $gitUri.Port, $gitlabProject.id, $gitSourceBranch, $gitDestinationBranch, \"PR from #{Octopus.Project.Name} release version #{Octopus.Release.Number}\"\n        Invoke-RestMethod -Method Post -Uri $gitlabApiUrl -Headers $header\n    }\n}\n\n<#\n# Set user\n$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']\n$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']\n\n# Check to see if user is system\nif ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq \"System\")\n{\n\t# Initiated by the Octopus server via automated process, put something in for the email address\n    $gitAuthorEmail = \"system@octopus.local\"\n}\n\n# Configure user information\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.name\", $gitAuthorName) #-GitFolder \"$($PWD)/$($folderName)\"\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.email\", $gitAuthorEmail) #-GitFolder \"$($PWD)/$($folderName)\"\n\n\n# Push the new tag\nInvoke-Git -Gitcommand \"request-pull\" -AdditionalArguments @(\"$gitSourceBranch\", $gitUrl, \"$gitDestinationBranch\") -GitFolder \"$($PWD)/$($folderName)\"    \n#>"
-  },
-  "Parameters": [
-    {
-      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
-      "Name": "Template.Git.Repo.Url",
-      "Label": "Git Repository URL",
-      "HelpText": "The URL used for the `git clone` operation.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
-      "Name": "Template.Git.User.Name",
-      "Label": "Git Username",
-      "HelpText": "Username of the credentials to use to log into git.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
-      "Name": "Template.Git.User.Password",
-      "Label": "Git User Password",
-      "HelpText": "Password for the git credential.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "7cfa6ba5-76c6-4b15-a30c-593e2cd8f914",
-      "Name": "Template.Git.Source.Branch",
-      "Label": "Source Branch",
-      "HelpText": "The source branch name to compare the repository with.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2b0ee0d3-8542-4db2-87fc-52ee41e63cc6",
-      "Name": "Template.Git.Destination.Branch",
-      "Label": "Destination Branch",
-      "HelpText": "The destination branch to create the pull/merge request against.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "74d8fc6d-2a4c-49ad-b7f8-248dcf44fc0f",
-      "Name": "Template.Git.Repository.Technology",
-      "Label": "Source Control Technology",
-      "HelpText": "Select which source control technology to create the request on.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "ado|Azure DevOps\nbitbucket|BitBucket\ngithub|GitHub\ngitlab|GitLab"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-12T15:32:53.416Z",
-    "OctopusVersion": "2023.4.2661",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "git"
-}
diff --git a/step-templates/git-pull-https.json b/step-templates/git-pull-https.json
deleted file mode 100644
index b43f37e74..000000000
--- a/step-templates/git-pull-https.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "5c08170d-e919-4afe-9da3-7616c797d42b",
-  "Name": "Git - Pull (HTTPS)",
-  "Description": "Gets the latest source for a Git repository.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"System.Web\")\nfunction Format-UriWithCredentials($url, $username, $password) {\n    $uri = New-Object \"System.Uri\" $url\n    \n    $url = $uri.Scheme + \"://\"\n    if (-not [string]::IsNullOrEmpty($username)) {\n        $url = $url + [System.Web.HttpUtility]::UrlEncode($username)\n        \n        if (-not [string]::IsNullOrEmpty($password)) {\n            $url = $url + \":\" + [System.Web.HttpUtility]::UrlEncode($password)  \n        }\n        \n        $url = $url + \"@\"    \n    } elseif (-not [string]::IsNullOrEmpty($uri.UserInfo)) {\n        $url = $uri.UserInfo + \"@\"\n    }\n\n    $url = $url + $uri.Host + $uri.PathAndQuery\n    return $url\n}\n\nfunction Test-LastExit($cmd) {\n    if ($LastExitCode -ne 0) {\n        Write-Host \"##octopus[stderr-error]\"\n        write-error \"$cmd failed with exit code: $LastExitCode\"\n    }\n}\n\n$tempDirectoryPath = $OctopusParameters['Octopus.Tentacle.Agent.ApplicationDirectoryPath']\n$tempDirectoryPath = join-path $tempDirectoryPath \"GitPull\" \n$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Environment.Name']\n$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Project.Name']\n$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Action.Name']\n\nWrite-Host \"Repository will be cloned to: $tempDirectoryPath\"\n\n# Step 1: Ensure we have the latest version of the repository\nmkdir $tempDirectoryPath -ErrorAction SilentlyContinue\ncd $tempDirectoryPath\n\nWrite-Host \"##octopus[stderr-progress]\"\n\ngit init\nTest-LastExit \"git init\"\n\n$url = Format-UriWithCredentials -url $OctopusParameters['GitHttpsUrl'] -username $OctopusParameters['Username'] -password $OctopusParameters['Password']\n\n$branch = $OctopusParameters['GitHttpsBranchName']\n\n# We might have already run before, so we need to reset the origin\ngit remote remove origin\ngit remote add origin $url\nTest-LastExit \"git remote add origin\"\n\nWrite-Host \"Fetching remote repository\"\ngit fetch origin\nTest-LastExit \"git fetch origin\"\n\nWrite-Host \"Check out branch $branch\"\ngit reset --hard \"origin/$branch\"\nTest-LastExit \"git reset --hard\"\n\nSet-OctopusVariable -name \"RepositoryDirectory\" -value $tempDirectoryPath\nWrite-Verbose \"Directory path '$tempDirectoryPath' available in 'RepositoryDirectory' output variable\"\nWrite-Host \"Repository successfully cloned to: $tempDirectoryPath\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "GitHttpsUrl",
-      "Label": "Clone URL",
-      "HelpText": "'https://' URL to the repository that will be cloned from.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Username to use when authenticating with the HTTPS server.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Password to use when authenticating with the HTTPS server. You should create a sensitive variable in your project variables, and then bind this value.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "GitHttpsBranchName",
-      "Label": "Branch name",
-      "HelpText": "Name of the Git branch to clone",
-      "DefaultValue": "master",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-16T00:23:33.282+00:00",
-    "OctopusVersion": "2.4.4.43",
-    "Type": "ActionTemplate"
-  },
-  "Category": "git"
-}
diff --git a/step-templates/git-push-https.json b/step-templates/git-push-https.json
deleted file mode 100644
index ffe086460..000000000
--- a/step-templates/git-push-https.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Id": "85cc56f9-26cb-4b0e-8320-854e88a09a25",
-  "Name": "Git - Push (HTTPS)",
-  "Description": "Deploy a package using Git to a HTTPS server. Performs a clone, overwrites the repository with the files from your package, then pushes. Great for deploying to AppHarbor and Windows Azure websites.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"System.Web\")\n\n# A collection of functions that can be used by script steps to determine where packages installed\n# by previous steps are located on the filesystem.\n \nfunction Find-InstallLocations {\n    $result = @()\n    $OctopusParameters.Keys | foreach {\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\n            $result += $OctopusParameters[$_]\n        }\n    }\n    return $result\n}\n \nfunction Find-InstallLocation($stepName) {\n    $result = $OctopusParameters.Keys | where {\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\n    } | select -first 1\n \n    if ($result) {\n        return $OctopusParameters[$result]\n    }\n \n    throw \"No install location found for step: $stepName\"\n}\n \nfunction Find-SingleInstallLocation {\n    $all = @(Find-InstallLocations)\n    if ($all.Length -eq 1) {\n        return $all[0]\n    }\n    if ($all.Length -eq 0) {\n        throw \"No package steps found\"\n    }\n    throw \"Multiple package steps have run; please specify a single step\"\n}\n\nfunction Format-UriWithCredentials($url, $username, $password) {\n    $uri = New-Object \"System.Uri\" $url\n    \n    $url = $uri.Scheme + \"://\"\n    if (-not [string]::IsNullOrEmpty($username)) {\n        $url = $url + [System.Web.HttpUtility]::UrlEncode($username)\n        \n        if (-not [string]::IsNullOrEmpty($password)) {\n            $url = $url + \":\" + [System.Web.HttpUtility]::UrlEncode($password)  \n        }\n        \n        $url = $url + \"@\"    \n    } elseif (-not [string]::IsNullOrEmpty($uri.UserInfo)) {\n        $url = $uri.UserInfo + \"@\"\n    }\n\n    $url = $url + $uri.Host + $uri.PathAndQuery\n    return $url\n}\n\nfunction Test-LastExit($cmd) {\n    if ($LastExitCode -ne 0) {\n        Write-Host \"##octopus[stderr-error]\"\n        write-error \"$cmd failed with exit code: $LastExitCode\"\n    }\n}\n\n$tempDirectoryPath = $OctopusParameters['Octopus.Tentacle.Agent.ApplicationDirectoryPath']\n$tempDirectoryPath = join-path $tempDirectoryPath \"GitPush\" \n$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Environment.Name']\n$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Project.Name']\n$tempDirectoryPath = join-path $tempDirectoryPath $OctopusParameters['Octopus.Action.Name']\n\n$stepName = $OctopusParameters['GitHttpsPackageStepName']\n\n$stepPath = \"\"\nif (-not [string]::IsNullOrEmpty($stepName)) {\n    Write-Host \"Finding path to package step: $stepName\"\n    $stepPath = Find-InstallLocation $stepName\n} else {\n    $stepPath = Find-SingleInstallLocation\n}\nWrite-Host \"Package was installed to: $stepPath\"\n\nWrite-Host \"Repository will be cloned to: $tempDirectoryPath\"\n\n# Step 1: Ensure we have the latest version of the repository\nmkdir $tempDirectoryPath -ErrorAction SilentlyContinue\ncd $tempDirectoryPath\n\nWrite-Host \"##octopus[stderr-progress]\"\n \ngit init\nTest-LastExit \"git init\"\n\n$url = Format-UriWithCredentials -url $OctopusParameters['GitHttpsUrl'] -username $OctopusParameters['Username'] -password $OctopusParameters['Password']\n\n$branch = $OctopusParameters['GitHttpsBranchName']\n\n# We might have already run before, so we need to reset the origin\ngit remote remove origin\ngit remote add origin $url\nTest-LastExit \"git remote add origin\"\n\nWrite-Host \"Fetching remote repository\"\ngit fetch origin\nTest-LastExit \"git fetch origin\"\n\nWrite-Host \"Check out branch $branch\"\ngit reset --hard \"origin/$branch\"\n\n# Step 2: Overwrite the contents\nwrite-host \"Synchronizing package contents with local git repository using Robocopy\"\n& robocopy $stepPath $tempDirectoryPath /MIR /xd \".git\"\nif ($lastexitcode -ge 5) {\n    write-error \"Unable to copy files from the package to the local cloned Git repository. See the Robocopy errors above for details.\"\n}\n\n# Step 3: Push the results\n$deploymentName = $OctopusParameters['Octopus.Deployment.Name']\n$releaseName = $OctopusParameters['Octopus.Release.Number']\n$projName = $OctopusParameters['Octopus.Project.Name']\n\ngit add . -A\nTest-LastExit \"git add\"\n\ngit diff-index --quiet HEAD\nif ($lastexitcode -ne 0) {\n    git commit -m \"$projName release $releaseName - $deploymentName\"\n    Test-LastExit \"git commit\"\n}\n\ngit push origin $branch\nTest-LastExit \"git push\"\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "GitHttpsUrl",
-      "Label": "Clone URL",
-      "HelpText": "`https://` URL to the repository that will be cloned from and pushed to.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Username to use when authenticating with the HTTPS server.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Password to use when authenticating with the HTTPS server. You should create a sensitive variable in your project variables, and then bind this value.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "GitHttpsPackageStepName",
-      "Label": "Package step name",
-      "HelpText": "Name of the previously-deployed package step that contains the files that you want to push.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "GitHttpsBranchName",
-      "Label": "Branch name",
-      "HelpText": "Name of the Git branch to clone/push",
-      "DefaultValue": "master",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-10-24T14:59:45.295+00:00",
-    "OctopusVersion": "2.5.11.614",
-    "Type": "ActionTemplate"
-  },
-  "Category": "git"
-}
\ No newline at end of file
diff --git a/step-templates/git-tag-repository.json b/step-templates/git-tag-repository.json
deleted file mode 100644
index a01b9a962..000000000
--- a/step-templates/git-tag-repository.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "dd76dee1-f5b1-4974-a5ae-bde643cf67af",
-  "Name": "Git - Tag repository",
-  "Description": "Tags a git repository with the specified tag",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Invoke-Git\n{\n\t# Define parameters\n    param (\n    \t$GitRepositoryUrl,\n        $GitFolder,\n        $GitUsername,\n        $GitPassword,\n        $GitCommand,\n        $AdditionalArguments,\n        $SupressOutput = $false\n    )\n    \n    # Get current work folder\n    $workDirectory = Get-Location\n    \n    # Create arguments array\n    $gitArguments = @()\n    $gitArguments += $GitCommand\n    \n    # Check for url\n    if (![string]::IsNullOrWhitespace($GitRepositoryUrl))\n    {\n      # Convert url to URI object\n      $gitUri = [System.Uri]$GitRepositoryUrl\n      $gitUrl = \"{0}://{1}:{2}@{3}:{4}{5}\" -f $gitUri.Scheme, $GitUsername, $GitPassword, $gitUri.Host, $gitUri.Port, $gitUri.PathAndQuery\n      $gitArguments += $gitUrl\n\n      # Get the newly created folder name\n      $gitFolderName = $GitRepositoryUrl.SubString($GitRepositoryUrl.LastIndexOf(\"/\") + 1)\n      if ($gitFolderName.Contains(\".git\"))\n      {\n          $gitFolderName = $gitFolderName.SubString(0, $gitFolderName.IndexOf(\".\"))\n      }\n    }\n   \n    \n    # Check for additional arguments\n    if ($null -ne $AdditionalArguments)\n    {\n \t\t# Add the additional arguments\n        $gitArguments += $AdditionalArguments\n    }\n    \n    # Execute git command\n    $results = Execute-Command \"git\" $gitArguments $GitFolder\n    \n    # Check to see if output is supposed to be suppressed\n    if ($SupressOutput -ne $true)\n    {\n    \tWrite-Host $results.stdout\n    }\n\n\t# Always display error messages\n    Write-Host $results.stderr\n    \n    # Store results into file\n    Add-Content -Path \"$PWD/$($GitCommand).txt\" -Value $results.stdout\n    \n    # Return the foldername\n   \treturn $gitFolderName\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nFunction Execute-Command\n{\n\tparam (\n    \t$commandPath,\n        $commandArguments,\n        $workingDir\n    )\n\n\t$gitExitCode = 0\n    $executionResults = $null\n\n  Try {\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.WorkingDirectory = $workingDir\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n    $executionResults = [pscustomobject]@{\n        stdout = $p.StandardOutput.ReadToEnd()\n        stderr = $p.StandardError.ReadToEnd()\n        ExitCode = $null\n    }\n    $p.WaitForExit()\n    $gitExitCode = [int]$p.ExitCode\n    $executionResults.ExitCode = $gitExitCode\n    \n    if ($gitExitCode -ge 2) \n    {\n\t\t# Fail the step\n        throw\n    }\n    \n    return $executionResults\n  }\n  Catch {\n    # Check exit code\n    Write-Error -Message \"$($executionResults.stderr)\" -ErrorId $gitExitCode\n    exit $gitExitCode\n  }\n\n}\n\n\n# Get variables\n$gitUrl = $OctopusParameters['Template.Git.Repo.Url']\n$gitUser = $OctopusParameters['Template.Git.User.Name']\n$gitPassword = $OctopusParameters['Template.Git.User.Password']\n$gitTag = $OctopusParameters['Template.Git.Tag']\n$gitAction = $OctopusParameters['Template.Git.Action']\n\n# Clone repository\n$folderName = Invoke-Git -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword -GitCommand \"clone\"\n\n# Set user\n$gitAuthorName = $OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']\n$gitAuthorEmail = $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']\n\n# Check to see if user is system\nif ([string]::IsNullOrWhitespace($gitAuthorEmail) -and $gitAuthorName -eq \"System\")\n{\n\t# Initiated by the Octopus server via automated process, put something in for the email address\n    $gitAuthorEmail = \"system@octopus.local\"\n}\n\n# Configure user information\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.name\", $gitAuthorName) -GitFolder \"$($PWD)/$($folderName)\"\nInvoke-Git -GitCommand \"config\" -AdditionalArguments @(\"user.email\", $gitAuthorEmail) -GitFolder \"$($PWD)/$($folderName)\"\n\n# Record existing tags, if any\nInvoke-Git -GitCommand \"tag\" -GitFolder \"$($PWD)/$($folderName)\" -SupressOutput $true\n\n# Check the file\n$existingTags = Get-Content \"$PWD/tag.txt\"\n\nif (![String]::IsNullOrWhitespace($existingTags))\n{\n\t# Parse\n    $existingTags = $existingTags.Split(\"`n\",[System.StringSplitOptions]::RemoveEmptyEntries)\n    \n    # Check to see if tag already exists\n    if ($null -ne ($existingTags | Where-Object {$_ -eq $gitTag}))\n    {\n\t\t# Check the selected action\n        switch ($gitAction)\n        {\n        \t\"delete\"\n            {\n                # Delete the tag locally\n                Write-Host \"Deleting tag $gitTag from cloned repository ...\"\n                Invoke-Git -GitCommand \"tag\" -AdditionalArguments @(\"--delete\", \"$gitTag\") -GitFolder \"$($PWD)/$($folderName)\"\n                \n                # Delete the tag on remote\n                Write-Host \"Deleting tag from remote repository ...\"\n                Invoke-Git -GitCommand \"push\" -AdditionalArguments @(\":refs/tags/$gitTag\") -GitFolder \"$($PWD)/$($folderName)\" -GitRepositoryUrl $gitUrl -GitUsername $gitUser -GitPassword $gitPassword\n                \n                break\n            }\n            \"ignore\"\n            {\n            \t# Ignore and continue\n                Write-Host \"$gitTag already exists on $gitUrl.  Selected action is Ignore, exiting.\"\n                \n                exit 0\n            }\n            \"fail\"\n            {\n\t\t\t\t# Error, tag already exists\n        \t\tWrite-Error \"Error: $gitTag already exists on $gitUrl!\"\n            }\n        }\n    }\n}\n\n# Tag the repo\nInvoke-Git -GitCommand \"tag\" -AdditionalArguments @(\"-a\", $gitTag, \"-m\", \"`\"Tag from #{Octopus.Project.Name} release version #{Octopus.Release.Number}`\"\") -GitFolder \"$($PWD)/$($folderName)\"\n\n# Push the new tag\nInvoke-Git -Gitcommand \"push\" -AdditionalArguments @(\"--tags\") -GitFolder \"$($PWD)/$($folderName)\""
-  },
-  "Parameters": [
-    {
-      "Id": "674d5325-aa93-4779-a734-cee8e5690f17",
-      "Name": "Template.Git.Repo.Url",
-      "Label": "Git Repository URL",
-      "HelpText": "The URL used for the `git clone` operation.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f2d07c9c-85fc-485e-8057-5577efd9a26d",
-      "Name": "Template.Git.User.Name",
-      "Label": "Git Username",
-      "HelpText": "Username of the credentials to use to log into git.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "597ae9a5-1ef4-4062-a435-2d9bb1fb16a2",
-      "Name": "Template.Git.User.Password",
-      "Label": "Git User Password",
-      "HelpText": "Password for the git credential.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "7cfa6ba5-76c6-4b15-a30c-593e2cd8f914",
-      "Name": "Template.Git.Tag",
-      "Label": "Tag",
-      "HelpText": "The tag name to tag the repository with.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b7ae407f-f926-4478-af72-74397025e4b6",
-      "Name": "Template.Git.Action",
-      "Label": "Action if tag already exists",
-      "HelpText": "Select the action if the tag already exsists.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "delete|Delete and recreate\nfail|Fail\nignore|Ignore"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-09-12T15:33:15.238Z",
-    "OctopusVersion": "2023.4.2661",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "git"
-}
diff --git a/step-templates/github-report-deployment.json b/step-templates/github-report-deployment.json
deleted file mode 100644
index 7587c7a56..000000000
--- a/step-templates/github-report-deployment.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "Id": "fb3137e5-f062-4dcd-9a56-b15321072a21",
-  "Name": "GitHub - Report Deployment",
-  "Description": "Creates or updates a deployment using [GitHub Deployments API](https://developer.github.com/v3/repos/deployments/)",
-  "ActionType": "Octopus.Script",
-  "Version": 45,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction InputParameters-Check() {\n    If ([string]::IsNullOrEmpty($OctopusParameters[\"GitHubHash\"])) {\n        Write-Host \"No github hash was specified, there's nothing to report then.\"\n        exit\n    }\n\n    If ([string]::IsNullOrEmpty($OctopusParameters[\"GitHubUserName\"])) {\n        Write-Host \"GitHubUserName is not set up, can't report without authentication.\"\n        exit\n    }\n\n    If ([string]::IsNullOrEmpty($OctopusParameters[\"GitHubPassword\"])) {\n        Write-Host \"GitHubPassword is not set up, can't report without authentication.\"\n        exit\n    }\n\n    If ([string]::IsNullOrEmpty($OctopusParameters[\"GitHubOwner\"])) {\n        Write-Host \"GitHubOwner is not set up, can't report without knowing the owner.\"\n        exit\n    }\n\n\n    If ([string]::IsNullOrEmpty($OctopusParameters[\"GitHubRepoName\"])) {\n        Write-Host \"GitHubRepoName is not set up, can't report without knowing the repo.\"\n        exit\n    }\n}\n\nfunction Headers-Create ([String] $username, [String] $password) {\n    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(\"${username}:${password}\"))\n\n    $headers = @{\n      Authorization=(\"Basic {0}\" -f $base64AuthInfo);\n      Accept=\"application/vnd.github.ant-man-preview+json, application/vnd.github.flash-preview+json\";\n    }\n    return $headers\n}\n\nfunction GithubDeployment-Create ([String] $owner, [String] $repository, [String] $gitHubHash, [String] $environment, [String] $username, [String] $password) {\n    $fullRepoName = $owner + \"/\" + $repository\n    $projectDeploymentsUrl = \"https://api.github.com/repos/$fullRepoName/deployments\"\n    Write-Host \"Creating a deployment on GitHub on behalf of $username for repo $fullRepoName\"\n    $headers = Headers-Create -username $username -password $password\n\n    $deploymentCreatePayload = @{\n        \"ref\"=$gitHubHash;\n        \"auto_merge\"=$False;\n        \"environment\"=$environment;\n        \"description\"=\"Octopus Deploy\";\n    }\n\n    Write-Host \"Calling $projectDeploymentsUrl\"\n    Write-Host \"Payload:\"\n    Write-Host ($deploymentCreatePayload | Format-Table | Out-String)\n\n    $newDeployment = Invoke-RestMethod $projectDeploymentsUrl -Method Post -Body ($deploymentCreatePayload|ConvertTo-Json) -Headers $headers\n    $deploymentId=$newDeployment.id\n    return $deploymentId\n}\n\nfunction GithubDeployment-UpdateStatus ([String] $owner, [String] $repository, [String] $deploymentId, [String] $environment, [String] $newStatus, [String] $logLink) {\n    $fullRepoName = $owner + \"/\" + $repository\n    $projectDeploymentsUrl = \"https://api.github.com/repos/$fullRepoName/deployments\"\n    Write-Host \"Setting statuses to $newStatus on $projectDeploymentsUrl\"\n    $headers = Headers-Create -username $username -password $password\n\n    $statusUpdatePayload = @{\n        \"environment\"=$environment;\n        \"state\"=$newStatus;\n        \"description\"=\"Octopus Deploy\";\n        \"log_url\"=$logLink;\n        \"environment_url\"=$logLink;\n        \"auto_inactive\"=$True;\n    }\n\n    $statusesUrl = \"$projectDeploymentsUrl/$deploymentId/statuses\"\n\n    Write-Host \"Calling $statusesUrl\"\n    Write-Host \"Payload:\"\n    Write-Host ($statusUpdatePayload | Format-Table | Out-String)\n\n    $statusResult = Invoke-RestMethod $statusesUrl -Method Post -Body ($statusUpdatePayload|ConvertTo-Json) -Headers $headers\n\n    Write-Host \"Call result:\"\n    Write-Host ($statusResult | Format-Table | Out-String)\n\n}\n\nfunction Status-Create() {\n    If ([string]::IsNullOrEmpty($OctopusParameters[\"GitHubStatus\"])) {\n        $octopusError=$OctopusParameters[\"Octopus.Deployment.Error\"]\n        $octopusErrorDetail=$OctopusParameters[\"Octopus.Deployment.ErrorDetail\"]\n\n        Write-Host \"Desired status is not specified. Reporting either success or error.\"\n        Write-Host \"Current Octopus.Deployment.Error is $octopusError\"\n        Write-Host \"Current Octopus.Deployment.ErrorDetail is $octopusErrorDetail\"\n        $newStatus = If ([string]::IsNullOrEmpty($octopusError)) { \"success\" } Else { \"failure\" }\n        Write-Host \"Based on that, the status is going to be $newStatus\"\n        return $newStatus\n    }\n    else {\n        Write-Host \"Desired status of $newStatus is specified, using it.\"\n        return $OctopusParameters[\"GitHubStatus\"]\n    }\n}\n\n$repoOwner=$OctopusParameters[\"GitHubOwner\"]\n$repoName=$OctopusParameters[\"GitHubRepoName\"]\n$gitHubHash=$OctopusParameters[\"GitHubHash\"]\n$username=$OctopusParameters[\"GitHubUserName\"]\n$password=$OctopusParameters[\"GitHubPassword\"]\n$environment=$OctopusParameters[\"Octopus.Environment.Name\"]\n$deploymentLink=$OctopusParameters[\"Octopus.Web.DeploymentLink\"]\n$serverUrl=$OctopusParameters[\"#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}\"] -replace \"http://\", \"https://\"\n$fullDeploymentLink=\"$serverUrl$deploymentLink\"\n$newStatus=$OctopusParameters[\"GitHubStatus\"]\n$deploymentId=$OctopusParameters[\"GitHubDeploymentId\"]\n\nInputParameters-Check\n\nIf ([string]::IsNullOrEmpty($deploymentId)) {\n    Write-Host \"No deployment id is provided.\"\n    $deploymentId = GithubDeployment-Create -owner $repoOwner -repository $repoName -gitHubHash $gitHubHash -environment $environment -username $username -password $password\n\n    Write-Host \"Created a deployment on GitHub: #($deploymentId). Exported it as GitHubDeploymentId\"\n    Set-OctopusVariable -name \"GitHubDeploymentId\" -value $deploymentId\n}\n\nWrite-Host \"Using deployment id $deploymentId.\"\n\n$status = Status-Create\nWrite-Host \"\"\nWrite-Host \"\"\n\nGithubDeployment-UpdateStatus -owner $repoOwner -repository $repoName -deploymentId $deploymentId -environment $environment -newStatus $status -logLink $fullDeploymentLink\n"
-  },
-  "Parameters": [
-    {
-      "Id": "51ba3ed4-5a81-46b8-af97-eec3de9fcec8",
-      "Name": "GitHubUserName",
-      "Label": "GitHub user",
-      "HelpText": "A username to be used to access GitHub.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7e0ae992-f878-473f-b51a-f53ead92ff4f",
-      "Name": "GitHubPassword",
-      "Label": "GitHub password",
-      "HelpText": "Password (access token) used to access GitHub. Use https://github.com/settings/tokens to generate a token. **repo_deployment** is the required scope for the token.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "230e8590-63d7-4125-aee8-71d25e66d7d1",
-      "Name": "GitHubRepoName",
-      "Label": "GitHub repository",
-      "HelpText": "Name of your GitHub repository.",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9a47c6db-11bd-489d-a904-cf31dc7fe0b2",
-      "Name": "GitHubOwner",
-      "Label": "GitHub owner",
-      "HelpText": "Owner of the repository (organization or user).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "56fca421-bb10-4bef-b10f-4a83c9ea1675",
-      "Name": "GitHubHash",
-      "Label": "GitHub hash",
-      "HelpText": "Commit hash used to create the deployment for.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c9cbf161-e537-46a1-8edf-5d4c34fb3744",
-      "Name": "GitHubDeploymentId",
-      "Label": "GitHub deployment id (optional)",
-      "HelpText": "Optional github deployment id. If not set, a new deployment will be created and exported",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a94f5a5b-4747-4738-8ab2-714b991a178d",
-      "Name": "GitHubStatus",
-      "Label": "GitHub deployment status (optional)",
-      "HelpText": "If not specified, will be either `error` or `success` depending on the current build status.\n\nThe state of the status. Can be one of `error,` `failure`, `inactive`, `in_progress`, `queued`, `pending`, or `success`.\n\nSee docu for details: https://developer.github.com/v3/repos/deployments/#parameters-2",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "\ninactive\npending\nqueued\nin_progress\nerror\nfailure\nsuccess\n"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-08-23T12:40:10.975Z",
-    "OctopusVersion": "2021.1.7687",
-    "Type": "ActionTemplate"
-  },
-  "Category": "github",
-  "LastModifiedBy": "benjimac93"
-}
\ No newline at end of file
diff --git a/step-templates/grate-database-migration.json b/step-templates/grate-database-migration.json
deleted file mode 100644
index c708a8381..000000000
--- a/step-templates/grate-database-migration.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
-    "Id": "ca23d18f-ab03-403d-bfb8-3ff74d3ddab3",
-    "Name": "grate Database Migrations",
-    "Description": "Database migrations using [grate](https://github.com/grate-devs/grate).\nWith this template you can either include grate with your package or use the `Download grate?` feature to download it at deploy time.  If you're downloading, you can choose the version by specifying it in the `Version of grate`.\n\nNOTE: \n - AWS EC2 IAM Role authentication requires the AWS CLI be installed.\n - To run on Linux, the machine must have both PowerShell Core and .NET Core 3.1 installed.",
-    "ActionType": "Octopus.Script",
-    "Version": 11,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-      {
-        "Id": "e0d1bcb0-4a7e-41dc-ab53-2799d6f2b051",
-        "Name": "gratePackage",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "gratePackage",
-          "Purpose": ""
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Configure template\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n\tWrite-Host \"Determining Operating System...\"\n    switch ([System.Environment]::OSVersion.Platform)\n    {\n    \t\"Win32NT\"\n        {\n        \t# Set variable\n            $IsWindows = $true\n            $IsLinux = $false\n        }\n        \"Unix\"\n        {\n        \t$IsWindows = $false\n            $IsLinux = $true\n        }\n    }\n}\n\nif ($IsWindows)\n{\n\t$ProgressPreference = 'SilentlyContinue'\n}\n\n# Define parameters\n$grateExecutable = \"\"\n$grateOutputPath = [System.IO.Path]::Combine($OctopusParameters[\"Octopus.Action.Package[gratePackage].ExtractedPath\"], \"output\")\n$grateSsl = [System.Convert]::ToBoolean($grateSsl)\n\nFunction Get-LatestVersionDownloadUrl {\n    # Define parameters\n    param(\n        $Repository,\n        $Version\n    )\n    \n    # Define local variables\n    $releases = \"https://api.github.com/repos/$Repository/releases\"\n    \n    # Get latest version\n    Write-Host \"Determining latest release of $Repository ...\"\n    \n    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)\n    \n    if ($null -ne $Version) {\n        # Get specific version\n        $tags = ($tags | Where-Object { $_.tag_name.EndsWith($Version) })\n\n        # Check to see if nothing was returned\n        if ($null -eq $tags) {\n            # Not found\n            Write-Host \"No release found matching version $Version, getting highest version using Major.Minor syntax...\"\n\n            # Get the tags\n            $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)\n\n            # Parse the version number into a version object\n            $parsedVersion = [System.Version]::Parse($Version)\n            $partialVersion = \"$($parsedVersion.Major).$($parsedVersion.Minor)\"\n\n            # Filter tags to ones matching only Major.Minor of version specified\n            $tags = ($tags | Where-Object { $_.tag_name.Contains(\"$partialVersion.\") -and $_.draft -eq $false })\n            \n            # Grab the latest\n            if ($null -eq $tags)\n            {\n            \t# decrement minor version\n                $minorVersion = [int]$parsedVersion.Minor\n                $minorVersion --\n                \n                # Check to make sure that minor version isn't negative\n                if ($minorVersion -ge 0)\n                {\n                \t# return the urls\n                \treturn (Get-LatestVersionDownloadUrl -Repository $Repository -Version \"$($parsedVersion.Major).$($minorVersion)\")\n                }\n                else\n                {\n                \t# Display error\n                    Write-Error \"Unable to find a version within the major version of $($parsedVersion.Major)!\"\n                }\n            }\n        }\n    }\n\n    # Find the latest version with a downloadable asset\n    foreach ($tag in $tags) {\n        if ($tag.assets.Count -gt 0) {\n            return $tag.assets.browser_download_url\n        }\n    }\n\n    # Return the version\n    return $null\n}\n\n# Change the location to the extract path\nSet-Location -Path $OctopusParameters[\"Octopus.Action.Package[gratePackage].ExtractedPath\"]\n\n$grateVersionNumber = $null\n\n# Check to see if download is specified\nif ([System.Boolean]::Parse($grateDownloadNuget))\n{\n    # Set secure protocols\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n    $downloadUrls = @()\n\n\t# Check to see if version number specified\n    if ([string]::IsNullOrWhitespace($grateNugetVersion))\n    {\n    \t# Get the latest version number\n        $downloadUrls = Get-LatestVersionDownloadUrl -Repository \"grate-devs/grate\"\n    }\n    else\n    {\n    \t# Get specific version\n        $downloadUrls = Get-LatestVersionDownloadUrl -Repository \"grate-devs/grate\" -Version $grateNugetVersion\n    }\n\n\t# Check to make sure something was returned\n    if ($null -ne $downloadUrls -and $downloadUrls.Length -gt 0)\n\t{\n    \n      # Check for download folder\n      if ((Test-Path -Path \"$PSSCriptRoot/grate\") -eq $false)\n      {\n          # Create the folder\n          New-Item -ItemType Directory -Path \"$PSSCriptRoot/grate\"\n      }\n\n      # Get version from the url\n      $grateVersionNumber = $(([Uri]$downloadUrls[0]).Segments[-2])\n      $grateVersionNumber = [Version]$grateVersionNumber.Replace(\"/\", \"\")\n\n      # Version 1.6.1 was the last version they used the grate-dotnet-tool name for the asset\n      if ($grateVersionNumber -le [Version]\"1.6.1\")\n      {\n        # Get URL of grate-dotnet-tool\n        $downloadUrl = $downloadUrls | Where-Object {$_.Contains(\"grate-dotnet-tool\")}\n      }\n      else\n      {\n        if ([Environment]::Is64BitOperatingSystem)\n        {\n          $osArchitectureBit = \"64\"  \n        }\n        else\n        {\n          $osArchitectureBit = \"32\"\n        }\n\n        if ($isLinux)\n        {\n          $osType = \"linux\"\n        }\n        else\n        {\n          $osType = \"win\"\n        }\n        \n        $downloadUrl = $downloadUrls | Where-Object {$_.Contains(\"grate-$($osType)-x$($osArchitectureBit)-self-contained-$($grateVersionNumber)\")}\n      }\n      \n      # Check to see if something was returned\n      if ($null -eq $downloadUrl)\n      {\n      \t# Attempt to get nuget package\n        Write-Host \"An asset with grate-dotnet-tool was not found, attempting to locate nuget package ...\"\n        $downloadUrl = $downloadUrls | Where-Object {$_.Contains(\".nupkg\")}\n        \n        # Check to see if something was returned\n        if ($null -eq $downloadUrl)\n        {\n        \tWrite-Error \"Unable to find appropriate asset for download.\"\n        }\n      }\n\n      # Download nuget package\n      Write-Output \"Downloading $downloadUrl ...\"\n\n      # Get download file name\n      $downloadFile = $downloadUrl.Substring($downloadUrl.LastIndexOf(\"/\") + 1)\n\n      # Download the file\n      Invoke-WebRequest -Uri $downloadUrl -OutFile \"$PSSCriptRoot/grate/$downloadFile\"\n\n      # Check the extension\n      if ($downloadFile.EndsWith(\".zip\"))\n      {\n          # Extract the file\n          Write-Host \"Extracting $downloadFile ...\"\n          Expand-Archive -Path \"$PSSCriptRoot/grate/$downloadFile\" -Destination \"$PSSCriptRoot/grate\"\n\n          # Delete the downloaded .zip\n          Remove-Item -Path \"$PSSCriptRoot/grate/$downloadFile\"\n\n          # Get extracted files\n          $extractedFiles = Get-ChildItem -Path \"$PSSCriptRoot/grate\"\n\n          # Check to see if what was extracted was simply a nuget file\n          if ($extractedFiles.Count -eq 1 -and $extractedFiles[0].Extension -eq \".nupkg\")\n          {\n              # Zip file contained a nuget package </facepalm>\n              Write-Host \"Archive contained a NuGet package, extracting package ...\"\n              $nugetPackage = $extractedFiles[0]\n              $nugetPackage | Rename-Item -NewName $nugetPackage.Name.Replace(\".nupkg\", \".zip\")\n              Expand-Archive -Path $nugetPackage.FullName.Replace(\".nupkg\", \".zip\") -Destination \"$PSSCriptRoot/grate\"\n          }\n      }\n\n      if ($downloadFile.EndsWith(\".nupkg\"))\n      {\n          # Zip file contained a nuget package </facepalm>\n          $nugetPackage = Get-ChildItem -Path \"$PSSCriptRoot/grate/$($downloadFile)\"\n          $nugetPackage | Rename-Item -NewName $nugetPackage.Name.Replace(\".nupkg\", \".zip\")\n          Expand-Archive -Path \"$PSSCriptRoot/grate/$($downloadFile.Replace(\".nupkg\", \".zip\"))\" -Destination \"$PSSCriptRoot/grate\"    \n      }\n    }\n    else\n    {\n    \tWrite-Error \"No download url returned!\"\n    }\n}\n\n\n\nif ([string]::IsNullOrWhitespace($grateExecutable))\n{\n    # Version 1.6.1 was the last version they used the grate-dotnet-tool name for the asset\n    if ($grateVersionNumber -le [Version]\"1.6.1\")\n    {\n      # Look for just grate.dll\n      $grateExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq \"grate.dll\"}\n    }\n    else\n    {\n      # Look for executable depending on OS\n      if ($isLinux)\n      {\n        $grateExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq \"grate\"} | Where-Object { ! $_.PSIsContainer }\n      }\n      else\n      {\n        $grateExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq \"grate.exe\"}\n      }\n    }\n    \n    # Check for multiple results\n    if ($grateExecutable -is [array])\n    {\n        # choose one that matches highest version of .net\n\t\t$dotnetVersions = (dotnet --list-runtimes) | Where-Object {$_ -like \"*.NetCore*\"}\n\n\t\t$maxVersion = $null\n\t\tforeach ($dotnetVersion in $dotnetVersions)\n\t\t{\n    \t\t$parsedVersion = $dotnetVersion.Split(\" \")[1]\n    \t\tif ($null -eq $maxVersion -or [System.Version]::Parse($parsedVersion) -gt [System.Version]::Parse($maxVersion))\n    \t\t{\n        \t\t$maxVersion = $parsedVersion\n    \t\t}\n\t\t}\n        \n        $grateExecutable = $grateExecutable | Where-Object {$_.FullName -like \"*net$(([System.Version]::Parse($maxVersion).Major))*\"}\n    }\n}\n\nif ([string]::IsNullOrWhitespace($grateExecutable))\n{\n    # Couldn't find grate\n    Write-Error \"Couldn't find the grate executable!\"\n}\n\n# Build the arguments\n$grateSwitches = @()\n\n# Update the connection string based on authentication method\nswitch ($grateAuthenticationMethod)\n{\n    \"awsiam\"\n    {\n        # Region is part of the RDS endpoint, extract\n        $region = ($grateServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $grateUserPassword = (aws rds generate-db-auth-token --hostname $grateServerName --region $region --port $grateServerPort --username $grateUserName)       \n        $grateUserInfo = \"Uid=$grateUserName;Pwd=$grateUserPassword;\"\n\n        break\n    }\n\t\n    \"azuremanagedidentity\"\n    {\n    \t# SQL Server driver doesn't assign password\n        if ($grateDatabaseServerType -ne \"sqlserver\")\n        {\n          # Get login token\n          Write-Host \"Generating Azure Managed Identity token ...\"\n          $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"}\n\n          $grateUserPassword = $token.access_token\n          $grateUserInfo = \"Uid=$grateUserName;Pwd=$grateUserPassword;\"\n        }\n        \n        break\n    }\n\n    \"gcpserviceaccount\"\n    {\n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object {$_.Contains(\"iam.gserviceaccount.com\") }\n\n\t\tWrite-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n        $grateUserPassword = $token.access_token\n        \n        # Append remaining portion of connection string\n        $grateUserInfo = \"Uid=$grateUserName;Pwd=$grateUserPassword;\"\n    }\n\n\n    \"usernamepassword\"\n    {\n    \t# Append remaining portion of connection string\n        $grateUserInfo = \"Uid=$grateUserName;Pwd=$grateUserPassword;\"\n\n\t\tbreak    \n\t}\n\n    \"windowsauthentication\"\n    {\n      # Append remaining portion of connection string\n\t  $grateUserInfo = \"integrated security=true;\"\n      \n      # Append username (required for non\n      $grateUserInfo += \"Uid=$grateUserName;\"\n    }\n    \n}\n\n# Configure connnection string based on technology\nswitch ($grateDatabaseServerType)\n{\n    \"sqlserver\"\n    {\n        # Check to see if port has been defined\n        if (![string]::IsNullOrEmpty($grateServerPort))\n        {\n            # Append to servername\n            $grateServerName += \",$grateServerPort\"\n\n            # Empty the port\n            $grateServerPort = [string]::Empty\n        }\n    }\n    \"mariadb\"\n    {\n    \t$grateServerPort = \"Port=$grateServerPort;Allow User Variables=true;\"\n    }\n    \"mysql\"\n    {\n    \t# Use the MySQL client\n        $grateDatabaseServerType = \"mariadb\"\n        $grateServerPort = \"Port=$grateServerPort;Allow User Variables=true;\"\n    }\n    \"oracle\"\n    {\n    \t# Oracle connection strings are built different than all others\n        $grateServerConnectionString = \"--connectionstring=`\"Data source=$($grateServerName):$($grateServerPort)/$grateDatabaseName;$($grateUserInfo.Replace(\"Uid\", \"User Id\").Replace(\"Pwd\", \"Password\")) \"\n    }\n    default\n    {\n        $grateServerPort = \"Port=$grateServerPort;\"\n    }\n}\n\n# Build base connection string\nif ([string]::IsNullOrWhitespace($grateServerConnectionString))\n{\n\t$grateServerConnectionString = \"--connectionstring=`\"Server=$grateServerName;$grateServerPort $grateUserInfo Database=$grateDatabaseName;\"\n}\n\n# Check for SQL Server and Azure Managed Identity\nif (($grateDatabaseServerType -eq \"sqlserver\") -and ($grateAuthenticationMethod -eq \"azuremanagedidentity\"))\n{\n\t# Append AD component to connection string\n    $grateServerConnectionString += \"Authentication=Active Directory Default;\"\n}\n\nif ($grateSsl -eq $true)\n{\n\tif (($grateDatabaseServerType -eq \"mariadb\") -or ($grateDatabaseServerType -eq \"mysql\") -or ($grateDatabaseServerType -eq \"postgres\"))\n    {\n    \t# Add sslmode\n        $grateServerConnectionString += \"SslMode=Require;Trust Server Certificate=true;\"\n    }\n    elseif ($grateDatabaseServerType -eq \"sqlserver\")\n    {\n    \t$grateServerConnectionString += \"Trust Server Certificate=true;\"\n    }\n    else\n    {\n    \tWrite-Warning \"Invalid Database Server Type selection for SSL, ignoring setting.\"\n    }\n}\n\n# Add terminating double quote to connection string\n$grateServerConnectionString += \"`\"\"\n\n$grateSwitches += $grateServerConnectionString\n\n$grateSwitches += \"--databasetype=$grateDatabaseServerType\"\n$grateSwitches += \"--silent\"\n\nif ([System.Boolean]::Parse($grateDryRun))\n{\n    $grateSwitches += \"--dryrun\"\n}\n\nif ([System.Boolean]::Parse($grateRecordOutput))\n{\n    $grateSwitches += \"--outputPath=$grateOutputPath\"\n    \n    # Check to see if path exists\n    if ((Test-Path -Path $grateOutputPath) -eq $false)\n    {\n    \t# Create folder\n        New-Item -Path $grateOutputPath -ItemType \"Directory\"\n    }\n}\n\n# Add transaction switch\n$grateSwitches += \"--transaction=$($grateWithTransaction.ToLower())\"\n\n# Add Command Timeout\nif (![string]::IsNullOrEmpty($grateCommandTimeout)){\n    $grateSwitches += \"--commandtimeout=$([int]$grateCommandTimeout)\"\n}\n\n# Add Baseline switch\nif ([System.Boolean]::Parse($grateBaseline)) {\n    $grateSwitches += \"--baseline\"\n}\n\n# Add SQL Files Directory parameter\nif (![string]::IsNullOrEmpty($grateSqlScriptFolder)) {\n    # Add up folder\n    $grateSwitches += \"--sqlfilesdirectory=$grateSqlScriptFolder\"\n}\n\n# Add log verbosity flag\nif (![string]::IsNullOrEmpty($grateLogVerbosity)) {\n    # Add up folder\n    $grateSwitches += \"--verbosity=$grateLogVerbosity\"\n}\n\n\n# Check for version\nif (![string]::IsNullOrEmpty($grateVersion))\n{\n    # Add version\n    $grateSwitches += \"--version=$grateVersion\"\n}\n\n# Set grate environment\nif (![string]::IsNullOrEmpty($grateEnvironment))\n{\n    # Add environment\n    $grateSwitches += \"--environment=$grateEnvironment\"\n}\n\n# Set grate schema. Especially useful when migrating from RoundhousE\nif (![string]::IsNullOrEmpty($grateSchema))\n{\n    # Add schema\n    $grateSwitches += \"--schema=$grateSchema\"\n}\n\n# Display what's going to be run\nif (![string]::IsNullOrWhitespace($grateUserPassword))\n{\n\tWrite-Host \"Executing $($grateExecutable.FullName) with $($grateSwitches.Replace($grateUserPassword, \"****\"))\"\n}\nelse\n{\n\tWrite-Host \"Executing $($grateExecutable.FullName) with $($grateSwitches)\"\n}\n\n# Execute grate\nif ($grateExecutable.FullName.EndsWith(\".dll\"))\n{\n\t& dotnet $grateExecutable.FullName $grateSwitches\n}\nelse\n{\n\t& $grateExecutable.FullName $grateSwitches\n}\n\n# If the output path was specified, attach artifacts\nif ([System.Boolean]::Parse($grateRecordOutput))\n{    \n    # Zip up output folder content\n    Add-Type -Assembly 'System.IO.Compression.FileSystem'\n    \n    $zipFile = \"$($OctopusParameters[\"Octopus.Action.Package[gratePackage].ExtractedPath\"])/output.zip\"\n    \n\t[System.IO.Compression.ZipFile]::CreateFromDirectory($grateOutputPath, $zipFile)\n    New-OctopusArtifact -Path \"$zipFile\" -Name \"output.zip\"\n}\n"
-    },
-    "Parameters": [
-      {
-        "Id": "5d54012a-1f10-4b3c-bbfd-fe70bf843904",
-        "Name": "gratePackage",
-        "Label": "grate Package",
-        "HelpText": "The package containing the scripts for grate to deploy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "57a43e61-86c0-46a3-8446-aacbb67cf596",
-        "Name": "grateServerName",
-        "Label": "Database Server Name",
-        "HelpText": "Name or IP address of the server being deployed to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ba3705a1-e620-4fb1-b494-2b9e65fbb194",
-        "Name": "grateServerPort",
-        "Label": "Database Server Port",
-        "HelpText": "Port number for the database server.  Uses default server port if left blank.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c3a7c802-babd-470b-8447-5f6159128b4c",
-        "Name": "grateAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the database server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-        }
-      },
-      {
-        "Id": "c955ad8c-9686-419c-a1cf-129ffbe0acb4",
-        "Name": "grateDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to deploy to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0438580a-8825-40db-a782-569a35144f4b",
-        "Name": "grateSsl",
-        "Label": "Force SSL",
-        "HelpText": "Check this box for force connection string to use SSL.  Only applicable to MariaDB, MySQL, SQL Server, and PostgreSQL database types.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "e007d182-88f5-4e1f-906f-c85ff955c51e",
-        "Name": "grateVersion",
-        "Label": "Database Version",
-        "HelpText": "Version number of your database migration.  Default value is the version of the grate package.",
-        "DefaultValue": "#{Octopus.Action.Package[gratePackage].PackageVersion}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "58ceec6b-f374-4c2e-83bb-fbd7ce26dc05",
-        "Name": "grateUsername",
-        "Label": "Database Username",
-        "HelpText": "Username of the account with sufficient permissions to execute scripts.  (Leave blank for Integrated Authentication.)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "29f6bb35-c076-4b5d-98cf-8ee8494cb38b",
-        "Name": "grateUserPassword",
-        "Label": "Database User Password",
-        "HelpText": "Password for the Database Username account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "5e5d68f1-fdc8-41ce-8cd3-ab082278218d",
-        "Name": "grateDatabaseServerType",
-        "Label": "Database Server Type",
-        "HelpText": "The database technology being deployed to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "mariadb|MariaDB\nmysql|MySQL\noracle|Oracle\npostgresql|PostgreSQL\nsqlserver|SQL Server"
-        }
-      },
-      {
-        "Id": "67c016c3-d779-4300-b3d1-e11463bb9fc4",
-        "Name": "grateWithTransaction",
-        "Label": "Use Transaction?",
-        "HelpText": "Check this box if you want all scripts to be run within the same transaction.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "29a4f568-23f7-4bb2-a5ba-910b922c5406",
-        "Name": "grateDryRun",
-        "Label": "Dry Run?",
-        "HelpText": "Check this box if you want to perform a dry run.  Results are recorded and attached as deployment artifacts if you check Record Output.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "eaad7639-05d8-46ed-bab3-b72b8ad81d5a",
-        "Name": "grateRecordOutput",
-        "Label": "Record Output?",
-        "HelpText": "Check this box to record the output of the run.  Useful for gathering what would be changed for approval purposes.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "84b46c25-6762-44c2-8ec6-4ba30ff599f5",
-        "Name": "grateCommandTimeout",
-        "Label": "Command Timeout",
-        "HelpText": "Customizable command timeout (in seconds). Default is 60",
-        "DefaultValue": "60",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3382a212-f467-409e-950b-317f05f59ea5",
-        "Name": "grateBaseline",
-        "Label": "Use Baseline",
-        "HelpText": "Check this box if you want grate to mark the scripts as run, but not to actually run anything against the database. [More information about this option can be found here](https://erikbra.github.io/grate/configuration-options/)",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "60dc1e2a-93ec-4bc9-abde-aacf6aeba0a7",
-        "Name": "grateSqlScriptFolder",
-        "Label": "SQL Script folder",
-        "HelpText": "Script location to use for grate (if not in the root of the package)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b792092e-e3c1-487b-8349-e17832506f12",
-        "Name": "grateLogVerbosity",
-        "Label": "Log Level",
-        "HelpText": "Configure log level when running Grate.",
-        "DefaultValue": "information",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "critical|Critical\ndebug|Debug\nerror|Error\ninformation|Information\nnone|None\ntrace|Trace\nwarning|Warning"
-        }
-      },
-      {
-        "Id": "b8a17064-900f-4d77-9354-e5de1d3057f0",
-        "Name": "grateDownloadNuget",
-        "Label": "Download grate?",
-        "HelpText": "Check this box if you want the template to download RoundhousE and use the downloaded version for deployment.  Requires .NET Core be installed on the machine executing the deployment.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "409bd29d-79cf-4209-a005-ce768714eb64",
-        "Name": "grateNugetVersion",
-        "Label": "Version of grate",
-        "HelpText": "Version of grate to download (used with Download grate option), leave blank for latest.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d9660ee0-8376-4f9b-8d1d-99f3b4701a42",
-        "Name": "grateEnvironment",
-        "Label": "Grate environment",
-        "HelpText": "The environment specific scripts that grate will execute",
-        "DefaultValue": "#{Octopus.Environment.Name}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a93b61a7-74ae-471e-ace3-d09cdfab8858",
-        "Name": "grateSchema",
-        "Label": "Grate schema for migration tables",
-        "HelpText": "Useful if migrating from RoundhousE.",
-        "DefaultValue": "grate",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2026-03-13T22:25:53.478Z",
-    "OctopusVersion": "2026.1.11242",
-    "Type": "ActionTemplate"
-  },
-    "LastModifiedBy": "twerthi",
-    "Category": "grate"
-  }
diff --git a/step-templates/hashicorp-vault-approle-get-wrapped-secretid.json b/step-templates/hashicorp-vault-approle-get-wrapped-secretid.json
deleted file mode 100644
index 5716ccd32..000000000
--- a/step-templates/hashicorp-vault-approle-get-wrapped-secretid.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "Id": "76827264-af27-46d0-913a-e093a4f0db48",
-    "Name": "HashiCorp Vault - AppRole Get Wrapped Secret ID",
-    "Description": "This step generates a response-wrapped Secret ID for an [AppRole](https://www.vaultproject.io/docs/auth/approle) from a HashiCorp Vault server.\n\n---\n\nTwo properties from the response will be made available as [sensitive Output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables):\n\n- `wrap_info.token` named `WrappedToken` - This is the wrapped token used to retrieve the actual Secret ID from Vault.\n- `wrap_info.creation_path` named `WrappedTokenCreationPath` - This is the creation path of the token to allow you to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- The full path where the AppRole auth method is mounted.\n- A `RoleName`.\n- A TTL for the wrapped token (Default: `120s`).\n- The [Auth token](https://www.vaultproject.io/docs/auth/token) used to authenticate with Vault. This token should be of limited scope and should only retrieve wrapped SecretIDs. See the [HashiCorp documentation](https://learn.hashicorp.com/tutorials/vault/pattern-approle?in=vault/recommended-patterns#vault-returns-a-token) for further information.\n\n---\n\n*Optional*\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\n---\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.VaultAddress\"]\n$VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.ApiVersion\"]\n$VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.Namespace\"]\n$VAULT_APPROLE_WRAPPED_SECRETID_PATH = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.AppRolePath\"]\n$VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.RoleName\"]\n$VAULT_APPROLE_WRAPPED_SECRETID_TTL = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.TTL\"]\n$VAULT_APPROLE_WRAPPED_SECRETID_TOKEN = $OctopusParameters[\"Vault.AppRole.WrappedSecretID.AuthToken\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS)) {\n   throw \"Required parameter VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION)) {\n\tthrow \"Required parameter VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_PATH)) {\n\tthrow \"Required parameter VAULT_APPROLE_WRAPPED_SECRETID_AUTH_PATH not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME)) {\n\tthrow \"Required parameter VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_TOKEN)) {\n\tthrow \"Required parameter VAULT_APPROLE_WRAPPED_SECRETID_TOKEN not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try {$response = $rawResponse | ConvertFrom-Json} catch {$response=$rawResponse}\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n###############################################################################\n\n$VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS = $VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS.TrimEnd('/')\n$VAULT_APPROLE_WRAPPED_SECRETID_PATH = $VAULT_APPROLE_WRAPPED_SECRETID_PATH.TrimStart('/').TrimEnd('/')\n$VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME = $VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME.TrimStart('/').TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\ntry\n{\n\t$headers = @{\n        \"X-Vault-Token\" = $VAULT_APPROLE_WRAPPED_SECRETID_TOKEN\n        \"X-Vault-Wrap-Ttl\" = $VAULT_APPROLE_WRAPPED_SECRETID_TTL\n    }\n    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE)) {\n        Write-Verbose \"Setting 'X-Vault-Namespace' header to: $VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE\"\n        $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_WRAPPED_SECRETID_NAMESPACE)\n    }\n    \n    $uri = \"$VAULT_APPROLE_WRAPPED_SECRETID_ADDRESS/$VAULT_APPROLE_WRAPPED_SECRETID_API_VERSION/$VAULT_APPROLE_WRAPPED_SECRETID_PATH/role/$([uri]::EscapeDataString($VAULT_APPROLE_WRAPPED_SECRETID_ROLENAME))/secret-id\"\n    Write-Verbose \"Making Put request to $uri\"\n    $response = Invoke-RestMethod -Uri $uri -Headers $headers -Method Put\n    \n    if($null -ne $response) {\n    \tSet-OctopusVariable -Name \"WrappedToken\" -Value $response.wrap_info.token -Sensitive\n        Set-OctopusVariable -Name \"WrappedTokenCreationPath\" -Value $response.wrap_info.creation_path -Sensitive\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.WrappedToken}\"\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.WrappedTokenCreationPath}\"\n    }\n    else {\n    \tWrite-Error \"Null or Empty response returned from Vault server\" -Category InvalidResult\n    }\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred getting a wrapped secretid: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.errors) {\n            $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n        }\n        else {\n            $errorDetails = $null\n            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n        }\n    }\n    \n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`n`tDetail: $AdditionalDetail\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "bbf1cf96-066a-43e8-8387-24131fa63feb",
-        "Name": "Vault.AppRole.WrappedSecretID.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "bd6ca2f2-2102-40e0-a1e0-36e526393203",
-        "Name": "Vault.AppRole.WrappedSecretID.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "30366827-71f8-42cc-ac0a-d05300ae6c8d",
-        "Name": "Vault.AppRole.WrappedSecretID.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "67c5d1c7-6373-4342-b02b-a7a6fa69402b",
-        "Name": "Vault.AppRole.WrappedSecretID.AppRolePath",
-        "Label": "App Role Path",
-        "HelpText": "The path where the approle auth method was mounted. The default path is `/auth/approle`. If the AppRole auth method was mounted at a different path, for example `my-path`, then specify `/my-path` instead.",
-        "DefaultValue": "/auth/approle",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "4c8ab1b0-36e3-4d19-9a45-557300bb0f06",
-        "Name": "Vault.AppRole.WrappedSecretID.RoleName",
-        "Label": "Role Name",
-        "HelpText": "The role name of the [AppRole](https://www.vaultproject.io/api/auth/approle).",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cc4afac6-6dc4-4c9f-bcb8-0ab9c2049523",
-        "Name": "Vault.AppRole.WrappedSecretID.TTL",
-        "Label": "Time-to-live (TTL)",
-        "HelpText": "The TTL of the [response-wrapping token](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-tokens) itself. Enter a value in seconds. The default is: `120s`",
-        "DefaultValue": "120s",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "297871f1-a145-4dde-97ba-d7a9a0690cc6",
-        "Name": "Vault.AppRole.WrappedSecretID.AuthToken",
-        "Label": "Auth token",
-        "HelpText": "The [Auth token](https://www.vaultproject.io/docs/auth/token) used to authenticate with Vault to generate a [response-wrapped](https://www.vaultproject.io/docs/concepts/response-wrapping) Secret ID.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-18T08:56:29.022Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-18T08:56:29.022Z",
-    "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
\ No newline at end of file
diff --git a/step-templates/hashicorp-vault-approle-login.json b/step-templates/hashicorp-vault-approle-login.json
deleted file mode 100644
index 798c65e4b..000000000
--- a/step-templates/hashicorp-vault-approle-login.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "Id": "e04a9cec-f04a-4da2-849b-1aed0fd408f0",
-    "Name": "HashiCorp Vault - AppRole Login",
-    "Description": "This step logs into a HashiCorp Vault server with the [AppRole](https://www.vaultproject.io/docs/auth/approle) auth method.\n\nThe `client_token` from the response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `AppRoleAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- You must supply the full path where the AppRole auth method is mounted.\n- You must supply both a `RoleId` and `SecretId`.\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.\n",
-    "ActionType": "Octopus.Script",
-    "Version": 8,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$VAULT_APPROLE_LOGIN_ADDRESS = $OctopusParameters[\"Vault.AppRole.Login.VaultAddress\"]\n$VAULT_APPROLE_LOGIN_API_VERSION = $OctopusParameters[\"Vault.AppRole.Login.ApiVersion\"]\n$VAULT_APPROLE_LOGIN_APPROLE_PATH = $OctopusParameters[\"Vault.AppRole.Login.AppRolePath\"]\n$VAULT_APPROLE_LOGIN_ROLEID = $OctopusParameters[\"Vault.AppRole.Login.RoleID\"]\n$VAULT_APPROLE_LOGIN_SECRETID = $OctopusParameters[\"Vault.AppRole.Login.SecretID\"]\n\n# Optional variables\n$VAULT_APPROLE_LOGIN_NAMESPACE = $OctopusParameters[\"Vault.AppRole.Login.Namespace\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_ADDRESS)) {\n    throw \"Required parameter VAULT_APPROLE_LOGIN_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_API_VERSION)) {\n    throw \"Required parameter VAULT_APPROLE_LOGIN_API_VERSION not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_APPROLE_PATH)) {\n    throw \"Required parameter VAULT_APPROLE_LOGIN_APPROLE_PATH not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_ROLEID)) {\n    throw \"Required parameter VAULT_APPROLE_LOGIN_ROLEID not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_SECRETID)) {\n    throw \"Required parameter VAULT_APPROLE_LOGIN_SECRETID not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n###############################################################################\n\n$VAULT_APPROLE_LOGIN_ADDRESS = $VAULT_APPROLE_LOGIN_ADDRESS.TrimEnd('/')\n$VAULT_APPROLE_LOGIN_APPROLE_PATH = $VAULT_APPROLE_LOGIN_APPROLE_PATH.TrimStart('/').TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\ntry {\n    $payload = @{\n        role_id   = $VAULT_APPROLE_LOGIN_ROLEID\n        secret_id = $VAULT_APPROLE_LOGIN_SECRETID\n    }\n\n    $Headers = @{}\n    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_LOGIN_NAMESPACE)) {\n        Write-Verbose \"Setting 'X-Vault-Namespace' header to: $VAULT_APPROLE_LOGIN_NAMESPACE\"\n        $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_LOGIN_NAMESPACE)\n    }\n\n    $uri = \"$VAULT_APPROLE_LOGIN_ADDRESS/$VAULT_APPROLE_LOGIN_API_VERSION/$([uri]::EscapeDataString($VAULT_APPROLE_LOGIN_APPROLE_PATH))/login\"\n    Write-Verbose \"Making request to $uri\"\n    $response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers\n    \n    if ($null -ne $response) {\n        Set-OctopusVariable -Name \"AppRoleAuthToken\" -Value $response.auth.client_token -Sensitive\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.AppRoleAuthToken}\"\n    }\n    else {\n        Write-Error \"Null or Empty response returned from Vault server\" -Category InvalidResult\n    }\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred logging in with AppRole: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.errors) {\n            $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n        }\n        else {\n            $errorDetails = $null\n            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n        }\n    }\n    \n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`n`tDetail: $AdditionalDetail\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "bbf1cf96-066a-43e8-8387-24131fa63feb",
-        "Name": "Vault.AppRole.Login.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "bd6ca2f2-2102-40e0-a1e0-36e526393203",
-        "Name": "Vault.AppRole.Login.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "49dc9994-778b-40ad-afe5-80ed34e45056",
-        "Name": "Vault.AppRole.Login.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "67c5d1c7-6373-4342-b02b-a7a6fa69402b",
-        "Name": "Vault.AppRole.Login.AppRolePath",
-        "Label": "App Role Path",
-        "HelpText": "The path where the approle auth method was mounted. The default path is `/auth/approle`. If the AppRole auth method was mounted at a different path, for example `my-path`, then specify `/my-path` instead.",
-        "DefaultValue": "/auth/approle",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "297871f1-a145-4dde-97ba-d7a9a0690cc6",
-        "Name": "Vault.AppRole.Login.RoleID",
-        "Label": "Role ID",
-        "HelpText": "The [RoleID](https://www.vaultproject.io/docs/auth/approle#roleid) of the AppRole.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "4c8ab1b0-36e3-4d19-9a45-557300bb0f06",
-        "Name": "Vault.AppRole.Login.SecretID",
-        "Label": "Secret ID",
-        "HelpText": "The [Secret ID](https://www.vaultproject.io/docs/auth/approle#secretid) of the AppRole.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-16T19:37:08.177Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-16T19:37:08.177Z",
-    "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
\ No newline at end of file
diff --git a/step-templates/hashicorp-vault-approle-unwrap-secretid-login.json b/step-templates/hashicorp-vault-approle-unwrap-secretid-login.json
deleted file mode 100644
index bf337d735..000000000
--- a/step-templates/hashicorp-vault-approle-unwrap-secretid-login.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "Id": "aa113393-e615-40ed-9c5a-f95f471d728f",
-    "Name": "HashiCorp Vault - AppRole Unwrap Secret ID and Login",
-    "Description": "This step combines two Vault operations into one:\n1. It retrieves (and unwraps) a Secret ID for an [AppRole](https://www.vaultproject.io/docs/auth/approle) using a wrapped auth token from a HashiCorp Vault server.\n2. It logs into the HashiCorp Vault server using a supplied Role ID and the unwrapped Secret ID.\n\nThe `client_token` from the login response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `AppRoleAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- The full path where the AppRole auth method is mounted.\n- The [RoleID](https://www.vaultproject.io/docs/auth/approle#roleid) of the AppRole.\n- The wrapped [auth token](https://www.vaultproject.io/docs/auth/token) used to retrieve the unwrapped Secret ID. \n\n---\n\n*Optional*\n- The creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\n---\n\nNotes:\n\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.\n- See the HashiCorp [AppRole patterns documentation](https://learn.hashicorp.com/tutorials/vault/pattern-approle?in=vault/recommended-patterns#vault-returns-a-token) for further information.\n",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.VaultAddress\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.ApiVersion\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.Namespace\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.AppRolePath\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.RoleID\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.WrappedToken\"]\n\n# Optional Variables\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN_CREATION_PATH = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Login.WrappedTokenCreationPath\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n###############################################################################\n\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS.TrimEnd('/')\n$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH.TrimStart('/').TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\ntry {\n    \n    Write-Verbose \"X-Vault-Namespace header: $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE\"\n    \n    # Should we validate lookup token's creation path?\n    if (![string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN_CREATION_PATH)) {\n        $uri = \"$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION/sys/wrapping/lookup\"    \n        $payload = @{\n            token = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN\n        }\n\n        $Headers = @{}\n        if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)\n        }\n\n        Write-Verbose \"Making Post request to $uri\"\n        $response = Invoke-RestMethod -Uri $uri -Method Post -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers\n\n        if ($null -ne $response) {\n            Write-Verbose \"Validating Wrapped token creation path.\"\n            $Lookup_CreationPath = $response.data.creation_path\n            if ($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN_CREATION_PATH -ne $Lookup_CreationPath) {\n                throw \"Supplied Wrapped token creation path failed lookup validation. Check the creation path value and retry.\"\n            }\n        }\n        else {\n            Write-Error \"Null or Empty response returned from Vault server lookup\" -Category InvalidResult\n        }\n    }\n\n    # Call to unwrap secret id from wrapped token.\n    $Headers = @{\n        \"X-Vault-Token\" = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_TOKEN\n    }\n    \n    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)) {\n        $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)\n    }\n    \n    $uri = \"$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION/sys/wrapping/unwrap\"\n    Write-Verbose \"Making Post request to $uri\"\n    $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method Post\n    \n    if ($null -ne $response) {\n\n        $payload = @{\n            role_id   = $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ROLEID\n            secret_id = $response.data.secret_id\n        }\n\n        $Headers = @{}\n        if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_NAMESPACE)\n        }\n\n        $uri = \"$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_API_VERSION/$([uri]::EscapeDataString($VAULT_APPROLE_UNWRAP_SECRETID_LOGIN_APPROLE_PATH))/login\"\n        Write-Verbose \"Making Post request to $uri\"\n        $login_response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers\n        \n        if ($null -ne $login_response) {\n            Set-OctopusVariable -Name \"AppRoleAuthToken\" -Value $login_response.auth.client_token -Sensitive\n            Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.AppRoleAuthToken}\"\n        }\n        else {\n            Write-Error \"Null or Empty response returned from Vault server\" -Category InvalidResult\n        }\n    }\n    else {\n        throw \"Null or Empty response returned from Vault server unwrap\"\n    }\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred unwrapping secretid: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.errors) {\n            $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n        }\n        else {\n            $errorDetails = $null\n            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n        }\n    }\n    \n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`n`tDetail: $AdditionalDetail\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "a0078913-4e0b-4b01-b8eb-f410138951e8",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "6b441222-26f8-4e68-bb96-fdabd0ebcc59",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "f973d44c-4840-4559-9331-6b2d91c130f3",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "6fd4b775-5b97-43c7-bc53-5dc3e2353287",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.AppRolePath",
-        "Label": "App Role Path",
-        "HelpText": "The path where the approle auth method was mounted. The default path is `/auth/approle`. If the AppRole auth method was mounted at a different path, for example `my-path`, then specify `/my-path` instead.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a8c0824c-3e1a-4014-8060-96a703d52365",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.RoleID",
-        "Label": "Role ID",
-        "HelpText": "The [RoleID](https://www.vaultproject.io/docs/auth/approle#roleid) of the AppRole.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "8ba05c24-215f-4ca0-9edc-bca38c43d7b5",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.WrappedToken",
-        "Label": "Wrapped Token",
-        "HelpText": "This is the wrapped token used to retrieve the actual Secret ID from Vault.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "3d94ac28-e7b6-4da2-8ff4-af506d5ded95",
-        "Name": "Vault.AppRole.UnwrapSecretID.Login.WrappedTokenCreationPath",
-        "Label": "Token Creation Path",
-        "HelpText": "*Optional* - the creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-18T09:07:46.536Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-18T09:07:46.536Z",
-      "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
diff --git a/step-templates/hashicorp-vault-approle-unwrap-secretid.json b/step-templates/hashicorp-vault-approle-unwrap-secretid.json
deleted file mode 100644
index c34c51270..000000000
--- a/step-templates/hashicorp-vault-approle-unwrap-secretid.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "Id": "c1f56030-0bcd-458d-bc70-b4f43ec0d30f",
-    "Name": "HashiCorp Vault - AppRole Unwrap Secret ID",
-    "Description": "This step retrieves (and unwraps) a Secret ID for an [AppRole](https://www.vaultproject.io/docs/auth/approle) using a wrapped auth token from a HashiCorp Vault server.\n\n---\n\nOne property from the response will be made available as a [sensitive Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables):\n\n- `data.secret_id` - This is the unwrapped Secret ID from Vault. The output variable name will be `UnwrappedSecretID`.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api-docs/auth/approle#login-with-approle), so no other dependencies are needed. \n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- The wrapped [auth token](https://www.vaultproject.io/docs/auth/token) used to retrieve the unwrapped Secret ID. \n\n---\n\n*Optional*\n- The creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault).\n\n---\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.\n- See the HashiCorp [AppRole patterns documentation](https://learn.hashicorp.com/tutorials/vault/pattern-approle?in=vault/recommended-patterns#vault-returns-a-token) for further information.",
-    "ActionType": "Octopus.Script",
-    "Version": 4,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.VaultAddress\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.ApiVersion\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_TOKEN = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.WrappedToken\"]\n\n# Optional Variables\n$VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.Namespace\"]\n$VAULT_APPROLE_UNWRAP_SECRETID_TOKEN_CREATION_PATH = $OctopusParameters[\"Vault.AppRole.UnwrapSecretID.WrappedTokenCreationPath\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_TOKEN)) {\n    throw \"Required parameter VAULT_APPROLE_UNWRAP_SECRETID_TOKEN not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n###############################################################################\n\n$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS = $VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS.TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\ntry {\n\n    Write-Verbose \"X-Vault-Namespace header: $VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE\"\n\n    # Should we validate lookup token's creation path?\n    if (![string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_TOKEN_CREATION_PATH)) {\n        $uri = \"$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION/sys/wrapping/lookup\"    \n        $payload = @{\n            token = $VAULT_APPROLE_UNWRAP_SECRETID_TOKEN\n        }\n\n        $Headers = @{}\n        if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)\n        }\n\n        Write-Verbose \"Making Post request to $uri\"\n        $response = Invoke-RestMethod -Uri $uri -Method Post -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers\n\n        if ($null -ne $response) {\n            Write-Verbose \"Validating Wrapped token creation path.\"\n            $Lookup_CreationPath = $response.data.creation_path\n            if ($VAULT_APPROLE_UNWRAP_SECRETID_TOKEN_CREATION_PATH -ne $Lookup_CreationPath) {\n                throw \"Supplied Wrapped token creation path failed lookup validation. Check the creation path value and retry.\"\n            }\n        }\n        else {\n            Write-Error \"Null or Empty response returned from Vault server lookup\" -Category InvalidResult\n        }\n    }\n\n    # Call to unwrap secret id from wrapped token.\n    $Headers = @{\n        \"X-Vault-Token\" = $VAULT_APPROLE_UNWRAP_SECRETID_TOKEN\n    }\n\n    if (-not [string]::IsNullOrWhiteSpace($VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)) {\n        $Headers.Add(\"X-Vault-Namespace\", $VAULT_APPROLE_UNWRAP_SECRETID_NAMESPACE)\n    }\n    \n    $uri = \"$VAULT_APPROLE_UNWRAP_SECRETID_ADDRESS/$VAULT_APPROLE_UNWRAP_SECRETID_API_VERSION/sys/wrapping/unwrap\"\n    Write-Verbose \"Making Post request to $uri\"\n    $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method Post\n    \n    if ($null -ne $response) {\n        Set-OctopusVariable -Name \"UnwrappedSecretID\" -Value $response.data.secret_id -Sensitive\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.UnwrappedSecretID}\"\n    }\n    else {\n        Write-Error \"Null or Empty response returned from Vault server unwrap\" -Category InvalidResult\n    }\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred unwrapping secretid: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.errors) {\n            $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n        }\n        else {\n            $errorDetails = $null\n            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n        }\n    }\n    \n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`n`tDetail: $AdditionalDetail\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "b30bafd3-a5b6-4c26-8eea-af938f5ba7da",
-        "Name": "Vault.AppRole.UnwrapSecretID.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a810fce1-3180-4eb8-b342-8b2d76a39667",
-        "Name": "Vault.AppRole.UnwrapSecretID.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "e60b5c0b-dacc-4a99-8907-82e57eb9f573",
-        "Name": "Vault.AppRole.UnwrapSecretID.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "6fd2fe01-9600-4ccc-a3f2-f733af79a255",
-        "Name": "Vault.AppRole.UnwrapSecretID.WrappedToken",
-        "Label": "Wrapped Token",
-        "HelpText": "This is the wrapped token used to retrieve the actual Secret ID from Vault.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "6dc8f829-c89c-403f-805c-350710d8d855",
-        "Name": "Vault.AppRole.UnwrapSecretID.WrappedTokenCreationPath",
-        "Label": "Token Creation Path",
-        "HelpText": "*Optional* - the creation path of the wrapped token. If this parameter value is provided, the step template will perform a [wrapping lookup](https://www.vaultproject.io/api-docs/system/wrapping-lookup) to [validate no malfeasance](https://www.vaultproject.io/docs/concepts/response-wrapping#response-wrapping-token-validation) has occurred.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-18T09:22:26.156Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-18T09:22:26.156Z",
-      "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
\ No newline at end of file
diff --git a/step-templates/hashicorp-vault-generate-jwt.json b/step-templates/hashicorp-vault-generate-jwt.json
deleted file mode 100644
index 37f90fb17..000000000
--- a/step-templates/hashicorp-vault-generate-jwt.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-    "Id": "e72fd23a-3bfd-4758-a720-2462d5206f65",
-    "Name": "HashiCorp Vault - Generate JWT",
-    "Description": "This step template generates a [Json Web Token (JWT)](https://en.wikipedia.org/wiki/JSON_Web_Token) for use with HashiCorp Vault.\n\nThe step is based on the existing [JWT - Generate JSON Web Token](https://library.octopus.com/step-templates/1ca0401c-dfca-420e-81ca-1f4b7cf02d2d/actiontemplate-jwt-generate-json-web-token) step template.\n\nHowever, it differs as it offers less flexibility in choosing the fields to use in the generated JWT and is opinionated towards support for Vault [entities and groups](https://learn.hashicorp.com/tutorials/vault/identity).\n\nThe resulting JWT will be stored as a [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) called **JWT**.\n\nA private key needs to be provided that will sign the combined JWT header and payload.\n\nCurrently, the following three signing algorithms are supported:\n\n1. `RS256` - RSASSA-PKCS1-v1_5 using SHA-256\n2. `RS384` - RSASSA-PKCS1-v1_5 using SHA-384\n3. `RS512` - RSASSA-PKCS1-v1_5 using SHA-512\n\nThe default is `RS256`.\n\n**Notes:**\n- Tested on Windows and Linux (PowerShell Core)\n- Tested with Octopus **2020.1**",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Helper functions\n###############################################################################\n\nfunction ConvertTo-JwtBase64 {\n    param (\n        $Value\n    )\n    if ($Value -is [string]) {\n        $ConvertedValue = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($Value)) -replace '\\+', '-' -replace '/', '_' -replace '='\n    }\n    elseif ($Value -is [byte[]]) {\n        $ConvertedValue = [Convert]::ToBase64String($Value) -replace '\\+', '-' -replace '/', '_' -replace '='\n    }\n\n    return $ConvertedValue\n}\n\nfunction ConvertTo-Subject {\n    param ([string]$Subject, [string]$IdentityPrefix)\n    return ConvertTo-Identity -IdentityValue $Subject -IdentityPrefix $IdentityPrefix\n}\n\nfunction ConvertTo-Groups {\n    param ([string]$Groups, [string]$IdentityPrefix)\n    return ConvertTo-Identity -IdentityValue $Groups -IdentityPrefix $IdentityPrefix\n}\n\nfunction ConvertTo-Identity {\n    param (\n        [string]$IdentityValue, \n        [string]$IdentityPrefix\n    )\n    $ServerUri = $OctopusParameters[\"Octopus.Web.ServerUri\"].ToLower() -Replace \"http://\" -Replace \"https://\"\n    $ProjectGroup = $OctopusParameters[\"Octopus.ProjectGroup.Name\"].ToLower() -Replace \" \", \"-\"\n    $Project = $OctopusParameters[\"Octopus.Project.Name\"].ToLower() -Replace \" \", \"-\"\n    $Environment = $OctopusParameters[\"Octopus.Environment.Name\"].ToLower() -Replace \" \", \"-\"\n    $identity = \"\"\n    switch ($VAULT_GENERATE_JWT_SUBJECT) {\n        \"serveruri\" {\n            $identity = $ServerUri\n        }\n        \"projectgroup\" {\n            $identity = \"$ServerUri/$ProjectGroup\"\n        }\n        \"project\" {\n            $identity = \"$ServerUri/$ProjectGroup/$Project\"\n        }\n        \"environment\" {\n            $identity = \"$ServerUri/$ProjectGroup/$Project/$Environment\"\n        }\n    }\n    if (![string]::IsNullOrWhiteSpace($IdentityPrefix)) {\n        $identity = \"$IdentityPrefix$identity\"\n    }\n    return $identity\n}\n\n###############################################################################\n\n# Variables\n$VAULT_GENERATE_JWT_PRIVATE_KEY = $OctopusParameters[\"Vault.Generate.JWT.PrivateKey\"]\n$VAULT_GENERATE_JWT_ALGORITHM = $OctopusParameters[\"Vault.Generate.JWT.Signing.Algorithm\"]\n$VAULT_GENERATE_JWT_EXPIRES_MINS = $OctopusParameters[\"Vault.Generate.JWT.ExpiresAfterMinutes\"]\n$VAULT_GENERATE_JWT_ISSUER = $OctopusParameters[\"Vault.Generate.JWT.Issuer\"]\n$VAULT_GENERATE_JWT_SUBJECT = $OctopusParameters[\"Vault.Generate.JWT.Subject\"]\n$VAULT_GENERATE_JWT_GROUPS = $OctopusParameters[\"Vault.Generate.JWT.Groups\"]\n$VAULT_GENERATE_JWT_AUDIENCE = $OctopusParameters[\"Vault.Generate.JWT.Audience\"]\n\n# Optional \n$VAULT_GENERATE_JWT_IDENTITY_PREFIX = $OctopusParameters[\"Vault.Generate.JWT.IdentityPrefix\"]\n\n$subject = ConvertTo-Subject -Groups $VAULT_GENERATE_JWT_GROUPS -IdentityPrefix $VAULT_GENERATE_JWT_IDENTITY_PREFIX\n$groups = ConvertTo-Groups -Groups $VAULT_GENERATE_JWT_GROUPS -IdentityPrefix $VAULT_GENERATE_JWT_IDENTITY_PREFIX\n\n$audiences = @()\nif (![string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_AUDIENCE)) {\n    @(($VAULT_GENERATE_JWT_AUDIENCE -Split \"`n\").Trim()) | ForEach-Object {\n        if (![string]::IsNullOrWhiteSpace($_)) {\n            $audiences += $_\n        }\n    }\n}\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_PRIVATE_KEY)) {\n    throw \"Required parameter Vault.Generate.JWT.PrivateKey not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_ALGORITHM)) {\n    throw \"Required parameter Vault.Generate.JWT.Signing.Algorithm not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_EXPIRES_MINS)) {\n    throw \"Required parameter Vault.Generate.JWT.ExpiresAfterMinutes not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_GENERATE_JWT_ISSUER)) {\n    throw \"Required parameter Vault.Generate.JWT.Issuer not specified.\"\n}\nif ($audiences.Length -le 0) {\n    throw \"Required parameter Vault.Generate.JWT.Audience not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($subject)) {\n    throw \"Required parameter Vault.Generate.JWT.Subject not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($groups)) {\n    throw \"Required parameter Vault.Generate.JWT.Groups not specified.\"\n}\n\n\n# Signing functions\n###############################################################################\n\n$RsaPrivateKey_Header = \"-----BEGIN RSA PRIVATE KEY-----\"\n$RsaPrivateKey_Footer = \"-----END RSA PRIVATE KEY-----\"\n$Pkcs8_PrivateKey_Header = \"-----BEGIN PRIVATE KEY-----\"\n$Pkcs8_PrivateKey_Footer = \"-----END PRIVATE KEY-----\"\n\nfunction ExtractPemData {\n    param (\n        [string]$Pem,\n        [string]$Header,\n        [string]$Footer\n    )\n\n    $Start = $Pem.IndexOf($Header) + $Header.Length\n    $End = $Pem.IndexOf($Footer, $Start) - $Start\n    $EncodedPem = ($Pem.Substring($Start, $End).Trim()) -Replace \" \", \"`n\"\n    \n    $PemData = [Convert]::FromBase64String($EncodedPem)\n    return [byte[]]$PemData\n}\n\nfunction DecodeIntSize {\n    param (\n        [System.IO.BinaryReader]$BinaryReader\n    )\n    \n    [byte]$byteValue = $BinaryReader.ReadByte()\n    \n    # If anything other than 0x02, an ASN.1 integer follows.\n    if ($byteValue -ne 0x02) {\n        return 0;\n    }\n    \n    $byteValue = $BinaryReader.ReadByte()\n    # 0x81 == Data size in next byte.\n    if ($byteValue -eq 0x81) { \n        $size = $BinaryReader.ReadByte()\n    }\n    # 0x82 == Data size in next 2 bytes.\n    else {\n        if ($byteValue -eq 0x82) {\n            [byte]$high = $BinaryReader.ReadByte()\n            [byte]$low = $BinaryReader.ReadByte()\n            $byteValues = [byte[]]@($low, $high, 0x00, 0x00)\n            $size = [System.BitConverter]::ToInt32($byteValues, 0)\n        }\n        else {\n            # Otherwise, data size has already been read above.\n            $size = $byteValue\n        }\n    }\n    # Remove high-order zeros in data\n    $byteValue = $BinaryReader.ReadByte()\n    while ($byteValue -eq 0x00) {\n        $byteValue = $BinaryReader.ReadByte()\n        $size -= 1\n    }\n\n    $BinaryReader.BaseStream.Seek(-1, [System.IO.SeekOrigin]::Current) | Out-Null\n    return $size\n}\n\nfunction PadByteArray {\n    param (\n        [byte[]]$Bytes,\n        [int]$Size\n    )\n\n    if ($Bytes.Length -eq $Size) {\n        return $Bytes\n    }\n    if ($Bytes.Length -gt $Size) {\n        throw \"Specified size '$Size' to pad is too small for byte array of size '$($Bytes.Length)'.\"\n    }\n\n    [byte[]]$PaddedBytes = New-Object Byte[] $Size\n    [System.Array]::Copy($Bytes, 0, $PaddedBytes, $Size - $bytes.Length, $bytes.Length) | Out-Null\n    return $PaddedBytes\n}\n\nfunction Compare-ByteArrays {\n    param (\n        [byte[]]$First,\n        [byte[]]$Second\n    )\n    if ($First.Length -ne $Second.Length) {\n        return $False\n    }\n    [int]$i = 0\n    foreach ($byte in $First) {\n        if ($byte -ne $Second[$i]) {\n            return $False\n        }\n        $i = $i + 1\n    }\n    return $True\n}\n\nfunction CreateRSAFromPkcs8 {\n    param (\n        [byte[]]$KeyBytes\n    )\n    Write-Verbose \"Reading RSA Pkcs8 private key bytes\"\n\n    # The encoded OID sequence for PKCS #1 rsaEncryption szOID_RSA_RSA = \"1.2.840.113549.1.1.1\"\n    # this byte[] includes the sequence byte and terminal encoded null \n    [byte[]]$SeqOID = 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00\n    [byte[]]$Seq = New-Object byte[] 15\n\n    # Have to wrap $KeyBytes in another array :|\n    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) \n    $reader = New-Object System.IO.BinaryReader($MemoryStream)\n    $StreamLength = [int]$MemoryStream.Length\n    \n    try {\n        [UInt16]$Bytes = $reader.ReadUInt16()\n\n        if ($Bytes -eq 0x8130) {\n            $reader.ReadByte() | Out-Null\n        }\n        elseif ($Bytes -eq 0x8230) {\n            $reader.ReadInt16() | Out-Null\n        }\n        else {\n            return $null\n        }\n        \n        [byte]$byteValue = $reader.ReadByte()\n\n        if ($byteValue -ne 0x02) {\n            return $null\n        }\n\n        $Bytes = $reader.ReadUInt16()\n\n        if ($Bytes -ne 0x0001) {\n            return $null\n        }\n\n        # Read the Sequence OID\n        $Seq = $reader.ReadBytes(15)\n        $SequenceMatches = Compare-ByteArrays -First $Seq -Second $SeqOID\n        if ($SequenceMatches -eq $False) {\n            Write-Verbose \"Sequence OID doesnt match\"\n            return $null\n        }\n\n        $byteValue = $reader.ReadByte()\n        # Next byte should be a Octet string\n        if ($byteValue -ne 0x04) {\n            return $null\n        }\n        # Read next byte / 2 bytes. \n        # Should be either: 0x81 or 0x82; otherwise it's the byte count.\n        $byteValue = $reader.ReadByte()\n        if ($byteValue -eq 0x81) {\n            $reader.ReadByte() | Out-Null\n        }\n        else {\n            if ($byteValue -eq 0x82) {\n                $reader.ReadUInt16() | Out-Null\n            }\n        }\n\n        # Remaining sequence *should* be the RSA Pkcs1 private Key bytes\n        [byte[]]$RsaKeyBytes = $reader.ReadBytes([int]($StreamLength - $MemoryStream.Position))\n        Write-Verbose \"Attempting to create RSA object from remaining Pkcs1 bytes\"\n        $rsa = CreateRSAFromPkcs1 -KeyBytes $RsaKeyBytes\n        return $rsa\n    }\n    catch {\n        Write-Warning \"CreateRSAFromPkcs8: Exception occurred - $($_.Exception.Message)\"\n        return $null\n    }\n    finally {\n        if ($null -ne $reader) { $reader.Close() }\n        if ($null -ne $MemoryStream) { $MemoryStream.Close() }\n    }\n}\n\nfunction CreateRSAFromPkcs1 {\n    param (\n        [byte[]]$KeyBytes\n    )\n    Write-Verbose \"Reading RSA Pkcs1 private key bytes\"\n    # Have to wrap $KeyBytes in another array :|\n    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) \n    $reader = New-Object System.IO.BinaryReader($MemoryStream)\n    try {\n               \n        [UInt16]$Bytes = $reader.ReadUInt16()\n\n        if ($Bytes -eq 0x8130) {\n            $reader.ReadByte() | Out-Null\n        }\n        elseif ($Bytes -eq 0x8230) {\n            $reader.ReadInt16() | Out-Null\n        }\n        else {\n            return $null\n        }\n    \n        $Bytes = $reader.ReadUInt16()\n        if ($Bytes -ne 0x0102) {\n            return $null\n        }\n    \n        [byte]$byteValue = $reader.ReadByte()\n        if ($byteValue -ne 0x00) {\n            return $null\n        }\n\n        # Private key parameters are integer sequences.\n        # For a summary of the RSA Parameters fields, \n        # See https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.rsaparameters#summary-of-fields\n        \n        $Modulus_Size = DecodeIntSize -BinaryReader $reader\n        $Modulus = $reader.ReadBytes($Modulus_Size)\n\n        $E_Size = DecodeIntSize -BinaryReader $reader\n        $E = $reader.ReadBytes($E_Size)\n\n        $D_Size = DecodeIntSize -BinaryReader $reader\n        $D = $reader.ReadBytes($D_Size)\n\n        $P_Size = DecodeIntSize -BinaryReader $reader\n        $P = $reader.ReadBytes($P_Size)\n\n        $Q_Size = DecodeIntSize -BinaryReader $reader\n        $Q = $reader.ReadBytes($Q_Size)\n\n        $DP_Size = DecodeIntSize -BinaryReader $reader\n        $DP = $reader.ReadBytes($DP_Size)\n\n        $DQ_Size = DecodeIntSize -BinaryReader $reader\n        $DQ = $reader.ReadBytes($DQ_Size)\n\n        $IQ_Size = DecodeIntSize -BinaryReader $reader\n        $IQ = $reader.ReadBytes($IQ_Size)\n\n        $rsa = New-Object System.Security.Cryptography.RSACryptoServiceProvider\n        $rsaParameters = New-Object System.Security.Cryptography.RSAParameters\n        $rsaParameters.Modulus = $Modulus\n        $rsaParameters.Exponent = $E\n        $rsaParameters.P = $P\n        $rsaParameters.Q = $Q\n        # Some RSAParameter values dont play well with byte buffers having leading zeroes removed.\n        $rsaParameters.D = PadByteArray -Bytes $D -Size $Modulus.Length\n        $rsaParameters.DP = PadByteArray -Bytes $DP -Size $P.Length\n        $rsaParameters.DQ = PadByteArray -Bytes $DQ -Size $Q.Length\n        $rsaParameters.InverseQ = PadByteArray -Bytes $IQ -Size $Q.Length\n        $rsa.ImportParameters($rsaParameters)\n\n        Write-Verbose \"Completed RSA object creation\"\n        return $rsa\n    }\n    catch {\n        Write-Warning \"CreateRSA-FromPkcs1: Exception occurred - $($_.Exception.Message)\"\n        return $null\n    }\n    finally {\n        if ($null -ne $reader) { $reader.Close() }\n        if ($null -ne $MemoryStream) { $MemoryStream.Close() }\n    }\n}\n\nfunction CreateSigningKey {\n    param (\n        [string]$Key\n    )\n    try {\n        $Key = $Key.Trim()\n        switch -Wildcard($Key) {\n            \"$Pkcs8_PrivateKey_Header*\" {\n                $KeyBytes = ExtractPemData -PEM $Key -Header $Pkcs8_PrivateKey_Header -Footer $Pkcs8_PrivateKey_Footer\n                $SigningKey = CreateRSAFromPkcs8 -KeyBytes $KeyBytes\n                return $SigningKey\n            }\n            \"$RsaPrivateKey_Header*\" {\n                $KeyBytes = ExtractPemData -PEM $Key -Header $RsaPrivateKey_Header -Footer $RsaPrivateKey_Footer\n                $SigningKey = CreateRSAFromPkcs1 -KeyBytes $KeyBytes\n                return $SigningKey\n            }\n            default {\n                Write-Verbose \"The PEM header could not be found. Accepted headers: 'BEGIN PRIVATE KEY', 'BEGIN RSA PRIVATE KEY'\"\n                return $null\n            }\n        }\n    }\n    catch {\n        Write-Warning \"Couldn't create signing key: $($_.Exception.Message)\"\n        return $null\n    }\n}\n\n###############################################################################\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$OutputVariableName = \"JWT\"\n\nWrite-Verbose \"Vault.Generate.JWT.Signing.Algorithm: $VAULT_GENERATE_JWT_ALGORITHM\"\nWrite-Verbose \"Vault.Generate.JWT.ExpiresAfterMinutes: $VAULT_GENERATE_JWT_EXPIRES_MINS\"\nWrite-Verbose \"Vault.Generate.JWT.Issuer: $VAULT_GENERATE_JWT_ISSUER\"\nWrite-Verbose \"Vault.Generate.JWT.Audience(s): $($audiences -Join \",\")\"\nWrite-Verbose \"Vault.Generate.JWT.Subject: $subject\"\nWrite-Verbose \"Vault.Generate.JWT.Groups: $groups\"\nWrite-Verbose \"Vault.Generate.JWT.IdentityPrefix: $VAULT_GENERATE_JWT_IDENTITY_PREFIX\"\nWrite-Verbose \"Step Name: $StepName\"\n\ntry {\n\n    # Created + Expires\n    $Created = (Get-Date).ToUniversalTime()\n    $Expires = $Created.AddMinutes([int]$VAULT_GENERATE_JWT_EXPIRES_MINS)\n\n    $createDate = [Math]::Floor([decimal](Get-Date($Created) -UFormat \"%s\"))\n    $expiryDate = [Math]::Floor([decimal](Get-Date($Expires) -UFormat \"%s\"))\n\n    $JwtHeader = @{\n        alg = $VAULT_GENERATE_JWT_ALGORITHM;\n        typ = \"JWT\";\n    } | ConvertTo-Json -Compress\n    \n    $JwtPayload = [Ordered]@{\n        iat = [long]$createDate;\n        exp = [long]$expiryDate;\n        iss = $VAULT_GENERATE_JWT_ISSUER;\n        aud = $audiences;\n        sub = $subject;\n        groups = $groups;\n    }\n\n    $JwtPayload = $JwtPayload | ConvertTo-Json -Compress\n\n    $base64Header = ConvertTo-JwtBase64 -Value $JwtHeader\n    $base64Payload = ConvertTo-JwtBase64 -Value $JwtPayload\n\n    $Jwt = $base64Header + '.' + $base64Payload\n\n    $JwtBytes = [System.Text.Encoding]::UTF8.GetBytes($Jwt)\n    $JwtSignature = $null\n    \n    switch ($VAULT_GENERATE_JWT_ALGORITHM) {\n        \"RS256\" {\n            try { \n\n                $rsa = CreateSigningKey -Key $VAULT_GENERATE_JWT_PRIVATE_KEY\n                if ($null -eq $rsa) {\n                    throw \"Couldn't create RSA object\"\n                }\n                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA256, [Security.Cryptography.RSASignaturePadding]::Pkcs1) \n                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature\n            }\n            catch { throw \"Signing with SHA256 and Pkcs1 padding failed using private key: $($_.Exception.Message)\" }\n            finally { if ($null -ne $rsa) { $rsa.Dispose() } }\n            \n        }\n        \"RS384\" {\n            try { \n                $rsa = CreateSigningKey -Key $VAULT_GENERATE_JWT_PRIVATE_KEY\n                if ($null -eq $rsa) {\n                    throw \"Couldn't create RSA object\"\n                }\n                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA384, [Security.Cryptography.RSASignaturePadding]::Pkcs1) \n                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature\n            }\n            catch { throw \"Signing with SHA384 and Pkcs1 padding failed using private key: $($_.Exception.Message)\" }\n            finally { if ($null -ne $rsa) { $rsa.Dispose() } }\n        }\n        \"RS512\" {\n            try { \n                $rsa = CreateSigningKey -Key $VAULT_GENERATE_JWT_PRIVATE_KEY\n                if ($null -eq $rsa) {\n                    throw \"Couldn't create RSA object\"\n                }\n                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA512, [Security.Cryptography.RSASignaturePadding]::Pkcs1) \n                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature\n            }\n            catch { throw \"Signing with SHA512 and Pkcs1 padding failed using private key: $($_.Exception.Message)\" }\n            finally { if ($null -ne $rsa) { $rsa.Dispose() } }\n        }\n        default {\n            throw \"The algorithm is not one of the supported: 'RS256', 'RS384', 'RS512'\"\n        }\n    }\n    if ([string]::IsNullOrWhiteSpace($JwtSignature) -eq $True) {\n        throw \"JWT signature empty.\"\n    }\n\n    $Jwt = \"$Jwt.$JwtSignature\"\n    Set-OctopusVariable -Name $OutputVariableName -Value $Jwt -Sensitive\n    Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}\"\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $Message = \"An error occurred generating a JWT: $ExceptionMessage\"\n    Write-Error $Message -Category InvalidResult\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "71bacc82-21d7-4d08-a944-15dacd0a3405",
-        "Name": "Vault.Generate.JWT.PrivateKey",
-        "Label": "JWT Private signing key",
-        "HelpText": "Provide the private key in PEM format to be used to sign the JWT.\n\nAccepted headers: \n\n- `----BEGIN RSA PRIVATE KEY-----`\n- `-----BEGIN PRIVATE KEY----`\n\n**Note:** It's recommended to use a sensitive variable to provide this value. If you instead enter the private key directly, the step template will attempt to detect this by replacing spaces with new lines ``n`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "84759ecc-a3f6-4822-a678-833269a8bf0d",
-        "Name": "Vault.Generate.JWT.Signing.Algorithm",
-        "Label": "JWT signing algorithm",
-        "HelpText": "The JWA [algorithm](https://datatracker.ietf.org/doc/html/rfc7518#section-3.1) to use when signing the JWT. The default is `RS256` (RSASSA-PKCS1-v1_5 using SHA-256).\n\nThis value is also used for the `alg` [algorithm header](https://datatracker.ietf.org/doc/html/rfc7515#section-4.1.1).",
-        "DefaultValue": "RS256",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "RS256|RS256: RSASSA-PKCS1-v1_5 using SHA-256\nRS384|RS384: RSASSA-PKCS1-v1_5 using SHA-384\nRS512|RS512: RSASSA-PKCS1-v1_5 using SHA-512"
-        }
-      },
-      {
-        "Id": "76d289c5-f6f9-4cfb-b876-13515745f03f",
-        "Name": "Vault.Generate.JWT.ExpiresAfterMinutes",
-        "Label": "JWT expiry time in minutes",
-        "HelpText": "The number of minutes after the JWT is created that it expires. This value is used for the `exp` [expiration time claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4). The default is `20` minutes.",
-        "DefaultValue": "20",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "20d57320-15e4-4777-916b-8563192a326d",
-        "Name": "Vault.Generate.JWT.Issuer",
-        "Label": "JWT Issuer claim",
-        "HelpText": "The `iss` [isuer claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.1) identifies the principal that issued the JWT.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "12a68971-8e0b-4b90-9a27-4c81413d0fb7",
-        "Name": "Vault.Generate.JWT.Audience",
-        "Label": "JWT Audience claim",
-        "HelpText": "The `aud` [audience claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3) identifies the recipients that the JWT is intended for. This is typically the base address of the resource being accessed, such as `https://example-domain.com`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "e7026958-60cb-4652-9fe0-2ef2965de951",
-        "Name": "Vault.Generate.JWT.Subject",
-        "Label": "JWT Subject claim",
-        "HelpText": "Choose from a defined list of values for the `sub` [subject claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.2) of the JWT.\n\nAvailable options start from least granular to most granular: \n\n- Octopus Server Uri\n- Octopus Server Uri, and Project Group name\n- Octopus Server Uri, Project Group, and Project name\n- Octopus Server Uri, Project Group, Project and Environment name\n\n*Note:* If the **Server Uri** property has not been set for the Octopus instance, the `Octopus.Web.ServerUri` variable will resolve to an empty string.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "serveruri|Octopus Server Uri\nprojectgroup|Octopus Server Uri, and Project Group\nproject|Octopus Server Uri, Project Group, and Project\nenvironment|Octopus Server Uri, Project Group, Project, and Environment"
-        }
-      },
-      {
-        "Id": "1bd2294c-64a3-4dad-bb9f-1a4cce5eaff5",
-        "Name": "Vault.Generate.JWT.Groups",
-        "Label": "JWT Groups claim",
-        "HelpText": "Choose from a defined list of values for the `groups` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies groups associated with this JWT. \n\nAvailable options start from least granular to most granular: \n\n- Octopus Server Uri\n- Octopus Server Uri, and Project Group name\n- Octopus Server Uri, Project Group, and Project name\n- Octopus Server Uri, Project Group, Project and Environment name\n\n*Note:* If the **Server Uri** property has not been set for the Octopus instance, the `Octopus.Web.ServerUri` variable will resolve to an empty string.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "serveruri|Octopus Server Uri\nprojectgroup|Octopus Server Uri, and Project Group\nproject|Octopus Server Uri, Project Group, and Project\nenvironment|Octopus Server Uri, Project Group, Project, and Environment"
-        }
-      },
-      {
-        "Id": "88298719-27ac-48c6-8c13-c40a3aaceb6c",
-        "Name": "Vault.Generate.JWT.IdentityPrefix",
-        "Label": "JWT Identity Prefix (optional)",
-        "HelpText": "*Optional* - A prefix to be added to the values used in **both** the `sub` and `groups` claims.\n\nIf no value is provided, the prefix is not included.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-08-10T12:55:30.088Z",
-      "OctopusVersion": "2021.2.7090",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "hashicorp-vault"
-  }
\ No newline at end of file
diff --git a/step-templates/hashicorp-vault-jwt-login.json b/step-templates/hashicorp-vault-jwt-login.json
deleted file mode 100644
index fcc5337ff..000000000
--- a/step-templates/hashicorp-vault-jwt-login.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "Id": "d49bc861-cd36-4624-960c-77613a54b139",
-    "Name": "HashiCorp Vault - JWT Login",
-    "Description": "This step logs into a HashiCorp Vault server using the [JWT](https://www.vaultproject.io/docs/auth/jwt) auth method.\n\nThe `client_token` from the response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `JWTAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api/auth/ldap#login-with-ldap-user), so no other dependencies are needed. \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- You must supply the full path where the JWT auth method is mounted.\n- You must supply a valid Vault [JWT role](https://www.vaultproject.io/api/auth/jwt#create-role).\n- You must supply a valid, non-expired [JWT token](https://en.wikipedia.org/wiki/JSON_Web_Token).\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$VAULT_JWT_LOGIN_ADDRESS = $OctopusParameters[\"Vault.JWT.Login.VaultAddress\"]\n$VAULT_JWT_LOGIN_API_VERSION = $OctopusParameters[\"Vault.JWT.Login.ApiVersion\"]\n$VAULT_JWT_LOGIN_AUTH_PATH = $OctopusParameters[\"Vault.JWT.Login.AuthPath\"]\n$VAULT_JWT_LOGIN_ROLE = $OctopusParameters[\"Vault.JWT.Login.Role\"]\n$VAULT_JWT_LOGIN_TOKEN = $OctopusParameters[\"Vault.JWT.Token\"]\n\n# Optional\n$VAULT_JWT_LOGIN_NAMESPACE = $OctopusParameters[\"Vault.JWT.Login.Namespace\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_ADDRESS)) {\n    throw \"Required parameter Vault.JWT.Login.VaultAddress not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_API_VERSION)) {\n    throw \"Required parameter Vault.JWT.Login.ApiVersion not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_AUTH_PATH)) {\n    throw \"Required parameter Vault.JWT.Login.AuthPath not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_ROLE)) {\n    throw \"Required parameter Vault.JWT.Login.Role not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_TOKEN)) {\n    throw \"Required parameter Vault.JWT.Token not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n###############################################################################\n\n$VAULT_JWT_LOGIN_ADDRESS = $VAULT_JWT_LOGIN_ADDRESS.TrimEnd('/')\n$VAULT_JWT_LOGIN_AUTH_PATH = $VAULT_JWT_LOGIN_AUTH_PATH.TrimStart('/').TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\ntry {\n    $payload = @{\n        role = $VAULT_JWT_LOGIN_ROLE;\n        jwt  = $VAULT_JWT_LOGIN_TOKEN;\n    }\n\n    $Headers = @{}\n    if (-not [string]::IsNullOrWhiteSpace($VAULT_JWT_LOGIN_NAMESPACE)) {\n        Write-Verbose \"Setting 'X-Vault-Namespace' header to: $VAULT_JWT_LOGIN_NAMESPACE\"\n        $Headers.Add(\"X-Vault-Namespace\", $VAULT_JWT_LOGIN_NAMESPACE)\n    }\n    \n    $uri = \"$VAULT_JWT_LOGIN_ADDRESS/$VAULT_JWT_LOGIN_API_VERSION/$VAULT_JWT_LOGIN_AUTH_PATH/login\"\n    Write-Verbose \"Making request to $uri\"\n    $response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers\n    if ($null -ne $response) {\n        Set-OctopusVariable -Name \"JWTAuthToken\" -Value $response.auth.client_token -Sensitive\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.JWTAuthToken}\"\n    }\n    else {\n        Write-Error \"Null or Empty response returned from Vault server\" -Category InvalidResult\n    }\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred logging in with JWT: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.errors) {\n            $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n        }\n        else {\n            $errorDetails = $null\n            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n        }\n    }\n    \n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`n`tDetail: $AdditionalDetail\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "37bec45d-aac8-4962-a8e8-1ccf38ab3038",
-        "Name": "Vault.JWT.Login.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c4dc7abc-d659-42c3-9bc5-99c12049b9a6",
-        "Name": "Vault.JWT.Login.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "d2a19b73-36fe-445d-be9b-13d0b54adbfa",
-        "Name": "Vault.JWT.Login.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "16272d7f-aac5-49c4-86f3-36725b05c750",
-        "Name": "Vault.JWT.Login.AuthPath",
-        "Label": "JWT Auth Login path",
-        "HelpText": "The path that the JWT method is mounted at. The default is `/auth/jwt`. If the JWT auth method was enabled at a different path, for example `my-path`, then specify `/my-path` instead.\n",
-        "DefaultValue": "/auth/jwt",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "379393d6-98c8-4114-af56-4ecfe29517f3",
-        "Name": "Vault.JWT.Login.Role",
-        "Label": "JWT role",
-        "HelpText": "The Vault [JWT role](https://www.vaultproject.io/api/auth/jwt#create-role).",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "75e6eb74-180c-4aa0-bc47-f7a33b0e9fb4",
-        "Name": "Vault.JWT.Token",
-        "Label": "JWT Token",
-        "HelpText": "The signed [JSON Web Token](https://tools.ietf.org/html/rfc7519) (JWT) to login with.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-21T19:20:21.100Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-21T19:20:21.100Z",
-      "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
diff --git a/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets.json b/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets.json
deleted file mode 100644
index a6ca66cc1..000000000
--- a/step-templates/hashicorp-vault-keyvalue-v1-retrieve-secrets.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "Id": "9aab9522-25e0-4539-841c-8b726e6b1520",
-    "Name": "HashiCorp Vault - Key Value (v1) retrieve secrets",
-    "Description": "This step retrieves one or more secrets in a v1 Key/Value secrets engine stored within a HashiCorp Vault server using a previously obtained authentication token.\n\nThis step template uses the [Rest API](https://www.vaultproject.io/api-docs/secret/kv/kv-v1), so no other dependencies are needed. \n\n---\n\n**Authentication Tokens**\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.\n\n---\n**Secrets Path:**\n\nSpecify the full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\nThis value should contain:\n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v1).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config`, then the value you would enter is:\n\n`/my-secrets/config`\n\n---\n\n**Retrieval methods:**\n\nThe step template operates in one of 2 retrieval modes that control how many Vault Key values are returned. The options are:\n- `Single vault key` - a single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#read-secret) method.\n- `Multiple vault keys` - multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#list-secrets) method.\n\nThe default is `Single vault key`.\n\n---\n\n**Optional field names:**\n\nChoose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this parameter is not set, all fields found from secret keys will be returned.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n\n---\n\n**Sensitive output variables:**\n\nFor each vault key's field values, an Octopus [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) will be created for use in other steps.\n\n---\n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- An authentication [token](https://www.vaultproject.io/docs/auth/token). \n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault).\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
-    "ActionType": "Octopus.Script",
-    "Version": 6,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "### Set TLS 1.2\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Required Variables\n$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.VaultAddress\"]\n$VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.ApiVersion\"]\n$VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.AuthToken\"]\n$VAULT_RETRIEVE_KV_V1_SECRETS_PATH = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.SecretsPath\"]\n$VAULT_RETRIEVE_KV_V1_SECRETS_METHOD = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.RetrievalMethod\"]\n$VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.RecursiveSearch\"]\n$VAULT_RETRIEVE_KV_V1_PRINT_VARIABLE_NAMES = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.PrintVariableNames\"]\n\n# Optional variables\n$VAULT_RETRIEVE_KV_V1_SECRETS_FIELD_VALUES = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.FieldValues\"]\n$VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE = $OctopusParameters[\"Vault.Retrieve.KV.V1.Secrets.Namespace\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_PATH)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_PATH not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_METHOD)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_METHOD not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try {$response = $rawResponse | ConvertFrom-Json} catch {$response=$rawResponse}\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\nfunction Get-VaultSecret {\n    param (\n        [string]$SecretEnginePath,\n        [string]$SecretPath,\n        $Fields\n    )\n    try {\n        # Local variables\n        $VariablesCreated = 0\n        $FieldsSpecified = ($Fields.Count -gt 0)\n        $SecretPath = $SecretPath.TrimStart(\"/\")\n        $WorkingPath = \"$($SecretEnginePath)/$($SecretPath)\"\n        $RequestPath = \"$SecretEnginePath/$($SecretPath)\"\n\n        $uri = \"$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))\"\n        $Headers = @{\"X-Vault-Token\" = $VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN }\n        \n        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)           \n        }\n\n        $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method GET\n\n        if ($null -ne $response) {\n            if ($FieldsSpecified -eq $True) {\n                foreach ($field in $Fields) {\n                    $fieldName = $field.Name\n                    $fieldVariableName = $field.VariableName\n                    $fieldValue = $response.data.$fieldName\n\n                    if ($null -ne $fieldValue) {\n                        if ([string]::IsNullOrWhiteSpace($fieldVariableName)) {\n                            $fieldVariableName = \"$($WorkingPath.Replace(\"/\",\".\")).$($fieldName.Trim())\"\n                        }\n                        \n                        Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive\n                        if($VAULT_RETRIEVE_KV_V1_PRINT_VARIABLE_NAMES -eq $True) {\n                            Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}\"\n                        }\n                        $VariablesCreated += 1\n                    }\n                }\n            } \n            # No fields specified, iterate through each one.\n            else {\n                $secretFieldNames = $response.data | Get-Member | Where-Object { $_.MemberType -eq \"NoteProperty\" } | Select-Object -ExpandProperty \"Name\"\n                foreach ($fieldName in $secretFieldNames) {\n                    $fieldVariableName = \"$($WorkingPath.Replace(\"/\",\".\")).$($fieldName.Trim())\"\n                    $fieldValue = $response.data.$fieldName\n                    \n                    Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive                    \n                    if($VAULT_RETRIEVE_KV_V1_PRINT_VARIABLE_NAMES -eq $True) {\n                        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}\"\n                    }\n                    $VariablesCreated += 1\n                }\n            }\n            return $VariablesCreated\n        }  \n    }\n    catch {\n        $ExceptionMessage = $_.Exception.Message\n        $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n        $Message = \"An error occurred logging in with AppRole: $ExceptionMessage\"\n        $AdditionalDetail = \"\"\n        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n            if ($null -ne $ErrorBody.errors) {\n                $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n            }\n            else {\n                $errorDetails = $null\n                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n            }\n        }\n        \n        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n            $Message += \"`n`tDetail: $AdditionalDetail\"\n        }\n    \n        Write-Error $Message -Category ConnectionError\n    }\n}\n\nfunction List-VaultSecrets {\n    param (\n        [string]$SecretEnginePath,\n        [string]$SecretPath\n    )\n    try {\n        $SecretPath = $SecretPath.TrimStart(\"/\")\n        $RequestPath = \"$SecretEnginePath/$SecretPath\"\n\n        # Vault uses the 'LIST' HTTP verb, which is only supported in PowerShell 6.0+ using -CustomMethod.\n        # Adding ?list=true will allow support for Windows Desktop PowerShell.\n        # See https://www.vaultproject.io/api#api-operations for further details/\n        $uri = \"$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))?list=true\"\n        $Headers = @{\"X-Vault-Token\" = $VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN }\n        \n        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE)           \n        }\n\n        $response = Invoke-RestMethod -Uri $uri -Headers $Headers -Method GET\n\n        return $response\n    }\n    catch {\n        $ExceptionMessage = $_.Exception.Message\n        $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n        $Message = \"An error occurred logging in with AppRole: $ExceptionMessage\"\n        $AdditionalDetail = \"\"\n        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n            if ($null -ne $ErrorBody.errors) {\n                $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n            }\n            else {\n                $errorDetails = $null\n                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n            }\n        }\n        \n        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n            $Message += \"`n`tDetail: $AdditionalDetail\"\n        }\n    \n        Write-Error $Message -Category ConnectionError\n    }\n}\n\nfunction Recursive-GetVaultSecrets {\n    param(\n        [string]$SecretEnginePath,\n        [string]$SecretPath\n    )\n    $VariablesCreated = 0\n    $SecretPath = $SecretPath.TrimStart(\"/\")\n    $SecretPath = $SecretPath.TrimEnd(\"/\")\n\n    Write-Verbose \"Executing Recursive-GetVaultSecrets\"\n    \n    # Get list of secrets for path\n    $VaultKeysResponse = List-VaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath \n    \n    if ($null -ne $VaultKeysResponse) {\n        $keys = $VaultKeysResponse.data.keys\n        if ($null -ne $keys) {\n            $secretKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and !$_.EndsWith(\"/\") }\n            foreach ($secretKey in $secretKeys) {\n                $secretKeyPath = \"$($SecretPath)/$secretKey\"\n                $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $secretKeyPath -Fields $Fields\n            }\n\n            if ($VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE -eq $True) {\n                $folderKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and $_.EndsWith(\"/\") }\n                foreach ($folderKey in $folderKeys) {\n                    $Depth = $Depth += 1\n                    $folderPath = \"$($SecretPath)/$folderKey\"\n                    $VariablesCreated += Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $folderPath\n                }\n            }\n        }\n    }\n    return $VariablesCreated\n}\n\n###############################################################################\n$VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS = $VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS.TrimEnd('/')\n$VAULT_RETRIEVE_KV_V1_SECRETS_PATH = $VAULT_RETRIEVE_KV_V1_SECRETS_PATH.TrimStart('/')\n\n# Local variables\n$RetrieveMultipleKeys = $VAULT_RETRIEVE_KV_V1_SECRETS_METHOD.ToUpper().Trim() -ne \"GET\"\n$SecretPathItems = ($VAULT_RETRIEVE_KV_V1_SECRETS_PATH -Split \"/\")\n$SecretEnginePath = ($SecretPathItems | Select-Object -First 1)\n$SecretPath = ($SecretPathItems | Select-Object -Skip 1) -Join \"/\"\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$Fields = @()\n$VariablesCreated = 0\n\nif (![string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V1_SECRETS_FIELD_VALUES)) {\n    \n    @(($VAULT_RETRIEVE_KV_V1_SECRETS_FIELD_VALUES -Split \"`n\").Trim()) | ForEach-Object {\n        if (![string]::IsNullOrWhiteSpace($_)) {\n            Write-Verbose \"Working on: '$_'\"\n            $fieldDefinition = ($_ -Split \"\\|\")\n            $name = $fieldDefinition[0].Trim()\n            if([string]::IsNullOrWhiteSpace($name)) {\n                throw \"Unable to establish fieldname from: '$($_)'\"\n            }\n            $field = [PsCustomObject]@{\n                Name         = $name\n                VariableName = if (![string]::IsNullOrWhiteSpace($fieldDefinition[1])) { $fieldDefinition[1].Trim() } else { \"\" }\n            }\n            $Fields += $field\n        }\n    }\n}\n$FieldsSpecified = ($Fields.Count -gt 0)\n\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS: $VAULT_RETRIEVE_KV_V1_SECRETS_ADDRESS\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION: $VAULT_RETRIEVE_KV_V1_SECRETS_API_VERSION\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_TOKEN: '********'\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_PATH: $VAULT_RETRIEVE_KV_V1_SECRETS_PATH\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_METHOD: $VAULT_RETRIEVE_KV_V1_SECRETS_METHOD\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE: $VAULT_RETRIEVE_KV_V1_SECRETS_RECURSIVE\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE: $VAULT_RETRIEVE_KV_V1_SECRETS_NAMESPACE\"\nWrite-Verbose \"RetrieveMultipleKeys: $RetrieveMultipleKeys\"\nWrite-Verbose \"Fields Specified: $($FieldsSpecified)\"\nWrite-Verbose \"Engine Path: $SecretEnginePath\"\nWrite-Verbose \"Secret Path: $SecretPath\"\n\n$variablesCreated = 0\n\nif ($RetrieveMultipleKeys -eq $false) {\n    $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Fields $Fields\n}\nelse {\n    $variablesCreated = Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Depth 0\n}\nWrite-Host \"Created $variablesCreated output variables\""
-    },
-    "Parameters": [
-      {
-        "Id": "13d0b003-63ef-45d0-969d-e032ba5b41ee",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e167ab26-3959-4e51-93fb-39c4a1ac76db",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "5f904ca6-299e-4591-a47b-a998c5aa9a9c",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "66a8d06e-08ac-4c9f-9e3a-a1727f2e0898",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.AuthToken",
-        "Label": "Auth Token",
-        "HelpText": "The [Auth Token](https://www.vaultproject.io/docs/auth/token) used to authenticate to retrieve secrets.\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "2534a01a-db65-4bc5-9766-68c6567ed5f6",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.SecretsPath",
-        "Label": "Secrets Path",
-        "HelpText": "The full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\n**This value should contain:** \n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v1).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config` then the value you would enter is:\n\n`/my-secrets/config`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "01ca54f6-269a-447a-9193-d7de9195b164",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.RetrievalMethod",
-        "Label": "Secrets retrieval method",
-        "HelpText": "This controls how many Vault Key values are returned. The options are:\n- A single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#read-secret) method.\n- Multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#list-secrets) method.\n\nThe default is `Single vault key`.",
-        "DefaultValue": "Get",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Get|Single vault key \nList|Multiple vault keys"
-        }
-      },
-      {
-        "Id": "ab4e36f5-96d9-4969-a8a8-7c1c7a2de9ff",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.RecursiveSearch",
-        "Label": "Recursive retrieval",
-        "HelpText": "If the path is being enumerated, should any secrets included in sub-folders also be retrieved? The default is: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "20ae7130-dd7c-4abf-af2a-675c039df7a5",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.FieldValues",
-        "Label": "Field names",
-        "HelpText": "Choose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this value is not present, any fields found within secrets from the specified path will be retrieved.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "3885d50e-3be5-4bc2-bb97-6e2b23459b07",
-        "Name": "Vault.Retrieve.KV.V1.Secrets.PrintVariableNames",
-        "Label": "Print output variable names",
-        "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-21T17:01:25.405Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-21T17:01:25.405Z",
-      "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
diff --git a/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets.json b/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets.json
deleted file mode 100644
index 155fd0f65..000000000
--- a/step-templates/hashicorp-vault-keyvalue-v2-retrieve-secrets.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "Id": "337f1b67-cdb0-4f33-9e08-6bf804f672d2",
-    "Name": "HashiCorp Vault - Key Value (v2) retrieve secrets",
-    "Description": "This step retrieves one or more secrets in a v2 Key/Value secrets engine stored within a HashiCorp Vault server.\n\nThis step template uses the [Rest API](https://www.vaultproject.io/api-docs/secret/kv/kv-v2), so no other dependencies are needed. \n\n---\n\n**Authentication Tokens**\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.\n\n---\n**Secrets Path:**\n\nSpecify the full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\nThis value should contain:\n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v2).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config`, then the value you would enter is:\n\n`/my-secrets/config`\n\n---\n\n**Retrieval methods:**\n\nThe step template operates in one of 2 retrieval modes that control how many Vault Key values are returned. The options are:\n- `Single vault key` - a single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v1#read-secret) method.\n- `Multiple vault keys` - multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#list-secrets) method.\n\nThe default is `Single vault key`.\n\n---\n\n**Optional field names:**\n\nChoose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this parameter is not set, all fields found from secret keys will be returned.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n\n---\n\n**Optional: Specific version of secret:**\n\n_Optional:_ The default behavior of this step is to retrieve the latest version of secrets.\n\nHowever, to retrieve a specific version of a secret:\n- Include the version of the secret you wish to retrieve. For example, if you want version 2 of all field values in a secret, enter `2`.\n\nNote: This parameter only works with the `Secrets Retrieval method` = `Single Vault key`.\n\nTo retrieve multiple vault keys with specific versions, use this step template in multiple steps.\n\n---\n\n**Sensitive output variables:**\n\nFor each vault key's field values, an Octopus [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) will be created for use in other steps.\n\n--- \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- An authentication [token](https://www.vaultproject.io/docs/auth/token).\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault).\n\nNotes:\n\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
-    "ActionType": "Octopus.Script",
-    "Version": 9,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "### Set TLS 1.2\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Required Variables\n$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.VaultAddress\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.ApiVersion\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.AuthToken\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_PATH = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.SecretsPath\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_METHOD = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.RetrievalMethod\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.RecursiveSearch\"]\n$VAULT_RETRIEVE_KV_V2_PRINT_VARIABLE_NAMES = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.PrintVariableNames\"]\n\n# Optional variables\n$VAULT_RETRIEVE_KV_V2_SECRETS_FIELD_VALUES = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.FieldValues\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.SecretVersion\"]\n$VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE = $OctopusParameters[\"Vault.Retrieve.KV.V2.Secrets.Namespace\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_PATH)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_PATH not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_METHOD)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_METHOD not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE)) {\n    throw \"Required parameter VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\nfunction Get-VaultSecret {\n    param (\n        [string]$SecretEnginePath,\n        [string]$SecretPath,\n        $Fields\n    )\n    try {\n        # Local variables\n        $VariablesCreated = 0\n        $FieldsSpecified = ($Fields.Count -gt 0)\n        $SecretPath = $SecretPath.TrimStart(\"/\")\n        $WorkingPath = \"$($SecretEnginePath)/$($SecretPath)\"\n        $RequestPath = \"$SecretEnginePath/data/$($SecretPath)\"\n\n        $uri = \"$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))\"\n        if (![string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION) -and $RetrieveMultipleKeys -eq $False) {\n            $uri = \"$($uri)?version=$VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION\"\n        }\n        \n        $headers = @{\"X-Vault-Token\" = $VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN }\n        \n        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)           \n        }\n        \n        Write-Verbose \"Making request to $uri\"\n        $response = Invoke-RestMethod -Uri $uri -Headers $headers -Method GET\n\n        if ($null -ne $response) {\n            if ($FieldsSpecified -eq $True) {\n                foreach ($field in $Fields) {\n                    $fieldName = $field.Name\n                    $fieldVariableName = $field.VariableName\n                    $fieldValue = $response.data.data.$fieldName\n\n                    if ($null -ne $fieldValue) {\n                        if ([string]::IsNullOrWhiteSpace($fieldVariableName)) {\n                            $fieldVariableName = \"$($WorkingPath.Replace(\"/\",\".\")).$($fieldName.Trim())\"\n                        }\n                        \n                        Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive\n                        if ($VAULT_RETRIEVE_KV_V2_PRINT_VARIABLE_NAMES -eq $True) {\n                            Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}\"\n                        }\n                        $VariablesCreated += 1\n                    }\n                }\n            } \n            # No fields specified, iterate through each one.\n            else {\n                $secretFieldNames = $response.data.data | Get-Member | Where-Object { $_.MemberType -eq \"NoteProperty\" } | Select-Object -ExpandProperty \"Name\"\n                foreach ($fieldName in $secretFieldNames) {\n                    $fieldVariableName = \"$($WorkingPath.Replace(\"/\",\".\")).$($fieldName.Trim())\"\n                    $fieldValue = $response.data.data.$fieldName\n                    \n                    Set-OctopusVariable -Name $fieldVariableName -Value $fieldValue -Sensitive\n                    if ($VAULT_RETRIEVE_KV_V2_PRINT_VARIABLE_NAMES -eq $True) {\n                        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$fieldVariableName}\"\n                    }\n                    $VariablesCreated += 1\n                }\n            }\n            return $VariablesCreated\n        }  \n    }\n    catch {\n        $ExceptionMessage = $_.Exception.Message\n        $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n        $Message = \"An error occurred logging in with AppRole: $ExceptionMessage\"\n        $AdditionalDetail = \"\"\n        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n            if ($null -ne $ErrorBody.errors) {\n                $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n            }\n            else {\n                $errorDetails = $null\n                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n            }\n        }\n        \n        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n            $Message += \"`n`tDetail: $AdditionalDetail\"\n        }\n    \n        Write-Error $Message -Category ConnectionError\n    }\n}\n\nfunction List-VaultSecrets {\n    param (\n        [string]$SecretEnginePath,\n        [string]$SecretPath\n    )\n    try {\n        $SecretPath = $SecretPath.TrimStart(\"/\")\n        $RequestPath = \"$SecretEnginePath/metadata/$SecretPath\"\n\n        # Vault uses the 'LIST' HTTP verb, which is only supported in PowerShell 6.0+ using -CustomMethod.\n        # Adding ?list=true will allow support for Windows Desktop PowerShell.\n        # See https://www.vaultproject.io/api#api-operations for further details/\n        $uri = \"$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS/$VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION/$([uri]::EscapeDataString($RequestPath))?list=true\"\n        $headers = @{\"X-Vault-Token\" = $VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN }\n        if (-not [string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)) {\n            $Headers.Add(\"X-Vault-Namespace\", $VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE)\n        }\n\n        Write-Verbose \"Making request to $uri\"\n        $response = Invoke-RestMethod -Uri $uri -Headers $headers -Method GET\n\n        return $response\n    }\n    catch {\n        $ExceptionMessage = $_.Exception.Message\n        $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n        $Message = \"An error occurred logging in with AppRole: $ExceptionMessage\"\n        $AdditionalDetail = \"\"\n        if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n            if ($null -ne $ErrorBody.errors) {\n                $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n            }\n            else {\n                $errorDetails = $null\n                try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n                $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n            }\n        }\n        \n        if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n            $Message += \"`n`tDetail: $AdditionalDetail\"\n        }\n    \n        Write-Error $Message -Category ConnectionError\n    }\n}\n\nfunction Recursive-GetVaultSecrets {\n    param(\n        [string]$SecretEnginePath,\n        [string]$SecretPath\n    )\n    $VariablesCreated = 0\n    $SecretPath = $SecretPath.TrimStart(\"/\")\n    $SecretPath = $SecretPath.TrimEnd(\"/\")\n\n    Write-Verbose \"Executing Recursive-GetVaultSecrets\"\n    \n    # Get list of secrets for path\n    $VaultKeysResponse = List-VaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath \n    \n    if ($null -ne $VaultKeysResponse) {\n        $keys = $VaultKeysResponse.data.keys\n        if ($null -ne $keys) {\n            $secretKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and !$_.EndsWith(\"/\") }\n            foreach ($secretKey in $secretKeys) {\n                $secretKeyPath = \"$($SecretPath)/$secretKey\"\n                $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $secretKeyPath -Fields $Fields\n            }\n\n            if ($VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE -eq $True) {\n                $folderKeys = $keys | Where-Object { ![string]::IsNullOrWhiteSpace($_) -and $_.EndsWith(\"/\") }\n                foreach ($folderKey in $folderKeys) {\n                    $Depth = $Depth += 1\n                    $folderPath = \"$($SecretPath)/$folderKey\"\n                    $VariablesCreated += Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $folderPath\n                }\n            }\n        }\n    }\n    return $VariablesCreated\n}\n\n###############################################################################\n$VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS = $VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS.TrimEnd('/')\n$VAULT_RETRIEVE_KV_V2_SECRETS_PATH = $VAULT_RETRIEVE_KV_V2_SECRETS_PATH.TrimStart('/')\n\n# Local variables\n$RetrieveMultipleKeys = $VAULT_RETRIEVE_KV_V2_SECRETS_METHOD.ToUpper().Trim() -ne \"GET\"\n$SecretPathItems = ($VAULT_RETRIEVE_KV_V2_SECRETS_PATH -Split \"/\")\n$SecretEnginePath = ($SecretPathItems | Select-Object -First 1)\n$SecretPath = ($SecretPathItems | Select-Object -Skip 1) -Join \"/\"\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$Fields = @()\n$VariablesCreated = 0\n\nif (![string]::IsNullOrWhiteSpace($VAULT_RETRIEVE_KV_V2_SECRETS_FIELD_VALUES)) {\n    \n    @(($VAULT_RETRIEVE_KV_V2_SECRETS_FIELD_VALUES -Split \"`n\").Trim()) | ForEach-Object {\n        if (![string]::IsNullOrWhiteSpace($_)) {\n            Write-Verbose \"Working on: '$_'\"\n            $fieldDefinition = ($_ -Split \"\\|\")\n            $name = $fieldDefinition[0].Trim()\n            if ([string]::IsNullOrWhiteSpace($name)) {\n                throw \"Unable to establish fieldname from: '$($_)'\"\n            }\n            $field = [PsCustomObject]@{\n                Name         = $name\n                VariableName = if (![string]::IsNullOrWhiteSpace($fieldDefinition[1])) { $fieldDefinition[1].Trim() } else { \"\" }\n            }\n            $Fields += $field\n        }\n    }\n}\n$FieldsSpecified = ($Fields.Count -gt 0)\n\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS: $VAULT_RETRIEVE_KV_V2_SECRETS_ADDRESS\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION: $VAULT_RETRIEVE_KV_V2_SECRETS_API_VERSION\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_TOKEN: '********'\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_PATH: $VAULT_RETRIEVE_KV_V2_SECRETS_PATH\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_METHOD: $VAULT_RETRIEVE_KV_V2_SECRETS_METHOD\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE: $VAULT_RETRIEVE_KV_V2_SECRETS_RECURSIVE\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION: $VAULT_RETRIEVE_KV_V2_SECRETS_SECRET_VERSION\"\nWrite-Verbose \"VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE: $VAULT_RETRIEVE_KV_V2_SECRETS_NAMESPACE\"\nWrite-Verbose \"RetrieveMultipleKeys: $RetrieveMultipleKeys\"\nWrite-Verbose \"Fields Specified: $($FieldsSpecified)\"\nWrite-Verbose \"Engine Path: $SecretEnginePath\"\nWrite-Verbose \"Secret Path: $SecretPath\"\n\n$variablesCreated = 0\n\nif ($RetrieveMultipleKeys -eq $false) {\n    $variablesCreated += Get-VaultSecret -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Fields $Fields\n}\nelse {\n    $variablesCreated = Recursive-GetVaultSecrets -SecretEnginePath $SecretEnginePath -SecretPath $SecretPath -Depth 0\n}\nWrite-Host \"Created $variablesCreated output variables\""
-    },
-    "Parameters": [
-      {
-        "Id": "a38edf0b-0e90-4421-97d3-688391887f9c",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0ab319fd-2d90-4f61-b529-cd682bc590a3",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "25fec34d-3627-4240-9532-6caf4558ac39",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b4922053-38da-4092-ac45-fc1551c65254",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.AuthToken",
-        "Label": "Auth Token",
-        "HelpText": "The [Auth Token](https://www.vaultproject.io/docs/auth/token) used to authenticate to retrieve secrets.\n\nOctopus recommends using one of the pre-existing Vault step templates to obtain an auth token, such as:\n- The [AppRole Login](https://library.octopus.com/step-templates/e04a9cec-f04a-4da2-849b-1aed0fd408f0/actiontemplate-hashicorp-vault-approle-l) or \n- The most secure [AppRole Get Wrapped SecretID](https://library.octopus.com/step-templates/76827264-af27-46d0-913a-e093a4f0db48/actiontemplate-hashicorp-vault-approle-get-wrapped-secret-id) in conjunction with the [AppRole Unwrap SecretID and Login](https://library.octopus.com/step-templates/aa113393-e615-40ed-9c5a-f95f471d728f/actiontemplate-hashicorp-vault-approle-unwrap-secret-id-and-login) template.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "5e62f123-d034-490b-a16f-c0ab7176974a",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.SecretsPath",
-        "Label": "Secrets Path",
-        "HelpText": "The full path to the secret(s) you want to retrieve. e.g.`/secret/config`.\n\n**This value should contain:** \n- The location where the [secrets engine has been enabled](https://www.vaultproject.io/api-docs/secret/kv/kv-v2).\n- The path to the secret(s) you want to retrieve.\n\nFor example, if the secrets engine was enabled at `/my-secrets` and you wanted to retrieve the secret(s) from the path `/config` then the value you would enter is:\n\n`/my-secrets/config`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "01c2b07e-40e5-4251-b246-1be0a514a09c",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.RetrievalMethod",
-        "Label": "Secrets retrieval method",
-        "HelpText": "This controls how many Vault Key values are returned. The options are:\n- A single key is returned. If this option is selected, the path specified will be assumed to be an individual vault key. This performs the equivalent of a `vault kv get` command using the [Get](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#read-secret) method.\n- Multiple keys can be returned. If this option is selected, the path specified will be assumed to be able to be enumerated. This performs the equivalent of a `vault kv list` command using the [List](https://www.vaultproject.io/api-docs/secret/kv/kv-v2#list-secrets) method.\n\nThe default is `Single vault key`.",
-        "DefaultValue": "Get",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Get|Single vault key \nList|Multiple vault keys"
-        }
-      },
-      {
-        "Id": "f997fbcc-bfc3-4a38-9571-58957062873d",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.RecursiveSearch",
-        "Label": "Recursive retrieval",
-        "HelpText": "If the path is being enumerated (indicated by `Secrets retrieval method = Multiple`), should any secrets included in sub-folders also be retrieved? The default is: `False`.\n\nNote: This value is ignored when `Secrets retrieval method = Single`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "b9db3c54-f1f8-4241-b997-c6440c12489d",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.SecretVersion",
-        "Label": "Secret Version",
-        "HelpText": "_Optional_ version specifier of a secret to retrieve. For example, if you wanted version 2 of all field values in a secret, enter the value `2`\n\nNote: This parameter only works with the `Secrets Retrieval method` = `Single Vault key`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b446cb03-d57a-4869-8b9e-a9c12ed5646a",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.FieldValues",
-        "Label": "Field names",
-        "HelpText": "Choose specific fields to be returned from the Vault key(s) found in the Key/value secrets engine, in the format `FieldName | OutputVariableName` where:\n\n- `FieldName` is the name of the field to retrieve from the key\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in.\n\nIf this value is not present, any fields found within secrets from the specified path will be retrieved.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "52630c04-8fb3-4afb-a02e-ed7e2d20e34e",
-        "Name": "Vault.Retrieve.KV.V2.Secrets.PrintVariableNames",
-        "Label": "Print output variable names",
-        "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-21T17:01:25.405Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-21T17:01:25.405Z",
-    "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
diff --git a/step-templates/hashicorp-vault-ldap-login.json b/step-templates/hashicorp-vault-ldap-login.json
deleted file mode 100644
index f4f66645c..000000000
--- a/step-templates/hashicorp-vault-ldap-login.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "Id": "de807003-3b05-4649-9af3-11a2c7722b3f",
-    "Name": "HashiCorp Vault - LDAP Login",
-    "Description": "This step logs into a HashiCorp Vault server using the [LDAP](https://www.vaultproject.io/docs/auth/ldap) auth method.\n\nThe `client_token` from the response will be made available as a sensitive [Output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) named `LDAPAuthToken` for use in other step templates.\n\nThis step template makes use of the [Rest API](https://www.vaultproject.io/api/auth/ldap#login-with-ldap-user), so no other dependencies are needed. \n\n**Required:** \n- The Vault server must be [unsealed](https://www.vaultproject.io/docs/concepts/seal).\n- You must supply the full path where the LDAP auth method is mounted.\n- You must supply both a `Username` and `Password`.\n\n*Optional*:\n- A Vault [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`. **Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .\n\nNotes:\n\n- Tested on Vault Server `1.11.3`.\n- Tested on both PowerShell Desktop and PowerShell Core.",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Variables\n$VAULT_LDAP_LOGIN_ADDRESS = $OctopusParameters[\"Vault.LDAP.Login.VaultAddress\"]\n$VAULT_LDAP_LOGIN_API_VERSION = $OctopusParameters[\"Vault.LDAP.Login.ApiVersion\"]\n$VAULT_LDAP_LOGIN_NAMESPACE = $OctopusParameters[\"Vault.LDAP.Login.Namespace\"]\n$VAULT_LDAP_LOGIN_AUTH_PATH = $OctopusParameters[\"Vault.LDAP.Login.AuthPath\"]\n$VAULT_LDAP_LOGIN_USERNAME = $OctopusParameters[\"Vault.LDAP.Login.Username\"]\n$VAULT_LDAP_LOGIN_PASSWORD = $OctopusParameters[\"Vault.LDAP.Login.Password\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_ADDRESS)) {\n    throw \"Required parameter VAULT_LDAP_LOGIN_ADDRESS not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_API_VERSION)) {\n    throw \"Required parameter VAULT_LDAP_LOGIN_API_VERSION not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_AUTH_PATH)) {\n    throw \"Required parameter VAULT_LDAP_LOGIN_AUTH_PATH not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_USERNAME)) {\n    throw \"Required parameter VAULT_LDAP_LOGIN_USERNAME not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_PASSWORD)) {\n    throw \"Required parameter VAULT_LDAP_LOGIN_PASSWORD not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n###############################################################################\n\n$VAULT_LDAP_LOGIN_ADDRESS = $VAULT_LDAP_LOGIN_ADDRESS.TrimEnd('/')\n$VAULT_LDAP_LOGIN_AUTH_PATH = $VAULT_LDAP_LOGIN_AUTH_PATH.TrimStart('/').TrimEnd('/')\n\n# Local variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\ntry {\n    $payload = @{\n        password = $VAULT_LDAP_LOGIN_PASSWORD\n    }\n    \n    $Headers = @{}\n    if (-not [string]::IsNullOrWhiteSpace($VAULT_LDAP_LOGIN_NAMESPACE)) {\n        Write-Verbose \"Setting 'X-Vault-Namespace' header to: $VAULT_LDAP_LOGIN_NAMESPACE\"\n        $Headers.Add(\"X-Vault-Namespace\", $VAULT_LDAP_LOGIN_NAMESPACE)\n    }\n    \n    $uri = \"$VAULT_LDAP_LOGIN_ADDRESS/$VAULT_LDAP_LOGIN_API_VERSION/$VAULT_LDAP_LOGIN_AUTH_PATH/login/$([uri]::EscapeDataString($VAULT_LDAP_LOGIN_USERNAME))\"\n    Write-Verbose \"Making request to $uri\"\n    $response = Invoke-RestMethod -Method Post -Uri $uri -Body ($payload | ConvertTo-Json -Depth 10) -Headers $Headers\n    if ($null -ne $response) {\n        Set-OctopusVariable -Name \"LDAPAuthToken\" -Value $response.auth.client_token -Sensitive\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.LDAPAuthToken}\"\n    }\n    else {\n        Write-Error \"Null or Empty response returned from Vault server\" -Category InvalidResult\n    }\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $ErrorBody = Get-WebRequestErrorBody -RequestError $_\n    $Message = \"An error occurred logging in with LDAP: $ExceptionMessage\"\n    $AdditionalDetail = \"\"\n    if (![string]::IsNullOrWhiteSpace($ErrorBody)) {\n        if ($null -ne $ErrorBody.errors) {\n            $AdditionalDetail = $ErrorBody.errors -Join \",\"   \n        }\n        else {\n            $errorDetails = $null\n            try { $errorDetails = ConvertFrom-Json $ErrorBody } catch {}\n            $AdditionalDetail += if ($null -ne $errorDetails) { $errorDetails.errors -Join \",\" } else { $ErrorBody } \n        }\n    }\n    \n    if (![string]::IsNullOrWhiteSpace($AdditionalDetail)) {\n        $Message += \"`n`tDetail: $AdditionalDetail\"\n    }\n\n    Write-Error $Message -Category ConnectionError\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "d0e95468-4f9e-4272-9dfa-d964c610a279",
-        "Name": "Vault.LDAP.Login.VaultAddress",
-        "Label": "Vault Server URL",
-        "HelpText": "The URL of the Vault instance you are connecting to. Port should be included (The default is `8200`). For example:\n\n\n`https://myvault.local:8200/`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "98d2a264-0466-4e0d-b5a3-4d172c81f405",
-        "Name": "Vault.LDAP.Login.ApiVersion",
-        "Label": "API version",
-        "HelpText": "All API routes are prefixed with a version e.g. `/v1/`.\n\nSee the [API documentation](https://www.vaultproject.io/api-docs) for further details.",
-        "DefaultValue": "v1",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "v1|v1"
-        }
-      },
-      {
-        "Id": "74fa0a75-0ab4-4a9d-a417-c9b9b391c640",
-        "Name": "Vault.LDAP.Login.Namespace",
-        "Label": "Namespace (Optional)",
-        "HelpText": "The _optional_ [namespace](https://www.vaultproject.io/docs/enterprise/namespaces) to use. Nested namespaces can also be supplied, e.g. `ns1/ns2`.\n\n**Note:** This field is only supported on [Vault Enterprise](https://www.hashicorp.com/products/vault) .",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c56afe5a-6506-497f-99b0-ae8776f03269",
-        "Name": "Vault.LDAP.Login.AuthPath",
-        "Label": "LDAP Auth Login path",
-        "HelpText": "The path that the LDAP method is mounted at. The default is `/auth/ldap`. If the LDAP auth method was enabled at a different path, for example `my-path`, then specify `/my-path` instead.\n",
-        "DefaultValue": "/auth/ldap",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7803e08c-026f-4d59-b902-f75a0992be48",
-        "Name": "Vault.LDAP.Login.Username",
-        "Label": "Username",
-        "HelpText": "The LDAP Username.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7a00c426-43f1-4229-a036-37b018d089a6",
-        "Name": "Vault.LDAP.Login.Password",
-        "Label": "LDAP Password",
-        "HelpText": "The LDAP Password.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "LastModifiedAt": "2022-09-18T08:25:57.132Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2022-09-18T08:25:57.132Z",
-    "OctopusVersion": "2022.4.2266",
-      "Type": "ActionTemplate"
-    },
-    "Category": "hashicorp-vault"
-  }
diff --git a/step-templates/hipchat-notify-api-v1.json b/step-templates/hipchat-notify-api-v1.json
deleted file mode 100644
index b182188b8..000000000
--- a/step-templates/hipchat-notify-api-v1.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Id": "c37ccd22-2b31-4263-8389-9e63868519b4",
-  "Name": "HipChat - Notify (API v1)",
-  "Description": "Send a success notification when this step is executed.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$message = if ($OctopusParameters['HipChatMessage']) { $OctopusParameters['HipChatMessage'] } else { \"(successful) \" + $OctopusParameters['Octopus.Project.Name'] + \" [v$($OctopusParameters['Octopus.Release.Number'])] deployed to $($OctopusParameters['Octopus.Environment.Name'])  on $($OctopusParameters['Octopus.Machine.Name'])\" } \r\n#---------\r\n$apitoken = $OctopusParameters['HipChatAuthToken']\r\n$roomid = $OctopusParameters['HipChatRoomId']\r\n$from = $OctopusParameters['HipChatFrom']\r\n$colour = $OctopusParameters['HipChatColor']\r\n\r\nTry \r\n{\r\n\t#Do the HTTP POST to HipChat\r\n\t$post = \"auth_token=$apitoken&room_id=$roomid&from=$from&color=$colour&message=$message&notify=1&message_format=text\"\r\n\t$webRequest = [System.Net.WebRequest]::Create(\"https://api.hipchat.com/v1/rooms/message\")\r\n\t$webRequest.ContentType = \"application/x-www-form-urlencoded\"\r\n\t$postStr = [System.Text.Encoding]::UTF8.GetBytes($post)\r\n\t$webrequest.ContentLength = $postStr.Length\r\n\t$webRequest.Method = \"POST\"\r\n\t$requestStream = $webRequest.GetRequestStream()\r\n\t$requestStream.Write($postStr, 0,$postStr.length)\r\n\t$requestStream.Close()\r\n\t\r\n\t[System.Net.WebResponse] $resp = $webRequest.GetResponse();\r\n\t$rs = $resp.GetResponseStream();\r\n\t[System.IO.StreamReader] $sr = New-Object System.IO.StreamReader -argumentList $rs;\r\n\t$sr.ReadToEnd();\t\t\t\t\t\r\n}\r\ncatch [Exception] {\r\n\t\"Woah!, wasn't expecting to get this exception. `r`n $_.Exception.ToString()\"\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "HipChatRoomId",
-      "Label": "Room Id",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HipChatAuthToken",
-      "Label": "Auth token",
-      "HelpText": "For API version 1.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HipChatFrom",
-      "Label": "From name",
-      "HelpText": null,
-      "DefaultValue": "Octopus Deploy",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HipChatColor",
-      "Label": "Color",
-      "HelpText": "HipChat message color",
-      "DefaultValue": "green",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HipChatMessage",
-      "Label": "Message",
-      "HelpText": "You can use variables here. Leave blank for the default build notification format.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-06-11T02:21:16.787+00:00",
-    "OctopusVersion": "2.4.7.85",
-    "Type": "ActionTemplate"
-  },
-  "Category": "hipchat"
-}
\ No newline at end of file
diff --git a/step-templates/hipchat-notify.json b/step-templates/hipchat-notify.json
deleted file mode 100644
index fd6b48c22..000000000
--- a/step-templates/hipchat-notify.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "6a6ce997-c91b-4e06-b237-4484417efc89",
-  "Name": "HipChat - Notify",
-  "Description": "Notifies a HipChat room of a deployment outcome.",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#--------- Notify-Hipchat\r\n$apitoken = $OctopusParameters['AuthToken']\r\n$roomid = $OctopusParameters['RoomId']\r\n$messageText = \"(successful)\"\r\n$color = 'green'\r\n\r\nif ($OctopusParameters['Octopus.Deployment.Error']) {\r\n    $messageText = \"(failed)\"\r\n    $color = 'red'\r\n}\r\n\r\n$messageValue = \"$messageText $($OctopusParameters['Octopus.Project.Name']) [v$($OctopusParameters['Octopus.Release.Number'])] deployed to $($OctopusParameters['Octopus.Environment.Name'])    on $($OctopusParameters['Octopus.Machine.Name'])\"\r\n\r\nif ($OctopusParameters['NotificationText']) {\r\n    $messageValue = $OctopusParameters['NotificationText']\r\n    $color = $OctopusParameters['NotificationColor']\r\n}\r\n\r\n$message = New-Object PSObject \r\n$message | Add-Member -MemberType NoteProperty -Name color -Value $color\r\n$message | Add-Member -MemberType NoteProperty -Name message -Value $messageValue\r\n$message | Add-Member -MemberType NoteProperty -Name notify -Value $false\r\n$message | Add-Member -MemberType NoteProperty -Name message_format -Value text\r\n\r\n#Do the HTTP POST to HipChat\r\n$uri = \"https://api.hipchat.com/v2/room/$roomid/notification?auth_token=$apitoken\"\r\n$postBody = ConvertTo-Json -InputObject $message\r\n$postStr = [System.Text.Encoding]::UTF8.GetBytes($postBody)\r\n\r\n$webRequest = [System.Net.WebRequest]::Create($uri)\r\n$webRequest.ContentType = \"application/json\"\r\n$webrequest.ContentLength = $postStr.Length\r\n$webRequest.Method = \"POST\"\r\n\r\n$requestStream = $webRequest.GetRequestStream()\r\n$requestStream.Write($postStr, 0,$postStr.length)\r\n$requestStream.Close()\r\n\r\n[System.Net.WebResponse] $resp = $webRequest.GetResponse()\r\n$rs = $resp.GetResponseStream()\r\n\r\n[System.IO.StreamReader] $sr = New-Object System.IO.StreamReader -argumentList $rs\r\n$sr.ReadToEnd()",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "AuthToken",
-      "Label": "API Auth Token",
-      "HelpText": "HipChat authentication token for a user who can post notifications to rooms",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RoomId",
-      "Label": "Room",
-      "HelpText": "The room name that you wish to post a notification to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NotificationText",
-      "Label": "Notification Text",
-      "HelpText": "An optional text override for the notification. Default is: <(succeeded) or (failed)> (Project) v(Release) deployed to (Environment) on (Machine)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NotificationColor",
-      "Label": "Notification Color",
-      "HelpText": "The color for the notification for the room. Default messages will receive green success, and red failure.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2014-07-29T01:53:13.319+00:00",
-  "LastModifiedBy": "stephengodbold",
-  "$Meta": {
-    "ExportedAt": "2014-07-29T01:56:04.693+00:00",
-    "OctopusVersion": "2.5.5.318",
-    "Type": "ActionTemplate"
-  },
-  "Category": "hipchat"
-}
\ No newline at end of file
diff --git a/step-templates/hockeyapp-upload-mobile-app.json b/step-templates/hockeyapp-upload-mobile-app.json
deleted file mode 100644
index 7d292e6ff..000000000
--- a/step-templates/hockeyapp-upload-mobile-app.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "Id": "5667710e-60b8-4067-bfa5-87196faafdda",
-  "Name": "HockeyApp - Upload Mobile App",
-  "Description": "This script uploads a new version of an existing app package to the [HockeyApp](http://hockeyapp.net/features/) services.",
-  "ActionType": "Octopus.Script",
-  "Version": 20,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Hockey App Upload script\r\n#\r\n# Uploads a mobile platform application package to Hockey App from a Nuget file\r\n#  extracted in a previous Octopus Deploy step. Allows a variety of parameters.\r\n#\r\n# v0.5 - Turns out Invoke-WebRequest was a memory hog, casuing high memory usage and\r\n#         out-of-memory errors. Switched to dot net native web request and streams.\r\n# v0.4 - Package location search is now recursive, as required by *.nuspec example.\r\n#        Added default description to pass along nuget version to notes.\r\n# v0.3 - Now supports windows .appx packages\r\n# v0.2 - Added extra parameters\r\n# v0.1 - Initial version, basic upload\r\n# \r\n#\r\n# The following *.nuspec example will package ALL matching Ipa, Apk (signed), and Appx files.\r\n# The upload script requires exactly one match (or specifying the exact file)\r\n# \r\n# Specify specific package path relative to the nuspec file location (or overriden basepath)\r\n#\r\n# https://docs.nuget.org/create/nuspec-reference#file-element-examples\r\n#\r\n# In some cases the ID, Version, and Description may need manually specified.\r\n#\r\n\r\n<#\r\n\r\n    <?xml version=\"1.0\"?>\r\n    <package>\r\n      <metadata>\r\n        <id>$id$</id>\r\n        <title>$id$</title>\r\n        <version>$version$</version>\r\n        <description>Mobile project packaged for Octopus deploy. $description$</description>\r\n      </metadata>\r\n      <files>\r\n        <!-- Matches mobile package files. Note this will only include the platform being built,\r\n\t         and should match only a single file. -->\r\n\r\n        <!-- Android, Signed only -->\r\n        <file src=\"**/Release/**/*-Signed.apk\" target=\"\" />\r\n\r\n        <!-- iOS -->\r\n        <file src=\"**/Release/**/*.ipa\" target=\"\" />\r\n\r\n        <!-- Windows App -->\r\n        <file src=\"**/*.appx\" exclude=\"**/Dependencies/**\" target=\"\" />\r\n      </files>\r\n    </package>\r\n\r\n#>\r\n\r\n# Hockey App API reference\r\n#\r\n# General API reference: http://support.hockeyapp.net/kb/api\r\n# Auth reference (tokens): http://support.hockeyapp.net/kb/api/api-basics-and-authentication\r\n# Upload App Version reference: http://support.hockeyapp.net/kb/api/api-versions#upload-version\r\n\r\n#############################\r\n# Debug Parameter Overrides #\r\n#############################\r\n\r\n# These values are set explicitly durring debugging so that the script can\r\n#   be run in the editor.\r\n# For local debugging, uncomment these values and fill in appropriately.\r\n\r\n<#\r\n\r\n$OctopusParameters = @{\r\n\"HockeyAppApiToken\" = \"YourApiKeyhere\";\r\n\"HockeyAppAppID\" = \"YourAppIdHere\";\r\n\"PackageFileName\" = \"MyAppFile-1.2.3.4.ipa\"; # app file name\r\n\"HockeyAppNotify\" = \"1\";\r\n\"HockeyAppStatus\" = \"2\";\r\n}\r\n\r\n# debug folder with app files\r\n$stepPath = \"C:\\Temp\\HockeyAppScript\\\"\r\n\r\n\r\n# #>\r\n\r\n###################################\r\n# Octopus Deploy common functions #\r\n###################################\r\n\r\n# A collection of functions that can be used by script steps to determine where packages installed\r\n# by previous steps are located on the filesystem.\r\n \r\nfunction Find-InstallLocations {\r\n    $result = @()\r\n    $OctopusParameters.Keys | foreach {\r\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\r\n            $result += $OctopusParameters[$_]\r\n        }\r\n    }\r\n    return $result\r\n}\r\n \r\nfunction Find-InstallLocation($stepName) {\r\n    $result = $OctopusParameters.Keys | where {\r\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\r\n    } | select -first 1\r\n \r\n    if ($result) {\r\n        return $OctopusParameters[$result]\r\n    }\r\n \r\n    throw \"No install location found for step: $stepName\"\r\n}\r\n\r\nfunction Find-SingleInstallLocation {\r\n    $all = @(Find-InstallLocations)\r\n    if ($all.Length -eq 1) {\r\n        return $all[0]\r\n    }\r\n    if ($all.Length -eq 0) {\r\n        throw \"No package steps found\"\r\n    }\r\n    throw \"Multiple package steps have run; please specify a single step\"\r\n}\r\n\r\n#####################\r\n# Utility functions #\r\n#####################\r\n\r\nfunction Get-ExactlyOneMobilePackageFileInfo($searchPath)\r\n{\r\n    $apkFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.apk #Android\r\n    $ipaFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.ipa #iOS\r\n    $appxFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.appx # windows\r\n\r\n    $apkCount = $apkFiles.count\r\n\r\n    $ipaCount = $ipaFiles.count\r\n\r\n    $appxCount = $appxFiles.count\r\n\r\n    $totalCount = $apkCount + $ipaCount + $appxCount\r\n\r\n    if($totalCount -ne 1)\r\n    {\r\n        throw \"Did not find exactly one (1) mobile application package. Found $apkCount APK file(s), $ipaCount IPA file(s), and $appxCount Appx file(s).\"\r\n    }\r\n\r\n    if($apkCount -eq 1)\r\n    {\r\n        return $apkFiles\r\n    }\r\n\r\n    if($ipaCount -eq 1)\r\n    {\r\n        return $ipaFiles\r\n    }\r\n\r\n    if($appxCount -eq 1)\r\n    {\r\n        return $appxFiles\r\n    }\r\n\r\n    throw \"Unable to find mobile application packages (fallback error - not expected)\"\r\n}\r\n\r\nfunction AddToHashIfExists([HashTable]$table, $value, $name)\r\n{\r\n    if(-not [String]::IsNullOrWhiteSpace($value))\r\n    {\r\n        $table.Add($name, $value)\r\n    }\r\n}\r\n\r\nfunction GetMultipartFormSectionString($key,$value)\r\n{\r\n    return @\"\r\nContent-Disposition: form-data; name=\"$key\"\r\n\r\n$value\r\n\"@\r\n}\r\n\r\n####################\r\n# Basic Parameters #\r\n####################\r\n\r\n$apiToken = $OctopusParameters['HockeyAppApiToken']\r\n$appId = $OctopusParameters['HockeyAppAppID']\r\n\r\n$octopusFilePathOverride = $OctopusParameters['PackageFileName']\r\n\r\n$stepName = $OctopusParameters['MobileAppPackageStepName']\r\n\r\n# set step path, if not already set\r\nIf([string]::IsNullOrEmpty($stepPath))\r\n{\r\n    if (![string]::IsNullOrEmpty($stepName)) {\r\n        Write-Host \"Finding path to package step: $stepName\"\r\n        $stepPath = Find-InstallLocation $stepName\r\n    } else {\r\n        $stepPath = Find-SingleInstallLocation\r\n    }\r\n}\r\n\r\nWrite-Host \"Package is located in folder: $stepPath\"\r\nWrite-Host \"##octopus[stderr-progress]\"\r\n\r\n# if we were not provided a file name, search for a single package file\r\nif([string]::IsNullOrWhiteSpace($octopusFilePathOverride))\r\n{\r\n    $appFileInfo = Get-ExactlyOneMobilePackageFileInfo $stepPath\r\n    $appFullFilePath = $appFileInfo.FullName\r\n}\r\nelse\r\n{\r\n    $appFullFilePath = Join-Path $stepPath $octopusFilePathOverride\r\n}\r\n\r\n$fileName = [System.IO.Path]::GetFileName($appFullFilePath)\r\n\r\n$apiUploadUri = \"https://rink.hockeyapp.net/api/2/apps/$appId/app_versions/upload\"\r\n\r\n# Request token details\r\n$uniqueBoundaryToken = [Guid]::NewGuid().ToString()\r\n\r\n$contentType = \"multipart/form-data; boundary=$uniqueBoundaryToken\"\r\n\r\n################################\r\n# Set up Hockey App parameters #\r\n################################\r\n\r\n$HockeyAppParameters = @{} # parameters are a hash table.\r\n\r\n# add parameters that have values - See docs at http://support.hockeyapp.net/kb/api/api-versions#upload-version\r\n\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppNotes']          \"notes\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppNotesType']      \"notes_type\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppNotify']         \"notify\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppStatus']         \"status\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppTags']           \"tags\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppTeams']          \"teams\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppUsers']          \"users\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppMandatory']      \"mandatory\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppCommitSha']      \"commit_sha\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppBuildServerUrl'] \"build_server_url\"\r\nAddToHashIfExists $HockeyAppParameters $OctopusParameters['HockeyAppRepositoryUrl']  \"repository_url\"\r\n\r\n$formSectionSeparator = @\"\r\n\r\n--$uniqueBoundaryToken\r\n\r\n\"@\r\n\r\nif($HockeyAppParameters.Count -gt 0)\r\n{\r\n    $parameterSectionsString = [String]::Join($formSectionSeparator,($HockeyAppParameters.GetEnumerator() | %{GetMultipartFormSectionString $_.Key $_.Value}))\r\n}\r\n\r\n############################\r\n# Prepare request wrappers #\r\n############################\r\n\r\n# Standard for multipart form data\r\n# http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4\r\n\r\n$stringEncoding = [System.Text.Encoding]::ASCII\r\n\r\n# Note the hard-coded \"ipa\" name here is per HockeyApp API documentation\r\n#  and it applies to ALL platform application files.\r\n\r\n$preFileBytes = $stringEncoding.GetBytes(\r\n$parameterSectionsString + \r\n$formSectionSeparator +\r\n@\"\r\nContent-Disposition: form-data; name=\"ipa\"; filename=\"$fileName\"\r\nContent-Type: application/octet-stream\r\n\r\n\r\n\"@)\r\n\r\n# file bytes will go in between\r\n\r\n$postFileBytes = $stringEncoding.GetBytes(@\"\r\n\r\n--$uniqueBoundaryToken--\r\n\"@)\r\n\r\n######################\r\n# Invoke the request #\r\n######################\r\n\r\n# Note, previous approach was Invoke-RestMethod based. It worked, but was NOT memory\r\n# efficient, leading to high memory usage and \"out of memory\" errors.\r\n\r\n# Based on examples from\r\n# http://stackoverflow.com/questions/566462/upload-files-with-httpwebrequest-multipart-form-data\r\n# and \r\n# https://gist.github.com/nolim1t/271018\r\n\r\n# Uses a dot net WebRequest and streaming to limit memory usage\r\n\r\n$WebRequest = [System.Net.WebRequest]::Create(\"$apiUploadUri\")\r\n\r\n$WebRequest.ContentType = $contentType\r\n$WebRequest.Method = \"POST\"\r\n$WebRequest.KeepAlive = $true;\r\n$WebRequest.Headers.Add(\"X-HockeyAppToken\",$apiToken)\r\n\r\n$RequestStream = $WebRequest.GetRequestStream()\r\n\r\n# before file bytes\r\n$RequestStream.Write($preFileBytes, 0, $preFileBytes.Length);\r\n\r\n#files bytes\r\n\r\n$fileMode = [System.IO.FileMode]::Open\r\n$fileAccess = [System.IO.FileAccess]::Read\r\n\r\n$fileStream = New-Object IO.FileStream $appFullFilePath,$fileMode,$fileAccess\r\n$bufferSize = 4096 # 4k at a time\r\n$byteBuffer = New-Object Byte[] ($bufferSize)\r\n\r\n# read bytes. While bytes are read...\r\nwhile(($bytesRead = $fileStream.Read($byteBuffer,0,$byteBuffer.Length)) -ne 0)\r\n{\r\n    # write those byes to the request stream\r\n    $RequestStream.Write($byteBuffer, 0, $bytesRead)\r\n}\r\n\r\n$fileStream.Close()\r\n\r\n# after file bytes\r\n$RequestStream.Write($postFileBytes, 0, $postFileBytes.Length);\r\n\r\n$RequestStream.Close()\r\n\r\n$response = $WebRequest.GetResponse();\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "HockeyAppApiToken",
-      "Label": "HockeyApp Api Token",
-      "HelpText": "HockeyApp requires an access token for their API as show in the [HockeyApp API Authentication Documentation](http://support.hockeyapp.net/kb/api/api-basics-and-authentication#authentication). Logged in users can generate tokens under [API Tokens](https://rink.hockeyapp.net/manage/auth_tokens) in the account menu.\n\nYou should generate an application specific token for this purpose.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppAppID",
-      "Label": "HockeyApp App ID",
-      "HelpText": "The ID of your App in HockeyApp. This is visible on the [Manage Apps](https://rink.hockeyapp.net/manage/apps) management page for your target app.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "MobileAppPackageStepName",
-      "Label": "Package Step Name",
-      "HelpText": "Name of the previously-deployed package step that contains the App that you want to deploy.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Name": "PackageFileName",
-      "Label": "Package File Name",
-      "HelpText": "The value is optional.\n\nIf no value is provided the scrip will search for exactly one *.apk, *.ipa, or *.appx file in the nupgk package files. Zero or multiple matches will result in an error.\n\nIf a value is provided, it will be used directly instead of searching. Use this to specify a mobile app to upload in the case of multiple apps, such as a signed and unsigned apk, or an apk and ipa in a single Nuget package.\n\nThis value must be the path and filename relative to the root of the nupkg file. You may use octopus parameters if needed, but the passed value must be the combined relative path with full filename for the package.\n\nFor creating the nupkg, the following *.nuspec example will package ALL matching Ipa, Apk (signed), and Appx files. If you have a single package as build output, the Nuget package should work by default.\n\n\t<?xml version=\"1.0\"?>\n\t<package>\n\t  <metadata>\n\t\t<id>$id$</id>\n\t\t<title>$id$</title>\n\t\t<version>$version$</version>\n\t\t<description>Mobile project packaged for Octopus deploy. $description$</description>\n\t  </metadata>\n\t  <files>\n\t\t<!-- Matches mobile package files. Note this will only include the platform being built,\n\t\t\t and should match only a single file. -->\n\n\t\t<!-- Android, Signed only -->\n\t\t<file src=\"**/Release/**/*-Signed.apk\" target=\"\" />\n\n\t\t<!-- iOS -->\n\t\t<file src=\"**/Release/**/*.ipa\" target=\"\" />\n\n\t\t<!-- Windows App -->\n\t\t<file src=\"**/*.appx\" exclude=\"**/Dependencies/**\" target=\"\" />\n\t  </files>\n\t</package>",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppNotes",
-      "Label": "HockeyApp Notes",
-      "HelpText": "optional, release notes as Textile or Markdown\n\nAs an example, you could use the Octopus variables from the Nuget package extract step as like this:\n\nDeployed from Nuget Package #{Octopus.Action[Nuget Package Extract].Package.NuGetPackageId}, Version  #{Octopus.Action[Nuget Package Extract].Package.NuGetPackageVersion}\n\nAnd get Hockey App notes like:\n\nDeployed from Nuget Package MyiOSPackage, Version 1.2.3.4\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppNotesType",
-      "Label": "HockeyApp Notes Type",
-      "HelpText": "optional, type of release notes:\n\n- 0 - Textile\n- 1 - Markdown\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppNotify",
-      "Label": "HockeyApp Notify",
-      "HelpText": "optional, notify testers (can only be set with full-access tokens):\n\n- 0 - Don't notify testers\n- 1 - Notify all testers that can install this app\n- 2 - Notify all testers\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppStatus",
-      "Label": "HockeyApp Status",
-      "HelpText": "optional, download status (can only be set with full-access tokens):\n\n- 1: Don't allow users to download or install the version\n- 2: Available for download or installation\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": "2",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppTags",
-      "Label": "HockeyApp Tags",
-      "HelpText": "optional, restrict download to comma-separated list of tags\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppTeams",
-      "Label": "HockeyApp Teams",
-      "HelpText": "optional, restrict download to comma-separated list of team IDs; example:\n\nteams=12,23,42 with 12, 23, and 42 being the database IDs of your teams\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppUsers",
-      "Label": "HockeyApp Users",
-      "HelpText": "optional, restrict download to comma-separated list of user IDs; example:\n\n    1224,5678\nwith 1224 and 5678 being the database IDs of your users\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppMandatory",
-      "Label": "HockeyApp Mandatory",
-      "HelpText": "optional, set version as mandatory:\n\n- 0 - no\n- 1 - yes\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppCommitSha",
-      "Label": "HockeyApp Commit Sha",
-      "HelpText": "optional, set to the git commit sha for this build\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppBuildServerUrl",
-      "Label": "HockeyApp Build Server Url",
-      "HelpText": "optional, set to the URL of the build job on your build server\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HockeyAppRepositoryUrl",
-      "Label": "HockeyApp Repository Url",
-      "HelpText": "optional, set to your source repository\n\nSee [Upload API Documentation](http://support.hockeyapp.net/kb/api/api-versions#upload-version)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2015-12-01T00:11:50.815+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "hockeyapp"
-}
diff --git a/step-templates/http-invoke-url.json b/step-templates/http-invoke-url.json
deleted file mode 100644
index 3f3127bf1..000000000
--- a/step-templates/http-invoke-url.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "bb2a8fef-1407-405b-9251-a259c1868bad",
-  "Name": "HTTP - Invoke URL",
-  "Description": "Invoke HTTP Get request using provided url. Doesn't throw exception when request fails.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$url,\r\n    [switch]$whatIf\r\n) \r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null -or $result -eq \"\") {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    param(\r\n        [string]$url\r\n    ) \r\n\r\n    Write-Host \"Invoke Url: $url\"\r\n\r\n    try {\r\n    \r\n        Invoke-WebRequest -Uri $url -Method Get -UseBasicParsing\r\n\r\n    } catch {\r\n        Write-Host \"There was a problem invoking Url\"    \r\n    }\r\n\r\n } `\r\n (Get-Param 'url' -Required)",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "url",
-      "Label": "Url",
-      "HelpText": "Web request Url",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-08-31T12:06:43.681+00:00",
-  "LastModifiedBy": "jmalczak",
-  "$Meta": {
-    "ExportedAt": "2015-08-31T12:25:19.923+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "http"
-}
\ No newline at end of file
diff --git a/step-templates/http-test-url.json b/step-templates/http-test-url.json
deleted file mode 100644
index b3c927875..000000000
--- a/step-templates/http-test-url.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "Id": "f5cebc0a-cc16-4876-9f72-bfbd513e6fdd",
-  "Name": "HTTP - Test URL",
-  "Description": "Makes a GET request to a HTTP(S) end point and verifies that a particular status code and (optional) response is returned within a specified period of time.",
-  "ActionType": "Octopus.Script",
-  "Version": 18,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$uri = $OctopusParameters['Uri']\n$customHostHeader = $OctopusParameters['CustomHostHeader']\n$expectedCode = [int] $OctopusParameters['ExpectedCode']\n$timeoutSeconds = [int] $OctopusParameters['TimeoutSeconds']\n$Username = $OctopusParameters['AuthUsername']\n$Password = $OctopusParameters['AuthPassword']\n$UseWindowsAuth = [System.Convert]::ToBoolean($OctopusParameters['UseWindowsAuth'])\n$ExpectedResponse = $OctopusParameters['ExpectedResponse']\n$securityProtocol = $OctopusParameters['SecurityProtocol']\n\nWrite-Host \"Starting verification request to $uri\"\nif ($customHostHeader)\n{\n    Write-Host \"Using custom host header $customHostHeader\"\n}\n\nWrite-Host \"Expecting response code $expectedCode.\"\nWrite-Host \"Expecting response: $ExpectedResponse.\"\n\nif ($securityProtocol)\n{\n    Write-Host \"Using security protocol $securityProtocol\"\n    [Net.ServicePointManager]::SecurityProtocol = [Enum]::parse([Net.SecurityProtocolType], $securityProtocol) \n}\n\n$timer = [System.Diagnostics.Stopwatch]::StartNew()\n$success = $false\ndo\n{\n    try\n    {\n        if ($Username -and $Password -and $UseWindowsAuth)\n        {\n            Write-Host \"Making request to $uri using windows authentication for user $Username\"\n            $request = [system.Net.WebRequest]::Create($uri)\n            $Credential = New-Object System.Management.Automation.PSCredential -ArgumentList $Username, $(ConvertTo-SecureString -String $Password -AsPlainText -Force)\n            $request.Credentials = $Credential \n            \n            if ($customHostHeader)\n            {\n                $request.Host = $customHostHeader\n            }\n\n            try\n            {\n                $response = $request.GetResponse()\n            }\n            catch [System.Net.WebException]\n            {\n                Write-Host \"Request failed :-( System.Net.WebException\"\n                Write-Host $_.Exception\n                $response = $_.Exception.Response\n            }\n            \n        }\n\t\telseif ($Username -and $Password)\n        {\n            Write-Host \"Making request to $uri using basic authentication for user $Username\"\n            $Credential = New-Object System.Management.Automation.PSCredential -ArgumentList $Username, $(ConvertTo-SecureString -String $Password -AsPlainText -Force)\n            if ($customHostHeader)\n            {\n                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -Credential $Credential -Headers @{\"Host\" = $customHostHeader} -TimeoutSec $timeoutSeconds\n            }\n            else \n            {\n                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -Credential $Credential -TimeoutSec $timeoutSeconds\n            }\n        }\n\t\telse\n        {\n            Write-Host \"Making request to $uri using anonymous authentication\"\n            if ($customHostHeader)\n            {\n                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -Headers @{\"Host\" = $customHostHeader} -TimeoutSec $timeoutSeconds\n            }\n            else \n            {\n                $response = Invoke-WebRequest -Uri $uri -Method Get -UseBasicParsing -TimeoutSec $timeoutSeconds\n            }\n        }\n        \n        $code = $response.StatusCode\n        $body = $response.Content;\n        Write-Host \"Recieved response code: $code\"\n        Write-Host \"Recieved response: $body\"\n\n        if($response.StatusCode -eq $expectedCode)\n        {\n            $success = $true\n        }\n        if ($success -and $ExpectedResponse)\n        {\n            $success = ($ExpectedResponse -eq $body)\n        }\n    }\n    catch\n    {\n        # Anything other than a 200 will throw an exception so\n        # we check the exception message which may contain the \n        # actual status code to verify\n        \n        Write-Host \"Request failed :-(\"\n        Write-Host $_.Exception\n\n        if($_.Exception -like \"*($expectedCode)*\")\n        {\n            $success = $true\n        }\n    }\n\n    if(!$success)\n    {\n        Write-Host \"Trying again in 5 seconds...\"\n        Start-Sleep -s 5\n    }\n}\nwhile(!$success -and $timer.Elapsed -le (New-TimeSpan -Seconds $timeoutSeconds))\n\n$timer.Stop()\n\n# Verify result\n\nif(!$success)\n{\n    throw \"Verification failed - giving up.\"\n}\n\nWrite-Host \"Sucesss! Found status code $expectedCode\"",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "ca7c3e92-c243-4115-a326-7693eb830214",
-      "Name": "Uri",
-      "Label": "URI",
-      "HelpText": "The full Uri of the endpoint",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0d760ed5-81ed-46d9-b833-74f75df08bfc",
-      "Name": "CustomHostHeader",
-      "Label": "Custom HOST header",
-      "HelpText": "An optional custom HOST header which will be passed with the request",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b4e57984-01df-4438-96e5-75e74c2c6188",
-      "Name": "SecurityProtocol",
-      "Label": "Security Protocol",
-      "HelpText": "The optional security protocol version to use for HTTPS requests.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "SystemDefault\nSsl3\nTls\nTls11\nTls12"
-      }
-    },
-    {
-      "Id": "8f47469e-3b6d-4915-a710-3a601debeb8a",
-      "Name": "ExpectedCode",
-      "Label": "Expected code",
-      "HelpText": "The expected HTTP status code",
-      "DefaultValue": "200",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7c96b2b3-53dd-4281-ae1a-ef67cbc0eb72",
-      "Name": "TimeoutSeconds",
-      "Label": "Timeout (Seconds)",
-      "HelpText": "The number of seconds before the step fails and times out",
-      "DefaultValue": "60",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ac0b303c-0c59-4776-be21-d93ebe9e28e7",
-      "Name": "AuthUsername",
-      "Label": "Username",
-      "HelpText": "Username for authentication. Leave blank to use Anonymous.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "38eae17a-3098-48df-b8dc-96c3185f9f40",
-      "Name": "AuthPassword",
-      "Label": "Password",
-      "HelpText": "Password for authentication. Leave blank for Anonymous.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "60fe87fe-e96d-448e-94fa-f2ce4bfbaf3a",
-      "Name": "UseWindowsAuth",
-      "Label": "Use Windows Authentication",
-      "HelpText": "Should the request be made passing windows authentication (kerberos) credentials otherwise uses basic authentication",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "47c779b5-c515-49f9-a122-f692b0f12ff7",
-      "Name": "ExpectedResponse",
-      "Label": "Expected Response",
-      "HelpText": "The response should be this text",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2020-06-16T08:03:12.574Z",
-    "OctopusVersion": "2020.2.13",
-    "Type": "ActionTemplate"
-  },
-  "Category": "http"
-}
\ No newline at end of file
diff --git a/step-templates/iis-add-isapicgirestrictionexception.json b/step-templates/iis-add-isapicgirestrictionexception.json
deleted file mode 100644
index 5789da687..000000000
--- a/step-templates/iis-add-isapicgirestrictionexception.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "47e1a39c-65f3-43aa-ad5e-ea1946bbf368",
-  "Name": "IIS - Add an Allow ISAPI And CGI Restriction Exception",
-  "Description": "Adds an IIS Server Allow exception to the ISAPI/CGI Restrictions in IIS 7 and above.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Param\r\n(\r\n    [Parameter(Position = 0)]\r\n    [ValidateNotNullOrEmpty()]\r\n    [string] $cgiIsapiExtensionPath,\r\n    [Parameter(Position = 1)]\r\n    [string] $description = [string]::Empty\r\n)\r\n\r\n$ErrorActionPrefrence = \"Stop\"\r\n\r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) \r\n{\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) \r\n    {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) \r\n    {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue    \r\n        if ($variable -ne $null) \r\n        {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null) \r\n    {\r\n        if ($Required) \r\n        {\r\n            throw \"Missing parameter value $Name\"\r\n        } \r\n        else \r\n        {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    Param\r\n    (\r\n        [Parameter(Mandatory=$True, Position = 0)]\r\n        [ValidateNotNullOrEmpty()]\r\n        [string] $cgiIsapiExtensionPath,\r\n        [Parameter(Position = 1)]\r\n        [string] $description = [string]::Empty\r\n    )\r\n\r\n    Import-Module \"WebAdministration\"\r\n\r\n    $cgiIsapiConfiguration = Get-WebConfiguration -Filter \"/system.webServer/security/isapiCgiRestriction/add\" -PSPath \"IIS:\\\"\r\n\r\n    $cgiIsapiExtensionFullPath = [System.Environment]::ExpandEnvironmentVariables($cgiIsapiExtensionPath)\r\n    $cgiIsapiExtensionFullPath = Resolve-Path -Path $cgiIsapiExtensionFullPath\r\n\r\n    $restrictionFound = $false\r\n    $cgiIsapiConfiguration | ForEach-Object {\r\n        $itemFullPath = [System.Environment]::ExpandEnvironmentVariables($_.path)\r\n        $itemFullPath = Resolve-Path -Path $itemFullPath\r\n\r\n        if ($itemFullPath.Path -eq $cgiIsapiExtensionFullPath.Path)\r\n        {\r\n           $restrictionFound = $true\r\n        }\r\n    }\r\n\r\n    if ($restrictionFound -eq $false)\r\n    {\r\n        Add-WebConfiguration -PSPath 'MACHINE/WEBROOT/APPHOST' -Filter \"system.webServer/security/isapiCgiRestriction\" -value @{description=\"$description\";path=\"$cgiIsapiExtensionPath\";allowed='True'}\r\n    }\r\n    else\r\n    {\r\n        Write-Host \"Allowed CGI/ISAPI Restriction for '$cgiIsapiExtensionPath' already exists.\"\r\n    }\r\n} `\r\n(Get-Param 'cgiIsapiExtensionPath' -Required) `\r\n(Get-Param 'description')",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "cgiIsapiExtensionPath",
-      "Label": "CGI/ISAPI Extension Path",
-      "HelpText": "The full path to the ISAPI/CGI extension to allow.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "description",
-      "Label": "Description",
-      "HelpText": "A description for the ISAPI/CGI Restriction allowance exception.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-01-13T21:28:56.040+00:00",
-  "LastModifiedBy": "ekrapfl",
-  "$Meta": {
-    "ExportedAt": "2016-01-13T21:28:56.040+00:00",
-    "OctopusVersion": "3.2.14",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-app-create.json b/step-templates/iis-app-create.json
deleted file mode 100644
index bbb2adbb3..000000000
--- a/step-templates/iis-app-create.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-  "Id": "5b3e7576-44f8-4852-ae09-a45bd985c549",
-  "Name": "IIS Application - Create",
-  "Description": "Create an IIS virtual application (a virtual directory with an application pool)",
-  "ActionType": "Octopus.Script",
-  "Version": 37,
-  "Properties": {
-  "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Input\r\n## --------------------------------------------------------------------------------------\r\n\r\n$virtualPath = $OctopusParameters['VirtualPath']\r\n$physicalPath = $OctopusParameters['PhysicalPath']\r\n$applicationPoolName = $OctopusParameters['ApplicationPoolName']\r\n$setApplicationPoolSettings = [boolean]::Parse($OctopusParameters['SetApplicationPoolSettings'])\r\n$appPoolFrameworkVersion = $OctopusParameters[\"ApplicationPoolFrameworkVersion\"]\r\n$applicationPoolIdentityType = $OctopusParameters[\"ApplicationPoolIdentityType\"]\r\n$applicationPoolUsername = $OctopusParameters[\"ApplicationPoolUsername\"]\r\n$applicationPoolPassword = $OctopusParameters[\"ApplicationPoolPassword\"]\r\n\r\n$parentSite = $OctopusParameters['ParentSite']\r\n$bindingProtocols = $OctopusParameters['BindingProtocols']\r\n$authentication = $OctopusParameters['AuthenticationType']\r\n$requireSSL = $OctopusParameters['RequireSSL']\r\n$clientCertificate = $OctopusParameters['ClientCertificate']\r\n\r\n$preloadEnabled = [boolean]::Parse($OctopusParameters['PreloadEnabled'])\r\n$enableAnonymous = [boolean]::Parse($OctopusParameters['EnableAnonymous'])\r\n$enableBasic = [boolean]::Parse($OctopusParameters['EnableBasic'])\r\n$enableWindows = [boolean]::Parse($OctopusParameters['EnableWindows'])\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Helpers\r\n## --------------------------------------------------------------------------------------\r\n# Helper for validating input parameters\r\nfunction Validate-Parameter($foo, [string[]]$validInput, $parameterName) {\r\n    Write-Host \"${parameterName}: ${foo}\"\r\n    if (! $foo) {\r\n        throw \"$parameterName cannot be empty, please specify a value\"\r\n    }\r\n    \r\n    if ($validInput) {\r\n        @($foo) | % { \r\n                if ($validInput -notcontains $_) {\r\n                    throw \"'$_' is not a valid input for '$parameterName'\"\r\n                }\r\n             }  \r\n        }   \r\n}\r\n\r\n# Helper to run a block with a retry if things go wrong\r\n$maxFailures = 5\r\n$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\r\nfunction Execute-WithRetry([ScriptBlock] $command) {\r\n    $attemptCount = 0\r\n    $operationIncomplete = $true\r\n\r\n    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {\r\n        $attemptCount = ($attemptCount + 1)\r\n\r\n        if ($attemptCount -ge 2) {\r\n            Write-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\r\n            Start-Sleep -s $sleepBetweenFailures\r\n            Write-Output \"Retrying...\"\r\n        }\r\n\r\n        try {\r\n            & $command\r\n\r\n            $operationIncomplete = $false\r\n        } catch [System.Exception] {\r\n            if ($attemptCount -lt ($maxFailures)) {\r\n                Write-Output (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\r\n            \r\n            }\r\n            else {\r\n                throw \"Failed to execute command\"\r\n            }\r\n        }\r\n    }\r\n}\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Configuration\r\n## --------------------------------------------------------------------------------------\r\nValidate-Parameter $virtualPath -parameterName \"Virtual path\"\r\nValidate-Parameter $physicalPath -parameterName \"Physical path\"\r\nValidate-Parameter $applicationPoolName -parameterName \"Application pool\"\r\nValidate-Parameter $parentSite -parameterName \"Parent site\"\r\n\r\n\r\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\nImport-Module WebAdministration -ErrorAction SilentlyContinue\r\n\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Run\r\n## --------------------------------------------------------------------------------------\r\n\r\nWrite-Host \"Getting web site $parentSite\"\r\n# Workaround to bug in Get-WebSite cmdlet which would return all sites\r\n# See http://forums.iis.net/p/1167298/1943273.aspx / http://stackoverflow.com/a/6832577/785750\r\n$site = Get-WebSite  | where { $_.Name -eq $parentSite }\r\nif (!$site) {\r\n    throw \"The web site '$parentSite' does not exist. Please create the site first.\"\r\n}\r\n\r\n$path = $site.PhysicalPath;\r\n$parts = $virtualPath -split \"[/\\\\]\"\r\n$name = \"\"\r\n\r\nfor ($i = 0; $i -lt $parts.Length; $i++) {\r\n    $name = $name + \"/\" + $parts[$i]\r\n    $name = $name.TrimStart('/').TrimEnd('/')\r\n    if ($i -eq $parts.Length - 1) {\r\n        \r\n    }\r\n    elseif ([string]::IsNullOrEmpty($name) -eq $false -and $name -ne \"\") {\r\n        Write-Host \"Ensuring parent exists: $name\"\r\n        \r\n        $path = [IO.Path]::Combine($path, $parts[$i])\r\n        $app = Get-WebApplication -Name $name -Site $parentSite\r\n\r\n        if (!$app) {\r\n            $vdir = Get-WebVirtualDirectory -Name $name -site $parentSite\r\n            if (!$vdir) {\r\n                Write-Verbose \"The application or virtual directory '$name' does not exist\"\r\n                if([IO.Directory]::Exists([System.Environment]::ExpandEnvironmentVariables($path)) -eq $true)\r\n                {\r\n                    Write-Verbose \"Using physical path '$path' as parent\"\r\n                }\r\n                else\r\n                {\r\n                    throw \"Failed to ensure parent\"\r\n                }\r\n            }\r\n            else\r\n            {\r\n                $path = $vdir.PhysicalPath\r\n            }\r\n        }\r\n        else\r\n        {\r\n            $path = $app.PhysicalPath\r\n        }\r\n    }\r\n}\r\n\r\n$existing = Get-WebApplication -site $parentSite -Name $name\r\n\r\n# Set App Pool\r\nExecute-WithRetry { \r\n\tWrite-Verbose \"Loading Application pool\"\r\n\t$pool = Get-Item \"IIS:\\AppPools\\$ApplicationPoolName\" -ErrorAction SilentlyContinue\r\n\tif (!$pool) { \r\n\t\tWrite-Host \"Application pool `\"$ApplicationPoolName`\" does not exist, creating...\" \r\n\t\tnew-item \"IIS:\\AppPools\\$ApplicationPoolName\" -confirm:$false\r\n\t\t$pool = Get-Item \"IIS:\\AppPools\\$ApplicationPoolName\"\r\n\t} else {\r\n\t\tWrite-Host \"Application pool `\"$ApplicationPoolName`\" already exists\"\r\n\t}\r\n}\r\n\r\n# Set App Pool Identity\r\nExecute-WithRetry { \r\n\tif($setApplicationPoolSettings)\r\n    {\r\n        Write-Host \"Set application pool identity: $applicationPoolIdentityType\"\r\n        if ($applicationPoolIdentityType -eq \"SpecificUser\") {\r\n            Set-ItemProperty \"IIS:\\AppPools\\$ApplicationPoolName\" -name processModel -value @{identitytype=\"SpecificUser\"; username=\"$applicationPoolUsername\"; password=\"$applicationPoolPassword\"}\r\n        } else {\r\n            Set-ItemProperty \"IIS:\\AppPools\\$ApplicationPoolName\" -name processModel -value @{identitytype=\"$applicationPoolIdentityType\"}\r\n        }\r\n    }\r\n}\r\n\r\n# Set .NET Framework\r\nExecute-WithRetry { \r\n    if($setApplicationPoolSettings)\r\n    {\r\n        Write-Host \"Set .NET framework version: $appPoolFrameworkVersion\" \r\n        if($appPoolFrameworkVersion -eq \"No Managed Code\")\r\n        {\r\n            Set-ItemProperty \"IIS:\\AppPools\\$ApplicationPoolName\" managedRuntimeVersion \"\"\r\n        }\r\n        else\r\n        {\r\n            Set-ItemProperty \"IIS:\\AppPools\\$ApplicationPoolName\" managedRuntimeVersion $appPoolFrameworkVersion\r\n        }\r\n    }\r\n}\r\n\r\nExecute-WithRetry { \r\n    ## Check if the physical path exits\r\n    if(!(Test-Path -Path $physicalPath)) {\r\n        Write-Host \"Creating physical path '$physicalPath'\"\r\n        New-Item -ItemType directory -Path $physicalPath\r\n    }\r\n\r\n    if (!$existing) {\r\n        Write-Host \"Creating web application '$name'\"\r\n        New-WebApplication -Site $parentSite -Name $name -ApplicationPool $applicationPoolName -PhysicalPath $physicalPath\r\n        Write-Host \"Web application created\"\r\n    } else {\r\n        Write-Host \"The web application '$name' already exists. Updating physical path:\"\r\n\r\n        Set-ItemProperty IIS:\\\\Sites\\\\$parentSite\\\\$name -name physicalPath -value $physicalPath\r\n        Write-Host \"Physical path changed to: $physicalPath\"\r\n\r\n        Set-ItemProperty IIS:\\\\Sites\\\\$parentSite\\\\$name -Name applicationPool -Value $applicationPoolName\r\n        Write-Output \"ApplicationPool changed to: $applicationPoolName\"\r\n    }\r\n    \r\n    Write-Host \"Enabling '$bindingProtocols' protocols\"\r\n    Set-ItemProperty IIS:\\\\Sites\\\\$parentSite\\\\$name -name enabledProtocols -value $bindingProtocols\r\n\r\n    $enabledIisAuthenticationOptions = $Authentication -split '\\\\s*[,;]\\\\s*'\r\n\r\n    try {\r\n\r\n    Execute-WithRetry { \r\n        Write-Output \"Anonymous authentication enabled: $enableAnonymous\"\r\n        Set-WebConfigurationProperty -filter /system.webServer/security/authentication/anonymousAuthentication -name enabled -value \"$enableAnonymous\" -PSPath IIS:\\\\ -location $parentSite/$virtualPath\r\n    }    \r\n    \r\n    Execute-WithRetry { \r\n        Write-Output \"Windows authentication enabled: $enableWindows\"\r\n        Set-WebConfigurationProperty -filter /system.WebServer/security/authentication/windowsAuthentication -name enabled -value \"$enableWindows\" -PSPath IIS:\\\\ -location $parentSite/$virtualPath\r\n    }\r\n\r\n    Execute-WithRetry { \r\n        Write-Output \"Basic authentication enabled: $enableBasic\"\r\n        Set-WebConfigurationProperty -filter /system.webServer/security/authentication/basicAuthentication -name enabled -value \"$enableBasic\" -PSPath IIS:\\\\ -location $parentSite/$virtualPath\r\n    }\r\n\r\n    } catch [System.Exception] {\r\n        Write-Output \"Authentication options could not be set. This can happen when there is a problem with your application's web.config. For example, you might be using a section that requires an extension that is not installed on this web server (such as URL Rewriting). It can also happen when you have selected an authentication option and the appropriate IIS module is not installed (for example, for Windows authentication, you need to enable the Windows Authentication module in IIS/Windows first)\"\r\n        throw\r\n    }\r\n\r\n    Set-WebConfiguration -value \"None\" -filter \"system.webserver/security/access\" -location $parentSite/$virtualPath -PSPath IIS:\\\\ \r\n    if ($requireSSL -ieq \"True\")\r\n    {\r\n        Write-Output \"Require SSL enabled: $requireSSL\"\r\n        Set-WebConfiguration -value \"Ssl\" -filter \"system.webserver/security/access\" -location $parentSite/$virtualPath -PSPath IIS:\\\\ \r\n        Write-Output \"Client certificate mode: $clientCertificate\"\r\n        if ($clientCertificate -ieq \"Accept\") {\r\n           Set-WebConfigurationProperty -filter \"system.webServer/security/access\" -location $parentSite/$virtualPath -PSPath IIS:\\\\ -name \"sslFlags\" -value \"Ssl,SslNegotiateCert\"\r\n        }\r\n        if ($clientCertificate -ieq \"Require\") {\r\n           Set-WebConfigurationProperty -filter \"system.webServer/security/access\" -location $parentSite/$virtualPath -PSPath IIS:\\\\ -name \"sslFlags\" -value \"Ssl,SslNegotiateCert,SslRequireCert\"\r\n        }\r\n    }\r\n    \r\n    try {\r\n        Set-ItemProperty IIS:\\\\Sites\\\\$parentSite\\\\$name -name preloadEnabled -value $preloadEnabled\r\n        Write-Output \"Preload Enabled: $preloadEnabled\"\r\n    } catch [System.Exception] {\r\n       if ($preloadEnabled) {\r\n            Write-Output \"Preload Enabled: $preloadEnabled Could not be set. You may to install the Application Initialization feature\"\r\n            throw\r\n       }\r\n    }\r\n}\r\n",
-
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "679da415-996c-4ad3-87d5-bb8ce4e1f8d0",
-      "Name": "VirtualPath",
-      "Label": "Virtual path",
-      "HelpText": "The name of the application to create. For example, to serve an application that will be available at `/myapp`, enter `myapp`. To create an application under a parent virtual directory or application, separate with slashes - for example: `/applications/myapp`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3eecef84-fe72-4efc-98bf-42aa41a2d488",
-      "Name": "PhysicalPath",
-      "Label": "Physical path",
-      "HelpText": "Physical folder that the application will serve files from. Example: `C:\\MyApp`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "f2b3a7ef-4d83-4692-a328-fc18cb85fd3e",
-      "Name": "ParentSite",
-      "Label": "Parent site",
-      "HelpText": "The name of the IIS web site to attach the application to. For example, to put the application under the default web site, enter:\n\n    Default Web Site",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3cb9971e-a7f2-47e7-8201-fb25c3080bd0",
-      "Name": "ApplicationPoolName",
-      "Label": "Application pool",
-      "HelpText": "The name of the application pool that the application will run under.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2a5d18bf-50ad-43c4-882b-9314ee2551b4",
-      "Name": "BindingProtocols",
-      "Label": "Protocols",
-      "HelpText": "The protocols to use for the application",
-      "DefaultValue": "http",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "07d979ef-c343-4c9c-8681-d3c06f451539",
-      "Name": "RequireSSL",
-      "Label": "Require SSL",
-      "HelpText": "Web site SSL settings",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3a3a8fe8-9fb0-4db5-85c9-04141f33f32d",
-      "Name": "ClientCertificate",
-      "Label": "Client certificate",
-      "HelpText": "_(Require SSL)_ Defines how to handle client certificates if SSL is required.",
-      "DefaultValue": "Ignore",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Ignore\nAccept\nRequire"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "174299e5-38dc-4fe9-b25a-6a5bdad05b34",
-      "Name": "PreloadEnabled",
-      "Label": "Preload Enabled",
-      "HelpText": "If true, sets the application to enable preloading.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "1641d3e2-a1e5-4933-b993-6528f1764557",
-      "Name": "EnableAnonymous",
-      "Label": "Enable Anonymous authentication",
-      "HelpText": "Whether IIS should allow anonymous authentication",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3a52b977-3ea6-482b-8e55-62efd0198b14",
-      "Name": "EnableBasic",
-      "Label": "Enable Basic authentication",
-      "HelpText": "Whether IIS should allow basic authentication with a 401 challenge.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "085a3183-30bc-499e-90bf-9b5bcdf0842a",
-      "Name": "EnableWindows",
-      "Label": "Enable Windows authentication",
-      "HelpText": "Whether IIS should allow integrated Windows authentication with a 401 challenge.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "de7b8dee-bf5a-48ea-99bc-f5b86fcdf118",
-      "Name": "SetApplicationPoolSettings",
-      "Label": "Set Application Pool Settings",
-      "HelpText": "If true, this will allow you to set the Application Pool CLR Version, identity using the .NET CLR Version, Identity, Username, and Password parameters.  If false, the other four parameters will be ignored.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "dd301881-0cd6-40bf-98b4-36e13a587fe2",
-      "Name": "ApplicationPoolFrameworkVersion",
-      "Label": "Application Pool .NET CLR Version",
-      "HelpText": "The version of the .NET common language runtime that this application pool will use.",
-      "DefaultValue": "v4.0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "v2.0|CLR v2.0 (.NET 2.0, 3.0, 3.5)\nv4.0|CLR v4.0 (.NET 4.0, 4.5, 4.6)\nNo Managed Code"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "92cb9de4-f65f-4855-bc88-d89e6a748f3c",
-      "Name": "ApplicationPoolIdentityType",
-      "Label": "Application Pool Identity",
-      "HelpText": "Which built-in account will the application pool run under.",
-      "DefaultValue": "ApplicationPoolIdentity",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "ApplicationPoolIdentity|Application Pool Identity\nLocalService|Local Service\nLocalSystem|Local System\nNetworkService|Network Service\nSpecificUser|Custom user ..."
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7cbeec84-7fad-46dd-98de-ed61531f8bb3",
-      "Name": "ApplicationPoolUsername",
-      "Label": "Application Pool Username",
-      "HelpText": "The Windows/domain account of the custom user that the application pool will run under. Example: YOURDOMAIN\\\\YourAccount. You will need to ensure that this user has permissions to run as an application pool.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "748a99a2-a9f4-46b2-b9b5-283a864171d3",
-      "Name": "ApplicationPoolPassword",
-      "Label": "Application Pool Password",
-      "HelpText": "The password for the custom account given above.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2017-04-10T15:13:10.653Z",
-    "OctopusVersion": "3.12.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-app-remove.json b/step-templates/iis-app-remove.json
deleted file mode 100644
index 5527d78c7..000000000
--- a/step-templates/iis-app-remove.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "a3edf679-e65a-4758-88a8-ec45a6c77563",
-  "Name": "IIS Application - Remove",
-  "Description": "Removes an IIS virtual application (a virtual directory with an application pool)",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Input\r\n## --------------------------------------------------------------------------------------\r\n\r\n$virtualPath = $OctopusParameters['VirtualPath']\r\n$parentSite = $OctopusParameters['ParentSite']\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Helpers\r\n## --------------------------------------------------------------------------------------\r\n# Helper for validating input parameters\r\nfunction Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {\r\n    Write-Host \"${parameterName}: $foo\"\r\n    if (! $foo) {\r\n        throw \"No value was set for $parameterName, and it cannot be empty\"\r\n    }\r\n    \r\n    if ($validInput) {\r\n        if (! $validInput -contains $foo) {\r\n            throw \"'$input' is not a valid input for '$parameterName'\"\r\n        }\r\n    }\r\n    \r\n}\r\n\r\n# Helper to run a block with a retry if things go wrong\r\n$maxFailures = 5\r\n$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\r\nfunction Execute-WithRetry([ScriptBlock] $command) {\r\n\t$attemptCount = 0\r\n\t$operationIncomplete = $true\r\n\r\n\twhile ($operationIncomplete -and $attemptCount -lt $maxFailures) {\r\n\t\t$attemptCount = ($attemptCount + 1)\r\n\r\n\t\tif ($attemptCount -ge 2) {\r\n\t\t\tWrite-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\r\n\t\t\tStart-Sleep -s $sleepBetweenFailures\r\n\t\t\tWrite-Output \"Retrying...\"\r\n\t\t}\r\n\r\n\t\ttry {\r\n\t\t\t& $command\r\n\r\n\t\t\t$operationIncomplete = $false\r\n\t\t} catch [System.Exception] {\r\n\t\t\tif ($attemptCount -lt ($maxFailures)) {\r\n\t\t\t\tWrite-Output (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\r\n\t\t\t\r\n\t\t\t}\r\n\t\t\telse {\r\n\t\t\t    throw \"Failed to execute command\"\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Configuration\r\n## --------------------------------------------------------------------------------------\r\nValidate-Parameter $virtualPath -parameterName \"Virtual path\"\r\nValidate-Parameter $parentSite -parameterName \"Parent site\"\r\n\r\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\nImport-Module WebAdministration -ErrorAction SilentlyContinue\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Run\r\n## --------------------------------------------------------------------------------------\r\n\r\nWrite-Host \"Getting web site $parentSite\"\r\n$site = Get-Website -name $parentSite\r\nif (!$site) {\r\n    throw \"The web site '$parentSite' does not exist. Please create the site first.\"\r\n}\r\n\r\n$parts = $virtualPath -split \"[/\\\\]\"\r\n$name = \"\"\r\n\r\nfor ($i = 0; $i -lt $parts.Length; $i++) {\r\n    $name = $name + \"/\" + $parts[$i]\r\n    $name = $name.TrimStart('/').TrimEnd('/')\r\n    if ($i -eq $parts.Length - 1) {\r\n        \r\n    }\r\n    elseif ([string]::IsNullOrEmpty($name) -eq $false -and $name -ne \"/\") {\r\n        Write-Host \"Ensuring parent exists: $name\"\r\n\r\n        $app = Get-WebApplication -Name $name -Site $parentSite\r\n\r\n        if (!$app) {\r\n            $vdir = Get-WebVirtualDirectory -Name $name -site $parentSite\r\n            if (!$vdir) {\r\n                throw \"The application or virtual directory '$name' does not exist\"\r\n            }\r\n        }\r\n    }\r\n}\r\n\r\n$existing = Get-WebApplication -site $parentSite -Name $name\r\n\r\nExecute-WithRetry { \r\n    if ($existing) {\r\n        Write-Host \"Removing web application '$name'\"\r\n\t\tRemove-WebApplication -Name $name -Site $parentSite\r\n        Write-Host \"Web application removed\"\r\n    } else {\r\n        Write-Host \"Web application doesn't exist, nothing to remove.\"\r\n    }\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "VirtualPath",
-      "Label": "Virtual path",
-      "HelpText": "The name of the application to remove. For example, if the application that will be removed is at `/myapp`, enter `myapp`. To remove an application under a parent virtual directory or application, separate with slashes - for example: `/applications/myapp`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ParentSite",
-      "Label": "Parent site",
-      "HelpText": "The name of the IIS web site to remove the application from. For example, to remove the application under the default web site, enter:\n\n    Default Web Site",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-05-20T20:25:09.714+00:00",
-  "LastModifiedBy": "lukerogers",
-  "$Meta": {
-    "ExportedAt": "2015-05-20T20:27:33.262+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-app-set-connect-as-credential.json b/step-templates/iis-app-set-connect-as-credential.json
deleted file mode 100644
index a4d0a58d2..000000000
--- a/step-templates/iis-app-set-connect-as-credential.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "Id": "1a482cf6-95ae-442f-92a4-c1e79d5c8e4b",
-  "Name": "IIS Application - Set Connect As credential",
-  "Description": "Sets the credential for the Connect As of an IIS application",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Import the WebAdministration module\nImport-Module WebAdministration\n\n# Get reference to the site\n$iisSite = Get-IISSite | Where-Object {$_.Name -ieq $IISSiteName}\n\n# Check to make sure the site was found\nif ($null -eq $iisSite)\n{\n\t# Throw an error\n    throw \"$IISSiteName was not found.\"\n}\n\n# Check to see if $IISApplicationName starts with a /\nif ($IISApplicationName.StartsWith(\"/\"))\n{\n\t# Remove the beginning slash\n    $IISApplicationName = $IISApplicationName.SubString(1)\n}\n\n# Get reference to the application\n$application = $iisSite.Applications | Where-Object {$_.Path -ieq \"/$IISApplicationName\"}\n\n# Check to see if the application was found\nif ($null -eq $application)\n{\n\t# Throw an error\n    throw \"$IISApplicationName was not found.\"\n}\n\n# retrieve existing values\n$currentUserName = Get-WebConfigurationProperty \"system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']\" -name username\n$currentPassword = Get-WebConfigurationProperty \"system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']\" -name password\n\n# Check the value of $ApplicationUserName\nif ([string]::IsNullOrEmpty($ApplicationUserName))\n{\n    # Ensure $ApplicationUserName is an empty string\n    $ApplicationUserName = [string]::Empty\n}\n\n# Check the value of $ApplicationPassword\nif ([string]::IsNullOrEmpty($ApplicationUserPassword) -or $ApplicationUserName.EndsWith('$')) # Usernames ending in $ are an indication that an MSA is being used\n{\n\t# Ensure $ApplicationPassword is empty string\n    $ApplicationPassword = [string]::Empty\n}\n\n# Compare username values\nif ($ApplicationUserName -ne $currentUserName.Value)\n{\n\t# Display message\n    Write-Output \"Updating username for $IISSiteName/$IISApplicationName to $ApplicationUserName Connect As property\"\n    \n\t# Update the property\n    Set-WebConfigurationProperty \"system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']\" -name username -value \"$ApplicationUserName\"\n}\nelse\n{\n\t# Display message\n    Write-Output \"User already set to $ApplicationUserName for $IISSiteName/$IISApplicationName Connect As property\"\n}\n\n# Compare password values\nif ($ApplicationUserPassword -ne $currentPassword.Value)\n{\n    # Display message\n    Write-Output \"Updating password for $IISSiteName/$IISApplicationName Connect As property\"\n    \n    # Set password property\n\tSet-WebConfigurationProperty \"system.applicationHost/sites/site[@name='$($iisSite.Name)']/application[@path='$($application.Path)']/virtualDirectory[@path='/']\" -name password -value \"$ApplicationUserPassword\"\n}\nelse\n{\n\t# Display message\n    Write-Output \"Password does not need updating for $IISSiteName/$IISApplicationName Connect As property\"\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "cca187a4-2e55-4b71-98e8-87bf47b9744d",
-      "Name": "IISSiteName",
-      "Label": "Site Name",
-      "HelpText": "Name of the IIS site.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "381050b6-975b-4a10-b79c-a6fee9383cf2",
-      "Name": "IISApplicationName",
-      "Label": "Application Name",
-      "HelpText": "Name of the application to set the credential on.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8b9f0aff-93d7-4bc0-b375-b30179835e17",
-      "Name": "ApplicationUserName",
-      "Label": "User name",
-      "HelpText": "Name of the credential to apply, leave blank to set to Pass-through authentication.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "220c4021-727a-4f10-935b-101a3cc8a3bb",
-      "Name": "ApplicationUserPassword",
-      "Label": "Password",
-      "HelpText": "Password of the credential to set.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedOn": "2018-12-04T20:21:52.123Z",
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2018-12-04T20:21:52.123Z",
-    "OctopusVersion": "2018.9.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-app-update-property.json b/step-templates/iis-app-update-property.json
deleted file mode 100644
index bd4210792..000000000
--- a/step-templates/iis-app-update-property.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "Id": "4eb08b60-142c-4443-92cf-2e069727f438",
-  "Name": "IIS App - Update Property",
-  "Description": "Updates property for specified application",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$webSiteName,\n    [string]$applicationName,\n    [string]$propertyName,\n    [object]$propertyValue,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null -or $result -eq \"\") {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\n& {\n    param(\n        [string]$webSiteName,\n        [string]$applicationName,\n        [string]$propertyName,\n        [object]$propertyValue\n    ) \n\n    Write-Host \"Setting $webSiteName\\$applicationName property $propertyName to $propertyValue\"\n\n    try {\n         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue\n         Import-Module WebAdministration -ErrorAction SilentlyContinue\n         \n         $oldValue = Get-ItemProperty \"IIS:\\Sites\\$webSiteName\\$applicationName\" -Name $propertyName\n         $oldValueString = \"\"\n\n         if ($oldValue.GetType() -eq [Microsoft.IIs.PowerShell.Framework.ConfigurationAttribute])\n         {\n             $oldValueString = ($oldValue | Select-Object -ExpandProperty \"Value\")\n         }\n         elseif ($oldValue.GetType() -eq [System.String])\n         {\n             $oldValueString = $oldValue\n         }\n         elseif ($oldValue.GetType() -eq [System.Management.Automation.PSCustomObject])\n         {\n             $oldValueString = ($oldValue | Select-Object -ExpandProperty $propertyName)\n         }\n\n         Write-Host \"Old value $oldValueString\"\n         Set-ItemProperty \"IIS:\\Sites\\$webSiteName\\$applicationName\" -Name $propertyName -Value $propertyValue\n         Write-Host \"New value $propertyValue\"\n         Write-Host \"Done\"\n    } catch {\n        Write-Host $_.Exception|format-list -force\n        Write-Host \"There was a problem setting property\"    \n    }\n\n } `\n (Get-Param 'webSiteName' -Required) (Get-Param 'applicationName' -Required) (Get-Param 'propertyName' -Required) (Get-Param 'propertyValue' -Required)\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "41b1663e-f84a-4e8a-981a-fb86ec4176b9",
-      "Name": "webSiteName",
-      "Label": "Web site name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1d7a25f9-0900-4c5c-b76b-5afbb427249b",
-      "Name": "applicationName",
-      "Label": "Aplication name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b074c934-c903-45e3-a96b-6c5282840d60",
-      "Name": "propertyName",
-      "Label": "Name of the property to set",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cdc37d1e-8a16-44bd-b80b-5c83c9d3022f",
-      "Name": "propertyValue",
-      "Label": "Value of the property to set",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2018-12-03T17:04:14.758Z",
-  "LastModifiedBy": "micdenny",
-  "$Meta": {
-    "ExportedAt": "2018-12-03T17:04:14.758Z",
-    "OctopusVersion": "2018.9.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-apppool-delete.json b/step-templates/iis-apppool-delete.json
deleted file mode 100644
index bf6797b55..000000000
--- a/step-templates/iis-apppool-delete.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "a7120f3e-6676-4bbb-b848-1413b03a35e8",
-  "Name": "IIS AppPool - Delete",
-  "Description": "Deletes an IIS Application Pool. \nCAUTION: Delete will proceed even if applications are using the Application Pool.",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Input\r\n## --------------------------------------------------------------------------------------\r\n\r\n$appPoolName = $OctopusParameters['AppPoolName']\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Helpers\r\n## --------------------------------------------------------------------------------------\r\n# Helper for validating input parameters\r\nfunction Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {\r\n    IF (! $parameterName -contains \"Password\") \r\n    { \r\n        Write-Host \"${parameterName}: $foo\" \r\n    }\r\n    if (! $foo) {\r\n        throw \"No value was set for $parameterName, and it cannot be empty\"\r\n    }\r\n}\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Configuration\r\n## --------------------------------------------------------------------------------------\r\nValidate-Parameter $appPoolName -parameterName \"Application Pool Name\"\r\n\r\n#Load Web Admin DLL\r\n[System.Reflection.Assembly]::LoadFrom( \"C:\\windows\\system32\\inetsrv\\Microsoft.Web.Administration.dll\" )\r\n\r\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\nImport-Module WebAdministration -ErrorAction SilentlyContinue\r\n\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Run\r\n## --------------------------------------------------------------------------------------\r\n\r\n$iis = (New-Object Microsoft.Web.Administration.ServerManager)\r\n\r\n$appPool = $iis.ApplicationPools | Where {$_.Name -eq $appPoolName} | Select-Object -First 1\r\n\r\nIF ($appPool -eq $null)\r\n{\r\n    Write-Output \"Could not find an Application Pool named '$appPoolName'\"\r\n}\r\nELSE\r\n{\r\n    Write-Output \"Removing Application Pool '$appPoolName'\"\r\n    $iis.ApplicationPools.Remove($appPool)\r\n    $iis.CommitChanges()\r\n}\r\n\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "AppPoolName",
-      "Label": "Application pool name",
-      "HelpText": "The name of the application pool that will be deleted.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2014-07-29T17:01:39.105+00:00",
-  "LastModifiedBy": "zagrophyte",
-  "$Meta": {
-    "ExportedAt": "2014-07-29T17:06:59.269+00:00",
-    "OctopusVersion": "2.5.5.318",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-apppool-stop.json b/step-templates/iis-apppool-stop.json
deleted file mode 100644
index f55e06346..000000000
--- a/step-templates/iis-apppool-stop.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Id": "3aaf34a5-90eb-4ea1-95db-15ec93c1e54d",
-  "Name": "IIS AppPool - Stop",
-  "Description": "Stops an IIS Application Pool",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Load IIS module:\nImport-Module WebAdministration\n\n# Get AppPool Name\n$appPoolName = $OctopusParameters['appPoolName']\n# Get the number of retries\n$retries = $OctopusParameters['appPoolCheckRetries']\n# Get the number of attempts\n$delay = $OctopusParameters['appPoolCheckDelay']\n\n# Check if exists\nif(Test-Path IIS:\\AppPools\\$appPoolName) {\n\n    # Stop App Pool if not already stopped\n    if ((Get-WebAppPoolState $appPoolName).Value -ne \"Stopped\") {\n        Write-Output \"Stopping IIS app pool $appPoolName\"\n        Stop-WebAppPool $appPoolName\n\n        $state = (Get-WebAppPoolState $appPoolName).Value\n        $counter = 1\n\n        # Wait for the app pool to the \"Stopped\" before proceeding\n        do{\n            $state = (Get-WebAppPoolState $appPoolName).Value\n            Write-Output \"$counter/$retries Waiting for IIS app pool $appPoolName to shut down completely. Current status: $state\"\n            $counter++\n            Start-Sleep -Milliseconds $delay\n        }\n        while($state -ne \"Stopped\" -and $counter -le $retries)\n\n        # Throw an error if the app pool is not stopped\n        if($counter -gt $retries) {\n            throw \"Could not shut down IIS app pool $appPoolName. `nTry to increase the number of retries ($retries) or delay between attempts ($delay milliseconds).\" }\n    }\n    else {\n        Write-Output \"$appPoolName already Stopped\"\n    }\n}\nelse {\n    Write-Output \"IIS app pool $appPoolName doesn't exist\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "Parameters": [
-    {
-      "Name": "AppPoolName",
-      "Label": "Application pool name",
-      "HelpText": "The name of the application pool in IIS.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AppPoolCheckDelay",
-      "Label": "Status check interval",
-      "HelpText": "The delay, in milliseconds, between each attempt to query the application pool to see if its status is \"Stopped\"",
-      "DefaultValue": "500",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AppPoolCheckRetries",
-      "Label": "Status check retries",
-      "HelpText": "The number of retries before an error is thrown.",
-      "DefaultValue": "20",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2017-04-10T18:41:25+00:00",
-    "OctopusVersion": "3.12.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-apppool-update-property.json b/step-templates/iis-apppool-update-property.json
deleted file mode 100644
index 4522a0916..000000000
--- a/step-templates/iis-apppool-update-property.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "183c1676-cb8e-44e8-a348-bbcb2b77536e",
-  "Name": "IIS AppPool - Update Property",
-  "Description": "Updates property for specified AppPool, useful for example to change startMode to AlwaysRunning.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$appPoolName,\n    [string]$propertyName,\n    [object]$propertyValue,\n    [switch]$whatIf\n)\n\n$ErrorActionPreference = \"Stop\"\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null -or $result -eq \"\") {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\n& {\n    param(\n        [string]$appPoolName,\n        [string]$propertyName,\n        [object]$propertyValue\n    )\n\n    Write-Host \"Setting $appPoolName property $propertyName to $propertyValue\"\n\n    try {\n         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue\n         Import-Module WebAdministration -ErrorAction SilentlyContinue\n\n         $oldValue = Get-ItemProperty \"IIS:\\AppPools\\$appPoolName\" -Name $propertyName\n         $oldValueString = \"\"\n\n         if ($oldValue.GetType() -eq [Microsoft.IIs.PowerShell.Framework.ConfigurationAttribute])\n         {\n             $oldValueString = ($oldValue | Select-Object -ExpandProperty \"Value\");\n             $convertedValue = $propertyValue -as $oldValueString.GetType();\n         }\n         else\n         {\n             $oldValueString = $oldValue;\n             $convertedValue = $propertyValue -as $oldValue.GetType();\n         }\n\n         Write-Host \"Old value $oldValueString\"\n         Set-ItemProperty \"IIS:\\AppPools\\$appPoolName\" -Name $propertyName -Value $convertedValue\n         Write-Host \"New value $propertyValue\"\n         Write-Host \"Done\"\n    } catch {\n        Write-Host $_.Exception|format-list -force\n        Write-Host \"There was a problem setting property\"\n    }\n\n } `\n (Get-Param 'appPoolName' -Required) (Get-Param 'propertyName' -Required) (Get-Param 'propertyValue' -Required)\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "appPoolName",
-      "Label": "Application pool name",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "propertyName",
-      "Label": "Name of the property to set",
-      "HelpText": "",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "propertyValue",
-      "Label": "Value of the property to set",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2019-09-05T00:59:58.662+00:00",
-  "LastModifiedBy": "olsh",
-  "$Meta": {
-    "ExportedAt": "2015-10-23T02:15:10.732+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-apppool-update-recycle-settings.json b/step-templates/iis-apppool-update-recycle-settings.json
deleted file mode 100644
index f40fa5d01..000000000
--- a/step-templates/iis-apppool-update-recycle-settings.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "Id": "5d771fd0-710c-41a7-9969-10bc75d00307",
-  "Name": "IIS AppPool - Update Recycle Settings",
-  "Description": "Update the worker process and app pool timeout/recycle times.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Import-Module WebAdministration\n\nfunction Update-IISAppPool-PeriodicRestart($appPool, $periodicRestart) {\n    Write-Output \"Setting worker process periodic restart time to $periodicRestart for AppPool $appPoolName.\"\n    $appPool.Recycling.PeriodicRestart.Time = [TimeSpan]::FromMinutes($periodicRestart)\n    $appPool | Set-Item\n}\n\nfunction Update-IISAppPool-IdleTimeout($appPool, $appPoolName, $idleTimeout) {\n    Write-Output \"Setting worker process idle timeout to $idleTimeout for AppPool $appPoolName.\"\n    $appPool.ProcessModel.IdleTimeout = [TimeSpan]::FromMinutes($idleTimeout)\n    $appPool | Set-Item\n}\n\nfunction Update-IISAppPool-ScheduledTimes($appPool, $appPoolName, $schedule) {\n    $minutes = $periodicRecycleTimes.Split(\",\")\n    $minuteArrayList = New-Object System.Collections.ArrayList\n\n    foreach ($minute in $minutes) {\n        $minute = $minute.trim()\n\n        if ($minute -eq \"-1\") {\n            break\n        }\n        if ($minute -lt 0) {\n            continue\n        }\n\n        $minuteArrayList.Add([TimeSpan]::FromMinutes($minute))\n    }\n\n    Write-Output \"Setting worker process scheduled restart times to $minuteArrayList for AppPool $appPoolName.\"\n\n    $settingName = \"recycling.periodicRestart.schedule\"\n    Clear-ItemProperty $appPool.PSPath -Name $settingName\n\n    $doneOne = $false\n    foreach ($minute in $minuteArrayList) {\n        if ($doneOne -eq $false) {\n            Set-ItemProperty $appPool.PSPath -Name $settingName -Value @{value=$minute}\n            $doneOne = $true\n        }\n        else {\n            New-ItemProperty $appPool.PSPath -Name $settingName -Value @{value=$minute}\n        }\n    }\n}\n\nfunction Update-IISAppPool-RecycleEventsToLog($appPool, $appPoolName, $events) {\n    $settingName = \"Recycling.logEventOnRecycle\"\n    Write-Output \"Setting $settingName for AppPool $appPoolName to $events.\"\n\n    Clear-ItemProperty $appPool.PSPath -Name $settingName\n    if ($events -ne \"-\") {\n        Set-ItemProperty $appPool.PSPath -Name $settingName -Value $events\n    }\n}\n\nfunction Update-IISAppPool-PrivateMemoryLimit($appPool, $appPoolName, $privateMemoryLimitKB) {\n    Write-Output \"Setting private memory limit to $privateMemoryLimitKB KB for AppPool $appPoolName.\"\n    $appPool.Recycling.PeriodicRestart.PrivateMemory = $privateMemoryLimitKB\n    $appPool | Set-Item\n}\n\nfunction Run {\n    $OctopusParameters = $OctopusParameters\n    if ($null -eq $OctopusParameters) {\n        write-host \"Using test values\"\n        $OctopusParameters = New-Object \"System.Collections.Hashtable\"\n        $OctopusParameters[\"ApplicationPoolName\"]=\"DefaultAppPool\"\n        $OctopusParameters[\"IdleTimeoutMinutes\"]=\"\"\n        $OctopusParameters[\"RegularTimeIntervalMinutes\"]=\"10\"\n        $OctopusParameters[\"PeriodicRecycleTime\"]=\"14,15,16\"\n        $OctopusParameters[\"RecycleEventsToLog\"]=\"Time, Requests, Schedule, Memory, IsapiUnhealthy, OnDemand, ConfigChange, PrivateMemory\"\n        $OctopusParameters[\"PrivateMemoryLimitKB\"]=\"1024000\"\n        $OctopusParameters[\"EmptyClearsValue\"]=$true\n    }\n\n    $applicationPoolName = $OctopusParameters[\"ApplicationPoolName\"]\n    $idleTimeout = $OctopusParameters[\"IdleTimeoutMinutes\"]\n    $periodicRestart = $OctopusParameters[\"RegularTimeIntervalMinutes\"]\n    $periodicRecycleTimes = $OctopusParameters[\"PeriodicRecycleTime\"]\n    $recycleEventsToLog = $OctopusParameters[\"RecycleEventsToLog\"]\n    $privateMemoryLimitKB = $OctopusParameters[\"PrivateMemoryLimitKB\"]\n    $emptyClearsValue = $OctopusParameters[\"EmptyClearsValue\"]\n\n    if ([string]::IsNullOrEmpty($applicationPoolName)) {\n        throw \"Application pool name is required.\"\n    }\n\n    $appPool = Get-Item IIS:\\AppPools\\$applicationPoolName\n\n    if ($emptyClearsValue -eq $true) {\n        Write-Output \"Empty values will reset to default\"\n        if ([string]::IsNullOrEmpty($idleTimeout)) {\n            $idleTimeout = \"0\"\n        }\n        if ([string]::IsNullOrEmpty($periodicRestart)) {\n            $periodicRestart = \"0\"\n        }\n        if ([string]::IsNullOrEmpty($periodicRecycleTimes)) {\n            $periodicRecycleTimes = \"-1\"\n        }\n        if ([string]::IsNullOrEmpty($recycleEventsToLog)) {\n            $recycleEventsToLog = \"-\"\n        }\n        if ([string]::IsNullOrEmpty($privateMemoryLimitKB)) {\n            $privateMemoryLimitKB = \"0\"\n        }\n    }\n\n    if (![string]::IsNullOrEmpty($periodicRestart)) {\n        Update-IISAppPool-PeriodicRestart              -appPool $appPool -appPoolName $appPool.Name -PeriodicRestart $periodicRestart\n    }\n    if (![string]::IsNullOrEmpty($idleTimeout)) {\n        Update-IISAppPool-IdleTimeout                  -appPool $appPool -appPoolName $appPool.Name -idleTimeout $idleTimeout\n    }\n    if (![string]::IsNullOrEmpty($periodicRecycleTimes)) {\n        Update-IISAppPool-ScheduledTimes               -appPool $appPool -appPoolName $appPool.Name -Schedule $periodicRecycleTimes\n    }\n    if(![string]::IsNullOrEmpty($recycleEventsToLog)){\n        Update-IISAppPool-RecycleEventsToLog           -appPool $appPool -appPoolName $appPool.Name -Events $recycleEventsToLog\n    }\n    if (![string]::IsNullOrEmpty($privateMemoryLimitKB)) {\n        Update-IISAppPool-PrivateMemoryLimit           -appPool $appPool -appPoolName $appPool.Name -PrivateMemoryLimitKB $privateMemoryLimitKB\n    }\n}\n\nRun\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "0fd90579-79b4-4086-8c7c-602cf21f9f10",
-      "Name": "ApplicationPoolName",
-      "Label": "Application pool",
-      "HelpText": "The name of the application pool to modify. The application pool must already exist.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4c1c4df5-4282-43f4-9119-e514016b4230",
-      "Name": "IdleTimeoutMinutes",
-      "Label": "Process idle timeout",
-      "HelpText": "Amount of time (in minutes) a worker process will remain idle before it shuts down. A value of 0 means the process does not shut down after an idle timeout.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "516e588b-b9e3-43cc-8342-7f50c97e138b",
-      "Name": "RegularTimeIntervalMinutes",
-      "Label": "Application pool recycle time interval",
-      "HelpText": "Period of time (in minutes) after which the application pool will recycle. A value of 0 means the application pool does not recycle on a regular interval.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a8121270-e728-4fe5-bf1b-f75cb5075516",
-      "Name": "PeriodicRecycleTime",
-      "Label": "Application pool periodic recycle time",
-      "HelpText": "A specific local time, in minutes after midnight, when the application pool is recycled. Seperate multiple times by using a ,\n\nExample: \"30\" for half an hour past midnight. or \"0, 360\" for midnight and 6 am.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fd4fe130-1bed-41ee-a1b5-73a080cc3ca5",
-      "Name": "RecycleEventsToLog",
-      "Label": "Recycle Events To Log",
-      "HelpText": "Event Log entries can be generated when an application pool is recycled. Select the Recycling events to log. The Options are **Time**, **Requests**, **Schedule**, **Memory**, **IsapiUnhealthy**, **OnDemand**, **ConfigChange**,  **PrivateMemory**. These should be entered in a comma separated list. \n\nExample: \"OnDemand,ConfigChange\"",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "334a24ee-d347-4fd8-bc97-43be090fd5c1",
-      "Name": "PrivateMemoryLimitKB",
-      "Label": "Private memory limit in KB",
-      "HelpText": "Maximum amount of private memory (in KB) a worker process can consume before causing the application pool to recycle. A value of 0 means there is no limit.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "bb164dea-1843-4655-a0e2-b29f990b44b7",
-      "Name": "EmptyClearsValue",
-      "Label": "Empty values reset",
-      "HelpText": "When checked, if the values are not set it will remove the setting from IIS.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2025-05-22T12:45:32Z",
-  "LastModifiedBy": "janv8000",
-  "$Meta": {
-    "ExportedAt": "2017-07-05T23:25:56.598Z",
-    "OctopusVersion": "3.14.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-autostartprovider-add.json b/step-templates/iis-autostartprovider-add.json
deleted file mode 100644
index 3c32ffddb..000000000
--- a/step-templates/iis-autostartprovider-add.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "20b8c2fd-9194-47e3-948e-badc6c2a30d5",
-  "Name": "IIS AutoStartProvider - Add",
-  "Description": "Add autostartprovider entry so type can be used to warm up applicaiton. Final changes in applicationHost.config look like that:\n\n<serviceAutoStartProviders>\n    <add name=\"ApplicationPreload\" type=\"WebApplication1.ApplicationPreload, WebApplication1\" />\n</serviceAutoStartProviders>\n\nwhere name and type are taken from parameters.",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n        [string]$serviceName,\r\n        [string]$serviceType,\r\n        [switch]$whatIf\r\n     ) \r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n        if ($OctopusParameters -ne $null) {\r\n            $result = $OctopusParameters[$Name]\r\n        }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n            if ($variable -ne $null) {\r\n                $result = $variable.Value\r\n            }\r\n    }\r\n\r\n    if ($result -eq $null -or $result -eq \"\") {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n& {\r\n    param(\r\n            [string]$serviceName,\r\n            [string]$serviceType\r\n         ) \r\n\r\n        Write-Host \"Setting $serviceName, $serviceType service autostart provider\"\r\n\r\n        try {\r\n            Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\n            Import-Module WebAdministration -ErrorAction SilentlyContinue\r\n\r\n            $oldValue = Get-WebConfiguration -filter /system.applicationHost/serviceAutoStartProviders/add | \r\n                        Where-Object { $_.Name -eq $serviceName }\r\n\r\n            if ($oldValue -eq $null) {\r\n                Write-Host \"Adding new service type provider $serviceName, $serviceType\"\r\n                Add-WebConfiguration -filter /system.applicationHost/serviceAutoStartProviders -Value @{name=$serviceName; type=$serviceType}\r\n            } \r\n            elseif ($oldValue.Type -eq $serviceType) { \r\n                Write-Host \"Service provider with the same name and type exists\"\r\n            } else {\r\n                $oldValueType = $oldValue.Type\r\n                Write-Host \"Replacing service type from $oldValueType to $serviceType\"\r\n                Set-WebConfiguration -filter \"/system.applicationHost/serviceAutoStartProviders/add[@name='$serviceName']\" -Value @{\"type\" = \"$serviceType\"}\r\n            }\r\n\r\n            Write-Host \"Done\"\r\n        } catch {\r\n            Write-Host $_.Exception|format-list -force\r\n            Write-Host \"There was a problem setting property\"    \r\n        }\r\n} `\r\n(Get-Param 'serviceName' -Required) (Get-Param 'serviceType' -Required) \r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "serviceName",
-      "Label": "Name of autostart service",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "serviceType",
-      "Label": "Type which implements IProcessHostPreloadClient",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-10-23T01:06:20.789+00:00",
-  "LastModifiedBy": "jmalczak",
-  "$Meta": {
-    "ExportedAt": "2015-10-23T02:23:21.661+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-backup-iis-configuration.json b/step-templates/iis-backup-iis-configuration.json
deleted file mode 100644
index f3d55915f..000000000
--- a/step-templates/iis-backup-iis-configuration.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "Id": "e1006e45-bbde-42e3-b6b9-16d804772684",
-  "Name": "IIS - Backup IIS Configuration",
-  "Description": "This backs up the entire IIS configuration for the server (does not include website files). Note that all prior configurations on that IIS server will be cleared out.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "<#\r\nThis script will take the existing configuration (does not include website files) and back it up on the IIS Server, which can then be later restored if needed.\r\n\r\nTo view existing backups for restore operation, find the latest backup here:\r\n    $env:Windir\\System32\\inetsrv\\backup\r\n\r\nTo restore, use the following commands:\r\n    Restore-WebConfiguration -Name \"IISConfigBackup\"\r\n    iisreset\r\n\r\nReference Articles:\r\nhttps://technet.microsoft.com/en-us/library/hh867851(v=wps.630).aspx\r\nhttps://technet.microsoft.com/en-us/library/hh867862(v=wps.630).aspx\r\n#>\r\n\r\n# clear all backed up configurations first\r\nRemove-WebConfigurationBackup\r\n\r\n# perform backup\r\nBackup-WebConfiguration -Name \"IISConfigBackup\"\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [],
-  "LastModifiedBy": "jjaffery",
-  "$Meta": {
-    "ExportedAt": "2016-11-23T21:07:51.416Z",
-    "OctopusVersion": "3.4.15",
-    "Type": "ActionTemplate"
-  },
-   "Category": "iis"
-}
diff --git a/step-templates/iis-bindings-backup.json b/step-templates/iis-bindings-backup.json
deleted file mode 100644
index 3619a6742..000000000
--- a/step-templates/iis-bindings-backup.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "Id": "0225e445-fe89-4cad-b495-4e26ba0b3ed0",
-  "Name": "IIS Bindings - Backup",
-  "Description": "Backs up IIS bindings for a given site so they can be restored in later steps. This is very useful if we we have any existing bindings on IIS server since Octopus wipes all existing bindings when create new ones.",
-  "ActionType": "Octopus.Script",
-  "Version": 13,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$webSiteName,\r\n    [string]$backupFolder,\r\n    [switch]$whatIf\r\n) \r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null -or $result -eq \"\") {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\nfunction Get-File-Name($backupFolder, $webSiteName) {\r\n    $folder = Join-Path -Path $backupFolder -ChildPath $webSiteName\r\n\r\n    if((Test-Path $folder) -eq $false) {\r\n        mkdir $folder | Out-Null\r\n    }\r\n\r\n    $fullPath = $null;\r\n\r\n    if($OctopusParameters -eq $null) {\r\n         $fullPath = Join-Path -Path $folder -ChildPath \"site_backup.xml\"\r\n    } else {\r\n         $fileName = $OctopusParameters[\"Octopus.Release.Number\"] + \"_\" + $OctopusParameters[\"Octopus.Environment.Name\"] + \".xml\"\r\n         $fullPath = Join-Path -Path $folder -ChildPath $fileName\r\n    }\r\n\r\n    return $fullPath\r\n}\r\n\r\n& {\r\n    param(\r\n        [string]$webSiteName,\r\n        [string]$backupFolder\r\n    ) \r\n\r\n    Write-Host \"Save $webSiteName bindings to bindings variable\"\r\n\r\n    try {\r\n         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\n         Import-Module WebAdministration -ErrorAction SilentlyContinue\r\n\r\n         $currentBindings = Get-WebBinding -Name $webSiteName\r\n         $bindingsBackupFile = Get-File-Name $backupFolder $webSiteName\r\n         $currentBindings | Export-CliXML $bindingsBackupFile\r\n\r\n         Write-Host \"Done\"\r\n    } catch {\r\n        Write-Host $_.Exception|format-list -force\r\n        Write-Host \"There was a problem saving bindings\"    \r\n    }\r\n\r\n } `\r\n (Get-Param 'webSiteName' -Required) (Get-Param 'backupFolder' -Required)\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "webSiteName",
-      "Label": "Web Site Name",
-      "HelpText": "Name of the web site for which we should backup bindings",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "backupFolder",
-      "Label": "Folder where backed up binding file will be stored",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "jmalczak",
-  "$Meta": {
-    "ExportedAt": "2016-01-04T14:42:14.131+00:00",
-    "OctopusVersion": "3.2.13",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-bindings-enable-ssl-ccs.json b/step-templates/iis-bindings-enable-ssl-ccs.json
deleted file mode 100644
index ee64d055c..000000000
--- a/step-templates/iis-bindings-enable-ssl-ccs.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "Name": "IIS - Add CCS HTTPS bindings based on HTTP bindings",
-  "Description": "Add IIS Centralized Certificate Store (CCS) SSL bindings to a website based on HTTP bindings (binds to same IP and hostname but different port and protocol).\n\nThis is used to enable CCS on IIS websites created with the normal Octopus IIS website creation step.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$WebSiteName = $OctopusParameters['IisCcsWebSiteName'];\n[bool]$SNI = $false;\nif (-not [bool]::TryParse($OctopusParameters['IisCcsSNI'], [ref]$SNI)) {\n    $SNI = $true;\n}\n$SslFlags = 2; # Use CCS\nif ($SNI) {\n\t$SslFlags = 3; # Use SNI CCS\n}\n$PortMap = [System.Collections.Generic.Dictionary[int,int]]::new();\nforeach ($mapping in [regex]::Matches($OctopusParameters['IisCcsPortMap'],\"([0-9]+):([0-9]+)\")) {\n    $PortMap.Add([int]$mapping.Groups[1].Value, [int]$mapping.Groups[2].Value);\n}\n$httpBindings = Get-WebBinding -Name $WebSiteName -Protocol http | Foreach-Object { $_.bindingInformation };\nif (-not $httpBindings) {\n    Write-Error \"The site $WebSiteName does not exist, or it has not HTTP binding\"\n}\nforeach ($binding in (Get-WebBinding -Name $WebSiteName -Protocol http | Foreach-Object { $_.bindingInformation })) {\n    $parts = $binding.Split(\":\");\n    $IPAddress = $parts[0];\n    $HostHeader = $parts[2];\n    [int]$Port = 0;\n    if ([string]::IsNullOrEmpty($HostHeader)) {\n        Write-Warning \"The binding $binding has no hostname, skipping\";\n    } elseif (-not $PortMap.TryGetValue([int]$parts[1], [ref]$Port)) {\n        Write-Warning \"There is no port mapping for the binding $binding, skipping\";\n    } else {\n        Write-Verbose \"Binding HTTP $binding to HTTPS $($IPAddress):$($Port):$($HostHeader)\";\n        $existingBinding = Get-WebBinding -Name $WebSiteName -Protocol https -IPAddress $IPAddress -Port $Port -HostHeader $HostHeader;\n        if ($existingBinding) {\n            if ($existingBinding.sslFlags -ne $SslFlags) {\n                Write-Host \"Change SSL flags of binding $($IPAddress):$($Port):$($HostHeader)\";\n                Set-WebBinding -Name $WebSiteName -IPAddress $IPAddress -Port $Port -HostHeader $HostHeader -PropertyName SslFlags -Value $SslFlags;\n            }\n        } else {\n            Write-Host \"Create HTTPS binding $($IPAddress):$($Port):$($HostHeader)\";\n            New-WebBinding -Name $WebSiteName -Protocol https -IPAddress $IPAddress -Port $Port -HostHeader $HostHeader -SslFlags $SslFlags;\n        }\n    }\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "e17b143f-d26c-458b-be41-6afca9e2666f",
-      "Name": "IisCcsWebSiteName",
-      "Label": "Website Name",
-      "HelpText": "Name of the website, can be retrieved from a IIS website deployment step: `#{Octopus.Action[*].IISWebSite.WebSiteName}`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "de1633dd-5dcd-4d8f-8c69-d031a6b32434",
-      "Name": "IisCcsSNI",
-      "Label": "Enable SNI",
-      "HelpText": "Enable SNI for the binding(s), default is enabled.",
-      "DefaultValue": "true",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "e6faf04c-441b-4ef2-8ad6-2ce0b4dc93df",
-      "Name": "IisCcsPortMap",
-      "Label": "Port mapping",
-      "HelpText": "Mapping of HTTP to HTTPS ports as list of integer parts. Default is `80:443` (multiple mappings may be added, separated by spaces).",
-      "DefaultValue": "80:443",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2019-09-14T22:53:52.793Z",
-    "OctopusVersion": "2019.7.1",
-    "Type": "ActionTemplate"
-  },
-  "Id": "0f21bd9a-2dea-4432-a1a1-2dee302ca418",
-  "Category": "iis"
-}
diff --git a/step-templates/iis-bindings-restore.json b/step-templates/iis-bindings-restore.json
deleted file mode 100644
index ae8ae9db8..000000000
--- a/step-templates/iis-bindings-restore.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "9d357886-1896-4240-a89f-118c7ca8ec05",
-
-  "Name": "IIS Bindings - Restore",
-  "Description": "This step will restore IIS bindings from backup taken in IIS Bindings - Backup step. Only bindings which doesn't exist will be restored.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$webSiteName,\r\n    [string]$backupFolder,\r\n    [switch]$whatIf\r\n) \r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null -or $result -eq \"\") {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\nfunction Get-File-Name($backupFolder, $webSiteName) {\r\n    $folder = Join-Path -Path $backupFolder -ChildPath $webSiteName\r\n\r\n    if((Test-Path $folder) -eq $false) {\r\n        mkdir $folder | Out-Null\r\n    }\r\n\r\n    $fullPath = $null;\r\n\r\n    if($OctopusParameters -eq $null) {\r\n         $fullPath = Join-Path -Path $folder -ChildPath \"site_backup.xml\"\r\n    } else {\r\n         $fileName = $OctopusParameters[\"Octopus.Release.Number\"] + \"_\" + $OctopusParameters[\"Octopus.Environment.Name\"] + \".xml\"\r\n         $fullPath = Join-Path -Path $folder -ChildPath $fileName\r\n    }\r\n\r\n    return $fullPath\r\n}\r\n\r\n& {\r\n    param(\r\n        [string]$webSiteName,\r\n        [string]$backupFolder\r\n    ) \r\n\r\n    Write-Host \"Restore $webSiteName bindings from bindings variable\"\r\n\r\n    try {\r\n        Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\n        Import-Module WebAdministration -ErrorAction SilentlyContinue\r\n         \r\n        $bindingsBackupFile = Get-File-Name $backupFolder $webSiteName\r\n        $currentBindings = Import-CliXML $bindingsBackupFile \r\n\r\n        if($currentBindings -eq $null) {\r\n            Write-Host \"There is no saved bindings, you have to run IIS save bindings before\"\r\n        } else {\r\n            foreach($binding in $currentBindings) {\r\n                $bindingArray = $binding.bindingInformation.Split(\":\")\r\n                $existing = Get-WebBinding -Name $webSiteName -Protocol $binding.protocol | Where-Object { $_.bindingInformation -eq $binding.bindingInformation }\r\n\r\n                if($existing -eq $null) {\r\n                    Write-Host \"Adding binding\" $binding.protocol $binding.bindingInformation                    \r\n                    New-WebBinding -Name $webSiteName -Protocol $binding.protocol -IPAddress $bindingArray[0] -Port $bindingArray[1] -HostHeader $bindingArray[2] -SslFlags $binding.sslFlags\r\n                    if ($binding.protocol -eq \"https\" -and $binding.certificateHash) {\r\n                        $newBinding = Get-WebBinding -Name $webSiteName -Protocol $binding.protocol -IPAddress $bindingArray[0] -Port $bindingArray[1] -HostHeader $bindingArray[2]\r\n                        Write-Host \"Assigning certificate\" $binding.certificateHash \"to binding\"\r\n                        $newBinding.AddSslCertificate($binding.certificateHash, $binding.certificateStoreName)\r\n                    }\r\n                }\r\n            }\r\n        }\r\n\r\n        Write-Host \"Done\"\r\n    } catch {\r\n        Write-Host $_.Exception|format-list -force\r\n        Write-Host \"There was a problem restoring bindings\"    \r\n    }\r\n\r\n } `\r\n (Get-Param 'webSiteName' -Required) (Get-Param 'backupFolder' -Required)\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "webSiteName",
-      "Label": "Web Site Name",
-      "HelpText": "Name of the web site for which bindings will be restored from backup taken in previous IIS Bindings - Backup task. Only bindings which doesn't already exist will be restored.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "backupFolder",
-      "Label": "Folder where backed up binding file is stored",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "krusoleo",
-  "$Meta": {
-    "ExportedAt": "2023-01-30T13:19:56.331Z",
-    "OctopusVersion": "2019.6.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-configure-compression.json b/step-templates/iis-configure-compression.json
deleted file mode 100644
index 2cce8524a..000000000
--- a/step-templates/iis-configure-compression.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "66dc7184-8736-4ab8-be65-51cb3933eaef",
-  "Name": "IIS - Configure Compression",
-  "Description": "Configures the MIME types used in static and dynamic compression e.g. The application/json MIME type can be configured to be served using GZIP compression.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$psPath = 'MACHINE/WEBROOT/APPHOST';\n\nif ($StaticMimeTypes)\n{\n    $filter = \"system.webServer/httpCompression/staticTypes\";\n    \n    $existingStaticMimeTypes = (Get-WebConfigurationProperty -pspath $psPath -filter $filter -name \".\").Collection;\n    foreach ($staticMimeType in $StaticMimeTypes.split(\",\"))\n    {\n        if ($staticMimeType)\n        {\n            if (($existingStaticMimeTypes | ? { $_.mimeType -eq $staticMimeType }).Count -ne 0)\n            {\n                Remove-WebConfigurationProperty -pspath $psPath -filter $filter -name \".\" -AtElement @{mimeType=$staticMimeType};\n                Write-Output \"Static MIME type $staticMimeType removed.\";\n            }\n            \n            Add-WebConfigurationProperty -pspath $psPath -filter $filter -name \".\" -value @{mimeType=$staticMimeType;enabled='True'};\n            Write-Output \"Static MIME type $staticMimeType added.\";\n        }\n    }\n}\n\nif ($DynamicMimeTypes)\n{\n    $filter = \"system.webServer/httpCompression/dynamicTypes\";\n    \n    $existingDynamicMimeTypes = (Get-WebConfigurationProperty -pspath $psPath -filter $filter -name \".\").Collection;\n    foreach ($dynamicMimeType in $DynamicMimeTypes.split(\",\"))\n    {\n        if ($dynamicMimeType)\n        {\n            if (($existingDynamicMimeTypes | ? { $_.mimeType -eq $dynamicMimeType }).Count -ne 0)\n            {\n                Remove-WebConfigurationProperty -pspath $psPath -filter $filter -name \".\" -AtElement @{mimeType=$dynamicMimeType};\n                Write-Output \"Dynamic MIME type $dynamicMimeType removed.\";\n            }\n            \n            Add-WebConfigurationProperty -pspath $psPath -filter $filter -name \".\" -value @{mimeType=$dynamicMimeType;enabled='True'};\n            Write-Output \"Dynamic MIME type $dynamicMimeType added.\";\n        }\n    }\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "StaticMimeTypes",
-      "Label": "Static Compression MIME Types",
-      "HelpText": "The MIME types to be added for static compression separated by commas. Example: _application/json,application/xml_",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "DynamicMimeTypes",
-      "Label": "Dynamic Compression MIME Types",
-      "HelpText": "The MIME types to be added for dynamic compression separated by commas. Example: _application/json,application/xml_",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2016-01-22T10:27:42.848+00:00",
-    "OctopusVersion": "3.2.19",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-list-sites.json b/step-templates/iis-list-sites.json
deleted file mode 100644
index a4545c733..000000000
--- a/step-templates/iis-list-sites.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "Id": "05e87da8-a9df-449f-bdbb-98fa44740b46",
-  "Name": "IIS - List Sites",
-  "Description": "List sites on the server.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "try {\r\n\t$iisFeature = Get-WindowsFeature Web-WebServer -ErrorAction Stop\r\n\tif ($iisFeature -eq $null -or $iisFeature.Installed -eq $false) {\r\n\t\tWrite-Error \"It looks like IIS is not installed on this server and the deployment is likely to fail.\"\r\n\t\tWrite-Error \"Tip: You can use PowerShell to ensure IIS is installed: 'Install-WindowsFeature Web-WebServer'\"\r\n\t\tWrite-Error \"     You are likely to want more IIS features than just the web server. Run 'Get-WindowsFeature *web*' to see all of the features you can install.\"\r\n\t\texit 1\r\n\t}\r\n} catch {\r\n\tWrite-Verbose \"Call to `Get-WindowsFeature Web-WebServer` failed.\"\r\n\tWrite-Verbose \"Unable to determine if IIS is installed on this server but will optimistically continue.\"\r\n}\r\n\r\ntry {\r\n\tAdd-PSSnapin WebAdministration -ErrorAction Stop\r\n} catch {\r\n    try {\r\n\t\t Import-Module WebAdministration -ErrorAction Stop\r\n\t\t} catch {\r\n\t\t\tWrite-Warning \"We failed to load the WebAdministration module. This usually resolved by doing one of the following:\"\r\n\t\t\tWrite-Warning \"1. Install .NET Framework 3.5.1\"\r\n\t\t\tWrite-Warning \"2. Upgrade to PowerShell 3.0 (or greater)\"\r\n\t\t\tWrite-Warning \"3. On Windows 2008 you might need to install PowerShell SnapIn for IIS from http://www.iis.net/downloads/microsoft/powershell#additionalDownloads\"\r\n\t\t\tthrow ($error | Select-Object -First 1)\r\n    }\r\n}\r\n\r\nGet-WebSite",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [],
-  "LastModifiedOn": "2016-12-19T23:20:00.000+00:00",
-  "LastModifiedBy": "BrettJaner",
-  "$Meta": {
-    "ExportedAt": "2016-12-19T23:20:00.000+00:00",
-    "OctopusVersion": "2.4.7.85",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-redirect-to-https.json b/step-templates/iis-redirect-to-https.json
deleted file mode 100644
index da709bd65..000000000
--- a/step-templates/iis-redirect-to-https.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "929f72d3-e1c3-4b97-bac9-d84434ca63c3",
-  "Name": "IIS Website - HTTP to HTTPS Redirect",
-  "Description": "Adds either a global or site specific rule which redirects from http to https",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$Name = \"HTTP to HTTPS Redirect (Octopus Deploy)\"\r\n$PsPath = \"MACHINE/WEBROOT/APPHOST\"\r\n$Filter = \"system.webserver/rewrite/GlobalRules\"\r\n\r\nClear-WebConfiguration -pspath $PsPath -filter \"$Filter/rule[@name='$Name']\"\r\nif ($Site) {\r\n    $Filter = \"system.webserver/rewrite/rules\"\r\n    Clear-WebConfiguration -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']\"\r\n}\r\n\r\nif ($Disabled -eq \"true\") {\r\n    exit\r\n}\r\n\r\n#Clear-WebConfiguration -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']\"\r\nAdd-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter\" -name \".\" -value @{name=$Name; patternSyntax='ECMAScript'; stopProcessing='True'}\r\nSet-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']/match\" -name url -value \"(.*)\"\r\nAdd-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']/conditions\" -name \".\" -value @{input=\"{HTTPS}\"; pattern='^OFF$'}\r\nif ($EnableProxyRules -eq \"true\") {\r\n    Add-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']/conditions\" -name \".\" -value @{input=\"{HTTP_X_FORWARDED_PROTO}\"; pattern='^HTTP$'}\r\n}\r\n\r\nSet-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']/action\" -name \"type\" -value \"Redirect\"\r\nSet-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']/action\" -name \"url\" -value \"https://{HTTP_HOST}/{R:1}\"\r\nSet-WebConfigurationProperty -location $Site -pspath $PsPath -filter \"$Filter/rule[@name='$Name']/action\" -name \"redirectType\" -value \"Permanent\" ",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "4cb5e060-d027-465f-aa17-29d806f7cb6f",
-      "Name": "Site",
-      "Label": "Name of Website",
-      "HelpText": "Set the rule for a specific website.\nIf not supplied, a global rule will be created.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2854ab2d-a000-48dd-9b20-6930c73c96fb",
-      "Name": "EnableProxyRules",
-      "Label": "Enable proxy rules",
-      "HelpText": "If the website is running behind a proxy, this setting most likely need to be checked.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4f341e5c-0694-471c-ac04-3ce525fefad5",
-      "Name": "Disabled",
-      "Label": "Disable",
-      "HelpText": "Disable adding rules.\nThis will remove any rules mathing current values.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "perosb",
-  "$Meta": {
-    "ExportedAt": "2017-02-20T12:37:13.724Z",
-    "OctopusVersion": "3.7.4",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-set-authentication.steptemplate.json b/step-templates/iis-set-authentication.steptemplate.json
deleted file mode 100644
index fd9c9c714..000000000
--- a/step-templates/iis-set-authentication.steptemplate.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "Id": "d3aa2e7b-d716-4f66-8d85-068cacedbb4f",
-  "Name": "IIS - Enable or Disable Authentication Methods",
-  "Description": "Step template to set the desired IIS Authentication (Anonymous, Windows, Digest) State for IIS site(s)",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#requires -version 3\n\nfunction Update-IISSiteAuthentication {\n    param\n    (\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [boolean]$State,\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$SitePath,\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$AuthMethod\n    )\n    \n    # check if WebAdministration module exists on the server\n    $cmd = (Get-Command \"Get-Website\" -errorAction SilentlyContinue)\n    if ($null -eq $cmd) {\n        throw \"The Windows PowerShell snap-in 'WebAdministration' is not installed on this server. Details can be found at https://technet.microsoft.com/en-us/library/ee790599.aspx.\"\n    }\n    \n    $IISSecurityPath = \"/system.WebServer/security/authentication/$AuthMethod\"\n    $separator = \"`r\",\"`n\",\",\"\n    $IISSites = $sitepath.split($separator, [System.StringSplitOptions]::RemoveEmptyEntries).Trim(' ')\n\n    $IISValidSites = New-Object System.Collections.ArrayList\n\tforeach ($website in Get-Website) {\n        $IISValidSites.Add($website.name)\n        foreach ($app in Get-WebApplication -Site $website.name) {\n\t\t\t$path = $website.name + $app.path\n\t\t\t$IISValidSites.Add($path)\n\t\t}\n\t}\n\n    $IISValidSiteNames = $IISValidSites -join ', '\n\n    foreach($Site in $IISSites) {\n        $IISSiteAvailable = $IISValidSites | Where-Object { $_ -eq $Site }\n\n        if ($IISSiteAvailable) {\n            Set-WebConfigurationProperty -Filter $IISSecurityPath -Name Enabled -Value $State -PSPath IIS:\\\\ -Location $Site\n            Write-Output \"$AuthMethod for site '$Site' set successfully to '$State'.\"\n        }\n        else {\n            Write-Output \"The IISSitePath '$Site' cannot be found. The valid sites are $IISValidSiteNames\"\n            throw \"The IISSitePath '$Site' cannot be found. The valid sites are $IISValidSiteNames\"\n        }\n    }\n}\n\nif (Test-Path Variable:OctopusParameters) {\n    Update-IISSiteAuthentication -State ($AnonymousAuth -eq \"True\") -SitePath $IISSitePaths -AuthMethod \"AnonymousAuthentication\"\n    Update-IISSiteAuthentication -State ($WindowsAuth -eq \"True\") -SitePath $IISSitePaths -AuthMethod \"WindowsAuthentication\"\n    Update-IISSiteAuthentication -State ($DigestAuth -eq \"True\") -SitePath $IISSitePaths -AuthMethod \"DigestAuthentication\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "AnonymousAuth",
-      "Label": "Anonymous Authentication",
-      "HelpText": "Enable Anonymous Authentication.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "WindowsAuth",
-      "Label": "Windows Authentication",
-      "HelpText": "Enable Windows Authentication.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "DigestAuth",
-      "Label": "Digest Authentication",
-      "HelpText": "Enable Digest Authentication.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "IISSitePaths",
-      "Label": "IIS Site name(s)",
-      "HelpText": "The IIS site(s) which will have security permissions transformed. Multiple values are to be new-line separated.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "HumanPrinter",
-  "$Meta": {
-    "ExportedAt": "2017-06-28T11:48:00+00:00",
-    "OctopusVersion": "3.3.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-set-http-redirect.json b/step-templates/iis-set-http-redirect.json
deleted file mode 100644
index 97854dd84..000000000
--- a/step-templates/iis-set-http-redirect.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "Id": "684b2249-a274-4518-ba73-e254eed037ac",
-  "Name": "IIS - Set HTTP Redirect on Site or Application",
-  "Description": "Configure a redirect for an IIS Site or Web Application",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Set temporary location for PowerShell modules\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n$iisPath = \"IIS:\\Sites\\$iisSiteName\"\n\n# Convert checkbox variables into true Boolean object types\n$enableRedirect = [System.Convert]::ToBoolean($enableRedirect)\n$exactDestination = [System.Convert]::ToBoolean($exactDestination)\n\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Get list of installed modules\n    $installedModules = Get-Module -ListAvailable\n\n    # Check to see if the module is installed\n    if ($null -ne ($installedModules | Where-Object {$_.Name -eq $PowerShellModuleName}))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-TemporaryPowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\n# Check to see if WebAdministration module installed\nif (!(Get-ModuleInstalled -PowerShellModuleName \"WebAdministration\"))\n{\n    # Temporarily install module\n    Write-Output \"Tempoarily installing PowerShell module WebAdministration.\"\n\n    Install-TemporaryPowerShellModule -PowerShellModuleName \"WebAdministration\" -LocalModulesPath $LocalModules\n}\n\n# Import the WebAdministartion module\nImport-Module -Name \"WebAdministration\"\n\n# Verify the site exists\nif ($null -eq (Get-WebSite -Name $iisSiteName))\n{\n    # Throw error\n    throw \"Site $iisSiteName not found!\"\n}\n\n# Check to see if the an application was specified\nif (!([string]::IsNullOrEmpty($iisApplicationName)))\n{\n    # Verify the appliation exists\n    if ($null -eq (Get-WebApplication -Site $iisSiteName -Name $iisApplicationName))\n    {\n        # Throw error\n        throw \"Web application $iisApplicationName not found on site $iisSiteName!\"\n    }\n\n    # Append application name to iis path\n    $iisPath += \"\\$iisApplicationName\"\n}\n\n# Set redirect on application\nSet-WebConfiguration system.webserver/httpRedirect -PSPath $iisPath -Value @{enabled=\"$enableRedirect\";destination=\"$redirectUrl\";exactDestination=\"$exactDestination\";httpResponseStatus=\"$httpResponseStatus\"}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "aba6b325-6d4e-4ebf-8c68-17b345db261d",
-      "Name": "iisSiteName",
-      "Label": "IIS Site Name",
-      "HelpText": "Name of the site to configure",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "97526f94-11ac-4050-b9b2-0af0a83e4095",
-      "Name": "iisApplicationName",
-      "Label": "IIS Web Application Name",
-      "HelpText": "Name of the Web Application on the IIS Site to configure the redirect on.  Leave blank if setting the redirect at the Site level.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "89af1c5d-17ee-476b-ada6-49ad5b0b3dc9",
-      "Name": "redirectUrl",
-      "Label": "Redirect URL",
-      "HelpText": "URL that the redirect points to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d76bd7c1-6075-4d14-b841-8c098e223bfd",
-      "Name": "enableRedirect",
-      "Label": "Enable Redirect",
-      "HelpText": "Boolean value for whether to enable or disable the redirect.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "4b8f8b38-d449-40c7-b2c9-050f10645ae4",
-      "Name": "exactDesintation",
-      "Label": "Exact Destination",
-      "HelpText": "Boolean value to redirect all requests to exact destination (instead of relative to destination)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "25ab7952-c2ff-43f8-9b96-14ad24fac282",
-      "Name": "httpResponseStatus",
-      "Label": "Status Code",
-      "HelpText": "Web Response code sent to the client when redirecting.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Found|Found\nPermanent|Permanent\nTemporary|Temporary\nPermRedirect|Permanent Redirect\n"
-      }
-    }
-  ],
-  "LastModifiedOn": "2019-01-23T17:34:26.109Z",
-  "LastModifiedBy": "twerthi", 
-  "$Meta": {
-    "ExportedAt": "2019-01-23T17:34:26.109Z",
-    "OctopusVersion": "2018.12.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-vdir-create.json b/step-templates/iis-vdir-create.json
deleted file mode 100644
index 15939dd83..000000000
--- a/step-templates/iis-vdir-create.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "Id": "2cfbcd72-cf43-43fd-8291-9bb564cc512c",
-  "Name": "IIS Virtual Directory - Create",
-  "Description": "Create an IIS virtual directory.",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Input\r\n## --------------------------------------------------------------------------------------\r\n\r\n$virtualPath = $OctopusParameters['VirtualPath'].TrimStart('/',' ').TrimEnd('/', ' ')\r\n$physicalPath = $OctopusParameters['PhysicalPath']\r\n$parentSite = $OctopusParameters['ParentSite']\r\n$application = $OctopusParameters['ApplicationName']\r\n$username = $OctopusParameters['Username']\r\n$password = $OctopusParameters['Password']\r\n$createPhysicalPath = $OctopusParameters['CreatePhysicalPath']\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Helpers\r\n## --------------------------------------------------------------------------------------\r\n# Helper for validating input parameters\r\nfunction Confirm-Parameter([string]$parameterInput, [string[]]$validInput, $parameterName) {\r\n    Write-Host \"${parameterName}: $parameterInput\"\r\n    if (! $parameterInput) {\r\n        throw \"No value was set for $parameterName, and it cannot be empty\"\r\n    }\r\n\r\n    if ($validInput) {\r\n        if (! $validInput -contains $parameterInput) {\r\n            throw \"'$input' is not a valid input for '$parameterName'\"\r\n        }\r\n    }\r\n\r\n}\r\n\r\n# Helper to run a block with a retry if things go wrong\r\n$maxFailures = 5\r\n$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\r\nfunction Invoke-CommandWithRetry([ScriptBlock] $command) {\r\n    $attemptCount = 0\r\n    $operationIncomplete = $true\r\n\r\n    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {\r\n        $attemptCount = ($attemptCount + 1)\r\n\r\n        if ($attemptCount -ge 2) {\r\n            Write-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\r\n            Start-Sleep -s $sleepBetweenFailures\r\n            Write-Output \"Retrying...\"\r\n        }\r\n\r\n        try {\r\n            & $command\r\n\r\n            $operationIncomplete = $false\r\n        } catch [System.Exception] {\r\n            if ($attemptCount -lt ($maxFailures)) {\r\n                Write-Output (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\r\n\r\n            }\r\n            else {\r\n                throw \"Failed to execute command\"\r\n            }\r\n        }\r\n    }\r\n}\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Configuration\r\n## --------------------------------------------------------------------------------------\r\nConfirm-Parameter $virtualPath -parameterName \"Virtual path\"\r\nConfirm-Parameter $physicalPath -parameterName \"Physical path\"\r\nConfirm-Parameter $parentSite -parameterName \"Parent site\"\r\n\r\nif (![string]::IsNullOrEmpty($application)) {\r\n    $application = $application.TrimStart('/',' ').TrimEnd('/',' ')\r\n}\r\n\r\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\r\nImport-Module WebAdministration -ErrorAction SilentlyContinue\r\n\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Run\r\n## --------------------------------------------------------------------------------------\r\n\r\nWrite-Host \"Getting web site $parentSite\"\r\n$site = Get-Website -name $parentSite\r\nif (!$site) {\r\n    throw \"The web site '$parentSite' does not exist. Please create the site first.\"\r\n}\r\n\r\n$virtualFullPath = $virtualPath\r\n\r\nif ($application) {\r\n    Write-Host \"Verifying existance of application $application\"\r\n    $app = Get-WebApplication -site $parentSite -name $application\r\n    if (!$app) {\r\n        throw \"The application '$parentSite' does not exist. Please create the application first.\"\r\n    } else {\r\n        $virtualFullPath = $application + '/' + $virtualPath\r\n    }\r\n}\r\n\r\n# If the physical path down not exist and $createPhysicalPath is true,\r\n# then attempt create it, otherwise throw an error.\r\nif (!(Test-Path $physicalPath)) {\r\n    if ($createPhysicalPath) {\r\n        try {\r\n            Write-Host \"Attempting to create physical path '$physicalPath'\"\r\n            New-Item -Type Directory -Path $physicalPath -Force\r\n        } catch {\r\n            throw \"Couldn't create physical path!\"\r\n        }\r\n    } else {\r\n        throw \"Physical path does not exist!\"\r\n    }\r\n}\r\n\r\n# This needs to be improved, especially given applicaltions can be nested.\r\nif ($application) {\r\n    $existing = Get-WebVirtualDirectory -site $parentSite -Application $application -Name $virtualPath\r\n} else {\r\n    $existing = Get-WebVirtualDirectory -site $parentSite -Name $virtualPath\r\n}\r\n\r\nInvoke-CommandWithRetry {\r\n\r\n    $virtualDirectoryPath = \"IIS:\\Sites\\$parentSite\\$virtualFullPath\"\r\n\r\n    if (!$existing) {\r\n        Write-Host \"Creating virtual directory '$virtualPath'\"\r\n\r\n        New-Item $virtualDirectoryPath -type VirtualDirectory -physicalPath $physicalPath\r\n\r\n        Write-Host \"Virtual directory created\"\r\n    }\r\n    else {\r\n        Write-Host \"The virtual directory '$virtualPath' already exists. Checking physical path.\"\r\n\r\n        $currentPath = (Get-ItemProperty $virtualDirectoryPath).physicalPath\r\n        Write-Host \"Physical path currently set to $currentPath\"\r\n\r\n        if ([string]::Compare($currentPath, $physicalPath, $True) -ne 0) {\r\n            Set-ItemProperty $virtualDirectoryPath -name physicalPath -value $physicalPath\r\n            Write-Host \"Physical path changed to $physicalPath\"\r\n        }\r\n    }\r\n\r\n    ## Set vdir pass-through credentails, if applicable\r\n    if (![string]::IsNullOrEmpty($username) -and ![string]::IsNullOrEmpty($password)) {\r\n        Write-Host \"Setting Pass-through credentials for username '$username'\"\r\n\r\n        Set-ItemProperty $virtualDirectoryPath -Name userName -Value $username\r\n        Set-ItemProperty $virtualDirectoryPath -Name password -Value $password\r\n\r\n        Write-Host \"Pass-through credentials set\"\r\n    }\r\n}\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "VirtualPath",
-      "Label": "Virtual path",
-      "HelpText": "The full path to the virtual directory you wish to create. Do not include the application (if any) the directory will be created under. The path, not including the virtual directory itself must already exist. Eg. If the virtual directory is to be created under `myapp/someFolder/myVdir` enter: `someFolder/myVdir`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApplicationName",
-      "Type": "String",
-      "Label": "Application",
-      "HelpText": "Name of the IIS application to create the virtual directory under (not required).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "PhysicalPath",
-      "Label": "Physical path",
-      "HelpText": "Physical folder that the application will serve files from. Example: `C:\\MyApp`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "CreatePhysicalPath",
-      "Label": "Create Physical Path (If not exists)",
-      "HelpText": "Create the physical path if it does not exist.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "ParentSite",
-      "Label": "Parent site",
-      "HelpText": "The name of the IIS web site to attach the application to. For example, to put the application under the default web site, enter:\n\n    Default Web Site",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Pass-through authentication username",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Pass-through authentication password",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedOn": "2017-03-21T23:56:11+00:00",
-  "LastModifiedBy": "jaymickey",
-  "$Meta": {
-    "ExportedAt": "2015-08-25T13:55:15.518+00:00",
-    "OctopusVersion": "3.0.9.2259",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-add-http-s-bindings.json b/step-templates/iis-website-add-http-s-bindings.json
deleted file mode 100644
index 140fd5ffe..000000000
--- a/step-templates/iis-website-add-http-s-bindings.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "Id": "0ad0ad00-adad-adad-adad-000000000003",
-  "Name": "IIS - Add HTTP(S) Bindings",
-  "Description": "Adds HTTP and HTTPS bindings to a website using the specified host name, port numbers, Certificate Location, and SSL Thumbprint",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nParam(\n    [string] $AD_AddBinding_WebsiteName,\n    [string] $AD_AddBinding_HostName,\n    [UInt32] $AD_AddBinding_HttpPort = 80,\n    [UInt32] $AD_AddBinding_HttpsPort = 443,\n    [string] $AD_AddBinding_SSLThumbprint = $null,\n    [string] $AD_AddBinding_SSLCertificateLocation = \"My\",\n    [Int16] $AD_AddBinding_Attempts = 5,\n    [switch] $WhatIf\n)\n\n$ErrorActionPreference = \"Stop\"\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($null -ne $OctopusParameters) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($null -eq $result) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($null -ne $variable) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($null -eq $result) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n        else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Execute(\n    [Parameter(Mandatory = $true)][string] $WebsiteName,\n    [Parameter(Mandatory = $true)][string] $HostName,\n    [Parameter(Mandatory = $false)][uint32] $HttpPort = 80,\n    [Parameter(Mandatory = $false)][uint32] $HttpsPort = 443,\n    [Parameter(Mandatory = $false)][string] $SSLThumbprint = $null,\n    [Parameter(Mandatory = $false)][string] $SSLCertificateLocation = \"My\",\n    [Parameter(Mandatory = $false)][Int16] $Attempts = 5\n) {\n    Import-Module WebAdministration\n\n    $attemptCount = 0\n    $operationIncomplete = $true\n    $maxFailures = $Attempts\n    $sleepBetweenFailures = 1\n\n    $appId = '{00112233-4455-6677-8899-AABBCCDDEEFF}'\n\n    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {\n        $attemptCount = ($attemptCount + 1)\n        if ($attemptCount -ge 2) {\n            Write-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\n            Start-Sleep -s $sleepBetweenFailures\n            Write-Output \"Retrying...\"\n            $sleepBetweenFailures = ($sleepBetweenFailures * 2)\n        }\n        try {\n            $protocol = \"http\"\n            $otherProtocol = \"https\"\n\n            $existingBinding = Get-WebBinding -Name $WebsiteName -Port $HttpPort -HostHeader $HostName\n            $msg = \"Binding '{0} *:{1}:{2} sslFlags=0' on '{3}'\" -f $protocol, $HttpPort, $HostName, $WebsiteName\n            if ($null -eq $existingBinding) {\n                Write-Output \"$msg doesn't exist - ADDING...\"\n                if (-Not ($WhatIf)) {\n                    New-WebBinding -Name $WebsiteName -Protocol $protocol -Port $HttpPort -HostHeader $HostName -SslFlags 0\n                }\n                Write-Output \"$msg - ADDED\"\n            }\n            elseif ($existingBinding.protocol -contains $protocol) {\n                Write-Output \"$msg  already exists - SKIPING\"\n            }\n            else {\n                Write-Error \"$msg can't be added because it already exists on $otherProtocol\"\n            }\n            Write-Output \"SSL is : $SSLThumbprint\"\n            if (-Not ([string]::IsNullOrWhitespace($SSLThumbprint))) {\n                $protocol = \"https\"\n                $otherProtocol = \"http\"\n                $existingBinding = Get-WebBinding -Name $WebsiteName -Port $HttpsPort -HostHeader $HostName\n                $msg = \"Binding '{0} *:{1}:{2} sslFlags=1' on '{3}'\" -f $protocol, $HttpsPort, $HostName, $WebsiteName\n                if ($null -eq $existingBinding) {\n                    Write-Output \"$msg doesn't exist - ADDING...\"\n                    if (-Not ($WhatIf)) {\n                        New-WebBinding -Name $WebsiteName -Protocol $protocol -Port $HttpsPort -HostHeader $HostName -SslFlags 1\n                        netsh http add sslcert hostnameport=$($HostName):$HttpsPort certhash=$SSLThumbprint appid=$appId certstorename=$SSLCertificateLocation\n                    }\n                    Write-Output \"$msg - ADDED\"\n                }\n                elseif ($existingBinding.protocol -contains $protocol) {\n                    Write-Output \"$msg  already exists - SKIPING\"\n                }\n                else {\n                    Write-Error \"$msg can't be added because it already exists on $otherProtocol\"\n                }\n            }\n            $operationIncomplete = $false\n        }\n        catch [System.Exception] {\n            if ($attemptCount -lt ($maxFailures)) {\n                Write-Host (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\n            }\n            else {\n                throw\n            }\n        }\n    }\n}\n& Execute `\n(Get-Param 'AD_AddBinding_WebsiteName' -Required)`\n(Get-Param 'AD_AddBinding_HostName' -Required)`\n(Get-Param 'AD_AddBinding_HttpPort')`\n(Get-Param 'AD_AddBinding_HttpsPort')`\n(Get-Param 'AD_AddBinding_SSLThumbprint')`\n(Get-Param 'AD_AddBinding_SSLCertificateLocation')`\n(Get-Param 'AD_AddBinding_Attempts')\n"
-  },
-  "Parameters": [
-    {
-      "Name": "AD_AddBinding_WebsiteName",
-      "Label": "Website name",
-      "HelpText": "The website name to apply the binding to",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddBinding_HostName",
-      "Label": "Host name",
-      "HelpText": "The host name",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddBinding_HttpPort",
-      "Label": "Http Port",
-      "HelpText": "Optional HTTP port number",
-      "DefaultValue": "80",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddBinding_HttpsPort",
-      "Label": "HTTPS Port",
-      "HelpText": "Optional HTTPS port number",
-      "DefaultValue": "443",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddBinding_SSLThumbprint",
-      "Label": "SSL Thumbprint",
-      "HelpText": "The SSL certificate thumbprint(no spaces)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddBinding_SSLCertificateLocation",
-      "Label": "Certificate Store Location",
-      "HelpText": "Optional Certificate Store location, Defaults to \"My\"",
-      "DefaultValue": "My",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_AddBinding_Attempts",
-      "Label": "Nr of attempts",
-      "HelpText": "Optional number of attempts before failing",
-      "DefaultValue": "5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "hasherdk",
-  "$Meta": {
-    "ExportedAt": "2020-07-17T05:49:27.280Z",
-    "OctopusVersion": "2019.8.6",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-add-release-number-to-response-header.json b/step-templates/iis-website-add-release-number-to-response-header.json
deleted file mode 100644
index 77a065f7e..000000000
--- a/step-templates/iis-website-add-release-number-to-response-header.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "7b51887e-1ad2-4133-b3a3-37688bb49b01",
-  "Name": "IIS Website - Add Release Number to Response Header",
-  "Description": "Adds the Octopus Deploy Release number to the IIS response header. When you browse your site you can look at the response header to verify the build number that is running.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Adding release number to response header\"\n\nfunction Get-IISServerManager\n{\n    [CmdletBinding()]\n    [OutputType([System.Object])]\n    param ()\n\n    $iisInstallPath = (Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\INetStp' -Name InstallPath).InstallPath\n    if (-not $iisInstallPath)\n    {\n        throw ('IIS installation path not found')\n    }\n    $assyPath = Join-Path -Path $iisInstallPath -ChildPath 'Microsoft.Web.Administration.dll' -Resolve -ErrorAction:SilentlyContinue\n    if (-not $assyPath)\n    {\n        throw 'IIS version of Microsoft.Web.Administration.dll not found'\n    }\n    $assy = [System.Reflection.Assembly]::LoadFrom($assyPath)\n    return [System.Activator]::CreateInstance($assy.FullName, 'Microsoft.Web.Administration.ServerManager').Unwrap()\n}\n\n$iis = Get-IISServerManager\n$config = $iis.GetWebConfiguration($OctopusParameters['headerWebsiteName'])\n$httpProtocolSection = $config.GetSection(\"system.webServer/httpProtocol\")\n$customHeadersCollection = $httpProtocolSection.GetCollection(\"customHeaders\")\n\n$update = $true\n\nforeach($path in $customHeadersCollection.GetCollection()) { \n    if ($path.GetAttributeValue(\"name\") -eq $OctopusParameters['headerFieldName']) {\n        write-host \"Release number is already in the response header, skipping\"\n        $update = $false\n        break\n    }\n}\n\nif ($update)\n{\n    $fieldName = $OctopusParameters['headerFieldName']\n    $releaseNumber = $OctopusParameters['Octopus.Release.Number']\n    \n    Write-Host \"Adding release number $releaseNumber to custom header $fieldName\"\n    \n    $addElement = $customHeadersCollection.CreateElement(\"add\")\n    $addElement[\"name\"] = $fieldName\n    $addElement[\"value\"] = $releaseNumber\n    $customHeadersCollection.Add($addElement)\n    \n    $iis.CommitChanges() | Write-Host\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "headerFieldName",
-      "Label": "Field name",
-      "HelpText": "The name of the custom header field with the release information.",
-      "DefaultValue": "Release",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "headerWebsiteName",
-      "Label": "Website name",
-      "HelpText": "The name of the website in IIS.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2019-03-19T16:25:56.946Z",
-  "LastModifiedBy": "geeeyetee",
-  "$Meta": {
-    "ExportedAt": "2019-03-19T16:25:56.946Z",
-    "OctopusVersion": "2019.1.9",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-add-windows-auth-providers.json b/step-templates/iis-website-add-windows-auth-providers.json
deleted file mode 100644
index b0c5a0ee9..000000000
--- a/step-templates/iis-website-add-windows-auth-providers.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "Id": "f3cf7831-d47c-4b5f-8f76-6bc649d59dd9",
-  "Name": "Explicitly Add IIS WindowsAuthentication Providers",
-  "Description": "Clears the WindowsAuthentication Providers, and explicitly adds the ones provided.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Configuration\r\n## --------------------------------------------------------------------------------------\r\n\r\n$isEnabled = $OctopusParameters[\"add-windows-authentication-providers.is-enabled\"]\r\nif (!$isEnabled -or ![boolean]::Parse($isEnabled))\r\n{\r\n   exit 0\r\n}\r\n\r\ntry {\r\n    Add-PSSnapin WebAdministration\r\n} catch {\r\n    try {\r\n        Import-Module WebAdministration\r\n    } catch {\r\n\t\tWrite-Warning \"We failed to load the WebAdministration module. This usually resolved by doing one of the following:\"\r\n\t\tWrite-Warning \"1. Install .NET Framework 3.5.1\"\r\n\t\tWrite-Warning \"2. Upgrade to PowerShell 3.0 (or greater)\"\r\n        throw ($error | Select-Object -First 1)\r\n    }\r\n}\r\n\r\n$webSiteName = $OctopusParameters[\"add-windows-authentication-providers.website-name\"]\r\n$providersString = $OctopusParameters[\"add-windows-authentication-providers.providers\"]\r\n$providers = ($providersString.Split(\"`r`n,\") | % {$_.Trim() } | ? {$_})\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Helpers\r\n## --------------------------------------------------------------------------------------\r\n$maxFailures = 5\r\n$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\r\nfunction Execute-WithRetry([ScriptBlock] $command) {\r\n    $attemptCount = 0\r\n    $operationIncomplete = $true\r\n\r\n    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {\r\n        $attemptCount = ($attemptCount + 1)\r\n\r\n        if ($attemptCount -ge 2) {\r\n            Write-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\r\n            Start-Sleep -s $sleepBetweenFailures\r\n            Write-Output \"Retrying...\"\r\n        }\r\n\r\n        try {\r\n            & $command\r\n\r\n            $operationIncomplete = $false\r\n        } catch [System.Exception] {\r\n            if ($attemptCount -lt ($maxFailures)) {\r\n                Write-Output (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\r\n            }\r\n            else {\r\n                throw \"Failed to execute command\"\r\n            }\r\n        }\r\n    }\r\n}\r\n\r\n## --------------------------------------------------------------------------------------\r\n## Run\r\n## --------------------------------------------------------------------------------------\r\nExecute-WithRetry { \r\n    Write-Host \"Clearing Windows Authentication Providers for $webSiteName\"\r\n    Remove-WebConfigurationProperty -PSPath IIS:\\ -Location \"$webSiteName\" -filter system.webServer/security/authentication/windowsAuthentication/providers -name \".\"\r\n}\r\n\r\n$providersPrintedString = $providers -join \", \"\r\nWrite-Host \"Providers to add: $providersPrintedString\"\r\nforeach ($provider in $providers) {\r\n    Write-Host \"Windows Authentication Provider $provider\"\r\n    Execute-WithRetry { \r\n        Add-WebConfiguration -Filter system.webServer/security/authentication/windowsAuthentication/providers -PSPath IIS:\\ -Location \"$webSiteName\" -Value \"$provider\"\r\n    }\r\n}",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "add-windows-authentication-providers.is-enabled",
-      "Label": "Add Windows Authentication Providers",
-      "HelpText": "If enabled, This step will clear the Windows Authentication Providers, and then add the ones listed in the\n    Windows Authentication Providers\nfield.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "add-windows-authentication-providers.website-name",
-      "Label": "Web Site name",
-      "HelpText": "The display name of the IIS web site to add Windows Authentication providers to.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "add-windows-authentication-providers.providers",
-      "Label": "Windows Authentication Providers",
-      "HelpText": "A comma- or newline-separated list of Windows Authentication Providers to add.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "KShanafelt",
-  "$Meta": {
-    "ExportedAt": "2016-05-27T01:18:58.041+00:00",
-    "OctopusVersion": "3.3.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-website-create.json b/step-templates/iis-website-create.json
deleted file mode 100644
index 434f22b6d..000000000
--- a/step-templates/iis-website-create.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "Id": "74c6ab38-f56c-4637-918c-1b46b4e24049",
-  "Name": "IIS Website - Create",
-  "Description": "Creates a new website in IIS",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\n## Input\n## --------------------------------------------------------------------------------------\n\n$webSiteName = $OctopusParameters['WebSiteName']\n$applicationPoolName = $OctopusParameters[\"ApplicationPoolName\"]\n$bindingProtocol = $OctopusParameters[\"BindingProtocol\"]\n$bindingPort = $OctopusParameters[\"BindingPort\"]\n$bindingIpAddress = $OctopusParameters[\"BindingIpAddress\"]\n$bindingHost = $OctopusParameters[\"BindingHost\"]\n$bindingSslThumbprint = $OctopusParameters[\"BindingSslThumbprint\"]\n$webRoot = $OctopusParameters[\"WebRoot\"]\n$iisAuthentication = $OctopusParameters[\"IisAuthentication\"]\n$webSiteStart = $OctopusParameters[\"WebsiteStart\"]\n\n\n$anonymousAuthentication = \"Anonymous\"\n$basicAuthentication = \"Basic\"\n$windowsAuthentication = \"Windows\"\n## --------------------------------------------------------------------------------------\n## Helpers\n## --------------------------------------------------------------------------------------\n# Helper for validating input parameters\nfunction Validate-Parameter($foo, [string[]]$validInput, $parameterName) {\n    Write-Host \"${parameterName}: ${foo}\"\n    if (! $foo) {\n        throw \"$parameterName cannot be empty, please specify a value\"\n    }\n    \n    if ($validInput) {\n        @($foo) | % { \n                if ($validInput -notcontains $_) {\n                    throw \"'$_' is not a valid input for '$parameterName'\"\n                }\n             }  \n        }   \n}\n\n# Helper to run a block with a retry if things go wrong\n$maxFailures = 5\n$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\nfunction Execute-WithRetry([ScriptBlock] $command) {\n\t$attemptCount = 0\n\t$operationIncomplete = $true\n\n\twhile ($operationIncomplete -and $attemptCount -lt $maxFailures) {\n\t\t$attemptCount = ($attemptCount + 1)\n\n\t\tif ($attemptCount -ge 2) {\n\t\t\tWrite-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\n\t\t\tStart-Sleep -s $sleepBetweenFailures\n\t\t\tWrite-Output \"Retrying...\"\n\t\t}\n\n\t\ttry {\n\t\t\t& $command\n\n\t\t\t$operationIncomplete = $false\n\t\t} catch [System.Exception] {\n\t\t\tif ($attemptCount -lt ($maxFailures)) {\n\t\t\t\tWrite-Output (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\n\t\t\t\n\t\t\t}\n\t\t\telse {\n\t\t\t    throw \"Failed to execute command\"\n\t\t\t}\n\t\t}\n\t}\n}\n\n## --------------------------------------------------------------------------------------\n## Validate Input\n## --------------------------------------------------------------------------------------\n\nWrite-Output \"Validating paramters...\"\nValidate-Parameter $webSiteName -parameterName \"Web Site Name\"\nValidate-Parameter $applicationPoolName -parameterName \"Application Pool Name\"\nValidate-Parameter $bindingProtocol -validInput @(\"HTTP\", \"HTTPS\") -parameterName \"Protocol\"\nValidate-Parameter $bindingPort -parameterName \"Port\"\nif($bindingProtocol.ToLower() -eq \"https\") {\n    Validate-Parameter $bindingSslThumbprint -parameterName \"SSL Thumbprint\"\n}\n\n$enabledIisAuthenticationOptions = $iisAuthentication -split '\\s*[,;]\\s*'\n\nValidate-Parameter $enabledIisAuthenticationOptions -validInput @($anonymousAuthentication, $basicAuthentication, $windowsAuthentication) -parameterName \"IIS Authentication\"\n\n$enableAnonymous = $enabledIisAuthenticationOptions -contains $anonymousAuthentication\n$enableBasic = $enabledIisAuthenticationOptions -contains $basicAuthentication\n$enableWindows = $enabledIisAuthenticationOptions -contains $windowsAuthentication\n\n## --------------------------------------------------------------------------------------\n## Configuration\n## --------------------------------------------------------------------------------------\nif (! $webRoot) {\n\t$webRoot = (Get-ItemProperty 'HKLM:\\SOFTWARE\\Microsoft\\InetStp' -name PathWWWRoot).PathWWWRoot\n}\n$webRoot = (resolve-path $webRoot).ProviderPath\nValidate-Parameter $webRoot -parameterName \"Relative Home Directory\"\n\n$bindingInformation = \"${bindingIpAddress}:${bindingPort}:${bindingHost}\"\n\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\nImport-Module WebAdministration -ErrorAction SilentlyContinue\n\n$wsBindings = new-object System.Collections.ArrayList\n$wsBindings.Add(@{ protocol=$bindingProtocol;bindingInformation=$bindingInformation }) | Out-Null\nif (! [string]::IsNullOrEmpty($bindingSslThumbprint)) {\n    $wsBindings.Add(@{ thumbprint=$bindingSslThumbprint }) | Out-Null\n    \n    $sslCertificateThumbprint = $bindingSslThumbprint.Trim()\n    Write-Output \"Finding SSL certificate with thumbprint $sslCertificateThumbprint\"\n    \n    $certificate = Get-ChildItem Cert:\\LocalMachine -Recurse | Where-Object { $_.Thumbprint -eq $sslCertificateThumbprint -and $_.HasPrivateKey -eq $true } | Select-Object -first 1\n    if (! $certificate) \n    {\n        throw \"Could not find certificate under Cert:\\LocalMachine with thumbprint $sslCertificateThumbprint. Make sure that the certificate is installed to the Local Machine context and that the private key is available.\"\n    }\n\n    Write-Output (\"Found certificate: \" + $certificate.Subject)\n\n    if ((! $bindingIpAddress) -or ($bindingIpAddress -eq '*')) {\n        $bindingIpAddress = \"0.0.0.0\"\n    }\n    $port = $bindingPort\n\n    $sslBindingsPath = (\"IIS:\\SslBindings\\\" + $bindingIpAddress + \"!\" + $port)\n\n\tExecute-WithRetry { \n\t\t$sslBinding = get-item $sslBindingsPath -ErrorAction SilentlyContinue\n\t\tif (! $sslBinding) {\n\t\t\tNew-Item $sslBindingsPath -Value $certificate | Out-Null\n\t\t} else {\n\t\t\tSet-Item $sslBindingsPath -Value $certificate | Out-Null\n\t\t}\t\t\n\t}\n}\n\n## --------------------------------------------------------------------------------------\n## Run\n## --------------------------------------------------------------------------------------\n\npushd IIS:\\\n\n$appPoolPath = (\"IIS:\\AppPools\\\" + $applicationPoolName)\n\nExecute-WithRetry { \n    Write-Output \"Finding application pool $applicationPoolName\"\n\t$pool = Get-Item $appPoolPath -ErrorAction SilentlyContinue\n\tif (!$pool) { \n\t\tthrow \"Application pool $applicationPoolName does not exist\" \n\t}\n}\n\n$sitePath = (\"IIS:\\Sites\\\" + $webSiteName)\n\nWrite-Output $sitePath\n\n$site = Get-Item $sitePath -ErrorAction SilentlyContinue\nif (!$site) { \n\tWrite-Output \"Creating web site $webSiteName\"\n    Execute-WithRetry {\n\t\t$id = (dir iis:\\sites | foreach {$_.id} | sort -Descending | select -first 1) + 1\n\t\tnew-item $sitePath -bindings ($wsBindings[0]) -id $id -physicalPath $webRoot -confirm:$false\n    }\n} else {\n\twrite-host \"Web site $webSiteName already exists\"\n}\n\n$cmd = { \n\tWrite-Output \"Assigning website to application pool: $applicationPoolName\"\n\tSet-ItemProperty $sitePath -name applicationPool -value $applicationPoolName\n}\nExecute-WithRetry -Command $cmd\n\nExecute-WithRetry { \n\tWrite-Output \"Setting home directory: $webRoot\"\n\tSet-ItemProperty $sitePath -name physicalPath -value \"$webRoot\"\n}\n\ntry {\n\tExecute-WithRetry { \n\t\tWrite-Output \"Anonymous authentication enabled: $enableAnonymous\"\n\t\tSet-WebConfigurationProperty -filter /system.webServer/security/authentication/anonymousAuthentication -name enabled -value \"$enableAnonymous\" -location $WebSiteName -PSPath \"IIS:\\\"\n\t}\n\n\tExecute-WithRetry { \n\t\tWrite-Output \"Basic authentication enabled: $enableBasic\"\n\t\tSet-WebConfigurationProperty -filter /system.webServer/security/authentication/basicAuthentication -name enabled -value \"$enableBasic\" -location $WebSiteName -PSPath \"IIS:\\\"\n\t}\n\n\tExecute-WithRetry { \n\t\tWrite-Output \"Windows authentication enabled: $enableWindows\"\n\t\tSet-WebConfigurationProperty -filter /system.webServer/security/authentication/windowsAuthentication -name enabled -value \"$enableWindows\" -location $WebSiteName -PSPath \"IIS:\\\"\n\t}\n} catch [System.Exception] {\n\tWrite-Output \"Authentication options could not be set. This can happen when there is a problem with your application's web.config. For example, you might be using a section that requires an extension that is not installed on this web server (such as URL Rewriting). It can also happen when you have selected an authentication option and the appropriate IIS module is not installed (for example, for Windows authentication, you need to enable the Windows Authentication module in IIS/Windows first)\"\n\tthrow\n}\n\n# It can take a while for the App Pool to come to life\nStart-Sleep -s 1\n\nExecute-WithRetry { \n\t$state = Get-WebAppPoolState $applicationPoolName\n\tif ($state.Value -eq \"Stopped\") {\n\t\tWrite-Output \"Application pool is stopped. Attempting to start...\"\n\t\tStart-WebAppPool $applicationPoolName\n\t}\n}\n\nif($webSiteStart -eq $true) {\n    Execute-WithRetry { \n    \t$state = Get-WebsiteState $webSiteName\n    \tif ($state.Value -eq \"Stopped\") {\n    \t\tWrite-Output \"Web site is stopped. Attempting to start...\"\n    \t\tStart-Website $webSiteName\n    \t}\n    }\n} else {\n\twrite-host \"Not starting Web site $webSiteName\"\n}\n\npopd\n\nWrite-Output \"IIS configuration complete\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "WebsiteName",
-      "Label": "Website name",
-      "HelpText": "The display name of the IIS website to create.\n\nExample: Default Web Site",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WebRoot",
-      "Label": "Relative home directory",
-      "HelpText": "The directory which will be used as the home directory of the IIS website. This should be bound to the installation directory of a previous step.\n\nExample: C:\\inetpub\\wwwroot",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApplicationPoolName",
-      "Label": "Application pool name",
-      "HelpText": "Name of the application pool in IIS to use for the new website",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BindingProtocol",
-      "Label": "Protocol",
-      "HelpText": "The protocol to use for the new website",
-      "DefaultValue": "http",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BindingPort",
-      "Label": "Port",
-      "HelpText": "The port to use for the new website",
-      "DefaultValue": "80",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BindingIpAddress",
-      "Label": "IP address",
-      "HelpText": "The IP address to use for the new website",
-      "DefaultValue": "*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BindingHost",
-      "Label": "Host Header",
-      "HelpText": "The host name to use for the new website\n\nExample: company.example.com",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BindingSslThumbprint",
-      "Label": "Thumbprint",
-      "HelpText": "The thumbprint of the SSL certificate to use for the new website when using the HTTPS protocol\n\nExample: 7c003ac253aa41e89976f139c11edd7b",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "IisAuthentication",
-      "Label": "IIS Authentication",
-      "HelpText": "The authentication mode to use for the new website (can be Anonymous, Basic or Windows), specify multiple modes by entering the modes required separated by a ',' or ';'",
-      "DefaultValue": "Anonymous",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WebsiteStart",
-      "Label": "Start the Website",
-      "HelpText": "Uncheck if you don't want the website started after it is created.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2016-02-04T01:00:46.771+00:00",
-    "OctopusVersion": "3.2.19",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-delete.json b/step-templates/iis-website-delete.json
deleted file mode 100644
index af54741d3..000000000
--- a/step-templates/iis-website-delete.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "a032159b-0742-4982-95f4-59877a31fba3",
-  "Name": "IIS Website - Delete",
-  "Description": "Deletes a website in IIS.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$webSiteName = $OctopusParameters['WebSiteName']\nif (! $webSiteName) {\n    throw \"Web Site Name cannot be empty, please specify the web site to delete\"\n}\n\n# Helper to run a block with a retry if things go wrong\n$maxFailures = 5\n$sleepBetweenFailures = Get-Random -minimum 1 -maximum 4\nfunction Execute-WithRetry([ScriptBlock] $command) {\n\t$attemptCount = 0\n\t$operationIncomplete = $true\n\n\twhile ($operationIncomplete -and $attemptCount -lt $maxFailures) {\n\t\t$attemptCount = ($attemptCount + 1)\n\n\t\tif ($attemptCount -ge 2) {\n\t\t\tWrite-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\n\t\t\tStart-Sleep -s $sleepBetweenFailures\n\t\t\tWrite-Output \"Retrying...\"\n\t\t}\n\n\t\ttry {\n\t\t\t& $command\n\n\t\t\t$operationIncomplete = $false\n\t\t} catch [System.Exception] {\n\t\t\tif ($attemptCount -lt ($maxFailures)) {\n\t\t\t\tWrite-Output (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\n\t\t\t\n\t\t\t}\n\t\t\telse {\n\t\t\t    throw \"Failed to execute command\"\n\t\t\t}\n\t\t}\n\t}\n}\n\nAdd-PSSnapin WebAdministration -ErrorAction SilentlyContinue\nImport-Module WebAdministration -ErrorAction SilentlyContinue\n\npushd IIS:\\\n\ntry {\n    Write-Output \"Deleting web site $webSiteName\"\n    $sitePath = (\"IIS:\\Sites\\\" + $webSiteName)\n    \n    Write-Output $sitePath\n    \n    $site = Get-Item $sitePath -ErrorAction SilentlyContinue\n    if (! $site) {\n        Write-Output \"$webSiteName does not exist\"\n    }\n    else {\n        \n        Execute-WithRetry {\n            $state = Get-WebSiteState $webSiteName\n            if($state.Value -eq \"Started\") {\n                Write-Output \"Web site is running. Attempting to stop...\"\n                Stop-WebSite $webSiteName\n            }\n        }\n        \n        Write-Output \"Attempting to delete $webSiteName...\"\n        Execute-WithRetry {\n            Write-Output \"Removing SSL Bindings...\"\n            #Skipping default binding (Hostname $null) as it will break all sites which depend on this binding (non-SNI enabled sites will be grouped on the default binding! Remove-WebSite can handle this properly.)\n            Get-Item 'IIS:\\SslBindings\\' | Get-ChildItem | select $_.Sites | Where-Object { ($_.Sites -contains $webSiteName) -and ($_.Hostname -ne $null) } | Remove-Item\n            Write-Output \"Removing Web Bindings...\"\n            Get-WebBinding -Name $webSiteName | Remove-WebBinding\n            Write-Output \"Removing web site...\"\n            Remove-WebSite $webSiteName\n        }\n    }\n} catch [System.Exception] {\n    throw (\"Failed to execute command\" + $_.Exception.Message)\n}\n\npopd\n\nWrite-Output \"IIS Configuration complete\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "WebsiteName",
-      "Label": "Website name",
-      "HelpText": "The name of the website in IIS to delete.\n\nExample: Default Web Site",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2021-04-22T14:41:30.252Z",
-    "OctopusVersion": "2020.4.6",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-set-ip-security.json b/step-templates/iis-website-set-ip-security.json
deleted file mode 100644
index 30686876b..000000000
--- a/step-templates/iis-website-set-ip-security.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "Id": "2aab8e8b-6a55-462c-91ca-3c2a395e82a5",
-  "Name": "IIS Website - Set IP Security",
-  "Description": "Takes a list of ip/mask and allow them in ipsecurity",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$existingRules = Get-WebConfiguration /system.webServer/security/ipSecurity/* -location $Site -pspath IIS://;\r\n[Object[]]$newRules = @();\r\n\r\n$ips = $IpAddresses -split '\\n';\r\n$ips = $ips.Trim('\\r');\r\nforeach ($u in $ips) {\r\n    $a = $u.Split(\"/\");\r\n    $newRules += [Object]@{ ipAddress = $a[0]; subnetMask = $a[1]; allowed = $true };\r\n}\r\n\r\nif ($EnableProxyMode -eq \"true\") {\r\n    Write-Output \"Enabling proxy mode\"\r\n    set-webconfigurationproperty -Filter /system.webServer/security/ipSecurity -location $Site -Name \"enableProxyMode\" -Value \"true\"\r\n}\r\n\r\nif ($SetDeny -eq \"true\") {\r\n    Write-Output \"Setting Deny rule\"\r\n    set-webconfigurationproperty -Filter /system.webServer/security/ipSecurity -location $Site -Name \"allowUnlisted\" -Value \"false\"\r\n}\r\n\r\nfunction addRules([string]$website, [Object[]]$newRules, [Object[]]$oldRules) {\r\n\r\n    foreach ($rule in $newRules) {\r\n        if (ruleExists $rule $oldRules) {\r\n            Write-Host \"Rule $($rule.ipAddress)/$($rule.subnetMask) already exists\";\r\n\r\n            continue;\r\n        }\r\n\r\n        $value = @{ipAddress = $($rule.ipAddress); allowed = \"true\" }\r\n        if ([string]::IsNullOrEmpty($rule.subnetMask)) {\r\n            Write-Output \"Adding ip $($rule.ipAddress) to allow\"\r\n        }\r\n        else {\r\n            Write-Output \"Adding ip $($rule.ipAddress)/$($rule.subnetMask) to allow\"\r\n            $value.subnetMask = $rule.subnetMask;\r\n        }\r\n\r\n        add-webconfiguration /system.webServer/security/ipSecurity -location $website -value $value -pspath IIS://\r\n    }    \r\n}\r\n\r\nfunction clearRules([string]$website, [Object[]]$newRules, [Object[]]$oldRules) {\r\n\r\n    foreach ($rule in $oldRules) {\r\n        if (ruleExists $rule $newRules) {\r\n            continue;\r\n        }\r\n\r\n        Write-Host \"Rule $($rule.ipAddress)/$($rule.subnetMask) is not exists, remove it\";\r\n\r\n        Clear-WebConfiguration -Filter $rule.ItemXPath -location $rule.Location\r\n    }    \r\n}\r\n\r\nfunction ruleExists([Object]$rule, [Object[]]$rules) {\r\n    foreach ($r in $rules) {\r\n        if ($r.ipAddress -eq $rule.ipAddress -and $r.allowed -eq $rule.allowed) {\r\n            if ($r.subnetMask -eq $rule.subnetMask) {\r\n                return $true;\r\n            }\r\n\r\n            if (([string]::IsNullOrEmpty($r.subnetMask) -or $r.subnetMask -eq \"255.255.255.255\") -and ([string]::IsNullOrEmpty($rule.subnetMask) -or $rule.subnetMask -eq \"255.255.255.255\")) {\r\n                return $true;\r\n            }\r\n        }\r\n    }\r\n\r\n    return $false;\r\n}\r\n\r\naddRules $Site $newRules $existingRules;\r\nclearRules $Site $newRules $existingRules;\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "357e87c7-908c-4cdb-af63-8818cef5bd23",
-      "Name": "Site",
-      "Label": "Name of Website",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9db7ed01-c348-48ee-868b-ebcd0d87cce1",
-      "Name": "IpAddresses",
-      "Label": "List of ip addresses",
-      "HelpText": "A newline separated list of IP addresses and/or IP address and subnet mask pairs in the format <IPAddress>/<SubnetMask>.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2854ab2d-a000-48dd-9b20-6930c73c96fb",
-      "Name": "EnableProxyMode",
-      "Label": "Enable proxy mode",
-      "HelpText": "If the website is running behind a proxy, this setting most likely need to be checked.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7d8cc90e-281e-4718-a0e9-b1daa522d5c9",
-      "Name": "SetDeny",
-      "Label": "Set deny",
-      "HelpText": "If checked, IIS will be changed to \"Deny\" all IP addresses not added to the list.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "olsh",
-  "$Meta": {
-    "ExportedAt": "2021-03-01T11:24:20.680Z",
-    "OctopusVersion": "3.7.4",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
\ No newline at end of file
diff --git a/step-templates/iis-website-set-log-format.json b/step-templates/iis-website-set-log-format.json
deleted file mode 100644
index 0abeb9b24..000000000
--- a/step-templates/iis-website-set-log-format.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "Id": "e46aad55-5484-48a7-a90d-970d40129893",
-  "Name": "IIS Website - Set log format",
-  "Description": "Sets fields included in IIS logging. Uses named checkboxes where the names are identical to the naming scheme in IIS Manager.",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "Import-Module \"WebAdministration\" -ErrorAction Stop\n\nfunction SetIisLogPath {\n    param($logPath, $IISsitename)\n    write-host \"#Updating IIS Log path\"\n    \n    if (!(Test-Path \"IIS:\\Sites\\$($IISsitename)\")) {\n        write-host \"$IISsitename does not exist in IIS\"\n    } else {\n        Set-ItemProperty IIS:\\Sites\\$($IISsitename) -name logFile.directory -value $logPath\n        write-host \"IIS LogPath updated to $logPath\"\n    }\n}\n\nfunction AdvancedLogging-GenerateAppCmdScriptToConfigureAndRun\n{\n    param([string] $site) \n\n    #Clear existing log definition if it exists. We use site name to make it apparent where it belongs.\n    clear-WebConfiguration -PSPath IIS:\\ -Filter \"system.webServer/advancedLogging/server/logDefinitions/logDefinition[@baseFileName='$site']\"\n\n    #Get current powershell execution folder\n    $currentLocation = Get-Location\n\n    #Create an empty bat which will be populated with appcmd instructions\n    $stream = [System.IO.StreamWriter] \"$currentLocation\\$site.bat\"\n\n    $stream.WriteLine(\"%systemroot%\\system32\\inetsrv\\appcmd.exe clear config \"\"$site\"\" -section:system.webServer/advancedLogging/server /commit:apphost\")\n\n    #Create site specific log definition\n    $stream.WriteLine(\"%systemroot%\\system32\\inetsrv\\appcmd.exe set config \"\"$site\"\" -section:system.webServer/advancedLogging/server /+`\"logDefinitions.[baseFileName='$site',enabled='True',logRollOption='Schedule',schedule='Daily',publishLogEvent='False']`\" /commit:apphost\")\n\n    #Get all available fields for logging\n    $availableFields = Get-WebConfiguration \"system.webServer/advancedLogging/server/fields\"\n\n    $targetFields = ((GetIisLogFields).iisHeader)\n    Write-Host \"Target fields: \" (($targetFields) -join ',')\n    #Add appcmd instruction to add all the selected fields above to be logged as part of the logging\n    #The below section can be extended to filter out any unwanted fields\n    foreach ($field in $targetFields) {\n    \t$f = (($availableFields.Collection) |Where-Object {$_.logHeaderName -eq \"$field\"})\n    \tWrite-Host \"Appending \" $f.iisHeader $f.id\n        $stream.WriteLine(\"C:\\windows\\system32\\inetsrv\\appcmd.exe set config \"\"$site\"\" -section:system.webServer/advancedLogging/server /+`\"logDefinitions.[baseFileName='$site'].selectedFields.[id='$($f.id)',logHeaderName='$($f.logHeaderName)']`\" /commit:apphost\")\n    }\n\n    $stream.close()\n\n    # execute the batch file create to configure the site specific Advanced Logging\n    Start-Process -FilePath $currentLocation\\$site.bat\n    Start-Sleep -Seconds 10\n}\n\nfunction GetIisLogFields {\n    $IisLogFields = @()\n    if ($OctopusParameters['Date'] -eq \"True\") \t\t    { $IisLogFields += New-Object PSObject -Property @{id = \"Date\"; iisHeader = \"date\" } }\n    if ($OctopusParameters['Time'] -eq \"True\") \t\t    { $IisLogFields += New-Object PSObject -Property @{id = \"Time\"; iisHeader = \"time\" } }\n    if ($OctopusParameters['ClientIP'] -eq \"True\")      \t{ $IisLogFields += New-Object PSObject -Property @{id = \"ClientIP\"; iisHeader = \"c-ip\"} }\n    if ($OctopusParameters['UserName'] -eq \"True\")     \t{ $IisLogFields += New-Object PSObject -Property @{id = \"UserName\"; iisHeader = \"cs-username\" } }\n    if ($OctopusParameters['SiteName'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"SiteName\"; iisHeader = \"s-sitename\" } }\n    if ($OctopusParameters['ComputerName'] -eq \"True\")     { $IisLogFields += New-Object PSObject -Property @{id = \"ComputerName\"; iisHeader = \"s-computername\" } }\n    if ($OctopusParameters['ServerIP'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"ServerIP\"; iisHeader = \"s-ip\" } }\n    if ($OctopusParameters['ServerPort'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"ServerPort\"; iisHeader = \"s-port\" } }\n    if ($OctopusParameters['Method'] -eq \"True\")    \t\t{ $IisLogFields += New-Object PSObject -Property @{id = \"Method\"; iisHeader = \"cs-method\" } }\n    if ($OctopusParameters['UriStem'] -eq \"True\") \t    \t{ $IisLogFields += New-Object PSObject -Property @{id = \"UriStem\"; iisHeader = \"cs-uri-stem\" } }\n    if ($OctopusParameters['UriQuery'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"UriQuery\"; iisHeader = \"cs-uri-query\" } }\n    if ($OctopusParameters['HttpStatus'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"HttpStatus\"; iisHeader = \"sc-status\" } }\n    if ($OctopusParameters['HttpSubStatus'] -eq \"True\") \t{ $IisLogFields += New-Object PSObject -Property @{id = \"HttpSubStatus\"; iisHeader = \"sc-substatus\" } }\n    if ($OctopusParameters['Win32Status'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"Win32Status\"; iisHeader = \"sc-win32-status\" } }\n    if ($OctopusParameters['BytesSent'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"BytesSent\"; iisHeader = \"sc-bytes\" } }\n    if ($OctopusParameters['BytesRecv'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"BytesRecv\"; iisHeader = \"cs-bytes\" } }\n    if ($OctopusParameters['TimeTaken'] -eq \"True\")     \t{ $IisLogFields += New-Object PSObject -Property @{id = \"TimeTaken\"; iisHeader = \"TimeTakenMS\" } }\n    if ($OctopusParameters['ProtocolVersion'] -eq \"True\") \t{ $IisLogFields += New-Object PSObject -Property @{id = \"ProtocolVersion\"; iisHeader = \"cs-version\" } }\n    if ($OctopusParameters['Host'] -eq \"True\") \t\t    { $IisLogFields += New-Object PSObject -Property @{id = \"Host\"; iisHeader = \"cs(Host)\" } }\n    if ($OctopusParameters['UserAgent'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"UserAgent\"; iisHeader = \"cs(User-Agent)\" } }\n    if ($OctopusParameters['Cookie'] -eq \"True\")    \t\t{ $IisLogFields += New-Object PSObject -Property @{id = \"Cookie\"; iisHeader = \"cs(Cookie)\" } }\n    if ($OctopusParameters['Referer'] -eq \"True\") \t\t    { $IisLogFields += New-Object PSObject -Property @{id = \"Referer\"; iisHeader = \"cs(Referer)\" } }\n    if ($OctopusParameters['OriginalIP'] -eq \"True\") \t    { $IisLogFields += New-Object PSObject -Property @{id = \"OriginalIP\"; iisHeader = \"x-forwarded-for\" } }\n    return $IisLogFields    \n}\n\nfunction SetForIISAboveV7 {\n    param($SiteName)\n    [System.Collections.ArrayList]$logFields = ((GetIisLogFields).id)\n    $filter = \"/system.applicationHost/sites/site[@Name=\"\"$SiteName\"\"]/logFile\"\n    write-host \"Filter: $filter\"\n    \n    #Clear all existing custom fields...\n    clear-WebConfiguration -PSPath IIS:\\ -Filter \"$filter/customFields\"\n    \n    if ($logFields.Contains(\"OriginalIP\")) { \n      add-WebConfiguration -PSPath IIS:\\ -Filter \"$filter/customFields\" -Value @{logFieldName='OriginalIP';sourceType='RequestHeader';sourceName='X-FORWARDED-FOR'}\n    }\n    \n    Write-Host (($logFields) -join ',')\n    # This is part of extended logging and cannot be set using the syntax below.\n    $logFields.Remove(\"OriginalIP\")\n    Set-WebConfigurationProperty -Filter $filter -Value (($logFields) -join ',') -Name \"LogExtFileFlags\"\n}\n\nfunction SetForIISV7 {\n    param($site, $logDirectory)\n    Write-Host 'Disables http logging module'\n    Set-WebConfigurationProperty -Filter system.webServer/httpLogging -PSPath machine/webroot/apphost -Name dontlog -Value true\n    Write-Host 'Adding X-Forwarded-For as OriginalIP to advanced logging'\n    if (Get-WebConfigurationProperty \"system.webServer/advancedLogging/server/fields\" -Name Collection |Where-Object {$_.id -eq \"OriginalID\"}) {\n\twrite-host \"OriginalID field already exists. Will not modify existing definition.\"\n    } else {\n        Add-WebConfiguration \"system.webServer/advancedLogging/server/fields\" -value @{id=\"OriginalID\";sourceName=\"X-Forwarded-For\";sourceType=\"RequestHeader\";logHeaderName=\"X-Forwarded-For\";category=\"Default\";loggingDataType=\"TypeLPCSTR\"}\n    }\n    # Disables the default advanced logging config\n    Set-WebConfigurationProperty -Filter \"system.webServer/advancedLogging/server/logDefinitions/logDefinition[@baseFileName='%COMPUTERNAME%-Server']\" -name enabled -value false\n    # Enable Advanced Logging\n    Set-WebConfigurationProperty -Filter system.webServer/advancedLogging/server -PSPath machine/webroot/apphost -Name enabled -Value true\n    \n    # Set log directory at server level\n    Set-WebConfigurationProperty -Filter system.applicationHost/advancedLogging/serverLogs -PSPath machine/webroot/apphost -Name directory -Value $logDirectory\n    \n    # Set log directory at site default level\n    Set-WebConfigurationProperty -Filter system.applicationHost/sites/siteDefaults/advancedLogging -PSPath machine/webroot/apphost -Name directory -Value $logDirectory\t\n\n    AdvancedLogging-GenerateAppCmdScriptToConfigureAndRun $site\t\n}\n\nWrite-Host \"Value of UriQuery parameter \" $OctopusParameters['UriQuery']\n$logPath = $OctopusParameters['IISLogPath']\n$IISsitename = $OctopusParameters['webSiteName']\n$iisMajorVersion = (get-itemproperty HKLM:\\SOFTWARE\\Microsoft\\InetStp\\ |select MajorVersion).MajorVersion\nif ($iisMajorVersion -gt 7) {\n  SetForIISAboveV7 $OctopusParameters['SiteName'] \n  SetIisLogPath $OctopusParameters['iisLogDirectory'] $OctopusParameters['SiteName']\n} elseif ($iisMajorVersion -lt 7) {\n   Write-Host 'Cannot handle IIS versions below 7. Found IIS version ' $iisMajorVersion\n   exit 1\n} else {\n    SetForIISV7 $OctopusParameters['SiteName'] $OctopusParameters['iisLogDirectory']\n}\n\n",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "1a1520b9-58b1-44ae-b9df-991b34f6b62b",
-      "Name": "SiteName",
-      "Label": "SiteName",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "66d6d9d2-3cc0-47f3-bcd1-6b1d9f0846dc",
-      "Name": "iisLogDirectory",
-      "Label": "Where should the logs be placed?",
-      "HelpText": "",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "61656b11-a130-494d-aac4-a352db00a405",
-      "Name": "Date",
-      "Label": "Date (date)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "0c9f888f-5187-4218-b69b-e3b02f5f84d0",
-      "Name": "Time",
-      "Label": "Time (time)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "816117df-bedb-4c2b-8b17-046be5f04954",
-      "Name": "ClientIP",
-      "Label": "ClientIP IP Address (c-ip)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "8b56b533-52b2-4c90-9c8c-bff00e05104c",
-      "Name": "UserName",
-      "Label": "User Name (cs-username)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "97c865b4-cd9f-4e7c-9163-eb3bafdf7a31",
-      "Name": "ServiceName",
-      "Label": "Service Name (s-sitename)",
-      "HelpText": "",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "d84fd363-736d-4f2f-94df-48833c240c32",
-      "Name": "ComputerName",
-      "Label": "ServerName (s-computername)",
-      "HelpText": null,
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "52514137-54a9-4f7c-b701-3f16b0702ff7",
-      "Name": "ServerIP",
-      "Label": "Server IP Address (s-ip)",
-      "HelpText": "",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "66c3b111-8c40-4100-bae2-df4cee69c7a4",
-      "Name": "Method",
-      "Label": "Method (cs-method)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "c049ab95-a33b-401e-be55-1e5a4f216eab",
-      "Name": "UriStem",
-      "Label": "UriStem (cs-uri-stem)",
-      "HelpText": null,
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "ed535131-6fcd-440c-bf41-9356cc1a6b2f",
-      "Name": "UriQuery",
-      "Label": "Uri query (cs-uri-query)",
-      "HelpText": null,
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "2d2d5072-8d94-4098-99a9-646918128f1a",
-      "Name": "HttpStatus",
-      "Label": "Protocol Status (sc-status)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "26839cc3-d338-4637-ba34-09134378dbc9",
-      "Name": "Win32Status",
-      "Label": "Win32 Status (sc-win32-status)",
-      "HelpText": null,
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "b3ddf483-63c6-4f5d-a3db-7e7fc802d8f5",
-      "Name": "HttpSubStatus",
-      "Label": "Protocol Substatus (sc-substatus)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "cc63cdc5-6ce0-4476-960e-aa59eb064095",
-      "Name": "BytesSent",
-      "Label": "Bytes sent (sc-bytes)",
-      "HelpText": "",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "cd121c63-7f76-4259-92aa-d013c7fedb97",
-      "Name": "BytesRecv",
-      "Label": "Bytes received (cs-bytes)",
-      "HelpText": null,
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "da122f26-639e-49fa-b49c-25c281d24bc6",
-      "Name": "TimeTaken",
-      "Label": "Time taken (time-taken)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "1343443a-d3d9-4d84-a16b-76ed7d07d668",
-      "Name": "ProtocolVersion",
-      "Label": "Protocol version (cs-version)",
-      "HelpText": null,
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "7ba34ff4-b677-4d4d-8302-a42b6a774295",
-      "Name": "Host",
-      "Label": "Host (cs-host)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "96379a19-d9c8-4808-9e2c-29a7e13f89a9",
-      "Name": "UserAgent",
-      "Label": "User agent (cs(UserAgent))",
-      "HelpText": null,
-      "DefaultValue": "true",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "c8d37be1-16e7-46de-92e0-c037c5227aa0",
-      "Name": "Cookie",
-      "Label": "Cookie (cs(Cookie))",
-      "HelpText": "",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "4b4877b4-80f0-46fd-b272-26781706d717",
-      "Name": "Referer",
-      "Label": "Referer (cs(Referer))",
-      "HelpText": null,
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "986223cd-eb82-4744-a27c-3dfba3d8c87a",
-      "Name": "ServerPort",
-      "Label": "Server Port (s-port)",
-      "HelpText": "",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "779b89aa-8631-443f-9108-a44acd92f5ef",
-      "Name": "OriginalIP",
-      "Label": "Original IP",
-      "HelpText": "From X-FORWARDED-FOR in request.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedBy": "arnodenuijl",
-  "$Meta": {
-    "ExportedAt": "2017-12-22T14:56:00.000Z",
-    "OctopusVersion": "3.4.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-stop.json b/step-templates/iis-website-stop.json
deleted file mode 100644
index 45235e900..000000000
--- a/step-templates/iis-website-stop.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "Id": "9eb40453-ac5d-4cb0-8666-046ff6305a3a",
-  "Name": "IIS Website - Stop",
-  "Description": "Stops a website in IIS.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Load IIS module:\r\nImport-Module WebAdministration\r\n\r\n# Get WebSite Name\r\n$webSiteName = $OctopusParameters['webSiteName']\r\n# Get the number of retries\r\n$retries = $OctopusParameters['webSiteCheckRetries']\r\n# Get the number of attempts\r\n$delay = $OctopusParameters['webSiteCheckDelay']\r\n\r\n# Check if exists\r\nif(Test-Path IIS:\\Sites\\$webSiteName) {\r\n\r\n    # Stop Website if not already stopped\r\n    if ((Get-WebSiteState $webSiteName).Value -ne \"Stopped\") {\r\n        Write-Output \"Stopping IIS Website $webSiteName\"\r\n        Stop-WebSite $webSiteName\r\n    \r\n        $state = (Get-WebSiteState $webSiteName).Value\r\n        $counter = 1\r\n        \r\n        # Wait for the Website to the \"Stopped\" before proceeding\r\n        do{ \r\n            $state = (Get-WebSiteState $webSiteName).Value\r\n            Write-Output \"$counter/$retries Waiting for IIS Website $webSiteName to shut down completely. Current status: $state\"\r\n            $counter++\r\n            Start-Sleep -Milliseconds $delay\r\n        }\r\n        while($state -ne \"Stopped\" -and $counter -le $retries)  \r\n        \r\n        # Throw an error if the Website is not stopped\r\n        if($counter -gt $retries) { \r\n            throw \"Could not shut down IIS Website $webSiteName. `nTry to increase the number of retries ($retries) or delay between attempts ($delay milliseconds).\" }\r\n    }\r\n}\r\nelse {\r\n    Write-Output \"IIS Website $webSiteName doesn't exist\"\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [{
-      "Name": "WebsiteName",
-      "Label": "Website name",
-      "HelpText": "The name of the site in IIS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WebSiteCheckDelay",
-      "Label": "Status check interval",
-      "HelpText": "The delay, in milliseconds, between each attempt to query the website to see if its status is \"Stopped\"",
-      "DefaultValue": "500",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WebSiteCheckRetries",
-      "Label": "Status check retries",
-      "HelpText": "The number of retries before an error is thrown.",
-      "DefaultValue": "20",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2017-02-09T23:04:46.440Z",
-    "OctopusVersion": "3.3.17",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/iis-website-update-property.json b/step-templates/iis-website-update-property.json
deleted file mode 100644
index 609d7db15..000000000
--- a/step-templates/iis-website-update-property.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "Id": "34118a0e-f872-435a-8522-d3c7f8515cb8",
-  "Name": "IIS WebSite - Update Property",
-  "Description": "Updates property for specified WebSite",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$webSiteName,\n    [string]$propertyName,\n    [string]$propertyValue,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null -or $result -eq \"\") {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\n& {\n    param(\n        [string]$webSiteName,\n        [string]$propertyName,\n        [string]$propertyValue\n    ) \n\n    Write-Host \"Setting $webSiteName property $propertyName to $propertyValue\"\n\n    try {\n         Add-PSSnapin WebAdministration -ErrorAction SilentlyContinue\n         Import-Module WebAdministration -ErrorAction SilentlyContinue\n         \n         $oldValue = Get-ItemProperty \"IIS:\\Sites\\$webSiteName\" -Name $propertyName\n         $oldValueString = \"\"\n\n         \n         if ($oldValue.GetType() -eq [Microsoft.IIs.PowerShell.Framework.ConfigurationAttribute])\n         {\n             $oldValueString = ($oldValue | Select-Object -ExpandProperty \"Value\")\n         }\n         elseif ($oldValue.GetType() -eq [System.String])\n         {\n             $oldValueString = $oldValue\n         }\n         elseif ($oldValue.GetType() -eq [System.Management.Automation.PSCustomObject])\n         {\n             $oldValueString = ($oldValue | Select-Object -ExpandProperty $propertyName)\n         }\n\n         Write-Host \"Old value $oldValueString\"\n         Set-ItemProperty \"IIS:\\Sites\\$webSiteName\" -Name $propertyName -Value $propertyValue\n         Write-Host \"New value $propertyValue\"\n         Write-Host \"Done\"\n    } catch {\n        Write-Host $_.Exception|format-list -force\n        Write-Host \"There was a problem setting property\"    \n    }\n\n } `\n (Get-Param 'webSiteName' -Required) (Get-Param 'propertyName' -Required) (Get-Param 'propertyValue' -Required)\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "webSiteName",
-      "Label": "Web site name",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "propertyName",
-      "Label": "Name of the property to set",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "propertyValue",
-      "Label": "Value of the property to set",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-05-30T11:42:50.429+00:00",
-  "LastModifiedBy": "ylashin",
-  "$Meta": {
-    "ExportedAt": "2016-05-30T11:42:50.429+00:00",
-    "OctopusVersion": "3.3.15",
-    "Type": "ActionTemplate"
-  },
-  "Category": "iis"
-}
diff --git a/step-templates/import-cert-from-azure-keyvault.json b/step-templates/import-cert-from-azure-keyvault.json
deleted file mode 100644
index 864f4cb33..000000000
--- a/step-templates/import-cert-from-azure-keyvault.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "Id": "e06e7e2a-5510-4b6d-bd46-22d3bc01291d",
-    "Name": "Import Certificate from Azure Key Vault",
-    "Description": "Imports a certificate from Azure Key Vault to the tentacle",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "Import-Module AzureRM.Profile\nImport-Module AzureRM.KeyVault\n\nFunction Validate-Parameter($parameterValue, [string[]]$validInput, $parameterName) {\n    Write-Host \"${parameterName}: ${parameterValue}\"\n    if (! $parameterValue) {\n        throw \"$parameterName cannot be empty, please specify a value\"\n    }\n}\n\nFunction Install-AzureKeyVaultCertificate {\n    Param(\n        [string]$keyVaultName,\n        [string]$certificateName,\n        [string]$certificateVersion,\n        [string]$certificateStoreName,\n        [string]$certificateStoreLocation,\n        [string]$certificateFriendlyName\n    )\n    \n    Write-Output \"Retrieving '$certificateName' from '$keyVaultName' ...\"\n    $getSecretParams = @{\n    \tVaultName = $keyVaultName\n        Name = $certificateName\n    }\n\n\tif($certificateVersion -notmatch \"latest\") {\n        $getSecretParams[\"Version\"] = $certificateVersion\n    }\n    \n\t$cert = Get-AzureKeyVaultSecret @getSecretParams\n    $b64 = [System.Convert]::FromBase64String($cert.SecretValueText)\n    $pfx = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($b64, \"\", \"MachineKeySet,PersistKeySet\")\n    Write-Output \"Certificate information:\"\n    Write-Output ($pfx | fl | Out-String)\n    \n    $certPath = \"Cert:\\$certificateStoreLocation\\$certificateStoreName\\$($pfx.Thumbprint)\"\n    if (Test-Path $certPath) {\n        \"A certificate with thumbprint '$($pfx.Thumbprint)' appears to already exist in the certificate store. Skipping...\"\n    }\n    else {\n        Write-Output \"Opening certificate store '$certificateStoreName' in '$certificateStoreLocation' ...\"\n        $store = New-Object System.Security.Cryptography.X509Certificates.X509Store($certificateStoreName, $certificateStoreLocation)\n        $store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)\n\n\t\tif($certificateFriendlyName) {\n          Write-Output \"Setting certificate friendly name to '$certificateFriendlyName'...\"\n          $pfx.FriendlyName = $certificateFriendlyName\n\t\t}\n        \n        Write-Output \"Adding certificate...\"\n        $store.Add($pfx)\n        $store.Close()\n        Write-Output \"Certificate added.\"\n\n        Write-Output \"Verifying - searching certificate store for thumbprint '$($pfx.Thumbprint)'...\"\n        if (Test-Path $certPath) {\n            Write-Output \"Certificate is successfully imported!\"\n        }\n        else {\n            Write-Error \"ERROR: Certificate with thumbprint '$($pfx.Thumbprint)' was not found in certificate store '$certificateStoreName' in '$certificateStoreLocation'\"\n        }\n    }\n}\n\n$azureSubscriptionId = $OctopusParameters['Azure.GetKeyVaultCertificate.SubscriptionId']\n$azureTenantId = $OctopusParameters['Azure.GetKeyVaultCertificate.TenantId']\n$azureClientId = $OctopusParameters['Azure.GetKeyVaultCertificate.ClientId']\n$azurePassword = $OctopusParameters['Azure.GetKeyVaultCertificate.Password']\n$keyVaultName = $OctopusParameters['Azure.GetKeyVaultCertificate.KeyVaultName']\n$certificateName = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateName']\n$certificateVersion = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateVersion']\n$certificateStoreName = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateStoreName']\n$certificateStoreLocation = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateStoreLocation']\n$certificateFriendlyName = $OctopusParameters['Azure.GetKeyVaultCertificate.CertificateFriendlyName']\n\n# Validate that all parameters have values\nWrite-Output \"Validating parameters...\"\nValidate-Parameter $azureSubscriptionId -parameterName \"azureSubscriptionId\"\nValidate-Parameter $azureTenantId -parameterName \"azureTenantId\"\nValidate-Parameter $azureClientId -parameterName \"azureClientId\"\nValidate-Parameter $azurePassword -parameterName \"azurePassword\"\nValidate-Parameter $keyVaultName -parameterName \"keyVaultName\"\nValidate-Parameter $certificateName -parameterName \"certificateName\"\nValidate-Parameter $certificateVersion -parameterName \"certificateVersion\"\nValidate-Parameter $certificateStoreName -parameterName \"certificateStoreName\"\nValidate-Parameter $certificateStoreLocation -parameterName \"certificateStoreLocation\"\n\n$azureCreds = New-Object System.Management.Automation.PSCredential($azureClientId, (ConvertTo-SecureString -String $azurePassword -AsPlainText -Force))\nLogin-AzureRmAccount -ServicePrincipal -SubscriptionId $azureSubscriptionId -TenantId $azureTenantId -Credential $azureCreds\n\n$params = @{\n    keyVaultName             = $keyVaultName\n    certificateName          = $certificateName\n    certificateVersion       = $certificateVersion\n    certificateStoreName     = $certificateStoreName\n    certificateStoreLocation = $certificateStoreLocation\n    certificateFriendlyName     = $certificateFriendlyName\n}\n\nInstall-AzureKeyVaultCertificate @params"
-    },
-    "Parameters": [
-        {
-            "Id": "70c9f9dd-22b6-4285-8d8a-f64278de0dc1",
-            "Name": "Azure.GetKeyVaultCertificate.SubscriptionId",
-            "Label": "Azure Service Principal SubscriptionId",
-            "HelpText": "Azure SubscriptionId for the Service Principal account",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "9a421884-0f63-417e-b2a9-b1039a1e8bf8",
-            "Name": "Azure.GetKeyVaultCertificate.TenantId",
-            "Label": "Azure Active Directory Tenant Id",
-            "HelpText": "The Azure Active Directory Tenant Id associated with the Service Principal account",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "bfb4a0a1-dab2-4c8f-bcb8-51033c35f633",
-            "Name": "Azure.GetKeyVaultCertificate.ClientId",
-            "Label": "Azure Service Principal Client Id",
-            "HelpText": "The Client Id associated with the Service Principal account",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "49857bcc-f3a1-4984-a2b1-ddeeca52114a",
-            "Name": "Azure.GetKeyVaultCertificate.Password",
-            "Label": "Azure Service Principal Password",
-            "HelpText": "The password or \"key\" for the Service Principal account",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "220d17f6-070c-4a3d-b742-205d56b27f47",
-            "Name": "Azure.GetKeyVaultCertificate.KeyVaultName",
-            "Label": "Key Vault Name",
-            "HelpText": "The name of the Azure Key Vault",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "930e6703-3df4-40bb-b3ae-6d367bf5cc5d",
-            "Name": "Azure.GetKeyVaultCertificate.CertificateName",
-            "Label": "Certificate Name",
-            "HelpText": "The name of the certificate to retrieve from the Key Vault",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "b3616901-a27a-4960-984c-59b2388b243e",
-            "Name": "Azure.GetKeyVaultCertificate.CertificateVersion",
-            "Label": "Certificate Version",
-            "HelpText": "_[Optional]_ Enter the specific version of the certificate. Defaults to `latest`.",
-            "DefaultValue": "latest",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "840f8939-4d87-42c7-9d6e-232d4617b90f",
-            "Name": "Azure.GetKeyVaultCertificate.CertificateStoreName",
-            "Label": "Certificate Store Name",
-            "HelpText": "Certificate store name. E.g. `My`",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Select",
-                "Octopus.SelectOptions": "My|My\nCertificateAuthority|CertificateAuthority\nRoot|Root\nTrustedPeople|TrustedPeople\nTrustedPublisher|TrustedPublisher"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "15916c8a-709b-4f14-af36-63ee5d3265e9",
-            "Name": "Azure.GetKeyVaultCertificate.CertificateStoreLocation",
-            "Label": "Certificate Store Location",
-            "HelpText": "Certificate store location. E.g. \"LocalMachine\"",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Select",
-                "Octopus.SelectOptions": "LocalMachine|LocalMachine\nCurrentUser|CurrentUser"
-            },
-            "Links": {}
-        },
-        {
-            "Id": "3915f38e-947f-4313-b207-4e88b5f63969",
-            "Name": "Azure.GetKeyVaultCertificate.CertificateFriendlyName",
-            "Label": "Certificate Friendly Name",
-            "HelpText": "_[Optional]_ A friendly name to give the certificate when importing. E.g. `Client Auth Cert for FooService`",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            },
-            "Links": {}
-        }
-    ],
-    "LastModifiedBy": "nshenoy",
-    "$Meta": {
-        "ExportedAt": "2018-04-17T20:24:57.757Z",
-        "OctopusVersion": "2018.3.13",
-        "Type": "ActionTemplate"
-    },
-    "Category": "azure"
-}
diff --git a/step-templates/import-databricks-workbooks.json b/step-templates/import-databricks-workbooks.json
deleted file mode 100644
index 4c34a4b39..000000000
--- a/step-templates/import-databricks-workbooks.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "0bbe289c-3ea9-47f8-970c-caa946878f49",
-  "Name": "Import Databricks Workbooks",
-  "Description": "Import Databricks workbooks (current supported files `.ipynb` and `.scala`) to a databricks instance",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "7885715a-c3e8-492a-ba61-23c34d2e9447",
-      "Name": "DeployDataBricksWorkBookPackage",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "DeployDataBricksWorkBookPackage"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\" #region fucntions\nfunction Set-DatabricksWorkBook\n{\n    [CmdletBinding()]\n    param (\n        [Parameter()]\n        [String]\n        $AccessToken, \n        [Parameter()]\n        [String]\n        $DataBricksInstanceUri,\n        [Parameter()]\n        [String]\n        $WorkbooksUploadPath,\n        [Parameter()]\n        [String]\n        $DatabrickImportFolder\n    )\n\n    $headers = @{\n        'Authorization' = (\"Bearer {0}\" -f $AccessToken )\n    }\n    $APIVersion = '/api/2.0'\n    $APICommand = '/workspace/import'\n    $Uri = \"https://$DataBricksInstanceUri$APIVersion$APICommand\"\n        \n    Get-ChildItem -Path $WorkbooksUploadPath -Recurse -File | ForEach-Object{ $currentWorkBook = $_\n        Write-Host (\"Importing Workbook:{0}\" -f $currentWorkBook.FullName)\n \t\t$workbookContent =  [Convert]::ToBase64String((Get-Content -path $currentWorkBook.FullName -Encoding byte))\n    \n        if($DatabrickImportFolder.EndsWith(\"/\"))\n    \t{\n    \t\t$workbookPath   = \"{0}{1}\" -f $DatabrickImportFolder , $currentWorkBook.BaseName\n    \t}\n    \telse \n    \t{\n        \t$workbookPath   = \"{0}/{1}\" -f $DatabrickImportFolder , $currentWorkBook.BaseName\n    \t}\n        \n        switch ($currentWorkBook.Extension.ToLower()) \n        {\n            '.ipynb' { \n                $workbookLanguage = \"PYTHON\" \n                $workbookFormat   = \"JUPYTER\"\n                break\n            }\n            '.scala' {\n                $workbookLanguage = \"SCALA\"\n                $workbookFormat   = \"SOURCE\"\n                break\n        }\n        Default \n            {\n                $workbookLanguage = \"SQL\"\n                $workbookFormat   = \"SOURCE\"\n            }\n        }\n        $requestBody = ConvertTo-Json -InputObject @{ \n            content = $workbookContent\n            path = $workbookPath\n            language = $workbookLanguage\n            format = $workbookFormat\n            overwrite = $true\n            }\n        \n        $apiResponse = Invoke-RestMethod -Method Post  -Uri  $Uri -Headers $headers -Body $requestBody\n        return $apiResponse\n    }\n}\n\n\nfunction Set-DatabricksWorkspaceFolder\n{\n    [CmdletBinding()]\n    param (\n        [Parameter()]\n        [String]\n        $AccessToken, \n        [Parameter()]\n        [String]\n        $DataBricksInstanceUri,\n        [Parameter()]\n        [String]\n        $DatabrickFolder\n    )\n\n    $headers = @{\n        'Authorization' = (\"Bearer {0}\" -f $AccessToken )\n    }\n    $APIVersion = '/api/2.0'\n    $APIListCommand = '/workspace/list'\n    $APIMkdirsCommand = '/workspace/mkdirs'\n    $ListUri = \"https://$DataBricksInstanceUri$APIVersion$APIListCommand\"\n    $MkdirsUri = \"https://$DataBricksInstanceUri$APIVersion$APIMkdirsCommand\"\n\n    $pathRoute = $DatabrickFolder.Substring(1) -split '/'\n    $basePath = \"/\"\n    foreach($path in $pathRoute)\n    {\n        $requestBody = @{ \n            path = $basePath\n        }\n        $apiResponse = Invoke-RestMethod -Uri $ListUri -Headers $headers -Body $requestBody -ContentType application/json  \n        $workSpaceFolder = $apiResponse.objects | Where-Object {$_.object_type -eq \"DIRECTORY\" -and $_.path -eq ( \"{0}{1}\" -f $basePath , $path) } \n        if($null -eq $workSpaceFolder)\n        {\n            $requestBody = ConvertTo-Json -InputObject  @{ \n                path = ( \"{0}{1}\" -f $basePath , $path)\n            } \n            Invoke-RestMethod -Method Post -Uri $MkdirsUri -Headers $headers -Body $requestBody\n        }\n        $basePath = \"{0}/{1}/\" -f $basePath , $path\n        if($basePath.StartsWith(\"//\"))\n        {\n            $basePath = $basePath.Substring(1)\n        }\n    }\n}\n\n#endregion fucntions\n\n\n$DatabrickWorkBookImportFolder = $OctopusParameters[\"Octopus.Action.Package[DeployDataBricksWorkBookPackage].ExtractedPath\"]\n\nWrite-Host \"Checking WorkSpace Folders\"\nSet-DatabricksWorkspaceFolder  -AccessToken $DataBricksAccessToken -DataBricksInstanceUri $DataBricksInstanceUri -DatabrickFolder $DatabricksImportFolder\nWrite-Host \"Importing Databricks Workbooks\"\nSet-DatabricksWorkBook -AccessToken $DataBricksAccessToken -DataBricksInstanceUri $DataBricksInstanceUri -WorkbooksUploadPath $DatabrickWorkBookImportFolder -DatabrickImportFolder $DatabricksImportFolder\n"
-  },
-  "Parameters": [
-    {
-      "Id": "b8cd5d73-29d9-4ba2-bdfa-86cc1316a16f",
-      "Name": "DeployDataBricksWorkBookPackage",
-      "Label": "DataBricks WorkBook Package",
-      "HelpText": "The Databricks workbook package",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "f81b9ccb-beea-4d8f-a049-ee9ea6da643e",
-      "Name": "DataBricksInstanceUri",
-      "Label": "Databricks Instance Uri",
-      "HelpText": "The Databricks Instance URL",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6c1aed25-f9a6-4c1f-b8e9-d50cc8669f2d",
-      "Name": "DataBricksAccessToken",
-      "Label": "Databricks Access Token",
-      "HelpText": "The access token to authenticate against the Databricks instance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "c95af088-180b-419e-8c44-ce3fb4d96f57",
-      "Name": "DatabricksImportFolder",
-      "Label": "Databricks Workbook Import Folder",
-      "HelpText": "Databricks Workbook import folder location",
-      "DefaultValue": "/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-10-05T09:38:27.445Z",
-    "OctopusVersion": "2021.2.7428",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "Zogamorph",
-  "Category": "databricks"
-}
diff --git a/step-templates/jira-transition-issues.json b/step-templates/jira-transition-issues.json
deleted file mode 100644
index 10ea0dd55..000000000
--- a/step-templates/jira-transition-issues.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "f0730d85-6ada-44d9-bd95-63b5c236e716",
-  "Name": "JIRA - Transition Issues",
-  "Description": "Transitions JIRA issues as the code they are associated with gets deployed.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\"\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12\n\n$Uri = $OctopusParameters[\"Jira.Transition.Url\"]\n$Jql = $OctopusParameters[\"Jira.Transition.Query\"]\n$Transition = $OctopusParameters[\"Jira.Transition.Name\"]\n$User = $OctopusParameters[\"Jira.Transition.Username\"]\n$Password = $OctopusParameters[\"Jira.Transition.Password\"]\n\nif ([string]::IsNullOrWhitespace($Uri)) {\n    throw \"Missing parameter value for 'Jira.Transition.Url'\"\n}\nif ([string]::IsNullOrWhitespace($Jql)) {\n    throw \"Missing parameter value for 'Jira.Transition.Query'\"\n}\nif ([string]::IsNullOrWhitespace($Transition)) {\n    throw \"Missing parameter value for 'Jira.Transition.Name'\"\n}\nif ([string]::IsNullOrWhitespace($User)) {\n    throw \"Missing parameter value for 'Jira.Transition.Username'\"\n}\nif ([string]::IsNullOrWhitespace($Password)) {\n    throw \"Missing parameter value for 'Jira.Transition.Password'\"\n}\n\nfunction Create-Uri {\n    Param (\n        $BaseUri,\n        $ChildUri\n    )\n\n    if ([string]::IsNullOrWhitespace($BaseUri)) {\n        throw \"BaseUri is null or empty!\"\n    }\n    if ([string]::IsNullOrWhitespace($ChildUri)) {\n        throw \"ChildUri is null or empty!\"\n    }\n    $CombinedUri = \"$($BaseUri.TrimEnd(\"/\"))/$($ChildUri.TrimStart(\"/\"))\"\n    return New-Object -TypeName System.Uri $CombinedUri\n}\n\nfunction Jira-QueryApi {\n    Param (\n        [Uri]$Query,\n        [string]$Username,\n        [string]$Password\n    );\n\n    Write-Output \"Querying JIRA API $($Query.AbsoluteUri)\"\n\n    # Prepare the Basic Authorization header - PSCredential doesn't seem to work\n    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $Username, $Password)))\n    $headers = @{Authorization = (\"Basic {0}\" -f $base64AuthInfo) }\n\n    # Execute the query\n    Invoke-RestMethod -Uri $Query -Headers $headers\n}\n\nfunction Jira-ExecuteApi {\n    Param (\n        [Uri]$Query,\n        [string]$Body,\n        [string]$Username,\n        [string]$Password\n    );\n\n    Write-Output \"Posting JIRA API $($Query.AbsoluteUri)\"\n\n    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $Username, $Password)))\n    $headers = @{Authorization = (\"Basic {0}\" -f $base64AuthInfo) }\n\n    Invoke-RestMethod -Uri $Query -Headers $headers -UseBasicParsing -Body $Body -Method Post -ContentType \"application/json\"\n}\n\nfunction Jira-GetTransitions {\n    Param (\n        [Uri]$TransitionsUri,\n        [string]$Username,\n        [string]$Password\n    );\n\n    $transitions = Jira-QueryApi -Query $TransitionsUri -Username $Username -Password $Password\n    $transitions.transitions\n}\n\nfunction Jira-PostTransition {\n    Param (\n        [Uri]$TransitionsUri,\n        [string]$Username,\n        [string]$Password,\n        [string]$Body\n    );\n\n    Jira-ExecuteApi -Query $TransitionsUri -Body $body -Username $Username -Password $Password\n}\n\nfunction Jira-TransitionTicket {\n    Param (\n        [Uri]$IssueUri,\n        [string]$Username,\n        [string]$Password,\n        [string]$Transition\n    );\n\n    $query = $IssueUri.AbsoluteUri + \"/transitions\"\n    $uri = [System.Uri] $query\n\n    $transitions = Jira-GetTransitions -TransitionsUri $uri -Username $Username -Password $Password\n    $match = $transitions | Where-Object name -eq $Transition | Select-Object -First 1\n    $comment = \"Status automatically updated via Octopus Deploy with release {0} of {1} to {2}\" -f $OctopusParameters['Octopus.Action.Package.PackageVersion'], $OctopusParameters['Octopus.Project.Name'], $OctopusParameters['Octopus.Environment.Name'] \n    \n    If ($null -ne $match) {\n        $transitionId = $match.id\n        $body = \"{ \"\"update\"\": { \"\"comment\"\": [ { \"\"add\"\" : { \"\"body\"\" : \"\"$comment\"\" } } ] }, \"\"transition\"\": { \"\"id\"\": \"\"$transitionId\"\" } }\"\n\n        Jira-PostTransition -TransitionsUri $uri -Body $body -Username $Username -Password $Password\n    }\n}\n\nfunction Jira-TransitionTickets {\n    Param (\n        [string]$BaseUri,\n        [string]$Username,\n        [string]$Password,\n        [string]$Jql,\n        [string]$Transition\n    );\n\n    try {\n        # Try the newer JQL search endpoint first\n        $childUri = (\"/rest/api/2/search/jql?jql=\" + $Jql)\n        $queryUri = Create-Uri -BaseUri $BaseUri -ChildUri $childUri\n        \n        $json = Jira-QueryApi -Query $queryUri -Username $Username -Password $Password\n        Set-Content -Path \"./header.txt\" -Value $json.issues\n        If ($json.issues.Count -eq 0) {\n            Write-Output \"No issues were found that matched your query : $Jql\"\n            return\n        }\n    }\n    catch {\n        # Fallback to the older search endpoint if the newer one fails\n        Write-Output \"Falling back to older JQL search endpoint\"\n        $childUri = (\"/rest/api/2/search?jql=\" + $Jql)\n        $queryUri = Create-Uri -BaseUri $BaseUri -ChildUri $childUri\n        \n        $json = Jira-QueryApi -Query $queryUri -Username $Username -Password $Password\n        If ($json.total -eq 0) {\n            Write-Output \"No issues were found that matched your query : $Jql\"\n            return\n        }\n    }\n\n    ForEach ($issue in $json.issues) {\n        $issuePath = (\"/rest/api/2/issue/\" + $issue.id)\n        $queryUri = Create-Uri -BaseUri $BaseUri -ChildUri $issuePath\n        Jira-TransitionTicket -IssueUri $queryUri -Transition $Transition -Username $Username -Password $Password\n    }\n}\n\nWrite-Output \"JIRA - Create Transition\"\nWrite-Output \"  JIRA URL   : $Uri\"\nWrite-Output \"  JIRA JQL   : $Jql\"\nWrite-Output \"  Transition : $Transition\"\nWrite-Output \"  Username   : $User\"\n\n# Some sample values:\n#   $uri = \"http://tempuri.org\"\n#   $Jql = \"fixVersion = 11.3.1 AND status = Completed\"\n#   $Ttransition = \"Deploy\"\n#   $User = \"admin\"\n#   $Pass = \"admin\"\n\ntry {\n    Jira-TransitionTickets -BaseUri $Uri -Jql $Jql -Transition $Transition -Username $User -Password $Password\n}\ncatch {\n    Write-Error \"An error occurred while attempting to transition the JIRA issues: $($_.Exception)\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "9da7c3ad-e06f-4727-8519-3860fbee6420",
-      "Name": "Jira.Transition.Url",
-      "Label": "JIRA URL",
-      "HelpText": "The base URL of the JIRA Server (e.g. http://tempuri.org/jira)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b37a4dde-f7f4-4e30-b992-3ebf6a6d6963",
-      "Name": "Jira.Transition.Username",
-      "Label": "Username",
-      "HelpText": "The username of the account that will be used to run the transition. The account should have sufficient permissions in JIRA to run the transition.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1f28d6cd-3d73-4ac2-b5ab-750b9efaabff",
-      "Name": "Jira.Transition.Password",
-      "Label": "Password",
-      "HelpText": "The password of the account that will be used to run the transaction.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "38aaca97-9fdc-4eef-8c90-8dfd2cf2844e",
-      "Name": "Jira.Transition.Name",
-      "Label": "Transition",
-      "HelpText": "The name of the transition that should be applied to the JIRA tickets. If an issue does not have the named transition, it will be ignored.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e16422bb-fd58-401e-bc25-a3817bab65e3",
-      "Name": "Jira.Transition.Query",
-      "Label": "JQL",
-      "HelpText": "The JIRA query that should be used to select issues that will be transitioned (e.g. status = Completed AND fixVersion = 1.2.3)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "LastModifiedBy": "octopus-hideaki",
-  "$Meta": {
-    "ExportedAt": "2025-09-17T21:41:52.140Z",
-    "OctopusVersion": "2025.3.14271",
-    "Type": "ActionTemplate"
-  },
-  "Category": "jira"
-}
diff --git a/step-templates/jira-update-version.json b/step-templates/jira-update-version.json
deleted file mode 100644
index 6da54603d..000000000
--- a/step-templates/jira-update-version.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "Id": "c691729f-685a-4339-bba9-716633b221ae",
-  "Name": "JIRA - Update Version Number",
-  "Description": "Update version to Jira tickets based on release number being deployed",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "#require version 3.0\n\nparam (\n    [System.Uri]$Uri,\n    [string]$Jql,\n    [string]$Version,\n    [string]$User,\n    [string]$Password,\n    [string]$ProjectKey    \n)\n\n$ErrorActionPreference = \"Stop\"\n$AllProtocols = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'\n[Net.ServicePointManager]::SecurityProtocol = $AllProtocols\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue    \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Jira-QueryApi\n{\n    Param (\n        [Uri]$Query,\n        [string]$Username,\n        [string]$Password\n    );\n\n    Write-Host \"Querying JIRA API $($Query.AbsoluteUri)\"\n\n    # Prepare the Basic Authorization header - PSCredential doesn't seem to work\n    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $Username,$Password)))\n    $headers = @{Authorization=(\"Basic {0}\" -f $base64AuthInfo)}\n\n    # Execute the query\n    Invoke-RestMethod -Uri $Query -Headers $headers\n}\n\nfunction Jira-ExecuteApi\n{\n    Param (\n        [Uri]$Query,\n        [string]$Body,\n        [string]$Username,\n        [string]$Password\n    );\n\n    Write-Host \"Updating ticket : $($Query.AbsoluteUri)\"\n\n    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $Username,$Password)))\n    $headers = @{Authorization=(\"Basic {0}\" -f $base64AuthInfo)}\n    Invoke-RestMethod -Uri $Query -Headers $headers -UseBasicParsing -Body $Body -Method Put -ContentType \"application/json\"\n}\n\nfunction Jira-CreateVersion\n{\n    Param (\n        [Uri]$Query,\n        [string]$Body,\n        [string]$Username,\n        [string]$Password\n    );\n\n    Write-Host \"Creating a version $($Query.AbsoluteUri)\"\n\n    $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes((\"{0}:{1}\" -f $Username,$Password)))\n    $headers = @{Authorization=(\"Basic {0}\" -f $base64AuthInfo)}\n    Invoke-RestMethod -Uri $Query -Headers $headers -UseBasicParsing -Body $Body -Method Post -ContentType \"application/json\"\n}\n\nfunction Jira-GetVersions\n{\n    Param (\n        [Uri]$VersionsUri,\n        [string]$Username,\n        [string]$Password\n    );\n\n    $versions = Jira-QueryApi -Query $VersionsUri -Username $Username -Password $Password    \n    $versions\n}\n\nfunction Jira-PostUpdate\n{\n    Param (\n        [Uri]$IssueUri,\n        [string]$Username,\n        [string]$Password,\n        [string]$Body\n    );\n\n    Jira-ExecuteApi -Query $IssueUri -Body $body -Username $Username -Password $Password\n}\n\nfunction Jira-UpdateTicket\n{\n    Param (\n    \t[Uri]$BaseUri,\n        [Uri]$IssueUri,\n        [string]$Username,\n        [string]$Password,\n        [string]$Version,\n        [string]$ProjectKey,\n        [System.Uri]$GetVersionsAPIURL,\n        [System.Uri]$CreateVersionAPIURL          \n    );\n\n    $query = $IssueUri.AbsoluteUri\n    $uri = [System.Uri] $query\n\t\n    $versionuri = $GetVersionsAPIURL\n    $createversionuri = $CreateVersionAPIURL\n       \n    $versions = Jira-GetVersions -VersionsUri $versionuri -Username $Username -Password $Password\n               \n    $match = $versions | Where name -eq $Version | Select -First 1   \n    \n    If ($match -ne $null)\n    {                      \n\t\t$body = \"{ \"\"update\"\" : { \"\"fixVersions\"\" : [ {\"\"add\"\" : {\"\"name\"\" : \"\"$Version\"\"} } ] } }\"\n        Jira-PostUpdate -IssueUri $uri -Body $body -Username $Username -Password $Password      \n    }    \n    else\n    {\n    \t$body = \"{ \"\"name\"\": \"\"$Version\"\",\t\"\"project\"\": \"\"$ProjectKey\"\"}\"\n     \tJira-CreateVersion -Query $createversionuri -Body $body -Username $Username -Password $Password\n        \n        $body = \"{ \"\"update\"\" : { \"\"fixVersions\"\" : [ {\"\"add\"\" : {\"\"name\"\" : \"\"$Version\"\"} } ] } }\"\n        Jira-PostUpdate -IssueUri $uri -Body $body -Username $Username -Password $Password  \n    }\n}\n\nfunction Jira-UpdateTickets\n{\n    Param (\n        [Uri]$BaseUri,\n        [string]$Username,\n        [string]$Password,\n        [string]$Jql,\n        [string]$Version,\n        [string]$ProjectKey,\n        [System.Uri]$GetVersionsAPIURL,\n        [System.Uri]$CreateVersionAPIURL        \n    );\n\n    $api = New-Object -TypeName System.Uri -ArgumentList $BaseUri, (\"/rest/api/2/search?jql=\" + $Jql)\n    $json = Jira-QueryApi -Query $api -Username $Username -Password $Password\n\n    If ($json.total -eq 0)\n    {\n        Write-Output \"No issues were found that matched your query : $Jql\"\n    }\n    Else\n    {\n        ForEach ($issue in $json.issues)\n        {\n            Jira-UpdateTicket -BaseUri $BaseUri -IssueUri $issue.self -Version $Version -Username $Username -Password $Password -ProjectKey $ProjectKey -GetVersionsAPIURL $GetVersionsAPIURL -CreateVersionAPIURL $CreateVersionAPIURL\n        }\n    }\n}\n\n& {\n    param(\n        [System.Uri]$Uri,\n        [string]$Jql,\n        [string]$Version,\n        [string]$User,\n        [string]$Password,\n        [string]$ProjectKey,\n        [System.Uri]$GetVersionsAPIURL,\n        [System.Uri]$CreateVersionAPIURL\n    )\n\n    Write-Host \"JIRA - Update Version Number\"\n    Write-Host \" Updating Fix Versions to : $Version\"\n\n    try     {\n        Jira-UpdateTickets -BaseUri $Uri -Jql $Jql -Version $Version -Username $User -Password $Password -ProjectKey $ProjectKey -GetVersionsAPIURL $GetVersionsAPIURL -CreateVersionAPIURL $CreateVersionAPIURL\n    } catch {\n        Write-Host -ForegroundColor Red \"An error occurred while attempting to update Fix Versions in JIRA issues\"\n        Write-Host -ForegroundColor Red $_.Exception | Format-List -Force\n    }\n} `\n(Get-Param \"Jira.Version.Url\" -Required) `\n(Get-Param \"Jira.Version.Query\" -Required) `\n(Get-Param \"Jira.Version.Name\" -Required) `\n(Get-Param \"Jira.Version.Username\" -Required) `\n(Get-Param \"Jira.Version.Password\" -Required) `\n(Get-Param \"Jira.Version.ProjectKey\" -Required) `\n(Get-Param \"Jira.Version.GetVersionsAPIURL\" -Required) `\n(Get-Param \"Jira.Version.CreateVersionAPIURL\" -Required)\n"
-  },
-  "Parameters": [
-    {
-      "Id": "4f231879-328a-4ea0-986c-aa6a2abf8e40",
-      "Name": "Jira.Version.Url",
-      "Label": "JIRA URL",
-      "HelpText": "The base URL of the JIRA Server (e.g. https://company.atlassian.net)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b16ac5da-e984-4f46-8cbd-793401be3a9b",
-      "Name": "Jira.Version.Username",
-      "Label": "Username",
-      "HelpText": "The username of the account that will be used to update Jira ticket. The account should have sufficient permissions in JIRA to update ticket.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "056b87ba-930c-4607-81e4-557503daa237",
-      "Name": "Jira.Version.Password",
-      "Label": "Password",
-      "HelpText": "The password of the account.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "458dcb98-1843-41c7-bf22-c451a18aa693",
-      "Name": "Jira.Version.Name",
-      "Label": "Version",
-      "HelpText": "The version that needs to updated to Fix Versions field in Jira ticket. If the version is not found, a new version will be created under respective project",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d7f0fddd-9518-4070-9c78-166b2dc67197",
-      "Name": "Jira.Version.Query",
-      "Label": "JQL",
-      "HelpText": "The JIRA query that should be used to select issues that will be updated with Fix Versions (e.g. status = Completed AND Status = \"Ready for Test Deploy\")",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "30334b2e-db2f-4a3e-878b-511686a58c9f",
-      "Name": "Jira.Version.ProjectKey",
-      "Label": "Project Key",
-      "HelpText": "The project where version to be created",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d858e2de-4dcc-4b1f-bd56-f0cb4d11b347",
-      "Name": "Jira.Version.GetVersionsAPIURL",
-      "Label": "Get Versions API URL",
-      "HelpText": "API URL to get all the versions from a particular project.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9747a96d-788e-45c7-816c-ee1bf91a6665",
-      "Name": "Jira.Version.CreateVersionAPIURL",
-      "Label": "Create Version API URL",
-      "HelpText": "API URL to create version on a particular project.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2019-03-26T19:05:07.140Z",
-    "OctopusVersion": "2018.10.2",
-    "Type": "ActionTemplate"
-  }
-}
\ No newline at end of file
diff --git a/step-templates/json-merge.json b/step-templates/json-merge.json
deleted file mode 100644
index f702a681a..000000000
--- a/step-templates/json-merge.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Id": "6bb1fb50-de38-4380-a5ef-7f21ac3a3e6f",
-  "Name": "JSON - Merge Files",
-  "Description": "Merge JSON files",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "function Get-RequiredParam($Name) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue    \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n\t\tthrow \"Missing parameter value $Name\"\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\nfunction Merge-Objects($file1, $file2) {\r\n    $propertyNames = $($file2 | Get-Member -MemberType *Property).Name\r\n    foreach ($propertyName in $propertyNames) {\r\n\t\t# Check if property already exists\r\n        if ($file1.PSObject.Properties.Match($propertyName).Count) {\r\n            if ($file1.$propertyName.GetType().Name -eq 'PSCustomObject') {\r\n\t\t\t\t# Recursively merge subproperties\r\n                $file1.$propertyName = Merge-Objects $file1.$propertyName $file2.$propertyName\r\n            } else {\r\n\t\t\t\t# Overwrite Property\r\n                $file1.$propertyName = $file2.$propertyName\r\n            }\r\n        } else {\r\n\t\t\t# Add property\r\n            $file1 | Add-Member -MemberType NoteProperty -Name $propertyName -Value $file2.$propertyName\r\n        }\r\n    }\r\n    return $file1\r\n}\r\n\r\nfunction Merge-Json($sourcePath, $transformPath, $failIfTransformMissing, $outputPath) {\r\n\tif(!(Test-Path $sourcePath)) {\r\n\t\tWrite-Host \"Source file $sourcePath does not exist!\"\r\n\t\tExit 1\r\n\t}\r\n\t\r\n\t$sourceObject = (Get-Content -Path $sourcePath -Encoding UTF8) -join \"`n\" | ConvertFrom-Json\r\n\t$mergedObject = $sourceObject\r\n\t\r\n\tif (!(Test-Path $transformPath)) {\r\n\t\tWrite-Host \"Transform file $transformPath does not exist!\"\r\n\t\tif ([System.Convert]::ToBoolean($failIfTransformMissing)) {\r\n\t\t\tExit 1\r\n\t\t}\r\n\t\tWrite-Host 'Source file will be written to output without changes'\r\n\t} else {\r\n\t\tWrite-Host 'Applying transformations'\r\n\t\t$transformObject = (Get-Content -Path $transformPath -Encoding UTF8) -join \"`n\" | ConvertFrom-Json\r\n\t\t$mergedObject = Merge-Objects $sourceObject $transformObject\r\n\t}\r\n\t\r\n\tWrite-Host \"Writing merged JSON to $outputPath...\"\r\n\t$mergedJson = $mergedObject | ConvertTo-Json -Depth 200\r\n\t[System.IO.File]::WriteAllLines($outputPath, $mergedJson)\r\n}\r\n\r\n$ErrorActionPreference = 'Stop'\r\n\r\nif($OctopusParameters -eq $null) {\r\n    Write-Host 'OctopusParameters is null...exiting with 1'\r\n    Exit 1    \r\n}\r\n\r\n$sourceFilePath = Get-RequiredParam 'jmf_SourceFile'\r\n$transformFilePath = Get-RequiredParam 'jmf_TransformFile'\r\n$failIfTransformFileMissing = Get-RequiredParam 'jmf_FailIfTransformFileMissing'\r\n$outputFilePath = Get-RequiredParam 'jmf_OutputFile'\r\n\r\nMerge-Json $sourceFilePath $transformFilePath $failIfTransformFileMissing $outputFilePath"
-  },
-  "Parameters": [
-    {
-      "Id": "ff6ebb11-b388-460b-835e-5cf98ae394ed",
-      "Name": "jmf_SourceFile",
-      "Label": "Source file",
-      "HelpText": "Path to the source file",
-      "DefaultValue": "Required",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "f4695bf4-817a-4029-92b8-3e0c9f7da324",
-      "Name": "jmf_TransformFile",
-      "Label": "Transform file",
-      "HelpText": "Path to the file with the changes",
-      "DefaultValue": "Required",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8b5e7f58-a167-46c9-9260-6c49f4945943",
-      "Name": "jmf_FailIfTransformFileMissing",
-      "Label": "Fail if transform file missing",
-      "HelpText": "Should the script fail if the transformation file is missing?",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "16e43e45-5bc7-4e13-a0d1-4c699cadd259",
-      "Name": "jmf_OutputFile",
-      "Label": "Output file",
-      "HelpText": "Path to the output file",
-      "DefaultValue": "Required",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "jonasjanusauskas",
-  "$Meta": {
-    "ExportedAt": "2019-01-31T13:01:36.386Z",
-    "OctopusVersion": "2018.2.3",
-    "Type": "ActionTemplate"
-  },
-  "Category": "json"
-}
\ No newline at end of file
diff --git a/step-templates/jwt-generate-json-web-token.json b/step-templates/jwt-generate-json-web-token.json
deleted file mode 100644
index 2e45fa40c..000000000
--- a/step-templates/jwt-generate-json-web-token.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "Id": "1ca0401c-dfca-420e-81ca-1f4b7cf02d2d",
-    "Name": "JWT - Generate JSON Web Token",
-    "Description": "Generates a [Json Web Token (JWT)](https://en.wikipedia.org/wiki/JSON_Web_Token) for use with applications that require a JWT token. The resulting JWT will be stored as a [sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) called **JWT**.\n\nA private key needs to be provided that will sign the combined JWT header and payload.\n\nCurrently, the following three signing algorithms are supported:\n\n1. `RS256` - RSASSA-PKCS1-v1_5 using SHA-256\n2. `RS384` - RSASSA-PKCS1-v1_5 using SHA-384\n3. `RS512` - RSASSA-PKCS1-v1_5 using SHA-512\n\nThe default is `RS256`.\n\n**Notes:**\n- Tested on Windows and Linux (PowerShell Core)\n- Tested with Octopus **2020.1**",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$GENERATE_JWT_PRIVATE_KEY = $OctopusParameters[\"Generate.JWT.PrivateKey\"]\n$GENERATE_JWT_ALGORITHM = $OctopusParameters[\"Generate.JWT.Signing.Algorithm\"]\n$GENERATE_JWT_EXPIRES_MINS = $OctopusParameters[\"Generate.JWT.ExpiresAfterMinutes\"]\n\n# Optional \n$GENERATE_JWT_ISSUER = $OctopusParameters[\"Generate.JWT.Issuer\"]\n$GENERATE_JWT_SUBJECT = $OctopusParameters[\"Generate.JWT.Subject\"]\n$GENERATE_JWT_GROUPS = $OctopusParameters[\"Generate.JWT.Groups\"]\n$GENERATE_JWT_AUDIENCE = $OctopusParameters[\"Generate.JWT.Audience\"]\n$GENERATE_JWT_TTL = $OctopusParameters[\"Generate.JWT.TTL\"]\n$GENERATE_JWT_MAX_TTL = $OctopusParameters[\"Generate.JWT.TTL.Max\"]\n$GENERATE_JWT_PRIVATE_CLAIM_NAME = $OctopusParameters[\"Generate.JWT.PrivateClaim.Name\"]\n$GENERATE_JWT_PRIVATE_CLAIM_VALUE = $OctopusParameters[\"Generate.JWT.PrivateClaim.Value\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_KEY)) {\n    throw \"Required parameter Generate.JWT.PrivateKey not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($GENERATE_JWT_ALGORITHM)) {\n    throw \"Required parameter Generate.JWT.Signing.Algorithm not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($GENERATE_JWT_EXPIRES_MINS)) {\n    throw \"Required parameter Generate.JWT.ExpiresAfterMinutes not specified.\"\n}\nif ([string]::IsNullOrWhiteSpace($GENERATE_JWT_AUDIENCE)) {\n    throw \"Required parameter Generate.JWT.Audience not specified.\"\n}\n\n# Optional fields that require validation\nif ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_CLAIM_NAME) -eq $False) {\n    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_CLAIM_VALUE)) {\n        throw \"A private claim name has been specified with no value found in Generate.JWT.PrivateClaim.Value.\"\n    }\n}\n\n# Helper functions\n###############################################################################\n\nfunction ConvertTo-JwtBase64 {\n    param (\n        $Value\n    )\n    if ($Value -is [string]) {\n        $ConvertedValue = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($Value)) -replace '\\+', '-' -replace '/', '_' -replace '='\n    }\n    elseif ($Value -is [byte[]]) {\n        $ConvertedValue = [Convert]::ToBase64String($Value) -replace '\\+', '-' -replace '/', '_' -replace '='\n    }\n\n    return $ConvertedValue\n}\n\n###############################################################################\n\n# Signing functions\n###############################################################################\n\n$RsaPrivateKey_Header = \"-----BEGIN RSA PRIVATE KEY-----\"\n$RsaPrivateKey_Footer = \"-----END RSA PRIVATE KEY-----\"\n$Pkcs8_PrivateKey_Header = \"-----BEGIN PRIVATE KEY-----\"\n$Pkcs8_PrivateKey_Footer = \"-----END PRIVATE KEY-----\"\n\nfunction ExtractPemData {\n    param (\n        [string]$Pem,\n        [string]$Header,\n        [string]$Footer\n    )\n\n    $Start = $Pem.IndexOf($Header) + $Header.Length\n    $End = $Pem.IndexOf($Footer, $Start) - $Start\n    $EncodedPem = ($Pem.Substring($Start, $End).Trim())  -Replace \" \", \"`n\"\n    \n    $PemData = [Convert]::FromBase64String($EncodedPem)\n    return [byte[]]$PemData\n}\n\nfunction DecodeIntSize {\n    param (\n        [System.IO.BinaryReader]$BinaryReader\n    )\n    \n    [byte]$byteValue = $BinaryReader.ReadByte()\n    \n    # If anything other than 0x02, an ASN.1 integer follows.\n    if ($byteValue -ne 0x02) {\n        return 0;\n    }\n    \n    $byteValue = $BinaryReader.ReadByte()\n    # 0x81 == Data size in next byte.\n    if ($byteValue -eq 0x81) { \n        $size = $BinaryReader.ReadByte()\n    }\n    # 0x82 == Data size in next 2 bytes.\n    else {\n        if ($byteValue -eq 0x82) {\n            [byte]$high = $BinaryReader.ReadByte()\n            [byte]$low = $BinaryReader.ReadByte()\n            $byteValues = [byte[]]@($low, $high, 0x00, 0x00)\n            $size = [System.BitConverter]::ToInt32($byteValues, 0)\n        }\n        else {\n            # Otherwise, data size has already been read above.\n            $size = $byteValue\n        }\n    }\n    # Remove high-order zeros in data\n    $byteValue = $BinaryReader.ReadByte()\n    while ($byteValue -eq 0x00) {\n        $byteValue = $BinaryReader.ReadByte()\n        $size -= 1\n    }\n\n    $BinaryReader.BaseStream.Seek(-1, [System.IO.SeekOrigin]::Current) | Out-Null\n    return $size\n}\n\nfunction PadByteArray {\n    param (\n        [byte[]]$Bytes,\n        [int]$Size\n    )\n\n    if ($Bytes.Length -eq $Size) {\n        return $Bytes\n    }\n    if ($Bytes.Length -gt $Size) {\n        throw \"Specified size '$Size' to pad is too small for byte array of size '$($Bytes.Length)'.\"\n    }\n\n    [byte[]]$PaddedBytes = New-Object Byte[] $Size\n    [System.Array]::Copy($Bytes, 0, $PaddedBytes, $Size - $bytes.Length, $bytes.Length) | Out-Null\n    return $PaddedBytes\n}\n\nfunction Compare-ByteArrays {\n    param (\n        [byte[]]$First,\n        [byte[]]$Second\n    )\n    if ($First.Length -ne $Second.Length) {\n        return $False\n    }\n    [int]$i = 0\n    foreach ($byte in $First) {\n        if ($byte -ne $Second[$i]) {\n            return $False\n        }\n        $i = $i + 1\n    }\n    return $True\n}\n\nfunction CreateRSAFromPkcs8 {\n    param (\n        [byte[]]$KeyBytes\n    )\n    Write-Verbose \"Reading RSA Pkcs8 private key bytes\"\n\n    # The encoded OID sequence for PKCS #1 rsaEncryption szOID_RSA_RSA = \"1.2.840.113549.1.1.1\"\n    # this byte[] includes the sequence byte and terminal encoded null \n    [byte[]]$SeqOID = 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00\n    [byte[]]$Seq = New-Object byte[] 15\n\n    # Have to wrap $KeyBytes in another array :|\n    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) \n    $reader = New-Object System.IO.BinaryReader($MemoryStream)\n    $StreamLength = [int]$MemoryStream.Length\n    \n    try {\n        [UInt16]$Bytes = $reader.ReadUInt16()\n\n        if ($Bytes -eq 0x8130) {\n            $reader.ReadByte() | Out-Null\n        }\n        elseif ($Bytes -eq 0x8230) {\n            $reader.ReadInt16() | Out-Null\n        }\n        else {\n            return $null\n        }\n        \n        [byte]$byteValue = $reader.ReadByte()\n\n        if ($byteValue -ne 0x02) {\n            return $null\n        }\n\n        $Bytes = $reader.ReadUInt16()\n\n        if ($Bytes -ne 0x0001) {\n            return $null\n        }\n\n        # Read the Sequence OID\n        $Seq = $reader.ReadBytes(15)\n        $SequenceMatches = Compare-ByteArrays -First $Seq -Second $SeqOID\n        if ($SequenceMatches -eq $False) {\n            Write-Verbose \"Sequence OID doesnt match\"\n            return $null\n        }\n\n        $byteValue = $reader.ReadByte()\n        # Next byte should be a Octet string\n        if ($byteValue -ne 0x04) {\n            return $null\n        }\n        # Read next byte / 2 bytes. \n        # Should be either: 0x81 or 0x82; otherwise it's the byte count.\n        $byteValue = $reader.ReadByte()\n        if ($byteValue -eq 0x81) {\n            $reader.ReadByte() | Out-Null\n        }\n        else {\n            if ($byteValue -eq 0x82) {\n                $reader.ReadUInt16() | Out-Null\n            }\n        }\n\n        # Remaining sequence *should* be the RSA Pkcs1 private Key bytes\n        [byte[]]$RsaKeyBytes = $reader.ReadBytes([int]($StreamLength - $MemoryStream.Position))\n        Write-Verbose \"Attempting to create RSA object from remaining Pkcs1 bytes\"\n        $rsa = CreateRSAFromPkcs1 -KeyBytes $RsaKeyBytes\n        return $rsa\n    }\n    catch {\n        Write-Warning \"CreateRSAFromPkcs8: Exception occurred - $($_.Exception.Message)\"\n        return $null\n    }\n    finally {\n        if ($null -ne $reader) { $reader.Close() }\n        if ($null -ne $MemoryStream) { $MemoryStream.Close() }\n    }\n}\n\nfunction CreateRSAFromPkcs1 {\n    param (\n        [byte[]]$KeyBytes\n    )\n    Write-Verbose \"Reading RSA Pkcs1 private key bytes\"\n    # Have to wrap $KeyBytes in another array :|\n    $MemoryStream = New-Object System.IO.MemoryStream(, $KeyBytes) \n    $reader = New-Object System.IO.BinaryReader($MemoryStream)\n    try {\n               \n        [UInt16]$Bytes = $reader.ReadUInt16()\n\n        if ($Bytes -eq 0x8130) {\n            $reader.ReadByte() | Out-Null\n        }\n        elseif ($Bytes -eq 0x8230) {\n            $reader.ReadInt16() | Out-Null\n        }\n        else {\n            return $null\n        }\n    \n        $Bytes = $reader.ReadUInt16()\n        if ($Bytes -ne 0x0102) {\n            return $null\n        }\n    \n        [byte]$byteValue = $reader.ReadByte()\n        if ($byteValue -ne 0x00) {\n            return $null\n        }\n\n        # Private key parameters are integer sequences.\n        # For a summary of the RSA Parameters fields, \n        # See https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.rsaparameters#summary-of-fields\n        \n        $Modulus_Size = DecodeIntSize -BinaryReader $reader\n        $Modulus = $reader.ReadBytes($Modulus_Size)\n\n        $E_Size = DecodeIntSize -BinaryReader $reader\n        $E = $reader.ReadBytes($E_Size)\n\n        $D_Size = DecodeIntSize -BinaryReader $reader\n        $D = $reader.ReadBytes($D_Size)\n\n        $P_Size = DecodeIntSize -BinaryReader $reader\n        $P = $reader.ReadBytes($P_Size)\n\n        $Q_Size = DecodeIntSize -BinaryReader $reader\n        $Q = $reader.ReadBytes($Q_Size)\n\n        $DP_Size = DecodeIntSize -BinaryReader $reader\n        $DP = $reader.ReadBytes($DP_Size)\n\n        $DQ_Size = DecodeIntSize -BinaryReader $reader\n        $DQ = $reader.ReadBytes($DQ_Size)\n\n        $IQ_Size = DecodeIntSize -BinaryReader $reader\n        $IQ = $reader.ReadBytes($IQ_Size)\n\n        $rsa = New-Object System.Security.Cryptography.RSACryptoServiceProvider\n        $rsaParameters = New-Object System.Security.Cryptography.RSAParameters\n        $rsaParameters.Modulus = $Modulus\n        $rsaParameters.Exponent = $E\n        $rsaParameters.P = $P\n        $rsaParameters.Q = $Q\n        # Some RSAParameter values dont play well with byte buffers having leading zeroes removed.\n        $rsaParameters.D = PadByteArray -Bytes $D -Size $Modulus.Length\n        $rsaParameters.DP = PadByteArray -Bytes $DP -Size $P.Length\n        $rsaParameters.DQ = PadByteArray -Bytes $DQ -Size $Q.Length\n        $rsaParameters.InverseQ = PadByteArray -Bytes $IQ -Size $Q.Length\n        $rsa.ImportParameters($rsaParameters)\n\n        Write-Verbose \"Completed RSA object creation\"\n        return $rsa\n    }\n    catch {\n        Write-Warning \"CreateRSA-FromPkcs1: Exception occurred - $($_.Exception.Message)\"\n        return $null\n    }\n    finally {\n        if ($null -ne $reader) { $reader.Close() }\n        if ($null -ne $MemoryStream) { $MemoryStream.Close() }\n    }\n}\n\nfunction CreateSigningKey {\n    param (\n        [string]$Key\n    )\n    try {\n        $Key = $Key.Trim()\n        switch -Wildcard($Key) {\n            \"$Pkcs8_PrivateKey_Header*\" {\n                $KeyBytes = ExtractPemData -PEM $Key -Header $Pkcs8_PrivateKey_Header -Footer $Pkcs8_PrivateKey_Footer\n                $SigningKey = CreateRSAFromPkcs8 -KeyBytes $KeyBytes\n                return $SigningKey\n            }\n            \"$RsaPrivateKey_Header*\" {\n                $KeyBytes = ExtractPemData -PEM $Key -Header $RsaPrivateKey_Header -Footer $RsaPrivateKey_Footer\n                $SigningKey = CreateRSAFromPkcs1 -KeyBytes $KeyBytes\n                return $SigningKey\n            }\n            default {\n                Write-Verbose \"The PEM header could not be found. Accepted headers: 'BEGIN PRIVATE KEY', 'BEGIN RSA PRIVATE KEY'\"\n                return $null\n            }\n        }\n    }\n    catch {\n        Write-Warning \"Couldn't create signing key: $($_.Exception.Message)\"\n        return $null\n    }\n}\n\n###############################################################################\n\n# Local variables\n$audiences = @()\nif (![string]::IsNullOrWhiteSpace($GENERATE_JWT_AUDIENCE)) {\n    @(($GENERATE_JWT_AUDIENCE -Split \"`n\").Trim()) | ForEach-Object {\n        if (![string]::IsNullOrWhiteSpace($_)) {\n            $audiences += $_\n        }\n    }\n}\n\n$groups = @()\nif (![string]::IsNullOrWhiteSpace($GENERATE_JWT_GROUPS)) {\n    @(($GENERATE_JWT_GROUPS -Split \"`n\").Trim()) | ForEach-Object {\n        if (![string]::IsNullOrWhiteSpace($_)) {\n            $groups += $_\n        }\n    }\n}\n\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$OutputVariableName = \"JWT\"\n\nWrite-Verbose \"Generate.JWT.Signing.Algorithm: $GENERATE_JWT_ALGORITHM\"\nWrite-Verbose \"Generate.JWT.ExpiresAfterMinutes: $GENERATE_JWT_EXPIRES_MINS\"\nWrite-Verbose \"Generate.JWT.Issuer: $GENERATE_JWT_ISSUER\"\nWrite-Verbose \"Generate.JWT.Subject: $GENERATE_JWT_SUBJECT\"\nWrite-Verbose \"Generate.JWT.Audience(s): $($audiences -Join \",\")\"\nWrite-Verbose \"Generate.JWT.Group(s): $($groups -Join \",\")\"\nWrite-Verbose \"Generate.JWT.TTL: $GENERATE_JWT_TTL\"\nWrite-Verbose \"Generate.JWT.TTL.Max: $GENERATE_JWT_MAX_TTL\"\nWrite-Verbose \"Generate.JWT.PrivateClaim.Name: $GENERATE_JWT_PRIVATE_CLAIM_NAME\"\nWrite-Verbose \"Generate.JWT.PrivateClaim.Value: $GENERATE_JWT_PRIVATE_CLAIM_VALUE\"\nWrite-Verbose \"Step Name: $StepName\"\n\ntry {\n\n    # Created + Expires\n    $Created = (Get-Date).ToUniversalTime()\n    $Expires = $Created.AddMinutes([int]$GENERATE_JWT_EXPIRES_MINS)\n\n    $createDate = [Math]::Floor([decimal](Get-Date($Created) -UFormat \"%s\"))\n    $expiryDate = [Math]::Floor([decimal](Get-Date($Expires) -UFormat \"%s\"))\n\n    $JwtHeader = @{\n        alg = $GENERATE_JWT_ALGORITHM;\n        typ = \"JWT\";\n    } | ConvertTo-Json -Compress\n    \n    $JwtPayload = [Ordered]@{\n        iat = [long]$createDate;\n        exp = [long]$expiryDate;\n    }\n\n    # Check for optional issuer: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.1\n    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_ISSUER) -eq $False) {\n        $JwtPayload | Add-Member -NotePropertyName iss -NotePropertyValue $GENERATE_JWT_ISSUER\n    }\n\n    # Check for optional subject: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.2\n    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_SUBJECT) -eq $False) {\n        $JwtPayload | Add-Member -NotePropertyName sub -NotePropertyValue $GENERATE_JWT_SUBJECT\n    }\n\n    # Check for optional audience: https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3\n    if ($audiences.Length -gt 0) {\n        $JwtPayload | Add-Member -NotePropertyName aud -NotePropertyValue $audiences\n    }\n    # Check for optional \"groups\" field\n    if ($groups.Length -gt 0) {\n        $JwtPayload | Add-Member -NotePropertyName groups -NotePropertyValue $groups\n    }\n\n    # Check for optional ttl field\n    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_TTL) -eq $False) {\n        $JwtPayload | Add-Member -NotePropertyName ttl -NotePropertyValue $GENERATE_JWT_TTL\n    }\n    # Check for optional max_ttl field\n    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_MAX_TTL) -eq $False) {\n        $JwtPayload | Add-Member -NotePropertyName max_ttl -NotePropertyValue $GENERATE_JWT_MAX_TTL\n    }\n\n    # Check for an optional private claim name and value: https://datatracker.ietf.org/doc/html/rfc7519#section-4.3\n    if ([string]::IsNullOrWhiteSpace($GENERATE_JWT_PRIVATE_CLAIM_NAME) -eq $False) {\n        $JwtPayload | Add-Member -NotePropertyName $GENERATE_JWT_PRIVATE_CLAIM_NAME -NotePropertyValue $GENERATE_JWT_PRIVATE_CLAIM_VALUE\n    } \n\n    $JwtPayload = $JwtPayload | ConvertTo-Json -Compress\n\n    $base64Header = ConvertTo-JwtBase64 -Value $JwtHeader\n    $base64Payload = ConvertTo-JwtBase64 -Value $JwtPayload\n\n    $Jwt = $base64Header + '.' + $base64Payload\n\n    $JwtBytes = [System.Text.Encoding]::UTF8.GetBytes($Jwt)\n    $JwtSignature = $null\n    \n    switch ($GENERATE_JWT_ALGORITHM) {\n        \"RS256\" {\n            try { \n\n                $rsa = CreateSigningKey -Key $GENERATE_JWT_PRIVATE_KEY\n                if ($null -eq $rsa) {\n                    throw \"Couldn't create RSA object\"\n                }\n                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA256, [Security.Cryptography.RSASignaturePadding]::Pkcs1) \n                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature\n            }\n            catch { throw \"Signing with SHA256 and Pkcs1 padding failed using private key: $($_.Exception.Message)\" }\n            finally { if ($null -ne $rsa) { $rsa.Dispose() } }\n            \n        }\n        \"RS384\" {\n            try { \n                $rsa = CreateSigningKey -Key $GENERATE_JWT_PRIVATE_KEY\n                if ($null -eq $rsa) {\n                    throw \"Couldn't create RSA object\"\n                }\n                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA384, [Security.Cryptography.RSASignaturePadding]::Pkcs1) \n                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature\n            }\n            catch { throw \"Signing with SHA384 and Pkcs1 padding failed using private key: $($_.Exception.Message)\" }\n            finally { if ($null -ne $rsa) { $rsa.Dispose() } }\n        }\n        \"RS512\" {\n            try { \n                $rsa = CreateSigningKey -Key $GENERATE_JWT_PRIVATE_KEY\n                if ($null -eq $rsa) {\n                    throw \"Couldn't create RSA object\"\n                }\n                $Signature = $rsa.SignData($JwtBytes, [Security.Cryptography.HashAlgorithmName]::SHA512, [Security.Cryptography.RSASignaturePadding]::Pkcs1) \n                $JwtSignature = ConvertTo-JwtBase64 -Value $Signature\n            }\n            catch { throw \"Signing with SHA512 and Pkcs1 padding failed using private key: $($_.Exception.Message)\" }\n            finally { if ($null -ne $rsa) { $rsa.Dispose() } }\n        }\n        default {\n            throw \"The algorithm is not one of the supported: 'RS256', 'RS384', 'RS512'\"\n        }\n    }\n    if ([string]::IsNullOrWhiteSpace($JwtSignature) -eq $True) {\n        throw \"JWT signature empty.\"\n    }\n\n    $Jwt = \"$Jwt.$JwtSignature\"\n    Set-OctopusVariable -Name $OutputVariableName -Value $Jwt -Sensitive\n    Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}\"\n}\ncatch {\n    $ExceptionMessage = $_.Exception.Message\n    $Message = \"An error occurred generating a JWT: $ExceptionMessage\"\n    Write-Error $Message -Category InvalidResult\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "71bacc82-21d7-4d08-a944-15dacd0a3405",
-        "Name": "Generate.JWT.PrivateKey",
-        "Label": "Private key used to sign the JWT",
-        "HelpText": "Provide the private key in PEM format to be used to sign the JWT.\n\nAccepted headers: \n\n- `----BEGIN RSA PRIVATE KEY-----`\n- `-----BEGIN PRIVATE KEY----`\n\n**Note:** It's recommended to use a sensitive variable to provide this value. If you instead enter the private key directly, the step template will attempt to detect this by replacing spaces with new lines ``n`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "84759ecc-a3f6-4822-a678-833269a8bf0d",
-        "Name": "Generate.JWT.Signing.Algorithm",
-        "Label": "JWT signing algorithm",
-        "HelpText": "The JWA [algorithm](https://datatracker.ietf.org/doc/html/rfc7518#section-3.1) to use when signing the JWT. The default is `RS256` (RSASSA-PKCS1-v1_5 using SHA-256).\n\nThis value is also used for the `alg` [algorithm header](https://datatracker.ietf.org/doc/html/rfc7515#section-4.1.1).",
-        "DefaultValue": "RS256",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "RS256|RS256: RSASSA-PKCS1-v1_5 using SHA-256\nRS384|RS384: RSASSA-PKCS1-v1_5 using SHA-384\nRS512|RS512: RSASSA-PKCS1-v1_5 using SHA-512"
-        }
-      },
-      {
-        "Id": "76d289c5-f6f9-4cfb-b876-13515745f03f",
-        "Name": "Generate.JWT.ExpiresAfterMinutes",
-        "Label": "JWT expiry time in minutes",
-        "HelpText": "The number of minutes after the JWT is created that it expires. This value is used for the `exp` [expiration time claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4). The default is `20` minutes.",
-        "DefaultValue": "20",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "20d57320-15e4-4777-916b-8563192a326d",
-        "Name": "Generate.JWT.Issuer",
-        "Label": "JWT Issuer (optional)",
-        "HelpText": "*Optional* - The `iss` [isuer claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.1) identifies the principal that issued the JWT.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e7026958-60cb-4652-9fe0-2ef2965de951",
-        "Name": "Generate.JWT.Subject",
-        "Label": "JWT Subject (optional)",
-        "HelpText": "*Optional* subject (`sub`) of the JWT.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "12a68971-8e0b-4b90-9a27-4c81413d0fb7",
-        "Name": "Generate.JWT.Audience",
-        "Label": "Audience claims (optional)",
-        "HelpText": "*Optional* - The `aud` [audience claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.3) identifies the recipients that the JWT is intended for. This is typically the base address of the resource being accessed, such as `https://example-domain.com`\n\n*Note:* \n- For multiple audiences, enter each entry on a new line. \n- Any entries that are an empty string will be ignored.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "1bd2294c-64a3-4dad-bb9f-1a4cce5eaff5",
-        "Name": "Generate.JWT.Groups",
-        "Label": "Group claims (optional)",
-        "HelpText": "*Optional* - A `groups` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies groups associated with this JWT. \n\n*Note:* \n- For multiple groups, enter each entry on a new line. \n- Any entries that are an empty string will be ignored.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "cdc3fe41-4669-48c8-8e65-1265faa79361",
-        "Name": "Generate.JWT.TTL",
-        "Label": "TTL claim (optional)",
-        "HelpText": "*Optional* - A `ttl` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies the time-to-live for the JWT.\n\nThis value can be useful when authenticating with a Secrets Manager and the `ttl` value is mapped through to a resulting token used for authentication.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "51b2ec44-1a8d-43ce-8e06-4d0262eed45e",
-        "Name": "Generate.JWT.TTL.Max",
-        "Label": "Max TTL claim (optional)",
-        "HelpText": "*Optional* - A `max_ttl` [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that identifies the time-to-live for the JWT.\n\nThis value can be useful when authenticating with a Secrets Manager and the `max_ttl` value is mapped through to a resulting token used for authentication.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "028ec077-a40f-4aa3-8099-2e873ab710a5",
-        "Name": "Generate.JWT.PrivateClaim.Name",
-        "Label": "Custom private claim name (optional)",
-        "HelpText": "*Optional* - The name of a custom [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) that can be included in this JWT. \n\n**Note:** \n\n- Don't include the value for the private claim. Set the value in the `Generate.JWT.PrivateClaim.Value` parameter instead.\n- If this value is null or an empty string, the private claim won't be added to the JWT payload.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "84a50912-284b-4c8a-bfee-87cd7cbc527e",
-        "Name": "Generate.JWT.PrivateClaim.Value",
-        "Label": "Custom private claim value (optional)",
-        "HelpText": "*Optional* - The value for the custom [private claim](https://datatracker.ietf.org/doc/html/rfc7519#section-4.3) as specified in the parameter `Generate.JWT.PrivateClaim.Name` to be included in this JWT.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedAt": "2021-08-09T11:51:09.772Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-        "ExportedAt": "2021-08-09T11:51:09.772Z",
-        "OctopusVersion": "2020.1.7316",
-        "Type": "ActionTemplate"
-    },
-    "Category": "jwt"
-  }
\ No newline at end of file
diff --git a/step-templates/k8s-create-serviceaccount-and-target.json b/step-templates/k8s-create-serviceaccount-and-target.json
deleted file mode 100644
index fed926e0d..000000000
--- a/step-templates/k8s-create-serviceaccount-and-target.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "Id": "05d2d9a8-3862-49ff-97d6-5f08935f6fa3",
-  "Name": "Kubernetes - Create Service Account and Target",
-  "Description": "Create a service account with a role granting full access to everything in the namespace, and create a Kubernetes target with the new account in Octopus",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 14,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if ([string]::IsNullOrWhitespace($CreateK8sTargetNamespace)) {\n\tWrite-Error \"The namespace variable must be defined\"\n    exit 1\n}\n\nif ([string]::IsNullOrWhitespace($CreateK8sTargetRole)) {\n\tWrite-Error \"The role variable must be defined\"\n    exit 1\n}\n\n$target = if ([string]::IsNullOrEmpty($CreateK8sTargetName)) {\"$($CreateK8sTargetNamespace)-k8s\"} else {$CreateK8sTargetName}\n$serviceaccount = \"$($CreateK8sTargetNamespace)-deployer\"\n$rolename = \"$($CreateK8sTargetNamespace)-deployer-role\"\n$binding = \"$($CreateK8sTargetNamespace)-deployer-binding\"\n\n$count = (kubectl get namespaces -o json |\n\tConvertFrom-JSON |\n    Select-Object -ExpandProperty items |\n    ? {$_.metadata.name -eq $CreateK8sTargetNamespace}).Count\n    \nif ($count -eq 0) {\n  Set-Content -Path namespace.yaml -Value @\"\n  apiVersion: v1\n  kind: Namespace\n  metadata:\n    name: $CreateK8sTargetNamespace\n\"@\n\n  if (![string]::IsNullOrWhitespace($CreateK8sTargetNamespaceAnnotations)) {\n  \tAdd-Content -Path namespace.yaml -Value @\"\n    annotations:\n\"@\n\t$annotations = ($CreateK8sTargetNamespaceAnnotations -split '\\r?\\n').Trim()\n    foreach ($annotation in $annotations) {\n        Add-Content -Path namespace.yaml -Value @\"\n      $annotation\n\"@\n    }\n  }\n\n  kubectl apply -f namespace.yaml\n}\n\nSet-Content -Path serviceaccount.yaml -Value @\"\napiVersion: v1\nkind: ServiceAccount\nmetadata:\n  name: $serviceaccount\n  namespace: $CreateK8sTargetNamespace \n---\nkind: Role\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n  namespace: $CreateK8sTargetNamespace \n  name: $rolename\nrules:\n- apiGroups: [\"*\"]\n  resources: [\"*\"]\n  verbs: [\"*\"]\n---\nkind: RoleBinding\napiVersion: rbac.authorization.k8s.io/v1\nmetadata:\n  name: $binding\n  namespace: $CreateK8sTargetNamespace \nsubjects:\n- kind: ServiceAccount\n  name: $serviceaccount\n  apiGroup: \"\"\nroleRef:\n  kind: Role\n  name: $rolename\n  apiGroup: \"\"\n\"@\n\nkubectl apply -f serviceaccount.yaml\n \nSet-Content -Path secret.yaml -Value @\"\napiVersion: v1\nkind: Secret\ntype: kubernetes.io/service-account-token\nmetadata:\n  name: $serviceaccount\n  namespace: $CreateK8sTargetNamespace\n  annotations:\n    kubernetes.io/service-account.name: \"$serviceaccount\"\n\"@\n\nkubectl apply -f secret.yaml\n\n$data = kubectl get secret $serviceaccount -o jsonpath=\"{.data.token}\" --namespace=$CreateK8sTargetNamespace \n\n$token = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($data))\n$url = (kubectl config view -o json | ConvertFrom-Json).clusters[0].cluster.server\n\nNew-OctopusTokenAccount -Name $target -token $token -updateIfExisting\n\nif ([string]::IsNullOrEmpty(\"#{Octopus.Action.Kubernetes.CertificateAuthority}\") -or \"#{Octopus.Action.Kubernetes.AksAdminLogin}\" -ieq \"True\") {\n\tNew-OctopusKubernetesTarget `\n\t\t-name $target `\n\t\t-clusterUrl $url `\n\t\t-octopusRoles $CreateK8sTargetRole `\n\t\t-octopusAccountIdOrName $target `\n\t\t-namespace $CreateK8sTargetNamespace `\n\t\t-updateIfExisting `\n\t\t-skipTlsVerification True `\n\t\t-octopusDefaultWorkerPoolIdOrName \"#{Octopus.WorkerPool.Id}\" `\n        -healthCheckContainerImageFeedIdOrName \"$CreateK8sTargetContainerImageFeed\" `\n    \t-healthCheckContainerImage \"$CreateK8sTargetContainerImage\"\n} else {\n\tNew-OctopusKubernetesTarget `\n\t\t-name $target `\n\t\t-clusterUrl $url `\n\t\t-octopusRoles $CreateK8sTargetRole `\n\t\t-octopusAccountIdOrName $target `\n\t\t-namespace $CreateK8sTargetNamespace `\n\t\t-updateIfExisting `\n        -octopusServerCertificateIdOrName \"#{Octopus.Action.Kubernetes.CertificateAuthority}\" `\n\t\t-octopusDefaultWorkerPoolIdOrName \"#{Octopus.WorkerPool.Id}\" `\n        -healthCheckContainerImageFeedIdOrName \"$CreateK8sTargetContainerImageFeed\" `\n    \t-healthCheckContainerImage \"$CreateK8sTargetContainerImage\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "66047c5e-8827-4bce-85ef-98466e656d0e",
-      "Name": "CreateK8sTargetName",
-      "Label": "Target name",
-      "HelpText": "The optional name of the target. Defaults to \"<namespace>-k8s\" if no value is defined.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1505ab59-1b6b-497e-9aa5-888f583c2cb2",
-      "Name": "CreateK8sTargetRole",
-      "Label": "Target Role",
-      "HelpText": "The role to assign to the new Kubernetes target",
-      "DefaultValue": "k8s",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e0dc3fc2-b422-4b27-8353-efee0233cf7f",
-      "Name": "CreateK8sTargetNamespace",
-      "Label": "Target Namespace",
-      "HelpText": "The namespace that the service account is granted access to, as well as the default namespace on the target.",
-      "DefaultValue": "#{Octopus.Environment.Name | ToLower}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "34a94173-611f-4cbf-b30a-66fb9456d1cf",
-      "Name": "CreateK8sTargetNamespaceAnnotations",
-      "Label": "Namespace annotations",
-      "HelpText": "An optional list of annotations to apply to the namespace",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "f14880f9-5a57-4469-85d7-5e68e090ed43",
-      "Name": "CreateK8sTargetContainerImageFeed",
-      "Label": "Container Image Feed",
-      "HelpText": "The optional name of the Docker feed where the container image is sourced from.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8d8d4317-af86-4a2a-9c04-eef1d8624e4a",
-      "Name": "CreateK8sTargetContainerImage",
-      "Label": "Container image",
-      "HelpText": "The optional name of the health check container image.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2023-03-07T11:26:30.753Z",
-    "OctopusVersion": "2023.1.9608",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "isaaccalligeros",
-  "Category": "k8s"
-}
diff --git a/step-templates/k8s-inspect-resource-pwsh.json b/step-templates/k8s-inspect-resource-pwsh.json
deleted file mode 100644
index 3b5a9783d..000000000
--- a/step-templates/k8s-inspect-resource-pwsh.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "53fe7e02-d003-4860-bf15-1122a128d7c0",
-  "Name": "Kubernetes - Inspect Resources",
-  "Category": "k8s",
-  "LastModifiedBy": "mcasperson",
-  "Description": "Inspect K8S resources with common actions like get, describe and logs. Optionally create artifacts containing the output.",
-  "ActionType": "Octopus.KubernetesRunScript",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "<#\n    This script provides a general purpose method for querying Kubernetes resources. It supports common operations\n    like get, describe, logs and output formats like yaml and json. Output can be captured as artifacts.\n#>\n\n<#\n.Description\nExecute an application, capturing the output. Based on https://stackoverflow.com/a/33652732/157605\n#>\nFunction Execute-Command ($commandPath, $commandArguments)\n{\n  Write-Host \"Executing: $commandPath $($commandArguments -join \" \")\"\n  \n  Try {\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n    [pscustomobject]@{\n        stdout = $p.StandardOutput.ReadToEnd()\n        stderr = $p.StandardError.ReadToEnd()\n        ExitCode = $p.ExitCode\n    }\n    $p.WaitForExit()\n  }\n  Catch {\n     exit\n  }\n}\n\n<#\n.Description\nFind any resource names that match a wildcard input if one was specified\n#>\nfunction Get-Resources() \n{\n    $names = $OctopusParameters[\"K8SInspectNames\"] -Split \"`n\" | % {$_.Trim()}\n    \n    if ($OctopusParameters[\"K8SInspectNames\"] -match '\\*' )\n    {\n        return Execute-Command kubectl (@(\"-o\", \"json\", \"get\", $OctopusParameters[\"K8SInspectResource\"])) |\n            # Select the stdout property from the execution\n            Select-Object -ExpandProperty stdout |\n            # Convert the output from JSON\n            ConvertFrom-JSON | \n            # Get the items object from the kubectl response\n            % {if ((Get-Member -InputObject $_ -Name items).Count -ne 0) {Select-Object -InputObject $_ -ExpandProperty items} else {$_}} |\n            # Extract the name\n            % {$_.metadata.name} |\n            # Find any matching resources\n            ? {$k8sName = $_; ($names | ? {$k8sName -like $_}).Count -ne 0}\n    }\n    else\n    {\n        return $names\n    }\n}\n\n<#\n.Description\nGet the kubectl arguments for a given action\n#>\nfunction Get-KubectlVerb() \n{\n    switch($OctopusParameters[\"K8SInspectKubectlVerb\"])\n    {\n        \"get json\" {return ,@(\"-o\", \"json\", \"get\")}\n        \"get yaml\" {return ,@(\"-o\", \"yaml\", \"get\")}\n        \"describe\" {return ,@(\"describe\")}\n        \"logs\" {return ,@(\"logs\")}\n        \"logs tail\" {return ,@(\"logs\", \"--tail\", \"100\")}\n        \"previous logs\" {return ,@(\"logs\", \"--previous\")}\n        \"previous logs tail\" {return ,@(\"logs\", \"--previous\", \"--tail\", \"100\")}\n        default {return ,@(\"get\")}\n    }\n}\n\n<#\n.Description\nGet an appropiate file extension based on the selected action\n#>\nfunction Get-ArtifactExtension() \n{\n   switch($OctopusParameters[\"K8SInspectKubectlVerb\"])\n    {\n        \"get json\" {\"json\"}\n        \"get yaml\" {\"yaml\"}\n        default {\"txt\"}\n    }\n}\n\nif ($OctopusParameters[\"K8SInspectKubectlVerb\"] -like \"*logs*\") \n{\n    if ( -not @($OctopusParameters[\"K8SInspectResource\"]) -like \"pod*\")\n    {\n        Write-Error \"Logs can only be returned for pods, not $($OctopusParameters[\"K8SInspectResource\"])\"\n    }\n    else\n    {\n        Execute-Command kubectl (@(\"-o\", \"json\", \"get\", \"pods\") + (Get-Resources)) |\n            # Select the stdout property from the execution\n            Select-Object -ExpandProperty stdout |\n            # Convert the output from JSON\n            ConvertFrom-JSON | \n            # Get the items object from the kubectl response\n            % {if ((Get-Member -InputObject $_ -Name items).Count -ne 0) {Select-Object -InputObject $_ -ExpandProperty items} else {$_}} |\n            # Get the pod logs for each container\n            % {\n                $podDetails = $_\n                @{\n                    logs=$podDetails.spec.containers | % {$logs=\"\"} {$logs += (Select-Object -InputObject (Execute-Command kubectl ((Get-KubectlVerb) + @($podDetails.metadata.name, \"-c\", $_.name))) -ExpandProperty stdout)} {$logs}; \n                    name=$podDetails.metadata.name\n                }                \n            } |\n            # Write the output\n            % {Write-Host $_.logs; $_} |\n            # Optionally capture the artifact\n            % {\n                if ($OctopusParameters[\"K8SInspectCreateArtifact\"] -ieq \"true\") \n                {\n                    Set-Content -Path \"$($_.name).$(Get-ArtifactExtension)\" -Value $_.logs\n                    New-OctopusArtifact \"$($_.name).$(Get-ArtifactExtension)\"\n                }\n            }\n    }      \n}\nelse\n{\n    Execute-Command kubectl ((Get-KubectlVerb) + @($OctopusParameters[\"K8SInspectResource\"]) + (Get-Resources)) |\n        % {Select-Object -InputObject $_ -ExpandProperty stdout} |\n        % {Write-Host $_; $_} |\n        % {\n            if ($OctopusParameters[\"K8SInspectCreateArtifact\"] -ieq \"true\") \n            {\n                Set-Content -Path \"output.$(Get-ArtifactExtension)\" -Value $_\n                New-OctopusArtifact \"output.$(Get-ArtifactExtension)\"\n            }\n        }\n}\n",
-    "Octopus.Action.KubernetesContainers.Namespace": "#{if K8SInspectNamespace}#{K8SInspectNamespace}#{/if}#{unless K8SInspectNamespace}#{Octopus.Action.Kubernetes.Namespace}#{/unless}"
-  },
-  "Parameters": [
-    {
-      "Id": "8a1ebc8c-ddf3-42bb-be49-9b36ee417f5d",
-      "Name": "K8SInspectResource",
-      "Label": "Resource",
-      "HelpText": "The type of Kubernetes resource to inspect. The list provided is not comprehensive, and any resource can be used if the field is bound.",
-      "DefaultValue": "pod",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "pod|Pod\nservice|Service\ningress|Ingress\ndeployment|Deployment\nstatefulset|StatefulSet\ndaemonset|DaemonSet\nreplicaset|ReplicaSet\nconfigmap|ConfigMap\nsecret|Secret\nnode|Node\nvirtualservice|VirtualService\ngateway|Gateway\npersistentvolume|PersistentVolume\nserviceaccount|Service Account\nrolebinding|Role Binding\nclusterrolebinding|Cluster Role Binding\nrole|Role\nclusterrole|Cluster Role"
-      }
-    },
-    {
-      "Id": "735e2fa4-4f9a-4183-aafe-653f3f6fb103",
-      "Name": "K8SInspectKubectlVerb",
-      "Label": "Kubectl Verb",
-      "HelpText": "The action used to inspect the Kubernetes resource.",
-      "DefaultValue": "get",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "get|Get\nget json|Get JSON\nget yaml|Get YAML\nlogs|Pod Logs\nlogs tail|Pod Logs Tail\nprevious logs|Previous Pod Logs\nprevious logs tail|Previous Pod Logs Tail\ndescribe|Describe"
-      }
-    },
-    {
-      "Id": "9c9dcd65-07eb-4e7d-a61a-370d35d1cf76",
-      "Name": "K8SInspectNames",
-      "Label": "Resource Names",
-      "HelpText": "An optional line break separated list of resources to inspect. If left blank, all resources are inspected. An asterisk can be used as a wildcard.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "4805afba-9ff9-45a6-b2c2-764c2d0e5240",
-      "Name": "K8SInspectCreateArtifact",
-      "Label": "Create Artifact",
-      "HelpText": "Check this to create an artifact capturing the output of the kubectl command.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "da70800b-0ec2-4bef-918c-08ef88c9f411",
-      "Name": "K8SInspectNamespace",
-      "Label": "Namespace",
-      "HelpText": "The Kubernetes namespace to inspect. Leave blank to use the default namespace of the Kubernetes target.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-04-22T01:41:35.012Z",
-    "OctopusVersion": "2020.2.4-ci0070",
-    "Type": "ActionTemplate"
-  }
-}
diff --git a/step-templates/keeper-secretsmanager-retrieve-secrets.json b/step-templates/keeper-secretsmanager-retrieve-secrets.json
deleted file mode 100644
index 43658ea23..000000000
--- a/step-templates/keeper-secretsmanager-retrieve-secrets.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "95a35cf6-ce95-4b81-b8de-0892cffca4c4",
-  "Name": "Keeper Secrets Manager - Retrieve Secrets",
-  "Description": "This step retrieves one or more secrets from a Keeper Vault and creates [sensitive output variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables) for each value retrieved. These values can be used in other steps in your deployment or runbook process.\n\nYou can retrieve secrets using Keeper Notation URIs, and you can choose a custom output variable name for each secret.\n\n---\n\n**Required:** \n- A [Keeper Secrets Manager](https://docs.keeper.io/secrets-manager/) application with permissions to retrieve secrets from the Keeper Vault.\n- The `SecretManagement.Keeper.Extension` PowerShell module installed on the target or worker. If the module can't be found, the step will fail. *The `SecretManagement.Keeper` module(s) can be installed from the [PowerShell gallery](https://www.powershellgallery.com/packages/SecretManagement.Keeper)*\n\nNotes:\n\n- Tested on Octopus `2022.4`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.\n\n",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# Variables\n$KsmModuleName = \"SecretManagement.Keeper.Extension\"\n$KsmParentModuleName = \"SecretManagement.Keeper\"\n$KsmConfig = $OctopusParameters[\"Keeper.SecretsManager.RetrieveSecrets.Config\"]\n$VaultSecrets = $OctopusParameters[\"Keeper.SecretsManager.RetrieveSecrets.VaultSecrets\"]\n$KsmModuleSpecificVersion = $OctopusParameters[\"Keeper.SecretsManager.RetrieveSecrets.KsmModule.SpecificVersion\"]\n$KsmModuleCustomInstallLocation = $OctopusParameters[\"Keeper.SecretsManager.RetrieveSecrets.KsmModule.CustomInstallLocation\"]\n$PrintVariableNames = $OctopusParameters[\"Keeper.SecretsManager.RetrieveSecrets.PrintVariableNames\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($VaultSecrets)) {\n    throw \"Required parameter Keeper.SecretsManager.RetrieveSecrets.VaultSecrets not specified\"\n}\n\nif ([string]::IsNullOrWhiteSpace($KsmModuleSpecificVersion) -eq $False) {\n    $requiredVersion = [Version]$KdmModuleSpecificVersion\n}\n\n# Cross-platform bits\n$WindowsPowerShell = $True\nif ($PSEdition -eq \"Core\") {\n    $WindowsPowerShell = $False\n}\n\n### Helper functions\nfunction Get-Module-CrossPlatform {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $Name\n    )\n\n    $module = Get-Module -Name $Name -ListAvailable\n    if($WindowsPowerShell -eq $True -and $null -eq $module) {\n        $module = Get-InstalledModule -Name $Name\n    }\n\n    return $module\n}\n\nfunction Load-Module {\n    Param(\n        [Parameter(Mandatory = $true)][string] $name\n    )\n\n    $retVal = $true\n    if (!(Get-Module -Name $name)) {\n        $isAvailable = Get-Module -ListAvailable | where { $_.Name -eq $name }\n        if ($isAvailable) {\n            try {\n                Import-Module $name -ErrorAction SilentlyContinue\n            } catch {\n                $retVal = $false\n            }\n        } else {\n            $retVal = $false\n        }\n    }\n    return $retVal\n}\n\n$PowerShellModuleName = $KsmModuleName\n\n# Check for Custom install location specified for KsmModule\nif ([string]::IsNullOrWhiteSpace($KsmModuleCustomInstallLocation) -eq $false) {\n    if ((Test-Path $KsmModuleCustomInstallLocation -IsValid) -eq $false) {\n        throw \"The path $KsmModuleCustomInstallLocation is not valid, please use a relative or absolute path.\"\n    }\n    \n    $KsmModulesFolder = [System.IO.Path]::GetFullPath($KsmModuleCustomInstallLocation)\n    $LocalModules = (New-Item \"$KsmModulesFolder\" -ItemType Directory -Force).FullName\n    $env:PSModulePath = $LocalModules + [System.IO.Path]::PathSeparator + $env:PSModulePath\n\n    # Check to see if there\n    if ((Test-Path -Path \"$LocalModules/$KsmModuleName\") -eq $true)\n    {\n        # Use specific location\n        $PowerShellModuleName = \"$LocalModules/$PowerShellModuleName\"\n    }\n}\n\n# Import module\nif([string]::IsNullOrWhiteSpace($KsmModuleSpecificVersion)) {\n    Write-Host \"Importing module $PowerShellModuleName ...\"\n    if ((Load-Module -Name $PowerShellModuleName) -eq $false) {\n        Write-Host \"Extension module not found $PowerShellModuleName - trying to find sub-module in parent $KsmParentModuleName\"\n        if (Get-Module -ListAvailable -Name $KsmParentModuleName) {\n            $KsmParentModuleDir = Split-Path -Path (Get-Module -ListAvailable -Name $KsmParentModuleName).Path\n            $KsmModuleFolder = [System.IO.Path]::GetFullPath($KsmParentModuleDir)\n            $LocalModules = (New-Item \"$KsmModuleFolder\" -ItemType Directory -Force).FullName\n            $env:PSModulePath = $LocalModules + [System.IO.Path]::PathSeparator + $env:PSModulePath\n\n            if ((Test-Path -Path \"$LocalModules/$KsmModuleName\") -eq $true)\n            {\n                $PowerShellModuleName = \"$LocalModules/$PowerShellModuleName\"\n                try {\n                    Import-Module -Name $PowerShellModuleName -ErrorAction SilentlyContinue\n                    Write-Host \"Imported sub-module $PowerShellModuleName ...\"\n                } catch {\n                    Write-Host \"Failed to import sub-module $PowerShellModuleName ...\"\n                }\n            }\n        } else {\n            Write-Host \"Module does not exist\"\n        }\n    }\n}\nelse {\n    Write-Host \"Importing module $PowerShellModuleName ($KsmModuleSpecificVersion)...\"\n    Import-Module -Name $PowerShellModuleName -RequiredVersion $requiredVersion\n}\n\n# Check if SecretManagement.Keeper.Extension Module is installed.\n$ksmVaultModule = Get-Module-CrossPlatform -Name $KsmModuleName\nif ($null -eq $ksmVaultModule) {\n    throw \"Cannot find the '$KsmModuleName' module on the machine. If you think it is installed, try restarting the Tentacle service for it to be detected.\"\n}\n\n$Secrets = @()\n$VariablesCreated = 0\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Extract lines and split into notations and variables\n$index = 0\n$usedNames = @()\n@(($VaultSecrets -Split \"`n\").Trim()) | ForEach-Object {\n    if (![string]::IsNullOrWhiteSpace($_)) {\n        Write-Verbose \"Working on: '$_'\"\n\n        # Split 'Notation | VariableName' and generate new var name if needed\n        $notation = $_\n        $variableName = \"\"\n        $n = $_.LastIndexOf(\"|\")\n        if ($n -ge 0) {\n            if ($n -lt $notation.Length-1) {\n                $variableName = $notation.SubString($n+1).Trim()\n            }\n            $notation = $notation.SubString(0, $n).Trim()\n        }\n        if ([string]::IsNullOrWhiteSpace($variableName)) {\n            do {\n                $index++\n                $variableName = \"KsmSecret\" + $index\n            } while ($usedNames.Contains($variableName))\n        }\n        # Duplicate var - either overlapping KsmSecretN or another user variable\n        if($usedNames.Contains($variableName)) {\n            throw \"Duplicate variable name: '$variableName'\"\n        }\n        $usedNames += $variableName\n\n        if([string]::IsNullOrWhiteSpace($notation)) {\n            throw \"Unable to establish notation URI from: '$($_)'\"\n        }\n        $secret = [PsCustomObject]@{\n            Notation         = $notation\n            VariableName = $variableName\n        }\n        $Secrets += $secret\n    }\n}\n\nWrite-Verbose \"Print variables: $PrintVariableNames\"\nWrite-Verbose \"Secrets to retrieve: $($Secrets.Count)\"\nWrite-Verbose \"KSM Version specified: $KsmModuleSpecificVersion\"\nWrite-Verbose \"KSM Custom Install Dir: $KsmModuleCustomInstallLocation\"\n\n# Retrieve Secrets\nforeach($secret in $secrets) {\n    $notation = $secret.Notation\n    $variableName = $secret.VariableName\n\n    $ksmSecretValue = Get-Notation -Notation $notation -Config $KsmConfig\n\n    Set-OctopusVariable -Name $variableName -Value $ksmSecretValue -Sensitive\n\n    if($PrintVariableNames -eq $True) {\n        Write-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n    }\n    $VariablesCreated += 1\n}\n\nWrite-Host \"Created $variablesCreated output variables\"\n"
-  },
-  "Parameters": [
-    {
-      "Id": "7daedc7d-7623-47b8-98ba-747290f04372",
-      "Name": "Keeper.SecretsManager.RetrieveSecrets.Config",
-      "Label": "Keeper Secrets Manager Configuration",
-      "HelpText": "Keeper Secrets Manager [configuration](https://docs.keeper.io/secrets-manager/secrets-manager/about/secrets-manager-configuration) for [KSM Application](https://docs.keeper.io/secrets-manager/secrets-manager/quick-start-guide) with permissions to retrieve secrets from the Keeper Vault. To generate KSM Configuration in Web Vault: Secrets Manager - KSM Application Name - Devices - Edit - Add Device, and switch to Method: Configuration File, preferably in Base64 format",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "10df4954-8683-434c-b708-cd25b3b395ff",
-      "Name": "Keeper.SecretsManager.RetrieveSecrets.VaultSecrets",
-      "Label": "Vault Secrets to retrieve",
-      "HelpText": "Use [Secrets Manager Notation URIs](https://docs.keeper.io/secrets-manager/secrets-manager/about/keeper-notation) to specify the Secrets to be returned from Keeper Vault, in the format `SecretsManagerNotation URI | OutputVariableName` where:\n\n- `OutputVariableName` is the _optional_ Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) name to store the secret's value in. *If this value isn't specified, an output name will be generated dynamically*.\n\n**Note:** Multiple fields can be retrieved by entering each one on a new line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "15bd51e5-72be-4600-85ba-7b4cf1a8e157",
-      "Name": "Keeper.SecretsManager.RetrieveSecrets.PrintVariableNames",
-      "Label": "Print output variable names",
-      "HelpText": "Write out the Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) names to the task log. Default: `False`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "6888b6b2-8916-4f88-9c7a-d811654e5a2b",
-      "Name": "Keeper.SecretsManager.RetrieveSecrets.KsmModule.SpecificVersion",
-      "Label": "SecretManagement.Keeper.Extension PowerShell Module version (optional)",
-      "HelpText": "If you wish to use a specific version of the `SecretManagement.Keeper.Extension` PowerShell module (rather than the default), enter the version number here. e.g. `16.5.0`.\n\n**Note:** The version specified must exist on the machine. Version 16.5.0 is the lowest supported version\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0a2b750b-0ad3-48fc-9d68-e133746226a9",
-      "Name": "Keeper.SecretsManager.RetrieveSecrets.KsmModule.CustomInstallLocation",
-      "Label": "SecretManagement.Keeper.Extension PowerShell Install Location (optional)",
-      "HelpText": "If you wish to provide a custom path to the `SecretManagement.Keeper.Extension` PowerShell module (rather than the default), enter the value here.\n\n**Note:** The Module must exist at the specified location on the machine. This step template will not download the Module.\n",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "idimov-keeper",
-  "LastModifiedAt": "2024-06-12T00:54:34.7240000Z",
-  "$Meta": {
-    "ExportedAt": "2024-06-12T00:54:34.7240000Z",
-    "OctopusVersion": "2022.4.8319",
-    "Type": "ActionTemplate"
-  },
-  "Category": "keeper-secretsmanager"
-}
\ No newline at end of file
diff --git a/step-templates/launchdarkly-toggle-feature-flag.json b/step-templates/launchdarkly-toggle-feature-flag.json
deleted file mode 100644
index cbb0036dc..000000000
--- a/step-templates/launchdarkly-toggle-feature-flag.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "Id": "bf51e357-8b88-4cfb-8568-550fe0a2d68a",
-    "Name": "LaunchDarkly - Toggle a feature flag",
-    "Description": "Toggle a LaunchDarkly feature flag on or off ",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "$headers = @{ Authorization = \"#{launchdarkly-access-token}\"; \"content-type\" = \"application/json\" }\n$body = @( @{ op = \"replace\"; path = \"/environments/#{launchdarkly-environment-key}/on\"; value = #{if launchdarkly-flag-value}$true#{/if}#{unless launchdarkly-flag-value}$false#{/unless} } )\n$bodyAsJson = ConvertTo-Json -InputObject $body -Compress\n\nInvoke-RestMethod 'https://app.launchdarkly.com/api/v2/flags/#{launchdarkly-project-key}/#{launchdarkly-flag-key}' -Method Patch -Body $bodyAsJson -Headers $headers"
-    },
-    "Parameters": [
-        {
-            "Id": "6504527d-cdb9-43d5-be88-45f942a4ac8d",
-            "Name": "launchdarkly-access-token",
-            "Label": "Access Token",
-            "HelpText": "Your LaunchDarkly access token",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "2cc43e76-7d49-48ad-922a-9b2ddfaa2098",
-            "Name": "launchdarkly-project-key",
-            "Label": "Project key",
-            "HelpText": "The key of the project containing this feature flag",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "01c4084a-368f-4bc0-9eb9-8b7764905a90",
-            "Name": "launchdarkly-environment-key",
-            "Label": "Environment key",
-            "HelpText": "The key of the environment to change this feature flag value in",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "cfa20800-262b-47d8-b9d0-a50283d08f37",
-            "Name": "launchdarkly-flag-key",
-            "Label": "Feature flag key",
-            "HelpText": "The key of the feature flag you want to toggle",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "b91bcc79-3672-4679-b82b-2bd616f455f8",
-            "Name": "launchdarkly-flag-value",
-            "Label": "Feature flag enabled",
-            "HelpText": "Enable targeting for this feature flag?",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "LastModifiedBy": "AndyMDoyle",
-    "$Meta": {
-        "ExportedAt": "2018-07-09T09:48:16.600Z",
-        "OctopusVersion": "2018.5.7",
-        "Type": "ActionTemplate"
-    },
-    "Category": "launchdarkly"
-}
\ No newline at end of file
diff --git a/step-templates/letsencrypt-azure-dns.json b/step-templates/letsencrypt-azure-dns.json
deleted file mode 100644
index 0f337a33c..000000000
--- a/step-templates/letsencrypt-azure-dns.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "Id": "79e0dd12-6222-4f8a-a8dc-bcbe579ed729",
-  "Name": "Lets Encrypt - Azure DNS",
-  "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [Azure DNS](https://azure.microsoft.com/en-us/services/dns/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "###############################################################################\n# TLS 1.2\n###############################################################################\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n###############################################################################\n# Required Modules folder\n###############################################################################\nWrite-Host \"Checking for required powershell modules folder\"\n$ModulesFolder = \"$HOME\\Documents\\WindowsPowerShell\\Modules\"\nif ($PSEdition -eq \"Core\") {\n    if ($PSVersionTable.Platform -eq \"Unix\") {\n        $ModulesFolder = \"$HOME/.local/share/powershell/Modules\"\n    }\n    else {\n        $ModulesFolder = \"$HOME\\Documents\\PowerShell\\Modules\"\n    }\n}\n$PSModuleFolderExists = (Test-Path $ModulesFolder)\nif ($PSModuleFolderExists -eq $False) {\n\tWrite-Host \"Creating directory: $ModulesFolder\"\n\tNew-Item $ModulesFolder -ItemType Directory -Force\n    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath\n}\n\n###############################################################################\n# Required Modules\n###############################################################################\nWrite-Host \"Checking for required modules.\"\n$required_posh_acme_version = 3.12.0\n$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }\n\nif (-not ($module_check)) {\n    Write-Host \"Ensuring NuGet provider is bootstrapped.\"\n    Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n    Write-Host \"Installing Posh-ACME.\"\n    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force\n}\n\nImport-Module Posh-ACME\n\n###############################################################################\n# Constants\n###############################################################################\n$LE_AzureDNS_CertificateDomain = $OctopusParameters[\"LE_AzureDNS_CertificateDomain\"]\n$LE_AzureDNS_CertificateName = \"Lets Encrypt - $($LE_AzureDNS_CertificateDomain)\"\n\n# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt\n$LE_AzureDNS_Fake_Issuers = @(\"Fake LE Intermediate X1\", \"(STAGING) Artificial Apricot R3\", \"(STAGING) Ersatz Edamame E1\", \"(STAGING) Pseudo Plum E5\", \"(STAGING) False Fennel E6\", \"(STAGING) Puzzling Parsnip E7\", \"(STAGING) Mysterious Mulberry E8\", \"(STAGING) Fake Fig E9\", \"(STAGING) Counterfeit Cashew R10\", \"(STAGING) Wannabe Watercress R11\", \"(STAGING) Riddling Rhubarb R12\", \"(STAGING) Tenuous Tomato R13\", \"(STAGING) Not Nectarine R14\")\n$LE_AzureDNS_Issuers = @(\"Let's Encrypt Authority X3\", \"E1\", \"E2\", \"E7\", \"E8\", \"R3\", \"R4\", \"R5\", \"R6\", \"R10\", \"R11\", \"R12\", \"R13\")\n\n# (Optional) CNAME DNS alias. If specified, the alias will be used for the TXT challenge.\n# https://poshac.me/docs/v4/Guides/Using-DNS-Challenge-Aliases/\n$LE_AzureDNS_DnsAlias = $OctopusParameters[\"LE_AzureDNS_DnsAlias\"]\n\n###############################################################################\n# Helpers\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $response = $reader.ReadToEnd()\n\n            return $response | ConvertFrom-Json\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\n###############################################################################\n# Functions\n###############################################################################\nfunction Get-LetsEncryptCertificate {\n    Write-Debug \"Entering: Get-LetsEncryptCertificate\"\n\n    if ($OctopusParameters[\"LE_AzureDNS_Use_Staging\"] -eq $True) {\n        Write-Host \"Using Lets Encrypt Server: Staging\"\n        Set-PAServer LE_STAGE;\n    }\n    else {\n        Write-Host \"Using Lets Encrypt Server: Production\"\n        Set-PAServer LE_PROD;\n    }\n\n    # Clobber account if it exists.\n    $le_account = Get-PAAccount\n    if ($le_account) {\n        Remove-PAAccount $le_account.Id -Force\n    }\n\n    $azure_password = ConvertTo-SecureString -String $OctopusParameters[\"LE_AzureDNS_AzureAccount.Password\"] -AsPlainText -Force\n    $azure_credential = New-Object System.Management.Automation.PSCredential($OctopusParameters[\"LE_AzureDNS_AzureAccount.Client\"], $azure_password)\n    $azure_params = @{\n        AZSubscriptionId = $OctopusParameters[\"LE_AzureDNS_AzureAccount.SubscriptionNumber\"];\n        AZTenantId       = $OctopusParameters[\"LE_AzureDNS_AzureAccount.TenantId\"];\n        AZAppCred        = $azure_credential\n    }\n\n    try {\n\n        $DnsPlugins = @(\"Azure\")\n        $DomainList = @($LE_AzureDNS_CertificateDomain)\n        \n        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.\n        if ($LE_AzureDNS_CertificateDomain -match \"\\*.\" -and $OctopusParameters[\"LE_AzureDNS_CreateWildcardSAN\"] -eq $True) {\n            $LE_AzureDNS_Certificate_SAN = $LE_AzureDNS_CertificateDomain.Replace(\"*.\",\"\")\n            $DomainList += $LE_AzureDNS_Certificate_SAN\n            # Include additional DnsPlugin of same type to suppress warning.\n            $DnsPlugins += \"Azure\"\n        }\n\n        $Cert_Params = @{\n            Domain = $DomainList\n            AcceptTOS = $True;\n            Contact = $OctopusParameters[\"LE_AzureDNS_ContactEmailAddress\"];\n            DnsPlugin = $DnsPlugins;\n            PluginArgs = $azure_params;\n            PfxPass = $OctopusParameters[\"LE_AzureDNS_PfxPassword\"];\n            Force = $True;\n        }\n        \n        if ($LE_AzureDNS_DnsAlias) {\n            $Cert_Params += @{DnsAlias = @($LE_AzureDNS_DnsAlias, $LE_AzureDNS_DnsAlias)} # Adding the value twice to avoid the warning \"Fewer DnsAlias values than names in the order.\"\n        }\n\n        return New-PACertificate @Cert_Params\n    }\n    catch {\n        Write-Host \"Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_AzureDNS_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_AzureDNS_CertificateDomain)\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        # We don't want to confuse Production and Staging Lets Encrypt Certificates.\n        $possible_issuers = $LE_AzureDNS_Issuers\n        if ($OctopusParameters[\"LE_AzureDNS_Use_Staging\"] -eq $True) {\n            $possible_issuers = $LE_AzureDNS_Fake_Issuers\n        }\n\n        return $certificates_search | Where-Object {\n            $_.SubjectCommonName -eq $LE_AzureDNS_CertificateDomain -and\n            $possible_issuers -contains $_.IssuerCommonName -and\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Publish-OctopusCertificate {\n    param (\n        [string] $JsonBody\n    )\n\n    Write-Debug \"Entering: Publish-OctopusCertificate\"\n\n    if (-not ($JsonBody)) {\n        Write-Host \"Existing Certificate is required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_AzureDNS_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Published $($LE_AzureDNS_CertificateDomain) certificate to the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Host \"Failed to publish $($LE_AzureDNS_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Update-OctopusCertificate {\n    param (\n        [string]$Certificate_Id,\n        [string]$JsonBody\n    )\n\n    Write-Debug \"Entering: Update-OctopusCertificate\"\n\n    if (-not ($Certificate_Id -and $JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_AzureDNS_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Replaced $($LE_AzureDNS_CertificateDomain) certificate in the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Error \"Failed to replace $($LE_AzureDNS_CertificateDomain) certificate. Error: $($_.Exception.Message)\"\n        exit 1\n    }\n}\n\nfunction Get-NewCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-NewCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        Name = \"$LE_AzureDNS_CertificateName\";\n        Notes             = \"\";\n        CertificateData   = @{\n            HasValue = $true;\n            NewValue = $certificate_base64;\n        };\n        Password          = @{\n            HasValue = $true;\n            NewValue = $OctopusParameters[\"LE_AzureDNS_PfxPassword\"];\n        };\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\nfunction Get-ReplaceCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-ReplaceCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        CertificateData = $certificate_base64;\n        Password        = $OctopusParameters[\"LE_AzureDNS_PfxPassword\"];\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\n###############################################################################\n# DO THE THING | MAIN |\n###############################################################################\nWrite-Debug \"Do the Thing\"\n\nWrite-Host \"Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store.\"\n$certificates = Get-OctopusCertificates\n\n# Check for PFX & PEM\nif ($certificates) {\n\n    # Handle weird behavior between Powershell 5 and Powershell 6+\n    $certificate_count = 1\n    if ($certificates.Count -ge 1) {\n        $certificate_count = $certificates.Count\n    }\n\n    Write-Host \"Found $certificate_count for $($LE_AzureDNS_CertificateDomain).\"\n    Write-Host \"Checking to see if any expire within $($OctopusParameters[\"LE_AzureDNS_ReplaceIfExpiresInDays\"]) days.\"\n\n    # Check Expiry Dates\n    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters[\"LE_AzureDNS_ReplaceIfExpiresInDays\"]) }\n\n    if ($expiring_certificates) {\n        Write-Host \"Found certificates that expire with $($OctopusParameters[\"LE_AzureDNS_ReplaceIfExpiresInDays\"]) days. Requesting new certificates for $($LE_AzureDNS_CertificateDomain) from Lets Encrypt\"\n        $le_certificate = Get-LetsEncryptCertificate\n\n        # PFX\n        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq \"Pkcs12\" } | Select-Object -First 1\n        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate\n        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json\n    }\n    else {\n        Write-Host \"Nothing to do here...\"\n    }\n\n    exit 0\n}\n\n# No existing Certificates - Lets get some new ones.\nWrite-Host \"No existing certificates found for $($LE_AzureDNS_CertificateDomain).\"\nWrite-Host \"Request New Certificate for $($LE_AzureDNS_CertificateDomain) from Lets Encrypt\"\n\n# New Certificate..\n$le_certificate = Get-LetsEncryptCertificate\n\nWrite-Host \"Publishing: LetsEncrypt - $($LE_AzureDNS_CertificateDomain) (PFX)\"\n$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate\nPublish-OctopusCertificate -JsonBody $certificate_as_json\n\nWrite-Host \"GREAT SUCCESS\"\n",
-    "Octopus.Action.SubstituteInFiles.Enabled": "True"
-  },
-  "Parameters": [
-    {
-      "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
-      "Name": "LE_AzureDNS_CertificateDomain",
-      "Label": "Certificate Domain",
-      "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
-      "Name": "LE_AzureDNS_PfxPassword",
-      "Label": "PFX Password",
-      "HelpText": "Password to use when converting to / from PFX. ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
-      "Name": "LE_AzureDNS_ReplaceIfExpiresInDays",
-      "Label": "Replace expiring certificate before N days",
-      "HelpText": "Replace the certificate if it expiries within N days",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2935998d-d030-4af6-ad42-39e8b85e2dce",
-      "Name": "LE_AzureDNS_AzureAccount",
-      "Label": "Azure account",
-      "HelpText": "An Azure Account that has API access to make DNS changes. ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "85af482d-e577-40b8-94e5-626e545adab5",
-      "Name": "LE_AzureDNS_Octopus_APIKey",
-      "Label": "Octopus Deploy API key",
-      "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
-      "Name": "LE_AzureDNS_Use_Staging",
-      "Label": "Use Lets Encrypt Staging",
-      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
-      "Name": "LE_AzureDNS_ContactEmailAddress",
-      "Label": "Contact Email Address",
-      "HelpText": "Email Address",
-      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
-      "Name": "LE_AzureDNS_CreateWildcardSAN",
-      "Label": "Create Wildcard SAN",
-      "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "36451c6b-f61d-4e00-b1f6-956341c9691d",
-      "Name": "LE_AzureDNS_DnsAlias",
-      "Label": "DNS Alias",
-      "HelpText": "Use a CNAME alias for the TXT challenge.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2025-09-11T14:51:42.815Z",
-    "OctopusVersion": "2025.3.14236",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "farhanalam",
-  "Category": "lets-encrypt"
-}
\ No newline at end of file
diff --git a/step-templates/letsencrypt-cloudflare.json b/step-templates/letsencrypt-cloudflare.json
deleted file mode 100644
index 916ebd648..000000000
--- a/step-templates/letsencrypt-cloudflare.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "Id": "cfb61368-7a85-480a-9770-b6d268f77a13",
-    "Name": "Lets Encrypt - Cloudflare",
-    "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [Cloudflare DNS](https://www.cloudflare.com/en-au/dns/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
-    "ActionType": "Octopus.Script",
-    "Version": 12,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "###############################################################################\n# TLS 1.2\n###############################################################################\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n###############################################################################\n# Required Modules folder\n###############################################################################\nWrite-Host \"Checking for required powershell modules folder\"\n$ModulesFolder = \"$HOME\\Documents\\WindowsPowerShell\\Modules\"\nif ($PSEdition -eq \"Core\") {\n    if ($PSVersionTable.Platform -eq \"Unix\") {\n        $ModulesFolder = \"$HOME/.local/share/powershell/Modules\"\n    }\n    else {\n        $ModulesFolder = \"$HOME\\Documents\\PowerShell\\Modules\"\n    }\n}\n$PSModuleFolderExists = (Test-Path $ModulesFolder)\nif ($PSModuleFolderExists -eq $False) {\n\tWrite-Host \"Creating directory: $ModulesFolder\"\n\tNew-Item $ModulesFolder -ItemType Directory -Force\n    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath\n}\n\n###############################################################################\n# Required Modules\n###############################################################################\nWrite-Host \"Checking for required modules.\"\n$required_posh_acme_version = 3.12.0\n$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }\n\nif (-not ($module_check)) {\n    Write-Host \"Ensuring NuGet provider is bootstrapped.\"\n    Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n    Write-Host \"Installing Posh-ACME.\"\n    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force\n}\n\nImport-Module Posh-ACME\n\n###############################################################################\n# Constants\n###############################################################################\n$LE_Cloudflare_CertificateDomain = $OctopusParameters[\"LE_Cloudflare_CertificateDomain\"]\n$LE_Cloudflare_CertificateName = \"Lets Encrypt - $($LE_Cloudflare_CertificateDomain)\"\n\n# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt\n$LE_Cloudflare_Fake_Issuers = @(\"Fake LE Intermediate X1\", \"(STAGING) Artificial Apricot R3\", \"(STAGING) Ersatz Edamame E1\", \"(STAGING) Pseudo Plum E5\", \"(STAGING) False Fennel E6\", \"(STAGING) Puzzling Parsnip E7\", \"(STAGING) Mysterious Mulberry E8\", \"(STAGING) Fake Fig E9\", \"(STAGING) Counterfeit Cashew R10\", \"(STAGING) Wannabe Watercress R11\", \"(STAGING) Riddling Rhubarb R12\", \"(STAGING) Tenuous Tomato R13\", \"(STAGING) Not Nectarine R14\")\n$LE_Cloudflare_Issuers = @(\"Let's Encrypt Authority X3\", \"E1\", \"E2\", \"E7\", \"E8\", \"R3\", \"R4\", \"R5\", \"R6\", \"R10\", \"R11\", \"R12\", \"R13\")\n\n###############################################################################\n# Helpers\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $response = $reader.ReadToEnd()\n\n            return $response | ConvertFrom-Json\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\n###############################################################################\n# Functions\n###############################################################################\nfunction Get-LetsEncryptCertificate {\n    Write-Debug \"Entering: Get-LetsEncryptCertificate\"\n\n    if ($OctopusParameters[\"LE_Cloudflare_Use_Staging\"] -eq $True) {\n        Write-Host \"Using Lets Encrypt Server: Staging\"\n        Set-PAServer LE_STAGE;\n    }\n    else {\n        Write-Host \"Using Lets Encrypt Server: Production\"\n        Set-PAServer LE_PROD;\n    }\n\n    # Clobber account if it exists.\n    $le_account = Get-PAAccount\n    if ($le_account) {\n        Remove-PAAccount $le_account.Id -Force\n    }\n\n    # Cloudflare API tokens require some special wrangling.\n    $cloudflare_token = ConvertTo-SecureString -String $OctopusParameters[\"LE_Cloudflare_PrimaryToken\"] -AsPlainText -Force\n    $cloudflare_args = @{\n        CFToken = $cloudflare_token\n    }\n\n    if ($OctopusParameters[\"LE_Cloudflare_SecondaryToken\"]) {\n        Write-Debug \"LE_Cloudflare_SecondaryToken has a value. Passing it to the Cloudflare DNS plugin as a Read All Token.\"\n        $cloudflare_token_secondary = ConvertTo-SecureString -String $OctopusParameters[\"LE_Cloudflare_SecondaryToken\"] -AsPlainText -Force\n        $cloudflare_args.CFTokenReadAll = $cloudflare_token_secondary\n    }\n\n    try {\n\n        $DnsPlugins = @(\"Cloudflare\")\n        $DomainList = @($LE_Cloudflare_CertificateDomain)\n        \n        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.\n        if ($LE_Cloudflare_CertificateDomain -match \"\\*.\" -and $OctopusParameters[\"LE_Cloudflare_CreateWildcardSAN\"] -eq $True) {\n            $LE_Cloudflare_Certificate_SAN = $LE_Cloudflare_CertificateDomain.Replace(\"*.\",\"\")\n            $DomainList += $LE_Cloudflare_Certificate_SAN\n            # Include additional DnsPlugin of same type to suppress warning.\n            $DnsPluginList += \"Cloudflare\"\n        }\n\n        $Cert_Params = @{\n            Domain = $DomainList\n            AcceptTOS = $True;\n            Contact = $OctopusParameters[\"LE_Cloudflare_ContactEmailAddress\"];\n            DnsPlugin = $DnsPlugins;\n            PluginArgs = $cloudflare_args;\n            PfxPass = $OctopusParameters[\"LE_Cloudflare_PfxPassword\"];\n            Force = $True;\n        }\n\n        return New-PACertificate @Cert_Params\n    }\n    catch {\n        Write-Host \"Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_Cloudflare_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_Cloudflare_CertificateDomain)\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        # We don't want to confuse Production and Staging Lets Encrypt Certificates.\n        $possible_issuers = $LE_Cloudflare_Issuers\n        if ($OctopusParameters[\"LE_Cloudflare_Use_Staging\"] -eq $True) {\n            $possible_issuers = $LE_Cloudflare_Fake_Issuers\n        }\n\n        return $certificates_search | Where-Object {\n            $_.SubjectCommonName -eq $LE_Cloudflare_CertificateDomain -and\n            $possible_issuers -contains $_.IssuerCommonName -and\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Publish-OctopusCertificate {\n    param (\n        [string] $JsonBody\n    )\n\n    Write-Debug \"Entering: Publish-OctopusCertificate\"\n\n    if (-not ($JsonBody)) {\n        Write-Host \"Existing Certificate is required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_Cloudflare_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Published $($LE_Cloudflare_CertificateDomain) certificate to the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Host \"Failed to publish $($LE_Cloudflare_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Update-OctopusCertificate {\n    param (\n        [string]$Certificate_Id,\n        [string]$JsonBody\n    )\n\n    Write-Debug \"Entering: Update-OctopusCertificate\"\n\n    if (-not ($Certificate_Id -and $JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_Cloudflare_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Replaced $($LE_Cloudflare_CertificateDomain) certificate in the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Error \"Failed to replace $($LE_Cloudflare_CertificateDomain) certificate. Error: $($_.Exception.Message)\"\n        exit 1\n    }\n}\n\nfunction Get-NewCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-NewCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        Name            = \"$LE_Cloudflare_CertificateName\";\n        Notes           = \"\";\n        CertificateData = @{\n            HasValue = $true;\n            NewValue = $certificate_base64;\n        };\n        Password        = @{\n            HasValue = $true;\n            NewValue = $OctopusParameters[\"LE_Cloudflare_PfxPassword\"];\n        };\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\nfunction Get-ReplaceCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-ReplaceCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        CertificateData = $certificate_base64;\n        Password        = $OctopusParameters[\"LE_Cloudflare_PfxPassword\"];\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\n###############################################################################\n# DO THE THING | MAIN |\n###############################################################################\nWrite-Debug \"Do the Thing\"\n\nWrite-Host \"Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store.\"\n$certificates = Get-OctopusCertificates\n\n# Check for PFX & PEM\nif ($certificates) {\n\n    # Handle weird behavior between Powershell 5 and Powershell 6+\n    $certificate_count = 1\n    if ($certificates.Count -ge 1) {\n        $certificate_count = $certificates.Count\n    }\n\n    Write-Host \"Found $certificate_count for $($LE_Cloudflare_CertificateDomain).\"\n    Write-Host \"Checking to see if any expire within $($OctopusParameters[\"LE_Cloudflare_ReplaceIfExpiresInDays\"]) days.\"\n\n    # Check Expiry Dates\n    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters[\"LE_Cloudflare_ReplaceIfExpiresInDays\"]) }\n\n    if ($expiring_certificates) {\n        Write-Host \"Found certificates that expire with $($OctopusParameters[\"LE_Cloudflare_ReplaceIfExpiresInDays\"]) days. Requesting new certificates for $($LE_Cloudflare_CertificateDomain) from Lets Encrypt\"\n        $le_certificate = Get-LetsEncryptCertificate\n\n        # PFX\n        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq \"Pkcs12\" } | Select-Object -First 1\n        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate\n        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json\n    }\n    else {\n        Write-Host \"Nothing to do here...\"\n    }\n\n    exit 0\n}\n\n# No existing Certificates - Lets get some new ones.\nWrite-Host \"No existing certificates found for $($LE_Cloudflare_CertificateDomain).\"\nWrite-Host \"Request New Certificate for $($LE_Cloudflare_CertificateDomain) from Lets Encrypt\"\n\n# New Certificate..\n$le_certificate = Get-LetsEncryptCertificate\n\nWrite-Host \"Publishing: LetsEncrypt - $($LE_Cloudflare_CertificateDomain) (PFX)\"\n$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate\nPublish-OctopusCertificate -JsonBody $certificate_as_json\n\nWrite-Host \"GREAT SUCCESS\"\n",
-        "Octopus.Action.SubstituteInFiles.Enabled": "True"
-    },
-    "Parameters": [{
-            "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
-            "Name": "LE_Cloudflare_CertificateDomain",
-            "Label": "Certificate Domain",
-            "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
-            "Name": "LE_Cloudflare_PfxPassword",
-            "Label": "PFX Password",
-            "HelpText": "Password to use when converting to / from PFX. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
-            "Name": "LE_Cloudflare_ReplaceIfExpiresInDays",
-            "Label": "Replace expiring certificate before N days",
-            "HelpText": "Replace the certificate if it expiries within N days",
-            "DefaultValue": "30",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "fc4f6877-2412-4af6-b87a-652da484cb5e",
-            "Name": "LE_Cloudflare_PrimaryToken",
-            "Label": "Primary Cloudflare API Token (Edit Permissions)",
-            "HelpText": "[Cloudflare API Token](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys) with the appropriate [Zone Edit](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/Cloudflare-Readme.md) permissions.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "e01cc404-2631-4f88-9a1a-9e860bc98e58",
-            "Name": "LE_Cloudflare_SecondaryToken",
-            "Label": "Secondary Cloudflare API Token",
-            "HelpText": "[Cloudflare API Token](https://support.cloudflare.com/hc/en-us/articles/200167836-Managing-API-Tokens-and-Keys) with the appropriate [Zone Read](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/Cloudflare-Readme.md) permissions.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "85af482d-e577-40b8-94e5-626e545adab5",
-            "Name": "LE_Cloudflare_Octopus_APIKey",
-            "Label": "Octopus Deploy API key",
-            "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
-            "Name": "LE_Cloudflare_Use_Staging",
-            "Label": "Use Lets Encrypt Staging",
-            "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
-            "Name": "LE_Cloudflare_ContactEmailAddress",
-            "Label": "Contact Email Address",
-            "HelpText": "Email Address",
-            "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
-            "Name": "LE_Cloudflare_CreateWildcardSAN",
-            "Label": "Create Wildcard SAN",
-            "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-              "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "$Meta": {
-    "ExportedAt": "2025-09-11T14:51:42.815Z",
-    "OctopusVersion": "2025.3.14236",
-        "Type": "ActionTemplate"
-      },
-      "LastModifiedBy": "benjimac93",
-    "Category": "lets-encrypt"
-}
diff --git a/step-templates/letsencrypt-dnsimple.json b/step-templates/letsencrypt-dnsimple.json
deleted file mode 100644
index 8fb263400..000000000
--- a/step-templates/letsencrypt-dnsimple.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "Id": "21583723-1283-46aa-bb7b-121d365837cb",
-    "Name": "Lets Encrypt - DNSimple",
-    "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [DNSimple](https://dnsimple.com/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
-    "ActionType": "Octopus.Script",
-    "Version": 9,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-        
-    ],
-    "Properties":{
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "###############################################################################\n# TLS 1.2\n###############################################################################\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n###############################################################################\n# Required Modules folder\n###############################################################################\nWrite-Host \"Checking for required powershell modules folder\"\n$ModulesFolder = \"$HOME\\Documents\\WindowsPowerShell\\Modules\"\nif ($PSEdition -eq \"Core\") {\n    if ($PSVersionTable.Platform -eq \"Unix\") {\n        $ModulesFolder = \"$HOME/.local/share/powershell/Modules\"\n    }\n    else {\n        $ModulesFolder = \"$HOME\\Documents\\PowerShell\\Modules\"\n    }\n}\n$PSModuleFolderExists = (Test-Path $ModulesFolder)\nif ($PSModuleFolderExists -eq $False) {\n\tWrite-Host \"Creating directory: $ModulesFolder\"\n\tNew-Item $ModulesFolder -ItemType Directory -Force\n    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath\n}\n\n###############################################################################\n# Required Modules\n###############################################################################\nWrite-Host \"Checking for required modules.\"\n$required_posh_acme_version = 3.12.0\n$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }\n\nif (-not ($module_check)) {\n    Write-Host \"Ensuring NuGet provider is bootstrapped.\"\n    Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n    Write-Host \"Installing Posh-ACME.\"\n    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force\n}\n\nImport-Module Posh-ACME\n\n###############################################################################\n# DebugOutput\n###############################################################################\nif ($OctopusParameters[\"LE_DNSimple_Debug_Output\"] -eq $True) {\n\tWrite-Host \"Setting DebugPreference to Continue\"\n    $DebugPreference = 'Continue'\n}\n\n###############################################################################\n# Constants\n###############################################################################\n$LE_DNSimple_CertificateDomain = $OctopusParameters[\"LE_DNSimple_CertificateDomain\"]\n$LE_DNSimple_CertificateName = \"Lets Encrypt - $($LE_DNSimple_CertificateDomain)\"\n\n# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt\n$LE_DNSimple_Fake_Issuers = @(\"Fake LE Intermediate X1\", \"(STAGING) Artificial Apricot R3\", \"(STAGING) Ersatz Edamame E1\", \"(STAGING) Pseudo Plum E5\", \"(STAGING) False Fennel E6\", \"(STAGING) Puzzling Parsnip E7\", \"(STAGING) Mysterious Mulberry E8\", \"(STAGING) Fake Fig E9\", \"(STAGING) Counterfeit Cashew R10\", \"(STAGING) Wannabe Watercress R11\", \"(STAGING) Riddling Rhubarb R12\", \"(STAGING) Tenuous Tomato R13\", \"(STAGING) Not Nectarine R14\")\n$LE_DNSimple_Issuers = @(\"Let's Encrypt Authority X3\", \"E1\", \"E2\", \"E7\", \"E8\", \"R3\", \"R4\", \"R5\", \"R6\", \"R10\", \"R11\", \"R12\", \"R13\")\n\n\n###############################################################################\n# Helpers\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $response = $reader.ReadToEnd()\n\n            return $response | ConvertFrom-Json\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\n###############################################################################\n# Functions\n###############################################################################\nfunction Get-LetsEncryptCertificate {\n    Write-Debug \"Entering: Get-LetsEncryptCertificate\"\n\n    if ($OctopusParameters[\"LE_DNSimple_Use_Staging\"] -eq $True) {\n        Write-Host \"Using Lets Encrypt Server: Staging\"\n        Set-PAServer LE_STAGE;\n    }\n    else {\n        Write-Host \"Using Lets Encrypt Server: Production\"\n        Set-PAServer LE_PROD;\n    }\n\n    # Clobber account if it exists.\n    $le_account = Get-PAAccount\n    if ($le_account) {\n        Remove-PAAccount $le_account.Id -Force\n    }\n\n\t$dnsimple_args = @{}\n    # DNSimple requires a token. If it's windows, Secure-String is supported.\n    if ($IsWindows -and 'Desktop' -eq $PSEdition) {\n        $token = ConvertTo-SecureString -String $OctopusParameters[\"LE_DNSimple_Token\"] -AsPlainText -Force\n    \t$dnsimple_args = @{\n        \tDSToken = $token\n    \t}\n    }\n    else {\n    \t$token = $OctopusParameters[\"LE_DNSimple_Token\"]\n    \t$dnsimple_args = @{\n        \tDSTokenInsecure = $token\n    \t}\n    }\n       \n    try {\n\n        $DnsPlugins = @(\"DNSimple\")\n        $DomainList = @($LE_DNSimple_CertificateDomain)\n        \n        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.\n        if ($LE_DNSimple_CertificateDomain -match \"\\*.\" -and $OctopusParameters[\"LE_DNSimple_CreateWildcardSAN\"] -eq $True) {\n            $LE_DNSimple_Certificate_SAN = $LE_DNSimple_CertificateDomain.Replace(\"*.\",\"\")\n            $DomainList += $LE_DNSimple_Certificate_SAN\n            # Include additional DnsPlugin of same type to surpress warning.\n            $DnsPlugins += \"DNSimple\"\n        }\n\n        $Cert_Params = @{\n            Domain = $DomainList\n            AcceptTOS = $True;\n            Contact = $OctopusParameters[\"LE_DNSimple_ContactEmailAddress\"];\n            DnsPlugin = $DnsPlugins;\n            PluginArgs = $dnsimple_args;\n            PfxPass = $OctopusParameters[\"LE_DNSimple_PfxPassword\"];\n            Force = $True;\n        }\n\n        return New-PACertificate @Cert_Params\n    }\n    catch {\n        Write-Host \"Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_DNSimple_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_DNSimple_CertificateDomain)\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        # We don't want to confuse Production and Staging Lets Encrypt Certificates.\n        $possible_issuers = $LE_DNSimple_Issuers\n        if ($OctopusParameters[\"LE_DNSimple_Use_Staging\"] -eq $True) {\n            $possible_issuers = $LE_DNSimple_Fake_Issuers\n        }\n\n        return $certificates_search | Where-Object {\n            $_.SubjectCommonName -eq $LE_DNSimple_CertificateDomain -and\n            $possible_issuers -contains $_.IssuerCommonName -and\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Publish-OctopusCertificate {\n    param (\n        [string] $JsonBody\n    )\n\n    Write-Debug \"Entering: Publish-OctopusCertificate\"\n\n    if (-not ($JsonBody)) {\n        Write-Host \"Existing Certificate is required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_DNSimple_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Published $($LE_DNSimple_CertificateDomain) certificate to the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Host \"Failed to publish $($LE_DNSimple_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Update-OctopusCertificate {\n    param (\n        [string]$Certificate_Id,\n        [string]$JsonBody\n    )\n\n    Write-Debug \"Entering: Update-OctopusCertificate\"\n\n    if (-not ($Certificate_Id -and $JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_DNSimple_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Replaced $($LE_DNSimple_CertificateDomain) certificate in the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Error \"Failed to replace $($LE_DNSimple_CertificateDomain) certificate. Error: $($_.Exception.Message)\"\n        exit 1\n    }\n}\n\nfunction Get-NewCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-NewCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        Name            = \"$LE_DNSimple_CertificateName\";\n        Notes           = \"\";\n        CertificateData = @{\n            HasValue = $true;\n            NewValue = $certificate_base64;\n        };\n        Password        = @{\n            HasValue = $true;\n            NewValue = $OctopusParameters[\"LE_DNSimple_PfxPassword\"];\n        };\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\nfunction Get-ReplaceCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-ReplaceCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        CertificateData = $certificate_base64;\n        Password        = $OctopusParameters[\"LE_DNSimple_PfxPassword\"];\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\n###############################################################################\n# DO THE THING | MAIN |\n###############################################################################\nWrite-Debug \"Do the Thing\"\n\nWrite-Host \"Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store.\"\n$certificates = Get-OctopusCertificates\n\n# Check for PFX & PEM\nif ($certificates) {\n\n    # Handle weird behavior between Powershell 5 and Powershell 6+\n    $certificate_count = 1\n    if ($certificates.Count -ge 1) {\n        $certificate_count = $certificates.Count\n    }\n\n    Write-Host \"Found $certificate_count for $($LE_DNSimple_CertificateDomain).\"\n    Write-Host \"Checking to see if any expire within $($OctopusParameters[\"LE_DNSimple_ReplaceIfExpiresInDays\"]) days.\"\n\n    # Check Expiry Dates\n    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters[\"LE_DNSimple_ReplaceIfExpiresInDays\"]) }\n\n    if ($expiring_certificates) {\n        Write-Host \"Found certificates that expire with $($OctopusParameters[\"LE_DNSimple_ReplaceIfExpiresInDays\"]) days. Requesting new certificates for $($LE_DNSimple_CertificateDomain) from Lets Encrypt\"\n        $le_certificate = Get-LetsEncryptCertificate\n\n        # PFX\n        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq \"Pkcs12\" } | Select-Object -First 1\n        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate\n        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json\n    }\n    else {\n        Write-Host \"Nothing to do here...\"\n    }\n\n    exit 0\n}\n\n# No existing Certificates - Lets get some new ones.\nWrite-Host \"No existing certificates found for $($LE_DNSimple_CertificateDomain).\"\nWrite-Host \"Request New Certificate for $($LE_DNSimple_CertificateDomain) from Lets Encrypt\"\n\n# New Certificate..\n$le_certificate = Get-LetsEncryptCertificate\n\nWrite-Host \"Publishing: LetsEncrypt - $($LE_DNSimple_CertificateDomain) (PFX)\"\n$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate\nPublish-OctopusCertificate -JsonBody $certificate_as_json\n\nWrite-Host \"GREAT SUCCESS\"\n",
-        "Octopus.Action.SubstituteInFiles.Enabled": "True"
-    },
-    "Parameters": [
-        {
-            "Id": "d0984e44-0783-4ddc-8a57-8008997edb2a",
-            "Name": "LE_DNSimple_CertificateDomain",
-            "Label": "Certificate Domain",
-            "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c68389d4-17e4-491b-a6ce-ee6b09ae1579",
-            "Name": "LE_DNSimple_PfxPassword",
-            "Label": "PFX Password",
-            "HelpText": "Password to use when converting to / from PFX. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "0bce1a67-4981-474d-8b93-873fa3b28712",
-            "Name": "LE_DNSimple_ReplaceIfExpiresInDays",
-            "Label": "Replace expiring certificate before N days",
-            "HelpText": "Replace the certificate if it expiries within N days",
-            "DefaultValue": "30",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "f1f25997-9733-4882-a546-ef6c76b7c7f1",
-            "Name": "LE_DNSimple_Token",
-            "Label": "DNSimple API Token",
-            "HelpText": "DNSimple API Token created from your [DNSimple account](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/DNSimple-Readme.md#setup)",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "1addd2e6-782d-4a1f-bd12-480a9dd964cd",
-            "Name": "LE_DNSimple_Octopus_APIKey",
-            "Label": "Octopus Deploy API key",
-            "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "ad07684b-93ea-4d65-b2a8-395e3bbfdaf8",
-            "Name": "LE_DNSimple_Use_Staging",
-            "Label": "Use Lets Encrypt Staging",
-            "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "9a358e2e-07df-42d1-9f0a-04cbc800dacf",
-            "Name": "LE_DNSimple_ContactEmailAddress",
-            "Label": "Contact Email Address",
-            "HelpText": "Email Address",
-            "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "3a9e5773-9fbb-4dd4-a9c2-0f66a36b74a2",
-            "Name": "LE_DNSimple_Debug_Output",
-            "Label": "Debug Output",
-            "HelpText": "Tick this to provide debug information in the output",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
-            "Name": "LE_DNSimple_CreateWildcardSAN",
-            "Label": "Create Wildcard SAN",
-            "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-              "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],    
-    "$Meta": {
-    "ExportedAt": "2025-09-11T14:51:42.815Z",
-    "OctopusVersion": "2025.3.14236",
-        "Type": "ActionTemplate"
-      },
-      "LastModifiedBy": "benjimac93",
-    "Category": "lets-encrypt"
-}
diff --git a/step-templates/letsencrypt-google-cloud.json b/step-templates/letsencrypt-google-cloud.json
deleted file mode 100644
index 0b7f9a232..000000000
--- a/step-templates/letsencrypt-google-cloud.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "Id": "0ea316b3-562e-4782-8611-ce82f5224eff",
-    "Name": "Lets Encrypt - Google Cloud DNS",
-    "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [Google Cloud DNS](https://cloud.google.com/dns) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
-    "ActionType": "Octopus.Script",
-    "Version": 13,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "###############################################################################\n# TLS 1.2\n###############################################################################\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n###############################################################################\n# Required Modules folder\n###############################################################################\nWrite-Host \"Checking for required powershell modules folder\"\n$ModulesFolder = \"$HOME\\Documents\\WindowsPowerShell\\Modules\"\nif ($PSEdition -eq \"Core\") {\n    if ($PSVersionTable.Platform -eq \"Unix\") {\n        $ModulesFolder = \"$HOME/.local/share/powershell/Modules\"\n    }\n    else {\n        $ModulesFolder = \"$HOME\\Documents\\PowerShell\\Modules\"\n    }\n}\n$PSModuleFolderExists = (Test-Path $ModulesFolder)\nif ($PSModuleFolderExists -eq $False) {\n\tWrite-Host \"Creating directory: $ModulesFolder\"\n\tNew-Item $ModulesFolder -ItemType Directory -Force\n    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath\n}\n\n###############################################################################\n# Required Modules\n###############################################################################\nWrite-Host \"Checking for required modules.\"\n$required_posh_acme_version = 3.12.0\n$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }\n\nif (-not ($module_check)) {\n    Write-Host \"Ensuring NuGet provider is bootstrapped.\"\n    Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n    Write-Host \"Installing Posh-ACME.\"\n    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force\n}\n\nImport-Module Posh-ACME\n\n###############################################################################\n# Constants\n###############################################################################\n$LE_GCloudDNS_CertificateDomain = $OctopusParameters[\"LE_GCloudDNS_CertificateDomain\"]\n$LE_GCloudDNS_CertificateName = \"Lets Encrypt - $($LE_GCloudDNS_CertificateDomain)\"\n\n# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt\n$LE_GCloudDNS_Fake_Issuers = @(\"Fake LE Intermediate X1\", \"(STAGING) Artificial Apricot R3\", \"(STAGING) Ersatz Edamame E1\", \"(STAGING) Pseudo Plum E5\", \"(STAGING) False Fennel E6\", \"(STAGING) Puzzling Parsnip E7\", \"(STAGING) Mysterious Mulberry E8\", \"(STAGING) Fake Fig E9\", \"(STAGING) Counterfeit Cashew R10\", \"(STAGING) Wannabe Watercress R11\", \"(STAGING) Riddling Rhubarb R12\", \"(STAGING) Tenuous Tomato R13\", \"(STAGING) Not Nectarine R14\")\n$LE_GCloudDNS_Issuers = @(\"Let's Encrypt Authority X3\", \"E1\", \"E2\", \"E7\", \"E8\", \"R3\", \"R4\", \"R5\", \"R6\", \"R10\", \"R11\", \"R12\", \"R13\")\n\n###############################################################################\n# Helpers\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $response = $reader.ReadToEnd()\n\n            return $response | ConvertFrom-Json\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\n###############################################################################\n# Functions\n###############################################################################\nfunction Get-LetsEncryptCertificate {\n    Write-Debug \"Entering: Get-LetsEncryptCertificate\"\n\n    if ($OctopusParameters[\"LE_GCloudDNS_Use_Staging\"] -eq $True) {\n        Write-Host \"Using Lets Encrypt Server: Staging\"\n        Set-PAServer LE_STAGE;\n    }\n    else {\n        Write-Host \"Using Lets Encrypt Server: Production\"\n        Set-PAServer LE_PROD;\n    }\n\n    # Clobber account if it exists.\n    $le_account = Get-PAAccount\n    if ($le_account) {\n        Remove-PAAccount $le_account.Id -Force\n    }\n\n    # Google Cloud requires JSON data to be passed in.\n    $gcloud_json = \"$(New-Guid).json\"\n    Set-Content -Path $gcloud_json -Value $OctopusParameters[\"LE_GCloudDNS_JSON\"]\n\n    $gcloud_args = @{\n        GCKeyFile = $gcloud_json\n    }\n\n    try {\n        $DnsPlugins = @(\"GCloud\")\n        $DomainList = @($LE_GCloudDNS_CertificateDomain)\n        \n        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.\n        if ($LE_GCloudDNS_CertificateDomain -match \"\\*.\" -and $OctopusParameters[\"LE_GCloudDNS_CreateWildcardSAN\"] -eq $True) {\n            $LE_GCloudDNS_Certificate_SAN = $LE_GCloudDNS_CertificateDomain.Replace(\"*.\",\"\")\n            $DomainList += $LE_GCloudDNS_Certificate_SAN\n            # Include additional DnsPlugin of same type to surpress warning.\n            $DnsPlugins += \"GCloud\"\n        }\n\n        $Cert_Params = @{\n            Domain = $DomainList\n            AcceptTOS = $True;\n            Contact = $OctopusParameters[\"LE_GCloudDNS_ContactEmailAddress\"];\n            DnsPlugin = $DnsPlugins;\n            PluginArgs = $gcloud_args;\n            PfxPass = $OctopusParameters[\"LE_GCloudDNS_PfxPassword\"];\n            Force = $True;\n        }\n\n        return New-PACertificate @Cert_Params\n    }\n    catch {\n        Write-Host \"Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_GCloudDNS_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_GCloudDNS_CertificateDomain)\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        # We don't want to confuse Production and Staging Lets Encrypt Certificates.\n        $possible_issuers = $LE_GCloudDNS_Issuers\n        if ($OctopusParameters[\"LE_GCloudDNS_Use_Staging\"] -eq $True) {\n            $possible_issuers = $LE_GCloudDNS_Fake_Issuers\n        }\n\n        return $certificates_search | Where-Object {\n            $_.SubjectCommonName -eq $LE_GCloudDNS_CertificateDomain -and\n            $possible_issuers -contains $_.IssuerCommonName -and\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Publish-OctopusCertificate {\n    param (\n        [string] $JsonBody\n    )\n\n    Write-Debug \"Entering: Publish-OctopusCertificate\"\n\n    if (-not ($JsonBody)) {\n        Write-Host \"Existing Certificate is required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_GCloudDNS_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Published $($LE_GCloudDNS_CertificateDomain) certificate to the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Host \"Failed to publish $($LE_GCloudDNS_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Update-OctopusCertificate {\n    param (\n        [string]$Certificate_Id,\n        [string]$JsonBody\n    )\n\n    Write-Debug \"Entering: Update-OctopusCertificate\"\n\n    if (-not ($Certificate_Id -and $JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_GCloudDNS_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Replaced $($LE_GCloudDNS_CertificateDomain) certificate in the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Error \"Failed to replace $($LE_GCloudDNS_CertificateDomain) certificate. Error: $($_.Exception.Message)\"\n        exit 1\n    }\n}\n\nfunction Get-NewCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-NewCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        Name            = \"$LE_GCloudDNS_CertificateName\";\n        Notes           = \"\";\n        CertificateData = @{\n            HasValue = $true;\n            NewValue = $certificate_base64;\n        };\n        Password        = @{\n            HasValue = $true;\n            NewValue = $OctopusParameters[\"LE_GCloudDNS_PfxPassword\"];\n        };\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\nfunction Get-ReplaceCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-ReplaceCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        CertificateData = $certificate_base64;\n        Password        = $OctopusParameters[\"LE_GCloudDNS_PfxPassword\"];\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\n###############################################################################\n# DO THE THING | MAIN |\n###############################################################################\nWrite-Debug \"Do the Thing\"\n\nWrite-Host \"Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store.\"\n$certificates = Get-OctopusCertificates\n\n# Check for PFX & PEM\nif ($certificates) {\n\n    # Handle weird behavior between Powershell 5 and Powershell 6+\n    $certificate_count = 1\n    if ($certificates.Count -ge 1) {\n        $certificate_count = $certificates.Count\n    }\n\n    Write-Host \"Found $certificate_count for $($LE_GCloudDNS_CertificateDomain).\"\n    Write-Host \"Checking to see if any expire within $($OctopusParameters[\"LE_GCloudDNS_ReplaceIfExpiresInDays\"]) days.\"\n\n    # Check Expiry Dates\n    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters[\"LE_GCloudDNS_ReplaceIfExpiresInDays\"]) }\n\n    if ($expiring_certificates) {\n        Write-Host \"Found certificates that expire with $($OctopusParameters[\"LE_GCloudDNS_ReplaceIfExpiresInDays\"]) days. Requesting new certificates for $($LE_GCloudDNS_CertificateDomain) from Lets Encrypt\"\n        $le_certificate = Get-LetsEncryptCertificate\n\n        # PFX\n        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq \"Pkcs12\" } | Select-Object -First 1\n        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate\n        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json\n    }\n    else {\n        Write-Host \"Nothing to do here...\"\n    }\n\n    exit 0\n}\n\n# No existing Certificates - Lets get some new ones.\nWrite-Host \"No existing certificates found for $($LE_GCloudDNS_CertificateDomain).\"\nWrite-Host \"Request New Certificate for $($LE_GCloudDNS_CertificateDomain) from Lets Encrypt\"\n\n# New Certificate..\n$le_certificate = Get-LetsEncryptCertificate\n\nWrite-Host \"Publishing: LetsEncrypt - $($LE_GCloudDNS_CertificateDomain) (PFX)\"\n$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate\nPublish-OctopusCertificate -JsonBody $certificate_as_json\n\nWrite-Host \"GREAT SUCCESS\"\n",
-        "Octopus.Action.SubstituteInFiles.Enabled": "True"
-    },
-    "Parameters": [{
-            "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
-            "Name": "LE_GCloudDNS_CertificateDomain",
-            "Label": "Certificate Domain",
-            "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
-            "Name": "LE_GCloudDNS_PfxPassword",
-            "Label": "PFX Password",
-            "HelpText": "Password to use when converting to / from PFX. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
-            "Name": "LE_GCloudDNS_ReplaceIfExpiresInDays",
-            "Label": "Replace expiring certificate before N days",
-            "HelpText": "Replace the certificate if it expiries within N days",
-            "DefaultValue": "30",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "d346e12a-4f9f-4317-8399-469c4b71b0a5",
-            "Name": "LE_GCloudDNS_JSON",
-            "Label": "Google Cloud IAM Json",
-            "HelpText": "Google Cloud IAM JSON with the [appropriate permissions](https://github.com/rmbolger/Posh-ACME/blob/master/Posh-ACME/DnsPlugins/GCloud-Readme.md).",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "85af482d-e577-40b8-94e5-626e545adab5",
-            "Name": "LE_GCloudDNS_Octopus_APIKey",
-            "Label": "Octopus Deploy API key",
-            "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
-            "Name": "LE_GCloudDNS_Use_Staging",
-            "Label": "Use Lets Encrypt Staging",
-            "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
-            "Name": "LE_GCloudDNS_ContactEmailAddress",
-            "Label": "Contact Email Address",
-            "HelpText": "Email Address",
-            "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
-            "Name": "LE_GCloudDNS_CreateWildcardSAN",
-            "Label": "Create Wildcard SAN",
-            "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-              "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "$Meta": {
-    "ExportedAt": "2025-09-11T14:51:42.815Z",
-    "OctopusVersion": "2025.3.14236",
-        "Type": "ActionTemplate"
-      },
-      "LastModifiedBy": "benjimac93",
-    "Category": "lets-encrypt"
-}
diff --git a/step-templates/letsencrypt-route-53.json b/step-templates/letsencrypt-route-53.json
deleted file mode 100644
index 7b64e7a86..000000000
--- a/step-templates/letsencrypt-route-53.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "Id": "55b654f4-3e01-424f-b299-f99beddf0501",
-    "Name": "Lets Encrypt - Route53",
-    "Description": "Request (or renew) a X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/). \n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com)\n- [AWS Route53](https://aws.amazon.com/route53/) Challenge for TLD, CNAME and Wildcard domains. \n- Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates). \n- Verified to work on both Windows (PowerShell 5+) and Linux (PowerShell 6+) deployment Targets or Workers.",
-    "ActionType": "Octopus.Script",
-    "Version": 14,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "###############################################################################\n# TLS 1.2\n###############################################################################\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n###############################################################################\n# Required Modules folder\n###############################################################################\nWrite-Host \"Checking for required powershell modules folder\"\n$ModulesFolder = \"$HOME\\Documents\\WindowsPowerShell\\Modules\"\nif ($PSEdition -eq \"Core\") {\n    if ($PSVersionTable.Platform -eq \"Unix\") {\n        $ModulesFolder = \"$HOME/.local/share/powershell/Modules\"\n    }\n    else {\n        $ModulesFolder = \"$HOME\\Documents\\PowerShell\\Modules\"\n    }\n}\n$PSModuleFolderExists = (Test-Path $ModulesFolder)\nif ($PSModuleFolderExists -eq $False) {\n\tWrite-Host \"Creating directory: $ModulesFolder\"\n\tNew-Item $ModulesFolder -ItemType Directory -Force\n    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath\n}\n\n###############################################################################\n# Required Modules\n###############################################################################\nWrite-Host \"Checking for required modules.\"\n$required_posh_acme_version = 3.12.0\n$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }\n\nif (-not ($module_check)) {\n    Write-Host \"Ensuring NuGet provider is bootstrapped.\"\n    Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n    Write-Host \"Installing Posh-ACME.\"\n    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force\n}\n\nImport-Module Posh-ACME\n\n###############################################################################\n# Constants\n###############################################################################\n$LE_Route53_CertificateDomain = $OctopusParameters[\"LE_Route53_CertificateDomain\"]\n$LE_Route53_CertificateName = \"Lets Encrypt - $($LE_Route53_CertificateDomain)\"\n\n# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt\n$LE_Route53_Fake_Issuers = @(\"Fake LE Intermediate X1\", \"(STAGING) Artificial Apricot R3\", \"(STAGING) Ersatz Edamame E1\", \"(STAGING) Pseudo Plum E5\", \"(STAGING) False Fennel E6\", \"(STAGING) Puzzling Parsnip E7\", \"(STAGING) Mysterious Mulberry E8\", \"(STAGING) Fake Fig E9\", \"(STAGING) Counterfeit Cashew R10\", \"(STAGING) Wannabe Watercress R11\", \"(STAGING) Riddling Rhubarb R12\", \"(STAGING) Tenuous Tomato R13\", \"(STAGING) Not Nectarine R14\")\n$LE_Route53_Issuers = @(\"Let's Encrypt Authority X3\", \"E1\", \"E2\", \"E7\", \"E8\", \"R3\", \"R4\", \"R5\", \"R6\", \"R10\", \"R11\", \"R12\", \"R13\")\n\n###############################################################################\n# Helpers\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $response = $reader.ReadToEnd()\n\n            return $response | ConvertFrom-Json\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\n###############################################################################\n# Functions\n###############################################################################\nfunction Get-LetsEncryptCertificate {\n    Write-Debug \"Entering: Get-LetsEncryptCertificate\"\n\n    if ($OctopusParameters[\"LE_Route53_Use_Staging\"] -eq $True) {\n        Write-Host \"Using Lets Encrypt Server: Staging\"\n        Set-PAServer LE_STAGE;\n    }\n    else {\n        Write-Host \"Using Lets Encrypt Server: Production\"\n        Set-PAServer LE_PROD;\n    }\n\n    # Clobber account if it exists.\n    $le_account = Get-PAAccount\n    if ($le_account) {\n        Remove-PAAccount $le_account.Id -Force\n    }\n\n    $aws_secret_key = ConvertTo-SecureString -String $OctopusParameters[\"LE_Route53_AWSAccount.SecretKey\"] -AsPlainText -Force\n    $route53_params = @{\n        R53AccessKey = $OctopusParameters[\"LE_Route53_AWSAccount.AccessKey\"];\n        R53SecretKey = $aws_secret_key\n    }\n\n    try {\n        $DnsPlugins = @(\"Route53\")\n        $DomainList = @($LE_Route53_CertificateDomain)\n        \n        # If domain is a wildcard e.g. *.example-domain.com, check if a SAN has been requested e.g. example-domain.com.\n        if ($LE_Route53_CertificateDomain -match \"\\*.\" -and $OctopusParameters[\"LE_Route53_CreateWildcardSAN\"] -eq $True) {\n            $LE_Route53_Certificate_SAN = $LE_Route53_CertificateDomain.Replace(\"*.\",\"\")\n            $DomainList += $LE_Route53_Certificate_SAN\n            # Include additional DnsPlugin of same type to surpress warning.\n            $DnsPlugins += \"Route53\"\n        }\n\n        $Cert_Params = @{\n            Domain = $DomainList\n            AcceptTOS = $True;\n            Contact = $OctopusParameters[\"LE_Route53_ContactEmailAddress\"];\n            DnsPlugin = $DnsPlugins;\n            PluginArgs = $route53_params;\n            PfxPass = $OctopusParameters[\"LE_Route53_PfxPassword\"];\n            Force = $True;\n        }\n\n        return New-PACertificate @Cert_Params\n    }\n    catch {\n        Write-Host \"Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_Route53_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$($LE_Route53_CertificateDomain)\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        # We don't want to confuse Production and Staging Lets Encrypt Certificates.\n        $possible_issuers = $LE_Route53_Issuers\n        if ($OctopusParameters[\"LE_Route53_Use_Staging\"] -eq $True) {\n            $possible_issuers = $LE_Route53_Fake_Issuers\n        }\n\n        return $certificates_search | Where-Object {\n            $_.SubjectCommonName -eq $LE_Route53_CertificateDomain -and\n            $possible_issuers -contains $_.IssuerCommonName -and\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Publish-OctopusCertificate {\n    param (\n        [string] $JsonBody\n    )\n\n    Write-Debug \"Entering: Publish-OctopusCertificate\"\n\n    if (-not ($JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_Route53_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Published $($LE_Route53_CertificateDomain) certificate to the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Host \"Failed to publish $($LE_Route53_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Update-OctopusCertificate {\n    param (\n        [string]$Certificate_Id,\n        [string]$JsonBody\n    )\n\n    Write-Debug \"Entering: Update-OctopusCertificate\"\n\n    if (-not ($Certificate_Id -and $JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        exit 1\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"LE_Route53_Octopus_APIKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Replaced $($LE_Route53_CertificateDomain) certificate in the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Error \"Failed to replace $($LE_Route53_CertificateDomain) certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        exit 1\n    }\n}\n\nfunction Get-NewCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-NewCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        Name = \"$LE_Route53_CertificateName\";\n        Notes            = \"\";\n        CertificateData  = @{\n            HasValue = $true;\n            NewValue = $certificate_base64;\n        };\n        Password         = @{\n            HasValue = $true;\n            NewValue = $OctopusParameters[\"LE_Route53_PfxPassword\"];\n        };\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\nfunction Get-ReplaceCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-ReplaceCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit 1\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($Certificate.PfxFullChain)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        CertificateData = $certificate_base64;\n        Password        = $OctopusParameters[\"LE_Route53_PfxPassword\"];\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\n###############################################################################\n# DO THE THING | MAIN |\n###############################################################################\nWrite-Debug \"Do the Thing\"\n\nWrite-Host \"Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store.\"\n$certificates = Get-OctopusCertificates\n\n# Check for PFX & PEM\nif ($certificates) {\n\n    # Handle weird behavior between Powershell 5 and Powershell 6+\n    $certificate_count = 1\n    if ($certificates.Count -ge 1) {\n        $certificate_count = $certificates.Count\n    }\n\n    Write-Host \"Found $certificate_count for $($LE_Route53_CertificateDomain).\"\n    Write-Host \"Checking to see if any expire within $($OctopusParameters[\"LE_Route53_ReplaceIfExpiresInDays\"]) days.\"\n\n    # Check Expiry Dates\n    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters[\"LE_Route53_ReplaceIfExpiresInDays\"]) }\n\n    if ($expiring_certificates) {\n        Write-Host \"Found certificates that expire with $($OctopusParameters[\"LE_Route53_ReplaceIfExpiresInDays\"]) days. Requesting new certificates for $($LE_Route53_CertificateDomain) from Lets Encrypt\"\n        $le_certificate = Get-LetsEncryptCertificate\n\n        # PFX\n        $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq \"Pkcs12\" } | Select-Object -First 1\n        $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate\n        Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json\n    }\n    else {\n        Write-Host \"Nothing to do here...\"\n    }\n\n    exit 0\n}\n\n# No existing Certificates - Lets get some new ones.\nWrite-Host \"No existing certificates found for $($LE_Route53_CertificateDomain).\"\nWrite-Host \"Request New Certificate for $($LE_Route53_CertificateDomain) from Lets Encrypt\"\n\n# New Certificate..\n$le_certificate = Get-LetsEncryptCertificate\n\nWrite-Host \"Publishing: LetsEncrypt - $($LE_Route53_CertificateDomain) (PFX)\"\n$certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate\nPublish-OctopusCertificate -JsonBody $certificate_as_json\n\nWrite-Host \"GREAT SUCCESS\"\n",
-        "Octopus.Action.SubstituteInFiles.Enabled": "True"
-    },
-    "Parameters": [{
-            "Id": "f1739a56-2603-42e0-b629-801dd71b0b0c",
-            "Name": "LE_Route53_CertificateDomain",
-            "Label": "Certificate Domain",
-            "HelpText": "Domain (TLD, CNAME or Wildcard) to create a certificate for. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c1f44b38-8025-4b12-b010-df48c02b3da4",
-            "Name": "LE_Route53_PfxPassword",
-            "Label": "PFX Password",
-            "HelpText": "Password to use when converting to / from PFX. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "c258ee0e-e298-4fa1-9c66-5ac0749409c5",
-            "Name": "LE_Route53_ReplaceIfExpiresInDays",
-            "Label": "Replace expiring certificate before N days",
-            "HelpText": "Replace the certificate if it expiries within N days",
-            "DefaultValue": "30",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "2935998d-d030-4af6-ad42-39e8b85e2dce",
-            "Name": "LE_Route53_AWSAccount",
-            "Label": "AWS account",
-            "HelpText": "An AWS Account that has API access to make Route53 changes. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "AmazonWebServicesAccount"
-            }
-        },
-        {
-            "Id": "85af482d-e577-40b8-94e5-626e545adab5",
-            "Name": "LE_Route53_Octopus_APIKey",
-            "Label": "Octopus Deploy API key",
-            "HelpText": "A Octopus Deploy API key with access to change Certificates in the Certificate Store. ",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "00d513ed-3d75-48d2-954a-0a0165d85530",
-            "Name": "LE_Route53_Use_Staging",
-            "Label": "Use Lets Encrypt Staging",
-            "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure?",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "f1fd315d-9fc5-4b15-b53c-9381ecc5cb88",
-            "Name": "LE_Route53_ContactEmailAddress",
-            "Label": "Contact Email Address",
-            "HelpText": "Email Address",
-            "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "2dc7d9bc-9eee-4ee0-a33c-ef9371ed69f1",
-            "Name": "LE_Route53_CreateWildcardSAN",
-            "Label": "Create Wildcard SAN",
-            "HelpText": "Should the certificate have a Subject Alternative Name (SAN) excluding the wildcard?\n\ne.g. a certificate domain of `*.internal.example-domain.com` could also have a SAN of `internal.example-domain.com`",
-            "DefaultValue": "false",
-            "DisplaySettings": {
-              "Octopus.ControlType": "Checkbox"
-            }
-        }
-    ],
-    "$Meta": {
-    "ExportedAt": "2025-09-11T14:51:42.815Z",
-    "OctopusVersion": "2025.3.14236",
-        "Type": "ActionTemplate"
-      },
-      "LastModifiedBy": "benjimac93",
-    "Category": "lets-encrypt"
-}
diff --git a/step-templates/letsencrypt-selfhosted-http.json b/step-templates/letsencrypt-selfhosted-http.json
deleted file mode 100644
index 4d959cd0e..000000000
--- a/step-templates/letsencrypt-selfhosted-http.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "Id": "e3614dd6-3a78-4220-97f0-b0e44415e58c",
-  "Name": "Lets Encrypt - Self-Hosted HTTP Challenge",
-  "Description": "Request (or renew) an X.509 SSL Certificate from the [Let's Encrypt Certificate Authority](https://letsencrypt.org/) using the Self-hosted HTTP Challenge Listener provided by the [Posh-ACME](https://github.com/rmbolger/Posh-ACME/) PowerShell Module.\n\n---\n#### Please Note\n\nIt's generally a better idea to use one of the Posh-ACME [DNS providers](https://github.com/rmbolger/Posh-ACME/wiki/List-of-Supported-DNS-Providers) for Let's Encrypt.\n\nThere are a number of Octopus Step templates in the [Community Library](https://library.octopus.com/listing/letsencrypt) that support DNS providers.\n\n---\n\n#### Features\n\n- ACME v2 protocol support which allows generating wildcard certificates (*.example.com).\n- [Self-hosted HTTP Challenge](https://github.com/rmbolger/Posh-ACME/wiki/How-To-Self-Host-HTTP-Challenges) Challenge for TLD, CNAME, and Wildcard domains. \n- _Optionally_ Publishes/Updates SSL Certificates in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates).\n- _Optionally_ import SSL Certificate into the local machine store. \n- _Optionally_ Export PFX (PKCS#12) SSL Certificate to a supplied file path.\n- Verified to work on Windows and Linux deployment targets\n\n#### Pre-requisites\n\n- There are specific requirements when [running on Windows](https://github.com/rmbolger/Posh-ACME/wiki/How-To-Self-Host-HTTP-Challenges#windows-only-prerequisites).\n- HTTP Challenge Listener must be available on Port 80.\n- When updating the Octopus Certificate Store, access to the Octopus Server from where the script template runs e.g. deployment target or worker is required.",
-  "ActionType": "Octopus.Script",
-  "Version": 12,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# TLS 1.2\nWrite-Host \"Enabling TLS 1.2 for script execution\"\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12\n\n###############################################################################\n# Required Modules folder\n###############################################################################\nWrite-Host \"Checking for required powershell modules folder\"\n$ModulesFolder = \"$HOME\\Documents\\WindowsPowerShell\\Modules\"\nif ($PSEdition -eq \"Core\") {\n    if ($PSVersionTable.Platform -eq \"Unix\") {\n        $ModulesFolder = \"$HOME/.local/share/powershell/Modules\"\n    }\n    else {\n        $ModulesFolder = \"$HOME\\Documents\\PowerShell\\Modules\"\n    }\n}\n$PSModuleFolderExists = (Test-Path $ModulesFolder)\nif ($PSModuleFolderExists -eq $False) {\n\tWrite-Host \"Creating directory: $ModulesFolder\"\n\tNew-Item $ModulesFolder -ItemType Directory -Force\n    $env:PSModulePath = $ModulesFolder + [System.IO.Path]::PathSeparator + $env:PSModulePath\n}\n\n###############################################################################\n# Required Modules\n###############################################################################\nWrite-Host \"Checking for required modules.\"\n$required_posh_acme_version = 3.12.0\n$module_check = Get-Module -ListAvailable -Name Posh-Acme | Where-Object { $_.Version -ge $required_posh_acme_version }\n\nif (-not ($module_check)) {\n    Write-Host \"Ensuring NuGet provider is bootstrapped.\"\n    Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n    Write-Host \"Installing Posh-ACME.\"\n    Install-Module -Name Posh-ACME -MinimumVersion 3.12.0 -Scope CurrentUser -Force\n}\n\nWrite-Host \"Importing Posh-ACME\"\nImport-Module Posh-ACME\n\n# Variables\n$LE_SelfHosted_CertificateDomain = $OctopusParameters[\"LE_SelfHosted_CertificateDomain\"]\n$LE_SelfHosted_Contact = $OctopusParameters[\"LE_SelfHosted_ContactEmailAddress\"]\n$LE_SelfHosted_PfxPass = $OctopusParameters[\"LE_SelfHosted_PfxPass\"]\n$LE_SelfHosted_Use_Staging = $OctopusParameters[\"LE_SelfHosted_Use_Staging\"]\n$LE_SelfHosted_HttpListenerTimeout = $OctopusParameters[\"LE_SelfHosted_HttpListenerTimeout\"]\n$LE_Self_Hosted_UpdateOctopusCertificateStore = $OctopusParameters[\"LE_Self_Hosted_UpdateOctopusCertificateStore\"]\n$LE_SelfHosted_Octopus_APIKey = $OctopusParameters[\"LE_SelfHosted_Octopus_APIKey\"]\n$LE_SelfHosted_ReplaceIfExpiresInDays = $OctopusParameters[\"LE_SelfHosted_ReplaceIfExpiresInDays\"]\n$LE_SelfHosted_Install = $OctopusParameters[\"LE_SelfHosted_Install\"]\n$LE_SelfHosted_ExportFilePath = $OctopusParameters[\"LE_SelfHosted_ExportFilePath\"]\n$LE_SelfHosted_Export = -not [System.String]::IsNullOrWhiteSpace($LE_SelfHosted_ExportFilePath)\n$LE_SelfHosted_TempFileLocation=[System.IO.Path]::GetTempFileName()\n\n# Consts\n$LE_SelfHosted_Certificate_Name = \"Lets Encrypt - $LE_SelfHosted_CertificateDomain\"\n\n# Issuer used in a cert could be one of multiple, including ones no longer supported by Let's Encrypt\n$LE_SelfHosted_Fake_Issuers = @(\"Fake LE Intermediate X1\", \"(STAGING) Artificial Apricot R3\", \"(STAGING) Ersatz Edamame E1\", \"(STAGING) Pseudo Plum E5\", \"(STAGING) False Fennel E6\", \"(STAGING) Puzzling Parsnip E7\", \"(STAGING) Mysterious Mulberry E8\", \"(STAGING) Fake Fig E9\", \"(STAGING) Counterfeit Cashew R10\", \"(STAGING) Wannabe Watercress R11\", \"(STAGING) Riddling Rhubarb R12\", \"(STAGING) Tenuous Tomato R13\", \"(STAGING) Not Nectarine R14\")\n$LE_SelfHosted_Issuers = @(\"Let's Encrypt Authority X3\", \"E1\", \"E2\", \"E7\", \"E8\", \"R3\", \"R4\", \"R5\", \"R6\", \"R10\", \"R11\", \"R12\", \"R13\")\n\n# Helper(s)\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $response = $reader.ReadToEnd()\n            return $response | ConvertFrom-Json\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\nfunction Clean-TempFiles {\n\tif(Test-Path -Path $LE_SelfHosted_TempFileLocation) {\n\t\tWrite-Debug \"Removing temporary file...\"\n\t\tRemove-Item $LE_SelfHosted_TempFileLocation -Force\n\t}\n}\n\nfunction Exit-Failure {\n  \tClean-TempFiles\n\tExit 1\n}\n\nfunction Exit-Success {\n  \tClean-TempFiles\n\tExit 0\n}\n\n# Functions\nfunction Get-LetsEncryptCertificate {\n    Write-Debug \"Entering: Get-LetsEncryptCertificate\"\n\n    if ($LE_SelfHosted_Use_Staging -eq $True) {\n        Write-Host \"Using Lets Encrypt Server: Staging\"\n        Set-PAServer LE_STAGE;\n    }\n    else {\n        Write-Host \"Using Lets Encrypt Server: Production\"\n        Set-PAServer LE_PROD;\n    }\n\n    $le_account = Get-PAAccount\n    if ($le_account) {\n        Write-Host \"Removing existing PA-Account...\"\n        Remove-PAAccount $le_account.Id -Force\n    }\n    \n    Write-Host \"Assigning new PA-Account...\"\n    $le_account = New-PAAccount -Contact $LE_SelfHosted_Contact -AcceptTOS -Force\n    \n    Write-Host \"Requesting new order for $LE_SelfHosted_CertificateDomain...\"\n    $order = New-PAOrder -Domain $LE_SelfHosted_CertificateDomain -PfxPass $LE_SelfHosted_PfxPass -Force\n    \n    try {\n    \tWrite-Host \"Invoking Self-Hosted HttpChallengeListener with timeout of $LE_SelfHosted_HttpListenerTimeout seconds...\"\n    \tInvoke-HttpChallengeListener -Verbose -ListenerTimeout $LE_SelfHosted_HttpListenerTimeout\n        \t\n        Write-Host \"Getting validated certificate...\"\n        $pArgs = @{ManualNonInteractive=$True}\n        $cert = New-PACertificate $LE_SelfHosted_CertificateDomain -PluginArgs $pArgs\n        \n        if ($LE_SelfHosted_Install -eq $True) {\n        \tif (-not $IsWindows -and 'Desktop' -ne $PSEdition) {\n              Write-Host \"Installing certificate currently only works on Windows\"\n          \t}\n            else {\n              Write-Host \"Installing certificate to local store...\"\n              $cert | Install-PACertificate\n            }\n    \t}\n        \n        # Linux showed weird $null issues using the .PfxFullChain path\n        if(Test-Path -Path $LE_SelfHosted_TempFileLocation) {\n        \tWrite-Debug \"Creating temp copy of certificate to: $LE_SelfHosted_TempFileLocation\"\n        \t$bytes = [System.IO.File]::ReadAllBytes($cert.PfxFullChain)\n            New-Item -Path $LE_SelfHosted_TempFileLocation -ItemType \"file\" -Force\n            [System.IO.File]::WriteAllBytes($LE_SelfHosted_TempFileLocation, $bytes)\n        }\n        \n        if($LE_SelfHosted_Export -eq $True) {\n        \tWrite-Host \"Exporting certificate to: $LE_SelfHosted_ExportFilePath\"\n        \t$bytes = [System.IO.File]::ReadAllBytes($LE_SelfHosted_TempFileLocation)\n            New-Item -Path $LE_SelfHosted_ExportFilePath -ItemType \"file\" -Force\n            [System.IO.File]::WriteAllBytes($LE_SelfHosted_ExportFilePath, $bytes)\n    \t}\n\n        return $cert\n    }\n    catch {\n        Write-Host \"Failed to Create Certificate. Error Message: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        Exit-Failure\n    }\n}\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $LE_SelfHosted_Octopus_APIKey }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$LE_SelfHosted_CertificateDomain\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        # We don't want to confuse Production and Staging Lets Encrypt Certificates.\n        $possible_issuers = $LE_SelfHosted_Issuers\n        if ($LE_SelfHosted_Use_Staging -eq $True) {\n            $possible_issuers = $LE_SelfHosted_Fake_Issuers\n        }\n\n        return $certificates_search | Where-Object {\n            $_.SubjectCommonName -eq $LE_SelfHosted_CertificateDomain -and\n            $possible_issuers -contains $_.IssuerCommonName -and\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        Exit-Failure\n    }\n}\n\nfunction Publish-OctopusCertificate {\n    param (\n        [string] $JsonBody\n    )\n\n    Write-Debug \"Entering: Publish-OctopusCertificate\"\n\n    if (-not ($JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        Exit-Failure\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $LE_SelfHosted_Octopus_APIKey }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates\"\n\tWrite-Verbose \"Preparing to publish to: $octopus_certificates_uri\"\n    \n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Published $LE_SelfHosted_CertificateDomain certificate to the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Host \"Failed to publish $LE_SelfHosted_CertificateDomain certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        Exit-Failure\n    }\n}\n\nfunction Update-OctopusCertificate {\n    param (\n        [string]$Certificate_Id,\n        [string]$JsonBody\n    )\n\n    Write-Debug \"Entering: Update-OctopusCertificate\"\n\n    if (-not ($Certificate_Id -and $JsonBody)) {\n        Write-Host \"Existing Certificate Id and a replace Certificate are required.\"\n        Exit-Failure\n    }\n\n    $octopus_uri = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $LE_SelfHosted_Octopus_APIKey }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates/$Certificate_Id/replace\"\n\n    try {\n        Invoke-WebRequest -Uri $octopus_certificates_uri -Method Post -Headers $octopus_headers -Body $JsonBody -UseBasicParsing\n        Write-Host \"Replaced $LE_SelfHosted_CertificateDomain certificate in the Octopus Deploy Certificate Store.\"\n    }\n    catch {\n        Write-Error \"Failed to replace $LE_SelfHosted_CertificateDomain certificate. Error: $($_.Exception.Message). See Debug output for details.\"\n        Write-Debug (Get-WebRequestErrorBody -RequestError $_)\n        Exit-Failure\n    }\n}\n\nfunction Get-NewCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-NewCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit-Failure\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($LE_SelfHosted_TempFileLocation)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        Name = \"$LE_SelfHosted_CertificateDomain\";\n        Notes            = \"\";\n        CertificateData  = @{\n            HasValue = $true;\n            NewValue = $certificate_base64;\n        };\n        Password         = @{\n            HasValue = $true;\n            NewValue = $LE_SelfHosted_PfxPass;\n        };\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\nfunction Get-ReplaceCertificatePFXAsJson {\n    param (\n        $Certificate\n    )\n\n    Write-Debug \"Entering: Get-ReplaceCertificatePFXAsJson\"\n\n    if (-not ($Certificate)) {\n        Write-Host \"Certificate is required.\"\n        Exit-Failure\n    }\n\n    [Byte[]]$certificate_buffer = [System.IO.File]::ReadAllBytes($LE_SelfHosted_TempFileLocation)\n    $certificate_base64 = [convert]::ToBase64String($certificate_buffer)\n\n    $certificate_body = @{\n        CertificateData = $certificate_base64;\n        Password        = $LE_SelfHosted_PfxPass;\n    }\n\n    return $certificate_body | ConvertTo-Json\n}\n\n# Main Execution starts here\n\nWrite-Debug \"Running MAIN function...\"\n\nif ($LE_Self_Hosted_UpdateOctopusCertificateStore -eq $True) {\n  Write-Host \"Checking for existing Lets Encrypt Certificates in the Octopus Deploy Certificates Store...\"\n  $certificates = Get-OctopusCertificates\n\n  # Check for PFX & PEM\n  if ($certificates) {\n\n      # Handle behavior between Powershell 5 and Powershell 6+\n      $certificate_count = 1\n      if ($certificates.Count -ge 1) {\n          $certificate_count = $certificates.Count\n      }\n\n      Write-Host \"Found $certificate_count for $LE_SelfHosted_CertificateDomain.\"\n      Write-Host \"Checking to see if any expire within $LE_SelfHosted_ReplaceIfExpiresInDays days.\"\n\n      # Check Expiry Dates\n      $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($LE_SelfHosted_ReplaceIfExpiresInDays) }\n\n      if ($expiring_certificates) {\n          Write-Host \"Found certificates that expire with $LE_SelfHosted_ReplaceIfExpiresInDays days. Requesting new certificates for $LE_SelfHosted_CertificateDomain from Lets Encrypt\"\n          $le_certificate = Get-LetsEncryptCertificate\n\n          # PFX\n          $existing_certificate = $certificates | Where-Object { $_.CertificateDataFormat -eq \"Pkcs12\" } | Select-Object -First 1\n          $certificate_as_json = Get-ReplaceCertificatePFXAsJson -Certificate $le_certificate\n          Update-OctopusCertificate -Certificate_Id $existing_certificate.Id -JsonBody $certificate_as_json\n      }\n      else {\n          Write-Host \"Nothing to do here...\"\n      }\n\n\tWrite-Host \"Completed running...\"\n    Exit-Success\n  }\n}\n\nWrite-Host \"Requesting New Certificate for $LE_SelfHosted_CertificateDomain from Lets Encrypt\"\n\n$le_certificate = Get-LetsEncryptCertificate\n\nif($LE_Self_Hosted_UpdateOctopusCertificateStore -eq $True) {\n  Write-Host \"Publishing new LetsEncrypt - $LE_SelfHosted_CertificateDomain (PFX) to Octopus Certificate Store\"\n  $certificate_as_json = Get-NewCertificatePFXAsJson -Certificate $le_certificate\n  Publish-OctopusCertificate -JsonBody $certificate_as_json\n} \nelse {\n  Write-Host \"Certificate generated...\"\n  $le_certificate | fl\n}\n\nWrite-Host \"Completed running...\"\nExit-Success"
-  },
-  "Parameters": [
-    {
-      "Id": "3d7e44e3-8a29-4458-b3ba-c09817566492",
-      "Name": "LE_SelfHosted_CertificateDomain",
-      "Label": "Certificate Domain",
-      "HelpText": "Domain (TLD, CNAME, or Wildcard) to create a certificate for.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7f882a93-511d-4c8c-a946-832d69739773",
-      "Name": "LE_SelfHosted_ContactEmailAddress",
-      "Label": "Contact Email Address",
-      "HelpText": "The Email address used when requesting the SSL certificate. _Default: `#{Octopus.Deployment.CreatedBy.EmailAddress}`_.",
-      "DefaultValue": "#{Octopus.Deployment.CreatedBy.EmailAddress}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c91935f5-64cb-48c3-940b-981fcbfb942a",
-      "Name": "LE_SelfHosted_PfxPass",
-      "Label": "PFX Password",
-      "HelpText": "The password to use when converting to/from PFX.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "dd75b10a-17ca-4859-ae8d-adf0de74dbce",
-      "Name": "LE_SelfHosted_Use_Staging",
-      "Label": "Use Lets Encrypt Staging",
-      "HelpText": "Should the Certificate be generated using the Lets Encrypt Staging infrastructure? _Default: `False`_.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "9a5d53f9-c5e5-4c83-9769-43b987ba04b0",
-      "Name": "LE_SelfHosted_HttpListenerTimeout",
-      "Label": "Http Listener Timeout",
-      "HelpText": "Self-Hosted Http Listener Timeout in Seconds. _Default: 120 seconds_.",
-      "DefaultValue": "120",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7d8c49b8-684e-49d3-95aa-353c6e087843",
-      "Name": "LE_Self_Hosted_UpdateOctopusCertificateStore",
-      "Label": "Update Octopus Certificate Store?",
-      "HelpText": "Should any generated certificate be updated in the [Octopus Deploy Certificate Store](https://octopus.com/docs/deployment-examples/certificates) _Default: `True`_.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "83e2d3cf-66a6-47b4-bae8-e207a6918048",
-      "Name": "LE_SelfHosted_Octopus_APIKey",
-      "Label": "Octopus Deploy API key",
-      "HelpText": "An Octopus Deploy API key with access to change Certificates in the Certificate Store. \n\n**Note:** Required if `LE_Self_Hosted_UpdateOctopusCertificateStore` is set to `True`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "95ff51cc-2390-4b5d-89b0-bd62e83bb4f8",
-      "Name": "LE_SelfHosted_ReplaceIfExpiresInDays",
-      "Label": "Replace expiring certificate before N days",
-      "HelpText": "Replace the certificate if it expiries within N days. _Default: 30 days_.\n\n**Note:** Required if `LE_Self_Hosted_UpdateOctopusCertificateStore` is set to `True`.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d429561f-cf00-41f6-9956-e994f623696a",
-      "Name": "LE_SelfHosted_Install",
-      "Label": "Install Certificate?",
-      "HelpText": "Installs the certificate in the local store. _Default: `False`_.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "f8abcf14-c9a1-4e15-87dc-95004f2216e6",
-      "Name": "LE_SelfHosted_ExportFilePath",
-      "Label": "PFX Export Filepath",
-      "HelpText": "Exports the full certificate chain as PKCS#12 archive (.PFX used by Windows and IIS) e.g. C:\\Temp\\octopus.com.pfx",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2025-09-11T14:51:42.815Z",
-    "OctopusVersion": "2025.3.14236",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "benjimac93",
-  "Category": "lets-encrypt"
-}
diff --git a/step-templates/linux-service-start-stop-restart.json b/step-templates/linux-service-start-stop-restart.json
deleted file mode 100644
index 1dfe40132..000000000
--- a/step-templates/linux-service-start-stop-restart.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "Id": "cc2aa1d1-975b-4ac4-a145-094bbd92a2c9",
-    "Name": "Linux Service - Start, Stop, Restart",
-    "Description": null,
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "Bash",
-      "Octopus.Action.Script.ScriptBody": "serviceName=$(get_octopusvariable \"templateServiceName\")\naction=$(get_octopusvariable \"templateAction\")\nsleepInSeconds=$(get_octopusvariable \"templateSleepInSeconds\")\n\nfunction get_service_running () {\n\tlocal linuxService=$1\n    local state=$(systemctl is-active \"$linuxService\")\n\n\n    if [[ $state == \"active\" ]]\n    then\n        state=true\n    else\n        state=false\n    fi\n\n  \t# Return the result\n    echo \"$state\"\n}\n\nfunction service_found () {\n\tlocal serviceName=$1\n\tlocal result=\"\"\n\n\tif [[ ! -z $(systemctl status $serviceName | grep \"$serviceName\") ]]\n\tthen\n\t\tresult=true\n\telse\n\t\tresult=false\n\tfi\n\n\techo \"$result\"\n}\n\n# Check for service\nif [[ $(service_found \"$serviceName\") == true ]]\nthen\n\t# Perform action\n\tcase $action in\n\t\tstart)\n\t\t\tif [[ $(get_service_running \"$serviceName\") == false ]]\n\t\t\tthen \n\t\t\t\techo \"Starting service $serviceName...\"\n\t\t\t\tsystemctl start $serviceName\n\n\t\t\t\tsleep $sleepInSeconds\n\n\t\t\t\tif [[ $(get_service_running \"$serviceName\") == true ]]\n\t\t\t\tthen\n\t\t\t\t\techo \"$serviceName started successfully.\"\n\t\t\t\telse\n\t\t\t\t\tfail_step \"$serviceName did not start within the specified wait time.\"\n\t\t\t\tfi\n\t\t\telse\n\t\t\t\tfail_step \"Service $serviceName is already running!\"\n\t\t\tfi\n\t\t\t;;\n\t\tstop)\n\t\t\tif [[ $(get_service_running \"$serviceName\") == true ]]\n\t\t\tthen\n\t\t\t\techo \"Stopping $serviceName...\"\n\t\t\t\tsystemctl stop $serviceName\n\n\t\t\t\tsleep $sleepInSeconds\n\n\t\t\t\tif [[ $(get_service_running \"$serviceName\") == false ]]\n\t\t\t\tthen\n\t\t\t\t\techo \"Stopped $serviceName successfully.\"\n\t\t\t\telse\n\t\t\t\t\tfail_step \"$serviceName failed to stop within the specified wait time.\"\n\t\t\t\tfi\n\t\t\telse\n\t\t\t\tfail_step \"Service $serviceName is not running!\"\n\t\t\tfi\n\t\t\t;;\n\n\t\trestart)\n\t\t\tif [[ $(get_service_running \"$serviceName\") == true ]]\n\t\t\tthen\n\t\t\t\techo \"Restarting $serviceName...\"\n\t\t\t\tsystemctl restart $serviceName\n\n\t\t\t\tsleep $sleepInSeconds\n\n\t\t\t\tif [[ $(get_service_running \"$serviceName\") == true ]]\n\t\t\t\tthen\n\t\t\t\t\techo \"Restarted $serviceName successfully.\"\n\t\t\t\telse\n\t\t\t\t\tfail_step \"$serviceName did not restart within the specified wait time\"\n\t\t\t\tfi\n\t\t\telse\n\t\t\t\tfail_step \"$serviceName is stopped!\"\n\t\t\tfi\n\t\t\t;;\n\n\n\t\t*)\n\t\t\tfail_step \"Invalid action.  Valid actions are start|stop|restart.\"\n\t\t\t;;\n\tesac\nelse\n\tfail_step \"Service $serviceName not found!\"\nfi"
-    },
-    "Parameters": [
-      {
-        "Id": "e8b2d399-ecad-4f25-bff5-f198b36a9de3",
-        "Name": "templateServiceName",
-        "Label": "Service Name",
-        "HelpText": "Name of the service",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3a1857db-c40e-4a18-8205-994fd30a9f9b",
-        "Name": "templateAction",
-        "Label": "Action",
-        "HelpText": "Action to take on the service",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "start|Start\nstop|Stop\nrestart|Restart"
-        }
-      },
-      {
-        "Id": "e42aff9e-776d-4046-9a6a-7979bf6acf82",
-        "Name": "templateSleepInSeconds",
-        "Label": "Sleep in seconds",
-        "HelpText": "Number of seconds to wait after starting, stopping, or restarting to make sure the action worked successfully.",
-        "DefaultValue": "5",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedBy": "twerthi",    
-    "$Meta": {
-      "ExportedAt": "2020-03-04T18:52:00.622Z",
-      "OctopusVersion": "2019.13.7",
-      "Type": "ActionTemplate"
-    },
-    "Category": "Linux"
-  }
\ No newline at end of file
diff --git a/step-templates/liquibase-apply-changeset.json b/step-templates/liquibase-apply-changeset.json
deleted file mode 100644
index 0dd4be7c7..000000000
--- a/step-templates/liquibase-apply-changeset.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-    "Id": "6a276a58-d082-425f-a77a-ff7b3979ce2e",
-    "Name": "Liquibase - Apply changeset",
-    "Description": "Deploy database updates using Liquibase.  You can include Liquibase in the package itself or choose Download to download it during runtime.  Use the `Report only?` option to output the SQL it will run and upload it as an Artifact.  NOTE: `Report only?` does not work with NoSQL databases such as MongoDB \n\n**This template is now deprecated, please use `Liquibase - Run command`**",
-    "ActionType": "Octopus.Script",
-    "Version": 13,
-    "Author": "twerthi",
-    "Packages": [
-      {
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "liquibaseChangeset"
-        },
-        "Id": "15eeeac8-d80d-46ba-bc52-413fddae36f3",
-        "Name": "liquibaseChangeset"
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Configure template\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Disable progress bar for PowerShell\n$ProgressPreference = 'SilentlyContinue'\n\n# Downloads and extracts liquibase to the work folder\nFunction Get-Liquibase\n{\n    # Define parameters\n    param ($Version) \n\n\t$repositoryName = \"liquibase/liquibase\"\n\n    # Check to see if version wasn't specified\n    if ([string]::IsNullOrEmpty($Version))\n    {\n        # Get the latest version download url\n        $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object {$_.EndsWith(\".zip\")})\n    }\n    else\n    {\n    \t$downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $Version | Where-Object {$_.EndsWith(\".zip\")})\n    }\n\n    # Check for download folder\n    if ((Test-Path -Path \"$PSSCriptRoot\\liquibase\") -eq $false)\n    {\n        # Create the folder\n        New-Item -ItemType Directory -Path \"$PSSCriptRoot\\liquibase\"\n    }\n\n    # Download the zip file\n    Write-Output \"Downloading Liquibase from $downloadUrl ...\"\n    $liquibaseZipFile = \"$PSScriptroot\\liquibase\\$($downloadUrl.Substring($downloadUrl.LastIndexOf(\"/\")))\"\n    Invoke-WebRequest -Uri $downloadUrl -OutFile $liquibaseZipFile -UseBasicParsing\n    \n\n    # Extract package\n    Write-Output \"Extracting Liqbuibase ...\"\n    Expand-Archive -Path $liquibaseZipFile -DestinationPath \"$PSSCriptRoot\\liquibase\"\n}\n\n# Downloads and extracts Java to the work folder, then adds the location of java.exe to the $env:PATH variabble so it can be called\nFunction Get-Java\n{\n    # Check to see if a folder needs to be created\n    if((Test-Path -Path \"$PSScriptRoot\\jdk\") -eq $false)\n    {\n        # Create new folder\n        New-Item -ItemType Directory -Path \"$PSSCriptRoot\\jdk\"\n    }\n\n    # Download java\n    Write-Output \"Downloading Java ... \"\n    Invoke-WebRequest -Uri \"https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL/openjdk-14.0.2_windows-x64_bin.zip\" -OutFile \"$PSScriptroot\\jdk\\openjdk-14.0.2_windows-x64_bin.zip\" -UseBasicParsing\n\n    # Extract\n    Write-Output \"Extracting Java ... \"\n    Expand-Archive -Path \"$PSScriptroot\\jdk\\openjdk-14.0.2_windows-x64_bin.zip\" -DestinationPath \"$PSSCriptRoot\\jdk\"\n\n    # Get Java executable\n    $javaExecutable = Get-ChildItem -Path \"$PSScriptRoot\\jdk\" -Recurse | Where-Object {$_.Name -eq \"java.exe\"}\n\n    # Add path to current session\n    $env:PATH += \";$($javaExecutable.Directory)\"\n}\n\n# Gets download url of latest release with an asset\nFunction Get-LatestVersionDownloadUrl\n{\n    # Define parameters\n    param(\n    \t$Repository,\n        $Version\n    )\n    \n    # Define local variables\n    $releases = \"https://api.github.com/repos/$Repository/releases\"\n    \n    # Get latest version\n    Write-Host \"Determining latest release ...\"\n    \n    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)\n    \n    if ($null -ne $Version)\n    {\n    \t$tags = ($tags | Where-Object {$_.name.EndsWith($Version)})\n    }\n\n    # Find the latest version with a downloadable asset\n    foreach ($tag in $tags)\n    {\n        if ($tag.assets.Count -gt 0)\n        {\n            return $tag.assets.browser_download_url\n        }\n    }\n\n    # Return the version\n    return $null\n}\n\n# Finds the specified changelog file\nFunction Get-ChangeLog\n{\n    # Define parameters\n    param ($FileName)\n    \n    # Find file\n    $fileReference = (Get-ChildItem -Path $OctopusParameters[\"Octopus.Action.Package[liquibaseChangeSet].ExtractedPath\"] -Recurse | Where-Object {$_.Name -eq $FileName})\n\n    # Check to see if something weas returned\n    if ($null -eq $fileReference)\n    {\n        # Not found\n        Write-Error \"$FileName was not found in $PSScriptRoot or subfolders.\"\n    }\n\n    # Return the reference\n    return $fileReference\n}\n\n# Downloads the appropriate JDBC driver\nFunction Get-DatabaseJar\n{\n    # Define parameters\n    param ($DatabaseType)\n\n    # Declare local variables\n    $driverPath = \"\"\n\n    # Check to see if a folder needs to be created\n    if((Test-Path -Path \"$PSScriptRoot\\DatabaseDriver\") -eq $false)\n    {\n        # Create new folder\n        New-Item -ItemType Directory -Path \"$PSSCriptRoot\\DatabaseDriver\" | Out-Null\n    }\n\n    # Download the driver for the selected type\n    switch ($DatabaseType)\n    {\n        \"MariaDB\"\n        {\n            # Download MariaDB driver\n            Write-Host \"Downloading MariaDB driver ...\"\n            $driverPath = \"$PSScriptroot\\DatabaseDriver\\mariadb-java-client-2.6.2.jar\"\n            Invoke-WebRequest -Uri \"https://downloads.mariadb.com/Connectors/java/connector-java-2.6.2/mariadb-java-client-2.6.2.jar\" -OutFile $driverPath -UseBasicParsing\n             \n            break\n        }\n        \"MongoDB\"\n        {\n        \t# Set repo name\n            $repositoryName = \"liquibase/liquibase-mongodb\"\n            \n            # Download MongoDB driver\n            Write-Host \"Downloading Maven MongoDB driver ...\"\n            $driverPath = \"$PSScriptroot\\DatabaseDriver\\mongo-java-driver-3.12.7.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/mongodb/mongo-java-driver/3.12.7/mongo-java-driver-3.12.7.jar\" -Outfile $driverPath -UseBasicParsing\n            \n            if ([string]::IsNullOrEmpty($liquibaseVersion))\n            {\n            \t# Get the latest version for the extension\n            \t$downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object {$_.EndsWith(\".jar\")})\n           \t}\n            else\n            {\n            \t# Download version matching extension\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object {$_.EndsWith(\".jar\")})\n            }\n                        \n\t\t\tWrite-Host \"Downloading MongoDB Liquibase extension from $downloadUrl ...\"\n            $extensionPath = \"$PSScriptroot\\$($downloadUrl.Substring($downloadUrl.LastIndexOf(\"/\")))\"\n            \n            Invoke-WebRequest -Uri $downloadUrl -Outfile $extensionPath -UseBasicParsing\n                        \n            # Make driver path null\n            $driverPath = \"$driverPath;$extensionPath\"\n            \n            break\n        }\n        \"MySQL\"\n        {\n            # Download MariaDB driver\n            Write-Host \"Downloading MySQL driver ...\"\n            Invoke-WebRequest -Uri \"https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.21.zip\" -OutFile \"$PSScriptroot\\DatabaseDriver\\mysql-connector-java-8.0.21.zip\" -UseBasicParsing\n\n            # Extract package\n            Write-Host \"Extracting MySQL driver ...\"\n            Expand-Archive -Path \"$PSScriptroot\\DatabaseDriver\\mysql-connector-java-8.0.21.zip\" -DestinationPath \"$PSSCriptRoot\\DatabaseDriver\"\n\n            # Find driver\n            $driverPath = (Get-ChildItem -Path \"$PSScriptRoot\\DatabaseDriver\" -Recurse | Where-Object {$_.Name -eq \"mysql-connector-java-8.0.21.jar\"}).FullName\n\n            break\n        }\n        \"Oracle\"\n        {\n            # Download Oracle driver\n            Write-Host \"Downloading Oracle driver ...\"\n            $driverPath = \"$PSScriptroot\\DatabaseDriver\\ojdbc10.jar\"\n            Invoke-WebRequest -Uri \"https://download.oracle.com/otn-pub/otn_software/jdbc/211/ojdbc11.jar\" -OutFile $driverPath -UseBasicParsing\n\n            break\n        }\n        \"SqlServer\"\n        {\n            # Download Microsoft driver\n            Write-Host \"Downloading Sql Server driver ...\"\n            Invoke-WebRequest -Uri \"https://go.microsoft.com/fwlink/?linkid=2137600\" -OutFile \"$PSScriptroot\\DatabaseDriver\\sqljdbc_8.4.0.0_enu.zip\" -UseBasicParsing\n\n            # Extract package\n            Write-Host \"Extracting SqlServer driver ...\"\n            Expand-Archive -Path \"$PSScriptroot\\DatabaseDriver\\sqljdbc_8.4.0.0_enu.zip\" -DestinationPath \"$PSSCriptRoot\\DatabaseDriver\"\n\n            # Find driver\n            $driverPath = (Get-ChildItem -Path \"$PSSCriptRoot\\DatabaseDriver\" -Recurse | Where-Object {$_.Name -eq \"mssql-jdbc-8.4.1.jre14.jar\"}).FullName\n\n\t\t\tbreak\n        }\n        \"PostgreSQL\"\n        {\n            # Download PostgreSQL driver\n            Write-Host \"Downloading PostgreSQL driver ...\"\n            $driverPath = \"$PSScriptroot\\DatabaseDriver\\postgresql-42.2.12.jar\"\n            Invoke-WebRequest -Uri \"https://jdbc.postgresql.org/download/postgresql-42.2.12.jar\" -OutFile $driverPath -UseBasicParsing\n\n            break\n        }\n        default\n        {\n            # Display error\n            Write-Error \"Unknown database type: $DatabaseType.\"\n        }\n    }\n\n    # Return the driver location\n    return $driverPath\n}\n\n# Returns the driver name for the liquibase call\nFunction Get-DatabaseDriverName\n{\n    # Define parameters\n    param ($DatabaseType)\n\n    # Declare local variables\n    $driverName = \"\"\n\n    # Download the driver for the selected type\n    switch ($DatabaseType)\n    {\n        \"MariaDB\"\n        {\n            $driverName = \"org.mariadb.jdbc.Driver\"\n            break\n        }\n        \"MongoDB\"\n        {\n        \t$driverName = $null\n            break\n        }\n        \"MySQL\"\n        {\n            $driverName = \"com.mysql.cj.jdbc.Driver\"\n            break\n        }\n        \"Oracle\"\n        {\n            $driverName = \"oracle.jdbc.OracleDriver\"\n            break\n        }\n        \"SqlServer\"\n        {\n            $driverName = \"com.microsoft.sqlserver.jdbc.SQLServerDriver\"\n            break\n        }\n        \"PostgreSQL\"\n        {\n            $driverName = \"org.postgresql.Driver\"\n            break\n        }\n        default\n        {\n            # Display error\n            Write-Error \"Unkonwn database type: $DatabaseType.\"\n        }\n    }\n\n    # Return the driver location\n    return $driverName\n}\n\n# Returns the connection string formatted for the database type\nFunction Get-ConnectionUrl\n{\n    # Define parameters\n    param ($DatabaseType, \n    \t$ServerPort, \n        $ServerName, \n        $DatabaseName, \n        $QueryStringParameters)\n\n    # Define local variables\n    $connectioUrl = \"\"\n\n    # Download the driver for the selected type\n    switch ($DatabaseType)\n    {\n        \"MariaDB\"\n        {\n            $connectionUrl = \"jdbc:mariadb://{0}:{1}/{2}\"\n            break\n        }\n        \"MongoDB\"\n        {\n        \t$connectionUrl = \"mongodb://{0}:{1}/{2}\"            \n            break\n        }\n        \"MySQL\"\n        {\n            $connectionUrl = \"jdbc:mysql://{0}:{1}/{2}\"\n            break\n        }\n        \"Oracle\"\n        {\n            $connectionUrl = \"jdbc:oracle:thin:@{0}:{1}:{2}\"\n            break\n        }\n        \"SqlServer\"\n        {\n            $connectionUrl = \"jdbc:sqlserver://{0}:{1};database={2};\"\n            break\n        }\n        \"PostgreSQL\"\n        {\n            $connectionUrl = \"jdbc:postgresql://{0}:{1}/{2}\"\n            break\n        }\n        default\n        {\n            # Display error\n            Write-Error \"Unkonwn database type: $DatabaseType.\"\n        }\n    }\n\n    if (![string]::IsNullOrEmpty($QueryStringParameters))\n    {\n        if ($QueryStringParameters.StartsWith(\"?\") -eq $false)\n        {\n            # Add the question mark\n            $connectionUrl += \"?\"\n        }\n        $connectionUrl += \"$QueryStringParameters\"\n    }\n\n    # Return the url\n    return ($connectionUrl -f $ServerName, $ServerPort, $DatabaseName)\n}\n\n# Create array for arguments\n$liquibaseArguments = @()\n\n# Check for license key\nif (![string]::IsNullOrEmpty($liquibaseProLicenseKey))\n{\n\t# Add key to arguments\n    $liquibaseArguments += \"--liquibaseProLicenseKey=$liquibaseProLicenseKey\"\n}\n\n# Find Change log\n$changeLogFile = (Get-ChangeLog -FileName $liquibaseChangeLogFileName)\n$liquibaseArguments += \"--changeLogFile=$($changeLogFile.Name)\"\n\n# Check to see if it needs to be downloaed to machine\nif ($liquibaseDownload -eq $true)\n{\n    # Download and extract liquibase\n    Get-Liquibase -Version $liquibaseVersion -DownloadFolder $workingFolder\n\n    # Download and extract java and add it to PATH environment variable\n    Get-Java\n\n    # Get the driver\n    $driverPath = Get-DatabaseJar -DatabaseType $liquibaseDatabaseType\n\n\tif (![string]::IsNullOrEmpty($driverPath))\n    {\n    \t# Add to arguments\n    \t$liquibaseArguments += \"--classpath=$driverPath\"\n    }\n}\nelse\n{\n    if (![string]::IsNullOrEmpty($liquibaseClassPath))\n    {\n    \t$liquibaseArguments += \"--classpath=$liquibaseClassPath\"\n    }\n}\n\n# Check to see if liquibase path has been defined\nif ([string]::IsNullOrEmpty($liquibaseExecutablePath))\n{\n    # Assign root\n    $liquibaseExecutablePath = $PSSCriptRoot\n}\n\n# Get the executable location\n$liquibaseExecutable = Get-ChildItem -Path $liquibaseExecutablePath -Recurse | Where-Object {$_.Name -eq \"liquibase.bat\"}\n\n# Add path to current session\n$env:PATH += \";$($liquibaseExecutable.Directory)\"\n\n# Check to make sure it was found\nif ([string]::IsNullOrEmpty($liquibaseExecutable))\n{\n    # Could not find the executable\n    Write-Error \"Unable to find liquibase.bat in $PSScriptRoot or subfolders.\"\n}\n\n# Add argument for driver\n#$databaseDriver = Get-DatabaseDriverName -DatabaseType $liquibaseDatabaseType\n#if (![string]::IsNullOrEmpty($databaseDriver))\n#{\n#\t$liquibaseArguments += \"--driver=$databaseDriver\"\n#}\n\n# Add connection Url\n$connectionUrl = Get-ConnectionUrl -DatabaseType $liquibaseDatabaseType -ServerPort $liquibaseServerPort -ServerName $liquibaseServerName -DatabaseName $liquibaseDatabaseName -QueryStringParameters $liquibaseQueryStringParameters\n$liquibaseArguments += \"--url=$connectionUrl\"\n\n# Add Username and password\n$liquibaseArguments += \"--username=$liquibaseUsername\"\n$liquibaseArguments += \"--password=`\"$liquibasePassword`\"\"\n\n# Set the location to where the file is\nSet-Location -Path $changeLogFile.Directory\n\n# Check to see if it should run or just report\nif ($liquibaseReport -eq $true)\n{\n    # Set error action preference - updateSQL writes to stderr so this is to prevent errors from showing up\n    $ErrorActionPreference = \"SilentlyContinue\"\n    \n    # Add just report\n    $liquibaseArguments += \"updateSQL\"\n    \n    # Execute liquibase\n    $liquibaseProcess = Start-Process -FilePath $liquibaseExecutable.FullName -ArgumentList $liquibaseArguments -RedirectStandardError \"$PSScriptRoot\\stderr.txt\" -RedirectStandardOutput \"$PSScriptRoot\\ChangeSet.sql\" -Passthru -Wait\n\t    \n    # Display standard error\n    foreach ($line in (Get-Content -Path \"$PSScriptRoot\\stderr.txt\"))\n    {\n    \t# Display\n        Write-Host \"$line\"\n    }\n    \n    # Check exit code\n    if ($liquibaseProcess.ExitCode -eq 0)\n    {\n    \t# Attach artifact\n        New-OctopusArtifact -Path \"$PSScriptRoot\\ChangeSet.sql\" -Name \"ChangeSet.sql\"\n    }\n}\nelse\n{\n    $liquibaseArguments += \"update\"\n    & $liquibaseExecutable.FullName $liquibaseArguments\n}\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "38e92902-4a82-41f3-a86a-3e467da0c454",
-        "Name": "liquibaseProLicenseKey",
-        "Label": "Pro license key",
-        "HelpText": "Enter your Liquibase Pro license key. [Request a free 30-day trial.](https://www.liquibase.com/trial) Leave blank to use the Community Edition.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "4477651b-2b6d-4352-a1bd-9b9e46c31c75",
-        "Name": "liquibaseDatabaseType",
-        "Label": "Database type",
-        "HelpText": "Select the database type to deploy to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "MariaDB|MariaDB\nMongoDB|MongoDB\nMySQL|MySQL\nOracle|Oracle\nPostgreSQL|PostgreSQL\nSqlServer|SqlServer"
-        }
-      },
-      {
-        "Id": "4c738f97-c803-4a14-895e-ad6bacf09270",
-        "Name": "liquibaseChangeLogFileName",
-        "Label": "Change Log file name",
-        "HelpText": "Name of the changelog file in the package.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "25ee8ea4-f38b-42e6-a503-026d72cc83a2",
-        "Name": "liquibaseServerName",
-        "Label": "Server name",
-        "HelpText": "Name or IP address of the database server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "592c5987-394a-41c2-bd82-1e234e470296",
-        "Name": "liquibaseServerPort",
-        "Label": "Server port",
-        "HelpText": "The port the database server listens on.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8e43ac61-4623-4102-bb59-58a2571bfa42",
-        "Name": "liquibaseDatabaseName",
-        "Label": "Database name",
-        "HelpText": "Name of the database (or service name in case of Oracle) to deploy to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "93f218a0-8fb3-42ab-bcb9-500d9f68922b",
-        "Name": "liquibaseUsername",
-        "Label": "Username",
-        "HelpText": "Username of a user that has permission to make changes to the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a2d1fee4-7161-4f8c-8d81-c00780acb79e",
-        "Name": "liquibasePassword",
-        "Label": "Password",
-        "HelpText": "Password for the user with permissions to make changes to the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "42741eb0-3768-4b99-8ad2-668b92db0c77",
-        "Name": "liquibaseQueryStringParameters",
-        "Label": "Connection query string parameters",
-        "HelpText": "Add additional parameters to the connection string URL. Example: ?useUnicode=true",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "1d907292-d8c6-4afc-bc26-34125b1f66ec",
-        "Name": "liquibaseClassPath",
-        "Label": "Database driver path",
-        "HelpText": "Filepath to the location of the .jar driver for the database type.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "49c3a944-b727-4487-b2b1-493527177f5d",
-        "Name": "liquibaseExecutablePath",
-        "Label": "Executable file path",
-        "HelpText": "File path to the Liquibase executable.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "6e2c9b48-9e67-4bed-aafa-3dc5257f9f62",
-        "Name": "liquibaseReport",
-        "Label": "Report only?",
-        "HelpText": "This option will generate the SQL statements, save them to a file, then attach them to the step as an artifact.  This option only generates the statement, it will not run them.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "35500312-a25b-4a05-ac1e-68a7f51afd1e",
-        "Name": "liquibaseDownload",
-        "Label": "Download Liquibase?",
-        "HelpText": "Use this option to download the software necessary to deploy a Liquibase changeset.  This will download Liquibase, java, and the appropriate driver for the selected database type.  Using this option overrides the `Database driver path` and `Executable file path` inputs.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "3602d6ce-94af-4d59-acc9-ae8a84bafd01",
-        "Name": "liquibaseVersion",
-        "Label": "Liquibase version",
-        "HelpText": "Used with `Download Liquibase` to specify the version of Liquibase to use.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "235f6187-0fbf-409a-820f-61d81cea3722",
-        "Name": "liquibaseChangeset",
-        "Label": "Changeset package",
-        "HelpText": "Select the package with the changeset.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-02-25T23:33:12.871Z",
-      "OctopusVersion": "2020.6.0-rc0003",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-    "LastModifiedBy": "bobjwalker",
-    "Category": "liquibase"
-  }
\ No newline at end of file
diff --git a/step-templates/liquibase-run-command.json b/step-templates/liquibase-run-command.json
deleted file mode 100644
index 537ab0beb..000000000
--- a/step-templates/liquibase-run-command.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-  "Id": "36df3e84-8501-4f2a-85cc-bd9eb22030d1",
-  "Name": "Liquibase - Run command",
-  "Description": "Run Liqbuibase commands against a database.  You can include Liquibase in the package itself or choose Download to download it during runtime.\n\nNote:\n- AWS EC2 IAM Authentication requires the AWS CLI to be installed.\n- Windows Authentication has been tested with \n  - Microsoft SQL Server \n  - PostgreSQL\n- SQL Anywhere only works with Username/Password authentication\n\nOnce the Liquibase commands have executed, the output is stored in an Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) called `LiquibaseCommandOutput` for use in subsequent Octopus deployment or runbook steps.\n\n**Downloading the database driver(s) is now a separate option called: Download database driver?**",
-  "ActionType": "Octopus.Script",
-  "Version": 30,
-  "Author": "twerthi",
-  "Packages": [
-    {
-      "Name": "liquibaseChangeset",
-      "Id": "15eeeac8-d80d-46ba-bc52-413fddae36f3",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "liquibaseChangeset"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# Configure template\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Downloads and extracts liquibase to the work folder\nFunction Get-Liquibase {\n    # Define parameters\n    param ($Version) \n\n    $repositoryName = \"liquibase/liquibase\"\n\n    # Check to see if version wasn't specified\n    if ([string]::IsNullOrEmpty($Version)) {\n        # Get the latest version download url\n        $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(\".zip\") })\n    }\n    else {\n        $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $Version | Where-Object { $_.EndsWith(\".zip\") })\n    }\n\n    # Extract the downloaded file\n    Expand-DownloadedFile -DownloadUrls $downloadUrl | Out-Null\n    \n    # Parse downloaded version\n    if ($downloadUrl -is [array]) {\n        $downloadedFileName = [System.IO.Path]::GetFileName($downloadUrl[0])\n    }\n    else {\n        $downloadedFileName = [System.IO.Path]::GetFileName($downloadUrl)\n    }\n\n    # Return the downloaded version\n    return $downloadedFileName.SubString($downloadedFileName.IndexOf(\"-\") + 1).Replace(\".zip\", \"\")    \n}\n\n# Downloads the files\nFunction Expand-DownloadedFile {\n    # Define parameters\n    param (\n        $DownloadUrls\n    )\n    \n    # Loop through results\n    foreach ($url in $DownloadUrls) {\n        # Download the zip file\n        $folderName = [System.IO.Path]::GetFileName(\"$PSScriptroot/$($url.Substring($url.LastIndexOf(\"/\")))\").Replace(\".zip\", \"\")\n        $zipFile = \"$PSScriptroot/$folderName/$($url.Substring($url.LastIndexOf(\"/\")))\"\n        Write-Host \"Downloading $zipFile from $url ...\"\n        \n        if ((Test-Path -Path \"$PSScriptroot/$folderName\") -eq $false) {\n            # Create folder\n            New-Item -Path \"$PSScriptroot/$folderName/\" -ItemType Directory\n        }\n\n        # Download the zip file\n        Invoke-WebRequest -Uri $url -OutFile $zipFile -UseBasicParsing | Out-Null\n\n        # Extract package\n        Write-Host \"Extracting $zipFile ...\"\n        Expand-Archive -Path $zipFile -DestinationPath \"$PSSCriptRoot/$folderName\" | Out-Null\n    }\n}\n\n\n# Downloads and extracts Java to the work folder, then adds the location of java.exe to the $env:PATH variabble so it can be called\nFunction Get-Java {\n    # Check to see if a folder needs to be created\n    if ((Test-Path -Path \"$PSScriptRoot/jdk\") -eq $false) {\n        # Create new folder\n        New-Item -ItemType Directory -Path \"$PSSCriptRoot/jdk\"\n    }\n\n    # Download java\n    Write-Output \"Downloading Java ... \"\n    \n    # Determine OS\n    if ($IsWindows) {\n        Invoke-WebRequest -Uri \"https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip\" -OutFile \"$PSScriptroot/jdk/openjdk-21.0.2_windows-x64_bin.zip\" -UseBasicParsing\n\n        # Extract\n        Write-Output \"Extracting Java ... \"\n        Expand-Archive -Path \"$PSScriptroot\\jdk\\openjdk-21.0.2_windows-x64_bin.zip\" -DestinationPath \"$PSSCriptRoot/jdk\"\n\n        # Get Java executable\n        $javaExecutable = Get-ChildItem -Path \"$PSScriptRoot\\jdk\" -Recurse | Where-Object { $_.Name -eq \"java.exe\" }\n    }\n    \n    if ($IsLinux) {\n        Invoke-WebRequest -Uri \"https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz\" -OutFile \"$PSScriptroot/jdk/openjdk-21.0.2_linux-x64_bin.tar.gz\" -UseBasicParsing\n\n        # Extract\n        Write-Output \"Extracting Java ... \"\n        tar -xvzf \"$PSScriptroot/jdk/openjdk-21.0.2_linux-x64_bin.tar.gz\" --directory \"$PSScriptRoot/jdk\"\n\n        # Get Java executable\n        $javaExecutable = Get-ChildItem -Path \"$PSScriptRoot/jdk\" -Recurse | Where-Object { $_.Name -eq \"java\" }   \n    }\n    \n    # Add path to current session as first entry to bypass other versions of Java that may be installed.\n    $env:PATH = \"$($javaExecutable.Directory)$([IO.Path]::PathSeparator)\" + $env:PATH\n    \n}\n\nFunction Get-DriverAssets {\n    # Define parameters\n    param (\n        $DownloadInfo\n    )\n\n    # Declare working variables\n    $assetFilePath = \"\"\n\n    # Check to see if there are multiple assets to download\n    if ($DownloadInfo -is [array]) {\n        # Declare local variables\n        $assetFiles = @()\n\n        # Loop through array\n        foreach ($url in $DownloadInfo) {\n            # Download the asset\n            Write-Host \"Downloading asset from $url...\"\n            $assetPath = \"$PSScriptroot/$($url.Substring($url.LastIndexOf(\"/\")))\"\n            \n            # Skip test assets\n            if ($assetPath.EndsWith(\"tests.jar\")) {\n                Write-Host \"Asset is for testing, skipping ...\"\n                continue\n            }\n            \n            Invoke-WebRequest -Uri $url -Outfile $assetPath -UseBasicParsing\n            $assetFiles += $assetPath\n        }\n\n        # Assign paths\n        $assetFilePath = $assetFiles -join \"$([IO.Path]::PathSeparator)\"\n    }\n    else {\n        # Download asset\n        Write-Host \"Downloading asset from $DownloadInfo ...\"\n        $assetFilePath = \"$PSScriptroot/$($DownloadInfo.Substring($DownloadInfo.LastIndexOf(\"/\")))\"\n        Invoke-WebRequest -Uri $DownloadInfo -Outfile $assetFilePath -UseBasicParsing\n    }\n\n    # Return path\n    return $assetFilePath\n}\n\n# Gets download url of latest release with an asset\nFunction Get-LatestVersionDownloadUrl {\n    # Define parameters\n    param(\n        $Repository,\n        $Version\n    )\n    \n    # Define local variables\n    $releases = \"https://api.github.com/repos/$Repository/releases\"\n    \n    # Get latest version\n    Write-Host \"Determining latest release of $Repository ...\"\n    \n    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)\n    \n    if ($null -ne $Version) {\n        # Get specific version\n        $tags = ($tags | Where-Object { $_.name.EndsWith($Version) })\n\n        # Check to see if nothing was returned\n        if ($null -eq $tags) {\n            # Not found\n            Write-Host \"No release found matching version $Version, getting highest version using Major.Minor syntax...\"\n\n            # Get the tags\n            $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)\n\n            # Parse the version number into a version object\n            $parsedVersion = [System.Version]::Parse($Version)\n            $partialVersion = \"$($parsedVersion.Major).$($parsedVersion.Minor)\"\n            \n            # Filter tags to ones matching only Major.Minor of version specified\n            $tags = ($tags | Where-Object { $_.name.Contains(\"$partialVersion.\") -and $_.draft -eq $false })\n            \n            # Grab the latest\n            if ($null -eq $tags)\n            {\n            \t# decrement minor version\n                $minorVersion = [int]$parsedVersion.Minor\n                $minorVersion --\n                \n                # return the urls\n                return (Get-LatestVersionDownloadUrl -Repository $Repository -Version \"$($parsedVersion.Major).$($minorVersion)\")\n            }\n        }\n    }\n\n    # Find the latest version with a downloadable asset\n    foreach ($tag in $tags) {\n        if ($tag.assets.Count -gt 0) {\n            return $tag.assets.browser_download_url\n        }\n    }\n\n    # Return the version\n    return $null\n}\n\n# Finds the specified changelog file\nFunction Get-ChangeLog {\n    # Define parameters\n    param ($FileName)\n    \n    # Find file\n    $fileReference = (Get-ChildItem -Path $OctopusParameters[\"Octopus.Action.Package[liquibaseChangeSet].ExtractedPath\"] -Recurse | Where-Object { $_.Name -eq $FileName })\n\n    # Check to see if something weas returned\n    if ($null -eq $fileReference) {\n        # Not found\n        Write-Error \"$FileName was not found in $PSScriptRoot or subfolders.\"\n    }\n\n    # Return the reference\n    return $fileReference\n}\n\n# Downloads the appropriate JDBC driver\nFunction Get-DatabaseJar {\n    # Define parameters\n    param ($DatabaseType)\n\n    # Declare local variables\n    $driverPath = \"\"\n\n    # Check to see if a folder needs to be created\n    if ((Test-Path -Path \"$PSScriptRoot/DatabaseDriver\") -eq $false) {\n        # Create new folder\n        New-Item -ItemType Directory -Path \"$PSSCriptRoot/DatabaseDriver\" | Out-Null\n    }\n\n    # Download the driver for the selected type\n    switch ($DatabaseType) {\n        \"Cassandra\" {\n\n\t\t\t# Get the release download\n            Write-Host \"Downloading Cassandra JDBC driver bundle ...\"\n\t\t\t$downloadUrl = Get-LatestVersionDownloadUrl -Repository \"ing-bank/cassandra-jdbc-wrapper\"\n           \n            # Find driver\n            $driverPath = (Get-DriverAssets -DownloadInfo $downloadUrl)\n\n            # Set repo name\n            $repositoryName = \"liquibase/liquibase-cassandra\"\n            \n            if ([string]::IsNullOrEmpty($liquibaseVersion)) {\n                # Get the latest version for the extension\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(\".jar\") })\n           \t}\n            else {\n                # Download version matching extension\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object { $_.EndsWith(\".jar\") })\n            }           \n\n            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl\n            \n            # Make driver path null\n            $driverPath = \"$driverPath$([IO.Path]::PathSeparator)$extensionPath\"\n\n            break\n        }\n        \"CosmosDB\"\n        {\n\t\t\t# Download the (long) list of dependencies\n            $driverPaths = @()\n\n\t\t\t# Set repo name\n            $repositoryName = \"liquibase/liquibase-cosmosdb\"\n\n\t\t\tif ([string]::IsNullOrEmpty($liquibaseVersion))\n            {\n            \t# Get the latest version for the extension\n            \t$downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object {$_.EndsWith(\".jar\")})\n           \t}\n            else\n            {\n            \t# Download version matching extension\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object {$_.EndsWith(\".jar\")})\n            }    \n            \n            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl\n                     \n\t\t\t# Add to driver path\n            $driverPaths += $extensionPath\n            \n            Write-Host \"Downloading azure-cosmos driver ...\"\n            $driverVersion = \"4.28.0\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/azure-cosmos-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/azure/azure-cosmos/$driverVersion/azure-cosmos-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            # Add to driver path\n            $driverPaths += $filePath\n            \n            Write-Host \"Downloading azure-core driver ...\"\n            $driverVersion = \"1.27.0\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/azure-core-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/azure/azure-core/$driverVersion/azure-core-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            $files = Get-ChildItem -Path \"$PSScriptRoot/DatabaseDriver\"\n            \n            Write-Host \"There are these $files\"\n\n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading jackson core driver ...\"\n            $driverVersion = \"2.13.2\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/jackson-core-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/$driverVersion/jackson-core-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading slf4j core driver ...\"\n            $driverVersion = \"1.7.36\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/slf4j-api-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/slf4j/slf4j-api/$driverVersion/slf4j-api-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty buffer driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-buffer-$driverVersion.final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-buffer/$driverVersion.Final/netty-buffer-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\t\t\t\n            Write-Host \"Downloading reactor-core driver ...\"\n            $driverVersion = \"3.4.16\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/reactor-core-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/projectreactor/reactor-core/$driverVersion/reactor-core-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading reactor-netty-core driver ...\"\n            $driverVersion = \"1.0.17\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/reactor-core-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/projectreactor/netty/reactor-netty-core/$driverVersion/reactor-netty-core-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading reactor-netty-core driver ...\"\n            $driverVersion = \"1.0.17\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/reactor-netty-http-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/projectreactor/netty/reactor-netty-http/$driverVersion/reactor-netty-http-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-resolver driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-resolver-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-resolver/$driverVersion.Final/netty-resolver-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing  | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-transport driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-transport-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-transport/$driverVersion.Final/netty-transport-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing  | Out-Null\n            \n            \n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading reactivestreams driver ...\"\n            $driverVersion = \"1.0.3\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/reactive-streams-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/$driverVersion/reactive-streams-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading jackson-databind driver ...\"\n            $driverVersion = \"2.13.2.1\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/jackson-databind-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/$driverVersion/jackson-databind-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading jackson-annotations driver ...\"\n            $driverVersion = \"2.13.2\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/jackson-annotations-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/$driverVersion/jackson-annotations-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n            \n            Write-Host \"Downloading jackson-module-afterburner driver ...\"\n            $driverVersion = \"2.13.2\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/jackson-module-afterburner-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-afterburner/$driverVersion/jackson-module-afterburner-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading reactor-netty driver ...\"\n            $driverVersion = \"1.0.17\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/reactor-netty-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/projectreactor/netty/reactor-netty/$driverVersion/reactor-netty-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-transport-native-unix-common driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-transport-native-unix-common-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/$driverVersion.Final/netty-transport-native-unix-common-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-transport-native-epoll driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-transport-native-epoll-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-transport-native-epoll/$driverVersion.Final/netty-transport-native-epoll-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-tcnative-boringssl-static driver ...\"\n            $driverVersion = \"2.0.51\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-tcnative-boringssl-static-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/$driverVersion.Final/netty-tcnative-boringssl-static-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-resolver-dns driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-resolver-dns-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-resolver-dns/$driverVersion.Final/netty-resolver-dns-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-handler-proxy driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-handler-proxy-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-handler-proxy/$driverVersion.Final/netty-handler-proxy-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-handler driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-handler-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-handler/$driverVersion.Final/netty-handler-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-common driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-common-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-common/$driverVersion.Final/netty-common-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-codec-socks driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-codec-socks-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-codec-socks/$driverVersion.Final/netty-codec-socks-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-codec-http driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-codec-http-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-codec-http/$driverVersion.Final/netty-codec-http-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-codec-http2 driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-codec-http2-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-codec-http2/$driverVersion.Final/netty-codec-http2-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-codec-dns driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-codec-dns-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-codec-dns/$driverVersion.Final/netty-codec-dns-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-codec driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-codec-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-codec/$driverVersion.Final/netty-codec-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading micrometer-core driver ...\"\n            $driverVersion = \"1.8.4\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/micrometer-core-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/micrometer/micrometer-core/$driverVersion/micrometer-core-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading metrics-core driver ...\"\n            $driverVersion = \"4.2.9\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/metrics-core-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core/$driverVersion/metrics-core-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading LatencyUtils driver ...\"\n            $driverVersion = \"2.0.3\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/LatencyUtils-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/latencyutils/LatencyUtils/$driverVersion/LatencyUtils-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading jackson-datatype-jsr310 driver ...\"\n            $driverVersion = \"2.12.5\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/jackson-datatype-jsr310-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/$driverVersion/jackson-datatype-jsr310-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-tcnative-classes driver ...\"\n            $driverVersion = \"2.0.51\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-tcnative-classes-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/$driverVersion.Final/netty-tcnative-classes-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-transport-classes-kqueue driver ...\"\n            $driverVersion = \"4.1.73\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-transport-classes-kqueue-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue/$driverVersion.Final/netty-transport-classes-kqueue-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading slf4j-simple driver ...\"\n            $driverVersion = \"1.7.36\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/slf4j-simple-$driverVersion.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/$driverVersion/slf4j-simple-$driverVersion.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-transport-classes-epoll driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-transport-classes-epoll-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/$driverVersion.Final/netty-transport-classes-epoll-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n            Write-Host \"Downloading netty-transport-native-kqueue driver ...\"\n            $driverVersion = \"4.1.75\"\n            $filePath = \"$PSScriptroot/DatabaseDriver/netty-transport-native-kqueue-$driverVersion.Final.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/$driverVersion.Final/netty-transport-native-kqueue-$driverVersion.Final.jar\" -Outfile $filePath -UseBasicParsing | Out-Null\n            \n\n            # Add to driver path\n            $driverPaths += $filePath\n\n\t\t\t# Return driver list separated by system specific PathSeparator\n            $driverPath = ($driverPaths -join [IO.Path]::PathSeparator)\n            \n            $files = Get-ChildItem -Path \"$PSScriptRoot/DatabaseDriver\"\n            \n            #Write-Host \"There are these $files\"\n            \n       \t\tbreak\n        }        \n        \"DB2\" {\n            # Use built-in driver\n            $driverPath = $null\n            break\n        }\n        \"MariaDB\" {\n            # Download MariaDB driver\n            Write-Host \"Downloading MariaDB driver ...\"\n            $driverPath = \"$PSScriptroot/DatabaseDriver/mariadb-java-client-3.5.7.jar\"\n            Invoke-WebRequest -Uri \"https://dlm.mariadb.com/4550269/Connectors/java/connector-java-3.5.7/mariadb-java-client-3.5.7.jar\" -OutFile $driverPath -UseBasicParsing\n             \n            break\n        }\n        \"MongoDB\" {\n            # Download MongoDB driver\n            Write-Host \"Downloading Maven MongoDB driver ...\"\n            $driverPath = \"$PSScriptroot/DatabaseDriver/mongo-java-driver-3.12.7.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/mongodb/mongo-java-driver/3.12.7/mongo-java-driver-3.12.7.jar\" -Outfile $driverPath -UseBasicParsing\n            \n            # Check to see if they are using a licenced version\n            if (![string]::IsNullOrWhitespace($liquibaseProLicenseKey)) {\n                # Set the paid version url\n                $mongoVersions = Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/org/liquibase/ext/liquibase-commercial-mongodb\" -UseBasicParsing\n                \n                # Loop through links, look for ones that evaluate to version\n                $versions = @()\n                foreach ($link in $mongoVersions.Links) {\n                    Write-Verbose \"Evaluating: $link\"\n                    if (![string]::IsNullOrWhitespace($link.title)) {\n                        # Get the inner text\n                        $versionNumber = $link.title.Replace(\"/\", \"\")\n\n                        # Check to see if $versionNumber can be parsed as a versionNumber\n                        $versionOut = $null\n                        if ([System.Version]::TryParse($versionNumber, [ref]$versionOut)) {\n                            $versions += $versionOut\n                        }\n                    }\n                }\n\n                # Get the highest version number\n                $info = ($versions | Measure-Object -Maximum)\n\n                $downloadUrl = \"https://repo1.maven.org/maven2/org/liquibase/ext/liquibase-commercial-mongodb/$($info.Maximum)/liquibase-commercial-mongodb-$($info.Maximum).jar\"                \n            }\n            else {\n                # Set repo name\n                $repositoryName = \"liquibase/liquibase-mongodb\"            \n                \n                # Download latest OSS version\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(\".jar\") })\n            }\n                        \n            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl\n            \n            # Make driver path null\n            $driverPath = \"$driverPath$([IO.Path]::PathSeparator)$extensionPath\"\n            \n            break\n        }\n        \"MySQL\" {\n            # Download MariaDB driver\n            Write-Host \"Downloading MySQL driver ...\"\n            Invoke-WebRequest -Uri \"https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.28.zip\" -OutFile \"$PSScriptroot/DatabaseDriver/mysql-connector-java-8.0.28.zip\" -UseBasicParsing -UserAgent \"curl/7.8.3.1\"\n\n            # Extract package\n            Write-Host \"Extracting MySQL driver ...\"\n            Expand-Archive -Path \"$PSScriptroot/DatabaseDriver/mysql-connector-java-8.0.28.zip\" -DestinationPath \"$PSSCriptRoot/DatabaseDriver\"\n\n            # Find driver\n            $driverPath = (Get-ChildItem -Path \"$PSScriptRoot/DatabaseDriver\" -Recurse | Where-Object { $_.Name -eq \"mysql-connector-java-8.0.28.jar\" }).FullName\n\n            break\n        }\n        \"Oracle\" {\n            # Download Oracle driver\n            Write-Host \"Downloading Oracle driver ...\"\n            $driverPath = \"$PSScriptroot/DatabaseDriver/ojdbc10.jar\"\n            Invoke-WebRequest -Uri \"https://download.oracle.com/otn-pub/otn_software/jdbc/211/ojdbc11.jar\" -OutFile $driverPath -UseBasicParsing\n\n            break\n        }\n        \"SqlAnywhere\" {\n            Write-Host \"Downloading jTds driver ...\"\n            \n            $downloadUrl = (Get-LatestVersionDownloadUrl -Repository \"milesibastos/jTDS\" | Where-Object {$_.Contains(\"-dist\")})\n            Invoke-WebRequest -Uri $downloadUrl -OutFile \"$PSScriptroot/DatabaseDriver/jtds.zip\" -UseBasicParsing\n\n            # Extract package\n            Write-Host \"Extracting jTds driver ...\"\n            Expand-Archive -Path \"$PSScriptroot/DatabaseDriver/jtds.zip\" -DestinationPath \"$PSScriptRoot/DatabaseDriver\"\n\n            # Find driver\n            $driverPath = (Get-ChildItem -Path \"$PSScriptRoot/DatabaseDriver\" -Recurse | Where-Object {$_.Name -like \"jtds-*.jar\"}).FullName\n\n            break\n        }\n        \"SqlServer\" {\n            # Download Microsoft driver\n            Write-Host \"Downloading Sql Server driver ...\"\n            Invoke-WebRequest -Uri \"https://go.microsoft.com/fwlink/?linkid=2186163\" -OutFile \"$PSScriptroot/DatabaseDriver/sqljdbc_10.2.0.0_enu.zip\" -UseBasicParsing\n\n            # Extract package\n            Write-Host \"Extracting SqlServer driver ...\"\n            Expand-Archive -Path \"$PSScriptroot/DatabaseDriver/sqljdbc_10.2.0.0_enu.zip\" -DestinationPath \"$PSSCriptRoot/DatabaseDriver\"\n\n            # Find driver\n            $driverPath = (Get-ChildItem -Path \"$PSSCriptRoot/DatabaseDriver\" -Recurse | Where-Object { $_.Name -eq \"mssql-jdbc-10.2.0.jre11.jar\" }).FullName\n            \n            # Determine architecture\n            if ([System.Environment]::Is64BitOperatingSystem) {\n                # Locate auth dll\n                $authDll = Get-ChildItem -Path \"$PSScriptRoot/DatabaseDriver\" -Recurse | Where-Object { $_.Name -eq \"mssql-jdbc_auth-10.2.0.x64.dll\" }\n            }\n            else {\n                $authDll = Get-ChildItem -Path \"$PSScriptRoot/DatabaseDriver\" -Recurse | Where-Object { $_.Name -eq \"mssql-jdbc_auth-10.2.0.x86.dll\" }\n            }\n            \n            # Add the dll to the path so it can find it.\n            $env:PATH += \"$([IO.Path]::PathSeparator)$($authDll.Directory)\"\n            \n            break\n        }\n        \"PostgreSQL\" {\n            # Download PostgreSQL driver\n            Write-Host \"Downloading PostgreSQL driver ...\"\n            $driverPath = \"$PSScriptroot/DatabaseDriver/postgresql-42.2.12.jar\"\n            Invoke-WebRequest -Uri \"https://jdbc.postgresql.org/download/postgresql-42.2.12.jar\" -OutFile $driverPath -UseBasicParsing\n            \n            # Download the WAFFLE jna driver for Windows Authentication\n            $repositoryName = \"waffle/waffle\"\n            \n            # Latest version of Waffle (2.3.0) doesn't seem to work, can't find sspi method, specify version 1.9.0\n            $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version \"1.9.0\" | Where-Object { $_.EndsWith(\".zip\") })\n            Expand-DownloadedFile -DownloadUrls $downloadUrl | Out-Null\n            \n            # Get all waffle jars\n            $waffleFolder = (Get-ChildItem -Path \"$PSScriptroot\" -Recurse | Where-Object { $_.PSIsContainer -and $_.Name -like \"Waffle*\" })           \n            $waffleJars = (Get-ChildItem -Path $waffleFolder.FullName -Recurse | Where-Object { $_.Extension -eq \".jar\" })\n            \n            foreach ($jar in $waffleJars) {\n                $driverPath += \"$([IO.Path]::PathSeparator)$($jar.FullName)\"\n            }\n\n\n            break\n        }\n        \"Snowflake\" {\n            # Set repo name\n            $repositoryName = \"liquibase/liquibase-snowflake\"\n\n            # Download Snowflake driver\n            Write-Host \"Downloading Snowflake driver ...\"\n            $driverPath = \"$PSScriptroot/DatabaseDriver/snowflake-jdbc-3.9.2.jar\"\n            Invoke-WebRequest -Uri \"https://repo1.maven.org/maven2/net/snowflake/snowflake-jdbc/3.9.2/snowflake-jdbc-3.9.2.jar\" -OutFile $driverPath -UseBasicParsing\n\n            if ([string]::IsNullOrEmpty($liquibaseVersion)) {\n                # Get the latest version for the extension\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName | Where-Object { $_.EndsWith(\".jar\") })\n           \t}\n            else {\n                # Download version matching extension\n                $downloadUrl = (Get-LatestVersionDownloadUrl -Repository $repositoryName -Version $liquibaseVersion | Where-Object { $_.EndsWith(\".jar\") })\n            }\n                        \n            $extensionPath = Get-DriverAssets -DownloadInfo $downloadUrl\n            \n            # Make driver path null\n            $driverPath = \"$driverPath$([IO.Path]::PathSeparator)$extensionPath\"\n\n\n            break\n        }\n        default {\n            # Display error\n            Write-Error \"Unknown database type: $DatabaseType.\"\n        }\n    }\n\n    # Return the driver location\n    return $driverPath\n}\n\n# Returns the connection string formatted for the database type\nFunction Get-ConnectionUrl {\n    # Define parameters\n    param ($DatabaseType, \n        $ServerPort, \n        $ServerName, \n        $DatabaseName, \n        $QueryStringParameters)\n\n    # Define local variables\n    $connectionUrl = \"\"\n\n    # Download the driver for the selected type\n    switch ($DatabaseType) {\n        \"Cassandra\" {\n            #$connectionUrl = \"jdbc:cassandra://{0}:{1};DefaultKeyspace={2}\"\n            $connectionUrl = \"jdbc:cassandra://{0}:{1}/{2}\"\n            break\n        }\n        \"CosmosDB\"\n        {\n            $connectionUrl = \"cosmosdb://{0}:$($liquibasePassword)@{0}:{1}/{2}\" \n            break\n        }        \n        \"DB2\" {\n            $connectionUrl = \"jdbc:db2://{0}:{1}/{2}\"\n            break\n        }\n        \"MariaDB\" {\n            $connectionUrl = \"jdbc:mariadb://{0}:{1}/{2}\"\n            \n            # Check for Windows Authentication type\n            if ($liquibaseAuthenticationMethod -eq \"windowsauthentication\") {\n                # Add querysting parameter\n                $connectionUrl += \"?integratedSecurity=true\"\n            }\n            \n            break\n        }\n        \"MongoDB\" {        \n            $connectionUrl = \"mongodb://{0}:{1}/{2}\"            \n            break\n        }\n        \"MySQL\" {\n        \n            $connectionUrl = \"jdbc:mysql://{0}:{1}/{2}\"\n            \n            # Check for Windows Authentication type\n            if ($liquibaseAuthenticationMethod -eq \"windowsauthentication\") {\n                # Add querysting parameter\n                $connectionUrl += \"?integratedSecurity=true\"\n            }\n            \n            break\n        }\n        \"Oracle\" {\n            $connectionUrl = \"jdbc:oracle:thin:@{0}:{1}/{2}\"\n            break\n        }\n        \"SqlAnywhere\" {\n            $connectionUrl = \"jdbc:jtds:sybase://{0}:{1}/{2}\"\n            break\n        }\n        \"SqlServer\" {\n            $connectionUrl = \"jdbc:sqlserver://{0}:{1};database={2};\"\n            \n            switch ($liquibaseAuthenticationMethod) {\n                \"azuremanagedidentity\" {\n                    # Add querystring parameter\n                    $connectionUrl += \"Authentication=ActiveDirectoryMSI;\"\n                    break\n                }\n                \"windowsauthentication\" {\n                    # Add querysting parameter\n                    $connectionUrl += \"integratedSecurity=true;\"\n                \t\n                    break\n                }\n            }\n            \n            break\n        }\n        \"PostgreSQL\" {\n            $connectionUrl = \"jdbc:postgresql://{0}:{1}/{2}\"\n            \n            # Check for Windows Authentication type\n            if ($liquibaseAuthenticationMethod -eq \"windowsauthentication\") {\n                # Add querysting parameter\n                $connectionUrl += \"?gsslib=sspi\"\n            }\n            \n            break\n        }\n        \"Snowflake\" {\n            $connectionUrl = \"jdbc:snowflake://{0}.snowflakecomputing.com?db={2}\"\n            break\n        }\n        default {\n            # Display error\n            Write-Error \"Unkonwn database type: $DatabaseType.\"\n        }\n    }\n\n    if (![string]::IsNullOrWhitespace($QueryStringParameters)) {       \t\n        if ($connectionUrl.Contains(\"?\")) {\n           \t# Replace the ? with & in connection string parameters\n            $QueryStringParameters = $QueryStringParameters.Replace(\"?\", \"&\")\n        }\n        \n        # Appen connecion string\n        $connectionUrl += \"$QueryStringParameters\"\n    }\n\n    # Return the url\n    return ($connectionUrl -f $ServerName, $ServerPort, $DatabaseName)\n}\n\n# Create array for arguments\n$liquibaseArguments = @()\n\n# Check to see if it's running on Windows\nif ($IsWindows) {\n    # Disable the progress bar so downloading files via Invoke-WebRequest are faster\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Check for license key\nif (![string]::IsNullOrWhitespace($liquibaseProLicenseKey)) {\n    # Add key to arguments\n    $liquibaseArguments += \"--liquibaseProLicenseKey=$liquibaseProLicenseKey\"\n}\n\n# Find Change log\n$changeLogFile = (Get-ChangeLog -FileName $liquibaseChangeLogFileName)\n$liquibaseArguments += \"--changeLogFile=$($changeLogFile.Name)\"\n\n# Set the location to where the file is\nSet-Location -Path $changeLogFile.Directory\n\n# Check to see if it needs to be downloaed to machine\nif ($liquibaseDownload -eq $true) {\n    # Download and extract liquibase - get the version for extensions that are version specific\n    $liquibaseVersion = Get-Liquibase -Version $liquibaseVersion -DownloadFolder $workingFolder\n\n    # Download and extract java and add it to PATH environment variable\n    Get-Java\n}\nelse {\n    if (![string]::IsNullOrEmpty($liquibaseClassPath)) {\n        $liquibaseArguments += \"--classpath=$liquibaseClassPath\"\n    }\n}\n\n# Check to see if liquibase path has been defined\nif ([string]::IsNullOrWhitespace($liquibaseExecutablePath)) {\n\n\tif ($env:IsContainer)\n    {\n    \t$liquibaseExecutablePath = \"/\"\t\n    }\n    else\n    {\n    \t# Assign root\n    \t$liquibaseExecutablePath = $PSSCriptRoot\n    }\n}\n\n# Get the executable location\nif ($IsWindows) {\n    $liquibaseExecutable = Get-ChildItem -Path $liquibaseExecutablePath -Recurse | Where-Object { $_.Name -eq \"liquibase.bat\" }\n}\n\nif ($IsLinux) {\n    $liquibaseExecutable = Get-ChildItem -Path $liquibaseExecutablePath -Recurse | Where-Object { $_.Name -eq \"liquibase\" }\n}\n\n# Add path to current session\n$env:PATH += \"$([IO.Path]::PathSeparator)$($liquibaseExecutable.Directory)\"\n\n# Check to make sure it was found\nif ([string]::IsNullOrEmpty($liquibaseExecutable)) {\n    # Could not find the executable\n    Write-Error \"Unable to find liquibase.bat in $PSScriptRoot or subfolders.\"\n}\n\n# Get connection Url\n$connectionUrl = Get-ConnectionUrl -DatabaseType $liquibaseDatabaseType -ServerPort $liquibaseServerPort -ServerName $liquibaseServerName -DatabaseName $liquibaseDatabaseName -QueryStringParameters $liquibaseQueryStringParameters\n\n# Add username\n$liquibaseArguments += \"--username=$liquibaseUsername\"\n\n# Determine authentication method\nswitch ($liquibaseAuthenticationMethod) {\n    \"azuremanagedidentity\" {\n        # SQL Server driver doesn't assign password\n        if ($liquibaseDatabaseType -ne \"SqlServer\") {\n            # Get login token\n            Write-Host \"Generating Azure Managed Identity token ...\"\n            $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\" } -UseBasicParsing\n\n            $liquibasePassword = $token.access_token\n            $liquibaseArguments += \"--password=`\"$liquibasePassword`\"\"\n        }\n    }\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($liquibaseServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $liquibasePassword = (aws rds generate-db-auth-token --hostname $liquibaseServerName --region $region --port $liquibaseServerPort --username $liquibaseUsername)\n        $liquibaseArguments += \"--password=`\"$liquibasePassword`\"\"\n\n        break\n    }\n    \"gcpserviceaccount\" {\n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\" }\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header -UseBasicParsing\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains(\"iam.gserviceaccount.com\") }\n\n        Write-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header -UseBasicParsing\n        \n        $liquibasePassword = $token.access_token\n        $liquibaseArguments += \"--password=`\"$liquibasePassword`\"\"\n    }\n    \"usernamepassword\" {\n        # Add password\n        $liquibaseArguments += \"--password=`\"$liquibasePassword`\"\"\n        \n        break\n    }\n}\n\n# Add connection url\n$liquibaseArguments += \"--url=`\"$connectionUrl`\"\"\n\n# Determine if the output variable needs to be set\nif ($liquibaseCommand.EndsWith(\"SQL\")) {\n    # Add the output variable as the command name\n    $liquibaseArguments += \"--outputFile=`\"$PSScriptRoot/artifacts/$($liquibaseCommand).sql`\"\"\n    \n    # Create the folder\n    if ((Test-Path -Path \"$PSScriptRoot/artifacts\") -eq $false) {\n        New-Item -Path \"$PSScriptRoot/artifacts\" -ItemType \"Directory\"\n    }\n}\n\n\n# Add the additional switches\nforeach ($liquibaseSwitch in $liquibaseAdditionalSwitches) {\n    $liquibaseArguments += $liquibaseSwitch\n}\n\nswitch ($liquibaseCommandStyle) {\n    \"legacy\" {\n        # Add the command to execute\n        $liquibaseArguments += $liquibaseCommand\n    }\n    \"modern\" {\n        # Insert the command at the beginning\n        $liquibaseArguments = @($liquibaseCommand) + $liquibaseArguments\n    }\n}\n\n# Add command arguments\n$liquibaseArguments += $liquibaseCommandArguments\n\n# Display what's going to be run\nif (![string]::IsNullOrWhitespace($liquibasePassword)) {\n    $liquibaseDisplayArguments = $liquibaseArguments.PSObject.Copy()\n    for ($i = 0; $i -lt $liquibaseDisplayArguments.Count; $i++) {\n        if ($null -ne $liquibaseDisplayArguments[$i]) {\n            if ($liquibaseDisplayArguments[$i].Contains($liquibasePassword)) {\n                $liquibaseDisplayArguments[$i] = $liquibaseDisplayArguments[$i].Replace($liquibasePassword, \"****\")\n            }\n        }\n    }\n    \n    Write-Host \"Executing the following command: $($liquibaseExecutable.FullName) $liquibaseDisplayArguments\"\n}\nelse {\n    Write-Host \"Executing the following command: $($liquibaseExecutable.FullName) $liquibaseArguments\"\n}\n\n# Check to see if the user has specified the drivers need to be downloaded\nif ($liquibaseDownloadDatabaseDriver -eq $true)\n{\n\t# Download any additional drivers based on the database technology being deployed to\n    $driverPath = Get-DatabaseJar -DatabaseType $liquibaseDatabaseType\n\n    # Check to see if it's null\n    if ($null -ne $driverPath) {\n        # Create folder to hold jar files to override\n        New-Item -Path \"$PWD/liquibase_libs/\" -ItemType Directory    \n\n        # Copy contents into liquibase_libs folder\n        $driverPaths = $driverPath.Split([IO.Path]::PathSeparator)\n\n        foreach ($driver in $driverPaths) {\n            # Copy the items\n            $files = Get-ChildItem -Path $driver\n\n            foreach ($file in $files) {\n                Write-Host \"Copying $($file.FullName) to $PWD/liquibase_libs/$($file.Name)\"\n                Copy-Item -Path $file.FullName -Destination \"$PWD/liquibase_libs/$($file.Name)\"\n            }\n            \n        }\n\n    }\n}\n\n\n\n# Declare variable to hold output from Tee-Object\n$liquibaseCommandOutput;\n\n# Redirection of stderr to stdout is done different on Windows versus Linux\nif ($IsWindows) {\n    # Batch file uses a find command which is located in c:\\windows\\system32 and not included in regular PowerShell sessions\n    $env:PATH = $env:PATH + \";c:\\windows\\system32\"\n    $liquibaseArguments += \"2>&1\"\n    # Execute Liquibase\n    & $liquibaseExecutable.FullName $liquibaseArguments | Tee-Object -Variable liquibaseCommandOutput\n}\n\nif ($IsLinux) {\n    # Execute Liquibase\n    & $liquibaseExecutable.FullName $liquibaseArguments 2>&1 | Tee-Object -Variable liquibaseCommandOutput\n}\n\nSet-OctopusVariable -name \"LiquibaseCommandOutput\" -value $liquibaseCommandOutput\n\n# Check exit code\nif ($lastExitCode -ne 0) {\n    # Fail the step\n    Write-Error \"Execution of Liquibase failed!\"\n}\n\n# Check to see if there were any files output\nif ((Test-Path -Path \"$PSScriptRoot/artifacts\") -eq $true) {\n    # Loop through items\n    foreach ($item in (Get-ChildItem -Path \"$PSScriptRoot/artifacts\")) {\n        New-OctopusArtifact -Path $item.FullName -Name $item.Name\n    }\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "Parameters": [
-    {
-      "Id": "a5f6167a-3e45-4337-ad76-fdacf385ac9c",
-      "Name": "liquibaseProLicenseKey",
-      "Label": "Pro license key",
-      "HelpText": "Enter your Liquibase Pro license key. [Request a free 30-day trial.](https://www.liquibase.com/trial) Leave blank to use the Community Edition.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f56f8e65-bd97-4be4-a9e8-979a5d8e5208",
-      "Name": "liquibaseDatabaseType",
-      "Label": "Database type",
-      "HelpText": "Select the database type to deploy to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Cassandra|Cassandra\nCosmosDB|CosmosDB\nDB2|DB2\nMariaDB|MariaDB\nMongoDB|MongoDB\nMySQL|MySQL\nOracle|Oracle\nPostgreSQL|PostgreSQL\nSnowflake|Snowflake\nSqlAnywhere|SqlAnywhere\nSqlServer|SqlServer"
-      }
-    },
-    {
-      "Id": "e0e2ba23-69f4-4a82-8310-b06f9a485802",
-      "Name": "liquibaseCommand",
-      "Label": "Command",
-      "HelpText": "Use the drop down to select the command to execute.\nCommands with `*` have partial functionality with Community edition, full functionality with Pro edition.\n\nCommands with `**` are Pro only (all Pro only commands require the use of Additional switches).\n\nCommands with `***` require Additiona switches.\n\nAll commands that end in `SQL` will automatically add the `--outputFile` switch and include the generated output as an artifact.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "changelogSync|changelogSync\nchangelogSyncSQL|changelogSyncSQL\nclearCheckSums|clearCheckSums\ndeactivateChangeLog|deactivateChangeLog\ndropAll|dropAll*\nfutureRollbackSQL|futureRollbackSQL\nhistory|history\nrollbackOneChangeSet|rollbackOneChangeSet**\nrollbackOneChangeSetSQL|rollbackOneChangeSetSQL**\nrollbackOneUpdate|rollbackOneUpdate**\nrollbackOneUpdateSQL|rollbackOneUpdateSQL**\nrollbackToDate|rollbackToDate***\nrollbackToDateSQL|rollbackToDateSQL***\nstatus|status\ntag-exists|tag-exists\nupdateSQL|updateSQL\nupdate|update\nupdateTestingRollback|updateTestingRollback\nvalidate|validate"
-      }
-    },
-    {
-      "Id": "86049fa3-866d-4687-b128-25be358cc5aa",
-      "Name": "liquibaseCommandStyle",
-      "Label": "Command style",
-      "HelpText": "Select the style of command, Legacy or Modern.  Legacy will place the Liquibase command at the end of the call, Modern will place it at the beginning\n\nLegacy:\n`liquibase --switch1 command`\n\nModern:\n`liquibase command --switch1`",
-      "DefaultValue": "modern",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "legacy|Legacy\nmodern|Modern"
-      }
-    },
-    {
-      "Id": "0af1aaa8-0cfb-4018-85fc-c996fd450d8c",
-      "Name": "liquibaseCommandArguments",
-      "Label": "Command Arguments",
-      "HelpText": "Some commands require additional arguments, e.g. , `status --verbose`, `rollbackOneUpdate --force`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9f2a3e0c-1afd-4472-acc9-66bd8743ec37",
-      "Name": "liquibaseAdditionalSwitches",
-      "Label": "Additional switches",
-      "HelpText": "A list of additional switches to include for the command, one per line.  (I.e. `--logLevel=debug`)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "ef523320-65ec-44ce-a0cd-0e65a0fed9f9",
-      "Name": "liquibaseChangeLogFileName",
-      "Label": "Change Log file name",
-      "HelpText": "Name of the changelog file in the package.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2ff32870-827c-45c1-86f8-f31842ef547b",
-      "Name": "liquibaseChangeset",
-      "Label": "Changeset package",
-      "HelpText": "Select the package with the changeset.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "dbb7c649-f87b-42f3-b6c9-6db97df39a2f",
-      "Name": "liquibaseServerName",
-      "Label": "Server name",
-      "HelpText": "Name or IP address of the database server.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "481b1bd7-ed0a-40da-8ee6-81397c8d0769",
-      "Name": "liquibaseServerPort",
-      "Label": "Server port",
-      "HelpText": "The port the database server listens on.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "56db5b8b-ceaa-4ee8-b231-df15ea7d9a43",
-      "Name": "liquibaseAuthenticationMethod",
-      "Label": "Authentication Method",
-      "HelpText": "Method used to authenticate to the database server.",
-      "DefaultValue": "usernamepassword",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-      }
-    },
-    {
-      "Id": "8d4337f3-3e37-40e7-983b-b85cc630a720",
-      "Name": "liquibaseDatabaseName",
-      "Label": "Database name",
-      "HelpText": "Name of the database to deploy to.\n- Service name for Oracle\n- KeySpace for Cassandra",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0524f7f4-fb8e-4747-8f1b-679237e398a7",
-      "Name": "liquibaseUsername",
-      "Label": "Username",
-      "HelpText": "Username of a user that has permission to make changes to the database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d58b5a73-681b-434a-92a9-b373216fedc3",
-      "Name": "liquibasePassword",
-      "Label": "Password",
-      "HelpText": "Password for the user with permissions to make changes to the database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "bac7d86b-eb37-4b3f-a99c-0779ffae3fca",
-      "Name": "liquibaseQueryStringParameters",
-      "Label": "Connection query string parameters",
-      "HelpText": "Add additional parameters to the connection string URL. Example: ?useUnicode=true or ;AuthMech=1",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8f1c2bc5-6b39-4c95-8eb0-bd97b0fe62f0",
-      "Name": "liquibaseClassPath",
-      "Label": "Database driver path",
-      "HelpText": "Filepath to the location of the .jar driver for the database type.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cae0020d-595b-407c-a96b-02f7a6bc9788",
-      "Name": "liquibaseExecutablePath",
-      "Label": "Executable file path",
-      "HelpText": "File path to the Liquibase executable.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2eae1d4e-a12d-47dd-8a43-1a6e49983fd9",
-      "Name": "liquibaseDownload",
-      "Label": "Download Liquibase?",
-      "HelpText": "Use this option to download the software necessary to deploy a Liquibase changeset.  This will download Liquibase, java, and the appropriate driver for the selected database type.  Using this option overrides the `Database driver path` and `Executable file path` inputs.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "3f37288f-a4df-4ed7-b309-bb361a496572",
-      "Name": "liquibaseVersion",
-      "Label": "Liquibase version",
-      "HelpText": "Used with `Download Liquibase` to specify the version of Liquibase to use.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "964c851d-1ff3-4f45-81ca-b55bbb8a7ff8",
-      "Name": "liquibaseDownloadDatabaseDriver",
-      "Label": "Download database driver?",
-      "HelpText": "Use this option to download the driver(s) for the selected database type.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2026-03-13T22:05:40.752Z",
-    "OctopusVersion": "2026.1.11242",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "liquibase"
-}

From 60464117d05022a489f0fc1494c7bb6fe686939d Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 00:59:25 -0700
Subject: [PATCH 10/21] refactor: migrate step template batch 4 to src

---
 .../Load-WIF-Issuer-Thumbprints/metadata.json |   60 +
 .../scriptbody.ps1                            |   99 ++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   31 +
 .../metadata.json                             |  105 ++
 .../scriptbody.ps1                            |  184 +++
 .../mariadb-create-database/metadata.json     |   85 ++
 .../mariadb-create-database/scriptbody.ps1    |  160 +++
 .../mariadb-create-user/metadata.json         |  105 ++
 .../mariadb-create-user/scriptbody.ps1        |  170 +++
 .../medianova-purge/metadata.json             |    7 +-
 .../medianova-purge/scriptbody.ps1            |   14 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |  112 ++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   80 ++
 .../metadata.json                             |   93 ++
 .../scriptbody.ps1                            |  174 +++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   61 +
 .../metadata.json                             |   85 ++
 .../scriptbody.ps1                            |   67 ++
 .../metadata.json                             |   94 ++
 .../scriptbody.ps1                            |   61 +
 .../mongodb-create-database/metadata.json     |   84 ++
 .../mongodb-create-database/scriptbody.ps1    |  141 +++
 .../mongodb-create-user/metadata.json         |   93 ++
 .../mongodb-create-user/scriptbody.ps1        |  165 +++
 .../metadata.json                             |  125 ++
 .../scriptbody.ps1                            |  132 +++
 .../mulesoft-cloudhub/metadata.json           |  178 +++
 .../mulesoft-cloudhub/scriptbody.ps1          |  203 ++++
 .../metadata.json                             |  136 +++
 .../scriptbody.ps1                            |  251 ++++
 .../mysql-backup-database/metadata.json       |  104 ++
 .../mysql-backup-database/scriptbody.ps1      |  140 +++
 .../mysql-create-database/metadata.json       |  105 ++
 .../mysql-create-database/scriptbody.ps1      |  225 ++++
 .../mysql-create-user/metadata.json           |  125 ++
 .../mysql-create-user/scriptbody.ps1          |  236 ++++
 .../mysql-execute-command/metadata.json       |  116 ++
 .../mysql-execute-command/scriptbody.ps1      |  164 +++
 .../metadata.json                             |   87 ++
 .../scriptbody.ps1                            |  285 +++++
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   12 +
 .../network-add-url-reservation/metadata.json |    8 +-
 .../scriptbody.ps1                            |   12 +
 .../metadata.json                             |   56 +
 .../scriptbody.ps1                            |  111 ++
 .../nssm-windows-service-create/metadata.json |   12 +-
 .../scriptbody.ps1                            |   90 ++
 .../metadata.json                             |    2 +-
 .../metadata.json                             |    2 +-
 .../metadata.json                             |    2 +-
 .../octopus-artifact-collect/metadata.json    |   83 ++
 .../octopus-artifact-collect/scriptbody.ps1   |  111 ++
 .../metadata.json                             |   45 +
 .../scriptbody.ps1                            |   63 +
 .../octopus-blue-green-check/metadata.json    |   56 +
 .../octopus-blue-green-check/scriptbody.ps1   |  128 ++
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   56 +
 .../octopus-chain-deployment/metadata.json    |  188 +++
 .../octopus-chain-deployment/scriptbody.ps1   | 1032 +++++++++++++++++
 .../metadata.json                             |   35 +
 .../scriptbody.ps1                            |   46 +
 .../octopus-check-roles/metadata.json         |   56 +
 .../octopus-check-roles/scriptbody.ps1        |   64 +
 .../metadata.json                             |   76 ++
 .../scriptbody.ps1                            |  104 ++
 .../metadata.json                             |    2 +-
 .../metadata.json                             |    2 +-
 .../metadata.json                             |   65 ++
 .../scriptbody.ps1                            |   65 ++
 .../octopus-find-cac-updates/metadata.json    |  131 +++
 .../octopus-find-cac-updates/scriptbody.ps1   |  371 ++++++
 .../octopus-get-octopus-usage/metadata.json   |   46 +
 .../octopus-get-octopus-usage/scriptbody.ps1  |  715 ++++++++++++
 .../octopus-import-certificate/metadata.json  |  133 +++
 .../octopus-import-certificate/scriptbody.ps1 |  220 ++++
 .../octopus-merge-cac-updates/metadata.json   |  151 +++
 .../octopus-merge-cac-updates/scriptbody.ps1  |  487 ++++++++
 .../octopus-octolint-a-space/metadata.json    |   57 +
 .../octopus-octolint-a-space/scriptbody.ps1   |    6 +
 .../metadata.json                             |   75 ++
 .../scriptbody.ps1                            |  225 ++++
 .../metadata.json                             |    2 +-
 .../metadata.json                             |    4 +-
 .../metadata.json                             |  145 +++
 .../scriptbody.ps1                            |  181 +++
 .../metadata.json                             |  135 +++
 .../scriptbody.ps1                            |  167 +++
 .../metadata.json                             |  104 ++
 .../scriptbody.ps1                            |  140 +++
 .../metadata.json                             |  105 ++
 .../scriptbody.py                             |  295 +++++
 .../metadata.json                             |  175 +++
 .../scriptbody.py                             |  430 +++++++
 .../metadata.json                             |   77 ++
 .../scriptbody.ps1                            |  138 +++
 .../metadata.json                             |   36 +
 .../scriptbody.ps1                            |   41 +
 .../octopus-support-export/metadata.json      |   64 +
 .../octopus-support-export/scriptbody.ps1     |  154 +++
 .../metadata.json                             |   54 +
 .../scriptbody.ps1                            |   35 +
 .../metadata.json                             |   89 ++
 .../scriptbody.ps1                            |  120 ++
 .../octopus-worker-healthcheck/metadata.json  |   53 +
 .../octopus-worker-healthcheck/scriptbody.ps1 |   83 ++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   68 ++
 .../metadata.json                             |    6 +-
 .../scriptbody.sh                             |   23 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   22 +
 .../oracle-add-user-to-role/metadata.json     |   94 ++
 .../oracle-add-user-to-role/scriptbody.ps1    |  147 +++
 .../metadata.json                             |   94 ++
 .../scriptbody.ps1                            |  141 +++
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   30 +
 .../metadata.json                             |   41 +
 .../scriptbody.ps1                            |   53 +
 .../pagerduty-create-incident/metadata.json   |    4 +-
 .../pagerduty-create-incident/scriptbody.ps1  |   73 ++
 .../metadata.json                             |   77 ++
 .../scriptbody.ps1                            |   90 ++
 .../pause-resume-pingdom-check/metadata.json  |    8 +-
 .../pause-resume-pingdom-check/scriptbody.ps1 |   12 +
 .../pingdom-create-uptime-check/metadata.json |  247 ++++
 .../scriptbody.ps1                            |  190 +++
 .../pingdom-modify-uptime-check/metadata.json |  104 ++
 .../scriptbody.ps1                            |  197 ++++
 .../metadata.json                             |  104 ++
 .../scriptbody.ps1                            |  228 ++++
 .../postgres-create-database/metadata.json    |  104 ++
 .../postgres-create-database/scriptbody.ps1   |  231 ++++
 .../postgres-create-user/metadata.json        |  115 ++
 .../postgres-create-user/scriptbody.ps1       |  238 ++++
 .../postgres-execute-sql/metadata.json        |  115 ++
 .../postgres-execute-sql/scriptbody.ps1       |  189 +++
 .../proxmox-deploy-lxc/metadata.json          |  194 ++++
 .../proxmox-deploy-lxc/scriptbody.ps1         |  213 ++++
 .../proxmox-destroy-lxc/metadata.json         |  104 ++
 .../proxmox-destroy-lxc/scriptbody.ps1        |   80 ++
 .../proxmox-start-lxc/metadata.json           |  104 ++
 .../proxmox-start-lxc/scriptbody.ps1          |   86 ++
 .../proxmox-stop-lxc/metadata.json            |  104 ++
 .../proxmox-stop-lxc/scriptbody.ps1           |   86 ++
 .../pushalot-send-notification/metadata.json  |  132 +--
 .../pushalot-send-notification/scriptbody.ps1 |   11 +
 .../pushover-send-notification/metadata.json  |  150 +--
 .../pushover-send-notification/scriptbody.ps1 |   11 +
 .../rabbitmq-notify-deploy/metadata.json      |   66 ++
 .../rabbitmq-notify-deploy/scriptbody.ps1     |   81 ++
 .../metadata.json                             |   67 ++
 .../scriptbody.ps1                            |   81 ++
 .../ravendb-create-database/metadata.json     |  104 ++
 .../ravendb-create-database/scriptbody.ps1    |  133 +++
 .../ravendb-create-filesystem/metadata.json   |  104 ++
 .../ravendb-create-filesystem/scriptbody.ps1  |  151 +++
 .../ravendb-delete-database/metadata.json     |   58 +
 .../ravendb-delete-database/scriptbody.ps1    |   98 ++
 .../ravendb-delete-filesystem/metadata.json   |   58 +
 .../ravendb-delete-filesystem/scriptbody.ps1  |   93 ++
 .../metadata.json                             |  139 +++
 .../scriptbody.ps1                            |  261 +++++
 .../metadata.json                             |   94 ++
 .../scriptbody.ps1                            |  166 +++
 .../metadata.json                             |   85 ++
 .../scriptbody.ps1                            |  280 +++++
 .../metadata.json                             |   45 +
 .../scriptbody.ps1                            |   79 ++
 .../metadata.json                             |  115 ++
 .../scriptbody.ps1                            |  621 ++++++++++
 .../metadata.json                             |   95 ++
 .../metadata.json                             |  207 ++++
 .../scriptbody.ps1                            |  381 ++++++
 .../metadata.json                             |  194 ++++
 .../scriptbody.ps1                            |  419 +++++++
 .../metadata.json                             |  156 +++
 .../scriptbody.ps1                            |  319 +++++
 .../metadata.json                             |  148 +++
 .../scriptbody.ps1                            |  361 ++++++
 .../metadata.json                             |  221 ++++
 .../scriptbody.ps1                            |  376 ++++++
 .../metadata.json                             |  197 ++++
 .../scriptbody.ps1                            |  397 +++++++
 .../redgate-deploy-from-package/metadata.json |  185 +++
 .../scriptbody.ps1                            |  380 ++++++
 .../Load-WIF-Issuer-Thumbprints.json          |   60 -
 .../mariadb-add-database-user-to-role.json    |  105 --
 step-templates/mariadb-create-database.json   |   85 --
 step-templates/mariadb-create-user.json       |  105 --
 .../mongodb-add-update-user-roles.json        |   93 --
 .../mongodb-atlas-pause-resume-cluster.json   |   85 --
 .../mongodb-atlas-restore-snapshot.json       |   94 --
 step-templates/mongodb-create-database.json   |   84 --
 step-templates/mongodb-create-user.json       |   93 --
 .../msmq-create-transactional-queue.json      |  125 --
 step-templates/mulesoft-cloudhub.json         |  178 ---
 .../mysql-add-database-user-to-role.json      |  136 ---
 step-templates/mysql-backup-database.json     |  104 --
 step-templates/mysql-create-database.json     |  105 --
 step-templates/mysql-create-user.json         |  125 --
 step-templates/mysql-execute-command.json     |  116 --
 ...tscaler-adc-enable-or-disable-service.json |   87 --
 .../newrelic-complete-deployment.json         |   56 -
 step-templates/octopus-artifact-collect.json  |   83 --
 .../octopus-authenticate-with-oidc.json       |   45 -
 step-templates/octopus-blue-green-check.json  |   56 -
 step-templates/octopus-chain-deployment.json  |  187 ---
 .../octopus-check-for-argo-instance.json      |   35 -
 step-templates/octopus-check-roles.json       |   56 -
 .../octopus-consolidate-releasenotes.json     |   78 --
 .../octopus-delete-machine-registration.json  |   65 --
 step-templates/octopus-find-cac-updates.json  |  131 ---
 step-templates/octopus-get-octopus-usage.json |   46 -
 .../octopus-import-certificate.json           |  133 ---
 step-templates/octopus-merge-cac-updates.json |  151 ---
 step-templates/octopus-octolint-a-space.json  |   57 -
 .../octopus-redeploy-previous-release.json    |   75 --
 .../octopus-register-aks-k8s-cluster.json     |  145 ---
 .../octopus-register-listening-target.json    |  135 ---
 .../octopus-register-listening-worker.json    |  104 --
 ...ctopus-serialize-runbook-to-terraform.json |  105 --
 .../octopus-serialize-space-to-terraform.json |  175 ---
 ...Octopus-releaese-notes-from-TFS-query.json |   77 --
 .../octopus-smtp-server-configured.json       |   36 -
 step-templates/octopus-support-export.json    |   64 -
 .../octopus-validate-deploying-user.json      |   54 -
 ...it-for-deployment-target-registration.json |   89 --
 .../octopus-worker-healthcheck.json           |   53 -
 step-templates/oracle-add-user-to-role.json   |   94 --
 .../oracle-create-user-if-not-exists.json     |   94 --
 .../pagerduty-close-maintenance-window.json   |   41 -
 .../pagerduty-open-maintenance-window.json    |   77 --
 .../pingdom-create-uptime-check.json          |  247 ----
 .../pingdom-modify-uptime-check.json          |  104 --
 .../postgres-add-database-user-to-role.json   |  104 --
 step-templates/postgres-create-database.json  |  104 --
 step-templates/postgres-create-user.json      |  115 --
 step-templates/postgres-execute-sql.json      |  115 --
 step-templates/proxmox-deploy-lxc.json        |  194 ----
 step-templates/proxmox-destroy-lxc.json       |  104 --
 step-templates/proxmox-start-lxc.json         |  104 --
 step-templates/proxmox-stop-lxc.json          |  104 --
 step-templates/rabbitmq-notify-deploy.json    |   66 --
 .../rackspace-update-load-balancer.json       |   67 --
 step-templates/ravendb-create-database.json   |  104 --
 step-templates/ravendb-create-filesystem.json |  104 --
 step-templates/ravendb-delete-database.json   |   58 -
 step-templates/ravendb-delete-filesystem.json |   58 -
 ...b-smuggler-move-data-between-database.json |  139 ---
 ...muggler-move-data-between-filesystems.json |   94 --
 ...b-update-properties-within-a-document.json |   85 --
 .../raygun-api-register-deployment.json       |   45 -
 .../re-prioritize-octopus-deploy-tasks.json   |  115 --
 .../readyroll-deploy-database-package.json    |   95 --
 ...eate-database-release-worker-friendly.json |  207 ----
 .../redgate-create-database-release.json      |  196 ----
 ...ploy-database-release-worker-friendly.json |  156 ---
 .../redgate-deploy-from-database-release.json |  150 ---
 .../redgate-deploy-from-database.json         |  223 ----
 ...e-deploy-from-package-worker-friendly.json |  197 ----
 .../redgate-deploy-from-package.json          |  187 ---
 268 files changed, 24156 insertions(+), 8213 deletions(-)
 create mode 100644 src/step-templates/Load-WIF-Issuer-Thumbprints/metadata.json
 create mode 100644 src/step-templates/Load-WIF-Issuer-Thumbprints/scriptbody.ps1
 rename step-templates/Manual-Intervention-User-Restrictions-Enforcement.json => src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/metadata.json (52%)
 create mode 100644 src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/scriptbody.ps1
 create mode 100644 src/step-templates/mariadb-add-database-user-to-role/metadata.json
 create mode 100644 src/step-templates/mariadb-add-database-user-to-role/scriptbody.ps1
 create mode 100644 src/step-templates/mariadb-create-database/metadata.json
 create mode 100644 src/step-templates/mariadb-create-database/scriptbody.ps1
 create mode 100644 src/step-templates/mariadb-create-user/metadata.json
 create mode 100644 src/step-templates/mariadb-create-user/scriptbody.ps1
 rename step-templates/medianova-purge.json => src/step-templates/medianova-purge/metadata.json (91%)
 create mode 100644 src/step-templates/medianova-purge/scriptbody.ps1
 rename step-templates/microsoft-power-automate-post-adaptivecard.json => src/step-templates/microsoft-power-automate-post-adaptivecard/metadata.json (56%)
 create mode 100644 src/step-templates/microsoft-power-automate-post-adaptivecard/scriptbody.ps1
 rename step-templates/microsoft-teams-post-a-message.json => src/step-templates/microsoft-teams-post-a-message/metadata.json (58%)
 create mode 100644 src/step-templates/microsoft-teams-post-a-message/scriptbody.ps1
 create mode 100644 src/step-templates/mongodb-add-update-user-roles/metadata.json
 create mode 100644 src/step-templates/mongodb-add-update-user-roles/scriptbody.ps1
 rename step-templates/mongodb-atlas-create-snapshot.json => src/step-templates/mongodb-atlas-create-snapshot/metadata.json (51%)
 create mode 100644 src/step-templates/mongodb-atlas-create-snapshot/scriptbody.ps1
 create mode 100644 src/step-templates/mongodb-atlas-pause-resume-cluster/metadata.json
 create mode 100644 src/step-templates/mongodb-atlas-pause-resume-cluster/scriptbody.ps1
 create mode 100644 src/step-templates/mongodb-atlas-restore-snapshot/metadata.json
 create mode 100644 src/step-templates/mongodb-atlas-restore-snapshot/scriptbody.ps1
 create mode 100644 src/step-templates/mongodb-create-database/metadata.json
 create mode 100644 src/step-templates/mongodb-create-database/scriptbody.ps1
 create mode 100644 src/step-templates/mongodb-create-user/metadata.json
 create mode 100644 src/step-templates/mongodb-create-user/scriptbody.ps1
 create mode 100644 src/step-templates/msmq-create-transactional-queue/metadata.json
 create mode 100644 src/step-templates/msmq-create-transactional-queue/scriptbody.ps1
 create mode 100644 src/step-templates/mulesoft-cloudhub/metadata.json
 create mode 100644 src/step-templates/mulesoft-cloudhub/scriptbody.ps1
 create mode 100644 src/step-templates/mysql-add-database-user-to-role/metadata.json
 create mode 100644 src/step-templates/mysql-add-database-user-to-role/scriptbody.ps1
 create mode 100644 src/step-templates/mysql-backup-database/metadata.json
 create mode 100644 src/step-templates/mysql-backup-database/scriptbody.ps1
 create mode 100644 src/step-templates/mysql-create-database/metadata.json
 create mode 100644 src/step-templates/mysql-create-database/scriptbody.ps1
 create mode 100644 src/step-templates/mysql-create-user/metadata.json
 create mode 100644 src/step-templates/mysql-create-user/scriptbody.ps1
 create mode 100644 src/step-templates/mysql-execute-command/metadata.json
 create mode 100644 src/step-templates/mysql-execute-command/scriptbody.ps1
 create mode 100644 src/step-templates/netscaler-adc-enable-or-disable-service/metadata.json
 create mode 100644 src/step-templates/netscaler-adc-enable-or-disable-service/scriptbody.ps1
 rename step-templates/network-add-ssl-certificate-binding.json => src/step-templates/network-add-ssl-certificate-binding/metadata.json (72%)
 create mode 100644 src/step-templates/network-add-ssl-certificate-binding/scriptbody.ps1
 rename step-templates/network-add-url-reservation.json => src/step-templates/network-add-url-reservation/metadata.json (68%)
 create mode 100644 src/step-templates/network-add-url-reservation/scriptbody.ps1
 create mode 100644 src/step-templates/newrelic-complete-deployment/metadata.json
 create mode 100644 src/step-templates/newrelic-complete-deployment/scriptbody.ps1
 rename step-templates/nssm-windows-service-create.json => src/step-templates/nssm-windows-service-create/metadata.json (56%)
 create mode 100644 src/step-templates/nssm-windows-service-create/scriptbody.ps1
 rename step-templates/octopus-add-runbook-to-project-azure.json => src/step-templates/octopus-add-runbook-to-project-azure/metadata.json (99%)
 rename step-templates/octopus-apply-octoterra-module-azure.json => src/step-templates/octopus-apply-octoterra-module-azure/metadata.json (99%)
 rename step-templates/octopus-apply-octoterra-module-s3.json => src/step-templates/octopus-apply-octoterra-module-s3/metadata.json (99%)
 create mode 100644 src/step-templates/octopus-artifact-collect/metadata.json
 create mode 100644 src/step-templates/octopus-artifact-collect/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-authenticate-with-oidc/metadata.json
 create mode 100644 src/step-templates/octopus-authenticate-with-oidc/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-blue-green-check/metadata.json
 create mode 100644 src/step-templates/octopus-blue-green-check/scriptbody.ps1
 rename step-templates/octopus-certificate-expiry-check.json => src/step-templates/octopus-certificate-expiry-check/metadata.json (58%)
 create mode 100644 src/step-templates/octopus-certificate-expiry-check/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-chain-deployment/metadata.json
 create mode 100644 src/step-templates/octopus-chain-deployment/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-check-for-argo-instance/metadata.json
 create mode 100644 src/step-templates/octopus-check-for-argo-instance/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-check-roles/metadata.json
 create mode 100644 src/step-templates/octopus-check-roles/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-consolidate-releasenotes/metadata.json
 create mode 100644 src/step-templates/octopus-consolidate-releasenotes/scriptbody.ps1
 rename step-templates/octopus-create-octoterra-space-azure.json => src/step-templates/octopus-create-octoterra-space-azure/metadata.json (99%)
 rename step-templates/octopus-create-octoterra-space-s3.json => src/step-templates/octopus-create-octoterra-space-s3/metadata.json (99%)
 create mode 100644 src/step-templates/octopus-delete-machine-registration/metadata.json
 create mode 100644 src/step-templates/octopus-delete-machine-registration/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-find-cac-updates/metadata.json
 create mode 100644 src/step-templates/octopus-find-cac-updates/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-get-octopus-usage/metadata.json
 create mode 100644 src/step-templates/octopus-get-octopus-usage/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-import-certificate/metadata.json
 create mode 100644 src/step-templates/octopus-import-certificate/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-merge-cac-updates/metadata.json
 create mode 100644 src/step-templates/octopus-merge-cac-updates/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-octolint-a-space/metadata.json
 create mode 100644 src/step-templates/octopus-octolint-a-space/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-redeploy-previous-release/metadata.json
 create mode 100644 src/step-templates/octopus-redeploy-previous-release/scriptbody.ps1
 rename step-templates/octopus-reference-architecture-eks.json => src/step-templates/octopus-reference-architecture-eks/metadata.json (99%)
 rename step-templates/octopus-reference-architecture-webapp.json => src/step-templates/octopus-reference-architecture-webapp/metadata.json (60%)
 create mode 100644 src/step-templates/octopus-register-aks-k8s-cluster/metadata.json
 create mode 100644 src/step-templates/octopus-register-aks-k8s-cluster/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-register-listening-target/metadata.json
 create mode 100644 src/step-templates/octopus-register-listening-target/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-register-listening-worker/metadata.json
 create mode 100644 src/step-templates/octopus-register-listening-worker/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-serialize-runbook-to-terraform/metadata.json
 create mode 100644 src/step-templates/octopus-serialize-runbook-to-terraform/scriptbody.py
 create mode 100644 src/step-templates/octopus-serialize-space-to-terraform/metadata.json
 create mode 100644 src/step-templates/octopus-serialize-space-to-terraform/scriptbody.py
 create mode 100644 src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/metadata.json
 create mode 100644 src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-smtp-server-configured/metadata.json
 create mode 100644 src/step-templates/octopus-smtp-server-configured/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-support-export/metadata.json
 create mode 100644 src/step-templates/octopus-support-export/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-validate-deploying-user/metadata.json
 create mode 100644 src/step-templates/octopus-validate-deploying-user/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-wait-for-deployment-target-registration/metadata.json
 create mode 100644 src/step-templates/octopus-wait-for-deployment-target-registration/scriptbody.ps1
 create mode 100644 src/step-templates/octopus-worker-healthcheck/metadata.json
 create mode 100644 src/step-templates/octopus-worker-healthcheck/scriptbody.ps1
 rename step-templates/onepassword-retrieve-secrets.json => src/step-templates/onepassword-retrieve-secrets/metadata.json (55%)
 create mode 100644 src/step-templates/onepassword-retrieve-secrets/scriptbody.ps1
 rename step-templates/opslevel-create-deploy-event-bash.json => src/step-templates/opslevel-create-deploy-event-bash/metadata.json (80%)
 create mode 100644 src/step-templates/opslevel-create-deploy-event-bash/scriptbody.sh
 rename step-templates/opslevel-create-deploy-event-ps.json => src/step-templates/opslevel-create-deploy-event-ps/metadata.json (80%)
 create mode 100644 src/step-templates/opslevel-create-deploy-event-ps/scriptbody.ps1
 create mode 100644 src/step-templates/oracle-add-user-to-role/metadata.json
 create mode 100644 src/step-templates/oracle-add-user-to-role/scriptbody.ps1
 create mode 100644 src/step-templates/oracle-create-user-if-not-exists/metadata.json
 create mode 100644 src/step-templates/oracle-create-user-if-not-exists/scriptbody.ps1
 rename step-templates/oracle-run-script-through-sqlplus.json => src/step-templates/oracle-run-script-through-sqlplus/metadata.json (60%)
 create mode 100644 src/step-templates/oracle-run-script-through-sqlplus/scriptbody.ps1
 create mode 100644 src/step-templates/pagerduty-close-maintenance-window/metadata.json
 create mode 100644 src/step-templates/pagerduty-close-maintenance-window/scriptbody.ps1
 rename step-templates/pagerduty-create-incident.json => src/step-templates/pagerduty-create-incident/metadata.json (54%)
 create mode 100644 src/step-templates/pagerduty-create-incident/scriptbody.ps1
 create mode 100644 src/step-templates/pagerduty-open-maintenance-window/metadata.json
 create mode 100644 src/step-templates/pagerduty-open-maintenance-window/scriptbody.ps1
 rename step-templates/pause-resume-pingdom-check.json => src/step-templates/pause-resume-pingdom-check/metadata.json (66%)
 create mode 100644 src/step-templates/pause-resume-pingdom-check/scriptbody.ps1
 create mode 100644 src/step-templates/pingdom-create-uptime-check/metadata.json
 create mode 100644 src/step-templates/pingdom-create-uptime-check/scriptbody.ps1
 create mode 100644 src/step-templates/pingdom-modify-uptime-check/metadata.json
 create mode 100644 src/step-templates/pingdom-modify-uptime-check/scriptbody.ps1
 create mode 100644 src/step-templates/postgres-add-database-user-to-role/metadata.json
 create mode 100644 src/step-templates/postgres-add-database-user-to-role/scriptbody.ps1
 create mode 100644 src/step-templates/postgres-create-database/metadata.json
 create mode 100644 src/step-templates/postgres-create-database/scriptbody.ps1
 create mode 100644 src/step-templates/postgres-create-user/metadata.json
 create mode 100644 src/step-templates/postgres-create-user/scriptbody.ps1
 create mode 100644 src/step-templates/postgres-execute-sql/metadata.json
 create mode 100644 src/step-templates/postgres-execute-sql/scriptbody.ps1
 create mode 100644 src/step-templates/proxmox-deploy-lxc/metadata.json
 create mode 100644 src/step-templates/proxmox-deploy-lxc/scriptbody.ps1
 create mode 100644 src/step-templates/proxmox-destroy-lxc/metadata.json
 create mode 100644 src/step-templates/proxmox-destroy-lxc/scriptbody.ps1
 create mode 100644 src/step-templates/proxmox-start-lxc/metadata.json
 create mode 100644 src/step-templates/proxmox-start-lxc/scriptbody.ps1
 create mode 100644 src/step-templates/proxmox-stop-lxc/metadata.json
 create mode 100644 src/step-templates/proxmox-stop-lxc/scriptbody.ps1
 rename step-templates/pushalot-send-notification.json => src/step-templates/pushalot-send-notification/metadata.json (78%)
 create mode 100644 src/step-templates/pushalot-send-notification/scriptbody.ps1
 rename step-templates/pushover-send-notification.json => src/step-templates/pushover-send-notification/metadata.json (78%)
 create mode 100644 src/step-templates/pushover-send-notification/scriptbody.ps1
 create mode 100644 src/step-templates/rabbitmq-notify-deploy/metadata.json
 create mode 100644 src/step-templates/rabbitmq-notify-deploy/scriptbody.ps1
 create mode 100644 src/step-templates/rackspace-update-load-balancer/metadata.json
 create mode 100644 src/step-templates/rackspace-update-load-balancer/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-create-database/metadata.json
 create mode 100644 src/step-templates/ravendb-create-database/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-create-filesystem/metadata.json
 create mode 100644 src/step-templates/ravendb-create-filesystem/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-delete-database/metadata.json
 create mode 100644 src/step-templates/ravendb-delete-database/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-delete-filesystem/metadata.json
 create mode 100644 src/step-templates/ravendb-delete-filesystem/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-smuggler-move-data-between-database/metadata.json
 create mode 100644 src/step-templates/ravendb-smuggler-move-data-between-database/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-smuggler-move-data-between-filesystems/metadata.json
 create mode 100644 src/step-templates/ravendb-smuggler-move-data-between-filesystems/scriptbody.ps1
 create mode 100644 src/step-templates/ravendb-update-properties-within-a-document/metadata.json
 create mode 100644 src/step-templates/ravendb-update-properties-within-a-document/scriptbody.ps1
 create mode 100644 src/step-templates/raygun-api-register-deployment/metadata.json
 create mode 100644 src/step-templates/raygun-api-register-deployment/scriptbody.ps1
 create mode 100644 src/step-templates/re-prioritize-octopus-deploy-tasks/metadata.json
 create mode 100644 src/step-templates/re-prioritize-octopus-deploy-tasks/scriptbody.ps1
 create mode 100644 src/step-templates/readyroll-deploy-database-package/metadata.json
 create mode 100644 src/step-templates/redgate-create-database-release-worker-friendly/metadata.json
 create mode 100644 src/step-templates/redgate-create-database-release-worker-friendly/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-create-database-release/metadata.json
 create mode 100644 src/step-templates/redgate-create-database-release/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-deploy-database-release-worker-friendly/metadata.json
 create mode 100644 src/step-templates/redgate-deploy-database-release-worker-friendly/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-deploy-from-database-release/metadata.json
 create mode 100644 src/step-templates/redgate-deploy-from-database-release/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-deploy-from-database/metadata.json
 create mode 100644 src/step-templates/redgate-deploy-from-database/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-deploy-from-package-worker-friendly/metadata.json
 create mode 100644 src/step-templates/redgate-deploy-from-package-worker-friendly/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-deploy-from-package/metadata.json
 create mode 100644 src/step-templates/redgate-deploy-from-package/scriptbody.ps1
 delete mode 100644 step-templates/Load-WIF-Issuer-Thumbprints.json
 delete mode 100644 step-templates/mariadb-add-database-user-to-role.json
 delete mode 100644 step-templates/mariadb-create-database.json
 delete mode 100644 step-templates/mariadb-create-user.json
 delete mode 100644 step-templates/mongodb-add-update-user-roles.json
 delete mode 100644 step-templates/mongodb-atlas-pause-resume-cluster.json
 delete mode 100644 step-templates/mongodb-atlas-restore-snapshot.json
 delete mode 100644 step-templates/mongodb-create-database.json
 delete mode 100644 step-templates/mongodb-create-user.json
 delete mode 100644 step-templates/msmq-create-transactional-queue.json
 delete mode 100644 step-templates/mulesoft-cloudhub.json
 delete mode 100644 step-templates/mysql-add-database-user-to-role.json
 delete mode 100644 step-templates/mysql-backup-database.json
 delete mode 100644 step-templates/mysql-create-database.json
 delete mode 100644 step-templates/mysql-create-user.json
 delete mode 100644 step-templates/mysql-execute-command.json
 delete mode 100644 step-templates/netscaler-adc-enable-or-disable-service.json
 delete mode 100644 step-templates/newrelic-complete-deployment.json
 delete mode 100644 step-templates/octopus-artifact-collect.json
 delete mode 100644 step-templates/octopus-authenticate-with-oidc.json
 delete mode 100644 step-templates/octopus-blue-green-check.json
 delete mode 100644 step-templates/octopus-chain-deployment.json
 delete mode 100644 step-templates/octopus-check-for-argo-instance.json
 delete mode 100644 step-templates/octopus-check-roles.json
 delete mode 100644 step-templates/octopus-consolidate-releasenotes.json
 delete mode 100644 step-templates/octopus-delete-machine-registration.json
 delete mode 100644 step-templates/octopus-find-cac-updates.json
 delete mode 100644 step-templates/octopus-get-octopus-usage.json
 delete mode 100644 step-templates/octopus-import-certificate.json
 delete mode 100644 step-templates/octopus-merge-cac-updates.json
 delete mode 100644 step-templates/octopus-octolint-a-space.json
 delete mode 100644 step-templates/octopus-redeploy-previous-release.json
 delete mode 100644 step-templates/octopus-register-aks-k8s-cluster.json
 delete mode 100644 step-templates/octopus-register-listening-target.json
 delete mode 100644 step-templates/octopus-register-listening-worker.json
 delete mode 100644 step-templates/octopus-serialize-runbook-to-terraform.json
 delete mode 100644 step-templates/octopus-serialize-space-to-terraform.json
 delete mode 100644 step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query.json
 delete mode 100644 step-templates/octopus-smtp-server-configured.json
 delete mode 100644 step-templates/octopus-support-export.json
 delete mode 100644 step-templates/octopus-validate-deploying-user.json
 delete mode 100644 step-templates/octopus-wait-for-deployment-target-registration.json
 delete mode 100644 step-templates/octopus-worker-healthcheck.json
 delete mode 100644 step-templates/oracle-add-user-to-role.json
 delete mode 100644 step-templates/oracle-create-user-if-not-exists.json
 delete mode 100644 step-templates/pagerduty-close-maintenance-window.json
 delete mode 100644 step-templates/pagerduty-open-maintenance-window.json
 delete mode 100644 step-templates/pingdom-create-uptime-check.json
 delete mode 100644 step-templates/pingdom-modify-uptime-check.json
 delete mode 100644 step-templates/postgres-add-database-user-to-role.json
 delete mode 100644 step-templates/postgres-create-database.json
 delete mode 100644 step-templates/postgres-create-user.json
 delete mode 100644 step-templates/postgres-execute-sql.json
 delete mode 100644 step-templates/proxmox-deploy-lxc.json
 delete mode 100644 step-templates/proxmox-destroy-lxc.json
 delete mode 100644 step-templates/proxmox-start-lxc.json
 delete mode 100644 step-templates/proxmox-stop-lxc.json
 delete mode 100644 step-templates/rabbitmq-notify-deploy.json
 delete mode 100644 step-templates/rackspace-update-load-balancer.json
 delete mode 100644 step-templates/ravendb-create-database.json
 delete mode 100644 step-templates/ravendb-create-filesystem.json
 delete mode 100644 step-templates/ravendb-delete-database.json
 delete mode 100644 step-templates/ravendb-delete-filesystem.json
 delete mode 100644 step-templates/ravendb-smuggler-move-data-between-database.json
 delete mode 100644 step-templates/ravendb-smuggler-move-data-between-filesystems.json
 delete mode 100644 step-templates/ravendb-update-properties-within-a-document.json
 delete mode 100644 step-templates/raygun-api-register-deployment.json
 delete mode 100644 step-templates/re-prioritize-octopus-deploy-tasks.json
 delete mode 100644 step-templates/readyroll-deploy-database-package.json
 delete mode 100644 step-templates/redgate-create-database-release-worker-friendly.json
 delete mode 100644 step-templates/redgate-create-database-release.json
 delete mode 100644 step-templates/redgate-deploy-database-release-worker-friendly.json
 delete mode 100644 step-templates/redgate-deploy-from-database-release.json
 delete mode 100644 step-templates/redgate-deploy-from-database.json
 delete mode 100644 step-templates/redgate-deploy-from-package-worker-friendly.json
 delete mode 100644 step-templates/redgate-deploy-from-package.json

diff --git a/src/step-templates/Load-WIF-Issuer-Thumbprints/metadata.json b/src/step-templates/Load-WIF-Issuer-Thumbprints/metadata.json
new file mode 100644
index 000000000..1bbacc086
--- /dev/null
+++ b/src/step-templates/Load-WIF-Issuer-Thumbprints/metadata.json
@@ -0,0 +1,60 @@
+{
+  "Id": "77331575-0628-455d-b484-cfd4703e2081",
+  "Name": "Load WIF Issuer Thumbprint(s)",
+  "Description": "Updates the web/app config files' WIF TrustedIssuer thumbprints based on a realtime metadata request.\n\nChanges are made to the following section:\n/configuration/system.identityModel/identityConfiguration/issuerNameRegistry/trustedIssuers",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "9fa8d0c0-53a3-4d38-b183-bab04037869e",
+      "Name": "FilePath",
+      "Label": "web config file path",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e97dcceb-fbf1-41f2-9829-e32c6322fe58",
+      "Name": "TrustedIssuerName",
+      "Label": "Trusted Issuer Name",
+      "HelpText": "",
+      "DefaultValue": "https://adfs/adfs/services/trust",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9670671a-5d7e-4232-9d45-5fc47d005167",
+      "Name": "MetadataUri",
+      "Label": "Metadata Uri",
+      "HelpText": null,
+      "DefaultValue": "https://adfs/FederationMetadata/2007-06/FederationMetadata.xml",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2018-06-07T19:59:41.9250000Z",
+  "LastModifiedBy": "sbrickey",
+  "Category": "XML",
+  "$Meta": {
+    "ExportedAt": "2018-06-07T19:59:41.9250000Z",
+    "OctopusVersion": "3.17.2",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/Load-WIF-Issuer-Thumbprints/scriptbody.ps1 b/src/step-templates/Load-WIF-Issuer-Thumbprints/scriptbody.ps1
new file mode 100644
index 000000000..1640e0ae1
--- /dev/null
+++ b/src/step-templates/Load-WIF-Issuer-Thumbprints/scriptbody.ps1
@@ -0,0 +1,99 @@
+$FilePath          = "#{FilePath}"
+$TrustedIssuerName = "#{TrustedIssuerName}"
+$MetadataUri       = "#{MetadataUri}"
+
+
+[void][System.Reflection.Assembly]::LoadWithPartialName("System.Xml.Linq")
+
+# because Octo calls powershell steps in a stupid manor...
+$charGT = [System.Text.Encoding]::ASCII.GetString( @(62) )
+
+function Get-Thumbprints($MetadataUri) {
+    $MetadataTxt = Invoke-WebRequest -Uri $MetadataUri
+    $MetadataXml = [xml]($MetadataTxt.Content)
+    
+    $outval = @()
+    # new certs
+    
+    $MetadataXml.EntityDescriptor.IDPSSODescriptor.KeyDescriptor | ? { $_.use -eq "signing" } | % {
+        $Cert_Bytes = [System.Convert]::FromBase64String( $_.KeyInfo.X509Data.X509Certificate )
+        $Cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2( , $Cert_Bytes ) # powershell is stupid about arrays
+        Write-Host "Found certificate for [$($_.use)] : [$($cert.NotBefore.ToString("yyyyMMdd")) - $($cert.NotAfter.ToString("yyyyMMdd"))] : Thumbprint [$($Cert.Thumbprint)] for Subject [$($Cert.Subject)]"
+        $outval += $Cert.Thumbprint
+    }
+    return $outval
+}
+
+function Get-TextIndex([string]$text, [int]$LineNumber = 0, [int]$LinePosition = 0) {
+    # Ported from : https://github.com/futurist/src-location/blob/master/index.js  function locationToIndex
+    # NOTE: diff from source to address bug. Test-GetTextIndex validates the changes.
+    $strLF = [char]10 # \n
+    $strCR = [char]13 # \r
+    $idx   = -1       # text index
+    $lc    = 1        # Line Count
+    for($i = 0; $lc -lt $LineNumber -and $i -lt $text.Length; $i++) {
+        $idx++
+        $c = $text[$i] # cur char
+        if ($c -eq $strLF -or $c -eq $strCR) {
+            $lc++
+            if ($c -eq $strCR -and $text[$i + 1] -eq $strLF) { # DOS CRLF
+                $i++
+                $idx++
+            }
+        }
+    }
+    return $idx + $LinePosition
+}
+
+function Replace-TrustedIssuerThumbprints($FilePath, $TrustedIssuerName, $Thumbprints) {
+    # Load the file twice - once as text for manipulation, once as XML for xpath and positions
+    $fileText      = [System.IO.File]::ReadAllText($FilePath)
+    $fileXml       = [System.Xml.Linq.XDocument]::Load($FilePath, [System.Xml.Linq.LoadOptions]::SetLineInfo -bor [System.Xml.Linq.LoadOptions]::PreserveWhitespace )
+    $IdpsXml       = $fileXml.Descendants("configuration")[0].Descendants("system.identityModel")[0].Descendants("identityConfiguration")[0].Descendants("issuerNameRegistry")[0].Descendants("trustedIssuers")[0].Descendants("add")
+
+    # Figure out which elements to manipulate... First delete from the bottom up, then replace the top-most element
+    $IdpMatches    = $IdpsXml | ? { $_.Attribute("name").Value -eq $TrustedIssuerName } | Sort-Object -Property LineNumber, LinePosition -Descending
+    $IdpsToDelete  = $IdpMatches | Select-Object -First ($IdpMatches.Count - 1)
+    $IdpsToReplace = $IdpMatches | Select-Object -Last 1
+
+    # Delete from the bottom up, so that the LineNumber/LinePosition remain valid during the manipulation
+    foreach ($IdP in $IdpsToDelete) {
+        Write-Host ( "DEL [{0}:{1}] {2}" -f $IdP.LineNumber, $IdP.LinePosition, $IdP.ToString() )
+
+        $fileIdxOpen  = Get-TextIndex -text $fileText -LineNumber $IdP.LineNumber -LinePosition ( $IdP.LinePosition - 1 )
+        $fileIdxClose = $fileText.IndexOf($charGT, $fileIdxOpen) + 1 # add one to include the closing &gt;
+        $fileSubstr   = $fileText.Substring($fileIdxOpen, $fileIdxClose - $fileIdxOpen)
+        Write-Host ( "    [$fileIdxOpen .. $fileIdxClose] : $fileSubstr" )
+
+        $fileIdxPrior = $fileText.LastIndexOf($charGT, $fileIdxOpen) + 1
+        $fileText     = $fileText.Remove($fileIdxPrior, $fileIdxClose - $fileIdxPrior)
+    }
+    # Replace the top-most element with each thumbprint
+    foreach ($IdP in $IdpsToReplace) {
+        Write-Host ( "FIX [{0}:{1}] {2}" -f $IdP.LineNumber, $IdP.LinePosition, $IdP.ToString() )
+
+        $fileIdxOpen  = Get-TextIndex -text $fileText -LineNumber $IdP.LineNumber -LinePosition ( $IdP.LinePosition - 1 )
+        $fileIdxClose = $fileText.IndexOf($charGT, $fileIdxOpen) + 1 # add one to include the closing &gt;
+        $fileSubstr   = $fileText.Substring($fileIdxOpen, $fileIdxClose - $fileIdxOpen)
+        Write-Host ( "    [$fileIdxOpen .. $fileIdxClose] : $fileSubstr" )
+
+        $fileIdxPrior = $fileText.LastIndexOf($charGT, $fileIdxOpen) + 1
+        $ElementDelim = $fileText.Substring($fileIdxPrior, $fileIdxOpen - $fileIdxPrior)
+        Write-Host ( "   -[{0} .. {1}]" -f $fileIdxPrior, $fileIdxClose )
+        $fileText     = $fileText.Remove($fileIdxPrior, $fileIdxClose - $fileIdxPrior)
+        foreach ($Thumbprint in $Thumbprints) {
+            $newAttribs = [System.Xml.Linq.XAttribute[]]@(
+                                ( New-Object System.Xml.Linq.XAttribute("thumbprint", $Thumbprint       ) ),
+                                ( New-Object System.Xml.Linq.XAttribute("name"      , $TrustedIssuerName) )
+                            )
+            $newValue = ( New-Object System.Xml.Linq.XElement("add", $newAttribs) ).ToString()
+            $fileText = $fileText.Insert($fileIdxPrior, $ElementDelim + $newValue)
+        }
+    }
+    return $fileText
+}
+
+
+$ThumbPrints       = Get-Thumbprints -MetadataUri $MetadataUri
+$fileContent       = Replace-TrustedIssuerThumbprints -FilePath $FilePath -TrustedIssuerName $TrustedIssuerName -Thumbprints $ThumbPrints
+[System.IO.File]::WriteAllText($FilePath, $fileContent)
diff --git a/step-templates/Manual-Intervention-User-Restrictions-Enforcement.json b/src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/metadata.json
similarity index 52%
rename from step-templates/Manual-Intervention-User-Restrictions-Enforcement.json
rename to src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/metadata.json
index 71821bddf..4a9b78742 100644
--- a/step-templates/Manual-Intervention-User-Restrictions-Enforcement.json
+++ b/src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$manIntStepName = $OctopusParameters[\"URE.ManualInterventionStepName\"]\n\nWrite-Host \"Created by: \"$OctopusParameters[\"Octopus.Deployment.CreatedBy.Username\"]\nWrite-Host \"Approved by: \"$OctopusParameters[\"Octopus.Action[$manIntStepName].Output.Manual.ResponsibleUser.Username\"]\n\nIf ($OctopusParameters[\"URE.PreventDeployerFromApproving\"] -eq $true) {\n  $deploymentCreatedByUsername = $OctopusParameters[\"Octopus.Deployment.CreatedBy.Username\"]\n}\n$approvedByUsername = $OctopusParameters[\"Octopus.Action[$manIntStepName].Output.Manual.ResponsibleUser.Username\"]\n\nIf ($approvedByUsername -eq $deploymentCreatedByUsername) {\n  Write-Warning \"The same user may not be used to both start the deployment and approve the deployment.\"\n  Write-Warning \"Please retry the deployment with a different approver for the $manIntStepName step.\"\n  throw \"Terminating deployment...\"\n}\nElse {\n  $excludedUserList = $OctopusParameters[\"URE.ExcludedUsers\"].Split([System.Environment]::NewLine)\n  If ($excludedUserList -contains $approvedByUsername) {\n  Write-Warning \"The user $approvedByUsername may not approve this deployment.\"\n  Write-Warning \"Please retry the deployment with a different approver for the $manIntStepName step.\"\n  throw \"Terminating deployment...\"\n  }\n}\n\nIf (($OctopusParameters[\"URE.PreventDeployerFromApproving\"] -ne $true) -and (!$excludedUserList)) {\n  Write-Host \">>>PreventDeployerFromApproving set to FALSE\" \n  Write-Host \">>>ExcludedUsers contain no value(s)\"\n}\nWrite-Host \"Check complete\"\nWrite-Host \"Continuing...\"\n  "
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -46,7 +46,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2025-04-16T21:40:42.587Z",
+    "ExportedAt": "2025-04-16T21:40:42.5870000Z",
     "OctopusVersion": "2025.2.6682",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/scriptbody.ps1 b/src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/scriptbody.ps1
new file mode 100644
index 000000000..1fe337a76
--- /dev/null
+++ b/src/step-templates/Manual-Intervention-User-Restrictions-Enforcement/scriptbody.ps1
@@ -0,0 +1,31 @@
+$manIntStepName = $OctopusParameters["URE.ManualInterventionStepName"]
+
+Write-Host "Created by: "$OctopusParameters["Octopus.Deployment.CreatedBy.Username"]
+Write-Host "Approved by: "$OctopusParameters["Octopus.Action[$manIntStepName].Output.Manual.ResponsibleUser.Username"]
+
+If ($OctopusParameters["URE.PreventDeployerFromApproving"] -eq $true) {
+  $deploymentCreatedByUsername = $OctopusParameters["Octopus.Deployment.CreatedBy.Username"]
+}
+$approvedByUsername = $OctopusParameters["Octopus.Action[$manIntStepName].Output.Manual.ResponsibleUser.Username"]
+
+If ($approvedByUsername -eq $deploymentCreatedByUsername) {
+  Write-Warning "The same user may not be used to both start the deployment and approve the deployment."
+  Write-Warning "Please retry the deployment with a different approver for the $manIntStepName step."
+  throw "Terminating deployment..."
+}
+Else {
+  $excludedUserList = $OctopusParameters["URE.ExcludedUsers"].Split([System.Environment]::NewLine)
+  If ($excludedUserList -contains $approvedByUsername) {
+  Write-Warning "The user $approvedByUsername may not approve this deployment."
+  Write-Warning "Please retry the deployment with a different approver for the $manIntStepName step."
+  throw "Terminating deployment..."
+  }
+}
+
+If (($OctopusParameters["URE.PreventDeployerFromApproving"] -ne $true) -and (!$excludedUserList)) {
+  Write-Host ">>>PreventDeployerFromApproving set to FALSE" 
+  Write-Host ">>>ExcludedUsers contain no value(s)"
+}
+Write-Host "Check complete"
+Write-Host "Continuing..."
+  
\ No newline at end of file
diff --git a/src/step-templates/mariadb-add-database-user-to-role/metadata.json b/src/step-templates/mariadb-add-database-user-to-role/metadata.json
new file mode 100644
index 000000000..6f021a27a
--- /dev/null
+++ b/src/step-templates/mariadb-add-database-user-to-role/metadata.json
@@ -0,0 +1,105 @@
+{
+  "Id": "24095ff8-a851-498f-8105-667bd76733eb",
+  "Name": "MariaDB - Add Database User To Role",
+  "Description": "Adds a database user to a role",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "b6384c33-5196-40a4-b67f-f904eccbd795",
+      "Name": "addMariaDBServerName",
+      "Label": "MariaDB Server name",
+      "HelpText": "Name of the MariaDB database server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6b8a13d6-7b7a-4cf2-8864-26b0c922a27f",
+      "Name": "addMariaDBServerPort",
+      "Label": "Port",
+      "HelpText": "Port the MariaDB listens on.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a8582fbc-4272-4098-8a99-6a28c9259958",
+      "Name": "addLoginWithAddRoleRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user that can add roles to other users.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d8e07293-a942-4ab3-9ef2-59092cc1fdc6",
+      "Name": "addLoginPasswordWithAddRoleRights",
+      "Label": "Login password",
+      "HelpText": "Password for the login account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "846984d9-3661-4938-9cd7-c6e2daa87c43",
+      "Name": "addUsername",
+      "Label": "User name",
+      "HelpText": "Name of the user to add the role to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ab3c26b1-d64b-4257-bd88-0b316ae21655",
+      "Name": "addUserHostname",
+      "Label": "User Hostname",
+      "HelpText": "Hostname of the user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "da07dc32-a66d-453d-9dcb-e78ea525a31f",
+      "Name": "addRoleName",
+      "Label": "Role name",
+      "HelpText": "Name of the role to add to the user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0d29c6ce-724c-47bc-a4ef-42b123cf02bb",
+      "Name": "mariaDbAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the MariaDB server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password"
+      }
+    }
+  ],
+  "LastModifiedBy": "coryreid",
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-02-19T01:10:27.9250000Z",
+    "OctopusVersion": "2025.4.10425",
+    "Type": "ActionTemplate"
+  },
+  "Category": "mariadb"
+}
diff --git a/src/step-templates/mariadb-add-database-user-to-role/scriptbody.ps1 b/src/step-templates/mariadb-add-database-user-to-role/scriptbody.ps1
new file mode 100644
index 000000000..ebd991941
--- /dev/null
+++ b/src/step-templates/mariadb-add-database-user-to-role/scriptbody.ps1
@@ -0,0 +1,184 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled 
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserInRole
+{
+	# Define parameters
+    param ($UserHostname,
+    $Username,
+    $RoleHostName,
+    $RoleName)
+    
+	# Execute query
+    $grants = Invoke-SqlQuery "SHOW GRANTS FOR '$Username'@'$UserHostName';" -ConnectionName $connectionName
+
+    # Loop through Grants
+    foreach ($grant in $grants.ItemArray)
+    {
+        # Check grant
+        if ($grant -eq "GRANT $RoleName TO '$Username'@'$UserHostName'")
+        {
+            # They're in the group
+            return $true
+        }
+    }
+
+    # Not found
+    return $false
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Declare initial connection string
+$connectionString = "Server=$addMariaDBServerName;Port=$addMariaDBServerPort;"
+
+# Update the connection string based on authentication method
+switch ($mariaDbAuthenticationMethod) {
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($addMariaDBServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $addLoginPasswordWithAddRoleRights = (aws rds generate-db-auth-token --hostname $addMariaDBServerName --region $region --port $addMariaDBServerPort --username $addLoginWithAddRoleRights)
+        
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$addLoginWithAddRoleRights;Pwd=`"$addLoginPasswordWithAddRoleRights`";"
+
+        break
+    }
+    "usernamepassword" {
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$addLoginWithAddRoleRights;Pwd=`"$addLoginPasswordWithAddRoleRights`";"
+        
+        break    
+    }
+    "windowsauthentication" {
+        # Append remaining portion of connection string
+        $connectionString += ";IntegratedSecurity=yes;Uid=$addLoginWithAddRoleRights;"
+
+        break
+    }
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+try
+{
+    # Connect to MySQL
+    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName
+
+    # See if database exists
+    $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleName $addRoleName
+
+    if ($userInRole -eq $false)
+    {
+        # Create database
+        Write-Output "Adding user $addUsername@$addUserHostName to role $addRoleName ..."
+        $executionResults = Invoke-SqlUpdate "GRANT $addRoleName TO '$addUsername'@'$addUserHostName';" -ConnectionName $connectionName
+
+        # See if it was created
+        $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleName $addRoleName
+            
+        # Check array
+        if ($userInRole -eq $true)
+        {
+            # Success
+            Write-Output "$addUserName@$addUserHostName added to $addRoleName successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "Failure adding $addUserName@$addUserHostName to $addRoleName!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $addUsername@$addUserHostName is already in role $addRoleName"
+    }
+}
+finally
+{
+    if ((Test-Connection -ConnectionName $connectionName) -eq $true)
+    {
+      Close-SqlConnection -ConnectionName $connectionName
+    }
+}
+
+
diff --git a/src/step-templates/mariadb-create-database/metadata.json b/src/step-templates/mariadb-create-database/metadata.json
new file mode 100644
index 000000000..99db8570d
--- /dev/null
+++ b/src/step-templates/mariadb-create-database/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "2bdfe600-e205-43f9-b174-67ee5d36bf5b",
+  "Name": "MariaDB - Create Database If Not Exists",
+  "Description": "Creates a MariaDB database if it doesn't already exist.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "8fc92b80-5122-44a0-b3d8-a1d022a35055",
+      "Name": "createMariaDBServerName",
+      "Label": "Server",
+      "HelpText": "Hostname (or IP) of the MariaDB database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "df993ccf-71ab-48de-9a67-e2af6653d35e",
+      "Name": "createUsername",
+      "Label": "Username",
+      "HelpText": "Username to use for the connection",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8a07f25d-a7db-466e-a356-9155cbc5f258",
+      "Name": "createUserPassword",
+      "Label": "Password",
+      "HelpText": "Password for the user account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "2af18465-c8d1-48f6-afce-1b1b30ae9559",
+      "Name": "createDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to create",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f55e2a34-7a82-4d92-83bb-a19f304774d8",
+      "Name": "createPort",
+      "Label": "Port",
+      "HelpText": "Port for the database instance.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "22bcb486-c796-412d-a7bc-e1a3e0d854a3",
+      "Name": "mariaDbAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the MariaDB server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password"
+      }
+    }
+  ],
+  "LastModifiedBy": "coryreid",
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-02-19T01:19:04.8710000Z",
+    "OctopusVersion": "2025.4.10425",
+    "Type": "ActionTemplate"
+  },
+  "Category": "mariadb"
+}
diff --git a/src/step-templates/mariadb-create-database/scriptbody.ps1 b/src/step-templates/mariadb-create-database/scriptbody.ps1
new file mode 100644
index 000000000..5f264379d
--- /dev/null
+++ b/src/step-templates/mariadb-create-database/scriptbody.ps1
@@ -0,0 +1,160 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled {
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {
+        # It is installed
+        return $true
+    }
+    else {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule {
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+    # Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+        # Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseExists {
+    # Define parameters
+    param ($DatabaseName)
+    
+    # Execute query
+    return Invoke-SqlQuery "SHOW DATABASES LIKE '$DatabaseName';" -ConnectionName $connectionName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true) {
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true) {
+    # Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+
+# Declare initial connection string
+$connectionString = "Server=$createMariaDBServerName;Port=$createPort;"
+
+# Update the connection string based on authentication method
+switch ($mariaDbAuthenticationMethod) {
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($createMariaDBServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $createUserPassword = (aws rds generate-db-auth-token --hostname $createMariaDBServerName --region $region --port $createPort --username $createUsername)
+        
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$createUsername;Pwd=`"$createUserPassword`";"
+
+        break
+    }
+    "usernamepassword" {
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$createUsername;Pwd=`"$createUserPassword`";"
+        
+        break    
+    }
+    "windowsauthentication" {
+        # Append remaining portion of connection string
+        $connectionString += ";IntegratedSecurity=yes;Uid=$createUsername;"
+
+        break
+    }
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+try {
+    # Connect to MySQL
+    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName
+
+    # See if database exists
+    $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName
+
+    if ($databaseExists.ItemArray.Count -eq 0) {
+        # Create database
+        Write-Output "Creating database $createDatabaseName ..."
+        $executionResult = Invoke-SqlUpdate "CREATE DATABASE $createDatabaseName;" -ConnectionName $connectionName
+
+        # Check result
+        if ($executionResult -ne 1) {
+            # Commit transaction
+            Write-Error "Create schema failed."
+        }
+        else {
+            # See if it was created
+            $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName
+            
+            # Check array
+            if ($databaseExists.ItemArray.Count -eq 1) {
+                # Success
+                Write-Output "$createDatabaseName created successfully!"
+            }
+            else {
+                # Failed
+                Write-Error "$createDatabaseName was not created!"
+            }
+        }
+    }
+    else {
+        # Display message
+        Write-Output "Database $createDatabaseName already exists."
+    }
+}
+finally {
+    # Test to see if connection is open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+      Write-Host "Closing connection ..."
+      Close-SqlConnection -ConnectionName $connectionName
+    }
+}
diff --git a/src/step-templates/mariadb-create-user/metadata.json b/src/step-templates/mariadb-create-user/metadata.json
new file mode 100644
index 000000000..7871e4edb
--- /dev/null
+++ b/src/step-templates/mariadb-create-user/metadata.json
@@ -0,0 +1,105 @@
+{
+  "Id": "5e41412b-0839-4fa8-b7a1-9360115ef303",
+  "Name": "MariaDB - Create User If Not Exists",
+  "Description": "Creates a new user account on a MariaDB database server",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "0fb5e63d-528c-4e7e-841d-6d4bd1ef47a4",
+      "Name": "createMariaDBServerName",
+      "Label": "MariaDB Server",
+      "HelpText": "Host name of the MariaDB server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "47364cd4-6c31-43f6-9585-cc97aca28d3c",
+      "Name": "createMariaDBServerPort",
+      "Label": "Port",
+      "HelpText": "Port number the MySQL server listens on.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cb9b74a5-f444-4b8c-b353-0eebd990e0a3",
+      "Name": "createLoginWithAddUserRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user with rights to create user accounts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "699b3521-06dc-4e66-a20e-adce0fddab38",
+      "Name": "createLoginPasswordWithAddUserRights",
+      "Label": "Login Password",
+      "HelpText": "Password Login name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5b5ec614-a799-407d-870a-d3098794e049",
+      "Name": "createNewUsername",
+      "Label": "New user name",
+      "HelpText": "Name of the new user account to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8fe190a3-b3d5-4d4b-84d2-a4fe5bf2c99f",
+      "Name": "createNewUserPassword",
+      "Label": "New user password",
+      "HelpText": "Password for the new user account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c7fd6115-ec4d-455b-b84b-d6eb19228140",
+      "Name": "createUserHostname",
+      "Label": "New user host name",
+      "HelpText": "Host name that the new user account is allowed to login from.  Enter % to allow the account to connect from anywhere.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "37569f0a-6cc7-4914-be50-0cc24484dcd9",
+      "Name": "mariaDbAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the MariaDB server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password"
+      }
+    }
+  ],
+  "LastModifiedBy": "coryreid",
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2026-02-19T01:20:22.2430000Z",
+    "OctopusVersion": "2025.4.10425",
+    "Type": "ActionTemplate"
+  },
+  "Category": "mariadb"
+}
diff --git a/src/step-templates/mariadb-create-user/scriptbody.ps1 b/src/step-templates/mariadb-create-user/scriptbody.ps1
new file mode 100644
index 000000000..c306da757
--- /dev/null
+++ b/src/step-templates/mariadb-create-user/scriptbody.ps1
@@ -0,0 +1,170 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserExists
+{
+	# Define parameters
+    param ($Hostname,
+    $Username)
+    
+	# Execute query
+    return Invoke-SqlQuery "SELECT * FROM mysql.user WHERE Host = '$Hostname' AND User = '$Username';" -ConnectionName $connectionName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Declare initial connection string
+$connectionString = "Server=$($createMariaDBServerName);Port=$($createMariaDBServerPort);"
+
+# Update the connection string based on authentication method
+switch ($mariaDbAuthenticationMethod) {
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($createMariaDBServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $createUserPassword = (aws rds generate-db-auth-token --hostname $createMariaDBServerName --region $region --port $createPort --username $createLoginWithAddUserRights)
+        
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$($createLoginWithAddUserRights);Pwd=`"$($createUserPassword)`";"
+
+        break
+    }
+    "usernamepassword" {
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$($createLoginWithAddUserRights);Pwd=`"$($createLoginPasswordWithAddUserRights)`";"
+        
+        break    
+    }
+    "windowsauthentication" {
+        # Append remaining portion of connection string
+        $connectionString += ";IntegratedSecurity=yes;Uid=$($createLoginWithAddUserRights);"
+
+        break
+    }
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+try
+{
+    # Connect to MySQL
+    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName
+
+    # See if database exists
+    $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername
+
+    if ($userExists -eq $null)
+    {
+        # Create database
+        Write-Output "Creating user $createNewUsername ..."
+        $executionResults = Invoke-SqlUpdate "CREATE USER '$createNewUsername'@'$createUserHostname' IDENTIFIED BY '$createNewUserPassword';" -ConnectionName $connectionName
+
+        # See if it was created
+        $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername
+            
+        # Check array
+        if ($userExists -ne $null)
+        {
+            # Success
+            Write-Output "$createNewUsername created successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "$createNewUsername was not created!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $createNewUsername on $createUserHostname already exists."
+    }
+}
+finally
+{
+    # Test to see if connection is open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+      Write-Host "Closing connection ..."
+      Close-SqlConnection -ConnectionName $connectionName
+    }
+}
+
+
diff --git a/step-templates/medianova-purge.json b/src/step-templates/medianova-purge/metadata.json
similarity index 91%
rename from step-templates/medianova-purge.json
rename to src/step-templates/medianova-purge/metadata.json
index 015607f0f..8a249f821 100644
--- a/step-templates/medianova-purge.json
+++ b/src/step-templates/medianova-purge/metadata.json
@@ -1,4 +1,3 @@
-
 {
   "Id": "dce70842-466e-4ae7-acd4-9aa18bfac065",
   "Name": "Medianova - Purge",
@@ -10,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$username = $OctopusParameters['username']\r\n$pass = $OctopusParameters['pass']\r\n$fileList = $OctopusParameters['fileList']\r\n\r\nTry \r\n{\r\n    foreach($file in $fileList.Split(\"`n\")){\r\n        \"https://purge.mncdn.com/?username=$username&pass=$pass&file=$file\"\r\n        $result = Invoke-WebRequest -UseBasicParsing -Uri \"https://purge.mncdn.com/?username=$username&pass=$pass&file=$file\"\r\n    }\r\n}\r\ncatch [Exception] {\r\n\t\"Error, couldn't finish purge operation. `r`n $_.Exception.ToString()\"\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -56,8 +55,8 @@
   "Logo": "iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAACXBIWXMAAA9hAAAPYQGoP6dpAAANRUlEQVRo3sVaCXNUVRb2twwJQkg6W2ffTBzCEgyoMOI4BkVAHHFcsGSknBELB4yOog7KFOPo6OAwqAVoUYpsCSFbZyH7vpOtk3SWTncnnd7OfOfd192v1yRNRlK3Ui8v79373XO/c8537rv3kevHZqMFC82baU60OTKZ+AJ3LFayW8lBcrPYaN5KZgvZ7ER28bb4j3Rl5+fxX2U/pnn5mps56LXyzhzNS/cXpLHkAeg+N2iL1VpVa796nX4W7Rq3y1dxx66pJtMcWWXc84PDs0Wl5us3aWiE+8V9Cbrcp91undANl5Ubim7ZrhY5u3J2KF9fD3ztvHNF/L6GThaqa9kQLtBuC5nmqnbtLVOn1cSl1sYkuVpZXPLltCwqq+QZOyRD9g9eyM27lpJVtuVhKiklg5FsVr4vgNvttLDQcubs2ZzcG0mZlfEpyt5qYxM8/vRpddHcXH9q4lKKEjNaXjnEViNf0LOG3see7F8Tow1TTayKklvYuqH7VW2R6q6CPTQ1w0YFJoPR8dGnFXHJdTEJpekPOM59RzOzMlsEaDw2a6DL12rW5zVHJ7r7DFvHzdW5v6bD719Fuv7E6C3r1PNHjrFpyJsedtJ7gnYOMBYWNRQeVR2bQt9eZChWia8j2rLtOxtVCZ3r4mCM2aOFNDHlxi1oDdu0dzU/vQ/vDqyJ0bmRqaTmB66rue7gRdibTn9OxrlgoMfCo8cxVydoXZgKL3esU5fmbaOBYTKbGTcA/fgzlh7P90v9Nux/gXoGnNR3QocTj47p3y7Ek5je8GoVTBDExh6IpXHReXl8Gl285EkPh5PeTnqMKrpw9Xjn/pg6VaKl8ATNGtmcQDZjuPPcHxqj1AMS7iZVQt2WR6iymh+wWtgK6BhPwvwzBrrwQ3FOLmimDeelG1cQwKfJ6yCm17M2DpwmTQ17FPlGj1lj++NPdUWwPXxBgzMAV5mSRU2tMg0QxWrrb6Zn4xUMADTAVJz1azr/Pen1tGCWAqL0gxmCkbcbGrfvbIhJ7FkTPRoeFdjkDBr/FQ9gfa6mZFPvIC+aP9CmuoI9jaokGFXJOVgFK8WwwlQgccdLr9LUNFksAsr4iZNwdiBGg9NgjAp1quHdD2hsnOYtso87pJUxmmh4tPv1P8MHetfGjYZ7U0WnCACua9CyeNNWGtOxpfyAxlRuVTY/sVsTl4ZHAV0b5u5X9ILFKklIA5uZYTbJ20bGazfki/UZk3wAVAGszudfpv4hXlMRxeVQaOEQ9NmXmsTM7jWx2mD2llubKuH20/toUs/v+gFtk/xmSm87+13Jpvz66IQBr/C3KgrIYMvGrTtofJIR4xWDib69gOgO44llgQnxItakYdsOqr7NxLA7XVPg1huppLzvwQ3Dq71B43UXMUSDq3S//gZ7BYbzA1oEbMG//jtzfymsSM7EO0Dj8npBEsQKw2dfkQGBAiCspJtq2vc8nnStjE6aHihenrWeLl3mQCnnYbuL3z05uX6ZzUOscrspJq898Td+xWIPDJqkfhHXMFJjU8vzL5YmpGH1AUj0hU471sbfyt5E7T28MhwfzFRbV5GYIRglBhsNiwTFOyKZ4pYPT5JuWnJNKVbebqjbmI8VcyH2sq6ywWHM584zzfxrDytk0DzjsErrbpfQ6KYQI5se2o6XMYyAhd/10UkTf/wTQjvjsHP+M751DFaRnFh2AOAAVe6sja2OS+o8eAjJn6b11NhSvTG/NUo9uNrDuoFA18QmUVEJr6d/0GZz/TvvUXE5c84sPWSTKIhUpNXNnPpHSdZ6AUvgrlCnU0UVqzDgxlR7B+AJ8GDvtQ5T9UsU78vfAfY3bNwKxFgEeKEL7viqCL/pHf+qik+l1nYlYk/Qprlbzzx7MSOn7Y2j1NVHs3NyPBZRAqxqaR979TCWG6MKHNW79/FSLMjhz3b2m6qYZADyMpuAjnliSiIvuiDKNvanSUTs1ySm08Sk7Mf+QJsGjhdeTWZdVpWxnk59hgwsk0mkQJgTXlxSXv273ZATAF2ekE5n/ksmo+xhkzMdT+xqi5TTk3LRBW7cD57JlUlNBP7mTfk8qEPpeh70sNCwtnHXHpZBEWqGvuMJgiAGcUW4BcvZk+ZpXEdf/LsiN+9mYsaNhx4mrVbWG9DWxbdKkzIQzgXiRcNwENDwh961MUMI0nojkRdolzYVcaCzG8miNZJxgwZIEyMvvALv4WBikZAJohvmaWBk8J33v8rd1PbJKVn94YHp2Ttvvo1pM1PDVctFLEK1S5QiaOrh7hAzDimsOaskBWiOeTYOSUWlZanZAI258gJFqYsyH5z6+BO4I6di4ch4fYE1E9U3XXrjTerqlpcCN3sGNA9sgJFGQwKtlGhIcPTRSU4I3qC9fiAqDEbrf87BxngNAyM2dUTEIqE0bnmULlyiKQOLChETRS1oXrBPTvGfIufBZU9/LlRraHBFxBRygM5+qxSlAUA7JOLOzOqPHENsRkIWvIQDIcVA2rYcOEh1LVJYNDuls9sGjBtjDAz2PvxYj5TYQ254HXkNTsKushhoCTey19hE3d7nnMmZG3AjpTdHJSC9zx1/n/WQSZLODrvHu7B0ZW13zuaQLS3qJtjoRnIWtXbSnMkB3voHLTS7zeltyI69fbWbtyG4Doe7xSoMDzQ10YnledsckM7TM2xaUBkJVVQ0TS3Vm6UMsjomZG4AdGdU/PWcDTQ6zkjI7g1aLl5sVmNrK+9R2KzyBICgTAMv7IpQKwsCoePg2ojW3bv2cl5Efga5WVc01eRtw2pwigmPvht6oH/NzgJJtFgC02PB8v3BV6m+gaOy8Couqo30zXl4FSSEEEOukASTCylXnJKlPXqc+gaoofn2Rg8b68JCDyCYeftLh2jawMsYELRxruqpPeU7HkeK4cnZnUpyxqA//h6M6sVRkWZhUZAP1G/LWN+dvQFZmnVFmCpoFbikFIM+h955n1ObNQjoWWPXzgLEh9bXDkvLvSDHb6z72HjH/gNIGQCkTBmunCeytLLS8coUy22TYSoIScOXX0slkj/QMqf1xp7HClpUiVyy//2fUsXhqqjN1Ndf/9CjIIPQFX4VmXfSXsLWTJDG2x0/XfEokBWgOcoybt5CKEB0RKtMyoQwcs8S0JELy6vK0h9EpvS1qH/r3h3omrhUut0op4LA9GDQIC7cCBat3JxPHd3uwh3VDtLpxUsadapv7RhcyIegPZAWNPHpNDQqr3Zw0ANSlEAChx907X6WN7t4n9cZxfXGhXc/xMINOJ1SbDCsIGhXydOQvdlXlAa0NLtUOPSKCqXO1Acfuythh+SUuqmOAy8jrvndr1iRJjaGAMZXlAYDLRgJcheD3D/8xMQQtTRvXOip6BaC6MoC9d6oiFBPvfgaZ4nlgZZFklrzwEZqapPrALhmTV1T7pa7FEOLilKQ03L8rzRrWiroUY9IrGqLSkR9RUNaTk6NrcjSojIVHuPi9Ao2cKMmNoW+OOMrSoOBVroUuoBGdRw8TCVV0E9CV4haOvh+c8gNWrJMnUY/XiGT2eNrTgDQT7pAu8KtCCbgQ29SFkKhl3aTzLySoDEuxrqemEG1TVyPBgVtV4JWhgWRorn0Wh3jpSsWy9KhTAaqA154JS2HCanY3l0EtHZpHF2CrggRNH912LqDtzvMFof0Q4vSQ7vSjrXcBkdv3H9A3gVf1BF7dj7pFT3uSUO863vzLRalFmsw0A5JmvYVPAMnGAn7v8SEpbf66ITpT09zRgtuaQZtMI4deKXDual1D0FzhL1wSd6RW4QeBqPpyLHGqHioDuRwrw9Fvp+OgtzXKaRPKKI0NgkymKss+6KgkX7+daY6LonLqnsHWt7e7e732t4NABrLoam5kZSBmi90etyd8BeitDo1m2WZb1Lxv2s6MX1z23akvXsFWkji9q2/CSRKPcot1yfK0Y9Ownm9vsT9Yk3SlTEjCNKSKPVIKwrDK0DzhqKFunrL03JEitH94llGbNIajxxVnjnwC9qZxsku9jyNhSd8zg2EuB+3XKqwooxJoFOnlWcOgmoPYe/5BRrW1v726UZVkpBHoZNk+aCxwpXxKfx13bQk0MrvthZq66rKe6Q51E3Eu9nevQlRiiCtOHPgPjvlCARaPIR3Glrqtj+OwhsRkE2+KvIXAM1nDlKzqOeOhygNDtqhtDdwj4wOvXWsKDlTbCyt1A5BENpAlN7YkMcf3hVnDnwD9n0BHFQcZbNwXVhSObj/hfL4tProJIhGGL5/DX+6xTSCbzWFABr91z61lyY9t3eDg/YmiU368AOTI9Q3tY19eLJiZwF/aIxL462ciDjl8Qqls46FrRtzHiVarijtPHSYz7gE0HdLAO1QftCQDoDBBi1ddO78/NuFQ/t+37blUU1yliYuBSESKgdNnEuTrhc5yua3XUnJ7D55SvoqYvUtWPwdcQsczN0H18QRScQjBH+IdLTpWRoYoqYWqtDwRx3XOcDLVxc7NOjn2ny9iPr62cwOezBLLwm0uOGvXJNZJM69zZsXO5K52PW8xX3YLPDP/wBTT3BVqNUZhQAAAABJRU5ErkJggg==",
   "LastModifiedBy": "olcay",
   "$Meta": {
-    "ExportedAt": "2017-01-12T12:04:56.746Z",
+    "ExportedAt": "2017-01-12T12:04:56.7460000Z",
     "OctopusVersion": "3.5.1",
     "Type": "ActionTemplate"
   }
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/medianova-purge/scriptbody.ps1 b/src/step-templates/medianova-purge/scriptbody.ps1
new file mode 100644
index 000000000..5fe0bf087
--- /dev/null
+++ b/src/step-templates/medianova-purge/scriptbody.ps1
@@ -0,0 +1,14 @@
+$username = $OctopusParameters['username']
+$pass = $OctopusParameters['pass']
+$fileList = $OctopusParameters['fileList']
+
+Try 
+{
+    foreach($file in $fileList.Split("`n")){
+        "https://purge.mncdn.com/?username=$username&pass=$pass&file=$file"
+        $result = Invoke-WebRequest -UseBasicParsing -Uri "https://purge.mncdn.com/?username=$username&pass=$pass&file=$file"
+    }
+}
+catch [Exception] {
+	"Error, couldn't finish purge operation. `r`n $_.Exception.ToString()"
+}
\ No newline at end of file
diff --git a/step-templates/microsoft-power-automate-post-adaptivecard.json b/src/step-templates/microsoft-power-automate-post-adaptivecard/metadata.json
similarity index 56%
rename from step-templates/microsoft-power-automate-post-adaptivecard.json
rename to src/step-templates/microsoft-power-automate-post-adaptivecard/metadata.json
index 3ef122975..a8c459869 100644
--- a/step-templates/microsoft-power-automate-post-adaptivecard.json
+++ b/src/step-templates/microsoft-power-automate-post-adaptivecard/metadata.json
@@ -8,7 +8,7 @@
   "Packages": [],
   "GitDependencies": [],
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n# Helper functions\nfunction Retry-Command {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Position=0, Mandatory=$true)]\n        [scriptblock]$ScriptBlock,\n \n        [Parameter(Position=1, Mandatory=$false)]\n        [int]$Maximum = 5,\n\n        [Parameter(Position=2, Mandatory=$false)]\n        [int]$Delay = 100\n    )\n\n    Begin {\n        $count = 0\n    }\n\n    Process {\n    \t$ex=$null\n        do {\n            $count++\n            \n            try {\n                Write-Verbose \"Attempt $count of $Maximum\"\n                $ScriptBlock.Invoke()\n                return\n            } catch {\n                $ex = $_\n                Write-Warning \"Error occurred executing command (on attempt $count of $Maximum): $($ex.Exception.Message)\"\n                Start-Sleep -Milliseconds $Delay\n            }\n        } while ($count -lt $Maximum)\n\n        throw \"Execution failed (after $count attempts): $($ex.Exception.Message)\"\n    }\n}\n# End Helper functions\n\n[int]$timeoutSec = $null\n[int]$maximum = 1\n[int]$delay = 100\n\nif(-not [int]::TryParse($OctopusParameters['PowerAutomatePostAdaptiveCard.Timeout'], [ref]$timeoutSec)) { $timeoutSec = 60 }\n\nif ($OctopusParameters[\"AutomatePostMessage.RetryPosting\"] -eq $True) {\n\tif(-not [int]::TryParse($OctopusParameters['PowerAutomatePostAdaptiveCard.RetryCount'], [ref]$maximum)) { $maximum = 1 }\n\tif(-not [int]::TryParse($OctopusParameters['PowerAutomatePostAdaptiveCard.RetryDelay'], [ref]$delay)) { $delay = 100 }\n\t\n    Write-Verbose \"Setting maximum retries to $maximum using a $delay ms delay\"\n}\n\n# Create the payload for Power Automate\n$payload = @{\n    type        = \"message\"  # Fixed value for message type\n    attachments = @(\n        @{\n            contentType = \"application/vnd.microsoft.card.adaptive\"\n            content = @{\n                type = \"AdaptiveCard\"\n                body = @(\n                    @{\n                        type = \"TextBlock\"\n                        text = $OctopusParameters['PowerAutomatePostAdaptiveCard.Title']\n                        weight = \"bolder\"\n                        size = \"medium\"\n                        color= $OctopusParameters['PowerAutomatePostAdaptiveCard.TitleColor']\n                    },\n                    @{\n                        type = \"TextBlock\"\n                        text = $OctopusParameters['PowerAutomatePostAdaptiveCard.Body']\n                        wrap = $true\n                        color= $OctopusParameters['PowerAutomatePostAdaptiveCard.BodyColor']\n                    }\n                )\n                actions = @(\n                    @{\n                        type  = \"Action.OpenUrl\"\n                        title = $OctopusParameters['PowerAutomatePostAdaptiveCard.ButtonTitle']\n                        url   = $OctopusParameters['PowerAutomatePostAdaptiveCard.ButtonUrl']\n                    }\n                )\n                \"`$schema\" = \"http://adaptivecards.io/schemas/adaptive-card.json\"\n                version = \"1.0\"\n            }\n        }\n    )\n}\n\nRetry-Command -Maximum $maximum -Delay $delay -ScriptBlock {\n    #Write-Output ($payload | ConvertTo-Json -Depth 6)\n  \n    # Prepare parameters for the POST request\n    $invokeParameters = @{\n        Method      = \"POST\"\n        Uri         = $OctopusParameters['PowerAutomatePostAdaptiveCard.HookUrl']\n        Body        = ($payload | ConvertTo-Json -Depth 6 -Compress)\n        ContentType = \"application/json; charset=utf-8\"\n        TimeoutSec  = $timeoutSec\n    }\n\n    # Check for UseBasicParsing (needed for some environments)\n    if ((Get-Command Invoke-RestMethod).Parameters.ContainsKey(\"PowerAutomatePostAdaptiveCard.UseBasicParsing\")) {\n        $invokeParameters.Add(\"UseBasicParsing\", $true)\n    }\n\n    # Send the request to the Power Automate webhook\n    $Response = Invoke-RestMethod @invokeParameters\n    Write-Verbose \"Response: $Response\"\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
@@ -128,7 +128,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2025-03-10T22:22:38.638Z",
+    "ExportedAt": "2025-03-10T22:22:38.6380000Z",
     "OctopusVersion": "2025.2.1265",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/microsoft-power-automate-post-adaptivecard/scriptbody.ps1 b/src/step-templates/microsoft-power-automate-post-adaptivecard/scriptbody.ps1
new file mode 100644
index 000000000..349993d7c
--- /dev/null
+++ b/src/step-templates/microsoft-power-automate-post-adaptivecard/scriptbody.ps1
@@ -0,0 +1,112 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+# Helper functions
+function Retry-Command {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Position=0, Mandatory=$true)]
+        [scriptblock]$ScriptBlock,
+ 
+        [Parameter(Position=1, Mandatory=$false)]
+        [int]$Maximum = 5,
+
+        [Parameter(Position=2, Mandatory=$false)]
+        [int]$Delay = 100
+    )
+
+    Begin {
+        $count = 0
+    }
+
+    Process {
+    	$ex=$null
+        do {
+            $count++
+            
+            try {
+                Write-Verbose "Attempt $count of $Maximum"
+                $ScriptBlock.Invoke()
+                return
+            } catch {
+                $ex = $_
+                Write-Warning "Error occurred executing command (on attempt $count of $Maximum): $($ex.Exception.Message)"
+                Start-Sleep -Milliseconds $Delay
+            }
+        } while ($count -lt $Maximum)
+
+        throw "Execution failed (after $count attempts): $($ex.Exception.Message)"
+    }
+}
+# End Helper functions
+
+[int]$timeoutSec = $null
+[int]$maximum = 1
+[int]$delay = 100
+
+if(-not [int]::TryParse($OctopusParameters['PowerAutomatePostAdaptiveCard.Timeout'], [ref]$timeoutSec)) { $timeoutSec = 60 }
+
+if ($OctopusParameters["AutomatePostMessage.RetryPosting"] -eq $True) {
+	if(-not [int]::TryParse($OctopusParameters['PowerAutomatePostAdaptiveCard.RetryCount'], [ref]$maximum)) { $maximum = 1 }
+	if(-not [int]::TryParse($OctopusParameters['PowerAutomatePostAdaptiveCard.RetryDelay'], [ref]$delay)) { $delay = 100 }
+	
+    Write-Verbose "Setting maximum retries to $maximum using a $delay ms delay"
+}
+
+# Create the payload for Power Automate
+$payload = @{
+    type        = "message"  # Fixed value for message type
+    attachments = @(
+        @{
+            contentType = "application/vnd.microsoft.card.adaptive"
+            content = @{
+                type = "AdaptiveCard"
+                body = @(
+                    @{
+                        type = "TextBlock"
+                        text = $OctopusParameters['PowerAutomatePostAdaptiveCard.Title']
+                        weight = "bolder"
+                        size = "medium"
+                        color= $OctopusParameters['PowerAutomatePostAdaptiveCard.TitleColor']
+                    },
+                    @{
+                        type = "TextBlock"
+                        text = $OctopusParameters['PowerAutomatePostAdaptiveCard.Body']
+                        wrap = $true
+                        color= $OctopusParameters['PowerAutomatePostAdaptiveCard.BodyColor']
+                    }
+                )
+                actions = @(
+                    @{
+                        type  = "Action.OpenUrl"
+                        title = $OctopusParameters['PowerAutomatePostAdaptiveCard.ButtonTitle']
+                        url   = $OctopusParameters['PowerAutomatePostAdaptiveCard.ButtonUrl']
+                    }
+                )
+                "`$schema" = "http://adaptivecards.io/schemas/adaptive-card.json"
+                version = "1.0"
+            }
+        }
+    )
+}
+
+Retry-Command -Maximum $maximum -Delay $delay -ScriptBlock {
+    #Write-Output ($payload | ConvertTo-Json -Depth 6)
+  
+    # Prepare parameters for the POST request
+    $invokeParameters = @{
+        Method      = "POST"
+        Uri         = $OctopusParameters['PowerAutomatePostAdaptiveCard.HookUrl']
+        Body        = ($payload | ConvertTo-Json -Depth 6 -Compress)
+        ContentType = "application/json; charset=utf-8"
+        TimeoutSec  = $timeoutSec
+    }
+
+    # Check for UseBasicParsing (needed for some environments)
+    if ((Get-Command Invoke-RestMethod).Parameters.ContainsKey("PowerAutomatePostAdaptiveCard.UseBasicParsing")) {
+        $invokeParameters.Add("UseBasicParsing", $true)
+    }
+
+    # Send the request to the Power Automate webhook
+    $Response = Invoke-RestMethod @invokeParameters
+    Write-Verbose "Response: $Response"
+}
diff --git a/step-templates/microsoft-teams-post-a-message.json b/src/step-templates/microsoft-teams-post-a-message/metadata.json
similarity index 58%
rename from step-templates/microsoft-teams-post-a-message.json
rename to src/step-templates/microsoft-teams-post-a-message/metadata.json
index 5831238c2..282a82c6f 100644
--- a/step-templates/microsoft-teams-post-a-message.json
+++ b/src/step-templates/microsoft-teams-post-a-message/metadata.json
@@ -7,7 +7,7 @@
   "CommunityActionTemplateId": null,
   "Packages": [],
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n# Helper functions\nfunction Retry-Command {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Position=0, Mandatory=$true)]\n        [scriptblock]$ScriptBlock,\n \n        [Parameter(Position=1, Mandatory=$false)]\n        [int]$Maximum = 5,\n\n        [Parameter(Position=2, Mandatory=$false)]\n        [int]$Delay = 100\n    )\n\n    Begin {\n        $count = 0\n    }\n\n    Process {\n    \t$ex=$null\n        do {\n            $count++\n            \n            try {\n                Write-Verbose \"Attempt $count of $Maximum\"\n                $ScriptBlock.Invoke()\n                return\n            } catch {\n                $ex = $_\n                Write-Warning \"Error occurred executing command (on attempt $count of $Maximum): $($ex.Exception.Message)\"\n                Start-Sleep -Milliseconds $Delay\n            }\n        } while ($count -lt $Maximum)\n\n        # Throw an error after $Maximum unsuccessful invocations. Doesn't need\n        # a condition, since the function returns upon successful invocation.\n        throw \"Execution failed (after $count attempts): $($ex.Exception.Message)\"\n    }\n}\n# End Helper functions\n[int]$timeoutSec = $null\n[int]$maximum = 1\n[int]$delay = 100\n\nif(-not [int]::TryParse($OctopusParameters['Timeout'], [ref]$timeoutSec)) { $timeoutSec = 60 }\n\n\nIf ($OctopusParameters[\"TeamsPostMessage.RetryPosting\"] -eq $True) {\n\tif(-not [int]::TryParse($OctopusParameters['RetryCount'], [ref]$maximum)) { $maximum = 1 }\n\tif(-not [int]::TryParse($OctopusParameters['RetryDelay'], [ref]$delay)) { $delay = 100 }\n\t\n    Write-Verbose \"Setting maximum retries to $maximum using a $delay ms delay\"\n}\n\n$payload = @{\n    title = $OctopusParameters['Title']\n    text = $OctopusParameters['Body'];\n    themeColor = $OctopusParameters['Color'];\n}\n\nRetry-Command -Maximum $maximum -Delay $delay -ScriptBlock {\n\t# Declare variable for parameters\n    $invokeParameters = @{}\n    $invokeParameters.Add(\"Method\", \"POST\")\n    $invokeParameters.Add(\"Uri\", $OctopusParameters['HookUrl'])\n    $invokeParameters.Add(\"Body\", ($payload | ConvertTo-Json -Depth 4))\n    $invokeParameters.Add(\"ContentType\", \"application/json; charset=utf-8\")\n    $invokeParameters.Add(\"TimeoutSec\", $timeoutSec)\n    \n    # Check for UseBasicParsing\n    if ((Get-Command Invoke-RestMethod).Parameters.ContainsKey(\"UseBasicParsing\"))\n    {\n    \t# Add the basic parsing argument\n        $invokeParameters.Add(\"UseBasicParsing\", $true)\n    }\n\n\t$Response = Invoke-RestMethod @invokeParameters\n    Write-Verbose \"Response: $Response\"\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
@@ -95,7 +95,7 @@
   ],
   "LastModifiedBy": "twerthi",
   "$Meta": {
-    "ExportedAt": "2023-08-31T20:39:39.222Z",
+    "ExportedAt": "2023-08-31T20:39:39.2220000Z",
     "OctopusVersion": "2023.2.13239",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/microsoft-teams-post-a-message/scriptbody.ps1 b/src/step-templates/microsoft-teams-post-a-message/scriptbody.ps1
new file mode 100644
index 000000000..c275c09f0
--- /dev/null
+++ b/src/step-templates/microsoft-teams-post-a-message/scriptbody.ps1
@@ -0,0 +1,80 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+# Helper functions
+function Retry-Command {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Position=0, Mandatory=$true)]
+        [scriptblock]$ScriptBlock,
+ 
+        [Parameter(Position=1, Mandatory=$false)]
+        [int]$Maximum = 5,
+
+        [Parameter(Position=2, Mandatory=$false)]
+        [int]$Delay = 100
+    )
+
+    Begin {
+        $count = 0
+    }
+
+    Process {
+    	$ex=$null
+        do {
+            $count++
+            
+            try {
+                Write-Verbose "Attempt $count of $Maximum"
+                $ScriptBlock.Invoke()
+                return
+            } catch {
+                $ex = $_
+                Write-Warning "Error occurred executing command (on attempt $count of $Maximum): $($ex.Exception.Message)"
+                Start-Sleep -Milliseconds $Delay
+            }
+        } while ($count -lt $Maximum)
+
+        # Throw an error after $Maximum unsuccessful invocations. Doesn't need
+        # a condition, since the function returns upon successful invocation.
+        throw "Execution failed (after $count attempts): $($ex.Exception.Message)"
+    }
+}
+# End Helper functions
+[int]$timeoutSec = $null
+[int]$maximum = 1
+[int]$delay = 100
+
+if(-not [int]::TryParse($OctopusParameters['Timeout'], [ref]$timeoutSec)) { $timeoutSec = 60 }
+
+
+If ($OctopusParameters["TeamsPostMessage.RetryPosting"] -eq $True) {
+	if(-not [int]::TryParse($OctopusParameters['RetryCount'], [ref]$maximum)) { $maximum = 1 }
+	if(-not [int]::TryParse($OctopusParameters['RetryDelay'], [ref]$delay)) { $delay = 100 }
+	
+    Write-Verbose "Setting maximum retries to $maximum using a $delay ms delay"
+}
+
+$payload = @{
+    title = $OctopusParameters['Title']
+    text = $OctopusParameters['Body'];
+    themeColor = $OctopusParameters['Color'];
+}
+
+Retry-Command -Maximum $maximum -Delay $delay -ScriptBlock {
+	# Declare variable for parameters
+    $invokeParameters = @{}
+    $invokeParameters.Add("Method", "POST")
+    $invokeParameters.Add("Uri", $OctopusParameters['HookUrl'])
+    $invokeParameters.Add("Body", ($payload | ConvertTo-Json -Depth 4))
+    $invokeParameters.Add("ContentType", "application/json; charset=utf-8")
+    $invokeParameters.Add("TimeoutSec", $timeoutSec)
+    
+    # Check for UseBasicParsing
+    if ((Get-Command Invoke-RestMethod).Parameters.ContainsKey("UseBasicParsing"))
+    {
+    	# Add the basic parsing argument
+        $invokeParameters.Add("UseBasicParsing", $true)
+    }
+
+	$Response = Invoke-RestMethod @invokeParameters
+    Write-Verbose "Response: $Response"
+}
\ No newline at end of file
diff --git a/src/step-templates/mongodb-add-update-user-roles/metadata.json b/src/step-templates/mongodb-add-update-user-roles/metadata.json
new file mode 100644
index 000000000..346f250a6
--- /dev/null
+++ b/src/step-templates/mongodb-add-update-user-roles/metadata.json
@@ -0,0 +1,93 @@
+{
+  "Id": "d93bcfdc-d3f8-4c83-9fd7-d35c9a8d1f2b",
+  "Name": "MongoDB - Add or update user roles ",
+  "Description": "Adds roles to an existing user in a MongoDB database.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d6343cb6-40d3-47a8-898f-ff3aeb6f9c1a",
+      "Name": "MongoDBServerName",
+      "Label": "Server Name",
+      "HelpText": "Name or IP address of the MongoDB server instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "75eae92c-0081-481b-b79a-73524a798349",
+      "Name": "MongoDBPort",
+      "Label": "Port",
+      "HelpText": "Port number the MongoDB instance is listening on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dbb4ef7a-ab79-4036-ac7b-466d683341f5",
+      "Name": "MongoDBDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to use.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0f0612d3-e039-4940-bcb7-a3333266ae95",
+      "Name": "MongoDBAdminUsername",
+      "Label": "Admin Username",
+      "HelpText": "User account with rights to query the users in the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fbdb0e70-33d5-41a6-b316-66f1be7e5a18",
+      "Name": "MogoDBAdminUserpassword",
+      "Label": "Admin Password",
+      "HelpText": "Password for the admin account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c151f9f5-36f3-47ab-80b7-7dcb18bb7ff8",
+      "Name": "MongoDBUsername",
+      "Label": "Username",
+      "HelpText": "Username to add roles to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c705b32d-c416-40fc-869d-88fc307fe94f",
+      "Name": "MongoDBRoles",
+      "Label": "Roles",
+      "HelpText": "A comma-delimited list of roles to add the user account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2024-10-28T21:13:02.2260000Z",
+    "OctopusVersion": "2024.3.12899",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "mongodb"
+}
diff --git a/src/step-templates/mongodb-add-update-user-roles/scriptbody.ps1 b/src/step-templates/mongodb-add-update-user-roles/scriptbody.ps1
new file mode 100644
index 000000000..fe24aaa5d
--- /dev/null
+++ b/src/step-templates/mongodb-add-update-user-roles/scriptbody.ps1
@@ -0,0 +1,174 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    $moduleParameters = @{
+      Name = $PowerShellModuleName
+      Path = $LocalModulesPath
+      Force = $true
+    }
+
+    # Check the version of PowerShell
+    if ($PSVersionTable.PSVersion.Major -lt 7)
+    {
+      # Add specific version of powershell module to use
+      $moduleParameters.Add("MaximumVersion", "6.7.4")
+    }
+
+	# Save the module in the temporary location
+    Save-Module @moduleParameters
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseUserExists
+{
+	# Define parameters
+    param ($UserName)
+    
+    # Define working variables
+    $userExists = $false
+    
+	# Get users for database
+    $command = @"
+{ usersInfo: 1 }
+"@
+
+	$results = Invoke-MdbcCommand -Command $command
+    $users = $results["users"]
+    
+    # Loop through returned results
+    foreach ($user in $users)
+    {
+    	if ($user["user"] -eq $UserName)
+        {
+        	return $true
+        }
+    }
+    
+    return $false
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "Mdbc"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Connect to mongodb instance
+$connectionUrl = "mongodb://$($MongoDBAdminUsername):$($MogoDBAdminUserpassword)@$($MongoDBServerName):$($MongoDBPort)"
+
+# Connect to MongoDB server
+Connect-Mdbc $connectionUrl $MongoDBDatabaseName
+
+# Get whether the database exits
+if ((Get-DatabaseUserExists -UserName $MongoDBUsername) -eq $true)
+{
+	# Create user
+    Write-Output "Adding $MongoDBRoles to $MongoDBUsername."
+    
+    # Create Roles array for adding
+    $roles = @()
+    foreach ($MongoDBRole in $MongoDBRoles.Split(","))
+    {
+    	$roles += @{
+        	role = $MongoDBRole.Trim()
+            db = $MongoDBDatabaseName
+        }
+    }
+
+    # Define create user command
+    $command = @"
+{
+	updateUser: `"$MongoDBUsername`"    
+    roles: $(ConvertTo-Json $roles)
+}
+"@
+
+	# Create user account
+    $result = Invoke-MdbcCommand -Command $command
+    
+    # Check to make sure it was created successfully
+    if ($result.ContainsKey("ok"))
+    {
+    	Write-Output "Successfully added role(s) $MongoDBRoles to $MongoDBUsername in database $MongoDBDatabaseName."
+    }
+    else
+    {
+    	Write-Error "Failed, $result"
+    }
+}
+else
+{
+	Write-Error "Unable to add role(s) to $MongoDBUsername, user does not exist in $MongoDBDatabaseName."
+}
+
+
+
+
+
+
diff --git a/step-templates/mongodb-atlas-create-snapshot.json b/src/step-templates/mongodb-atlas-create-snapshot/metadata.json
similarity index 51%
rename from step-templates/mongodb-atlas-create-snapshot.json
rename to src/step-templates/mongodb-atlas-create-snapshot/metadata.json
index a9b9f5cf4..7a8fd1a2a 100644
--- a/step-templates/mongodb-atlas-create-snapshot.json
+++ b/src/step-templates/mongodb-atlas-create-snapshot/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$project_source = $OctopusParameters[\"matlas-project-id\"]\n$cluster_source = $OctopusParameters[\"matlas-cluster-name\"]\n$retention_in_days = $OctopusParameters[\"matlas-retention-in-days\"]\n$snapshot_description = $OctopusParameters[\"matlas-snapshot-description\"]\n$check_delay_seconds = $OctopusParameters[\"matlas-check-delay-seconds\"]\n\n$login = $OctopusParameters[\"matlas-public-key\"]\n$secret = $OctopusParameters[\"matlas-private-key\"]\n\n$snapshot_description_json = $snapshot_description | ConvertTo-Json\n$check_delay_seconds_nb = ($check_delay_seconds -as [int])\n$retention_in_days_nb = ($retention_in_days -as [int])\n\nfunction Check-Required($name, $value) {\n\tif($value -eq $null -or $value -eq ''){\n    \tWrite-Error -Message \"Missing parameter or invalid value for '$name'. ($value)\" -ErrorAction Stop\n    }\n}\n\nCheck-Required 'matlas-public-key' $login\nCheck-Required 'matlas-private-key' $secret\nCheck-Required 'matlas-project-id' $project_source\nCheck-Required 'matlas-cluster-name' $cluster_source\nCheck-Required 'matlas-check-delay-seconds' $check_delay_seconds_nb\nCheck-Required 'matlas-retention-in-days' $retention_in_days_nb\n\nWrite-Host \"Creating snapshot of $($project_source)/$($cluster_source) using $login.\"\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction Invoke-Api($uri, $method, $content) {\t\n\n\t$securedPassword = ConvertTo-SecureString -String $secret -AsPlainText -Force\t\n\t$credentials = New-Object System.Management.Automation.PSCredential ($login, $securedPassword)\n\n\ttry {\n\t\treturn Invoke-RestMethod -Uri $uri -Method $method -Credential $credentials -ContentType \"application/json\" -Body $content\n\t}\n\tcatch {\n\t\tWrite-Error -Message $_ -ErrorAction Stop\n\t}\n}\n\n$root = \"https://cloud.mongodb.com/api/atlas/v1.0\"\n\n$uri = New-Object System.Uri(\"$root/groups/$project_source/clusters/$cluster_source/backup/snapshots\")\n$request = \"{`\"description`\": $snapshot_description_json, `\"retentionInDays`\": $retention_in_days_nb}\"\n$snapshot = Invoke-Api $uri \"POST\" $request\n\n$uri = New-Object System.Uri(\"$root/groups/$project_source/clusters/$cluster_source/backup/snapshots/$($snapshot.id)\")\nwhile ($snapshot.status -eq \"queued\" -or $snapshot.status -eq \"inProgress\") {\n\n\tWrite-Host \"Waiting for snapshot to complete.\"\t\n\tStart-Sleep -s $check_delay_seconds_nb\n\t$snapshot = Invoke-Api $uri \"GET\"\n}\n\nWrite-Host \"Snapshot $($snapshot.status). Id : '$($snapshot.id)'.\"\n\nSet-OctopusVariable -name \"matlas-snapshot-id\" -value $snapshot.id\nSet-OctopusVariable -name \"matlas-snapshot-status\" -value $snapshot.status\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -85,7 +85,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2022-10-03T10:50:33.391Z",
+    "ExportedAt": "2022-10-03T10:50:33.3910000Z",
     "OctopusVersion": "2020.6.5394",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/mongodb-atlas-create-snapshot/scriptbody.ps1 b/src/step-templates/mongodb-atlas-create-snapshot/scriptbody.ps1
new file mode 100644
index 000000000..8c5b19cbf
--- /dev/null
+++ b/src/step-templates/mongodb-atlas-create-snapshot/scriptbody.ps1
@@ -0,0 +1,61 @@
+$project_source = $OctopusParameters["matlas-project-id"]
+$cluster_source = $OctopusParameters["matlas-cluster-name"]
+$retention_in_days = $OctopusParameters["matlas-retention-in-days"]
+$snapshot_description = $OctopusParameters["matlas-snapshot-description"]
+$check_delay_seconds = $OctopusParameters["matlas-check-delay-seconds"]
+
+$login = $OctopusParameters["matlas-public-key"]
+$secret = $OctopusParameters["matlas-private-key"]
+
+$snapshot_description_json = $snapshot_description | ConvertTo-Json
+$check_delay_seconds_nb = ($check_delay_seconds -as [int])
+$retention_in_days_nb = ($retention_in_days -as [int])
+
+function Check-Required($name, $value) {
+	if($value -eq $null -or $value -eq ''){
+    	Write-Error -Message "Missing parameter or invalid value for '$name'. ($value)" -ErrorAction Stop
+    }
+}
+
+Check-Required 'matlas-public-key' $login
+Check-Required 'matlas-private-key' $secret
+Check-Required 'matlas-project-id' $project_source
+Check-Required 'matlas-cluster-name' $cluster_source
+Check-Required 'matlas-check-delay-seconds' $check_delay_seconds_nb
+Check-Required 'matlas-retention-in-days' $retention_in_days_nb
+
+Write-Host "Creating snapshot of $($project_source)/$($cluster_source) using $login."
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function Invoke-Api($uri, $method, $content) {	
+
+	$securedPassword = ConvertTo-SecureString -String $secret -AsPlainText -Force	
+	$credentials = New-Object System.Management.Automation.PSCredential ($login, $securedPassword)
+
+	try {
+		return Invoke-RestMethod -Uri $uri -Method $method -Credential $credentials -ContentType "application/json" -Body $content
+	}
+	catch {
+		Write-Error -Message $_ -ErrorAction Stop
+	}
+}
+
+$root = "https://cloud.mongodb.com/api/atlas/v1.0"
+
+$uri = New-Object System.Uri("$root/groups/$project_source/clusters/$cluster_source/backup/snapshots")
+$request = "{`"description`": $snapshot_description_json, `"retentionInDays`": $retention_in_days_nb}"
+$snapshot = Invoke-Api $uri "POST" $request
+
+$uri = New-Object System.Uri("$root/groups/$project_source/clusters/$cluster_source/backup/snapshots/$($snapshot.id)")
+while ($snapshot.status -eq "queued" -or $snapshot.status -eq "inProgress") {
+
+	Write-Host "Waiting for snapshot to complete."	
+	Start-Sleep -s $check_delay_seconds_nb
+	$snapshot = Invoke-Api $uri "GET"
+}
+
+Write-Host "Snapshot $($snapshot.status). Id : '$($snapshot.id)'."
+
+Set-OctopusVariable -name "matlas-snapshot-id" -value $snapshot.id
+Set-OctopusVariable -name "matlas-snapshot-status" -value $snapshot.status
diff --git a/src/step-templates/mongodb-atlas-pause-resume-cluster/metadata.json b/src/step-templates/mongodb-atlas-pause-resume-cluster/metadata.json
new file mode 100644
index 000000000..5b4b0e0ea
--- /dev/null
+++ b/src/step-templates/mongodb-atlas-pause-resume-cluster/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "2339fa87-ba06-4014-b918-ec1bdc4690e4",
+  "Name": "MongoDB Atlas - Pause or Resume cluster",
+  "Description": "Allow the user to pause/resume the asked cluster.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "claude-uceda",
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "7b92df2e-5469-4e97-a379-ccfe6eb942d9",
+      "Name": "matlas-public-key",
+      "Label": "Public key",
+      "HelpText": "Mongo atlas public key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "51ced2a8-b158-4c0e-9244-081d429a1814",
+      "Name": "matlas-private-key",
+      "Label": "Private key",
+      "HelpText": "Mongo atlas private key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "3f62699d-32c3-4eb0-8925-f6ad2e288de9",
+      "Name": "matlas-project-id",
+      "Label": "Project id",
+      "HelpText": "Project/group id of the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "215ed2bf-a5fd-4860-9006-c2525f96815e",
+      "Name": "matlas-cluster-name",
+      "Label": "Cluster name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f1eb059b-d8e7-46c8-a084-77b0d3a872a4",
+      "Name": "matlas-pause",
+      "Label": "Action",
+      "HelpText": "If the cluster needs to be paused or resumed.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "True|Pause\nFalse|Resume"
+      }
+    },
+    {
+      "Id": "e1975200-57aa-4159-a1cc-bb1d5fbfca2e",
+      "Name": "matlas-check-delay-seconds",
+      "Label": "Status check delay",
+      "HelpText": "Delay in seconds between each statuses check.",
+      "DefaultValue": "15",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2022-10-03T10:51:25.5830000Z",
+    "OctopusVersion": "2020.6.5394",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "claude-uceda",
+  "Category": "mongodb"
+}
diff --git a/src/step-templates/mongodb-atlas-pause-resume-cluster/scriptbody.ps1 b/src/step-templates/mongodb-atlas-pause-resume-cluster/scriptbody.ps1
new file mode 100644
index 000000000..d5487f428
--- /dev/null
+++ b/src/step-templates/mongodb-atlas-pause-resume-cluster/scriptbody.ps1
@@ -0,0 +1,67 @@
+$cluster = $OctopusParameters["matlas-cluster-name"]
+$project = $OctopusParameters["matlas-project-id"]
+$check_delay_seconds = $OctopusParameters["matlas-check-delay-seconds"]
+
+$login = $OctopusParameters["matlas-public-key"]
+$secret = $OctopusParameters["matlas-private-key"]
+
+$pause = [System.Convert]::ToBoolean($OctopusParameters["matlas-pause"])
+$check_delay_seconds_nb = ($check_delay_seconds -as [int])
+
+function Check-Required($name, $value) {
+	if($value -eq $null -or $value -eq ''){
+    	Write-Error -Message "Missing parameter or invalid value for '$name'. ($value)" -ErrorAction Stop
+    }
+}
+
+Check-Required 'matlas-public-key' $login
+Check-Required 'matlas-private-key' $secret
+Check-Required 'matlas-project-id' $project
+Check-Required 'matlas-cluster-name' $cluster
+Check-Required 'matlas-check-delay-seconds' $check_delay_seconds_nb
+
+$action = "Pausing"
+if($pause -eq $false){
+	$action = "Resuming"
+}
+
+Write-Host "$action $($project)/$($cluster) using $login."
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function Invoke-Api($uri, $method, $content) {
+
+	$securedPassword = ConvertTo-SecureString -String $secret -AsPlainText -Force	
+	$credentials = New-Object System.Management.Automation.PSCredential ($login, $securedPassword)
+
+	try {
+		return Invoke-RestMethod -Uri $uri -Method $method -Credential $credentials -ContentType "application/json" -Body $content
+	}
+	catch {
+		Write-Error -Message $_ -ErrorAction Stop
+	}
+}
+
+
+$root = "https://cloud.mongodb.com/api/atlas/v1.0"
+$uri = New-Object System.Uri("$root/groups/$project/clusters/$cluster")
+$data = Invoke-Api $uri "GET"
+
+if ($data.paused -ne $pause) {	
+	$value = $pause.ToString().ToLower()
+	$data = Invoke-Api $uri "PATCH" "{`"paused`": $value}"	
+	
+	while ($data.stateName -eq "REPAIRING" -or $data.stateName -eq "UPDATING") {
+
+		Write-Host "Waiting for change to be applied. Cluster status : $($data.stateName)."		
+		Start-Sleep -s $check_delay_seconds_nb	
+		$data = Invoke-Api $uri "GET"
+	}	
+
+	Write-Host "Change applied. $Cluster status : $($data.stateName)."
+}
+else {
+	
+	$action = If ($pause) { "paused" } Else { "running" }
+	Write-Host "Cluster already $action, no change applied. $Cluster status : $($data.stateName)."
+}
diff --git a/src/step-templates/mongodb-atlas-restore-snapshot/metadata.json b/src/step-templates/mongodb-atlas-restore-snapshot/metadata.json
new file mode 100644
index 000000000..8162faffa
--- /dev/null
+++ b/src/step-templates/mongodb-atlas-restore-snapshot/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "bf062dfe-de07-462c-8e7d-ec062b29e550",
+  "Name": "MongoDB Atlas - Restore cluster from latest snapshot",
+  "Description": "Allow the user to restore a cluster from the latest snapshot.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "claude-uceda",
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "0cfd5665-9bfc-413a-bc4a-7778a860b7f0",
+      "Name": "matlas-public-key",
+      "Label": "Public key",
+      "HelpText": "Mongo atlas public key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "61cff00c-69b5-44b5-873d-742430ca2beb",
+      "Name": "matlas-private-key",
+      "Label": "Private key",
+      "HelpText": "Mongo atlas private key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "3d86c70a-2a6c-4cb7-a04e-f7f43838554c",
+      "Name": "matlas-project-source",
+      "Label": "Project source's id",
+      "HelpText": "Project id of the cluster that will be the snapshot source.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2a32df2e-641d-41a0-9e56-dba341efe58d",
+      "Name": "matlas-cluster-source",
+      "Label": "Cluster source's name",
+      "HelpText": "Cluster that will be used to get the snapshot.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bff9846a-980e-4a8f-b6bb-b43de82397c1",
+      "Name": "matlas-project-target",
+      "Label": "Project target's id",
+      "HelpText": "Project id of the cluster that will used to restore the snapshot.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e2aaa07d-9122-47ee-b3e9-008949ed5709",
+      "Name": "matlas-cluster-target",
+      "Label": "Cluster target's name",
+      "HelpText": "Cluster that will be used to restore the snapshot.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ac4c10c6-e487-4cec-902d-7cfaab7a3934",
+      "Name": "matlas-check-delay-seconds",
+      "Label": "Status check delay",
+      "HelpText": "Delay in seconds between each statuses check.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2022-10-03T10:52:04.4230000Z",
+    "OctopusVersion": "2020.6.5394",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "claude-uceda",
+  "Category": "mongodb"
+}
diff --git a/src/step-templates/mongodb-atlas-restore-snapshot/scriptbody.ps1 b/src/step-templates/mongodb-atlas-restore-snapshot/scriptbody.ps1
new file mode 100644
index 000000000..2a2c37c5c
--- /dev/null
+++ b/src/step-templates/mongodb-atlas-restore-snapshot/scriptbody.ps1
@@ -0,0 +1,61 @@
+$project_source = $OctopusParameters["matlas-project-source"]
+$cluster_source = $OctopusParameters["matlas-cluster-source"]
+$project_target = $OctopusParameters["matlas-project-target"]
+$cluster_target = $OctopusParameters["matlas-cluster-target"]
+$check_delay_seconds = $OctopusParameters["matlas-check-delay-seconds"]
+
+$login = $OctopusParameters["matlas-public-key"]
+$secret = $OctopusParameters["matlas-private-key"]
+
+$check_delay_seconds_nb = ($check_delay_seconds -as [int])
+
+function Check-Required($name, $value) {
+	if($value -eq $null -or $value -eq ''){
+    	Write-Error -Message "Missing parameter or invalid value for '$name'. ($value)" -ErrorAction Stop
+    }
+}
+
+Check-Required 'matlas-public-key' $login
+Check-Required 'matlas-private-key' $secret
+Check-Required 'matlas-project-source' $project_source
+Check-Required 'matlas-cluster-source' $cluster_source
+Check-Required 'matlas-project-target' $project_target
+Check-Required 'matlas-cluster-target' $cluster_target
+Check-Required 'matlas-check-delay-seconds' $check_delay_seconds_nb
+
+Write-Host "Restoring from $($project_source)/$($cluster_source) to $($project_target)/$($cluster_target) using $login."
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function Invoke-Api($uri, $method, $content) {	
+
+	$securedPassword = ConvertTo-SecureString -String $secret -AsPlainText -Force	
+	$credentials = New-Object System.Management.Automation.PSCredential ($login, $securedPassword)
+
+	try {
+		return Invoke-RestMethod -Uri $uri -Method $method -Credential $credentials -ContentType "application/json" -Body $content
+	}
+	catch {
+		Write-Error -Message $_ -ErrorAction Stop
+	}
+}
+
+$root = "https://cloud.mongodb.com/api/atlas/v1.0"
+$uri = New-Object System.Uri("$root/groups/$project_source/clusters/$cluster_source/backup/snapshots?itemsPerPage=5")
+$results = Invoke-Api $uri "GET"
+$snapshots = $results.results | Where-Object { $_.status -eq "completed" }
+$snapshot = $snapshots[0]
+
+$uri = New-Object System.Uri("$root/groups/$project_source/clusters/$cluster_source/backup/restoreJobs")
+$request = "{`"deliveryType`":`"automated`", `"snapshotId`":`"$($snapshot.id)`", `"targetClusterName`":`"$cluster_target`", `"targetGroupId`":`"$project_target`"}"
+$job = Invoke-Api $uri "POST" $request
+
+$uri = New-Object System.Uri("$root/groups/$project_source/clusters/$cluster_source/backup/restoreJobs/$($job.id)")
+while ($null -eq $job.finishedAt -or $job.finishedAt -eq "") {
+
+	Write-Host "Waiting for restore to complete."	
+	Start-Sleep -s $check_delay_seconds_nb
+	$job = Invoke-Api $uri "GET"
+}
+
+Write-Host "Restore completed."
diff --git a/src/step-templates/mongodb-create-database/metadata.json b/src/step-templates/mongodb-create-database/metadata.json
new file mode 100644
index 000000000..6ecab62e9
--- /dev/null
+++ b/src/step-templates/mongodb-create-database/metadata.json
@@ -0,0 +1,84 @@
+{
+  "Id": "4de90708-1f76-4103-ab27-e9fd1916fa07",
+  "Name": "MongoDB - Create Database if not exists",
+  "Description": "Creates a new database on a MongoDB server with an initial collection.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d6343cb6-40d3-47a8-898f-ff3aeb6f9c1a",
+      "Name": "MongoDBServerName",
+      "Label": "Server Name",
+      "HelpText": "Name or IP address of the MongoDB server instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "75eae92c-0081-481b-b79a-73524a798349",
+      "Name": "MongoDBPort",
+      "Label": "Port",
+      "HelpText": "Port number the MongoDB instance is listening on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dbb4ef7a-ab79-4036-ac7b-466d683341f5",
+      "Name": "MongoDBDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8fabfc02-2f33-4663-9af3-b8c2f74e0175",
+      "Name": "MongoDBInitialCollection",
+      "Label": "Initial Collection",
+      "HelpText": "Name of the Initial Collection in the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0f0612d3-e039-4940-bcb7-a3333266ae95",
+      "Name": "MongoDBUsername",
+      "Label": "Username",
+      "HelpText": "Username to connect with.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fbdb0e70-33d5-41a6-b316-66f1be7e5a18",
+      "Name": "MogoDBUserpassword",
+      "Label": "Password",
+      "HelpText": "Password for the user to connect with.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2024-10-28T21:07:02.2490000Z",
+    "OctopusVersion": "2024.3.12899",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "twerthi",
+  "Category": "mongodb"
+}
diff --git a/src/step-templates/mongodb-create-database/scriptbody.ps1 b/src/step-templates/mongodb-create-database/scriptbody.ps1
new file mode 100644
index 000000000..3ed895477
--- /dev/null
+++ b/src/step-templates/mongodb-create-database/scriptbody.ps1
@@ -0,0 +1,141 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    $moduleParameters = @{
+      Name = $PowerShellModuleName
+      Path = $LocalModulesPath
+      Force = $true
+    }
+
+    # Check the version of PowerShell
+    if ($PSVersionTable.PSVersion.Major -lt 7)
+    {
+      # Add specific version of powershell module to use
+      $moduleParameters.Add("MaximumVersion", "6.7.4")
+    }
+
+	# Save the module in the temporary location
+    Save-Module @moduleParameters
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseExists
+{
+	# Define parameters
+    param ($DatabaseName)
+    
+	# Execute query
+    $mongodbDatabases = Get-MdbcDatabase
+    
+    return $mongodbDatabases.DatabaseNamespace -contains $DatabaseName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "Mdbc"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Connect to mongodb instance
+$connectionUrl = "mongodb://$($MongoDBUsername):$($MogoDBUserpassword)@$($MongoDBServerName):$($MongoDBPort)"
+
+# Connect to MongoDB server
+Connect-Mdbc $connectionUrl "admin"
+
+# Get whether the database exits
+if ((Get-DatabaseExists -DatabaseName $MongoDBDatabaseName) -ne $true)
+{
+	# Create database
+    Write-Output "Database $MongoDBDatabaseName doesn't exist."
+    Connect-Mdbc $connectionUrl "$MongoDBDatabaseName"
+    
+    # Databases don't get created unless some data has been added
+    Add-MdbcCollection $MongoDBInitialCollection
+    
+    # Check to make sure it was successful
+    if ((Get-DatabaseExists -DatabaseName $MongoDBDatabaseName))
+    {
+    	# Display success
+        Write-Output "$MongoDBDatabaseName created successfully."        
+    }
+    else
+    {
+    	Write-Error "Failed to create $MongoDBDatabaseName!"
+    }
+}
+else
+{
+	Write-Output "Database $MongoDBDatabaseName already exists."
+}
+
+
+
+
+
+
diff --git a/src/step-templates/mongodb-create-user/metadata.json b/src/step-templates/mongodb-create-user/metadata.json
new file mode 100644
index 000000000..93a7035a6
--- /dev/null
+++ b/src/step-templates/mongodb-create-user/metadata.json
@@ -0,0 +1,93 @@
+{
+  "Id": "d7504483-0d48-49b5-b75c-b65dde8fc2bf",
+  "Name": "MongoDB - Create User if not exists",
+  "Description": "Creates a new database user on a MongoDB server.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d6343cb6-40d3-47a8-898f-ff3aeb6f9c1a",
+      "Name": "MongoDBServerName",
+      "Label": "Server Name",
+      "HelpText": "Name or IP address of the MongoDB server instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "75eae92c-0081-481b-b79a-73524a798349",
+      "Name": "MongoDBPort",
+      "Label": "Port",
+      "HelpText": "Port number the MongoDB instance is listening on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dbb4ef7a-ab79-4036-ac7b-466d683341f5",
+      "Name": "MongoDBDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to add the user to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0f0612d3-e039-4940-bcb7-a3333266ae95",
+      "Name": "MongoDBAdminUsername",
+      "Label": "Admin Username",
+      "HelpText": "User account with rights to query the users in the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fbdb0e70-33d5-41a6-b316-66f1be7e5a18",
+      "Name": "MogoDBAdminUserpassword",
+      "Label": "Admin Password",
+      "HelpText": "Password for the admin account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c151f9f5-36f3-47ab-80b7-7dcb18bb7ff8",
+      "Name": "MongoDBUsername",
+      "Label": "Username",
+      "HelpText": "Username to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3cb55ad5-8dc3-4f12-a35f-aaa30957313b",
+      "Name": "MongoDBUserPassword",
+      "Label": "Password",
+      "HelpText": "Password for the account to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2024-10-28T21:10:17.1140000Z",
+    "OctopusVersion": "2024.3.12899",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "mongodb"
+}
diff --git a/src/step-templates/mongodb-create-user/scriptbody.ps1 b/src/step-templates/mongodb-create-user/scriptbody.ps1
new file mode 100644
index 000000000..ca54c889a
--- /dev/null
+++ b/src/step-templates/mongodb-create-user/scriptbody.ps1
@@ -0,0 +1,165 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    $moduleParameters = @{
+      Name = $PowerShellModuleName
+      Path = $LocalModulesPath
+      Force = $true
+    }
+
+    # Check the version of PowerShell
+    if ($PSVersionTable.PSVersion.Major -lt 7)
+    {
+      # Add specific version of powershell module to use
+      $moduleParameters.Add("MaximumVersion", "6.7.4")
+    }
+
+	# Save the module in the temporary location
+    Save-Module @moduleParameters
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseUserExists
+{
+	# Define parameters
+    param ($UserName)
+    
+    # Define working variables
+    $userExists = $false
+    
+	# Get users for database
+    $command = @"
+{ usersInfo: 1 }
+"@
+
+	$results = Invoke-MdbcCommand -Command $command
+    $users = $results["users"]
+    
+    # Loop through returned results
+    foreach ($user in $users)
+    {
+    	if ($user["user"] -eq $UserName)
+        {
+        	return $true
+        }
+    }
+    
+    return $false
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "Mdbc"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Connect to mongodb instance
+$connectionUrl = "mongodb://$($MongoDBAdminUsername):$($MogoDBAdminUserpassword)@$($MongoDBServerName):$($MongoDBPort)"
+
+# Connect to MongoDB server
+Connect-Mdbc $connectionUrl $MongoDBDatabaseName
+
+# Get whether the database exits
+if ((Get-DatabaseUserExists -UserName $MongoDBUsername) -ne $true)
+{
+	# Create user
+    Write-Output "User $MongoDBUsername doesn't exist in database $MongoDBDatabaseName."
+    
+    # Define create user command
+    $command = @"
+{
+	createUser: `"$MongoDBUsername`"
+    pwd: `"$MongoDBUserPassword`"
+    roles: []
+}
+"@
+
+	# Create user account
+    $result = Invoke-MdbcCommand -Command $command
+    
+    # Check to make sure it was created successfully
+    if ($result.ContainsKey("ok"))
+    {
+    	Write-Output "User $MongoDBUsername successfully created in database $MongoDBDatabaseName."
+    }
+    else
+    {
+    	Write-Error "Failed, $result"
+    }
+}
+else
+{
+	Write-Output "User $MongoDBUsername already exists in database $MongoDBDatabaseName."
+}
+
+
+
+
+
+
diff --git a/src/step-templates/msmq-create-transactional-queue/metadata.json b/src/step-templates/msmq-create-transactional-queue/metadata.json
new file mode 100644
index 000000000..3579d964d
--- /dev/null
+++ b/src/step-templates/msmq-create-transactional-queue/metadata.json
@@ -0,0 +1,125 @@
+{
+  "Id": "4c22f201-c634-4a22-aa55-ae24dc83d588",
+  "Name": "MSMQ - Create Transactional Queue",
+  "Description": "Create one or more MSMQ transactional queues and configure permissions.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "35154cac-d005-4a7b-85c9-8eab276e726b",
+      "Name": "MSMQQueues",
+      "Label": "Queue names",
+      "HelpText": "Queue names, separated by semicolons. Example: _Queue1;Queue2;Queue3_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6f3a90b7-df04-4884-9cd1-f04ad7a1f97b",
+      "Name": "MSMQUsers",
+      "Label": "Queue users",
+      "HelpText": "Users with access to the queue separated by semicolons. Example: _DOMAIN\\User1;DOMAIN\\User2_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3e2e1512-6f75-4e36-80cc-d350a3563a09",
+      "Name": "MSMQPermAllow",
+      "Label": "Allowed permissions",
+      "HelpText": "Permissions granted to the queue users, separated by semicolons. Example: _DeleteMessage;PeekMessage;ReceiveMessage_",
+      "DefaultValue": "DeleteMessage;PeekMessage;ReceiveMessage;WriteMessage",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2063989e-587f-4787-b3ce-6865501316b2",
+      "Name": "MSMQPermDeny",
+      "Label": "Denied permissions",
+      "HelpText": "Denied permissions, separated by semicolons: _TakeQueueOwnership_",
+      "DefaultValue": "TakeQueueOwnership",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "42ec591d-9631-4ff4-ac56-94a1ac7c5994",
+      "Name": "MSMQAdminUsers",
+      "Label": "Admin queue users",
+      "HelpText": "Users with access to the queue separated by semicolons. Example: _DOMAIN\\User1;DOMAIN\\User2_",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "47dee55f-9d5a-4798-a61c-b4c7350774a5",
+      "Name": "MSMQPermAdminAllow",
+      "Label": "Allowed admin permissions",
+      "HelpText": "Permissions granted to the queue admin users, separated by semicolons. Example: _DeleteMessage;PeekMessage;ReceiveMessage_",
+      "DefaultValue": "FullControl",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "949b3efb-5fb7-4350-8336-1dfff67172aa",
+      "Name": "MSMQPermAdminDeny",
+      "Label": "Denied admin permissions",
+      "HelpText": "Denied permissions, separated by semicolons: _TakeQueueOwnership_",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2be54d36-3b81-4a39-8685-adfe8d98ebbb",
+      "Name": "MSMQResetPermissions",
+      "Label": "Reset Permissions",
+      "HelpText": "Remove all existing permissions from the Queue if it already exists",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "54143721-075f-4270-89c1-154719ee0b3c",
+      "Name": "MSMQResetDomains",
+      "Label": "Reset Permissions Domains",
+      "HelpText": "This is used if Reset Permissions is set.\nExample: YOURDOMAIN1;YOURDOMAIN2",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2018-03-28T07:21:22.0390000Z",
+    "OctopusVersion": "2018.2.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/msmq-create-transactional-queue/scriptbody.ps1 b/src/step-templates/msmq-create-transactional-queue/scriptbody.ps1
new file mode 100644
index 000000000..870b72874
--- /dev/null
+++ b/src/step-templates/msmq-create-transactional-queue/scriptbody.ps1
@@ -0,0 +1,132 @@
+$MSMQQueues = $OctopusParameters['MSMQQueues']
+$MSMQResetPermissions = $OctopusParameters['MSMQResetPermissions']
+$MSMQResetDomains = $OctopusParameters['MSMQResetDomains']
+$MSMQUsers = $OctopusParameters['MSMQUsers']
+$MSMQPermAllow = $OctopusParameters['MSMQPermAllow']
+$MSMQPermDeny = $OctopusParameters['MSMQPermDeny']
+$MSMQAdminUsers = $OctopusParameters['MSMQAdminUsers']
+$MSMQPermAdminAllow = $OctopusParameters['MSMQPermAdminAllow']
+$MSMQPermAdminDeny = $OctopusParameters['MSMQPermAdminDeny']
+
+Write-Verbose "`$MSMQQueues = $MSMQQueues"
+Write-Verbose "`$MSMQResetPermissions = $MSMQResetPermissions"
+Write-Verbose "`$MSMQResetDomains = $MSMQResetDomains"
+Write-Verbose "`$MSMQUsers = $MSMQUsers"
+Write-Verbose "`$MSMQPermAllow = $MSMQPermAllow"
+Write-Verbose "`$MSMQPermDeny = $MSMQPermDeny"
+Write-Verbose "`$MSMQAdminUsers = $MSMQAdminUsers"
+Write-Verbose "`$MSMQPermAdminAllow = $MSMQPermAdminAllow"
+Write-Verbose "`$MSMQPermAdminDeny = $MSMQPermAdminDeny"
+
+#Split the Queues into an array
+$arrQueues = $MSMQQueues.split(";")
+foreach ($Queue in $arrQueues) 
+{
+    #Does Queue Exists Already?
+    $thisQueue = Get-MSMQQueue $Queue
+    if (!$thisQueue)
+    {
+        #not found, create
+        Write-Output "Creating Queue: " $Queue
+        New-MsmqQueue -Name "$Queue" -Label "private$\$Queue" -Transactional | Out-Null
+        $thisQueue = Get-MSMQQueue $Queue    
+    }
+    else
+    {
+        Write-Output "Queue Exists: " $thisQueue.QueueName
+        
+        if($MSMQResetPermissions -eq "True")
+        {
+            foreach($domain in $MSMQResetDomains.split(";"))
+            {
+                # reset permissions
+                $QueuePermissions = $thisQueue | Get-MsmqQueueACL
+                foreach ($AccessItem in $MSMQQueuePermissions)
+                {
+                    $userName = [Environment]::UserName
+                    if($AccessItem.AccountName -NotLike "*$userName") # not current user
+                    {
+                        $domain = "$($domain)*" #append * to end of domain
+                        if ($AccessItem.AccountName -Like "$($domain)*")
+                        {
+                            Write-Output "Removing Permissions $($AccessItem.Right) for $($AccessItem.AccountName)"
+                            Try
+                            {
+                                $thisQueue | Set-MsmqQueueACL -UserName $AccessItem.AccountName -Remove $AccessItem.Right | Out-Null
+                            }
+                            Catch
+                            {
+                                Write-Output "Could not set permissions item $_.Exception.Message"
+                                Break
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #set acl for users
+    $arrUsers = $MSMQUsers.split(";")
+    foreach ($User in $arrUsers)     
+    {    
+        if ($User)
+        {    
+            Write-Output "Adding ACL for User: " $User        
+            
+            #allows
+            if ($MSMQPermAllow)
+            {
+                $arrPermissions = $MSMQPermAllow.split(";")
+                foreach ($Permission in $arrPermissions)     
+                {
+                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Allow $Permission | Out-Null                
+                    Write-Output "ACL Allow set: $Permission"
+                }
+            }
+                
+            #denies
+            if ($MSMQPermDeny)
+            {
+                $arrPermissions = $MSMQPermDeny.split(";")
+                foreach ($Permission in $arrPermissions)     
+                {
+                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Deny $Permission | Out-Null
+                    Write-Output "ACL Deny set: $Permission"
+                }
+            }
+        }
+    }   
+    
+    
+    $arrAdminUsers = $MSMQAdminUsers.split(";") 
+    foreach ($User in $arrAdminUsers)     
+    {    
+        if ($User)
+        { 
+            Write-Output "Adding ACL for Admin User: " $User        
+            
+            #allows
+            if ($MSMQPermAdminAllow)
+            {
+                $arrPermissions = $MSMQPermAdminAllow.split(";")
+                foreach ($Permission in $arrPermissions)     
+                {
+                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Allow $Permission | Out-Null                
+                    Write-Output "ACL Allow admin set: $Permission"
+                }
+            }
+                
+            #denies
+            if ($MSMQPermAdminDeny)
+            {
+                $arrPermissions = $MSMQPermAdminDeny.split(";")
+                foreach ($Permission in $arrPermissions)     
+                {
+                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Deny $Permission | Out-Null
+                    Write-Output "ACL Deny admin set: $Permission"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/mulesoft-cloudhub/metadata.json b/src/step-templates/mulesoft-cloudhub/metadata.json
new file mode 100644
index 000000000..0963319b1
--- /dev/null
+++ b/src/step-templates/mulesoft-cloudhub/metadata.json
@@ -0,0 +1,178 @@
+{
+  "Id": "35450be7-a9a2-415f-82b4-6503ca148f22",
+  "Name": "Mulesoft - Deploy to Cloudhub",
+  "Description": "Deploys a Mulesoft API to Cloudhub",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "a8d60939-169c-4026-a9b3-3789b2bb0152",
+      "Name": "Mulesoft.Asset",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "False",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Mulesoft.Asset.File",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e73b1ba3-df1f-490f-98d3-e564f6c1904a",
+      "Name": "Mulesoft.Anypoint.Organization.Id",
+      "Label": "Anypoint OrganizationID",
+      "HelpText": "The Organization ID of your Anypoint account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "680c0b8c-a219-466a-840d-a5828247d2e8",
+      "Name": "Mulesoft.Anypoint.Client.Id",
+      "Label": "Anypoint Client ID",
+      "HelpText": "Client ID of the Anypoint user used for deployment.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f71f9285-acee-4461-83fc-6f281c78ee87",
+      "Name": "Mulesoft.Anypoint.Client.Secret",
+      "Label": "Anypoint Client Secret",
+      "HelpText": "Client Secret of the Anypoint user used for deployment.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "4a7f78d5-3e68-4d04-aa88-327903d86d5c",
+      "Name": "Mulesoft.Anypoint.Environment",
+      "Label": "Anypoint Environment",
+      "HelpText": "Environment name to target.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "669bd6f1-a55e-4017-bc41-7008a166727c",
+      "Name": "Mulesoft.Anypoint.Application.Name",
+      "Label": "Anypoint Application Name",
+      "HelpText": "Name of the deployed application.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3ad06081-5a16-4fff-8d6d-dd2e9b5ea435",
+      "Name": "Mulesoft.Asset.File",
+      "Label": "Mulesoft Asset File",
+      "HelpText": "Select the package containing the Mulesoft API to upload to Exchange.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "291892c6-9fb0-4fc6-a3a5-d10bcdf70338",
+      "Name": "Mulesoft.Anypoint.Runtime.Version",
+      "Label": "Runtime version",
+      "HelpText": "The version of the runtime to use for your application.",
+      "DefaultValue": "4.4.0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d636b68a-dd56-4201-b2af-bb8faecc17ea",
+      "Name": "Mulesfot.Anypoint.Worker.Count",
+      "Label": "Number of Workers",
+      "HelpText": "(Optional) \t\nNumber of workers. (This value is '1' by default)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ace7c127-6adf-4df3-8e13-e43d596490f4",
+      "Name": "Mulesoft.Anypoint.Worker.Size",
+      "Label": "Worker Size",
+      "HelpText": "(Optional) Size of the workers in vCores. (This value is '1' by default)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a5aa6973-a64a-479e-a080-7fa684f00d45",
+      "Name": "Mulesoft.Anypoint.Region",
+      "Label": "Region",
+      "HelpText": "Name of the region to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7f527d06-c329-4883-a5cf-15f233fbe319",
+      "Name": "Mulesoft.Anypoint.CLI.AdditionalArguments",
+      "Label": "Additional CLI arguments",
+      "HelpText": "A comma delimited list of additional arguments to add to the CLI.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ada95ba7-64d4-4b0e-a287-b2dd6fac5718",
+      "Name": "Mulesoft.Node.CLI.Version",
+      "Label": "NodeJS version",
+      "HelpText": "Use to specify which version of the NodeJS CLI to use when choosing the Download Node option",
+      "DefaultValue": "18.16.0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9b34443c-bd76-4aa4-b036-10d930d619eb",
+      "Name": "Mulesoft.Anypoint.CLI.Version",
+      "Label": "Anypoint CLI Version",
+      "HelpText": "Specify the version of the CLI being used.",
+      "DefaultValue": "4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aa635c7b-bedb-4000-95a0-3c399721ce2b",
+      "Name": "Mulesoft.Download",
+      "Label": "Download NodeJS and Anypoint CLI?",
+      "HelpText": "Tick the box to dynamically download the NodeJS and Anypoint CLI utilities to deploy.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-07-20T17:36:01.8970000Z",
+    "OctopusVersion": "2023.2.12998",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "mulesoft"
+}
diff --git a/src/step-templates/mulesoft-cloudhub/scriptbody.ps1 b/src/step-templates/mulesoft-cloudhub/scriptbody.ps1
new file mode 100644
index 000000000..9801927b5
--- /dev/null
+++ b/src/step-templates/mulesoft-cloudhub/scriptbody.ps1
@@ -0,0 +1,203 @@
+Function Get-NpmExecutable
+{
+	# Define parameters
+    param (
+    	$NodeVersion = "18.16.0"
+    )
+       
+    # Declare local variables
+    $npmDownloadUrl = "https://nodejs.org/dist/v$NodeVersion/"
+    $downloadFileName = [string]::Empty
+    $npmExecutable = [string]::Empty
+    
+    # Assign download url
+    if ($IsWindows)
+    {
+    	$downloadFileName += "node-v$($NodeVersion)-win-x64.zip"
+    }
+    else
+    {
+    	$downloadFileName += "node-v$($NodeVersion)-linux-x64.tar.xz"
+    }
+
+	# Create folder for npm
+    if ((Test-Path -Path "$PWD/npm") -eq $false)
+    {
+    	New-Item -Path "$PWD/npm" -ItemType "Directory"
+    }
+    
+    # Download npm binary
+    Write-Host "Downloading $(($npmDownloadUrl + $downloadFileName)) ..."
+    Invoke-WebRequest -Uri ($npmDownloadUrl + $downloadFileName) -Outfile "$PWD/$downloadFileName"
+    
+    Write-Output "Extracting $downloadFileName ... "
+    
+    if ($IsWindows)
+    {
+      # Extract
+      Expand-Archive -Path "$PWD/$downloadFileName" -DestinationPath "$PWD/npm"
+      
+      # Find the executable
+      $npmExecutable = Get-ChildItem -Path "$PWD/npm/$($downloadFileName.Replace('.zip', ''))" | Where-Object {$_.Name -eq "npm.cmd"}
+    }
+    
+    if ($IsLinux)
+    {
+      # Extract archive
+      tar -xf "$PWD/$downloadFileName" --directory "$PWD/npm"
+      
+      # Find the executable
+      $npmExecutable = Get-ChildItem -Path "$PWD/npm/$($downloadFileName.Replace('.tar.xz', ''))/bin" | Where-Object {$_.Name -eq "npm"}      
+    }
+    
+    # Insert location of executable into PATH environment variable so it can be called from anywhere
+    $env:PATH = "$($npmExecutable.Directory)$([IO.Path]::PathSeparator)" + $env:PATH
+}
+
+Function Install-MulesoftCLI
+{
+	# Define parameters
+    param (
+    	$CLIVersion = "4"
+    )
+	
+    # Run npm command to install pluguin
+    Write-Host "Installing anypoint-cli-v$($CLIVersion) node module ..."
+    
+    # Adjust install command based on operating system
+    if ($IsWindows)
+    {
+    	& npm install -g "anypoint-cli-v$($CLIVersion)" "2>&1"
+    }
+    else
+    {
+    	& npm install -g "anypoint-cli-v$($CLIVersion)" 2>&1
+    }
+    
+	# Check exit code
+	if ($lastExitCode -ne 0)
+	{
+		# Fail the step
+    	Write-Error "Installation failed!"
+	}
+}
+
+Function Deploy-MulesoftApplication
+{
+	# Define parameters
+    param (
+    	$AssetFilePath,
+        $ApplicationName,
+        $RuntimeVersion,
+        $NumberOfWorkers,
+        $WorkerSize,
+        $Region
+    )
+    
+    # Replace path seperator
+    if ($AssetFilePath.Contains("\"))
+    {
+    	# Replace them with forward slash
+        $AssetFilePath = $AssetFilePath.Replace("\", "/")
+    }
+    
+    # Check to see if application already exists
+    $applicationList = (anypoint-cli-v4 runtime-mgr:cloudhub-application:list --output json | ConvertFrom-JSON)
+    $deployResults = $null
+    
+    if ($null -eq ($applicationList | Where-Object {$_.domain -eq $ApplicationName}))
+    {
+    	# Deploy the application to cloud hub
+        Write-Host "Deploying new application ..."
+    	$deployResults = anypoint-cli-v4 runtime-mgr:cloudhub-application:deploy $ApplicationName $AssetFilePath --output json --runtime $RuntimeVersion --workers $NumberOfWorkers --workerSize $WorkerSize --region $Region
+    }
+    else
+    {
+    	# Update the application
+        Write-Host "Updating existing application ..."
+        $deployResults = anypoint-cli-v4 runtime-mgr:cloudhub-application:modify $ApplicationName $AssetFilePath --output json --runtime $RuntimeVersion --workers $NumberOfWorkers --workerSize $WorkerSize --region $Region
+    }
+    
+    # Display results 
+    Write-Host "Results:"
+    $deployResults
+}
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+if ($IsWindows)
+{
+	# Disable progress bar for faster installation
+    $ProgressPreference = 'SilentlyContinue'
+}
+
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Get parameters
+$downloadUtils = [System.Convert]::ToBoolean("$($OctopusParameters['Mulesoft.Download'])")
+
+# Check to see if we need to download utilities
+if ($downloadUtils)
+{
+	Get-NpmExecutable -NodeVersion $OctopusParameters['Mulesoft.Node.CLI.Version']
+	Install-MulesoftCLI -CLIVersion $OctopusParameters['Mulesoft.Anypoint.CLI.Version']
+}
+
+# Set environment variables
+$env:ANYPOINT_CLIENT_ID = $OctopusParameters['Mulesoft.Anypoint.Client.Id']
+$env:ANYPOINT_CLIENT_SECRET = $OctopusParameters['Mulesoft.Anypoint.Client.Secret']
+$env:ANYPOINT_ORG = $OctopusParameters['Mulesoft.Anypoint.Organization.Id']
+$env:ANYPOINT_ENV = $OctopusParameters['Mulesoft.Anypoint.Environment']
+
+# Set global variables
+$mulesoftOrganizationId = $OctopusParameters['Mulesoft.Anypoint.Organization.Id']
+$mulesoftAssetVersionNumber = $OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageVersion']
+$mulesoftAssetArtifactId = $OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageId']
+$mulesoftApplicationName = $OctopusParameters['Mulesoft.Anypoint.Application.Name'].ToLower()
+$mulesoftRuntimeVersion = $OctopusParameters['Mulesoft.Anypoint.Runtime.Version']
+$mulesoftNumberOfWorkers = $OctopusParameters['Mulesfot.Anypoint.Worker.Count']
+$mulesoftWorkerSize = $OctopusParameters['Mulesoft.Anypoint.Worker.Size']
+$mulesoftRegion = $OctopusParameters['Mulesoft.Anypoint.Region']
+
+# Check optional parameters
+if ([string]::IsNullOrWhitespace($mulesoftNumberOfWorkers))
+{
+	$mulesoftNumberOfWorkers = "1"
+}
+
+if ([string]::IsNullOrWhitespace($mulesoftWorkerSize))
+{
+	$mulesoftWorkerSize = "1"
+}
+
+# Display variable values
+Write-Host "================== Deploying to CloudHub with the following options =================="
+Write-Host "Organization Id/Group Id: $mulesoftOrganizationId"
+Write-Host "Artifact Id: $mulesoftAssetArtifactId"
+Write-Host "Version number: $mulesoftAssetVersionNumber"
+Write-Host "Application Name: $mulesoftApplicationname"
+Write-Host "Environment: $($env:ANYPOINT_ENV)"
+Write-Host "Runtime version: $mulesoftRuntimeVersion"
+Write-Host "Number of workers: $mulesoftNumberOfWorkers"
+Write-Host "Worker size: $mulesoftWorkerSize"
+Write-Host "Region: $mulesoftRegion"
+Write-Host "======================================================================================="
+
+# Get file properties
+$mulesoftApplicationFileExtension = [System.IO.Path]::GetExtension("$PWD/$($OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageFileName'])")
+
+# Rename the file to the original
+Rename-Item -Path "$PWD/$($OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageFileName'])" -NewName "$($mulesoftAssetArtifactId).$($mulesoftAssetVersionNumber)$mulesoftApplicationFileExtension"
+$mulesoftApplicationFilePath = "$PWD/$($mulesoftAssetArtifactId).$($mulesoftAssetVersionNumber)$mulesoftApplicationFileExtension"
+
+# Upload asset to exchange
+Deploy-MulesoftApplication -AssetFilePath $mulesoftApplicationFilePath -ApplicationName $mulesoftApplicationName -Region $mulesoftRegion -RuntimeVersion $mulesoftRuntimeVersion -NumberOfWorkers $mulesoftNumberOfWorkers -Workersize $mulesoftWorkerSize
+
diff --git a/src/step-templates/mysql-add-database-user-to-role/metadata.json b/src/step-templates/mysql-add-database-user-to-role/metadata.json
new file mode 100644
index 000000000..a1b24fcde
--- /dev/null
+++ b/src/step-templates/mysql-add-database-user-to-role/metadata.json
@@ -0,0 +1,136 @@
+{
+  "Id": "fc7272be-779c-4ef2-8051-0e7271471328",
+  "Name": "MySQL - Add Database User To Role",
+  "Description": "Adds a database user to a role",
+  "Author": "twerthi",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "80bf18c2-a2ea-4499-a33d-eea226b9727a",
+      "Name": "addMySQLServerName",
+      "Label": "MySQL Server name",
+      "HelpText": "Name of the MySQL database server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2eba54c0-293c-4009-aef0-077b91b568b4",
+      "Name": "addMySQLServerPort",
+      "Label": "Port",
+      "HelpText": "Port the MySQL listens on.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c8732b96-bedd-4e4a-be2d-941315e1bddd",
+      "Name": "addLoginWithAddRoleRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user that can add roles to other users.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4b669f8a-7309-4aed-81ff-cd5b3ebf5342",
+      "Name": "addLoginPasswordWithAddRoleRights",
+      "Label": "Login password",
+      "HelpText": "Password for the login account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "7db3f187-ca97-42cc-a10e-fa5cc3f1382c",
+      "Name": "addUsername",
+      "Label": "User name",
+      "HelpText": "Name of the user to add the role to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "052563dd-c831-4f09-8d59-1e54bc30afa0",
+      "Name": "addUserHostname",
+      "Label": "User Hostname",
+      "HelpText": "Hostname for the user account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "885c5057-f859-4bed-a765-03c568f9e9a2",
+      "Name": "addRoleName",
+      "Label": "Role name",
+      "HelpText": "Name of the role to add to the user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "302ac0ce-3128-45bc-8006-ac92a59b7141",
+      "Name": "addRoleHostName",
+      "Label": "Role hostname",
+      "HelpText": "Hostname of the role.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a54387ea-9e98-45a2-93e9-214ff2fcf67f",
+      "Name": "addUseSSL",
+      "Label": "Use SSL",
+      "HelpText": "Check this box to force the use of SSL.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "89de7391-de67-46cf-b19c-a7b219280dc9",
+      "Name": "mySqlAuthenticationMethod",
+      "Label": "MySQL Authentication Method",
+      "HelpText": "Authentication method used to connect with MySQL. Options include standard Username/Password, Windows Authentication, [AWS IAM Authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html), [Azure Managed Identity](https://docs.microsoft.com/en-us/azure/mysql/single-server/how-to-connect-with-managed-identity), and [Google Cloud IAM for Cloud SQL ](https://cloud.google.com/sql/docs/mysql/iam-overview)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS IAM\nusernamepassword|Username/password\nwindowsauthentication|Windows Authentication\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP IAM"
+      }
+    },
+    {
+      "Id": "a97452b5-f7ef-4b72-ab2f-b440cda16343",
+      "Name": "mysqlAdditionalParameters",
+      "Label": "Additional connection string parameters",
+      "HelpText": "A comma-delimited list of additional parameters to add to the connection string.  ex `AllowPublicKeyRetrieval=True`\"",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2024-03-22T16:19:47.0740000Z",
+    "OctopusVersion": "2024.1.12087",
+    "Type": "ActionTemplate"
+  },
+  "Category": "mysql"
+}
diff --git a/src/step-templates/mysql-add-database-user-to-role/scriptbody.ps1 b/src/step-templates/mysql-add-database-user-to-role/scriptbody.ps1
new file mode 100644
index 000000000..e833f4a7e
--- /dev/null
+++ b/src/step-templates/mysql-add-database-user-to-role/scriptbody.ps1
@@ -0,0 +1,251 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserInRole
+{
+	# Define parameters
+    param ($UserHostname,
+    $Username,
+    $RoleHostName,
+    $RoleName)
+    
+	# Execute query
+    $grants = Invoke-SqlQuery "SHOW GRANTS FOR '$Username'@'$UserHostName';" -ConnectionName $connectionName
+
+    # Loop through Grants
+    foreach ($grant in $grants.ItemArray)
+    {
+        # Check grant
+        if ($grant -eq "GRANT ``$RoleName``@``$RoleHostName`` TO ``$Username``@``$UserHostName``")
+        {
+            # They're in the group
+            return $true
+        }
+    }
+
+    # Not found
+    return $false
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Import from specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Declare connection string
+$connectionString = "Server=$addMySQLServerName;Port=$addMySQLServerPort;"
+
+# Customize connection string based on authentication method
+switch ($mySqlAuthenticationMethod) {
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($addMySQLServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $addLoginPasswordWithAddRoleRights = (aws rds generate-db-auth-token --hostname $addMySQLServerName --region $region --port $addMySQLServerPort --username $addLoginWithAddRoleRights)
+        
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$addLoginWithAddRoleRights;Pwd=`"$addLoginPasswordWithAddRoleRights`";"
+
+        break
+    }
+
+    "usernamepassword" {
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$addLoginWithAddRoleRights;Pwd=`"$addLoginPasswordWithAddRoleRights`";"
+        
+        break    
+    }
+
+    "windowsauthentication" {
+        # Append remaining portion of connection string
+        $connectionString += ";IntegratedSecurity=yes;Uid=$addLoginWithAddRoleRights;"
+
+        break
+    }
+
+    "azuremanagedidentity" {
+        Write-Host "Generating Azure Managed Identity token ..."
+        $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true" }
+
+        $addLoginPasswordWithAddRoleRights = $token.access_token
+
+        $connectionString += ";Uid=$addLoginWithAddRoleRights;Pwd=`"$addLoginPasswordWithAddRoleRights`";"
+
+        break
+    }
+
+    "gcpserviceaccount" {
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google" }
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains("iam.gserviceaccount.com") }
+
+        if ([string]::IsNullOrWhiteSpace(($addLoginWithAddRoleRights))) {
+            $addLoginWithAddRoleRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+        }
+
+        Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+        
+        $addLoginPasswordWithAddRoleRights = $token.access_token
+        $connectionString += ";Uid=$addLoginWithAddRoleRights;Pwd=`"$addLoginPasswordWithAddRoleRights`";"
+
+        break
+    }
+}
+
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+try
+{
+    if ($addUseSSL -eq "True")
+    {
+    	# Append to connection string
+        $connectionString += "SslMode=Required;"
+    }
+    else
+    {
+    	# Disable SSL
+        $connectionString += "SslMode=none;"
+    }
+    
+    if (![string]::IsNullOrWhitespace($mysqlAdditionalParameters))
+    {
+      foreach ($parameter in $mysqlAdditionalParameters.Split(","))
+      {
+          # Check for delimiter
+          if (!$connectionString.EndsWith(";") -and !$parameter.StartsWith(";"))
+          {
+              # Append delimeter
+              $connectionString +=";"
+          }
+
+          $connectionString += $parameter.Trim()
+      }
+    }
+   
+    
+    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName
+    
+
+    # See if database exists
+    $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleHostName $addRoleHostName -RoleName $addRoleName
+
+    if ($userInRole -eq $false)
+    {
+        # Create database
+        Write-Output "Adding user $addUsername@$addUserHostName to role $addRoleName@$addRoleHostName ..."
+        $executionResults = Invoke-SqlUpdate "GRANT '$addRoleName'@'$addRoleHostName' TO '$addUsername'@'$addUserHostName';" -ConnectionName $connectionName
+
+        # See if it was created
+        $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleHostName $addRoleHostName -RoleName $addRoleName
+            
+        # Check array
+        if ($userInRole -eq $true)
+        {
+            # Success
+            Write-Output "$addUserName@$addUserHostName added to $addRoleName@$addRoleHostName successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "Failure adding $addUserName@$addUserHostName to $addRoleName@$addRoleHostName!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $addUsername@$addUserHostName is already in role $addRoleName@$addRoleHostName"
+    }
+}
+finally
+{
+	# Close connection if open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+    	Close-SqlConnection -ConnectionName $connectionName
+    }
+}
diff --git a/src/step-templates/mysql-backup-database/metadata.json b/src/step-templates/mysql-backup-database/metadata.json
new file mode 100644
index 000000000..21a92b405
--- /dev/null
+++ b/src/step-templates/mysql-backup-database/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "4fa6d062-d4da-4a02-849e-dec804554453",
+  "Name": "MySQL - Backup Database",
+  "Description": "Backs up a MySQL database on a windows instance hosting MySQL. ",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "adamoctoclose",
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "7030ad54-4e10-4854-998a-ca91e3b490a3",
+      "Name": "BackupMySQL_ServerName",
+      "Label": "Server",
+      "HelpText": "Name or IP of the MySQL server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "07dbf251-a982-4cc5-b6c1-dc0af50c519c",
+      "Name": "BackupMySQL_Username",
+      "Label": "Username",
+      "HelpText": "\tUsername with rights to dump database",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ac42a150-b7e7-4414-9dec-f18e105eaedf",
+      "Name": "BackupMySQL_Password",
+      "Label": "Password",
+      "HelpText": "Password for the user account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "62ffb949-c5db-4151-bb29-47a37586bda5",
+      "Name": "BackupMySQL_DatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to backup",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c54832b1-571f-4475-9159-6a7342a67982",
+      "Name": "BackupMySQL_Port",
+      "Label": "Port",
+      "HelpText": "Port number for the MySQL server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a33dc26c-15b3-4b5e-a62f-7a5e97576bcc",
+      "Name": "BackupMySQL_UseSSL",
+      "Label": "Use SSL",
+      "HelpText": "Check this box to force the use of SSL.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "fc2c1a2f-43ba-4878-8e74-b88dad96c5d2",
+      "Name": "BackupMySQL_MySQLPath",
+      "Label": "MySQL Path",
+      "HelpText": "Path to binaries e.g. C:\\Program Files\\MySQL\\MySQL Server 5.6\\bin\nIf binaries don't exist on the target machine the backup will fail.",
+      "DefaultValue": "C:\\Program Files\\MySQL\\MySQL Server 5.6\\bin",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "39063215-b069-4e51-b202-65060db9fd20",
+      "Name": "BackupMySQL_BackupDirectory",
+      "Label": "Backup Directory",
+      "HelpText": "Location to store backup file",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-11T15:11:43.1350000Z",
+    "OctopusVersion": "2020.3.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "adamoctoclose",
+  "Category": "mysql"
+}
diff --git a/src/step-templates/mysql-backup-database/scriptbody.ps1 b/src/step-templates/mysql-backup-database/scriptbody.ps1
new file mode 100644
index 000000000..f2430fd3f
--- /dev/null
+++ b/src/step-templates/mysql-backup-database/scriptbody.ps1
@@ -0,0 +1,140 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseExists
+{
+	# Define parameters
+    param ($DatabaseName)
+    
+	# Execute query
+    return Invoke-SqlQuery "SHOW DATABASES LIKE '$DatabaseName';"
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Import from temp location
+    $PowerShellModuleName =  "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+
+# Create credential object for the connection
+#$SecurePassword = ConvertTo-SecureString $BackupMySQL_Password -AsPlainText -Force
+#$ServerCredential = New-Object System.Management.Automation.PSCredential ($BackupMySQL_Username, $BackupMySQL_Password)
+
+try
+{
+
+
+	# Connect to MySQL
+    $connectionString = "Server=$BackupMySQL_ServerName;Port=$BackupMySQL_Port;Uid=$BackupMySQL_Username;Pwd=$BackupMySQL_Password;"
+
+    if ($BackupMySQL_UseSSL -eq "True")
+    {
+		# Append to connection string
+        $connectionString += "SslMode=Required;"
+    }
+    else
+    {
+    	# Disable ssl
+        $connectionString += "SslMode=none;"
+    }
+    
+    Open-MySqlConnection -ConnectionString $connectionString
+
+    # See if database exists
+    $databaseExists = Get-DatabaseExists -DatabaseName $BackupMySQL_DatabaseName
+
+    if ($databaseExists.ItemArray.Count -eq 0)
+    {
+        # Display message
+        Write-Error "Database $BackupMySQL_DatabaseName doesn't exist."
+ 
+    }
+    else
+    {
+
+        cd $BackupMySQL_MySQLPath
+
+        $backupname = '{0}{1}-{2}.sql' -f ($BackupMySQL_BackupDirectory, $BackupMySQL_DatabaseName ,(Get-Date -Format FileDatetime))
+
+        .\mysqldump.exe --databases $BackupMySQL_DatabaseName > $backupname
+                
+        # Success
+        Write-Output "$BackupMySQL_DatabaseName was backed up!"
+    }
+}
+finally
+{
+    Close-SqlConnection
+}
diff --git a/src/step-templates/mysql-create-database/metadata.json b/src/step-templates/mysql-create-database/metadata.json
new file mode 100644
index 000000000..83a68313f
--- /dev/null
+++ b/src/step-templates/mysql-create-database/metadata.json
@@ -0,0 +1,105 @@
+{
+  "Id": "4a222ac3-ff4b-4328-8778-1c44eebdedde",
+  "Name": "MySQL - Create Database If Not Exists",
+  "Description": "Creates a MySQL database if it doesn't already exist.  This template is also compatible with MariaDB.\n\nNote - this template will install the Nuget package provider if it's not already present.",
+  "ActionType": "Octopus.Script",
+  "Author": "twerthi",
+  "Version": 9,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "987155d9-f852-415d-b89d-cd74618d14bb",
+      "Name": "createMySQLServerName",
+      "Label": "Server",
+      "HelpText": "Hostname (or IP) of the MySQL database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aff09ee3-b7c4-4a88-a4e3-70ad0eee04e9",
+      "Name": "createUsername",
+      "Label": "Username",
+      "HelpText": "Username to use for the connection",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a08b0359-560f-49cb-bc71-d759d49a06fc",
+      "Name": "createUserPassword",
+      "Label": "Password",
+      "HelpText": "Password for the user account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e17c8ac9-6b4a-4321-975b-452e2015bc4a",
+      "Name": "createDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to create",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a1d735f0-3ec2-45a1-af43-d0af7bf13f68",
+      "Name": "createPort",
+      "Label": "Port",
+      "HelpText": "Port for the database instance.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ddd1ca9c-04fe-4a43-84f7-dc8d52adb063",
+      "Name": "createUseSSL",
+      "Label": "Use SSL",
+      "HelpText": "Check this box to force the use of SSL.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4090f423-b47f-4bac-ab38-ab45c92e0ab5",
+      "Name": "mySqlAuthenticationMethod",
+      "Label": "MySQL Authentication Method",
+      "HelpText": "Authentication method used to connect with MySQL. Options include standard Username/Password, Windows Authentication, [AWS IAM Authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html), [Azure Managed Identity](https://docs.microsoft.com/en-us/azure/mysql/single-server/how-to-connect-with-managed-identity), and [Google Cloud IAM for Cloud SQL ](https://cloud.google.com/sql/docs/mysql/iam-overview)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS IAM\nusernamepassword|Username/password\nwindowsauthentication|Windows Authentication\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP IAM"
+      }
+    },
+    {
+      "Id": "273612dc-5c75-4591-9da9-dc8e40b7bf39",
+      "Name": "mysqlAdditionalParameters",
+      "Label": "Additional connection string parameters",
+      "HelpText": "A comma-delimited list of additional parameters to add to the connection string.  ex `AllowPublicKeyRetrieval=True`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2024-03-20T19:31:22.0960000Z",
+    "OctopusVersion": "2024.2.2075",
+    "Type": "ActionTemplate"
+  },
+  "Category": "mysql"
+}
diff --git a/src/step-templates/mysql-create-database/scriptbody.ps1 b/src/step-templates/mysql-create-database/scriptbody.ps1
new file mode 100644
index 000000000..4a77422db
--- /dev/null
+++ b/src/step-templates/mysql-create-database/scriptbody.ps1
@@ -0,0 +1,225 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled {
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {
+        # It is installed
+        return $true
+    }
+    else {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule {
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+    # Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+        # Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseExists {
+    # Define parameters
+    param ($DatabaseName)
+    
+    # Execute query
+    return Invoke-SqlQuery "SHOW DATABASES LIKE '$DatabaseName';" -ConnectionName $connectionName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true) {
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true) {
+    # Import from temp location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Declare connection string
+$connectionString = "Server=$createMySQLServerName;Port=$createPort;"
+
+# Customize connection string based on authentication method
+switch ($mySqlAuthenticationMethod) {
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($createMySQLServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $createUserPassword = (aws rds generate-db-auth-token --hostname $createMySQLServerName --region $region --port $createPort --username $createUsername)
+        
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$createUsername;Pwd=`"$createUserPassword`";"
+
+        break
+    }
+
+    "usernamepassword" {
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$createUsername;Pwd=`"$createUserPassword`";"
+        
+        break    
+    }
+
+    "windowsauthentication" {
+        # Append remaining portion of connection string
+        $connectionString += ";IntegratedSecurity=yes;Uid=$createUsername;"
+
+        break
+    }
+
+    "azuremanagedidentity" {
+        Write-Host "Generating Azure Managed Identity token ..."
+        $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true" }
+
+        $createUserPassword = $token.access_token
+
+        $connectionString += ";Uid=$createUsername;Pwd=`"$createUserPassword`";"
+
+        break
+    }
+
+    "gcpserviceaccount" {
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google" }
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains("iam.gserviceaccount.com") }
+
+        if ([string]::IsNullOrWhiteSpace(($createUsername))) {
+            $createUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+        }
+
+        Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+        
+        $createUserPassword = $token.access_token
+        $connectionString += ";Uid=$createUsername;Pwd=`"$createUserPassword`";"
+
+        break
+    }
+}
+
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+
+try {
+    # Connect to MySQL
+    $connectionString = "Server=$createMySQLServerName;Port=$createPort;Uid=$createUsername;Pwd=$createUserPassword;"
+    if ($createUseSSL -eq "True") {
+        # Append to connection string
+        $connectionString += "SslMode=Required;"
+    }
+    else {
+        # Disable ssl
+        $connectionString += "SslMode=none;"
+    }
+    
+    if (![string]::IsNullOrWhitespace($mysqlAdditionalParameters))
+    {
+      foreach ($parameter in $mysqlAdditionalParameters.Split(","))
+      {
+          # Check for delimiter
+          if (!$connectionString.EndsWith(";") -and !$parameter.StartsWith(";"))
+          {
+              # Append delimeter
+              $connectionString +=";"
+          }
+
+          $connectionString += $parameter.Trim()
+      }
+    }
+       
+    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName
+
+    # See if database exists
+    $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName
+
+    if ($databaseExists.ItemArray.Count -eq 0) {
+        # Create database
+        Write-Output "Creating database $createDatabaseName ..."
+        $executionResult = Invoke-SqlUpdate "CREATE DATABASE $createDatabaseName;" -ConnectionName $connectionName
+
+        # Check result
+        if ($executionResult -ne 1) {
+            # Commit transaction
+            Write-Error "Create schema failed."
+        }
+        else {
+            # See if it was created
+            $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName
+            
+            # Check array
+            if ($databaseExists.ItemArray.Count -eq 1) {
+                # Success
+                Write-Output "$createDatabaseName created successfully!"
+            }
+            else {
+                # Failed
+                Write-Error "$createDatabaseName was not created!"
+            }
+        }
+    }
+    else {
+        # Display message
+        Write-Output "Database $createDatabaseName already exists."
+    }
+}
+finally {
+	# Close connection if open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+    	Close-SqlConnection -ConnectionName $connectionName
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/mysql-create-user/metadata.json b/src/step-templates/mysql-create-user/metadata.json
new file mode 100644
index 000000000..8d7c6db34
--- /dev/null
+++ b/src/step-templates/mysql-create-user/metadata.json
@@ -0,0 +1,125 @@
+{
+  "Id": "d5e87b36-da2b-4771-9394-0dbdc9587dd4",
+  "Name": "MySQL - Create User If Not Exists",
+  "Description": "Creates a new user account on a MySQL database server",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "0fb5e63d-528c-4e7e-841d-6d4bd1ef47a4",
+      "Name": "createMySQLServerName",
+      "Label": "MySQL Server",
+      "HelpText": "Host name of the MySQL server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "47364cd4-6c31-43f6-9585-cc97aca28d3c",
+      "Name": "createMySQLServerPort",
+      "Label": "Port",
+      "HelpText": "Port number the MySQL server listens on.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cb9b74a5-f444-4b8c-b353-0eebd990e0a3",
+      "Name": "createLoginWithAddUserRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user with rights to create user accounts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "699b3521-06dc-4e66-a20e-adce0fddab38",
+      "Name": "createLoginPasswordWithAddUserRights",
+      "Label": "Login Password",
+      "HelpText": "Password Login name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5b5ec614-a799-407d-870a-d3098794e049",
+      "Name": "createNewUsername",
+      "Label": "New user name",
+      "HelpText": "Name of the new user account to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8fe190a3-b3d5-4d4b-84d2-a4fe5bf2c99f",
+      "Name": "createNewUserPassword",
+      "Label": "New user password",
+      "HelpText": "Password for the new user account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c7fd6115-ec4d-455b-b84b-d6eb19228140",
+      "Name": "createUserHostname",
+      "Label": "New user host name",
+      "HelpText": "Host name that the new user account is allowed to login from.  Enter % to allow the account to connect from anywhere.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "26090b1e-7f56-4f49-990d-5d8022417f13",
+      "Name": "createUseSSL",
+      "Label": "Use SSL",
+      "HelpText": "Check this box to force the use of SSL.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "f6ad5f4c-509a-4533-82d4-b9fad04988f3",
+      "Name": "mySqlAuthenticationMethod",
+      "Label": "MySQL Authentication Method",
+      "HelpText": "Authentication method used to connect with MySQL. Options include standard Username/Password, Windows Authentication, [AWS IAM Authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html), [Azure Managed Identity](https://docs.microsoft.com/en-us/azure/mysql/single-server/how-to-connect-with-managed-identity), and [Google Cloud IAM for Cloud SQL ](https://cloud.google.com/sql/docs/mysql/iam-overview)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS IAM\nusernamepassword|Username/password\nwindowsauthentication|Windows Authentication\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP IAM"
+      }
+    },
+    {
+      "Id": "5a8ca84d-ad02-46ac-b8f2-f19191fe9cc5",
+      "Name": "mysqlAdditionalParameters",
+      "Label": "Additional connection string parameters",
+      "HelpText": "A comma-delimited list of additional parameters to add to the connection string.  ex `AllowPublicKeyRetrieval=True`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-03-22T16:22:09.1240000Z",
+    "OctopusVersion": "2024.1.12087",
+    "Type": "ActionTemplate"
+  },
+  "Category": "mysql"
+}
diff --git a/src/step-templates/mysql-create-user/scriptbody.ps1 b/src/step-templates/mysql-create-user/scriptbody.ps1
new file mode 100644
index 000000000..773e3434c
--- /dev/null
+++ b/src/step-templates/mysql-create-user/scriptbody.ps1
@@ -0,0 +1,236 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserExists
+{
+	# Define parameters
+    param ($Hostname,
+    $Username)
+    
+	# Execute query
+    return Invoke-SqlQuery "SELECT * FROM mysql.user WHERE Host = '$Hostname' AND User = '$Username';" -ConnectionName $connectionName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Declare connection string
+$connectionString = "Server=$createMySQLServerName;Port=$createPort;"
+$connectionString = "Server=$createMySQLServerName;Port=$createMySQLServerPort;Uid=$createLoginWithAddUserRights;Pwd=$createLoginPasswordWithAddUserRights;"
+
+
+# Customize connection string based on authentication method
+switch ($mySqlAuthenticationMethod) {
+    "awsiam" {
+        # Region is part of the RDS endpoint, extract
+        $region = ($createMySQLServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $createLoginPasswordWithAddUserRights = (aws rds generate-db-auth-token --hostname $createMySQLServerName --region $region --port $createPort --username $createLoginWithAddUserRights)
+        
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$createLoginWithAddUserRights;Pwd=`"$createLoginPasswordWithAddUserRights`";"
+
+        break
+    }
+
+    "usernamepassword" {
+        # Append remaining portion of connection string
+        $connectionString += ";Uid=$createLoginWithAddUserRights;Pwd=`"$createLoginPasswordWithAddUserRights`";"
+        
+        break    
+    }
+
+    "windowsauthentication" {
+        # Append remaining portion of connection string
+        $connectionString += ";IntegratedSecurity=yes;Uid=$createLoginWithAddUserRights;"
+
+        break
+    }
+
+    "azuremanagedidentity" {
+        Write-Host "Generating Azure Managed Identity token ..."
+        $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true" }
+
+        $createLoginPasswordWithAddUserRights = $token.access_token
+
+        $connectionString += ";Uid=$createLoginWithAddUserRights;Pwd=`"$createLoginPasswordWithAddUserRights`";"
+
+        break
+    }
+
+    "gcpserviceaccount" {
+        # Define header
+        $header = @{ "Metadata-Flavor" = "Google" }
+
+        # Retrieve service accounts
+        $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+        # Results returned in plain text format, get into array and remove empty entries
+        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+        # Retreive the specific service account assigned to the VM
+        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains("iam.gserviceaccount.com") }
+
+        if ([string]::IsNullOrWhiteSpace(($createLoginWithAddUserRights)))
+        {
+                $createLoginWithAddUserRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+        }
+
+        Write-Host "Generating GCP IAM token ..."
+        # Retrieve token for account
+        $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+        
+        $createLoginPasswordWithAddUserRights = $token.access_token
+        $connectionString += ";Uid=$createLoginWithAddUserRights;Pwd=`"$createLoginPasswordWithAddUserRights`";"
+
+        break
+    }
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+try
+{
+	# Connect to MySQL
+    if ($createUseSSL -eq "True")
+    {
+    	# Append to connection string
+        $connectionString += "SslMode=Required;"
+    }
+    else
+    {
+    	# Disable ssl
+        $connectionString += "SslMode=none;"
+    }
+
+    if (![string]::IsNullOrWhitespace($mysqlAdditionalParameters))
+    {
+      foreach ($parameter in $mysqlAdditionalParameters.Split(","))
+      {
+          # Check for delimiter
+          if (!$connectionString.EndsWith(";") -and !$parameter.StartsWith(";"))
+          {
+              # Append delimeter
+              $connectionString +=";"
+          }
+
+          $connectionString += $parameter.Trim()
+      }
+    }
+
+	Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName
+    
+    # See if database exists
+    $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername
+
+    if ($userExists -eq $null)
+    {
+        # Create database
+        Write-Output "Creating user $createNewUsername ..."
+        $executionResults = Invoke-SqlUpdate "CREATE USER '$createNewUsername'@'$createUserHostname' IDENTIFIED BY '$createNewUserPassword';" -ConnectionName $connectionName
+
+        # See if it was created
+        $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername
+            
+        # Check array
+        if ($userExists -ne $null)
+        {
+            # Success
+            Write-Output "$createNewUsername created successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "$createNewUsername was not created!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $createNewUsername on $createUserHostname already exists."
+    }
+}
+finally
+{
+	# Close connection if open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+    	Close-SqlConnection -ConnectionName $connectionName
+    }
+}
diff --git a/src/step-templates/mysql-execute-command/metadata.json b/src/step-templates/mysql-execute-command/metadata.json
new file mode 100644
index 000000000..06dd3181f
--- /dev/null
+++ b/src/step-templates/mysql-execute-command/metadata.json
@@ -0,0 +1,116 @@
+{
+  "Id": "f035cbb1-3400-4808-bfde-d5a8aaf36cf1",
+  "Name": "MySQL - Execute Command",
+  "Description": "Enables ad-hoc command execution on a MySQL server",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Author": "coryreid",
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "c1126889-66f0-4bcf-8fca-8164097e73ee",
+      "Name": "mySqlServerName",
+      "Label": "Server",
+      "HelpText": "Hostname (or IP) of the MySQL database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "28f4f93c-c6a0-40fd-a0db-5d6830c9779a",
+      "Name": "mySqlAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the MySQL server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "a8563d9f-6ce3-4965-9f04-9fab03ec9385",
+      "Name": "mySqlUsername",
+      "Label": "Username",
+      "HelpText": "Username to use for the connection",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "19693759-b161-454f-86cc-535788da366e",
+      "Name": "mySqlPassword",
+      "Label": "Password",
+      "HelpText": "Password for the user account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "a5e1378b-990a-4ffe-a675-16d6c5f6b802",
+      "Name": "mySqlDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to execute against.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b2206d1e-cf1e-4305-b58a-0abf835ccc9a",
+      "Name": "mySqlServerPort",
+      "Label": "Server Port",
+      "HelpText": "Port for the database instance.",
+      "DefaultValue": "3306",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fda16aec-ebcc-47f2-9294-7b37b985209c",
+      "Name": "mySqlTrustSSL",
+      "Label": "Trust SSL Certificate",
+      "HelpText": "Force trusting an SSL Certificate.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "786d615c-e7cd-4f1d-adb0-7787bd26c476",
+      "Name": "mySqlCommandTimeout",
+      "Label": "Command Timeout",
+      "HelpText": "Timeout value (in seconds) for SQL commands.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0b10867f-b061-4cab-8044-175e6469e1e1",
+      "Name": "mySqlCommand",
+      "Label": "Command",
+      "HelpText": "SQL statement(s) to execute.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2022-06-22T18:37:20.8470000Z",
+    "OctopusVersion": "2022.3.1455",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "coryreid",
+  "Category": "mysql"
+}
diff --git a/src/step-templates/mysql-execute-command/scriptbody.ps1 b/src/step-templates/mysql-execute-command/scriptbody.ps1
new file mode 100644
index 000000000..4c3ea1e35
--- /dev/null
+++ b/src/step-templates/mysql-execute-command/scriptbody.ps1
@@ -0,0 +1,164 @@
+# Define functions
+function Get-ModuleInstalled {
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {
+        # It is installed
+        return $true
+    }
+    else {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule {
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+    # Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+        # Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true) {
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true) {
+    # Use specific version
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Get whether trust certificate is necessary
+$mySqlTrustSSL = [System.Convert]::ToBoolean("$mySqlTrustSSL")
+
+try {
+    # Declare initial connection string
+    $connectionString = "Server=$mySqlServerName;Port=$mySqlServerPort;Database=$mySqlDatabaseName;"
+    
+    # Check to see if we need to trust the ssl cert
+    if ($mySqlTrustSSL -eq $true) {
+        # Append SSL connection string components
+        $connectionString += "SslMode=Required;"
+    }
+
+    # Update the connection string based on authentication method
+    switch ($mySqlAuthenticationMethod) {
+        "azuremanagedidentity" {
+            # Get login token
+            Write-Host "Generating Azure Managed Identity token ..."
+            $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true" }
+            
+            # Append remaining portion of connection string
+            $connectionString += ";Uid=$mySqlUsername;Pwd=`"$($token.access_token)`";"
+            
+            break
+        }
+        "awsiam" {
+            # Region is part of the RDS endpoint, extract
+            $region = ($mySqlServerName.Split("."))[2]
+
+            Write-Host "Generating AWS IAM token ..."
+            $mySqlPassword = (aws rds generate-db-auth-token --hostname $mySqlServerName --region $region --port $mySqlServerPort --username $mySqlUsername)
+
+            # Append remaining portion of connection string
+            $connectionString += ";Uid=$mySqlUsername;Pwd=`"$mySqlPassword`";"
+
+            break
+        }
+        "gcpserviceaccount" {
+            # Define header
+            $header = @{ "Metadata-Flavor" = "Google" }
+
+            # Retrieve service accounts
+            $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+            # Results returned in plain text format, get into array and remove empty entries
+            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+            # Retreive the specific service account assigned to the VM
+            $serviceAccount = $serviceAccounts | Where-Object { $_.Contains("iam.gserviceaccount.com") }
+
+            Write-Host "Generating GCP IAM token ..."
+            # Retrieve token for account
+            $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+            
+            # Check to see if there was a username provided
+            if ([string]::IsNullOrWhitespace($mySqlUsername)) {
+                # Use the service account name, but strip off the .gserviceaccount.com part
+                $mySqlUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+            }
+
+            # Append remaining portion of connection string
+            $connectionString += ";Uid=$mySqlUsername;Pwd=`"$($token.access_token)`";"
+
+            break
+        }
+        "usernamepassword" {
+            # Append remaining portion of connection string
+            $connectionString += ";Uid=$mySqlUsername;Pwd=`"$mySqlPassword`";"
+
+            break    
+        }
+
+        "windowsauthentication" {
+            # Append remaining portion of connection string
+            $connectionString += ";Integrated Security=True;"
+        }
+    }
+
+    # Open connection
+    Open-MySqlConnection -ConnectionString $connectionString
+
+    # Execute the statement
+    $executionResult = Invoke-SqlUpdate -Query "$mySqlCommand" -CommandTimeout $mySqlCommandTimeout
+    
+    # Display the result
+    Get-SqlMessage
+}
+finally {
+    Close-SqlConnection
+}
+
+
diff --git a/src/step-templates/netscaler-adc-enable-or-disable-service/metadata.json b/src/step-templates/netscaler-adc-enable-or-disable-service/metadata.json
new file mode 100644
index 000000000..56fafe25f
--- /dev/null
+++ b/src/step-templates/netscaler-adc-enable-or-disable-service/metadata.json
@@ -0,0 +1,87 @@
+{
+  "Id": "1bd58988-3e56-4cfb-8f87-3769024fcdc3",
+  "Name": "NetScaler ADC - Enable or Disable Service",
+  "Description": "Enables or disables a load balancing service i Citrix NetScaler ADC. For documentation, see https://github.com/jnus/NetScalerPSLib\n",
+  "ActionType": "Octopus.Script",
+  "Version": 21,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "EnableOrDisable",
+      "Label": "Service status",
+      "HelpText": "Option whether to disable og enable a Load Balancing Service",
+      "DefaultValue": "enable",
+      "DisplaySettings": {
+        "Octopus.SelectOptions": "enable|Enable\ndisable|Disable",
+        "Octopus.ControlType": "Select"
+      }
+    },
+    {
+      "Name": "ServiceName",
+      "Label": "LB Service Name",
+      "HelpText": "Load Balancing Service Name to enable or diable",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "HostName",
+      "Label": "NetScaler ADC host name",
+      "HelpText": "Address of the primary NetScaler ADC instance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "NetScaler ADC username",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "NetScaler ADC password",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Graceful",
+      "Label": "Graceful shutdown",
+      "HelpText": "The service is disabled only when all the current active client connections are closed by either the server or the client",
+      "DefaultValue": "Yes",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "YES|Yes\nNO|No"
+      }
+    },
+    {
+      "Name": "GracefulDelay",
+      "Label": "Graceful Delay (s)",
+      "HelpText": "The time in seconds after which the service is marked as OUT OF SERVICE.",
+      "DefaultValue": "300",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-01-29T13:49:05.6090000-08:00",
+  "LastModifiedBy": "jasper@sovs.net",
+  "$Meta": {
+    "ExportedAt": "2015-01-29T13:49:10.2340000-08:00",
+    "OctopusVersion": "2.6.0.778",
+    "Type": "ActionTemplate"
+  },
+  "Category": "netScaler"
+}
diff --git a/src/step-templates/netscaler-adc-enable-or-disable-service/scriptbody.ps1 b/src/step-templates/netscaler-adc-enable-or-disable-service/scriptbody.ps1
new file mode 100644
index 000000000..3dec67b9c
--- /dev/null
+++ b/src/step-templates/netscaler-adc-enable-or-disable-service/scriptbody.ps1
@@ -0,0 +1,285 @@
+param(
+        [string]$NSAddress,
+        [string]$ServiceName,
+        [string]$Action,
+        [string]$NSUserName,
+        [string]$NSPassword,
+        [string]$NSProtocol
+)
+
+
+$ErrorActionPreference = "Stop"
+
+function Connect-NSAppliance {
+    <#
+    .SYNOPSIS
+        Connect to NetScaler Appliance
+    .DESCRIPTION
+        Connect to NetScaler Appliance. A custom web request session object will be returned
+    .PARAMETER NSAddress
+        NetScaler Management IP address
+    .PARAMETER NSName
+        NetScaler DNS name or FQDN
+    .PARAMETER NSUserName
+        UserName to access the NetScaler appliance
+    .PARAMETER NSPassword
+        Password to access the NetScaler appliance
+    .PARAMETER Timeout
+        Timeout in seconds to for the token of the connection to the NetScaler appliance. 900 is the default admin configured value.
+    .EXAMPLE
+         $Session = Connect-NSAppliance -NSAddress 10.108.151.1
+    .EXAMPLE
+         $Session = Connect-NSAppliance -NSName mynetscaler.mydomain.com
+    .OUTPUTS
+        CustomPSObject
+    .NOTES
+        Copyright (c) Citrix Systems, Inc. All rights reserved.
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory=$true,ParameterSetName='Address')] [string]$NSAddress,
+        [Parameter(Mandatory=$true,ParameterSetName='Name')] [string]$NSName,
+        [Parameter(Mandatory=$false)] [string]$NSUserName="nsroot",
+        [Parameter(Mandatory=$false)] [string]$NSPassword="nsroot",
+        [Parameter(Mandatory=$false)] [int]$Timeout=900
+    )
+    Write-Verbose "$($MyInvocation.MyCommand): Enter"
+
+    if ($PSCmdlet.ParameterSetName -eq 'Address') {
+        Write-Verbose "Validating IP Address"
+        $IPAddressObj = New-Object -TypeName System.Net.IPAddress -ArgumentList 0
+        if (-not [System.Net.IPAddress]::TryParse($NSAddress,[ref]$IPAddressObj)) {
+            throw "'$NSAddress' is an invalid IP address"
+        }
+        $nsEndpoint = $NSAddress
+    } elseif ($PSCmdlet.ParameterSetName -eq 'Name') {
+        $nsEndpoint = $NSName
+    }
+
+
+    $login = @{"login" = @{"username"=$NSUserName;"password"=$NSPassword;"timeout"=$Timeout}}
+    $loginJson = ConvertTo-Json $login
+
+    try {
+        Write-Verbose "Calling Invoke-RestMethod for login"
+        $response = Invoke-RestMethod -Uri "$($Script:NSURLProtocol)://$nsEndpoint/nitro/v1/config/login" -Body $loginJson -Method POST -SessionVariable saveSession -ContentType application/json
+
+        if ($response.severity -eq "ERROR") {
+            throw "Error. See response: `n$($response | fl * | Out-String)"
+        } else {
+            Write-Verbose "Response:`n$(ConvertTo-Json $response | Out-String)"
+        }
+    }
+    catch [Exception] {
+        throw $_
+    }
+
+
+    $nsSession = New-Object -TypeName PSObject
+    $nsSession | Add-Member -NotePropertyName Endpoint -NotePropertyValue $nsEndpoint -TypeName String
+    $nsSession | Add-Member -NotePropertyName WebSession  -NotePropertyValue $saveSession -TypeName Microsoft.PowerShell.Commands.WebRequestSession
+
+    Write-Verbose "$($MyInvocation.MyCommand): Exit"
+
+    return $nsSession
+}
+
+function Set-NSMgmtProtocol {
+    <#
+    .SYNOPSIS
+        Set $Script:NSURLProtocol, this will be used for all subsequent invocation of NITRO APIs
+    .DESCRIPTION
+        Set $Script:NSURLProtocol
+    .PARAMETER Protocol
+        Protocol, acceptable values are "http" and "https"
+    .EXAMPLE
+        Set-Protocol -Protocol https
+    .NOTES
+        Copyright (c) Citrix Systems, Inc. All rights reserved.
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory=$true)] [ValidateSet("http","https")] [string]$Protocol
+    )
+
+    Write-Verbose "$($MyInvocation.MyCommand): Enter"
+
+    $Script:NSURLProtocol = $Protocol
+
+    Write-Verbose "$($MyInvocation.MyCommand): Exit"
+}
+
+function Invoke-NSNitroRestApi {
+    <#
+    .SYNOPSIS
+        Invoke NetScaler NITRO REST API
+    .DESCRIPTION
+        Invoke NetScaler NITRO REST API
+    .PARAMETER NSSession
+        An existing custom NetScaler Web Request Session object returned by Connect-NSAppliance
+    .PARAMETER OperationMethod
+        Specifies the method used for the web request
+    .PARAMETER ResourceType
+        Type of the NS appliance resource
+    .PARAMETER ResourceName
+        Name of the NS appliance resource, optional
+    .PARAMETER Action
+        Name of the action to perform on the NS appliance resource
+    .PARAMETER Payload
+        Payload  of the web request, in hashtable format
+    .PARAMETER GetWarning
+        Switch parameter, when turned on, warning message will be sent in 'message' field and 'WARNING' value is set in severity field of the response in case there is a warning.
+        Turned off by default
+    .PARAMETER OnErrorAction
+        Use this parameter to set the onerror status for nitro request. Applicable only for bulk requests.
+        Acceptable values: "EXIT", "CONTINUE", "ROLLBACK", default to "EXIT"
+    .EXAMPLE
+        Invoke NITRO REST API to add a DNS Server resource.
+        $payload = @{ip="10.8.115.210"}
+        Invoke-NSNitroRestApi -NSSession $Session -OperationMethod POST -ResourceType dnsnameserver -Payload $payload -Action add
+    .OUTPUTS
+        Only when the OperationMethod is GET:
+        PSCustomObject that represents the JSON response content. This object can be manipulated using the ConvertTo-Json Cmdlet.
+    .NOTES
+        Copyright (c) Citrix Systems, Inc. All rights reserved.
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory=$true)] [PSObject]$NSSession,
+        [Parameter(Mandatory=$true)] [ValidateSet("DELETE","GET","POST","PUT")] [string]$OperationMethod,
+        [Parameter(Mandatory=$true)] [string]$ResourceType,
+        [Parameter(Mandatory=$false)] [string]$ResourceName,
+        [Parameter(Mandatory=$false)] [string]$Action,
+        [Parameter(Mandatory=$false)] [ValidateScript({$OperationMethod -eq "GET"})] [hashtable]$Arguments=@{},
+        [Parameter(Mandatory=$false)] [ValidateScript({$OperationMethod -ne "GET"})] [hashtable]$Payload=@{},
+        [Parameter(Mandatory=$false)] [switch]$GetWarning=$false,
+        [Parameter(Mandatory=$false)] [ValidateSet("EXIT", "CONTINUE", "ROLLBACK")] [string]$OnErrorAction="EXIT"
+    )
+
+    Write-Verbose "$($MyInvocation.MyCommand): Enter"
+
+    Write-Verbose "Building URI"
+    $uri = "$($Script:NSURLProtocol)://$($NSSession.Endpoint)/nitro/v1/config/$ResourceType"
+    if (-not [string]::IsNullOrEmpty($ResourceName)) {
+        $uri += "/$ResourceName"
+    }
+    if ($OperationMethod -ne "GET") {
+        if (-not [string]::IsNullOrEmpty($Action)) {
+            $uri += "?action=$Action"
+        }
+    } else {
+        if ($Arguments.Count -gt 0) {
+            $uri += "?args="
+            $argsList = @()
+            foreach ($arg in $Arguments.GetEnumerator()) {
+                $argsList += "$($arg.Name):$([System.Uri]::EscapeDataString($arg.Value))"
+            }
+            $uri += $argsList -join ','
+        }
+        #TODO: Add filter, view, and pagesize
+    }
+    Write-Verbose "URI: $uri"
+
+    if ($OperationMethod -ne "GET") {
+        Write-Verbose "Building Payload"
+        $warning = if ($GetWarning) { "YES" } else { "NO" }
+        $hashtablePayload = @{}
+        $hashtablePayload."params" = @{"warning"=$warning;"onerror"=$OnErrorAction;<#"action"=$Action#>}
+        $hashtablePayload.$ResourceType = $Payload
+        $jsonPayload = ConvertTo-Json $hashtablePayload -Depth ([int]::MaxValue)
+        Write-Verbose "JSON Payload:`n$jsonPayload"
+    }
+
+    try {
+        Write-Verbose "Calling Invoke-RestMethod"
+        $restParams = @{
+            Uri = $uri
+            ContentType = "application/json"
+            Method = $OperationMethod
+            WebSession = $NSSession.WebSession
+            ErrorVariable = "restError"
+        }
+
+        if ($OperationMethod -ne "GET") {
+            $restParams.Add("Body",$jsonPayload)
+        }
+
+        $response = Invoke-RestMethod @restParams
+
+        if ($response) {
+            if ($response.severity -eq "ERROR") {
+                throw "Error. See response: `n$($response | fl * | Out-String)"
+            } else {
+                Write-Verbose "Response:`n$(ConvertTo-Json $response | Out-String)"
+            }
+        }
+    }
+    catch [Exception] {
+        if ($ResourceType -eq "reboot" -and $restError[0].Message -eq "The underlying connection was closed: The connection was closed unexpectedly.") {
+            Write-Verbose "Connection closed due to reboot"
+        } else {
+            throw $_
+        }
+    }
+
+    Write-Verbose "$($MyInvocation.MyCommand): Exit"
+
+    if ($OperationMethod -eq "GET") {
+        return $response
+    }
+}
+
+$psver = $PSVersionTable.PSVersion.Major
+if ($psver -eq "1" -or $psver -eq "2") {
+    Write-Error "NetScaler ADC Enable Disable Service requires PowerShell v3 or newer. Installed version v$psver"
+    return -1
+}
+
+$NSAddress = $OctopusParameters['HostName']
+$NSUserName = $OctopusParameters['Username']
+$NSPassword = $OctopusParameters['Password']
+$NSProtocol="http"
+$Action = $OctopusParameters['EnableOrDisable']
+$ServiceName = $OctopusParameters['ServiceName']
+$GracefulShutdown = $OctopusParameters['Graceful']
+$GraceFulShutdownDelay = $OctopusParameters['GracefulDelay']
+
+if(!$NSAddress) {
+    Write-Error "No NetScaler address specified. Please specify an address"
+    exit -2
+}
+
+if(!$NSUserName) {
+    Write-Error "No username specified. Please specify a username"
+    exit -2
+}
+
+if(!$NSPassword) {
+    Write-Error "No password specified. Please specify a password"
+    exit -2
+}
+
+if(!$Action) {
+    Write-Error "No action set. Action must either be enable or disable. Please select an action"
+    exit -2
+}
+
+if(!$GracefulShutdown) {
+    Write-Error "Graceful shutdown not selected. Must either be yes or no. Please select an option"
+    exit -2
+}
+
+if(!$ServiceName) {
+    Write-Error "Service name must be specified. Please specify service name"
+    exist -2
+}
+
+
+Set-NSMgmtProtocol -Protocol $NSProtocol
+$myNSSession = Connect-NSAppliance -NSAddress $NSAddress -NSUserName $NSUserName -NSPassword $NSPassword
+$payload = @{name=$ServiceName}
+if($Action -eq "disable") {
+    $payload = @{name=$ServiceName;graceful=$GracefulShutdown;delay=$GraceFulShutdownDelay}
+}
+
+Invoke-NSNitroRestApi -NSSession $myNSSession -OperationMethod POST -ResourceType service -Payload $payload -Action $Action
diff --git a/step-templates/network-add-ssl-certificate-binding.json b/src/step-templates/network-add-ssl-certificate-binding/metadata.json
similarity index 72%
rename from step-templates/network-add-ssl-certificate-binding.json
rename to src/step-templates/network-add-ssl-certificate-binding/metadata.json
index 0059729fd..c776f4d30 100644
--- a/step-templates/network-add-ssl-certificate-binding.json
+++ b/src/step-templates/network-add-ssl-certificate-binding/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$hostnameport = $OctopusParameters['HostnamePort']\n$certhash = $OctopusParameters['CertHash']\n$appid = $OctopusParameters['AppId']\n$certstore = $OctopusParameters['CertStore']\n\n$delcert = \"http delete sslcert hostnameport=\"\"$hostnameport\"\"\"\nwrite-host \"Removing Cert: $delcert\"\n$delcert | netsh | out-host\n\n$addcert = \"http add sslcert hostnameport=\"\"$hostnameport\"\" certhash=\"\"$certhash\"\" appid=\"\"$appid\"\" certstore=$certstore\"\nwrite-host \"Creating Certificate Binding: $addcert\"\n$addcert | netsh | out-host",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.ScriptFileName": null,
@@ -50,12 +50,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2017-07-04T10:34:05.300Z",
+    "ExportedAt": "2017-07-04T10:34:05.3000000Z",
     "OctopusVersion": "3.3.14",
     "Type": "ActionTemplate"
   },
   "Category": "http"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/network-add-ssl-certificate-binding/scriptbody.ps1 b/src/step-templates/network-add-ssl-certificate-binding/scriptbody.ps1
new file mode 100644
index 000000000..bf4e34c98
--- /dev/null
+++ b/src/step-templates/network-add-ssl-certificate-binding/scriptbody.ps1
@@ -0,0 +1,12 @@
+$hostnameport = $OctopusParameters['HostnamePort']
+$certhash = $OctopusParameters['CertHash']
+$appid = $OctopusParameters['AppId']
+$certstore = $OctopusParameters['CertStore']
+
+$delcert = "http delete sslcert hostnameport=""$hostnameport"""
+write-host "Removing Cert: $delcert"
+$delcert | netsh | out-host
+
+$addcert = "http add sslcert hostnameport=""$hostnameport"" certhash=""$certhash"" appid=""$appid"" certstore=$certstore"
+write-host "Creating Certificate Binding: $addcert"
+$addcert | netsh | out-host
\ No newline at end of file
diff --git a/step-templates/network-add-url-reservation.json b/src/step-templates/network-add-url-reservation/metadata.json
similarity index 68%
rename from step-templates/network-add-url-reservation.json
rename to src/step-templates/network-add-url-reservation/metadata.json
index 1538d3942..d70982e76 100644
--- a/step-templates/network-add-url-reservation.json
+++ b/src/step-templates/network-add-url-reservation/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 11,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$url = $OctopusParameters['Url']\n$user = $OctopusParameters['User']\n$delegate = if ('True' -eq $OctopusParameters['Delegate']) { 'yes' } else { 'no'}\n\n$delacl = \"http delete urlacl url=$url\"\n$addacl = \"http add urlacl url=$url user=\"\"$user\"\" delegate=$delegate\"\n\nwrite-host \"Removing ACL: $delacl\"\n$delacl | netsh | out-host\n\nwrite-host \"Creating ACL: $addacl\"\n$addacl | netsh | out-host\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -38,12 +38,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-27T18:53:32.929+00:00",
+    "ExportedAt": "2014-05-27T11:53:32.9290000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "http"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/network-add-url-reservation/scriptbody.ps1 b/src/step-templates/network-add-url-reservation/scriptbody.ps1
new file mode 100644
index 000000000..cb028b0c7
--- /dev/null
+++ b/src/step-templates/network-add-url-reservation/scriptbody.ps1
@@ -0,0 +1,12 @@
+$url = $OctopusParameters['Url']
+$user = $OctopusParameters['User']
+$delegate = if ('True' -eq $OctopusParameters['Delegate']) { 'yes' } else { 'no'}
+
+$delacl = "http delete urlacl url=$url"
+$addacl = "http add urlacl url=$url user=""$user"" delegate=$delegate"
+
+write-host "Removing ACL: $delacl"
+$delacl | netsh | out-host
+
+write-host "Creating ACL: $addacl"
+$addacl | netsh | out-host
diff --git a/src/step-templates/newrelic-complete-deployment/metadata.json b/src/step-templates/newrelic-complete-deployment/metadata.json
new file mode 100644
index 000000000..1f4e8df64
--- /dev/null
+++ b/src/step-templates/newrelic-complete-deployment/metadata.json
@@ -0,0 +1,56 @@
+{
+  "Id": "7c88ea1e-de71-452d-be7e-b99dda397ba7",
+  "Name": "New Relic - Complete Deployment",
+  "Description": "Notifies [New Relic](https://newrelic.com) of a deployment.\nSends the revision/version number, deployer, etc from the Octopus deployment.",
+  "ActionType": "Octopus.Script",
+  "Version": 27,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "caf3f015-671f-4600-bce0-ebcc7d5957fe",
+      "Name": "ApiKey",
+      "Label": "Api Key",
+      "HelpText": "Your New Relic API key.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3748da93-614d-4040-8c63-7c86a260c79e",
+      "Name": "AppId",
+      "Label": "App ID",
+      "HelpText": "The ID of the application in New Relic RPM.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "719ab099-a361-4a58-ad34-b1d4acb70dd2",
+      "Name": "User",
+      "Label": "User (optional)",
+      "HelpText": "The name of the user/process that triggered this deployment.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2024-04-16T10:50:00.0000000-07:00",
+  "LastModifiedBy": "Softer",
+  "$Meta": {
+    "ExportedAt": "2024-04-16T10:50:00.0000000-07:00",
+    "OctopusVersion": "2019.12.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "newrelic"
+}
diff --git a/src/step-templates/newrelic-complete-deployment/scriptbody.ps1 b/src/step-templates/newrelic-complete-deployment/scriptbody.ps1
new file mode 100644
index 000000000..aa71f2fb3
--- /dev/null
+++ b/src/step-templates/newrelic-complete-deployment/scriptbody.ps1
@@ -0,0 +1,111 @@
+# Minimum PowerShell version for ConvertTo-Json is 3
+
+Add-Type -AssemblyName System.Web
+
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12
+
+$apiKey = $OctopusParameters['ApiKey']
+$user = $OctopusParameters['User']
+$appId = $OctopusParameters['AppId']
+
+#https://octopus.com/docs/deployment-process/variables/system-variables
+$releaseNumber = $OctopusParameters['Octopus.Release.Number']
+$releaseNotes = $OctopusParameters['Octopus.Release.Notes']
+$machineName = $OctopusParameters['Octopus.Machine.Name']
+$projectName = $OctopusParameters['Octopus.Project.Name']
+$deploymentLink = $OctopusParameters['Octopus.Web.DeploymentLink']
+
+## --------------------------------------------------------------------------------------
+## Helpers
+## --------------------------------------------------------------------------------------
+# Helper for validating input parameters
+function Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {
+  Write-Host "${parameterName}: $foo"
+  if (! $foo) {
+    throw "No value was set for $parameterName, and it cannot be empty"
+  }
+
+  if ($validInput) {
+    if (! $validInput -contains $foo) {
+      throw "'$input' is not a valid input for '$parameterName'"
+    }
+  }
+}
+
+## --------------------------------------------------------------------------------------
+## Configuration
+## --------------------------------------------------------------------------------------
+Validate-Parameter $apiKey -parameterName "Api Key"
+
+if (!$appId) {
+  Write-Host "NewRelic Deploy - AppId has not been set yet. Skipping call to API."
+  exit 0
+}
+
+if ($appId -eq 0) {
+  Write-Host "NewRelic Deploy - AppId has been set to zero. Skipping call to API."
+  exit 0
+}
+
+$userText = $((" by user $user", "")[!$user])
+Write-Host ("NewRelic Deploy - Notify deployment{0} - App {1} - Revision {2}" -f $userText, $appId, $revision)
+
+
+# https://rpm.newrelic.com/api/explore/application_deployments/create?application_id=1127348
+$deployment = New-Object -TypeName PSObject
+$deployment | Add-Member -MemberType NoteProperty -Name "user" -Value $user
+$deployment | Add-Member -MemberType NoteProperty -Name "revision" -Value $releaseNumber
+$deployment | Add-Member -MemberType NoteProperty -Name "changelog" -Value $releaseNotes
+$deployment | Add-Member -MemberType NoteProperty -Name "description" -Value "Octopus deployment of $projectName to $machineName. ($deploymentLink)"
+
+$deploymentContainer = New-Object -TypeName PSObject
+$deploymentContainer | Add-Member -MemberType NoteProperty -Name "deployment" -Value $deployment
+
+$post = $deploymentContainer | ConvertTo-Json
+Write-Debug $post
+
+# in production, we need to
+#Create a URI instance since the HttpWebRequest.Create Method will escape the URL by default.
+$URL = "https://api.newrelic.com/v2/applications/$appId/deployments.json"
+$URI = New-Object System.Uri($URL,$true)
+
+#Create a request object using the URI
+$request = [System.Net.HttpWebRequest]::Create($URI)
+$request.Method = "POST"
+$request.Headers.Add("X-Api-Key","$apiKey");
+$request.ContentType = "application/json"
+
+#Build up a nice User Agent
+$request.UserAgent = $(
+"{0} (PowerShell {1}; .NET CLR {2}; {3})" -f $UserAgent,
+$(if($Host.Version){$Host.Version}else{"1.0"}),
+[Environment]::Version,
+[Environment]::OSVersion.ToString().Replace("Microsoft Windows ", "Win")
+)
+$ReturnCode = 0
+try {
+  Write-Host "Posting data to $URL"
+  #Create a new stream writer to write the xml to the request stream.
+  $stream = New-Object IO.StreamWriter $request.GetRequestStream()
+  $stream.AutoFlush = $True
+  $PostStr = [System.Text.Encoding]::UTF8.GetBytes($Post)
+  $stream.Write($PostStr, 0,$PostStr.length)
+  $stream.Close()
+
+  #Make the request and get the response
+  $response = $request.GetResponse()
+
+  if ([int]$response.StatusCode -eq 201) {
+    Write-Host "NewRelic Deploy - API called succeeded - HTTP $($response.StatusCode)."
+  } else {
+    Write-Host "NewRelic Deploy - API called failed - HTTP $($response.StatusCode)."
+    $ReturnCode = 1
+  }
+  $response.Close()
+} catch {
+  $ErrorMessage = $_.Exception.Message
+  $res = $_.Exception.Response
+  Write-Host "NewRelic Deploy - API called failed - $ErrorMessage"
+  $ReturnCode = 1
+}
+exit $ReturnCode
diff --git a/step-templates/nssm-windows-service-create.json b/src/step-templates/nssm-windows-service-create/metadata.json
similarity index 56%
rename from step-templates/nssm-windows-service-create.json
rename to src/step-templates/nssm-windows-service-create/metadata.json
index 3756bc203..c28d50ed2 100644
--- a/step-templates/nssm-windows-service-create.json
+++ b/src/step-templates/nssm-windows-service-create/metadata.json
@@ -8,14 +8,14 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$serviceStopStepAdded = $OctopusParameters['ServiceStopStepAdded']\r\n$serviceName = $OctopusParameters['ServiceNameValue']\r\n$displayName = $OctopusParameters['ServiceDisplayNameValue']\r\n$startupType = $OctopusParameters['StartupTypeValue']\r\n$description = $OctopusParameters['ServiceDescriptionValue']\r\n$serviceExecutable = $OctopusParameters['ServiceExecutableValue']\r\n$serviceExecutableArgs = $OctopusParameters['serviceExecutableArgsValue']\r\n$serviceAppDirectory = $OctopusParameters['ServiceAppDirectoryValue']\r\n$serviceUserAccount = $OctopusParameters['serviceUserAccountValue']\r\n$serviceUserPassword = $OctopusParameters['serviceUserPasswordValue']\r\n$dependsOn = $OctopusParameters['DependsOnValue']\r\n$serviceErrorLogFile = $OctopusParameters['serviceErrorLogFileValue']\r\n$serviceOutputLogFile = $OctopusParameters['serviceOutputLogFileValue']\r\n$nssmExecutable = $OctopusParameters['NSSMExecutableValue']\r\n\r\nif($serviceStopStepAdded -ne 'True'){\r\n    Write-Host Please add a step to stop the windows service as the first step!\r\n    Write-Host If already added, make sure to check the checkbox - Step to stop service added as first step? - in NSSM Windows Service Setup\r\n    return\r\n}\r\n\r\nWrite-Host Installing service $serviceName -foreground \"green\"\r\nWrite-Host \"NSSM path\" $serviceAppDirectory\r\nWrite-Host $serviceName\r\nWrite-Host $serviceExecutable\r\nWrite-Host $serviceExecutableArgs\r\nWrite-Host $serviceAppDirectory\r\nWrite-Host $serviceErrorLogFile\r\nWrite-Host $serviceOutputLogFile\r\nWrite-Host $serviceUserAccount\r\nWrite-Host $serviceUserPassword\r\n\r\npush-location\r\nSet-Location $serviceAppDirectory\r\n\r\n$service = Get-Service $serviceName -ErrorAction SilentlyContinue\r\n\r\nif($service) {\r\n    Write-host service $service.Name is $service.Status\r\n    Write-Host Removing $serviceName service   \r\n    if($service.Status -ne 'Stopped'){\r\n        &$nssmExecutable stop $serviceName\r\n    }\r\n    &$nssmExecutable remove $serviceName confirm\r\n}\r\n\r\nWrite-Host Installing $serviceName as a service\r\n&$nssmExecutable install $serviceName $serviceExecutable $serviceExecutableArgs\r\n\r\nif($displayName){\r\n    &$nssmExecutable set $serviceName DisplayName $displayName\r\n} \r\n\r\nif($startupType){\r\n    &$nssmExecutable set $serviceName Start $startupType\r\n}\r\n\r\nif($description){\r\n    &$nssmExecutable set $serviceName Description $description\r\n}\r\n\r\nif($dependsOn){\r\n    &$nssmExecutable set $serviceName DependOnService $dependsOn\r\n}\r\n\r\n# setting log file \r\nif($serviceErrorLogFile){\r\n    &$nssmExecutable set $serviceName AppStderr $serviceErrorLogFile\r\n    &$nssmExecutable set $serviceName AppStderrCreationDisposition 2\r\n}\r\n\r\nif($serviceOutputLogFile){\r\n    &$nssmExecutable set $serviceName AppStdout $serviceOutputLogFile\r\n    &$nssmExecutable set $serviceName AppStdoutCreationDisposition 2\r\n}\r\n\r\n# setting app directory\r\nif($serviceAppDirectory) {\r\n    Write-host setting app directory to $serviceAppDirectory -foreground \"green\"\r\n    &$nssmExecutable set $serviceName AppDirectory $serviceAppDirectory\r\n}\r\n\r\n# setting user account\r\nif($serviceUserAccount -And $serviceUserPassword) {\r\n    &$nssmExecutable set $serviceName ObjectName $serviceUserAccount $serviceUserPassword\r\n}\r\n\r\n#start service right away\r\n&$nssmExecutable start $serviceName\r\npop-location",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": "",
     "Octopus.Action.Package.FeedId": "",
     "Octopus.Action.Package.PackageId": ""
   },
   "SensitiveProperties": {},
   "Parameters": [
-	{
+    {
       "Name": "ServiceStopStepAdded",
       "Label": "Step to stop service added as first step?",
       "HelpText": "Ensure that a step to stop the service added as first step",
@@ -23,7 +23,7 @@
       "DisplaySettings": {
         "Octopus.ControlType": "Checkbox"
       }
-    },  
+    },
     {
       "Name": "ServiceNameValue",
       "Label": "ServiceName",
@@ -142,12 +142,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2017-05-12T22:50:12.920+00:00",
+  "LastModifiedOn": "2017-05-12T15:50:12.9200000-07:00",
   "LastModifiedBy": "1FastSTi",
   "$Meta": {
-    "ExportedAt": "2017-05-12T22:50:16.405Z",
+    "ExportedAt": "2017-05-12T22:50:16.4050000Z",
     "OctopusVersion": "2.6.4.951",
     "Type": "ActionTemplate"
   },
-  "Category": "windows"  
+  "Category": "windows"
 }
diff --git a/src/step-templates/nssm-windows-service-create/scriptbody.ps1 b/src/step-templates/nssm-windows-service-create/scriptbody.ps1
new file mode 100644
index 000000000..81dd0a447
--- /dev/null
+++ b/src/step-templates/nssm-windows-service-create/scriptbody.ps1
@@ -0,0 +1,90 @@
+$serviceStopStepAdded = $OctopusParameters['ServiceStopStepAdded']
+$serviceName = $OctopusParameters['ServiceNameValue']
+$displayName = $OctopusParameters['ServiceDisplayNameValue']
+$startupType = $OctopusParameters['StartupTypeValue']
+$description = $OctopusParameters['ServiceDescriptionValue']
+$serviceExecutable = $OctopusParameters['ServiceExecutableValue']
+$serviceExecutableArgs = $OctopusParameters['serviceExecutableArgsValue']
+$serviceAppDirectory = $OctopusParameters['ServiceAppDirectoryValue']
+$serviceUserAccount = $OctopusParameters['serviceUserAccountValue']
+$serviceUserPassword = $OctopusParameters['serviceUserPasswordValue']
+$dependsOn = $OctopusParameters['DependsOnValue']
+$serviceErrorLogFile = $OctopusParameters['serviceErrorLogFileValue']
+$serviceOutputLogFile = $OctopusParameters['serviceOutputLogFileValue']
+$nssmExecutable = $OctopusParameters['NSSMExecutableValue']
+
+if($serviceStopStepAdded -ne 'True'){
+    Write-Host Please add a step to stop the windows service as the first step!
+    Write-Host If already added, make sure to check the checkbox - Step to stop service added as first step? - in NSSM Windows Service Setup
+    return
+}
+
+Write-Host Installing service $serviceName -foreground "green"
+Write-Host "NSSM path" $serviceAppDirectory
+Write-Host $serviceName
+Write-Host $serviceExecutable
+Write-Host $serviceExecutableArgs
+Write-Host $serviceAppDirectory
+Write-Host $serviceErrorLogFile
+Write-Host $serviceOutputLogFile
+Write-Host $serviceUserAccount
+Write-Host $serviceUserPassword
+
+push-location
+Set-Location $serviceAppDirectory
+
+$service = Get-Service $serviceName -ErrorAction SilentlyContinue
+
+if($service) {
+    Write-host service $service.Name is $service.Status
+    Write-Host Removing $serviceName service   
+    if($service.Status -ne 'Stopped'){
+        &$nssmExecutable stop $serviceName
+    }
+    &$nssmExecutable remove $serviceName confirm
+}
+
+Write-Host Installing $serviceName as a service
+&$nssmExecutable install $serviceName $serviceExecutable $serviceExecutableArgs
+
+if($displayName){
+    &$nssmExecutable set $serviceName DisplayName $displayName
+} 
+
+if($startupType){
+    &$nssmExecutable set $serviceName Start $startupType
+}
+
+if($description){
+    &$nssmExecutable set $serviceName Description $description
+}
+
+if($dependsOn){
+    &$nssmExecutable set $serviceName DependOnService $dependsOn
+}
+
+# setting log file 
+if($serviceErrorLogFile){
+    &$nssmExecutable set $serviceName AppStderr $serviceErrorLogFile
+    &$nssmExecutable set $serviceName AppStderrCreationDisposition 2
+}
+
+if($serviceOutputLogFile){
+    &$nssmExecutable set $serviceName AppStdout $serviceOutputLogFile
+    &$nssmExecutable set $serviceName AppStdoutCreationDisposition 2
+}
+
+# setting app directory
+if($serviceAppDirectory) {
+    Write-host setting app directory to $serviceAppDirectory -foreground "green"
+    &$nssmExecutable set $serviceName AppDirectory $serviceAppDirectory
+}
+
+# setting user account
+if($serviceUserAccount -And $serviceUserPassword) {
+    &$nssmExecutable set $serviceName ObjectName $serviceUserAccount $serviceUserPassword
+}
+
+#start service right away
+&$nssmExecutable start $serviceName
+pop-location
\ No newline at end of file
diff --git a/step-templates/octopus-add-runbook-to-project-azure.json b/src/step-templates/octopus-add-runbook-to-project-azure/metadata.json
similarity index 99%
rename from step-templates/octopus-add-runbook-to-project-azure.json
rename to src/step-templates/octopus-add-runbook-to-project-azure/metadata.json
index 60ebfdec7..6bcbe97d1 100644
--- a/step-templates/octopus-add-runbook-to-project-azure.json
+++ b/src/step-templates/octopus-add-runbook-to-project-azure/metadata.json
@@ -174,7 +174,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-12-20T23:32:58.875Z",
+    "ExportedAt": "2023-12-20T23:32:58.8750000Z",
     "OctopusVersion": "2024.1.5406",
     "Type": "ActionTemplate"
   },
diff --git a/step-templates/octopus-apply-octoterra-module-azure.json b/src/step-templates/octopus-apply-octoterra-module-azure/metadata.json
similarity index 99%
rename from step-templates/octopus-apply-octoterra-module-azure.json
rename to src/step-templates/octopus-apply-octoterra-module-azure/metadata.json
index 496a98be6..cb7a71929 100644
--- a/step-templates/octopus-apply-octoterra-module-azure.json
+++ b/src/step-templates/octopus-apply-octoterra-module-azure/metadata.json
@@ -164,7 +164,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-12-20T23:12:15.992Z",
+    "ExportedAt": "2023-12-20T23:12:15.9920000Z",
     "OctopusVersion": "2024.1.5406",
     "Type": "ActionTemplate"
   },
diff --git a/step-templates/octopus-apply-octoterra-module-s3.json b/src/step-templates/octopus-apply-octoterra-module-s3/metadata.json
similarity index 99%
rename from step-templates/octopus-apply-octoterra-module-s3.json
rename to src/step-templates/octopus-apply-octoterra-module-s3/metadata.json
index c2914d795..583e25ffd 100644
--- a/step-templates/octopus-apply-octoterra-module-s3.json
+++ b/src/step-templates/octopus-apply-octoterra-module-s3/metadata.json
@@ -154,7 +154,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-10-11T09:11:08.244Z",
+    "ExportedAt": "2023-10-11T09:11:08.2440000Z",
     "OctopusVersion": "2023.4.5160",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/octopus-artifact-collect/metadata.json b/src/step-templates/octopus-artifact-collect/metadata.json
new file mode 100644
index 000000000..b6e3c99be
--- /dev/null
+++ b/src/step-templates/octopus-artifact-collect/metadata.json
@@ -0,0 +1,83 @@
+{
+  "Id": "7d09ccec-91b7-4c0c-95d7-27a42b21eb5a",
+  "Name": "Artifact Collect",
+  "Description": "Collect artifacts easily and safely.",
+  "ActionType": "Octopus.Script",
+  "Version": 15,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "1e50ae45-2a45-43c5-afdb-ac69f2527a37",
+      "Name": "shaloArtifactPath",
+      "Label": "Artifact path",
+      "HelpText": "Folder path or file full name\n\nExample: \n* C:\\somepath\n* C:\\somepath\\file.log",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bf2684fa-1ddf-4f46-9763-949962c543f3",
+      "Name": "shaloArtifactTempPath",
+      "Label": "Artifact temporal path",
+      "HelpText": "Temporal path that will use to compress files and mask sensitive data",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "380865db-7f30-43bc-9425-6af65a2b9e8d",
+      "Name": "shaloCompressionLevel",
+      "Label": "Compression Level",
+      "HelpText": null,
+      "DefaultValue": "Optimal",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Optimal|Optimal\nFastest|Fastest\nNoCompression|No Compression"
+      }
+    },
+    {
+      "Id": "5161cd62-df8b-4037-83b1-a674f695839b",
+      "Name": "shaloMaskFilers",
+      "Label": "Files with sensitive data",
+      "HelpText": "__Optional__\nComma separated file extensions witch contains sensitive data.\n\nExample: .txt, .config",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2a205ab4-1790-436e-b000-42706ea0524b",
+      "Name": "shaloMaskKeys",
+      "Label": "Keys words that will be masked",
+      "HelpText": "__Optional__\nComma separated sensitive words\n\nExample: username, password, 1234-4567-8912-3456",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "9a5036b8-dc0e-412a-a7ea-4aa2120d8e0d",
+      "Name": "shaloCollectedArtifactName",
+      "Label": "Collected artifact Name",
+      "HelpText": "Artifact Name\n\nExample: DeploymentLogs.#{Octopus.Release.Number}",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2019-05-29T23:09:57.3290000Z",
+    "OctopusVersion": "2019.3.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-artifact-collect/scriptbody.ps1 b/src/step-templates/octopus-artifact-collect/scriptbody.ps1
new file mode 100644
index 000000000..bc3ddd69c
--- /dev/null
+++ b/src/step-templates/octopus-artifact-collect/scriptbody.ps1
@@ -0,0 +1,111 @@
+try{
+    #region Types - Constants
+    Add-Type -assembly "system.io.compression.filesystem"
+    $shaloMaskString = '********'
+    #endregion
+
+    #region Params
+    $shaloArtifactPath = $OctopusParameters['shaloArtifactPath']
+    Write-Host "     Artifact path: [$shaloArtifactPath]"
+
+    $shaloCollectedArtifactName = $OctopusParameters['shaloCollectedArtifactName']
+    Write-Host "     Artifact name: [$shaloCollectedArtifactName]"
+
+    $shaloArtifactTempPath = $OctopusParameters['shaloArtifactTempPath']
+    if($shaloArtifactTempPath.Length -eq 0){
+        Write-Error "     Artifact Temporal path not set."
+        exit 1
+    }
+    Write-Host "     Artifact Temporal path: [$shaloArtifactTempPath]"
+
+    
+
+    $shaloCompressionLevel = $OctopusParameters['shaloCompressionLevel']
+    switch($shaloCompressionLevel) {
+        'Optimal' {$shaloCompressionLevel = [System.IO.Compression.CompressionLevel]::Optimal} 
+        'Fastest' {$shaloCompressionLevel = [System.IO.Compression.CompressionLevel]::Fastest} 
+        'NoCompression' {$shaloCompressionLevel = [System.IO.Compression.CompressionLevel]::NoCompression} 
+    }
+    Write-Host "     Artifact compresion Level: [$shaloCompressionLevel]"
+
+    $shaloMaskFilers = $OctopusParameters['shaloMaskFilers']
+    $shaloMaskKeys = $OctopusParameters['shaloMaskKeys']
+    if($shaloMaskFilers.Length -gt 0 -and $shaloMaskKeys.Length -gt 0){
+        Write-Host "     Scrub sensitive values from this file extensions : [$shaloMaskFilers]"
+        $shaloMaskFilers = $shaloMaskFilers.Split(',')
+        $shaloMaskKeys = $shaloMaskKeys.Split(',')
+    }
+    #endregion
+
+    
+    if(Test-Path -Path $shaloArtifactPath){
+        Write-Host ''
+        #region Create Temporal Artifact
+        $shaloArtifactObject = Get-Item $shaloArtifactPath
+        try{
+        	Write-Host '     Cleaning Artifact Temporal Folder'
+            Remove-Item -Path $shaloArtifactTempPath -Force -Recurse
+        }catch{
+        }
+        if($shaloArtifactObject.PSIsContainer){
+            Write-Host '     Artifact type: [Directory]'
+            Copy-Item -Path $shaloArtifactPath -Destination $shaloArtifactTempPath -Recurse -Force
+        }else{
+            Write-Host '     Artifact type: [File]'
+            New-Item -Path $shaloArtifactTempPath -Force -ItemType Directory
+            Copy-Item -Path $shaloArtifactObject.FullName -Destination ($shaloArtifactTempPath + "\" + $shaloArtifactObject.Name) -Force
+        }
+        Write-Host '     Temporal artifact created'
+        #endregion
+    
+        #region Apply Mask
+        Write-Host ''
+        Write-Host '     Masking sensitive data'
+        if($shaloMaskFilers.Length -gt 0 -and $shaloMaskKeys.Length -gt 0){
+            $shaloArtifactTempObjects = Get-ChildItem -Path $shaloArtifactTempPath -Force -Recurse
+            foreach($shaloItem in $shaloArtifactTempObjects){
+                if($shaloMaskFilers.Trim() -contains $shaloItem.Extension){
+                    foreach($ShaloKey in $shaloMaskKeys){
+                        (Get-Content $shaloItem.FullName) -replace $ShaloKey.Trim(), $shaloMaskString| Set-Content $shaloItem.FullName
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region Compress and Collect
+        Write-Host ''
+        Write-Host ''
+        Write-Host '     Compressing artifact...'
+        Write-Host "     Artifact Temporal Path [$shaloArtifactTempPath]"
+        Compress-Archive -Path $shaloArtifactTempPath -DestinationPath "$shaloArtifactTempPath\$shaloCollectedArtifactName.zip" -Force -CompressionLevel $shaloCompressionLevel
+        Write-Host '     Artifact compressed'
+       
+
+        Write-Host ''
+        Write-Host ''
+        Write-Host '     Collecting artifact...'
+        Write-Host "     Artifact Path [$shaloArtifactTempPath\$shaloCollectedArtifactName.zip]"
+        $Shalohash = Get-FileHash "$shaloArtifactTempPath\$shaloCollectedArtifactName.zip" -Algorithm MD5 | Select Hash
+        Write-Host '     MD5 hash [' $Shalohash.Hash ']'
+        New-OctopusArtifact -Path "$shaloArtifactTempPath\$shaloCollectedArtifactName.zip" -Name "$shaloCollectedArtifactName.zip"
+        Write-Host '     Artifact Collected'
+        
+        Write-Host ''
+        Write-Host ''
+    }else{
+        Write-Host ''
+        Write-Host ''
+        Write-Warning '     Artifact not found!'
+    }
+    
+        Write-Host ''
+        Write-Host ''
+        Write-Host 'Done!'
+
+}catch{
+    $ErrorMessage = $_.Exception.Message
+    $FailedItem = $_.Exception.ItemName
+    Write-Error "We failed to processing $FailedItem. The error message was $ErrorMessage"
+    exit 1
+}
\ No newline at end of file
diff --git a/src/step-templates/octopus-authenticate-with-oidc/metadata.json b/src/step-templates/octopus-authenticate-with-oidc/metadata.json
new file mode 100644
index 000000000..246058202
--- /dev/null
+++ b/src/step-templates/octopus-authenticate-with-oidc/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "97a36fb9-7b00-4608-866f-53fd459bcdea",
+  "Name": "Octopus - Authenticate with OIDC",
+  "Description": "**This step requires Octopus 2025.3.12525 or later.**\n<br /><br />\nThis step uses Octopus an [OpenID Connect](https://octopus.com/docs/infrastructure/accounts/openid-connect) Account to obtain an access token that can be used in place of an API key in requests against the Octopus API.\n<br /><br />\nThe access token is stored in an [Output Variable](https://octopus.com/docs/projects/variables/output-variables) named **AccessToken**.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "057c4820-9052-4d87-860e-4f4ef501fd4a",
+      "Name": "AuthenticateWithOIDC.ServerUri",
+      "Label": "Octopus Server Uri",
+      "HelpText": "The URI of the Octopus Server with which to authenticate.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dbcea301-baeb-4ae5-974e-3161695df254",
+      "Name": "AuthenticateWithOIDC.OidcAccount",
+      "Label": "OIDC Account",
+      "HelpText": "The Generic OIDC Account variable used to authenticate with the Octopus Server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "GenericOidcAccount"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-09-02T21:56:43.5190000Z",
+    "OctopusVersion": "2025.3.13248",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-authenticate-with-oidc/scriptbody.ps1 b/src/step-templates/octopus-authenticate-with-oidc/scriptbody.ps1
new file mode 100644
index 000000000..1939e836a
--- /dev/null
+++ b/src/step-templates/octopus-authenticate-with-oidc/scriptbody.ps1
@@ -0,0 +1,63 @@
+function Invoke-OctopusApi {
+  param(
+    $Uri,
+    $Method,
+    $Body
+  )
+
+  try {
+    Write-Verbose "Making request to $Uri"
+
+    if ($null -eq $Body)
+    {
+      Write-Verbose "No body to send in the request"
+      return Invoke-RestMethod -Method $method -Uri $Uri -ContentType "application/json; charset=utf-8"
+    } 
+
+  $Body = $Body | ConvertTo-Json -Depth 10
+  Write-Verbose $Body
+  
+    return Invoke-RestMethod -Uri $Uri -Method $Method -Body $Body -ContentType "application/json; charset=utf-8" -ErrorAction Stop
+  }
+  catch {
+    Write-Host "Request failed with message `"$($_.Exception.Message)`""
+
+    if ($_.Exception.Response) {
+        $code = $_.Exception.Response.StatusCode.value__
+        $message = $_.Exception.Message
+        Write-Host "HTTP response code: $code"
+
+        Write-Host "Server returned: $error"
+      }
+
+    Fail-Step "Failed to make $method request to $uri"
+  }
+}
+
+if ([string]::IsNullOrWhiteSpace($OctopusParameters["AuthenticateWithOIDC.ServerUri"])) {
+  Fail-Step "Octopus Server Uri is required."
+}
+
+if ([string]::IsNullOrWhiteSpace($OctopusParameters["AuthenticateWithOIDC.OidcAccount"])) {
+  Fail-Step "OIDC Account is required."
+}
+
+$server = $OctopusParameters["AuthenticateWithOIDC.ServerUri"]
+$serviceAccountId = $OctopusParameters["AuthenticateWithOIDC.OidcAccount.Audience"]
+$jwt = $OctopusParameters["AuthenticateWithOIDC.OidcAccount.OpenIdConnect.Jwt"]
+
+$body = @{
+  grant_type = "urn:ietf:params:oauth:grant-type:token-exchange";
+  audience = "$serviceAccountId";
+  subject_token_type = "urn:ietf:params:oauth:token-type:jwt";
+  subject_token = "$jwt"
+}
+
+$uri = "$server/.well-known/openid-configuration"
+$response = Invoke-OctopusApi -Uri $uri -Method "GET"
+$response = Invoke-OctopusApi -Uri $response.token_endpoint -Method "POST" -Body $body
+
+Set-OctopusVariable -name "AccessToken" -value $response.access_token -sensitive
+
+$stepName = $OctopusParameters["Octopus.Step.Name"]
+Write-Host "Created output variable: ##{Octopus.Action[$stepName].Output.AccessToken}"
\ No newline at end of file
diff --git a/src/step-templates/octopus-blue-green-check/metadata.json b/src/step-templates/octopus-blue-green-check/metadata.json
new file mode 100644
index 000000000..5fde64fa6
--- /dev/null
+++ b/src/step-templates/octopus-blue-green-check/metadata.json
@@ -0,0 +1,56 @@
+{
+  "Id": "72db001f-ae7f-4a0f-b952-5f80e2fc4cd2",
+  "Name": "Octopus - Check Blue Green Deployment",
+  "Description": "This step checks to ensure that deployments to blue/green environments alternate. The output variable `SequentialDeploy` is set to `True` if two deployments are done to the same environment, and `False` if they are alternating.\n\nA common scenario is to check for `SequentialDeploy` set to `True` and display a warning or the manual intervention step to confirm a deployment.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False"
+  },
+  "Parameters": [
+    {
+      "Id": "825689d8-f465-4887-a8fc-b03821c82910",
+      "Name": "BlueGreen.Octopus.Api.Key",
+      "Label": "The Octopus API key",
+      "HelpText": "Use the documentation at https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key to create an API key.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b2535aeb-ea47-413b-a387-f2bae47137bd",
+      "Name": "BlueGreen.Environment.Blue.Name",
+      "Label": "The name of the blue environment",
+      "HelpText": "This is the name of the environment in Octopus that represents the blue deployment stack. It will be something like `Production - Blue`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7049503a-b6a1-4ba4-b190-55b2f4508d85",
+      "Name": "BlueGreen.Environment.Green.Name",
+      "Label": "The name of the green environment",
+      "HelpText": "This is the name of the environment in Octopus that represents the green deployment stack. It will be something like `Production - Green`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-10-14T06:35:25.5150000Z",
+    "OctopusVersion": "2025.3.14357",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "Octopus"
+}
diff --git a/src/step-templates/octopus-blue-green-check/scriptbody.ps1 b/src/step-templates/octopus-blue-green-check/scriptbody.ps1
new file mode 100644
index 000000000..f65cd196f
--- /dev/null
+++ b/src/step-templates/octopus-blue-green-check/scriptbody.ps1
@@ -0,0 +1,128 @@
+# We assume that deployments to the production environments alternate between green and blue.
+# For example, if the last production deployment was to blue the next one should be to the green environment.
+# This check is used to provide a warning if a production environment is deployed to twice in a row.
+
+$octopusUrl = ""
+
+# Check to make sure targets have been created
+if ([string]::IsNullOrWhitespace("#{Octopus.Web.ServerUri}"))
+{
+    $octopusUrl = "#{Octopus.Web.BaseUrl}"
+}
+else
+{
+    $octopusUrl = "#{Octopus.Web.ServerUri}"
+}
+
+if (-not "#{BlueGreen.Octopus.Api.Key}".StartsWith("API-")) {
+    Write-Host "The BlueGreen.Octopus.Api.Key variable has not been defined. We can not validate the deployment environment."
+    Write-Highlight "See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys."
+    Write-Highlight "Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check for deployments to blue/green environments in this space."
+    exit 0
+}
+
+if ([string]::IsNullOrWhiteSpace("#{BlueGreen.Environment.Blue.Name}")) {
+    Write-Host "The BlueGreen.Environment.Blue.Name variable has not been defined. We can not validate the deployment environment."
+    exit 0
+}
+
+if ([string]::IsNullOrWhiteSpace("#{BlueGreen.Environment.Green.Name}")) {
+    Write-Host "The BlueGreen.Environment.Green.Name variable has not been defined. We can not validate the deployment environment."
+    exit 0
+}
+
+$header = @{ "X-Octopus-ApiKey" = "#{BlueGreen.Octopus.Api.Key}" }
+
+# Get environment ID
+$blueEnvironmentName = "#{BlueGreen.Environment.Blue.Name}"
+$blueEnvironments = Invoke-RestMethod -Uri "$octopusURL/api/#{Octopus.Space.Id}/environments?partialName=$([uri]::EscapeDataString($blueEnvironmentName))&skip=0&take=100" -Headers $header
+$blueEnvironment = $blueEnvironments.Items | Where-Object { $_.Name -eq $blueEnvironmentName } | Select-Object -First 1
+
+if ($null -eq $blueEnvironment) {
+    Write-Host "Could not find an environment called $blueEnvironmentName. We can not validate the deployment environment."
+    exit 0
+}
+
+$greenEnvironmentName = "#{BlueGreen.Environment.Green.Name}"
+$greenEnvironments = Invoke-RestMethod -Uri "$octopusURL/api/#{Octopus.Space.Id}/environments?partialName=$([uri]::EscapeDataString($greenEnvironmentName))&skip=0&take=100" -Headers $header
+$greenEnvironment = $greenEnvironments.Items | Where-Object { $_.Name -eq $greenEnvironmentName } | Select-Object -First 1
+
+if ($null -eq $greenEnvironment) {
+    Write-Host "Could not find an environment called $greenEnvironment. We can not validate the deployment environment."
+    exit 0
+}
+
+# Get deployments for the environment and project, excluding the current deployment
+$blueDeploymentsUri = "$octopusUrl/api/#{Octopus.Space.Id}/deployments?environments=$($blueEnvironment.Id)&projects=#{Octopus.Project.Id}&take=2"
+$blueLatestDeployment = Invoke-RestMethod -Uri $blueDeploymentsUri -Headers $header | Select-Object -ExpandProperty Items | Where-Object { $_.Id -ne "#{Octopus.Deployment.Id}" }
+
+$greenDeploymentsUri = "$octopusUrl/api/#{Octopus.Space.Id}/deployments?environments=$($greenEnvironment.Id)&projects=#{Octopus.Project.Id}&take=2"
+$greenLatestDeployment = Invoke-RestMethod -Uri $greenDeploymentsUri -Headers $header | Select-Object -ExpandProperty Items | Where-Object { $_.Id -ne "#{Octopus.Deployment.Id}" }
+
+# This is the first deployment to any environment. It doesn't matter which one we go to first.
+if ($greenLatestDeployment.Length -eq 0 -and $blueLatestDeployment.Length -eq 0) {
+    Write-Host "Neither environment has had a deployment, so we are OK to continue"
+    Set-OctopusVariable -name "SequentialDeploy" -value "False"
+    exit 0
+}
+
+if ("#{Octopus.Environment.Name}" -eq $blueEnvironmentName) {
+    if ($blueLatestDeployment.Length -eq 0)
+    {
+        Write-Host "We're deploying to blue and there are no blue deployments, so we're OK to continue"
+        Set-OctopusVariable -name "SequentialDeploy" -value "False"
+        exit 0
+    }
+
+    # We know we have deployed to blue at least once, but if we have never deployed to green
+    # then we should not continue.
+    if ($greenLatestDeployment.Length -eq 0)
+    {
+        Write-Host "We're deploying to blue but there are no green deployments, so we should not continue"
+        Set-OctopusVariable -name "SequentialDeploy" -value "True"
+        exit 0
+    }
+}
+
+if ("#{Octopus.Environment.Name}" -eq $greenEnvironmentName) {
+    if ($greenLatestDeployment.Length -eq 0)
+    {
+        Write-Host "We're deploying to green and there are no green deployments, so we're OK to continue"
+        Set-OctopusVariable -name "SequentialDeploy" -value "False"
+        exit 0
+    }
+
+    # We know we have deployed to green at least once, but if we have never deployed to blue
+    # then we should not continue.
+    if ($blueLatestDeployment.Length -eq 0)
+    {
+        Write-Host "We're deploying to green but there are no blue deployments, so we should not continue"
+        Set-OctopusVariable -name "SequentialDeploy" -value "True"
+        exit 0
+    }
+}
+
+# At this point both blue and green have done at least one deployment. We need to check
+# which environment had the last deployment.
+$blueLastDeploy = [DateTimeOffset]::Parse($blueLatestDeployment[0].Created)
+$greenLastDeploy = [DateTimeOffset]::Parse($greenLatestDeployment[0].Created)
+
+Write-Host "Blue Last Deploy: $blueLastDeploy"
+Write-Host "Green Last Deploy: $greenLastDeploy"
+
+# We now check to see if the current environment has had the last deployment. If so,
+# we have deployed to this environment twice in a row and we should block the deployment.
+if ("#{Octopus.Environment.Name}" -eq $blueEnvironmentName -and $blueLastDeploy -gt $greenLastDeploy) {
+    Write-Host "The last deployment was to the blue environment, so we should not deploy to it again."
+    Set-OctopusVariable -name "SequentialDeploy" -value "True"
+    exit 0
+}
+
+if ("#{Octopus.Environment.Name}" -eq $greenEnvironmentName -and $greenLastDeploy -gt $blueLastDeploy) {
+    Write-Host "The last deployment was to the green environment, so we should not deploy to it again."
+    Set-OctopusVariable -name "SequentialDeploy" -value "True"
+    exit 0
+}
+
+Write-Host "We're OK to continue with the deployment."
+Set-OctopusVariable -name "SequentialDeploy" -value "False"
\ No newline at end of file
diff --git a/step-templates/octopus-certificate-expiry-check.json b/src/step-templates/octopus-certificate-expiry-check/metadata.json
similarity index 58%
rename from step-templates/octopus-certificate-expiry-check.json
rename to src/step-templates/octopus-certificate-expiry-check/metadata.json
index 9d8742dc5..a0ddc645b 100644
--- a/step-templates/octopus-certificate-expiry-check.json
+++ b/src/step-templates/octopus-certificate-expiry-check/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction Get-OctopusCertificates {\n    Write-Debug \"Entering: Get-OctopusCertificates\"\n\n    $octopus_uri = $OctopusParameters[\"Certificate.Expiry.Check.OctopusServerUrl\"].Trim('/')\n    $octopus_space_id = $OctopusParameters[\"Octopus.Space.Id\"]\n    $octopus_headers = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"Certificate.Expiry.Check.ApiKey\"] }\n    $octopus_certificates_uri = \"$octopus_uri/api/$octopus_space_id/certificates?search=$($OctopusParameters[\"Certificate.Expiry.Check.CertificateDomain\"])\"\n\n    try {\n        # Get a list of certificates that match our domain search criteria.\n        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items\n\n        return $certificates_search | Where-Object {\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived\n        }\n    }\n    catch {\n        Write-Host \"Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message).\"\n        exit 1\n    }\n}\n\nWrite-Host \"Checking for existing certificates in the Octopus Deploy Certificates Store.\"\n$certificates = Get-OctopusCertificates\n\nif ($certificates) {\n\n    # Handle weird behavior between Powershell 5 and Powershell 6+\n    $certificate_count = 1\n    if ($certificates.Count -ge 1) {\n        $certificate_count = $certificates.Count\n    }\n\n    Write-Host \"Found $certificate_count matching domain: $($OctopusParameters[\"Certificate.Expiry.Check.CertificateDomain\"]).\"\n    Write-Host \"Checking to see if any expire within $($OctopusParameters[\"Certificate.Expiry.Check.Days\"]) days.\"\n\n    # Check Expiry Dates\n    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters[\"Certificate.Expiry.Check.Days\"]) }\n\n    if ($expiring_certificates) {\n        Write-Host \"Found certificates that expire with $($OctopusParameters[\"Certificate.Expiry.Check.Days\"]) days.\"\n        \n        $expiring_certs_json = $expiring_certificates | select Name, Thumbprint, SubjectCommonName, Issuer, NotAfter | ConvertTo-Json\n        Set-OctopusVariable -name \"ExpiringCertificateJson\" -value $expiring_certs_json\n\n    }\n    else {\n    \tSet-OctopusVariable -name \"ExpiringCertificateJson\" -value \"\"\n        Write-Host \"Nothing to do here...\"\n    }\n\n    exit 0\n}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -53,12 +53,12 @@
       }
     }
   ],
-  "LastModifiedAt": "2020-08-28T08:55:06.515Z",
+  "LastModifiedAt": "2020-08-28T08:55:06.5150000Z",
   "LastModifiedBy": "benjimac93",
   "$Meta": {
-    "ExportedAt": "2021-08-23T12:40:10.975Z",
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
     "OctopusVersion": "2021.1.7687",
     "Type": "ActionTemplate"
   },
   "Category": "octopus"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/octopus-certificate-expiry-check/scriptbody.ps1 b/src/step-templates/octopus-certificate-expiry-check/scriptbody.ps1
new file mode 100644
index 000000000..d4483ec31
--- /dev/null
+++ b/src/step-templates/octopus-certificate-expiry-check/scriptbody.ps1
@@ -0,0 +1,56 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function Get-OctopusCertificates {
+    Write-Debug "Entering: Get-OctopusCertificates"
+
+    $octopus_uri = $OctopusParameters["Certificate.Expiry.Check.OctopusServerUrl"].Trim('/')
+    $octopus_space_id = $OctopusParameters["Octopus.Space.Id"]
+    $octopus_headers = @{ "X-Octopus-ApiKey" = $OctopusParameters["Certificate.Expiry.Check.ApiKey"] }
+    $octopus_certificates_uri = "$octopus_uri/api/$octopus_space_id/certificates?search=$($OctopusParameters["Certificate.Expiry.Check.CertificateDomain"])"
+
+    try {
+        # Get a list of certificates that match our domain search criteria.
+        $certificates_search = Invoke-WebRequest -Uri $octopus_certificates_uri -Method Get -Headers $octopus_headers -UseBasicParsing -ErrorAction Stop | ConvertFrom-Json | Select-Object -ExpandProperty Items
+
+        return $certificates_search | Where-Object {
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived
+        }
+    }
+    catch {
+        Write-Host "Could not retrieve certificates from Octopus Deploy. Error: $($_.Exception.Message)."
+        exit 1
+    }
+}
+
+Write-Host "Checking for existing certificates in the Octopus Deploy Certificates Store."
+$certificates = Get-OctopusCertificates
+
+if ($certificates) {
+
+    # Handle weird behavior between Powershell 5 and Powershell 6+
+    $certificate_count = 1
+    if ($certificates.Count -ge 1) {
+        $certificate_count = $certificates.Count
+    }
+
+    Write-Host "Found $certificate_count matching domain: $($OctopusParameters["Certificate.Expiry.Check.CertificateDomain"])."
+    Write-Host "Checking to see if any expire within $($OctopusParameters["Certificate.Expiry.Check.Days"]) days."
+
+    # Check Expiry Dates
+    $expiring_certificates = $certificates | Where-Object { [DateTime]$_.NotAfter -lt (Get-Date).AddDays($OctopusParameters["Certificate.Expiry.Check.Days"]) }
+
+    if ($expiring_certificates) {
+        Write-Host "Found certificates that expire with $($OctopusParameters["Certificate.Expiry.Check.Days"]) days."
+        
+        $expiring_certs_json = $expiring_certificates | select Name, Thumbprint, SubjectCommonName, Issuer, NotAfter | ConvertTo-Json
+        Set-OctopusVariable -name "ExpiringCertificateJson" -value $expiring_certs_json
+
+    }
+    else {
+    	Set-OctopusVariable -name "ExpiringCertificateJson" -value ""
+        Write-Host "Nothing to do here..."
+    }
+
+    exit 0
+}
diff --git a/src/step-templates/octopus-chain-deployment/metadata.json b/src/step-templates/octopus-chain-deployment/metadata.json
new file mode 100644
index 000000000..b3d1c442e
--- /dev/null
+++ b/src/step-templates/octopus-chain-deployment/metadata.json
@@ -0,0 +1,188 @@
+{
+  "Id": "18392835-d50e-4ce9-9065-8e15a3c30954",
+  "Name": "Chain Deployment",
+  "Description": "Triggers a deployment of another project in Octopus",
+  "ActionType": "Octopus.Script",
+  "Version": 26,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "61bffab9-bb89-4107-a5e0-79d69eaf8f2a",
+      "Name": "Chain_ApiKey",
+      "Label": "API Key",
+      "HelpText": "An Octopus API Key with appropriate permissions to perform the deployment",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a37cac4d-8fd3-4d58-bfda-45a436be8dd5",
+      "Name": "Chain_ProjectName",
+      "Label": "Project Name",
+      "HelpText": "Name of the Octopus project that should be deployed",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4fd440af-70fe-41ca-bec3-074f05155e81",
+      "Name": "Chain_Channel",
+      "Label": "Channel Name",
+      "HelpText": "The project channel to use when finding or [creating](https://octopus.com/docs/releases/channels#Channels-CreatingReleases) the release to deploy\n\n_Leave blank to use the default channel_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "78739052-438d-4dc7-862a-d4567eafc5df",
+      "Name": "Chain_ReleaseNum",
+      "Label": "Release Number",
+      "HelpText": "Release number to use for the deployment\n\n_Leave blank to use the latest release in the channel_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fd2c3474-7187-4356-aaec-96f4910bb9c5",
+      "Name": "Chain_CreateOption",
+      "Label": "Create new release?",
+      "HelpText": "If a release should be created as part of this deployment\n\n\nThe release is created using either the **Release Number** if specified, or from the project release version template / donor package step if not specified\n\nA release will not be created if it is found to already exist",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f648fa0c-b271-4e4a-b4f2-7a88db6b605c",
+      "Name": "Chain_SnapshotVariables",
+      "Label": "Update Variable Snapshot?",
+      "HelpText": "Should variables in the release be updated before deploying?\n\nBy updating the variables, the current snapshot will be discarded, and the latest variables (as seen on the Variables tab) will be imported",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "80634b3b-3171-4643-b164-a5077c6d387b",
+      "Name": "Chain_DeployTo",
+      "Label": "Environment Name",
+      "HelpText": "The name of an environment to deploy to\n\nMultiple environments can be deployed to by entering the name of a [lifecycle phase](https://octopus.com/docs/key-concepts/lifecycles#Lifecycles-LifecyclePhases)",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1334093d-0be4-4115-bb93-d752171a19d8",
+      "Name": "Chain_Tenants",
+      "Label": "Tenants",
+      "HelpText": "_Leave blank to perform an untenanted deployment_\n\nA list of [tenants & tenant tags](https://octopus.com/docs/tenants) to deploy. Tenant Tags are specified in [Canonical Name](https://octopus.com/docs/tenants/tenant-tags#referencing-tenant-tags) format:\n\n    Tag Set Name/Tag Name\n\nIndividual tenants can be listed in addition to tags\n\n    Tenant Name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "83d9d973-7a72-4f71-a890-8f19d955bc37",
+      "Name": "Chain_FormValues",
+      "Label": "Form Values",
+      "HelpText": "Provide values for [prompted variables](https://octopus.com/docs/projects/variables/prompted-variables) to use in the deployment\n\nVariables should be listed one per line using the format\n\n    VariableName = Value",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6522ca29-898a-4da6-b0c3-da52991e6812",
+      "Name": "Chain_StepsToSkip",
+      "Label": "Steps To Skip",
+      "HelpText": "A list of steps which should be skipped in the deployment\n\nSteps should be listed one per line, and specified using either the step number (as per the deployment plan) or by the step name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "acb2cd0e-fc53-42a7-95da-089955ea1870",
+      "Name": "Chain_GuidedFailure",
+      "Label": "Failure Handling",
+      "HelpText": "Determines how deployment failures & [guided failure mode](https://octopus.com/docs/releases/guided-failures) should be handled for the deployment\n\nAutomatic failure handling is performed by using [guided failure](https://octopus.com/docs/releases/guided-failures) and submitting an appropriate action\n\nThe number of retry attempts can be customised by [setting the following variables in indexer notion](https://octopus.com/docs/deploying-applications/variables/system-variables#Systemvariables-Action)\n- Octopus.Action.StepRetryCount\n- Octopus.Action.DeploymentRetryCount",
+      "DefaultValue": "Default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Default|Default - Guided Failure is inherited from this deployment\nEnabled|Enable - Guided Failure is enabled\nDisabled|Disable - Guided Failure is disabled\nRetryIgnore|Retry & Ignore - Automatically retry a failing step, a second failure is ignored\nRetryAbort|Retry & Abort - Automatically retry a failing step, and abort on a second failure\nIgnore|Ignore - Automatically ignore any step failures\nRetryDeployment|Retry Deployment - Automatically retry the entire deployment on failure"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "73a80735-4ca0-4c12-9fa3-f0123db6349f",
+      "Name": "Chain_DeploySchedule",
+      "Label": "Scheduling",
+      "HelpText": "Defines how the deployment should be scheduled & run\n\n_Note: Automated failure handling & post-deploy script functionality is only available when the **Wait For Deployment** option is selected_\n\nA user defined schedule can be set with the **Use a custom expression** option\nFor an exact date & time use the following format, the day is optional and the time is in 24-hour format\n\n    [Mon/Tue/Wed/Thu/Fri/Sat/Sun] @ HH:MM\n\nTo schedule a deployment a relative number of hours & minutes in the future use\n\n    + MMM\n    + HHH:MM\n\n_Note: Reoccurring deployments & automatic retry of failed deployment are possible using a scheduled deployment and the [Always Run or On Failure run conditions](https://octopus.com/docs/deploying-applications#Deployingapplications-Conditions)_",
+      "DefaultValue": "WaitForDeployment",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "WaitForDeployment|Wait For Deployment\nNoWait|Queue Immediately\n+ 5|Deploy in 5 minutes\n+ 15|Deploy in 15 minutes\n+ 1:00|Deploy in 1 hour\n+ 24:00|Deploy in 24 hours\n@ 00:00|Deploy At Midnight\n@ 00:00 + 12:00|Deploy At Noon Tomorrow\nMon @ 08:00|Deploy At 8am On Monday\nSat @ 00:00 + 168:00|Deploy the following Saturday at Midnight"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7e7f9ac5-8674-4a91-a94a-896a3ee1334d",
+      "Name": "Chain_PostDeploy",
+      "Label": "Post-Deploy Script",
+      "HelpText": "A PowerShell script which should be run after a successful deployment\n\nVariables are replaced in the script using the resultant **Manifest VariableSet** from the deployment in the [binding syntax](https://octopus.com/docs/projects/variables/variable-substitutions#binding-variables) format\n\nVariables are not available if they are:\n- [Sensitive](https://octopus.com/docs/deploying-applications/variables/sensitive-variables)\n- Action scoped\n- Machine scoped\n- Role scoped\n\n\nWhen performing a tenanted deployment the script will be run once for each tenant using the specific variables from their deployment",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "5c3fddc3-69cb-4762-ac6a-4fdb05f43c6b",
+      "Name": "Chain_ForcePackageDownload",
+      "Label": "Force Package Download",
+      "HelpText": "Should we redownload the package for this release?",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "9ee151bb-78e5-4cb0-8780-6536ea319934",
+      "Name": "Chain_MachineList",
+      "Label": "Machine List",
+      "HelpText": "A list of Machine Names which should be Targeted in the deployment\n\nMachine Names should be listed one per line and specified using either the Machine Id or by the Machine name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "LeoDOD",
+  "$Meta": {
+    "ExportedAt": "2023-02-23T21:40:33.2790000Z",
+    "OctopusVersion": "2022.3.10847",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-chain-deployment/scriptbody.ps1 b/src/step-templates/octopus-chain-deployment/scriptbody.ps1
new file mode 100644
index 000000000..e7afe7a51
--- /dev/null
+++ b/src/step-templates/octopus-chain-deployment/scriptbody.ps1
@@ -0,0 +1,1032 @@
+<#
+----- Chain Deployment -----
+Authors & Credits
+    Paul Marston @paulmarsy (paul@marston.me)
+    Joe Waid @joewaid
+    Henrik Andersson @alfhenrik
+    Damian Brady @Damovisa
+    Aaron Burke @aburke-incomm (aburke@incomm.com)
+    Bob Hindy @bstr413
+    Leo De Oliveira Dias @LeoDOD
+Links
+    https://library.octopus.com/step-templates/18392835-d50e-4ce9-9065-8e15a3c30954
+    https://github.com/OctopusDeploy/Library/commits/master/step-templates/octopus-chain-deployment.json
+
+----- Advanced Configuration Settings -----
+Variable names can use either of the following two formats: 
+    Octopus.Action.<Setting Name> - will apply to all steps in the deployment, e.g.
+        Octopus.Action.DebugLogging
+    Octopus.Action[Step Name].<Setting Name> - will apply to 'step name' alone, e.g.
+        Octopus.Action[Provision Virtual Machine].DeploymentRetryCount
+
+Available Settings:
+    - DebugLogging - set to 'True' or 'False' to log all GET web requests
+    - GuidedFailureMessage - will change the note used when submitting guided failure actions, the following variables will be replaced in the text:
+        #{GuidedFailureActionIndex} - The current count of interrupts for that step e.g. 1
+        #{GuidedFailureAction} - The action being submitted by the step e.g. Retry
+    - DeploymentRetryCount - will override the number of times a deployment will be retried when unsuccessful and enable retrying when the failure option is set for a different option, default is 1
+    - StepRetryCount - will override the number of times a deployment step will be retried before before submitting Ignore or Abort, default is 1
+    - RetryWaitPeriod - an additional delay in seconds wait before retrying a failed step/deployment, default is 0
+    - QueueTimeout - when scheduling a deployment for later a timeout must be provided, this allows a custom value, default is 30:00, format is hh:mm
+    - OctopusServerUrl - will override the base url used for all webrequests, making it possible to chain deployments on a different Octopus instance/server, or as a workaround for misconfigured node settings
+
+----- Changelog -----
+25. Feb 9, 2023 - Bob Hindy @bstr413
+	- Fixed issue caused by version 23 where script would not work with on premise Octopus servers. (Reverted most of the changes 60ae653 and d614a2d made to this step template.)
+24. Sept 13, 2021 - Mark Harrison @harrisonmeister
+    - Fixed issue where the Invoke-OctopusApi function would error with 404: NotFound when running Chain deployment on an Octopus instance 
+      that runs under either a "virtual directory" / route prefix other than the route e.g https://my.octopus.app/octo/
+23. Aug 23rd, 2021 - Ben Macpherson benjimac93
+    - Use Octopus.Web.ServerUri in place of Octopus.Web.BaseUrl if present.
+22. Dec 31, 2020 - Josh Slaughter @joshgk00
+	- Fixed an issue where the script was unable to create a release if Chained project contained a step with multiple package references
+20. Sept 3, 2020 - Mark Harrison @harrisonmeister
+	- Included setting to TLS 1.2. 
+19. July 17, 2020 - Aaron Burke @aburke-incomm
+	- Update script handle Regex for Channel Tags in the CreateRelease Function
+17. December 18, 2018 - Jim Burger @burgomg
+	- Added Spaces compatibility
+16. November 22, 2018 - Patrick Kearney @patrickkearney
+    - Fixed an issue where the step was unable to pass a form variable containing an "=" in the value.
+15. July 17, 2017 - Robert Glickman @robertglickman
+    - Fixed an issue where the step would fail in Octopus 3.15+ due to templated URIs not being handled
+14. May 5, 2017 - Paul Marston @paulmarsy (paul@marston.me)
+    - Improved step parameter metadata & validation
+    - Added changelog, documentation of advanced settings
+    - Supports deploying to multiple environments in one step by specifying a lifecycle phase name e.g. 'Dev'
+    - Automated retry of the entire deployment as an additional failure handling option
+    - Number of step/deployment retries is configurable using a settings variable
+    - Supports Octopus scheduled deployments (can be used for reoccuring scheduled deploys, or autonomous deployment retry)
+    - Individual tenants as well as tenant tags can be deployed to
+    - Fixing a bug where Guided Failure is always evaluated to true
+    - Improved identification of valid environment&tenant promotions by using the 'deployment template' api
+    - If a release version has already been created, it will be used rather than erroring trying to recreate it
+    - Using 'Fail-Step' for better error logging
+    - Fixed a bug where log messages with an identical timestamp were repeatedly reported
+    - Added an option to wait before retrying a step/deployment
+    - A release's channel is taken into account when checking if an existing release version can be used
+13. Apr 21, 2017 - Paul Marston @paulmarsy (paul@marston.me)
+    - Complete step template rewrite
+    - Improved logging
+        * Logs only written when chained deployment changes
+        * Progress of deployment step states is reported
+        * Errors & warnings are reported without interpretation in parent deployment
+        * Manual intervention & guided failure events are reported
+        * Queue position reported before deployment starts
+        * Verbose logging of useful API urls
+    - Multi-tenancy support and handling multiple tenant deploys from one chain step
+    - Support for skipping steps
+    - Support for prompted form variables
+    - Create release functionality supports using the version from the incremented version template or donor package
+    - Ability to snapshot update variables of a release before deploying
+    - Automated handling of guided failure scenarios e.g. retry on step failure, then abort if it errors a second time
+    - Transient Octopus API request failures are handled (e.g. we saw many deployments failing because of a request timeout)
+    - Post-deploy script support with variable substitution performed using the manifest variable set of the chained deployment with appropriate scoping applied (though not advanced scope specificity)
+    - Defaulting channel to a blank value which looks for one with 'IsDefault' set true
+    - Create release performs a simplified package version lookup to populate the 'SelectedPackages' field
+12. Mar 30, 2017 - Joe Waid @joewaid
+    - Pass the Environments "Guided Failure" setting
+    - Check status after deployment when Chain_WaitForDeployment is true
+11. Nov 21, 2016 - Henrik Andersson @alfhenrik
+    - Add Wait for deployment option to chain deployment step template
+10. May 2, 2016 - Damian Brady @Damovisa
+    - Add Chained Deployment step template
+#>
+#Requires -Version 5
+$ErrorActionPreference = 'Stop'
+$ProgressPreference = 'SilentlyContinue'
+$DefaultUrl = $OctopusParameters['Octopus.Web.BaseUrl']
+$Chain_BaseApiUrl = "/api"
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+function Test-String {
+    param([Parameter(Position = 0)]$InputObject, [switch]$ForAbsence)
+
+    $hasNoValue = [System.String]::IsNullOrWhiteSpace($InputObject)
+    if ($ForAbsence) { $hasNoValue }
+    else { -not $hasNoValue }
+}
+
+function Get-OctopusSetting {
+    param([Parameter(Position = 0, Mandatory)][string]$Name, [Parameter(Position = 1, Mandatory)]$DefaultValue)
+    $formattedName = 'Octopus.Action.{0}' -f $Name
+    if ($OctopusParameters.ContainsKey($formattedName)) {
+        $value = $OctopusParameters[$formattedName]
+        if ($DefaultValue -is [int]) { return ([int]::Parse($value)) }
+        if ($DefaultValue -is [bool]) { return ([System.Convert]::ToBoolean($value)) }
+        if ($DefaultValue -is [array] -or $DefaultValue -is [hashtable] -or $DefaultValue -is [pscustomobject]) { return (ConvertFrom-Json -InputObject $value) }
+        return $value
+    }
+    else { return $DefaultValue }
+}
+
+# Write functions are re-defined using octopus service messages to preserve formatting of log messages received from the chained deployment and avoid errors being twice wrapped in an ErrorRecord
+function Write-Fatal($message, $exitCode = -1) {
+    if (Test-Path Function:\Fail-Step) {
+        Fail-Step $message
+    }
+    else {
+        Write-Host ("##octopus[stdout-error]`n{0}" -f $message)
+        Exit $exitCode
+    }
+}
+function Write-Error($message) { Write-Host ("##octopus[stdout-error]`n{0}`n##octopus[stdout-default]" -f $message) }
+function Write-Warning($message) { Write-Host ("##octopus[stdout-warning]`n{0}`n##octopus[stdout-default]" -f $message) }
+function Write-Verbose($message) { Write-Host ("##octopus[stdout-verbose]`n{0}`n##octopus[stdout-default]" -f $message) }
+
+# Use "Octopus.Web.ServerUri" if it is available
+if ([string]::IsNullOrWhiteSpace($OctopusParameters['Octopus.Web.ServerUri']) -eq $False) {
+    $DefaultUrl = $OctopusParameters['Octopus.Web.ServerUri']
+}
+
+$Chain_BaseUrl = (Get-OctopusSetting OctopusServerUrl $DefaultUrl).Trim('/')
+if (Test-String $Chain_ApiKey -ForAbsence) {
+    Write-Fatal "The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again."
+}
+$DebugLogging = Get-OctopusSetting DebugLogging $false
+
+# Replace any "virtual directory" or route prefix e.g from the Links collection used
+# with the api e.g. /api
+function Format-LinksUri {
+    param(
+        [Parameter(Position = 0, Mandatory)]
+        $Uri
+    )
+    $Uri = $Uri -replace '.*/api', '/api'
+    Return $Uri
+}
+# Replace any "virtual directory" or route prefix e.g from the Links collection used
+# with the web app e.g. /app
+function Format-WebLinksUri {
+    param(
+        [Parameter(Position = 0, Mandatory)]
+        $Uri
+    )
+    $Uri = $Uri -replace '.*/app', '/app'
+    Return $Uri
+}
+
+function Invoke-OctopusApi {
+    param(
+        [Parameter(Position = 0, Mandatory)]$Uri,
+        [ValidateSet('Get', 'Post', 'Put')]$Method = 'Get',
+        $Body,
+        [switch]$GetErrorResponse
+    )
+    # Replace query string example parameters e.g. {?skip,take,partialName} 
+    # Replace any "virtual directory" or route prefix e.g from the Links collection.
+    $Uri = $Uri -replace '{.*?}', '' -replace '.*/api', '/api'
+    $requestParameters = @{
+        Uri             = ('{0}/{1}' -f $Chain_BaseUrl, $Uri.TrimStart('/'))
+        Method          = $Method
+        Headers         = @{ 'X-Octopus-ApiKey' = $Chain_ApiKey }
+        UseBasicParsing = $true
+    }
+    if ($Method -ne 'Get' -or $DebugLogging) {
+        Write-Verbose ('{0} {1}' -f $Method.ToUpperInvariant(), $requestParameters.Uri)
+    }
+    if ($null -ne $Body) {
+        $requestParameters.Add('Body', (ConvertTo-Json -InputObject $Body -Depth 10))
+        Write-Verbose $requestParameters.Body
+    }
+    
+    $wait = 0
+    $webRequest = $null
+    while ($null -eq $webRequest) {	
+        try {
+            $webRequest = Invoke-WebRequest @requestParameters
+        }
+        catch {
+            if ($_.Exception -is [System.Net.WebException] -and $null -ne $_.Exception.Response) {
+                $errorResponse = [System.IO.StreamReader]::new($_.Exception.Response.GetResponseStream()).ReadToEnd()
+                Write-Verbose ("Error Response:`n{0}" -f $errorResponse)
+                if ($GetErrorResponse) {
+                    return ($errorResponse | ConvertFrom-Json)
+                }
+                if ($_.Exception.Response.StatusCode -in @([System.Net.HttpStatusCode]::NotFound, [System.Net.HttpStatusCode]::InternalServerError, [System.Net.HttpStatusCode]::BadRequest, [System.Net.HttpStatusCode]::Unauthorized)) {
+                    Write-Fatal $_.Exception.Message
+                }
+            }
+            if ($wait -eq 120) {
+                Write-Fatal ("Octopus web request ({0}: {1}) failed & the maximum number of retries has been exceeded:`n{2}" -f $Method.ToUpperInvariant(), $requestParameters.Uri, $_.Exception.Message) -43
+            }
+            $wait = switch ($wait) {
+                0 { 30 }
+                30 { 60 }
+                60 { 120 }
+            }
+            Write-Warning ("Octopus web request ({0}: {1}) failed & will be retried in $wait seconds:`n{2}" -f $Method.ToUpperInvariant(), $requestParameters.Uri, $_.Exception.Message)
+            Start-Sleep -Seconds $wait
+        }
+    }
+    $webRequest.Content | ConvertFrom-Json | Write-Output
+}
+
+function Get-FilteredOctopusItem {
+    param(
+        $itemList,
+        $itemName
+    )
+
+    if ($itemList.Items.Count -eq 0) {
+        Write-Fatal "Unable to find $itemName.  Exiting with an exit code of 1."
+        Exit 1
+    }  
+
+    $item = $itemList.Items | Where-Object { $_.Name -eq $itemName }      
+
+    if ($null -eq $item) {
+        Write-Fatal "Unable to find $itemName.  Exiting with an exit code of 1."
+        exit 1
+    }
+    
+    if ($item -is [array]) {
+        Write-Fatal "More than one item exists with the name $itemName.  Exiting with an exit code of 1."
+        exit 1
+    }
+
+    return $item
+}
+
+function Test-SpacesApi {
+    Write-Verbose "Checking API compatibility";
+    $rootDocument = Invoke-OctopusApi "api/";
+    if ($null -ne $rootDocument.Links -and $null -ne $rootDocument.Links.Spaces) {
+        Write-Verbose "Spaces API found"
+        return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if (Test-SpacesApi) {
+    $spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if ([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+    }
+    $Chain_BaseApiUrl = "/api/$spaceId" ;
+}
+
+enum GuidedFailure {
+    Default
+    Enabled
+    Disabled
+    RetryIgnore
+    RetryAbort
+    Ignore
+    RetryDeployment
+}
+
+class DeploymentContext {
+    hidden $BaseUrl
+    hidden $BaseApiUrl
+    DeploymentContext($baseUrl, $baseApiUrl) {
+        $this.BaseUrl = $baseUrl
+        $this.BaseApiUrl = $baseApiUrl
+    }
+
+    hidden $Project
+    hidden $Lifecycle
+    [void] SetProject($projectName) {
+        $this.Project = Invoke-OctopusApi "$($this.BaseApiUrl)/projects/all" | Where-Object Name -eq $projectName
+        if ($null -eq $this.Project) {
+            Write-Fatal "Project $projectName not found"
+        }
+        Write-Host "Project: $($this.Project.Name)"
+        Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Project.Links.Self)"
+        
+        $this.Lifecycle = Invoke-OctopusApi ("$($this.BaseApiUrl)/lifecycles/{0}" -f $this.Project.LifecycleId)
+        Write-Host "Project Lifecycle: $($this.Lifecycle.Name)"
+        Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Lifecycle.Links.Self)"
+    }
+    
+    hidden $Channel
+    [void] SetChannel($channelName) {
+        $useDefaultChannel = Test-String $channelName -ForAbsence
+        $this.Channel = Invoke-OctopusApi (Format-LinksUri -Uri $this.Project.Links.Channels) | ForEach-Object Items | Where-Object { $useDefaultChannel -and $_.IsDefault -or $_.Name -eq $channelName }
+        if ($null -eq $this.Channel) {
+            Write-Fatal "$(if ($useDefaultChannel) { 'Default channel' } else { "Channel $channelName" }) not found"
+        }
+        Write-Host "Channel: $($this.Channel.Name)"
+        Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Channel.Links.Self)"
+
+        if ($null -ne $this.Channel.LifecycleId) {
+            $this.Lifecycle = Invoke-OctopusApi ("$($this.BaseApiUrl)/lifecycles/{0}" -f $this.Channel.LifecycleId)
+            Write-Host "Channel Lifecycle: $($this.Lifecycle.Name)"
+            Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Lifecycle.Links.Self)"        
+        }
+    }
+
+    hidden $Release
+    [void] SetRelease($releaseVersion) {
+        if (Test-String $releaseVersion) {
+            $this.Release = Invoke-OctopusApi ("$($this.BaseApiUrl)/projects/{0}/releases/{1}" -f $this.Project.Id, $releaseVersion) -GetErrorResponse
+            if ($null -ne $this.Release.ErrorMessage) {
+                Write-Fatal $this.Release.ErrorMessage
+            }
+        }
+        else {
+            $this.Release = Invoke-OctopusApi (Format-LinksUri -Uri $this.Channel.Links.Releases) | ForEach-Object Items | Select-Object -First 1
+            if ($null -eq $this.Release) {
+                Write-Fatal "There are no releases for channel $($this.Channel.Name)"
+            }
+        }
+        Write-Host "Release: $($this.Release.Version)"
+        Write-Verbose "`t$($this.BaseUrl)$($this.BaseApiUrl)/releases/$($this.Release.Id)"
+    }
+
+    [void] CreateRelease($releaseVersion) {
+        $template = Invoke-OctopusApi ('{0}/template?channel={1}' -f (Format-LinksUri -Uri $this.Project.Links.DeploymentProcess), $this.Channel.Id)
+        $selectedPackages = @()
+        Write-Host 'Resolving package versions...'
+        $template.Packages | ForEach-Object {
+            $preReleaseTag = $this.Channel.Rules | Where-Object Actions -contains $_.StepName | Where-Object { $null -ne $_ } | ForEach-Object { '&preReleaseTag={0}' -f $([System.Net.WebUtility]::UrlEncode($_.Tag)) }
+            $versionRange = $this.Channel.Rules | Where-Object Actions -contains $_.StepName | Where-Object { $null -ne $_ } | ForEach-Object { '&versionRange={0}' -f $([System.Net.WebUtility]::UrlEncode($_.VersionRange)) }
+
+            $package = Invoke-OctopusApi ("$($this.BaseApiUrl)/feeds/{0}/packages?packageId={1}&partialMatch=false&includeMultipleVersions=false&includeNotes=false&includePreRelease=true&take=1{2}{3}" -f $_.FeedId, $_.PackageId, $preReleaseTag, $versionRange)
+            $packageDesc = "$($package.Title) @ $($package.Version) for step $($_.StepName)"
+            if ( $_.PackageReferenceName ) {
+                $packageDesc += "/$($_.PackageReferenceName)"
+            }
+            Write-Host "Found $packageDesc"
+            
+            $selectedPackages += @{
+                StepName             = $_.StepName
+                ActionName           = $_.ActionName
+                PackageReferenceName = $_.PackageReferenceName
+                Version              = $package.Version
+            }
+
+            if ( (Test-String $releaseVersion -ForAbsence) -and ($_.StepName -eq $template.VersioningPackageStepName) ) {
+                Write-Host "Release will be created using the version number from package step $($template.VersioningPackageStepName): $($package.Version)"
+                $releaseVersion = $package.Version
+            }
+        }
+        if (Test-String $releaseVersion) {
+            $this.Release = Invoke-OctopusApi ("$($this.BaseApiUrl)/projects/{0}/releases/{1}" -f $this.Project.Id, $releaseVersion) -GetErrorResponse
+            if ( ($null -eq $this.Release.ErrorMessage) -and ($this.Release.Version -ieq $releaseVersion) -and ($this.Release.ChannelId -eq $this.Channel.Id) ) {
+                Write-Host "Release version $($this.Release.Version) has already been created, selecting it for deployment"
+                Write-Verbose "`t$($this.BaseUrl)$($this.BaseApiUrl)/releases/$($this.Release.Id)"
+                return
+            }
+        }
+        else {
+            Write-Host "Release will be created using the incremented release version: $($template.NextVersionIncrement)"
+            $releaseVersion = $template.NextVersionIncrement
+        }
+
+        $this.Release = Invoke-OctopusApi "$($this.BaseApiUrl)/releases?ignoreChannelRules=false" -Method Post -Body @{
+            ProjectId        = $this.Project.Id
+            ChannelId        = $this.Channel.Id 
+            Version          = $releaseVersion
+            SelectedPackages = $selectedPackages
+        } -GetErrorResponse
+        if ($null -ne $this.Release.ErrorMessage) {
+            Write-Fatal "$($this.Release.ErrorMessage)`n$($this.Release.Errors -join "`n")"
+        }
+        Write-Host "Release $($this.Release.Version) has been successfully created"
+        Write-Verbose "`t$($this.BaseUrl)$($this.BaseApiUrl)/releases/$($this.Release.Id)"
+    }
+
+    [void] UpdateVariableSnapshot() {
+        $this.Release = Invoke-OctopusApi (Format-LinksUri -Uri $this.Release.Links.SnapshotVariables) -Method Post
+        Write-Host 'Variables snapshot update performed. The release now references the latest variables.'
+    }
+
+    hidden $DeploymentTemplate
+    [void] GetDeploymentTemplate() {
+        Write-Host 'Getting deployment template for release...'
+        $this.DeploymentTemplate = Invoke-OctopusApi (Format-LinksUri -Uri $this.Release.Links.DeploymentTemplate)
+    }
+
+    hidden [bool]$UseGuidedFailure
+    hidden [string[]]$GuidedFailureActions
+    hidden [string]$GuidedFailureMessage
+    hidden [int]$DeploymentRetryCount
+    [void] SetGuidedFailure([GuidedFailure]$guidedFailure, $guidedFailureMessage) {
+        $this.UseGuidedFailure = switch ($guidedFailure) {
+            ([GuidedFailure]::Default) { [System.Convert]::ToBoolean($global:OctopusUseGuidedFailure) }
+            ([GuidedFailure]::Enabled) { $true }
+            ([GuidedFailure]::Disabled) { $false }
+            ([GuidedFailure]::RetryIgnore) { $true }
+            ([GuidedFailure]::RetryAbort) { $true }
+            ([GuidedFailure]::Ignore) { $true } 
+            ([GuidedFailure]::RetryDeployment) { $false }
+        }
+        Write-Host "Setting Guided Failure: $($this.UseGuidedFailure)"
+        
+        $retryActions = @(1..(Get-OctopusSetting StepRetryCount 1) | ForEach-Object { 'Retry' })
+        $this.GuidedFailureActions = switch ($guidedFailure) {
+            ([GuidedFailure]::Default) { $null }
+            ([GuidedFailure]::Enabled) { $null }
+            ([GuidedFailure]::Disabled) { $null }
+            ([GuidedFailure]::RetryIgnore) { $retryActions + @('Ignore') }
+            ([GuidedFailure]::RetryAbort) { $retryActions + @('Abort') }
+            ([GuidedFailure]::Ignore) { @('Ignore') }
+            ([GuidedFailure]::RetryDeployment) { $null }
+        }
+        if ($null -ne $this.GuidedFailureActions) {
+            Write-Host "Automated Failure Guidance: $($this.GuidedFailureActions -join '; ') "
+        }
+        $this.GuidedFailureMessage = $guidedFailureMessage
+        
+        $defaultRetries = if ($guidedFailure -eq [GuidedFailure]::RetryDeployment) { 1 } else { 0 }
+        $this.DeploymentRetryCount = Get-OctopusSetting DeploymentRetryCount $defaultRetries
+        if ($this.DeploymentRetryCount -ne 0) {
+            Write-Host "Failed Deployments will be retried #$($this.DeploymentRetryCount) times"
+        }
+    }
+
+    [bool]$ForcePackageDownload
+    [void] SetForcePackageDownload($forcePackageDownload) {
+        if ($forcePackageDownload -eq $true) {
+            $this.ForcePackageDownload = $true
+            Write-Host 'Deployment will Force Package Download...'
+            return
+        } 
+        $this.ForcePackageDownload = $false
+        Write-Host 'Deployment will not Force Package Download.'
+        return
+
+    }
+
+    [bool]$WaitForDeployment
+    hidden [datetime]$QueueTime
+    hidden [datetime]$QueueTimeExpiry
+    [void] SetSchedule($deploySchedule) {
+        if (Test-String $deploySchedule -ForAbsence) {
+            Write-Fatal 'The deployment schedule step parameter was not found.'
+        }
+        if ($deploySchedule -eq 'WaitForDeployment') {
+            $this.WaitForDeployment = $true
+            Write-Host 'Deployment will be queued to start immediatley...'
+            return
+        }
+        $this.WaitForDeployment = $false
+        if ($deploySchedule -eq 'NoWait') {
+            Write-Host 'Deployment will be queued to start immediatley...'
+            return
+        }
+        <#
+            ^(?i) - Case-insensitive matching
+            (?:
+                (?<Day>MON|TUE|WED|THU|FRI|SAT|SUN)? - Capture an optional day
+                \s*@\s* - '@' indicates deploying at a specific time
+                (?<TimeOfDay>(?:[01]?[0-9]|2[0-3]):[0-5][0-9]) - Captures the time of day, in 24 hour format
+            )? - Day & TimeOfDay are optional
+            \s*
+            (?:
+                \+\s* - '+' indicates deploying after a length of tie
+                (?<TimeSpan>
+                    \d{1,3} - Match 1 to 3 digits
+                    (?::[0-5][0-9])? - Optionally match a colon and 00 to 59, this denotes if the previous 1-3 digits are hours or minutes
+                )
+            )?$ - TimeSpan is optional
+        #>
+        $parsedSchedule = [regex]::Match($deploySchedule, '^(?i)(?:(?<Day>MON|TUE|WED|THU|FRI|SAT|SUN)?\s*@\s*(?<TimeOfDay>(?:[01]?[0-9]|2[0-3]):[0-5][0-9]))?\s*(?:\+\s*(?<TimeSpan>\d{1,3}(?::[0-5][0-9])?))?$')
+        if (!$parsedSchedule.Success) {
+            Write-Fatal "The deployment schedule step parameter contains an invalid value. Valid values are 'WaitForDeployment', 'NoWait' or a schedule in the format '[[DayOfWeek] @ HH:mm] [+ <MMM|HHH:MM>]'" 
+        }
+        $this.QueueTime = Get-Date
+        if ($parsedSchedule.Groups['Day'].Success) {
+            Write-Verbose "Parsed Day: $($parsedSchedule.Groups['Day'].Value)"
+            while (!$this.QueueTime.DayOfWeek.ToString().StartsWith($parsedSchedule.Groups['Day'].Value)) {
+                $this.QueueTime = $this.QueueTime.AddDays(1)
+            }
+        }
+        if ($parsedSchedule.Groups['TimeOfDay'].Success) {
+            Write-Verbose "Parsed Time Of Day: $($parsedSchedule.Groups['TimeOfDay'].Value)"
+            $timeOfDay = [datetime]::ParseExact($parsedSchedule.Groups['TimeOfDay'].Value, 'HH:mm', $null)
+            $this.QueueTime = $this.QueueTime.Date + $timeOfDay.TimeOfDay
+        }
+        if ($parsedSchedule.Groups['TimeSpan'].Success) {
+            Write-Verbose "Parsed Time Span: $($parsedSchedule.Groups['TimeSpan'].Value)"
+            $timeSpan = $parsedSchedule.Groups['TimeSpan'].Value.Split(':')
+            $hoursToAdd = if ($timeSpan.Length -eq 2) { $timeSpan[0] } else { 0 }
+            $minutesToAdd = if ($timeSpan.Length -eq 2) { $timeSpan[1] } else { $timeSpan[0] }
+            $this.QueueTime = $this.QueueTime.Add((New-TimeSpan -Hours $hoursToAdd -Minutes $minutesToAdd))
+        }
+        Write-Host "Deployment will be queued to start at: $($this.QueueTime.ToLongDateString()) $($this.QueueTime.ToLongTimeString())"
+        Write-Verbose "Local Time: $($this.QueueTime.ToLocalTime().ToString('r'))"
+        Write-Verbose "Universal Time: $($this.QueueTime.ToUniversalTime().ToString('o'))"
+        $this.QueueTimeExpiry = $this.QueueTime.Add([timespan]::ParseExact((Get-OctopusSetting QueueTimeout '00:30'), "hh\:mm", $null))
+        Write-Verbose "Queued deployment will expire on: $($this.QueueTimeExpiry.ToUniversalTime().ToString('o'))"
+    }
+
+    hidden $Environments
+    [void] SetEnvironment($environmentName) {
+        $lifecyclePhaseEnvironments = $this.Lifecycle.Phases | Where-Object Name -eq $environmentName | ForEach-Object {
+            $_.AutomaticDeploymentTargets
+            $_.OptionalDeploymentTargets
+        }
+        $this.Environments = $this.DeploymentTemplate.PromoteTo | Where-Object { $_.Id -in $lifecyclePhaseEnvironments -or $_.Name -ieq $environmentName }
+        if ($null -eq $this.Environments) {
+            Write-Fatal "The specified environment ($environmentName) was not found or not eligible for deployment of the release ($($this.Release.Version)). Verify that the release has been deployed to all required environments before it can be promoted to this environment. Once you have corrected these problems you can try again." 
+        }
+        Write-Host "Environments: $(($this.Environments | ForEach-Object Name) -join ', ')"
+    }
+    
+    [bool] $IsTenanted
+    hidden $Tenants
+    [void] SetTenants($tenantFilter) {
+        $this.IsTenanted = Test-String $tenantFilter
+        if (!$this.IsTenanted) {
+            return
+        }
+        $tenantPromotions = $this.DeploymentTemplate.TenantPromotions | ForEach-Object Id
+        $this.Tenants = $tenantFilter.Split("`n") | ForEach-Object { [uri]::EscapeUriString($_.Trim()) } | ForEach-Object {
+            $criteria = if ($_ -like '*/*') { 'tags' } else { 'name' }
+            
+            $tenantResults = Invoke-OctopusApi ("$($this.BaseApiUrl)/tenants/all?projectId={0}&{1}={2}" -f $this.Project.Id, $criteria, $_) -GetErrorResponse
+            if ($tenantResults -isnot [array] -and $tenantResults.ErrorMessage) {
+                Write-Warning "Full Exception: $($tenantResults.FullException)"
+                Write-Fatal $tenantResults.ErrorMessage
+            }
+            $tenantResults
+        } | Where-Object Id -in $tenantPromotions
+
+        if ($null -eq $this.Tenants) {
+            Write-Fatal "No eligible tenants found for deployment of the release ($($this.Release.Version)). Verify that the tenants have been associated with the project."
+        }
+        Write-Host "Tenants: $(($this.Tenants | ForEach-Object Name) -join ', ')"
+    }
+
+    [DeploymentController[]] GetDeploymentControllers() {
+        Write-Verbose 'Determining eligible environments & tenants. Retrieving deployment previews...'
+        $deploymentControllers = @()
+        foreach ($environment in $this.Environments) {
+            $envPrefix = if ($this.Environments.Count -gt 1) { $environment.Name }
+            if ($this.IsTenanted) {
+                foreach ($tenant in $this.Tenants) {
+                    $tenantPrefix = if ($this.Tenants.Count -gt 1) { $tenant.Name }
+                    if ($this.DeploymentTemplate.TenantPromotions | Where-Object Id -eq $tenant.Id | ForEach-Object PromoteTo | Where-Object Id -eq $environment.Id) {
+                        $logPrefix = ($envPrefix, $tenantPrefix | Where-Object { $null -ne $_ }) -join '::'
+                        $deploymentControllers += [DeploymentController]::new($this, $logPrefix, $environment, $tenant)
+                    }
+                }
+            }
+            else {
+                $deploymentControllers += [DeploymentController]::new($this, $envPrefix, $environment, $null)
+            }
+        }
+        return $deploymentControllers
+    }
+}
+
+class DeploymentController {
+    hidden [string]$BaseUrl
+    hidden [DeploymentContext]$DeploymentContext
+    hidden [string]$LogPrefix
+    hidden [object]$Environment
+    hidden [object]$Tenant
+    hidden [object]$DeploymentPreview
+    hidden [int]$DeploymentRetryCount
+    hidden [int]$DeploymentAttempt
+    
+    DeploymentController($deploymentContext, $logPrefix, $environment, $tenant) {
+        $this.BaseUrl = $deploymentContext.BaseUrl
+        $this.DeploymentContext = $deploymentContext
+        if (Test-String $logPrefix) {
+            $this.LogPrefix = "[${logPrefix}] "
+        }
+        $this.Environment = $environment
+        $this.Tenant = $tenant
+        if ($tenant) {
+            $this.DeploymentPreview = Invoke-OctopusApi ("$($this.DeploymentContext.BaseApiUrl)/releases/{0}/deployments/preview/{1}/{2}" -f $this.DeploymentContext.Release.Id, $this.Environment.Id, $this.Tenant.Id)
+        }
+        else {
+            $this.DeploymentPreview = Invoke-OctopusApi ("$($this.DeploymentContext.BaseApiUrl)/releases/{0}/deployments/preview/{1}" -f $this.DeploymentContext.Release.Id, $this.Environment.Id)
+        }
+        $this.DeploymentRetryCount = $deploymentContext.DeploymentRetryCount
+        $this.DeploymentAttempt = 0
+    }
+
+    hidden [string[]]$SkipActions = @()
+    [void] SetStepsToSkip($stepsToSkip) {
+        $comparisonArray = $stepsToSkip.Split("`n") | ForEach-Object Trim
+        $this.SkipActions = $this.DeploymentPreview.StepsToExecute | Where-Object {
+            $_.CanBeSkipped -and ($_.ActionName -in $comparisonArray -or $_.ActionNumber -in $comparisonArray)
+        } | ForEach-Object {
+            $logMessage = "Skipping Step $($_.ActionNumber): $($_.ActionName)"
+            if ($this.LogPrefix) { Write-Verbose "$($this.LogPrefix)$logMessage" }
+            else { Write-Host $logMessage }
+            $_.ActionId
+        }
+    }
+
+
+    hidden [string[]]$SpecificMachineIds
+    [void] SetSpecificMachineIds($specificMachineNames) {
+        $this.SpecificMachineIds = @()
+        $specificMachineNames.Split("`n") | ForEach-Object {
+            Write-Host "Translating $_ to an Id. First checking to see if it is already an Id."
+            if ($_.Trim().StartsWith("Machines-")) {
+                Write-Host "$_ is already an Id, no need to look that up."
+                $this.SpecificMachineIds += $_.Trim()
+                continue
+            }
+            $itemNameToFind = $_.Trim()
+            Write-Host "Attempting to find Deployment Target with the name of $itemNameToFind"
+            $itemList = Invoke-OctopusApi ("$($this.DeploymentContext.BaseApiUrl)/machines/?partialName=$([uri]::EscapeDataString($itemNameToFind))&skip=0&take=100" ) -GetErrorResponse
+            $machineObject = Get-FilteredOctopusItem -itemList $itemList -itemName $itemNameToFind
+            Write-Host "Successfully found $itemNameToFind with id of $($machineObject.Id)"
+            $this.SpecificMachineIds += $machineObject.Id
+        }
+    }
+
+    hidden [hashtable]$FormValues
+    [void] SetFormValues($formValuesToSet) {
+        $this.FormValues = @{}
+        $this.DeploymentPreview.Form.Values | Get-Member -MemberType NoteProperty | ForEach-Object {
+            $this.FormValues.Add($_.Name, $this.DeploymentPreview.Form.Values.$($_.Name))
+        }
+
+        $formValuesToSet.Split("`n") | ForEach-Object {
+            $entry = $_.Split('=') | ForEach-Object Trim
+            $entryName, $entryValues = $entry
+            $entry = @($entryName, $($entryValues -join "="))
+            $this.DeploymentPreview.Form.Elements | Where-Object { $_.Control.Name -ieq $entry[0] } | ForEach-Object {
+                $logMessage = "Setting Form Value '$($_.Control.Label)' to: $($entry[1])"
+                if ($this.LogPrefix) { Write-Verbose "$($this.LogPrefix)$logMessage" }
+                else { Write-Host $logMessage }
+                $this.FormValues[$_.Name] = $entry[1]
+            }
+        }
+    }
+	
+    [ServerTask]$Task
+    [void] Start() {
+        $request = @{
+            ReleaseId        = $this.DeploymentContext.Release.Id
+            EnvironmentId    = $this.Environment.Id
+            SkipActions      = $this.SkipActions
+            FormValues       = $this.FormValues
+            SpecificMachineIds = $this.SpecificMachineIds
+            ForcePackageDownload = $this.DeploymentContext.ForcePackageDownload
+            UseGuidedFailure = $this.DeploymentContext.UseGuidedFailure
+        }
+        if ($this.DeploymentContext.QueueTime -ne [datetime]::MinValue) { $request.Add('QueueTime', $this.DeploymentContext.QueueTime.ToUniversalTime().ToString('o')) }
+        if ($this.DeploymentContext.QueueTimeExpiry -ne [datetime]::MinValue) { $request.Add('QueueTimeExpiry', $this.DeploymentContext.QueueTimeExpiry.ToUniversalTime().ToString('o')) }
+        if ($this.Tenant) { $request.Add('TenantId', $this.Tenant.Id) }
+
+        $deployment = Invoke-OctopusApi "$($this.DeploymentContext.BaseApiUrl)/deployments" -Method Post -Body $request -GetErrorResponse
+        if ($deployment.ErrorMessage) { Write-Fatal "$($deployment.ErrorMessage)`n$($deployment.Errors -join "`n")" }
+        Write-Host "Queued $($deployment.Name)..."
+        Write-Host "`t$($this.BaseUrl)$(Format-WebLinksUri -Uri $deployment.Links.Web)"
+        Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $deployment.Links.Self)"
+        Write-Verbose "`t$($this.BaseUrl)$($this.DeploymentContext.BaseApiUrl)/deploymentprocesses/$($deployment.DeploymentProcessId)"
+        Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $deployment.Links.Variables)"
+        Write-Verbose "`t$($this.BaseUrl)$(Format-LinksUri -Uri $deployment.Links.Task)/details"
+
+        $this.Task = [ServerTask]::new($this.DeploymentContext, $deployment, $this.LogPrefix)
+    }
+
+    [bool] PollCheck() {
+        $this.Task.Poll()
+        if ($this.Task.IsCompleted -and !$this.Task.FinishedSuccessfully -and $this.DeploymentAttempt -lt $this.DeploymentRetryCount) {
+            $retryWaitPeriod = New-TimeSpan -Seconds (Get-OctopusSetting RetryWaitPeriod 0)
+            $waitText = if ($retryWaitPeriod.TotalSeconds -gt 0) {
+                $minutesText = if ($retryWaitPeriod.Minutes -gt 1) { " $($retryWaitPeriod.Minutes) minutes" } elseif ($retryWaitPeriod.Minutes -eq 1) { " $($retryWaitPeriod.Minutes) minute" }
+                $secondsText = if ($retryWaitPeriod.Seconds -gt 1) { " $($retryWaitPeriod.Seconds) seconds" } elseif ($retryWaitPeriod.Seconds -eq 1) { " $($retryWaitPeriod.Seconds) second" }
+                "Waiting${minutesText}${secondsText} before "
+            }
+            $this.DeploymentAttempt++
+            Write-Error "$($this.LogPrefix)Deployment failed. ${waitText}Queuing retry #$($this.DeploymentAttempt) of $($this.DeploymentRetryCount)..."
+            if ($retryWaitPeriod.TotalSeconds -gt 0) {
+                Start-Sleep -Seconds $retryWaitPeriod.TotalSeconds
+            }
+            $this.Start()
+            return $true
+        }
+        return !$this.Task.IsCompleted
+    }
+}
+
+class ServerTask {
+    hidden [DeploymentContext]$DeploymentContext
+    hidden [object]$Deployment
+    hidden [string]$LogPrefix
+
+    hidden [bool] $IsCompleted = $false
+    hidden [bool] $FinishedSuccessfully
+    hidden [string] $ErrorMessage
+    
+    hidden [int]$PollCount = 0
+    hidden [bool]$HasInterruptions = $false
+    hidden [hashtable]$State = @{}
+    hidden [System.Collections.Generic.HashSet[string]]$Logs
+ 
+    ServerTask($deploymentContext, $deployment, $logPrefix) {
+        $this.DeploymentContext = $deploymentContext
+        $this.Deployment = $deployment
+        $this.LogPrefix = $logPrefix
+        $this.Logs = [System.Collections.Generic.HashSet[string]]::new()
+    }
+    
+    [void] Poll() {	
+        if ($this.IsCompleted) { return }
+
+        $details = Invoke-OctopusApi ("$($this.DeploymentContext.BaseApiUrl)/tasks/{0}/details?verbose=false&tail=30" -f $this.Deployment.TaskId)
+        $this.IsCompleted = $details.Task.IsCompleted
+        $this.FinishedSuccessfully = $details.Task.FinishedSuccessfully
+        $this.ErrorMessage = $details.Task.ErrorMessage
+
+        $this.PollCount++
+        if ($this.PollCount % 10 -eq 0) {
+            $this.Verbose("$($details.Task.State). $($details.Task.Duration), $($details.Progress.EstimatedTimeRemaining)")
+        }
+        
+        if ($details.Task.HasPendingInterruptions) { $this.HasInterruptions = $true }
+        $this.LogQueuePosition($details.Task)
+        $activityLogs = $this.FlattenActivityLogs($details.ActivityLogs)    
+        $this.WriteLogMessages($activityLogs)
+    }
+
+    hidden [bool] IfNewState($firstKey, $secondKey, $value) {
+        $key = '{0}/{1}' -f $firstKey, $secondKey
+        $containsKey = $this.State.ContainsKey($key)
+        if ($containsKey) { return $false }
+        $this.State[$key] = $value
+        return $true
+    }
+
+    hidden [bool] HasChangedState($firstKey, $secondKey, $value) {
+        $key = '{0}/{1}' -f $firstKey, $secondKey
+        $hasChanged = if (!$this.State.ContainsKey($key)) { $true } else { $this.State[$key] -ne $value }
+        if ($hasChanged) {
+            $this.State[$key] = $value
+        }
+        return $hasChanged
+    }
+
+    hidden [object] GetState($firstKey, $secondKey) { return $this.State[('{0}/{1}' -f $firstKey, $secondKey)] }
+
+    hidden [void] ResetState($firstKey, $secondKey) { $this.State.Remove(('{0}/{1}' -f $firstKey, $secondKey)) }
+
+    hidden [void] Error($message) { Write-Error "$($this.LogPrefix)${message}" }
+    hidden [void] Warn($message) { Write-Warning "$($this.LogPrefix)${message}" }
+    hidden [void] Host($message) { Write-Host "$($this.LogPrefix)${message}" }   
+    hidden [void] Verbose($message) { Write-Verbose "$($this.LogPrefix)${message}" }
+
+    hidden [psobject[]] FlattenActivityLogs($ActivityLogs) {
+        $flattenedActivityLogs = { @() }.Invoke()
+        $this.FlattenActivityLogs($ActivityLogs, $null, $flattenedActivityLogs)
+        return $flattenedActivityLogs
+    }
+
+    hidden [void] FlattenActivityLogs($ActivityLogs, $Parent, $flattenedActivityLogs) {
+        foreach ($log in $ActivityLogs) {
+            $log | Add-Member -MemberType NoteProperty -Name Parent -Value $Parent
+            $insertBefore = $null -eq $log.Parent -and $log.Status -eq 'Running'	
+            if ($insertBefore) { $flattenedActivityLogs.Add($log) }
+            foreach ($childLog in $log.Children) {
+                $this.FlattenActivityLogs($childLog, $log, $flattenedActivityLogs)
+            }
+            if (!$insertBefore) { $flattenedActivityLogs.Add($log) }
+        }
+    }
+
+    hidden [void] LogQueuePosition($Task) {
+        if ($Task.HasBeenPickedUpByProcessor) {
+            $this.ResetState($Task.Id, 'QueuePosition')
+            return
+        }
+		
+        $queuePosition = (Invoke-OctopusApi ("$($this.DeploymentContext.BaseApiUrl)/tasks/{0}/queued-behind" -f $this.Deployment.TaskId)).Items.Count
+        if ($this.HasChangedState($Task.Id, 'QueuePosition', $queuePosition) -and $queuePosition -ne 0) {
+            $this.Host("Queued behind $queuePosition tasks...")
+        }
+    }
+
+    hidden [void] WriteLogMessages($ActivityLogs) {
+        $interrupts = if ($this.HasInterruptions) {
+            Invoke-OctopusApi ("$($this.DeploymentContext.BaseApiUrl)/interruptions?regarding={0}" -f $this.Deployment.TaskId) | ForEach-Object Items
+        }
+        foreach ($activity in $ActivityLogs) {
+            $correlatedInterrupts = $interrupts | Where-Object CorrelationId -eq $activity.Id         
+            $correlatedInterrupts | Where-Object IsPending -eq $false | ForEach-Object { $this.LogInterruptMessages($activity, $_) }
+
+            $this.LogStepTransition($activity)         
+            $this.LogErrorsAndWarnings($activity)
+            $correlatedInterrupts | Where-Object IsPending -eq $true | ForEach-Object { 
+                $this.LogInterruptMessages($activity, $_)
+                $this.HandleInterrupt($_)
+            }
+        }
+    }
+
+    hidden [void] LogStepTransition($ActivityLog) {
+        if ($ActivityLog.ShowAtSummaryLevel -and $ActivityLog.Status -ne 'Pending') {
+            $existingState = $this.GetState($ActivityLog.Id, 'Status')
+            if ($this.HasChangedState($ActivityLog.Id, 'Status', $ActivityLog.Status)) {
+                $existingStateText = if ($existingState) { "$existingState -> " }
+                $this.Host("$($ActivityLog.Name) ($existingStateText$($ActivityLog.Status))")
+            }
+        }
+    }
+
+    hidden [void] LogErrorsAndWarnings($ActivityLog) {
+        foreach ($logEntry in $ActivityLog.LogElements) {
+            if ($logEntry.Category -eq 'Info') { continue }
+            if ($this.Logs.Add(($ActivityLog.Id, $logEntry.OccurredAt, $logEntry.MessageText -join '/'))) {
+                switch ($logEntry.Category) {
+                    'Fatal' {
+                        if ($ActivityLog.Parent) {
+                            $this.Error("FATAL: During $($ActivityLog.Parent.Name)")
+                            $this.Error("FATAL: $($logEntry.MessageText)")
+                        }
+                    }
+                    'Error' { $this.Error("[$($ActivityLog.Parent.Name)] $($logEntry.MessageText)") }
+                    'Warning' { $this.Warn("[$($ActivityLog.Parent.Name)] $($logEntry.MessageText)") }
+                }
+            }
+        }
+    }
+
+    hidden [void] LogInterruptMessages($ActivityLog, $Interrupt) {
+        $message = $Interrupt.Form.Elements | Where-Object Name -eq Instructions | ForEach-Object Control | ForEach-Object Text
+        if ($Interrupt.IsPending -and $this.HasChangedState($Interrupt.Id, $ActivityLog.Parent.Name, $message)) {
+            $this.Warn("Deployment is paused at '$($ActivityLog.Parent.Name)' for manual intervention: $message")
+        }
+        if ($null -ne $Interrupt.ResponsibleUserId -and $this.HasChangedState($Interrupt.Id, 'ResponsibleUserId', $Interrupt.ResponsibleUserId)) {
+            $user = Invoke-OctopusApi (Format-LinksUri -Uri $Interrupt.Links.User)
+            $emailText = if (Test-String $user.EmailAddress) { " ($($user.EmailAddress))" }
+            $this.Warn("$($user.DisplayName)$emailText has taken responsibility for the manual intervention")
+        }
+        $manualAction = $Interrupt.Form.Values.Result
+        if ((Test-String $manualAction) -and $this.HasChangedState($Interrupt.Id, 'Action', $manualAction)) {
+            $this.Warn("Manual intervention action '$manualAction' submitted with notes: $($Interrupt.Form.Values.Notes)")
+        }
+        $guidanceAction = $Interrupt.Form.Values.Guidance
+        if ((Test-String $guidanceAction) -and $this.HasChangedState($Interrupt.Id, 'Action', $guidanceAction)) {
+            $this.Warn("Failure guidance to '$guidanceAction' submitted with notes: $($Interrupt.Form.Values.Notes)")
+        }
+    }
+
+    hidden [void] HandleInterrupt($Interrupt) {
+        $isGuidedFailure = $null -ne ($Interrupt.Form.Elements | Where-Object Name -eq Guidance)
+        if (!$isGuidedFailure -or !$this.DeploymentContext.GuidedFailureActions -or !$Interrupt.IsPending) {
+            return
+        }
+        $this.IfNewState($Interrupt.CorrelationId, 'ActionIndex', 0)
+        if ($Interrupt.CanTakeResponsibility -and $null -eq $Interrupt.ResponsibleUserId) {
+            Invoke-OctopusApi (Format-LinksUri -Uri $Interrupt.Links.Responsible) -Method Put
+        }
+        if ($Interrupt.HasResponsibility) {
+            $guidanceIndex = $this.GetState($Interrupt.CorrelationId, 'ActionIndex')
+            $guidance = $this.DeploymentContext.GuidedFailureActions[$guidanceIndex]
+            $guidanceIndex++
+            
+            $retryWaitPeriod = New-TimeSpan -Seconds (Get-OctopusSetting RetryWaitPeriod 0)
+            if ($guidance -eq 'Retry' -and $retryWaitPeriod.TotalSeconds -gt 0) {
+                $minutesText = if ($retryWaitPeriod.Minutes -gt 1) { " $($retryWaitPeriod.Minutes) minutes" } elseif ($retryWaitPeriod.Minutes -eq 1) { " $($retryWaitPeriod.Minutes) minute" }
+                $secondsText = if ($retryWaitPeriod.Seconds -gt 1) { " $($retryWaitPeriod.Seconds) seconds" } elseif ($retryWaitPeriod.Seconds -eq 1) { " $($retryWaitPeriod.Seconds) second" }
+                $this.Warn("Waiting${minutesText}${secondsText} before submitting retry failure guidance...")
+                Start-Sleep -Seconds $retryWaitPeriod.TotalSeconds
+            }
+            Invoke-OctopusApi (Format-LinksUri -Uri $Interrupt.Links.Submit) -Body @{
+                Notes    = $this.DeploymentContext.GuidedFailureMessage.Replace('#{GuidedFailureActionIndex}', $guidanceIndex).Replace('#{GuidedFailureAction}', $guidance)
+                Guidance = $guidance
+            } -Method Post
+
+            $this.HasChangedState($Interrupt.CorrelationId, 'ActionIndex', $guidanceIndex)
+        }
+    }
+}
+
+function Show-Heading {
+    param($Text)
+    $padding = ' ' * ((80 - 2 - $Text.Length) / 2)
+    Write-Host " `n"
+    Write-Host (@("`t", ([string][char]0x2554), (([string][char]0x2550) * 80), ([string][char]0x2557)) -join '')
+    Write-Host "`t$(([string][char]0x2551))$padding $Text $padding$([string][char]0x2551)"  
+    Write-Host (@("`t", ([string][char]0x255A), (([string][char]0x2550) * 80), ([string][char]0x255D)) -join '')
+    Write-Host " `n"
+}
+
+if ($OctopusParameters['Octopus.Action.RunOnServer'] -ieq 'False') {
+    Write-Warning "For optimal performance use 'Run On Server' for this action"
+}
+
+$deploymentContext = [DeploymentContext]::new($Chain_BaseUrl, $Chain_BaseApiUrl)
+
+if ($Chain_CreateOption -ieq 'True') {
+    Show-Heading 'Creating Release'
+}
+else {
+    Show-Heading 'Retrieving Release'
+}
+$deploymentContext.SetProject($Chain_ProjectName)
+$deploymentContext.SetChannel($Chain_Channel)
+Write-Host "`t$Chain_BaseUrl$(Format-WebLinksUri -Uri $deploymentContext.Project.Links.Web)"
+
+if ($Chain_CreateOption -ieq 'True') {
+    $deploymentContext.CreateRelease($Chain_ReleaseNum)
+}
+else {
+    $deploymentContext.SetRelease($Chain_ReleaseNum)
+}
+Write-Host "`t$Chain_BaseUrl$(Format-WebLinksUri -Uri $deploymentContext.Release.Links.Web)"
+if ($Chain_SnapshotVariables -ieq 'True') {
+    $deploymentContext.UpdateVariableSnapshot()
+}
+
+
+Show-Heading 'Configuring Deployment'
+$deploymentContext.GetDeploymentTemplate()
+$email = if (Test-String $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']) { "($($OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']))" }
+$guidedFailureMessage = Get-OctopusSetting GuidedFailureMessage @"
+Automatic Failure Guidance will #{GuidedFailureAction} (Failure ###{GuidedFailureActionIndex})
+Initiated by $($OctopusParameters['Octopus.Deployment.Name']) of $($OctopusParameters['Octopus.Project.Name']) release $($OctopusParameters['Octopus.Release.Number'])
+Created By: $($OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']) $email
+${Chain_BaseUrl}$($OctopusParameters['Octopus.Web.DeploymentLink'])
+"@
+$deploymentContext.SetGuidedFailure($Chain_GuidedFailure, $guidedFailureMessage)
+$deploymentContext.SetSchedule($Chain_DeploySchedule)
+
+$deploymentContext.SetEnvironment($Chain_DeployTo)
+$deploymentContext.SetTenants($Chain_Tenants)
+$deploymentContext.SetForcePackageDownload($Chain_ForcePackageDownload)
+$deploymentControllers = $deploymentContext.GetDeploymentControllers()
+if (Test-String $Chain_StepsToSkip) {
+    $deploymentControllers | ForEach-Object { $_.SetStepsToSkip($Chain_StepsToSkip) }
+}
+if (Test-String $Chain_FormValues) {
+    $deploymentControllers | ForEach-Object { $_.SetFormValues($Chain_FormValues) }
+}
+
+if (Test-String $Chain_MachineList) {
+    $deploymentControllers | ForEach-Object { $_.SetSpecificMachineIds($Chain_MachineList) }
+}
+
+Show-Heading 'Queue Deployment'
+if ($deploymentContext.IsTenanted) {
+    Write-Host 'Queueing tenant deployments...'
+}
+else {
+    Write-Host 'Queueing untenanted deployment...'
+}
+$deploymentControllers | ForEach-Object Start
+
+if (!$deploymentContext.WaitForDeployment) {
+    Write-Host 'Deployments have been queued, proceeding to the next step...'
+    return
+}
+
+Show-Heading 'Waiting For Deployment'
+do {
+    Start-Sleep -Seconds 1
+    $tasksStillRunning = $false
+    foreach ($deployment in $deploymentControllers) {
+        if ($deployment.PollCheck()) {
+            $tasksStillRunning = $true
+        }
+    }
+} while ($tasksStillRunning)
+
+if ($deploymentControllers | ForEach-Object Task | Where-Object FinishedSuccessfully -eq $false) {
+    Show-Heading 'Deployment Failed!'
+    Write-Fatal (($deploymentControllers | ForEach-Object Task | ForEach-Object ErrorMessage) -join "`n")
+}
+else {
+    Show-Heading 'Deployment Successful!'
+}
+
+if (Test-String $Chain_PostDeploy -ForAbsence) {
+    return 
+}
+
+Show-Heading 'Post-Deploy Script'
+$rawPostDeployScript = Invoke-OctopusApi ("$Chain_BaseApiUrl/releases/{0}" -f $OctopusParameters['Octopus.Release.Id']) |
+ForEach-Object { Invoke-OctopusApi (Format-LinksUri -Uri $_.Links.ProjectDeploymentProcessSnapshot) } |
+ForEach-Object Steps | Where-Object Id -eq $OctopusParameters['Octopus.Step.Id'] |
+ForEach-Object Actions | Where-Object Id -eq $OctopusParameters['Octopus.Action.Id'] |
+ForEach-Object { $_.Properties.Chain_PostDeploy }
+Write-Verbose "Raw Post-Deploy Script:`n$rawPostDeployScript"
+
+Add-Type -Path (Get-WmiObject Win32_Process | Where-Object ProcessId -eq $PID | ForEach-Object { Get-Process -Id $_.ParentProcessId } | ForEach-Object { Join-Path (Split-Path -Path $_.Path -Parent) 'Octostache.dll' })
+
+$deploymentControllers | ForEach-Object {
+    $deployment = $_.Task.Deployment
+    $tenant = $_.Tenant
+    $variablesDictionary = [Octostache.VariableDictionary]::new()
+    Invoke-OctopusApi ("$Chain_BaseApiUrl/variables/{0}" -f $deployment.ManifestVariableSetId) | ForEach-Object Variables | Where-Object {
+        ($_.IsSensitive -eq $false) -and `
+        ($_.Scope.Private -ne 'True') -and `
+        ($null -eq $_.Scope.Action) -and `
+        ($null -eq $_.Scope.Machine) -and `
+        ($null -eq $_.Scope.TargetRole) -and `
+        ($null -eq $_.Scope.Role) -and `
+        ($null -eq $_.Scope.Tenant -or $_.Scope.Tenant -contains $tenant.Id) -and `
+        ($null -eq $_.Scope.TenantTag -or (Compare-Object $_.Scope.TenantTag $tenant.TenantTags -ExcludeDifferent -IncludeEqual)) -and `
+        ($null -eq $_.Scope.Environment -or $_.Scope.Environment -contains $deployment.EnvironmentId) -and `
+        ($null -eq $_.Scope.Channel -or $_.Scope.Channel -contains $deployment.ChannelId) -and `
+        ($null -eq $_.Scope.Project -or $_.Scope.Project -contains $deployment.ProjectId)
+    } | ForEach-Object { $variablesDictionary.Set($_.Name, $_.Value) }
+    $postDeployScript = $variablesDictionary.Evaluate($rawPostDeployScript)
+    Write-Host "$($_.LogPrefix)Evaluated Post-Deploy Script:"
+    Write-Host $postDeployScript
+    Write-Host 'Script output:'
+    [scriptblock]::Create($postDeployScript).Invoke()
+}
\ No newline at end of file
diff --git a/src/step-templates/octopus-check-for-argo-instance/metadata.json b/src/step-templates/octopus-check-for-argo-instance/metadata.json
new file mode 100644
index 000000000..5621fdae3
--- /dev/null
+++ b/src/step-templates/octopus-check-for-argo-instance/metadata.json
@@ -0,0 +1,35 @@
+{
+  "Id": "7da3a76e-57ca-4542-846a-73c00252206c",
+  "Name": "Octopus - Check for Argo CD Instances",
+  "Description": "Checks to see if there are any Argo CD instances registered to the space.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "dfeca839-7c5d-4d5f-a941-27522f918a67",
+      "Name": "Template.Octopus.API.Key",
+      "Label": "Octopus Deploy API Key",
+      "HelpText": "The Octopus Deploy API Key to use when making calls to the Octopus API.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-11-05T23:41:23.3200000Z",
+    "OctopusVersion": "2025.4.6474",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-check-for-argo-instance/scriptbody.ps1 b/src/step-templates/octopus-check-for-argo-instance/scriptbody.ps1
new file mode 100644
index 000000000..9709b71b0
--- /dev/null
+++ b/src/step-templates/octopus-check-for-argo-instance/scriptbody.ps1
@@ -0,0 +1,46 @@
+# Fix ANSI Color on PWSH Core issues when displaying objects
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+
+# Define variables
+$isArgoPresent = $false
+
+# Check to see if the Octopus.Web.ServerUri variable has a value
+if (![string]::IsNullOrWhitespace($OctopusParameters["Octopus.Web.ServerUri"]))
+{
+    $baseUrl = $OctopusParameters["Octopus.Web.ServerUri"]
+}
+else
+{
+    $baseUrl = $OctopusParameters["Octopus.Web.BaseUrl"]
+}
+
+# Validate parameters
+if ([string]::IsNullOrWhitespace($OctopusParameters["Template.Octopus.API.Key"]) -or -not $OctopusParameters["Template.Octopus.API.Key"].StartsWith("API-"))
+{
+    Write-Highlight "An API Key was not provided, unable to check to see if there are any Argo CD instances registered in this space."
+    Write-Highlight "See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys."
+    Write-Highlight "Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check for Argo CD instances in this space."
+}
+else
+{
+    $header = @{ "X-Octopus-ApiKey" = $OctopusParameters["Template.Octopus.API.Key"] }
+
+    # Get registered Argo CD instances
+    $argoInstances = Invoke-RestMethod -Method Get -Uri "$($baseUrl)/api/#{Octopus.Space.Id}/argocdinstances/summaries" -Headers $header
+
+    # Check the returned values
+    if ($argoInstances.Resources.Count -gt 0)
+    {
+        Write-Highlight "Found $($argoInstances.Resources.Count) Argo instance(s) registered!"
+        $isArgoPresent = $true
+    }
+    else
+    {
+        Write-Highlight "No Argo CD instances registered to space $($OctopusParameters['Octopus.Space.Name']).  Please [register an Argo CD instance](https://octopus.com/docs/argo-cd/instances) with this space."
+    }
+}
+
+# Set output variable
+Set-OctopusVariable -Name ArgoPresent -Value $isArgoPresent
\ No newline at end of file
diff --git a/src/step-templates/octopus-check-roles/metadata.json b/src/step-templates/octopus-check-roles/metadata.json
new file mode 100644
index 000000000..d59146831
--- /dev/null
+++ b/src/step-templates/octopus-check-roles/metadata.json
@@ -0,0 +1,56 @@
+{
+  "Id": "81444e7f-d77a-47db-b287-0f1ab5793880",
+  "Name": "Octopus - Check Targets Available",
+  "Description": "Checks for the presence of targets with the specified tag. If no targets are found, the deployment will fail with the provided message.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e9713772-81f8-4f0f-af80-10c3ec0bfb17",
+      "Name": "CheckTargets.Octopus.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The API key used to query the Octopus instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f2c126ad-e907-4fb8-84a3-a5fb80dd6688",
+      "Name": "CheckTargets.Octopus.Role",
+      "Label": "Target Tag to Check",
+      "HelpText": "The name of the target tag to check for.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2d5257e4-288a-456c-ba18-bd2b3c1c1351",
+      "Name": "CheckTargets.Message",
+      "Label": "Message to display if tags not found",
+      "HelpText": "An optional custom message to display if no targets are found with the specified tag.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-10-13T00:52:34.0190000Z",
+    "OctopusVersion": "2025.3.14357",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "Octopus"
+}
diff --git a/src/step-templates/octopus-check-roles/scriptbody.ps1 b/src/step-templates/octopus-check-roles/scriptbody.ps1
new file mode 100644
index 000000000..67773178d
--- /dev/null
+++ b/src/step-templates/octopus-check-roles/scriptbody.ps1
@@ -0,0 +1,64 @@
+$errorCollection = @()
+$setupValid = $false
+
+Write-Host "Checking for deployment targets ..."
+
+try
+{
+    # Check to make sure targets have been created
+    if ([string]::IsNullOrWhitespace("#{Octopus.Web.ServerUri}"))
+    {
+        $octopusUrl = "#{Octopus.Web.BaseUrl}"
+    }
+    else
+    {
+        $octopusUrl = "#{Octopus.Web.ServerUri}"
+    }
+
+    $apiKey = "#{CheckTargets.Octopus.Api.Key}"
+    $role = "#{CheckTargets.Octopus.Role}"
+    $message = "#{CheckTargets.Message}"
+
+    if (![string]::IsNullOrWhitespace($apiKey) -and $apiKey.StartsWith("API-"))
+    {
+        $spaceId = "#{Octopus.Space.Id}"
+        $headers = @{ "X-Octopus-ApiKey" = "$apiKey" }
+
+        try
+        {
+            $roleTargets = Invoke-RestMethod -Method Get -Uri "$octopusUrl/api/$spaceId/machines?roles=$role" -Headers $headers
+            if ($roleTargets.Items.Count -lt 1)
+            {
+                $errorCollection += @("Expected at least 1 target for tag $role, but found $( $roleTargets.Items.Count ). $message")
+            }
+        }
+        catch
+        {
+            $errorCollection += @("Failed to retrieve role targets: $( $_.Exception.Message )")
+        }
+
+        if ($errorCollection.Count -gt 0)
+        {
+            foreach ($item in $errorCollection)
+            {
+                Write-Highlight "$item"
+            }
+        }
+        else
+        {
+            $setupValid = $true
+            Write-Host "Setup valid!"
+        }
+    }
+    else
+    {
+        Write-Highlight "The project variable CheckTargets.Octopus.Api.Key has not been configured, unable to check deployment targets."
+        Write-Highlight "See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys."
+        Write-Highlight "Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check for targets in this space."
+    }
+
+    Set-OctopusVariable -Name SetupValid -Value $setupValid
+} catch {
+    Write-Verbose "Fatal error occurred:"
+    Write-Verbose "$($_.Exception.Message)"
+}
\ No newline at end of file
diff --git a/src/step-templates/octopus-consolidate-releasenotes/metadata.json b/src/step-templates/octopus-consolidate-releasenotes/metadata.json
new file mode 100644
index 000000000..c78e423a7
--- /dev/null
+++ b/src/step-templates/octopus-consolidate-releasenotes/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "fa570d27-1405-4030-87b2-c0abf12bb833",
+  "Name": "Consolidate Release Notes",
+  "Description": "Consolidates all Release Notes between the last successful release in the current Environment and this one by merging or concatenating them.",
+  "ActionType": "Octopus.Script",
+  "Version": 13,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "fa5cfdb4-b006-4f92-90ee-affc1791fc79",
+      "Name": "Consolidate_ApiKey",
+      "Type": "String",
+      "Label": "Api Key",
+      "HelpText": "The API Key to use for authentication",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2fe221e5-1f47-4cf9-bde7-ed3b77028bf4",
+      "Name": "Consolidate_Dedupe",
+      "Type": "String",
+      "Label": "Remove Duplicates",
+      "HelpText": "Whether to remove **duplicate** lines when constructing release notes",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "301aa2a8-f06b-4904-9636-99189074f224",
+      "Name": "Consolidate_RemoveWhitespace",
+      "Type": "String",
+      "Label": "Remove Blank Lines",
+      "HelpText": "Whether to remove **blank** lines when constructing release notes",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox",
+        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "517d4aac-e6ae-451c-b18f-be31c6c153b8",
+      "Name": "Consolidate_Order",
+      "Type": "String",
+      "Label": "Concatenation Order",
+      "HelpText": "The order in which to append release notes",
+      "DefaultValue": "Newest",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Newest|Newest to Oldest\nOldest|Oldest to Newest"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "FinnianDempsey",
+  "$Meta": {
+    "ExportedAt": "2023-03-09T13:12:44.0430000Z",
+    "OctopusVersion": "2022.3.10936",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-consolidate-releasenotes/scriptbody.ps1 b/src/step-templates/octopus-consolidate-releasenotes/scriptbody.ps1
new file mode 100644
index 000000000..8031c3a44
--- /dev/null
+++ b/src/step-templates/octopus-consolidate-releasenotes/scriptbody.ps1
@@ -0,0 +1,104 @@
+$baseUri = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}']
+$reqheaders = @{"X-Octopus-ApiKey" = $Consolidate_ApiKey }
+$putReqHeaders = @{"X-HTTP-Method-Override" = "PUT"; "X-Octopus-ApiKey" = $Consolidate_ApiKey }
+
+$remWhiteSpace = [bool]::Parse($Consolidate_RemoveWhitespace)
+$deDupe = [bool]::Parse($Consolidate_Dedupe)
+$reverse = ($Consolidate_Order -eq "Oldest")
+
+# Get details we'll need
+$projectId = $OctopusParameters['Octopus.Project.Id']
+$thisReleaseNumber = $OctopusParameters['Octopus.Release.Number']
+$lastSuccessfulReleaseId = $OctopusParameters['Octopus.Release.CurrentForEnvironment.Id']
+$lastSuccessfulReleaseNumber = $OctopusParameters['Octopus.Release.CurrentForEnvironment.Number']
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-WebRequest "$baseUri/api" -Headers $reqHeaders -UseBasicParsing | ConvertFrom-Json;
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if(Test-SpacesApi) {
+	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+    }
+	$baseApiUrl = "/api/$spaceId" ;
+} else {
+	$baseApiUrl = "/api" ;
+}
+
+# Get all previous releases to this environment
+$releaseUri = "$baseUri$baseApiUrl/projects/$projectId/releases"
+try {
+    $allReleases = Invoke-WebRequest $releaseUri -Headers $reqheaders -UseBasicParsing | ConvertFrom-Json
+} catch {
+    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {
+        $result = $_.Exception.Response.GetResponseStream()
+        $reader = New-Object System.Io.StreamReader($result);
+        $responseBody = $reader.ReadToEnd();
+        throw "Error occurred: $responseBody"
+    }
+}
+
+# Find and aggregate release notes
+$aggregateNotes = @()
+
+Write-Host "Finding all release notes between the last successful release: $lastSuccessfulReleaseNumber and this release: $thisReleaseNumber"
+foreach ($rel in $allReleases.Items) {
+    if ($rel.Id -ne $lastSuccessfulReleaseId) {
+        Write-Host "Found release notes for $($rel.Version)"
+        $theseNotes = @()
+        #split into lines
+        $lines = $rel.ReleaseNotes -split "`n"
+        foreach ($line in $lines) {
+            if (-not $remWhitespace -or -not [string]::IsNullOrWhiteSpace($line)) {
+                if (-not $deDupe -or -not $aggregateNotes.Contains($line)) {
+                    $theseNotes = $theseNotes + $line
+                }
+            }
+        }
+        if ($reverse) {
+            $aggregateNotes = $theseNotes + $aggregateNotes
+        } else {
+            $aggregateNotes = $aggregateNotes + $theseNotes
+        }
+    } else {
+        break
+    }
+}
+$aggregateNotesText = $aggregateNotes -join "`n`n"
+
+# Get the current release
+$releaseUri = "$baseUri$baseApiUrl/projects/$projectId/releases/$thisReleaseNumber"
+try {
+    $currentRelease = Invoke-WebRequest $releaseUri -Headers $reqheaders -UseBasicParsing | ConvertFrom-Json
+} catch {
+    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {
+        $result = $_.Exception.Response.GetResponseStream()
+        $reader = New-Object System.Io.StreamReader($result);
+        $responseBody = $reader.ReadToEnd();
+        throw "Error occurred: $responseBody"
+    }
+}
+
+# Update the release notes for the current release
+$currentRelease.ReleaseNotes = $aggregateNotesText
+Write-Host "Updating release notes for $thisReleaseNumber`:`n`n"
+Write-Host $aggregateNotesText
+try {
+    $releaseUri = "$baseUri$baseApiUrl/releases/$($currentRelease.Id)"
+    $currentReleaseBody = $currentRelease | ConvertTo-Json -Depth 10
+    $result = Invoke-WebRequest $releaseUri -Method Post -Headers $putReqHeaders -Body $currentReleaseBody -UseBasicParsing | ConvertFrom-Json
+} catch {
+    $result = $_.Exception.Response.GetResponseStream()
+    $reader = New-Object System.Io.StreamReader($result);
+    $responseBody = $reader.ReadToEnd();
+    Write-Host $responseBody
+    throw "Error occurred: $responseBody"
+}
\ No newline at end of file
diff --git a/step-templates/octopus-create-octoterra-space-azure.json b/src/step-templates/octopus-create-octoterra-space-azure/metadata.json
similarity index 99%
rename from step-templates/octopus-create-octoterra-space-azure.json
rename to src/step-templates/octopus-create-octoterra-space-azure/metadata.json
index f5ae7afe3..687c251f0 100644
--- a/step-templates/octopus-create-octoterra-space-azure.json
+++ b/src/step-templates/octopus-create-octoterra-space-azure/metadata.json
@@ -173,7 +173,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-12-20T22:22:32.372Z",
+    "ExportedAt": "2023-12-20T22:22:32.3720000Z",
     "OctopusVersion": "2024.1.5406",
     "Type": "ActionTemplate"
   },
diff --git a/step-templates/octopus-create-octoterra-space-s3.json b/src/step-templates/octopus-create-octoterra-space-s3/metadata.json
similarity index 99%
rename from step-templates/octopus-create-octoterra-space-s3.json
rename to src/step-templates/octopus-create-octoterra-space-s3/metadata.json
index ad74a8e26..6215fd5ea 100644
--- a/step-templates/octopus-create-octoterra-space-s3.json
+++ b/src/step-templates/octopus-create-octoterra-space-s3/metadata.json
@@ -163,7 +163,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-10-24T03:21:15.975Z",
+    "ExportedAt": "2023-10-24T03:21:15.9750000Z",
     "OctopusVersion": "2023.4.6612",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/octopus-delete-machine-registration/metadata.json b/src/step-templates/octopus-delete-machine-registration/metadata.json
new file mode 100644
index 000000000..a9c227d50
--- /dev/null
+++ b/src/step-templates/octopus-delete-machine-registration/metadata.json
@@ -0,0 +1,65 @@
+{
+  "Id": "e4255fcb-fe7d-4d5b-8ec0-0243e5f48a9c",
+  "Name": "Delete Target or Worker Registration From Octopus",
+  "Description": "Step that will attempt to delete a target or worker from Octopus Deploy using the API.  If it cannot delete the target or worker it will disable the target and rename it.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "octobob",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "f287ffbb-9b6b-48b8-bea6-2ba399ae570c",
+      "Name": "DeleteTarget.Octopus.Base.Url",
+      "Label": "Octopus Base Url",
+      "HelpText": "The Base URL of the Octopus Deploy Server.  Example: https://samples.octopus.app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cabd24c3-3eb3-4913-b73a-0df2df02e82d",
+      "Name": "DeleteTarget.Octopus.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The API key of a user who has permissions to delete a target from Octopus Deploy",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "396591f9-8bd0-4acb-9de6-2dacf0ca2c50",
+      "Name": "DeleteTarget.Target.Name",
+      "Label": "Target Name",
+      "HelpText": "The Name of the Target to delete from Octopus Deploy",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e01b6695-1cef-423b-b53f-b1185cc3b894",
+      "Name": "DeleteTarget.Target.TargetType",
+      "Label": "Target Type",
+      "HelpText": "What kind of registration is it, a worker or a deployment target",
+      "DefaultValue": "Target",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Target|Deployment Target\nWorker|Worker"
+      }
+    }
+  ],
+  "LastModifiedBy": "octobob",
+  "$Meta": {
+    "ExportedAt": "2020-04-13T15:37:29.8660000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-delete-machine-registration/scriptbody.ps1 b/src/step-templates/octopus-delete-machine-registration/scriptbody.ps1
new file mode 100644
index 000000000..69db25d41
--- /dev/null
+++ b/src/step-templates/octopus-delete-machine-registration/scriptbody.ps1
@@ -0,0 +1,65 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$OctopusAPIKey = $OctopusParameters["DeleteTarget.Octopus.Api.Key"]
+$TargetName = $OctopusParameters["DeleteTarget.Target.Name"]
+$OctopusUrl = $OctopusParameters["DeleteTarget.Octopus.Base.Url"]
+$SpaceId = $OctopusParameters["Octopus.Space.Id"]
+$TargetType = $OctopusParameters["DeleteTarget.Target.TargetType"]
+
+Write-Host "Target Name: $TargetName"
+Write-Host "Octopus URL: $OctopusUrl"
+Write-Host "Space Id: $SpaceId"
+Write-Host "Target Type: $TargetType"
+
+$header = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$header.Add("X-Octopus-ApiKey", $OctopusAPIKey)
+
+$baseApiUrl = "$OctopusUrl/api"
+$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header
+if ((Get-Member -InputObject $baseApiInformation.Links -Name "Spaces" -MemberType Properties) -ne $null)
+{
+	$baseApiUrl = "$baseApiUrl/$SpaceId"
+}
+
+$baseTargetUrl = "$baseApiUrl/machines"
+
+if ($TargetType -eq "Worker")
+{
+	$baseTargetUrl = "$baseApiUrl/workers"
+    Write-Host "Worker was selected, switching over to use the URL $baseTargetUrl"
+}
+
+$targetListUrl = "$($baseTargetUrl)?skip=0&take=1000&partialName=$TargetName"
+Write-Host "Get a list of all machine using the URL $targetListUrl"
+
+$targetList = (Invoke-RestMethod $targetListUrl -Headers $header)
+
+foreach($target in $targetList.Items)
+{
+    if ($target.Name -eq $TargetName)
+    {
+        $targetId = $target.Id
+        $itemToDeleteEndPoint = "$baseTargetUrl/$targetId"
+        try
+        {        	
+        	Write-Highlight "Deleting the machine $targetId because the name $($target.Name) matches the $TargetName $itemToDeleteEndPoint"
+        	$deleteResponse = (Invoke-RestMethod $itemToDeleteEndPoint -Headers $header -Method Delete)
+            Write-Highlight "Successfully deleted machine $TargetName"
+            Write-Host "Delete Response $deleteResponse"
+        }
+        catch
+        {          	
+        	$currentDate = Get-Date -Format "_MMddyyyy_HHmm"
+        	$target.Name = "$($target.Name)-old$currentdate"
+            $target.IsDisabled = $True
+            
+            $jsonRequest = $target | ConvertTo-Json
+                        
+            Write-Highlight "There was an error deleting the machine, renaming it to $($target.name) and disabling it"
+          	Write-Host $_
+            $machineResponse = Invoke-RestMethod $itemToDeleteEndPoint -Headers $header -Method PUT -Body $jsonRequest
+        } 
+        
+        break
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/octopus-find-cac-updates/metadata.json b/src/step-templates/octopus-find-cac-updates/metadata.json
new file mode 100644
index 000000000..57ca0a456
--- /dev/null
+++ b/src/step-templates/octopus-find-cac-updates/metadata.json
@@ -0,0 +1,131 @@
+{
+  "Id": "05210515-1a52-45d9-8be3-16caef808326",
+  "Name": "Octopus - Find CaC Updates (S3 Backend)",
+  "Description": "This step queries each workspace in the Terraform state for downstream Octopus CaC enabled projects, extracts the Git repo associated with the CaC project, and determines if there are any changes to merge into the downstream project from the upstream project.\n\nThis indicates if changes to an upstream project are available to be merged into a downstream project, either automatically, or after resolving merge conflicts.",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Aws.Region": "#{FindConflicts.Terraform.Backend.S3Region}",
+    "Octopus.Action.AwsAccount.Variable": "#{FindConflicts.Terraform.Aws.Account}"
+  },
+  "Parameters": [
+    {
+      "Id": "1eea75a0-74c7-4af9-8569-a9e9ece1bd55",
+      "Name": "FindConflicts.Git.Credentials.Username",
+      "Label": "Git Username",
+      "HelpText": "The git repo username. When using GitHub with an access token, the value is `x-access-token`.",
+      "DefaultValue": "x-access-token",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1cf36824-079a-4cf1-b67c-36f07933f642",
+      "Name": "FindConflicts.Git.Credentials.Password",
+      "Label": "Git Password",
+      "HelpText": "The git repo password or access token.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e6a7414d-8d84-4fb8-9149-2a87f20502bf",
+      "Name": "FindConflicts.Git.Url.Protocol",
+      "Label": "Git Protocol",
+      "HelpText": "The git repo protocol.",
+      "DefaultValue": "https",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "https|HTTPS\nhttp|HTTP"
+      }
+    },
+    {
+      "Id": "f5d0d829-ef6c-4e06-b115-7b2845339544",
+      "Name": "FindConflicts.Git.Url.Host",
+      "Label": "Git Hostname",
+      "HelpText": "The git repo host name.",
+      "DefaultValue": "github.com",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8b6e78e2-07fa-4783-9f9a-c23f5295f146",
+      "Name": "FindConflicts.Git.Url.Organization",
+      "Label": "Git Organization",
+      "HelpText": "The git repo owner or organization i.e. `owner` in the url `https://github.com/owner/repo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1e99c543-9e80-41b2-9384-8cbefd5c3ee6",
+      "Name": "FindConflicts.Git.Url.Template",
+      "Label": "Git Template Repo",
+      "HelpText": "The repo holding the upstream, or template, CaC project i.e. `repo` in the url `https://github.com/owner/repo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b0131561-4928-4dfb-85a9-a1282ac4a1be",
+      "Name": "FindConflicts.Terraform.Backend.S3Region",
+      "Label": "AWS Region",
+      "HelpText": "The AWS region hosting the S3 bucket persisting the Terraform state.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "652fa73d-99fa-4c81-9ef8-2e79d985222d",
+      "Name": "FindConflicts.Terraform.Backend.S3Key",
+      "Label": "S3 Key",
+      "HelpText": "The name of the file in the S3 bucket hosting the Terraform state.",
+      "DefaultValue": "Project_#{Octopus.Project.Name | Replace \"[^A-Za-z0-9]\" \"_\"}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7102a4ab-0f05-4b97-be26-8361b23df361",
+      "Name": "FindConflicts.Terraform.Backend.S3Bucket",
+      "Label": "S3 Bucket",
+      "HelpText": "The name of the S3 bucket hosting the Terraform state.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7015ee07-f265-41d4-863a-d1f13fcfbc68",
+      "Name": "FindConflicts.Terraform.Aws.Account",
+      "Label": "AWS Account",
+      "HelpText": "The AWS account used to access the S3 bucket.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2023-11-16T20:09:13.6590000Z",
+    "OctopusVersion": "2024.1.1838",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-find-cac-updates/scriptbody.ps1 b/src/step-templates/octopus-find-cac-updates/scriptbody.ps1
new file mode 100644
index 000000000..79c0285aa
--- /dev/null
+++ b/src/step-templates/octopus-find-cac-updates/scriptbody.ps1
@@ -0,0 +1,371 @@
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows) {
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Function Get-GitExecutable
+{
+    # Define parameters
+    param (
+        $WorkingDirectory
+    )
+
+    # Define variables
+    $gitExe = "PortableGit-2.41.0.3-64-bit.7z.exe"
+    $gitDownloadUrl = "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe"
+    $gitDownloadArguments = @{}
+    $gitDownloadArguments.Add("Uri", $gitDownloadUrl)
+    $gitDownloadArguments.Add("OutFile", "$WorkingDirectory/git/$gitExe")
+
+    # This makes downloading faster
+    $ProgressPreference = 'SilentlyContinue'
+
+    # Check to see if git subfolder exists
+    if ((Test-Path -Path "$WorkingDirectory/git") -eq $false)
+    {
+        # Create subfolder
+        New-Item -Path "$WorkingDirectory/git"  -ItemType Directory | Out-Null
+    }
+
+    # Check PowerShell version
+    if ($PSVersionTable.PSVersion.Major -lt 6)
+    {
+        # Use basic parsing is required
+        $gitDownloadArguments.Add("UseBasicParsing", $true)
+    }
+
+    # Download Git
+    Write-Host "Downloading Git ..."
+    Invoke-WebRequest @gitDownloadArguments
+
+    # Extract Git
+    $gitExtractArguments = @()
+    $gitExtractArguments += "-o"
+    $gitExtractArguments += "$WorkingDirectory\git"
+    $gitExtractArguments += "-y"
+    $gitExtractArguments += "-bd"
+
+    Write-Host "Extracting Git download ..."
+    & "$WorkingDirectory\git\$gitExe" $gitExtractArguments
+
+    # Wait until unzip action is complete
+    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(".")))}))
+    {
+        Start-Sleep 5
+    }
+
+    # Add bin folder to path
+    $env:PATH = "$WorkingDirectory\git\bin$([IO.Path]::PathSeparator)" + $env:PATH
+
+    # Disable promopt for credential helper
+    Invoke-CustomCommand "git" @("config", "--system", "--unset", "credential.helper") | Write-Results
+}
+
+Function Invoke-CustomCommand
+{
+    Param (
+        $commandPath,
+        $commandArguments,
+        $workingDir = (Get-Location),
+        $path = @()
+    )
+
+    $path += $env:PATH
+    $newPath = $path -join [IO.Path]::PathSeparator
+
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.WorkingDirectory = $workingDir
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $pinfo.EnvironmentVariables["PATH"] = $newPath
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+
+    # Capture output during process execution so we don't hang
+    # if there is too much output.
+    # Microsoft documents a C# solution here:
+    # https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.processstartinfo.redirectstandardoutput?view=net-7.0&redirectedfrom=MSDN#remarks
+    # This code is based on https://stackoverflow.com/a/74748844
+    $stdOut = [System.Text.StringBuilder]::new()
+    $stdErr = [System.Text.StringBuilder]::new()
+    do
+    {
+        if (!$p.StandardOutput.EndOfStream)
+        {
+            $stdOut.AppendLine($p.StandardOutput.ReadLine())
+        }
+        if (!$p.StandardError.EndOfStream)
+        {
+            $stdErr.AppendLine($p.StandardError.ReadLine())
+        }
+
+        Start-Sleep -Milliseconds 10
+    }
+    while (-not $p.HasExited)
+
+    # Capture any standard output generated between our last poll and process end.
+    while (!$p.StandardOutput.EndOfStream)
+    {
+        $stdOut.AppendLine($p.StandardOutput.ReadLine())
+    }
+
+    # Capture any error output generated between our last poll and process end.
+    while (!$p.StandardError.EndOfStream)
+    {
+        $stdErr.AppendLine($p.StandardError.ReadLine())
+    }
+
+    $p.WaitForExit()
+
+    $executionResults = [pscustomobject]@{
+        StdOut = $stdOut.ToString()
+        StdErr = $stdErr.ToString()
+        ExitCode = $p.ExitCode
+    }
+
+    return $executionResults
+
+}
+
+function Write-Results
+{
+    [cmdletbinding()]
+    param (
+        [Parameter(Mandatory=$True,ValuefromPipeline=$True)]
+        $results
+    )
+
+    if (![String]::IsNullOrWhiteSpace($results.StdOut))
+    {
+        Write-Verbose $results.StdOut
+    }
+
+    if (![String]::IsNullOrWhiteSpace($results.StdErr))
+    {
+        Write-Verbose $results.StdErr
+    }
+}
+
+function Write-TerraformBackend {
+    Set-Content -Path 'backend.tf' -Value @"
+terraform {
+        backend "s3" {}
+        required_providers {
+          octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = "0.14.9" }
+        }
+    }
+"@
+}
+
+function Format-StringAsNullOrTrimmed {
+    [cmdletbinding()]
+    param (
+        [Parameter(ValuefromPipeline=$True)]
+        $input
+    )
+
+    if ([string]::IsNullOrWhitespace($input)) {
+        return $null
+    }
+
+    return $input.Trim()
+}
+
+$username = $OctopusParameters["FindConflicts.Git.Credentials.Username"]
+$password = $OctopusParameters["FindConflicts.Git.Credentials.Password"]
+$protocol = $OctopusParameters["FindConflicts.Git.Url.Protocol"]
+$gitHost = $OctopusParameters["FindConflicts.Git.Url.Host"]
+$org = $OctopusParameters["FindConflicts.Git.Url.Organization"]
+$repo = $OctopusParameters["FindConflicts.Git.Url.Template"]
+$region = $OctopusParameters["FindConflicts.Terraform.Backend.S3Region"]
+$key = $OctopusParameters["FindConflicts.Terraform.Backend.S3Key"]
+$bucket = $OctopusParameters["FindConflicts.Terraform.Backend.S3Bucket"]
+
+# Validate the inputs
+if ([string]::IsNullOrWhitespace($username)) {
+    Write-Error "The FindConflicts.Git.Credentials.Username variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($password)) {
+    Write-Error "The FindConflicts.Git.Credentials.Password variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($protocol)) {
+    Write-Error "The FindConflicts.Git.Url.Protocol variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($gitHost)) {
+    Write-Error "The FindConflicts.Git.Url.Host variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($org)) {
+    Write-Error "The FindConflicts.Git.Url.Organization variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($repo)) {
+    Write-Error "The FindConflicts.Git.Url.Template variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($region)) {
+    Write-Error "The FindConflicts.Terraform.Backend.S3Region variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($key)) {
+    Write-Error "The FindConflicts.Terraform.Backend.S3Key variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($bucket)) {
+    Write-Error "The FindConflicts.Terraform.Backend.S3Bucket variable must be provided"
+}
+
+$templateRepoUrl = $protocol + "://" + $gitHost + "/" + $org + "/" + $repo + ".git"
+$templateRepo = $protocol + "://" + $username + ":" + $password + "@" + $gitHost + "/" + $org + "/" + $repo + ".git"
+$branch = "main"
+
+# Check to see if it's Windows
+if ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq "Hosted Windows")
+{
+    # Dynamic worker don't have git, download portable version and add to path for execution
+    Write-Host "Detected usage of Windows Dynamic Worker ..."
+    Get-GitExecutable -WorkingDirectory $PWD
+}
+
+Write-TerraformBackend
+
+Invoke-CustomCommand "git" @("config", "--global", "user.email", "octopus@octopus.com") | Write-Results
+Invoke-CustomCommand "git" @("config", "--global", "user.name", "Octopus Server") | Write-Results
+
+Invoke-CustomCommand "terraform" @("init", "-no-color", "-backend-config=`"bucket=$bucket`"", "-backend-config=`"region=$region`"", "-backend-config=`"key=$key`"") | Write-Results
+
+Write-Host "- Up to date"
+Write-Host "> Can automatically merge"
+Write-Host "× Merge conflict"
+Write-Host "Verbose logs contain instructions for resolving merge conflicts."
+
+$workspaces = Invoke-CustomCommand "terraform" @("workspace", "list")
+
+Write-Results $workspaces
+
+$parsedWorkspaces = $workspaces.StdOut.Replace("*", "").Split("`n")
+
+$downstreamCount = 0
+foreach ($workspace in $parsedWorkspaces)
+{
+    $trimmedWorkspace = $workspace | Format-StringAsNullOrTrimmed
+
+    if ($trimmedWorkspace -eq "default" -or [string]::IsNullOrWhitespace($trimmedWorkspace))
+    {
+        continue
+    }
+
+    Write-Verbose "Processing workspace $trimmedWorkspace"
+
+    Invoke-CustomCommand "terraform" @("workspace", "select", $trimmedWorkspace) | Write-Results
+
+    $state = Invoke-CustomCommand "terraform" @("show", "-json")
+
+    # state might include sensitive values, so don't print it unless there was an error
+
+    if (-not $state.ExitCode -eq 0)
+    {
+        Write-Results $state
+        continue
+    }
+
+    $parsedState = $state.StdOut | ConvertFrom-Json
+
+    $resources = $parsedState.values.root_module.resources | Where-Object {
+        $_.type -eq "octopusdeploy_project"
+    }
+
+    # The outputs allow us to contact the downstream instance)
+    $spaceId = Invoke-CustomCommand "terraform" @("output", "-raw", "octopus_space_id")
+    $spaceName = Invoke-CustomCommand "terraform" @("output", "-raw", "octopus_space_name")
+    $space = if ([string]::IsNullOrWhitespace($spaceName.StdOut))
+    {
+        $spaceId.StdOut | Format-StringAsNullOrTrimmed
+    }
+    else
+    {
+        $spaceName.StdOut | Format-StringAsNullOrTrimmed
+    }
+
+    foreach ($resource in $resources)
+    {
+        $url = $resource.values.git_library_persistence_settings.url | Format-StringAsNullOrTrimmed
+        $spaceId = $resource.values.space_id | Format-StringAsNullOrTrimmed
+        $name = $resource.values.name | Format-StringAsNullOrTrimmed
+
+        if (-not [string]::IsNullOrWhitespace($url))
+        {
+            $downstreamCount++
+
+            mkdir $trimmedWorkspace | Out-Null
+
+            Invoke-CustomCommand "git" @("clone", $url, $trimmedWorkspace) | Write-Results
+            Invoke-CustomCommand "git" @("remote", 'add', 'upstream', $templateRepo) $trimmedWorkspace | Write-Results
+            Invoke-CustomCommand "git" @("fetch", "--all") $trimmedWorkspace | Write-Results
+            Invoke-CustomCommand "git" @("checkout", "-b", "upstream-$branch", "upstream/$branch") $trimmedWorkspace | Write-Results
+
+            if (-not($branch -eq "master" -or $branch -eq "main"))
+            {
+                Invoke-CustomCommand "git" @("checkout", "-b", $branch, "origin/$branch") $trimmedWorkspace | Write-Results
+            }
+            else
+            {
+                Invoke-CustomCommand "git" @("checkout", $branch) $trimmedWorkspace | Write-Results
+            }
+
+            $mergeBase = Invoke-CustomCommand "git" @("merge-base", $branch, "upstream-$branch") $trimmedWorkspace
+
+            Write-Results $mergeBase
+
+            $mergeSourceCurrentCommit = Invoke-CustomCommand "git" @("rev-parse", "upstream-$branch") $trimmedWorkspace
+
+            Write-Results $mergeSourceCurrentCommit
+
+            $mergeResult = Invoke-CustomCommand "git" @("merge", "--no-commit", "--no-ff", "upstream-$branch") $trimmedWorkspace
+
+            Write-Results $mergeResult
+
+            if ($mergeBase.StdOut -eq $mergeSourceCurrentCommit.StdOut)
+            {
+                Write-Host "$space `"$name`" $url -"
+            }
+            elseif (-not $mergeResult.ExitCode -eq 0)
+            {
+                Write-Host "$space `"$name`" $url ×"
+                Write-Verbose "To resolve the conflicts, run the following commands:"
+                Write-Verbose "mkdir cac"
+                Write-Verbose "cd cac"
+                Write-Verbose "git clone $url ."
+                Write-Verbose "git remote add upstream $templateRepoUrl"
+                Write-Verbose "git fetch --all"
+                Write-Verbose "git checkout -b upstream-$branch upstream/$branch"
+                if (-not($branch -eq "master" -or $branch -eq "main"))
+                {
+                    Write-Verbose "git checkout -b $branch origin/$branch"
+                }
+                else
+                {
+                    Write-Verbose "git checkout $branch"
+                    Write-Verbose "git merge-base $branch upstream-$branch"
+                    Write-Verbose "git merge --no-commit --no-ff upstream-$branch"
+                }
+            }
+            else
+            {
+                Write-Host "$space `"$name`" $url >"
+            }
+        }
+        else {
+            Write-Verbose "`"$name`" is not a CaC project"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/octopus-get-octopus-usage/metadata.json b/src/step-templates/octopus-get-octopus-usage/metadata.json
new file mode 100644
index 000000000..f46120da1
--- /dev/null
+++ b/src/step-templates/octopus-get-octopus-usage/metadata.json
@@ -0,0 +1,46 @@
+{
+  "Id": "f70f16a9-7bf3-448c-9532-e5a69364581d",
+  "Name": "Get Octopus Usage",
+  "Description": "Step template to gather Octopus usage details across spaces. The results will be output to the log and also as a downloadable artifact.\n\nTo avoid slowing down your instance, this script will pull back 50 items at a time and count them.  It is designed to run on instances as old as 3.4.\n\n**Required:** An API Key for a user or service account that has read access in every space on the instance.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "afe5d565-c87a-481d-a9d1-005a32763b9e",
+      "Name": "GetUsage.Octopus.ServerUri",
+      "Label": "Octopus Server URI",
+      "HelpText": "The URI of the Octopus Server. For use on the same server, #{Octopus.Web.ServerUri} will work.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "51bfc97d-d174-452d-a852-0e120cc4cba8",
+      "Name": "GetUsage.Octopus.ApiKey",
+      "Label": "Octopus Server API Key",
+      "HelpText": "The API key with read permissions to all spaces in the instance being inspected.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-08-26T10:35:22.7190000Z",
+    "OctopusVersion": "2025.3.9781",
+    "Type": "ActionTemplate"
+  },
+  "Author": "ryanrousseau",
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "Octopus"
+}
diff --git a/src/step-templates/octopus-get-octopus-usage/scriptbody.ps1 b/src/step-templates/octopus-get-octopus-usage/scriptbody.ps1
new file mode 100644
index 000000000..c3882f847
--- /dev/null
+++ b/src/step-templates/octopus-get-octopus-usage/scriptbody.ps1
@@ -0,0 +1,715 @@
+$OctopusDeployUrl = $OctopusParameters["GetUsage.Octopus.ServerUri"]
+$OctopusDeployApiKey = $OctopusParameters["GetUsage.Octopus.ApiKey"]
+
+## To avoid nuking your instance, this script will pull back 50 items at a time and count them.  It is designed to run on instances as far back as 3.4.
+
+function Get-OctopusUrl
+{
+    param (
+        $EndPoint,
+        $SpaceId,
+        $OctopusUrl        
+    )
+
+    $octopusUrlToUse = $OctopusUrl
+    if ($OctopusUrl.EndsWith("/"))
+    {
+        $octopusUrlToUse = $OctopusUrl.Substring(0, $OctopusUrl.Length - 1)
+    }
+
+    if ($EndPoint -match "/api")
+    {
+        if (!$EndPoint.StartsWith("/api"))
+        {
+            $EndPoint = $EndPoint.Substring($EndPoint.IndexOf("/api"))
+        }
+
+        return "$octopusUrlToUse$EndPoint"
+    }
+
+    if ([string]::IsNullOrWhiteSpace($SpaceId))
+    {
+        return "$octopusUrlToUse/api/$EndPoint"
+    }
+
+    return "$octopusUrlToUse/api/$spaceId/$EndPoint"
+}
+
+function Invoke-OctopusApi
+{
+    param
+    (
+        $endPoint,
+        $spaceId,
+        $octopusUrl,        
+        $apiKey
+    )    
+
+    try
+    {        
+        $url = Get-OctopusUrl -EndPoint $endPoint -SpaceId $spaceId -OctopusUrl $octopusUrl
+
+        Write-Host "Invoking $url"
+        return Invoke-RestMethod -Method Get -Uri $url -Headers @{"X-Octopus-ApiKey" = "$apiKey" } -ContentType 'application/json; charset=utf-8' -TimeoutSec 60        
+    }
+    catch
+    {
+        Write-Host "There was an error making a Get call to the $url.  Please check that for more information." -ForegroundColor Red
+
+        if ($null -ne $_.Exception.Response)
+        {
+            if ($_.Exception.Response.StatusCode -eq 401)
+            {
+                Write-Host "Unauthorized error returned from $url, please verify API key and try again" -ForegroundColor Red
+            }
+            elseif ($_.ErrorDetails.Message)
+            {                
+                Write-Host -Message "Error calling $url StatusCode: $($_.Exception.Response) $($_.ErrorDetails.Message)" -ForegroundColor Red
+                Write-Host $_.Exception -ForegroundColor Red
+            }            
+            else 
+            {
+                Write-Host $_.Exception -ForegroundColor Red
+            }
+        }
+        else
+        {
+            Write-Host $_.Exception -ForegroundColor Red
+        }
+
+        Write-Host "Stopping the script from proceeding" -ForegroundColor Red
+        exit 1
+    }    
+}
+
+function Get-OctopusObjectCount
+{
+    param
+    (
+        $endPoint,
+        $spaceId,
+        $octopusUrl,        
+        $apiKey
+    )
+
+    $activeItemCount = 0
+    $disabledItemCount = 0
+    $currentPage = 1
+    $pageSize = 50
+    $skipValue = 0
+    $haveReachedEndOfList = $false
+
+    while ($haveReachedEndOfList -eq $false)
+    {
+        $currentEndPoint = "$($endPoint)?skip=$skipValue&take=$pageSize"
+
+        $itemList = Invoke-OctopusApi -endPoint $currentEndPoint -spaceId $spaceId -octopusUrl $octopusUrl -apiKey $apiKey
+
+        foreach ($item in $itemList.Items)
+        {
+            if ($null -ne (Get-Member -InputObject $item -Name "IsDisabled" -MemberType Properties))
+            {          
+                if ($item.IsDisabled -eq $false)
+                {
+                    $activeItemCount += 1
+                }
+                else
+                {
+                    $disabledItemCount += 1
+                }
+            }
+            else 
+            {
+                $activeItemCount += 1    
+            }
+        }
+
+        if ($currentPage -lt $itemList.NumberOfPages)
+        {
+            $skipValue = $currentPage * $pageSize
+            $currentPage += 1
+
+            Write-Host "The endpoint $endpoint has reported there are $($itemList.NumberOfPages) pages.  Setting the skip value to $skipValue and re-querying"
+        }
+        else
+        {
+            $haveReachedEndOfList = $true    
+        }
+    }
+    
+    return @{
+        ActiveItemCount = $activeItemCount
+        DisabledItemCount = $disabledItemCount
+        TotalItemCount = $activeItemCount + $disabledItemCount
+    }
+}
+
+function Get-EffectiveLimit 
+{
+    param (
+        $limit
+    )
+
+    if ($null -ne (Get-Member -InputObject $limit -Name "LicensedLimit" -MemberType Properties))
+    {
+        if ($limit.LicensedLimit -eq 2147483647) # int.MaxValue means it is an unlimited license
+        {
+            return "of Unlimited"
+        }
+        else
+        {
+            return "of $($limit.LicensedLimit)"
+        }
+    }
+    
+    return ""
+}
+
+function Get-OctopusDeploymentTargetsCount
+{
+    param
+    (
+        $spaceId,
+        $octopusUrl,        
+        $apiKey
+    )
+
+    $targetCount = @{
+        TargetCount = 0 
+        ActiveTargetCount = 0
+        UnavailableTargetCount = 0        
+        DisabledTargets = 0
+        ActiveListeningTentacleTargets = 0
+        ActivePollingTentacleTargets = 0
+        ActiveSshTargets = 0        
+        ActiveKubernetesCount = 0
+        ActiveAzureWebAppCount = 0
+        ActiveAzureServiceFabricCount = 0
+        ActiveAzureCloudServiceCount = 0
+        ActiveOfflineDropCount = 0    
+        ActiveECSClusterCount = 0
+        ActiveCloudRegions = 0  
+        ActiveFtpTargets = 0
+        DisabledListeningTentacleTargets = 0
+        DisabledPollingTentacleTargets = 0
+        DisabledSshTargets = 0        
+        DisabledKubernetesCount = 0
+        DisabledAzureWebAppCount = 0
+        DisabledAzureServiceFabricCount = 0
+        DisabledAzureCloudServiceCount = 0
+        DisabledOfflineDropCount = 0    
+        DisabledECSClusterCount = 0
+        DisabledCloudRegions = 0  
+        DisabledFtpTargets = 0            
+    }
+
+    $currentPage = 1
+    $pageSize = 50
+    $skipValue = 0
+    $haveReachedEndOfList = $false
+
+    while ($haveReachedEndOfList -eq $false)
+    {
+        $currentEndPoint = "machines?skip=$skipValue&take=$pageSize"
+
+        $itemList = Invoke-OctopusApi -endPoint $currentEndPoint -spaceId $spaceId -octopusUrl $octopusUrl -apiKey $apiKey
+
+        foreach ($item in $itemList.Items)
+        {
+            $targetCount.TargetCount += 1
+
+            if ($item.IsDisabled -eq $true)
+            {
+                $targetCount.DisabledTargets += 1                  
+
+                if ($item.EndPoint.CommunicationStyle -eq "None")
+                {
+                    $targetCount.DisabledCloudRegions += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "TentacleActive")
+                {
+                    $targetCount.DisabledPollingTentacleTargets += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "TentaclePassive")
+                {
+                    $targetCount.DisabledListeningTentacleTargets += 1
+                }
+                # Cover newer k8s agent and traditional worker-API approach
+                elseif ($item.EndPoint.CommunicationStyle -ilike "Kubernetes*")
+                {
+                    $targetCount.DisabledKubernetesCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "AzureWebApp")
+                {
+                    $targetCount.DisabledAzureWebAppCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "Ssh")
+                {
+                    $targetCount.DisabledSshTargets += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "Ftp")
+                {
+                    $targetCount.DisabledFtpTargets += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "AzureCloudService")
+                {
+                    $targetCount.DisabledAzureCloudServiceCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "AzureServiceFabricCluster")
+                {
+                    $targetCount.DisabledAzureServiceFabricCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "OfflineDrop")
+                {
+                    $targetCount.DisabledOfflineDropCount += 1
+                }
+                else
+                {
+                    $targetCount.DisabledECSClusterCount += 1
+                }
+            }
+            else
+            {
+                if ($item.HealthStatus -eq "Healthy" -or $item.HealthStatus -eq "HealthyWithWarnings")
+                {
+                    $targetCount.ActiveTargetCount += 1
+                }
+                else
+                {
+                    $targetCount.UnavailableTargetCount += 1    
+                }
+
+                if ($item.EndPoint.CommunicationStyle -eq "None")
+                {
+                    $targetCount.ActiveCloudRegions += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "TentacleActive")
+                {
+                    $targetCount.ActivePollingTentacleTargets += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "TentaclePassive")
+                {
+                    $targetCount.ActiveListeningTentacleTargets += 1
+                }
+                # Cover newer k8s agent and traditional worker-API approach
+                elseif ($item.EndPoint.CommunicationStyle -ilike "Kubernetes*")
+                {
+                    $targetCount.ActiveKubernetesCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "AzureWebApp")
+                {
+                    $targetCount.ActiveAzureWebAppCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "Ssh")
+                {
+                    $targetCount.ActiveSshTargets += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "Ftp")
+                {
+                    $targetCount.ActiveFtpTargets += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "AzureCloudService")
+                {
+                    $targetCount.ActiveAzureCloudServiceCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "AzureServiceFabricCluster")
+                {
+                    $targetCount.ActiveAzureServiceFabricCount += 1
+                }
+                elseif ($item.EndPoint.CommunicationStyle -eq "OfflineDrop")
+                {
+                    $targetCount.ActiveOfflineDropCount += 1
+                }
+                else
+                {
+                    $targetCount.ActiveECSClusterCount += 1
+                }
+            }                                
+        }
+
+        if ($currentPage -lt $itemList.NumberOfPages)
+        {
+            $skipValue = $currentPage * $pageSize
+            $currentPage += 1
+
+            Write-Host "The endpoint $endpoint has reported there are $($itemList.NumberOfPages) pages.  Setting the skip value to $skipValue and re-querying"
+        }
+        else
+        {
+            $haveReachedEndOfList = $true    
+        }
+    }
+    
+    return $targetCount
+}
+
+# Add support for both TLS 1.2 and TLS 1.3
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 -bor [System.Net.SecurityProtocolType]::Tls13
+
+$ObjectCounts = @{
+    TotalProjectCount = 0
+    ActiveProjectCount = 0
+    DisabledProjectCount = 0
+    TotalTenantCount = 0        
+    ActiveTenantCount = 0
+    DisabledTenantCount = 0
+    TargetCount = 0 
+    DisabledTargets = 0
+    ActiveTargetCount = 0
+    UnavailableTargetCount = 0
+    ActiveListeningTentacleTargets = 0
+    ActivePollingTentacleTargets = 0
+    ActiveSshTargets = 0        
+    ActiveKubernetesCount = 0
+    ActiveAzureWebAppCount = 0
+    ActiveAzureServiceFabricCount = 0
+    ActiveAzureCloudServiceCount = 0
+    ActiveOfflineDropCount = 0    
+    ActiveECSClusterCount = 0
+    ActiveCloudRegions = 0
+    ActiveFtpTargets = 0 
+    DisabledListeningTentacleTargets = 0
+    DisabledPollingTentacleTargets = 0
+    DisabledSshTargets = 0        
+    DisabledKubernetesCount = 0
+    DisabledAzureWebAppCount = 0
+    DisabledAzureServiceFabricCount = 0
+    DisabledAzureCloudServiceCount = 0
+    DisabledOfflineDropCount = 0    
+    DisabledECSClusterCount = 0
+    DisabledCloudRegions = 0  
+    DisabledFtpTargets = 0             
+    WorkerCount = 0
+    ListeningTentacleWorkers = 0
+    PollingTentacleWorkers = 0
+    SshWorkers = 0
+    ActiveWorkerCount = 0
+    UnavailableWorkerCount = 0
+    WindowsLinuxMachineCount = 0
+    LicensedTargetCount = $null
+    LicensedTargetEntitlement = $null
+    LicensedWorkerCount = 0
+    LicensedWorkerEntitlement = $null
+    LicensedUserCount = 0
+    LicensedUserEntitlement = $null    
+    LicensedProjectCount = 0
+    LicensedProjectEntitlement = $null
+    LicensedTenantCount = $null
+    LicensedTenantEntitlement = $null
+    LicensedMachineCount = $null
+    LicensedMachineEntitlement = $null
+}
+
+Write-Host "Getting Octopus Deploy Version Information"
+$apiInformation = Invoke-OctopusApi -endPoint "/api" -spaceId $null -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey
+$splitVersion = $apiInformation.Version -split "\."
+$OctopusMajorVersion = [int]$splitVersion[0]
+$OctopusMinorVersion = [int]$splitVersion[1]
+$isPtm = $false
+
+$hasLicenseSummary = $OctopusMajorVersion -ge 4
+$hasSpaces = $OctopusMajorVersion -ge 2019
+$hasWorkers = ($OctopusMajorVersion -eq 2018 -and $OctopusMinorVersion -ge 7) -or $OctopusMajorVersion -ge 2019
+
+$spaceIdList = @()
+if ($hasSpaces -eq $true)
+{
+    $OctopusSpaceList = Invoke-OctopusApi -endPoint "spaces?skip=0&take=10000" -octopusUrl $OctopusDeployUrl -spaceId $null -apiKey $OctopusDeployApiKey
+    foreach ($space in $OctopusSpaceList.Items)
+    {
+        $spaceIdList += $space.Id
+    }
+}
+else
+{
+    $spaceIdList += $null    
+}
+
+if ($hasLicenseSummary -eq $true)
+{
+    Write-Host "Checking the license summary for this instance"
+    $licenseSummary = Invoke-OctopusApi -endPoint "licenses/licenses-current-status" -octopusUrl $OctopusDeployUrl -spaceId $null -apiKey $OctopusDeployApiKey
+
+    if ($null -eq (Get-Member -InputObject $licenseSummary -Name "IsPtm" -MemberType Properties))
+    {
+        $isPtm = $false
+    }
+    elseif($licenseSummary.IsPtm -eq $true)
+    {
+        $isPtm = $true
+    }
+    else
+    {
+        $isPtm = $false
+    }
+
+    if ($null -ne (Get-Member -InputObject $licenseSummary -Name "NumberOfMachines" -MemberType Properties))
+    {
+        $ObjectCounts.LicensedTargetCount = $licenseSummary.NumberOfMachines
+    }
+    else
+    {
+        foreach ($limit in $licenseSummary.Limits)
+        {
+            if ($limit.Name -eq "Projects")
+            {
+                Write-Host "Your instance is currently using $($limit.CurrentUsage) Projects"
+                $ObjectCounts.LicensedProjectCount = $limit.CurrentUsage
+                $objectCounts.LicensedProjectEntitlement = Get-EffectiveLimit $limit
+            }
+
+            if ($limit.Name -eq "Tenants")
+            {
+                Write-Host "Your instance is currently using $($limit.CurrentUsage) Tenants"
+                $ObjectCounts.LicensedTenantCount = $limit.CurrentUsage
+                $objectCounts.LicensedTenantEntitlement = Get-EffectiveLimit $limit
+            }
+
+            if ($limit.Name -eq "Targets")
+            {
+                if ($isPtm -eq $true)
+                {                
+                    Write-Host "Your instance is currently using $($limit.CurrentUsage) Machines"
+                    $ObjectCounts.LicensedMachineCount = $limit.CurrentUsage
+                    $objectCounts.LicensedMachineEntitlement = Get-EffectiveLimit $limit
+                }
+                else
+                {
+                    Write-Host "Your instance is currently using $($limit.CurrentUsage) Targets"
+                    $ObjectCounts.LicensedTargetCount = $limit.CurrentUsage
+                    $objectCounts.LicensedTargetEntitlement = Get-EffectiveLimit $limit
+                }                
+            }
+
+            if ($limit.Name -eq "Workers")
+            {
+                Write-Host "Your instance is currently using $($limit.CurrentUsage) Workers"
+                $ObjectCounts.LicensedWorkerCount = $limit.CurrentUsage
+                $objectCounts.LicensedWorkerEntitlement = Get-EffectiveLimit $limit
+            }
+
+            if ($limit.Name -eq "Users")
+            {
+                Write-Host "Your instance is currently using $($limit.CurrentUsage) Users"
+                $ObjectCounts.LicensedUserCount = $limit.CurrentUsage
+                $objectCounts.LicensedUserEntitlement = Get-EffectiveLimit $limit
+            }            
+        }
+    }
+}
+
+
+foreach ($spaceId in $spaceIdList)
+{    
+    Write-Host "Getting project counts for $spaceId"
+    $projectCounts = Get-OctopusObjectCount -endPoint "projects" -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey
+
+    Write-Host "$spaceId has $($projectCounts.ActiveItemCount) active projects."
+    $ObjectCounts.ActiveProjectCount += $projectCounts.ActiveItemCount
+
+    Write-Host "$spaceId has $($projectCounts.DisabledItemCount) disabled projects."
+    $ObjectCounts.DisabledProjectCount += $projectCounts.DisabledItemCount
+
+    Write-Host "$spaceId has $($projectCounts.TotalItemCount) total projects."
+    $ObjectCounts.TotalProjectCount += $projectCounts.TotalItemCount
+
+    Write-Host "Getting tenant counts for $spaceId"
+    $tenantCounts = Get-OctopusObjectCount -endPoint "tenants" -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey
+
+    Write-Host "$spaceId has $($tenantCounts.ActiveItemCount) active tenants."
+    $ObjectCounts.ActiveTenantCount += $tenantCounts.ActiveItemCount
+
+    Write-Host "$spaceId has $($tenantCounts.InactiveItemCount) disabled tenants."
+    $ObjectCounts.DisabledTenantCount += $tenantCounts.DisabledItemCount
+
+    Write-Host "$spaceId has $($tenantCounts.TotalItemCount) total tenants."
+    $ObjectCounts.TotalTenantCount += $tenantCounts.TotalItemCount
+    
+    Write-Host "Getting Infrastructure Summary for $spaceId"
+    $infrastructureSummary = Get-OctopusDeploymentTargetsCount -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey
+
+    Write-host "$spaceId has $($infrastructureSummary.TargetCount) targets"
+    $ObjectCounts.TargetCount += $infrastructureSummary.TargetCount
+
+    Write-Host "$spaceId has $($infrastructureSummary.ActiveTargetCount) Healthy Targets"
+    $ObjectCounts.ActiveTargetCount += $infrastructureSummary.ActiveTargetCount
+
+    Write-Host "$spaceId has $($infrastructureSummary.DisabledTargets) Disabled Targets"
+    $ObjectCounts.DisabledTargets += $infrastructureSummary.DisabledTargets
+
+    Write-Host "$spaceId has $($infrastructureSummary.UnavailableTargetCount) Unhealthy Targets"
+    $ObjectCounts.UnavailableTargetCount += $infrastructureSummary.UnavailableTargetCount    
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveListeningTentacleTargets) Active Listening Tentacles Targets"
+    $ObjectCounts.ActiveListeningTentacleTargets += $infrastructureSummary.ActiveListeningTentacleTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.ActivePollingTentacleTargets) Active Polling Tentacles Targets"
+    $ObjectCounts.ActivePollingTentacleTargets += $infrastructureSummary.ActivePollingTentacleTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveCloudRegions) Active Cloud Region Targets"
+    $ObjectCounts.ActiveCloudRegions += $infrastructureSummary.ActiveCloudRegions
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveOfflineDropCount) Active Offline Packages"
+    $ObjectCounts.ActiveOfflineDropCount += $infrastructureSummary.ActiveOfflineDropCount
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveSshTargets) Active SSH Targets"
+    $ObjectCounts.ActiveSshTargets += $infrastructureSummary.ActiveSshTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveSshTargets) Active Kubernetes Targets"
+    $ObjectCounts.ActiveKubernetesCount += $infrastructureSummary.ActiveKubernetesCount
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveAzureWebAppCount) Active Azure Web App Targets"
+    $ObjectCounts.ActiveAzureWebAppCount += $infrastructureSummary.ActiveAzureWebAppCount
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveAzureServiceFabricCount) Active Azure Service Fabric Cluster Targets"
+    $ObjectCounts.ActiveAzureServiceFabricCount += $infrastructureSummary.ActiveAzureServiceFabricCount
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveAzureCloudServiceCount) Active (Legacy) Azure Cloud Service Targets"
+    $ObjectCounts.ActiveAzureCloudServiceCount += $infrastructureSummary.ActiveAzureCloudServiceCount
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveECSClusterCount) Active ECS Cluster Targets"
+    $ObjectCounts.ActiveECSClusterCount += $infrastructureSummary.ActiveECSClusterCount
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveFtpTargets) Active FTP Targets"
+    $ObjectCounts.ActiveFtpTargets += $infrastructureSummary.ActiveFtpTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledListeningTentacleTargets) Disabled Listening Tentacles Targets"
+    $ObjectCounts.DisabledListeningTentacleTargets += $infrastructureSummary.DisabledListeningTentacleTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledPollingTentacleTargets) Disabled Polling Tentacles Targets"
+    $ObjectCounts.DisabledPollingTentacleTargets += $infrastructureSummary.DisabledPollingTentacleTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledCloudRegions) Disabled Cloud Region Targets"
+    $ObjectCounts.DisabledCloudRegions += $infrastructureSummary.DisabledCloudRegions
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledOfflineDropCount) Disabled Offline Packages"
+    $ObjectCounts.DisabledOfflineDropCount += $infrastructureSummary.DisabledOfflineDropCount
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledSshTargets) Disabled SSH Targets"
+    $ObjectCounts.DisabledSshTargets += $infrastructureSummary.DisabledSshTargets
+
+    Write-host "$spaceId has $($infrastructureSummary.ActiveSshTargets) Disabled Kubernetes Targets"
+    $ObjectCounts.DisabledKubernetesCount += $infrastructureSummary.DisabledKubernetesCount
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledAzureWebAppCount) Disabled Azure Web App Targets"
+    $ObjectCounts.DisabledAzureWebAppCount += $infrastructureSummary.DisabledAzureWebAppCount
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledAzureServiceFabricCount) Disabled Azure Service Fabric Cluster Targets"
+    $ObjectCounts.DisabledAzureServiceFabricCount += $infrastructureSummary.DisabledAzureServiceFabricCount
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledAzureCloudServiceCount) Disabled (Legacy) Azure Cloud Service Targets"
+    $ObjectCounts.DisabledAzureCloudServiceCount += $infrastructureSummary.DisabledAzureCloudServiceCount
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledECSClusterCount) Disabled ECS Cluster Targets"
+    $ObjectCounts.DisabledECSClusterCount += $infrastructureSummary.DisabledECSClusterCount
+
+    Write-host "$spaceId has $($infrastructureSummary.DisabledFtpTargets) Disabled FTP Targets"
+    $ObjectCounts.DisabledFtpTargets += $infrastructureSummary.DisabledFtpTargets
+
+    if ($hasWorkers -eq $true)
+    {
+        Write-Host "Getting worker information for $spaceId"
+        $workerPoolSummary = Invoke-OctopusApi -endPoint "workerpools/summary" -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey 
+
+        Write-host "$spaceId has $($workerPoolSummary.TotalMachines) Workers"
+        $ObjectCounts.WorkerCount += $workerPoolSummary.TotalMachines
+
+        Write-Host "$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.Healthy) Healthy Workers"
+        $ObjectCounts.ActiveWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.Healthy
+    
+        Write-Host "$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.HasWarnings) Healthy with Warning Workers"
+        $ObjectCounts.ActiveWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.HasWarnings
+    
+        Write-Host "$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.Unhealthy) Unhealthy Workers"
+        $ObjectCounts.UnavailableWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.Unhealthy
+    
+        Write-Host "$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.Unknown) Workers with a Status of Unknown"
+        $ObjectCounts.UnavailableWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.Unknown
+        
+        Write-host "$spaceId has $($workerPoolSummary.MachineEndpointSummaries.TentaclePassive) Listening Tentacles Workers"
+        $ObjectCounts.ListeningTentacleWorkers += $workerPoolSummary.MachineEndpointSummaries.TentaclePassive
+
+        Write-host "$spaceId has $($workerPoolSummary.MachineEndpointSummaries.TentacleActive) Polling Tentacles Workers"
+        $ObjectCounts.PollingTentacleWorkers += $workerPoolSummary.MachineEndpointSummaries.TentacleActive        
+
+        if ($null -ne (Get-Member -InputObject $workerPoolSummary.MachineEndpointSummaries -Name "Ssh" -MemberType Properties))
+        {
+            Write-host "$spaceId has $($workerPoolSummary.MachineEndpointSummaries.TentacleActive) SSH Targets Workers"
+            $ObjectCounts.SshWorkers += $workerPoolSummary.MachineEndpointSummaries.Ssh
+        }
+    }
+}
+
+Write-Host "Calculating Windows and Linux Machine Count"
+$ObjectCounts.WindowsLinuxMachineCount = $ObjectCounts.ActivePollingTentacleTargets + $ObjectCounts.ActiveListeningTentacleTargets + $ObjectCounts.ActiveSshTargets
+
+if ($hasLicenseSummary -eq $false)
+{
+    $ObjectCounts.LicensedTargetCount = $ObjectCounts.TargetCount - $ObjectCounts.ActiveCloudRegions - $ObjectCounts.DisabledTargets    
+}
+
+# Get node information
+$nodeInfo = Invoke-OctopusApi -endPoint "octopusservernodes" -octopusUrl $OctopusDeployUrl -spaceId $null -apiKey $OctopusDeployApiKey
+      
+$text = @"
+The item counts are as follows:
+`tInstance ID: $($apiInformation.InstallationId)
+`tServer Version: $($apiInformation.Version)
+`tNumber of Server Nodes: $($nodeInfo.TotalResults)
+`tEntitlement Usage
+$(if ($isPtm) {
+"`t`tLicensed Project Count: $($ObjectCounts.LicensedProjectCount) $($ObjectCounts.LicensedProjectEntitlement)
+`t`tLicensed Tenant Count: $($ObjectCounts.LicensedTenantCount) $($ObjectCounts.LicensedTenantEntitlement)
+`t`tLicensed Machine Count: $($ObjectCounts.LicensedMachineCount) $($ObjectCounts.LicensedMachineEntitlement)"
+} else {
+"`t`tLicensed Target Count: $($ObjectCounts.LicensedTargetCount) $($ObjectCounts.LicensedTargetEntitlement)"
+})
+`t`tLicensed User Count: $($ObjectCounts.LicensedUserCount) $($ObjectCounts.LicensedUserEntitlement)
+`t`tLicensed Worker Count: $($ObjectCounts.LicensedWorkerCount) $($ObjectCounts.LicensedWorkerEntitlement)
+`tProject Count: $($ObjectCounts.TotalProjectCount)
+`t`tActive Project Count (Counted against entitlements for all licenses): $($ObjectCounts.ActiveProjectCount)
+`t`tDisabled Project Count (Counted against entitlements for free licenses): $($ObjectCounts.DisabledProjectCount)
+`tTenant Count: $($ObjectCounts.TotalTenantCount)
+`t`tActive Tenant Count (Counted against entitlements for all licenses): $($ObjectCounts.ActiveTenantCount)
+`t`tDisabled Tenant Count (Counted against entitlements for free licenses): $($ObjectCounts.DisabledTenantCount)
+`tMachine Counts (Active Linux and Windows Tentacles and SSH Connections): $($ObjectCounts.WindowsLinuxMachineCount)
+`tDeployment Target Count: $($ObjectCounts.TargetCount)
+`t`tActive and Available Targets: $($ObjectCounts.ActiveTargetCount)
+`t`tActive but Unavailable Targets: $($ObjectCounts.UnavailableTargetCount)
+`t`tActive Target Breakdown
+`t`t`tListening Tentacle Target Count: $($ObjectCounts.ActiveListeningTentacleTargets)
+`t`t`tPolling Tentacle Target Count: $($ObjectCounts.ActivePollingTentacleTargets)
+`t`t`tSSH Target Count: $($ObjectCounts.ActiveSshTargets)
+`t`t`tKubernetes Target Count: $($ObjectCounts.ActiveKubernetesCount)
+`t`t`tAzure Web App Target Count: $($ObjectCounts.ActiveAzureWebAppCount)
+`t`t`tAzure Service Fabric Cluster Target Count: $($ObjectCounts.ActiveAzureServiceFabricCount)
+`t`t`tAzure (Legacy) Cloud Service Target Count: $($ObjectCounts.ActiveAzureCloudServiceCount)
+`t`t`tAWS ECS Cluster Target Count: $($ObjectCounts.ActiveECSClusterCount)
+`t`t`tOffline Target Count: $($ObjectCounts.ActiveOfflineDropCount)
+`t`t`tCloud Region Target Count: $($ObjectCounts.ActiveCloudRegions)
+`t`t`tFtp Target Count: $($ObjectCounts.ActiveFtpTargets)
+`t`tDisabled Targets Targets: $($ObjectCounts.DisabledTargets)
+`t`tDisabled Target Breakdown
+`t`t`tListening Tentacle Target Count: $($ObjectCounts.DisabledListeningTentacleTargets)
+`t`t`tPolling Tentacle Target Count: $($ObjectCounts.DisabledPollingTentacleTargets)
+`t`t`tSSH Target Count: $($ObjectCounts.DisabledSshTargets)
+`t`t`tKubernetes Target Count: $($ObjectCounts.DisabledKubernetesCount)
+`t`t`tAzure Web App Target Count: $($ObjectCounts.DisabledAzureWebAppCount)
+`t`t`tAzure Service Fabric Cluster Target Count: $($ObjectCounts.DisabledAzureServiceFabricCount)
+`t`t`tAzure (Legacy) Cloud Service Target Count: $($ObjectCounts.DisabledAzureCloudServiceCount)
+`t`t`tAWS ECS Cluster Target Count: $($ObjectCounts.DisabledECSClusterCount)
+`t`t`tOffline Target Count: $($ObjectCounts.DisabledOfflineDropCount)
+`t`t`tCloud Region Target Count: $($ObjectCounts.DisabledCloudRegions)
+`t`t`tFtp Target Count: $($ObjectCounts.DisabledFtpTargets)
+`tWorker Count: $($ObjectCounts.WorkerCount)
+`t`tActive Workers: $($ObjectCounts.ActiveWorkerCount)
+`t`tUnavailable Workers: $($ObjectCounts.UnavailableWorkerCount)
+`t`tWorker Breakdown
+`t`t`tListening Tentacle Target Count: $($ObjectCounts.ListeningTentacleWorkers)
+`t`t`tPolling Tentacle Target Count: $($ObjectCounts.PollingTentacleWorkers)
+`t`t`tSSH Target Count: $($ObjectCounts.SshWorkers)
+"@
+
+Write-Host $text
+$text > octopus-usage.txt
+New-OctopusArtifact "$($PWD)/octopus-usage.txt"
\ No newline at end of file
diff --git a/src/step-templates/octopus-import-certificate/metadata.json b/src/step-templates/octopus-import-certificate/metadata.json
new file mode 100644
index 000000000..c0c90f42a
--- /dev/null
+++ b/src/step-templates/octopus-import-certificate/metadata.json
@@ -0,0 +1,133 @@
+{
+  "Id": "3b1f6c62-c2cb-480b-9b14-435686b9f2cc",
+  "Name": "Octopus - Import Certificate",
+  "Description": "Create or replace an [Octopus Certificate](https://octopus.com/docs/deploying-applications/certificates) from a certificate file",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "6a723531-1272-4c7f-ae04-9576051396ad",
+      "Name": "StepTemplate_OctopusUrl",
+      "Label": "Octopus Url",
+      "HelpText": "Provide the URL of your Octopus Server. The default is `#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}`. Cloud instances should use `Octopus.Web.ServerUri`. See [System Variables - Server](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server) for more info.",
+      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9a84f62c-99f7-4349-bf6d-f42397f4de73",
+      "Name": "StepTemplate_ApiKey",
+      "Label": "API Key",
+      "HelpText": "Provide an Octopus API Key with appropriate permissions to save the certificate.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4fcb5ddf-14a9-42b1-8e77-d8d68e69b2fe",
+      "Name": "StepTemplate_CertificateName",
+      "Label": "Certificate Name",
+      "HelpText": "A short, memorable, unique name for this certificate.\n\nIf the certificate already exists it [will be replaced](https://octopus.com/docs/deployments/certificates/replace-certificate).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "0664b204-c11e-47d1-b388-58ef0b0a7b1a",
+      "Name": "StepTemplate_CertEncoding",
+      "Label": "Certificate Encoding",
+      "HelpText": "Defines the format of the **Certificate** parameter.",
+      "DefaultValue": "file",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "file|File Path\nbase64|Base64 Encoded String"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "df336e72-328a-4bad-92b1-374155ec3fb4",
+      "Name": "StepTemplate_Certificate",
+      "Label": "Certificate",
+      "HelpText": "The certificate to import into Octopus, either as a **File Path** to the certificate, or as a **Base64 Encoded String** representation depending on the _Certificate Encoding_ chosen.\n\nSupported formats: [PFX (PKCS #12), DER, PEM](https://octopus.com/docs/deployments/certificates)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b875e962-5edc-44e8-be03-51f8a87eca5d",
+      "Name": "StepTemplate_Password",
+      "Label": "Password",
+      "HelpText": "The password protecting the certificate (if required).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9d87e43f-d17a-40ea-affc-a3755f1cc16a",
+      "Name": "StepTemplate_Environments",
+      "Label": "Environments",
+      "HelpText": "Comma-delimited list of environments to restrict certificate to.  A blank value will not restrict the certificate.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "014474f8-d7a2-4d67-b57f-364ba723ece2",
+      "Name": "StepTemplate_TenantParticipation",
+      "Label": "Tenant Participation",
+      "HelpText": "Select the tenant participation level.",
+      "DefaultValue": "untenanted",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "untenanted|Untenanted\ntenanted|Tenanted\ntenantedoruntenanted|Tenanted or untenanted"
+      }
+    },
+    {
+      "Id": "bf9a1f70-0c67-4070-b4ff-e38f159ff701",
+      "Name": "StepTemplate_Tenants",
+      "Label": "Tenants",
+      "HelpText": "Comma-delimited list of tenants that can use this certificate.  Used with `Tenant Participation` values of `Tenanted` or `Tenanted or untenanted`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e041fbd8-66da-4b6a-ae3e-90d20f110a48",
+      "Name": "StepTemplate_TenantTags",
+      "Label": "Tenant Tags",
+      "HelpText": "Comma-delimited list of tenant tags to apply to the certificate.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2022-11-14T23:22:38.4820000Z",
+    "OctopusVersion": "2022.4.8111",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus",
+  "Author": "paulmarsy"
+}
diff --git a/src/step-templates/octopus-import-certificate/scriptbody.ps1 b/src/step-templates/octopus-import-certificate/scriptbody.ps1
new file mode 100644
index 000000000..41b01b0eb
--- /dev/null
+++ b/src/step-templates/octopus-import-certificate/scriptbody.ps1
@@ -0,0 +1,220 @@
+
+
+<#
+ ----- Octopus - Import Certificate ----- 
+    Paul Marston @paulmarsy (paul@marston.me)
+Links
+    https://github.com/OctopusDeploy/Library/commits/master/step-templates/octopus-import-certificate.json
+#>
+
+$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12
+[Net.ServicePointManager]::SecurityProtocol = $securityProtocol
+
+$ErrorActionPreference = 'Stop'
+
+$StepTemplate_BaseUrl = $StepTemplate_OctopusUrl.Trim('/')
+
+if ([string]::IsNullOrWhiteSpace($StepTemplate_ApiKey)) {
+    throw "The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again."
+}
+filter Out-Verbose {
+    Write-Verbose ($_ | Out-String)
+}
+filter Out-Indented {
+    $_ | Out-String | % Trim | % Split "`n" | % { "`t$_" }  
+}
+function Invoke-OctopusApi {
+    param(
+        [Parameter(Position = 0, Mandatory)]$Uri,
+        [ValidateSet("Get", "Post")]$Method = 'Get',
+        $Body
+    )
+    $requestParameters = @{
+        Uri = ('{0}/{1}' -f $StepTemplate_BaseUrl, $Uri.TrimStart('/'))
+        Method = $Method
+        Headers = @{ "X-Octopus-ApiKey" = $StepTemplate_ApiKey }
+        UseBasicParsing = $true
+    }
+    Write-Verbose "$($Method.ToUpperInvariant()) $($requestParameters.Uri)"   
+    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }
+    try {
+        Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json | Write-Output
+    }
+    catch [System.Net.WebException] {
+        if ($_.Exception.Response) {
+            $errorResponse = [System.IO.StreamReader]::new($_.Exception.Response.GetResponseStream()).ReadToEnd()
+            throw ("$($_.Exception.Message)`n{0}" -f $errorResponse)
+        }
+        
+        if ($_.Exception.Message) {
+        	$message = $_.Exception.Message
+        	Write-Highlight $message
+            throw "$message"
+        }
+    }
+}
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-OctopusApi 'api/';
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+function Get-OctopusItems
+{
+	# Define parameters
+    param(
+    	$OctopusUri,
+        $ApiKey,
+        $SkipCount = 0
+    )
+    
+    # Define working variables
+    $items = @()
+    $skipQueryString = ""
+    $headers = @{"X-Octopus-ApiKey"="$ApiKey"}
+
+    # Check to see if there there is already a querystring
+    if ($octopusUri.Contains("?"))
+    {
+        $skipQueryString = "&skip="
+    }
+    else
+    {
+        $skipQueryString = "?skip="
+    }
+
+    $skipQueryString += $SkipCount
+    
+    # Get intial set
+    $resultSet = Invoke-RestMethod -Uri "$($OctopusUri)$skipQueryString" -Method GET -Headers $headers
+
+    # Check to see if it returned an item collection
+    if ($resultSet.Items)
+    {
+        # Store call results
+        $items += $resultSet.Items
+    
+        # Check to see if resultset is bigger than page amount
+        if (($resultSet.Items.Count -gt 0) -and ($resultSet.Items.Count -eq $resultSet.ItemsPerPage))
+        {
+            # Increment skip count
+            $SkipCount += $resultSet.ItemsPerPage
+
+            # Recurse
+            $items += Get-OctopusItems -OctopusUri $OctopusUri -ApiKey $ApiKey -SkipCount $SkipCount
+        }
+    }
+    else
+    {
+        return $resultSet
+    }
+    
+
+    # Return results
+    return $items
+}
+
+function Get-OctopusIds 
+{
+	# Define parameters
+    param (
+    	$OctopusCollection,
+        $NamesArray
+    )
+    
+    $returnList = @()
+    
+    foreach ($item in $NamesArray)
+    {
+    	# Trim item
+        $item = $item.Trim()
+        
+        # Compare
+        $octopusItem = $OctopusCollection | Where-Object {$_.Name -eq $item}
+        
+        if ($null -ne $octopusItem)
+        {
+        	# Add to array
+            $returnList += $item.Id
+        }
+    }
+    
+    # Return list
+    return $returnList
+}
+
+if(Test-SpacesApi) {
+	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+    }
+	$baseApiUrl = "/api/$spaceId" ;
+} else {
+	$baseApiUrl = "/api" ;
+}
+
+# Get all environments
+Write-Host "Getting list of Environments ...$($StepTemplate_BaseUrl)$($baseApiUrl)/environments"
+$environmentList = Get-OctopusItems -OctopusUri "$($StepTemplate_BaseUrl)$($baseApiUrl)/environments" -ApiKey $StepTemplate_ApiKey
+$environmentIds = Get-OctopusIds -OctopusCollection $environmentList -NamesArray $StepTemplate_Environments.Split(",")
+
+# Get tenants
+Write-Host "Getting list of Tenants ..."
+$tenantList = Get-OctopusItems -OctopusUri "$($StepTemplate_BaseUrl)$($baseApiUrl)/tenants" -ApiKey $StepTemplate_ApiKey
+$tenantIds = Get-OctopusIds -OctopusCollection $tenantList -NamesArray $StepTemplate_Tenants.Split(",")
+
+# Get tenant tags
+Write-Host "Getting list of Tenant Tags ..."
+$tenantTagList = Get-OctopusItems -OctopusUri "$($StepTemplate_BaseUrl)$($baseApiUrl)/tagsets" -ApiKey $StepTemplate_ApiKey
+$tenantTagIds = Get-OctopusIds -OctopusCollection $tenantTagList -NamesArray $StepTemplate_TenantTags.Split(",")
+
+$certificate = switch ($StepTemplate_CertEncoding) {
+    'file' {   
+        if (!(Test-Path $StepTemplate_Certificate)) {
+            throw "Certificate file $StepTemplate_Certificate does not exist"
+        }
+        $certificateBytes = Get-Content -Path $StepTemplate_Certificate -Encoding Byte
+        [System.Convert]::ToBase64String($certificateBytes)
+    }
+    'base64' {
+        $StepTemplate_Certificate
+    }
+}
+
+$existingCert = Invoke-OctopusApi "$baseApiUrl/certificates" | % Items | ? Name -eq $StepTemplate_CertificateName
+if ($existingCert) {
+    Write-Host 'Existing certificate will be archived & replaced...'
+    Invoke-OctopusApi ("$baseApiUrl/certificates/{0}/replace" -f $existingCert.Id) -Method Post -Body @{
+        certificateData = $certificate
+        password = $StepTemplate_Password
+    } | % {
+        $_.CertificateData = $null
+        $_.Password = $null
+        $_
+    } | Out-Verbose
+} else {
+    Write-Host 'Creating & importing new certificate...'
+    Invoke-OctopusApi "$baseApiUrl/certificates" -Method Post -Body @{
+        Name = $StepTemplate_CertificateName
+        CertificateData = @{
+            HasValue = $true
+            NewValue = $certificate
+        }
+        Password = @{
+            HasValue = $true
+            NewValue = $StepTemplate_Password
+        }
+        TenantedDeploymentParticipation = $StepTemplate_TenantParticipation
+        EnvironmentIds = $environmentIds
+        TenantIds = $tenantIds
+        TenantTags = $tenantTagIds
+    } | Out-Verbose
+}
+Write-Host 'Certificate has been imported:'
+Invoke-OctopusApi "$baseApiUrl/certificates" | % Items | ? Name -eq $StepTemplate_CertificateName | Out-Indented
\ No newline at end of file
diff --git a/src/step-templates/octopus-merge-cac-updates/metadata.json b/src/step-templates/octopus-merge-cac-updates/metadata.json
new file mode 100644
index 000000000..18aa2418f
--- /dev/null
+++ b/src/step-templates/octopus-merge-cac-updates/metadata.json
@@ -0,0 +1,151 @@
+{
+  "Id": "c2536053-024f-499e-bf14-7e55c5a675d0",
+  "Name": "Octopus - Merge CaC Updates (S3 Backend)",
+  "Description": "This step queries each workspace in the Terraform state for downstream Octopus CaC enabled projects, extracts the Git repo associated with the CaC project, and merges any changes so long as there are no merge conflicts.\n\nIf there is a merge conflict between the upstream and downstream repos, instructions for manually resolving the conflict are provided.",
+  "ActionType": "Octopus.AwsRunScript",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Aws.AssumeRole": "False",
+    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Aws.Region": "#{FindConflicts.Terraform.Backend.S3Region}",
+    "Octopus.Action.AwsAccount.Variable": "#{FindConflicts.Terraform.Aws.Account}"
+  },
+  "Parameters": [
+    {
+      "Id": "5abfbf98-22f0-47a2-8dd8-f16e2227d4ba",
+      "Name": "FindConflicts.Octopus.Spaces",
+      "Label": "Octopus Spaces",
+      "HelpText": "An optional newline-separated list of space names with projects to merge changes into. Leave this field blank to merge changes to projects in all spaces.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "56b85050-7c06-4a84-9565-88730a4859dc",
+      "Name": "FindConflicts.Octopus.Projects",
+      "Label": "Octopus Projects",
+      "HelpText": "A newline-separated list of projects to merge changes into. Leave this field blank to merge changes to all projects.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "539dc165-d880-4bf2-99c2-7024f36f7593",
+      "Name": "FindConflicts.Git.Credentials.Username",
+      "Label": "Git Username",
+      "HelpText": "The git repo username. When using GitHub with an access token, the value is `x-access-token`.",
+      "DefaultValue": "x-access-token",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7cf2352e-7381-485d-994c-ff128ee0fe8b",
+      "Name": "FindConflicts.Git.Credentials.Password",
+      "Label": "Git Password",
+      "HelpText": "The git repo password or access token.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "3887173c-a7f9-4311-848f-6f82736df2ce",
+      "Name": "FindConflicts.Git.Url.Protocol",
+      "Label": "Git Protocol",
+      "HelpText": "The git repo protocol.",
+      "DefaultValue": "https",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "https|HTTPS\nhttp|HTTP"
+      }
+    },
+    {
+      "Id": "0781245e-3f02-4d5b-a2ad-68c5f6270cb5",
+      "Name": "FindConflicts.Git.Url.Host",
+      "Label": "Git Hostname",
+      "HelpText": "The git repo host name.",
+      "DefaultValue": "github.com",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7891f539-752e-4933-abcc-68db8ba9d114",
+      "Name": "FindConflicts.Git.Url.Organization",
+      "Label": "Git Organization",
+      "HelpText": "The git repo owner or organization i.e. `owner` in the url `https://github.com/owner/repo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e5a6f5a3-fec6-47dd-ad46-82ed7df409f7",
+      "Name": "FindConflicts.Git.Url.Template",
+      "Label": "Git Template Repo",
+      "HelpText": "The repo holding the upstream, or template, CaC project i.e. `repo` in the url `https://github.com/owner/repo`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d8abeacf-b392-4a9e-b95f-50d0d033819f",
+      "Name": "FindConflicts.Terraform.Backend.S3Region",
+      "Label": "AWS Region",
+      "HelpText": "The AWS region hosting the S3 bucket persisting the Terraform state.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c9f76f2e-9c8b-4af2-9768-6449526d52ca",
+      "Name": "FindConflicts.Terraform.Backend.S3Key",
+      "Label": "S3 Key",
+      "HelpText": "The name of the file in the S3 bucket hosting the Terraform state.",
+      "DefaultValue": "Project_#{Octopus.Project.Name | Replace \"[^A-Za-z0-9]\" \"_\"}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fa261df0-01dc-4310-ad1e-1b07c3145e41",
+      "Name": "FindConflicts.Terraform.Backend.S3Bucket",
+      "Label": "S3 Bucket",
+      "HelpText": "The name of the S3 bucket hosting the Terraform state.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "00d184f8-287f-46e4-8848-282138484cfa",
+      "Name": "FindConflicts.Terraform.Aws.Account",
+      "Label": "AWS Account",
+      "HelpText": "The AWS account used to access the S3 bucket.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AmazonWebServicesAccount"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AwsRunScript",
+  "$Meta": {
+    "ExportedAt": "2023-11-17T01:19:30.4740000Z",
+    "OctopusVersion": "2024.1.1838",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-merge-cac-updates/scriptbody.ps1 b/src/step-templates/octopus-merge-cac-updates/scriptbody.ps1
new file mode 100644
index 000000000..4c27f67d7
--- /dev/null
+++ b/src/step-templates/octopus-merge-cac-updates/scriptbody.ps1
@@ -0,0 +1,487 @@
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+    Write-Host "Determining Operating System..."
+    $IsWindows = ([System.Environment]::OSVersion.Platform -eq "Win32NT")
+    $IsLinux = ([System.Environment]::OSVersion.Platform -eq "Unix")
+}
+
+Function Get-GitExecutable
+{
+    # Define parameters
+    param (
+        $WorkingDirectory
+    )
+
+    # Define variables
+    $gitExe = "PortableGit-2.41.0.3-64-bit.7z.exe"
+    $gitDownloadUrl = "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe"
+    $gitDownloadArguments = @{ }
+    $gitDownloadArguments.Add("Uri", $gitDownloadUrl)
+    $gitDownloadArguments.Add("OutFile", "$WorkingDirectory/git/$gitExe")
+
+    # This makes downloading faster
+    $ProgressPreference = 'SilentlyContinue'
+
+    # Check to see if git subfolder exists
+    if ((Test-Path -Path "$WorkingDirectory/git") -eq $false)
+    {
+        # Create subfolder
+        New-Item -Path "$WorkingDirectory/git"  -ItemType Directory | Out-Null
+    }
+
+    # Check PowerShell version
+    if ($PSVersionTable.PSVersion.Major -lt 6)
+    {
+        # Use basic parsing is required
+        $gitDownloadArguments.Add("UseBasicParsing", $true)
+    }
+
+    # Download Git
+    Write-Host "Downloading Git ..."
+    Invoke-WebRequest @gitDownloadArguments
+
+    # Extract Git
+    $gitExtractArguments = @()
+    $gitExtractArguments += "-o"
+    $gitExtractArguments += "$WorkingDirectory\git"
+    $gitExtractArguments += "-y"
+    $gitExtractArguments += "-bd"
+
+    Write-Host "Extracting Git download ..."
+    & "$WorkingDirectory\git\$gitExe" $gitExtractArguments
+
+    # Wait until unzip action is complete
+    while ($null -ne (Get-Process | Where-Object { $_.ProcessName -eq ($gitExe.Substring(0,$gitExe.LastIndexOf("."))) }))
+    {
+        Start-Sleep 5
+    }
+
+    # Add bin folder to path
+    $env:PATH = "$WorkingDirectory\git\bin$( [IO.Path]::PathSeparator )" + $env:PATH
+
+    # Disable promopt for credential helper
+    Invoke-CustomCommand "git" @("config", "--system", "--unset", "credential.helper") | Write-Results
+}
+
+Function Invoke-CustomCommand
+{
+    Param (
+        $commandPath,
+        $commandArguments,
+        $workingDir = (Get-Location),
+        $path = @(),
+        $envVars = @{ }
+    )
+
+    $path += $env:PATH
+    $newPath = $path -join [IO.Path]::PathSeparator
+
+    $pinfo = New-Object System.Diagnostics.ProcessStartInfo
+    $pinfo.FileName = $commandPath
+    $pinfo.WorkingDirectory = $workingDir
+    $pinfo.RedirectStandardError = $true
+    $pinfo.RedirectStandardOutput = $true
+    $pinfo.UseShellExecute = $false
+    $pinfo.Arguments = $commandArguments
+    $pinfo.EnvironmentVariables["PATH"] = $newPath
+
+    foreach ($env in $envVars.Keys)
+    {
+        Write-Verbose "Setting $env to $( $envVars.$env )"
+        $pinfo.EnvironmentVariables.Add($env,$envVars.$env.ToString())
+    }
+
+    $p = New-Object System.Diagnostics.Process
+    $p.StartInfo = $pinfo
+    $p.Start() | Out-Null
+
+    # Capture output during process execution so we don't hang
+    # if there is too much output.
+    # Microsoft documents a C# solution here:
+    # https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.processstartinfo.redirectstandardoutput?view=net-7.0&redirectedfrom=MSDN#remarks
+    # This code is based on https://stackoverflow.com/a/74748844
+    $stdOut = [System.Text.StringBuilder]::new()
+    $stdErr = [System.Text.StringBuilder]::new()
+    do
+    {
+        if (!$p.StandardOutput.EndOfStream)
+        {
+            $stdOut.AppendLine($p.StandardOutput.ReadLine())
+        }
+        if (!$p.StandardError.EndOfStream)
+        {
+            $stdErr.AppendLine($p.StandardError.ReadLine())
+        }
+
+        Start-Sleep -Milliseconds 10
+    }
+    while (-not $p.HasExited)
+
+    # Capture any standard output generated between our last poll and process end.
+    while (!$p.StandardOutput.EndOfStream)
+    {
+        $stdOut.AppendLine($p.StandardOutput.ReadLine())
+    }
+
+    # Capture any error output generated between our last poll and process end.
+    while (!$p.StandardError.EndOfStream)
+    {
+        $stdErr.AppendLine($p.StandardError.ReadLine())
+    }
+
+    $p.WaitForExit()
+
+    $executionResults = [pscustomobject]@{
+        StdOut = $stdOut.ToString()
+        StdErr = $stdErr.ToString()
+        ExitCode = $p.ExitCode
+    }
+
+    return $executionResults
+
+}
+
+function Write-Results
+{
+    [cmdletbinding()]
+    param (
+        [Parameter(Mandatory = $True, ValuefromPipeline = $True)]
+        $results
+    )
+
+    if (![String]::IsNullOrWhiteSpace($results.StdOut))
+    {
+        Write-Verbose $results.StdOut
+    }
+
+    if (![String]::IsNullOrWhiteSpace($results.StdErr))
+    {
+        Write-Verbose $results.StdErr
+    }
+}
+
+function Format-StringAsNullOrTrimmed {
+    [cmdletbinding()]
+    param (
+        [Parameter(ValuefromPipeline=$True)]
+        $input
+    )
+
+    if ([string]::IsNullOrWhitespace($input)) {
+        return $null
+    }
+
+    return $input.Trim()
+}
+
+function Write-TerraformBackend
+{
+    Set-Content -Path 'backend.tf' -Value @"
+terraform {
+        backend "s3" {}
+        required_providers {
+          octopusdeploy = { source = "OctopusDeployLabs/octopusdeploy", version = ">= 0.21.1" }
+        }
+    }
+"@
+}
+
+function Set-GitContactDetails
+{
+    $gitEmail = Invoke-CustomCommand "git" @("config", "--global", "user.email", "octopus@octopus.com")
+    Write-Results $gitEmail
+    if (-not $gitEmail.ExitCode -eq 0)
+    {
+        Write-Error "Failed to set the git email address (exit code was $( $gitEmail.ExitCode ))."
+    }
+
+    $gitUser = Invoke-CustomCommand "git" @("config", "--global", "user.name", "Octopus Server")
+    Write-Results $gitUser
+    if (-not $gitUser.ExitCode -eq 0)
+    {
+        Write-Error "Failed to set the git name (exit code was $( $gitUser.ExitCode ))."
+    }
+}
+
+$spaceFilter = if (-not [string]::IsNullOrWhitespace($OctopusParameters["FindConflicts.Octopus.Spaces"]))
+{
+    $OctopusParameters["FindConflicts.Octopus.Spaces"].Split("`n")
+}
+else
+{
+    @()
+}
+$projectFilter = if (-not [string]::IsNullOrWhitespace($OctopusParameters["FindConflicts.Octopus.Projects"]))
+{
+    $OctopusParameters["FindConflicts.Octopus.Projects"].Split("`n")
+}
+else
+{
+    @()
+}
+$username = $OctopusParameters["FindConflicts.Git.Credentials.Username"]
+$password = $OctopusParameters["FindConflicts.Git.Credentials.Password"]
+$protocol = $OctopusParameters["FindConflicts.Git.Url.Protocol"]
+$gitHost = $OctopusParameters["FindConflicts.Git.Url.Host"]
+$org = $OctopusParameters["FindConflicts.Git.Url.Organization"]
+$repo = $OctopusParameters["FindConflicts.Git.Url.Template"]
+$region = $OctopusParameters["FindConflicts.Terraform.Backend.S3Region"]
+$key = $OctopusParameters["FindConflicts.Terraform.Backend.S3Key"]
+$bucket = $OctopusParameters["FindConflicts.Terraform.Backend.S3Bucket"]
+
+if ([string]::IsNullOrWhitespace($username))
+{
+    Write-Error "The FindConflicts.Git.Credentials.Username variable must be provided"
+}
+
+if ([string]::IsNullOrWhitespace($password))
+{
+    Write-Error "The FindConflicts.Git.Credentials.Password variable must be provided"
+}
+
+if ( [string]::IsNullOrWhitespace($protocol))
+{
+    Write-Error "The FindConflicts.Git.Url.Protocol variable must be defined."
+}
+
+if ( [string]::IsNullOrWhitespace($gitHost))
+{
+    Write-Error "The FindConflicts.Git.Url.Host variable must be defined."
+}
+
+if ( [string]::IsNullOrWhitespace($repo))
+{
+    Write-Error "The FindConflicts.Git.Url.Template variable must be defined."
+}
+
+if ( [string]::IsNullOrWhitespace($region))
+{
+    Write-Error "The FindConflicts.Terraform.Backend.S3Region variable must be defined."
+}
+
+if ( [string]::IsNullOrWhitespace($key))
+{
+    Write-Error "The FindConflicts.Terraform.Backend.S3Key variable must be defined."
+}
+
+if ( [string]::IsNullOrWhitespace($bucket))
+{
+    Write-Error "The FindConflicts.Terraform.Backend.S3Bucket variable must be defined."
+}
+
+$templateRepoUrl = $protocol + "://" + $gitHost + "/" + $org + "/" + $repo + ".git"
+$templateRepo = $protocol + "://" + $username + ":" + $password + "@" + $gitHost + "/" + $org + "/" + $repo + ".git"
+$branch = "main"
+
+# Check to see if it's Windows
+if ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq "Hosted Windows")
+{
+    # Dynamic worker don't have git, download portable version and add to path for execution
+    Write-Host "Detected usage of Windows Dynamic Worker ..."
+    Get-GitExecutable -WorkingDirectory $PWD
+}
+
+Write-TerraformBackend
+Set-GitContactDetails
+
+Invoke-CustomCommand "terraform" @("init", "-no-color", "-backend-config=`"bucket=$bucket`"", "-backend-config=`"region=$region`"", "-backend-config=`"key=$key`"") | Write-Results
+
+Write-Host "Verbose logs contain instructions for resolving merge conflicts."
+
+$workspaces = Invoke-CustomCommand "terraform" @("workspace", "list")
+
+Write-Results $workspaces
+
+$parsedWorkspaces = $workspaces.StdOut.Replace("*", "").Split("`n")
+
+foreach ($workspace in $parsedWorkspaces)
+{
+    $trimmedWorkspace = $workspace | Format-StringAsNullOrTrimmed
+
+    if ($trimmedWorkspace -eq "default" -or [string]::IsNullOrWhitespace($trimmedWorkspace))
+    {
+        continue
+    }
+
+    Write-Verbose "Processing workspace $trimmedWorkspace"
+
+    Invoke-CustomCommand "terraform" @("workspace", "select", $trimmedWorkspace) | Write-Results
+
+    $state = Invoke-CustomCommand "terraform" @("show", "-json")
+
+    # state might include sensitive values, so don't print it unless there was an error
+
+    if (-not $state.ExitCode -eq 0)
+    {
+        Write-Results $state
+        continue
+    }
+
+    $parsedState = $state.StdOut | ConvertFrom-Json
+
+    $resources = $parsedState.values.root_module.resources | Where-Object {
+        $_.type -eq "octopusdeploy_project"
+    }
+
+    # The outputs allow us to contact the downstream instance)
+    $spaceName = (Invoke-CustomCommand "terraform" @("output", "-raw", "octopus_space_name")).StdOut | Format-StringAsNullOrTrimmed
+
+    foreach ($resource in $resources)
+    {
+        $url = $resource.values.git_library_persistence_settings.url | Format-StringAsNullOrTrimmed
+        $name = $resource.values.name | Format-StringAsNullOrTrimmed
+
+        # Optional filtering
+        if (-not($spaceFilter.Count -eq 0 -or $spaceFilter.Contains($spaceName)))
+        {
+            continue
+        }
+
+        if (-not($projectFilter.Count -eq 0 -or $projectFilter.Contains($name)))
+        {
+            continue
+        }
+
+        if (-not [string]::IsNullOrWhitespace($url))
+        {
+            mkdir $trimmedWorkspace | Out-Null
+
+            $parsedUrl = [System.Uri]$url
+            $urlWithCreds = $parsedUrl.Scheme + "://" + $username + ":" + $password + "@" + $parsedUrl.Host + ":" + $parsedUrl.Port + $parsedUrl.AbsolutePath
+
+            Write-Verbose "Cloning repo"
+            $cloneRepo = Invoke-CustomCommand "git" @("clone", $urlWithCreds, $trimmedWorkspace)
+            Write-Results $cloneRepo
+            if (-not $cloneRepo.ExitCode -eq 0)
+            {
+                Write-Error "Failed to clone repo (exit code was $( $cloneRepo.ExitCode ))."
+            }
+
+            Write-Verbose "Cloning upstream remote"
+            $addRemote = Invoke-CustomCommand "git" @("remote", 'add', 'upstream', $templateRepo) $trimmedWorkspace
+            Write-Results $addRemote
+            if (-not $addRemote.ExitCode -eq 0)
+            {
+                Write-Error "Failed to clone repo (exit code was $( $addRemote.ExitCode ))."
+            }
+
+            Write-Verbose "Fetching all"
+            $fetchAll = Invoke-CustomCommand "git" @("fetch", "--all") $trimmedWorkspace
+            Write-Results $fetchAll
+            if (-not $fetchAll.ExitCode -eq 0)
+            {
+                Write-Error "Failed to fetch all (exit code was $( $fetchAll.ExitCode ))."
+            }
+
+            Write-Verbose "Checking out upstream-$branch upstream/$branch"
+            $checkoutUpstream = Invoke-CustomCommand "git" @("checkout", "-b", "upstream-$branch", "upstream/$branch") $trimmedWorkspace
+            Write-Results $checkoutUpstream
+            if (-not $checkoutUpstream.ExitCode -eq 0)
+            {
+                Write-Error "Failed to checkout upstream (exit code was $( $checkoutUpstream.ExitCode ))."
+            }
+
+            if (-not($branch -eq "master" -or $branch -eq "main"))
+            {
+                Write-Verbose "Checking out $branch origin/$branch"
+                $checkoutDownstream = Invoke-CustomCommand "git" @("checkout", "-b", $branch, "origin/$branch") $trimmedWorkspace
+            }
+            else
+            {
+                Write-Verbose "Checking out $branch"
+                $checkoutDownstream = Invoke-CustomCommand "git" @("checkout", $branch) $trimmedWorkspace
+            }
+
+            Write-Results $checkoutDownstream
+            if (-not $checkoutDownstream.ExitCode -eq 0)
+            {
+                Write-Error "Failed to checkout downstream (exit code was $( $checkoutDownstream.ExitCode ))."
+            }
+
+            Write-Verbose "Merge base"
+            $mergeBase = Invoke-CustomCommand "git" @("merge-base", $branch, "upstream-$branch") $trimmedWorkspace
+            Write-Results $mergeBase
+            if (-not $mergeBase.ExitCode -eq 0)
+            {
+                Write-Error "Failed to merge base (exit code was $( $mergeBase.ExitCode ))."
+            }
+
+            Write-Verbose "Rev parse"
+            $mergeSourceCurrentCommit = Invoke-CustomCommand "git" @("rev-parse", "upstream-$branch") $trimmedWorkspace
+            Write-Results $mergeSourceCurrentCommit
+            if (-not $mergeSourceCurrentCommit.ExitCode -eq 0)
+            {
+                Write-Error "Failed to rev parse (exit code was $( $mergeSourceCurrentCommit.ExitCode ))."
+            }
+
+            Write-Verbose "Merge (no commit)"
+            $mergeResult = Invoke-CustomCommand "git" @("merge", "--no-commit", "--no-ff", "upstream-$branch") $trimmedWorkspace
+            Write-Results $mergeResult
+
+            if ($mergeBase.StdOut -eq $mergeSourceCurrentCommit.StdOut)
+            {
+                Write-Host "No changes found in the upstream repo $templateRepoUrl that do not exist in the downstream repo $url for project `"$name`" in space $spaceName"
+            }
+            elseif (-not $mergeResult.ExitCode -eq 0)
+            {
+                Write-Warning "Changes between upstream repo $templateRepoUrl conflict with changes in downstream repo $url for project `"$name`" in space $spaceName."
+                Write-Verbose "To resolve the conflicts, run the following commands:"
+                Write-Verbose "mkdir cac"
+                Write-Verbose "cd cac"
+                Write-Verbose "git clone $url ."
+                Write-Verbose "git remote add upstream $templateRepoUrl"
+                Write-Verbose "git fetch --all"
+                Write-Verbose "git checkout -b upstream-$branch upstream/$branch"
+                if (-not($branch -eq "master" -or $branch -eq "main"))
+                {
+                    Write-Verbose "git checkout -b $branch origin/$branch"
+                }
+                else
+                {
+                    Write-Verbose "git checkout $branch"
+                    Write-Verbose "git merge-base $branch upstream-$branch"
+                    Write-Verbose "git merge --no-commit --no-ff upstream-$branch"
+                }
+            }
+            else
+            {
+                # https://stackoverflow.com/a/76272919
+                # How to commit a merge non-interactively
+                Write-Verbose "Git commit"
+                $mergeContinue = Invoke-CustomCommand "git" @("commit", "--no-edit") $trimmedWorkspace
+                Write-Results $mergeContinue
+                if (-not $mergeContinue.ExitCode -eq 0)
+                {
+                    Write-Error "Failed to merge continue (exit code was $( $mergeContinue.ExitCode ))."
+                }
+
+                $diffResult = Invoke-CustomCommand "git" @("diff", "--quiet", "--exit-code", "@{upstream}") $trimmedWorkspace
+                Write-Results $diffResult
+
+                if (-not $diffResult.ExitCode -eq 0)
+                {
+                    $pushResult = Invoke-CustomCommand "git" @("push", "origin") $trimmedWorkspace
+                    Write-Results $pushResult
+
+                    if ($pushResult.ExitCode -eq 0)
+                    {
+                        Write-Host "Changes were merged between upstream repo $templateRepoUrl and downstream repo $url for project `"$name`" in space $spaceName."
+                    }
+                    else
+                    {
+                        Write-Warning "Failed to push changes to downstream repo $url for project `"$name`" in space $spaceName (exit code $( $pushResult.ExitCode ))."
+                    }
+                }
+                else
+                {
+                    Write-Host "No changes found in the upstream repo $templateRepoUrl that do not exist in the downstream repo $url for project `"$name`" in space $spaceName"
+                }
+            }
+        }
+        else
+        {
+            Write-Verbose "`"$name`" is not a CaC project"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/octopus-octolint-a-space/metadata.json b/src/step-templates/octopus-octolint-a-space/metadata.json
new file mode 100644
index 000000000..52ba7763e
--- /dev/null
+++ b/src/step-templates/octopus-octolint-a-space/metadata.json
@@ -0,0 +1,57 @@
+{
+  "Id": "48e2b213-324a-43be-8fa1-f8e08a2bb547",
+  "Name": "Octolint a Space",
+  "Description": "Run the [octolint tool](https://github.com/OctopusSolutionsEngineering/OctopusRecommendationEngine) against a Space to get a usage recommendation report.\n\nThis step requires a worker or execution container that has docker installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "5d03c192-1126-4912-986e-799098fcf4a7",
+      "Name": "Octolint.Octopus.ServerUri",
+      "Label": "Octopus Server URI",
+      "HelpText": "The URI of the Octopus Server. For use on the same server, #{Octopus.Web.ServerUri} will work.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "58392cba-5d54-4ba1-9447-388b0bc439fb",
+      "Name": "Octolint.Octopus.ApiKey",
+      "Label": "Octopus Server API Key",
+      "HelpText": "The API key with [read permissions](https://github.com/OctopusSolutionsEngineering/OctopusRecommendationEngine#permissions) to the space being linted.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b51e59f4-86ca-423d-87a0-f29faa1cd159",
+      "Name": "Octolint.Octopus.SpaceName",
+      "Label": "Octopus Space Name",
+      "HelpText": "The name of the Space being linted.",
+      "DefaultValue": "#{Octopus.Space.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-01-12T16:25:50.3070000Z",
+    "OctopusVersion": "2024.1.6809",
+    "Type": "ActionTemplate"
+  },
+  "Author": "ryanrousseau",
+  "LastModifiedBy": "ryanrousseau",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-octolint-a-space/scriptbody.ps1 b/src/step-templates/octopus-octolint-a-space/scriptbody.ps1
new file mode 100644
index 000000000..9b9e37b7e
--- /dev/null
+++ b/src/step-templates/octopus-octolint-a-space/scriptbody.ps1
@@ -0,0 +1,6 @@
+$server = $OctopusParameters["Octolint.Octopus.ServerUri"]
+$apiKey = $OctopusParameters["Octolint.Octopus.ApiKey"]
+$spaceName = $OctopusParameters["Octolint.Octopus.SpaceName"]
+
+docker pull octopussamples/octolint
+docker run --rm octopussamples/octolint -url "$server" -apiKey "$apiKey" -space "$spaceName" -verboseErrors
\ No newline at end of file
diff --git a/src/step-templates/octopus-redeploy-previous-release/metadata.json b/src/step-templates/octopus-redeploy-previous-release/metadata.json
new file mode 100644
index 000000000..4b93a1235
--- /dev/null
+++ b/src/step-templates/octopus-redeploy-previous-release/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "829b2777-144c-498b-b6aa-2b387da76ead",
+  "Name": "Octopus - Re-deploy previous version",
+  "Description": "Re-deploy the previous version of a project.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9f8d7b00-417c-406e-8788-326fd67d22b3",
+      "Name": "redeploy.octopus.server.uri",
+      "Label": "Octopus URI",
+      "HelpText": "Provide the URI to your Octopus server.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7b2ed439-b215-42fe-8971-3839626988fd",
+      "Name": "redeploy.api.key",
+      "Label": "API Key",
+      "HelpText": "Provide an API key with permission to re-deploy the previous version.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "92461617-cab6-4dc7-8fdd-0fcfc08c5d66",
+      "Name": "redeploy.release.number",
+      "Label": "Release number",
+      "HelpText": "(Optional)\nProvide a release number to re-deploy.  Leave blank to use the immediate previous release number.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "47eaaeaf-e414-4b34-ba7d-7d84715fd2ea",
+      "Name": "redeploy.prompted.variables",
+      "Label": "Prompted variables",
+      "HelpText": "Enter any prompted variables and their values in the format `VariableName=VariableValue`.  Enter one entry per line.\n\nExample: `MyVar=MyValue`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "c0137294-b4e3-406e-a36d-fd7aca2731e7",
+      "Name": "redeploy.prompted.useexisting",
+      "Label": "Use previous prompted variables",
+      "HelpText": "Tick this box to use the same prompted variables and values from the previous deployment.\n\nNote: This setting will override anything in the `Prompted variables` input with the values from the previous deployment.  In addition, it will use the values from the latest deployment of the Release.\n\nNote: Please be aware that this template uses the API to retrieve variable which will not work sensitive values.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-06-18T23:04:33.8020000Z",
+    "OctopusVersion": "2024.2.9220",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-redeploy-previous-release/scriptbody.ps1 b/src/step-templates/octopus-redeploy-previous-release/scriptbody.ps1
new file mode 100644
index 000000000..ae5e61d72
--- /dev/null
+++ b/src/step-templates/octopus-redeploy-previous-release/scriptbody.ps1
@@ -0,0 +1,225 @@
+function Get-OctopusItems
+{
+	# Define parameters
+    param(
+    	$OctopusUri,
+        $ApiKey,
+        $SkipCount = 0
+    )
+    
+    # Define working variables
+    $items = @()
+    $skipQueryString = ""
+    $headers = @{"X-Octopus-ApiKey"="$ApiKey"}
+
+    # Check to see if there there is already a querystring
+    if ($octopusUri.Contains("?"))
+    {
+        $skipQueryString = "&skip="
+    }
+    else
+    {
+        $skipQueryString = "?skip="
+    }
+
+    $skipQueryString += $SkipCount
+    
+    # Get intial set
+    Write-Host "Calling $OctopusUri$skipQueryString"
+    $resultSet = Invoke-RestMethod -Uri "$($OctopusUri)$skipQueryString" -Method GET -Headers $headers
+
+    # Check to see if it returned an item collection
+    if ($null -ne $resultSet.Items)
+    {
+        # Store call results
+        $items += $resultSet.Items
+    
+        # Check to see if resultset is bigger than page amount
+        if (($resultSet.Items.Count -gt 0) -and ($resultSet.Items.Count -eq $resultSet.ItemsPerPage))
+        {
+            # Increment skip count
+            $SkipCount += $resultSet.ItemsPerPage
+
+            # Recurse
+            $items += Get-OctopusItems -OctopusUri $OctopusUri -ApiKey $ApiKey -SkipCount $SkipCount
+        }
+    }
+    else
+    {
+        return $resultSet
+    }
+    
+    # Return results
+    return $items
+}
+
+# Define variables
+$octopusApiKey = $OctopusParameters['redeploy.api.key']
+$octopusUri = $OctopusParameters['redeploy.octopus.server.uri']
+$octopusReleaseNumber = $OctopusParameters['redeploy.release.number']
+$octopusReleaseId = $null
+$header =  @{ "X-Octopus-ApiKey" = $octopusApiKey }
+$spaceId = $OctopusParameters['Octopus.Space.Id']
+$environmentId = $OctopusParameters['Octopus.Environment.Id']
+$projectId = $OctopusParameters['Octopus.Project.Id']
+$promptedVariables = $OctopusParameters['redeploy.prompted.variables']
+$usePreviousPromptedVariables = [System.Convert]::ToBoolean($OctopusParameters['redeploy.prompted.useexisting'])
+$deploymentFormValues = @{}
+
+if ($octopusUri.EndsWith("/") -eq $true)
+{
+  # Add trailing slash
+  $octopusUri = $octopusUri.Substring(0, ($octopusUri.Length - 1))
+}
+
+# Check to see if a release number was provided
+if ([string]::IsNullOrWhitespace($octopusReleaseNumber))
+{
+  # Get the previous release number
+  $octopusReleaseId = $OctopusParameters['Octopus.Release.PreviousForEnvironment.Id']
+  
+  $release = Get-OctopusItems -OctopusUri "$octopusUri/api/$spaceId/releases/$octopusReleaseId" -ApiKey $octopusApiKey
+}
+else
+{
+  # Get the specific release
+  $release = Get-OctopusItems -OctopusUri "$octopusUri/api/$spaceId/projects/$projectId/releases?searchByVersion=$octopusReleaseNumber" -ApiKey $octopusApiKey
+  
+  # Record the id
+  $octopusReleaseId = $release.Id
+}  
+  
+# Verify result
+if ($null -ne $release)
+{
+  # Get deployments
+  $deployments = Get-OctopusItems -OctopusUri "$octopusUri/api/$spaceId/releases/$($release.Id)/deployments" -ApiKey $octopusApiKey
+   
+  # Ensure this release has been deployed to this environment
+  $deployment = ($deployments | Where-Object {$_.EnvironmentId -eq $environmentId})
+    
+  if ($null -eq $deployment)
+  {
+    Write-Error "Error: $octopusReleaseNumber has not been deployed to $($OctopusParameters['Octopus.Environment.Name'])!"
+  }
+    
+  # Get the task
+  if ($deployment.Links.Task -is [array])
+  {
+    # Get the last attempt
+    $taskLink = $deployment.Links.Task[-1]
+  }
+  else
+  {
+    $taskLink = $deployment.Links.Task
+  }
+  
+  $serverTask = Invoke-RestMethod -Method Get -Uri "$octopusUri$($taskLink)" -Headers $header
+    
+  # Ensure it was successful before continuing
+  if ($serverTask.State -eq "Failed")
+  {
+    Write-Error "The previous deployment of $($release.Version) to $($OctopusParameters['Octopus.Environment.Name']) was not successful, unable to re-deploy."
+  }
+  
+  try
+  {
+    $deploymentVariables = Invoke-RestMethod -Method Get -Uri "$octopusUri/api/$spaceId/variables/variableset-$($serverTask.Arguments.DeploymentId)" -Headers $header
+  }
+  catch
+  {
+    if ($_.Exception.Response.StatusCode -eq "NotFound")
+    {
+      $deploymentVariables = $null
+    }
+    else
+    {
+      throw
+    }
+  }
+  
+  # Get only prompted variables
+  $deploymentVariables = ($deploymentVariables.Variables | Where-Object {$null -ne $_.Prompt})
+}
+else
+{
+  Write-Error "Unable to find release version $octopusReleaseNumber!"
+}
+
+# Check to see if there prompted variables that need to be included
+if ($usePreviousPromptedVariables -or ![string]::IsNullOrWhitespace($promptedVariables))
+{
+    # Ensure the previous deployment variables were retrieved
+    if ($null -eq $deploymentVariables)
+    {
+      throw "Error: Unable to retrieve previous deployment variables!"
+    }
+    
+    if ($usePreviousPromptedVariables)
+    {
+      # Create list
+      $promptedValueList = @()
+      foreach ($variable in $deploymentVariables)
+      {
+        $promptedValueList += "$($variable.Name)=$($variable.Value)"
+      }
+    }
+    else
+    {
+      $promptedValueList = @(($promptedVariables -Split "`n").Trim())
+    }
+
+    # Get deployment preview for prompted variables
+    $deploymentPreview = Invoke-RestMethod "$OctopusUri/api/$spaceId/releases/$octopusReleaseId/deployments/preview/$($environmentId)?includeDisabledSteps=true" -Headers $header  
+   
+    foreach($element in $deploymentPreview.Form.Elements)
+    {
+        $nameToSearchFor = $element.Control.Name
+        $uniqueName = $element.Name
+        $isRequired = $element.Control.Required
+    
+        $promptedVariablefound = $false
+    
+        Write-Host "Looking for the prompted variable value for $nameToSearchFor"
+        foreach ($promptedValue in $promptedValueList)
+        {
+            $splitValue = $promptedValue -Split "="
+            Write-Host "Comparing $nameToSearchFor with provided prompted variable $($promptedValue[$nameToSearchFor])"
+            if ($splitValue.Length -gt 1)
+            {
+                if ($nameToSearchFor -eq $splitValue[0].Trim())
+                {
+                    Write-Host "Found the prompted variable value $nameToSearchFor"
+                    $deploymentFormValues[$uniqueName] = $splitValue[1].Trim()
+                    $promptedVariableFound = $true
+                    break
+                }
+            }
+        }
+    
+        if ($promptedVariableFound -eq $false -and $isRequired -eq $true)
+        {
+            Write-Highlight "Unable to find a value for the required prompted variable $nameToSearchFor, exiting"
+            Exit 1
+        }
+    }
+ 
+}
+
+# Create json object to deploy the release
+$deploymentBody = @{
+  ReleaseId = $octopusReleaseId
+  EnvironmentId = $environmentId
+}
+
+# Check to see if there were any Prompted Variables
+if ($deploymentFormValues.Count -gt 0)
+{
+  $deploymentBody.Add("FormValues", $deploymentFormValues)
+}
+
+# Submit deployment
+Write-Host "Submitting release $($release.Version) to $($OctopusParameters['Octopus.Environment.Name'])"
+$submittedRelease = (Invoke-RestMethod -Uri "$octopusUri/api/$spaceId/deployments" -Method POST -Headers $header -Body ($deploymentBody | ConvertTo-Json -Depth 10))
+
+Write-Host "[View the re-deployment]($octopusUri$($submittedRelease.Links.Web))"
\ No newline at end of file
diff --git a/step-templates/octopus-reference-architecture-eks.json b/src/step-templates/octopus-reference-architecture-eks/metadata.json
similarity index 99%
rename from step-templates/octopus-reference-architecture-eks.json
rename to src/step-templates/octopus-reference-architecture-eks/metadata.json
index 94ed4152f..78f0bacdf 100644
--- a/step-templates/octopus-reference-architecture-eks.json
+++ b/src/step-templates/octopus-reference-architecture-eks/metadata.json
@@ -127,7 +127,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-10-18T22:44:44.053Z",
+    "ExportedAt": "2023-10-18T22:44:44.0530000Z",
     "OctopusVersion": "2023.4.6357",
     "Type": "ActionTemplate"
   },
diff --git a/step-templates/octopus-reference-architecture-webapp.json b/src/step-templates/octopus-reference-architecture-webapp/metadata.json
similarity index 60%
rename from step-templates/octopus-reference-architecture-webapp.json
rename to src/step-templates/octopus-reference-architecture-webapp/metadata.json
index b29da1430..889f7ad4b 100644
--- a/step-templates/octopus-reference-architecture-webapp.json
+++ b/src/step-templates/octopus-reference-architecture-webapp/metadata.json
@@ -17,7 +17,7 @@
     "Octopus.Action.Terraform.RunAutomaticFileSubstitution": "True",
     "Octopus.Action.Terraform.PlanJsonOutput": "False",
     "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Terraform.Template": "#region Provider\nterraform {\n  required_providers {\n    octopusdeploy = {\n      source = \"OctopusDeployLabs/octopusdeploy\"\n      version = \"0.21.1\"\n    }\n  }\n}\n\nvariable \"octopus_server\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The URL of the Octopus server e.g. https://myinstance.octopus.app.\"\n  default     = \"#{Octopus.Web.ServerUri}\"\n}\n\nvariable \"octopus_apikey\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The API key used to access the Octopus server. See https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key for details on creating an API key.\"\n}\n\nvariable \"octopus_space_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The ID of the Octopus space to populate.\"\n  default     = \"#{Octopus.Space.Id}\"\n}\n\nprovider \"octopusdeploy\" {\n  address  = var.octopus_server\n  api_key  = var.octopus_apikey\n  space_id = var.octopus_space_id\n}\n#endregion\n#region Locals\nlocals {\n  /*\n    You will need to edit:\n    * smoke_test_properties - depending on the step type, custom properties will need to be defined\n    * smoke_test_script - replace REPLACE THIS WITH CODE TO RETURN THE PUBLIC HOSTNAME with the appropriate logic\n    * cloud_account - this will need to be created in most cases\n    * security_scan_docker_script - the reference to the docker image deployed in earlier steps needs to be updated from #{Octopus.Action[Deploy Container].Package[web].PackageId}\n    * octopusdeploy_deployment_process - each of the sample application deployment processes (there are 3 defined in this template) needs to have the actual deployment step added\n  */\n\n  project_template_project_name             = \"Docker Project Templates\"\n  project_group_name                        = \"Azure Web App\"\n  infrastructure_project_name               = \"_ Azure Web App Infrastructure\"\n  infrastructure_project_description        = \"Runbooks to create and manage Azure Web Apps\"\n  infrastructure_runbook_name               = \"Create Web App\"\n  infrastructure_runbook_description        = \"Creates an Azure web app and the associated Octopus target\"\n  feedback_link                             = \"https://oc.to/CfiezA\"\n  octopub_frontend_project_name             = \"Azure WebApp Octopub Frontend\"\n  octopub_frontend_project_description      = \"Deploys the Octopub Frontend app to an Azure Web App target\"\n  octopub_products_project_name             = \"Azure WebApp Octopub Products\"\n  octopub_products_project_description      = \"Deploys the Octopub Products app to an Azure Web App target\"\n  octopub_audits_project_name               = \"Azure WebApp Octopub Audits\"\n  octopub_audits_project_description        = \"Deploys the Octopub Audits app to an Azure Web App target\"\n  octopub_orchestration_project_name        = \"_ Deploy Azure Web App Octopub Stack\"\n  octopub_orchestration_project_description = \"Deploys the full Octopub application stack\"\n  frontend_health_check                     = \"/index.html\"\n  products_health_check                     = \"/health/products\"\n  audits_health_check                       = \"/health/audits\"\n  target_role                               = \"Web App Reference Architecture\"\n  unique_prefix                             = \"#{Octopus.Web.ServerUri | Replace \\\"^https?://\\\" \\\"\\\" | Replace \\\"[^A-Za-z0-9]\\\" \\\"-\\\"}\"\n\n  // Use the example below for any accounts that might be included in this reference architecture\n  cloud_account = length(data.octopusdeploy_accounts.account.accounts) == 0 ? octopusdeploy_azure_service_principal.account[0].id : data.octopusdeploy_accounts.account.accounts[0].id\n\n  development_environment_id         = length(data.octopusdeploy_environments.environment_development.environments) == 0 ? octopusdeploy_environment.environment_development[0].id : data.octopusdeploy_environments.environment_development.environments[0].id\n  test_environment_id                = length(data.octopusdeploy_environments.environment_test.environments) == 0 ? octopusdeploy_environment.environment_test[0].id : data.octopusdeploy_environments.environment_test.environments[0].id\n  production_environment_id          = length(data.octopusdeploy_environments.environment_production.environments) == 0 ? octopusdeploy_environment.environment_production[0].id : data.octopusdeploy_environments.environment_production.environments[0].id\n  sync_environment_id                = length(data.octopusdeploy_environments.environment_sync.environments) == 0 ? octopusdeploy_environment.environment_sync[0].id : data.octopusdeploy_environments.environment_sync.environments[0].id\n  security_environment_id            = length(data.octopusdeploy_environments.environment_security.environments) == 0 ? octopusdeploy_environment.environment_security[0].id : data.octopusdeploy_environments.environment_security.environments[0].id\n  this_instance_library_variable_set = length(data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets) == 0 ? octopusdeploy_library_variable_set.this_instance[0].id : data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets[0].id\n  github_library_variable_set        = length(data.octopusdeploy_library_variable_sets.github.library_variable_sets) == 0 ? octopusdeploy_library_variable_set.github[0].id : data.octopusdeploy_library_variable_sets.github.library_variable_sets[0].id\n  docker_library_variable_set        = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? octopusdeploy_library_variable_set.docker[0].id : data.octopusdeploy_library_variable_sets.docker.library_variable_sets[0].id\n  docker_hub_feed_id                 = length(data.octopusdeploy_feeds.dockerhub.feeds) == 0 ? octopusdeploy_docker_container_registry.docker_hub[0].id : data.octopusdeploy_feeds.dockerhub.feeds[0].id\n  github_feed_id                     = length(data.octopusdeploy_feeds.github_feed.feeds) == 0 ? octopusdeploy_github_repository_feed.github_feed[0].id : data.octopusdeploy_feeds.github_feed.feeds[0].id\n  worker_pool_id                     = length(data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools) == 0 ? \"\" : data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id\n  devops_lifecycle_id                = length(data.octopusdeploy_lifecycles.devsecops.lifecycles) == 0 ? octopusdeploy_lifecycle.lifecycle_devsecops[0].id : data.octopusdeploy_lifecycles.devsecops.lifecycles[0].id\n  project_group_id                   = length(data.octopusdeploy_project_groups.ra.project_groups) == 0 ? octopusdeploy_project_group.project_group_ra[0].id : data.octopusdeploy_project_groups.ra.project_groups[0].id\n  project_templates_project_group_id = length(data.octopusdeploy_project_groups.project_templates.project_groups) == 0 ? octopusdeploy_project_group.project_group_project_templates[0].id : data.octopusdeploy_project_groups.project_templates.project_groups[0].id\n  application_lifecycle_id           = length(data.octopusdeploy_lifecycles.application.lifecycles) == 0 ? octopusdeploy_lifecycle.lifecycle_application[0].id : data.octopusdeploy_lifecycles.application.lifecycles[0].id\n  smoke_test_container_image         = \"octopuslabs/azure-workertools\"\n  smoke_test_action_type             = \"Octopus.AzurePowerShell\"\n  smoke_test_properties              = {\n    \"Octopus.Action.RunOnServer\"         = \"true\"\n    \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n    \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n    \"Octopus.Action.Script.ScriptBody\"   = local.smoke_test_script\n    \"OctopusUseBundledTooling\" : \"False\"\n    \"Octopus.Action.Azure.AccountId\" : local.cloud_account\n  }\n  link_highlight_container_image = \"octopuslabs/azure-workertools\"\n  link_highlight_action_type     = \"Octopus.AzurePowerShell\"\n  link_highlight_properties      = {\n    \"Octopus.Action.RunOnServer\"         = \"true\"\n    \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n    \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n    \"Octopus.Action.Script.ScriptBody\"   = local.link_highlight_script\n    \"OctopusUseBundledTooling\" : \"False\"\n    \"Octopus.Action.Azure.AccountId\" : local.cloud_account\n  }\n\n  link_highlight_script = <<-EOT\n  write_highlight \"[https://#{Octopus.Action.Azure.WebAppName}.azurewebsites.net#{App.HealthCheck}](https://#{Octopus.Action.Azure.WebAppName}.azurewebsites.net#{App.HealthCheck})\"\n  EOT\n\n  feedback_script             = <<-EOT\n  Write-Highlight \"Please share your feedback on this step in our [GitHub discussion](${local.feedback_link}).\"\n  EOT\n  smoke_test_script           = <<-EOT\n  for i in {1..30}\n  do\n    HOSTNAME=#{Octopus.Action.Azure.WebAppName}.azurewebsites.net\n      if [[ -n \"$${HOSTNAME}\" ]]\n      then\n        break\n      fi\n      echo \"Waiting for ingress hostname\"\n      sleep 10\n  done\n\n\n  # Load balancers can take a minute or so before their DNS is propagated.\n  # A status code of 000 means curl could not resolve the DNS name, so we wait for a bit until DNS is updated.\n  echo \"Testing https://$${HOSTNAME}#{App.HealthCheck}\"\n  echo \"Waiting for DNS to propagate. This can take a while for a new load balancer.\"\n  for i in {1..30}\n  do\n    CODE=$(curl -o /dev/null -s -w \"%%{http_code}\\n\" https://$${HOSTNAME}#{App.HealthCheck})\n    if [[ \"$${CODE}\" == \"200\" ]]\n    then\n      break\n    fi\n    echo \"Waiting for DNS name to be resolvable and for service to respond\"\n    sleep 10\n  done\n\n  echo \"response code: $${CODE}\"\n  if [[ \"$${CODE}\" == \"200\" ]]\n  then\n      echo \"success\"\n      exit 0\n  else\n      echo \"error\"\n      exit 1\n  fi\n  EOT\n  security_scan_docker_script = <<-EOT\n  echo \"Pulling Trivy Docker Image\"\n  echo \"##octopus[stdout-verbose]\"\n  docker pull aquasec/trivy\n  echo \"##octopus[stdout-default]\"\n\n  echo \"Installing umoci\"\n  echo \"##octopus[stdout-verbose]\"\n  # Install umoci\n  if ! which umoci\n  then\n    curl -o umoci -L https://github.com/opencontainers/umoci/releases/latest/download/umoci.amd64 2>&1\n    chmod +x umoci\n  fi\n  echo \"##octopus[stdout-default]\"\n\n  DOCKERIMAGE=#{Octopus.Action[Deploy Container].Package.PackageId}\n  DOCKERTAG=#{Octopus.Action[Deploy Container].Package.PackageVersion}\n\n  echo \"Extracting Application Docker Image\"\n  echo \"##octopus[stdout-verbose]\"\n  # Download and extract the docker image\n  # https://manpages.ubuntu.com/manpages/jammy/man1/umoci-raw-unpack.1.html\n  docker pull quay.io/skopeo/stable:latest 2>&1\n  docker run -v $(pwd):/output quay.io/skopeo/stable:latest copy docker://$${DOCKERIMAGE}:$${DOCKERTAG} oci:/output/image:latest 2>&1\n  ./umoci unpack --image image --rootless bundle 2>&1\n  echo \"##octopus[stdout-default]\"\n\n  TIMESTAMP=$(date +%s%3N)\n  SUCCESS=0\n  for x in $(find . -name bom.json -type f -print); do\n      echo \"Scanning $${x}\"\n\n      # Delete any existing report file\n      if [[ -f \"$PWD/depscan-bom.json\" ]]; then\n        rm \"$PWD/depscan-bom.json\"\n      fi\n\n      # Generate the report, capturing the output, and ensuring $? is set to the exit code\n      OUTPUT=$(bash -c \"docker run --rm -v \\\"$PWD:/app\\\" aquasec/trivy sbom \\\"/app/$${x}\\\"; exit \\$?\" 2>&1)\n\n      # Success is set to 1 if the exit code is not zero\n      if [[ $? -ne 0 ]]; then\n          SUCCESS=1\n      fi\n\n      # Print the output stripped of ANSI colour codes\n      echo -e \"$${OUTPUT}\" | sed 's/\\x1b\\[[0-9;]*m//g'\n  done\n\n  set_octopusvariable \"VerificationResult\" $SUCCESS\n\n  if [[ $SUCCESS -ne 0 ]]; then\n    >&2 echo \"Critical vulnerabilities were detected\"\n  fi\n\n  exit 0\n  EOT\n}\n#endregion\n#region Environments\ndata \"octopusdeploy_environments\" \"environment_development\" {\n  ids          = null\n  partial_name = \"Development\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_development\" {\n  count                        = length(data.octopusdeploy_environments.environment_development.environments) == 0 ? 1 : 0\n  name                         = \"Development\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = true\n  sort_order                   = 10\n\n  jira_extension_settings {\n    environment_type = \"development\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_test\" {\n  ids          = null\n  partial_name = \"Test\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_test\" {\n  count                        = length(data.octopusdeploy_environments.environment_test.environments) == 0 ? 1 : 0\n  name                         = \"Test\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = true\n  sort_order                   = 11\n\n  jira_extension_settings {\n    environment_type = \"testing\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_production\" {\n  ids          = null\n  partial_name = \"Production\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_production\" {\n  count                        = length(data.octopusdeploy_environments.environment_production.environments) == 0 ? 1 : 0\n  name                         = \"Production\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = true\n  sort_order                   = 12\n\n  jira_extension_settings {\n    environment_type = \"production\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_security\" {\n  ids          = null\n  partial_name = \"Security\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_security\" {\n  count                        = length(data.octopusdeploy_environments.environment_security.environments) == 0 ? 1 : 0\n  name                         = \"Security\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = false\n  sort_order                   = 14\n\n  jira_extension_settings {\n    environment_type = \"production\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_sync\" {\n  ids          = null\n  partial_name = \"Sync\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_sync\" {\n  count                        = length(data.octopusdeploy_environments.environment_sync.environments) == 0 ? 1 : 0\n  name                         = \"Sync\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = false\n  sort_order                   = 15\n\n  jira_extension_settings {\n    environment_type = \"development\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_lifecycles\" \"devsecops\" {\n  ids          = []\n  partial_name = \"DevSecOps\"\n  skip         = 0\n  take         = 1\n}\n\ndata \"octopusdeploy_lifecycles\" \"application\" {\n  ids          = []\n  partial_name = \"Application\"\n  skip         = 0\n  take         = 1\n}\n\ndata \"octopusdeploy_lifecycles\" \"sync\" {\n  ids          = []\n  partial_name = \"Sync\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_lifecycle\" \"sync\" {\n  count       = length(data.octopusdeploy_lifecycles.sync.lifecycles) == 0 ? 1 : 0\n  name        = \"Sync\"\n  description = \"\"\n\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.sync_environment_id\n    ]\n    name                                  = \"Sync\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n\n  release_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n\n  tentacle_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n}\n\nresource \"octopusdeploy_lifecycle\" \"lifecycle_devsecops\" {\n  count       = length(data.octopusdeploy_lifecycles.devsecops.lifecycles) == 0 ? 1 : 0\n  name        = \"DevSecOps\"\n  description = \"\"\n\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.development_environment_id\n    ]\n    name                                  = \"Development\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.test_environment_id\n    ]\n    name                                  = \"Test\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.production_environment_id\n    ]\n    name                                  = \"Production\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = [\n      local.security_environment_id\n    ]\n    optional_deployment_targets           = []\n    name                                  = \"Security\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n\n  release_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n\n  tentacle_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n}\n\nresource \"octopusdeploy_lifecycle\" \"lifecycle_application\" {\n  count       = length(data.octopusdeploy_lifecycles.application.lifecycles) == 0 ? 1 : 0\n  name        = \"Application\"\n  description = \"\"\n\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.development_environment_id\n    ]\n    name                                  = \"Development\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.test_environment_id\n    ]\n    name                                  = \"Test\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.production_environment_id\n    ]\n    name                                  = \"Production\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n\n  release_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n\n  tentacle_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n}\n#endregion\n#region Feeds\n\ndata \"octopusdeploy_feeds\" \"project\" {\n  feed_type = \"OctopusProject\"\n  ids       = []\n  skip      = 0\n  take      = 1\n}\n\ndata \"octopusdeploy_feeds\" \"bitnami\" {\n  feed_type    = \"Helm\"\n  ids          = []\n  partial_name = \"Bitnami\"\n  skip         = 0\n  take         = 1\n}\n\n\nresource \"octopusdeploy_helm_feed\" \"feed_helm\" {\n  count                                = length(data.octopusdeploy_feeds.bitnami.feeds) == 0 ? 1 : 0\n  name                                 = \"Bitnami\"\n  feed_uri                             = \"https://repo.vmware.com/bitnami-files/\"\n  package_acquisition_location_options = [\"ExecutionTarget\", \"NotAcquired\"]\n}\n\ndata \"octopusdeploy_feeds\" \"dockerhub\" {\n  feed_type    = \"Docker\"\n  ids          = []\n  partial_name = \"Docker Hub\"\n  skip         = 0\n  take         = 1\n}\n\nvariable \"feed_docker_hub_username\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The username used by the feed Docker Hub\"\n}\n\nvariable \"feed_docker_hub_password\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The password used by the feed Docker Hub\"\n}\n\nresource \"octopusdeploy_docker_container_registry\" \"docker_hub\" {\n  count                                = length(data.octopusdeploy_feeds.dockerhub.feeds) == 0 ? 1 : 0\n  name                                 = \"Docker Hub\"\n  password                             = var.feed_docker_hub_password\n  username                             = var.feed_docker_hub_username\n  api_version                          = \"v1\"\n  feed_uri                             = \"https://index.docker.io\"\n  package_acquisition_location_options = [\"ExecutionTarget\", \"NotAcquired\"]\n}\n\ndata \"octopusdeploy_feeds\" \"sales_maven_feed\" {\n  feed_type    = \"Maven\"\n  ids          = []\n  partial_name = \"Sales Maven Feed\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_maven_feed\" \"feed_sales_maven_feed\" {\n  count                                = length(data.octopusdeploy_feeds.sales_maven_feed.feeds) == 0 ? 1 : 0\n  name                                 = \"Sales Maven Feed\"\n  feed_uri                             = \"https://octopus-sales-public-maven-repo.s3.ap-southeast-2.amazonaws.com/snapshot\"\n  package_acquisition_location_options = [\"Server\", \"ExecutionTarget\"]\n  download_attempts                    = 3\n  download_retry_backoff_seconds       = 20\n}\n\ndata \"octopusdeploy_feeds\" \"github_feed\" {\n  feed_type    = \"GitHub\"\n  ids          = []\n  partial_name = \"Github Releases\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_github_repository_feed\" \"github_feed\" {\n  count                          = length(data.octopusdeploy_feeds.github_feed.feeds) == 0 ? 1 : 0\n  download_attempts              = 1\n  download_retry_backoff_seconds = 30\n  feed_uri                       = \"https://api.github.com\"\n  name                           = \"Github Releases\"\n}\n#endregion\n#region Library Variable Sets\ndata \"octopusdeploy_library_variable_sets\" \"this_instance\" {\n  partial_name = \"This Instance\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_library_variable_set\" \"this_instance\" {\n  count       = length(data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets) == 0 ? 1 : 0\n  name        = \"This Instance\"\n  description = \"Credentials used to interact with this Octopus instance\"\n}\n\nresource \"octopusdeploy_variable\" \"octopus_admin_api_key\" {\n  count           = length(data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets) == 0 ? 1 : 0\n  name            = \"Octopus.ApiKey\"\n  type            = \"Sensitive\"\n  description     = \"Octopus API Key\"\n  is_sensitive    = true\n  is_editable     = true\n  owner_id        = octopusdeploy_library_variable_set.this_instance[0].id\n  sensitive_value = var.octopus_apikey\n}\n\ndata \"octopusdeploy_library_variable_sets\" \"github\" {\n  partial_name = \"GitHub\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_library_variable_set\" \"github\" {\n  count       = length(data.octopusdeploy_library_variable_sets.github.library_variable_sets) == 0 ? 1 : 0\n  name        = \"GitHub\"\n  description = \"Credentials used to interact with GitHub\"\n}\n\nvariable \"github_access_token\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The GitHub access token\"\n}\n\nresource \"octopusdeploy_variable\" \"github_access_token\" {\n  count           = length(data.octopusdeploy_library_variable_sets.github.library_variable_sets) == 0 ? 1 : 0\n  name            = \"Git.Credentials.Password\"\n  type            = \"Sensitive\"\n  description     = \"The GitHub access token\"\n  is_sensitive    = true\n  is_editable     = true\n  owner_id        = octopusdeploy_library_variable_set.github[0].id\n  sensitive_value = var.github_access_token\n}\n\ndata \"octopusdeploy_library_variable_sets\" \"docker\" {\n  partial_name = \"Docker\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_library_variable_set\" \"docker\" {\n  count       = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? 1 : 0\n  name        = \"Docker\"\n  description = \"Credentials used to interact with Docker\"\n}\n\nresource \"octopusdeploy_variable\" \"docker_username\" {\n  count        = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? 1 : 0\n  name         = \"Docker.Credentials.Username\"\n  type         = \"String\"\n  description  = \"The docker username\"\n  is_sensitive = false\n  is_editable  = true\n  owner_id     = octopusdeploy_library_variable_set.docker[0].id\n  value        = var.feed_docker_hub_username\n}\n\nresource \"octopusdeploy_variable\" \"docker_password\" {\n  count           = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? 1 : 0\n  name            = \"Docker.Credentials.Password\"\n  type            = \"Sensitive\"\n  description     = \"The docker password\"\n  is_sensitive    = true\n  is_editable     = true\n  owner_id        = octopusdeploy_library_variable_set.docker[0].id\n  sensitive_value = var.feed_docker_hub_password\n}\n#endregion\n#region Accounts\n\ndata \"octopusdeploy_accounts\" \"account\" {\n  account_type = \"AzureServicePrincipal\"\n  partial_name = \"Azure\"\n  skip         = 0\n  take         = 1\n}\n\nvariable \"azure_account_application_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The Azure account application ID\"\n}\n\nvariable \"azure_account_subscription_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The Azure account subscription ID\"\n}\n\nvariable \"azure_account_tenant_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The Azure account tenant ID\"\n}\n\nvariable \"azure_account_password\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The Azure account password\"\n}\n\nresource \"octopusdeploy_azure_service_principal\" \"account\" {\n  count                             = length(data.octopusdeploy_accounts.account.accounts) == 0 ? 1 : 0\n  description                       = \"Azure Account\"\n  name                              = \"Azure\"\n  environments                      = []\n  tenants                           = []\n  tenanted_deployment_participation = \"Untenanted\"\n  application_id                    = var.azure_account_application_id\n  password                          = var.azure_account_password\n  subscription_id                   = var.azure_account_subscription_id\n  tenant_id                         = var.azure_account_tenant_id\n}\n\n#endregion\n#region Worker Pools\n\ndata \"octopusdeploy_worker_pools\" \"workerpool_hosted_ubuntu\" {\n  partial_name = \"Hosted Ubuntu\"\n  ids          = null\n  skip         = 0\n  take         = 1\n}\n#endregion\n#region Project Groups\ndata \"octopusdeploy_project_groups\" \"ra\" {\n  ids          = []\n  partial_name = local.project_group_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_project_group\" \"project_group_ra\" {\n  count       = length(data.octopusdeploy_project_groups.ra.project_groups) == 0 ? 1 : 0\n  name        = local.project_group_name\n  description = \"${local.project_group_name} projects.\"\n}\n\ndata \"octopusdeploy_project_groups\" \"project_templates\" {\n  ids          = []\n  partial_name = \"Project Templates\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_project_group\" \"project_group_project_templates\" {\n  count       = length(data.octopusdeploy_project_groups.project_templates.project_groups) == 0 ? 1 : 0\n  name        = \"Project Templates\"\n  description = \"Sample code project generators\"\n}\n#endregion\n\n#region Projects\n\n#region Infrastructure Project\nvariable \"infrastructure_project_name\" {\n  type    = string\n  default = \"\"\n}\n\n\ndata \"octopusdeploy_projects\" \"infrastructure\" {\n  partial_name = var.infrastructure_project_name == \"\" ? local.infrastructure_project_name : var.infrastructure_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"azure_account\" {\n  count       = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  name        = \"Azure.Account\"\n  type        = \"AzureAccount\"\n  description = \"The Azure account used to create the web app infrastructure\"\n  value       = local.cloud_account\n  owner_id    = octopusdeploy_project.infrastructure[0].id\n}\n\nresource \"octopusdeploy_project\" \"infrastructure\" {\n  count                                = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  name                                 = var.infrastructure_project_name == \"\" ? local.infrastructure_project_name : var.infrastructure_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.infrastructure_project_description\n}\n\nresource \"octopusdeploy_runbook\" \"runbook_create_infrastructure\" {\n  count             = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  name              = local.infrastructure_runbook_name\n  project_id        = octopusdeploy_project.infrastructure[0].id\n  environment_scope = \"Specified\"\n  environments      = [\n    local.development_environment_id,\n    local.test_environment_id,\n    local.production_environment_id,\n  ]\n  force_package_download      = false\n  default_guided_failure_mode = \"EnvironmentDefault\"\n  description                 = local.infrastructure_runbook_description\n  multi_tenancy_mode          = \"Untenanted\"\n\n  retention_policy {\n    quantity_to_keep    = 100\n    should_keep_forever = false\n  }\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n}\n\nresource \"octopusdeploy_runbook_process\" \"runbook_process_runbook_create_infrastructure\" {\n  count      = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  runbook_id = octopusdeploy_runbook.runbook_create_infrastructure[0].id\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Create Resource Group If Not Exists (AZ Module)\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzurePowerShell\"\n      name                               = \"Create Resource Group If Not Exists (AZ Module)\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.ScriptSource\"              = \"Inline\"\n        \"CreateResourceGroup.ResourceGroup.Location.Abbr\" = \"australiasoutheast\"\n        \"Octopus.Action.Script.ScriptBody\"                = \"$resourceGroupName = $OctopusParameters[\\\"CreateResourceGroup.ResourceGroup.Name\\\"]\\n$resourceGroupLocationAbbr = $OctopusParameters[\\\"CreateResourceGroup.ResourceGroup.Location.Abbr\\\"]\\n\\n$existingResourceGroups = (az group list --query \\\"[?location=='$resourceGroupLocationAbbr']\\\") | ConvertFrom-JSON\\n\\n$createResourceGroup = $true\\nforeach ($resourceGroupFound in $existingResourceGroups)\\n{\\t\\n\\tWrite-Host \\\"Checking if current resource group $($resourceGroupFound.name) matches $resourceGroupName\\\"\\n    if ($resourceGroupFound.name -eq $resourceGroupName)\\n    {\\n    \\t$createResourceGroup = $false\\n    \\tWrite-Highlight \\\"Resource group already exists, skipping creation\\\"\\n    \\tbreak\\n    }\\n}\\n\\nif ($createResourceGroup)\\n{\\n\\tWrite-Host \\\"Creating the $resourceGroupName because it was not found in $resourceGroupLocationAbbr\\\"\\n\\taz group create -l $resourceGroupLocationAbbr -n $resourceGroupName\\n}\"\n        \"Octopus.Action.RunOnServer\"                      = \"true\"\n        \"Octopus.Action.Script.Syntax\"                    = \"PowerShell\"\n        \"Octopus.Action.Azure.AccountId\"                  = \"#{CreateResourceGroup.Azure.Account}\"\n        \"CreateResourceGroup.Azure.Account\"               = \"Azure.Account\"\n        \"CreateResourceGroup.ResourceGroup.Name\"          = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"OctopusUseBundledTooling\"                        = \"False\"\n      }\n\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = \"octopuslabs/azure-workertools\"\n      }\n\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create App Service Plan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create App Service Plan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\"     = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"                  = \"Inline\"\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopub\"\n          }\n          \"appServiceSku\" = {\n            \"value\" = \"B2\"\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"parameters\" = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"appServiceSku\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"B2\"\n              \"metadata\"     = {\n                \"description\" = \"The SKU of App Service Plan\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"appServicePlanName\" = \"[concat(parameters('projectName'), '-', parameters('environment'),'-hosting')]\"\n          }\n          \"resources\" = [\n            {\n              \"kind\"       = \"linux\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"properties\" = {\n                \"reserved\" = \"true\"\n              }\n              \"dependsOn\" = []\n              \"sku\"       = {\n                \"name\" = \"[parameters('appServiceSku')]\"\n              }\n              \"apiVersion\" = \"2017-08-01\"\n              \"type\"       = \"Microsoft.Web/serverfarms\"\n              \"name\"       = \"[variables('appServicePlanName')]\"\n              \"comments\"   = \"This app service plan is used for the web app and slots.\"\n            },\n          ]\n          \"outputs\" = {\n            \"appServicePlan\" = {\n              \"type\"  = \"string\"\n              \"value\" = \"[resourceId('Microsoft.Web/serverfarms', variables('appServicePlanName'))]\"\n            }\n          }\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n        })\n        \"Octopus.Action.Azure.AccountId\"         = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\" = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"             = \"true\"\n        \"OctopusUseBundledTooling\"               = \"False\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Frontend Web App Service\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create Frontend Web App Service\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopubfrontend\"\n          }\n          \"uniquePrefix\" = {\n            \"value\" = local.unique_prefix\n          }\n          \"appServicePlanId\" = {\n            \"value\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n          }\n          \"dockerImageName\" = {\n            \"value\" = \"nginx:latest\"\n          }\n          \"resourceTags\" = {\n            \"value\" = {\n              \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n              \"octopus-role\"        = \"${local.target_role} Frontend\"\n              \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n              \"octopus-project\"     = \"Azure WebApp Octopub Frontend\"\n            }\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"resources\" = [\n            {\n              \"apiVersion\" = \"2016-08-01\"\n              \"name\"       = \"[variables('webAppPortalName')]\"\n              \"kind\"       = \"app,linux,container\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"tags\"       = \"[parameters('resourceTags')]\"\n              \"dependsOn\"  = []\n              \"properties\" = {\n                \"name\"       = \"[variables('webAppPortalName')]\"\n                \"siteConfig\" = {\n                  \"linuxFxVersion\" = \"[concat('DOCKER|', parameters('dockerImageName'))]\"\n                  \"alwaysOn\"       = \"true\"\n                }\n                \"serverFarmId\" = \"[parameters('appServicePlanId')]\"\n              }\n              \"type\" = \"Microsoft.Web/sites\"\n            },\n          ]\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n          \"parameters\"     = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"uniquePrefix\" = {\n              \"defaultValue\" = local.unique_prefix\n              \"type\"         = \"string\"\n            }\n            \"appServicePlanId\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n            }\n            \"dockerImageName\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"nginx:latest\"\n            }\n            \"resourceTags\" = {\n              \"type\"         = \"object\"\n              \"defaultValue\" = {\n                \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n                \"octopus-role\"        = \"${local.target_role} Frontend\"\n                \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n                \"octopus-project\"     = \"\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"webAppPortalName\" = \"[concat(parameters('uniquePrefix'), '-', parameters('projectName'), '-', parameters('environment'), '-webapp')]\"\n          }\n        })\n        \"Octopus.Action.Azure.AccountId\"                   = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\"           = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"                       = \"true\"\n        \"OctopusUseBundledTooling\"                         = \"False\"\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\" = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"              = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Create Products Microservice App Service\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create Products Microservice App Service\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopubproducts\"\n          }\n          \"uniquePrefix\" = {\n            \"value\" = local.unique_prefix\n          }\n          \"appServicePlanId\" = {\n            \"value\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n          }\n          \"dockerImageName\" = {\n            \"value\" = \"nginx:latest\"\n          }\n          \"resourceTags\" = {\n            \"value\" = {\n              \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n              \"octopus-role\"        = \"${local.target_role} Products\"\n              \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n              \"octopus-project\"     = \"Azure WebApp Octopub Products\"\n            }\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"resources\" = [\n            {\n              \"apiVersion\" = \"2016-08-01\"\n              \"name\"       = \"[variables('webAppPortalName')]\"\n              \"kind\"       = \"app,linux,container\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"tags\"       = \"[parameters('resourceTags')]\"\n              \"dependsOn\"  = []\n              \"properties\" = {\n                \"name\"       = \"[variables('webAppPortalName')]\"\n                \"siteConfig\" = {\n                  \"linuxFxVersion\" = \"[concat('DOCKER|', parameters('dockerImageName'))]\"\n                  \"alwaysOn\"       = \"true\"\n                }\n                \"serverFarmId\" = \"[parameters('appServicePlanId')]\"\n              }\n              \"type\" = \"Microsoft.Web/sites\"\n            },\n          ]\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n          \"parameters\"     = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"uniquePrefix\" = {\n              \"defaultValue\" = local.unique_prefix\n              \"type\"         = \"string\"\n            }\n            \"appServicePlanId\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n            }\n            \"dockerImageName\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"nginx:latest\"\n            }\n            \"resourceTags\" = {\n              \"type\"         = \"object\"\n              \"defaultValue\" = {\n                \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n                \"octopus-role\"        = \"${local.target_role} Products\"\n                \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n                \"octopus-project\"     = \"\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"webAppPortalName\" = \"[concat(parameters('uniquePrefix'), '-', parameters('projectName'), '-', parameters('environment'), '-webapp')]\"\n          }\n        })\n        \"Octopus.Action.Azure.AccountId\"                   = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\"           = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"                       = \"true\"\n        \"OctopusUseBundledTooling\"                         = \"False\"\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\" = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"              = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Create Audits Microservice App Service\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create Audits Microservice App Service\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopubaudits\"\n          }\n          \"uniquePrefix\" = {\n            \"value\" = local.unique_prefix\n          }\n          \"appServicePlanId\" = {\n            \"value\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n          }\n          \"dockerImageName\" = {\n            \"value\" = \"nginx:latest\"\n          }\n          \"resourceTags\" = {\n            \"value\" = {\n              \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n              \"octopus-role\"        = \"${local.target_role} Audits\"\n              \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n              \"octopus-project\"     = \"Azure WebApp Octopub Audits\"\n            }\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"resources\" = [\n            {\n              \"apiVersion\" = \"2016-08-01\"\n              \"name\"       = \"[variables('webAppPortalName')]\"\n              \"kind\"       = \"app,linux,container\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"tags\"       = \"[parameters('resourceTags')]\"\n              \"dependsOn\"  = []\n              \"properties\" = {\n                \"name\"       = \"[variables('webAppPortalName')]\"\n                \"siteConfig\" = {\n                  \"linuxFxVersion\" = \"[concat('DOCKER|', parameters('dockerImageName'))]\"\n                  \"alwaysOn\"       = \"true\"\n                }\n                \"serverFarmId\" = \"[parameters('appServicePlanId')]\"\n              }\n              \"type\" = \"Microsoft.Web/sites\"\n            },\n          ]\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n          \"parameters\"     = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"uniquePrefix\" = {\n              \"defaultValue\" = local.unique_prefix\n              \"type\"         = \"string\"\n            }\n            \"appServicePlanId\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n            }\n            \"dockerImageName\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"nginx:latest\"\n            }\n            \"resourceTags\" = {\n              \"type\"         = \"object\"\n              \"defaultValue\" = {\n                \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n                \"octopus-role\"        = \"${local.target_role} Audits\"\n                \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n                \"octopus-project\"     = \"\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"webAppPortalName\" = \"[concat(parameters('uniquePrefix'), '-', parameters('projectName'), '-', parameters('environment'), '-webapp')]\"\n          }\n        })\n        \"Octopus.Action.Azure.AccountId\"                   = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\"           = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"                       = \"true\"\n        \"OctopusUseBundledTooling\"                         = \"False\"\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\" = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"              = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Octopub Frontend Project\nvariable \"frontend_project_name\" {\n  type    = string\n  default = \"\"\n}\n\ndata \"octopusdeploy_projects\" \"frontend\" {\n  partial_name = var.frontend_project_name == \"\" ? local.octopub_frontend_project_name : var.frontend_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"frontend_health_check\" {\n  count        = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.frontend[0].id\n  value        = local.frontend_health_check\n  name         = \"App.HealthCheck\"\n  type         = \"String\"\n  description  = \"The path to perform a health check on.\"\n  is_sensitive = false\n  depends_on   = []\n}\n\nresource \"octopusdeploy_variable\" \"azure_webapp_octopub_frontend_octopus_azure_account\" {\n  count        = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.frontend[0].id\n  value        = local.cloud_account\n  name         = \"Octopus.Azure.Account\"\n  type         = \"AzureAccount\"\n  description  = \"\"\n  is_sensitive = false\n}\n\nresource \"octopusdeploy_project\" \"frontend\" {\n  count                                = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  name                                 = var.frontend_project_name == \"\" ? local.octopub_frontend_project_name : var.frontend_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.octopub_frontend_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"frontend\" {\n  count      = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  project_id = octopusdeploy_project.frontend[0].id\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  // The deployment step goes here.\n  // Call the step \"Deploy Container\"\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Container\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureAppService\"\n      name                               = \"Deploy Container\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                = \"true\"\n        \"OctopusUseBundledTooling\"                  = \"False\"\n        \"Octopus.Action.Azure.DeploymentType\"       = \"Container\"\n        \"Octopus.Action.Package.DownloadOnTentacle\" = \"False\"\n        \"Octopus.Action.Azure.AppSettings\"          = jsonencode([\n          {\n            \"name\"        = \"UDL_SETVALUE_1\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][productEndpoint]https://${local.unique_prefix}-octopubproducts-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/api/products\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"UDL_SETVALUE_2\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][productHealthEndpoint]https://${local.unique_prefix}-octopubproducts-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/health/products\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"UDL_SETVALUE_3\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][auditEndpoint]https://${local.unique_prefix}-octopubaudits-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/api/audits\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"UDL_SETVALUE_4\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][auditHealthEndpoint]https://${local.unique_prefix}-octopubaudits-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/health/audits\"\n            \"slotSetting\" = \"false\"\n          }\n        ])\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = \"octopussamples/octopub-frontend\"\n        acquisition_location = \"NotAcquired\"\n        feed_id              = local.docker_hub_feed_id\n        properties           = { SelectionMode = \"immediate\" }\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Frontend\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Service Link\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type = local.link_highlight_action_type\n      properties  = local.link_highlight_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.link_highlight_container_image\n      }\n      name                               = \"Service Link\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      environments                       = []\n      excluded_environments              = []\n      channels                           = []\n      tenant_tags                        = []\n      features                           = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Frontend\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Smoke Test\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = local.smoke_test_action_type\n      name                               = \"Smoke Test\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = local.smoke_test_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.smoke_test_container_image\n      }\n      environments = [\n        local.development_environment_id,\n        local.test_environment_id,\n        local.production_environment_id,\n      ]\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Frontend\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Security Scan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Security Scan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.security_scan_docker_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n\n#endregion\n\n#region Octopub Products Project\nvariable \"products_project_name\" {\n  type    = string\n  default = \"\"\n}\n\n\ndata \"octopusdeploy_projects\" \"products\" {\n  partial_name = var.products_project_name == \"\" ? local.octopub_products_project_name : var.products_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"azure_webapp_octopub_products_octopus_azure_account\" {\n  count        = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.products[0].id\n  value        = local.cloud_account\n  name         = \"Octopus.Azure.Account\"\n  type         = \"AzureAccount\"\n  description  = \"\"\n  is_sensitive = false\n}\n\nresource \"octopusdeploy_variable\" \"products_health_check\" {\n  count        = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.products[0].id\n  value        = local.products_health_check\n  name         = \"App.HealthCheck\"\n  type         = \"String\"\n  description  = \"The path to perform a health check on.\"\n  is_sensitive = false\n  depends_on   = []\n}\n\nresource \"octopusdeploy_project\" \"products\" {\n  count                                = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  name                                 = var.products_project_name == \"\" ? local.octopub_products_project_name : var.products_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.octopub_products_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"products\" {\n  count      = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  project_id = octopusdeploy_project.products[0].id\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  // The deployment step goes here.\n  // Call the step \"Deploy Container\"\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Container\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureAppService\"\n      name                               = \"Deploy Container\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                = \"true\"\n        \"OctopusUseBundledTooling\"                  = \"False\"\n        \"Octopus.Action.Azure.DeploymentType\"       = \"Container\"\n        \"Octopus.Action.Package.DownloadOnTentacle\" = \"False\"\n        \"Octopus.Action.Azure.AppSettings\"          = jsonencode([\n          {\n            \"name\"        = \"WEBSITES_PORT\"\n            \"value\"       = \"8083\"\n            \"slotSetting\" = \"false\"\n          }\n        ])\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = \"octopussamples/octopub-products-microservice\"\n        acquisition_location = \"NotAcquired\"\n        feed_id              = local.docker_hub_feed_id\n        properties           = { SelectionMode = \"immediate\" }\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Products\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Service Link\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type = local.link_highlight_action_type\n      properties  = local.link_highlight_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.link_highlight_container_image\n      }\n      name                               = \"Service Link\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      environments                       = []\n      excluded_environments              = []\n      channels                           = []\n      tenant_tags                        = []\n      features                           = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Products\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Smoke Test\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = local.smoke_test_action_type\n      name                               = \"Smoke Test\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = local.smoke_test_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.smoke_test_container_image\n      }\n      environments = [\n        local.development_environment_id,\n        local.test_environment_id,\n        local.production_environment_id,\n      ]\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Products\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Security Scan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Security Scan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.security_scan_docker_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Octopub Audits Project\nvariable \"audits_project_name\" {\n  type    = string\n  default = \"\"\n}\n\ndata \"octopusdeploy_projects\" \"audits\" {\n  partial_name = var.audits_project_name == \"\" ? local.octopub_audits_project_name : var.audits_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"azure_webapp_octopub_audits_octopus_azure_account\" {\n  count        = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.audits[0].id\n  value        = local.cloud_account\n  name         = \"Octopus.Azure.Account\"\n  type         = \"AzureAccount\"\n  description  = \"\"\n  is_sensitive = false\n}\n\nresource \"octopusdeploy_variable\" \"audits_healthcheck\" {\n  count        = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.audits[0].id\n  value        = local.audits_health_check\n  name         = \"App.HealthCheck\"\n  type         = \"String\"\n  description  = \"The path to perform a health check on.\"\n  is_sensitive = false\n  depends_on   = []\n}\n\nresource \"octopusdeploy_project\" \"audits\" {\n  count                                = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  name                                 = var.audits_project_name == \"\" ? local.octopub_audits_project_name : var.audits_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.octopub_audits_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"audits\" {\n  count      = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  project_id = octopusdeploy_project.audits[0].id\n\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  // The deployment step goes here.\n  // Call the step \"Deploy Container\"\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Container\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureAppService\"\n      name                               = \"Deploy Container\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                = \"true\"\n        \"OctopusUseBundledTooling\"                  = \"False\"\n        \"Octopus.Action.Azure.DeploymentType\"       = \"Container\"\n        \"Octopus.Action.Package.DownloadOnTentacle\" = \"False\"\n        \"Octopus.Action.Azure.AppSettings\"          = jsonencode([\n          {\n            \"name\"        = \"WEBSITES_PORT\"\n            \"value\"       = \"10000\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"MIGRATE_AT_START\"\n            \"value\"       = \"true\"\n            \"slotSetting\" = \"false\"\n          },\n        ])\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = \"octopussamples/octopub-audit-microservice\"\n        acquisition_location = \"NotAcquired\"\n        feed_id              = local.docker_hub_feed_id\n        properties           = { SelectionMode = \"immediate\" }\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Audits\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Service Link\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type = local.link_highlight_action_type\n      properties  = local.link_highlight_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.link_highlight_container_image\n      }\n      name                               = \"Service Link\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      environments                       = []\n      excluded_environments              = []\n      channels                           = []\n      tenant_tags                        = []\n      features                           = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Audits\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Smoke Test\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = local.smoke_test_action_type\n      properties                         = local.smoke_test_properties\n      name                               = \"Smoke Test\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.smoke_test_container_image\n      }\n      environments = [\n        local.development_environment_id,\n        local.test_environment_id,\n        local.production_environment_id,\n      ]\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Audits\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Security Scan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Security Scan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.security_scan_docker_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Octopub Orchestration Project\ndata \"octopusdeploy_projects\" \"orchestration\" {\n  partial_name = local.octopub_orchestration_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_project\" \"orchestration\" {\n  count                                = length(data.octopusdeploy_projects.orchestration.projects) == 0 ? 1 : 0\n  name                                 = local.octopub_orchestration_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = false\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = []\n  }\n  description = local.octopub_products_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"orchestration\" {\n  project_id = octopusdeploy_project.orchestration[0].id\n  count      = length(data.octopusdeploy_projects.orchestration.projects) == 0 ? 1 : 0\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Frontend\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.DeployRelease\"\n      name                               = \"Deploy Frontend\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = \"\"\n      properties                         = {\n        \"Octopus.Action.Package.DownloadOnTentacle\"        = \"NotAcquired\"\n        \"Octopus.Action.RunOnServer\"                       = \"True\"\n        \"Octopus.Action.DeployRelease.DeploymentCondition\" = \"Always\"\n        \"Octopus.Action.DeployRelease.ProjectId\"           = length(data.octopusdeploy_projects.frontend.projects) == 0 ? octopusdeploy_project.frontend[0].id : data.octopusdeploy_projects.frontend.projects[0].id\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = length(data.octopusdeploy_projects.frontend.projects) == 0 ? octopusdeploy_project.frontend[0].id : data.octopusdeploy_projects.frontend.projects[0].id\n        acquisition_location = \"NotAcquired\"\n        feed_id              = data.octopusdeploy_feeds.project.feeds[0].id\n        properties           = {}\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Products\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.DeployRelease\"\n      name                               = \"Deploy Products\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = \"\"\n      properties                         = {\n        \"Octopus.Action.DeployRelease.ProjectId\"           = length(data.octopusdeploy_projects.products.projects) == 0 ? octopusdeploy_project.products[0].id : data.octopusdeploy_projects.products.projects[0].id\n        \"Octopus.Action.Package.DownloadOnTentacle\"        = \"NotAcquired\"\n        \"Octopus.Action.RunOnServer\"                       = \"True\"\n        \"Octopus.Action.DeployRelease.DeploymentCondition\" = \"Always\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = length(data.octopusdeploy_projects.products.projects) == 0 ? octopusdeploy_project.products[0].id : data.octopusdeploy_projects.products.projects[0].id\n        acquisition_location = \"NotAcquired\"\n        feed_id              = data.octopusdeploy_feeds.project.feeds[0].id\n        properties           = {}\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Audits\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.DeployRelease\"\n      name                               = \"Deploy Audits\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = \"\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                       = \"True\"\n        \"Octopus.Action.DeployRelease.DeploymentCondition\" = \"Always\"\n        \"Octopus.Action.DeployRelease.ProjectId\"           = length(data.octopusdeploy_projects.audits.projects) == 0 ? octopusdeploy_project.audits[0].id : data.octopusdeploy_projects.audits.projects[0].id\n        \"Octopus.Action.Package.DownloadOnTentacle\"        = \"NotAcquired\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = length(data.octopusdeploy_projects.audits.projects) == 0 ? octopusdeploy_project.audits[0].id : data.octopusdeploy_projects.audits.projects[0].id\n        acquisition_location = \"NotAcquired\"\n        feed_id              = data.octopusdeploy_feeds.project.feeds[0].id\n        properties           = {}\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Project Templates\nvariable \"project_template_project_name\" {\n  type    = string\n  default = \"\"\n}\n\ndata \"octopusdeploy_projects\" \"docker_project_template\" {\n  partial_name = var.project_template_project_name == \"\" ? local.project_template_project_name : var.project_template_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_git_organization\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Git.Url.Organization\"\n  type         = \"String\"\n  description  = \"The GitHub organization to create the repo in.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Github organization where the repo will be created. This is the `owner` part of the URL `https://github.com/owner/myrepo`.\"\n    label       = \"Github Organization\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_git_repo\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Git.Url.Repo\"\n  type         = \"String\"\n  description  = \"The GitHub repo to create.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Github repo to be created. This is the `myrepo` part of the URL `https://github.com/owner/myrepo`.\"\n    label       = \"Github Repo\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_image_name\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Application.Docker.Image\"\n  type         = \"String\"\n  description  = \"The Docker image to create containing the new application.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Docker image to create containing the new application.\"\n    label       = \"Docker Image\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_octopus_project\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Application.Octopus.Project\"\n  type         = \"String\"\n  description  = \"The Octopus project to associate with the new application.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Octopus project to associate with the new application. A release is created in this project when the image is successfully built.\"\n    label       = \"Octopus Project\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_project\" \"docker_project_template\" {\n  count                                = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  name                                 = var.project_template_project_name == \"\" ? local.project_template_project_name : var.project_template_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"Off\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = false\n  lifecycle_id                         = local.application_lifecycle_id\n  project_group_id                     = local.project_templates_project_group_id\n  included_library_variable_sets       = [\n    local.this_instance_library_variable_set, local.github_library_variable_set, local.docker_library_variable_set\n  ]\n  tenanted_deployment_participation = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = []\n  }\n  description = <<EOT\nCreates Project Templates.\nEOT\n}\n\nresource \"octopusdeploy_runbook\" \"docker_project_template_create_nodejs_template\" {\n  count                       = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  name                        = \"\uD83D\uDCD7 Create Template Github Node.js Project\"\n  project_id                  = octopusdeploy_project.docker_project_template[0].id\n  environment_scope           = \"Specified\"\n  environments                = [local.sync_environment_id]\n  force_package_download      = false\n  default_guided_failure_mode = \"EnvironmentDefault\"\n  description                 = \"This runbook populates a GitHub repo with a sample Node.js project and GitHub Actions Workflow that builds a Docker image, pushes it to DockerHub, and triggers the deployment of the associated Octopus project in the Development environment. \\n\\n**Action**: Creates a new GitHub repo (if it doesn't exist) and populates it with the output of a Yeoman generator.\\n\\n\\n**Affects**: This will overwrite files in the target Git repo. Changes can be reverted with git.\"\n  multi_tenancy_mode          = \"Untenanted\"\n\n  retention_policy {\n    quantity_to_keep    = 100\n    should_keep_forever = false\n  }\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n}\n\nresource \"octopusdeploy_runbook_process\" \"docker_project_template_create_nodejs_template\" {\n  runbook_id = octopusdeploy_runbook.docker_project_template_create_nodejs_template[0].id\n  count      = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n\n  step {\n    condition           = \"Success\"\n    name                = \"Get Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Get Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.ScriptBody\"   = \"# This is a workaround to the issue where octostache templates in the Terraform\\n# project are replaced during deployment, when we actually want some variables\\n# at run time.\\n\\nSet-OctopusVariable -name \\\"Project.Name\\\" -value $OctopusParameters[\\\"Octopus.Project.Name\\\"]\\nSet-OctopusVariable -name \\\"Web.ServerUri\\\" -value $OctopusParameters[\\\"Octopus.Web.ServerUri\\\"]\\nSet-OctopusVariable -name \\\"Space.Id\\\" -value $OctopusParameters[\\\"Octopus.Space.Id\\\"]\\nSet-OctopusVariable -name \\\"Space.Name\\\" -value $OctopusParameters[\\\"Octopus.Space.Name\\\"]\"\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Repo\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Repo\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"CreateGithubRepo.Git.Url.Organization\"        = \"#{Git.Url.Organization}\"\n        \"Octopus.Action.Script.Syntax\"                 = \"Python\"\n        \"Octopus.Action.RunOnServer\"                   = \"true\"\n        \"CreateGithubRepo.Git.Url.NewRepoNamePrefix\"   = \"\"\n        \"CreateGithubRepo.Git.Credentials.AccessToken\" = \"#{Git.Credentials.Password}\"\n        \"Octopus.Action.Script.ScriptBody\"             = \"# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\n\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport platform\\nfrom urllib.request import urlretrieve\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Create a GitHub repo'\\n    )\\n    parser.add_argument('--new-repo-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(\\n                            'Git.Url.NewRepoName') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--new-repo-name-prefix', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(\\n                            'Git.Url.NewRepoNamePrefix'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--github-access-token', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Credentials.AccessToken') or get_octopusvariable_quiet(\\n                            'Git.Credentials.AccessToken'),\\n                        help='The git password')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef create_new_repo(token, cac_org, new_repo):\\n    # If we could not view the repo, assume it needs to be created.\\n    # https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#create-an-organization-repository\\n    # Note you have to use the token rather than the JWT:\\n    # https://stackoverflow.com/questions/39600396/bad-credentails-for-jwt-for-github-integrations-api\\n\\n    headers = {\\n        'Authorization': 'token ' + token,\\n        'Content-Type': 'application/json',\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28',\\n    }\\n\\n    try:\\n        # First try to create an organization repo:\\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos#create-an-organization-repository\\n        url = 'https://api.github.com/orgs/' + cac_org + '/repos'\\n        body = {'name': new_repo}\\n        request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\\n        urllib.request.urlopen(request)\\n    except urllib.error.URLError as ex:\\n        # Then fall back to creating a repo for the user:\\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos?apiVersion=2022-11-28#create-a-repository-for-the-authenticated-user\\n        if ex.code == 404:\\n            url = 'https://api.github.com/user/repos'\\n            body = {'name': new_repo}\\n            request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\\n            urllib.request.urlopen(request)\\n        else:\\n            raise ValueError(\\\"Failed to create thew new repository. This could indicate bad credentials.\\\") from ex\\n\\n\\ndef is_windows():\\n    return platform.system() == 'Windows'\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.github_access_token.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.new_repo_name.strip():\\n    print(\\\"You must define the new repo name\\\")\\n    sys.exit(1)\\n\\n# The access token is generated from a github app or supplied directly as an access token\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key, parser.github_app_installation_id) \\\\\\n    if not parser.github_access_token.strip() else parser.github_access_token.strip()\\n\\ncac_org = parser.git_organization.strip()\\nnew_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())\\nproject_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name.strip())\\n\\n# The prefix is optional\\nnew_repo_prefix_with_separator = new_repo_custom_prefix + '_' if new_repo_custom_prefix else ''\\n\\n# The new repo name is the prefix + the name of thew new project\\nnew_repo = new_repo_prefix_with_separator + project_repo_sanitized\\n\\n# This is the value of the forked git repo\\nset_octopusvariable('NewRepoUrl', 'https://github.com/' + cac_org + '/' + new_repo)\\nset_octopusvariable('NewRepo', new_repo)\\n\\nif not verify_new_repo(token, cac_org, new_repo):\\n    create_new_repo(token, cac_org, new_repo)\\n    print(\\n        'New repo was created at https://github.com/' + cac_org + '/' + new_repo)\\nelse:\\n    print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')\\n\\nprint('New repo URL is defined in the output variable \\\"NewRepoUrl\\\": #{Octopus.Action[' +\\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepoUrl}')\\nprint('New repo name is defined in the output variable \\\"NewRepo\\\": #{Octopus.Action[' +\\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')\\n\"\n        \"CreateGithubRepo.Git.Url.NewRepoName\"         = \"#{Git.Url.Repo}\"\n        \"Octopus.Action.Script.ScriptSource\"           = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Octopus API Key Secret\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Octopus API Key Secret\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.Syntax\"                = \"Python\"\n        \"CreateGitHubSecret.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n        \"CreateGitHubSecret.GitHub.Secret.Value\"      = \"#{Octopus.ApiKey}\"\n        \"CreateGitHubSecret.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"Octopus.Action.Script.ScriptSource\"          = \"Inline\"\n        \"CreateGitHubSecret.GitHub.Secret.Name\"       = \"OCTOPUS_API_TOKEN\"\n        \"CreateGitHubSecret.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"Octopus.Action.Script.ScriptBody\"            = \"# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\\n\\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport urllib3\\nfrom base64 import b64encode\\nfrom typing import TypedDict\\nfrom nacl import public, encoding\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n\\n    parser.add_argument('--secret-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Name'))\\n    parser.add_argument('--secret-value', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Value'))\\n\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\\n    \\\"\\\"\\\"Encrypt a Unicode string using the public key.\\\"\\\"\\\"\\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\\\"utf-8\\\"), encoding.Base64Encoder()))\\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\\\"utf-8\\\"))\\n    return b64encode(encrypted).decode(\\\"utf-8\\\")\\n\\n\\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\\n    public_key_endpoint: str = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\\\"\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\"}\\n    response = requests.get(url=public_key_endpoint, headers=headers)\\n    if response.status_code != 200:\\n        raise IOError(\\n            f\\\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\\\")\\n\\n    public_key_json = response.json()\\n    return public_key_json['key_id'], public_key_json['key']\\n\\n\\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\\n               encrypted_secret_value: str):\\n    secret_creation_url = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\\\"\\n    secret_creation_body = {\\\"key_id\\\": public_key_id, \\\"encrypted_value\\\": encrypted_secret_value}\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\", \\\"Content-Type\\\": \\\"application/json\\\"}\\n\\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\\n        print(\\\"--Secret Created / Updated!--\\\")\\n    else:\\n        print(f\\\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\\\")\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.secret_name.strip():\\n    print(\\\"You must define the secret name\\\")\\n    sys.exit(1)\\n    \\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print(\\\"Could not find the repo\\\")\\n    sys.exit(1)\\n\\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\\n                                    token)\\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\\n           encrypted_secret_value=encrypted_secret)\\n\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Docker Hub Password Secret\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Docker Hub Password Secret\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"CreateGitHubSecret.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n        \"CreateGitHubSecret.GitHub.Secret.Name\"       = \"DOCKERHUB_TOKEN\"\n        \"Octopus.Action.Script.Syntax\"                = \"Python\"\n        \"CreateGitHubSecret.GitHub.Secret.Value\"      = \"#{Docker.Credentials.Password}\"\n        \"CreateGitHubSecret.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"Octopus.Action.Script.ScriptSource\"          = \"Inline\"\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"CreateGitHubSecret.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"Octopus.Action.Script.ScriptBody\"            = \"# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\\n\\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport urllib3\\nfrom base64 import b64encode\\nfrom typing import TypedDict\\nfrom nacl import public, encoding\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n\\n    parser.add_argument('--secret-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Name'))\\n    parser.add_argument('--secret-value', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Value'))\\n\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\\n    \\\"\\\"\\\"Encrypt a Unicode string using the public key.\\\"\\\"\\\"\\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\\\"utf-8\\\"), encoding.Base64Encoder()))\\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\\\"utf-8\\\"))\\n    return b64encode(encrypted).decode(\\\"utf-8\\\")\\n\\n\\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\\n    public_key_endpoint: str = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\\\"\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\"}\\n    response = requests.get(url=public_key_endpoint, headers=headers)\\n    if response.status_code != 200:\\n        raise IOError(\\n            f\\\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\\\")\\n\\n    public_key_json = response.json()\\n    return public_key_json['key_id'], public_key_json['key']\\n\\n\\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\\n               encrypted_secret_value: str):\\n    secret_creation_url = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\\\"\\n    secret_creation_body = {\\\"key_id\\\": public_key_id, \\\"encrypted_value\\\": encrypted_secret_value}\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\", \\\"Content-Type\\\": \\\"application/json\\\"}\\n\\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\\n        print(\\\"--Secret Created / Updated!--\\\")\\n    else:\\n        print(f\\\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\\\")\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.secret_name.strip():\\n    print(\\\"You must define the secret name\\\")\\n    sys.exit(1)\\n    \\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print(\\\"Could not find the repo\\\")\\n    sys.exit(1)\\n\\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\\n                                    token)\\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\\n           encrypted_secret_value=encrypted_secret)\\n\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Docker Hub Password Username\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Docker Hub Password Username\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"CreateGitHubSecret.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"CreateGitHubSecret.GitHub.Secret.Value\"      = \"#{Docker.Credentials.Username}\"\n        \"CreateGitHubSecret.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"Octopus.Action.Script.ScriptSource\"          = \"Inline\"\n        \"Octopus.Action.Script.ScriptBody\"            = \"# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\\n\\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport urllib3\\nfrom base64 import b64encode\\nfrom typing import TypedDict\\nfrom nacl import public, encoding\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n\\n    parser.add_argument('--secret-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Name'))\\n    parser.add_argument('--secret-value', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Value'))\\n\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\\n    \\\"\\\"\\\"Encrypt a Unicode string using the public key.\\\"\\\"\\\"\\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\\\"utf-8\\\"), encoding.Base64Encoder()))\\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\\\"utf-8\\\"))\\n    return b64encode(encrypted).decode(\\\"utf-8\\\")\\n\\n\\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\\n    public_key_endpoint: str = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\\\"\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\"}\\n    response = requests.get(url=public_key_endpoint, headers=headers)\\n    if response.status_code != 200:\\n        raise IOError(\\n            f\\\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\\\")\\n\\n    public_key_json = response.json()\\n    return public_key_json['key_id'], public_key_json['key']\\n\\n\\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\\n               encrypted_secret_value: str):\\n    secret_creation_url = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\\\"\\n    secret_creation_body = {\\\"key_id\\\": public_key_id, \\\"encrypted_value\\\": encrypted_secret_value}\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\", \\\"Content-Type\\\": \\\"application/json\\\"}\\n\\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\\n        print(\\\"--Secret Created / Updated!--\\\")\\n    else:\\n        print(f\\\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\\\")\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.secret_name.strip():\\n    print(\\\"You must define the secret name\\\")\\n    sys.exit(1)\\n    \\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print(\\\"Could not find the repo\\\")\\n    sys.exit(1)\\n\\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\\n                                    token)\\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\\n           encrypted_secret_value=encrypted_secret)\\n\"\n        \"CreateGitHubSecret.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"CreateGitHubSecret.GitHub.Secret.Name\"       = \"DOCKERHUB_USERNAME\"\n        \"Octopus.Action.Script.Syntax\"                = \"Python\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Generate and Push\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate and Push\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"PopulateGithubRepo.Yeoman.Generator.SubGenerator\" = \"nodejs-docker-webapp\"\n        \"PopulateGithubRepo.Yeoman.Generator.Arguments\"    = \"--octopusUrl #{Octopus.Action[Get Variables].Output.Web.ServerUri} --octopusSpace \\\"#{Octopus.Action[Get Variables].Output.Space.Name}\\\" --octopusApi #{Octopus.ApiKey} --octopusProject \\\"#{Application.Octopus.Project}\\\" --dockerImage #{Application.Docker.Image}\"\n        \"PopulateGithubRepo.Yeoman.Generator.Name\"         = \"octopus-reference-architecture-apps\"\n        \"Octopus.Action.Script.Syntax\"                     = \"Python\"\n        \"Octopus.Action.Script.ScriptSource\"               = \"Inline\"\n        \"Octopus.Action.Script.ScriptBody\"                 = \"# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nenv_vars = os.environ.copy()\\nenv_vars['PIP_ROOT_USER_ACTION'] = 'ignore'\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'], env=env_vars)\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'requests', '--disable-pip-version-check'], env=env_vars)\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'anyascii', '--disable-pip-version-check'], env=env_vars)\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport platform\\nimport zipfile\\nimport lzma\\nimport tarfile\\nimport shutil\\nimport urllib3\\nfrom shlex import split\\nfrom anyascii import anyascii\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except Exception as inst:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n    parser.add_argument('--generator', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Yeoman.Generator.Name') or get_octopusvariable_quiet(\\n                            'Yeoman.Generator.Name'))\\n    parser.add_argument('--sub-generator', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Yeoman.Generator.SubGenerator') or get_octopusvariable_quiet(\\n                            'Yeoman.Generator.SubGenerator'))\\n    parser.add_argument('--generator-arguments', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Yeoman.Generator.Arguments') or get_octopusvariable_quiet(\\n                            'Yeoman.Generator.Arguments'),\\n                        help='The arguments to pas to yo. Pass all arguments as a single string. This string is then parsed as if it were yo arguments.')\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n    parser.add_argument('--git-username', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Credentials.Username') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Username'),\\n                        help='The git username. This will be used for both the git authentication and the username associated with any commits.')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except Exception as inst:\\n        return False\\n\\n\\ndef is_windows():\\n    return platform.system() == 'Windows'\\n\\n\\ndef download_file(url, filename, verify_ssl=True):\\n    r = requests.get(url, verify=verify_ssl)\\n    with open(filename, 'wb') as file:\\n        file.write(r.content)\\n\\n\\ndef ensure_git_exists():\\n    if is_windows():\\n        print(\\\"Checking git is installed\\\")\\n        try:\\n            stdout, _, exit_code = execute(['git', 'version'])\\n            printverbose(stdout)\\n            if not exit_code == 0:\\n                raise \\\"git not found\\\"\\n        except:\\n            print(\\\"Downloading git\\\")\\n            download_file('https://www.7-zip.org/a/7zr.exe', '7zr.exe')\\n            download_file(\\n                'https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe',\\n                'PortableGit.7z.exe')\\n            print(\\\"Installing git\\\")\\n            print(\\\"Consider installing git on the worker or using a standard worker-tools image\\\")\\n            execute(['7zr.exe', 'x', 'PortableGit.7z.exe', '-o' + os.path.join(os.getcwd(), 'git'), '-y'])\\n            return os.path.join(os.getcwd(), 'git', 'bin', 'git')\\n\\n    return 'git'\\n\\n\\ndef install_npm_linux():\\n    print(\\\"Downloading node\\\")\\n    download_file(\\n        'https://nodejs.org/dist/v18.18.2/node-v18.18.2-linux-x64.tar.xz',\\n        'node.tar.xz')\\n    print(\\\"Installing node on Linux\\\")\\n    with lzma.open(\\\"node.tar.xz\\\", \\\"r\\\") as lzma_ref:\\n        with open(\\\"node.tar\\\", \\\"wb\\\") as fdst:\\n            shutil.copyfileobj(lzma_ref, fdst)\\n    with tarfile.open(\\\"node.tar\\\", \\\"r\\\") as tar_ref:\\n        tar_ref.extractall(os.getcwd())\\n\\n    try:\\n        _, _, exit_code = execute([os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', '--version'],\\n                                  append_to_path=os.getcwd() + '/node-v18.18.2-linux-x64/bin')\\n        if not exit_code == 0:\\n            raise Exception(\\\"Failed to run npm\\\")\\n    except Exception as ex:\\n        print('Failed to install npm ' + str(ex))\\n        sys.exit(1)\\n    return os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', os.getcwd() + '/node-v18.18.2-linux-x64/bin'\\n\\n\\ndef install_npm_windows():\\n    print(\\\"Downloading node\\\")\\n    download_file('https://nodejs.org/dist/v18.18.2/node-v18.18.2-win-x64.zip', 'node.zip', False)\\n    print(\\\"Installing node on Windows\\\")\\n    with zipfile.ZipFile(\\\"node.zip\\\", \\\"r\\\") as zip_ref:\\n        zip_ref.extractall(os.getcwd())\\n    try:\\n        _, _, exit_code = execute([os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'), '--version'],\\n                                  append_to_path=os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))\\n        if not exit_code == 0:\\n            raise Exception(\\\"Failed to run npm\\\")\\n    except Exception as ex:\\n        print('Failed to install npm ' + str(ex))\\n        sys.exit(1)\\n\\n    return (os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'),\\n            os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))\\n\\n\\ndef ensure_node_exists():\\n    try:\\n        print(\\\"Checking node is installed\\\")\\n        _, _, exit_code = execute(['npm', '--version'])\\n        if not exit_code == 0:\\n            raise Exception(\\\"npm not found\\\")\\n    except:\\n        if is_windows():\\n            return install_npm_windows()\\n        else:\\n            return install_npm_linux()\\n\\n    return 'npm', None\\n\\n\\ndef ensure_yo_exists(npm_executable, npm_path):\\n    try:\\n        print(\\\"Checking Yeoman is installed\\\")\\n        _, _, exit_code = execute(['yo', '--version'])\\n        if not exit_code == 0:\\n            raise Exception(\\\"yo not found\\\")\\n    except:\\n        print('Installing Yeoman')\\n\\n        _, _, retcode = execute([npm_executable, 'install', '-g', 'yo'], append_to_path=npm_path)\\n\\n        if not retcode == 0:\\n            print(\\\"Failed to set install Yeoman. Check the verbose logs for details.\\\")\\n            sys.exit(1)\\n\\n        npm_bin, _, retcode = execute([npm_executable, 'config', 'get', 'prefix'], append_to_path=npm_path)\\n\\n        if not retcode == 0:\\n            print(\\\"Failed to set get the npm prefix directory. Check the verbose logs for details.\\\")\\n            sys.exit(1)\\n\\n        try:\\n            if is_windows():\\n                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'yo.cmd'), '--version'],\\n                                          append_to_path=npm_path)\\n            else:\\n                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'bin', 'yo'), '--version'],\\n                                          append_to_path=npm_path)\\n\\n            if not exit_code == 0:\\n                raise Exception(\\\"Failed to run yo\\\")\\n        except Exception as ex:\\n            print('Failed to install yo ' + str(ex))\\n            sys.exit(1)\\n\\n        # Windows and Linux save NPM binaries in different directories\\n        if is_windows():\\n            return os.path.join(npm_bin.strip(), 'yo.cmd')\\n\\n        return os.path.join(npm_bin.strip(), 'bin', 'yo')\\n\\n    return 'yo'\\n\\n\\ngit_executable = ensure_git_exists()\\nnpm_executable, npm_path = ensure_node_exists()\\nyo_executable = ensure_yo_exists(npm_executable, npm_path)\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.generator.strip():\\n    print(\\\"You must define the Yeoman generator\\\")\\n    sys.exit(1)\\n\\n# Create a dir for the git clone\\nif os.path.exists('downstream'):\\n    shutil.rmtree('downstream')\\n\\nos.mkdir('downstream')\\n\\n# Create a dir for yeoman to use\\nif os.path.exists('downstream-yeoman'):\\n    shutil.rmtree('downstream-yeoman')\\n\\nos.mkdir('downstream-yeoman')\\n# Yeoman will use a less privileged user to write to this directory, so grant full access\\nif not is_windows():\\n    os.chmod('downstream-yeoman', 0o777)\\n\\ndownstream_dir = os.path.join(os.getcwd(), 'downstream')\\ndownstream_yeoman_dir = os.path.join(os.getcwd(), 'downstream-yeoman')\\n\\n# The access token is generated from a github app or supplied directly as an access token\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print('Repo at https://github.com/' + parser.git_organization + '/' + parser.repo + ' could not be accessed')\\n    sys.exit(1)\\n\\n# We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close\\nif is_windows():\\n    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.helper', 'manager'])\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to set the credential.helper setting. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.modalprompt', 'false'])\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to srt the credential.modalprompt setting. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n    # We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close\\n    _, _, retcode = execute(\\n        [git_executable, 'config', '--system', 'credential.microsoft.visualstudio.com.interactive', 'never'])\\n\\n    if not retcode == 0:\\n        print(\\n            \\\"Failed to set the credential.microsoft.visualstudio.com.interactive setting. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n_, _, retcode = execute([git_executable, 'config', '--global', 'user.email', 'octopus@octopus.com'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the user.email setting. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n_, _, retcode = execute([git_executable, 'config', '--global', 'core.autocrlf', 'input'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the core.autocrlf setting. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nusername = parser.git_username if len(parser.git_username) != 0 else 'Octopus'\\n_, _, retcode = execute([git_executable, 'config', '--global', 'user.name', username])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the git username. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n_, _, retcode = execute([git_executable, 'config', '--global', 'credential.helper', 'cache'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the git credential helper. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nprint('Cloning repo')\\n\\n_, _, retcode = execute(\\n    [git_executable, 'clone',\\n     'https://' + username + ':' + token + '@github.com/' + parser.git_organization + '/' + parser.repo + '.git',\\n     'downstream'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to clone the git repo. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nprint('Configuring Yeoman Generator')\\n\\n_, _, retcode = execute([npm_executable, 'install'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to install the generator dependencies. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n_, _, retcode = execute([npm_executable, 'link'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to link the npm module. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nprint('Running Yeoman Generator')\\n\\n# Treat the string of yo arguments as a raw input and parse it again. The resulting list of unknown arguments\\n# is then passed to yo. We have to convert the incoming values from utf to ascii when parsing a second time.\\nyo_args = split(anyascii(parser.generator_arguments))\\n\\ngenerator_name = parser.generator + ':' + parser.sub_generator if len(parser.sub_generator) != 0 else parser.generator\\n\\nyo_arguments = [yo_executable, generator_name, '--force', '--skip-install']\\n\\n# Yeoman has issues running as root, which it will often do in a container.\\n# So we run Yeoman in its own directory, and then copy the changes to the git directory.\\n_, _, retcode = execute(yo_arguments + yo_args, cwd=downstream_yeoman_dir, append_to_path=npm_path)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to run Yeoman. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nshutil.copytree(downstream_yeoman_dir, downstream_dir, dirs_exist_ok=True)\\n\\nprint('Adding changes to git')\\n\\n_, _, retcode = execute([git_executable, 'add', '.'], cwd=downstream_dir)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to add the git changes. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n# Check for pending changes\\n_, _, retcode = execute([git_executable, 'diff-index', '--quiet', 'HEAD'], cwd=downstream_dir)\\n\\nif not retcode == 0:\\n    print('Committing changes to git')\\n    _, _, retcode = execute([git_executable, 'commit', '-m',\\n                             'Added files from Yeoman generator ' + parser.generator + ':' + parser.sub_generator],\\n                            cwd=downstream_dir)\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to set commit the git changes. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n    print('Pushing changes to git')\\n\\n    _, _, retcode = execute([git_executable, 'push', 'origin', 'main'], cwd=downstream_dir)\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to push the git changes. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\"\n        \"PopulateGithubRepo.Yeoman.Generator.Package\"      = jsonencode({\n          \"PackageId\" = \"OctopusSolutionsEngineering/ReferenceArchitectureAppGenerators\"\n          \"FeedId\"    = local.github_feed_id\n        })\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"PopulateGithubRepo.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"PopulateGithubRepo.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"PopulateGithubRepo.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n      }\n\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = \"octopussamples/node-workertools\"\n      }\n\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      package {\n        name                      = \"YeomanGenerator\"\n        package_id                = \"OctopusSolutionsEngineering/ReferenceArchitectureAppGenerators\"\n        acquisition_location      = \"Server\"\n        extract_during_deployment = false\n        feed_id                   = local.github_feed_id\n        properties                = {\n          Extract       = \"True\", PackageParameterName = \"PopulateGithubRepo.Yeoman.Generator.Package\", Purpose = \"\",\n          SelectionMode = \"deferred\"\n        }\n      }\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#endregion\n",
+    "Octopus.Action.Terraform.Template": "#region Provider\nterraform {\n  required_providers {\n    octopusdeploy = {\n      source = \"OctopusDeployLabs/octopusdeploy\"\n      version = \"0.21.1\"\n    }\n  }\n}\n\nvariable \"octopus_server\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The URL of the Octopus server e.g. https://myinstance.octopus.app.\"\n  default     = \"#{Octopus.Web.ServerUri}\"\n}\n\nvariable \"octopus_apikey\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The API key used to access the Octopus server. See https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key for details on creating an API key.\"\n}\n\nvariable \"octopus_space_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The ID of the Octopus space to populate.\"\n  default     = \"#{Octopus.Space.Id}\"\n}\n\nprovider \"octopusdeploy\" {\n  address  = var.octopus_server\n  api_key  = var.octopus_apikey\n  space_id = var.octopus_space_id\n}\n#endregion\n#region Locals\nlocals {\n  /*\n    You will need to edit:\n    * smoke_test_properties - depending on the step type, custom properties will need to be defined\n    * smoke_test_script - replace REPLACE THIS WITH CODE TO RETURN THE PUBLIC HOSTNAME with the appropriate logic\n    * cloud_account - this will need to be created in most cases\n    * security_scan_docker_script - the reference to the docker image deployed in earlier steps needs to be updated from #{Octopus.Action[Deploy Container].Package[web].PackageId}\n    * octopusdeploy_deployment_process - each of the sample application deployment processes (there are 3 defined in this template) needs to have the actual deployment step added\n  */\n\n  project_template_project_name             = \"Docker Project Templates\"\n  project_group_name                        = \"Azure Web App\"\n  infrastructure_project_name               = \"_ Azure Web App Infrastructure\"\n  infrastructure_project_description        = \"Runbooks to create and manage Azure Web Apps\"\n  infrastructure_runbook_name               = \"Create Web App\"\n  infrastructure_runbook_description        = \"Creates an Azure web app and the associated Octopus target\"\n  feedback_link                             = \"https://oc.to/CfiezA\"\n  octopub_frontend_project_name             = \"Azure WebApp Octopub Frontend\"\n  octopub_frontend_project_description      = \"Deploys the Octopub Frontend app to an Azure Web App target\"\n  octopub_products_project_name             = \"Azure WebApp Octopub Products\"\n  octopub_products_project_description      = \"Deploys the Octopub Products app to an Azure Web App target\"\n  octopub_audits_project_name               = \"Azure WebApp Octopub Audits\"\n  octopub_audits_project_description        = \"Deploys the Octopub Audits app to an Azure Web App target\"\n  octopub_orchestration_project_name        = \"_ Deploy Azure Web App Octopub Stack\"\n  octopub_orchestration_project_description = \"Deploys the full Octopub application stack\"\n  frontend_health_check                     = \"/index.html\"\n  products_health_check                     = \"/health/products\"\n  audits_health_check                       = \"/health/audits\"\n  target_role                               = \"Web App Reference Architecture\"\n  unique_prefix                             = \"#{Octopus.Web.ServerUri | Replace \\\"^https?://\\\" \\\"\\\" | Replace \\\"[^A-Za-z0-9]\\\" \\\"-\\\"}\"\n\n  // Use the example below for any accounts that might be included in this reference architecture\n  cloud_account = length(data.octopusdeploy_accounts.account.accounts) == 0 ? octopusdeploy_azure_service_principal.account[0].id : data.octopusdeploy_accounts.account.accounts[0].id\n\n  development_environment_id         = length(data.octopusdeploy_environments.environment_development.environments) == 0 ? octopusdeploy_environment.environment_development[0].id : data.octopusdeploy_environments.environment_development.environments[0].id\n  test_environment_id                = length(data.octopusdeploy_environments.environment_test.environments) == 0 ? octopusdeploy_environment.environment_test[0].id : data.octopusdeploy_environments.environment_test.environments[0].id\n  production_environment_id          = length(data.octopusdeploy_environments.environment_production.environments) == 0 ? octopusdeploy_environment.environment_production[0].id : data.octopusdeploy_environments.environment_production.environments[0].id\n  sync_environment_id                = length(data.octopusdeploy_environments.environment_sync.environments) == 0 ? octopusdeploy_environment.environment_sync[0].id : data.octopusdeploy_environments.environment_sync.environments[0].id\n  security_environment_id            = length(data.octopusdeploy_environments.environment_security.environments) == 0 ? octopusdeploy_environment.environment_security[0].id : data.octopusdeploy_environments.environment_security.environments[0].id\n  this_instance_library_variable_set = length(data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets) == 0 ? octopusdeploy_library_variable_set.this_instance[0].id : data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets[0].id\n  github_library_variable_set        = length(data.octopusdeploy_library_variable_sets.github.library_variable_sets) == 0 ? octopusdeploy_library_variable_set.github[0].id : data.octopusdeploy_library_variable_sets.github.library_variable_sets[0].id\n  docker_library_variable_set        = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? octopusdeploy_library_variable_set.docker[0].id : data.octopusdeploy_library_variable_sets.docker.library_variable_sets[0].id\n  docker_hub_feed_id                 = length(data.octopusdeploy_feeds.dockerhub.feeds) == 0 ? octopusdeploy_docker_container_registry.docker_hub[0].id : data.octopusdeploy_feeds.dockerhub.feeds[0].id\n  github_feed_id                     = length(data.octopusdeploy_feeds.github_feed.feeds) == 0 ? octopusdeploy_github_repository_feed.github_feed[0].id : data.octopusdeploy_feeds.github_feed.feeds[0].id\n  worker_pool_id                     = length(data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools) == 0 ? \"\" : data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id\n  devops_lifecycle_id                = length(data.octopusdeploy_lifecycles.devsecops.lifecycles) == 0 ? octopusdeploy_lifecycle.lifecycle_devsecops[0].id : data.octopusdeploy_lifecycles.devsecops.lifecycles[0].id\n  project_group_id                   = length(data.octopusdeploy_project_groups.ra.project_groups) == 0 ? octopusdeploy_project_group.project_group_ra[0].id : data.octopusdeploy_project_groups.ra.project_groups[0].id\n  project_templates_project_group_id = length(data.octopusdeploy_project_groups.project_templates.project_groups) == 0 ? octopusdeploy_project_group.project_group_project_templates[0].id : data.octopusdeploy_project_groups.project_templates.project_groups[0].id\n  application_lifecycle_id           = length(data.octopusdeploy_lifecycles.application.lifecycles) == 0 ? octopusdeploy_lifecycle.lifecycle_application[0].id : data.octopusdeploy_lifecycles.application.lifecycles[0].id\n  smoke_test_container_image         = \"octopuslabs/azure-workertools\"\n  smoke_test_action_type             = \"Octopus.AzurePowerShell\"\n  smoke_test_properties              = {\n    \"Octopus.Action.RunOnServer\"         = \"true\"\n    \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n    \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n    \"Octopus.Action.Script.ScriptBody\"   = local.smoke_test_script\n    \"OctopusUseBundledTooling\" : \"False\"\n    \"Octopus.Action.Azure.AccountId\" : local.cloud_account\n  }\n  link_highlight_container_image = \"octopuslabs/azure-workertools\"\n  link_highlight_action_type     = \"Octopus.AzurePowerShell\"\n  link_highlight_properties      = {\n    \"Octopus.Action.RunOnServer\"         = \"true\"\n    \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n    \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n    \"Octopus.Action.Script.ScriptBody\"   = local.link_highlight_script\n    \"OctopusUseBundledTooling\" : \"False\"\n    \"Octopus.Action.Azure.AccountId\" : local.cloud_account\n  }\n\n  link_highlight_script = <<-EOT\n  write_highlight \"[https://#{Octopus.Action.Azure.WebAppName}.azurewebsites.net#{App.HealthCheck}](https://#{Octopus.Action.Azure.WebAppName}.azurewebsites.net#{App.HealthCheck})\"\n  EOT\n\n  feedback_script             = <<-EOT\n  Write-Highlight \"Please share your feedback on this step in our [GitHub discussion](${local.feedback_link}).\"\n  EOT\n  smoke_test_script           = <<-EOT\n  for i in {1..30}\n  do\n    HOSTNAME=#{Octopus.Action.Azure.WebAppName}.azurewebsites.net\n      if [[ -n \"$${HOSTNAME}\" ]]\n      then\n        break\n      fi\n      echo \"Waiting for ingress hostname\"\n      sleep 10\n  done\n\n\n  # Load balancers can take a minute or so before their DNS is propagated.\n  # A status code of 000 means curl could not resolve the DNS name, so we wait for a bit until DNS is updated.\n  echo \"Testing https://$${HOSTNAME}#{App.HealthCheck}\"\n  echo \"Waiting for DNS to propagate. This can take a while for a new load balancer.\"\n  for i in {1..30}\n  do\n    CODE=$(curl -o /dev/null -s -w \"%%{http_code}\\n\" https://$${HOSTNAME}#{App.HealthCheck})\n    if [[ \"$${CODE}\" == \"200\" ]]\n    then\n      break\n    fi\n    echo \"Waiting for DNS name to be resolvable and for service to respond\"\n    sleep 10\n  done\n\n  echo \"response code: $${CODE}\"\n  if [[ \"$${CODE}\" == \"200\" ]]\n  then\n      echo \"success\"\n      exit 0\n  else\n      echo \"error\"\n      exit 1\n  fi\n  EOT\n  security_scan_docker_script = <<-EOT\n  echo \"Pulling Trivy Docker Image\"\n  echo \"##octopus[stdout-verbose]\"\n  docker pull aquasec/trivy\n  echo \"##octopus[stdout-default]\"\n\n  echo \"Installing umoci\"\n  echo \"##octopus[stdout-verbose]\"\n  # Install umoci\n  if ! which umoci\n  then\n    curl -o umoci -L https://github.com/opencontainers/umoci/releases/latest/download/umoci.amd64 2>&1\n    chmod +x umoci\n  fi\n  echo \"##octopus[stdout-default]\"\n\n  DOCKERIMAGE=#{Octopus.Action[Deploy Container].Package.PackageId}\n  DOCKERTAG=#{Octopus.Action[Deploy Container].Package.PackageVersion}\n\n  echo \"Extracting Application Docker Image\"\n  echo \"##octopus[stdout-verbose]\"\n  # Download and extract the docker image\n  # https://manpages.ubuntu.com/manpages/jammy/man1/umoci-raw-unpack.1.html\n  docker pull quay.io/skopeo/stable:latest 2>&1\n  docker run -v $(pwd):/output quay.io/skopeo/stable:latest copy docker://$${DOCKERIMAGE}:$${DOCKERTAG} oci:/output/image:latest 2>&1\n  ./umoci unpack --image image --rootless bundle 2>&1\n  echo \"##octopus[stdout-default]\"\n\n  TIMESTAMP=$(date +%s%3N)\n  SUCCESS=0\n  for x in $(find . -name bom.json -type f -print); do\n      echo \"Scanning $${x}\"\n\n      # Delete any existing report file\n      if [[ -f \"$PWD/depscan-bom.json\" ]]; then\n        rm \"$PWD/depscan-bom.json\"\n      fi\n\n      # Generate the report, capturing the output, and ensuring $? is set to the exit code\n      OUTPUT=$(bash -c \"docker run --rm -v \\\"$PWD:/app\\\" aquasec/trivy sbom \\\"/app/$${x}\\\"; exit \\$?\" 2>&1)\n\n      # Success is set to 1 if the exit code is not zero\n      if [[ $? -ne 0 ]]; then\n          SUCCESS=1\n      fi\n\n      # Print the output stripped of ANSI colour codes\n      echo -e \"$${OUTPUT}\" | sed 's/\\x1b\\[[0-9;]*m//g'\n  done\n\n  set_octopusvariable \"VerificationResult\" $SUCCESS\n\n  if [[ $SUCCESS -ne 0 ]]; then\n    >&2 echo \"Critical vulnerabilities were detected\"\n  fi\n\n  exit 0\n  EOT\n}\n#endregion\n#region Environments\ndata \"octopusdeploy_environments\" \"environment_development\" {\n  ids          = null\n  partial_name = \"Development\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_development\" {\n  count                        = length(data.octopusdeploy_environments.environment_development.environments) == 0 ? 1 : 0\n  name                         = \"Development\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = true\n  sort_order                   = 10\n\n  jira_extension_settings {\n    environment_type = \"development\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_test\" {\n  ids          = null\n  partial_name = \"Test\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_test\" {\n  count                        = length(data.octopusdeploy_environments.environment_test.environments) == 0 ? 1 : 0\n  name                         = \"Test\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = true\n  sort_order                   = 11\n\n  jira_extension_settings {\n    environment_type = \"testing\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_production\" {\n  ids          = null\n  partial_name = \"Production\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_production\" {\n  count                        = length(data.octopusdeploy_environments.environment_production.environments) == 0 ? 1 : 0\n  name                         = \"Production\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = true\n  sort_order                   = 12\n\n  jira_extension_settings {\n    environment_type = \"production\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_security\" {\n  ids          = null\n  partial_name = \"Security\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_security\" {\n  count                        = length(data.octopusdeploy_environments.environment_security.environments) == 0 ? 1 : 0\n  name                         = \"Security\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = false\n  sort_order                   = 14\n\n  jira_extension_settings {\n    environment_type = \"production\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_environments\" \"environment_sync\" {\n  ids          = null\n  partial_name = \"Sync\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_environment\" \"environment_sync\" {\n  count                        = length(data.octopusdeploy_environments.environment_sync.environments) == 0 ? 1 : 0\n  name                         = \"Sync\"\n  description                  = \"\"\n  allow_dynamic_infrastructure = true\n  use_guided_failure           = false\n  sort_order                   = 15\n\n  jira_extension_settings {\n    environment_type = \"development\"\n  }\n\n  jira_service_management_extension_settings {\n    is_enabled = false\n  }\n\n  servicenow_extension_settings {\n    is_enabled = false\n  }\n}\n\ndata \"octopusdeploy_lifecycles\" \"devsecops\" {\n  ids          = []\n  partial_name = \"DevSecOps\"\n  skip         = 0\n  take         = 1\n}\n\ndata \"octopusdeploy_lifecycles\" \"application\" {\n  ids          = []\n  partial_name = \"Application\"\n  skip         = 0\n  take         = 1\n}\n\ndata \"octopusdeploy_lifecycles\" \"sync\" {\n  ids          = []\n  partial_name = \"Sync\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_lifecycle\" \"sync\" {\n  count       = length(data.octopusdeploy_lifecycles.sync.lifecycles) == 0 ? 1 : 0\n  name        = \"Sync\"\n  description = \"\"\n\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.sync_environment_id\n    ]\n    name                                  = \"Sync\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n\n  release_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n\n  tentacle_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n}\n\nresource \"octopusdeploy_lifecycle\" \"lifecycle_devsecops\" {\n  count       = length(data.octopusdeploy_lifecycles.devsecops.lifecycles) == 0 ? 1 : 0\n  name        = \"DevSecOps\"\n  description = \"\"\n\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.development_environment_id\n    ]\n    name                                  = \"Development\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.test_environment_id\n    ]\n    name                                  = \"Test\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.production_environment_id\n    ]\n    name                                  = \"Production\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = [\n      local.security_environment_id\n    ]\n    optional_deployment_targets           = []\n    name                                  = \"Security\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n\n  release_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n\n  tentacle_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n}\n\nresource \"octopusdeploy_lifecycle\" \"lifecycle_application\" {\n  count       = length(data.octopusdeploy_lifecycles.application.lifecycles) == 0 ? 1 : 0\n  name        = \"Application\"\n  description = \"\"\n\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.development_environment_id\n    ]\n    name                                  = \"Development\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.test_environment_id\n    ]\n    name                                  = \"Test\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n  phase {\n    automatic_deployment_targets = []\n    optional_deployment_targets  = [\n      local.production_environment_id\n    ]\n    name                                  = \"Production\"\n    is_optional_phase                     = false\n    minimum_environments_before_promotion = 0\n  }\n\n  release_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n\n  tentacle_retention_policy {\n    quantity_to_keep    = 3\n    should_keep_forever = false\n    unit                = \"Days\"\n  }\n}\n#endregion\n#region Feeds\n\ndata \"octopusdeploy_feeds\" \"project\" {\n  feed_type = \"OctopusProject\"\n  ids       = []\n  skip      = 0\n  take      = 1\n}\n\ndata \"octopusdeploy_feeds\" \"bitnami\" {\n  feed_type    = \"Helm\"\n  ids          = []\n  partial_name = \"Bitnami\"\n  skip         = 0\n  take         = 1\n}\n\n\nresource \"octopusdeploy_helm_feed\" \"feed_helm\" {\n  count                                = length(data.octopusdeploy_feeds.bitnami.feeds) == 0 ? 1 : 0\n  name                                 = \"Bitnami\"\n  feed_uri                             = \"https://repo.vmware.com/bitnami-files/\"\n  package_acquisition_location_options = [\"ExecutionTarget\", \"NotAcquired\"]\n}\n\ndata \"octopusdeploy_feeds\" \"dockerhub\" {\n  feed_type    = \"Docker\"\n  ids          = []\n  partial_name = \"Docker Hub\"\n  skip         = 0\n  take         = 1\n}\n\nvariable \"feed_docker_hub_username\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The username used by the feed Docker Hub\"\n}\n\nvariable \"feed_docker_hub_password\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The password used by the feed Docker Hub\"\n}\n\nresource \"octopusdeploy_docker_container_registry\" \"docker_hub\" {\n  count                                = length(data.octopusdeploy_feeds.dockerhub.feeds) == 0 ? 1 : 0\n  name                                 = \"Docker Hub\"\n  password                             = var.feed_docker_hub_password\n  username                             = var.feed_docker_hub_username\n  api_version                          = \"v1\"\n  feed_uri                             = \"https://index.docker.io\"\n  package_acquisition_location_options = [\"ExecutionTarget\", \"NotAcquired\"]\n}\n\ndata \"octopusdeploy_feeds\" \"sales_maven_feed\" {\n  feed_type    = \"Maven\"\n  ids          = []\n  partial_name = \"Sales Maven Feed\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_maven_feed\" \"feed_sales_maven_feed\" {\n  count                                = length(data.octopusdeploy_feeds.sales_maven_feed.feeds) == 0 ? 1 : 0\n  name                                 = \"Sales Maven Feed\"\n  feed_uri                             = \"https://octopus-sales-public-maven-repo.s3.ap-southeast-2.amazonaws.com/snapshot\"\n  package_acquisition_location_options = [\"Server\", \"ExecutionTarget\"]\n  download_attempts                    = 3\n  download_retry_backoff_seconds       = 20\n}\n\ndata \"octopusdeploy_feeds\" \"github_feed\" {\n  feed_type    = \"GitHub\"\n  ids          = []\n  partial_name = \"Github Releases\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_github_repository_feed\" \"github_feed\" {\n  count                          = length(data.octopusdeploy_feeds.github_feed.feeds) == 0 ? 1 : 0\n  download_attempts              = 1\n  download_retry_backoff_seconds = 30\n  feed_uri                       = \"https://api.github.com\"\n  name                           = \"Github Releases\"\n}\n#endregion\n#region Library Variable Sets\ndata \"octopusdeploy_library_variable_sets\" \"this_instance\" {\n  partial_name = \"This Instance\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_library_variable_set\" \"this_instance\" {\n  count       = length(data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets) == 0 ? 1 : 0\n  name        = \"This Instance\"\n  description = \"Credentials used to interact with this Octopus instance\"\n}\n\nresource \"octopusdeploy_variable\" \"octopus_admin_api_key\" {\n  count           = length(data.octopusdeploy_library_variable_sets.this_instance.library_variable_sets) == 0 ? 1 : 0\n  name            = \"Octopus.ApiKey\"\n  type            = \"Sensitive\"\n  description     = \"Octopus API Key\"\n  is_sensitive    = true\n  is_editable     = true\n  owner_id        = octopusdeploy_library_variable_set.this_instance[0].id\n  sensitive_value = var.octopus_apikey\n}\n\ndata \"octopusdeploy_library_variable_sets\" \"github\" {\n  partial_name = \"GitHub\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_library_variable_set\" \"github\" {\n  count       = length(data.octopusdeploy_library_variable_sets.github.library_variable_sets) == 0 ? 1 : 0\n  name        = \"GitHub\"\n  description = \"Credentials used to interact with GitHub\"\n}\n\nvariable \"github_access_token\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The GitHub access token\"\n}\n\nresource \"octopusdeploy_variable\" \"github_access_token\" {\n  count           = length(data.octopusdeploy_library_variable_sets.github.library_variable_sets) == 0 ? 1 : 0\n  name            = \"Git.Credentials.Password\"\n  type            = \"Sensitive\"\n  description     = \"The GitHub access token\"\n  is_sensitive    = true\n  is_editable     = true\n  owner_id        = octopusdeploy_library_variable_set.github[0].id\n  sensitive_value = var.github_access_token\n}\n\ndata \"octopusdeploy_library_variable_sets\" \"docker\" {\n  partial_name = \"Docker\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_library_variable_set\" \"docker\" {\n  count       = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? 1 : 0\n  name        = \"Docker\"\n  description = \"Credentials used to interact with Docker\"\n}\n\nresource \"octopusdeploy_variable\" \"docker_username\" {\n  count        = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? 1 : 0\n  name         = \"Docker.Credentials.Username\"\n  type         = \"String\"\n  description  = \"The docker username\"\n  is_sensitive = false\n  is_editable  = true\n  owner_id     = octopusdeploy_library_variable_set.docker[0].id\n  value        = var.feed_docker_hub_username\n}\n\nresource \"octopusdeploy_variable\" \"docker_password\" {\n  count           = length(data.octopusdeploy_library_variable_sets.docker.library_variable_sets) == 0 ? 1 : 0\n  name            = \"Docker.Credentials.Password\"\n  type            = \"Sensitive\"\n  description     = \"The docker password\"\n  is_sensitive    = true\n  is_editable     = true\n  owner_id        = octopusdeploy_library_variable_set.docker[0].id\n  sensitive_value = var.feed_docker_hub_password\n}\n#endregion\n#region Accounts\n\ndata \"octopusdeploy_accounts\" \"account\" {\n  account_type = \"AzureServicePrincipal\"\n  partial_name = \"Azure\"\n  skip         = 0\n  take         = 1\n}\n\nvariable \"azure_account_application_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The Azure account application ID\"\n}\n\nvariable \"azure_account_subscription_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The Azure account subscription ID\"\n}\n\nvariable \"azure_account_tenant_id\" {\n  type        = string\n  nullable    = false\n  sensitive   = false\n  description = \"The Azure account tenant ID\"\n}\n\nvariable \"azure_account_password\" {\n  type        = string\n  nullable    = false\n  sensitive   = true\n  description = \"The Azure account password\"\n}\n\nresource \"octopusdeploy_azure_service_principal\" \"account\" {\n  count                             = length(data.octopusdeploy_accounts.account.accounts) == 0 ? 1 : 0\n  description                       = \"Azure Account\"\n  name                              = \"Azure\"\n  environments                      = []\n  tenants                           = []\n  tenanted_deployment_participation = \"Untenanted\"\n  application_id                    = var.azure_account_application_id\n  password                          = var.azure_account_password\n  subscription_id                   = var.azure_account_subscription_id\n  tenant_id                         = var.azure_account_tenant_id\n}\n\n#endregion\n#region Worker Pools\n\ndata \"octopusdeploy_worker_pools\" \"workerpool_hosted_ubuntu\" {\n  partial_name = \"Hosted Ubuntu\"\n  ids          = null\n  skip         = 0\n  take         = 1\n}\n#endregion\n#region Project Groups\ndata \"octopusdeploy_project_groups\" \"ra\" {\n  ids          = []\n  partial_name = local.project_group_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_project_group\" \"project_group_ra\" {\n  count       = length(data.octopusdeploy_project_groups.ra.project_groups) == 0 ? 1 : 0\n  name        = local.project_group_name\n  description = \"${local.project_group_name} projects.\"\n}\n\ndata \"octopusdeploy_project_groups\" \"project_templates\" {\n  ids          = []\n  partial_name = \"Project Templates\"\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_project_group\" \"project_group_project_templates\" {\n  count       = length(data.octopusdeploy_project_groups.project_templates.project_groups) == 0 ? 1 : 0\n  name        = \"Project Templates\"\n  description = \"Sample code project generators\"\n}\n#endregion\n\n#region Projects\n\n#region Infrastructure Project\nvariable \"infrastructure_project_name\" {\n  type    = string\n  default = \"\"\n}\n\n\ndata \"octopusdeploy_projects\" \"infrastructure\" {\n  partial_name = var.infrastructure_project_name == \"\" ? local.infrastructure_project_name : var.infrastructure_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"azure_account\" {\n  count       = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  name        = \"Azure.Account\"\n  type        = \"AzureAccount\"\n  description = \"The Azure account used to create the web app infrastructure\"\n  value       = local.cloud_account\n  owner_id    = octopusdeploy_project.infrastructure[0].id\n}\n\nresource \"octopusdeploy_project\" \"infrastructure\" {\n  count                                = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  name                                 = var.infrastructure_project_name == \"\" ? local.infrastructure_project_name : var.infrastructure_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.infrastructure_project_description\n}\n\nresource \"octopusdeploy_runbook\" \"runbook_create_infrastructure\" {\n  count             = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  name              = local.infrastructure_runbook_name\n  project_id        = octopusdeploy_project.infrastructure[0].id\n  environment_scope = \"Specified\"\n  environments      = [\n    local.development_environment_id,\n    local.test_environment_id,\n    local.production_environment_id,\n  ]\n  force_package_download      = false\n  default_guided_failure_mode = \"EnvironmentDefault\"\n  description                 = local.infrastructure_runbook_description\n  multi_tenancy_mode          = \"Untenanted\"\n\n  retention_policy {\n    quantity_to_keep    = 100\n    should_keep_forever = false\n  }\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n}\n\nresource \"octopusdeploy_runbook_process\" \"runbook_process_runbook_create_infrastructure\" {\n  count      = length(data.octopusdeploy_projects.infrastructure.projects) == 0 ? 1 : 0\n  runbook_id = octopusdeploy_runbook.runbook_create_infrastructure[0].id\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Create Resource Group If Not Exists (AZ Module)\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzurePowerShell\"\n      name                               = \"Create Resource Group If Not Exists (AZ Module)\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.ScriptSource\"              = \"Inline\"\n        \"CreateResourceGroup.ResourceGroup.Location.Abbr\" = \"australiasoutheast\"\n        \"Octopus.Action.Script.ScriptBody\"                = \"$resourceGroupName = $OctopusParameters[\\\"CreateResourceGroup.ResourceGroup.Name\\\"]\\n$resourceGroupLocationAbbr = $OctopusParameters[\\\"CreateResourceGroup.ResourceGroup.Location.Abbr\\\"]\\n\\n$existingResourceGroups = (az group list --query \\\"[?location=='$resourceGroupLocationAbbr']\\\") | ConvertFrom-JSON\\n\\n$createResourceGroup = $true\\nforeach ($resourceGroupFound in $existingResourceGroups)\\n{\\t\\n\\tWrite-Host \\\"Checking if current resource group $($resourceGroupFound.name) matches $resourceGroupName\\\"\\n    if ($resourceGroupFound.name -eq $resourceGroupName)\\n    {\\n    \\t$createResourceGroup = $false\\n    \\tWrite-Highlight \\\"Resource group already exists, skipping creation\\\"\\n    \\tbreak\\n    }\\n}\\n\\nif ($createResourceGroup)\\n{\\n\\tWrite-Host \\\"Creating the $resourceGroupName because it was not found in $resourceGroupLocationAbbr\\\"\\n\\taz group create -l $resourceGroupLocationAbbr -n $resourceGroupName\\n}\"\n        \"Octopus.Action.RunOnServer\"                      = \"true\"\n        \"Octopus.Action.Script.Syntax\"                    = \"PowerShell\"\n        \"Octopus.Action.Azure.AccountId\"                  = \"#{CreateResourceGroup.Azure.Account}\"\n        \"CreateResourceGroup.Azure.Account\"               = \"Azure.Account\"\n        \"CreateResourceGroup.ResourceGroup.Name\"          = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"OctopusUseBundledTooling\"                        = \"False\"\n      }\n\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = \"octopuslabs/azure-workertools\"\n      }\n\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create App Service Plan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create App Service Plan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\"     = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"                  = \"Inline\"\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopub\"\n          }\n          \"appServiceSku\" = {\n            \"value\" = \"B2\"\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"parameters\" = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"appServiceSku\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"B2\"\n              \"metadata\"     = {\n                \"description\" = \"The SKU of App Service Plan\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"appServicePlanName\" = \"[concat(parameters('projectName'), '-', parameters('environment'),'-hosting')]\"\n          }\n          \"resources\" = [\n            {\n              \"kind\"       = \"linux\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"properties\" = {\n                \"reserved\" = \"true\"\n              }\n              \"dependsOn\" = []\n              \"sku\"       = {\n                \"name\" = \"[parameters('appServiceSku')]\"\n              }\n              \"apiVersion\" = \"2017-08-01\"\n              \"type\"       = \"Microsoft.Web/serverfarms\"\n              \"name\"       = \"[variables('appServicePlanName')]\"\n              \"comments\"   = \"This app service plan is used for the web app and slots.\"\n            },\n          ]\n          \"outputs\" = {\n            \"appServicePlan\" = {\n              \"type\"  = \"string\"\n              \"value\" = \"[resourceId('Microsoft.Web/serverfarms', variables('appServicePlanName'))]\"\n            }\n          }\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n        })\n        \"Octopus.Action.Azure.AccountId\"         = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\" = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"             = \"true\"\n        \"OctopusUseBundledTooling\"               = \"False\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Frontend Web App Service\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create Frontend Web App Service\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopubfrontend\"\n          }\n          \"uniquePrefix\" = {\n            \"value\" = local.unique_prefix\n          }\n          \"appServicePlanId\" = {\n            \"value\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n          }\n          \"dockerImageName\" = {\n            \"value\" = \"nginx:latest\"\n          }\n          \"resourceTags\" = {\n            \"value\" = {\n              \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n              \"octopus-role\"        = \"${local.target_role} Frontend\"\n              \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n              \"octopus-project\"     = \"Azure WebApp Octopub Frontend\"\n            }\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"resources\" = [\n            {\n              \"apiVersion\" = \"2016-08-01\"\n              \"name\"       = \"[variables('webAppPortalName')]\"\n              \"kind\"       = \"app,linux,container\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"tags\"       = \"[parameters('resourceTags')]\"\n              \"dependsOn\"  = []\n              \"properties\" = {\n                \"name\"       = \"[variables('webAppPortalName')]\"\n                \"siteConfig\" = {\n                  \"linuxFxVersion\" = \"[concat('DOCKER|', parameters('dockerImageName'))]\"\n                  \"alwaysOn\"       = \"true\"\n                }\n                \"serverFarmId\" = \"[parameters('appServicePlanId')]\"\n              }\n              \"type\" = \"Microsoft.Web/sites\"\n            },\n          ]\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n          \"parameters\"     = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"uniquePrefix\" = {\n              \"defaultValue\" = local.unique_prefix\n              \"type\"         = \"string\"\n            }\n            \"appServicePlanId\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n            }\n            \"dockerImageName\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"nginx:latest\"\n            }\n            \"resourceTags\" = {\n              \"type\"         = \"object\"\n              \"defaultValue\" = {\n                \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n                \"octopus-role\"        = \"${local.target_role} Frontend\"\n                \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n                \"octopus-project\"     = \"\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"webAppPortalName\" = \"[concat(parameters('uniquePrefix'), '-', parameters('projectName'), '-', parameters('environment'), '-webapp')]\"\n          }\n        })\n        \"Octopus.Action.Azure.AccountId\"                   = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\"           = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"                       = \"true\"\n        \"OctopusUseBundledTooling\"                         = \"False\"\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\" = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"              = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Create Products Microservice App Service\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create Products Microservice App Service\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopubproducts\"\n          }\n          \"uniquePrefix\" = {\n            \"value\" = local.unique_prefix\n          }\n          \"appServicePlanId\" = {\n            \"value\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n          }\n          \"dockerImageName\" = {\n            \"value\" = \"nginx:latest\"\n          }\n          \"resourceTags\" = {\n            \"value\" = {\n              \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n              \"octopus-role\"        = \"${local.target_role} Products\"\n              \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n              \"octopus-project\"     = \"Azure WebApp Octopub Products\"\n            }\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"resources\" = [\n            {\n              \"apiVersion\" = \"2016-08-01\"\n              \"name\"       = \"[variables('webAppPortalName')]\"\n              \"kind\"       = \"app,linux,container\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"tags\"       = \"[parameters('resourceTags')]\"\n              \"dependsOn\"  = []\n              \"properties\" = {\n                \"name\"       = \"[variables('webAppPortalName')]\"\n                \"siteConfig\" = {\n                  \"linuxFxVersion\" = \"[concat('DOCKER|', parameters('dockerImageName'))]\"\n                  \"alwaysOn\"       = \"true\"\n                }\n                \"serverFarmId\" = \"[parameters('appServicePlanId')]\"\n              }\n              \"type\" = \"Microsoft.Web/sites\"\n            },\n          ]\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n          \"parameters\"     = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"uniquePrefix\" = {\n              \"defaultValue\" = local.unique_prefix\n              \"type\"         = \"string\"\n            }\n            \"appServicePlanId\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n            }\n            \"dockerImageName\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"nginx:latest\"\n            }\n            \"resourceTags\" = {\n              \"type\"         = \"object\"\n              \"defaultValue\" = {\n                \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n                \"octopus-role\"        = \"${local.target_role} Products\"\n                \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n                \"octopus-project\"     = \"\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"webAppPortalName\" = \"[concat(parameters('uniquePrefix'), '-', parameters('projectName'), '-', parameters('environment'), '-webapp')]\"\n          }\n        })\n        \"Octopus.Action.Azure.AccountId\"                   = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\"           = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"                       = \"true\"\n        \"OctopusUseBundledTooling\"                         = \"False\"\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\" = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"              = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Create Audits Microservice App Service\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureResourceGroup\"\n      name                               = \"Create Audits Microservice App Service\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Azure.ResourceGroupTemplateParameters\" = jsonencode({\n          \"environment\" = {\n            \"value\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n          }\n          \"projectName\" = {\n            \"value\" = \"octopubaudits\"\n          }\n          \"uniquePrefix\" = {\n            \"value\" = local.unique_prefix\n          }\n          \"appServicePlanId\" = {\n            \"value\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n          }\n          \"dockerImageName\" = {\n            \"value\" = \"nginx:latest\"\n          }\n          \"resourceTags\" = {\n            \"value\" = {\n              \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n              \"octopus-role\"        = \"${local.target_role} Audits\"\n              \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n              \"octopus-project\"     = \"Azure WebApp Octopub Audits\"\n            }\n          }\n        })\n        \"Octopus.Action.Azure.ResourceGroupTemplate\" = jsonencode({\n          \"resources\" = [\n            {\n              \"apiVersion\" = \"2016-08-01\"\n              \"name\"       = \"[variables('webAppPortalName')]\"\n              \"kind\"       = \"app,linux,container\"\n              \"location\"   = \"[resourceGroup().location]\"\n              \"tags\"       = \"[parameters('resourceTags')]\"\n              \"dependsOn\"  = []\n              \"properties\" = {\n                \"name\"       = \"[variables('webAppPortalName')]\"\n                \"siteConfig\" = {\n                  \"linuxFxVersion\" = \"[concat('DOCKER|', parameters('dockerImageName'))]\"\n                  \"alwaysOn\"       = \"true\"\n                }\n                \"serverFarmId\" = \"[parameters('appServicePlanId')]\"\n              }\n              \"type\" = \"Microsoft.Web/sites\"\n            },\n          ]\n          \"$schema\"        = \"https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#\"\n          \"contentVersion\" = \"1.0.0.0\"\n          \"parameters\"     = {\n            \"environment\" = {\n              \"type\" = \"string\"\n            }\n            \"projectName\" = {\n              \"type\" = \"string\"\n            }\n            \"uniquePrefix\" = {\n              \"defaultValue\" = local.unique_prefix\n              \"type\"         = \"string\"\n            }\n            \"appServicePlanId\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"#{Octopus.Action[Create App Service Plan].Output.AzureRmOutputs[appServicePlan]}\"\n            }\n            \"dockerImageName\" = {\n              \"type\"         = \"string\"\n              \"defaultValue\" = \"nginx:latest\"\n            }\n            \"resourceTags\" = {\n              \"type\"         = \"object\"\n              \"defaultValue\" = {\n                \"octopus-environment\" = \"#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName}\"\n                \"octopus-role\"        = \"${local.target_role} Audits\"\n                \"octopus-space\"       = \"#{Octopus.Space.Name}\"\n                \"octopus-project\"     = \"\"\n              }\n            }\n          }\n          \"variables\" = {\n            \"webAppPortalName\" = \"[concat(parameters('uniquePrefix'), '-', parameters('projectName'), '-', parameters('environment'), '-webapp')]\"\n          }\n        })\n        \"Octopus.Action.Azure.AccountId\"                   = local.cloud_account\n        \"Octopus.Action.Azure.ResourceGroupName\"           = \"octopub-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}\"\n        \"Octopus.Action.RunOnServer\"                       = \"true\"\n        \"OctopusUseBundledTooling\"                         = \"False\"\n        \"Octopus.Action.Azure.ResourceGroupDeploymentMode\" = \"Incremental\"\n        \"Octopus.Action.Azure.TemplateSource\"              = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Octopub Frontend Project\nvariable \"frontend_project_name\" {\n  type    = string\n  default = \"\"\n}\n\ndata \"octopusdeploy_projects\" \"frontend\" {\n  partial_name = var.frontend_project_name == \"\" ? local.octopub_frontend_project_name : var.frontend_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"frontend_health_check\" {\n  count        = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.frontend[0].id\n  value        = local.frontend_health_check\n  name         = \"App.HealthCheck\"\n  type         = \"String\"\n  description  = \"The path to perform a health check on.\"\n  is_sensitive = false\n  depends_on   = []\n}\n\nresource \"octopusdeploy_variable\" \"azure_webapp_octopub_frontend_octopus_azure_account\" {\n  count        = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.frontend[0].id\n  value        = local.cloud_account\n  name         = \"Octopus.Azure.Account\"\n  type         = \"AzureAccount\"\n  description  = \"\"\n  is_sensitive = false\n}\n\nresource \"octopusdeploy_project\" \"frontend\" {\n  count                                = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  name                                 = var.frontend_project_name == \"\" ? local.octopub_frontend_project_name : var.frontend_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.octopub_frontend_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"frontend\" {\n  count      = length(data.octopusdeploy_projects.frontend.projects) == 0 ? 1 : 0\n  project_id = octopusdeploy_project.frontend[0].id\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  // The deployment step goes here.\n  // Call the step \"Deploy Container\"\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Container\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureAppService\"\n      name                               = \"Deploy Container\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                = \"true\"\n        \"OctopusUseBundledTooling\"                  = \"False\"\n        \"Octopus.Action.Azure.DeploymentType\"       = \"Container\"\n        \"Octopus.Action.Package.DownloadOnTentacle\" = \"False\"\n        \"Octopus.Action.Azure.AppSettings\"          = jsonencode([\n          {\n            \"name\"        = \"UDL_SETVALUE_1\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][productEndpoint]https://${local.unique_prefix}-octopubproducts-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/api/products\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"UDL_SETVALUE_2\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][productHealthEndpoint]https://${local.unique_prefix}-octopubproducts-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/health/products\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"UDL_SETVALUE_3\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][auditEndpoint]https://${local.unique_prefix}-octopubaudits-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/api/audits\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"UDL_SETVALUE_4\"\n            \"value\"       = \"[/usr/share/nginx/html/config.json][auditHealthEndpoint]https://${local.unique_prefix}-octopubaudits-#{Octopus.Action[Generate Variables].Output.OctopusEnvironmentName | ToLower}-webapp.azurewebsites.net/health/audits\"\n            \"slotSetting\" = \"false\"\n          }\n        ])\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = \"octopussamples/octopub-frontend\"\n        acquisition_location = \"NotAcquired\"\n        feed_id              = local.docker_hub_feed_id\n        properties           = { SelectionMode = \"immediate\" }\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Frontend\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Service Link\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type = local.link_highlight_action_type\n      properties  = local.link_highlight_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.link_highlight_container_image\n      }\n      name                               = \"Service Link\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      environments                       = []\n      excluded_environments              = []\n      channels                           = []\n      tenant_tags                        = []\n      features                           = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Frontend\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Smoke Test\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = local.smoke_test_action_type\n      name                               = \"Smoke Test\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = local.smoke_test_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.smoke_test_container_image\n      }\n      environments = [\n        local.development_environment_id,\n        local.test_environment_id,\n        local.production_environment_id,\n      ]\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Frontend\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Security Scan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Security Scan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.security_scan_docker_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n\n#endregion\n\n#region Octopub Products Project\nvariable \"products_project_name\" {\n  type    = string\n  default = \"\"\n}\n\n\ndata \"octopusdeploy_projects\" \"products\" {\n  partial_name = var.products_project_name == \"\" ? local.octopub_products_project_name : var.products_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"azure_webapp_octopub_products_octopus_azure_account\" {\n  count        = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.products[0].id\n  value        = local.cloud_account\n  name         = \"Octopus.Azure.Account\"\n  type         = \"AzureAccount\"\n  description  = \"\"\n  is_sensitive = false\n}\n\nresource \"octopusdeploy_variable\" \"products_health_check\" {\n  count        = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.products[0].id\n  value        = local.products_health_check\n  name         = \"App.HealthCheck\"\n  type         = \"String\"\n  description  = \"The path to perform a health check on.\"\n  is_sensitive = false\n  depends_on   = []\n}\n\nresource \"octopusdeploy_project\" \"products\" {\n  count                                = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  name                                 = var.products_project_name == \"\" ? local.octopub_products_project_name : var.products_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.octopub_products_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"products\" {\n  count      = length(data.octopusdeploy_projects.products.projects) == 0 ? 1 : 0\n  project_id = octopusdeploy_project.products[0].id\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  // The deployment step goes here.\n  // Call the step \"Deploy Container\"\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Container\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureAppService\"\n      name                               = \"Deploy Container\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                = \"true\"\n        \"OctopusUseBundledTooling\"                  = \"False\"\n        \"Octopus.Action.Azure.DeploymentType\"       = \"Container\"\n        \"Octopus.Action.Package.DownloadOnTentacle\" = \"False\"\n        \"Octopus.Action.Azure.AppSettings\"          = jsonencode([\n          {\n            \"name\"        = \"WEBSITES_PORT\"\n            \"value\"       = \"8083\"\n            \"slotSetting\" = \"false\"\n          }\n        ])\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = \"octopussamples/octopub-products-microservice\"\n        acquisition_location = \"NotAcquired\"\n        feed_id              = local.docker_hub_feed_id\n        properties           = { SelectionMode = \"immediate\" }\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Products\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Service Link\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type = local.link_highlight_action_type\n      properties  = local.link_highlight_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.link_highlight_container_image\n      }\n      name                               = \"Service Link\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      environments                       = []\n      excluded_environments              = []\n      channels                           = []\n      tenant_tags                        = []\n      features                           = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Products\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Smoke Test\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = local.smoke_test_action_type\n      name                               = \"Smoke Test\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = local.smoke_test_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.smoke_test_container_image\n      }\n      environments = [\n        local.development_environment_id,\n        local.test_environment_id,\n        local.production_environment_id,\n      ]\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Products\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Security Scan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Security Scan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.security_scan_docker_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Octopub Audits Project\nvariable \"audits_project_name\" {\n  type    = string\n  default = \"\"\n}\n\ndata \"octopusdeploy_projects\" \"audits\" {\n  partial_name = var.audits_project_name == \"\" ? local.octopub_audits_project_name : var.audits_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"azure_webapp_octopub_audits_octopus_azure_account\" {\n  count        = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.audits[0].id\n  value        = local.cloud_account\n  name         = \"Octopus.Azure.Account\"\n  type         = \"AzureAccount\"\n  description  = \"\"\n  is_sensitive = false\n}\n\nresource \"octopusdeploy_variable\" \"audits_healthcheck\" {\n  count        = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.audits[0].id\n  value        = local.audits_health_check\n  name         = \"App.HealthCheck\"\n  type         = \"String\"\n  description  = \"The path to perform a health check on.\"\n  is_sensitive = false\n  depends_on   = []\n}\n\nresource \"octopusdeploy_project\" \"audits\" {\n  count                                = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  name                                 = var.audits_project_name == \"\" ? local.octopub_audits_project_name : var.audits_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = true\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = [connectivity_policy]\n  }\n  description = local.octopub_audits_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"audits\" {\n  count      = length(data.octopusdeploy_projects.audits.projects) == 0 ? 1 : 0\n  project_id = octopusdeploy_project.audits[0].id\n\n\n  step {\n    condition           = \"Success\"\n    name                = \"Generate Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = \"${data.octopusdeploy_worker_pools.workerpool_hosted_ubuntu.worker_pools[0].id}\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = \"Set-OctopusVariable -name \\\"OctopusEnvironmentName\\\" -value $OctopusParameters[\\\"Octopus.Environment.Name\\\"]\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  // The deployment step goes here.\n  // Call the step \"Deploy Container\"\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Container\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.AzureAppService\"\n      name                               = \"Deploy Container\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                = \"true\"\n        \"OctopusUseBundledTooling\"                  = \"False\"\n        \"Octopus.Action.Azure.DeploymentType\"       = \"Container\"\n        \"Octopus.Action.Package.DownloadOnTentacle\" = \"False\"\n        \"Octopus.Action.Azure.AppSettings\"          = jsonencode([\n          {\n            \"name\"        = \"WEBSITES_PORT\"\n            \"value\"       = \"10000\"\n            \"slotSetting\" = \"false\"\n          },\n          {\n            \"name\"        = \"MIGRATE_AT_START\"\n            \"value\"       = \"true\"\n            \"slotSetting\" = \"false\"\n          },\n        ])\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = \"octopussamples/octopub-audit-microservice\"\n        acquisition_location = \"NotAcquired\"\n        feed_id              = local.docker_hub_feed_id\n        properties           = { SelectionMode = \"immediate\" }\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Audits\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Service Link\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type = local.link_highlight_action_type\n      properties  = local.link_highlight_properties\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.link_highlight_container_image\n      }\n      name                               = \"Service Link\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      environments                       = []\n      excluded_environments              = []\n      channels                           = []\n      tenant_tags                        = []\n      features                           = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Audits\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Smoke Test\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = local.smoke_test_action_type\n      properties                         = local.smoke_test_properties\n      name                               = \"Smoke Test\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = local.smoke_test_container_image\n      }\n      environments = [\n        local.development_environment_id,\n        local.test_environment_id,\n        local.production_environment_id,\n      ]\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = [\"${local.target_role} Audits\"]\n  }\n\n  step {\n    condition           = \"Success\"\n    name                = \"Security Scan\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Security Scan\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"Bash\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.security_scan_docker_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Octopub Orchestration Project\ndata \"octopusdeploy_projects\" \"orchestration\" {\n  partial_name = local.octopub_orchestration_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_project\" \"orchestration\" {\n  count                                = length(data.octopusdeploy_projects.orchestration.projects) == 0 ? 1 : 0\n  name                                 = local.octopub_orchestration_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"EnvironmentDefault\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = false\n  lifecycle_id                         = local.devops_lifecycle_id\n  project_group_id                     = local.project_group_id\n  included_library_variable_sets       = []\n  tenanted_deployment_participation    = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = []\n  }\n  description = local.octopub_products_project_description\n}\n\nresource \"octopusdeploy_deployment_process\" \"orchestration\" {\n  project_id = octopusdeploy_project.orchestration[0].id\n  count      = length(data.octopusdeploy_projects.orchestration.projects) == 0 ? 1 : 0\n\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Frontend\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.DeployRelease\"\n      name                               = \"Deploy Frontend\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = \"\"\n      properties                         = {\n        \"Octopus.Action.Package.DownloadOnTentacle\"        = \"NotAcquired\"\n        \"Octopus.Action.RunOnServer\"                       = \"True\"\n        \"Octopus.Action.DeployRelease.DeploymentCondition\" = \"Always\"\n        \"Octopus.Action.DeployRelease.ProjectId\"           = length(data.octopusdeploy_projects.frontend.projects) == 0 ? octopusdeploy_project.frontend[0].id : data.octopusdeploy_projects.frontend.projects[0].id\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = length(data.octopusdeploy_projects.frontend.projects) == 0 ? octopusdeploy_project.frontend[0].id : data.octopusdeploy_projects.frontend.projects[0].id\n        acquisition_location = \"NotAcquired\"\n        feed_id              = data.octopusdeploy_feeds.project.feeds[0].id\n        properties           = {}\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Products\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.DeployRelease\"\n      name                               = \"Deploy Products\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = \"\"\n      properties                         = {\n        \"Octopus.Action.DeployRelease.ProjectId\"           = length(data.octopusdeploy_projects.products.projects) == 0 ? octopusdeploy_project.products[0].id : data.octopusdeploy_projects.products.projects[0].id\n        \"Octopus.Action.Package.DownloadOnTentacle\"        = \"NotAcquired\"\n        \"Octopus.Action.RunOnServer\"                       = \"True\"\n        \"Octopus.Action.DeployRelease.DeploymentCondition\" = \"Always\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = length(data.octopusdeploy_projects.products.projects) == 0 ? octopusdeploy_project.products[0].id : data.octopusdeploy_projects.products.projects[0].id\n        acquisition_location = \"NotAcquired\"\n        feed_id              = data.octopusdeploy_feeds.project.feeds[0].id\n        properties           = {}\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Deploy Audits\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.DeployRelease\"\n      name                               = \"Deploy Audits\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = \"\"\n      properties                         = {\n        \"Octopus.Action.RunOnServer\"                       = \"True\"\n        \"Octopus.Action.DeployRelease.DeploymentCondition\" = \"Always\"\n        \"Octopus.Action.DeployRelease.ProjectId\"           = length(data.octopusdeploy_projects.audits.projects) == 0 ? octopusdeploy_project.audits[0].id : data.octopusdeploy_projects.audits.projects[0].id\n        \"Octopus.Action.Package.DownloadOnTentacle\"        = \"NotAcquired\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      primary_package {\n        package_id           = length(data.octopusdeploy_projects.audits.projects) == 0 ? octopusdeploy_project.audits[0].id : data.octopusdeploy_projects.audits.projects[0].id\n        acquisition_location = \"NotAcquired\"\n        feed_id              = data.octopusdeploy_feeds.project.feeds[0].id\n        properties           = {}\n      }\n\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Always\"\n    name                = \"Feedback\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Feedback\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.ScriptBody\"   = local.feedback_script\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#region Project Templates\nvariable \"project_template_project_name\" {\n  type    = string\n  default = \"\"\n}\n\ndata \"octopusdeploy_projects\" \"docker_project_template\" {\n  partial_name = var.project_template_project_name == \"\" ? local.project_template_project_name : var.project_template_project_name\n  skip         = 0\n  take         = 1\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_git_organization\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Git.Url.Organization\"\n  type         = \"String\"\n  description  = \"The GitHub organization to create the repo in.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Github organization where the repo will be created. This is the `owner` part of the URL `https://github.com/owner/myrepo`.\"\n    label       = \"Github Organization\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_git_repo\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Git.Url.Repo\"\n  type         = \"String\"\n  description  = \"The GitHub repo to create.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Github repo to be created. This is the `myrepo` part of the URL `https://github.com/owner/myrepo`.\"\n    label       = \"Github Repo\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_image_name\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Application.Docker.Image\"\n  type         = \"String\"\n  description  = \"The Docker image to create containing the new application.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Docker image to create containing the new application.\"\n    label       = \"Docker Image\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_variable\" \"docker_project_template_octopus_project\" {\n  count        = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  owner_id     = octopusdeploy_project.docker_project_template[0].id\n  value        = \"\"\n  name         = \"Application.Octopus.Project\"\n  type         = \"String\"\n  description  = \"The Octopus project to associate with the new application.\"\n  is_sensitive = false\n\n  prompt {\n    description = \"The Octopus project to associate with the new application. A release is created in this project when the image is successfully built.\"\n    label       = \"Octopus Project\"\n    is_required = true\n    display_settings {\n      control_type = \"SingleLineText\"\n    }\n  }\n\n  scope {\n    actions      = []\n    channels     = []\n    environments = [local.sync_environment_id]\n    machines     = []\n    roles        = null\n    tenant_tags  = null\n  }\n}\n\nresource \"octopusdeploy_project\" \"docker_project_template\" {\n  count                                = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  name                                 = var.project_template_project_name == \"\" ? local.project_template_project_name : var.project_template_project_name\n  auto_create_release                  = false\n  default_guided_failure_mode          = \"Off\"\n  default_to_skip_if_already_installed = false\n  discrete_channel_release             = false\n  is_disabled                          = false\n  is_version_controlled                = false\n  lifecycle_id                         = local.application_lifecycle_id\n  project_group_id                     = local.project_templates_project_group_id\n  included_library_variable_sets       = [\n    local.this_instance_library_variable_set, local.github_library_variable_set, local.docker_library_variable_set\n  ]\n  tenanted_deployment_participation = \"Untenanted\"\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n\n  versioning_strategy {\n    template = \"#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}\"\n  }\n\n  lifecycle {\n    ignore_changes = []\n  }\n  description = <<EOT\nCreates Project Templates.\nEOT\n}\n\nresource \"octopusdeploy_runbook\" \"docker_project_template_create_nodejs_template\" {\n  count                       = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n  name                        = \"📗 Create Template Github Node.js Project\"\n  project_id                  = octopusdeploy_project.docker_project_template[0].id\n  environment_scope           = \"Specified\"\n  environments                = [local.sync_environment_id]\n  force_package_download      = false\n  default_guided_failure_mode = \"EnvironmentDefault\"\n  description                 = \"This runbook populates a GitHub repo with a sample Node.js project and GitHub Actions Workflow that builds a Docker image, pushes it to DockerHub, and triggers the deployment of the associated Octopus project in the Development environment. \\n\\n**Action**: Creates a new GitHub repo (if it doesn't exist) and populates it with the output of a Yeoman generator.\\n\\n\\n**Affects**: This will overwrite files in the target Git repo. Changes can be reverted with git.\"\n  multi_tenancy_mode          = \"Untenanted\"\n\n  retention_policy {\n    quantity_to_keep    = 100\n    should_keep_forever = false\n  }\n\n  connectivity_policy {\n    allow_deployments_to_no_targets = true\n    exclude_unhealthy_targets       = false\n    skip_machine_behavior           = \"None\"\n  }\n}\n\nresource \"octopusdeploy_runbook_process\" \"docker_project_template_create_nodejs_template\" {\n  runbook_id = octopusdeploy_runbook.docker_project_template_create_nodejs_template[0].id\n  count      = length(data.octopusdeploy_projects.docker_project_template.projects) == 0 ? 1 : 0\n\n  step {\n    condition           = \"Success\"\n    name                = \"Get Variables\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Get Variables\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.ScriptBody\"   = \"# This is a workaround to the issue where octostache templates in the Terraform\\n# project are replaced during deployment, when we actually want some variables\\n# at run time.\\n\\nSet-OctopusVariable -name \\\"Project.Name\\\" -value $OctopusParameters[\\\"Octopus.Project.Name\\\"]\\nSet-OctopusVariable -name \\\"Web.ServerUri\\\" -value $OctopusParameters[\\\"Octopus.Web.ServerUri\\\"]\\nSet-OctopusVariable -name \\\"Space.Id\\\" -value $OctopusParameters[\\\"Octopus.Space.Id\\\"]\\nSet-OctopusVariable -name \\\"Space.Name\\\" -value $OctopusParameters[\\\"Octopus.Space.Name\\\"]\"\n        \"Octopus.Action.RunOnServer\"         = \"true\"\n        \"Octopus.Action.Script.ScriptSource\" = \"Inline\"\n        \"Octopus.Action.Script.Syntax\"       = \"PowerShell\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Repo\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Repo\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"CreateGithubRepo.Git.Url.Organization\"        = \"#{Git.Url.Organization}\"\n        \"Octopus.Action.Script.Syntax\"                 = \"Python\"\n        \"Octopus.Action.RunOnServer\"                   = \"true\"\n        \"CreateGithubRepo.Git.Url.NewRepoNamePrefix\"   = \"\"\n        \"CreateGithubRepo.Git.Credentials.AccessToken\" = \"#{Git.Credentials.Password}\"\n        \"Octopus.Action.Script.ScriptBody\"             = \"# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\n\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport platform\\nfrom urllib.request import urlretrieve\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Create a GitHub repo'\\n    )\\n    parser.add_argument('--new-repo-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(\\n                            'Git.Url.NewRepoName') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--new-repo-name-prefix', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(\\n                            'Git.Url.NewRepoNamePrefix'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--github-access-token', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGithubRepo.Git.Credentials.AccessToken') or get_octopusvariable_quiet(\\n                            'Git.Credentials.AccessToken'),\\n                        help='The git password')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef create_new_repo(token, cac_org, new_repo):\\n    # If we could not view the repo, assume it needs to be created.\\n    # https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#create-an-organization-repository\\n    # Note you have to use the token rather than the JWT:\\n    # https://stackoverflow.com/questions/39600396/bad-credentails-for-jwt-for-github-integrations-api\\n\\n    headers = {\\n        'Authorization': 'token ' + token,\\n        'Content-Type': 'application/json',\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28',\\n    }\\n\\n    try:\\n        # First try to create an organization repo:\\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos#create-an-organization-repository\\n        url = 'https://api.github.com/orgs/' + cac_org + '/repos'\\n        body = {'name': new_repo}\\n        request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\\n        urllib.request.urlopen(request)\\n    except urllib.error.URLError as ex:\\n        # Then fall back to creating a repo for the user:\\n        # https://docs.github.com/en/free-pro-team@latest/rest/repos/repos?apiVersion=2022-11-28#create-a-repository-for-the-authenticated-user\\n        if ex.code == 404:\\n            url = 'https://api.github.com/user/repos'\\n            body = {'name': new_repo}\\n            request = urllib.request.Request(url, headers=headers, data=json.dumps(body).encode('utf-8'))\\n            urllib.request.urlopen(request)\\n        else:\\n            raise ValueError(\\\"Failed to create thew new repository. This could indicate bad credentials.\\\") from ex\\n\\n\\ndef is_windows():\\n    return platform.system() == 'Windows'\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.github_access_token.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.new_repo_name.strip():\\n    print(\\\"You must define the new repo name\\\")\\n    sys.exit(1)\\n\\n# The access token is generated from a github app or supplied directly as an access token\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key, parser.github_app_installation_id) \\\\\\n    if not parser.github_access_token.strip() else parser.github_access_token.strip()\\n\\ncac_org = parser.git_organization.strip()\\nnew_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())\\nproject_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name.strip())\\n\\n# The prefix is optional\\nnew_repo_prefix_with_separator = new_repo_custom_prefix + '_' if new_repo_custom_prefix else ''\\n\\n# The new repo name is the prefix + the name of thew new project\\nnew_repo = new_repo_prefix_with_separator + project_repo_sanitized\\n\\n# This is the value of the forked git repo\\nset_octopusvariable('NewRepoUrl', 'https://github.com/' + cac_org + '/' + new_repo)\\nset_octopusvariable('NewRepo', new_repo)\\n\\nif not verify_new_repo(token, cac_org, new_repo):\\n    create_new_repo(token, cac_org, new_repo)\\n    print(\\n        'New repo was created at https://github.com/' + cac_org + '/' + new_repo)\\nelse:\\n    print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')\\n\\nprint('New repo URL is defined in the output variable \\\"NewRepoUrl\\\": #{Octopus.Action[' +\\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepoUrl}')\\nprint('New repo name is defined in the output variable \\\"NewRepo\\\": #{Octopus.Action[' +\\n      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')\\n\"\n        \"CreateGithubRepo.Git.Url.NewRepoName\"         = \"#{Git.Url.Repo}\"\n        \"Octopus.Action.Script.ScriptSource\"           = \"Inline\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Octopus API Key Secret\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Octopus API Key Secret\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"Octopus.Action.Script.Syntax\"                = \"Python\"\n        \"CreateGitHubSecret.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n        \"CreateGitHubSecret.GitHub.Secret.Value\"      = \"#{Octopus.ApiKey}\"\n        \"CreateGitHubSecret.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"Octopus.Action.Script.ScriptSource\"          = \"Inline\"\n        \"CreateGitHubSecret.GitHub.Secret.Name\"       = \"OCTOPUS_API_TOKEN\"\n        \"CreateGitHubSecret.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"Octopus.Action.Script.ScriptBody\"            = \"# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\\n\\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport urllib3\\nfrom base64 import b64encode\\nfrom typing import TypedDict\\nfrom nacl import public, encoding\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n\\n    parser.add_argument('--secret-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Name'))\\n    parser.add_argument('--secret-value', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Value'))\\n\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\\n    \\\"\\\"\\\"Encrypt a Unicode string using the public key.\\\"\\\"\\\"\\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\\\"utf-8\\\"), encoding.Base64Encoder()))\\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\\\"utf-8\\\"))\\n    return b64encode(encrypted).decode(\\\"utf-8\\\")\\n\\n\\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\\n    public_key_endpoint: str = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\\\"\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\"}\\n    response = requests.get(url=public_key_endpoint, headers=headers)\\n    if response.status_code != 200:\\n        raise IOError(\\n            f\\\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\\\")\\n\\n    public_key_json = response.json()\\n    return public_key_json['key_id'], public_key_json['key']\\n\\n\\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\\n               encrypted_secret_value: str):\\n    secret_creation_url = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\\\"\\n    secret_creation_body = {\\\"key_id\\\": public_key_id, \\\"encrypted_value\\\": encrypted_secret_value}\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\", \\\"Content-Type\\\": \\\"application/json\\\"}\\n\\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\\n        print(\\\"--Secret Created / Updated!--\\\")\\n    else:\\n        print(f\\\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\\\")\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.secret_name.strip():\\n    print(\\\"You must define the secret name\\\")\\n    sys.exit(1)\\n    \\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print(\\\"Could not find the repo\\\")\\n    sys.exit(1)\\n\\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\\n                                    token)\\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\\n           encrypted_secret_value=encrypted_secret)\\n\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Docker Hub Password Secret\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Docker Hub Password Secret\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"CreateGitHubSecret.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n        \"CreateGitHubSecret.GitHub.Secret.Name\"       = \"DOCKERHUB_TOKEN\"\n        \"Octopus.Action.Script.Syntax\"                = \"Python\"\n        \"CreateGitHubSecret.GitHub.Secret.Value\"      = \"#{Docker.Credentials.Password}\"\n        \"CreateGitHubSecret.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"Octopus.Action.Script.ScriptSource\"          = \"Inline\"\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"CreateGitHubSecret.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"Octopus.Action.Script.ScriptBody\"            = \"# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\\n\\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport urllib3\\nfrom base64 import b64encode\\nfrom typing import TypedDict\\nfrom nacl import public, encoding\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n\\n    parser.add_argument('--secret-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Name'))\\n    parser.add_argument('--secret-value', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Value'))\\n\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\\n    \\\"\\\"\\\"Encrypt a Unicode string using the public key.\\\"\\\"\\\"\\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\\\"utf-8\\\"), encoding.Base64Encoder()))\\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\\\"utf-8\\\"))\\n    return b64encode(encrypted).decode(\\\"utf-8\\\")\\n\\n\\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\\n    public_key_endpoint: str = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\\\"\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\"}\\n    response = requests.get(url=public_key_endpoint, headers=headers)\\n    if response.status_code != 200:\\n        raise IOError(\\n            f\\\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\\\")\\n\\n    public_key_json = response.json()\\n    return public_key_json['key_id'], public_key_json['key']\\n\\n\\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\\n               encrypted_secret_value: str):\\n    secret_creation_url = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\\\"\\n    secret_creation_body = {\\\"key_id\\\": public_key_id, \\\"encrypted_value\\\": encrypted_secret_value}\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\", \\\"Content-Type\\\": \\\"application/json\\\"}\\n\\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\\n        print(\\\"--Secret Created / Updated!--\\\")\\n    else:\\n        print(f\\\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\\\")\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.secret_name.strip():\\n    print(\\\"You must define the secret name\\\")\\n    sys.exit(1)\\n    \\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print(\\\"Could not find the repo\\\")\\n    sys.exit(1)\\n\\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\\n                                    token)\\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\\n           encrypted_secret_value=encrypted_secret)\\n\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Create Docker Hub Password Username\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Create Docker Hub Password Username\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = false\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"CreateGitHubSecret.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"CreateGitHubSecret.GitHub.Secret.Value\"      = \"#{Docker.Credentials.Username}\"\n        \"CreateGitHubSecret.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"Octopus.Action.Script.ScriptSource\"          = \"Inline\"\n        \"Octopus.Action.Script.ScriptBody\"            = \"# https://gist.github.com/comdotlinux/9a53bb00767a16d6646464c4b8249094\\n\\n# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'])\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pynacl', '--disable-pip-version-check'])\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport urllib3\\nfrom base64 import b64encode\\nfrom typing import TypedDict\\nfrom nacl import public, encoding\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n\\n    parser.add_argument('--secret-name', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Name') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Name'))\\n    parser.add_argument('--secret-value', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.Secret.Value') or get_octopusvariable_quiet(\\n                            'GitHub.Secret.Value'))\\n\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo') or get_octopusvariable_quiet('Octopus.Project.Name'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'CreateGitHubSecret.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except:\\n        return False\\n\\n\\ndef encrypt(public_key_for_repo: str, secret_value_input: str) -> str:\\n    \\\"\\\"\\\"Encrypt a Unicode string using the public key.\\\"\\\"\\\"\\n    sealed_box = public.SealedBox(public.PublicKey(public_key_for_repo.encode(\\\"utf-8\\\"), encoding.Base64Encoder()))\\n    encrypted = sealed_box.encrypt(secret_value_input.encode(\\\"utf-8\\\"))\\n    return b64encode(encrypted).decode(\\\"utf-8\\\")\\n\\n\\ndef get_public_key(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str) -> (str, str):\\n    public_key_endpoint: str = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/public-key\\\"\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\"}\\n    response = requests.get(url=public_key_endpoint, headers=headers)\\n    if response.status_code != 200:\\n        raise IOError(\\n            f\\\"Could not get public key for repository {gh_owner}/{gh_repo}. The Response code was {response.status_code}\\\")\\n\\n    public_key_json = response.json()\\n    return public_key_json['key_id'], public_key_json['key']\\n\\n\\ndef set_secret(gh_base_url: str, gh_owner: str, gh_repo: str, gh_auth_token: str, public_key_id: str, secret_key: str,\\n               encrypted_secret_value: str):\\n    secret_creation_url = f\\\"{gh_base_url}/{gh_owner}/{gh_repo}/actions/secrets/{secret_key}\\\"\\n    secret_creation_body = {\\\"key_id\\\": public_key_id, \\\"encrypted_value\\\": encrypted_secret_value}\\n    headers: TypedDict[str, str] = {\\\"Authorization\\\": f\\\"Bearer {gh_auth_token}\\\", \\\"Content-Type\\\": \\\"application/json\\\"}\\n\\n    secret_creation_response = requests.put(url=secret_creation_url, json=secret_creation_body, headers=headers)\\n    if secret_creation_response.status_code == 201 or secret_creation_response.status_code == 204:\\n        print(\\\"--Secret Created / Updated!--\\\")\\n    else:\\n        print(f\\\"-- Error creating / updating github secret, the reason was : {secret_creation_response.reason}\\\")\\n\\n\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.secret_name.strip():\\n    print(\\\"You must define the secret name\\\")\\n    sys.exit(1)\\n    \\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print(\\\"Could not find the repo\\\")\\n    sys.exit(1)\\n\\nkey_id, public_key = get_public_key('https://api.github.com/repos', parser.git_organization, parser.repo,\\n                                    token)\\nencrypted_secret: str = encrypt(public_key_for_repo=public_key, secret_value_input=parser.secret_value)\\nset_secret(gh_base_url='https://api.github.com/repos', gh_owner=parser.git_organization, gh_repo=parser.repo,\\n           gh_auth_token=token, public_key_id=key_id, secret_key=parser.secret_name,\\n           encrypted_secret_value=encrypted_secret)\\n\"\n        \"CreateGitHubSecret.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"CreateGitHubSecret.GitHub.Secret.Name\"       = \"DOCKERHUB_USERNAME\"\n        \"Octopus.Action.Script.Syntax\"                = \"Python\"\n      }\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n      features              = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n  step {\n    condition           = \"Success\"\n    name                = \"Generate and Push\"\n    package_requirement = \"LetOctopusDecide\"\n    start_trigger       = \"StartAfterPrevious\"\n\n    action {\n      action_type                        = \"Octopus.Script\"\n      name                               = \"Generate and Push\"\n      condition                          = \"Success\"\n      run_on_server                      = true\n      is_disabled                        = false\n      can_be_used_for_project_versioning = true\n      is_required                        = false\n      worker_pool_id                     = local.worker_pool_id\n      properties                         = {\n        \"PopulateGithubRepo.Yeoman.Generator.SubGenerator\" = \"nodejs-docker-webapp\"\n        \"PopulateGithubRepo.Yeoman.Generator.Arguments\"    = \"--octopusUrl #{Octopus.Action[Get Variables].Output.Web.ServerUri} --octopusSpace \\\"#{Octopus.Action[Get Variables].Output.Space.Name}\\\" --octopusApi #{Octopus.ApiKey} --octopusProject \\\"#{Application.Octopus.Project}\\\" --dockerImage #{Application.Docker.Image}\"\n        \"PopulateGithubRepo.Yeoman.Generator.Name\"         = \"octopus-reference-architecture-apps\"\n        \"Octopus.Action.Script.Syntax\"                     = \"Python\"\n        \"Octopus.Action.Script.ScriptSource\"               = \"Inline\"\n        \"Octopus.Action.Script.ScriptBody\"                 = \"# This script forks a GitHub repo. It creates a token from a GitHub App installation to avoid\\n# having to use a regular user account.\\nimport subprocess\\nimport sys\\n\\n# Install our own dependencies\\nenv_vars = os.environ.copy()\\nenv_vars['PIP_ROOT_USER_ACTION'] = 'ignore'\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'jwt', '--disable-pip-version-check'], env=env_vars)\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'requests', '--disable-pip-version-check'], env=env_vars)\\nsubprocess.check_call([sys.executable, '-m', 'pip', 'install', 'anyascii', '--disable-pip-version-check'], env=env_vars)\\n\\nimport requests\\nimport json\\nimport subprocess\\nimport sys\\nimport os\\nimport urllib.request\\nimport base64\\nimport re\\nimport jwt\\nimport time\\nimport argparse\\nimport platform\\nimport zipfile\\nimport lzma\\nimport tarfile\\nimport shutil\\nimport urllib3\\nfrom shlex import split\\nfrom anyascii import anyascii\\n\\n# Disable insecure http request warnings\\nurllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\\n\\n# If this script is not being run as part of an Octopus step, setting variables is a noop\\nif 'set_octopusvariable' not in globals():\\n    def set_octopusvariable(variable, value):\\n        pass\\n\\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\\n# Periods are replaced with underscores, and the variable name is converted to uppercase\\nif \\\"get_octopusvariable\\\" not in globals():\\n    def get_octopusvariable(variable):\\n        return os.environ[re.sub('\\\\\\\\.', '_', variable.upper())]\\n\\n# If this script is not being run as part of an Octopus step, print directly to std out.\\nif 'printverbose' not in globals():\\n    def printverbose(msg):\\n        print(msg)\\n\\n\\ndef printverbose_noansi(output):\\n    \\\"\\\"\\\"\\n    Strip ANSI color codes and print the output as verbose\\n    :param output: The output to print\\n    \\\"\\\"\\\"\\n    output_no_ansi = re.sub(r'\\\\x1b\\\\[[0-9;]*m', '', output)\\n    printverbose(output_no_ansi)\\n\\n\\ndef get_octopusvariable_quiet(variable):\\n    \\\"\\\"\\\"\\n    Gets an octopus variable, or an empty string if it does not exist.\\n    :param variable: The variable name\\n    :return: The variable value, or an empty string if the variable does not exist\\n    \\\"\\\"\\\"\\n    try:\\n        return get_octopusvariable(variable)\\n    except Exception as inst:\\n        return ''\\n\\n\\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi, raise_on_non_zero=False,\\n            append_to_path=None):\\n    \\\"\\\"\\\"\\n        The execute method provides the ability to execute external processes while capturing and returning the\\n        output to std err and std out and exit code.\\n    \\\"\\\"\\\"\\n\\n    my_env = os.environ.copy() if env is None else env\\n\\n    if append_to_path is not None:\\n        my_env[\\\"PATH\\\"] = append_to_path + os.pathsep + my_env['PATH']\\n\\n    process = subprocess.Popen(args,\\n                               stdout=subprocess.PIPE,\\n                               stderr=subprocess.PIPE,\\n                               stdin=open(os.devnull),\\n                               text=True,\\n                               cwd=cwd,\\n                               env=my_env)\\n    stdout, stderr = process.communicate()\\n    retcode = process.returncode\\n\\n    if not retcode == 0 and raise_on_non_zero:\\n        raise Exception('command returned exit code ' + retcode)\\n\\n    if print_args is not None:\\n        print_output(' '.join(args))\\n\\n    if print_output is not None:\\n        print_output(stdout)\\n        print_output(stderr)\\n\\n    return stdout, stderr, retcode\\n\\n\\ndef init_argparse():\\n    parser = argparse.ArgumentParser(\\n        usage='%(prog)s [OPTION]',\\n        description='Fork a GitHub repo'\\n    )\\n    parser.add_argument('--generator', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Yeoman.Generator.Name') or get_octopusvariable_quiet(\\n                            'Yeoman.Generator.Name'))\\n    parser.add_argument('--sub-generator', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Yeoman.Generator.SubGenerator') or get_octopusvariable_quiet(\\n                            'Yeoman.Generator.SubGenerator'))\\n    parser.add_argument('--generator-arguments', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Yeoman.Generator.Arguments') or get_octopusvariable_quiet(\\n                            'Yeoman.Generator.Arguments'),\\n                        help='The arguments to pas to yo. Pass all arguments as a single string. This string is then parsed as if it were yo arguments.')\\n    parser.add_argument('--repo', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Url.Repo') or get_octopusvariable_quiet(\\n                            'Git.Url.Repo'))\\n    parser.add_argument('--git-organization', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet(\\n                            'Git.Url.Organization'))\\n    parser.add_argument('--github-app-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))\\n    parser.add_argument('--github-app-installation-id', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.GitHub.App.InstallationId') or get_octopusvariable_quiet(\\n                            'GitHub.App.InstallationId'))\\n    parser.add_argument('--github-app-private-key', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.GitHub.App.PrivateKey') or get_octopusvariable_quiet(\\n                            'GitHub.App.PrivateKey'))\\n    parser.add_argument('--git-password', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Credentials.Password') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Password'),\\n                        help='The git password. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')\\n    parser.add_argument('--git-username', action='store',\\n                        default=get_octopusvariable_quiet(\\n                            'PopulateGithubRepo.Git.Credentials.Username') or get_octopusvariable_quiet(\\n                            'Git.Credentials.Username'),\\n                        help='The git username. This will be used for both the git authentication and the username associated with any commits.')\\n\\n    return parser.parse_known_args()\\n\\n\\ndef generate_github_token(github_app_id, github_app_private_key, github_app_installation_id):\\n    # Generate the tokens used by git and the GitHub API\\n    app_id = github_app_id\\n    signing_key = jwt.jwk_from_pem(github_app_private_key.encode('utf-8'))\\n\\n    payload = {\\n        # Issued at time\\n        'iat': int(time.time()),\\n        # JWT expiration time (10 minutes maximum)\\n        'exp': int(time.time()) + 600,\\n        # GitHub App's identifier\\n        'iss': app_id\\n    }\\n\\n    # Create JWT\\n    jwt_instance = jwt.JWT()\\n    encoded_jwt = jwt_instance.encode(payload, signing_key, alg='RS256')\\n\\n    # Create access token\\n    url = 'https://api.github.com/app/installations/' + github_app_installation_id + '/access_tokens'\\n    headers = {\\n        'Authorization': 'Bearer ' + encoded_jwt,\\n        'Accept': 'application/vnd.github+json',\\n        'X-GitHub-Api-Version': '2022-11-28'\\n    }\\n    request = urllib.request.Request(url, headers=headers, method='POST')\\n    response = urllib.request.urlopen(request)\\n    response_json = json.loads(response.read().decode())\\n    return response_json['token']\\n\\n\\ndef generate_auth_header(token):\\n    auth = base64.b64encode(('x-access-token:' + token).encode('ascii'))\\n    return 'Basic ' + auth.decode('ascii')\\n\\n\\ndef verify_new_repo(token, cac_org, new_repo):\\n    # Attempt to view the new repo\\n    try:\\n        url = 'https://api.github.com/repos/' + cac_org + '/' + new_repo\\n        headers = {\\n            'Accept': 'application/vnd.github+json',\\n            'Authorization': 'Bearer ' + token,\\n            'X-GitHub-Api-Version': '2022-11-28'\\n        }\\n        request = urllib.request.Request(url, headers=headers)\\n        urllib.request.urlopen(request)\\n        return True\\n    except Exception as inst:\\n        return False\\n\\n\\ndef is_windows():\\n    return platform.system() == 'Windows'\\n\\n\\ndef download_file(url, filename, verify_ssl=True):\\n    r = requests.get(url, verify=verify_ssl)\\n    with open(filename, 'wb') as file:\\n        file.write(r.content)\\n\\n\\ndef ensure_git_exists():\\n    if is_windows():\\n        print(\\\"Checking git is installed\\\")\\n        try:\\n            stdout, _, exit_code = execute(['git', 'version'])\\n            printverbose(stdout)\\n            if not exit_code == 0:\\n                raise \\\"git not found\\\"\\n        except:\\n            print(\\\"Downloading git\\\")\\n            download_file('https://www.7-zip.org/a/7zr.exe', '7zr.exe')\\n            download_file(\\n                'https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.2/PortableGit-2.42.0.2-64-bit.7z.exe',\\n                'PortableGit.7z.exe')\\n            print(\\\"Installing git\\\")\\n            print(\\\"Consider installing git on the worker or using a standard worker-tools image\\\")\\n            execute(['7zr.exe', 'x', 'PortableGit.7z.exe', '-o' + os.path.join(os.getcwd(), 'git'), '-y'])\\n            return os.path.join(os.getcwd(), 'git', 'bin', 'git')\\n\\n    return 'git'\\n\\n\\ndef install_npm_linux():\\n    print(\\\"Downloading node\\\")\\n    download_file(\\n        'https://nodejs.org/dist/v18.18.2/node-v18.18.2-linux-x64.tar.xz',\\n        'node.tar.xz')\\n    print(\\\"Installing node on Linux\\\")\\n    with lzma.open(\\\"node.tar.xz\\\", \\\"r\\\") as lzma_ref:\\n        with open(\\\"node.tar\\\", \\\"wb\\\") as fdst:\\n            shutil.copyfileobj(lzma_ref, fdst)\\n    with tarfile.open(\\\"node.tar\\\", \\\"r\\\") as tar_ref:\\n        tar_ref.extractall(os.getcwd())\\n\\n    try:\\n        _, _, exit_code = execute([os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', '--version'],\\n                                  append_to_path=os.getcwd() + '/node-v18.18.2-linux-x64/bin')\\n        if not exit_code == 0:\\n            raise Exception(\\\"Failed to run npm\\\")\\n    except Exception as ex:\\n        print('Failed to install npm ' + str(ex))\\n        sys.exit(1)\\n    return os.getcwd() + '/node-v18.18.2-linux-x64/bin/npm', os.getcwd() + '/node-v18.18.2-linux-x64/bin'\\n\\n\\ndef install_npm_windows():\\n    print(\\\"Downloading node\\\")\\n    download_file('https://nodejs.org/dist/v18.18.2/node-v18.18.2-win-x64.zip', 'node.zip', False)\\n    print(\\\"Installing node on Windows\\\")\\n    with zipfile.ZipFile(\\\"node.zip\\\", \\\"r\\\") as zip_ref:\\n        zip_ref.extractall(os.getcwd())\\n    try:\\n        _, _, exit_code = execute([os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'), '--version'],\\n                                  append_to_path=os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))\\n        if not exit_code == 0:\\n            raise Exception(\\\"Failed to run npm\\\")\\n    except Exception as ex:\\n        print('Failed to install npm ' + str(ex))\\n        sys.exit(1)\\n\\n    return (os.path.join(os.getcwd(), 'node-v18.18.2-win-x64', 'npm.cmd'),\\n            os.path.join(os.getcwd(), 'node-v18.18.2-win-x64'))\\n\\n\\ndef ensure_node_exists():\\n    try:\\n        print(\\\"Checking node is installed\\\")\\n        _, _, exit_code = execute(['npm', '--version'])\\n        if not exit_code == 0:\\n            raise Exception(\\\"npm not found\\\")\\n    except:\\n        if is_windows():\\n            return install_npm_windows()\\n        else:\\n            return install_npm_linux()\\n\\n    return 'npm', None\\n\\n\\ndef ensure_yo_exists(npm_executable, npm_path):\\n    try:\\n        print(\\\"Checking Yeoman is installed\\\")\\n        _, _, exit_code = execute(['yo', '--version'])\\n        if not exit_code == 0:\\n            raise Exception(\\\"yo not found\\\")\\n    except:\\n        print('Installing Yeoman')\\n\\n        _, _, retcode = execute([npm_executable, 'install', '-g', 'yo'], append_to_path=npm_path)\\n\\n        if not retcode == 0:\\n            print(\\\"Failed to set install Yeoman. Check the verbose logs for details.\\\")\\n            sys.exit(1)\\n\\n        npm_bin, _, retcode = execute([npm_executable, 'config', 'get', 'prefix'], append_to_path=npm_path)\\n\\n        if not retcode == 0:\\n            print(\\\"Failed to set get the npm prefix directory. Check the verbose logs for details.\\\")\\n            sys.exit(1)\\n\\n        try:\\n            if is_windows():\\n                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'yo.cmd'), '--version'],\\n                                          append_to_path=npm_path)\\n            else:\\n                _, _, exit_code = execute([os.path.join(npm_bin.strip(), 'bin', 'yo'), '--version'],\\n                                          append_to_path=npm_path)\\n\\n            if not exit_code == 0:\\n                raise Exception(\\\"Failed to run yo\\\")\\n        except Exception as ex:\\n            print('Failed to install yo ' + str(ex))\\n            sys.exit(1)\\n\\n        # Windows and Linux save NPM binaries in different directories\\n        if is_windows():\\n            return os.path.join(npm_bin.strip(), 'yo.cmd')\\n\\n        return os.path.join(npm_bin.strip(), 'bin', 'yo')\\n\\n    return 'yo'\\n\\n\\ngit_executable = ensure_git_exists()\\nnpm_executable, npm_path = ensure_node_exists()\\nyo_executable = ensure_yo_exists(npm_executable, npm_path)\\nparser, _ = init_argparse()\\n\\nif not parser.git_password.strip() and not (\\n        parser.github_app_id.strip() and parser.github_app_private_key.strip() and parser.github_app_installation_id.strip()):\\n    print(\\\"You must supply the GitHub token, or the GitHub App ID and private key and installation ID\\\")\\n    sys.exit(1)\\n\\nif not parser.git_organization.strip():\\n    print(\\\"You must define the organization\\\")\\n    sys.exit(1)\\n\\nif not parser.repo.strip():\\n    print(\\\"You must define the repo name\\\")\\n    sys.exit(1)\\n\\nif not parser.generator.strip():\\n    print(\\\"You must define the Yeoman generator\\\")\\n    sys.exit(1)\\n\\n# Create a dir for the git clone\\nif os.path.exists('downstream'):\\n    shutil.rmtree('downstream')\\n\\nos.mkdir('downstream')\\n\\n# Create a dir for yeoman to use\\nif os.path.exists('downstream-yeoman'):\\n    shutil.rmtree('downstream-yeoman')\\n\\nos.mkdir('downstream-yeoman')\\n# Yeoman will use a less privileged user to write to this directory, so grant full access\\nif not is_windows():\\n    os.chmod('downstream-yeoman', 0o777)\\n\\ndownstream_dir = os.path.join(os.getcwd(), 'downstream')\\ndownstream_yeoman_dir = os.path.join(os.getcwd(), 'downstream-yeoman')\\n\\n# The access token is generated from a github app or supplied directly as an access token\\ntoken = generate_github_token(parser.github_app_id, parser.github_app_private_key,\\n                              parser.github_app_installation_id) if len(\\n    parser.git_password.strip()) == 0 else parser.git_password.strip()\\n\\nif not verify_new_repo(token, parser.git_organization, parser.repo):\\n    print('Repo at https://github.com/' + parser.git_organization + '/' + parser.repo + ' could not be accessed')\\n    sys.exit(1)\\n\\n# We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close\\nif is_windows():\\n    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.helper', 'manager'])\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to set the credential.helper setting. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n    _, _, retcode = execute([git_executable, 'config', '--system', 'credential.modalprompt', 'false'])\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to srt the credential.modalprompt setting. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n    # We need to disable the credentials helper prompt, which will pop open a GUI prompt that we can never close\\n    _, _, retcode = execute(\\n        [git_executable, 'config', '--system', 'credential.microsoft.visualstudio.com.interactive', 'never'])\\n\\n    if not retcode == 0:\\n        print(\\n            \\\"Failed to set the credential.microsoft.visualstudio.com.interactive setting. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n_, _, retcode = execute([git_executable, 'config', '--global', 'user.email', 'octopus@octopus.com'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the user.email setting. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n_, _, retcode = execute([git_executable, 'config', '--global', 'core.autocrlf', 'input'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the core.autocrlf setting. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nusername = parser.git_username if len(parser.git_username) != 0 else 'Octopus'\\n_, _, retcode = execute([git_executable, 'config', '--global', 'user.name', username])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the git username. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n_, _, retcode = execute([git_executable, 'config', '--global', 'credential.helper', 'cache'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to set the git credential helper. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nprint('Cloning repo')\\n\\n_, _, retcode = execute(\\n    [git_executable, 'clone',\\n     'https://' + username + ':' + token + '@github.com/' + parser.git_organization + '/' + parser.repo + '.git',\\n     'downstream'])\\n\\nif not retcode == 0:\\n    print(\\\"Failed to clone the git repo. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nprint('Configuring Yeoman Generator')\\n\\n_, _, retcode = execute([npm_executable, 'install'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to install the generator dependencies. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n_, _, retcode = execute([npm_executable, 'link'], cwd=os.path.join(os.getcwd(), 'YeomanGenerator'), append_to_path=npm_path)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to link the npm module. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nprint('Running Yeoman Generator')\\n\\n# Treat the string of yo arguments as a raw input and parse it again. The resulting list of unknown arguments\\n# is then passed to yo. We have to convert the incoming values from utf to ascii when parsing a second time.\\nyo_args = split(anyascii(parser.generator_arguments))\\n\\ngenerator_name = parser.generator + ':' + parser.sub_generator if len(parser.sub_generator) != 0 else parser.generator\\n\\nyo_arguments = [yo_executable, generator_name, '--force', '--skip-install']\\n\\n# Yeoman has issues running as root, which it will often do in a container.\\n# So we run Yeoman in its own directory, and then copy the changes to the git directory.\\n_, _, retcode = execute(yo_arguments + yo_args, cwd=downstream_yeoman_dir, append_to_path=npm_path)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to run Yeoman. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\nshutil.copytree(downstream_yeoman_dir, downstream_dir, dirs_exist_ok=True)\\n\\nprint('Adding changes to git')\\n\\n_, _, retcode = execute([git_executable, 'add', '.'], cwd=downstream_dir)\\n\\nif not retcode == 0:\\n    print(\\\"Failed to add the git changes. Check the verbose logs for details.\\\")\\n    sys.exit(1)\\n\\n# Check for pending changes\\n_, _, retcode = execute([git_executable, 'diff-index', '--quiet', 'HEAD'], cwd=downstream_dir)\\n\\nif not retcode == 0:\\n    print('Committing changes to git')\\n    _, _, retcode = execute([git_executable, 'commit', '-m',\\n                             'Added files from Yeoman generator ' + parser.generator + ':' + parser.sub_generator],\\n                            cwd=downstream_dir)\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to set commit the git changes. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\\n    print('Pushing changes to git')\\n\\n    _, _, retcode = execute([git_executable, 'push', 'origin', 'main'], cwd=downstream_dir)\\n\\n    if not retcode == 0:\\n        print(\\\"Failed to push the git changes. Check the verbose logs for details.\\\")\\n        sys.exit(1)\\n\"\n        \"PopulateGithubRepo.Yeoman.Generator.Package\"      = jsonencode({\n          \"PackageId\" = \"OctopusSolutionsEngineering/ReferenceArchitectureAppGenerators\"\n          \"FeedId\"    = local.github_feed_id\n        })\n        \"Octopus.Action.RunOnServer\"                  = \"true\"\n        \"PopulateGithubRepo.Git.Url.Organization\"     = \"#{Git.Url.Organization}\"\n        \"PopulateGithubRepo.Git.Url.Repo\"             = \"#{Octopus.Action[Create Repo].Output.NewRepo}\"\n        \"PopulateGithubRepo.Git.Credentials.Password\" = \"#{Git.Credentials.Password}\"\n      }\n\n      container {\n        feed_id = local.docker_hub_feed_id\n        image   = \"octopussamples/node-workertools\"\n      }\n\n      environments          = []\n      excluded_environments = []\n      channels              = []\n      tenant_tags           = []\n\n      package {\n        name                      = \"YeomanGenerator\"\n        package_id                = \"OctopusSolutionsEngineering/ReferenceArchitectureAppGenerators\"\n        acquisition_location      = \"Server\"\n        extract_during_deployment = false\n        feed_id                   = local.github_feed_id\n        properties                = {\n          Extract       = \"True\", PackageParameterName = \"PopulateGithubRepo.Yeoman.Generator.Package\", Purpose = \"\",\n          SelectionMode = \"deferred\"\n        }\n      }\n      features = []\n    }\n\n    properties   = {}\n    target_roles = []\n  }\n}\n#endregion\n\n#endregion\n",
     "Octopus.Action.Terraform.TemplateParameters": "{\"octopus_server\":\"#{ReferenceArchitecture.WebApp.Octopus.ServerUrl}\",\"octopus_apikey\":\"#{ReferenceArchitecture.WebApp.Octopus.ApiKey}\",\"octopus_space_id\":\"#{ReferenceArchitecture.WebApp.Octopus.SpaceId}\",\"feed_docker_hub_username\":\"#{ReferenceArchitecture.WebApp.Docker.Username}\",\"feed_docker_hub_password\":\"#{ReferenceArchitecture.WebApp.Docker.Password}\",\"github_access_token\":\"#{ReferenceArchitecture.WebApp.GitHub.AccessToken}\",\"azure_account_application_id\":\"#{ReferenceArchitecture.WebApp.Azure.ApplicationId}\",\"azure_account_subscription_id\":\"#{ReferenceArchitecture.WebApp.Azure.SubscriptionId}\",\"azure_account_tenant_id\":\"#{ReferenceArchitecture.WebApp.Azure.TenantId}\",\"azure_account_password\":\"#{ReferenceArchitecture.WebApp.Azure.AccountPassword}\"}",
     "OctopusUseBundledTooling": "False",
     "Octopus.Action.Terraform.AdditionalInitParams": "#{if ReferenceArchitecture.Terraform.InitArgs}#{ReferenceArchitecture.Terraform.InitArgs}#{/if}",
@@ -147,7 +147,7 @@
   ],
   "StepPackageId": "Octopus.TerraformApply",
   "$Meta": {
-    "ExportedAt": "2023-11-12T23:48:11.062Z",
+    "ExportedAt": "2023-11-12T23:48:11.0620000Z",
     "OctopusVersion": "2024.1.1024",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/octopus-register-aks-k8s-cluster/metadata.json b/src/step-templates/octopus-register-aks-k8s-cluster/metadata.json
new file mode 100644
index 000000000..c42b19bea
--- /dev/null
+++ b/src/step-templates/octopus-register-aks-k8s-cluster/metadata.json
@@ -0,0 +1,145 @@
+{
+  "Id": "eff227d2-2cd6-4d86-90ae-6258cee53d0a",
+  "Name": "Register AKS Cluster with Octopus Deploy",
+  "Description": "Step template to Register an AKS Cluster with Octopus Deploy using the Octopus Deploy API",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "octobob",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e98dc4e2-0766-4d2d-a753-eafe294fdeea",
+      "Name": "RegisterAzureCluster.Octopus.Base.Url",
+      "Label": "Octopus Base Url",
+      "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cb3cdd41-3d1f-49c6-820e-acfa24bf5a88",
+      "Name": "RegisterAzureCluster.Octopus.Api.Key",
+      "Label": "Octopus Api Key",
+      "HelpText": "The API key of a user in Octopus Deploy who has permissions to register the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "1d3d8695-27a3-4d3e-9457-6b483253a609",
+      "Name": "RegisterAzureCluster.Azure.Account",
+      "Label": "Azure Account",
+      "HelpText": "The Azure Account with permissions to access the AKS cluster",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "ca9d9733-2032-466b-9e80-2aa6abd3c977",
+      "Name": "RegisterAzureCluster.AKS.Name",
+      "Label": "AKS Cluster Name",
+      "HelpText": "The name of the AKS Cluster Name to register with Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1e3c6a4a-09da-4cd1-989f-93be59ad7f16",
+      "Name": "RegisterAzureCluster.ResourceGroup.Name",
+      "Label": "AKS Resource Group Name",
+      "HelpText": "Name of the Azure Resource Group where the AKS cluster is located.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fa4bd89d-bb86-4d3f-87ff-17125cd88f24",
+      "Name": "RegisterAzureCluster.Roles.List",
+      "Label": "Role CSV List",
+      "HelpText": "Comma separated list of environments to assign to the AKS cluster in Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0c80326d-cdc1-439d-be6b-fbab4da42cda",
+      "Name": "RegisterAzureCluster.Environment.List",
+      "Label": "Environment CSV List",
+      "HelpText": "Comma separated list of environments to assign to the AKS cluster in Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "667a18b3-1694-4333-87a4-9be712b59122",
+      "Name": "RegisterAzureCluster.Tenant.List",
+      "Label": "Tenant CSV List",
+      "HelpText": "(Optional) If this is for a tenant, the a comma separated list of tenants to assign the AKS cluster to in Octopus Deploy",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "db2de612-45bb-4e4a-ab95-64083dd80393",
+      "Name": "RegisterAzureCluster.Tenant.DeploymentType",
+      "Label": "Tenanted Deployments",
+      "HelpText": "Choose the kind of deployment where this deployment target should be included.",
+      "DefaultValue": "Untenanted",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Untenanted|Exclude from tenanted deployments (default)\nTenanted|Include only in tenanted deployments\nTenantedOrUntenanted|Include in both tenanted and untenanted deployments"
+      }
+    },
+    {
+      "Id": "5ef91f37-b13b-413d-955c-872c7f274c7e",
+      "Name": "RegisterAzureCluster.MachinePolicy.IdOrName",
+      "Label": "Machine Policy Id Or Name",
+      "HelpText": "Enter in the name or the Id of the Machine Policy in Octopus Deploy for the AKS Cluster.",
+      "DefaultValue": "Default Machine Policy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c4c45925-d7a4-4e41-9c2d-a8d73a6292b1",
+      "Name": "RegisterAzureCluster.WorkerPool.IdOrName",
+      "Label": "Worker Pool Id or Name",
+      "HelpText": "The name or id of the worker pool all communication will go through for the K8s cluster.  Leave blank for the default worker pool.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "94b90acb-a054-4886-91e0-79e9881709f9",
+      "Name": "RegisterAzureCluster.Overwrite.Existing",
+      "Label": "Overwrite Existing Registration",
+      "HelpText": "Indicates if the existing cluster should be overwritten",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "octobob",
+  "$Meta": {
+    "ExportedAt": "2020-04-13T15:37:29.8660000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-register-aks-k8s-cluster/scriptbody.ps1 b/src/step-templates/octopus-register-aks-k8s-cluster/scriptbody.ps1
new file mode 100644
index 000000000..c806d4e00
--- /dev/null
+++ b/src/step-templates/octopus-register-aks-k8s-cluster/scriptbody.ps1
@@ -0,0 +1,181 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$OctopusAPIKey = $OctopusParameters["RegisterAzureCluster.Octopus.Api.Key"]
+$RegistrationName = $OctopusParameters["RegisterAzureCluster.AKS.Name"]
+$ClusterResourceGroup = $OctopusParameters["RegisterAzureCluster.ResourceGroup.Name"]
+$OctopusUrl = $OctopusParameters["RegisterAzureCluster.Octopus.Base.Url"]
+$Roles = $OctopusParameters["RegisterAzureCluster.Roles.List"]
+$Environments = $OctopusParameters["RegisterAzureCluster.Environment.List"]
+$SpaceId = $OctopusParameters["Octopus.Space.Id"]
+$MachinePolicyIdOrName = $OctopusParameters["RegisterAzureCluster.MachinePolicy.IdOrName"]
+$AzureAccountId = $OctopusParameters["RegisterAzureCluster.Azure.Account"]
+$Tenants = $OctopusParameters["RegisterAzureCluster.Tenant.List"]
+$DeploymentType = $OctopusParameters["RegisterAzureCluster.Tenant.DeploymentType"]
+$WorkerPoolNameOrId = $OctopusParameters["RegisterAzureCluster.WorkerPool.IdOrName"]
+$OverwriteExisting = $OctopusParameters["RegisterAzureCluster.Overwrite.Existing"]
+$OverwriteExisting = $OverwriteExisting -eq "True"
+
+Write-Host "AKS Name: $RegistrationName"
+Write-Host "Resoure Group Name: $ClusterResourceGroup"
+Write-Host "Octopus Url: $OctopusUrl"
+Write-Host "Role List: $Roles"
+Write-Host "Environments: $Environments"
+Write-Host "Machine Policy Name or Id: $MachinePolicyIdOrName"
+Write-Host "Azure Account Id: $AzureAccountId"
+Write-Host "Tenant List: $Tenants"
+Write-Host "Deployment Type: $DeploymentType"
+Write-Host "Worker Pool Name or Id: $WorkerPoolNameOrId"
+Write-Host "Overwrite Existing: $OverwriteExisting"
+
+$header = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$header.Add("X-Octopus-ApiKey", $OctopusAPIKey)
+
+$baseApiUrl = "$OctopusUrl/api"
+$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header
+if ((Get-Member -InputObject $baseApiInformation.Links -Name "Spaces" -MemberType Properties) -ne $null)
+{  	
+	$baseApiUrl = "$baseApiUrl/$SpaceId"    
+}
+
+Write-Host "Base API Url: $baseApiUrl"
+
+$existingMachineResultsUrl = "$baseApiUrl/machines?partialName=$RegistrationName&skip=0&take=1000"
+Write-Host "Attempting to find existing machine with similar name at $existingMachineResultsUrl"
+$existingMachineResponse = Invoke-RestMethod $existingMachineResultsUrl -Headers $header
+Write-Host $existingMachineResponse
+
+$machineFound = $false
+$machineId = $null
+foreach ($item in $existingMachineResponse.Items)
+{
+	if ($item.Name -eq $RegistrationName)
+    {
+    	$machineFound = $true
+        if ($OverwriteExisting)
+        {
+        	$machineId = $item.Id 
+        }
+        break
+    }
+}
+
+if ($machineFound -and $OverwriteExisting -eq $false)
+{
+	Write-Highlight "Machine already exists, skipping registration"
+    Exit 0
+}
+
+$roleList = $Roles -split ","
+$environmentList = $Environments -split ","
+$environmentIdList = @()
+Write-Host "Getting the ids for all environments specified"
+foreach($environment in $environmentList)
+{
+	Write-Host "Getting the id for the environment $environment"
+    $environmentEscaped = $environment.Replace(" ", "%20")
+    $environmentUrl = "$baseApiUrl/environments?skip=0&take=1000&name=$environmentEscaped"
+    $environmentResponse = Invoke-RestMethod $environmentUrl -Headers $header 
+
+    $environmentId = $environmentResponse.Items[0].Id
+    if ($environmentId -eq $null)
+    {
+    	Write-Host "The environment $environment cannot be found in this space, exiting"
+        exit 1
+    }
+    Write-Host "The id for environment $environment is $environmentId"
+    $environmentIdList += $environmentId
+}
+$tenantList = $Tenants -split ","
+$tenantIdList = @()
+
+foreach($tenant in $tenantList)
+{
+	if ([string]::IsNullOrWhiteSpace($tenant) -eq $false)
+    {    
+      Write-Host "Getting the id for tenant $tenant"
+      $tenantEscaped = $tenant.Replace(" ", "%20")
+      $tenantUrl = "$baseApiUrl/tenants?skip=0&take=1000&name=$tenantEscaped"
+      $tenantResponse = Invoke-RestMethod $tenantUrl -Headers $header 
+
+      $tenantId = $tenantResponse.Items[0].Id
+      Write-Host "The id for tenant $tenant is $tenantId"
+      $tenantIdList += $tenantId
+    }
+}
+
+$machinePolicyId = $machinePolicyIdOrName
+if ($machinePolicyIdOrName.StartsWith("MachinePolicies-") -eq $false)
+{
+	Write-Host "The machine policy specified $machinePolicyIdOrName appears to be a name"
+	$machinePolicyNameEscaped = $machinePolicyIdOrName.Replace(" ", "%20")
+	$machinePolicyResponse = Invoke-RestMethod "$baseApiUrl/machinepolicies?partialName=$machinePolicyNameEscaped" -Headers $header
+        
+    $machinePolicyId = $machinePolicyResponse.Items[0].Id
+    Write-Host "The machine policy id is $machinePolicyId"
+}
+
+if ([string]::IsNullOrWhiteSpace($machinePolicyId) -eq $true)
+{
+	Write-Host "The machine policy $machinePolicyIdOrName cannot be found, exiting"
+    exit 1
+}
+
+$workerPoolId = $WorkerPoolNameOrId
+if ([string]::IsNullOrWhiteSpace($workerPoolId) -eq $false -and $workerPoolId.StartsWith("WorkerPools-") -eq $false)
+{
+	Write-Host "The worker pool $workerPoolId appears to be a name, looking it up"
+    $workerPoolNameEscaped = $workerPoolId.Replace(" ", "%20")
+    $workerPoolResponse = Invoke-RestMethod "$baseApiUrl/workerpools?partialName=$workerPoolNameEscaped" -Headers $header
+    
+    $workerPoolId = $workerPoolResponse.Items[0].Id
+    Write-Host "The worker pool id is $workerPoolId"
+}
+
+$rawRequest = @{
+	Id = $machineId;
+    MachinePolicyId = $MachinePolicyId;
+    Name = $RegistrationName;
+	IsDisabled = $false;
+	HealthStatus = "Unknown";
+	HasLatestCalamari = $true;
+	StatusSummary = $null;
+	IsInProcess = $true;
+	Endpoint = @{
+    	Id = $null;
+		CommunicationStyle = "Kubernetes";
+		Links = $null;
+		AccountType = "AzureServicePrincipal";
+        ClusterUrl = $null;
+        ClusterCertificate = $null;
+        SkipTlsVerification = $false;
+        DefaultWorkerPoolId = $workerPoolId;
+        Authentication = @{
+        	AuthenticationType = "KubernetesAzure";
+            AccountId = $AzureAccountId;
+            ClusterName = $RegistrationName;
+            ClusterResourceGroup = $ClusterResourceGroup
+        };
+    };
+	Links = $null;	
+	Roles = $roleList;
+	EnvironmentIds = $environmentIdList;
+	TenantIds = $tenantIdList;
+    TenantedDeploymentParticipation = $DeploymentType;
+	TenantTags = @()}
+
+$jsonRequest = $rawRequest | ConvertTo-Json -Depth 10
+
+Write-Host "Sending in the request $jsonRequest"
+
+$machineUrl = "$baseApiUrl/machines"
+$method = "POST"
+if ($OverwriteExisting -and $machineId -ne $null)
+{
+	$machineUrl = "$machineUrl/$machineId" 
+  	$method = "PUT"
+}
+
+Write-Host "Posting to url $machineUrl"
+$machineResponse = Invoke-RestMethod $machineUrl -Headers $header -Method $method -Body $jsonRequest
+
+Write-Host "Create machine's response: $machineResponse"
\ No newline at end of file
diff --git a/src/step-templates/octopus-register-listening-target/metadata.json b/src/step-templates/octopus-register-listening-target/metadata.json
new file mode 100644
index 000000000..f76dbb8d7
--- /dev/null
+++ b/src/step-templates/octopus-register-listening-target/metadata.json
@@ -0,0 +1,135 @@
+{
+  "Id": "6f95a351-a1a1-43d1-a378-410a9acf0e60",
+  "Name": "Register Listening Deployment Target with Octopus",
+  "Description": "Step template to Register an Listening Deployment Target with Octopus Deploy using the API.  Useful when spinning up machines and you want to wait to register until the machine finishes installing all additional software.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Author": "octobob",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e98dc4e2-0766-4d2d-a753-eafe294fdeea",
+      "Name": "RegisterListeningTarget.Octopus.Base.Url",
+      "Label": "Octopus Base Url",
+      "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cb3cdd41-3d1f-49c6-820e-acfa24bf5a88",
+      "Name": "RegisterListeningTarget.Octopus.Api.Key",
+      "Label": "Octopus Api Key",
+      "HelpText": "The API key of a user in Octopus Deploy who has permissions to register the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ca9d9733-2032-466b-9e80-2aa6abd3c977",
+      "Name": "RegisterListeningTarget.Machine.Name",
+      "Label": "Machine Name",
+      "HelpText": "The name of the machine to register with Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1d3d8695-27a3-4d3e-9457-6b483253a609",
+      "Name": "RegisterListeningTarget.Machine.Address",
+      "Label": "Machine Address",
+      "HelpText": "The machine address (IP Address or Domain Name) to connect to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea762a1e-07ee-4eec-af7a-b6e29bf274d8",
+      "Name": "RegisterListeningTarget.Machine.Port",
+      "Label": "Port Number",
+      "HelpText": "The port the tentacle is listening on",
+      "DefaultValue": "10933",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fa4bd89d-bb86-4d3f-87ff-17125cd88f24",
+      "Name": "RegisterListeningTarget.Roles.List",
+      "Label": "Role CSV List",
+      "HelpText": "Comma separated list of environments to assign to the machine in Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0c80326d-cdc1-439d-be6b-fbab4da42cda",
+      "Name": "RegisterListeningTarget.Environment.List",
+      "Label": "Environment CSV List",
+      "HelpText": "Comma separated list of environments to assign to the the machine in Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "667a18b3-1694-4333-87a4-9be712b59122",
+      "Name": "RegisterListeningTarget.Tenant.List",
+      "Label": "Tenant CSV List",
+      "HelpText": "(Optional) If this is for a tenant, the a comma separated list of tenants to assign the machine to in Octopus Deploy",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "db2de612-45bb-4e4a-ab95-64083dd80393",
+      "Name": "RegisterListeningTarget.Tenant.DeploymentType",
+      "Label": "Tenanted Deployments",
+      "HelpText": "Choose the kind of deployment where this deployment target should be included.",
+      "DefaultValue": "Untenanted",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Untenanted|Exclude from tenanted deployments (default)\nTenanted|Include only in tenanted deployments\nTenantedOrUntenanted|Include in both tenanted and untenanted deployments"
+      }
+    },
+    {
+      "Id": "5ef91f37-b13b-413d-955c-872c7f274c7e",
+      "Name": "RegisterListeningTarget.MachinePolicy.IdOrName",
+      "Label": "Machine Policy Id Or Name",
+      "HelpText": "Enter in the name or the Id of the Machine Policy in Octopus Deploy for the AKS Cluster.",
+      "DefaultValue": "Default Machine Policy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5b2e0993-7f96-4447-b47b-029c8f225688",
+      "Name": "RegisterListeningTarget.Overwrite.Existing",
+      "Label": "Overwrite Existing Registration",
+      "HelpText": "Indicates if the existing listening tentacle should be overwritten in Octopus.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "adamoctoclose",
+  "$Meta": {
+    "ExportedAt": "2021-03-17T15:37:29.8660000Z",
+    "OctopusVersion": "2020.5.5",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-register-listening-target/scriptbody.ps1 b/src/step-templates/octopus-register-listening-target/scriptbody.ps1
new file mode 100644
index 000000000..f5e64061d
--- /dev/null
+++ b/src/step-templates/octopus-register-listening-target/scriptbody.ps1
@@ -0,0 +1,167 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$OctopusAPIKey = $OctopusParameters["RegisterListeningTarget.Octopus.Api.Key"]
+$RegistrationName = $OctopusParameters["RegisterListeningTarget.Machine.Name"]
+$RegistrationAddress = $OctopusParameters["RegisterListeningTarget.Machine.Address"]
+$OctopusUrl = $OctopusParameters["RegisterListeningTarget.Octopus.Base.Url"]
+$Roles = $OctopusParameters["RegisterListeningTarget.Roles.List"]
+$Environments = $OctopusParameters["RegisterListeningTarget.Environment.List"]
+$SpaceId = $OctopusParameters["Octopus.Space.Id"]
+$MachinePolicyIdOrName = $OctopusParameters["RegisterListeningTarget.MachinePolicy.IdOrName"]
+$Tenants = $OctopusParameters["RegisterListeningTarget.Tenant.List"]
+$DeploymentType = $OctopusParameters["RegisterListeningTarget.Tenant.DeploymentType"]
+$PortNumber = $OctopusParameters["RegisterListeningTarget.Machine.Port"]
+$OverwriteExisting = $OctopusParameters["RegisterListeningTarget.Overwrite.Existing"]
+$OverwriteExisting = $OverwriteExisting -eq "True"
+
+Write-Host "Machine Name: $RegistrationName"
+Write-Host "Machine Address: $RegistrationAddress"
+Write-Host "Machine Port: $PortNumber"
+Write-Host "Octopus Url: $OctopusUrl"
+Write-Host "Role List: $Roles"
+Write-Host "Environments: $Environments"
+Write-Host "Machine Policy Name or Id: $MachinePolicyIdOrName"
+Write-Host "Tenant List: $Tenants"
+Write-Host "Deployment Type: $DeploymentType"
+Write-Host "Overwrite Existing: $OverwriteExisting"
+
+$header = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$header.Add("X-Octopus-ApiKey", $OctopusAPIKey)
+
+# If tenanted only deployments is set then you require at least one tenant in the tenant list
+if($tenantList -eq $null -and $DeploymentType -eq "Tenanted"){
+	Fail-Step "Tenanted only deployments require at least one associated tenants!"
+}
+
+$baseApiUrl = "$OctopusUrl/api"
+$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header
+if ((Get-Member -InputObject $baseApiInformation.Links -Name "Spaces" -MemberType Properties) -ne $null)
+{  	
+	$baseApiUrl = "$baseApiUrl/$SpaceId"    
+}
+
+Write-Host "Base API Url: $baseApiUrl"
+
+$existingMachineResultsUrl = "$baseApiUrl/machines?partialName=$RegistrationName&skip=0&take=1000"
+Write-Host "Attempting to find existing machine with similar name at $existingMachineResultsUrl"
+$existingMachineResponse = Invoke-RestMethod $existingMachineResultsUrl -Headers $header
+Write-Host $existingMachineResponse
+
+$machineFound = $false
+$machineId = $null
+foreach ($item in $existingMachineResponse.Items)
+{
+	if ($item.Name -eq $RegistrationName)
+    {
+    	$machineFound = $true
+        if ($OverwriteExisting)
+        {
+        	$machineId = $item.Id 
+        }
+        break
+    }
+}
+
+if ($machineFound -and $OverwriteExisting -eq $false)
+{
+	Write-Highlight "Machine already exists, skipping registration"
+    Exit 0
+}
+
+$roleList = $Roles -split ","
+$environmentList = $Environments -split ","
+$environmentIdList = @()
+Write-Host "Getting the ids for all environments specified"
+foreach($environment in $environmentList)
+{
+	Write-Host "Getting the id for the environment $environment"
+    $environmentEscaped = $environment.Replace(" ", "%20")
+    $environmentUrl = "$baseApiUrl/environments?skip=0&take=1000&name=$environmentEscaped"
+    $environmentResponse = Invoke-RestMethod $environmentUrl -Headers $header 
+
+    $environmentId = $environmentResponse.Items[0].Id
+    Write-Host "The id for environment $environment is $environmentId"
+    $environmentIdList += $environmentId
+}
+$tenantList = $Tenants -split ","
+$tenantIdList = @()
+
+# If tenant list is null then no need to go trhough this or it will pick the first tenant from all the tenants in Octopus
+if($tenantIdList -ne $null){
+
+	foreach($tenant in $tenantList)
+	{
+		Write-Host "Getting the id for tenant $tenant"
+		$tenantEscaped = $tenant.Replace(" ", "%20")
+		$tenantUrl = "$baseApiUrl/tenants?skip=0&take=1000&name=$tenantEscaped"
+		$tenantResponse = Invoke-RestMethod $tenantUrl -Headers $header 
+	
+		$tenantId = $tenantResponse.Items[0].Id
+		Write-Host "The id for tenant $tenant is $tenantId"
+		$tenantIdList += $tenantId
+	}
+	
+}
+
+
+
+$machinePolicyId = $machinePolicyIdOrName
+if ($machinePolicyIdOrName.StartsWith("MachinePolicies-") -eq $false)
+{
+	Write-Host "The machine policy specified $machinePolicyIdOrName appears to be a name"
+	$machinePolicyNameEscaped = $machinePolicyIdOrName.Replace(" ", "%20")
+	$machinePolicyResponse = Invoke-RestMethod "$baseApiUrl/machinepolicies?partialName=$machinePolicyNameEscaped" -Headers $header
+        
+    $machinePolicyId = $machinePolicyResponse.Items[0].Id
+    Write-Host "The machine policy id is $machinePolicyId"
+}
+
+$discoverUrl = "$baseApiUrl/machines/discover?host=$RegistrationAddress&port=$PortNumber&type=TentaclePassive"
+Write-Host "Discovering the machine $discoverUrl"
+$discoverResponse = Invoke-RestMethod $discoverUrl -Headers $header 
+Write-Host "ProjectResponse: $discoverResponse"
+
+$machineThumbprint = $discoverResponse.EndPoint.Thumbprint
+Write-Host "Thumbprint = $machineThumbprint"
+
+$rawRequest = @{
+	Id = $machineId;
+	MachinePolicyId = $machinePolicyId;
+	Name = $RegistrationName;
+	IsDisabled = $false;
+	HealthStatus = "Unknown";
+	HasLatestCalamari = $true;
+	StatusSummary = $null;
+	IsInProcess = $true;
+	Endpoint = @{
+    		Id = $null;
+		CommunicationStyle = "TentaclePassive";
+		Links = $null;
+		Uri = "https://$RegistrationAddress`:$PortNumber";
+		Thumbprint = "$machineThumbprint";
+		ProxyId = $null
+	};
+	Links = $null;	
+	Roles = $roleList;
+	EnvironmentIds = $environmentIdList;
+	TenantIds = $tenantIdList;
+	TenantTags = $null;
+	TenantedDeploymentParticipation = $DeploymentType
+}
+
+$jsonRequest = $rawRequest | ConvertTo-Json -Depth 10
+
+Write-Host "Sending in the request $jsonRequest"
+
+$machineUrl = "$baseApiUrl/machines"
+
+$method = "POST"
+if ($OverwriteExisting -and $machineId -ne $null)
+{
+	$machineUrl = "$machineUrl/$machineId" 
+  	$method = "PUT"
+}
+Write-Host "Posting to url $machineUrl"
+$machineResponse = Invoke-RestMethod $machineUrl -Headers $header -Method $method -Body $jsonRequest
+
+Write-Host "Create machine's response: $machineResponse"
\ No newline at end of file
diff --git a/src/step-templates/octopus-register-listening-worker/metadata.json b/src/step-templates/octopus-register-listening-worker/metadata.json
new file mode 100644
index 000000000..0975a0624
--- /dev/null
+++ b/src/step-templates/octopus-register-listening-worker/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "e83b3265-64f9-4870-8802-54884c43eaf0",
+  "Name": "Register Listening Worker with Octopus",
+  "Description": "Step template to Register an Listening Worker with Octopus Deploy using the API.  Useful for when you need to wait to install additional software and a restart when spinning up a new worker.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "octobob",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e98dc4e2-0766-4d2d-a753-eafe294fdeea",
+      "Name": "RegisterListeningWorker.Octopus.Base.Url",
+      "Label": "Octopus Base Url",
+      "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cb3cdd41-3d1f-49c6-820e-acfa24bf5a88",
+      "Name": "RegisterListeningWorker.Octopus.Api.Key",
+      "Label": "Octopus Api Key",
+      "HelpText": "The API key of a user in Octopus Deploy who has permissions to register the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ca9d9733-2032-466b-9e80-2aa6abd3c977",
+      "Name": "RegisterListeningWorker.Machine.Name",
+      "Label": "Machine Name",
+      "HelpText": "The name of the machine to register with Octopus Deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1d3d8695-27a3-4d3e-9457-6b483253a609",
+      "Name": "RegisterListeningWorker.Machine.Address",
+      "Label": "Machine Address",
+      "HelpText": "The machine address (IP Address or Domain Name) to connect to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ea762a1e-07ee-4eec-af7a-b6e29bf274d8",
+      "Name": "RegisterListeningWorker.Machine.Port",
+      "Label": "Port Number",
+      "HelpText": "The port the tentacle is listening on",
+      "DefaultValue": "10933",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fa4bd89d-bb86-4d3f-87ff-17125cd88f24",
+      "Name": "RegisterListeningWorker.WorkerPool.List",
+      "Label": "Worker Pool CSV List",
+      "HelpText": "Comma separated list of Worker Pools to assign the worker to in Octopus Deploy.  This can be the worker pool name or the id.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5ef91f37-b13b-413d-955c-872c7f274c7e",
+      "Name": "RegisterListeningWorker.MachinePolicy.IdOrName",
+      "Label": "Machine Policy Id Or Name",
+      "HelpText": "Enter in the name or the Id of the Machine Policy in Octopus Deploy for the AKS Cluster.",
+      "DefaultValue": "Default Machine Policy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d456924c-3720-4893-9a40-36bb1c00b331",
+      "Name": "RegisterListeningWorker.Overwrite.Existing",
+      "Label": "Overwrite Existing Registration",
+      "HelpText": "Indicates if the existing worker should be overwritten",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "octobob",
+  "$Meta": {
+    "ExportedAt": "2020-04-13T15:37:29.8660000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-register-listening-worker/scriptbody.ps1 b/src/step-templates/octopus-register-listening-worker/scriptbody.ps1
new file mode 100644
index 000000000..c1bdd7411
--- /dev/null
+++ b/src/step-templates/octopus-register-listening-worker/scriptbody.ps1
@@ -0,0 +1,140 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$OctopusAPIKey = $OctopusParameters["RegisterListeningWorker.Octopus.Api.Key"]
+$RegistrationName = $OctopusParameters["RegisterListeningWorker.Machine.Name"]
+$RegistrationAddress = $OctopusParameters["RegisterListeningWorker.Machine.Address"]
+$OctopusUrl = $OctopusParameters["RegisterListeningWorker.Octopus.Base.Url"]
+$WorkerPools = $OctopusParameters["RegisterListeningWorker.WorkerPool.List"]
+$SpaceId = $OctopusParameters["Octopus.Space.Id"]
+$MachinePolicyIdOrName = $OctopusParameters["RegisterListeningWorker.MachinePolicy.IdOrName"]
+$PortNumber = $OctopusParameters["RegisterListeningWorker.Machine.Port"]
+$OverwriteExisting = $OctopusParameters["RegisterListeningWorker.Overwrite.Existing"]
+$OverwriteExisting = $OverwriteExisting -eq "True"
+
+
+Write-Host "Machine Name: $RegistrationName"
+Write-Host "Machine Address: $RegistrationAddress"
+Write-Host "Machine Port: $PortNumber"
+Write-Host "Octopus Url: $OctopusUrl"
+Write-Host "Worker Pools: $WorkerPools"
+Write-Host "Environments: $Environments"
+Write-Host "Machine Policy Name or Id: $MachinePolicyIdOrName"
+Write-Host "Overwrite Existing: $OverwriteExisting"
+
+$header = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$header.Add("X-Octopus-ApiKey", $OctopusAPIKey)
+
+$baseApiUrl = "$OctopusUrl/api"
+$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header
+if ((Get-Member -InputObject $baseApiInformation.Links -Name "Spaces" -MemberType Properties) -ne $null)
+{  	
+	$baseApiUrl = "$baseApiUrl/$SpaceId"    
+}
+
+Write-Host "Base API Url: $baseApiUrl"
+
+$existingMachineResultsUrl = "$baseApiUrl/workers?partialName=$RegistrationName&skip=0&take=1000"
+Write-Host "Attempting to find existing machine with similar name at $existingMachineResultsUrl"
+$existingMachineResponse = Invoke-RestMethod $existingMachineResultsUrl -Headers $header
+Write-Host $existingMachineResponse
+
+$machineFound = $false
+foreach ($item in $existingMachineResponse.Items)
+{
+	if ($item.Name -eq $RegistrationName)
+    {
+    	$machineFound = $true
+        if ($OverwriteExisting)
+        {
+        	$machineId = $item.Id 
+        }
+        break
+    }
+}
+
+if ($machineFound -and $OverwriteExisting -eq $false)
+{
+	Write-Highlight "Machine already exists, skipping registration"
+    Exit 0
+}
+
+$workerPoolList = $WorkerPools -split ","
+$workerPoolIdList = @()
+Write-Host "Getting the ids for all environments specified"
+foreach($workerPool in $workerPoolList)
+{
+	Write-Host "Getting the id for the worker pool $workerPool"
+    
+    if ($workerPool.StartsWith("WorkerPools-") -eq $true)
+    {
+    	Write-Host "The worker pool is already an id, using that instead of looking it up"
+    	$workerPoolIdList += $workerPool
+    }
+    else
+    {
+    	$workerPoolEscaped = $workerPool.Replace(" ", "%20")
+        $workerPoolUrl = "$baseApiUrl/workerpools?skip=0&take=1000&partialName=$workerPoolEscaped"
+        $workerPoolResponse = Invoke-RestMethod $workerPoolUrl -Headers $header 
+
+        $workerPoolId = $workerPoolResponse.Items[0].Id
+        Write-Host "The id for worker pool $workerPool is $workerPoolId"
+        $workerPoolIdList += $workerPoolId
+    }       
+}
+
+$machinePolicyId = $machinePolicyIdOrName
+if ($machinePolicyIdOrName.StartsWith("MachinePolicies-") -eq $false)
+{
+	Write-Host "The machine policy specified $machinePolicyIdOrName appears to be a name"
+	$machinePolicyNameEscaped = $machinePolicyIdOrName.Replace(" ", "%20")
+	$machinePolicyResponse = Invoke-RestMethod "$baseApiUrl/machinepolicies?partialName=$machinePolicyNameEscaped" -Headers $header
+        
+    $machinePolicyId = $machinePolicyResponse.Items[0].Id
+    Write-Host "The machine policy id is $machinePolicyId"
+}
+
+$discoverUrl = "$baseApiUrl/machines/discover?host=$RegistrationAddress&port=$PortNumber&type=TentaclePassive"
+Write-Host "Discovering the machine $discoverUrl"
+$discoverResponse = Invoke-RestMethod $discoverUrl -Headers $header 
+Write-Host "ProjectResponse: $discoverResponse"
+
+$machineThumbprint = $discoverResponse.EndPoint.Thumbprint
+Write-Host "Thumbprint = $machineThumbprint"
+
+$rawRequest = @{
+  Id = $machineId;
+  MachinePolicyId = $MachinePolicyId;
+  Name = $RegistrationName;
+  IsDisabled = $false;
+  HealthStatus = "Unknown";
+  HasLatestCalamari = $true;
+  StatusSummary = $null;
+  IsInProcess = $true;
+  Links = $null;
+  WorkerPoolIds = $workerPoolIdList;
+  Endpoint = @{
+    Id = $null;
+    CommunicationStyle = "TentaclePassive";
+    Links = $null;
+    Uri = "https://$RegistrationAddress`:$PortNumber";
+    Thumbprint = "$machineThumbprint";
+    ProxyId = $null
+  }
+}
+
+$jsonRequest = $rawRequest | ConvertTo-Json -Depth 10
+
+Write-Host "Sending in the request $jsonRequest"
+
+$machineUrl = "$baseApiUrl/workers"
+$method = "POST"
+if ($OverwriteExisting -and $machineId -ne $null)
+{
+	$machineUrl = "$machineUrl/$machineId" 
+  	$method = "PUT"
+}
+
+Write-Host "Posting to url $machineUrl"
+$machineResponse = Invoke-RestMethod $machineUrl -Headers $header -Method $method -Body $jsonRequest
+
+Write-Host "Create workers's response: $machineResponse"
\ No newline at end of file
diff --git a/src/step-templates/octopus-serialize-runbook-to-terraform/metadata.json b/src/step-templates/octopus-serialize-runbook-to-terraform/metadata.json
new file mode 100644
index 000000000..b1c2c8ae3
--- /dev/null
+++ b/src/step-templates/octopus-serialize-runbook-to-terraform/metadata.json
@@ -0,0 +1,105 @@
+{
+  "Id": "07b966c3-130c-4f13-ae0f-5105af5b97a1",
+  "Name": "Octopus - Serialize Runbook to Terraform",
+  "Description": "Serialize an Octopus runbook as a Terraform module and upload the resulting package to the Octopus built in feed.\n\nNote the exported runbooks do not include project variables, so any project that the exported runbook is attached to must already have all project and library variables defined.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python"
+  },
+  "Parameters": [
+    {
+      "Id": "070f2882-2911-4297-b9e3-2da81abf6e70",
+      "Name": "SerializeProject.Exported.Project.IgnoreAllChanges",
+      "Label": "Ignore All Changes",
+      "HelpText": "Selecting this option creates a Terraform module with the \"lifecycle.ignore_changes\" option set to \"all\". This allows the resources to be created if they do not exist, but won't update them if the module is reapplied.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4cb3da75-7449-4adb-b81a-e87dff371a27",
+      "Name": "SerializeProject.ThisInstance.Terraform.Backend",
+      "Label": "Terraform Backend",
+      "HelpText": "The [backed](https://developer.hashicorp.com/terraform/language/settings/backends/configuration) to define in the Terraform module.",
+      "DefaultValue": "s3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aa3df492-845a-4889-a7fc-c9c6f3a95a30",
+      "Name": "SerializeProject.ThisInstance.Server.Url",
+      "Label": "Octopus Server URL",
+      "HelpText": "The URL of the Octopus Server hosting the project to be serialized.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e92dbdff-dd5a-4c95-91a1-40c0ccbb3b3f",
+      "Name": "SerializeProject.ThisInstance.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The Octopus API Key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "c906ecbd-f304-48b8-83ea-fe75008c37df",
+      "Name": "SerializeProject.Exported.Space.Id",
+      "Label": "Octopus Space ID",
+      "HelpText": "The Space ID containing the project to be exported",
+      "DefaultValue": "#{Octopus.Space.Id}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fae1f2e4-9be5-4380-9fd3-409a1a538b37",
+      "Name": "SerializeProject.Exported.Project.Name",
+      "Label": "Octopus Project Name",
+      "HelpText": "The name of the project containing the runbook.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a711f201-fa2f-4b32-9205-13f396c253d7",
+      "Name": "SerializeProject.Exported.Runbook.Name",
+      "Label": "Octopus Runbook Name",
+      "HelpText": "The name of the runbook to serialize.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "27b222da-690c-4da3-8c60-d06bc7d3505b",
+      "Name": "SerializeProject.Octopus.UploadSpace.Id",
+      "Label": "Octopus Upload Space ID",
+      "HelpText": "The ID of the space to upload the Terraform package to. Leave this blank to upload to the space defined in the `Octopus Space ID` parameter.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-11-08T23:36:23.6100000Z",
+    "OctopusVersion": "2024.1.895",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-serialize-runbook-to-terraform/scriptbody.py b/src/step-templates/octopus-serialize-runbook-to-terraform/scriptbody.py
new file mode 100644
index 000000000..f0dcba14c
--- /dev/null
+++ b/src/step-templates/octopus-serialize-runbook-to-terraform/scriptbody.py
@@ -0,0 +1,295 @@
+import argparse
+import os
+import re
+import socket
+import subprocess
+import sys
+from datetime import datetime
+from urllib.parse import urlparse
+from itertools import chain
+import platform
+from urllib.request import urlretrieve
+import zipfile
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if "printverbose" not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    output_no_ansi = re.sub('\x1b\[[0-9;]*m', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi):
+    """
+        The execute method provides the ability to execute external processes while capturing and returning the
+        output to std err and std out and exit code.
+    """
+    process = subprocess.Popen(args,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               text=True,
+                               cwd=cwd,
+                               env=env)
+    stdout, stderr = process.communicate()
+    retcode = process.returncode
+
+    if print_args is not None:
+        print_output(' '.join(args))
+
+    if print_output is not None:
+        print_output(stdout)
+        print_output(stderr)
+
+    return stdout, stderr, retcode
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION] [FILE]...',
+        description='Serialize an Octopus project to a Terraform module'
+    )
+    parser.add_argument('--ignore-all-changes',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.IgnoreAllChanges') or get_octopusvariable_quiet(
+                            'Exported.Project.IgnoreAllChanges') or 'false',
+                        help='Set to true to set the "lifecycle.ignore_changes" ' +
+                             'setting on each exported resource to "all"')
+    parser.add_argument('--terraform-backend',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.ThisInstance.Terraform.Backend') or get_octopusvariable_quiet(
+                            'ThisInstance.Terraform.Backend') or 'pg',
+                        help='Set this to the name of the Terraform backend to be included in the generated module.')
+    parser.add_argument('--server-url',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.ThisInstance.Server.Url') or get_octopusvariable_quiet(
+                            'ThisInstance.Server.Url'),
+                        help='Sets the server URL that holds the project to be serialized.')
+    parser.add_argument('--api-key',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.ThisInstance.Api.Key') or get_octopusvariable_quiet(
+                            'ThisInstance.Api.Key'),
+                        help='Sets the Octopus API key.')
+    parser.add_argument('--space-id',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Space.Id') or get_octopusvariable_quiet(
+                            'Exported.Space.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),
+                        help='Set this to the space ID containing the project to be serialized.')
+    parser.add_argument('--project-name',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Project.Name') or get_octopusvariable_quiet(
+                            'Exported.Project.Name') or get_octopusvariable_quiet(
+                            'Octopus.Project.Name'),
+                        help='Set this to the name of the project to be serialized.')
+    parser.add_argument('--runbook-name',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Exported.Runbook.Name') or get_octopusvariable_quiet(
+                            'Exported.Runbook.Name'),
+                        help='Set this to the name of the project to be serialized.')
+    parser.add_argument('--upload-space-id',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeProject.Octopus.UploadSpace.Id') or get_octopusvariable_quiet(
+                            'Octopus.UploadSpace.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),
+                        help='Set this to the space ID of the Octopus space where ' +
+                             'the resulting package will be uploaded to.')
+
+    return parser.parse_known_args()
+
+
+def ensure_octo_cli_exists():
+    if is_windows():
+        print("Checking for the Octopus CLI")
+        try:
+            stdout, _, exit_code = execute(['octo', 'help'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octo CLI not found"
+        except:
+            print("Downloading the Octopus CLI")
+            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.win-x64.zip',
+                        'OctopusTools.zip')
+            with zipfile.ZipFile('OctopusTools.zip', 'r') as zip_ref:
+                zip_ref.extractall(os.getcwd())
+
+
+def check_docker_exists():
+    try:
+        stdout, _, exit_code = execute(['docker', 'version'])
+        printverbose(stdout)
+        if not exit_code == 0:
+            raise "Docker not found"
+    except:
+        print('Docker must be installed: https://docs.docker.com/get-docker/')
+        sys.exit(1)
+
+
+check_docker_exists()
+ensure_octo_cli_exists()
+parser, _ = init_argparse()
+
+# Variable precondition checks
+if len(parser.server_url) == 0:
+    print("--server-url, ThisInstance.Server.Url, or SerializeProject.ThisInstance.Server.Url must be defined")
+    sys.exit(1)
+
+if len(parser.api_key) == 0:
+    print("--api-key, ThisInstance.Api.Key, or ThisInstance.Api.Key must be defined")
+    sys.exit(1)
+    
+octoterra_image = 'ghcr.io/octopussolutionsengineering/octoterra-windows' if is_windows() else 'ghcr.io/octopussolutionsengineering/octoterra'
+octoterra_mount = 'C:/export' if is_windows() else '/export'  
+
+print("Pulling the Docker images")
+execute(['docker', 'pull', octoterra_image])
+
+if not is_windows():
+    execute(['docker', 'pull', 'ghcr.io/octopusdeploylabs/octo'])
+
+# Find out the IP address of the Octopus container
+parsed_url = urlparse(parser.server_url)
+octopus = socket.getaddrinfo(parsed_url.hostname, '80')[0][4][0]
+
+print("Octopus hostname: " + parsed_url.hostname)
+print("Octopus IP: " + octopus.strip())
+
+os.mkdir(os.getcwd() + '/export')
+
+export_args = ['docker', 'run',
+               '--rm',
+               '--add-host=' + parsed_url.hostname + ':' + octopus.strip(),
+               '-v', os.getcwd() + '/export:' + octoterra_mount,
+               octoterra_image,
+               # the url of the instance
+               '-url', parser.server_url,
+               # the api key used to access the instance
+               '-apiKey', parser.api_key,
+               # add a postgres backend to the generated modules
+               '-terraformBackend', parser.terraform_backend,
+               # dump the generated HCL to the console
+               '-console',
+               # dump the project from the current space
+               '-space', parser.space_id,
+               # the name of the project to serialize
+               '-projectName', parser.project_name,
+               # the name of the runbook to serialize
+               '-runbookName', parser.runbook_name,
+               # ignoreProjectChanges can be set to ignore all changes to the project, variables, runbooks etc
+               '-ignoreProjectChanges=' + parser.ignore_all_changes,
+               # for any secret variables, add a default value set to the octostache value of the variable
+               # e.g. a secret variable called "database" has a default value of "#{database}"
+               '-defaultSecretVariableValues',
+               # detach any step templates, allowing the exported project to be used in a new space
+               '-detachProjectTemplates',
+               # Capture the octopus endpoint, space ID, and space name as output vars. This is useful when
+               # querying th Terraform state file to know which space and instance the resources were
+               # created in. The scripts used to update downstream projects in bulk work by querying the
+               # Terraform state, finding all the downstream projects, and using the space name to only process
+               # resources that match the current tenant (because space names and tenant names are the same).
+               # The output variables added by this option are octopus_server, octopus_space_id, and
+               # octopus_space_name.
+               '-includeOctopusOutputVars',
+               # Where steps do not explicitly define a worker pool and reference the default one, this
+               # option explicitly exports the default worker pool by name. This means if two spaces have
+               # different default pools, the exported project still uses the pool that the original project
+               # used.
+               '-lookUpDefaultWorkerPools',
+               # These tenants are linked to the project to support some management runbooks, but should not
+               # be exported
+               '-excludeAllTenants',
+               # The directory where the exported files will be saved
+               '-dest', octoterra_mount]
+
+print("Exporting Terraform module")
+_, _, octoterra_exit = execute(export_args)
+
+if not octoterra_exit == 0:
+    print("Octoterra failed. Please check the logs for more information.")
+    sys.exit(1)
+
+date = datetime.now().strftime('%Y.%m.%d.%H%M%S')
+
+print("Creating Terraform module package")
+if is_windows():
+    execute(['octo',
+             'pack',
+             '--format', 'zip',
+             '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name + "_" + parser.runbook_name),
+             '--version', date,
+             '--basePath', os.getcwd() + '\\export',
+             '--outFolder', 'C:\\export'])
+else:
+    _, _, _ = execute(['docker', 'run',
+                            '--rm',
+                            '--add-host=' + parsed_url.hostname + ':' + octopus.strip(),
+                            '-v', os.getcwd() + "/export:/export",
+                            'ghcr.io/octopusdeploylabs/octo',
+                            'pack',
+                            '--format', 'zip',
+                            '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name + "_" + parser.runbook_name),
+                            '--version', date,
+                            '--basePath', '/export',
+                            '--outFolder', '/export'])
+
+print("Uploading Terraform module package")
+if is_windows():
+    _, _, _ = execute(['octo',
+                            'push',
+                            '--apiKey', parser.api_key,
+                            '--server', parser.server_url,
+                            '--space', parser.upload_space_id,
+                            '--package', 'C:\\export\\' +
+                            re.sub('[^0-9a-zA-Z]', '_', parser.project_name + "_" + parser.runbook_name) + '.' + date + '.zip',
+                            '--replace-existing'])
+else:
+    _, _, _ = execute(['docker', 'run',
+                            '--rm',
+                            '--add-host=' + parsed_url.hostname + ':' + octopus.strip(),
+                            '-v', os.getcwd() + "/export:/export",
+                            'ghcr.io/octopusdeploylabs/octo',
+                            'push',
+                            '--apiKey', parser.api_key,
+                            '--server', parser.server_url,
+                            '--space', parser.upload_space_id,
+                            '--package', '/export/' +
+                            re.sub('[^0-9a-zA-Z]', '_', parser.project_name + "_" + parser.runbook_name) + '.' + date + '.zip',
+                            '--replace-existing'])
+
+print("##octopus[stdout-default]")
+
+print("Done")
diff --git a/src/step-templates/octopus-serialize-space-to-terraform/metadata.json b/src/step-templates/octopus-serialize-space-to-terraform/metadata.json
new file mode 100644
index 000000000..baf13b88c
--- /dev/null
+++ b/src/step-templates/octopus-serialize-space-to-terraform/metadata.json
@@ -0,0 +1,175 @@
+{
+  "Id": "e03c56a4-f660-48f6-9d09-df07e1ac90bd",
+  "Name": "Octopus - Serialize Space to Terraform",
+  "Description": "Serialize an Octopus space, excluding all projects, as a Terraform module and upload the resulting package to the Octopus built in feed.\n\nThis step is expected to be used in conjunction with the [Octopus - Serialize Project to Terraform](https://library.octopus.com/step-templates/e9526501-09d5-490f-ac3f-5079735fe041/actiontemplate-octopus-serialize-project-to-terraform) step. This step will serialize the global space resources, which typically do not change much, and have those resources recreated in a downstream space. The `Octopus - Serialize Project to Terraform` step then serializes a project, using `data` blocks to reference space level resources by name.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.py",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "Python"
+  },
+  "Parameters": [
+    {
+      "Id": "b9a96f7f-d8bc-408b-a614-5646bf44d092",
+      "Name": "SerializeSpace.ThisInstance.Terraform.Backend",
+      "Label": "Terraform Backend",
+      "HelpText": "The [backed](https://developer.hashicorp.com/terraform/language/settings/backends/configuration) to define in the Terraform module.",
+      "DefaultValue": "s3",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "941e2310-7ea0-4e76-a528-c65c9b68f8e7",
+      "Name": "SerializeSpace.ThisInstance.Server.Url",
+      "Label": "Octopus Server URL",
+      "HelpText": "The URL of the Octopus Server hosting the project to be serialized.",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6799b358-e3a5-4668-a12f-5e10e092c1c9",
+      "Name": "SerializeSpace.ThisInstance.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The Octopus API Key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "950d7bb5-c80b-42a8-84a5-a7012d0fe7ca",
+      "Name": "SerializeSpace.Exported.Space.Id",
+      "Label": "Octopus Space ID",
+      "HelpText": "The Space ID containing the project to be exported",
+      "DefaultValue": "#{Octopus.Space.Id}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "64acb2fe-b713-4f69-b08b-34546dd808cd",
+      "Name": "SerializeSpace.Octopus.UploadSpace.Id",
+      "Label": "Octopus Upload Space ID",
+      "HelpText": "The ID of the space to upload the Terraform package to. Leave this blank to upload to the space defined in the `Octopus Space ID` parameter.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e6b3d298-87e8-4965-966e-230537b4dd4c",
+      "Name": "SerializeSpace.Exported.Space.IgnoredLibraryVariableSet",
+      "Label": "Ignored Library Variables Sets",
+      "HelpText": "A comma separated list of library variables sets that will not be included in the Terraform module. These library variable sets are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b946a235-a1c1-4b04-83da-ecef622c018a",
+      "Name": "SerializeSpace.Exported.Space.IgnoredAllLibraryVariableSet",
+      "Label": "Ignore All Library Variable Sets",
+      "HelpText": "Check this option to ignore all library variable sets when serializing the Terraform module. This is useful when the downstream space already has library variable sets created.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "1208c54c-568a-4a48-9340-fbff710079b3",
+      "Name": "SerializeSpace.Exported.Space.IgnoredTenants",
+      "Label": "Ignored Tenants",
+      "HelpText": "A comma separated list of tenants that will not be included in the Terraform module. These tenants are often those used by Runbooks to identify managed spaces or instances, but which must not be recreated.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9121bc1d-df00-4ec7-ae1c-751261d2438d",
+      "Name": "SerializeSpace.Exported.Space.IgnoredAccounts",
+      "Label": "Ignored Accounts",
+      "HelpText": "A comma separated list of accounts that will not be included in the Terraform module. These accounts are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c33810ae-0f53-421d-b11a-9161bfdd0df8",
+      "Name": "SerializeSpace.Exported.Space.IgnoreTargets",
+      "Label": "Ignore All Targets",
+      "HelpText": "Check this option to ignore the targets when serializing the Terraform module. This is useful when downstream spaces require their own unique targets to work correctly.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "a8e8163e-0981-4496-a844-b16281d8ce1c",
+      "Name": "SerializeSpace.Exported.Space.DummySecrets",
+      "Label": "Default Secrets to Dummy Values",
+      "HelpText": "This option sets the default value of all secrets, like account and feed passwords, to a dummy value. This allows the resources to be created and then updated at a later time with the correct values. Note the default values can be overridden if they are known.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c068b289-5d29-4e90-b2ca-1098858044a2",
+      "Name": "SerializeSpace.Exported.Space.DefaultSecrets",
+      "Label": "Default Secrets to Default Values",
+      "HelpText": "This option sets the default value of all secrets, like account and feed passwords, to an Octostache template referencing the variable name. This allows the default value to be replaced by Octopus with the sensitive value during deployment.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "e7cbd75d-39f1-40ad-a41a-8eed8a65902c",
+      "Name": "SerializeSpace.Exported.Space.IgnoredTenantTags",
+      "Label": "Ignore Tenants with Tag",
+      "HelpText": "A comma separated list of tenant tags that identify tenants to exclude from the export. Typically tenants that represent internal teams or business units will have a tag like `TenantType/InternalCustomer` to distinguish them from other kinds of tenants.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f312be91-cc8f-49d6-afd7-fc6a6e38926c",
+      "Name": "SerializeSpace.Exported.Space.IncludeStepTemplates",
+      "Label": "Include Step Templates",
+      "HelpText": "Enable this option to export step templates.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "5944a2ce-e435-406b-a878-c499a6db4d6a",
+      "Name": "SerializeSpace.Exported.Space.OctopusManagedTerraformVars",
+      "Label": "Octopus Managed Terraform Vars",
+      "HelpText": "The optional name of an Octopus variable to use as the terraform.tfvars file.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-10-24T05:39:19.0040000Z",
+    "OctopusVersion": "2023.4.6612",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-serialize-space-to-terraform/scriptbody.py b/src/step-templates/octopus-serialize-space-to-terraform/scriptbody.py
new file mode 100644
index 000000000..e36041114
--- /dev/null
+++ b/src/step-templates/octopus-serialize-space-to-terraform/scriptbody.py
@@ -0,0 +1,430 @@
+import argparse
+import os
+import stat
+import re
+import socket
+import subprocess
+import sys
+from datetime import datetime
+from urllib.parse import urlparse
+from itertools import chain
+import platform
+from urllib.request import urlretrieve
+import zipfile
+import urllib.request
+import urllib.parse
+import json
+import tarfile
+import random, time
+
+# If this script is not being run as part of an Octopus step, return variables from environment variables.
+# Periods are replaced with underscores, and the variable name is converted to uppercase
+if "get_octopusvariable" not in globals():
+    def get_octopusvariable(variable):
+        return os.environ[re.sub('\\.', '_', variable.upper())]
+
+# If this script is not being run as part of an Octopus step, print directly to std out.
+if "printverbose" not in globals():
+    def printverbose(msg):
+        print(msg)
+
+
+def printverbose_noansi(output):
+    """
+    Strip ANSI color codes and print the output as verbose
+    :param output: The output to print
+    """
+    if not output:
+        return
+
+    # https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python
+    output_no_ansi = re.sub(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])', '', output)
+    printverbose(output_no_ansi)
+
+
+def get_octopusvariable_quiet(variable):
+    """
+    Gets an octopus variable, or an empty string if it does not exist.
+    :param variable: The variable name
+    :return: The variable value, or an empty string if the variable does not exist
+    """
+    try:
+        return get_octopusvariable(variable)
+    except:
+        return ''
+
+
+def retry_with_backoff(fn, retries=5, backoff_in_seconds=1):
+    x = 0
+    while True:
+        try:
+            return fn()
+        except Exception as e:
+
+            print(e)
+
+            if x == retries:
+                raise
+
+            sleep = (backoff_in_seconds * 2 ** x +
+                     random.uniform(0, 1))
+            time.sleep(sleep)
+            x += 1
+
+
+def execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi):
+    """
+        The execute method provides the ability to execute external processes while capturing and returning the
+        output to std err and std out and exit code.
+    """
+    process = subprocess.Popen(args,
+                               stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE,
+                               text=True,
+                               cwd=cwd,
+                               env=env)
+    stdout, stderr = process.communicate()
+    retcode = process.returncode
+
+    if print_args is not None:
+        print_output(' '.join(args))
+
+    if print_output is not None:
+        print_output(stdout)
+        print_output(stderr)
+
+    return stdout, stderr, retcode
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def init_argparse():
+    parser = argparse.ArgumentParser(
+        usage='%(prog)s [OPTION] [FILE]...',
+        description='Serialize an Octopus project to a Terraform module'
+    )
+    parser.add_argument('--terraform-backend',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.ThisInstance.Terraform.Backend') or get_octopusvariable_quiet(
+                            'ThisInstance.Terraform.Backend') or 'pg',
+                        help='Set this to the name of the Terraform backend to be included in the generated module.')
+    parser.add_argument('--server-url',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.ThisInstance.Server.Url') or get_octopusvariable_quiet(
+                            'ThisInstance.Server.Url'),
+                        help='Sets the server URL that holds the project to be serialized.')
+    parser.add_argument('--api-key',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.ThisInstance.Api.Key') or get_octopusvariable_quiet(
+                            'ThisInstance.Api.Key'),
+                        help='Sets the Octopus API key.')
+    parser.add_argument('--space-id',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.Id') or get_octopusvariable_quiet(
+                            'Exported.Space.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),
+                        help='Set this to the space ID containing the project to be serialized.')
+    parser.add_argument('--upload-space-id',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Octopus.UploadSpace.Id') or get_octopusvariable_quiet(
+                            'Octopus.UploadSpace.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),
+                        help='Set this to the space ID of the Octopus space where ' +
+                             'the resulting package will be uploaded to.')
+    parser.add_argument('--ignored-library-variable-sets',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IgnoredLibraryVariableSet') or get_octopusvariable_quiet(
+                            'Exported.Space.IgnoredLibraryVariableSet'),
+                        help='A comma separated list of library variable sets to ignore.')
+
+    parser.add_argument('--ignored-all-library-variable-sets',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IgnoredAllLibraryVariableSet') or get_octopusvariable_quiet(
+                            'Exported.Space.IgnoredAllLibraryVariableSet') or 'false',
+                        help='Set to true to exclude library variable sets from the exported module')
+
+    parser.add_argument('--ignored-tenants',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IgnoredTenants') or get_octopusvariable_quiet(
+                            'Exported.Space.IgnoredTenants'),
+                        help='A comma separated list of tenants ignore.')
+
+    parser.add_argument('--ignored-tenants-with-tag',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IgnoredTenantTags') or get_octopusvariable_quiet(
+                            'Exported.Space.IgnoredTenants'),
+                        help='A comma separated list of tenant tags that identify tenants to ignore.')
+    parser.add_argument('--ignore-all-targets',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IgnoreTargets') or get_octopusvariable_quiet(
+                            'Exported.Space.IgnoreTargets') or 'false',
+                        help='Set to true to exclude targets from the exported module')
+
+    parser.add_argument('--dummy-secret-variables',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.DummySecrets') or get_octopusvariable_quiet(
+                            'Exported.Space.DummySecrets') or 'false',
+                        help='Set to true to set secret values, like account and feed passwords, to a dummy value by default')
+
+    parser.add_argument('--default-secret-variables',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.DefaultSecrets') or get_octopusvariable_quiet(
+                            'Exported.Space.DefaultSecrets') or 'false',
+                        help='Set to true to set sensitive variables to the octostache template that represents the variable')
+    parser.add_argument('--include-step-templates',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IncludeStepTemplates') or get_octopusvariable_quiet(
+                            'Exported.Space.IncludeStepTemplates') or 'false',
+                        help='Set this to true to include step templates in the exported module. ' +
+                             'This disables the default behaviour of detaching step templates.')
+    parser.add_argument('--ignored-accounts',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.IgnoredAccounts') or get_octopusvariable_quiet(
+                            'Exported.Space.IgnoredAccounts'),
+                        help='A comma separated list of accounts to ignore.')
+    parser.add_argument('--octopus-managed-terraform-vars',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'SerializeSpace.Exported.Space.OctopusManagedTerraformVars') or get_octopusvariable_quiet(
+                            'Exported.Space.OctopusManagedTerraformVars'),
+                        help='The name of an Octopus variable to use as the terraform.tfvars file.')
+
+    return parser.parse_known_args()
+
+
+def get_latest_github_release(owner, repo, filename):
+    url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
+    releases = urllib.request.urlopen(url).read()
+    contents = json.loads(releases)
+
+    download = [asset for asset in contents.get('assets') if asset.get('name') == filename]
+
+    if len(download) != 0:
+        return download[0].get('browser_download_url')
+
+    return None
+
+
+def ensure_octo_cli_exists():
+    if is_windows():
+        print("Checking for the Octopus CLI")
+        try:
+            stdout, _, exit_code = execute(['octo.exe', 'help'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octo CLI not found"
+            return ""
+        except:
+            print("Downloading the Octopus CLI")
+            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.win-x64.zip',
+                        'OctopusTools.zip')
+            with zipfile.ZipFile('OctopusTools.zip', 'r') as zip_ref:
+                zip_ref.extractall(os.getcwd())
+            return os.getcwd()
+    else:
+        print("Checking for the Octopus CLI for Linux")
+        try:
+            stdout, _, exit_code = execute(['octo', 'help'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octo CLI not found"
+            return ""
+        except:
+            print("Downloading the Octopus CLI for Linux")
+            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.linux-x64.tar.gz',
+                        'OctopusTools.tar.gz')
+            with tarfile.open('OctopusTools.tar.gz') as file:
+                file.extractall(os.getcwd())
+                os.chmod(os.path.join(os.getcwd(), 'octo'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)
+            return os.getcwd()
+
+
+def ensure_octoterra_exists():
+    if is_windows():
+        print("Checking for the Octoterra tool for Windows")
+        try:
+            stdout, _, exit_code = execute(['octoterra.exe', '-version'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octoterra not found"
+            return ""
+        except:
+            print("Downloading Octoterra CLI for Windows")
+            retry_with_backoff(lambda: urlretrieve(
+                "https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_windows_amd64.exe",
+                'octoterra.exe'), 10, 30)
+            return os.getcwd()
+    else:
+        print("Checking for the Octoterra tool for Linux")
+        try:
+            stdout, _, exit_code = execute(['octoterra', '-version'])
+            printverbose(stdout)
+            if not exit_code == 0:
+                raise "Octoterra not found"
+            return ""
+        except:
+            print("Downloading Octoterra CLI for Linux")
+            retry_with_backoff(lambda: urlretrieve(
+                "https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_linux_amd64",
+                'octoterra'), 10, 30)
+            os.chmod(os.path.join(os.getcwd(), 'octoterra'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)
+            return os.getcwd()
+
+
+octocli_path = ensure_octo_cli_exists()
+octoterra_path = ensure_octoterra_exists()
+parser, _ = init_argparse()
+
+# Variable precondition checks
+if len(parser.server_url) == 0:
+    print("--server-url, ThisInstance.Server.Url, or SerializeSpace.ThisInstance.Server.Url must be defined")
+    sys.exit(1)
+
+if len(parser.api_key) == 0:
+    print("--api-key, ThisInstance.Api.Key, or SerializeSpace.ThisInstance.Api.Key must be defined")
+    sys.exit(1)
+
+
+print("Octopus URL: " + parser.server_url)
+print("Octopus Space ID: " + parser.space_id)
+
+# Build the arguments to ignore library variable sets
+ignores_library_variable_sets = parser.ignored_library_variable_sets.split(',')
+ignores_library_variable_sets_args = [['-excludeLibraryVariableSetRegex', x] for x in ignores_library_variable_sets if
+                                      x.strip() != '']
+
+# Build the arguments to ignore tenants
+ignores_tenants = parser.ignored_tenants.split(',')
+ignores_tenants_args = [['-excludeTenants', x] for x in ignores_tenants if x.strip() != '']
+
+# Build the arguments to ignore tenants with tags
+ignored_tenants_with_tag = parser.ignored_tenants_with_tag.split(',')
+ignored_tenants_with_tag_args = [['-excludeTenantsWithTag', x] for x in ignored_tenants_with_tag if x.strip() != '']
+
+# Build the arguments to ignore accounts
+ignored_accounts = parser.ignored_accounts.split(',')
+ignored_accounts = [['-excludeAccountsRegex', x] for x in ignored_accounts]
+
+os.mkdir(os.getcwd() + '/export')
+
+export_args = [os.path.join(octoterra_path, 'octoterra'),
+               # the url of the instance
+               '-url', parser.server_url,
+               # the api key used to access the instance
+               '-apiKey', parser.api_key,
+               # add a postgres backend to the generated modules
+               '-terraformBackend', parser.terraform_backend,
+               # dump the generated HCL to the console
+               '-console',
+               # dump the project from the current space
+               '-space', parser.space_id,
+               # Use default dummy values for secrets (e.g. a feed password). These values can still be overridden if known,
+               # but allows the module to be deployed and have the secrets updated manually later.
+               '-dummySecretVariableValues=' + parser.dummy_secret_variables,
+               # for any secret variables, add a default value set to the octostache value of the variable
+               # e.g. a secret variable called "database" has a default value of "#{database}"
+               '-defaultSecretVariableValues=' + parser.default_secret_variables,
+               # Add support for experimental step templates
+               '-experimentalEnableStepTemplates=' + parser.include_step_templates,
+               # Don't export any projects
+               '-excludeAllProjects',
+               # Output variables allow the Octopus space and instance to be determined from the Terraform state file.
+               '-includeOctopusOutputVars',
+               # Provide an option to ignore targets.
+               '-excludeAllTargets=' + parser.ignore_all_targets,
+               # Provide an option to exclude all library variable sets
+               '-excludeAllLibraryVariableSets=' + parser.ignored_all_library_variable_sets,
+               # Define the name of an Octopus variable to populte the terraform.tfvars file
+               '-octopusManagedTerraformVars=' + parser.octopus_managed_terraform_vars,
+               # The directory where the exported files will be saved
+               '-dest', os.getcwd() + '/export'] + list(
+    chain(*ignores_library_variable_sets_args, *ignores_tenants_args, *ignored_tenants_with_tag_args,
+          *ignored_accounts))
+
+print("Exporting Terraform module")
+_, _, octoterra_exit = execute(export_args)
+
+if not octoterra_exit == 0:
+    print("Octoterra failed. Please check the verbose logs for more information.")
+    sys.exit(1)
+
+date = datetime.now().strftime('%Y.%m.%d.%H%M%S')
+
+print('Looking up space name')
+url = parser.server_url + '/api/Spaces/' + parser.space_id
+headers = {
+    'X-Octopus-ApiKey': parser.api_key,
+    'Accept': 'application/json'
+}
+request = urllib.request.Request(url, headers=headers)
+
+# Retry the request for up to a minute.
+response = None
+for x in range(12):
+    response = urllib.request.urlopen(request)
+    if response.getcode() == 200:
+        break
+    time.sleep(5)
+
+if not response or not response.getcode() == 200:
+    print('The API query failed')
+    sys.exit(1)
+
+data = json.loads(response.read().decode("utf-8"))
+print('Space name is ' + data['Name'])
+
+print("Creating Terraform module package")
+if is_windows():
+    execute([os.path.join(octocli_path, 'octo.exe'),
+             'pack',
+             '--format', 'zip',
+             '--id', re.sub('[^0-9a-zA-Z]', '_', data['Name']),
+             '--version', date,
+             '--basePath', os.getcwd() + '\\export',
+             '--outFolder', os.getcwd()])
+else:
+    _, _, _ = execute([os.path.join(octocli_path, 'octo'),
+                       'pack',
+                       '--format', 'zip',
+                       '--id', re.sub('[^0-9a-zA-Z]', '_', data['Name']),
+                       '--version', date,
+                       '--basePath', os.getcwd() + '/export',
+                       '--outFolder', os.getcwd()])
+
+print("Uploading Terraform module package")
+if is_windows():
+    _, _, _ = execute([os.path.join(octocli_path, 'octo.exe'),
+                       'push',
+                       '--apiKey', parser.api_key,
+                       '--server', parser.server_url,
+                       '--space', parser.upload_space_id,
+                       '--package', os.getcwd() + "\\" +
+                       re.sub('[^0-9a-zA-Z]', '_', data['Name']) + '.' + date + '.zip',
+                       '--replace-existing'])
+else:
+    _, _, _ = execute([os.path.join(octocli_path, 'octo'),
+                       'push',
+                       '--apiKey', parser.api_key,
+                       '--server', parser.server_url,
+                       '--space', parser.upload_space_id,
+                       '--package', os.getcwd() + "/" +
+                       re.sub('[^0-9a-zA-Z]', '_', data['Name']) + '.' + date + '.zip',
+                       '--replace-existing'])
+
+print("##octopus[stdout-default]")
+
+print("Done")
diff --git a/src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/metadata.json b/src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/metadata.json
new file mode 100644
index 000000000..b8b22bdf0
--- /dev/null
+++ b/src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/metadata.json
@@ -0,0 +1,77 @@
+{
+  "Id": "c6faf6be-296c-44ee-abf6-ce87331b2557",
+  "Name": "Set Octopus release notes from TFS query",
+  "Description": "Sets Octopus release notes from TFS query",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "08ce7e1a-7251-4b9f-bd07-f63cbfbc7f20",
+      "Name": "tfsInstance",
+      "Label": "TFS Instance",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "85eff544-5275-420f-81d8-cf01ea42d903",
+      "Name": "tfsCollection",
+      "Label": "Collection",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a423bf6c-52be-4994-8bab-2d64f05f167f",
+      "Name": "tfsProject",
+      "Label": "Project",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1db49bf8-d38a-4ae7-b858-693c584272d5",
+      "Name": "tfsPat",
+      "Label": "Personal access token",
+      "HelpText": "Personal access token to retrieve from TFS",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "0427c73a-2925-4c55-a2ce-5584cd24b1dd",
+      "Name": "octopusAPIKey",
+      "Label": "Octopus API key",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2023-02-16T15:38:44.0430000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/scriptbody.ps1 b/src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/scriptbody.ps1
new file mode 100644
index 000000000..1075b02f4
--- /dev/null
+++ b/src/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query/scriptbody.ps1
@@ -0,0 +1,138 @@
+#TFS
+$instance = $OctopusParameters["tfsInstance"]
+$collection = $OctopusParameters["tfsCollection"]
+$project = $OctopusParameters["tfsProject"]
+$PAT = $OctopusParameters["tfsPat"]
+$pathquery = $OctopusParameters["tfsPathQuery"]
+
+#Octopus
+$octopusAPIKey = $OctopusParameters['octopusAPIKey']
+$baseUri = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}']
+$octopusProjectId = $OctopusParameters['Octopus.Project.Id']
+$thisReleaseNumber = $OctopusParameters['Octopus.Release.Number']
+
+write-host "Instance: $($instance)"
+write-host "collection: $($collection)"
+write-host "project: $($project)"
+write-host "baseUri: $($baseUri)"
+write-host "projectId: $($projectId)"
+write-host "thisReleaseNumber: $($thisReleaseNumber)"
+write-host "TFS path: $($pathquery)"
+
+#Create HEADERS
+$bytes = [System.Text.Encoding]::ASCII.GetBytes($PAT)
+$base64 = [System.Convert]::ToBase64String($bytes)
+$basicAuthValue = "Basic $base64"
+$headers = @{ }
+$headers.Add("Authorization", $basicAuthValue)
+$headers.Add("Accept","application/json")
+$headers.Add("Content-Type","application/json")
+
+$reqheaders = @{"X-Octopus-ApiKey" = $octopusAPIKey }
+$putReqHeaders = @{"X-HTTP-Method-Override" = "PUT"; "X-Octopus-ApiKey" = $octopusAPIKey }
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-WebRequest "$baseUri/api" -Headers $reqheaders -UseBasicParsing | ConvertFrom-Json;
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if(Test-SpacesApi) {
+	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+    }
+	$baseApiUrl = "/api/$spaceId" ;
+} else {
+	$baseApiUrl = "/api" ;
+}
+
+# Get the current release
+$releaseUri = "$baseUri$baseApiUrl/projects/$octopusProjectId/releases/$thisReleaseNumber"
+write-host "Release uri $($releaseUri)"
+try {
+    $currentRelease = Invoke-RestMethod $releaseUri -Headers $reqheaders -UseBasicParsing 
+} catch {
+    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {
+        $result = $_.Exception.Response.GetResponseStream()
+        $reader = New-Object System.Io.StreamReader($result);
+        $responseBody = $reader.ReadToEnd();
+        throw "Error occurred: $responseBody"
+    }
+}
+
+if(![string]::IsNullOrWhiteSpace($currentRelease.ReleaseNotes)){
+	write-host "Release notes already filled in. $($currentRelease.ReleaseNotes)"
+    Set-OctopusVariable -name "ReleaseNotes" -value $releaseNotes
+	exit;
+}
+
+
+#Get projectid
+$url = "http://$($instance)/tfs/$($collection)/$($projectId)/_apis/projects/$($project)?&includeCapabilities=false&includeHistory=false&api-version=2.2"
+write-host "Invoking url= $($url)"
+$projectresponse = Invoke-RestMethod $url -Method GET -Headers $headers
+
+$projectid = $projectresponse.id
+write-host "projectid $($projectid)"
+
+#Get the ID of the query to execute
+$queryResult = Invoke-RestMethod "http://$($instance)/tfs/$($collection)/$($projectId)/_apis/$($pathquery)?$depth=1&api-version=2.2" -Method GET -Headers $headers
+write-host "queryResult $($queryResult)"
+
+#https://{instance}/DefaultCollection/[{project}/]_apis/wit/wiql/{id}?api-version={version}
+$queryResult = Invoke-RestMethod "http://$($instance)/tfs/$($collection)/$($projectId)/_apis/wit/wiql/$($queryResult.Id)?api-version=2.2" -Method GET -Headers $headers
+
+Write-Host "Found $($queryResult.workItems.Count) number of workitems for query: ReleaseNotes$($releaseTag)"
+
+$releaseNotes = "**Work Items:**"
+
+
+if($queryResult.workItems.Count -eq 0)
+{
+	Write-Host "No work items for release"
+	$releaseNotes = "`n no new work items"
+}
+else
+{
+	#Create a list of ids
+	$ids = [string]::Join("%2C", ($queryResult.workItems.id))
+
+	#Get all the work items
+	$workItems = Invoke-RestMethod  "http://$($instance)/tfs/$($collection)/_apis/wit/workItems?ids=$($ids)&fields=System.Title" -Method GET -Headers $headers
+
+	foreach($workItem in $workItems.value)
+	{
+		#Add line for each work item
+		$releaseNotes = $releaseNotes + "`n* [$($workItem.id)] (http://$($instance)/tfs/$($collection)/9981e67f-b27c-4628-b5cf-fba1d327aa07/_workitems/edit/$($workItem.id)) : $($workItem.fields.'System.Title')"
+	}
+
+}
+
+
+
+# Update the release notes for the current release
+$currentRelease.ReleaseNotes = $releaseNotes 
+write-host "Release notes $($currentRelease.ReleaseNotes)"
+Write-Host "Updating release notes for $thisReleaseNumber`:`n`n"
+try {
+    $releaseUri = "$baseUri$baseApiUrl/releases/$($currentRelease.Id)"
+    write-host "Release uri $($releaseUri)"
+    $currentReleaseBody = $currentRelease | ConvertTo-Json
+    write-host "Current release body $($currentReleaseBody)"
+    $result = Invoke-RestMethod $releaseUri -Method Post -Headers $putReqHeaders -Body $currentReleaseBody -UseBasicParsing
+	write-host "result $($result)"
+} catch {
+    $result = $_.Exception.Response.GetResponseStream()
+    $reader = New-Object System.Io.StreamReader($result);
+    $responseBody = $reader.ReadToEnd();
+    Write-Host "error $($responseBody)"
+    throw "Error occurred: $responseBody"
+}
+
+Set-OctopusVariable -name "ReleaseNotes" -value $releaseNotes
diff --git a/src/step-templates/octopus-smtp-server-configured/metadata.json b/src/step-templates/octopus-smtp-server-configured/metadata.json
new file mode 100644
index 000000000..dcd12269b
--- /dev/null
+++ b/src/step-templates/octopus-smtp-server-configured/metadata.json
@@ -0,0 +1,36 @@
+{
+  "Id": "ad8126be-37af-4297-b46e-fce02ba3987a",
+  "Name": "Octopus - Check SMTP Server Configured",
+  "Description": "Checks that the SMTP server has been configured.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "d48a2f7f-f895-459a-ae63-e81c8eb24d43",
+      "Name": "SmtpCheck.Octopus.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "The API key used to access the Octopus instance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-10-12T23:48:48.0860000Z",
+    "OctopusVersion": "2025.3.14357",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "Octopus"
+}
diff --git a/src/step-templates/octopus-smtp-server-configured/scriptbody.ps1 b/src/step-templates/octopus-smtp-server-configured/scriptbody.ps1
new file mode 100644
index 000000000..1ea83d238
--- /dev/null
+++ b/src/step-templates/octopus-smtp-server-configured/scriptbody.ps1
@@ -0,0 +1,41 @@
+$apiKey = "#{SmtpCheck.Octopus.Api.Key}"
+$isSmtpConfigured = $false
+
+if (![string]::IsNullOrWhitespace($apiKey) -and $apiKey.StartsWith("API-"))
+{
+    if ([String]::IsNullOrWhitespace("#{Octopus.Web.ServerUri}"))
+    {
+        $octopusUrl = "#{Octopus.Web.BaseUrl}"
+    }
+    else
+    {
+        $octopusUrl = "#{Octopus.Web.ServerUri}"
+    }
+
+    $uriBuilder = New-Object System.UriBuilder("$octopusUrl/api/smtpconfiguration/isconfigured")
+    $uri = $uriBuilder.ToString()
+
+    try
+    {
+        $headers = @{ "X-Octopus-ApiKey" = $apiKey }
+        $smtpConfigured = Invoke-RestMethod -Method Get -Uri $uri -Headers $headers
+        $isSmtpConfigured = $smtpConfigured.IsConfigured
+    }
+    catch
+    {
+        Write-Host "Error checking SMTP configuration: $($_.Exception.Message)"
+    }
+}
+else
+{
+    Write-Highlight "The project variable SmtpCheck.Octopus.Api.Key has not been configured, unable to check SMTP configuration."
+    Write-Highlight "See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys."
+    Write-Highlight "Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check the SMTP configuration."
+}
+
+if (-not $isSmtpConfigured)
+{
+    Write-Highlight "SMTP is not configured. Please [configure SMTP](https://octopus.com/docs/projects/built-in-step-templates/email-notifications#smtp-configuration) settings in Octopus Deploy."
+}
+
+Set-OctopusVariable -Name SmtpConfigured -Value $isSmtpConfigured
\ No newline at end of file
diff --git a/src/step-templates/octopus-support-export/metadata.json b/src/step-templates/octopus-support-export/metadata.json
new file mode 100644
index 000000000..ef2dbe945
--- /dev/null
+++ b/src/step-templates/octopus-support-export/metadata.json
@@ -0,0 +1,64 @@
+{
+  "Id": "de1fb4d2-5cc7-43cc-8dfc-633d63e97c92",
+  "Name": "Octopus - Support Export",
+  "Description": "This step template will take an already exported project on your server and do the following:\n- Change all sensitive variables to plain text variables, and the values will become \"Sensitive Variable Was Here\"\n- All accounts will have their details nulled out\n- All certificates will have junk data put into their json\n\nAfter the above is complete, the modified zip file will be attached to the task that you can download and send to support. Please remember, support will still need the password you used to create the original export, but now there will be no sensitive data available.\n\nNOTE: This step template currently DOES NOT purge any Tenant variables. If you have any Tenants connected to this project with variables you are concerned about sharing, you will need to import the modified zip into a blank space and remove the values, and re-export for now. This functionality will come in a future update to the step template.\n\n**NOTE: This template only works on Octopus Server 2021.1 and above, as it requires project import/export to be available.**",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4833547d-71c7-4b60-bf3e-1bdfb2847f26",
+      "Name": "SupportExportSpaceName",
+      "Label": "Space Name",
+      "HelpText": "The Space that has the project and export task that you want to be scrubbed.",
+      "DefaultValue": "Default",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2aaa1afe-bad9-4eae-b79b-467fd4a19ec5",
+      "Name": "SupportExportAPIKey",
+      "Label": "API Key",
+      "HelpText": "API Key that has access to the project and task.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "68874953-98d4-4c45-8046-90208330e0c8",
+      "Name": "SupportExportTaskID",
+      "Label": "Task ID",
+      "HelpText": "Task ID of the export you want to be scrubbed",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d075d988-210a-4239-b3e3-1923679762c8",
+      "Name": "SupportExportServerURL",
+      "Label": "ServerURL",
+      "HelpText": "This will default to the Defined Server URI in Configuration->Nodes. In some cases, you might want to define the URL that you want the API call to run against rather than letting the default value be used. If you get a connection issue, try defining a known good URL here.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2022-06-01T15:54:33.1400000Z",
+    "OctopusVersion": "2022.1.2584",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "millerjn21",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-support-export/scriptbody.ps1 b/src/step-templates/octopus-support-export/scriptbody.ps1
new file mode 100644
index 000000000..2938189cb
--- /dev/null
+++ b/src/step-templates/octopus-support-export/scriptbody.ps1
@@ -0,0 +1,154 @@
+Add-Type -AssemblyName System.Web
+
+#Gathering Parameters
+[string]$SpaceName = $OctopusParameters["SupportExportSpaceName"]
+[string]$APIKey = $OctopusParameters["SupportExportAPIKey"]
+[string]$serverTaskId = $OctopusParameters["SupportExportTaskID"]
+[string]$OctopusURL = $OctopusParameters["SupportExportServerURL"]
+
+if ([string]::IsNullOrEmpty($SpaceName)){
+	Write-Error "You did not supply a space name. The space name is required."
+    exit
+}
+if ([string]::IsNullOrEmpty($APIKey)){
+	Write-Error "You did not supply an API Key. An API Key is required."
+    exit
+}
+if ([string]::IsNullOrEmpty($serverTaskId)){
+	Write-Error "You did not supply the task ID of the export task you want to be scrubbed. This parameter is required."
+    exit
+}
+
+#If the Server URL parameter was empty, use the ServerURI if it exists, if not, use the BaseURL, which could result in a failed connection in some environments so it's a last resort.
+if ([string]::IsNullOrEmpty($OctopusURL))
+{
+    if ([string]::IsNullOrEmpty("#{Octopus.Web.ServerUri}")){
+         $OctopusURL = "#{Octopus.Web.BaseUrl}"
+    }
+    else{
+         $OctopusURL = "#{Octopus.Web.ServerUri}"
+    }
+}
+$header = @{ "X-Octopus-ApiKey" = $APIKey }
+$fileDownloadPath = "#{env:OctopusCalamariWorkingDirectory}"
+
+#Junk Certificate to overwrite the exported certs with
+$junkCert = @"
+ {
+  "CertificateData": "ZV+cWXHpMqMfmZrMXndg+8TGup8TkDYQUrHVU8Q/b2wJwjpj5QqDry43RUWUX7FNbGwqCtLI5PtKZ9C6gfGdAUYK6frdal/IatPrVZV+uLQZKEE4S+ky5bu8U8WQ7KjQP70i39ayde2N1nnhXpdjbhYBqky3rFwdzRH3O1qOA+aJWOQs7tUgMP+A+2N+jRGanMAwhBNyAsk//84mgWxBFCdx6HJFAvfD4oxa6uQHURl34GFvk1CS2EKdfyqSjrz8nle1YYD68L4kBvERAyZvnzMW34fpUfNNEd9KepIKWbmNhO87yPgaspUFF2LV2tEsu2AXv1l4Rhzn+8cHsTsCJMEz1VPVPJ217+OZIudSJMo0Zx5YVJHpOsRwKL6n3fYYrFYqMZG/DIoRK+SlmgHcmsZ0YfA5NmCprppLxzOmWbsD6t6gOFUAhPj9G314GDfAmV3B54rWXqWnR/VEGc778rfw+mSHScpJAt0fA/xEZgsbd6CQYYmOGvwx2tOYSE3l56QTQEBatCv+zdWRH3dI7Tdr8Yrf2zrHACXDdk+/19oNBVSWsgwgDg/xu+4p9Y/ZyW1pZFbY6ZEgTTegeNbl5U6Lkb8QlMMFd98yDiQqhKSeDanF4N+yrwefhV+JGmfiOzhgcO3zEHf6gFALZnk9umf2y38fRnOc9rfOymG0rlDr+S6Rx3Xc0vvqH/FeS7e/ctc3dmKB7bYC0KeJNWxEkGpJw0bdudM+nJnjVvCmDfjBCW1ScKTpm9sZ02E/SPiL9gGUds1hAALtdZ70UDSjyDvlPKxPu/w0lPLUqPgSavCeoLTVfGZVVY9rHLOKDTvRlqSMzl90TdovuXGcDHqyQL8T5imRRAhxGaaVZxmLzGXoPWacNkAP79wrnGkKU6GHSNZfC9CtZ21FVGAyEZPyRuXc9nhWPcyl4/rdt+ne/5c96E/lwTmV2thRKdD0awDkQmWji+6+aJUtSCpw69xJcCIVzb3g/4j02ugZAL8/jjDPiLLytWRUNTTSH/RSpPnHUPi0/ciiGev8O7AblGA8Z7g7ok1WOl8FBERvUd3hpX6z0nbrKe4za7ydNivNNouWEpKZoenC82BoQAGkkCHcNio1UJYWn8Ri3W15Eml+bZ2Z4qbeUWp5ro2kwL4vwyte941FGOJEv4YBA4EKeRbr2oY1wzFFxq0kcLXdR42Bqpcn3HXdYSkl/ZmyNh33AWa4ooda51ouBJ6Ae43U201xt8OXow/w2mo913z3uclBG0pJcoHc4o1uQS6/ZTp6hxEPvOmJNc1c14E5gykUNuSs0u1TAVra49W486XOAniSb9RvnJ1iqja2aUeY4B835cjTeAx5xBIL+ESwxBpiFeCy5IyhNINOL3lWW+H1NruCC+otPVUVroYenPXRHXA0dng/koPgQ89Ck0/8dQ/SJM/IP0fyJE7NFZWu9XofcpfTSk6Pte17R3m4VuTYjx/oG0tkq3UL4s0Khj0s+H3CISK2Qc0BwE1S1l9bQ5Ukz1v7HFcn77mKgzk5PB4sowMrwWyBtLMcVF2d460Aa0eM8/OA1m9ZrkzAeBGRUMy9dLQAAowGMYui5TfGNUBlVeBaMc1IoKpJUgcvAu5sYcPJvOOLO1wRUFIhu9qwlHbAx/hl6ZfxShDx5BZV8eN60dMm7N34PuZpe/mL80P3z+SNLz9NuBjM5lg82O25dOBkTYRZFt6Hmmc3431vLLvbCMvhcRJNuaa/p3JPjY/uXEuzknQ2/hw9YvgY2+BrovE6SoWlPsppfisTcGhYx80hOGX4kzMpNNW+XeD0o7SWXvCIq2VrI1dQWgZ0AIgOv7oaVmQ2isaJyaGG4P6Uz39BOoBzH4k/beSFt3RwF2DELk1hVbk8F/XieQlzgrqBalFpJZ8sdlRDAKntdSolxQEMrwKAIHeiJxtV9rwOhubTFlcJEyDISwVTz1j5lWrj6j/dv4lzLVIY58lwzqhOrh734OU/N9pr0rCZViiAl3adh7gVLpMNRZ4RJPBAKbbZImkeA/eFAxXEhi5fS9R3gUyHvqxwOySTIVPXXRENRgjdnq9cmqtszpw/1Bm4cN/iD+H0kh7UA98X48iJ3VxdWfe7qjJFcz6euyRKdejxZMrk2rfHAu7kcMIcDuACsoqRxPADPVJFGbMxJDrB6B0MfLxettxX3crmLfzknkHWsVvCW3mdZcNYszf8N7VJ/fFI7oNhq6ptq3yaeJqOTBNFUD9PcITkH4P3iUYlOf4jS2rXuLmcGDqKGQ2EzUa7YFUa3iwp5iOQnnfG4xpGGYhUz/QZHKNNufklgzFpVONn2rCfxLeHxbaZodny3uAQJiqNPQzLaBLqt1Jh/F+l9h/TEfjfIsXwygoIsPXRW6dlxa/Zkqy7+4fGQp8L7wjYWmZi+icq4pnI6ai4sqIKuz+xQGtwV2JLy8kLKaXzA7jTDV0wzJ7pmwAzbkX24sLznBYD4wUbb0Ix7G8=|AAAAAAAAAAAAAAAAAAAAAA==",
+  "Password": null,
+  "CertificateMetadata": {
+    "Type": "Valid",
+    "CertificateDataFormat": "Pem",
+    "HasPrivateKey": false,
+    "RootCertificate": {
+      "Version": 3,
+      "SerialNumber": "01",
+      "SignatureAlgorithmName": "SHA-1withRSA",
+      "NotBefore": "2014-01-28T15:36:55-05:00",
+      "NotAfter": "2024-01-26T15:36:55-05:00",
+      "SubjectName": "CN=www.dimi.fr,O=Internet Widgits Pty Ltd,ST=Some-State,C=FR",
+      "IssuerName": "E=dimi@dimi.fr,CN=Dimi CA,OU=NSBU,O=Dimi,L=Paris,ST=Some-State,C=FR",
+      "Thumbprint": "AD42744CC010C079D9CC08A17A45414C8140B1E7",
+      "SubjectAlternativeNames": []
+    },
+    "CertificateChain": []
+  }
+  }
+
+
+"@
+$junkCert = $junkCert | ConvertFrom-Json
+
+Write-Host "Getting the space information"
+$spaceList = Invoke-RestMethod -Method Get -Uri "$OctopusUrl/api/spaces?skip=0&take=10&partialName=$([System.Web.HTTPUtility]::UrlEncode($spaceName))" -Headers $header
+$space = $spaceList.Items | Where-Object {$_.Name -eq $spaceName}
+$spaceId = $space.Id
+
+#Getting artifact from the export task
+$artifactList = Invoke-RestMethod -Method Get -Uri "$OctopusUrl/api/$spaceId/artifacts?regarding=$serverTaskId" -Headers $header
+$artifact = $artifactList.Items | Where-Object {$_.Filename -like "*Octopus-Export*"}
+$fullname = $artifact.Filename
+$artifactId = $artifact.Id
+Write-Host "Found $artifactId that matches expected file name Octopus-Export"
+
+Write-Host "Getting file content"
+Invoke-RestMethod -Method Get -Uri "$OctopusUrl/api/$spaceId/artifacts/$artifactId/content" -Headers $header -OutFile "$($filedownloadpath)\$($fullname)"
+Write-Host "File content written to $fileDownloadPath"
+
+$ExportFile = "$($filedownloadpath)\$($fullname)"
+
+$OriginalFileName = (Get-Item $ExportFile).BaseName
+$Path = "$($fileDownloadPath)\export"
+Expand-Archive -Path $ExportFile -DestinationPath $Path
+$SearchInFilesWithFileNameMatching = "variableset-*"
+$TextToSearchFor = @("Sensitive*","AzureAccount","AmazonWebServicesAccount","GoogleCloudAccount","Certificate")
+$PathArray = @()
+
+
+foreach ($text in $TextToSearchFor){
+    Get-ChildItem $Path | Where-Object {$_.Name -match $SearchInFilesWithFileNameMatching} | Where-Object { $_.Attributes -ne "Directory"} |
+    ForEach-Object {
+        If (Get-Content $_.FullName | Select-String -Pattern $text) {
+            $PathArray += $_.FullName
+        }
+    }
+}
+
+
+foreach ($file in $pathArray) {
+    $variableSnapshot = Get-Content -Path $file | ConvertFrom-Json
+    foreach ($variable in $variableSnapshot.Variables) {
+        #Check if the variable is a sensitive variable and make it a string and put junk there
+        if ($variable.Type -eq "Sensitive"){
+            $variable.Type = "String"
+            $variable.Value = "Sensitive Variable Was Here"        
+        }
+        #Check if the variable is an account, if so, null out everything but the account type and save the json back
+        if (($variable.Type -eq "AzureAccount") -or ($variable.Type -eq "AmazonWebServicesAccount") -or ($variable.Type -eq"GoogleCloudAccount")){
+           
+            if (Test-Path -Path "$($Path)\$($variable.value).json"){
+                $tempJson = Get-Content -Path "$($Path)\$($variable.value).json"
+                $tempJson = $tempJson | ConvertFrom-Json
+                foreach ($item in $tempJson.Details){
+                    $item.PSObject.Properties | ForEach-Object {
+                        if ($_.Name -ne "AccountType"){
+                            if ($_.Value -ne $null){
+                                $_.Value = $null
+                            }
+                        }
+                    }
+                }
+                $tempJson = $tempJson | ConvertTo-Json -Depth 10
+                Set-Content -Path "$($Path)\$($variable.value).json" -Value $tempJson
+            }
+        }
+
+        #Check if the variable is a certificate, if so, make it equal to the junk cert that we created in the beginning
+        if ($variable.Type -eq "Certificate"){
+            
+            if (Test-Path -Path "$($Path)\$($variable.value).json"){
+                $tempJson = Get-Content -Path "$($Path)\$($variable.value).json"
+                $tempJson = $tempJson | ConvertFrom-Json
+
+                #overwriting pertinent data with junk
+                $tempJson.CertificateData = $junkCert.CertificateData
+                $tempJson.Password = $junkCert.Password
+                $tempJson.CertificateMetadata = $junkCert.CertificateMetadata
+
+
+                $tempJson = $tempJson | ConvertTo-Json -Depth 10
+                Set-Content -Path "$($Path)\$($variable.value).json" -Value $tempJson
+
+            }
+        }
+    }
+    $variableSnapshot | ConvertTo-Json -Depth 100 | Out-File $file -Encoding UTF8
+}
+            
+            
+
+Compress-Archive -Path $Path\* -DestinationPath "$($fileDownloadPath)\$($OriginalFileName)-Modified.zip"
+Remove-Item $Path -Recurse
+
+New-OctopusArtifact -Path "$($fileDownloadPath)\$($OriginalFileName)-Modified.zip" -Name "$($OriginalFileName)-Modified.zip"
\ No newline at end of file
diff --git a/src/step-templates/octopus-validate-deploying-user/metadata.json b/src/step-templates/octopus-validate-deploying-user/metadata.json
new file mode 100644
index 000000000..f3313a5b1
--- /dev/null
+++ b/src/step-templates/octopus-validate-deploying-user/metadata.json
@@ -0,0 +1,54 @@
+{
+  "Id": "bbcf1894-9cf7-4968-a3e4-3bff08d8c75b",
+  "Name": "Octopus - Validate Deploying User",
+  "Description": "Verifies current deploying user didn't deploy previously to specified environment.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "e99ae8d8-f63c-45b5-967c-703cc89e620c",
+      "Name": "ovdu_octopusURL",
+      "Label": "Octopus Base Url",
+      "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "781b3394-138e-4aa5-bd26-5a835563bf88",
+      "Name": "ovdu_octopusAPIKey",
+      "Label": "Octopus Api Key",
+      "HelpText": "The API key of a user in Octopus Deploy who has permissions to manage releases.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "a05c4f99-ae6e-48ea-a11e-2cb3b538bf7e",
+      "Name": "ovdu_precedingEnvironment",
+      "Label": "Environment to validate deployer against",
+      "HelpText": "The environment preceding the controlled environment where if the user deployed this release, it will fail in this environment",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-10-22T15:08:53.0420000Z",
+    "OctopusVersion": "2021.1.7665",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "handplaned",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-validate-deploying-user/scriptbody.ps1 b/src/step-templates/octopus-validate-deploying-user/scriptbody.ps1
new file mode 100644
index 000000000..04c356f6a
--- /dev/null
+++ b/src/step-templates/octopus-validate-deploying-user/scriptbody.ps1
@@ -0,0 +1,35 @@
+$releaseId = $OctopusParameters["Octopus.Release.Id"]
+$currentDeployerId = $OctopusParameters["Octopus.Deployment.CreatedBy.Id"]
+$userName = $OctopusParameters["Octopus.Deployment.CreatedBy.Username"]
+$environmentId = $OctopusParameters["Octopus.Environment.Id"]
+$spaceId = $OctopusParameters["Octopus.Space.Id"]
+$octopusURL = $OctopusParameters["ovdu_octopusURL"]
+$octopusAPIKey = $OctopusParameters["ovdu_octopusAPIKey"]
+$precedingEnvironment = $OctopusParameters["ovdu_precedingEnvironment"]
+
+$header = @{ "X-Octopus-ApiKey" = $octopusAPIKey }
+
+$deploymentDetails = (Invoke-RestMethod -Method Get -Uri "$octopusURL/api/$($spaceId)/releases/$($releaseId)/deployments/" -Headers $header)
+
+# Get details for deployment to preceding environment
+$allEnvironments = (Invoke-RestMethod -Method Get -Uri "$octopusURL/api/$($spaceId)/environments" -Headers $header)
+$environmentItem = $allEnvironments.Items | where-object { $_.Name -eq $precedingEnvironment }
+$environmentId = $environmentItem.Id
+
+# Load all deploys to the previous environment
+$environmentDeploys = $deploymentDetails.Items | Where-Object {$_.EnvironmentId -eq $environmentId}
+
+# Iterate deployments to the previous environment to validate current deployer
+foreach($prevdeployment in $environmentDeploys)
+    {
+    	if($prevDeployment.Id -eq $OctopusParameters["Octopus.Deployment.Id"])
+        {continue}
+    	else
+        {
+    		if($prevdeployment.DeployedById -eq $currentDeployerId )
+        	{
+            	Write-Highlight "$userName previously deployed this project to $precedingEnvironment - deployment cancelled."
+            	Throw "$userName previously deployed this project to $precedingEnvironment - deployment cancelled."
+        	}
+        }
+    }
\ No newline at end of file
diff --git a/src/step-templates/octopus-wait-for-deployment-target-registration/metadata.json b/src/step-templates/octopus-wait-for-deployment-target-registration/metadata.json
new file mode 100644
index 000000000..733b95086
--- /dev/null
+++ b/src/step-templates/octopus-wait-for-deployment-target-registration/metadata.json
@@ -0,0 +1,89 @@
+{
+  "Id": "dc573fd6-92be-46fa-aab1-861adcd37d82",
+  "Name": "Octopus - Wait for Deployment Target registration",
+  "Description": "This step will poll Octopus Deploy until it detects that the expected Deployment Target has been registered.\n\nThe goal being that a deployment will be paused until the expected Deployment Target is available (eg [Transient Targets](https://octopus.com/docs/infrastructure/environments/elastic-and-transient-environments/deploying-to-transient-targets)). On subsequent deploys, the Deployment Target would quickly be identified as registered, and the deployment would continue as expected.\n\nWith a couple of extra step templates you can:\n- Create a new EC2 Instance (_AWS - Launch EC2 Instance_)\n- Include the new Deployment Target in subsequent deployment steps (_Health Check_)",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "46d497f7-f297-4329-a5a3-a32e32dfb85b",
+      "Name": "odEnv",
+      "Label": "Environment",
+      "HelpText": "The Environment you expect the Deployment Target to be registered in.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "28e05635-b343-4a00-a42e-55f5244ddd47",
+      "Name": "odName",
+      "Label": "Expected Display Name",
+      "HelpText": "The Display Name of the expected Deployment Target.\nNote: _Partial matches for the supplied Display Name is enabled (eg \"Machine\" would match a Target called \"Machine01\")_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2df65d31-6a0e-47cb-bcc3-7b5320a23aee",
+      "Name": "odRole",
+      "Label": "Expected Role (Optional)",
+      "HelpText": "The Role of the expected Deployment Target.\nNote: _Partial matches for the supplied Role is enabled (eg \"Database\" would match a Target with the Role \"Database01\")_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ff029a44-af95-4580-95c1-889a06a83f4c",
+      "Name": "odTimeout",
+      "Label": "Timeout",
+      "HelpText": "The amount of time to wait for the expected Deployment Target to be registered. (aka the Timeout)",
+      "DefaultValue": "600",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9fe91ebb-7521-4a91-9284-8398a8e9ad87",
+      "Name": "odUrl",
+      "Label": "Octopus Deploy URL (Kind-of Optional)",
+      "HelpText": "The base URL of your Octopus Deploy installation.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"OD\\_API\\_URL\"",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "054a2fca-6f12-46b2-a2a3-32045a50ea6a",
+      "Name": "odApiKey",
+      "Label": "API Key (Kind-of Optional)",
+      "HelpText": "An API Key with permissions access the Octopus Deploy API.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"OD\\_API\\_KEY\"\nFurther Reading:\nhttps://octopus.com/docs/api-and-integration/api/how-to-create-an-api-key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2020-09-03T08:23:42.8510000Z",
+    "OctopusVersion": "2020.4.0-rc0003",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-wait-for-deployment-target-registration/scriptbody.ps1 b/src/step-templates/octopus-wait-for-deployment-target-registration/scriptbody.ps1
new file mode 100644
index 000000000..9afaeeeb5
--- /dev/null
+++ b/src/step-templates/octopus-wait-for-deployment-target-registration/scriptbody.ps1
@@ -0,0 +1,120 @@
+# Running outside octopus
+param(
+    [string]$odEnv,
+    [string]$odName,
+    [string]$odRole,
+    [int]$odTimeout,
+    [string]$odUrl,
+    [string]$odApiKey,
+    [switch]$whatIf
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if (!$result -or $result -eq $null) {
+        if ($Default) {
+            $result = $Default
+        } elseif ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    return $result
+}
+
+& {
+    param(
+        [string]$odEnv,
+        [string]$odName,
+        [string]$odRole,
+        [int]$odTimeout,
+        [string]$odUrl,
+        [string]$odApiKey
+    )
+
+    # If Octopus Deploy's URL/API Key are not provided as params, attempt to retrieve them from Environment Variables
+    if (!$odUrl) {
+        if ([Environment]::GetEnvironmentVariable("OD_API_URL", "Machine")) {
+            $odUrl = [Environment]::GetEnvironmentVariable("OD_API_URL", "Machine")
+        }
+    }
+    
+    if (!$odUrl) { throw "Octopus Deploy API URL was not available/provided." }
+
+    if (!$odApiKey) {
+        if ([Environment]::GetEnvironmentVariable("OD_API_KEY", "Machine")) {
+            $odApiKey = [Environment]::GetEnvironmentVariable("OD_API_KEY", "Machine")
+        }
+    } 
+    
+    if (!$odApiKey) { throw "Octopus Deploy API key was not available/provided." }
+
+    $header = @{ "X-Octopus-ApiKey" = $odApiKey }
+    
+    Write-Verbose "Checking API compatibility";
+    $rootDocument = Invoke-WebRequest "$odUrl/api/" -Header $header -UseBasicParsing | ConvertFrom-Json;
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+      Write-Verbose "Spaces API found"
+      $hasSpacesApi = $true;
+    } else {
+      Write-Verbose "Pre-spaces API found"
+      $hasSpacesApi = $false;
+    }
+    
+    if($hasSpacesApi) {
+        $spaceId = $OctopusParameters['Octopus.Space.Id'];
+        if([string]::IsNullOrWhiteSpace($spaceId)) {
+            throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+        }
+        $baseApiUrl = "/api/$spaceId" ;
+    } else {
+        $baseApiUrl = "/api" ;
+    }    
+    
+    $environments = (Invoke-WebRequest "$odUrl$baseApiUrl/environments/all" -Headers $header -UseBasicParsing).content | ConvertFrom-Json
+    $environment = $environments | Where-Object { $_.Name -contains $odEnv }
+    if (@($environment).Count -eq 0) { throw "Could not find environment with the name '$odEnv'" }
+    
+    $timeout = new-timespan -Seconds $odTimeout
+    $sw = [diagnostics.stopwatch]::StartNew()
+
+    Write-Output ("------------------------------")
+    Write-Output ("Checking the Deployment Target's registration status:")
+    Write-Output ("------------------------------")
+
+    while ($true)
+    {
+        if ($sw.elapsed -gt $timeout) { throw "Timed out waiting for the Deployment Target to register" }
+        
+        $machines = ((Invoke-WebRequest ($odUrl + $environment.Links.Self + "/machines") -Headers $header -UseBasicParsing).content | ConvertFrom-Json).items
+        if ($odName) { $machines = $machines | Where-Object { $_.Name -like "*$odName*" } }
+        if ($odRole) { $machines = $machines | Where-Object { $_.Roles -like "*$odRole*" } }
+        if (@($machines).Count -gt 0) { break }
+
+        Write-Output ("$(Get-Date) | Waiting for Deployment Target to register with the name '$odName' and role '$odRole'")
+
+        Start-Sleep -Seconds 5
+    }
+    
+    Write-Output ("$(Get-Date) | Deployment Target registered with the name '$odName' and role '$odRole'!")
+ } `
+ (Get-Param 'odEnv' -Required) `
+ (Get-Param 'odName' -Required) `
+ (Get-Param 'odRole') `
+ (Get-Param 'odTimeout' -Required) `
+ (Get-Param 'odUrl') `
+ (Get-Param 'odApiKey')
\ No newline at end of file
diff --git a/src/step-templates/octopus-worker-healthcheck/metadata.json b/src/step-templates/octopus-worker-healthcheck/metadata.json
new file mode 100644
index 000000000..ca803522c
--- /dev/null
+++ b/src/step-templates/octopus-worker-healthcheck/metadata.json
@@ -0,0 +1,53 @@
+{
+  "Id": "c6c23c7b-876d-4758-a908-511f066156d7",
+  "Name": "Worker - Health check",
+  "Description": "Run a health check against a worker.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4ec84f25-8c23-4576-b7fe-3b60ca6f0f3c",
+      "Name": "WorkerName",
+      "Label": "Worker name",
+      "HelpText": "Name of the worker to do a health check on.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d876958b-1d93-45fa-996e-2005de2919ee",
+      "Name": "WorkerPoolName",
+      "Label": "Worker Pool",
+      "HelpText": "(Optional) Worker pool the worker belongs to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1939947b-e777-4e4a-8caf-729dacb25aed",
+      "Name": "WorkerApiKey",
+      "Label": "Api Key",
+      "HelpText": "Api Key to use to issue health check.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2023-02-16T15:38:44.0430000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/octopus-worker-healthcheck/scriptbody.ps1 b/src/step-templates/octopus-worker-healthcheck/scriptbody.ps1
new file mode 100644
index 000000000..4a9150a52
--- /dev/null
+++ b/src/step-templates/octopus-worker-healthcheck/scriptbody.ps1
@@ -0,0 +1,83 @@
+# Define parameters
+$baseUrl = $OctopusParameters['Octopus.Web.ServerUri'] 
+$apiKey = $WorkerApiKey
+$spaceId = $OctopusParameters['Octopus.Space.Id']
+$spaceName = $OctopusParameters['Octopus.Space.Name']
+$environmentName = $OctopusParameters['Octopus.Environment.Name']
+$workerName = $OctopusParameters['WorkerName']
+$workerPoolName = $OctopusParameters['WorkerPoolName']
+
+# Check for null or empty
+if ([string]::IsNullOrEmpty($baseUrl))
+{
+	$baseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}']
+}
+
+# Get worker
+if (![string]::IsNullOrEmpty($workerPoolName))
+{
+    # Get worker pool
+    $workerPool = (Invoke-RestMethod -Method Get -Uri "$baseUrl/api/$spaceId/workerpools/all" -Headers @{"X-Octopus-ApiKey"="$apiKey"}) | Where-Object {$_.Name -eq $workerPoolName}
+    
+    # Check to make sure it exists
+    if ($null -ne $workerPool)
+    {
+        $worker = (Invoke-RestMethod -Method Get -Uri "$baseUrl/api/$spaceId/workerpools/$($workerPool.Id)/workers" -Headers @{"X-Octopus-ApiKey"="$apiKey"}).Items | Where-Object {$_.Name -eq "$workerName"}
+    }
+    else
+    {
+    	Write-Error "Worker pool $workerPoolName not found!"
+    }
+}
+else
+{
+    $worker = (Invoke-RestMethod -Method Get -Uri "$baseUrl/api/$spaceId/workers/all" -Headers @{"X-Octopus-ApiKey"="$apiKey"}) | Where-Object {$_.Name -eq "$workerName"}
+}
+
+# Check to make sure something was returned
+if ($null -eq $worker)
+{
+	if (![string]::IsNullOrEmpty($workerPoolName))
+    {
+    	Write-Error "Unable to find $workerName in $workerPoolName!"
+    }
+    else
+    {
+    	Write-Error "Unable to find $workerName!"
+    }
+}
+
+# Build payload
+$jsonPayload = @{
+	Name = "Health"
+    Description = "Check $workerName health"
+    Arguments = @{
+    	Timeout = "00:05:00"
+        MachineIds = @(
+        	$worker.Id
+        )
+    OnlyTestConnection = "false"
+    }
+    SpaceId = "$spaceId"
+}
+
+# Display message
+Write-Output "Beginning health check of $workerName ..."
+
+# Execute health check
+$healthCheck = (Invoke-RestMethod -Method Post -Uri "$baseUrl/api/tasks" -Body ($jsonPayload | ConvertTo-Json -Depth 10) -Headers @{"X-Octopus-ApiKey"="$apiKey"})
+
+# Check to see if the health check is queued
+while ($healthCheck.IsCompleted -eq $false)
+{
+    $healthCheck = (Invoke-RestMethod -Method Get -Uri "$baseUrl/api/tasks/$($healthCheck.Id)" -Headers @{"X-Octopus-ApiKey"="$apiKey"})
+}
+
+if ($healthCheck.State -eq "Failed")
+{
+	Write-Error "Health check failed!"
+}
+else
+{
+	Write-Output "Health check completed with $($healthCheck.State)."
+}
diff --git a/step-templates/onepassword-retrieve-secrets.json b/src/step-templates/onepassword-retrieve-secrets/metadata.json
similarity index 55%
rename from step-templates/onepassword-retrieve-secrets.json
rename to src/step-templates/onepassword-retrieve-secrets/metadata.json
index 136e27651..3f9002c84 100644
--- a/step-templates/onepassword-retrieve-secrets.json
+++ b/src/step-templates/onepassword-retrieve-secrets/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Check if the 1Password CLI is installed\nif (-not (Get-Command op -ErrorAction SilentlyContinue)) {\n    Write-Output \"Error: 1Password CLI (op) is not installed.\"\n    exit 1\n}\n\n# Retrieve environment variables from Octopus\n$env:OP_CONNECT_HOST =$OctopusParameters[\"OnePass.CONNECT_HOST\"]\n$env:OP_CONNECT_TOKEN = $OctopusParameters[\"OnePass.CONNECT_TOKEN\"]\n\n# Perform nslookup after removing \"http://\" or \"https://\"\n$hostLookup = $env:OP_CONNECT_HOST -replace 'https?://', ''\nnslookup $hostLookup\n\n$STEP_NAME = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Retrieve the list of secrets to process from Octopus variable\n$SECRETS = $OctopusParameters[\"OnePass.SecretsManager.RetrieveSecrets.SecretNames\"]\nWrite-Output $SECRETS\n\n# Validation\nif ([string]::IsNullOrEmpty($SECRETS)) {\n    Write-Output \"Required parameter 'OnePass.SecretsManager.RetrieveSecrets.SecretNames' not specified. Exiting...\"\n    exit 1\n}\n\n# Helper function to save Octopus variable\nfunction Save-OctopusVariable {\n    param (\n        [string]$name,\n        [string]$value\n    )\n\n    Set-OctopusVariable -name $name -value $value --sensitive\n    Write-Output \"Created output variable: ##{Octopus.Action[$STEP_NAME].Output.$name}\"\n}\n\n# Process each secret entry\n$SECRETS -split \"`n\" | ForEach-Object {\n    $secret_entry = $_.Trim()\n    if ([string]::IsNullOrEmpty($secret_entry)) { return }\n\n    # Check if the secret entry contains the '|' character\n    if ($secret_entry -notmatch '\\|') {\n        Write-Output \"Warning: The entry '$secret_entry' is not formatted correctly and will be skipped.\"\n        return\n    }\n\n    # Parse the secret entry\n    $split_entry = $secret_entry -split '\\|'\n    $secret_path = $split_entry[0].Trim()  # 1Password path\n    $octopus_variable_name = $split_entry[1].Trim()  # Octopus variable name\n\n    Write-Output \"Fetching secret for path: $secret_path\"\n\n    # Retrieve the secret field using 1Password CLI\n    $field_value = (& op read $secret_path 2>$null)\n\n    # Validate retrieval\n    if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrEmpty($field_value)) {\n        Write-Output \"Error: Failed to retrieve secret for path '$secret_path'.\"\n        exit 1\n    }\n\n    # Save the retrieved value in the specified Octopus variable\n    Save-OctopusVariable -name $octopus_variable_name -value $field_value\n    Write-Output \"Secret retrieval and variable setting complete.\"\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -56,7 +56,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2024-11-06T05:48:36.574Z",
+    "ExportedAt": "2024-11-06T05:48:36.5740000Z",
     "OctopusVersion": "2024.4.6576",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/onepassword-retrieve-secrets/scriptbody.ps1 b/src/step-templates/onepassword-retrieve-secrets/scriptbody.ps1
new file mode 100644
index 000000000..ae9631c12
--- /dev/null
+++ b/src/step-templates/onepassword-retrieve-secrets/scriptbody.ps1
@@ -0,0 +1,68 @@
+# Check if the 1Password CLI is installed
+if (-not (Get-Command op -ErrorAction SilentlyContinue)) {
+    Write-Output "Error: 1Password CLI (op) is not installed."
+    exit 1
+}
+
+# Retrieve environment variables from Octopus
+$env:OP_CONNECT_HOST =$OctopusParameters["OnePass.CONNECT_HOST"]
+$env:OP_CONNECT_TOKEN = $OctopusParameters["OnePass.CONNECT_TOKEN"]
+
+# Perform nslookup after removing "http://" or "https://"
+$hostLookup = $env:OP_CONNECT_HOST -replace 'https?://', ''
+nslookup $hostLookup
+
+$STEP_NAME = $OctopusParameters["Octopus.Step.Name"]
+
+# Retrieve the list of secrets to process from Octopus variable
+$SECRETS = $OctopusParameters["OnePass.SecretsManager.RetrieveSecrets.SecretNames"]
+Write-Output $SECRETS
+
+# Validation
+if ([string]::IsNullOrEmpty($SECRETS)) {
+    Write-Output "Required parameter 'OnePass.SecretsManager.RetrieveSecrets.SecretNames' not specified. Exiting..."
+    exit 1
+}
+
+# Helper function to save Octopus variable
+function Save-OctopusVariable {
+    param (
+        [string]$name,
+        [string]$value
+    )
+
+    Set-OctopusVariable -name $name -value $value --sensitive
+    Write-Output "Created output variable: ##{Octopus.Action[$STEP_NAME].Output.$name}"
+}
+
+# Process each secret entry
+$SECRETS -split "`n" | ForEach-Object {
+    $secret_entry = $_.Trim()
+    if ([string]::IsNullOrEmpty($secret_entry)) { return }
+
+    # Check if the secret entry contains the '|' character
+    if ($secret_entry -notmatch '\|') {
+        Write-Output "Warning: The entry '$secret_entry' is not formatted correctly and will be skipped."
+        return
+    }
+
+    # Parse the secret entry
+    $split_entry = $secret_entry -split '\|'
+    $secret_path = $split_entry[0].Trim()  # 1Password path
+    $octopus_variable_name = $split_entry[1].Trim()  # Octopus variable name
+
+    Write-Output "Fetching secret for path: $secret_path"
+
+    # Retrieve the secret field using 1Password CLI
+    $field_value = (& op read $secret_path 2>$null)
+
+    # Validate retrieval
+    if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrEmpty($field_value)) {
+        Write-Output "Error: Failed to retrieve secret for path '$secret_path'."
+        exit 1
+    }
+
+    # Save the retrieved value in the specified Octopus variable
+    Save-OctopusVariable -name $octopus_variable_name -value $field_value
+    Write-Output "Secret retrieval and variable setting complete."
+}
\ No newline at end of file
diff --git a/step-templates/opslevel-create-deploy-event-bash.json b/src/step-templates/opslevel-create-deploy-event-bash/metadata.json
similarity index 80%
rename from step-templates/opslevel-create-deploy-event-bash.json
rename to src/step-templates/opslevel-create-deploy-event-bash/metadata.json
index 0295ef43a..65d4005e6 100644
--- a/step-templates/opslevel-create-deploy-event-bash.json
+++ b/src/step-templates/opslevel-create-deploy-event-bash/metadata.json
@@ -22,7 +22,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "if test -f \"#{Octopus.Action.Package[OpsLevel].ExtractedPath}/opslevel\"; then\n\tchmod +x #{Octopus.Action.Package[OpsLevel].ExtractedPath}/opslevel\n\tcat << EOF | #{Octopus.Action.Package[OpsLevel].ExtractedPath}/opslevel create deploy --log-level=WARN -i #{OL_INTEGRATION_URL} -f -\nservice: #{OL_SERVICE}\ndescription: #{OL_DESCRIPTION}\nenvironment: #{OL_ENVIRONMENT}\ndeploy-number: #{OL_DEPLOY_NUMBER}\ndeploy-url: #{OL_DEPLOY_URL}\ndedup-id: #{OL_DEDUP_ID}\ndeployer:\n  name: #{OL_DEPLOYER_NAME}\n  email: #{OL_DEPLOYER_EMAIL}\n#{if Octopus.Release.Package}\n#{if Octopus.Release.Package[].Commits}\ncommit:\n  sha: \"#{Octopus.Release.Package[0].Commits[0].CommitId}\"\n  message: \"#{Octopus.Release.Package[0].Commits[0].Comment}\"\n#{/if}\n#{/if}\nEOF\nelse\n\techo \"Please ensure the `opslevel` CLI package is setup and installed!\"\nfi"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -117,10 +117,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-06-27T16:56:46.770Z",
+    "ExportedAt": "2021-06-27T16:56:46.7700000Z",
     "OctopusVersion": "2021.1.7316",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "rocktavious",
   "Category": "opslevel"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/opslevel-create-deploy-event-bash/scriptbody.sh b/src/step-templates/opslevel-create-deploy-event-bash/scriptbody.sh
new file mode 100644
index 000000000..657b07ff6
--- /dev/null
+++ b/src/step-templates/opslevel-create-deploy-event-bash/scriptbody.sh
@@ -0,0 +1,23 @@
+if test -f "#{Octopus.Action.Package[OpsLevel].ExtractedPath}/opslevel"; then
+	chmod +x #{Octopus.Action.Package[OpsLevel].ExtractedPath}/opslevel
+	cat << EOF | #{Octopus.Action.Package[OpsLevel].ExtractedPath}/opslevel create deploy --log-level=WARN -i #{OL_INTEGRATION_URL} -f -
+service: #{OL_SERVICE}
+description: #{OL_DESCRIPTION}
+environment: #{OL_ENVIRONMENT}
+deploy-number: #{OL_DEPLOY_NUMBER}
+deploy-url: #{OL_DEPLOY_URL}
+dedup-id: #{OL_DEDUP_ID}
+deployer:
+  name: #{OL_DEPLOYER_NAME}
+  email: #{OL_DEPLOYER_EMAIL}
+#{if Octopus.Release.Package}
+#{if Octopus.Release.Package[].Commits}
+commit:
+  sha: "#{Octopus.Release.Package[0].Commits[0].CommitId}"
+  message: "#{Octopus.Release.Package[0].Commits[0].Comment}"
+#{/if}
+#{/if}
+EOF
+else
+	echo "Please ensure the `opslevel` CLI package is setup and installed!"
+fi
\ No newline at end of file
diff --git a/step-templates/opslevel-create-deploy-event-ps.json b/src/step-templates/opslevel-create-deploy-event-ps/metadata.json
similarity index 80%
rename from step-templates/opslevel-create-deploy-event-ps.json
rename to src/step-templates/opslevel-create-deploy-event-ps/metadata.json
index 62dd34a4b..10ac9cf69 100644
--- a/step-templates/opslevel-create-deploy-event-ps.json
+++ b/src/step-templates/opslevel-create-deploy-event-ps/metadata.json
@@ -22,7 +22,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if (Test-Path -Path #{Octopus.Action.Package[OpsLevel].ExtractedPath}\\opslevel.exe -PathType Leaf) {\n\t@\"\nservice: #{OL_SERVICE}\ndescription: #{OL_DESCRIPTION}\nenvironment: #{OL_ENVIRONMENT}\ndeploy-number: #{OL_DEPLOY_NUMBER}\ndeploy-url: #{OL_DEPLOY_URL}\ndedup-id: #{OL_DEDUP_ID}\ndeployer:\n  name: #{OL_DEPLOYER_NAME}\n  email: #{OL_DEPLOYER_EMAIL}\n#{if Octopus.Release.Package}\n#{if Octopus.Release.Package[].Commits}\ncommit:\n  sha: \\\"#{Octopus.Release.Package[0].Commits[0].CommitId}\\\"\n  message: \\\"#{Octopus.Release.Package[0].Commits[0].Comment}\\\"\n#{/if}\n#{/if}\n\"@ | #{Octopus.Action.Package[OpsLevel].ExtractedPath}\\opslevel.exe create deploy --log-level=WARN -i \"#{OL_INTEGRATION_URL}\" -f -\n} else {\n\tWrite-Host \"Please ensure the `opslevel` CLI package is setup and installed!\"\n}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -117,10 +117,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-06-27T16:57:30.362Z",
+    "ExportedAt": "2021-06-27T16:57:30.3620000Z",
     "OctopusVersion": "2021.1.7316",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "rocktavious",
   "Category": "opslevel"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/opslevel-create-deploy-event-ps/scriptbody.ps1 b/src/step-templates/opslevel-create-deploy-event-ps/scriptbody.ps1
new file mode 100644
index 000000000..970927967
--- /dev/null
+++ b/src/step-templates/opslevel-create-deploy-event-ps/scriptbody.ps1
@@ -0,0 +1,22 @@
+if (Test-Path -Path #{Octopus.Action.Package[OpsLevel].ExtractedPath}\opslevel.exe -PathType Leaf) {
+	@"
+service: #{OL_SERVICE}
+description: #{OL_DESCRIPTION}
+environment: #{OL_ENVIRONMENT}
+deploy-number: #{OL_DEPLOY_NUMBER}
+deploy-url: #{OL_DEPLOY_URL}
+dedup-id: #{OL_DEDUP_ID}
+deployer:
+  name: #{OL_DEPLOYER_NAME}
+  email: #{OL_DEPLOYER_EMAIL}
+#{if Octopus.Release.Package}
+#{if Octopus.Release.Package[].Commits}
+commit:
+  sha: \"#{Octopus.Release.Package[0].Commits[0].CommitId}\"
+  message: \"#{Octopus.Release.Package[0].Commits[0].Comment}\"
+#{/if}
+#{/if}
+"@ | #{Octopus.Action.Package[OpsLevel].ExtractedPath}\opslevel.exe create deploy --log-level=WARN -i "#{OL_INTEGRATION_URL}" -f -
+} else {
+	Write-Host "Please ensure the `opslevel` CLI package is setup and installed!"
+}
diff --git a/src/step-templates/oracle-add-user-to-role/metadata.json b/src/step-templates/oracle-add-user-to-role/metadata.json
new file mode 100644
index 000000000..68283ddea
--- /dev/null
+++ b/src/step-templates/oracle-add-user-to-role/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "6a0db144-3ad5-46bb-bd7d-02b22b98a559",
+  "Name": "Oracle - Add Database User To Role",
+  "Description": "Adds database user to a role",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "66790019-ca40-41cc-8849-5995557e34c1",
+      "Name": "oracleServerName",
+      "Label": "Server name",
+      "HelpText": "Name of the Oracle server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d29f262e-74d2-4c7b-acb3-67b642b614c4",
+      "Name": "oracleServerPort",
+      "Label": "Port",
+      "HelpText": "Port that the Oracle server listens on.",
+      "DefaultValue": "1521",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "330f737b-dc2b-4ceb-9d27-168c1b5f6e18",
+      "Name": "oracleServiceName",
+      "Label": "Service Name",
+      "HelpText": "Service name for Oracle database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0531e03b-c152-46e4-ab2d-7cb8093aa641",
+      "Name": "oracleLoginWithAddRoleRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user that can add roles to other users.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5bddbafe-0ca0-4037-9dd1-d522abc5838e",
+      "Name": "oracleLoginPasswordWithAddRoleRights",
+      "Label": "Login password",
+      "HelpText": "Password for the login account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "2c6ee772-96f6-4803-b6a1-5d57a58b28f0",
+      "Name": "oracleUsername",
+      "Label": "User name",
+      "HelpText": "Name of the user to add the role to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7f806b37-e0d5-4560-873e-de6c73f80161",
+      "Name": "oracleRoleName",
+      "Label": "Role name",
+      "HelpText": "Name of the role to add to the user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-21T21:54:08.7530000Z",
+    "OctopusVersion": "2020.3.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "oracle"
+}
diff --git a/src/step-templates/oracle-add-user-to-role/scriptbody.ps1 b/src/step-templates/oracle-add-user-to-role/scriptbody.ps1
new file mode 100644
index 000000000..5f7800737
--- /dev/null
+++ b/src/step-templates/oracle-add-user-to-role/scriptbody.ps1
@@ -0,0 +1,147 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserInRole
+{
+	# Define parameters
+    param (
+    $Username,
+    $RoleName)
+    
+	# Execute query
+    $userRole = Invoke-SqlQuery "SELECT * FROM DBA_ROLE_PRIVS WHERE GRANTEE = '$Username' AND GRANTED_ROLE = '$RoleName'"
+
+    # Check to see if anything was returned
+    if ($userRole.ItemArray.Count -gt 0)
+    {
+        # Found
+        return $true
+    }
+    
+
+    # Not found
+    return $false
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Create credential object for the connection
+$SecurePassword = ConvertTo-SecureString $oracleLoginPasswordWithAddRoleRights -AsPlainText -Force
+$ServerCredential = New-Object System.Management.Automation.PSCredential ($oracleLoginWithAddRoleRights, $SecurePassword)
+
+try
+{
+	# Connect to MySQL
+    Open-OracleConnection -Datasource $oracleServerName -Credential $ServerCredential -Port $oracleServerPort -ServiceName $oracleServiceName
+
+    # See if database exists
+    $userInRole = Get-UserInRole -Username $oracleUsername -RoleName $oracleRoleName
+
+    if ($userInRole -eq $false)
+    {
+        # Create database
+        Write-Output "Adding user $oracleUsername to role $oracleRoleName ..."
+        $executionResults = Invoke-SqlUpdate "GRANT `"$oracleRoleName`" TO `"$oracleUsername`""
+
+        # See if it was created
+        $userInRole = Get-UserInRole -Username $oracleUsername -RoleName $oracleRoleName
+            
+        # Check array
+        if ($userInRole -eq $true)
+        {
+            # Success
+            Write-Output "$oracleUserName added to $oracleRoleName successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "Failure adding $oracleUserName to $oracleRoleName!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $oracleUsername is already in role $oracleRoleName"
+    }
+}
+finally
+{
+    Close-SqlConnection
+}
+
+
diff --git a/src/step-templates/oracle-create-user-if-not-exists/metadata.json b/src/step-templates/oracle-create-user-if-not-exists/metadata.json
new file mode 100644
index 000000000..2b0a03c7b
--- /dev/null
+++ b/src/step-templates/oracle-create-user-if-not-exists/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "d8b21b0b-1a07-4d47-9c72-4260e83a807c",
+  "Name": "Oracle - Create User If Not Exists",
+  "Description": "Creates a new user account on a Oracle database server",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "8123da26-a8ed-4b4e-bc04-b5c90546785a",
+      "Name": "oracleDBServerName",
+      "Label": "Oracle Server",
+      "HelpText": "Host name of the Oracle server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a4a4ee03-b166-4324-9bdf-4011c1f4f707",
+      "Name": "oracleDBServerPort",
+      "Label": "Port",
+      "HelpText": "Port number the Oracle server listens on.",
+      "DefaultValue": "1521",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "63cd98dc-359c-4c25-8b84-56ab33d9d05f",
+      "Name": "oracleServiceName",
+      "Label": "Service Name",
+      "HelpText": "Service name for Oracle database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "307a4f0e-92b7-4b2f-8cac-b12771d2cb23",
+      "Name": "oracleLoginWithAddUserRights",
+      "Label": "Admin Login name",
+      "HelpText": "Login name of a user with rights to create user accounts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "78ccf489-2c68-419e-9b53-bdf96ff9ae8c",
+      "Name": "oracleLoginPasswordWithAddUserRights",
+      "Label": "Login Password",
+      "HelpText": "Password Login name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "8bf12f2a-7d7b-4b8c-bced-2b438fbb21e4",
+      "Name": "oracleNewUsername",
+      "Label": "New user name",
+      "HelpText": "Name of the new user account to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "45b96db6-4523-4b07-b8e7-848dc2b63053",
+      "Name": "oracleNewUserPassword",
+      "Label": "New user password",
+      "HelpText": "Password for the new user account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2024-10-15T20:26:00.5560000Z",
+    "OctopusVersion": "2024.3.12828",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "oracle"
+}
diff --git a/src/step-templates/oracle-create-user-if-not-exists/scriptbody.ps1 b/src/step-templates/oracle-create-user-if-not-exists/scriptbody.ps1
new file mode 100644
index 000000000..82dfeda08
--- /dev/null
+++ b/src/step-templates/oracle-create-user-if-not-exists/scriptbody.ps1
@@ -0,0 +1,141 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserExists
+{
+	# Define parameters
+    param ($Hostname,
+    $Username)
+    
+	# Execute query
+    return Invoke-SqlQuery "SELECT * FROM ALL_USERS WHERE USERNAME = '$UserName'" -ConnectionName $connectionName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Create credential object for the connection
+$SecurePassword = ConvertTo-SecureString $oracleLoginPasswordWithAddUserRights -AsPlainText -Force
+$ServerCredential = New-Object System.Management.Automation.PSCredential ($oracleLoginWithAddUserRights, $SecurePassword)
+
+try
+{
+	# Connect to MySQL
+    Open-OracleConnection -Datasource $oracleDBServerName -Credential $ServerCredential -Port $oracleDBServerPort -ServiceName $oracleServiceName -ConnectionName $connectionName
+
+    # See if database exists
+    $userExists = Get-UserExists -Username $oracleNewUsername
+
+    if ($userExists -eq $null)
+    {
+        # Create database
+        Write-Output "Creating user $oracleNewUsername ..."
+        $executionResults = Invoke-SqlUpdate "CREATE USER `"$oracleNewUsername`" IDENTIFIED BY `"$oracleNewUserPassword`"" -ConnectionName $connectionName
+
+        # See if it was created
+        $userExists = Get-UserExists -Username $oracleNewUsername
+            
+        # Check array
+        if ($userExists -ne $null)
+        {
+            # Success
+            Write-Output "$oracleNewUsername created successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "$oracleNewUsername was not created!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $oracleNewUsername already exists."
+    }
+}
+finally 
+{
+	# Close connection if open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+    	Close-SqlConnection -ConnectionName $connectionName
+    }
+}
+
diff --git a/step-templates/oracle-run-script-through-sqlplus.json b/src/step-templates/oracle-run-script-through-sqlplus/metadata.json
similarity index 60%
rename from step-templates/oracle-run-script-through-sqlplus.json
rename to src/step-templates/oracle-run-script-through-sqlplus/metadata.json
index a0efb1970..34285204b 100644
--- a/step-templates/oracle-run-script-through-sqlplus.json
+++ b/src/step-templates/oracle-run-script-through-sqlplus/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$scriptFile = $OctopusParameters[\"Oracle.ScriptFile.Location\"]\n$server = $OctopusParameters[\"Oracle.Server.Name\"]\n$user = $OctopusParameters[\"Oracle.User.Name\"]\n$password = $OctopusParameters[\"Oracle.User.Password\"]\n\nWrite-Host \"Script File: $scriptFile\"\nWrite-Host \"Oracle Server: $server\"\nWrite-Host \"Oracle Username: $user\"\nWrite-Host \"Oracle Password not shown\"\n\nIf ((Test-Path $scriptFile) -eq $true){\n  Write-Host \"Script file found, running on the database\"\n  \n  $maskedConnectionString = \"$user/*****@$server/$deploymentSchema\"\n  $unmaskedConnectionString = \"$user/$password@$server\"\n  Write-Host \"Running the script against: $maskedConnectionString\"\n  \n  Write-Host \"Adding to the top of the script file WHENEVER SQLERROR EXIT SQL.SQLCODE\"\n  $scriptToHandleErrors = \"WHENEVER SQLERROR EXIT SQL.SQLCODE\n  \"\n  \n  $old = Get-Content $scriptFile\n  Set-Content -Path $scriptFile -Value $scriptToHandleErrors\n  Add-Content -Path $scriptFile -Value $old\n\n  echo exit | sqlplus $unmaskedConnectionString @$scriptFile\n}\nelse {\n\tWrite-Highlight \"No script file was found.  If the script file should be there please verify the location and try again.\"\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -56,7 +56,7 @@
   "LastModifiedOn": "2019-03-21T14:34Z",
   "LastModifiedBy": "octobob",
   "$Meta": {
-    "ExportedAt": "2019-03-21T20:12:11.956Z",
+    "ExportedAt": "2019-03-21T20:12:11.9560000Z",
     "OctopusVersion": "2018.9.5",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/oracle-run-script-through-sqlplus/scriptbody.ps1 b/src/step-templates/oracle-run-script-through-sqlplus/scriptbody.ps1
new file mode 100644
index 000000000..6abb40738
--- /dev/null
+++ b/src/step-templates/oracle-run-script-through-sqlplus/scriptbody.ps1
@@ -0,0 +1,30 @@
+$scriptFile = $OctopusParameters["Oracle.ScriptFile.Location"]
+$server = $OctopusParameters["Oracle.Server.Name"]
+$user = $OctopusParameters["Oracle.User.Name"]
+$password = $OctopusParameters["Oracle.User.Password"]
+
+Write-Host "Script File: $scriptFile"
+Write-Host "Oracle Server: $server"
+Write-Host "Oracle Username: $user"
+Write-Host "Oracle Password not shown"
+
+If ((Test-Path $scriptFile) -eq $true){
+  Write-Host "Script file found, running on the database"
+  
+  $maskedConnectionString = "$user/*****@$server/$deploymentSchema"
+  $unmaskedConnectionString = "$user/$password@$server"
+  Write-Host "Running the script against: $maskedConnectionString"
+  
+  Write-Host "Adding to the top of the script file WHENEVER SQLERROR EXIT SQL.SQLCODE"
+  $scriptToHandleErrors = "WHENEVER SQLERROR EXIT SQL.SQLCODE
+  "
+  
+  $old = Get-Content $scriptFile
+  Set-Content -Path $scriptFile -Value $scriptToHandleErrors
+  Add-Content -Path $scriptFile -Value $old
+
+  echo exit | sqlplus $unmaskedConnectionString @$scriptFile
+}
+else {
+	Write-Highlight "No script file was found.  If the script file should be there please verify the location and try again."
+}
\ No newline at end of file
diff --git a/src/step-templates/pagerduty-close-maintenance-window/metadata.json b/src/step-templates/pagerduty-close-maintenance-window/metadata.json
new file mode 100644
index 000000000..bbb082ed9
--- /dev/null
+++ b/src/step-templates/pagerduty-close-maintenance-window/metadata.json
@@ -0,0 +1,41 @@
+{
+  "Id": "4841c8e6-3f23-4b52-90d0-c363eb0bc526",
+  "Name": "PagerDuty - Close Maintenance Window",
+  "Description": "Closes a maintenance window by Id.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Name": "Token",
+      "Label": "Token",
+      "HelpText": "The API token of the PagerDuty instance.\n\nFound here: https://mydomain.pagerduty.com/api_keys",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "OpeningStepName",
+      "Label": "OpeningStepName",
+      "HelpText": "The **previous** step in which the window to close was opened.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    }
+  ],
+  "LastModifiedOn": "2020-07-23T07:38:49.0560000Z",
+  "LastModifiedBy": "tfbryan",
+  "$Meta": {
+    "ExportedAt": "2020-07-23T07:38:49.0560000Z",
+    "OctopusVersion": "2020.1.14",
+    "Type": "ActionTemplate"
+  },
+  "Category": "pagerduty"
+}
diff --git a/src/step-templates/pagerduty-close-maintenance-window/scriptbody.ps1 b/src/step-templates/pagerduty-close-maintenance-window/scriptbody.ps1
new file mode 100644
index 000000000..25bc560bc
--- /dev/null
+++ b/src/step-templates/pagerduty-close-maintenance-window/scriptbody.ps1
@@ -0,0 +1,53 @@
+param(
+    [string]$OpeningStepName = "",
+    [string]$Token = ""
+) 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $Result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $Result = $OctopusParameters[$Name]
+    }
+
+    if ($Result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $Result = $variable.Value
+        }
+    }
+
+    if ($Result -eq $null -or $Result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $Result = $Default
+        }
+    }
+
+    return $Result
+}
+
+& {
+    param([string]$OpeningStepName, [string]$Token)
+
+	$WindowId = $OctopusParameters["Octopus.Action[$OpeningStepName].Output.WindowId"]
+    $Uri = "https://api.pagerduty.com/maintenance_windows/$WindowId"
+    $Headers = @{
+          "Authorization" = "Token token=$Token"
+          "Accept" = "application/vnd.pagerduty+json;version=2"
+		}
+
+	try {
+		Invoke-RestMethod -Uri $Uri -Method Delete -ContentType "application/json" -Headers $Headers
+		Write-Host "PagerDuty window closed for window_id: $WindowId"
+	} catch [System.Exception] {
+        Write-Host $_.Exception.Message
+        
+        $ResponseStream = $_.Exception.Response.GetResponseStream()
+        $Reader = New-Object System.IO.StreamReader($ResponseStream)
+        $Reader.ReadToEnd() | Write-Host
+
+		Exit 0
+    }
+} (Get-Param 'OpeningStepName' -Required) (Get-Param 'Token' -Required)
\ No newline at end of file
diff --git a/step-templates/pagerduty-create-incident.json b/src/step-templates/pagerduty-create-incident/metadata.json
similarity index 54%
rename from step-templates/pagerduty-create-incident.json
rename to src/step-templates/pagerduty-create-incident/metadata.json
index 099ab0e27..ea5ce313a 100644
--- a/step-templates/pagerduty-create-incident.json
+++ b/src/step-templates/pagerduty-create-incident/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Gather Octopus variables\n$pagerDutyToken = $OctopusParameters['PagerDuty.API.AuthorizationToken']\n$incidentTitle = $OctopusParameters['PagerDuty.Incident.Title']\n$serviceId = $OctopusParameters['PagerDuty.Service.Id']\n$incidentPriority = $OctopusParameters['PagerDuty.Priority.Code']\n$incidentUrgency = $OctopusParameters['PagerDuty.Urgency.Code']\n$escalationPolicyId = $OctopusParameters['PagerDuty.EscalationPolicy.Id']\n$incidentDetails = $OctopusParameters['PagerDuty.Body.Details']\n$pagerDutyFrom = \"Octopus Deploy Project: $($OctopusParameters['Octopus.Project.Name']) Environment $($OctopusParameters['Octopus.Environment.Name'])\"\n\n# Configure request headers\n$headers = @{\n    \"Authorization\" = \"Token token=$pagerDutyToken\"\n    \"Content-Type\" = \"application/json\"\n    \"Accept\" = \"application/json\"\n    \"From\" = \"$pagerDutyFrom\"\n}\n\n# Build Incident Object\n$incidentPayload = @{\n  incident = @{\n    type = \"incident\"\n    title = $incidentTitle\n    service = @{\n      id = $serviceId\n      type = \"service_reference\"\n    }\n  \n    urgency = $incidentUrgency\n    body = @{\n      type = \"incident_body\"\n      details = $incidentDetails\n    }\n  }\n}\n\n# Check to see if an escalation id was specified\nif (![string]::IsNullOrWhitespace($escalationPolicyId))\n{\n  $policyDetails = @{\n    type = \"escalation_policy_reference\"\n    id = $escalationPolicyId\n  }\n\n  $incidentPayload.incident.Add(\"escalation_policy\", $policyDetails)\n}\n\n\n# Get Priority\n$priorities = (Invoke-RestMethod -Method Get -Uri \"https://api.pagerduty.com/priorities\" -Headers $headers)\n$priority = ($priorities.priorities | Where-Object {$_.Name -eq $incidentPriority})\n\n# Add priority to body\n$priorityBody = @{\n  id = \"$($priority.id)\"\n  type = \"priority_reference\"\n}\n$incidentPayload.incident.Add(\"priority\", $priorityBody)\n\n# Submit incident\ntry\n{\n  $responseResult = Invoke-RestMethod -Method Post -Uri \"https://api.pagerduty.com/incidents\" -Body ($incidentPayload | ConvertTo-Json -Depth 10) -Headers $headers\n  Write-Host \"Successfully created incident.\"\n  $responseResult.incident\n}\ncatch [System.Exception] {\n        Write-Host $_.Exception.Message\n        \n        $ResponseStream = $_.Exception.Response.GetResponseStream()\n        $Reader = New-Object System.IO.StreamReader($ResponseStream)\n        $Reader.ReadToEnd() | Write-Error\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -88,7 +88,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2024-12-20T22:23:43.782Z",
+    "ExportedAt": "2024-12-20T22:23:43.7820000Z",
     "OctopusVersion": "2024.4.7005",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/pagerduty-create-incident/scriptbody.ps1 b/src/step-templates/pagerduty-create-incident/scriptbody.ps1
new file mode 100644
index 000000000..2bc2a7dad
--- /dev/null
+++ b/src/step-templates/pagerduty-create-incident/scriptbody.ps1
@@ -0,0 +1,73 @@
+# Gather Octopus variables
+$pagerDutyToken = $OctopusParameters['PagerDuty.API.AuthorizationToken']
+$incidentTitle = $OctopusParameters['PagerDuty.Incident.Title']
+$serviceId = $OctopusParameters['PagerDuty.Service.Id']
+$incidentPriority = $OctopusParameters['PagerDuty.Priority.Code']
+$incidentUrgency = $OctopusParameters['PagerDuty.Urgency.Code']
+$escalationPolicyId = $OctopusParameters['PagerDuty.EscalationPolicy.Id']
+$incidentDetails = $OctopusParameters['PagerDuty.Body.Details']
+$pagerDutyFrom = "Octopus Deploy Project: $($OctopusParameters['Octopus.Project.Name']) Environment $($OctopusParameters['Octopus.Environment.Name'])"
+
+# Configure request headers
+$headers = @{
+    "Authorization" = "Token token=$pagerDutyToken"
+    "Content-Type" = "application/json"
+    "Accept" = "application/json"
+    "From" = "$pagerDutyFrom"
+}
+
+# Build Incident Object
+$incidentPayload = @{
+  incident = @{
+    type = "incident"
+    title = $incidentTitle
+    service = @{
+      id = $serviceId
+      type = "service_reference"
+    }
+  
+    urgency = $incidentUrgency
+    body = @{
+      type = "incident_body"
+      details = $incidentDetails
+    }
+  }
+}
+
+# Check to see if an escalation id was specified
+if (![string]::IsNullOrWhitespace($escalationPolicyId))
+{
+  $policyDetails = @{
+    type = "escalation_policy_reference"
+    id = $escalationPolicyId
+  }
+
+  $incidentPayload.incident.Add("escalation_policy", $policyDetails)
+}
+
+
+# Get Priority
+$priorities = (Invoke-RestMethod -Method Get -Uri "https://api.pagerduty.com/priorities" -Headers $headers)
+$priority = ($priorities.priorities | Where-Object {$_.Name -eq $incidentPriority})
+
+# Add priority to body
+$priorityBody = @{
+  id = "$($priority.id)"
+  type = "priority_reference"
+}
+$incidentPayload.incident.Add("priority", $priorityBody)
+
+# Submit incident
+try
+{
+  $responseResult = Invoke-RestMethod -Method Post -Uri "https://api.pagerduty.com/incidents" -Body ($incidentPayload | ConvertTo-Json -Depth 10) -Headers $headers
+  Write-Host "Successfully created incident."
+  $responseResult.incident
+}
+catch [System.Exception] {
+        Write-Host $_.Exception.Message
+        
+        $ResponseStream = $_.Exception.Response.GetResponseStream()
+        $Reader = New-Object System.IO.StreamReader($ResponseStream)
+        $Reader.ReadToEnd() | Write-Error
+}
\ No newline at end of file
diff --git a/src/step-templates/pagerduty-open-maintenance-window/metadata.json b/src/step-templates/pagerduty-open-maintenance-window/metadata.json
new file mode 100644
index 000000000..e104470e8
--- /dev/null
+++ b/src/step-templates/pagerduty-open-maintenance-window/metadata.json
@@ -0,0 +1,77 @@
+{
+  "Id": "93a10982-f675-42cd-ac3a-46ef28a46afa",
+  "Name": "PagerDuty - Open Maintenance Window",
+  "Description": "Open a new maintenance window for the specified services, using the PagerDuty v2 API.\n\nNo new incidents will be created for a service that is currently in maintenance.\n\nThis script sets an output variable **WindowId** that can be used in the _PagerDuty - Close Maintenance Window_ template.",
+  "ActionType": "Octopus.Script",
+  "Version": 16,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Name": "Minutes",
+      "Label": "Minutes",
+      "HelpText": "Please set an estimated number of minutes for the maintenance window. The maintenance window will remain open for this duration unless it's proactively closed sooner.",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RequesterId",
+      "Label": "RequesterId",
+      "HelpText": "Please configure an email address of the user creating the maintenance window.\n\nExample: Octopus@mydomain.com",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Token",
+      "Label": "Token",
+      "HelpText": "Please supply the API token of your PagerDuty instance.\n\nFound here: https://mydomain.pagerduty.com/api_keys",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Description",
+      "Label": "Description",
+      "HelpText": "Please supply a short description for this maintenance window.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ServiceIds",
+      "Label": "ServiceIds",
+      "HelpText": "Please supply a comma separated list of the PagerDuty service ids that will be included in this maintenance window.\n\nFound here: https://mydomain.pagerduty.com/services/**ABC123**\n\nExample: ABC123, ABC456",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Subdomain",
+      "Label": "Subdomain",
+      "HelpText": "The subdomain of the PagerDuty instance.\n\nFound here: https://**mydomain**.pagerduty.com/",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2020-07-23T08:13:54.3820000Z",
+  "LastModifiedBy": "tfbryan",
+  "$Meta": {
+    "ExportedAt": "2020-07-23T08:13:54.3820000Z",
+    "OctopusVersion": "2020.1.14",
+    "Type": "ActionTemplate"
+  },
+  "Category": "pagerduty"
+}
diff --git a/src/step-templates/pagerduty-open-maintenance-window/scriptbody.ps1 b/src/step-templates/pagerduty-open-maintenance-window/scriptbody.ps1
new file mode 100644
index 000000000..a38cae4fb
--- /dev/null
+++ b/src/step-templates/pagerduty-open-maintenance-window/scriptbody.ps1
@@ -0,0 +1,90 @@
+param(
+    [array]$ServiceIds = @(""),
+    [string]$RequesterId = "",
+    [string]$Description = "",
+    [int]$Minutes = 10,
+    [string]$Token = ""
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $Result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $Result = $OctopusParameters[$Name]
+    }
+
+    if ($Result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $Result = $variable.Value
+        }
+    }
+
+    if ($Result -eq $null -or $Result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $Result = $Default
+        }
+    }
+
+    return $Result
+}
+
+& {
+    param([array]$ServiceIds, [string]$RequesterId, [string]$Description, [int]$Minutes, [string]$Token)
+
+    Write-Host "Opening PagerDuty window for $Description"
+
+    try {
+        $ArrayOfServices = $ServiceIds.split(",") | foreach { $_.trim() }
+        $Start = ((Get-Date)).ToString("yyyy-MM-ddTHH:mm:sszzzzZ");
+        $End = ((Get-Date).AddMinutes($Minutes)).ToString("yyyy-MM-ddTHH:mm:sszzzzZ");
+        $ServiceIdArray = @()
+        
+        foreach($ServiceId in $ArrayOfServices){
+        	$ServiceIdArray += @{"id"=$ServiceId; "type"="service_reference"}
+        }
+        
+        $Uri = "https://api.pagerduty.com/maintenance_windows"
+        $Headers = @{
+          "Authorization" = "Token token=$Token"
+          "Accept" = "application/vnd.pagerduty+json;version=2"
+          "From" = $RequesterId
+		}
+
+        Write-Host "Window will be open from $Start -> $End"
+
+        $Post = @{
+            maintenance_window= @{
+            	type = 'maintenance_window'
+                start_time = $Start
+                end_time = $End
+                description = $Description
+                services = $ServiceIdArray
+            }
+        } | ConvertTo-Json -Depth 4
+
+        $ResponseObj = Invoke-RestMethod -Uri $Uri -Method Post -Body $Post -ContentType "application/json" -Headers $Headers
+        $WindowId = $ResponseObj.maintenance_window.id
+
+        Write-Host "Window Id $WindowId created"
+
+        if(Get-Command -name "Set-OctopusVariable" -ErrorAction SilentlyContinue) {
+            Set-OctopusVariable -name "WindowId" -value $WindowId
+        } else {
+            Write-Host "Octopus output variable not set"
+        }
+    } catch [System.Exception] {
+        Write-Host "Error while opening PagerDuty window"
+        Write-Host $_.Exception.Message
+        
+        $ResponseStream = $_.Exception.Response.GetResponseStream()
+        $Reader = New-Object System.IO.StreamReader($ResponseStream)
+        $Reader.ReadToEnd() | Write-Host
+        
+        Exit 1
+    }
+} (Get-Param 'ServiceIds' -Required) (Get-Param 'RequesterId' -Required) (Get-Param 'Description' -Required) (Get-Param 'Minutes' -Required) (Get-Param 'Token' -Required)
\ No newline at end of file
diff --git a/step-templates/pause-resume-pingdom-check.json b/src/step-templates/pause-resume-pingdom-check/metadata.json
similarity index 66%
rename from step-templates/pause-resume-pingdom-check.json
rename to src/step-templates/pause-resume-pingdom-check/metadata.json
index ba72f5f3a..c6c06a047 100644
--- a/step-templates/pause-resume-pingdom-check.json
+++ b/src/step-templates/pause-resume-pingdom-check/metadata.json
@@ -6,7 +6,7 @@
   "Version": 1,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$webclient = New-Object System.Net.WebClient\n$webclient.Credentials = New-Object System.Net.NetworkCredential($UserName, $Password)\n$webClient.Headers.add('App-Key',$AppKey)\n$url = \"https://api.pingdom.com/api/2.0/checks/$CheckId\"\n$actionBody = \"paused=\" + ($Action -eq \"Pause\").tostring().tolower()\n\n$checkResult = $webclient.DownloadString($url) | ConvertFrom-Json\nWrite-Host \"Attempting to\" $Action.tolower() \"check\" $CheckId \"-\" $checkResult.check.name\n\n$result = $webclient.UploadString($url, \"PUT\", $actionBody) | ConvertFrom-Json\n\nWrite-Host $result.message"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -54,12 +54,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-07-31T12:23:52.329+00:00",
+  "LastModifiedOn": "2015-07-31T05:23:52.3290000-07:00",
   "LastModifiedBy": "timorzadir",
   "$Meta": {
-    "ExportedAt": "2015-07-31T12:23:52.329+00:00",
+    "ExportedAt": "2015-07-31T05:23:52.3290000-07:00",
     "OctopusVersion": "3.0.7.2204",
     "Type": "ActionTemplate"
   },
   "Category": "pingdom"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/pause-resume-pingdom-check/scriptbody.ps1 b/src/step-templates/pause-resume-pingdom-check/scriptbody.ps1
new file mode 100644
index 000000000..e7f22b027
--- /dev/null
+++ b/src/step-templates/pause-resume-pingdom-check/scriptbody.ps1
@@ -0,0 +1,12 @@
+$webclient = New-Object System.Net.WebClient
+$webclient.Credentials = New-Object System.Net.NetworkCredential($UserName, $Password)
+$webClient.Headers.add('App-Key',$AppKey)
+$url = "https://api.pingdom.com/api/2.0/checks/$CheckId"
+$actionBody = "paused=" + ($Action -eq "Pause").tostring().tolower()
+
+$checkResult = $webclient.DownloadString($url) | ConvertFrom-Json
+Write-Host "Attempting to" $Action.tolower() "check" $CheckId "-" $checkResult.check.name
+
+$result = $webclient.UploadString($url, "PUT", $actionBody) | ConvertFrom-Json
+
+Write-Host $result.message
\ No newline at end of file
diff --git a/src/step-templates/pingdom-create-uptime-check/metadata.json b/src/step-templates/pingdom-create-uptime-check/metadata.json
new file mode 100644
index 000000000..e40f496c2
--- /dev/null
+++ b/src/step-templates/pingdom-create-uptime-check/metadata.json
@@ -0,0 +1,247 @@
+{
+  "Id": "70ea4820-7d02-4015-a691-8c77b5ab14d5",
+  "Name": "Pingdom - Create Uptime Check",
+  "Description": "Creates Pingdom http check using [Create New Check API method](https://www.pingdom.com/resources/api#MethodCreate+New+Check).",
+  "ActionType": "Octopus.Script",
+  "Version": 43,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Package.DownloadOnTentacle": "False",
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null,
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "16cdd666-9822-428c-9c1e-fb8943039a98",
+      "Name": "Pingdom.Username",
+      "Label": "Username",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d5b36e0f-3c55-4b63-9971-4c9147218514",
+      "Name": "Pingdom.Password",
+      "Label": "Password",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "2f33c3ed-202a-4711-8897-a47329c18b8d",
+      "Name": "Pingdom.AppKey",
+      "Label": "App key",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "754d2183-3b3b-4170-898b-f759af555f69",
+      "Name": "Pingdom.CheckName",
+      "Label": "Name",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c04286a9-d4e4-4c33-985e-67f52b3a9549",
+      "Name": "Pingdom.CheckTarget",
+      "Label": "Target",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "96e4c38b-4d43-4083-ace3-510f945a4202",
+      "Name": "Pingdom.CheckIntervalMinutes",
+      "Label": "Interval",
+      "HelpText": "Check interval in minutes. Integer (1, 5, 15, 30, 60)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7fc1f49f-446c-4836-8966-b1786d45f6b1",
+      "Name": "Pingdom.CheckContactIds",
+      "Label": "Contact Ids",
+      "HelpText": "Pingdom contact identifiers. For example contactids=154325,465231,765871.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f76811df-7a79-4fee-a491-46c6ce4bc813",
+      "Name": "Pingdom.CheckIntegrationIds",
+      "Label": "",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "963c6ff8-b79e-408d-9729-036b58c42857",
+      "Name": "Pingdom.CheckSendNotificationWhenDown",
+      "Label": "Send notification when down",
+      "HelpText": "Send notification when down n times.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6ba72782-3eee-465c-9176-659de024f8dd",
+      "Name": "Pingdom.CheckNotifyAgainEvery",
+      "Label": "Notify every",
+      "HelpText": "Notify again every n result. 0 means that no extra notifications will be sent.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9ad13abe-13ab-466c-bd0e-a51637bece3b",
+      "Name": "Pingdom.CheckSendToEmail",
+      "Label": "Send to email",
+      "HelpText": null,
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "8a958bb9-5a61-4956-b79d-7f990271b127",
+      "Name": "Pingdom.CheckNotifyWhenBackUp",
+      "Label": "Notify when back up",
+      "HelpText": "Notify when back up again.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "93e9f063-b0b9-495b-8774-fd140b96a640",
+      "Name": "Pingdom.CheckTags",
+      "Label": "Tags",
+      "HelpText": "Pingdom check tags. Example: octopus,azure.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9d579e60-2228-4521-9178-2da35817d0b8",
+      "Name": "Pingdom.CheckHttpEncryptionEnabled",
+      "Label": "Http encryption enabled",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e289c1f6-cfbc-4774-ac97-395ac353b3b3",
+      "Name": "Pingdom.CheckHttpTargetPort",
+      "Label": "Http target port",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "dcda6fd8-9e42-40c4-9213-f77e9e67b974",
+      "Name": "Pingdom.CheckAuth",
+      "Label": "Auth",
+      "HelpText": "Username and password for target HTTP authentication. Example: user:password.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "bab9c934-dfb4-42c3-817f-22b58a8ef3d5",
+      "Name": "Pingdom.CheckShouldContain",
+      "Label": "Should contain",
+      "HelpText": "Target site should contain this string.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "96e83352-1dce-4d16-bce7-0f8d4929ced7",
+      "Name": "Pingdom.CheckShouldNotContain",
+      "Label": "Should not contain",
+      "HelpText": "Target site should NOT contain this string. If shouldcontain is also set, this parameter is not allowed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "60570a61-678f-4ef2-90e5-c70d7b53ecb4",
+      "Name": "Pingdom.CheckPostData",
+      "Label": "Post data",
+      "HelpText": "Data that should be posted to the web page, for example submission data for a sign-up or login form. The data needs to be formatted in the same way as a web browser would send it to the web server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fdb84b63-f86b-4aff-b9e9-e9166d512f51",
+      "Name": "Pingdom.ThrowErrorWhenFailed",
+      "Label": "Error when failed",
+      "HelpText": "When checked, throws Octopus exception if template script has failed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "sarbis",
+  "$Meta": {
+    "ExportedAt": "2018-06-11T13:49:31.5080000Z",
+    "OctopusVersion": "2018.4.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "pingdom"
+}
diff --git a/src/step-templates/pingdom-create-uptime-check/scriptbody.ps1 b/src/step-templates/pingdom-create-uptime-check/scriptbody.ps1
new file mode 100644
index 000000000..32c87e227
--- /dev/null
+++ b/src/step-templates/pingdom-create-uptime-check/scriptbody.ps1
@@ -0,0 +1,190 @@
+# Ref https://www.pingdom.com/resources/api#MethodCreate+New+Check
+
+Function Get-Parameter() {
+    Param(
+        [parameter(Mandatory=$true)]
+        [string]$Name, 
+        [switch]$Required, 
+        $Default, 
+        [switch]$FailOnValidate
+    )
+
+    $result = $null
+    $errMessage = [string]::Empty
+
+    If ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+        Write-Host ("Octopus parameter value for " + $Name + ": " + $result)
+    }
+
+    If ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    If ($result -eq $null -or [string]::IsNullOrEmpty($result)) {
+        If ($Required) {
+            $errMessage = "Missing value for $Name"
+        } ElseIf (-Not $Default -eq $null) {
+            Write-Host ("Default value: " + $Default)
+            $result = $Default
+        }
+    }
+
+    If (-Not [string]::IsNullOrEmpty($errMessage)) {
+        If ($FailOnValidate) {
+            Throw $errMessage
+        } Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    return $result
+}
+
+Function Test-Any() { 
+   begin { 
+      $any = $false
+   } 
+   process { 
+      $any = $true
+   } 
+   end { 
+      $any
+   } 
+} 
+
+& {
+    Write-Host "Start PingdomCreateUptimeCheck"
+
+    Add-Type -AssemblyName System.Web
+
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    $throwErrorWhenFailed = [System.Convert]::ToBoolean([string](Get-Parameter -Name "Pingdom.ThrowErrorWhenFailed" -Default "False"))
+
+    $pingdomUsername = [string] (Get-Parameter -Name "Pingdom.Username" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomPassword = [string] (Get-Parameter -Name "Pingdom.Password" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomAppKey = [string] (Get-Parameter -Name "Pingdom.AppKey" -Required -FailOnValidate:$throwErrorWhenFailed)
+
+    $pingdomCheckName = [string] (Get-Parameter -Name "Pingdom.CheckName" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckTarget = [string] (Get-Parameter -Name "Pingdom.CheckTarget" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckType = "http"
+    $pingdomCheckIntervalMinutes = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckIntervalMinutes" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckContactIds = [string] (Get-Parameter -Name "Pingdom.CheckContactIds" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckSendNotificationWhenDown = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckSendNotificationWhenDown" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckNotifyAgainEvery = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckNotifyAgainEvery" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckNotifyWhenBackUp = [string](Get-Parameter -Name "Pingdom.CheckNotifyWhenBackUp" -Default "True" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckTags = [string] (Get-Parameter -Name "Pingdom.CheckTags" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckHttpUrl = [string] (Get-Parameter -Name "Pingdom.CheckHttpUrl" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckHttpEncryptionEnabled = [string](Get-Parameter -Name "Pingdom.CheckHttpEncryptionEnabled" -Default "False" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckHttpTargetPort = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckHttpTargetPort" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckAuth = [string] (Get-Parameter -Name "Pingdom.CheckAuth" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckShouldContain = [string] (Get-Parameter -Name "Pingdom.CheckShouldContain" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckShouldNotContain = [string] (Get-Parameter -Name "Pingdom.CheckShouldNotContain" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckPostData = [string] (Get-Parameter -Name "Pingdom.CheckPostData" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckIntegrationIds = [string] (Get-Parameter -Name "Pingdom.CheckIntegrationIds" -FailOnValidate:$throwErrorWhenFailed)
+
+    $apiVersion = "2.1"
+    $url = "https://api.pingdom.com/api/{0}/checks" -f $apiVersion
+    $securePassword = ConvertTo-SecureString $pingdomPassword -AsPlainText -Force
+    $credential = New-Object System.Management.Automation.PSCredential($pingdomUsername, $securePassword)
+    $headers = @{ 
+        "App-Key" = $pingdomAppKey
+    }
+
+    # Validate if check already registered
+
+    Write-Host "Getting uptime check list to find check by name: $url"
+    Try {
+        $response = Invoke-RestMethod -Uri $url -Method Get -ContentType "application/json" -Credential $credential -Headers $headers
+    } Catch {
+        $errMessage = "Error occured when getting uptime check in Pingdom: " + $_.Exception.Message
+        If($throwErrorWhenFailed -eq $true) {
+            Write-Error $errMessage
+        }
+        Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    $checkExists = $response.checks | Where-Object { $_.name -eq $pingdomCheckName } | Test-Any
+    If ($checkExists -eq $true) {
+        Write-Host "Check with name $pingdomCheckName already registered. New check will not be created!"
+        Exit
+    }
+
+    # Create new check
+
+    $apiParameters = @{}
+    $apiParameters.Add("name", $pingdomCheckName)
+    $apiParameters.Add("host", $pingdomCheckTarget)
+    $apiParameters.Add("type", $pingdomCheckType)
+    $apiParameters.Add("contactids", $pingdomCheckContactIds)
+    $apiParameters.Add("integrationids", $pingdomCheckIntegrationIds)
+    If ($pingdomCheckIntervalMinutes -ne $null) {
+        $apiParameters.Add("resolution", $pingdomCheckIntervalMinutes)
+    }
+    If ($pingdomCheckSendNotificationWhenDown -ne $null) {
+        $apiParameters.Add("sendnotificationwhendown", $pingdomCheckSendNotificationWhenDown)
+    }
+    If ($pingdomCheckNotifyAgainEvery -ne $null) {
+        $apiParameters.Add("notifyagainevery", $pingdomCheckNotifyAgainEvery)
+    }
+    If ($pingdomCheckNotifyWhenBackUp -ne $null) {
+        $apiParameters.Add("notifywhenbackup", $pingdomCheckNotifyWhenBackUp.ToLower())
+    }
+    If ($pingdomCheckTags -ne $null) {
+        $apiParameters.Add("tags", $pingdomCheckTags)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckHttpUrl)) {
+        $apiParameters.Add("url", $pingdomCheckHttpUrl)
+    }
+    If ($pingdomCheckHttpEncryptionEnabled -ne $null) {
+        $apiParameters.Add("encryption", $pingdomCheckHttpEncryptionEnabled.ToLower())
+    }
+    If ($pingdomCheckHttpTargetPort -ne $null) {
+        $apiParameters.Add("port", $pingdomCheckHttpTargetPort)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckAuth)) {
+        $apiParameters.Add("auth", $pingdomCheckAuth)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldContain)) {
+        $apiParameters.Add("shouldcontain", $pingdomCheckShouldContain)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldNotContain)) {
+        $apiParameters.Add("shouldnotcontain", $pingdomCheckShouldNotContain)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckPostData )) {
+        $apiParameters.Add("postdata", $pingdomCheckPostData)
+    }
+
+    If ($apiParameters.Count -gt 0) {
+        $queryString = ""
+        $apiParameters.Keys | ForEach-Object { 
+            $queryString += ($_ + "=" + [System.Web.HttpUtility]::UrlEncode($apiParameters.Item($_)) + "&")
+        }
+        $requestBody = $queryString.Substring(0, $queryString.Length - 1)
+        $url += "?$requestBody"
+    }
+
+    Write-Host "Creating new uptime check: $url"
+    Write-Host "Request body: $requestBody"
+    Try {
+        $response = Invoke-RestMethod -Uri $url -Method Post -Body $requestBody -ContentType "application/json" -Credential $credential -Headers $headers
+        Write-Host ("Successfully added uptime check in Pingdom: Name = " + $response.check.name + ", Id = " + $response.check.id)
+    } Catch {
+        $errMessage = "Error occured when adding uptime check in Pingdom: " + $_.Exception + "`n"
+        $errMessage += "Response: " + $_
+        If($throwErrorWhenFailed -eq $true) {
+            Write-Error $errMessage
+        }
+        Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    Write-Host "End PingdomCreateUptimeCheck"
+}
\ No newline at end of file
diff --git a/src/step-templates/pingdom-modify-uptime-check/metadata.json b/src/step-templates/pingdom-modify-uptime-check/metadata.json
new file mode 100644
index 000000000..c22d0e15a
--- /dev/null
+++ b/src/step-templates/pingdom-modify-uptime-check/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "e2324451-0488-4dbf-acc8-656cc2f8defb",
+  "Name": "Pingdom - Modify Uptime Check",
+  "Description": "Modifies Pingdom http check using [Modify Check API method](https://www.pingdom.com/resources/api#MethodModify+Check).",
+  "ActionType": "Octopus.Script",
+  "Version": 26,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null,
+    "Octopus.Action.Package.DownloadOnTentacle": "False",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "cc77291a-308c-414a-9e68-3a23ea2207da",
+      "Name": "Pingdom.Username",
+      "Label": "Username",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "815e7620-2f99-4231-a975-5a074b77260c",
+      "Name": "Pingdom.Password",
+      "Label": "Password",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ac459f1c-7688-481c-a954-05779adeac61",
+      "Name": "Pingdom.AppKey",
+      "Label": "App key",
+      "HelpText": "Mandatory.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "df91b159-d961-4a45-bb8b-9521b3e8848f",
+      "Name": "Pingdom.CheckId",
+      "Label": "Id",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "9a3d6294-799b-474c-9cd4-3404e281acb5",
+      "Name": "Pingdom.CheckName",
+      "Label": "Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4508116a-fb26-4500-b1d1-b75d13838204",
+      "Name": "Pingdom.CheckPaused",
+      "Label": "Paused",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "603710c6-e717-44e0-9eac-b84c06ff9351",
+      "Name": "Pingdom.ThrowErrorWhenFailed",
+      "Label": "Error when failed",
+      "HelpText": "When checked, throws Octopus exception if template script has failed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "sarbis",
+  "$Meta": {
+    "ExportedAt": "2018-06-11T13:50:51.6990000Z",
+    "OctopusVersion": "2018.4.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "pingdom"
+}
diff --git a/src/step-templates/pingdom-modify-uptime-check/scriptbody.ps1 b/src/step-templates/pingdom-modify-uptime-check/scriptbody.ps1
new file mode 100644
index 000000000..1785e33c8
--- /dev/null
+++ b/src/step-templates/pingdom-modify-uptime-check/scriptbody.ps1
@@ -0,0 +1,197 @@
+# Ref: https://www.pingdom.com/resources/api#MethodModify+Check
+
+Function Get-Parameter() {
+    Param(
+        [parameter(Mandatory=$true)]
+        [string]$Name, 
+        [switch]$Required, 
+        $Default, 
+        [switch]$FailOnValidate
+    )
+
+    $result = $null
+    $errMessage = [string]::Empty
+
+    If ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+        Write-Host ("Octopus parameter value for " + $Name + ": " + $result)
+    }
+
+    If ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    If ($result -eq $null -or [string]::IsNullOrEmpty($result)) {
+        If ($Required) {
+            $errMessage = "Missing value for $Name"
+        } ElseIf (-Not $Default -eq $null) {
+            Write-Host ("Default value: " + $Default)
+            $result = $Default
+        }
+    }
+
+    If (-Not [string]::IsNullOrEmpty($errMessage)) {
+        If ($FailOnValidate) {
+            Throw $errMessage
+        } Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    return $result
+}
+
+& {
+    Write-Host "Start PingdomModifyUptimeCheck"
+
+    Add-Type -AssemblyName System.Web
+
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    $throwErrorWhenFailed = [System.Convert]::ToBoolean([string](Get-Parameter -Name "Pingdom.ThrowErrorWhenFailed" -Default "False"))
+
+    $pingdomUsername = [string] (Get-Parameter -Name "Pingdom.Username" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomPassword = [string] (Get-Parameter -Name "Pingdom.Password" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomAppKey = [string] (Get-Parameter -Name "Pingdom.AppKey" -Required -FailOnValidate:$throwErrorWhenFailed)
+
+    $pingdomCheckId = [string] (Get-Parameter -Name "Pingdom.CheckId" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckPaused = [string] (Get-Parameter -Name "Pingdom.CheckPaused" -Default "False" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckName = [string] (Get-Parameter -Name "Pingdom.CheckName" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckTarget = [string] (Get-Parameter -Name "Pingdom.CheckTarget" -Required -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckIntervalMinutes = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckIntervalMinutes" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckContactIds = [string] (Get-Parameter -Name "Pingdom.CheckContactIds" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckSendNotificationWhenDown = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckSendNotificationWhenDown" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckNotifyAgainEvery = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckNotifyAgainEvery" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckNotifyWhenBackUp = [string](Get-Parameter -Name "Pingdom.CheckNotifyWhenBackUp" -Default "True" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckTags = [string] (Get-Parameter -Name "Pingdom.CheckTags" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckHttpUrl = [string] (Get-Parameter -Name "Pingdom.CheckHttpUrl" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckHttpEncryptionEnabled = [string](Get-Parameter -Name "Pingdom.CheckHttpEncryptionEnabled" -Default "False" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckHttpTargetPort = [System.Nullable[int]] (Get-Parameter -Name "Pingdom.CheckHttpTargetPort" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckAuth = [string] (Get-Parameter -Name "Pingdom.CheckAuth" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckShouldContain = [string] (Get-Parameter -Name "Pingdom.CheckShouldContain" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckShouldNotContain = [string] (Get-Parameter -Name "Pingdom.CheckShouldNotContain" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckPostData = [string] (Get-Parameter -Name "Pingdom.CheckPostData" -FailOnValidate:$throwErrorWhenFailed)
+    $pingdomCheckIntegrationIds = [string] (Get-Parameter -Name "Pingdom.CheckIntegrationIds" -FailOnValidate:$throwErrorWhenFailed)
+
+    $apiVersion = "2.1"
+    $url = "https://api.pingdom.com/api/{0}/checks" -f $apiVersion
+    $securePassword = ConvertTo-SecureString $pingdomPassword -AsPlainText -Force
+    $credential = New-Object System.Management.Automation.PSCredential($pingdomUsername, $securePassword)
+    $headers = @{ 
+        "App-Key" = $pingdomAppKey
+    }
+
+    If ([string]::IsNullOrEmpty($pingdomCheckId) -and [string]::IsNullOrEmpty($pingdomCheckName)) {
+        $errMessage = "Please specify CheckId or CheckName!"
+        If($throwErrorWhenFailed -eq $true) {
+            Write-Error $errMessage
+        }
+        Else {
+            Write-Warning $errMessage
+        }
+        Exit
+    } 
+    
+    # Find check id by name
+
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckName)) {
+        Write-Host "Getting uptime check list to find check by name: $url"
+        Try {
+            $response = Invoke-RestMethod -Uri $url -Method Get -ContentType "application/json" -Credential $credential -Headers $headers
+        } Catch {
+            Write-Host "Error occured when getting uptime check list in Pingdom: " + $_.Exception.Message
+        }
+
+        $checkFiltered = $response.checks | Where-Object { $_.name -eq $pingdomCheckName }
+        If ($checkFiltered -eq $null) {
+            Write-Warning "Check with name $pingdomCheckName not found!"
+            Exit
+        }
+
+        $pingdomCheckId = $checkFiltered.id
+    }
+
+    If ([string]::IsNullOrEmpty($pingdomCheckId)) {
+        Write-Warning "Check with name $pingdomCheckName was not found!"
+        Exit
+    }
+
+    # Pause or resume check
+
+    $url += "/$pingdomCheckId"
+
+    $apiParameters = @{}
+    $apiParameters.Add("host", $pingdomCheckTarget)
+    $apiParameters.Add("contactids", $pingdomCheckContactIds)
+    $apiParameters.Add("integrationids", $pingdomCheckIntegrationIds)
+    If ($pingdomCheckPaused -eq "True") {
+        $apiParameters.Add("paused", "true")
+    } Else {
+        $apiParameters.Add("paused", "false")
+    }
+    If ($pingdomCheckIntervalMinutes -ne $null) {
+        $apiParameters.Add("resolution", $pingdomCheckIntervalMinutes)
+    }
+    If ($pingdomCheckSendNotificationWhenDown -ne $null) {
+        $apiParameters.Add("sendnotificationwhendown", $pingdomCheckSendNotificationWhenDown)
+    }
+    If ($pingdomCheckNotifyAgainEvery -ne $null) {
+        $apiParameters.Add("notifyagainevery", $pingdomCheckNotifyAgainEvery)
+    }
+    If ($pingdomCheckNotifyWhenBackUp -ne $null) {
+        $apiParameters.Add("notifywhenbackup", $pingdomCheckNotifyWhenBackUp.ToLower())
+    }
+    If ($pingdomCheckTags -ne $null) {
+        $apiParameters.Add("tags", $pingdomCheckTags)
+    }
+    If ($pingdomCheckHttpUrl -ne $null) {
+        $apiParameters.Add("url", $pingdomCheckHttpUrl)
+    }
+    If ($pingdomCheckHttpEncryptionEnabled -ne $null) {
+        $apiParameters.Add("encryption", $pingdomCheckHttpEncryptionEnabled.ToLower())
+    }
+    If ($pingdomCheckHttpTargetPort -ne $null) {
+        $apiParameters.Add("port", $pingdomCheckHttpTargetPort)
+    }
+    If ($pingdomCheckAuth -ne $null) {
+        $apiParameters.Add("auth", $pingdomCheckAuth)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldContain)) {
+        $apiParameters.Add("shouldcontain", $pingdomCheckShouldContain)
+    }
+    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldNotContain)) {
+        $apiParameters.Add("shouldnotcontain", $pingdomCheckShouldNotContain)
+    }
+    If ($pingdomCheckPostData -ne $null) {
+        $apiParameters.Add("postdata", $pingdomCheckPostData)
+    }
+
+    If ($apiParameters.Count -gt 0) {
+        $queryString = ""
+        $apiParameters.Keys | ForEach-Object { 
+            $queryString += ($_ + "=" + [Web.HttpUtility]::UrlEncode($apiParameters.Item($_)) + "&")  
+        }
+        $queryString = $queryString.Substring(0, $queryString.Length - 1)
+        $url += "?$queryString"
+    }
+
+    Write-Host "Modifying uptime check: $url"
+    Try {
+        $response = Invoke-RestMethod -Uri $url -Method Put -ContentType "application/json" -Credential $credential -Headers $headers
+        Write-Host $response.message
+    } Catch {
+        $errMessage = "Error occured when adding uptime check in Pingdom: " + $_.Exception + "`n"
+        $errMessage += "Response: " + $_
+        If($throwErrorWhenFailed -eq $true) {
+            Write-Error $errMessage
+        }
+        Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    Write-Host "End PingdomModifyUptimeCheck"
+}
\ No newline at end of file
diff --git a/src/step-templates/postgres-add-database-user-to-role/metadata.json b/src/step-templates/postgres-add-database-user-to-role/metadata.json
new file mode 100644
index 000000000..ba82e1556
--- /dev/null
+++ b/src/step-templates/postgres-add-database-user-to-role/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "72f8bfaf-14c3-4807-b687-c07738c14ba1",
+  "Name": "Postgres - Add Database User To Role",
+  "Description": "Adds database user to a role.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "802920ef-155f-4d43-aba7-0c32b09e90e8",
+      "Name": "addPostgresServerName",
+      "Label": "Server name",
+      "HelpText": "Name of the PostreSQL server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "89dcd174-d798-49be-8a09-d8a528cb6847",
+      "Name": "addPostgresServerPort",
+      "Label": "Port",
+      "HelpText": "Port that the PostgreSQL server listens on.",
+      "DefaultValue": "5432",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e357a82c-a25d-4f0e-ac99-b7928d884c25",
+      "Name": "postgreSqlAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the PostgreSQL server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "9a975cd9-3891-4150-b747-bb78a76fcfb8",
+      "Name": "addLoginWithAddRoleRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user that can add roles to other users.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "76b5d5a6-4953-4dc4-92c9-3487b7852a2f",
+      "Name": "addLoginPasswordWithAddRoleRights",
+      "Label": "Login password",
+      "HelpText": "Password for the login account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "cf31a6ae-244f-49bb-b60b-e80987b96cdf",
+      "Name": "addUsername",
+      "Label": "User name",
+      "HelpText": "Name of the user to add the role to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "631a3a6c-203c-4925-9ee9-d2086debde37",
+      "Name": "addRoleName",
+      "Label": "Role name",
+      "HelpText": "Name of the role to add to the user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c2fa3736-8d0c-4de6-9d11-72d0910c9cb7",
+      "Name": "addTrustSSL",
+      "Label": "Trust SSL certificate",
+      "HelpText": "Force trusting the SSL certificate.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2022-06-14T15:09:44.8060000Z",
+    "OctopusVersion": "2022.2.5111",
+    "Type": "ActionTemplate"
+  },
+  "Category": "postgresql"
+}
diff --git a/src/step-templates/postgres-add-database-user-to-role/scriptbody.ps1 b/src/step-templates/postgres-add-database-user-to-role/scriptbody.ps1
new file mode 100644
index 000000000..5d173d1a0
--- /dev/null
+++ b/src/step-templates/postgres-add-database-user-to-role/scriptbody.ps1
@@ -0,0 +1,228 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserInRole
+{
+	# Define parameters
+    param (
+    $Username,
+    $RoleName)
+    
+	# Execute query
+    $userRole = Invoke-SqlQuery "SELECT r.rolname, r1.rolname as `"role`" FROM pg_catalog.pg_roles r JOIN pg_catalog.pg_auth_members m ON (m.member = r.oid) JOIN pg_roles r1 ON (m.roleid=r1.oid) WHERE r.rolcanlogin AND r1.rolname = '$RoleName' AND r.rolname = '$Username'"
+
+    # Check to see if anything was returned
+    if ($userRole.ItemArray.Count -gt 0)
+    {
+        # Found
+        return $true
+    }
+    
+
+    # Not found
+    return $false
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Get whether trust certificate is necessary
+$addTrustSSL = [System.Convert]::ToBoolean("$addTrustSSL")
+
+try
+{
+	# Declare initial connection string
+    $connectionString = "Server=$addPostgresServerName;Port=$addPostgresServerPort;Database=postgres;"
+
+	# Check to see if we need to trust the ssl cert
+	if ($addTrustSSL -eq $true)
+	{
+        # Append SSL connection string components
+        $connectionString += "SSL Mode=Require;Trust Server Certificate=true;"
+	}
+
+   # Update the connection string based on authentication method
+    switch ($postgreSqlAuthenticationMethod)
+    {
+        "azuremanagedidentity"
+        {
+        	# Get login token
+            Write-Host "Generating Azure Managed Identity token ..."
+            $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"}
+            
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$addLoginWithAddRoleRights;Password=`"$($token.access_token)`";"
+            
+            break
+        }    
+        "awsiam"
+        {
+            # Region is part of the RDS endpoint, extract
+            $region = ($addPostgresServerName.Split("."))[2]
+
+            Write-Host "Generating AWS IAM token ..."
+            $addLoginPasswordWithAddRoleRights = (aws rds generate-db-auth-token --hostname $addPostgresServerName --region $region --port $addPostgresServerPort --username $addLoginWithAddRoleRights)
+
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$addLoginWithAddRoleRights;Password=`"$addLoginPasswordWithAddRoleRights`";"
+
+            break
+        }
+        "gcpserviceaccount"
+        {
+            # Define header
+            $header = @{ "Metadata-Flavor" = "Google"}
+
+            # Retrieve service accounts
+            $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+            # Results returned in plain text format, get into array and remove empty entries
+            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+            # Retreive the specific service account assigned to the VM
+            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains("iam.gserviceaccount.com") }
+
+            Write-Host "Generating GCP IAM token ..."
+            # Retrieve token for account
+            $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+            
+            # Check to see if there was a username provided
+            if ([string]::IsNullOrWhitespace($addLoginWithAddRoleRights))
+            {
+            	# Use the service account name, but strip off the .gserviceaccount.com part
+                $addLoginWithAddRoleRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+            }
+  
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$addLoginWithAddRoleRights;Password=`"$($token.access_token)`";"
+  
+            break
+        }
+        "usernamepassword"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$addLoginWithAddRoleRights;Password=`"$addLoginPasswordWithAddRoleRights`";"
+
+            break    
+        }
+
+        "windowsauthentication"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";Integrated Security=True;"
+        }
+    }
+    
+	# Open connection
+    Open-PostGreConnection -ConnectionString $connectionString   
+    
+    # See if database exists
+    $userInRole = Get-UserInRole -Username $addUsername -RoleName $addRoleName
+
+    if ($userInRole -eq $false)
+    {
+        # Create database
+        Write-Output "Adding user $addUsername to role $addRoleName ..."
+        $executionResults = Invoke-SqlUpdate "GRANT $addRoleName TO `"$addUsername`";"
+
+        # See if it was created
+        $userInRole = Get-UserInRole -Username $addUsername -RoleName $addRoleName
+            
+        # Check array
+        if ($userInRole -eq $true)
+        {
+            # Success
+            Write-Output "$addUserName added to $addRoleName successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "Failure adding $addUserName to $addRoleName!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $addUsername is already in role $addRoleName"
+    }
+}
+finally
+{
+    Close-SqlConnection
+}
+
+
diff --git a/src/step-templates/postgres-create-database/metadata.json b/src/step-templates/postgres-create-database/metadata.json
new file mode 100644
index 000000000..352aa147d
--- /dev/null
+++ b/src/step-templates/postgres-create-database/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "0a1208c7-4a12-4da1-a60d-2b3197b377c4",
+  "Name": "Postgres - Create Database If Not Exists",
+  "Description": "Creates a Postgres database if it doesn't already exist.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "8fc92b80-5122-44a0-b3d8-a1d022a35055",
+      "Name": "createPosgreSQLServerName",
+      "Label": "Server",
+      "HelpText": "Hostname (or IP) of the MySQL database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "32abc8e8-486c-4afb-abe1-f1e84125afc8",
+      "Name": "postgreSqlAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the PostgreSQL server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "df993ccf-71ab-48de-9a67-e2af6653d35e",
+      "Name": "createUsername",
+      "Label": "Username",
+      "HelpText": "Username to use for the connection",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8a07f25d-a7db-466e-a356-9155cbc5f258",
+      "Name": "createUserPassword",
+      "Label": "Password",
+      "HelpText": "Password for the user account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "2af18465-c8d1-48f6-afce-1b1b30ae9559",
+      "Name": "createDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to create",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f55e2a34-7a82-4d92-83bb-a19f304774d8",
+      "Name": "createPort",
+      "Label": "Port",
+      "HelpText": "Port for the database instance.",
+      "DefaultValue": "5432",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0366424c-ab0b-4895-8d48-2902e3f6de39",
+      "Name": "createTrustSSL",
+      "Label": "Trust SSL Certificate",
+      "HelpText": "Force trusting an SSL Certificate.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "99f987cb-97da-4f0a-8056-33a93ab908dc",
+      "Name": "postgresCommandTimeout",
+      "Label": "Command Timeout",
+      "HelpText": "Timeout value (in seconds) for SQL commands",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2024-05-23T15:30:50.3190000Z",
+    "OctopusVersion": "2024.3.164",
+    "Type": "ActionTemplate"
+  },
+  "Category": "postgresql"
+}
diff --git a/src/step-templates/postgres-create-database/scriptbody.ps1 b/src/step-templates/postgres-create-database/scriptbody.ps1
new file mode 100644
index 000000000..bd99e1be0
--- /dev/null
+++ b/src/step-templates/postgres-create-database/scriptbody.ps1
@@ -0,0 +1,231 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-DatabaseExists
+{
+	# Define parameters
+    param ($DatabaseName)
+    
+	# Execute query
+    return Invoke-SqlQuery -Query "SELECT datname FROM pg_catalog.pg_database where datname = '$DatabaseName';" -CommandTimeout $postgresCommandTimeout -ConnectionName $connectionName
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific version
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Get whether trust certificate is necessary
+$createTrustSSL = [System.Convert]::ToBoolean("$createTrustSSL")
+
+try
+{
+	# Declare initial connection string
+    $connectionString = "Server=$createPosgreSQLServerName;Port=$createPort;Database=postgres;"
+    
+	# Check to see if we need to trust the ssl cert
+	if ($createTrustSSL -eq $true)
+	{
+        # Append SSL connection string components
+        $connectionString += "SSL Mode=Require;Trust Server Certificate=true;"
+	}
+
+    # Update the connection string based on authentication method
+    switch ($postgreSqlAuthenticationMethod)
+    {
+        "azuremanagedidentity"
+        {
+        	# Get login token
+            Write-Host "Generating Azure Managed Identity token ..."
+            $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"}
+            
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createUsername;Password=`"$($token.access_token)`";"
+            
+            break
+        }
+        "awsiam"
+        {
+            # Region is part of the RDS endpoint, extract
+            $region = ($createPosgreSQLServerName.Split("."))[2]
+
+            Write-Host "Generating AWS IAM token ..."
+            $createUserPassword = (aws rds generate-db-auth-token --hostname $createPosgreSQLServerName --region $region --port $createPort --username $createUsername)
+
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createUsername;Password=`"$createUserPassword`";"
+
+            break
+        }
+        "gcpserviceaccount"
+        {
+            # Define header
+            $header = @{ "Metadata-Flavor" = "Google"}
+
+            # Retrieve service accounts
+            $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+            # Results returned in plain text format, get into array and remove empty entries
+            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+            # Retreive the specific service account assigned to the VM
+            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains("iam.gserviceaccount.com") }
+
+            Write-Host "Generating GCP IAM token ..."
+            # Retrieve token for account
+            $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+            
+            # Check to see if there was a username provided
+            if ([string]::IsNullOrWhitespace($createUsername))
+            {
+            	# Use the service account name, but strip off the .gserviceaccount.com part
+                $createUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+            }
+  
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createUsername;Password=`"$($token.access_token)`";"
+  
+            break
+        }
+        "usernamepassword"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createUsername;Password=`"$createUserPassword`";"
+
+            break    
+        }
+
+        "windowsauthentication"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";Integrated Security=True;"
+        }
+    }
+
+	# Open connection
+    Open-PostGreConnection -ConnectionString $connectionString -ConnectionName $connectionName
+
+    # See if database exists
+    $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName
+
+    if ($databaseExists.ItemArray.Count -eq 0)
+    {
+        # Create database
+        Write-Output "Creating database $createDatabaseName ..."
+        $executionResult = Invoke-SqlUpdate -Query "CREATE DATABASE `"$createDatabaseName`";" -CommandTimeout $postgresCommandTimeout -ConnectionName $connectionName
+
+        # Check result
+        if ($executionResult -ne -1)
+        {
+            # Commit transaction
+            Write-Error "Create schema failed."
+        }
+        else
+        {
+        	# See if it was created
+            $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName
+            
+            # Check array
+            if ($databaseExists.ItemArray.Count -eq 1)
+            {
+            	# Success
+                Write-Output "$createDatabaseName created successfully!"
+            }
+            else
+            {
+            	# Failed
+                Write-Error "$createDatabaseName was not created!"
+            }
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "Database $createDatabaseName already exists."
+    }
+}
+finally
+{
+	# Close connection if open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+    	Close-SqlConnection -ConnectionName $connectionName
+    }
+}
+
+
diff --git a/src/step-templates/postgres-create-user/metadata.json b/src/step-templates/postgres-create-user/metadata.json
new file mode 100644
index 000000000..5f9332147
--- /dev/null
+++ b/src/step-templates/postgres-create-user/metadata.json
@@ -0,0 +1,115 @@
+{
+  "Id": "6e676055-fb63-450f-9d98-ac99c4a68023",
+  "Name": "Postgres- Create User If Not Exists",
+  "Description": "Creates a new user account on a Postgres database server.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "3ff05fe1-7873-443e-ae6b-f52c7d994664",
+      "Name": "createPostgresSQLServerName",
+      "Label": "Host name of the Postgres server",
+      "HelpText": "Name of the Postgres server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7db491c2-441a-455e-849d-dbb6b61b24e2",
+      "Name": "createPostgreSQLServerPort",
+      "Label": "Port",
+      "HelpText": "Port number the Postgres server listens on.",
+      "DefaultValue": "5432",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cbb7e84e-1492-4e76-b588-b65c76f3bf2b",
+      "Name": "createTrustSSL",
+      "Label": "Trust SSL Certificate",
+      "HelpText": "Force trusting an SSL Certificate.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c0e8a9e1-e68b-4af7-8dfa-5f1c9872e615",
+      "Name": "postgreSqlAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the PostgreSQL server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "0e3cb957-541d-436c-b3b5-047ddda28ec8",
+      "Name": "createLoginWithAddUserRights",
+      "Label": "Login name",
+      "HelpText": "Login name of a user with rights to create user accounts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b9029a8c-e4bd-4993-a163-1f95dfbaf01d",
+      "Name": "createLoginPasswordWithAddUserRights",
+      "Label": "Login Password",
+      "HelpText": "Password for Login name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b9986f38-a587-46bd-82d7-97d16baf529f",
+      "Name": "postgreSqlAccountType",
+      "Label": "Account type",
+      "HelpText": null,
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "43b9e471-e792-49e1-a761-a8fa95679a24",
+      "Name": "createNewUsername",
+      "Label": "New user name",
+      "HelpText": "Name of the new user account to create.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aeda6f0b-d9e9-4f66-8c61-84cf42c26f27",
+      "Name": "createNewUserPassword",
+      "Label": "New user password",
+      "HelpText": "Password for the new user account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2022-06-14T15:09:44.8060000Z",
+    "OctopusVersion": "2022.2.5111",
+    "Type": "ActionTemplate"
+  },
+  "Category": "postgresql"
+}
diff --git a/src/step-templates/postgres-create-user/scriptbody.ps1 b/src/step-templates/postgres-create-user/scriptbody.ps1
new file mode 100644
index 000000000..528362901
--- /dev/null
+++ b/src/step-templates/postgres-create-user/scriptbody.ps1
@@ -0,0 +1,238 @@
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-UserExists
+{
+	# Define parameters
+    param ($Hostname,
+    $Username)
+    
+	# Execute query
+    return Invoke-SqlQuery "SELECT * FROM pg_roles WHERE rolname = '$Username';"
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific location
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Get whether trust certificate is necessary
+$createTrustSSL = [System.Convert]::ToBoolean("$createTrustSSL")
+
+try
+{
+	# Declare initial connection string
+    $connectionString = "Server=$createPostgresSQLServerName;Port=$createPostgreSQLServerPort;Database=postgres;"
+    
+	# Check to see if we need to trust the ssl cert
+	if ($createTrustSSL -eq $true)
+	{
+        # Append SSL connection string components
+        $connectionString += "SSL Mode=Require;Trust Server Certificate=true;"
+	}
+
+    # Update the connection string based on authentication method
+    switch ($postgreSqlAuthenticationMethod)
+    {
+        "azuremanagedidentity"
+        {
+        	# Get login token
+            Write-Host "Generating Azure Managed Identity token ..."
+            $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"}
+            
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createLoginWithAddUserRights;Password=`"$($token.access_token)`";"
+            
+            break
+        }    
+        "awsiam"
+        {
+            # Region is part of the RDS endpoint, extract
+            $region = ($createPostgresSQLServerName.Split("."))[2]
+
+            Write-Host "Generating AWS IAM token ..."
+            $createLoginPasswordWithAddUserRights = (aws rds generate-db-auth-token --hostname $createPostgresSQLServerName --region $region --port $createPostgreSQLServerPort --username $createLoginWithAddUserRights)
+
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createLoginWithAddUserRights;Password=`"$createLoginPasswordWithAddUserRights`";"
+
+            break
+        }
+        "gcpserviceaccount"
+        {
+            # Define header
+            $header = @{ "Metadata-Flavor" = "Google"}
+
+            # Retrieve service accounts
+            $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+            # Results returned in plain text format, get into array and remove empty entries
+            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+            # Retreive the specific service account assigned to the VM
+            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains("iam.gserviceaccount.com") }
+
+            Write-Host "Generating GCP IAM token ..."
+            # Retrieve token for account
+            $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+            
+            # Check to see if there was a username provided
+            if ([string]::IsNullOrWhitespace($createLoginWithAddUserRights))
+            {
+            	# Use the service account name, but strip off the .gserviceaccount.com part
+                $createLoginWithAddUserRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+            }
+  
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createLoginWithAddUserRights;Password=`"$($token.access_token)`";"
+  
+            break
+        }
+        "usernamepassword"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$createLoginWithAddUserRights;Password=`"$createLoginPasswordWithAddUserRights`";"
+
+            break    
+        }
+
+        "windowsauthentication"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";Integrated Security=True;"
+        }
+    }
+
+	# Open connection
+    Open-PostGreConnection -ConnectionString $connectionString
+
+    # See if database exists
+    $userExists = Get-UserExists -Username $createNewUsername
+
+    if ($userExists -eq $null)
+    {
+        # Create user
+        Write-Output "Creating user $createNewUsername ..."
+        $createSql = ""
+        
+        switch ($postgreSqlAccountType)
+        {
+            "awsiam"
+            {
+				$createSql = "CREATE ROLE `"$createNewUsername`" WITH LOGIN; GRANT rds_iam TO `"$createNewUsername`";"
+                break
+            }
+
+            "usernamepassword"
+            {
+				$createSql = "CREATE ROLE `"$createNewUsername`" WITH LOGIN PASSWORD '$createNewUserPassword';"
+                break    
+            }
+
+            "windowsauthentication"
+            {
+            	$createSql = "CREATE ROLE `"$createNewUsername`" WITH LOGIN;"
+            	break
+            }
+        }
+
+        
+        $executionResults = Invoke-SqlUpdate $createSql
+
+        # See if it was created
+        $userExists = Get-UserExists -Username $createNewUsername
+            
+        # Check array
+        if ($userExists -ne $null)
+        {
+            # Success
+            Write-Output "$createNewUsername created successfully!"
+        }
+        else
+        {
+            # Failed
+            Write-Error "$createNewUsername was not created!"
+        }
+    }
+    else
+    {
+    	# Display message
+        Write-Output "User $createNewUsername already exists."
+    }
+}
+finally
+{
+    Close-SqlConnection
+}
\ No newline at end of file
diff --git a/src/step-templates/postgres-execute-sql/metadata.json b/src/step-templates/postgres-execute-sql/metadata.json
new file mode 100644
index 000000000..04d73e85e
--- /dev/null
+++ b/src/step-templates/postgres-execute-sql/metadata.json
@@ -0,0 +1,115 @@
+{
+  "Id": "9a9c8c2c-d50e-4dc8-8e7e-b561f6e8fc15",
+  "Name": "Postgres - Execute SQL",
+  "Description": "Creates a Postgres database if it doesn't already exist.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "3adf249d-aef2-41dc-922d-a3cfb67c4afe",
+      "Name": "postgresqlServerName",
+      "Label": "Server",
+      "HelpText": "Hostname (or IP) of the MySQL database server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0fbfc453-3495-42b9-b13a-c7db532bc030",
+      "Name": "postgresqlAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the PostgreSQL server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "cba7ecb6-e23d-462e-97d8-2d72e28d3233",
+      "Name": "postgresqlUsername",
+      "Label": "Username",
+      "HelpText": "Username to use for the connection",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0fc033f0-7446-4698-b003-bc18549d45b3",
+      "Name": "postgesqlUserPassword",
+      "Label": "Password",
+      "HelpText": "Password for the user account",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "0f2cea01-dd43-4f3e-87aa-1d1ca2974e3e",
+      "Name": "postgresqlDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to execute against.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ef1a940d-cd67-49b6-b584-c79d918b4707",
+      "Name": "postgresqlServerPort",
+      "Label": "Port",
+      "HelpText": "Port for the database instance.",
+      "DefaultValue": "5432",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "355fb14a-2dfd-4b41-98a3-87b7d177f716",
+      "Name": "postgresqlTrustSSL",
+      "Label": "Trust SSL Certificate",
+      "HelpText": "Force trusting an SSL Certificate.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4d7dbc06-697c-4585-b18d-043ed1c120a7",
+      "Name": "postgresqlCommandTimeout",
+      "Label": "Command Timeout",
+      "HelpText": "Timeout value (in seconds) for SQL commands",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5a810fee-d9e9-4200-8540-2a22b3681be9",
+      "Name": "postgresqlCommand",
+      "Label": "Command",
+      "HelpText": "SQL statement(s) to execute.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-10-06T18:58:48.8690000Z",
+    "OctopusVersion": "2025.3.14336",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "postgresql"
+}
diff --git a/src/step-templates/postgres-execute-sql/scriptbody.ps1 b/src/step-templates/postgres-execute-sql/scriptbody.ps1
new file mode 100644
index 000000000..e48b86dd1
--- /dev/null
+++ b/src/step-templates/postgres-execute-sql/scriptbody.ps1
@@ -0,0 +1,189 @@
+# Define variables
+$connectionName = "OctopusDeploy"
+
+# Define functions
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed -ConnectionName $connectionName
+        return $false
+    }
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+$PowerShellModuleName = "SimplySql"
+
+# Set secure protocols
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+# Check to see if SimplySql module is installed
+if ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)
+{
+    # Tell user what we're doing
+    Write-Output "PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ..."
+
+    # Install temporary copy
+    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules
+}
+
+# Display
+Write-Output "Importing module $PowerShellModuleName ..."
+
+# Check to see if it was downloaded
+if ((Test-Path -Path "$LocalModules\$PowerShellModuleName") -eq $true)
+{
+	# Use specific version
+    $PowerShellModuleName = "$LocalModules\$PowerShellModuleName"
+}
+
+# Import the module
+Import-Module -Name $PowerShellModuleName
+
+# Get whether trust certificate is necessary
+$postgresqlTrustSSL = [System.Convert]::ToBoolean("$postgresqlTrustSSL")
+
+try
+{
+	# Declare initial connection string
+    $connectionString = "Server=$postgresqlServerName;Port=$postgresqlServerPort;Database=$postgresqlDatabaseName;"
+    
+	# Check to see if we need to trust the ssl cert
+	if ($postgresqlTrustSSL -eq $true)
+	{
+        # Append SSL connection string components
+        $connectionString += "SSL Mode=Require;Trust Server Certificate=true;"
+	}
+
+    # Update the connection string based on authentication method
+    switch ($postgreSqlAuthenticationMethod)
+    {
+        "azuremanagedidentity"
+        {
+        	# Get login token
+            Write-Host "Generating Azure Managed Identity token ..."
+            $token = Invoke-RestMethod -Method GET -Uri "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net" -Headers @{"MetaData" = "true"}
+            
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$postgresqlUsername;Password=`"$($token.access_token)`";"
+            
+            break
+        }
+        "awsiam"
+        {
+            # Region is part of the RDS endpoint, extract
+            $region = ($createPosgreSQLServerName.Split("."))[2]
+
+            Write-Host "Generating AWS IAM token ..."
+            $createUserPassword = (aws rds generate-db-auth-token --hostname $postgresqlServerName --region $region --port $createPort --username $postgresqlUsername)
+
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$postgresqlUsername;Password=`"$postgesqlUserPassword`";"
+
+            break
+        }
+        "gcpserviceaccount"
+        {
+            # Define header
+            $header = @{ "Metadata-Flavor" = "Google"}
+
+            # Retrieve service accounts
+            $serviceAccounts = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/" -Headers $header
+
+            # Results returned in plain text format, get into array and remove empty entries
+            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)
+
+            # Retreive the specific service account assigned to the VM
+            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains("iam.gserviceaccount.com") }
+
+            Write-Host "Generating GCP IAM token ..."
+            # Retrieve token for account
+            $token = Invoke-RestMethod -Method Get -Uri "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token" -Headers $header
+            
+            # Check to see if there was a username provided
+            if ([string]::IsNullOrWhitespace($postgresqlUsername))
+            {
+            	# Use the service account name, but strip off the .gserviceaccount.com part
+                $postgresqlUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(".gserviceaccount.com"))
+            }
+  
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$postgresqlUsername;Password=`"$($token.access_token)`";"
+  
+            break
+        }
+        "usernamepassword"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";User Id=$postgresqlUsername;Password=`"$postgesqlUserPassword`";"
+
+            break    
+        }
+
+        "windowsauthentication"
+        {
+            # Append remaining portion of connection string
+            $connectionString += ";Integrated Security=True;"
+        }
+    }
+
+	# Open connection
+    Open-PostGreConnection -ConnectionString $connectionString -ConnectionName $connectionName
+
+    # Execute the statement
+    $executionResult = Invoke-SqlUpdate -Query "$postgresqlCommand" -CommandTimeout $postgresqlCommandTimeout -ConnectionName $connectionName
+    
+    # Display the result
+    Get-SqlMessage -ConnectionName $connectionName
+}
+finally
+{
+	# Close connection if open
+    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)
+    {
+    	Close-SqlConnection -ConnectionName $connectionName
+    }
+}
+
+
diff --git a/src/step-templates/proxmox-deploy-lxc/metadata.json b/src/step-templates/proxmox-deploy-lxc/metadata.json
new file mode 100644
index 000000000..b55230ed2
--- /dev/null
+++ b/src/step-templates/proxmox-deploy-lxc/metadata.json
@@ -0,0 +1,194 @@
+{
+  "Id": "ab90cb93-96ae-4841-8058-1cc5ec6feebe",
+  "Name": "Proxmox Deploy LXC Container",
+  "Description": "Creates a new Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "c75c69c5-bdfb-4cbf-8b5a-aeb6ef93c274",
+      "Name": "Proxmox.Host",
+      "Label": "Proxmox Host",
+      "HelpText": "The hostname or IP address of the Proxmox cluster/host",
+      "DefaultValue": "1.2.3.4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "eddd73e2-cb63-4c1b-8100-05e8e9586180",
+      "Name": "Proxmox.Port",
+      "Label": "Proxmox Port",
+      "HelpText": "Port number for Proxmox Cluster/Host",
+      "DefaultValue": "8006",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "eae18957-8977-4f51-8e09-2402453fd531",
+      "Name": "Proxmox.User",
+      "Label": "Proxmox User Account",
+      "HelpText": "The Proxmox user account associated with the api token.",
+      "DefaultValue": "root@pam",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b413ee30-ba94-4ff3-8b4e-148c1fbc52f6",
+      "Name": "Proxmox.Node",
+      "Label": "Proxmox Node",
+      "HelpText": "The Proxmox node in the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3f70fe63-2b55-44f5-af8e-27d8717ade20",
+      "Name": "Proxmox.TokenID",
+      "Label": "Proxmox Token ID",
+      "HelpText": "This is token id that was used to create an API token in proxmox.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "741c3b80-af85-47c6-b49e-36aea9b2bc9a",
+      "Name": "Proxmox.Token",
+      "Label": "Proxmox API Token",
+      "HelpText": "The API Token secret key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "003db066-99a7-4d4c-a794-7a6310c2c86b",
+      "Name": "Proxmox.LXC.VMID",
+      "Label": "LXC VM ID",
+      "HelpText": "The new VMID for the new LXC container default is -1 to find the next ID",
+      "DefaultValue": "-1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "63ba1450-8c9e-4d06-bedf-00389a63ef3f",
+      "Name": "Proxmox.LXC.Hostname",
+      "Label": "LXC Hostname",
+      "HelpText": "The new LXC hostname",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0a13d075-3a2f-4718-9793-f9b2f5963455",
+      "Name": "Proxmox.LXC.OSTemplate",
+      "Label": "LXC OS Template",
+      "HelpText": "The template image or backup image for the LXC",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "55f7937b-4a5f-49bb-b129-f589c3ce51cc",
+      "Name": "Proxmox.LXC.Password",
+      "Label": "LXC Root Password",
+      "HelpText": "This will be the root password once the LXC container has been created",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "671751a5-d213-445a-a73f-dd9f1f33d754",
+      "Name": "Proxmox.LXC.Storage",
+      "Label": "LXC Storage",
+      "HelpText": "Where the rootfs for this LXC will be stored.",
+      "DefaultValue": "local",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e796b021-0c31-4e03-8825-23c19cbf8876",
+      "Name": "Proxmox.LXC.Network",
+      "Label": "LXC Networks",
+      "HelpText": "The list of network connections this LXC has. Each network connection on a new line.\n\n\n`name=<name>,bridge=<bridge>,firewall=<0|1>,gw=<IPv4>,ip=<IPv4/CIDR|dhcp|manual>`\n\n\nMore Info: [https://pve.proxmox.com/pve-docs/api-viewer/#/nodes/{node}/lxc](https://pve.proxmox.com/pve-docs/api-viewer/#/nodes/{node}/lxc)",
+      "DefaultValue": "name=eth0,bridge=vmbr0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "c9e865ea-a7b2-42d3-aca6-8772e54b893a",
+      "Name": "Proxmox.LXC.Cores",
+      "Label": "LXC CPU Cores",
+      "HelpText": "The amount of CPU cores the LXC is assigned",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "74b64687-8aed-433d-bce3-714bfd738927",
+      "Name": "Proxmox.LXC.Memory",
+      "Label": "LXC Memory",
+      "HelpText": "The amount of Memory the LXC is assigned.",
+      "DefaultValue": "2048",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "85c52eb6-a25f-4f8e-a068-2a165160d94d",
+      "Name": "Proxmox.LXC.RootSize",
+      "Label": "LXC Rootfs Size",
+      "HelpText": "The size of the root volume for this LXC, Size is in GB",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fd072ced-1c8b-4205-a724-e9456b5152c6",
+      "Name": "Proxmox.LXC.StartOnCreate",
+      "Label": "LXC Start Once Created",
+      "HelpText": "Should the LXC start once the LXC has been created",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "dfea6eea-47ff-4489-9434-8ff80bbb8694",
+      "Name": "Proxmox.LXC.Force",
+      "Label": "LXC Overwrite Container",
+      "HelpText": "Overwrites an existing LXC with the same VMID",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-05-04T10:44:27.9680000Z",
+    "OctopusVersion": "2023.2.9087",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "domrichardson",
+  "Category": "proxmox"
+}
diff --git a/src/step-templates/proxmox-deploy-lxc/scriptbody.ps1 b/src/step-templates/proxmox-deploy-lxc/scriptbody.ps1
new file mode 100644
index 000000000..3c0059aec
--- /dev/null
+++ b/src/step-templates/proxmox-deploy-lxc/scriptbody.ps1
@@ -0,0 +1,213 @@
+# Proxmox Connection Variables
+$ProxmoxHost = $OctopusParameters["Proxmox.Host"];
+$ProxmoxPort = [int]$OctopusParameters["Proxmox.Port"];
+$ProxmoxUser = $OctopusParameters["Proxmox.User"];
+
+$ProxmoxNode = $OctopusParameters["Proxmox.Node"];
+
+$ProxmoxTokenID = $OctopusParameters["Proxmox.TokenID"];
+$ProxmoxToken = $OctopusParameters["Proxmox.Token"];
+
+# LXC Variables
+$LXC_VMID = [int]$OctopusParameters["Proxmox.LXC.VMID"];
+$LXC_Hostname = $OctopusParameters["Proxmox.LXC.Hostname"];
+$LXC_OSTemplate = $OctopusParameters["Proxmox.LXC.OSTemplate"];
+$LXC_Storage = $OctopusParameters["Proxmox.LXC.Storage"];
+$LXC_CPU = [int]$OctopusParameters["Proxmox.LXC.Cores"];
+$LXC_Memory = [int]$OctopusParameters["Proxmox.LXC.Memory"];
+$LXC_RootSize = [int]$OctopusParameters["Proxmox.LXC.RootSize"];
+$LXC_Networks = $OctopusParameters["Proxmox.LXC.Network"];
+$LXC_Password = $OctopusParameters["Proxmox.LXC.Password"];
+
+$BaseURL = "https://$($ProxmoxHost):$($ProxmoxPort)/api2/json"
+
+$header = @{
+	"Authorization" = "PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)"
+}
+
+
+Write-Host "Testing Connection To Proxmox Server/Cluster ..."
+
+try{
+	Invoke-RestMethod -Method GET -uri "$($BaseURL)" -Headers $header | out-null
+}catch{
+	throw "Couldn't Connect to the Proxmox Server/Cluster"
+}
+
+Write-Host "Successfully Connected To Proxmox Server/Cluster"
+
+$LXC_Start = 0
+try {
+  $Start = [System.Convert]::ToBoolean($OctopusParameters["Proxmox.LXC.StartOnCreate"])
+  
+  if($Start -eq $True){
+  	$LXC_Start = 1
+  }
+  
+} catch {}
+
+$LXC_Force = 0
+try {
+  $Force = [System.Convert]::ToBoolean($OctopusParameters["Proxmox.LXC.Force"])
+  
+  if($Force -eq $True){
+  	$LXC_Force = 1
+  }
+  
+} catch {}
+
+if($LXC_CPU -lt 1){
+	$LXC_CPU=1;
+}
+
+if($LXC_Memory -lt 16){
+	$LXC_Memory = 16;
+}
+
+if($LXC_RootSize -lt 1){
+	$LXC_RootSize = 1;
+}
+
+if($LXC_Hostname -eq $null -or $LXC_Hostname -eq ""){
+	throw "LXC Hostname must be provided!"
+}
+
+if($LXC_OSTemplate -eq $null -or $LXC_OSTemplate -eq ""){
+	throw "LXC OS Template must be provided!"
+}
+
+if($LXC_Storage -eq $null -or $LXC_Storage -eq ""){
+	throw "LXC Storage must be provided!"
+}
+
+if($LXC_Networks -eq $null){
+	throw "You must provide at least one network property"
+}
+
+if($LXC_Password -eq $null -or $LXC_Password -eq ""){
+	throw "LXC Password must be provided!"
+}
+
+if($LXC_VMID -eq "-1"){
+	$LXC_VMID=(Invoke-RestMethod -Method GET -uri "$($BaseURL)/cluster/nextid" -headers $header).data
+    Write-Host "Found next vm id: $($LXC_VMID)"
+}
+
+if($LXC_VMID -lt 1){
+	throw "The LXC VMID was not valid ($LXC_VMID), Set this to -1 to automatically find the next id"
+}
+
+$LXCData = @{
+	"vmid" = $LXC_VMID
+    "hostname" = $LXC_Hostname
+    "ostemplate" = $LXC_OSTemplate
+    "rootfs" = "volume=$($LXC_Storage):$($LXC_RootSize)"
+    "cores" = $LXC_CPU
+    "memory" = $LXC_Memory
+    "storage" = $LXC_Storage
+    "password" = $LXC_Password
+    "start" = $LXC_Start
+    "force" = $LXC_Force
+}
+
+$NetworkIndex = 0;
+
+$Networks = $LXC_Networks.replace("\n", "`n").split("`n")
+
+if($Networks.Count -lt 1){
+	throw "You must provide at least one network property"
+}
+
+foreach ($network in $Networks){
+    $LXCData["net$($NetworkIndex)"] = $network;
+    $NetworkIndex++;
+}
+
+$existingLXC = $null;
+
+try{
+    $existingLXC = Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXCData.vmid)" -Headers $header
+}catch{}
+
+if($existingLXC -ne $null -and $LXCData.force -eq 0){
+    throw "LXC with VMID: $($LXCData.vmid) already exists. Use Force parameter to overwrite this LXC."
+
+}elseif($existingLXC -ne $null -and $LXCData.force -eq 1){
+
+    Write-host "Deleting existing LXC with VMID: $($LXCData.vmid)"
+    $LXCDestroyAsyncTask =Invoke-RestMethod -Method DELETE -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXCData.vmid)" -Headers $header
+
+    $count = 1;
+    $maxCount = 10;
+    $TaskID = $LXCDestroyAsyncTask.Data;
+
+    DO
+    {
+        Write-Host "Checking if LXC has finished Deleting.."
+        $LXCDestroyAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status" -Headers $header).data
+    
+        if($LXCDestroyAsyncTaskStatus.status -eq "stopped"){
+    	    if($LXCDestroyAsyncTaskStatus.exitstatus -ne "OK"){
+        	    Write-Error "LXC destroy task finished with error: $($LXCDestroyAsyncTaskStatus.exitstatus)"
+            }else{
+        	    Write-Host "LXC destroy task has successfully completed!"
+            }
+        
+            break;
+        }
+    
+	    Write-Host "LXC destroy task has not finished yet, retrying in 5 seconds.."
+        Write-Host "Task Status: $($LXCDestroyAsyncTaskStatus.status)"
+        sleep 5
+    
+        If($count -gt $maxCount) {
+          Write-Warning "Task Timed out!"
+          break;
+        }
+        $count++
+
+    } While ($count -le $maxCount)
+}
+
+Write-Host ""
+
+Write-Host "New LXC Summary:"
+
+$LXCData | Convertto-json -depth 10
+
+$LXCCreateAsyncTask = (Invoke-RestMethod -Method POST -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc" -Headers $header -Body $LXCData)
+
+
+$count = 1;
+$maxCount = 10;
+
+Write-Host ""
+
+DO
+{
+ 
+ $TaskID = $LXCCreateAsyncTask.Data;
+    Write-Host "Checking if LXC has finished creating.."
+    $LXCCreateAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status" -Headers $header).data
+    
+    if($LXCCreateAsyncTaskStatus.status -eq "stopped"){
+    	if($LXCCreateAsyncTaskStatus.exitstatus -ne "OK"){
+        	Write-Error "LXC create task finished with error: $($LXCCreateAsyncTaskStatus.exitstatus)"
+        }else{
+        	Write-Host "LXC create task has successfully completed!"
+        }
+        
+        break;
+    }
+    
+	Write-Host "LXC create task has not finished yet, retrying in 5 seconds.."
+    Write-Host "Task Status: $($LXCCreateAsyncTaskStatus.status)"
+    sleep 5
+    
+    If($count -gt $maxCount) {
+      Write-Warning "Task Timed out!"
+      break;
+    }
+    $count++
+
+} While ($count -le $maxCount)
diff --git a/src/step-templates/proxmox-destroy-lxc/metadata.json b/src/step-templates/proxmox-destroy-lxc/metadata.json
new file mode 100644
index 000000000..8f0dc5444
--- /dev/null
+++ b/src/step-templates/proxmox-destroy-lxc/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "5facb9eb-5a33-4a67-a254-7ba938d0b5a4",
+  "Name": "Proxmox Destroy LXC Container",
+  "Description": "Destroys a Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9f1a3789-a4fe-4fc4-9a66-78e73d384248",
+      "Name": "Proxmox.Host",
+      "Label": "Proxmox Host",
+      "HelpText": "The hostname or IP address of the Proxmox cluster/host",
+      "DefaultValue": "1.2.3.4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "240b1180-7b10-48ac-90fb-796fc8eaaf41",
+      "Name": "Proxmox.Port",
+      "Label": "Proxmox Port",
+      "HelpText": "Port number for Proxmox Cluster/Host",
+      "DefaultValue": "8006",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "37d5fad7-2bd3-45da-b30c-62116f0b1940",
+      "Name": "Proxmox.User",
+      "Label": "Proxmox User Account",
+      "HelpText": "The Proxmox user account associated with the api token.",
+      "DefaultValue": "root@pam",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "72a89f72-2571-435b-b0f7-a383f08572b9",
+      "Name": "Proxmox.Node",
+      "Label": "Proxmox Node",
+      "HelpText": "The Proxmox node in the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b33b88c3-3949-4563-91a2-4ae264bc2d7f",
+      "Name": "Proxmox.TokenID",
+      "Label": "Proxmox Token ID",
+      "HelpText": "This is token id that was used to create an API token in proxmox.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "eff9ca9b-b3ea-44e9-aa79-489d1d9161ee",
+      "Name": "Proxmox.Token",
+      "Label": "Proxmox API Token",
+      "HelpText": "The API Token secret key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f7be6495-cc3b-4492-bb1b-e8a178a36a91",
+      "Name": "Proxmox.LXC.VMID",
+      "Label": "LXC VM ID",
+      "HelpText": "The LXC VMID you want to destroy",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "94de0cbc-b722-4788-858f-fb2b32b57fd8",
+      "Name": "Proxmox.LXC.Force",
+      "Label": "Force Destroy LXC",
+      "HelpText": "Do you want to force destroy the LXC container even if its running",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-03-16T12:26:59.4120000Z",
+    "OctopusVersion": "2023.2.2028",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "domrichardson",
+  "Category": "proxmox"
+}
diff --git a/src/step-templates/proxmox-destroy-lxc/scriptbody.ps1 b/src/step-templates/proxmox-destroy-lxc/scriptbody.ps1
new file mode 100644
index 000000000..59f6f9020
--- /dev/null
+++ b/src/step-templates/proxmox-destroy-lxc/scriptbody.ps1
@@ -0,0 +1,80 @@
+# Proxmox Connection Variables
+$ProxmoxHost = $OctopusParameters["Proxmox.Host"];
+$ProxmoxPort = [int]$OctopusParameters["Proxmox.Port"];
+$ProxmoxUser = $OctopusParameters["Proxmox.User"];
+
+$ProxmoxNode = $OctopusParameters["Proxmox.Node"];
+
+$ProxmoxTokenID = $OctopusParameters["Proxmox.TokenID"];
+$ProxmoxToken = $OctopusParameters["Proxmox.Token"];
+
+# LXC Variables
+$LXC_VMID = [int]$OctopusParameters["Proxmox.LXC.VMID"];
+
+$BaseURL = "https://$($ProxmoxHost):$($ProxmoxPort)/api2/json"
+
+$header = @{
+	"Authorization" = "PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)"
+}
+
+
+Write-Host "Testing Connection To Proxmox Server/Cluster ..."
+
+try{
+	Invoke-RestMethod -Method GET -uri "$($BaseURL)" -Headers $header | out-null
+}catch{
+	throw "Couldn't Connect to the Proxmox Server/Cluster"
+}
+
+Write-Host "Successfully Connected To Proxmox Server/Cluster"
+
+$CheckLXCExists = Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/current" -Headers $header
+
+if($CheckLXCExists.data -eq $null){
+	throw "The LXC container with vmid ($LXC_VMID) does not exist!"
+}
+
+
+$LXC_Force = 0
+try {
+  $Force = [System.Convert]::ToBoolean($OctopusParameters["Proxmox.LXC.Force"])
+  
+  if($Force -eq $True){
+  	$LXC_Force = 1
+  }
+  
+} catch {}
+
+$LXCDestroyAsyncTask = (Invoke-RestMethod -Method DELETE -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)?force=$($LXC_Force)" -Headers $header)
+
+$count = 1;
+$maxCount = 10;
+
+$TaskID = $LXCDestroyAsyncTask.Data;
+
+DO
+{
+    Write-Host "Checking if LXC has finished Destroying.."
+    $LXCSDestroyAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status" -Headers $header).data
+    
+    if($LXCSDestroyAsyncTaskStatus.status -eq "stopped"){
+    	if($LXCSDestroyAsyncTaskStatus.exitstatus -ne "OK"){
+        	Write-Error "LXC destroy task finished with error: $($LXCSDestroyAsyncTaskStatus.exitstatus)"
+        }else{
+        	Write-Host "LXC destroy task has successfully completed!"
+        }
+        
+        break;
+    }
+    
+	Write-Host "LXC destroy task has not finished yet, retring in 5 seconds.."
+    Write-Host "Task Status: $($LXCSDestroyAsyncTaskStatus.status)"
+    sleep 5
+    
+    If($count -gt $maxCount) {
+      Write-Warning "Task Timed out!"
+      break;
+    }
+    $count++
+
+} While ($count -le $maxCount)
diff --git a/src/step-templates/proxmox-start-lxc/metadata.json b/src/step-templates/proxmox-start-lxc/metadata.json
new file mode 100644
index 000000000..46301ba4b
--- /dev/null
+++ b/src/step-templates/proxmox-start-lxc/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "f68d54f4-ddcb-4bda-b743-1182b0d82335",
+  "Name": "Proxmox Start LXC Container",
+  "Description": "Starts or Reboots a Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9f1a3789-a4fe-4fc4-9a66-78e73d384248",
+      "Name": "Proxmox.Host",
+      "Label": "Proxmox Host",
+      "HelpText": "The hostname or IP address of the Proxmox cluster/host",
+      "DefaultValue": "1.2.3.4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "240b1180-7b10-48ac-90fb-796fc8eaaf41",
+      "Name": "Proxmox.Port",
+      "Label": "Proxmox Port",
+      "HelpText": "Port number for Proxmox Cluster/Host",
+      "DefaultValue": "8006",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "37d5fad7-2bd3-45da-b30c-62116f0b1940",
+      "Name": "Proxmox.User",
+      "Label": "Proxmox User Account",
+      "HelpText": "The Proxmox user account associated with the api token.",
+      "DefaultValue": "root@pam",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "72a89f72-2571-435b-b0f7-a383f08572b9",
+      "Name": "Proxmox.Node",
+      "Label": "Proxmox Node",
+      "HelpText": "The Proxmox node in the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b33b88c3-3949-4563-91a2-4ae264bc2d7f",
+      "Name": "Proxmox.TokenID",
+      "Label": "Proxmox Token ID",
+      "HelpText": "This is token id that was used to create an API token in proxmox.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "eff9ca9b-b3ea-44e9-aa79-489d1d9161ee",
+      "Name": "Proxmox.Token",
+      "Label": "Proxmox API Token",
+      "HelpText": "The API Token secret key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f7be6495-cc3b-4492-bb1b-e8a178a36a91",
+      "Name": "Proxmox.LXC.VMID",
+      "Label": "LXC VM ID",
+      "HelpText": "The LXC VMID you want to start",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "94de0cbc-b722-4788-858f-fb2b32b57fd8",
+      "Name": "Proxmox.LXC.Reboot",
+      "Label": "Reboot LXC",
+      "HelpText": "Do you want to reboot the LXC container",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-03-16T12:29:02.3500000Z",
+    "OctopusVersion": "2023.2.2028",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "domrichardson",
+  "Category": "proxmox"
+}
diff --git a/src/step-templates/proxmox-start-lxc/scriptbody.ps1 b/src/step-templates/proxmox-start-lxc/scriptbody.ps1
new file mode 100644
index 000000000..859fcfc87
--- /dev/null
+++ b/src/step-templates/proxmox-start-lxc/scriptbody.ps1
@@ -0,0 +1,86 @@
+# Proxmox Connection Variables
+$ProxmoxHost = $OctopusParameters["Proxmox.Host"];
+$ProxmoxPort = [int]$OctopusParameters["Proxmox.Port"];
+$ProxmoxUser = $OctopusParameters["Proxmox.User"];
+
+$ProxmoxNode = $OctopusParameters["Proxmox.Node"];
+
+$ProxmoxTokenID = $OctopusParameters["Proxmox.TokenID"];
+$ProxmoxToken = $OctopusParameters["Proxmox.Token"];
+
+# LXC Variables
+$LXC_VMID = [int]$OctopusParameters["Proxmox.LXC.VMID"];
+
+$BaseURL = "https://$($ProxmoxHost):$($ProxmoxPort)/api2/json"
+
+$header = @{
+	"Authorization" = "PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)"
+}
+
+
+Write-Host "Testing Connection To Proxmox Server/Cluster ..."
+
+try{
+	Invoke-RestMethod -Method GET -uri "$($BaseURL)" -Headers $header | out-null
+}catch{
+	throw "Couldn't Connect to the Proxmox Server/Cluster"
+}
+
+Write-Host "Successfully Connected To Proxmox Server/Cluster"
+
+$CheckLXCExists = Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/current" -Headers $header
+
+if($CheckLXCExists.data -eq $null){
+	throw "The LXC container with vmid ($LXC_VMID) does not exist!"
+}
+
+
+$LXC_Reboot = $False
+try {
+  $Start = [System.Convert]::ToBoolean($OctopusParameters["Proxmox.LXC.Reboot"])
+  
+  if($Start -eq $True){
+  	$LXC_Reboot = $True
+  }
+  
+} catch {}
+
+$LXCData = @{}
+
+if($LXC_Reboot -eq $True){
+	$LXCStartAsyncTask = (Invoke-RestMethod -Method POST -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/reboot" -Headers $header -Body $LXCData)
+} else{
+	$LXCStartAsyncTask = (Invoke-RestMethod -Method POST -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/start" -Headers $header -Body $LXCData)
+}
+
+$count = 1;
+$maxCount = 10;
+
+$TaskID = $LXCStartAsyncTask.Data;
+
+DO
+{
+    Write-Host "Checking if LXC has finished Starting.."
+    $LXCStartAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status" -Headers $header).data
+    
+    if($LXCStartAsyncTaskStatus.status -eq "stopped"){
+    	if($LXCStartAsyncTaskStatus.exitstatus -ne "OK"){
+        	Write-Error "LXC start task finished with error: $($LXCStartAsyncTaskStatus.exitstatus)"
+        }else{
+        	Write-Host "LXC start task has successfully completed!"
+        }
+        
+        break;
+    }
+    
+	Write-Host "LXC start task has not finished yet, retring in 5 seconds.."
+    Write-Host "Task Status: $($LXCStartAsyncTaskStatus.status)"
+    sleep 5
+    
+    If($count -gt $maxCount) {
+      Write-Warning "Task Timed out!"
+      break;
+    }
+    $count++
+
+} While ($count -le $maxCount)
diff --git a/src/step-templates/proxmox-stop-lxc/metadata.json b/src/step-templates/proxmox-stop-lxc/metadata.json
new file mode 100644
index 000000000..1c03fce4c
--- /dev/null
+++ b/src/step-templates/proxmox-stop-lxc/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "402a0407-9fa7-4d6a-8e13-9bbfa7228960",
+  "Name": "Proxmox Shutdown LXC Container",
+  "Description": "Shutdown or Stop a Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9f1a3789-a4fe-4fc4-9a66-78e73d384248",
+      "Name": "Proxmox.Host",
+      "Label": "Proxmox Host",
+      "HelpText": "The hostname or IP address of the Proxmox cluster/host",
+      "DefaultValue": "1.2.3.4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "240b1180-7b10-48ac-90fb-796fc8eaaf41",
+      "Name": "Proxmox.Port",
+      "Label": "Proxmox Port",
+      "HelpText": "Port number for Proxmox Cluster/Host",
+      "DefaultValue": "8006",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "37d5fad7-2bd3-45da-b30c-62116f0b1940",
+      "Name": "Proxmox.User",
+      "Label": "Proxmox User Account",
+      "HelpText": "The Proxmox user account associated with the api token.",
+      "DefaultValue": "root@pam",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "72a89f72-2571-435b-b0f7-a383f08572b9",
+      "Name": "Proxmox.Node",
+      "Label": "Proxmox Node",
+      "HelpText": "The Proxmox node in the cluster.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b33b88c3-3949-4563-91a2-4ae264bc2d7f",
+      "Name": "Proxmox.TokenID",
+      "Label": "Proxmox Token ID",
+      "HelpText": "This is token id that was used to create an API token in proxmox.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "eff9ca9b-b3ea-44e9-aa79-489d1d9161ee",
+      "Name": "Proxmox.Token",
+      "Label": "Proxmox API Token",
+      "HelpText": "The API Token secret key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f7be6495-cc3b-4492-bb1b-e8a178a36a91",
+      "Name": "Proxmox.LXC.VMID",
+      "Label": "LXC VM ID",
+      "HelpText": "The LXC VMID you want to shutdown",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "94de0cbc-b722-4788-858f-fb2b32b57fd8",
+      "Name": "Proxmox.LXC.Stop",
+      "Label": "Force Stop LXC",
+      "HelpText": "If enabled it will Force Stop the LXC Container Non-gracefully.\nIf disabled it will gracefully shutdown the LXC Container.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-03-16T12:30:15.1680000Z",
+    "OctopusVersion": "2023.2.2028",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "domrichardson",
+  "Category": "proxmox"
+}
diff --git a/src/step-templates/proxmox-stop-lxc/scriptbody.ps1 b/src/step-templates/proxmox-stop-lxc/scriptbody.ps1
new file mode 100644
index 000000000..58de74f77
--- /dev/null
+++ b/src/step-templates/proxmox-stop-lxc/scriptbody.ps1
@@ -0,0 +1,86 @@
+# Proxmox Connection Variables
+$ProxmoxHost = $OctopusParameters["Proxmox.Host"];
+$ProxmoxPort = [int]$OctopusParameters["Proxmox.Port"];
+$ProxmoxUser = $OctopusParameters["Proxmox.User"];
+
+$ProxmoxNode = $OctopusParameters["Proxmox.Node"];
+
+$ProxmoxTokenID = $OctopusParameters["Proxmox.TokenID"];
+$ProxmoxToken = $OctopusParameters["Proxmox.Token"];
+
+# LXC Variables
+$LXC_VMID = [int]$OctopusParameters["Proxmox.LXC.VMID"];
+
+$BaseURL = "https://$($ProxmoxHost):$($ProxmoxPort)/api2/json"
+
+$header = @{
+	"Authorization" = "PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)"
+}
+
+
+Write-Host "Testing Connection To Proxmox Server/Cluster ..."
+
+try{
+	Invoke-RestMethod -Method GET -uri "$($BaseURL)" -Headers $header | out-null
+}catch{
+	throw "Couldn't Connect to the Proxmox Server/Cluster"
+}
+
+Write-Host "Successfully Connected To Proxmox Server/Cluster"
+
+$CheckLXCExists = Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/current" -Headers $header
+
+if($CheckLXCExists.data -eq $null){
+	throw "The LXC container with vmid ($LXC_VMID) does not exist!"
+}
+
+
+$LXC_Stop = $False
+try {
+  $Stop = [System.Convert]::ToBoolean($OctopusParameters["Proxmox.LXC.Stop"])
+  
+  if($Stop -eq $True){
+  	$LXC_Stop = $True
+  }
+  
+} catch {}
+
+$LXCData = @{}
+
+if($LXC_Stop -eq $True){
+	$LXCStopAsyncTask = (Invoke-RestMethod -Method POST -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/stop" -Headers $header -Body $LXCData)
+} else{
+	$LXCStopAsyncTask = (Invoke-RestMethod -Method POST -uri "$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/shutdown" -Headers $header -Body $LXCData)
+}
+
+$count = 1;
+$maxCount = 10;
+
+$TaskID = $LXCStopAsyncTask.Data;
+
+DO
+{
+    Write-Host "Checking if LXC has finished Shutting Down.."
+    $LXCStopAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri "$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status" -Headers $header).data
+    
+    if($LXCStopAsyncTaskStatus.status -eq "stopped"){
+    	if($LXCStopAsyncTaskStatus.exitstatus -ne "OK"){
+        	Write-Error "LXC shutdown task finished with error: $($LXCStopAsyncTaskStatus.exitstatus)"
+        }else{
+        	Write-Host "LXC shutdown task has successfully completed!"
+        }
+        
+        break;
+    }
+    
+	Write-Host "LXC shutdown task has not finished yet, retring in 5 seconds.."
+    Write-Host "Task Status: $($LXCStopAsyncTaskStatus.status)"
+    sleep 5
+    
+    If($count -gt $maxCount) {
+      Write-Warning "Task Timed out!"
+      break;
+    }
+    $count++
+
+} While ($count -le $maxCount)
diff --git a/step-templates/pushalot-send-notification.json b/src/step-templates/pushalot-send-notification/metadata.json
similarity index 78%
rename from step-templates/pushalot-send-notification.json
rename to src/step-templates/pushalot-send-notification/metadata.json
index dd938d28e..517b00ac4 100644
--- a/step-templates/pushalot-send-notification.json
+++ b/src/step-templates/pushalot-send-notification/metadata.json
@@ -1,66 +1,66 @@
-{
-  "Id": "5e837cf6-27de-436b-a2e6-b2f9d0c7411c",
-  "Name": "Pushalot - Send a notification",
-  "Description": "Sends a notification using the Pushalot REST API.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[int]$timeoutSec = $null\nif(-not [int]::TryParse($Timeout, [ref]$timeoutSec)) { $timeoutSec = 60 }\n\nif($Source -eq $null) {\n    $input = @{AuthorizationToken = $AuthorizationToken; Title = $Title; Body = $Body }\n}\nelse {\n    $input = @{AuthorizationToken = $AuthorizationToken; Title = $Title; Body = $Body; Source = $Source }\n}\n\nInvoke-RestMethod -Method Post -Uri \"https://pushalot.com/api/sendmessage\" -Body $input -TimeoutSec $timeoutSec "
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "AuthorizationToken",
-      "Label": "Specify the authorization token as registered in the Pushalot Dashboard",
-      "HelpText": "Goto [Apps+Tokens](https://pushalot.com) and create a token for your application, e.g. Octopus.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "Body",
-      "Label": "The body of the message",
-      "HelpText": "Body of the message. Will show in client app in message listing in shortened version and in message detail page in full version, so when possible try to keep most important information in the beginning of the text.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "Title",
-      "Label": "The title for the message",
-      "HelpText": "Title for the message. Will show in client app in message listing in shortened version and in message detail in full version, so when possible try to keep most important information in the beginning of the text.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Source",
-      "Label": "Source",
-      "HelpText": "Notification source name that will be displayed instead of authorization token's app name. When empty, the parameter will be omitted in the Pushalot API call.",
-      "DefaultValue": 0,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Timeout",
-      "Label": "Timeout in seconds",
-      "HelpText": "The maximum timout in seconds for the request.",
-      "DefaultValue": "60",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "HumanPrinter",
-  "$Meta": {
-    "ExportedAt": "2017-01-31T08:00:00.000Z",
-    "OctopusVersion": "3.8.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "pushalot"
-}
\ No newline at end of file
+{
+  "Id": "5e837cf6-27de-436b-a2e6-b2f9d0c7411c",
+  "Name": "Pushalot - Send a notification",
+  "Description": "Sends a notification using the Pushalot REST API.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "AuthorizationToken",
+      "Label": "Specify the authorization token as registered in the Pushalot Dashboard",
+      "HelpText": "Goto [Apps+Tokens](https://pushalot.com) and create a token for your application, e.g. Octopus.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "Body",
+      "Label": "The body of the message",
+      "HelpText": "Body of the message. Will show in client app in message listing in shortened version and in message detail page in full version, so when possible try to keep most important information in the beginning of the text.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "Title",
+      "Label": "The title for the message",
+      "HelpText": "Title for the message. Will show in client app in message listing in shortened version and in message detail in full version, so when possible try to keep most important information in the beginning of the text.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Source",
+      "Label": "Source",
+      "HelpText": "Notification source name that will be displayed instead of authorization token's app name. When empty, the parameter will be omitted in the Pushalot API call.",
+      "DefaultValue": 0,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Timeout",
+      "Label": "Timeout in seconds",
+      "HelpText": "The maximum timout in seconds for the request.",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "HumanPrinter",
+  "$Meta": {
+    "ExportedAt": "2017-01-31T08:00:00.0000000Z",
+    "OctopusVersion": "3.8.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "pushalot"
+}
diff --git a/src/step-templates/pushalot-send-notification/scriptbody.ps1 b/src/step-templates/pushalot-send-notification/scriptbody.ps1
new file mode 100644
index 000000000..c21bd8fa8
--- /dev/null
+++ b/src/step-templates/pushalot-send-notification/scriptbody.ps1
@@ -0,0 +1,11 @@
+[int]$timeoutSec = $null
+if(-not [int]::TryParse($Timeout, [ref]$timeoutSec)) { $timeoutSec = 60 }
+
+if($Source -eq $null) {
+    $input = @{AuthorizationToken = $AuthorizationToken; Title = $Title; Body = $Body }
+}
+else {
+    $input = @{AuthorizationToken = $AuthorizationToken; Title = $Title; Body = $Body; Source = $Source }
+}
+
+Invoke-RestMethod -Method Post -Uri "https://pushalot.com/api/sendmessage" -Body $input -TimeoutSec $timeoutSec 
\ No newline at end of file
diff --git a/step-templates/pushover-send-notification.json b/src/step-templates/pushover-send-notification/metadata.json
similarity index 78%
rename from step-templates/pushover-send-notification.json
rename to src/step-templates/pushover-send-notification/metadata.json
index 54fbd4ab2..4ff48953a 100644
--- a/step-templates/pushover-send-notification.json
+++ b/src/step-templates/pushover-send-notification/metadata.json
@@ -1,75 +1,75 @@
-{
-  "Id": "610f3e98-e0ee-4c94-8f0f-b6417c16169e",
-  "Name": "Pushover - Send a notification",
-  "Description": "Sends a notification using the Pushover REST API.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[int]$timeoutSec = $null\nif(-not [int]::TryParse($Timeout, [ref]$timeoutSec)) { $timeoutSec = 60 }\n\nif($Title -eq $null) {\n    $input = @{token = $APIToken; user = $UserKey; message = $Message; priority = $Priority }\n}\nelse {\n    $input = @{token = $APIToken; user = $UserKey; message = $Message; priority = $Priority; title = $Title }\n}\n\nInvoke-RestMethod -Method Post -Uri \"https://api.pushover.net/1/messages.json\" -Body $input -TimeoutSec $timeoutSec "
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "APIToken",
-      "Label": "Specify the App token as registered in the Pushover Dashboard",
-      "HelpText": "Goto [Create New Pushover Application/Plugin](https://pushover.net/apps/build) and create a token for your application, e.g. Octopus.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "UserKey",
-      "Label": "The User Key of the Pushover User to send the notification to",
-      "HelpText": "The **User Key** can be found on the [Pushover dashboard](https://pushover.net/) after logging in.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "Message",
-      "Label": "The message that should be send",
-      "HelpText": "The message that must be displayed in the notification.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "Title",
-      "Label": "Title",
-      "HelpText": "The title of the notification. When empty, the parameter will be omitted in the Pushover API call.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Priority",
-      "Label": "Priority",
-      "HelpText": "The priority of the notification. See Pushover API documentation for valid values.",
-      "DefaultValue": 0,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Timeout",
-      "Label": "Timeout in seconds",
-      "HelpText": "The maximum timout in seconds for the request.",
-      "DefaultValue": "60",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "HumanPrinter",
-  "$Meta": {
-    "ExportedAt": "2017-01-31T08:00:00.000Z",
-    "OctopusVersion": "3.8.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "pushover"
-}
\ No newline at end of file
+{
+  "Id": "610f3e98-e0ee-4c94-8f0f-b6417c16169e",
+  "Name": "Pushover - Send a notification",
+  "Description": "Sends a notification using the Pushover REST API.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "APIToken",
+      "Label": "Specify the App token as registered in the Pushover Dashboard",
+      "HelpText": "Goto [Create New Pushover Application/Plugin](https://pushover.net/apps/build) and create a token for your application, e.g. Octopus.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "UserKey",
+      "Label": "The User Key of the Pushover User to send the notification to",
+      "HelpText": "The **User Key** can be found on the [Pushover dashboard](https://pushover.net/) after logging in.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "Message",
+      "Label": "The message that should be send",
+      "HelpText": "The message that must be displayed in the notification.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "Title",
+      "Label": "Title",
+      "HelpText": "The title of the notification. When empty, the parameter will be omitted in the Pushover API call.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Priority",
+      "Label": "Priority",
+      "HelpText": "The priority of the notification. See Pushover API documentation for valid values.",
+      "DefaultValue": 0,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Timeout",
+      "Label": "Timeout in seconds",
+      "HelpText": "The maximum timout in seconds for the request.",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "HumanPrinter",
+  "$Meta": {
+    "ExportedAt": "2017-01-31T08:00:00.0000000Z",
+    "OctopusVersion": "3.8.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "pushover"
+}
diff --git a/src/step-templates/pushover-send-notification/scriptbody.ps1 b/src/step-templates/pushover-send-notification/scriptbody.ps1
new file mode 100644
index 000000000..8f6e188c9
--- /dev/null
+++ b/src/step-templates/pushover-send-notification/scriptbody.ps1
@@ -0,0 +1,11 @@
+[int]$timeoutSec = $null
+if(-not [int]::TryParse($Timeout, [ref]$timeoutSec)) { $timeoutSec = 60 }
+
+if($Title -eq $null) {
+    $input = @{token = $APIToken; user = $UserKey; message = $Message; priority = $Priority }
+}
+else {
+    $input = @{token = $APIToken; user = $UserKey; message = $Message; priority = $Priority; title = $Title }
+}
+
+Invoke-RestMethod -Method Post -Uri "https://api.pushover.net/1/messages.json" -Body $input -TimeoutSec $timeoutSec 
\ No newline at end of file
diff --git a/src/step-templates/rabbitmq-notify-deploy/metadata.json b/src/step-templates/rabbitmq-notify-deploy/metadata.json
new file mode 100644
index 000000000..1d47d9c19
--- /dev/null
+++ b/src/step-templates/rabbitmq-notify-deploy/metadata.json
@@ -0,0 +1,66 @@
+{
+  "Id": "309f8497-7f79-4979-89a6-5d7e15d83ae2",
+  "Name": "RabbitMQ - Notify Deploy",
+  "Description": "Notifies a deploy by sending a message into rabbitMQ. The message contains all octopus variables and these can be used to have some insight on the deploy. The step is very beta, it is advised to improve it to match real case scenarios.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "rabbitUsername",
+      "Label": "rabbitmq username",
+      "HelpText": "username used to publish message",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "rabbitPassword",
+      "Label": "rabbitmq user password",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "rabbitExchange",
+      "Label": "rabbitMQ exchange",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "rabbitVirtualHost",
+      "Label": "rabbitmq virtual host",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "rabbitUrl",
+      "Label": "rabbitmq url endpoint",
+      "HelpText": null,
+      "DefaultValue": "http://localhost:15672",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "alfhenrik",
+  "$Meta": {
+    "ExportedAt": "2015-07-05T01:47:05.5720000-07:00",
+    "OctopusVersion": "3.0.0.1666",
+    "Type": "ActionTemplate"
+  },
+  "Category": "rabbitmq"
+}
diff --git a/src/step-templates/rabbitmq-notify-deploy/scriptbody.ps1 b/src/step-templates/rabbitmq-notify-deploy/scriptbody.ps1
new file mode 100644
index 000000000..f52edba1f
--- /dev/null
+++ b/src/step-templates/rabbitmq-notify-deploy/scriptbody.ps1
@@ -0,0 +1,81 @@
+function Add-ValueToHashtable
+{
+    param(
+    [Parameter(Mandatory = 1)][object]$variable,
+    [Parameter(Mandatory = 1)][hashtable]$hashtable
+    )
+
+    if ($variable.value.GetType() -eq [System.String])
+    {
+        $hashtable.Add($variable.Name, $variable.value)
+        return
+    }
+
+    if (($variable.value.GetType() -eq (New-Object 'System.Collections.Generic.Dictionary[String,String]').GetType()) -or ($variable.value.GetType() -eq [Hashtable]))
+    {
+        foreach ($element in $variable.Value.GetEnumerator())
+        {
+            $obj = New-Object PsObject -Property @{ Name = $element.Key; Value = $element.Value }
+            Add-ValueToHashtable -variable $obj -hashtable $hashtable
+        }
+        return
+    }
+
+    throw "Add-ValueToHashtable method does not know what to do with type " + $variable.value.GetType().Name
+}
+
+function Get-UnixDate
+{
+    $epoch = Get-Date -Year 1970 -Month 1 -Day 1 -Hour 0 -Minute 0 -Second 0	
+    $now = Get-Date
+    return ([math]::truncate($now.ToUniversalTime().Subtract($epoch).TotalMilliSeconds))
+}
+
+function Get-IsRollback
+{
+    $currentVersion = New-Object -TypeName System.Version -ArgumentList $OctopusReleaseNumber
+    $prevVersion = New-Object -TypeName System.Version -ArgumentList $OctopusReleasePreviousNumber
+
+    return ($currentVersion.CompareTo($prevVersion) -lt 0)
+}
+
+function Get-OctopusVariablesJson
+{
+    $octoVariables = @{}
+
+    foreach ($var in (Get-Variable -Name OctopusParameters*))
+    {
+        Add-ValueToHashtable -variable $var -hashtable $octoVariables
+    }
+
+    $octoVariables.Add("isrollback", (Get-IsRollback))
+    $octoVariables.Add("timestamp", (Get-UnixDate))
+    $octoVariables.Add("safeprojectname", $OctopusParameters["Octopus.Project.Name"].Replace(" ", "_"))
+
+    return ($octoVariables | ConvertTo-Json -Compress)
+}
+
+function ConvertTo-AsciiString
+{
+    param(  
+    [Parameter(Mandatory = $true, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
+    [string]$input)
+    
+    process {
+        #custom desired transformation
+        $tmp = $input.Replace([char]0x00EC, "i")
+        #fallback
+        $bytes = [System.Text.Encoding]::UTF8.GetBytes($tmp)
+        $asciiArray = [System.Text.Encoding]::Convert([System.Text.Encoding]::UTF8, [System.Text.Encoding]::ASCII, $bytes)
+        $ascistring = [System.Text.Encoding]::ASCII.GetString($asciiArray)
+        return $ascistring
+    }
+}
+
+$json = Get-OctopusVariablesJson | ConvertTo-AsciiString
+$body = New-Object PsObject -Property @{ properties = @{}; routing_key = "#"; payload = $json; payload_encoding = "string" } | ConvertTo-Json -Compress
+
+$securepassword = ConvertTo-SecureString $rabbitPassword -AsPlainText -Force
+$cred = New-Object System.Management.Automation.PSCredential ($rabbitUsername, $securepassword)
+
+Invoke-RestMethod -Uri "$rabbitUrl/api/exchanges/$rabbitVirtualHost/$rabbitExchange/publish" -Method Post -Credential $cred -Body $body -ContentType "application/json"
\ No newline at end of file
diff --git a/src/step-templates/rackspace-update-load-balancer/metadata.json b/src/step-templates/rackspace-update-load-balancer/metadata.json
new file mode 100644
index 000000000..62f20cc45
--- /dev/null
+++ b/src/step-templates/rackspace-update-load-balancer/metadata.json
@@ -0,0 +1,67 @@
+{
+  "Id": "94aa35a3-0a0c-4c45-8781-98006bda3bcd",
+  "Name": "Rackspace - Update Load Balancer",
+  "Description": "Change the condition of a node in a Rackspace Cloud Load Balancer.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Rackspace control panel username",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApiKey",
+      "Label": "API key",
+      "HelpText": "Rackspace control panel user API key",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "LoadBalancerID",
+      "Label": "Load Balancer ID",
+      "HelpText": "ID of the load balancer, found on the details page in the Rackspace control panel",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NodeIpAddress",
+      "Label": "Node IP address",
+      "HelpText": "IP address of load balanced node. Found on the load balancer details page of the Rackspace control panel",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NewCondition",
+      "Label": "New Node Condition",
+      "HelpText": "Condition to set the node to. Can either be 'ENABLED', 'DISABLED' or 'DRAINING'",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-16T03:29:42.4810000-07:00",
+    "OctopusVersion": "2.4.5.46",
+    "Type": "ActionTemplate"
+  },
+  "Category": "rackspace"
+}
diff --git a/src/step-templates/rackspace-update-load-balancer/scriptbody.ps1 b/src/step-templates/rackspace-update-load-balancer/scriptbody.ps1
new file mode 100644
index 000000000..6d475f5c5
--- /dev/null
+++ b/src/step-templates/rackspace-update-load-balancer/scriptbody.ps1
@@ -0,0 +1,81 @@
+$username = $OctopusParameters['Username']
+$apiKey = $OctopusParameters['ApiKey']
+$loadbalanderId = $OctopusParameters['LoadBalancerID']
+$newNodeCondition = $OctopusParameters['NewCondition']
+$ipAddress = $OctopusParameters['NodeIpAddress']
+
+if ($newNodeCondition -ne "ENABLED" -and $newNodeCondition -ne "DISABLED" -and $newNodeCondition -ne "DRAINING")
+{
+    throw "Condition must be one of 'ENABLED', 'DISABLED' or 'DRAINING'"
+}
+
+# Get token and manipulation URL
+
+$tokensUri = "https://lon.identity.api.rackspacecloud.com/v2.0/tokens"
+$tokensBody = @"
+{
+    "auth":
+    {
+       "RAX-KSKEY:apiKeyCredentials":
+       {  
+          "username": "$username",  
+          "apiKey": "$apiKey"
+       }
+    }  
+}
+"@
+
+Write-Host "Sending request $tokensBody to $tokensUri"
+
+$tokensResponse = Invoke-WebRequest -Uri $tokensUri -Method Post -Body $tokensBody -ContentType "application/json" -UseBasicParsing
+
+if ($tokensResponse.StatusCode -ne 200)
+{
+    throw "Authorisation failed"
+}
+
+$tokensObj = ConvertFrom-Json -InputObject $tokensResponse.Content
+
+$loadBalancerDetails = $tokensObj.access.serviceCatalog | Where {$_.name -eq "cloudLoadBalancers"}
+$endpoints = $loadBalancerDetails.endpoints | Select -First 1
+$loadbalancerUrl = $endpoints.publicURL
+$token = $tokensObj.access.token.id
+
+# Update node
+
+$header = @{}
+$header.Add("X-Auth-Token", $token)
+$nodesUrl = "$loadbalancerUrl/loadbalancers/$loadbalancerId/nodes"
+
+Write-Host "Getting node details from $nodesUrl"
+
+$nodesResponse = Invoke-WebRequest -Uri $nodesUrl -Method Get -Headers $header -ContentType "application/json" -UseBasicParsing
+
+if ($nodesResponse.StatusCode -ne 200)
+{
+    throw "Getting load balancer details failed"
+}
+
+$nodesObj = ConvertFrom-Json -InputObject $nodesResponse.Content
+$node = $nodesObj.nodes | Where {$_.address -eq $ipAddress}
+$nodeId = $node.id
+
+$updateBody = @"
+{
+    "node": {
+        "condition" : "$newNodeCondition"
+    }
+}
+"@
+$updateUrl = "$loadbalancerUrl/loadbalancers/$loadbalancerId/nodes/$nodeId"
+
+Write-Host "Updating node $nodeId to $newNodeCondition"
+Write-Host "$updateBody"
+Write-Host "$updateUrl"
+
+$updateResponse = Invoke-WebRequest -Uri $updateUrl -Body $updateBody -Method Put -Headers $header -ContentType "application/json" -UseBasicParsing
+
+if ($updateResponse.StatusCode -ne 202)
+{
+    throw "Updating load balancer failed"
+}
\ No newline at end of file
diff --git a/src/step-templates/ravendb-create-database/metadata.json b/src/step-templates/ravendb-create-database/metadata.json
new file mode 100644
index 000000000..580e98d3a
--- /dev/null
+++ b/src/step-templates/ravendb-create-database/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "ffa7c244-f835-42d1-ad38-15f96037f114",
+  "Name": "RavenDB - Create Database",
+  "Description": "Used to create a new database on a server",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenDatabaseURL",
+      "Label": "URL of the RavenDB",
+      "HelpText": "URL of the RavenDB, where you would like the database to be created.  \n\nFor example **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenDatabaseName",
+      "Label": "Name of the Database",
+      "HelpText": "The name the database will be called. Make sure that name is not already being used.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenActiveBundles",
+      "Label": "Active Bundles",
+      "HelpText": "A settings option, Active Bundles refers bundles that RavenDB has (Replication;Versioning; etc)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenStorageTypeName",
+      "Label": "Name of the Storage Type",
+      "HelpText": "What storage type to use",
+      "DefaultValue": "Esent",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Esent| Esent\nVoron| Voron"
+      }
+    },
+    {
+      "Name": "ravenDataDir",
+      "Label": "Path for the database directory",
+      "HelpText": "The path for the database directory on the server",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "allowIncrementalBackups",
+      "Label": "Allow Incremental Backups",
+      "HelpText": "Allow Incremental Backups to be perform on this Database",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "voronTempPath",
+      "Label": "Path to Temporary Files",
+      "HelpText": "A different path where the temporary files will be stored",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "esentLogsPath",
+      "Label": "Path for the Esent Logs",
+      "HelpText": "The path for the Esent logs",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "indexStoragePath",
+      "Label": "Path for the Indexes",
+      "HelpText": "The path for the indexes on a disk, if you want to store the indexes on another HDD for performance reasons",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-12T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-15T14:07:42.4390000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-create-database/scriptbody.ps1 b/src/step-templates/ravendb-create-database/scriptbody.ps1
new file mode 100644
index 000000000..3af5ab05a
--- /dev/null
+++ b/src/step-templates/ravendb-create-database/scriptbody.ps1
@@ -0,0 +1,133 @@
+#--------------------------------------------------------------------
+#Octopus Variables
+
+#URL where the database will be create
+$ravenDatabaseURL = $OctopusParameters["ravenDatabaseURL"]
+
+#Name of the new database
+$ravenDatabaseName = $OctopusParameters["ravenDatabaseName"]
+
+#Name of Active Bundles (Replication; Versioning; etc) (Default is null)
+$ravenActiveBundles = $OctopusParameters["ravenActiveBundles"]
+
+#storage Type Name (esent or voron)
+$ravenStorageTypeName = $OctopusParameters["ravenStorageTypeName"]
+
+#directory the database will be located on the server
+$ravenDataDir = $OctopusParameters["ravenDataDir"]
+
+#allow incremental back ups: boolean
+$allowIncrementalBackups = $OctopusParameters["allowIncrementalBackups"]
+
+#temporary files will be created at this location
+$voronTempPath = $OctopusParameters["voronTempPath"]
+
+#The path for the esent logs
+$esentLogsPath = $OctopusParameters["esentLogsPath"]
+
+#The path for the indexes on a disk
+$indexStoragePath = $OctopusParameters["indexStoragePath"]
+
+
+#--------------------------------------------------------------------
+
+#checks to see if the entered database exists, return a boolean value depending on the outcome
+function doesRavenDBExist([string] $databaseChecking, [string]$URL)
+{
+    #retrieves the list of databases at the specified URL
+    $database_list = Invoke-RestMethod -Uri "$URL/databases" -Method Get
+    #checks if the database is at the specified URL
+    if ($database_list -contains $databaseChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+}#ends does ravenDB exist function
+
+Write-Output "`n-------------------------`n"
+
+
+#--------------------------------------------------------------------
+
+#check to see if database exists
+Write-Output "Checking to see if $ravenDatabaseName exists"
+
+$database_exists = doesRavenDBExist -databaseChecking $ravenDatabaseName -URL $ravenDatabaseURL
+
+if($database_exists -eq $TRUE)
+{
+    Write-Error "$ravenDatabaseName already exists" -ErrorId E4
+    Exit 1
+}
+
+
+
+Write-Output "`n-------------------------`n"
+#--------------------------------------------------------------------
+#check setting variables 
+
+if($ravenActiveBundles -eq $null)
+{
+   $ravenActiveBundles = "" 
+}
+
+if($ravenDataDir -eq "")
+{
+    Write-Warning "A directory for the database has NOT been entered. The default directory ~\Databases\System is being used."
+    $ravenDataDir  = "~\Databases\System"
+}
+
+if($esentLogsPath -eq "")
+{
+    Write-Warning "The path for the esent logs has NOT been entered. The default path of ~/Data/Logs will be used"
+    $esentLogsPath =  "~/Data/Logs"
+}
+
+if($indexStoragePath -eq "")
+{
+    Write-Warning "The path for the indexes has NOT been entered. The default path of ~/Data/Indexes will be used"
+    $indexStoragePath = "~/Data/Indexes"
+}
+
+
+$ravenDataDir = $ravenDataDir.Replace("\", "\\")
+
+$voronTempPath = $voronTempPath.Replace("\", "\\")
+
+$esentLogsPath = $esentLogsPath.Replace("\", "\\")
+
+$indexStoragePath = $indexStoragePath.Replace("\", "\\")
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#database Settings 
+
+$db_settings = @"
+{
+   "Settings":
+   {
+   "Raven/ActiveBundles": "$ravenActiveBundles",
+    "Raven/StorageTypeName": "$ravenStorageTypeName",
+    "Raven/DataDir": "$ravenDataDir",
+    "Raven/Voron/AllowIncrementalBackups": "$allowIncrementalBackups",
+    "Raven/Voron/TempPath": "$voronTempPath",
+    "Raven/Esent/LogsPath": "$esentLogsPath",
+    "Raven/IndexStoragePath": "$indexStoragePath"
+   }
+}
+"@
+
+#--------------------------------------------------------------------
+#create Database
+
+Write-Output "Create database: $ravenDatabaseName"
+
+$createURI = "$ravenDatabaseURL/admin/databases/$ravenDatabaseName"
+
+Invoke-RestMethod -Uri $createURI -Body $db_settings -Method Put
diff --git a/src/step-templates/ravendb-create-filesystem/metadata.json b/src/step-templates/ravendb-create-filesystem/metadata.json
new file mode 100644
index 000000000..504f39610
--- /dev/null
+++ b/src/step-templates/ravendb-create-filesystem/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "35e74a1b-3d6a-4d68-be07-51d0dfb56f23",
+  "Name": "RavenDB - Create File System",
+  "Description": "Used to create a new file system on a server",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenFileSystemURL",
+      "Label": "URL of RavenDB",
+      "HelpText": "URL of the RavenDB, where you would like the file system to be created. \n\nFor example **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenFileSystemName",
+      "Label": "Name of the File System",
+      "HelpText": "Name the new File System will be called. Make sure the name is not being used already within this instance of RavenDB",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenActiveBundles",
+      "Label": "Active Bundles",
+      "HelpText": "A settings option, Active Bundles refers bundles that RavenDB has (Replication;Versioning; etc)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenStorageTypeName",
+      "Label": "Name of the Storage Type",
+      "HelpText": "What storage type to use",
+      "DefaultValue": "Esent",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Esent| Esent\nVoron| Voron"
+      }
+    },
+    {
+      "Name": "ravenDataDir",
+      "Label": "Path for the database directory",
+      "HelpText": "The path for the database directory on the server",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "allowIncrementalBackups",
+      "Label": "Allow Incremental Backups",
+      "HelpText": "Allow Incremental Backups to be perform on this Database",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "voronTempPath",
+      "Label": "Path to Temporary Files",
+      "HelpText": "A different path where the temporary files will be stored",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "esentLogsPath",
+      "Label": "Path for the Esent Logs",
+      "HelpText": "The path for the Esent logs",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "indexStoragePath",
+      "Label": "Path for the Indexes",
+      "HelpText": "The path for the indexes on a disk, if you want to store the indexes on another HDD for performance reasons",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-12T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-15T14:10:59.0920000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-create-filesystem/scriptbody.ps1 b/src/step-templates/ravendb-create-filesystem/scriptbody.ps1
new file mode 100644
index 000000000..ea2055beb
--- /dev/null
+++ b/src/step-templates/ravendb-create-filesystem/scriptbody.ps1
@@ -0,0 +1,151 @@
+#--------------------------------------------------------------------
+#File System Octopus Variables
+
+#URL of RavenFS that is being deleted 
+$ravenFileSystemURL = $OctopusParameters["ravenFileSystemURL"]
+
+#name of the RavenFS that is being deleted
+$ravenFileSystemName = $OctopusParameters["ravenFileSystemName"]
+
+#--------------------------------------------------------------------
+#Settings Octopus Variables
+
+#Name of Active Bundles (Replication; Versioning; etc) (Default is none)
+$ravenActiveBundles = $OctopusParameters["ravenActiveBundles"]
+
+#storage Type Name (esent or voron)
+$ravenStorageTypeName = $OctopusParameters["ravenStorageTypeName"]
+
+#directory the database will be located on the server
+$ravenDataDir = $OctopusParameters["ravenDataDir"]
+
+#allow incremental back ups: boolean
+$allowIncrementalBackups = $OctopusParameters["allowIncrementalBackups"]
+
+#temporary files will be created at this location
+$voronTempPath = $OctopusParameters["voronTempPath"]
+
+#The path for the esent logs
+$esentLogsPath = $OctopusParameters["esentLogsPath"]
+
+#The path for the indexes on a disk
+$indexStoragePath = $OctopusParameters["indexStoragePath"]
+
+
+#--------------------------------------------------------------------
+
+#checks to see if the entered file system exists, return a Boolean value depending on the outcome
+function doesRavenFSExist([string] $FSChecking, [string]$URL)
+{
+    #retrieves the list of File Systems at the specified URL
+    $fs_list = Invoke-RestMethod -Uri "$URL/fs" -Method Get
+    #checks if the File System is at the specified URL
+    if ($fs_list -contains $FSChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+}#ends does File System exist function
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#check to see if File System exists
+
+Write-Output "Checking if $ravenFileSystemName exists"
+
+$fs_exists = doesRavenFSExist -FSChecking $ravenFileSystemName -URL $ravenFileSystemURL
+
+if($fs_exists -eq $TRUE)
+{
+    Write-Error "$ravenFileSystemName already exists" -ErrorId E4
+    Exit 1
+}
+else
+{
+    Write-Output "$ravenFileSystemName doesn't exist. Creating $ravenFileSystemName now"
+}
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#check setting variables 
+
+if($ravenActiveBundles -eq $null)
+{
+   $ravenActiveBundles = "" 
+}
+
+if($ravenDataDir -eq "")
+{
+    Write-Warning "A directory for the database has NOT been entered. The default directory ~\Databases\System is being used."
+    $ravenDataDir  = "~\Databases\System"
+}
+
+if($esentLogsPath -eq "")
+{
+    Write-Warning "The path for the esent logs has NOT been entered. The default path of ~/Data/Logs will be used"
+    $esentLogsPath =  "~/Data/Logs"
+}
+
+if($indexStoragePath -eq "")
+{
+    Write-Warning "The path for the indexes has NOT been entered. The default path of ~/Data/Indexes will be used"
+    $indexStoragePath = "~/Data/Indexes"
+}
+
+
+$ravenDataDir = $ravenDataDir.Replace("\", "\\")
+
+$voronTempPath = $voronTempPath.Replace("\", "\\")
+
+$esentLogsPath = $esentLogsPath.Replace("\", "\\")
+
+$indexStoragePath = $indexStoragePath.Replace("\", "\\")
+
+$ravenDataDir = $ravenDataDir.Replace("DB", "FS")
+
+$voronTempPath = $voronTempPath.Replace("DB", "FS")
+
+$esentLogsPath = $esentLogsPath.Replace("DB", "FS")
+
+$indexStoragePath = $indexStoragePath.Replace("DB", "FS")
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#file system settings
+
+
+$fs_settings = @"
+{
+   "Settings":
+   {
+   "Raven/ActiveBundles": "$ravenActiveBundles",
+    "Raven/StorageTypeName": "$ravenStorageTypeName",
+    "Raven/DataDir": "$ravenDataDir",
+    "Raven/Voron/AllowIncrementalBackups": "$allowIncrementalBackups",
+    "Raven/Voron/TempPath": "$voronTempPath",
+    "Raven/Esent/LogsPath": "$esentLogsPath",
+    "Raven/IndexStoragePath": "$indexStoragePath"
+   }
+}
+"@
+
+#--------------------------------------------------------------------
+#Create File System
+
+Write-Output "Creating File System: $ravenFileSystemName"
+
+$createURI = "$ravenFileSystemURL/admin/fs/$ravenFileSystemName"
+
+Invoke-RestMethod -Uri $createURI -Body $fs_settings -Method Put
+
+Write-Output "$ravenFileSystemName created."
diff --git a/src/step-templates/ravendb-delete-database/metadata.json b/src/step-templates/ravendb-delete-database/metadata.json
new file mode 100644
index 000000000..3540f6557
--- /dev/null
+++ b/src/step-templates/ravendb-delete-database/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "474d4dff-e91b-4580-b074-c39763741cd6",
+  "Name": "RavenDB - Delete Database",
+  "Description": "Used to delete a database from a server, with a possibility to remove all the data from hard drive.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenDatabaseURL",
+      "Label": "URL of the Raven Database",
+      "HelpText": "The URL of the Raven database, where the Database is located. \n\nFor example **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenDatabaseName",
+      "Label": "Name of the Raven Database",
+      "HelpText": "Name of the Database in Raven.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "hardDelete",
+      "Label": "Hard Delete",
+      "HelpText": "Should all of the data be removed from the hard drive as well",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "allowDelete",
+      "Label": "Allow Deletion",
+      "HelpText": "Is the database allowed to be deleted. **TRUE OR FALSE** value must be entered\n\n**For example**: you don't want a production server to be deleted, the script will stop it from happening\n\n**HINT**: have a variable within Octopus that returns true if it is allowed to be deleted and vice versa.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-26T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-25T19:54:46.6140000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-delete-database/scriptbody.ps1 b/src/step-templates/ravendb-delete-database/scriptbody.ps1
new file mode 100644
index 000000000..a46418ee2
--- /dev/null
+++ b/src/step-templates/ravendb-delete-database/scriptbody.ps1
@@ -0,0 +1,98 @@
+#--------------------------------------------------------------------
+#Octopus Variables
+
+#URL where the database can be found
+$ravenDatabaseURL = $OctopusParameters["ravenDatabaseURL"]
+
+#Name of the Database
+$ravenDatabaseName = $OctopusParameters["ravenDatabaseName"]
+
+#hard delete (true or false)
+$hardDelete = $OctopusParameters["hardDelete"]
+
+#Allow Database to be deleted
+$allowDelete = $OctopusParameters["allowDelete"]
+
+
+
+Write-Output "`n-------------------------`n"
+#--------------------------------------------------------------------
+#checks to see if the database can be deleted
+
+if($allowDelete -eq $FALSE)
+{
+    Write-Error "$ravenDatabaseName cannot be deleted. Please try this on a database that can be delete." -ErrorId E4
+    Exit 1
+}
+
+
+#--------------------------------------------------------------------
+
+#checks to see if the entered database exists, return a boolean value depending on the outcome
+function doesRavenDBExist([string] $databaseChecking, [string]$URL)
+{
+    #retrieves the list of databases at the specified URL
+    $database_list = Invoke-RestMethod -Uri "$URL/databases" -Method Get
+    #checks if the database is at the specified URL
+    if ($database_list -contains $databaseChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+}#ends does ravenDB exist function
+
+Write-Output "`n-------------------------`n"
+
+
+#--------------------------------------------------------------------
+
+#check to see if database exists
+Write-Output "Checking to see if $ravenDatabaseName exists"
+
+$database_exists = doesRavenDBExist -databaseChecking $ravenDatabaseName -URL $ravenDatabaseURL
+
+if($database_exists -eq $TRUE)
+{
+    Write-Output "$ravenDatabaseName exists"
+    $doWork = $TRUE
+}
+else
+{
+    Write-Warning "$ravenDatabaseName does not exist already." 
+    $doWork = $FALSE
+}
+
+
+Write-Output "`n-------------------------`n"
+
+
+#--------------------------------------------------------------------
+#hard delete option
+
+$hardDeleteString = $hardDelete.ToString().ToLower()
+
+
+
+#--------------------------------------------------------------------
+#Delete database
+
+if($doWork -eq $TRUE)
+{
+
+    Write-Output "Deleting Database: $ravenDatabaseName"
+
+    $deleteURI = "$ravenDatabaseURL/admin/databases/$ravenDatabaseName" + "?hard-delete=$hardDeleteString"
+
+    Invoke-RestMethod -Uri $deleteURI -Method Delete
+
+    #Waits 10 seconds before it continues
+    Start-Sleep -Seconds 10
+    
+    Write-Output "Database has successfuly been deleted"
+
+}
\ No newline at end of file
diff --git a/src/step-templates/ravendb-delete-filesystem/metadata.json b/src/step-templates/ravendb-delete-filesystem/metadata.json
new file mode 100644
index 000000000..e2b95936f
--- /dev/null
+++ b/src/step-templates/ravendb-delete-filesystem/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "365ae5c6-8f97-4e99-82c8-9973b9b0d8ff",
+  "Name": "RavenDB - Delete File System",
+  "Description": "Used to delete a file system from a server, with a possibility to remove its all data from the hard drive.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenFileSystemURL",
+      "Label": "URL of the Raven Database",
+      "HelpText": "The URL of the Raven File System, where the File System is located.\n\nFor example: **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenFileSystemName",
+      "Label": "Name of the File System",
+      "HelpText": "Name of the File System in Raven",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "hardDelete",
+      "Label": "Hard Delete",
+      "HelpText": "Should all of the data be removed from the hard drive as well",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "allowDelete",
+      "Label": "Allow Deletion",
+      "HelpText": "Is the File System allowed to be deleted. **TRUE OR FALSE** value must be entered\n\n**For example**: you don't want a production server to be deleted, the script will stop it from happening\n\n**HINT**: have a variable within Octopus that returns true if it is allowed to be deleted and vice versa.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-26T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-25T19:55:48.0360000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-delete-filesystem/scriptbody.ps1 b/src/step-templates/ravendb-delete-filesystem/scriptbody.ps1
new file mode 100644
index 000000000..f694a764f
--- /dev/null
+++ b/src/step-templates/ravendb-delete-filesystem/scriptbody.ps1
@@ -0,0 +1,93 @@
+#--------------------------------------------------------------------
+#Octopus Variables
+
+#URL of RavenFS that is being deleted 
+$ravenFileSystemURL = $OctopusParameters["ravenFileSystemURL"]
+
+#name of the RavenFS that is being deleted
+$ravenFileSystemName = $OctopusParameters["ravenFileSystemName"]
+
+#hard delete (true or false)
+$hardDelete = $OctopusParameters["hardDelete"]
+
+#Allow File System to be deleted
+$allowDelete = $OctopusParameters["allowDelete"]
+
+
+
+Write-Output "`n-------------------------`n"
+#--------------------------------------------------------------------
+#checks to see if the File System can be deleted
+
+if($allowDelete -eq $FALSE)
+{
+    Write-Error "$ravenFileSystemName cannot be deleted. Please try this on a database that can be delete." -ErrorId E4
+    Exit 1
+}
+
+
+#--------------------------------------------------------------------
+
+#checks to see if the entered file system exists, return a Boolean value depending on the outcome
+function doesRavenFSExist([string] $FSChecking, [string]$URL)
+{
+    #retrieves the list of File Systems at the specified URL
+    $fs_list = Invoke-RestMethod -Uri "$URL/fs" -Method Get
+    #checks if the File System is at the specified URL
+    if ($fs_list -contains $FSChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+}#ends does File System exist function
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#check to see if File System exists
+
+Write-Output "Checking if $ravenFileSystemName exists"
+
+$fs_exists = doesRavenFSExist -FSChecking $ravenFileSystemName -URL $ravenFileSystemURL
+
+if($fs_exists -eq $TRUE)
+{
+    Write-Output "$ravenFileSystemName exists"
+    $doWork = $TRUE
+}
+else
+{
+    Write-Warning "$ravenFileSystemName doesn't exist already."
+    $doWork = $FALSE
+}
+
+#--------------------------------------------------------------------
+#converts hard delete option to a string
+
+$hardDeleteString = $hardDelete.ToString().ToLower()
+
+#--------------------------------------------------------------------
+#Delete File System
+
+if($doWork -eq $TRUE)
+{
+
+    Write-Output "Deleting File System: $ravenFileSystemName"
+
+    $deleteURI = "$ravenFileSystemURL/admin/fs/$ravenFileSystemName" + "?hard-delete=$hardDeleteString"
+
+    Invoke-RestMethod -Uri $deleteURI -Method Delete
+
+
+    #Waits 10 seconds before it continues
+    Start-Sleep -Seconds 10
+    
+    Write-Output "File System has successfuly been deleted"
+
+}
\ No newline at end of file
diff --git a/src/step-templates/ravendb-smuggler-move-data-between-database/metadata.json b/src/step-templates/ravendb-smuggler-move-data-between-database/metadata.json
new file mode 100644
index 000000000..0da676c89
--- /dev/null
+++ b/src/step-templates/ravendb-smuggler-move-data-between-database/metadata.json
@@ -0,0 +1,139 @@
+{
+  "Id": "82f804fe-682e-4e0b-8c2a-a5f289a9cabc",
+  "Name": "RavenDB - Smuggler - Move Data Between Databases",
+  "Description": "To move data directly between two instances (or different databases in the same instance) using the between option introduced in Smuggler version 3.",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenSmugglerPath",
+      "Label": "Raven Smuggler Path",
+      "HelpText": "Full path to the Smuggler EXE. \n \nFor example **C:\\RavenDB\\Smuggler\\Raven.Smuggler.exe**",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "sourceDatabaseUrl",
+      "Label": "Source Database URL",
+      "HelpText": "The URL of the Raven database, where the **Source Database** is located. \n\nFor example **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "sourceDatabaseName",
+      "Label": "Name of the Source Database",
+      "HelpText": "Name of the **Source Database** in Raven.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "sourceDatabaseApiKey",
+      "Label": "API Key for the Source Database",
+      "HelpText": "API Key needed to access the **Source Database**. \n\nIf key is not provided, anonymous authentication will be used.\n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "destinationDatabaseUrl",
+      "Label": "Destination Database URL",
+      "HelpText": "The URL of the Raven database, where the **Destination Database** is located. \n\nFor example **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "destinationDatabaseName",
+      "Label": "Name of the Destination Database",
+      "HelpText": "Name of the **Destination Database** in Raven.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "destinationDatabaseApiKey",
+      "Label": "API Key for the Destination Database",
+      "HelpText": "API Key needed to access the **Destination Database**. \n\nIf key is not provided, anonymous authentication will be used.\n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "OperateDocuments",
+      "Label": "Operate on Documents",
+      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Documents** from the copying process.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "OperateAttachments",
+      "Label": "Operate on Attachments",
+      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Attachments** from the copying process.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "OperateIndexes",
+      "Label": "Operate on Indexes",
+      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Indexes** from the copying process.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "OperateTransformers",
+      "Label": "Operate on Transformers",
+      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Transformers** from the copying process.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "timeout",
+      "Label": "Timeout",
+      "HelpText": "The timeout (in milliseconds) to use for requests.",
+      "DefaultValue": "300000",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WaitIndexing",
+      "Label": "Wait for Indexing",
+      "HelpText": "Wait until all indexing activity has been completed (Import Only).",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-12T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-15T14:01:49.3850000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-smuggler-move-data-between-database/scriptbody.ps1 b/src/step-templates/ravendb-smuggler-move-data-between-database/scriptbody.ps1
new file mode 100644
index 000000000..9f9367f2e
--- /dev/null
+++ b/src/step-templates/ravendb-smuggler-move-data-between-database/scriptbody.ps1
@@ -0,0 +1,261 @@
+
+# Variables
+
+#Location of the Raven Smuggler exe
+$ravenSmugglerPath = $OctopusParameters["ravenSmugglerPath"]
+
+
+#--------------------------------------------------------------------
+# Source Database Variables
+
+#URL of RavenDB that is being backed up 
+$sourceDatabaseURL = $OctopusParameters["sourceDatabaseURL"]
+
+#name of the RavenDB that is being backed up
+$sourceDatabaseName = $OctopusParameters["sourceDatabaseName"]
+
+#API Key for the Source Database
+$sourceDatabaseApiKey = $OctopusParameters["sourceDatabaseApiKey"]
+
+
+#--------------------------------------------------------------------
+#Destination Database Variables
+
+#URL of destination RavenDB 
+$destinationDatabaseURL = $OctopusParameters["destinationDatabaseURL"]
+
+#Name of the destination RavenDB
+$destinationDatabaseName = $OctopusParameters["destinationDatabaseName"]
+
+#API Key for the Destination Database
+$destinationDatabaseAPIKey = $OctopusParameters["destinationDatabaseAPIKey"]
+
+
+
+#------------------------------------------------------------------------------
+# Other Variables retrieved from Octopus
+
+#Limit the back up to different types in the database
+#Get document option (true/false)
+$operateOnDocuments = $OctopusParameters["operateOnDocuments"]
+
+#Get attachments option (true/false)
+$operateOnAttachments = $OctopusParameters["operateOnAttachments"]
+
+#Get indexes option (true/false)
+$operateOnIndexes = $OctopusParameters["operateOnIndexes"]
+
+#Get transformers option (true/false)
+$operateOnTransformers = $OctopusParameters["operateOnTransformers"]
+
+#Get timeout option 
+$timeout = $OctopusParameters["timeout"]
+
+#Get wait for indexing option (true/false)
+$waitForIndexing = $OctopusParameters["waitForIndexing"]
+
+
+#--------------------------------------------------------------------
+
+#checks to see if the entered database exists, return a boolean value depending on the outcome
+function doesRavenDBExist([string] $databaseChecking, [string]$URL)
+{
+    #retrieves the list of databases at the specified URL
+    $database_list = Invoke-RestMethod -Uri "$URL/databases" -Method Get
+    #checks if the database is at the specified URL
+    if ($database_list -contains $databaseChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+}#ends does ravenDB exist function
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#Checking the versions of Raven Server of both databases to see if they are compatible 
+
+Write-Output "Checking that both $sourceDatabaseName and $destinationDatabaseName are running the same version of RavenDB"
+
+#Getting Source Database's build version
+$sourceVersionURL = "$sourceDatabaseURL/databases/$sourceDatabaseName/build/version"
+
+$sourceDatabaseVersion = Invoke-RestMethod -Uri $sourceVersionURL -Method Get
+
+#Getting destination Database's build version
+$destinationVersionURL = "$destinationDatabaseURL/databases/$destinationDatabaseName/build/version"
+
+$destinationDatabaseVersion = Invoke-RestMethod -Uri $destinationVersionURL -Method Get
+
+#Checks to see if they are the same version and build number
+if(($sourceDatabaseVersion.ProductVersion -eq $destinationDatabaseVersion.ProductVersion) -and ($sourceDatabaseVersion.BuildVersion -eq $destinationDatabaseVersion.BuildVersion))
+{
+    
+    Write-Output "Source Database Product Version:" $sourceDatabaseVersion.ProductVersion 
+    Write-Output "Source Database Build Version:" $sourceDatabaseVersion.BuildVersion
+    Write-Output "Destination Database Version:" $destinationDatabaseVersion.ProductVersion 
+    Write-Output "Destination Database Build Version:" $destinationDatabaseVersion.BuildVersion
+    Write-Output "Source and destination Databases are running the same version of Raven Server"
+    
+}
+else 
+{
+    Write-Warning "Source Database Version: $sourceDatabaseVersion"
+    Write-Warning "Destination Database Version: $destinationDatabaseVersion"
+    Write-Warning "The databases are running different versions of Raven Server"
+}
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+
+#Check path to smuggler
+Write-Output "Checking if Smuggler path is correct`n"
+
+$smugglerPath = "$ravenSmugglerPath"
+
+$smuggler_Exists = Test-Path -Path $smugglerPath
+
+
+
+#if the path is correct, the script continues, throws an error if the path is wrong
+If($smuggler_Exists -eq $TRUE)
+{
+    Write-Output "Smuggler exists"
+
+}#ends if smuggler exists 
+else
+{
+    Write-Error "Smuggler can not be found `nCheck the directory: $ravenSmugglerPath" -ErrorId E4
+    Exit 1
+}#ends else, smuggler can't be found
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#Checking the version of smuggler
+
+$SmugglerVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ravenSmugglerPath).FileVersion
+
+if($SmugglerVersion -cgt "3")
+{
+    Write-Output "Smuggler Version: $SmugglerVersion"
+}
+else
+{
+    Write-Error "The version of Smuggler that is installed can NOT complete this step `nPlease update Smuggler before continuing" -ErrorId E4
+    Exit 1
+}
+Write-Output "`n-------------------------`n"
+
+
+
+
+
+#--------------------------------------------------------------------
+
+
+#Checks if both Source database and destination database exist
+Write-Output "Checking if both $sourceDatabaseName and $destinationDatabaseName exist`n"
+
+$sourceDatabase_exists = doesRavenDBExist -databaseChecking $sourceDatabaseName -URL $sourceDatabaseURL 
+
+$destinationDatabase_exists = doesRavenDBExist -databaseChecking $destinationDatabaseName -URL $destinationDatabaseURL
+
+
+#if both database exist a backup occurs
+if(($sourceDatabase_exists -eq $TRUE) -and ($destinationDatabase_exists -eq $TRUE))
+{
+
+    Write-Output "Both $sourceDatabaseName and $destinationDatabaseName exist`n"
+
+}#ends if 
+#if the source database doesn’t exist an error is throw
+elseIf(($sourceDatabase_exists -eq $FALSE) -and ($destinationDatabase_exists -eq $TRUE))
+{
+
+    Write-Error "$sourceDatabaseName does not exist. `nMake sure the database exists before continuing" -ErrorId E4
+    Exit 1
+
+}
+#if the destination database doesn’t exist an error is throw
+elseIf(($destinationDatabase_exists -eq $FALSE) -and ($sourceDatabase_exists -eq $TRUE))
+{
+
+    Write-Error "$destinationDatabaseName does not exist. `nMake sure the database exists before continuing" -ErrorId E4
+    Exit 1
+
+}#ends destination db not exists
+else
+{
+
+    Write-Error "Neither $sourceDatabaseName or $destinationDatabaseName exists. `nMake sure both databases exists" -ErrorId E4
+    Exit 1
+
+}#ends else
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#changing the types to export/import
+
+$operateTypes = @()
+
+
+if($operateOnDocuments -eq $TRUE)
+{
+    $operateTypes += "Documents"
+}
+if($operateOnIndexes -eq $TRUE)
+{
+    $operateTypes += "Indexes"
+}
+if($operateOnAttachments -eq $TRUE)
+{
+    $operateTypes += "Attachments"
+}
+if($operateOnTransformers -eq $TRUE)
+{
+    $operateTypes += "Transformers"
+}
+
+$Types = $operateTypes -join ","
+
+if($Types -ne "")
+{
+    Write-Output "This back up is only operating on $Types"
+
+    Write-Output "`n-------------------------`n"
+}
+
+
+#--------------------------------------------------------------------
+#check if wait for indexing is selected
+$Indexing = ""
+
+if($waitForIndexing -eq $TRUE)
+{
+    $Indexing = "--wait-for-indexing"
+}
+
+#--------------------------------------------------------------------
+#backing up source database into the destination database
+
+try
+{
+    Write-Output "Attempting Backup up now"
+    Write-Output "`n-------------------------`n"
+    & $ravenSmugglerPath between $sourceDatabaseURL $destinationDatabaseURL --database=$sourceDatabaseName --database2=$destinationDatabaseName --api-key=$sourceDatabaseApiKey --api-key2=$destinationDatabaseAPIKey --timeout=$Timeout $Indexing 
+    Write-Output "`n-------------------------`n"
+    Write-Output "Backup successful" 
+}#ends try
+catch
+{
+    Write-Error "An error occurred during backup, please try again" -ErrorId E4
+    Exit 1
+}#ends catch 
diff --git a/src/step-templates/ravendb-smuggler-move-data-between-filesystems/metadata.json b/src/step-templates/ravendb-smuggler-move-data-between-filesystems/metadata.json
new file mode 100644
index 000000000..be4a409ae
--- /dev/null
+++ b/src/step-templates/ravendb-smuggler-move-data-between-filesystems/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "4ec55f5e-ab8b-409d-b404-dc0bf705d057",
+  "Name": "RavenDB - Smuggler - Moving Data between File Systems",
+  "Description": "To move data directly between two instances (or different file systems in the same instance) using the between option introduced in Smuggler version 3.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenSmugglerPath",
+      "Label": "Raven Smuggler Path",
+      "HelpText": "Full path to the Smuggler EXE.\n\nFor example: **C:\\RavenDB\\Smuggler\\Raven.Smuggler.exe**",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "sourceFileSystemURL",
+      "Label": "Source File System URL",
+      "HelpText": "The URL of the Raven File System, where the **Source File System** is located.\n\nFor example: **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "sourceFileSystemName",
+      "Label": "Name of the Source File System",
+      "HelpText": "Name of the **Source File System** in Raven.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "sourceFileSystemApiKey",
+      "Label": "Api Key for the Source File System",
+      "HelpText": "API Key needed to access the **Source File System**.\n\nIf key is not provided, anonymous authentication will be used. \n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "destinationFileSystemURL",
+      "Label": "Destination File System URL",
+      "HelpText": "The URL for the Raven File System where the **Destination File System** is located.\n\nFor example: **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "destinationFileSystemName",
+      "Label": "Name of the Destination File System",
+      "HelpText": "Name of the **Destination File System** in Raven.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "destinationFileSystemAPIKey",
+      "Label": "API Key for the Destination File System",
+      "HelpText": "API Key needed to access the **Destination File System**.\n\nIf key is not provided, anonymous authentication will be used.\n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "timeout",
+      "Label": "Timeout",
+      "HelpText": "The timeout (in milliseconds) to use for requests.",
+      "DefaultValue": "300000",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-12T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-15T14:06:33.7370000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-smuggler-move-data-between-filesystems/scriptbody.ps1 b/src/step-templates/ravendb-smuggler-move-data-between-filesystems/scriptbody.ps1
new file mode 100644
index 000000000..5efa09224
--- /dev/null
+++ b/src/step-templates/ravendb-smuggler-move-data-between-filesystems/scriptbody.ps1
@@ -0,0 +1,166 @@
+
+# Variables
+
+#Location of the Raven Smuggler exe
+$ravenSmugglerPath = $OctopusParameters["ravenSmugglerPath"]
+
+
+#--------------------------------------------------------------------
+# Source File System Variables
+
+#URL of RavenFS that is being backed up 
+$sourceFileSystemURL = $OctopusParameters["sourceFileSystemURL"]
+
+#name of the RavenFS that is being backed up
+$sourceFileSystemName = $OctopusParameters["sourceFileSystemName"]
+
+#API Key for the Source File System
+$sourceFileSystemApiKey = $OctopusParameters["sourceFileSystemApiKey"]
+
+
+
+
+#--------------------------------------------------------------------
+#Destination File System Variables
+
+#URL of destination RavenFS 
+$destinationFileSystemURL = $OctopusParameters["destinationFileSystemURL"]
+
+#Name of the destination RavenFS
+$destinationFileSystemName = $OctopusParameters["destinationFileSystemName"]
+
+#API Key for the Destination File System
+$destinationFileSystemAPIKey = $OctopusParameters["destinationFileSystemAPIKey"]
+
+
+#--------------------------------------------------------------------
+# Other Variables retrieved from Octopus
+
+#Get timeout variable
+$timeout = $OctopusParameters["timeout"]
+
+
+
+#--------------------------------------------------------------------
+
+#checks to see if the entered file system exists, return a Boolean value depending on the outcome
+function doesRavenFSExist([string] $FSChecking, [string]$URL)
+{
+    #retrieves the list of File Systems at the specified URL
+    $fs_list = Invoke-RestMethod -Uri "$URL/fs" -Method Get
+    #checks if the File System is at the specified URL
+    if ($fs_list -contains $FSChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+}#ends does File System exist function
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+
+#Check path to smuggler
+Write-Output "Checking if Smuggler path is correct`n"
+
+$smuggler_Exists = Test-Path -Path $ravenSmugglerPath
+
+
+
+#if the path is correct, the script continues, throws an error if the path is wrong
+If($smuggler_Exists -eq $TRUE)
+{
+    Write-Output "Smuggler exists"
+
+}#ends if smuggler exists 
+else
+{
+    Write-Error "Smuggler cannot be found `nCheck the directory: $ravenSmugglerPath" -ErrorId E4
+    Exit 1
+}#ends else, smuggler can't be found
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#Checking the version of smuggler
+
+$SmugglerVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ravenSmugglerPath).FileVersion
+
+if($SmugglerVersion -cgt "3")
+{
+    Write-Host "Smuggler Version: $SmugglerVersion"
+}
+else
+{
+    Write-Error "The version of Smuggler that is installed can NOT complete this step. `nPlease update Smuggler before continuing" -ErrorId E4
+    Exit 1
+}
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+
+#Check if Source File System and destination File System exists
+Write-Output "Checking if both $sourceFileSystemName and $destinationFileSystemName exist`n"
+
+$sourceFS_exists = doesRavenFSExist -FSChecking $sourceFileSystemName -URL $sourceFileSystemURL 
+
+$DestinationFS_Exist = doesRavenFSExist -FSChecking $destinationFileSystemName -URL $destinationFileSystemURL
+
+
+#if both File System exist a backup occurs
+if(($sourceFS_exists -eq $TRUE) -and ($DestinationFS_Exist -eq $TRUE))
+{
+
+    Write-Output "Both $sourceFileSystemName and $destinationFileSystemName exist`n"
+
+}#ends if 
+#if the source File System doesn’t exist an error is throw
+elseIf(($sourceFS_exists -eq $FALSE) -and ($DestinationFS_Exist -eq $TRUE))
+{
+
+    Write-Error "$sourceFileSystemName does not exist. `nMake sure the File System exists before continuing" -ErrorId E4
+    Exit 1
+
+}
+#if the destination File System doesn’t exist an error is throw
+elseIf(($DestinationFS_Exist -eq $FALSE) -and ($sourceFS_exists -eq $TRUE))
+{
+
+    Write-Error "$destinationFileSystemName does not exist. `nMake sure the File System exists before continuing" -ErrorId E4
+    Exit 1
+
+}#ends destination FS not exists
+else
+{
+ 
+    Write-Error "Neither $sourceFileSystemName or $destinationFileSystemName exists. `nMake sure both File Systems exists" -ErrorId E4
+    Exit 1
+
+}#ends else
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#start Backup
+
+try
+{
+    Write-Output "Attempting Backup up now"
+    Write-Output "`n-------------------------`n"
+    & $ravenSmugglerPath between $sourceFileSystemURL $destinationFileSystemURL --filesystem=$sourceFileSystemName --filesystem2=$destinationFileSystemName --api-key=$sourceFileSystemApiKey --api-key2=$destinationFileSystemAPIKey --timeout=$timeout
+    Write-Output "`n-------------------------`n"
+    Write-Output "Backup successful"
+
+
+}#ends try
+catch
+{
+    Write-Error "An error occurred during backup, please try again" -ErrorId E4
+    Exit 1
+}#ends catch
diff --git a/src/step-templates/ravendb-update-properties-within-a-document/metadata.json b/src/step-templates/ravendb-update-properties-within-a-document/metadata.json
new file mode 100644
index 000000000..9572bcb5c
--- /dev/null
+++ b/src/step-templates/ravendb-update-properties-within-a-document/metadata.json
@@ -0,0 +1,85 @@
+{
+  "Id": "89806198-6216-4034-a934-6de6a3f445b0",
+  "Name": "RavenDB - Update Properties within a Document",
+  "Description": "Retrieves the specified document by a Raven Query, updates selected variables with values from octopus Variables. Replaces the current document with the newly created document with the updated values.\n**IMPORTANT**: Any variable that is being updated **MUST** have an Octopus Variable that has exactly the same name (including capitals, any special characters, etc.) prefixed with “Property_”. This is the case of **BOTH** document variables and Metadata variables. I.E. if you wanted TestMode change, you **MUST** have an Octopus Variable named Property_TestMode (same name, and capitals, etc.).\n",
+  "ActionType": "Octopus.Script",
+  "Version": 50,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ravenDatabaseURL",
+      "Label": "URL of the Database",
+      "HelpText": "The URL of the database.\n\nFor example: **http://localhost:8080/**",
+      "DefaultValue": "http://localhost:8080/",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenDatabaseName",
+      "Label": "Name of the Database",
+      "HelpText": "Name of the database in Raven",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ravenDocumentName",
+      "Label": "Name of the Document",
+      "HelpText": "Name of the document in Raven that the program will retrieve.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "includeSettingList",
+      "Label": "List of Included Document Variables",
+      "HelpText": "A List of document variables that the program will update based on values within Octopus Variables\n\n**IMPORTANT:** The names of the variables **MUST** be the same (including capitals, special characters, etc.)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "excludeSettingList",
+      "Label": "List of Excluded Document Variables",
+      "HelpText": "A list of document variables that the step will exclude from the updated version. \n\nFor example: if TestMode is in both the include and exclude document list, then TestMode will be excluded from the update.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "includeMetadataList",
+      "Label": "List of Included Metadata Variables",
+      "HelpText": "A List of Metadata variables that the program will update based on values within Octopus Variables\n\n**IMPORTANT:** The names of the variables **MUST** be the same (including capitals, special characters, etc.)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "excludeMetadataList",
+      "Label": "List of Excluded Metadata Variables",
+      "HelpText": "A list of Metadata variables that the step will exclude from the updated version. \n\nFor example: if Raven-Entity-Name is in both the include and exclude metadata lists, then Raven-Entity-Name will be excluded from the update.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-11-26T14:39:11.5560000-08:00",
+  "LastModifiedBy": "timhunt303",
+  "$Meta": {
+    "ExportedAt": "2015-11-26T14:00:53.3590000-08:00",
+    "OctopusVersion": "3.1.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ravendb"
+}
diff --git a/src/step-templates/ravendb-update-properties-within-a-document/scriptbody.ps1 b/src/step-templates/ravendb-update-properties-within-a-document/scriptbody.ps1
new file mode 100644
index 000000000..9d86f055d
--- /dev/null
+++ b/src/step-templates/ravendb-update-properties-within-a-document/scriptbody.ps1
@@ -0,0 +1,280 @@
+
+#Variables
+
+#--------------------------------------------------------------------
+#RavenDB database variables
+
+#URL address of RavenDB
+$ravenDatabaseURL = $OctopusParameters["ravenDatabaseURL"]
+
+#Name of the database
+$ravenDatabaseName = $OctopusParameters["ravenDatabaseName"]
+
+#--------------------------------------------------------------------
+#RavenDB Query variables
+
+#Raven Query
+#$ravenQuery = $OctopusParameters["ravenQuery"]
+
+#Name of the settings document
+$ravenDocumentName = $OctopusParameters["ravenDocumentName"]
+
+#--------------------------------------------------------------------
+#Setting Variables
+
+#list of settings variables that are to be changed
+$includeSettingList = $OctopusParameters["includeSettingList"]
+
+#list of settings variables that are NOT to be changed
+$excludeSettingList = $OctopusParameters["excludeSettingList"]
+
+#--------------------------------------------------------------------
+#Metadata variables
+
+#list of metadata variables that are to be changed
+$includeMetadataList = $OctopusParameters["includeMetadataList"]
+
+#list of metadata variables that are NOT to be changed
+$excludeMetadataList = $OctopusParameters["excludeMetadataList"]
+
+
+#--------------------------------------------------------------------
+#other variables
+
+$octopusVariableList = $OctopusParameters.GetEnumerator()
+
+
+
+Write-Output "`n-------------------------`n"
+#--------------------------------------------------------------------
+#checks to see if the entered database exists, return a Boolean value depending on the outcome
+function doesRavenDBExist([string] $databaseChecking, [string]$URL)
+{
+    #retrieves the list of databases at the specified URL
+    $database_list = Invoke-RestMethod -Uri "$ravenDatabaseURL/databases" -Method Get
+    #checks if the database is at the specified URL
+    if ($database_list -contains $databaseChecking.ToString()) 
+    {
+        return $TRUE
+    }
+    else 
+    {
+        return $FALSE
+    }
+
+    
+
+}#ends does ravenDB exist function
+
+
+Write-Output "`n-------------------------`n"
+#--------------------------------------------------------------------    
+#check to see if the database exists
+       
+
+Write-Output "Checking if $ravenDatabaseName exists"
+
+$database_exists = doesRavenDBExist -databaseChecking $ravenDatabaseName -URL $ravenDatabaseURL
+
+
+#only proceeds if database exists
+if ($database_exists -eq $TRUE)
+{
+    Write-Output "$ravenDatabaseName exists"
+            
+}#ends database exists if statement 
+else 
+{
+    Write-Error "$ravenDatabaseName doesn't exists. `nMake sure the database exists before continuing" -ErrorId E4
+    Exit 1
+}
+
+
+Write-Output "`n-------------------------`n"   
+         
+#--------------------------------------------------------------------
+#Get current setings and change them accordingly
+
+$allSettingsJSON = $null
+
+Write-Output "Getting Document: $ravenDatabaseName"
+
+$settingsURI = "$ravenDatabaseURL/databases/$ravenDatabaseName/docs/$ravenDocumentName"
+
+    
+
+try {
+    #Gets settings from the specific Uri
+    $allSettings = Invoke-RestMethod -Uri $settingsURI -Method Get
+
+} catch {
+    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {
+  
+    $_.Exception
+    }
+}
+
+#check to make sure the query return some results
+if($allSettings -eq $null)
+{
+    Write-Error "An error occurred while querying the database. `nThe query did not return any values. `nPlease enter a new query" -ErrorId E4
+    Exit 1
+}
+
+$includeList = @()
+
+($includeSettingList.Split(", ") | ForEach {
+    $includeList += $_.ToString()
+})
+
+     
+Write-Output "Updating the Settings document"
+try
+{
+    
+
+    #changes the values of the included settings within the original settings document to values from Octopus Variables
+    for($i = 0; $i -lt $includeList.length; $i++)
+    {
+        
+        
+        #checks if the any of the include setting list is in the exclude setting list
+        if($excludeSettingList -notcontains $includeList[$i])
+        {
+            
+            
+            $octopusVariableList = $OctopusParameters.GetEnumerator()
+            
+            #loops through the variable list to find the corresponding value to the settings variable
+            foreach($varKey in $octopusVariableList)
+            {
+                
+                
+                $newSettingVar = $includeList[$i].ToString()
+                
+                $newSettingVar = "Property_$newSettingVar"
+                
+                #sets the setting variable to the correct variable in octopus
+                if($varKey.Key -eq $newSettingVar)
+                {
+                    
+                    
+
+                    $allSettings.($includeList[$i]) = $varKey.Value 
+
+                }#ends if
+
+            }#ends for each
+
+
+
+        }#ends check if settings in excluded list
+
+
+    }#ends for
+}#ends try
+catch
+{
+    Write-Error "An error occurred while trying to find the Setting Variables." -ErrorId E4
+    Exit 1
+}
+
+
+Write-Output "Update complete"
+
+Write-Output "`n-----------------------------"
+
+#--------------------------------------------------------------------
+#set update metadata information
+
+Write-Output "Updating the Metadata of the document"
+
+$metadata = @{}
+
+$metadataList = @()
+
+($includeMetadataList.Split(", ") | Foreach {
+    $metadataList += $_.ToString()
+})
+
+
+try
+{
+    for($i = 0; $i -lt $metadataList.length; $i++)
+    {
+    
+        if($excludeMetadataList -notcontains $metadataList[$i])
+        {
+        
+            $octopusVariableList = $OctopusParameters.GetEnumerator()
+        
+            foreach($varKey in $octopusVariableList)
+            {
+                
+                $newMetadataVar = $metadataList[$i]
+                
+                $newMetadataVar = "Property_$newMetadataVar"
+
+                if($varKey.Key -eq $newMetadataVar)
+                {
+                    
+                    $temp = $metadataList[$i].ToString()
+                    
+                    $metadata.Add("$temp", $varKey.Value)
+                    
+                    
+                }
+            
+            }#ends foreach
+
+        }#ends if
+
+    }#Ends for 
+}#ends try
+catch
+{
+    Write-Error "An error occurred while trying to find the Metadata Variables." -ErrorId E4
+    Exit 1
+}
+
+
+Write-Output "Metadata update complete"
+
+
+
+#--------------------------------------------------------------------
+#converting settings to a JSON document
+
+Write-Output "Converting settings to a JSON document"
+
+#Converts allSettings to JSON so it can be added to RavenDB
+if ($allSettingsJSON -eq $null) 
+{
+    $allSettingsJSON = ConvertTo-Json -InputObject $allSettings
+}
+
+
+
+Write-Output "`n-------------------------`n"
+
+#--------------------------------------------------------------------
+#inserting settings document
+
+Write-Output "Restoring Document: $ravenDatabaseName . Inserting the new settings document to the database"
+
+#URL to put the JSON document
+$putSettingsURI = "$ravenDatabaseURL/databases/$ravenDatabaseName/docs/$ravenDocumentName"
+
+#Puts the settings and metadata in the specified RavenDB
+try
+{
+
+    Invoke-RestMethod -Uri $putSettingsURI -Headers $metadata -Body $allSettingsJSON -Method Put
+        
+    Write-Output "New settings have been successfully added to the database"
+}
+catch
+{
+    Write-Error "An error occurred while inserting the new settings document to the database" -ErrorId E4
+} 
+
diff --git a/src/step-templates/raygun-api-register-deployment/metadata.json b/src/step-templates/raygun-api-register-deployment/metadata.json
new file mode 100644
index 000000000..4bf5b3e3c
--- /dev/null
+++ b/src/step-templates/raygun-api-register-deployment/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "bb7de751-edba-4c5f-9845-1bd1b26f6b62",
+  "Name": "Raygun API - Register Deployment",
+  "Description": "Notifies [Raygun](https://raygun.com) of a deployment using their [Deployments API](https://raygun.com/documentation/product-guides/deployment-tracking/powershell/).\nSends the release number, deployer, release notes from the Octopus deployment.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "0dd429d3-28f6-46b8-8fb7-e2ceb9124c15",
+      "Name": "Raygun.ApiKey",
+      "Label": "Api Key",
+      "HelpText": "Raygun Application's ApiKey (the same one you use to set Raygun up within your app)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "22d41dfb-f8f3-479d-8e72-08f456529f04",
+      "Name": "Raygun.PersonalAccessToken",
+      "Label": "Personal Access Token",
+      "HelpText": "Personal Access Token to use from your [Raygun User Settings page](https://app.raygun.io/user).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-04-09T08:20:04.0750000Z",
+    "OctopusVersion": "2024.2.4248",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "benjimac93",
+  "Category": "raygun"
+}
diff --git a/src/step-templates/raygun-api-register-deployment/scriptbody.ps1 b/src/step-templates/raygun-api-register-deployment/scriptbody.ps1
new file mode 100644
index 000000000..7415d8c17
--- /dev/null
+++ b/src/step-templates/raygun-api-register-deployment/scriptbody.ps1
@@ -0,0 +1,79 @@
+Function Get-Parameter($Name, [switch]$Required, $Default, [switch]$FailOnValidate) {
+    $result = $null
+    $errMessage = [string]::Empty
+
+    If ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+        Write-Host "Octopus paramter value for $Name : $result"
+    }
+
+    If ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    If ($result -eq $null) {
+        If ($Required) {
+            $errMessage = "Missing parameter value $Name"
+        } Else {
+            $result = $Default
+        }
+    } 
+
+    If (-Not [string]::IsNullOrEmpty($errMessage)) {
+        If ($FailOnValidate) {
+            Throw $errMessage
+        } Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    return $result
+}
+
+& {
+    Write-Host "Start AddInRaygun"
+
+    $deploymentId = [string] (Get-Parameter "Octopus.Release.Number" $true [string]::Empty $true)
+    $ownerName = [string] (Get-Parameter "Octopus.Deployment.CreatedBy.DisplayName" $true [string]::Empty $true)
+    $emailAddress = [string] (Get-Parameter "Octopus.Deployment.CreatedBy.EmailAddress" $false [string]::Empty $true)
+    $releaseNotes = [string] (Get-Parameter "Octopus.Release.Notes" $false [string]::Empty $true)
+    $personAccessToken = [string] (Get-Parameter "Raygun.PersonalAccessToken" $true [string]::Empty $true)
+    $apiKey = [string] (Get-Parameter "Raygun.ApiKey" $true [string]::Empty $true)
+    $deployedAt = Get-Date -Format "o"
+
+    Write-Host "Registering deployment with Raygun"
+
+    # Some older API keys may contain URL reserved characters (eg '/', '=', '+') and will need to be encoded.
+    # If your API key does not contain any reserved characters you can exclude the following line.
+    $urlEncodedApiKey = [System.Uri]::EscapeDataString($apiKey);
+
+    $url = "https://api.raygun.com/v3/applications/api-key/" + $urlEncodedApiKey + "/deployments"
+
+    $headers = @{
+        Authorization="Bearer " + $personAccessToken
+    }
+
+    $payload = @{
+        version = $deploymentId
+        ownerName = $ownerName
+        emailAddress = $emailAddress
+        comment = $releaseNotes
+        deployedAt = $deployedAt
+    }
+
+    $payloadJson = $payload | ConvertTo-Json 
+
+
+    try {
+        Invoke-RestMethod -Uri $url -Body $payloadJson -Method Post -Headers $headers -ContentType "application/json" -AllowInsecureRedirect
+        Write-Host "Deployment registered with Raygun"
+    } catch {
+        Write-Host "Tried to send a deployment to " $url " with payload " $payloadJson
+        Write-Error "Error received when registering deployment with Raygun: $_"
+    }
+
+    Write-Host "End AddInRaygun"
+}
\ No newline at end of file
diff --git a/src/step-templates/re-prioritize-octopus-deploy-tasks/metadata.json b/src/step-templates/re-prioritize-octopus-deploy-tasks/metadata.json
new file mode 100644
index 000000000..53cbe4db4
--- /dev/null
+++ b/src/step-templates/re-prioritize-octopus-deploy-tasks/metadata.json
@@ -0,0 +1,115 @@
+{
+  "Id": "c9d5c96f-f731-4e6c-b9b3-d93f84a9bb74",
+  "Name": "Re-prioritize Octopus Deploy Tasks",
+  "Description": "This step will allow you to re-prioritize tasks in the Octopus Deploy queue.  \n\nIt will check the task queue for pending tasks and if it finds a task that should be prioritized based on the matching criteria it will cancel any tasks before it to move it to the top of the queue.  \n\nThe matching logic supports:\n- Task Id - you provide a list of task ids and it will move those to the top of the queue\n- Space, Environment, Project, Tenant - you provide a list of spaces, environments, projects, or tenants and the step will find matching deployments or runbook runs and move them to the top of the queue.  \n\nHow it works:\n1) The step template pulls the list of unscheduled queued tasks (if you schedule a task to run at 7 PM it will exclude that from the check).\n2) Attempts to find matching tasks based on task id or space/environment/project/tenant criteria.\n3) If it finds one or more matching tasks it checks the position of those tasks in the queue.  Any tasks ahead of them are cancelled.\n4) if the step template cancels any deployments or runbook runs it will resubmit them using the same criteria as before (this moves them to the bottom of the queue).\n\n**Important** It will not cancel running tasks.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "f7357d18-33c3-4f1e-883d-613e13e098cd",
+      "Name": "TaskPriority.Api.Key",
+      "Label": "Octopus API Key",
+      "HelpText": "*Required* \n\n\nThe API key of the user authorized to cancel tasks and resubmit them.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "82ef3721-aef1-4624-a306-9f20ad2ef64d",
+      "Name": "TaskPriority.Octopus.Url",
+      "Label": "Octopus URL",
+      "HelpText": "*Required*\n\nThe URL of the Octopus Deploy instance you wish to query.  \n\nPlease only pass in the base URL, eg `https://samples.octopus.app`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b2e14858-7309-46ab-b624-ec811ad95618",
+      "Name": "TaskPriority.TaskId.List",
+      "Label": "Task Id List",
+      "HelpText": "A comma-separated or new-line separated list of task ids to move to the top of the queue.\n\n**IMPORTANT** when this is provided all other matching logic is ignored, including the task type and the space list.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "2434bd05-791b-45e9-9ffa-7fbde9524e5f",
+      "Name": "TaskPriority.Space.List",
+      "Label": "Space List",
+      "HelpText": "List of spaces to monitor.  Separate spaces by using a new line.\n\nWhen left empty this step will query all spaces.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "87a7ec4a-128b-4b74-8f6b-ea66c9261dec",
+      "Name": "TaskPriority.Environment.List",
+      "Label": "Environment List",
+      "HelpText": "List of environment names to monitor for.  Separate environment names by a new line.\n\nOptions:\n- `EnvironmentName` - looks for matching environment names in all spaces in the space list.\n- `EnvironmentName::SpaceName` - looks for the environment name in the specified space.  Use this when the same environment appears in multiple spaces and you want to filter to only apply to an item in a specific space.\n\nThe default `Production`.  \n\nWhen not specifying a value for the Task Id parameter; a entry must appear in the Environment List, Project List, OR Tenant List.  Otherwise, this step will not do anything.",
+      "DefaultValue": "Production",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "b94bd70b-6554-4ea5-86f1-fbfb1827dfc5",
+      "Name": "TaskPriority.Project.List",
+      "Label": "Project List",
+      "HelpText": "List of projects to monitor.  Separate project names by a new line.\n\nOptions:\n- `ProjectName` - looks for the specified project name in all spaces in the space list.\n- `ProjectName::SpaceName` - looks for that project in a specific space.  Use this when the same project appears in multiple spaces and you want to filter to only apply to an item in a specific space.\n\nWhen left empty it will not look for any projects.\n\nWhen not specifying a value for the Task Id parameter; a entry must appear in the Environment List, Project List, OR Tenant List.  Otherwise, this step will not do anything.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "0958b7b3-94b6-4a3e-b78c-f2436950728a",
+      "Name": "TaskPriority.Tenant.List",
+      "Label": "Tenant List",
+      "HelpText": "List of tenant names to monitor.  Separate tenant names by a new line.\n\nOptions:\n- `TenantName` - looks for the tenant name in any spaces in the space list\n- `TenantName::SpaceName` - looks for the tenant name in the specified space.  Use this when the same tenant appears in multiple spaces and you want to filter to only apply to an item in a specific space.\n\nWhen left empty it will not filter anything by the tenant.\n\nWhen not specifying a value for the Task Id parameter; a entry must appear in the Environment List, Project List, OR Tenant List.  Otherwise, this step will not do anything.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "a6382a5c-df7f-4dee-bdc9-df89459e1d14",
+      "Name": "TaskPriority.Task.Match",
+      "Label": "Task Match",
+      "HelpText": "Indicates how the matching will occur.\n\nOptions:\n- `And` - means the deployment has to be for the Environment AND the project AND the tenant (when they are specified)\n- `Or` - means the deployment can be for Environment OR the project OR the tenant\n\nDefault is `Or`\n",
+      "DefaultValue": "Or",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Or|Or\nAnd|And"
+      }
+    },
+    {
+      "Id": "1e8d3fc8-36b5-4c84-bfe5-4bfc5b4f5869",
+      "Name": "TaskPriority.Task.Type",
+      "Label": "Task Type",
+      "HelpText": "The type of task to move to the top of the queue.\n\nOptions:\n- `Deploy` - monitors deployments only\n- `RunbookRun` - monitors runbook runs only\n- `Both` - monitors both deployments and runbooks\n\nDefaults to `Both`",
+      "DefaultValue": "Both",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Both|Both\nDeploy|Deploy\nRunbookRun|RunbookRun"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-02-22T15:40:24.6040000Z",
+    "OctopusVersion": "2021.1.0-ci1022",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "octobob",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/re-prioritize-octopus-deploy-tasks/scriptbody.ps1 b/src/step-templates/re-prioritize-octopus-deploy-tasks/scriptbody.ps1
new file mode 100644
index 000000000..41435ed80
--- /dev/null
+++ b/src/step-templates/re-prioritize-octopus-deploy-tasks/scriptbody.ps1
@@ -0,0 +1,621 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+$octopusApiKey = $OctopusParameters["TaskPriority.Api.Key"]
+$spaceList = $OctopusParameters["TaskPriority.Space.List"]
+$environmentList = $OctopusParameters["TaskPriority.Environment.List"]
+$projectList = $OctopusParameters["TaskPriority.Project.List"]
+$tenantList = $OctopusParameters["TaskPriority.Tenant.List"]
+$matchType =  $OctopusParameters["TaskPriority.Match.Type"]
+$taskType = $OctopusParameters["TaskPriority.Task.Type"]
+$octopusUrl = $OctopusParameters["TaskPriority.Octopus.Url"]
+$taskIdList = $OctopusParameters["TaskPriority.TaskId.List"]
+
+$cachedResults = @{}
+
+function Write-OctopusVerbose
+{
+    param($message)
+    
+    Write-Verbose $message  
+}
+
+function Write-OctopusInformation
+{
+    param($message)
+    
+    Write-Host $message  
+}
+
+function Write-OctopusSuccess
+{
+    param($message)
+
+    Write-Highlight $message 
+}
+
+function Write-OctopusWarning
+{
+    param($message)
+
+    Write-Warning "$message" 
+}
+
+function Write-OctopusCritical
+{
+    param ($message)
+
+    Write-Error "$message" 
+}
+
+function Invoke-OctopusApi
+{
+    param
+    (
+        $octopusUrl,
+        $endPoint,
+        $spaceId,
+        $apiKey,
+        $method,
+        $item,
+        $ignoreCache     
+    )
+
+    $octopusUrlToUse = $OctopusUrl
+    if ($OctopusUrl.EndsWith("/"))
+    {
+        $octopusUrlToUse = $OctopusUrl.Substring(0, $OctopusUrl.Length - 1)
+    }
+
+    if ([string]::IsNullOrWhiteSpace($SpaceId))
+    {
+        $url = "$octopusUrlToUse/api/$EndPoint"
+    }
+    else
+    {
+        $url = "$octopusUrlToUse/api/$spaceId/$EndPoint"    
+    }  
+
+    try
+    {        
+        if ($null -ne $item)
+        {
+            $body = $item | ConvertTo-Json -Depth 10
+            Write-OctopusVerbose $body
+
+            Write-OctopusInformation "Invoking $method $url"
+            return Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -Body $body -ContentType 'application/json; charset=utf-8' 
+        }
+
+        if (($null -eq $ignoreCache -or $ignoreCache -eq $false) -and $method.ToUpper().Trim() -eq "GET")
+        {
+            Write-OctopusVerbose "Checking to see if $url is already in the cache"
+            if ($cachedResults.ContainsKey($url) -eq $true)
+            {
+                Write-OctopusVerbose "$url is already in the cache, returning the result"
+                return $cachedResults[$url]
+            }
+        }
+        else
+        {
+            Write-OctopusVerbose "Ignoring cache."    
+        }
+
+        Write-OctopusVerbose "No data to post or put, calling bog standard invoke-restmethod for $url"
+        $result = Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -ContentType 'application/json; charset=utf-8'
+
+        if ($cachedResults.ContainsKey($url) -eq $true)
+        {
+            $cachedResults.Remove($url)
+        }
+        Write-OctopusVerbose "Adding $url to the cache"
+        $cachedResults.add($url, $result)
+
+        return $result
+
+               
+    }
+    catch
+    {
+        if ($null -ne $_.Exception.Response)
+        {
+            if ($_.Exception.Response.StatusCode -eq 401)
+            {
+                Write-OctopusCritical "Unauthorized error returned from $url, please verify API key and try again"
+            }
+            elseif ($_.Exception.Response.statusCode -eq 403)
+            {
+                Write-OctopusCritical "Forbidden error returned from $url, please verify API key and try again"
+            }
+            else
+            {                
+                Write-OctopusVerbose -Message "Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )"
+            }            
+        }
+        else
+        {
+            Write-OctopusVerbose $_.Exception
+        }
+    }
+
+    Throw "There was an error calling the Octopus API please check the log for more details"
+}
+
+function Get-FilteredOctopusItem
+{
+    param(
+        $itemList,
+        $itemName
+    )
+
+    if ($itemList.Items.Count -eq 0)
+    {
+        Write-OctopusCritical "Unable to find $itemName.  Exiting with an exit code of 1."
+        return $null
+    }  
+
+    $item = $itemList.Items | Where-Object { $_.Name -eq $itemName}      
+
+    if ($null -eq $item)
+    {
+        Write-OctopusCritical "Unable to find $itemName.  Exiting with an exit code of 1."
+        return $null
+    }
+
+    return $item
+}
+
+function Get-OctopusItemByName
+{
+    param(
+        $itemName,
+        $itemType,
+        $endpoint,        
+        $spaceId,
+        $octopusUrl,
+        $octopusApiKey
+    )
+
+    if ([string]::IsNullOrWhiteSpace($itemName))
+    {
+        return $null
+    }
+
+    Write-OctopusInformation "Attempting to find $itemType with the name of $itemName"
+    
+    $itemList = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "$($endPoint)?partialName=$([uri]::EscapeDataString($itemName))&skip=0&take=100" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"    
+    $item = Get-FilteredOctopusItem -itemList $itemList -itemName $itemName
+
+    if ($null -eq $item)
+    {
+        Write-OctopusInformation "Unable to find $itemType $itemName"    
+        return $null
+    }
+    
+    Write-OctopusInformation "Successfully found $itemType $itemName with an id of $($item.Id)"
+
+    return $item
+}
+
+function Get-SplitItemIntoArray
+{
+    param (
+        $itemToSplit
+    )
+
+    if ($itemToSplit -like "*`n*")
+    {
+        return @(($itemToSplit -Split "`n").Trim())
+    }
+
+    if ($itemToSplit -like "*,*")
+    {
+        return @(($itemToSplit -Split ",").Trim())
+    }
+
+    return @($itemToSplit)
+}
+
+function Get-OctopusSpaceList
+{
+	param(
+    	$spaceList,        
+        $octopusUrl,
+        $octopusApiKey    
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($spaceList))
+    {
+        $rawOctopusSpaceList = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "spaces?skip=0&take=10000" -spaceId $null -apiKey $octopusApiKey -method "GET"    
+
+        return $rawOctopusSpaceList.Items
+    }
+    
+    $spaceListSplit = @(Get-SplitItemIntoArray -itemToSplit $spaceList)
+    $returnList = @()
+
+    foreach ($spaceName in $spaceListSplit)
+    {
+        if ([string]::IsNullOrWhiteSpace($spaceName) -eq $false)
+        {
+            $octopusSpace = Get-OctopusItemByName -itemName $spaceName -itemType "Space" -endpoint "spaces" -spaceId $null -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+
+            if ($null -ne $octopusSpace)
+            {
+                $returnList += $octopusSpace
+            }            
+        }        
+    }    
+    
+    return $returnList
+}
+
+function Get-OctopusItemList
+{
+    param(
+        $octopusSpaceList,
+        $itemList,
+        $itemType,
+        $endpoint,
+        $octopusApiKey,
+        $octopusUrl
+    )
+
+    if ([string]::IsNullOrWhiteSpace($itemList))
+    {
+        Write-Host "The list for $itemType was empty"        
+        return @()
+    }
+
+    $itemListSplit = @(Get-SplitItemIntoArray -itemToSplit $itemList)
+    $returnList = @()
+    
+    foreach ($itemName in $itemListSplit)
+    {
+        $splitItem = $itemName -split "::"
+        if ($splitItem.Count -gt 1 -and [string]::IsNullOrWhiteSpace($splitItem[1]) -eq $false)
+        {
+            Write-OctopusInformation "The item $itemName included a space name, only pulling back the information for that space"
+            $spaceId = $octopusSpaceList | Where-Object { $_.Name.ToLower().Trim() -eq $splitItem[1].ToLower().Trim() }
+
+            if ($null -eq $spaceId)
+            {
+                Write-OctopusInformation "The space name $($splitItem[1]) was not included in the space filter.  Skipping this option."
+                continue
+            }
+
+            $octopusItem = Get-OctopusItemByName -itemName $splitItem[0] -itemType $itemType -endpoint $endpoint -spaceId $spaceId -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+
+            if ($null -ne $octopusItem)
+            {
+                $returnList += $octopusItem
+            }
+
+            continue
+        }
+
+        foreach ($space in $octopusSpaceList)
+        {
+            $octopusItem = Get-OctopusItemByName -itemName $itemName -itemType $itemType -endpoint $endpoint -spaceId $space.Id -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+
+            if ($null -ne $octopusItem)
+            {
+                $returnList += $octopusItem
+            }
+        }
+    }
+
+    return $returnList
+}
+
+function Get-QueuedOctopusTasks
+{
+    param (
+        $octopusApiKey,
+        $octopusUrl
+    )
+
+    $queuedTasks = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint "Tasks?states=Queued&skip=0&take=1000" -spaceId $null -apiKey $octopusApiKey -method "GET" -ignoreCache $true
+
+    $returnList = @()
+    $currentTime = $(Get-Date).ToUniversalTime()
+
+    Write-OctopusInformation "Looping through the found items in reverse order because the Queue is FIFO but the return object is ordered by date DESC"
+
+    for($i = $queuedTasks.Items.Count - 1; $i -ge 0; $i--)    
+    {
+        $task = $queuedTasks.Items[$i]
+        
+        if ($null -ne $task.QueueTime)
+        {
+            $compareTime = [DateTime]::Parse($task.QueueTime)
+            $compareTime = $compareTime.ToUniversalTime()
+
+            Write-OctopusVerbose "Checking to see if $compareTime is ahead of the $currentTime"
+            if ($compareTime -gt $currentTime)
+            {
+                Write-OctopusInformation "The queued task $($task.Id) has a queue time $($task.QueueTime) in the future.  That means this is a scheduled deployment.  Skipping this task."
+                continue
+            }
+        }
+
+        if ($null -ne $task.StartTime)
+        {
+            Write-OctopusInformation "The queued task $($task.Id) has a start time, meaning it was picked up, work was done, then it was added back to the queue.  Skipping."
+            continue
+        }
+
+        if ($true -eq $task.HasPendingInterruptions)
+        {
+            Write-OctopusInformation "The task $($task.Id) has pending interruptions, this means the deployment has started and is awaiting someone to respond.  Skipping this task."
+            continue
+        }
+
+        $returnList += $task
+    }
+
+    return $returnList
+}
+
+function Test-OctopusListHasId
+{
+    param (
+        $octopusList,
+        $octopusId
+    )
+
+    $findItem = $octopusList | Where-Object { $_.Id -eq $octopusId }
+
+    if ($null -eq $findItem)
+    {
+        return $false
+    }
+
+    return $true
+}
+
+function Get-RunbookRunDetailsFromTask
+{
+    param (
+        $runbookTask,
+        $octopusUrl,
+        $octopusApiKey
+    )
+
+    return Invoke-OctopusApi -endPoint "runbookRuns/$($runbookTask.Arguments.RunbookRunId)" -octopusUrl $octopusUrl -spaceId $runbookTask.SpaceId -apiKey $octopusApiKey -method "GET"
+}
+
+function Get-DeploymentDetailsFromTask
+{
+    param (
+        $deploymentTask,
+        $octopusUrl,
+        $octopusApiKey
+    )
+
+    return Invoke-OctopusApi -endPoint "deployments/$($deploymentTask.Arguments.DeploymentId)" -octopusUrl $octopusUrl -spaceId $deploymentTask.SpaceId -apiKey $octopusApiKey -method "GET"
+}
+
+Write-OctopusInformation "Space List: $spaceList"
+Write-OctopusInformation "Environment List: $environmentList"
+Write-OctopusInformation "Project List: $projectList"
+Write-OctopusInformation "Tenant List: $tenantList"
+Write-OctopusInformation "Octopus URL: $octopusUrl"
+Write-OctopusInformation "Match Type: $matchType"
+Write-OctopusInformation "Task Id List: $taskIdList"
+
+$queuedTasks = @(Get-QueuedOctopusTasks -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)
+
+if ($queuedTasks.Length -eq 0)
+{
+    Write-OctopusSuccess "No queued tasks found that can block a deployment.  Exiting."
+    exit 0
+}
+
+$octopusInformation = @{
+    TaskIdList = @(Get-SplitItemIntoArray -itemToSplit $taskIdList)
+}
+
+if ([string]::IsNullOrWhiteSpace($taskIdList))
+{
+    $octopusInformation.SpaceList = @(Get-OctopusSpaceList -spaceList $spaceList -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey)
+
+    $octopusInformation.EnvironmentList = @(Get-OctopusItemList -octopusSpaceList $octopusInformation.SpaceList -itemList $environmentList -itemType "Environment" -endpoint "environments" -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)
+    $octopusInformation.HasEnvironmentFilter = $octopusInformation.EnvironmentList.Count -gt 0
+
+    $octopusInformation.ProjectList = @(Get-OctopusItemList -octopusSpaceList $octopusInformation.SpaceList -itemList $projectList -itemType "Project" -endpoint "projects" -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)
+    $octopusInformation.HasProjectFilter = $octopusInformation.ProjectList.Count -gt 0
+
+    $octopusInformation.TenantList = @(Get-OctopusItemList -octopusSpaceList $octopusInformation.SpaceList -itemList $tenantList -itemType "Tenant" -endpoint "tenants" -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)
+    $octopusInformation.HasTenantFilter = $octopusInformation.TenantList.Count -gt 0
+
+    if ($octopusInformation.EnvironmentList.Count -eq 0 -and $octopusInformation.ProjectList.Count -eq 0 -and $octopusInformation.TenantList.Count -eq 0)
+    {
+        Write-OctopusCritical "No environments OR projects OR tenants provided to filter on.  You must provide at least one environment OR project OR tenant."
+        exit 1
+    }
+
+    Write-OctopusSuccess "Going to look for any $taskType in the spaces ($(($octopusInformation.SpaceList | Select-Object -ExpandProperty Id) -join ", ")) matching "
+    Write-OctopusSuccess "Environments ($(($octopusInformation.EnvironmentList | Select-Object -ExpandProperty Id) -join " OR ")) $matchType"
+    Write-OctopusSuccess "Projects ($(($octopusInformation.ProjectList | Select-Object -ExpandProperty Id) -join " OR ")) $matchType"
+    Write-OctopusSuccess "Tenants ($(($octopusInformation.TenantList | Select-Object -ExpandProperty Id) -join " OR "))"
+}
+else
+{
+    Write-OctopusSuccess "Going to look for the tasks ($($octopusInformation.TaskIdList -join ", "))"    
+}
+
+$matchingTasks = @()
+
+Write-OctopusInformation "Attempting to find any matching tasks based on the filtering criteria."
+foreach ($task in $queuedTasks)
+{
+    if ($octopusInformation.TaskIdList -contains $task.Id)
+    {
+        Write-OctopusInformation "The task $($task.Id) was found in the list of task ids.  Adding to list."
+        $matchingTasks += $task
+
+        continue
+    }
+
+    if ($task.Name -ne "Deploy" -and $task.Name -ne "RunbookRun")
+    {
+        Write-Information "The task not a deployment or a runbook run.  It is $($task.Description).  Moving onto next task."
+        continue
+    }
+
+    if ($taskType -ne "Both" -and $taskType -ne $task.Name)
+    {
+        Write-Information "You have selected to filter on $taskType only and this task is a $($task.Name).  Moving onto the next task."
+        continue
+    }
+
+    if ((Test-OctopusListHasId -octopusList $octopusInformation.SpaceList -octopusId $task.SpaceId) -eq $false)
+    {
+        Write-Information "The task is not for any spaces specified.  Moving onto the next task."
+        continue
+    }
+
+    if ($task.Name -eq "RunbookRun")
+    {
+        $itemDetails = Get-RunbookRunDetailsFromTask -runbookTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+    }
+    else
+    {
+        $itemDetails = Get-DeploymentDetailsFromTask -deploymentTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+    }        
+
+    $matchesEnvironmentFilter = $octopusInformation.HasEnvironmentFilter -eq $true -and (Test-OctopusListHasId -octopusList $octopusInformation.EnvironmentList -octopusId $itemDetails.EnvironmentId)
+    Write-OctopusInformation "$($task.Name) $($itemDetails.Id) Matches Environment Filter $matchesEnvironmentFilter"
+
+    $matchesProjectFilter = $octopusInformation.HasProjectFilter -eq $true -and (Test-OctopusListHasId -octopusList $octopusInformation.ProjectList -octopusId $itemDetails.ProjectId)
+    Write-OctopusInformation "$($task.Name) $($itemDetails.Id) Matches Project Filter $matchesProjectFilter"
+
+    $matchesTenantFilter = $octopusInformation.HasTenantFilter -eq $true -and $null -ne $itemDetails.TenantId -and (Test-OctopusListHasId -octopusList $octopusInformation.TenantList -octopusId $itemDetails.TenantId)
+    Write-OctopusInformation "$($task.Name) $($itemDetails.Id) Matches Tenant Filter $matchesTenantFilter"
+
+    if ($matchType -eq "Or" -and ($matchesTenantFilter -eq $true -or $matchesProjectFilter -eq $true -or $matchesEnvironmentFilter -eq $true))
+    {
+        Write-OctopusInformation "The match type was OR and one of the filters matched, adding this task to the matching list"
+        $matchingTasks += $task
+
+        continue
+    }
+
+    Write-OctopusInformation "The match type is AND, checking to see if the task matches all the filters"
+
+    if ($octopusInformation.HasEnvironmentFilter -eq $true -and $matchesEnvironmentFilter -eq $false)
+    {
+        Write-OctopusInformation "The environment filter was provided and the environment $($itemDetails.EnvironmentId) didn't match any environments.  Moving onto next task."
+        continue
+    }
+
+    if ($octopusInformation.HasProjectFilter -eq $true -and $matchesProjectFilter -eq $false)
+    {
+        Write-OctopusInformation "The project filter was provided and the project $($itemDetails.ProjectId) didn't match any projects.  Moving onto next task."
+        continue
+    }
+
+    if ($octopusInformation.HasTenantFilter -eq $true -and $matchesTenantFilter -eq $false)
+    {
+        Write-OctopusInformation "The tenant filter was provided and the tenant $($itemDetails.TenantId) didn't match any tenants.  Moving onto next task."
+        continue
+    }
+
+    $matchingTasks += $task
+}
+
+if ($matchingTasks.Count -eq 0)
+{
+    Write-OctopusSuccess "No matching tasks found, exiting."
+    exit 0
+}
+
+Write-OctopusSuccess "Matching tasks found, checking where they are in the queue."
+
+$matchingTaskCounter = 0
+
+Write-OctopusInformation "Looping through all the queued tasks again to find which tasks to cancel."
+foreach ($task in $queuedTasks)
+{        
+    if ((Test-OctopusListHasId -octopusList $matchingTasks -octopusId $task.Id))
+    {
+        $matchingTaskCounter += 1
+        Write-OctopusInformation "The task $($task.Id) is one we want to move to the top of queue, leaving as is."
+
+        if ($matchingTaskCounter -eq $matchingTasks.Count)
+        {
+            Write-OctopusSuccess "All the matching tasks we want to move to the top of the queue have been found, exiting"
+            break
+        }
+
+        continue
+    }
+
+    $updatedTask = Invoke-OctopusApi -endPoint "tasks/$($task.Id)" -octopusUrl $octopusUrl -spaceId $null -apiKey $octopusApiKey -method "GET" -ignoreCache $true
+
+    if ($updatedTask.HasBeenPickedUpByProcssor -eq $true)
+    {
+        Write-OctopusInformation "The task $($task.Id) has already been picked up and started processing, moving on."
+        continue
+    }
+
+    $canceledTaskResult = Invoke-OctopusApi -endPoint "tasks/$($task.Id)/cancel" -octopusUrl $octopusUrl -spaceId $null -apiKey $octopusApiKey -method "POST" -ignoreCache $true
+
+    Write-OctopusSuccess "Task $($canceledTaskResult.Description) has been successfully cancelled" 
+
+    if ($task.Name -eq "Deploy")
+    {
+        Write-OctopusInformation "Task $($task.Id) is a deployment, setting up a redeploy."
+
+        $deploymentInfo = Get-DeploymentDetailsFromTask -deploymentTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+
+        $bodyRaw = @{
+            EnvironmentId = $deploymentInfo.EnvironmentId
+            ExcludedMachineIds = $deploymentInfo.ExcludedMachineIds
+            ForcePackageDownload = $deploymentInfo.ForcePackageDownload
+            ForcePackageRedeployment = $deploymentInfo.ForcePackageRedeployment
+            FormValues = $deploymentInfo.FormValues
+            QueueTime = $null
+            QueueTimeExpiry = $null
+            ReleaseId = $deploymentInfo.ReleaseId
+            SkipActions = $deploymentInfo.SkipActions
+            SpecificMachineIds = $deploymentInfo.SpecificMachineIds
+            TenantId = $deploymentInfo.TenantId
+            UseGuidedFailure = $deploymentInfo.UseGuidedFailure
+        } 
+
+        $newDeployment = Invoke-OctopusApi -endPoint "deployments" -spaceId $task.SpaceId -octopusUrl $octopusUrl -apiKey $octopusApiKey -method "POST" -item $bodyRaw
+
+        Write-OctopusSuccess "$($task.Description) has been successfully resubmitted with the new id $($newDeployment.TaskId)"        
+    }
+
+    if ($task.Name -eq "RunbookRun")
+    {
+        Write-OctopusInformation "Task $($task.Id) is a runbook run, configuring a re-run."
+
+        $runbookInfo = Get-RunbookRunDetailsFromTask -runbookTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey
+
+        $bodyRaw = @{
+            EnvironmentId = $runbookInfo.EnvironmentId
+            ExcludedMachineIds = $runbookInfo.ExcludedMachineIds
+            ForcePackageDownload = $runbookInfo.ForcePackageDownload
+            ForcePackageRedeployment = $runbookInfo.ForcePackageRedeployment
+            FormValues = $runbookInfo.FormValues
+            QueueTime = $null
+            QueueTimeExpiry = $null
+            RunbookId = $runbookInfo.RunbookId
+            SkipActions = $runbookInfo.SkipActions
+            SpecificMachineIds = $runbookInfo.SpecificMachineIds
+            TenantId = $runbookInfo.TenantId
+            UseGuidedFailure = $runbookInfo.UseGuidedFailure
+            FrozenRunbookProcessId = $runbookInfo.FrozenRunbookProcessId
+            RunbookSnapshotId = $runbookInfo.RunbookSnapshotId            
+        } 
+
+        $newDeployment = Invoke-OctopusApi -endPoint "runbookRuns" -spaceId $task.SpaceId -octopusUrl $octopusUrl -apiKey $octopusApiKey -method "POST" -item $bodyRaw
+
+        Write-OctopusSuccess "$($task.Description) has been successfully resubmitted with the new id $($newDeployment.TaskId)" 
+    }
+}
+
+Write-OctopusSuccess "Finished re-prioritizing tasks"
\ No newline at end of file
diff --git a/src/step-templates/readyroll-deploy-database-package/metadata.json b/src/step-templates/readyroll-deploy-database-package/metadata.json
new file mode 100644
index 000000000..fe62d71d4
--- /dev/null
+++ b/src/step-templates/readyroll-deploy-database-package/metadata.json
@@ -0,0 +1,95 @@
+{
+  "Id": "14e87c33-b34a-429f-be2c-e44d3d631649",
+  "Name": "ReadyRoll - Deploy Database Package",
+  "Description": "Deploy database changes packaged with Redgate's [ReadyRoll](http://www.ready-roll.com/). Requires the Microsoft SQL Command Line Utilities 11 or later to be installed on the tentacle.\n\n*Version date: 14th January, 2016*",
+  "ActionType": "Octopus.TentaclePackage",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "536b0ad2-6439-4e6a-aff0-64ba07a33733",
+      "Name": "",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "SelectionMode": "deferred",
+        "PackageParameterName": "PackageName"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Package.DownloadOnTentacle": "False"
+  },
+  "Parameters": [
+    {
+      "Id": "43af2bc5-668d-482f-a23b-1e46189fcd69",
+      "Name": "PackageName",
+      "Label": "Package to deploy",
+      "HelpText": "The package you want to deploy. If using NuGet, this matches the package ID from the NuSpec file in your ReadyRoll project.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "c7d2a8f5-0b33-4b1d-94cd-0f0f11ecf9d1",
+      "Name": "DatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a0c8e52f-e7f2-4859-9769-f749f6705a08",
+      "Name": "DatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database to deploy to. ReadyRoll will create a new database if it does not exist.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8c448c0e-27c8-4572-8a96-0e9dad5c8091",
+      "Name": "UseWindowsAuth",
+      "Label": "Use Windows Authentication",
+      "HelpText": "If you check this field, Windows authentication will be used to connect, using the account that runs the Tentacle service. Otherwise, SQL Server authentication will be used and you will need to specify a username and password below.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "53358be8-b6fb-4dce-b107-a501c5ef5b1e",
+      "Name": "DatabaseUsername",
+      "Label": "Username",
+      "HelpText": "The SQL Server username used to connect to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "60688c6e-db91-4a6f-971f-e52901d7b732",
+      "Name": "DatabasePassword",
+      "Label": "Password",
+      "HelpText": "The SQL Server password used to connect to the database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedBy": "harrisonmeister",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "StepPackageId": "Octopus.TentaclePackage",
+  "$Meta": {
+    "ExportedAt": "2023-11-15T14:12:59.8320000Z",
+    "OctopusVersion": "2024.1.1169",
+    "Type": "ActionTemplate"
+  },
+  "Category": "readyroll"
+}
diff --git a/src/step-templates/redgate-create-database-release-worker-friendly/metadata.json b/src/step-templates/redgate-create-database-release-worker-friendly/metadata.json
new file mode 100644
index 000000000..9eb3f49cf
--- /dev/null
+++ b/src/step-templates/redgate-create-database-release-worker-friendly/metadata.json
@@ -0,0 +1,207 @@
+{
+  "Id": "47d29b57-5bca-4205-ac62-ce10cdf8bab9",
+  "Name": "Redgate - Create Database Release (Worker Friendly)",
+  "Description": "Creates the resources (including the SQL update script) to deploy database changes using Redgate's [SQL Change Automation](https://www.red-gate.com/products/sql-development/sql-change-automation/), and exports them as Octopus artifacts so you can review the changes before deploying.\n\nRequires SQL Change Automation version 3.0.2 or later.\n\n*Version date: 2019-07-26*\n\nThis step template is worker friendly, you can pass in a package reference rather than having to reference a previous step which downloaded the package. This step requires Octopus Deploy **2019.10.0** or higher.",
+  "ActionType": "Octopus.Script",
+  "Author": "octobob",
+  "Version": 4,
+  "Packages": [
+    {
+      "Id": "86e63d39-4d9f-4d9d-a0f6-4d830d37811e",
+      "Name": "DLMAutomation.Package.Name",
+      "PackageId": null,
+      "FeedId": "#{DLMAutomationFeedId}",
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "DLMAutomationPackageName"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "851de66e-5ebd-49f3-ae26-d7e276438313",
+      "Name": "DLMAutomationDeploymentResourcesPath",
+      "Label": "Export path",
+      "HelpText": "The path that the database deployment resources will be exported to.\n\nThis path is used in the \"Redgate - Deploy from Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0d3a301d-dbe3-4e49-a3cd-4d5c8cee8483",
+      "Name": "DLMAutomationPackageName",
+      "Label": "Package",
+      "HelpText": "The name of the package to extract",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "011c4343-85f0-4b10-8789-e8654723f355",
+      "Name": "DLMAutomationDeleteExistingFiles",
+      "Label": "Delete files in export folder",
+      "HelpText": "If the folder that the deployment resources are exported to isn't empty, this step will fail. Select this option to delete any files in the folder.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b3bf1847-5167-4aa6-a559-d72d563569ae",
+      "Name": "DLMAutomationDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dfec97ea-de71-4b80-92cc-406830b278be",
+      "Name": "DLMAutomationDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database that the source schema (the database package) will be compared with to generate the deployment resources. This must be an existing database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cdeee900-0313-4a40-9256-9432ae3d6e7a",
+      "Name": "DLMAutomationDatabaseUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "552ee2df-2581-4061-a406-449b28de6bf6",
+      "Name": "DLMAutomationDatabasePassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "45bfb972-d44b-476b-8988-934bcc56da1f",
+      "Name": "DLMAutomationFilterPath",
+      "Label": "Filter path (optional)",
+      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d867564b-2134-4a41-8c39-b3828e168444",
+      "Name": "DLMAutomationCompareOptions",
+      "Label": "SQL Compare options (optional)",
+      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "26764c18-7f04-4b69-b53e-4c61b1d8eeda",
+      "Name": "DLMAutomationDataCompareOptions",
+      "Label": "SQL Data Compare options (optional)",
+      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](https://documentation.red-gate.com/sca4/deploying-database-changes/automated-deployment-with-sql-source-control-projects/using-comparison-options-with-sql-change-automation-powershell-module-for-sql-source-control-projects).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "53313b06-05ef-4a17-9d65-91ffa17bd3c4",
+      "Name": "DLMAutomationTransactionIsolationLevel",
+      "Label": "Transaction isolation level (optional)",
+      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
+      "DefaultValue": "Serializable",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
+      }
+    },
+    {
+      "Id": "e462b1ae-76f5-400e-b772-c36f36fae241",
+      "Name": "DLMAutomationIgnoreStaticData",
+      "Label": "Ignore static data",
+      "HelpText": "Exclude changes to static data when generating the deployment resources.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "13252389-53ff-4cea-8651-76c9cde85ca5",
+      "Name": "DLMAutomationIncludeIdenticalsInReport",
+      "Label": "Include identical objects in the change report",
+      "HelpText": "By default, the change report only includes added, modified and removed objects. Choose this option to also include identical objects.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "91d18ab6-88bf-4f9f-baec-baf44ec53cf1",
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "61adc6ec-4216-41c8-ab30-dba6cfcd37d0",
+      "Name": "DLMModuleInstallLocation",
+      "Label": "SQL Change Automation Install Location (optional)",
+      "HelpText": "The SQL Change Automation cmdlets will be downloaded from the [PowerShell gallery](https://www.powershellgallery.com/packages/SqlChangeAutomation).  Please specify the folder folder where those packages will be saved to.  It can be relative or absolute.\n\n\nIf this is empty it will default `$Home\\Documents\\WindowsPowerShell\\Modules` which is the [recommended location](https://docs.microsoft.com/en-us/powershell/scripting/developer/module/installing-a-powershell-module?view=powershell-7#where-to-install-modules) from Microsoft.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4844f3e7-1f3b-491f-8dc8-5e2b03c164d5",
+      "Name": "DLMAutomationTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Trust SQL Server Certificate",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "cb2b74bb-9481-4aab-b18f-b032746e3edd",
+      "Name": "DLMAutomationCustomConnectionString",
+      "Label": "Connection String (Optional)",
+      "HelpText": "If set, uses this as the full connection string. Allows for advanced configuration.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedBy": "markgould",
+  "$Meta": {
+    "ExportedAt": "2020-05-01T15:18:51.6850000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-create-database-release-worker-friendly/scriptbody.ps1 b/src/step-templates/redgate-create-database-release-worker-friendly/scriptbody.ps1
new file mode 100644
index 000000000..66152c53c
--- /dev/null
+++ b/src/step-templates/redgate-create-database-release-worker-friendly/scriptbody.ps1
@@ -0,0 +1,381 @@
+#Improve performance by turning off progress bar
+#More details here: https://redgate.uservoice.com/forums/267000-sql-change-automation/suggestions/44882212-improve-performance-invoke-databasebuild-by-re
+$ProgressPreference = "SilentlyContinue"
+
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = "$Home\Documents\WindowsPowerShell\Modules"
+
+if ([string]::IsNullOrWhiteSpace($DLMModuleInstallLocation) -eq $false)
+{
+	if ((Test-Path $DLMModuleInstallLocation -IsValid) -eq $false)
+    {
+    	Write-Error "The path $DLMModuleInstallLocation is not valid, please use a relative or absolute path."
+        exit 1
+    }
+    
+    $ModulesFolder = [System.IO.Path]::GetFullPath($DLMModuleInstallLocation)            
+}
+
+Write-Host "Modules will be installed into $ModulesFolder"
+
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+Write-Host "LocalModules: $LocalModules"
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+Write-Host $env:PSModulePath
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion
+    )    
+
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule) {
+        #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+        Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+        InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+    }
+    elseif (!$requiredVersion) {
+        #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+        $newest = GetHighestInstallableModule $moduleName
+        if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+            Write-Verbose "Updating $moduleName to version $($newest.Version)"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName        
+    }
+    
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet 
+        
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )    
+
+    return Get-Module $moduleName -ListAvailable | 
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} | 
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions | 
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1    
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {	
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+	
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { 
+        $Default
+    } else { 
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion
+
+# Check if SQL Change Automation is installed.	
+$powershellModule = Get-Module -Name SqlChangeAutomation	
+if ($powershellModule -eq $null) { 	
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."	
+}
+
+$currentVersion = $powershellModule.Version	
+$minimumRequiredVersion = [version] '3.0.3'	
+if ($currentVersion -lt $minimumRequiredVersion) { 	
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"	
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+
+# Check the parameters.
+$DLMAutomationCustomConnectionString = Optional -Parameter $DLMAutomationCustomConnectionString
+
+Required -Parameter $DLMAutomationDeploymentResourcesPath -Name 'Export Path'
+Required -Parameter $DLMAutomationDeleteExistingFiles -Name 'Delete files in export folder'
+
+if ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)
+{
+    Required -Parameter $DLMAutomationDatabaseServer -Name 'Target SQL Server instance'
+    Required -Parameter $DLMAutomationDatabaseName -Name 'Target database name'
+}
+
+$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername
+$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword
+$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath
+$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions
+$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions
+$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default 'Serializable'
+$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default 'False'
+$DLMAutomationIncludeIdenticalsInReport = Optional -Parameter $DLMAutomationIncludeIdenticalsInReport -Default 'False'
+$DLMAutomationTrustServerCertificate = [Convert]::ToBoolean($OctopusParameters["DLMAutomationTrustServerCertificate"])
+
+# Constructing the unique export path.
+$projectId = $OctopusParameters["Octopus.Project.Id"]
+$releaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$nugetPackageId = $OctopusParameters["Octopus.Action.Package[DLMAutomation.Package.Name].PackageId"]
+$exportPath =  Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId
+
+# Make sure the directory we're about to create doesn't already exist, and delete any files if requested.
+if ((Test-Path $exportPath) -AND ((Get-ChildItem $exportPath | Measure-Object).Count -ne 0)) {
+    if ($DLMAutomationDeleteExistingFiles -eq 'True') {
+        Write-Host "Deleting all files in $exportPath"
+        rmdir $exportPath -Recurse -Force
+    } else {
+        throw "The export path is not empty: $exportPath.  Select the 'Delete files in export folder' option to overwrite the existing folder contents."
+    }
+}
+
+
+# Create and test connection to the database.
+if ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)
+{
+    $databaseConnection = New-DatabaseConnection -ServerInstance $DLMAutomationDatabaseServer `
+                                                    -Database $DLMAutomationDatabaseName `
+                                                    -Username $DLMAutomationDatabaseUsername `
+                                                    -Password $DLMAutomationDatabasePassword `
+                                                    -TrustServerCertificate $DLMAutomationTrustServerCertificate | Test-DatabaseConnection
+} else {
+    $databaseConnection = New-Object -TypeName RedGate.Versioning.Automation.Compare.SchemaSources.DatabaseConnection `
+                                        -ArgumentList $DLMAutomationCustomConnectionString | Test-DatabaseConnection
+}
+
+$packagePath = $OctopusParameters["Octopus.Action.Package[DLMAutomation.Package.Name].ExtractedPath"]
+
+$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packagePath
+
+# Only allow sqlcmd variables that don't have special characters like spaces, colon or dashes
+$regex = '^[a-zA-Z_][a-zA-Z0-9_]+$'
+$sqlCmdVariables = @{}
+$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {
+	$sqlCmdVariables[$_] = $OctopusParameters[$_]
+}
+
+# Create the deployment resources from the database to the NuGet package
+$releaseParams = @{
+    Target = $databaseConnection
+    Source = $importedBuildArtifact
+    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel
+    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)
+    FilterPath = $DLMAutomationFilterPath
+    SQLCompareOptions = $DLMAutomationCompareOptions
+    IncludeIdenticalsInReport = [bool]::Parse($DLMAutomationIncludeIdenticalsInReport)
+    SqlCmdVariables = $sqlCmdVariables
+}
+
+if($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {
+    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions
+} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {
+    Write-Warning "SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion."
+}
+
+$release = New-DatabaseReleaseArtifact @releaseParams
+
+# Export the deployment resources to disk
+$release | Export-DatabaseReleaseArtifact -Path $exportPath
+
+# Import the changes summary, deployment warnings, and update script as Octopus artifacts, so you can review them.
+function UploadIfExists() {
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$ArtifactPath,
+        [Parameter(Mandatory = $true)]
+        [string]$Name
+    ) 
+    if (Test-Path $ArtifactPath) {
+        New-OctopusArtifact $ArtifactPath -Name $Name
+    }
+}
+
+UploadIfExists -ArtifactPath "$exportPath\Reports\Changes.html" -Name "Changes-$DLMAutomationDatabaseName.html"
+UploadIfExists -ArtifactPath "$exportPath\Reports\Drift.html" -Name "Drift-$DLMAutomationDatabaseName.html"
+UploadIfExists -ArtifactPath "$exportPath\Reports\Warnings.xml" -Name "Warnings-$DLMAutomationDatabaseName.xml"
+UploadIfExists -ArtifactPath "$exportPath\Update.sql" -Name "Update-$DLMAutomationDatabaseName.sql"
+UploadIfExists -ArtifactPath "$exportPath\TargetedDeploymentScript.sql" -Name "TargetedDeploymentScript-$DLMAutomationDatabaseName.sql"
+UploadIfExists -ArtifactPath "$exportPath\DriftRevertScript.sql" -Name "DriftRevertScript-$DLMAutomationDatabaseName.sql"
+
+# Sets a variable if there are changes to deploy. Useful if you want to have steps run only when this is set
+if ($release.UpdateSQL -notlike '*This script is empty because the Target and Source schemas are equivalent*')
+{
+  Set-OctopusVariable -name "ChangesToDeploy" -value "True"
+}
\ No newline at end of file
diff --git a/src/step-templates/redgate-create-database-release/metadata.json b/src/step-templates/redgate-create-database-release/metadata.json
new file mode 100644
index 000000000..6594948c1
--- /dev/null
+++ b/src/step-templates/redgate-create-database-release/metadata.json
@@ -0,0 +1,194 @@
+{
+  "Id": "c20b70dc-69aa-42a1-85db-6d37341b63e3",
+  "Name": "Redgate - Create Database Release",
+  "Description": "Creates the resources (including the SQL update script) to deploy database changes using Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage), and exports them as Octopus artifacts so you can review the changes before deploying.\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
+  "ActionType": "Octopus.Script",
+  "Version": 22,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "DLMAutomationDeploymentResourcesPath",
+      "Label": "Export path",
+      "HelpText": "The path that the database deployment resources will be exported to.\n\nThis path is used in the \"Redgate - Deploy from Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDeleteExistingFiles",
+      "Label": "Delete files in export folder",
+      "HelpText": "If the folder that the deployment resources are exported to isn't empty, this step will fail. Select this option to delete any files in the folder.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationNuGetDbPackageDownloadStepName",
+      "Label": "Database package step",
+      "HelpText": "Select the step in this project which downloads the database package.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database that the source schema (the database package) will be compared with to generate the deployment resources. This must be an existing database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabaseUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabasePassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "DLMAutomationEncrypt",
+      "Label": "Encrypt",
+      "HelpText": "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Specify whether to force SQL Server to skip certificate validation.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationFilterPath",
+      "Label": "Filter path (optional)",
+      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationCompareOptions",
+      "Label": "SQL Compare options (optional)",
+      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDataCompareOptions",
+      "Label": "SQL Data Compare options (optional)",
+      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTransactionIsolationLevel",
+      "Label": "Transaction isolation level (optional)",
+      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
+      "DefaultValue": "Serializable",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
+      }
+    },
+    {
+      "Name": "DLMAutomationIgnoreStaticData",
+      "Label": "Ignore static data",
+      "HelpText": "Exclude changes to static data when generating the deployment resources.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationIncludeIdenticalsInReport",
+      "Label": "Include identical objects in the change report",
+      "HelpText": "By default, the change report only includes added, modified and removed objects. Choose this option to also include identical objects.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "UseInstalledModuleVersion",
+      "Label": "Only use a version of SQL Change Automation that is already installed",
+      "HelpText": "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationModuleInstallationFolder",
+      "Label": "Module Installation Folder (optional)",
+      "HelpText": "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationProxyUrl",
+      "Label": "Proxy URL (optional)",
+      "HelpText": "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-03-19T03:01:37.1100000-07:00",
+  "LastModifiedBy": "support@red-gate.com",
+  "$Meta": {
+    "ExportedAt": "2015-07-17T11:04:21.3480000Z",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-create-database-release/scriptbody.ps1 b/src/step-templates/redgate-create-database-release/scriptbody.ps1
new file mode 100644
index 000000000..413cf3465
--- /dev/null
+++ b/src/step-templates/redgate-create-database-release/scriptbody.ps1
@@ -0,0 +1,419 @@
+function GetModuleInstallationFolder
+{
+    if (ModuleInstallationFolderIsValid)
+    {
+        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)
+    }
+
+    return "$PSScriptRoot\Modules"
+}
+
+function ModuleInstallationFolderIsValid
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))
+    {
+        return $false
+    }
+
+    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;
+}
+
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = GetModuleInstallationFolder
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion,
+        [Parameter(Mandatory = $false)]
+        [bool]$useInstalledVersion
+    )
+
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    if ($useInstalledVersion) {
+        Write-Verbose "Option to use installed version is selected. Skipping update/install using PowerShellGet."
+    }
+    else {
+        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+        if (!$installedModule) {
+            #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+            Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+        }
+        elseif (!$requiredVersion) {
+            #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+            $newest = GetHighestInstallableModule $moduleName
+            if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+                Write-Verbose "Updating $moduleName to version $($newest.Version)"
+                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+            }
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName
+    }
+
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+
+    ConfigureProxyIfVariableSet
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet
+
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+
+    return Get-Module $moduleName -ListAvailable |
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions |
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+function ConfigureProxyIfVariableSet
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)
+    {
+        Write-Debug "Setting DefaultWebProxy to $proxyUrl"
+
+        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)
+        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials
+        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True
+    }
+}
+
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) {
+        $Default
+    } else {
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default 'False'
+$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch
+
+# Check if SQL Change Automation is installed.
+$powershellModule = Get-Module -Name SqlChangeAutomation
+if ($powershellModule -eq $null) {
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."
+}
+
+$currentVersion = $powershellModule.Version
+$minimumRequiredVersion = [version] '3.0.3'
+if ($currentVersion -lt $minimumRequiredVersion) {
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+$minimumRequiredVersionTrustServerCertificate = [version]'4.3.20267'
+
+function AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)
+{
+    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)
+    {
+        return $true
+    }
+    elseif($encryptConnection -or $trustServerCertificate)
+    {
+        Write-Warning "Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion."
+        return $false
+    }
+}
+
+# Check the parameters.
+Required -Parameter $DLMAutomationDeploymentResourcesPath -Name 'Export Path'
+Required -Parameter $DLMAutomationDeleteExistingFiles -Name 'Delete files in export folder'
+Required -Parameter $DLMAutomationNuGetDbPackageDownloadStepName -Name 'Database package step'
+Required -Parameter $DLMAutomationDatabaseServer -Name 'Target SQL Server instance'
+Required -Parameter $DLMAutomationDatabaseName -Name 'Target database name'
+$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername
+$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword
+$DLMAutomationEncrypt = Optional -Parameter $DLMAutomationEncrypt
+$DLMAutomationTrustServerCertificate = Optional -Parameter $DLMAutomationTrustServerCertificate
+$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath
+$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions
+$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions
+$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default 'Serializable'
+$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default 'False'
+$DLMAutomationIncludeIdenticalsInReport = Optional -Parameter $DLMAutomationIncludeIdenticalsInReport -Default 'False'
+$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder
+$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl
+
+# Get the NuGet package installation directory path.
+$packagePath = $OctopusParameters["Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Output.Package.InstallationDirectoryPath"]
+if($packagePath -eq $null) {
+    throw "The 'Database package download step' is not a 'Deploy a NuGet package' step: '$DLMAutomationNuGetDbPackageDownloadStepName'"
+}
+
+# Constructing the unique export path.
+$projectId = $OctopusParameters["Octopus.Project.Id"]
+$releaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$nugetPackageId = $OctopusParameters["Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Package.NuGetPackageId"]
+$exportPath = Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId
+
+# Make sure the directory we're about to create doesn't already exist, and delete any files if requested.
+if ((Test-Path $exportPath) -AND ((Get-ChildItem $exportPath | Measure-Object).Count -ne 0)) {
+    if ($DLMAutomationDeleteExistingFiles -eq 'True') {
+        Write-Host "Deleting all files in $exportPath"
+        rmdir $exportPath -Recurse -Force
+    } else {
+        throw "The export path is not empty: $exportPath.  Select the 'Delete files in export folder' option to overwrite the existing folder contents."
+    }
+}
+
+$connectionOptions = @{ }
+
+if(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationEncrypt), [bool]::Parse($DLMAutomationTrustServerCertificate))) {
+    $connectionOptions += @{ 'Encrypt' = [bool]::Parse($DLMAutomationEncrypt) }
+    $connectionOptions += @{ 'TrustServerCertificate' = [bool]::Parse($DLMAutomationTrustServerCertificate) }
+}
+
+# Determine whether or not to include identical objects in the report.
+$targetDB = New-DatabaseConnection @connectionOptions `
+                                   -ServerInstance $DLMAutomationDatabaseServer `
+                                   -Database $DLMAutomationDatabaseName `
+                                   -Username $DLMAutomationDatabaseUsername `
+                                   -Password $DLMAutomationDatabasePassword | Test-DatabaseConnection
+
+$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packagePath
+
+# Only allow sqlcmd variables that don't have special characters like spaces, colon or dashes
+$regex = '^[a-zA-Z_][a-zA-Z0-9_]+$'
+$sqlCmdVariables = @{}
+$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {
+	$sqlCmdVariables[$_] = $OctopusParameters[$_]
+}
+
+# Create the deployment resources from the database to the NuGet package
+$releaseParams = @{
+    Target = $targetDB
+    Source = $importedBuildArtifact
+    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel
+    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)
+    FilterPath = $DLMAutomationFilterPath
+    SQLCompareOptions = $DLMAutomationCompareOptions
+    IncludeIdenticalsInReport = [bool]::Parse($DLMAutomationIncludeIdenticalsInReport)
+    SqlCmdVariables = $sqlCmdVariables
+}
+
+if($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {
+    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions
+} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {
+    Write-Warning "SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion."
+}
+
+$release = New-DatabaseReleaseArtifact @releaseParams
+
+# Export the deployment resources to disk
+$release | Export-DatabaseReleaseArtifact -Path $exportPath
+
+# Import the changes summary, deployment warnings, and update script as Octopus artifacts, so you can review them.
+function UploadIfExists() {
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$ArtifactPath,
+        [Parameter(Mandatory = $true)]
+        [string]$Name
+    )
+    if (Test-Path $ArtifactPath) {
+        New-OctopusArtifact $ArtifactPath -Name $Name
+    }
+}
+
+UploadIfExists -ArtifactPath "$exportPath\Reports\Changes.html" -Name "Changes-$DLMAutomationDatabaseName.html"
+UploadIfExists -ArtifactPath "$exportPath\Reports\Drift.html" -Name "Drift-$DLMAutomationDatabaseName.html"
+UploadIfExists -ArtifactPath "$exportPath\Reports\Warnings.xml" -Name "Warnings-$DLMAutomationDatabaseName.xml"
+UploadIfExists -ArtifactPath "$exportPath\Update.sql" -Name "Update-$DLMAutomationDatabaseName.sql"
+UploadIfExists -ArtifactPath "$exportPath\TargetedDeploymentScript.sql" -Name "TargetedDeploymentScript-$DLMAutomationDatabaseName.sql"
+UploadIfExists -ArtifactPath "$exportPath\DriftRevertScript.sql" -Name "DriftRevertScript-$DLMAutomationDatabaseName.sql"
+
+# Sets a variable if there are changes to deploy. Useful if you want to have steps run only when this is set
+if ($release.UpdateSQL -notlike '*This script is empty because the Target and Source schemas are equivalent*')
+{
+  Set-OctopusVariable -name "ChangesToDeploy" -value "True"
+}
diff --git a/src/step-templates/redgate-deploy-database-release-worker-friendly/metadata.json b/src/step-templates/redgate-deploy-database-release-worker-friendly/metadata.json
new file mode 100644
index 000000000..dd6c2edb9
--- /dev/null
+++ b/src/step-templates/redgate-deploy-database-release-worker-friendly/metadata.json
@@ -0,0 +1,156 @@
+{
+  "Id": "adf9a009-8bbb-4b82-8f3b-6fb12ef4ba18",
+  "Name": "Redgate - Deploy from Database Release (Worker Friendly)",
+  "Description": "Uses the deployment resources from the 'Redgate - Create Database Release' step to deploy the database changes using Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage).\n\nRequires SQL Change Automation version 3.0.2 or later.\n\n*Version date: 2019-07-26*\n\nThis step template is worker friendly, you can pass in a package reference rather than having to reference a previous step which downloaded the package. This step requires Octopus Deploy **2019.10.0** or higher.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Author": "octobob",
+  "Packages": [
+    {
+      "Id": "cbac673c-43fb-4f6f-8204-31597bb57077",
+      "Name": "DLMAutomationPackageName",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "DLMAutomationPackageName"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "57b50569-40cb-42b2-80a0-d607fff366ec",
+      "Name": "DLMAutomationDeploymentResourcesPath",
+      "Label": "Export path",
+      "HelpText": "The path the database deployment resources were exported to.\n\nThis should be the same path specified in the \"Redgate - Create Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "30a84de3-af9a-4c00-b9d4-ad9a96c59df6",
+      "Name": "DLMAutomationDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9bd39d00-e163-4051-bce5-635cbab28068",
+      "Name": "DLMAutomationDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database to deploy changes to. This must be an existing database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "91c79e89-f988-4ec1-90ec-7ba64e3b7be7",
+      "Name": "DLMAutomationDatabaseUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2074e5f7-9987-411a-bbfe-87ad28c4d3ab",
+      "Name": "DLMAutomationDatabasePassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "da1aa9b7-3e11-4982-b027-274d6b6c7561",
+      "Name": "DLMAutomationQueryBatchTimeout",
+      "Label": "Query batch timeout (in seconds)",
+      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "411b3ad1-4968-4cdb-b47b-3ddb4eab0468",
+      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
+      "Label": "Skip post update schema check",
+      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "e824b03b-802c-45c9-ba1e-c1540888789a",
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "25a16ceb-d668-4ea9-a645-fbf2001c1615",
+      "Name": "DLMAutomationPackageName",
+      "Label": "Package",
+      "HelpText": "The package which is being deployed",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "61adc6ec-4216-41c8-ab30-dba6cfcd37d0",
+      "Name": "DLMModuleInstallLocation",
+      "Label": "SQL Change Automation Install Location (optional)",
+      "HelpText": "The SQL Change Automation cmdlets will be downloaded from the [PowerShell gallery](https://www.powershellgallery.com/packages/SqlChangeAutomation).  Please specify the folder folder where those packages will be saved to.  It can be relative or absolute.\n\n\nIf this is empty it will default `$Home\\Documents\\WindowsPowerShell\\Modules` which is the [recommended location](https://docs.microsoft.com/en-us/powershell/scripting/developer/module/installing-a-powershell-module?view=powershell-7#where-to-install-modules) from Microsoft.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4844f3e7-1f3b-491f-8dc8-5e2b03c164d5",
+      "Name": "DLMAutomationTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Trust SQL Server Certificate",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "cb2b74bb-9481-4aab-b18f-b032746e3edd",
+      "Name": "DLMAutomationCustomConnectionString",
+      "Label": "Connection String (Optional)",
+      "HelpText": "If set, uses this as the full connection string. Allows for advanced configuration.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedBy": "markgould",
+  "$Meta": {
+    "ExportedAt": "2020-05-01T15:21:38.7170000Z",
+    "OctopusVersion": "2020.1.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-deploy-database-release-worker-friendly/scriptbody.ps1 b/src/step-templates/redgate-deploy-database-release-worker-friendly/scriptbody.ps1
new file mode 100644
index 000000000..2a7aabe37
--- /dev/null
+++ b/src/step-templates/redgate-deploy-database-release-worker-friendly/scriptbody.ps1
@@ -0,0 +1,319 @@
+#Improve performance by turning off progress bar
+#More details here: https://redgate.uservoice.com/forums/267000-sql-change-automation/suggestions/44882212-improve-performance-invoke-databasebuild-by-re
+$ProgressPreference = "SilentlyContinue"
+
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = "$Home\Documents\WindowsPowerShell\Modules"
+
+if ([string]::IsNullOrWhiteSpace($DLMModuleInstallLocation) -eq $false)
+{
+	if ((Test-Path $DLMModuleInstallLocation -IsValid) -eq $false)
+    {
+    	Write-Error "The path $DLMModuleInstallLocation is not valid, please use a relative or absolute path."
+        exit 1
+    }
+    
+    $ModulesFolder = [System.IO.Path]::GetFullPath($DLMModuleInstallLocation)            
+}
+
+Write-Host "Modules will be installed into $ModulesFolder"
+
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion
+    )
+    
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule) {
+        #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+        Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+        InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+    }
+    elseif (!$requiredVersion) {
+        #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+        $newest = GetHighestInstallableModule $moduleName
+        if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+            Write-Verbose "Updating $moduleName to version $($newest.Version)"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName        
+    }
+    
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet 
+        
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+
+    return Get-Module $moduleName -ListAvailable | 
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} | 
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions | 
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1   
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { 
+        $Default
+    } else { 
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion
+
+# Check if SQL Change Automation is installed.	
+$powershellModule = Get-Module -Name SqlChangeAutomation	
+if ($powershellModule -eq $null) { 	
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."	
+}
+
+$currentVersion = $powershellModule.Version	
+$minimumRequiredVersion = [version] '3.0.3'	
+if ($currentVersion -lt $minimumRequiredVersion) { 	
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"	
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+
+# Check the parameters.
+$DLMAutomationCustomConnectionString = Optional -Parameter $DLMAutomationCustomConnectionString
+
+Required -Parameter $DLMAutomationDeploymentResourcesPath -Name 'Export Path'
+
+if ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)
+{
+    Required -Parameter $DLMAutomationDatabaseServer -Name 'Target SQL Server instance'
+    Required -Parameter $DLMAutomationDatabaseName -Name 'Target database name'
+}
+
+$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername
+$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword
+$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default "False"
+$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'
+$DLMAutomationTrustServerCertificate = [Convert]::ToBoolean($OctopusParameters["DLMAutomationTrustServerCertificate"])
+
+$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'
+$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'
+
+# Check whether database deployment resources export path exists and is a valid directory path 
+if((Test-Path $DLMAutomationDeploymentResourcesPath) -eq $true) {
+    if((Get-Item $DLMAutomationDeploymentResourcesPath) -isnot [System.IO.DirectoryInfo]) {
+        throw "The export path is not a valid folder: $DLMAutomationDeploymentResourcesPath"
+    }
+} else {
+    throw "The export path folder doesn't exist, or the current Windows account can't access it: $DLMAutomationDeploymentResourcesPath"
+}
+
+# Constructing the unique export path.
+$nugetPackageId = $OctopusParameters["Octopus.Action.Package[DLMAutomationPackageName].PackageId"]
+$projectId = $OctopusParameters['Octopus.Project.Id']
+$releaseNumber = $OctopusParameters['Octopus.Release.Number']
+$exportPath = Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId
+
+# Create and test connection to the database.
+if ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)
+{
+    $databaseConnection = New-DatabaseConnection -ServerInstance $DLMAutomationDatabaseServer `
+                                                    -Database $DLMAutomationDatabaseName `
+                                                    -Username $DLMAutomationDatabaseUsername `
+                                                    -Password $DLMAutomationDatabasePassword `
+                                                    -TrustServerCertificate $DLMAutomationTrustServerCertificate | Test-DatabaseConnection
+} else {
+    $databaseConnection = New-Object -TypeName RedGate.Versioning.Automation.Compare.SchemaSources.DatabaseConnection `
+                                        -ArgumentList $DLMAutomationCustomConnectionString | Test-DatabaseConnection
+}
+
+$releaseUrl = $OctopusParameters['Octopus.Web.ServerUri'] + $OctopusParameters['Octopus.Web.DeploymentLink']; 
+# Import and deploy the release.
+Import-DatabaseReleaseArtifact $exportPath | Use-DatabaseReleaseArtifact -DeployTo $databaseConnection -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck
\ No newline at end of file
diff --git a/src/step-templates/redgate-deploy-from-database-release/metadata.json b/src/step-templates/redgate-deploy-from-database-release/metadata.json
new file mode 100644
index 000000000..3882c2eb9
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-database-release/metadata.json
@@ -0,0 +1,148 @@
+{
+  "Id": "7d18aeb8-5e69-4c91-aca4-0d71022944e8",
+  "Name": "Redgate - Deploy from Database Release",
+  "Description": "Uses the deployment resources from the 'Redgate - Create Database Release' step to deploy the database changes using Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage).\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
+  "ActionType": "Octopus.Script",
+  "Version": 18,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "DLMAutomationDeploymentResourcesPath",
+      "Label": "Export path",
+      "HelpText": "The path the database deployment resources were exported to.\n\nThis should be the same path specified in the \"Redgate - Create Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationNuGetDbPackageDownloadStepName",
+      "Label": "Database package step",
+      "HelpText": "Select the step in this project which downloads the database package.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database to deploy changes to. This must be an existing database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabaseUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDatabasePassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "DLMAutomationEncrypt",
+      "Label": "Encrypt",
+      "HelpText": "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Specify whether to force SQL Server to skip certificate validation.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationQueryBatchTimeout",
+      "Label": "Query batch timeout (in seconds)",
+      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
+      "Label": "Skip post update schema check",
+      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "UseInstalledModuleVersion",
+      "Label": "Only use a version of SQL Change Automation that is already installed",
+      "HelpText": "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationModuleInstallationFolder",
+      "Label": "Module Installation Folder (optional)",
+      "HelpText": "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationProxyUrl",
+      "Label": "Proxy URL (optional)",
+      "HelpText": "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-03-19T03:01:37.1250000-07:00",
+  "LastModifiedBy": "benimac93",
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-deploy-from-database-release/scriptbody.ps1 b/src/step-templates/redgate-deploy-from-database-release/scriptbody.ps1
new file mode 100644
index 000000000..24f5b24b6
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-database-release/scriptbody.ps1
@@ -0,0 +1,361 @@
+function GetModuleInstallationFolder
+{
+    if (ModuleInstallationFolderIsValid)
+    {
+        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)
+    }
+
+    return "$PSScriptRoot\Modules"
+}
+
+function ModuleInstallationFolderIsValid
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))
+    {
+        return $false
+    }
+
+    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;
+}
+
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = GetModuleInstallationFolder
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion,
+        [Parameter(Mandatory = $false)]
+        [bool]$useInstalledVersion
+    )
+
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    if ($useInstalledVersion) {
+        Write-Verbose "Option to use installed version is selected. Skipping update/install using PowerShellGet."
+    }
+    else {
+        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+        if (!$installedModule) {
+            #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+            Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+        }
+        elseif (!$requiredVersion) {
+            #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+            $newest = GetHighestInstallableModule $moduleName
+            if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+                Write-Verbose "Updating $moduleName to version $($newest.Version)"
+                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+            }
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName
+    }
+
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+
+    ConfigureProxyIfVariableSet
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet
+
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+
+    return Get-Module $moduleName -ListAvailable |
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions |
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+function ConfigureProxyIfVariableSet
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)
+    {
+        Write-Debug "Setting DefaultWebProxy to $proxyUrl"
+
+        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)
+        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials
+        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True
+    }
+}
+
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) {
+        $Default
+    } else {
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default 'False'
+$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch
+
+# Check if SQL Change Automation is installed.
+$powershellModule = Get-Module -Name SqlChangeAutomation
+if ($powershellModule -eq $null) {
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."
+}
+
+$currentVersion = $powershellModule.Version
+$minimumRequiredVersion = [version] '3.0.3'
+if ($currentVersion -lt $minimumRequiredVersion) {
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+$minimumRequiredVersionTrustServerCertificate = [version]'4.3.20267'
+
+function AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)
+{
+    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)
+    {
+        return $true
+    }
+    elseif($encryptConnection -or $trustServerCertificate)
+    {
+        Write-Warning "Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion."
+        return $false
+    }
+}
+
+# Check the parameters.
+Required -Parameter $DLMAutomationDeploymentResourcesPath -Name 'Export path'
+Required -Parameter $DLMAutomationNuGetDbPackageDownloadStepName -Name 'Database package step'
+Required -Parameter $DLMAutomationDatabaseServer -Name  'Target SQL Server instance'
+Required -Parameter $DLMAutomationDatabaseName -Name  'Target database name'
+$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername
+$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword
+$DLMAutomationTrustServerCertificate = Optional -Parameter $DLMAutomationTrustServerCertificate
+$DLMAutomationEncrypt = Optional -Parameter $DLMAutomationEncrypt
+$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default "False"
+$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'
+$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder
+$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl
+
+$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'
+$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'
+
+# Check whether database deployment resources export path exists and is a valid directory path
+if((Test-Path $DLMAutomationDeploymentResourcesPath) -eq $true) {
+    if((Get-Item $DLMAutomationDeploymentResourcesPath) -isnot [System.IO.DirectoryInfo]) {
+        throw "The export path is not a valid folder: $DLMAutomationDeploymentResourcesPath"
+    }
+} else {
+    throw "The export path folder doesn't exist, or the current Windows account can't access it: $DLMAutomationDeploymentResourcesPath"
+}
+
+# Get the NuGet package ID and validate the step name.
+$nugetPackageId = $OctopusParameters["Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Package.NuGetPackageId"]
+if ($nugetPackageId -eq $null) {
+    throw "The 'Database package download step' is not a 'Deploy a NuGet package' step: '$DLMAutomationNuGetDbPackageDownloadStepName'"
+}
+
+# Constructing the unique export path.
+$projectId = $OctopusParameters['Octopus.Project.Id']
+$releaseNumber = $OctopusParameters['Octopus.Release.Number']
+$exportPath = Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId
+
+$connectionOptions = @{ }
+
+if(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationEncrypt), [bool]::Parse($DLMAutomationTrustServerCertificate))) {
+    $connectionOptions += @{ 'Encrypt' = [bool]::Parse($DLMAutomationEncrypt) }
+    $connectionOptions += @{ 'TrustServerCertificate' = [bool]::Parse($DLMAutomationTrustServerCertificate) }
+}
+
+# Create and test connection to the database.
+$databaseConnection = New-DatabaseConnection @connectionOptions `
+                                             -ServerInstance $DLMAutomationDatabaseServer `
+                                             -Database $DLMAutomationDatabaseName `
+                                             -Username $DLMAutomationDatabaseUsername `
+                                             -Password $DLMAutomationDatabasePassword | Test-DatabaseConnection
+
+$releaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}'] + $OctopusParameters['Octopus.Web.DeploymentLink'];
+# Import and deploy the release.
+Import-DatabaseReleaseArtifact $exportPath | Use-DatabaseReleaseArtifact -DeployTo $databaseConnection -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck
diff --git a/src/step-templates/redgate-deploy-from-database/metadata.json b/src/step-templates/redgate-deploy-from-database/metadata.json
new file mode 100644
index 000000000..546f8a271
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-database/metadata.json
@@ -0,0 +1,221 @@
+{
+  "Id": "548a661f-0c77-479d-acbd-da1e0875df1d",
+  "Name": "Redgate - Deploy from Database",
+  "Description": "Uses Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage) to deploy a source schema to a SQL Server database without a review step.\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
+  "ActionType": "Octopus.Script",
+  "Version": 37,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "DLMAutomationSourceDatabaseServer",
+      "Label": "Source SQL Server instance",
+      "HelpText": "The fully qualified instance name of the SQL Server that hosts the source database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationSourceDatabaseName",
+      "Label": "Source database name",
+      "HelpText": "The name of the database with the source schema (the schema that will be deployed).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationSourceUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the source database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationSourcePassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username for source database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "DLMAutomationSourceEncrypt",
+      "Label": "Encrypt",
+      "HelpText": "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
+      "DefaultValue": "true",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationSourceTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Specify whether to force SQL Server to skip certificate validation.",
+      "DefaultValue": "true",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database to deploy changes to. This must be an existing database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the target database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetPassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username for target database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetEncrypt",
+      "Label": "Encrypt",
+      "HelpText": "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Specify whether to force SQL Server to skip certificate validation.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationFilterPath",
+      "Label": "Filter path (optional)",
+      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationCompareOptions",
+      "Label": "SQL Compare options (optional)",
+      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDataCompareOptions",
+      "Label": "SQL Data Compare options (optional)",
+      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTransactionIsolationLevel",
+      "Label": "Transaction isolation level (optional)",
+      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
+      "DefaultValue": "Serializable",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
+      }
+    },
+    {
+      "Name": "DLMAutomationQueryBatchTimeout",
+      "Label": "Query batch timeout (in seconds)",
+      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
+      "Label": "Skip post update schema check",
+      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "UseInstalledModuleVersion",
+      "Label": "Only use a version of SQL Change Automation that is already installed",
+      "HelpText": "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationModuleInstallationFolder",
+      "Label": "Module Installation Folder (optional)",
+      "HelpText": "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationProxyUrl",
+      "Label": "Proxy URL (optional)",
+      "HelpText": "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-03-19T03:01:37.1410000-07:00",
+  "LastModifiedBy": "benjimac93",
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-deploy-from-database/scriptbody.ps1 b/src/step-templates/redgate-deploy-from-database/scriptbody.ps1
new file mode 100644
index 000000000..1e63b9ca0
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-database/scriptbody.ps1
@@ -0,0 +1,376 @@
+function GetModuleInstallationFolder
+{
+    if (ModuleInstallationFolderIsValid)
+    {
+        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)
+    }
+
+    return "$PSScriptRoot\Modules"
+}
+
+function ModuleInstallationFolderIsValid
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))
+    {
+        return $false
+    }
+
+    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;
+}
+
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = GetModuleInstallationFolder
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion,
+        [Parameter(Mandatory = $false)]
+        [bool]$useInstalledVersion
+    )
+
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    if ($useInstalledVersion) {
+        Write-Verbose "Option to use installed version is selected. Skipping update/install using PowerShellGet."
+    }
+    else {
+        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+        if (!$installedModule) {
+            #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+            Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+        }
+        elseif (!$requiredVersion) {
+            #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+            $newest = GetHighestInstallableModule $moduleName
+            if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+                Write-Verbose "Updating $moduleName to version $($newest.Version)"
+                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+            }
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName
+    }
+
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+
+    ConfigureProxyIfVariableSet
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet
+
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+
+    return Get-Module $moduleName -ListAvailable |
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions |
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+function ConfigureProxyIfVariableSet
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)
+    {
+        Write-Debug "Setting DefaultWebProxy to $proxyUrl"
+
+        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)
+        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials
+        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True
+    }
+}
+
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) {
+        $Default
+    } else {
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default 'False'
+$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch
+
+# Check if SQL Change Automation is installed.
+$powershellModule = Get-Module -Name SqlChangeAutomation
+if ($powershellModule -eq $null) {
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."
+}
+
+$currentVersion = $powershellModule.Version
+$minimumRequiredVersion = [version] '3.0.3'
+if ($currentVersion -lt $minimumRequiredVersion) {
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+$minimumRequiredVersionTrustServerCertificate = [version]'4.3.20267'
+
+function AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)
+{
+    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)
+    {
+        return $true
+    }
+    elseif($encryptConnection -or $trustServerCertificate)
+    {
+        Write-Warning "Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion."
+        return $false
+    }
+}
+
+# Check the parameters.
+Required -Parameter $DLMAutomationSourceDatabaseServer -Name 'Source SQL Server instance'
+Required -Parameter $DLMAutomationSourceDatabaseName -Name 'Source database name'
+$DLMAutomationSourceUsername = Optional -Parameter $DLMAutomationSourceUsername
+$DLMAutomationSourcePassword = Optional -Parameter $DLMAutomationSourcePassword
+$DLMAutomationSourceTrustServerCertificate = Optional -Parameter $DLMAutomationSourceTrustServerCertificate
+$DLMAutomationSourceEncrypt = Optional -Parameter $DLMAutomationSourceEncrypt
+Required -Parameter $DLMAutomationTargetDatabaseServer -Name 'Target SQL Server instance'
+Required -Parameter $DLMAutomationTargetDatabaseName -Name 'Target database name'
+$DLMAutomationTargetUsername = Optional -Parameter $DLMAutomationTargetUsername
+$DLMAutomationTargetPassword = Optional -Parameter $DLMAutomationTargetPassword
+$DLMAutomationTargetTrustServerCertificate = Optional -Parameter $DLMAutomationTargetTrustServerCertificate
+$DLMAutomationTargetEncrypt = Optional -Parameter $DLMAutomationTargetEncrypt
+$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath
+$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions
+$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions
+$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default 'Serializable'
+$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default "False"
+$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'
+$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder
+$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl
+
+$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'
+$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'
+
+
+$targetConnectionOptions = @{ }
+$sourceConnectionOptions = @{ }
+
+if(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationTargetEncrypt) -or [bool]::Parse($DLMAutomationSourceEncrypt), `
+                               [bool]::Parse($DLMAutomationTargetTrustServerCertificate) -or [bool]::Parse($DLMAutomationSourceTrustServerCertificate))) {
+    $targetConnectionOptions += @{ 'Encrypt' = [bool]::Parse($DLMAutomationTargetEncrypt) }
+    $targetConnectionOptions += @{ 'TrustServerCertificate' = [bool]::Parse($DLMAutomationTargetTrustServerCertificate) }
+	$sourceConnectionOptions += @{ 'Encrypt' = [bool]::Parse($DLMAutomationSourceEncrypt) }
+    $sourceConnectionOptions += @{ 'TrustServerCertificate' = [bool]::Parse($DLMAutomationSourceTrustServerCertificate) }
+}
+
+$targetDB = New-DatabaseConnection @targetConnectionOptions `
+                                   -ServerInstance $DLMAutomationTargetDatabaseServer `
+                                   -Database $DLMAutomationTargetDatabaseName `
+                                   -Username $DLMAutomationTargetUsername `
+                                   -Password $DLMAutomationTargetPassword | Test-DatabaseConnection
+
+$sourceDB = New-DatabaseConnection @sourceConnectionOptions `
+								   -ServerInstance $DLMAutomationSourceDatabaseServer `
+                                   -Database $DLMAutomationSourceDatabaseName `
+                                   -Username $DLMAutomationSourceUsername `
+                                   -Password $DLMAutomationSourcePassword | Test-DatabaseConnection
+
+# Create the deployment resources, only adding the arguments that are not null or empty.
+$releaseParams = @{
+    Target = $targetDB
+    Source = $sourceDB
+    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel
+    FilterPath = $DLMAutomationFilterPath
+    SQLCompareOptions = $DLMAutomationCompareOptions
+}
+
+if($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {
+    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions
+} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {
+    Write-Warning "SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion."
+}
+
+$release = New-DatabaseReleaseArtifact @releaseParams
+
+$releaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}'] + $OctopusParameters['Octopus.Web.DeploymentLink'];
+# Deploy the source schema to the target database.
+$release | Use-DatabaseReleaseArtifact -DeployTo $targetDB -SkipPreUpdateSchemaCheck -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck
diff --git a/src/step-templates/redgate-deploy-from-package-worker-friendly/metadata.json b/src/step-templates/redgate-deploy-from-package-worker-friendly/metadata.json
new file mode 100644
index 000000000..27541d256
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-package-worker-friendly/metadata.json
@@ -0,0 +1,197 @@
+{
+  "Id": "02b5b305-92ca-4612-a632-92eb840bd2a8",
+  "Name": "Redgate - Deploy from Package (Worker Friendly)",
+  "Description": "Uses Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage) to deploy a package containing a database schema to a SQL Server database, without a review step.\n\nRequires SQL Change Automation version 3.0.2 or later.\n\n*Version date: 2022-01-24*\n\nThis step template is worker friendly, you can pass in a package reference rather than having to reference a previous step which downloaded the package. This step requires Octopus Deploy **2019.10.0** or higher.\n\n**NOTE**: This template requires the SQLCMD utility, if not found, the template will install the following: \n - Visual Studio 2017 C++ Redistributable \n - SQL Server 2017 ODBC driver \n - SQLCMD utility",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "8ec6200a-24c9-4273-bdcc-5ff46ce3111f",
+      "Name": "DLMAutomation.Package.Name",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "DLMAutomationPackageName"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "3aa8db8b-94e7-4a13-8ac3-054ad5456f3f",
+      "Name": "DLMAutomationPackageName",
+      "Label": "Package",
+      "HelpText": "The name of the package to extract and deploy",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "529e5641-44a7-42fe-9a55-72c3c08d2b7d",
+      "Name": "DLMAutomationTargetDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "29c48d57-c4f2-4dda-9866-b97a20f84c60",
+      "Name": "DLMAutomationTargetDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database to deploy changes to. This must be an existing database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "96c56aaf-ed86-4728-a68c-bac95e9e1040",
+      "Name": "DLMAutomationTargetUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "515c98af-ff2b-488c-bebd-81bff7b82761",
+      "Name": "DLMAutomationTargetPassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "cfebb7c8-497b-4406-8d64-34973c12711c",
+      "Name": "DLMAutomationFilterPath",
+      "Label": "Filter path (optional)",
+      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a305bef9-af25-44f6-a78b-d641d7b6609a",
+      "Name": "DLMAutomationCompareOptions",
+      "Label": "SQL Compare options (optional)",
+      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1bbdec30-e207-4e5e-b08c-26bae87f78b3",
+      "Name": "DLMAutomationDataCompareOptions",
+      "Label": "SQL Data Compare options (optional)",
+      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "367a4913-6c79-451a-bfe6-269462f784f8",
+      "Name": "DLMAutomationTransactionIsolationLevel",
+      "Label": "Transaction isolation level (optional)",
+      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
+      "DefaultValue": "Serializable",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
+      }
+    },
+    {
+      "Id": "b5e1544c-45c9-455c-9c5c-ab5c3ec37c8a",
+      "Name": "DLMAutomationIgnoreStaticData",
+      "Label": "Ignore static data",
+      "HelpText": "Exclude changes to static data when generating the deployment resources.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "56644eed-84d2-4efb-a645-8a690770af01",
+      "Name": "DLMAutomationQueryBatchTimeout",
+      "Label": "Query batch timeout (in seconds)",
+      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a5d870d2-bef0-43e2-888a-265a8c7bccf3",
+      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
+      "Label": "Skip post update schema check",
+      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "66a03c11-eb4c-4c59-81cf-e1f09c31aee7",
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2d38d44f-409f-407b-9cc2-401a95f07d01",
+      "Name": "DLMModuleInstallLocation",
+      "Label": "SQL Change Automation Install Location (optional)",
+      "HelpText": "The SQL Change Automation cmdlets will be downloaded from the [PowerShell gallery](https://www.powershellgallery.com/packages/SqlChangeAutomation).  Please specify the folder folder where those packages will be saved to.  It can be relative or absolute.\n\n\nIf this is empty it will default `$Home\\Documents\\WindowsPowerShell\\Modules` which is the [recommended location](https://docs.microsoft.com/en-us/powershell/scripting/developer/module/installing-a-powershell-module?view=powershell-7#where-to-install-modules) from Microsoft.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4daa7ac9-65b8-47ff-b00a-616f94896664",
+      "Name": "DLMAutomationTrustServerCertificate",
+      "Label": "Trust server certificate",
+      "HelpText": "Check this box to trust the SQL Server certificate.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "cb2b74bb-9481-4aab-b18f-b032746e3edd",
+      "Name": "DLMAutomationCustomConnectionString",
+      "Label": "Connection String (Optional)",
+      "HelpText": "If set, uses this as the full connection string. Allows for advanced configuration.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2022-01-25T16:00:25.2690000Z",
+    "OctopusVersion": "2022.1.80",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "markgould",
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-deploy-from-package-worker-friendly/scriptbody.ps1 b/src/step-templates/redgate-deploy-from-package-worker-friendly/scriptbody.ps1
new file mode 100644
index 000000000..3c60a66b9
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-package-worker-friendly/scriptbody.ps1
@@ -0,0 +1,397 @@
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = "$Home\Documents\WindowsPowerShell\Modules"
+
+
+if ([string]::IsNullOrWhiteSpace($DLMModuleInstallLocation) -eq $false)
+{
+	if ((Test-Path $DLMModuleInstallLocation -IsValid) -eq $false)
+    {
+    	Write-Error "The path $DLMModuleInstallLocation is not valid, please use a relative or absolute path."
+        exit 1
+    }
+    
+    $ModulesFolder = [System.IO.Path]::GetFullPath($DLMModuleInstallLocation)            
+}
+
+Write-Host "Modules will be installed into $ModulesFolder"
+
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion
+    )
+
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule) {
+        #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+        Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+        InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+    }
+    elseif (!$requiredVersion) {
+        #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+        $newest = GetHighestInstallableModule $moduleName
+        if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+            Write-Verbose "Updating $moduleName to version $($newest.Version)"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName
+    }
+
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet
+
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+
+    return Get-Module $moduleName -ListAvailable |
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions |
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { 
+        $Default
+    } else { 
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter, 
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+function Get-SqlcmdInstalled
+{
+	# Define variables
+    $searchPaths = @("c:\program files\microsoft sql server", "c:\program files (x86)\microsoft sql server")
+    
+    # Loop through search paths
+    foreach ($searchPath in $searchPaths)
+    {
+    	# Ensure folder exists
+        if (Test-Path -Path $searchPath)
+        {
+        	# Search the path
+            return ($null -ne (Get-ChildItem -Path $searchPath -Recurse | Where-Object {$_.Name -eq "sqlcmd.exe"}))
+        }
+    }
+    
+    # Not found
+    return $false
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion
+
+# Check if SQL Change Automation is installed.	
+$powershellModule = Get-Module -Name SqlChangeAutomation	
+if ($powershellModule -eq $null) { 	
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."	
+}
+
+# Check to for sqlcmd
+$sqlCmdExists = Get-SqlCmdInstalled
+
+if ($sqlCmdExists -eq $false)
+{
+	Write-Verbose "This template requires the sqlcmd utility, downloading ..."
+	$tempPath = (New-Item "$PSScriptRoot\sqlcmd" -ItemType Directory -Force).FullName
+    
+	$sqlCmdUrl = ""
+    $odbcUrl = ""
+    $redistributableUrl = ""
+    
+    switch ($Env:PROCESSOR_ARCHITECTURE)
+    {
+    	"AMD64"
+        {
+        	$sqlCmdUrl = "https://go.microsoft.com/fwlink/?linkid=2142258"
+            $odbcUrl = "https://go.microsoft.com/fwlink/?linkid=2168524"
+            $redistributableUrl = "https://aka.ms/vs/17/release/vc_redist.x64.exe"
+            break
+        }
+        "x86"
+        {
+        	$sqlCmdUrl = "https://go.microsoft.com/fwlink/?linkid=2142257"
+            $odbcUrl = "https://go.microsoft.com/fwlink/?linkid=2168713"
+            $redistributableUrl = "https://aka.ms/vs/17/release/vc_redist.x86.exe"
+            break
+        }
+    }
+    
+    Invoke-WebRequest -Uri $sqlCmdUrl -OutFile "$tempPath\sqlcmd.msi" -UseBasicParsing
+	Invoke-WebRequest -Uri $odbcUrl -OutFile "$tempPath\msodbc.msi" -UseBasicParsing
+	Invoke-WebRequest -Uri $redistributableUrl -Outfile "$tempPath\vc_redist.exe" -UseBasicParsing
+
+	Write-Verbose "Installing Visual Studio 2017 C++ redistrutable prequisite ..."
+	Start-Process -FilePath "$tempPath\vc_redist.exe" -ArgumentList @("/install", "/passive", "/norestart") -NoNewWindow -Wait
+    Write-Verbose "Installing SQL Server 2017 ODBC driver prequisite ..."
+	Start-Process -FilePath "msiexec.exe" -ArgumentList @("/i", "$tempPath\msodbc.msi", "IACCEPTMSODBCSQLLICENSETERMS=YES", "/qn") -NoNewWindow -Wait
+    Write-Verbose "Installing SQLCMD utility ..."
+	Start-Process -FilePath "msiexec.exe" -ArgumentList @("/i", "$tempPath\sqlcmd.msi", "IACCEPTMSSQLCMDLNUTILSLICENSETERMS=YES", "/qn") -NoNewWindow -Wait
+
+	Write-Verbose "Sqlcmd Installation complete!"
+}
+
+$currentVersion = $powershellModule.Version	
+$minimumRequiredVersion = [version] '3.0.3'	
+if ($currentVersion -lt $minimumRequiredVersion) { 	
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"	
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+
+# Check the parameters.
+$DLMAutomationCustomConnectionString = Optional -Parameter $DLMAutomationCustomConnectionString
+
+if ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)
+{
+    Required -Parameter $DLMAutomationTargetDatabaseServer -Name 'Target SQL Server instance'
+    Required -Parameter $DLMAutomationTargetDatabaseName -Name 'Target database name'
+}
+
+$DLMAutomationTargetUsername = Optional -Parameter $DLMAutomationTargetUsername
+$DLMAutomationTargetPassword = Optional -Parameter $DLMAutomationTargetPassword
+$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath
+$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions
+$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions
+$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default "Serializable"
+$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default 'False'
+$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default "False"
+$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'
+$DLMAutomationTrustServerCertificate = [Convert]::ToBoolean($OctopusParameters["DLMAutomationTrustServerCertificate"])
+
+$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'
+$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'
+
+# Create and test connection to the database.
+if ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)
+{
+    $databaseConnection = New-DatabaseConnection -ServerInstance $DLMAutomationTargetDatabaseServer `
+                                                    -Database $DLMAutomationTargetDatabaseName `
+                                                    -Username $DLMAutomationTargetUsername `
+                                                    -Password $DLMAutomationTargetPassword `
+                                                    -TrustServerCertificate $DLMAutomationTrustServerCertificate | Test-DatabaseConnection
+} else {
+    $databaseConnection = New-Object -TypeName RedGate.Versioning.Automation.Compare.SchemaSources.DatabaseConnection `
+                                        -ArgumentList $DLMAutomationCustomConnectionString | Test-DatabaseConnection
+}
+$packageExtractPath = $OctopusParameters["Octopus.Action.Package[DLMAutomation.Package.Name].ExtractedPath"]
+$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packageExtractPath
+
+# Only allow sqlcmd variables that don't have special characters like spaces, colon or dashes
+$regex = '^[a-zA-Z_][a-zA-Z0-9_]+$'
+$sqlCmdVariables = @{}
+$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {
+	$sqlCmdVariables[$_] = $OctopusParameters[$_]
+}
+
+# Create database deployment resources from the NuGet package to the database
+$releaseParams = @{
+    Target = $databaseConnection
+    Source = $importedBuildArtifact
+    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel
+    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)
+    FilterPath = $DLMAutomationFilterPath
+    SQLCompareOptions = $DLMAutomationCompareOptions
+    SqlCmdVariables = $sqlCmdVariables
+}
+
+if($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {
+    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions
+} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {
+    Write-Warning "SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion."
+}
+
+$release = New-DatabaseReleaseArtifact @releaseParams
+
+# Deploy the source schema to the target database.
+Write-Host "Timeout = $queryBatchTimeout"
+$releaseUrl = $OctopusParameters['Octopus.Web.ServerUri'] + $OctopusParameters['Octopus.Web.DeploymentLink']; 
+$release | Use-DatabaseReleaseArtifact -DeployTo $databaseConnection -SkipPreUpdateSchemaCheck -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck
+
diff --git a/src/step-templates/redgate-deploy-from-package/metadata.json b/src/step-templates/redgate-deploy-from-package/metadata.json
new file mode 100644
index 000000000..4552e5540
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-package/metadata.json
@@ -0,0 +1,185 @@
+{
+  "Id": "19f750fb-2ce8-4361-859e-2dfcdf08a952",
+  "Name": "Redgate - Deploy from Package",
+  "Description": "Uses Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage) to deploy a package containing a database schema to a SQL Server database, without a review step.\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
+  "ActionType": "Octopus.Script",
+  "Version": 18,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "DLMAutomationNuGetDbPackageDownloadStepName",
+      "Label": "Database package step",
+      "HelpText": "Select the step in this project which downloads the database package.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetDatabaseServer",
+      "Label": "Target SQL Server instance",
+      "HelpText": "The fully qualified SQL Server instance name for the target database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetDatabaseName",
+      "Label": "Target database name",
+      "HelpText": "The name of the database to deploy changes to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetUsername",
+      "Label": "Username (optional)",
+      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetPassword",
+      "Label": "Password (optional)",
+      "HelpText": "You must enter a password if you entered a username.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetEncrypt",
+      "Label": "Encrypt",
+      "HelpText": "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationTargetTrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Specify whether to force SQL Server to skip certificate validation.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationFilterPath",
+      "Label": "Filter path (optional)",
+      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationCompareOptions",
+      "Label": "SQL Compare options (optional)",
+      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationDataCompareOptions",
+      "Label": "SQL Data Compare options (optional)",
+      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationTransactionIsolationLevel",
+      "Label": "Transaction isolation level (optional)",
+      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
+      "DefaultValue": "Serializable",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
+      }
+    },
+    {
+      "Name": "DLMAutomationIgnoreStaticData",
+      "Label": "Ignore static data",
+      "HelpText": "Exclude changes to static data when generating the deployment resources.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationQueryBatchTimeout",
+      "Label": "Query batch timeout (in seconds)",
+      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
+      "Label": "Skip post update schema check",
+      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "SpecificModuleVersion",
+      "Label": "SQL Change Automation version (optional)",
+      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "UseInstalledModuleVersion",
+      "Label": "Only use a version of SQL Change Automation that is already installed",
+      "HelpText": "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "DLMAutomationModuleInstallationFolder",
+      "Label": "Module Installation Folder (optional)",
+      "HelpText": "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DLMAutomationProxyUrl",
+      "Label": "Proxy URL (optional)",
+      "HelpText": "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-03-19T03:01:37.1520000-07:00",
+  "LastModifiedBy": "benjimac93",
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-deploy-from-package/scriptbody.ps1 b/src/step-templates/redgate-deploy-from-package/scriptbody.ps1
new file mode 100644
index 000000000..92250c86f
--- /dev/null
+++ b/src/step-templates/redgate-deploy-from-package/scriptbody.ps1
@@ -0,0 +1,380 @@
+function GetModuleInstallationFolder
+{
+    if (ModuleInstallationFolderIsValid)
+    {
+        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)
+    }
+
+    return "$PSScriptRoot\Modules"
+}
+
+function ModuleInstallationFolderIsValid
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))
+    {
+        return $false
+    }
+
+    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;
+}
+
+$DlmAutomationModuleName = "DLMAutomation"
+$SqlChangeAutomationModuleName = "SqlChangeAutomation"
+$ModulesFolder = GetModuleInstallationFolder
+$LocalModules = (New-Item "$ModulesFolder" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+function IsScaAvailable
+{
+    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {
+        return $true
+    }
+
+    return $false
+}
+
+function InstallCorrectSqlChangeAutomation
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $false)]
+        [Version]$requiredVersion,
+        [Parameter(Mandatory = $false)]
+        [bool]$useInstalledVersion
+    )
+
+    $moduleName = $SqlChangeAutomationModuleName
+
+    # this will be null if $requiredVersion is not specified - which is exactly what we want
+    $maximumVersion = $requiredVersion
+
+    if ($requiredVersion) {
+        if ($requiredVersion.Revision -eq -1) {
+            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision
+            $maximumVersion = [Version]"$requiredVersion.$([System.Int32]::MaxValue)"
+        }
+
+        if ($requiredVersion.Major -lt 3) {
+            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead
+            $moduleName = $DlmAutomationModuleName
+        }
+    }
+
+    if ($useInstalledVersion) {
+        Write-Verbose "Option to use installed version is selected. Skipping update/install using PowerShellGet."
+    }
+    else {
+        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+        if (!$installedModule) {
+            #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed
+            Write-Verbose "$moduleName $requiredVersion not available - attempting to download from gallery"
+            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+        }
+        elseif (!$requiredVersion) {
+            #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade
+            $newest = GetHighestInstallableModule $moduleName
+            if ($newest -and ($installedModule.Version -lt $newest.Version)) {
+                Write-Verbose "Updating $moduleName to version $($newest.Version)"
+                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version
+            }
+        }
+    }
+
+    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements
+
+    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,
+    # so we have to find the precise matching installed version using our code, then import that specifically. Note that
+    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.
+    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion
+
+    if (!$installedModule -and !$requiredVersion) {
+        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.
+        Write-Verbose "$moduleName is not installed - trying to fall back to $DlmAutomationModuleName"
+        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName
+    }
+
+    if ($installedModule) {
+        Write-Verbose "Importing installed $($installedModule.Name) version $($installedModule.Version)"
+        Import-Module $installedModule -Force
+    }
+    else {
+        throw "$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery"
+    }
+}
+
+function InstallPowerShellGet {
+    [CmdletBinding()]
+    Param()
+
+    ConfigureProxyIfVariableSet
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
+
+    $psget = GetHighestInstalledModule PowerShellGet
+    if (!$psget)
+    {
+        Write-Warning @"
+Cannot access the PowerShell Gallery because PowerShellGet is not installed.
+To install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.
+See https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.
+"@
+        throw "PowerShellGet is not available"
+    }
+
+    if ($psget.Version -lt [Version]'1.6') {
+        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights
+        Write-Debug "Installing NuGet package provider"
+        Get-PackageProvider NuGet -ForceBootstrap | Out-Null
+
+        #Use the currently-installed version of PowerShellGet
+        Import-PackageProvider PowerShellGet
+
+        #Download the version of PowerShellGet that we actually need
+        Write-Debug "Installing PowershellGet"
+        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue
+    }
+
+    Write-Debug "Importing PowershellGet"
+    Import-Module PowerShellGet -MinimumVersion 1.6 -Force
+    #Make sure we're actually using the package provider from the imported version of PowerShellGet
+    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null
+}
+
+function InstallLocalModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$moduleName,
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+    try {
+        InstallPowerShellGet
+
+        Write-Debug "Install $moduleName $requiredVersion"
+        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop
+    }
+    catch {
+        Write-Warning "Could not install $moduleName $requiredVersion from any registered PSRepository"
+    }
+}
+
+function GetHighestInstalledModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName,
+
+        [Parameter(Mandatory = $false)]
+        [Version]$minimumVersion,
+        [Parameter(Mandatory = $false)]
+        [Version]$maximumVersion
+    )
+
+    return Get-Module $moduleName -ListAvailable |
+           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |
+           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+           Select -First 1
+}
+
+function GetHighestInstallableModule {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $true, Position = 0)]
+        [string] $moduleName
+    )
+
+    try {
+        InstallPowerShellGet
+        Find-Module SqlChangeAutomation -AllVersions |
+            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |
+            Select -First 1
+    }
+    catch {
+        Write-Warning "Could not find any suitable versions of $moduleName from any registered PSRepository"
+    }
+}
+
+function GetInstalledSqlChangeAutomationVersion {
+    $scaModule = (Get-Module $SqlChangeAutomationModuleName)
+
+    if ($scaModule -ne $null) {
+        return $scaModule.Version
+    }
+
+    $dlmaModule = (Get-Module $DlmAutomationModuleName)
+
+    if ($dlmaModule -ne $null) {
+        return $dlmaModule.Version
+    }
+
+    return $null
+}
+
+function ConfigureProxyIfVariableSet
+{
+    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)
+    {
+        Write-Debug "Setting DefaultWebProxy to $proxyUrl"
+
+        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)
+        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials
+        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True
+    }
+}
+
+
+$ErrorActionPreference = 'Stop'
+$VerbosePreference = 'Continue'
+
+# Set process level FUR environment
+$env:REDGATE_FUR_ENVIRONMENT = "Octopus Step Templates"
+
+#Helper functions for paramter handling
+function Required() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw "You must enter a value for '$Name'" }
+}
+function Optional() {
+    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $false)]$Default
+    )
+    if ([string]::IsNullOrWhiteSpace($Parameter)) {
+        $Default
+    } else {
+        $Parameter
+    }
+}
+function RequireBool() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = $False
+    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a boolean value." }
+    $Result
+}
+function RequirePositiveNumber() {
+    Param(
+        [Parameter(Mandatory = $false)][string]$Parameter,
+        [Parameter(Mandatory = $true)][string]$Name
+    )
+    $Result = 0
+    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw "'$Name' must be a numerical value." }
+    if ($Result -lt 0) { throw "'$Name' must be >= 0." }
+    $Result
+}
+
+$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion
+$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default 'False'
+$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)
+InstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch
+
+# Check if SQL Change Automation is installed.
+$powershellModule = Get-Module -Name SqlChangeAutomation
+if ($powershellModule -eq $null) {
+    throw "Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected."
+}
+
+$currentVersion = $powershellModule.Version
+$minimumRequiredVersion = [version] '3.0.3'
+if ($currentVersion -lt $minimumRequiredVersion) {
+    throw "This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage"
+}
+
+$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'
+$minimumRequiredVersionTrustServerCertificate = [version]'4.3.20267'
+
+function AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)
+{
+    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)
+    {
+        return $true
+    }
+    elseif($encryptConnection -or $trustServerCertificate)
+    {
+        Write-Warning "Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion."
+        return $false
+    }
+}
+
+# Check the parameters.
+Required -Parameter $DLMAutomationNuGetDbPackageDownloadStepName -Name 'Database package step'
+Required -Parameter $DLMAutomationTargetDatabaseServer -Name 'Target SQL Server instance'
+Required -Parameter $DLMAutomationTargetDatabaseName -Name 'Target database name'
+$DLMAutomationTargetTrustServerCertificate = Optional -Parameter $DLMAutomationTargetTrustServerCertificate
+$DLMAutomationTargetEncrypt = Optional -Parameter $DLMAutomationTargetEncrypt
+$DLMAutomationTargetUsername = Optional -Parameter $DLMAutomationTargetUsername
+$DLMAutomationTargetPassword = Optional -Parameter $DLMAutomationTargetPassword
+$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath
+$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions
+$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions
+$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default "Serializable"
+$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default 'False'
+$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default "False"
+$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'
+$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder
+$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl
+
+$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'
+$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'
+
+# Get the NuGet package installation directory path.
+$packageExtractPath = $OctopusParameters["Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Output.Package.InstallationDirectoryPath"]
+if($packageExtractPath -eq $null) {
+    throw "The 'Database package download step' is not a 'Deploy a NuGet package' step: '$DLMAutomationNuGetDbPackageDownloadStepName'"
+}
+
+$targetConnectionOptions = @{ }
+
+if(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationTargetEncrypt), [bool]::Parse($DLMAutomationTargetTrustServerCertificate))) {
+    $targetConnectionOptions += @{ 'Encrypt' = [bool]::Parse($DLMAutomationTargetEncrypt) }
+    $targetConnectionOptions += @{ 'TrustServerCertificate' = [bool]::Parse($DLMAutomationTargetTrustServerCertificate) }
+}
+
+$targetDB = New-DatabaseConnection @targetConnectionOptions `
+                                   -ServerInstance $DLMAutomationTargetDatabaseServer `
+                                   -Database $DLMAutomationTargetDatabaseName `
+                                   -Username $DLMAutomationTargetUsername `
+                                   -Password $DLMAutomationTargetPassword
+
+$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packageExtractPath
+
+# Only allow sqlcmd variables that don't have special characters like spaces, colon or dashes
+$regex = '^[a-zA-Z_][a-zA-Z0-9_]+$'
+$sqlCmdVariables = @{}
+$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {
+	$sqlCmdVariables[$_] = $OctopusParameters[$_]
+}
+
+# Create database deployment resources from the NuGet package to the database
+$releaseParams = @{
+    Target = $targetDB
+    Source = $importedBuildArtifact
+    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel
+    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)
+    FilterPath = $DLMAutomationFilterPath
+    SQLCompareOptions = $DLMAutomationCompareOptions
+    SqlCmdVariables = $sqlCmdVariables
+}
+
+if($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {
+    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions
+} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {
+    Write-Warning "SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion."
+}
+
+$release = New-DatabaseReleaseArtifact @releaseParams
+
+# Deploy the source schema to the target database.
+Write-Host "Timeout = $queryBatchTimeout"
+$releaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}'] + $OctopusParameters['Octopus.Web.DeploymentLink'];
+$release | Use-DatabaseReleaseArtifact -DeployTo $targetDB -SkipPreUpdateSchemaCheck -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck
+
diff --git a/step-templates/Load-WIF-Issuer-Thumbprints.json b/step-templates/Load-WIF-Issuer-Thumbprints.json
deleted file mode 100644
index 0ec287675..000000000
--- a/step-templates/Load-WIF-Issuer-Thumbprints.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "Id": "77331575-0628-455d-b484-cfd4703e2081",
-  "Name": "Load WIF Issuer Thumbprint(s)",
-  "Description": "Updates the web/app config files' WIF TrustedIssuer thumbprints based on a realtime metadata request.\n\nChanges are made to the following section:\n/configuration/system.identityModel/identityConfiguration/issuerNameRegistry/trustedIssuers",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$FilePath          = \"#{FilePath}\"\r\n$TrustedIssuerName = \"#{TrustedIssuerName}\"\r\n$MetadataUri       = \"#{MetadataUri}\"\r\n\r\n\r\n[void][System.Reflection.Assembly]::LoadWithPartialName(\"System.Xml.Linq\")\r\n\r\n# because Octo calls powershell steps in a stupid manor...\r\n$charGT = [System.Text.Encoding]::ASCII.GetString( @(62) )\r\n\r\nfunction Get-Thumbprints($MetadataUri) {\r\n    $MetadataTxt = Invoke-WebRequest -Uri $MetadataUri\r\n    $MetadataXml = [xml]($MetadataTxt.Content)\r\n    \r\n    $outval = @()\r\n    # new certs\r\n    \r\n    $MetadataXml.EntityDescriptor.IDPSSODescriptor.KeyDescriptor | ? { $_.use -eq \"signing\" } | % {\r\n        $Cert_Bytes = [System.Convert]::FromBase64String( $_.KeyInfo.X509Data.X509Certificate )\r\n        $Cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2( , $Cert_Bytes ) # powershell is stupid about arrays\r\n        Write-Host \"Found certificate for [$($_.use)] : [$($cert.NotBefore.ToString(\"yyyyMMdd\")) - $($cert.NotAfter.ToString(\"yyyyMMdd\"))] : Thumbprint [$($Cert.Thumbprint)] for Subject [$($Cert.Subject)]\"\r\n        $outval += $Cert.Thumbprint\r\n    }\r\n    return $outval\r\n}\r\n\r\nfunction Get-TextIndex([string]$text, [int]$LineNumber = 0, [int]$LinePosition = 0) {\r\n    # Ported from : https://github.com/futurist/src-location/blob/master/index.js  function locationToIndex\r\n    # NOTE: diff from source to address bug. Test-GetTextIndex validates the changes.\r\n    $strLF = [char]10 # \\n\r\n    $strCR = [char]13 # \\r\r\n    $idx   = -1       # text index\r\n    $lc    = 1        # Line Count\r\n    for($i = 0; $lc -lt $LineNumber -and $i -lt $text.Length; $i++) {\r\n        $idx++\r\n        $c = $text[$i] # cur char\r\n        if ($c -eq $strLF -or $c -eq $strCR) {\r\n            $lc++\r\n            if ($c -eq $strCR -and $text[$i + 1] -eq $strLF) { # DOS CRLF\r\n                $i++\r\n                $idx++\r\n            }\r\n        }\r\n    }\r\n    return $idx + $LinePosition\r\n}\r\n\r\nfunction Replace-TrustedIssuerThumbprints($FilePath, $TrustedIssuerName, $Thumbprints) {\r\n    # Load the file twice - once as text for manipulation, once as XML for xpath and positions\r\n    $fileText      = [System.IO.File]::ReadAllText($FilePath)\r\n    $fileXml       = [System.Xml.Linq.XDocument]::Load($FilePath, [System.Xml.Linq.LoadOptions]::SetLineInfo -bor [System.Xml.Linq.LoadOptions]::PreserveWhitespace )\r\n    $IdpsXml       = $fileXml.Descendants(\"configuration\")[0].Descendants(\"system.identityModel\")[0].Descendants(\"identityConfiguration\")[0].Descendants(\"issuerNameRegistry\")[0].Descendants(\"trustedIssuers\")[0].Descendants(\"add\")\r\n\r\n    # Figure out which elements to manipulate... First delete from the bottom up, then replace the top-most element\r\n    $IdpMatches    = $IdpsXml | ? { $_.Attribute(\"name\").Value -eq $TrustedIssuerName } | Sort-Object -Property LineNumber, LinePosition -Descending\r\n    $IdpsToDelete  = $IdpMatches | Select-Object -First ($IdpMatches.Count - 1)\r\n    $IdpsToReplace = $IdpMatches | Select-Object -Last 1\r\n\r\n    # Delete from the bottom up, so that the LineNumber/LinePosition remain valid during the manipulation\r\n    foreach ($IdP in $IdpsToDelete) {\r\n        Write-Host ( \"DEL [{0}:{1}] {2}\" -f $IdP.LineNumber, $IdP.LinePosition, $IdP.ToString() )\r\n\r\n        $fileIdxOpen  = Get-TextIndex -text $fileText -LineNumber $IdP.LineNumber -LinePosition ( $IdP.LinePosition - 1 )\r\n        $fileIdxClose = $fileText.IndexOf($charGT, $fileIdxOpen) + 1 # add one to include the closing &gt;\r\n        $fileSubstr   = $fileText.Substring($fileIdxOpen, $fileIdxClose - $fileIdxOpen)\r\n        Write-Host ( \"    [$fileIdxOpen .. $fileIdxClose] : $fileSubstr\" )\r\n\r\n        $fileIdxPrior = $fileText.LastIndexOf($charGT, $fileIdxOpen) + 1\r\n        $fileText     = $fileText.Remove($fileIdxPrior, $fileIdxClose - $fileIdxPrior)\r\n    }\r\n    # Replace the top-most element with each thumbprint\r\n    foreach ($IdP in $IdpsToReplace) {\r\n        Write-Host ( \"FIX [{0}:{1}] {2}\" -f $IdP.LineNumber, $IdP.LinePosition, $IdP.ToString() )\r\n\r\n        $fileIdxOpen  = Get-TextIndex -text $fileText -LineNumber $IdP.LineNumber -LinePosition ( $IdP.LinePosition - 1 )\r\n        $fileIdxClose = $fileText.IndexOf($charGT, $fileIdxOpen) + 1 # add one to include the closing &gt;\r\n        $fileSubstr   = $fileText.Substring($fileIdxOpen, $fileIdxClose - $fileIdxOpen)\r\n        Write-Host ( \"    [$fileIdxOpen .. $fileIdxClose] : $fileSubstr\" )\r\n\r\n        $fileIdxPrior = $fileText.LastIndexOf($charGT, $fileIdxOpen) + 1\r\n        $ElementDelim = $fileText.Substring($fileIdxPrior, $fileIdxOpen - $fileIdxPrior)\r\n        Write-Host ( \"   -[{0} .. {1}]\" -f $fileIdxPrior, $fileIdxClose )\r\n        $fileText     = $fileText.Remove($fileIdxPrior, $fileIdxClose - $fileIdxPrior)\r\n        foreach ($Thumbprint in $Thumbprints) {\r\n            $newAttribs = [System.Xml.Linq.XAttribute[]]@(\r\n                                ( New-Object System.Xml.Linq.XAttribute(\"thumbprint\", $Thumbprint       ) ),\r\n                                ( New-Object System.Xml.Linq.XAttribute(\"name\"      , $TrustedIssuerName) )\r\n                            )\r\n            $newValue = ( New-Object System.Xml.Linq.XElement(\"add\", $newAttribs) ).ToString()\r\n            $fileText = $fileText.Insert($fileIdxPrior, $ElementDelim + $newValue)\r\n        }\r\n    }\r\n    return $fileText\r\n}\r\n\r\n\r\n$ThumbPrints       = Get-Thumbprints -MetadataUri $MetadataUri\r\n$fileContent       = Replace-TrustedIssuerThumbprints -FilePath $FilePath -TrustedIssuerName $TrustedIssuerName -Thumbprints $ThumbPrints\r\n[System.IO.File]::WriteAllText($FilePath, $fileContent)\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "9fa8d0c0-53a3-4d38-b183-bab04037869e",
-      "Name": "FilePath",
-      "Label": "web config file path",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e97dcceb-fbf1-41f2-9829-e32c6322fe58",
-      "Name": "TrustedIssuerName",
-      "Label": "Trusted Issuer Name",
-      "HelpText": "",
-      "DefaultValue": "https://adfs/adfs/services/trust",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9670671a-5d7e-4232-9d45-5fc47d005167",
-      "Name": "MetadataUri",
-      "Label": "Metadata Uri",
-      "HelpText": null,
-      "DefaultValue": "https://adfs/FederationMetadata/2007-06/FederationMetadata.xml",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2018-06-07T19:59:41.925Z",
-  "LastModifiedBy": "sbrickey",
-  "Category": "XML",
-  "$Meta": {
-    "ExportedAt": "2018-06-07T19:59:41.925Z",
-    "OctopusVersion": "3.17.2",
-    "Type": "ActionTemplate"
-  }
-}
diff --git a/step-templates/mariadb-add-database-user-to-role.json b/step-templates/mariadb-add-database-user-to-role.json
deleted file mode 100644
index 951976048..000000000
--- a/step-templates/mariadb-add-database-user-to-role.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "Id": "24095ff8-a851-498f-8105-667bd76733eb",
-    "Name": "MariaDB - Add Database User To Role",
-    "Description": "Adds a database user to a role",
-    "ActionType": "Octopus.Script",
-    "Version": 6,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-          "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled \n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserInRole\n{\n\t# Define parameters\n    param ($UserHostname,\n    $Username,\n    $RoleHostName,\n    $RoleName)\n    \n\t# Execute query\n    $grants = Invoke-SqlQuery \"SHOW GRANTS FOR '$Username'@'$UserHostName';\" -ConnectionName $connectionName\n\n    # Loop through Grants\n    foreach ($grant in $grants.ItemArray)\n    {\n        # Check grant\n        if ($grant -eq \"GRANT $RoleName TO '$Username'@'$UserHostName'\")\n        {\n            # They're in the group\n            return $true\n        }\n    }\n\n    # Not found\n    return $false\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Declare initial connection string\n$connectionString = \"Server=$addMariaDBServerName;Port=$addMariaDBServerPort;\"\n\n# Update the connection string based on authentication method\nswitch ($mariaDbAuthenticationMethod) {\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($addMariaDBServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $addLoginPasswordWithAddRoleRights = (aws rds generate-db-auth-token --hostname $addMariaDBServerName --region $region --port $addMariaDBServerPort --username $addLoginWithAddRoleRights)\n        \n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$addLoginWithAddRoleRights;Pwd=`\"$addLoginPasswordWithAddRoleRights`\";\"\n\n        break\n    }\n    \"usernamepassword\" {\n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$addLoginWithAddRoleRights;Pwd=`\"$addLoginPasswordWithAddRoleRights`\";\"\n        \n        break    \n    }\n    \"windowsauthentication\" {\n        # Append remaining portion of connection string\n        $connectionString += \";IntegratedSecurity=yes;Uid=$addLoginWithAddRoleRights;\"\n\n        break\n    }\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\ntry\n{\n    # Connect to MySQL\n    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName\n\n    # See if database exists\n    $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleName $addRoleName\n\n    if ($userInRole -eq $false)\n    {\n        # Create database\n        Write-Output \"Adding user $addUsername@$addUserHostName to role $addRoleName ...\"\n        $executionResults = Invoke-SqlUpdate \"GRANT $addRoleName TO '$addUsername'@'$addUserHostName';\" -ConnectionName $connectionName\n\n        # See if it was created\n        $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleName $addRoleName\n            \n        # Check array\n        if ($userInRole -eq $true)\n        {\n            # Success\n            Write-Output \"$addUserName@$addUserHostName added to $addRoleName successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"Failure adding $addUserName@$addUserHostName to $addRoleName!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $addUsername@$addUserHostName is already in role $addRoleName\"\n    }\n}\nfinally\n{\n    if ((Test-Connection -ConnectionName $connectionName) -eq $true)\n    {\n      Close-SqlConnection -ConnectionName $connectionName\n    }\n}\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "b6384c33-5196-40a4-b67f-f904eccbd795",
-        "Name": "addMariaDBServerName",
-        "Label": "MariaDB Server name",
-        "HelpText": "Name of the MariaDB database server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "6b8a13d6-7b7a-4cf2-8864-26b0c922a27f",
-        "Name": "addMariaDBServerPort",
-        "Label": "Port",
-        "HelpText": "Port the MariaDB listens on.",
-        "DefaultValue": "3306",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a8582fbc-4272-4098-8a99-6a28c9259958",
-        "Name": "addLoginWithAddRoleRights",
-        "Label": "Login name",
-        "HelpText": "Login name of a user that can add roles to other users.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d8e07293-a942-4ab3-9ef2-59092cc1fdc6",
-        "Name": "addLoginPasswordWithAddRoleRights",
-        "Label": "Login password",
-        "HelpText": "Password for the login account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "846984d9-3661-4938-9cd7-c6e2daa87c43",
-        "Name": "addUsername",
-        "Label": "User name",
-        "HelpText": "Name of the user to add the role to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ab3c26b1-d64b-4257-bd88-0b316ae21655",
-        "Name": "addUserHostname",
-        "Label": "User Hostname",
-        "HelpText": "Hostname of the user.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-    {
-        "Id": "da07dc32-a66d-453d-9dcb-e78ea525a31f",
-        "Name": "addRoleName",
-        "Label": "Role name",
-        "HelpText": "Name of the role to add to the user.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-            "Octopus.ControlType": "SingleLineText"
-        }
-    },
-    {
-        "Id": "0d29c6ce-724c-47bc-a4ef-42b123cf02bb",
-        "Name": "mariaDbAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the MariaDB server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-            "Octopus.ControlType": "Select",
-            "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password"
-        }
-    }
-    ],
-    "LastModifiedBy": "coryreid",
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2026-02-19T01:10:27.925Z",
-      "OctopusVersion": "2025.4.10425",
-      "Type": "ActionTemplate"
-    },
-    "Category": "mariadb"
-  }
diff --git a/step-templates/mariadb-create-database.json b/step-templates/mariadb-create-database.json
deleted file mode 100644
index b6c3320db..000000000
--- a/step-templates/mariadb-create-database.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "Id": "2bdfe600-e205-43f9-b174-67ee5d36bf5b",
-    "Name": "MariaDB - Create Database If Not Exists",
-    "Description": "Creates a MariaDB database if it doesn't already exist.",
-    "ActionType": "Octopus.Script",
-    "Version": 7,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled {\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {\n        # It is installed\n        return $true\n    }\n    else {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule {\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n    # Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n        # Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseExists {\n    # Define parameters\n    param ($DatabaseName)\n    \n    # Execute query\n    return Invoke-SqlQuery \"SHOW DATABASES LIKE '$DatabaseName';\" -ConnectionName $connectionName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true) {\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true) {\n    # Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n\n# Declare initial connection string\n$connectionString = \"Server=$createMariaDBServerName;Port=$createPort;\"\n\n# Update the connection string based on authentication method\nswitch ($mariaDbAuthenticationMethod) {\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($createMariaDBServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $createUserPassword = (aws rds generate-db-auth-token --hostname $createMariaDBServerName --region $region --port $createPort --username $createUsername)\n        \n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$createUsername;Pwd=`\"$createUserPassword`\";\"\n\n        break\n    }\n    \"usernamepassword\" {\n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$createUsername;Pwd=`\"$createUserPassword`\";\"\n        \n        break    \n    }\n    \"windowsauthentication\" {\n        # Append remaining portion of connection string\n        $connectionString += \";IntegratedSecurity=yes;Uid=$createUsername;\"\n\n        break\n    }\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\ntry {\n    # Connect to MySQL\n    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName\n\n    # See if database exists\n    $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName\n\n    if ($databaseExists.ItemArray.Count -eq 0) {\n        # Create database\n        Write-Output \"Creating database $createDatabaseName ...\"\n        $executionResult = Invoke-SqlUpdate \"CREATE DATABASE $createDatabaseName;\" -ConnectionName $connectionName\n\n        # Check result\n        if ($executionResult -ne 1) {\n            # Commit transaction\n            Write-Error \"Create schema failed.\"\n        }\n        else {\n            # See if it was created\n            $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName\n            \n            # Check array\n            if ($databaseExists.ItemArray.Count -eq 1) {\n                # Success\n                Write-Output \"$createDatabaseName created successfully!\"\n            }\n            else {\n                # Failed\n                Write-Error \"$createDatabaseName was not created!\"\n            }\n        }\n    }\n    else {\n        # Display message\n        Write-Output \"Database $createDatabaseName already exists.\"\n    }\n}\nfinally {\n    # Test to see if connection is open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n      Write-Host \"Closing connection ...\"\n      Close-SqlConnection -ConnectionName $connectionName\n    }\n}\n"
-    },
-    "Parameters": [
-      {
-        "Id": "8fc92b80-5122-44a0-b3d8-a1d022a35055",
-        "Name": "createMariaDBServerName",
-        "Label": "Server",
-        "HelpText": "Hostname (or IP) of the MariaDB database server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "df993ccf-71ab-48de-9a67-e2af6653d35e",
-        "Name": "createUsername",
-        "Label": "Username",
-        "HelpText": "Username to use for the connection",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8a07f25d-a7db-466e-a356-9155cbc5f258",
-        "Name": "createUserPassword",
-        "Label": "Password",
-        "HelpText": "Password for the user account",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "2af18465-c8d1-48f6-afce-1b1b30ae9559",
-        "Name": "createDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to create",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f55e2a34-7a82-4d92-83bb-a19f304774d8",
-        "Name": "createPort",
-        "Label": "Port",
-        "HelpText": "Port for the database instance.",
-        "DefaultValue": "3306",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "22bcb486-c796-412d-a7bc-e1a3e0d854a3",
-        "Name": "mariaDbAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the MariaDB server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-            "Octopus.ControlType": "Select",
-            "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password"
-        }
-    }
-    ],
-    "LastModifiedBy": "coryreid",
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2026-02-19T01:19:04.871Z",
-      "OctopusVersion": "2025.4.10425",
-      "Type": "ActionTemplate"
-    },
-    "Category": "mariadb"
-  }
diff --git a/step-templates/mariadb-create-user.json b/step-templates/mariadb-create-user.json
deleted file mode 100644
index 2304fa337..000000000
--- a/step-templates/mariadb-create-user.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "Id": "5e41412b-0839-4fa8-b7a1-9360115ef303",
-    "Name": "MariaDB - Create User If Not Exists",
-    "Description": "Creates a new user account on a MariaDB database server",
-    "ActionType": "Octopus.Script",
-    "Version": 6,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserExists\n{\n\t# Define parameters\n    param ($Hostname,\n    $Username)\n    \n\t# Execute query\n    return Invoke-SqlQuery \"SELECT * FROM mysql.user WHERE Host = '$Hostname' AND User = '$Username';\" -ConnectionName $connectionName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Declare initial connection string\n$connectionString = \"Server=$($createMariaDBServerName);Port=$($createMariaDBServerPort);\"\n\n# Update the connection string based on authentication method\nswitch ($mariaDbAuthenticationMethod) {\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($createMariaDBServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $createUserPassword = (aws rds generate-db-auth-token --hostname $createMariaDBServerName --region $region --port $createPort --username $createLoginWithAddUserRights)\n        \n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$($createLoginWithAddUserRights);Pwd=`\"$($createUserPassword)`\";\"\n\n        break\n    }\n    \"usernamepassword\" {\n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$($createLoginWithAddUserRights);Pwd=`\"$($createLoginPasswordWithAddUserRights)`\";\"\n        \n        break    \n    }\n    \"windowsauthentication\" {\n        # Append remaining portion of connection string\n        $connectionString += \";IntegratedSecurity=yes;Uid=$($createLoginWithAddUserRights);\"\n\n        break\n    }\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\ntry\n{\n    # Connect to MySQL\n    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName\n\n    # See if database exists\n    $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername\n\n    if ($userExists -eq $null)\n    {\n        # Create database\n        Write-Output \"Creating user $createNewUsername ...\"\n        $executionResults = Invoke-SqlUpdate \"CREATE USER '$createNewUsername'@'$createUserHostname' IDENTIFIED BY '$createNewUserPassword';\" -ConnectionName $connectionName\n\n        # See if it was created\n        $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername\n            \n        # Check array\n        if ($userExists -ne $null)\n        {\n            # Success\n            Write-Output \"$createNewUsername created successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"$createNewUsername was not created!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $createNewUsername on $createUserHostname already exists.\"\n    }\n}\nfinally\n{\n    # Test to see if connection is open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n      Write-Host \"Closing connection ...\"\n      Close-SqlConnection -ConnectionName $connectionName\n    }\n}\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "0fb5e63d-528c-4e7e-841d-6d4bd1ef47a4",
-        "Name": "createMariaDBServerName",
-        "Label": "MariaDB Server",
-        "HelpText": "Host name of the MariaDB server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "47364cd4-6c31-43f6-9585-cc97aca28d3c",
-        "Name": "createMariaDBServerPort",
-        "Label": "Port",
-        "HelpText": "Port number the MySQL server listens on.",
-        "DefaultValue": "3306",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cb9b74a5-f444-4b8c-b353-0eebd990e0a3",
-        "Name": "createLoginWithAddUserRights",
-        "Label": "Login name",
-        "HelpText": "Login name of a user with rights to create user accounts.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "699b3521-06dc-4e66-a20e-adce0fddab38",
-        "Name": "createLoginPasswordWithAddUserRights",
-        "Label": "Login Password",
-        "HelpText": "Password Login name.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "5b5ec614-a799-407d-870a-d3098794e049",
-        "Name": "createNewUsername",
-        "Label": "New user name",
-        "HelpText": "Name of the new user account to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8fe190a3-b3d5-4d4b-84d2-a4fe5bf2c99f",
-        "Name": "createNewUserPassword",
-        "Label": "New user password",
-        "HelpText": "Password for the new user account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "c7fd6115-ec4d-455b-b84b-d6eb19228140",
-        "Name": "createUserHostname",
-        "Label": "New user host name",
-        "HelpText": "Host name that the new user account is allowed to login from.  Enter % to allow the account to connect from anywhere.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-    {
-        "Id": "37569f0a-6cc7-4914-be50-0cc24484dcd9",
-        "Name": "mariaDbAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the MariaDB server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-            "Octopus.ControlType": "Select",
-            "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password"
-        }
-    }
-    ],
-    "LastModifiedBy": "coryreid",
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2026-02-19T01:20:22.243Z",
-      "OctopusVersion": "2025.4.10425",
-      "Type": "ActionTemplate"
-    },
-    "Category": "mariadb"
-}
diff --git a/step-templates/mongodb-add-update-user-roles.json b/step-templates/mongodb-add-update-user-roles.json
deleted file mode 100644
index e987de346..000000000
--- a/step-templates/mongodb-add-update-user-roles.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "Id": "d93bcfdc-d3f8-4c83-9fd7-d35c9a8d1f2b",
-    "Name": "MongoDB - Add or update user roles ",
-    "Description": "Adds roles to an existing user in a MongoDB database.",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    $moduleParameters = @{\n      Name = $PowerShellModuleName\n      Path = $LocalModulesPath\n      Force = $true\n    }\n\n    # Check the version of PowerShell\n    if ($PSVersionTable.PSVersion.Major -lt 7)\n    {\n      # Add specific version of powershell module to use\n      $moduleParameters.Add(\"MaximumVersion\", \"6.7.4\")\n    }\n\n\t# Save the module in the temporary location\n    Save-Module @moduleParameters\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseUserExists\n{\n\t# Define parameters\n    param ($UserName)\n    \n    # Define working variables\n    $userExists = $false\n    \n\t# Get users for database\n    $command = @\"\n{ usersInfo: 1 }\n\"@\n\n\t$results = Invoke-MdbcCommand -Command $command\n    $users = $results[\"users\"]\n    \n    # Loop through returned results\n    foreach ($user in $users)\n    {\n    \tif ($user[\"user\"] -eq $UserName)\n        {\n        \treturn $true\n        }\n    }\n    \n    return $false\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"Mdbc\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Connect to mongodb instance\n$connectionUrl = \"mongodb://$($MongoDBAdminUsername):$($MogoDBAdminUserpassword)@$($MongoDBServerName):$($MongoDBPort)\"\n\n# Connect to MongoDB server\nConnect-Mdbc $connectionUrl $MongoDBDatabaseName\n\n# Get whether the database exits\nif ((Get-DatabaseUserExists -UserName $MongoDBUsername) -eq $true)\n{\n\t# Create user\n    Write-Output \"Adding $MongoDBRoles to $MongoDBUsername.\"\n    \n    # Create Roles array for adding\n    $roles = @()\n    foreach ($MongoDBRole in $MongoDBRoles.Split(\",\"))\n    {\n    \t$roles += @{\n        \trole = $MongoDBRole.Trim()\n            db = $MongoDBDatabaseName\n        }\n    }\n\n    # Define create user command\n    $command = @\"\n{\n\tupdateUser: `\"$MongoDBUsername`\"    \n    roles: $(ConvertTo-Json $roles)\n}\n\"@\n\n\t# Create user account\n    $result = Invoke-MdbcCommand -Command $command\n    \n    # Check to make sure it was created successfully\n    if ($result.ContainsKey(\"ok\"))\n    {\n    \tWrite-Output \"Successfully added role(s) $MongoDBRoles to $MongoDBUsername in database $MongoDBDatabaseName.\"\n    }\n    else\n    {\n    \tWrite-Error \"Failed, $result\"\n    }\n}\nelse\n{\n\tWrite-Error \"Unable to add role(s) to $MongoDBUsername, user does not exist in $MongoDBDatabaseName.\"\n}\n\n\n\n\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "d6343cb6-40d3-47a8-898f-ff3aeb6f9c1a",
-        "Name": "MongoDBServerName",
-        "Label": "Server Name",
-        "HelpText": "Name or IP address of the MongoDB server instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "75eae92c-0081-481b-b79a-73524a798349",
-        "Name": "MongoDBPort",
-        "Label": "Port",
-        "HelpText": "Port number the MongoDB instance is listening on.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "dbb4ef7a-ab79-4036-ac7b-466d683341f5",
-        "Name": "MongoDBDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to use.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0f0612d3-e039-4940-bcb7-a3333266ae95",
-        "Name": "MongoDBAdminUsername",
-        "Label": "Admin Username",
-        "HelpText": "User account with rights to query the users in the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fbdb0e70-33d5-41a6-b316-66f1be7e5a18",
-        "Name": "MogoDBAdminUserpassword",
-        "Label": "Admin Password",
-        "HelpText": "Password for the admin account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "c151f9f5-36f3-47ab-80b7-7dcb18bb7ff8",
-        "Name": "MongoDBUsername",
-        "Label": "Username",
-        "HelpText": "Username to add roles to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c705b32d-c416-40fc-869d-88fc307fe94f",
-        "Name": "MongoDBRoles",
-        "Label": "Roles",
-        "HelpText": "A comma-delimited list of roles to add the user account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2024-10-28T21:13:02.226Z",
-      "OctopusVersion": "2024.3.12899",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "mongodb"
-  }
diff --git a/step-templates/mongodb-atlas-pause-resume-cluster.json b/step-templates/mongodb-atlas-pause-resume-cluster.json
deleted file mode 100644
index dab7c8863..000000000
--- a/step-templates/mongodb-atlas-pause-resume-cluster.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "Id": "2339fa87-ba06-4014-b918-ec1bdc4690e4",
-  "Name": "MongoDB Atlas - Pause or Resume cluster",
-  "Description": "Allow the user to pause/resume the asked cluster.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Author": "claude-uceda",
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$cluster = $OctopusParameters[\"matlas-cluster-name\"]\n$project = $OctopusParameters[\"matlas-project-id\"]\n$check_delay_seconds = $OctopusParameters[\"matlas-check-delay-seconds\"]\n\n$login = $OctopusParameters[\"matlas-public-key\"]\n$secret = $OctopusParameters[\"matlas-private-key\"]\n\n$pause = [System.Convert]::ToBoolean($OctopusParameters[\"matlas-pause\"])\n$check_delay_seconds_nb = ($check_delay_seconds -as [int])\n\nfunction Check-Required($name, $value) {\n\tif($value -eq $null -or $value -eq ''){\n    \tWrite-Error -Message \"Missing parameter or invalid value for '$name'. ($value)\" -ErrorAction Stop\n    }\n}\n\nCheck-Required 'matlas-public-key' $login\nCheck-Required 'matlas-private-key' $secret\nCheck-Required 'matlas-project-id' $project\nCheck-Required 'matlas-cluster-name' $cluster\nCheck-Required 'matlas-check-delay-seconds' $check_delay_seconds_nb\n\n$action = \"Pausing\"\nif($pause -eq $false){\n\t$action = \"Resuming\"\n}\n\nWrite-Host \"$action $($project)/$($cluster) using $login.\"\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction Invoke-Api($uri, $method, $content) {\n\n\t$securedPassword = ConvertTo-SecureString -String $secret -AsPlainText -Force\t\n\t$credentials = New-Object System.Management.Automation.PSCredential ($login, $securedPassword)\n\n\ttry {\n\t\treturn Invoke-RestMethod -Uri $uri -Method $method -Credential $credentials -ContentType \"application/json\" -Body $content\n\t}\n\tcatch {\n\t\tWrite-Error -Message $_ -ErrorAction Stop\n\t}\n}\n\n\n$root = \"https://cloud.mongodb.com/api/atlas/v1.0\"\n$uri = New-Object System.Uri(\"$root/groups/$project/clusters/$cluster\")\n$data = Invoke-Api $uri \"GET\"\n\nif ($data.paused -ne $pause) {\t\n\t$value = $pause.ToString().ToLower()\n\t$data = Invoke-Api $uri \"PATCH\" \"{`\"paused`\": $value}\"\t\n\t\n\twhile ($data.stateName -eq \"REPAIRING\" -or $data.stateName -eq \"UPDATING\") {\n\n\t\tWrite-Host \"Waiting for change to be applied. Cluster status : $($data.stateName).\"\t\t\n\t\tStart-Sleep -s $check_delay_seconds_nb\t\n\t\t$data = Invoke-Api $uri \"GET\"\n\t}\t\n\n\tWrite-Host \"Change applied. $Cluster status : $($data.stateName).\"\n}\nelse {\n\t\n\t$action = If ($pause) { \"paused\" } Else { \"running\" }\n\tWrite-Host \"Cluster already $action, no change applied. $Cluster status : $($data.stateName).\"\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "7b92df2e-5469-4e97-a379-ccfe6eb942d9",
-      "Name": "matlas-public-key",
-      "Label": "Public key",
-      "HelpText": "Mongo atlas public key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "51ced2a8-b158-4c0e-9244-081d429a1814",
-      "Name": "matlas-private-key",
-      "Label": "Private key",
-      "HelpText": "Mongo atlas private key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "3f62699d-32c3-4eb0-8925-f6ad2e288de9",
-      "Name": "matlas-project-id",
-      "Label": "Project id",
-      "HelpText": "Project/group id of the cluster.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "215ed2bf-a5fd-4860-9006-c2525f96815e",
-      "Name": "matlas-cluster-name",
-      "Label": "Cluster name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f1eb059b-d8e7-46c8-a084-77b0d3a872a4",
-      "Name": "matlas-pause",
-      "Label": "Action",
-      "HelpText": "If the cluster needs to be paused or resumed.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "True|Pause\nFalse|Resume"
-      }
-    },
-    {
-      "Id": "e1975200-57aa-4159-a1cc-bb1d5fbfca2e",
-      "Name": "matlas-check-delay-seconds",
-      "Label": "Status check delay",
-      "HelpText": "Delay in seconds between each statuses check.",
-      "DefaultValue": "15",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2022-10-03T10:51:25.583Z",
-    "OctopusVersion": "2020.6.5394",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "claude-uceda",
-  "Category": "mongodb"
-}
diff --git a/step-templates/mongodb-atlas-restore-snapshot.json b/step-templates/mongodb-atlas-restore-snapshot.json
deleted file mode 100644
index b2c4e42ab..000000000
--- a/step-templates/mongodb-atlas-restore-snapshot.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "Id": "bf062dfe-de07-462c-8e7d-ec062b29e550",
-  "Name": "MongoDB Atlas - Restore cluster from latest snapshot",
-  "Description": "Allow the user to restore a cluster from the latest snapshot.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Author": "claude-uceda",
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$project_source = $OctopusParameters[\"matlas-project-source\"]\n$cluster_source = $OctopusParameters[\"matlas-cluster-source\"]\n$project_target = $OctopusParameters[\"matlas-project-target\"]\n$cluster_target = $OctopusParameters[\"matlas-cluster-target\"]\n$check_delay_seconds = $OctopusParameters[\"matlas-check-delay-seconds\"]\n\n$login = $OctopusParameters[\"matlas-public-key\"]\n$secret = $OctopusParameters[\"matlas-private-key\"]\n\n$check_delay_seconds_nb = ($check_delay_seconds -as [int])\n\nfunction Check-Required($name, $value) {\n\tif($value -eq $null -or $value -eq ''){\n    \tWrite-Error -Message \"Missing parameter or invalid value for '$name'. ($value)\" -ErrorAction Stop\n    }\n}\n\nCheck-Required 'matlas-public-key' $login\nCheck-Required 'matlas-private-key' $secret\nCheck-Required 'matlas-project-source' $project_source\nCheck-Required 'matlas-cluster-source' $cluster_source\nCheck-Required 'matlas-project-target' $project_target\nCheck-Required 'matlas-cluster-target' $cluster_target\nCheck-Required 'matlas-check-delay-seconds' $check_delay_seconds_nb\n\nWrite-Host \"Restoring from $($project_source)/$($cluster_source) to $($project_target)/$($cluster_target) using $login.\"\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction Invoke-Api($uri, $method, $content) {\t\n\n\t$securedPassword = ConvertTo-SecureString -String $secret -AsPlainText -Force\t\n\t$credentials = New-Object System.Management.Automation.PSCredential ($login, $securedPassword)\n\n\ttry {\n\t\treturn Invoke-RestMethod -Uri $uri -Method $method -Credential $credentials -ContentType \"application/json\" -Body $content\n\t}\n\tcatch {\n\t\tWrite-Error -Message $_ -ErrorAction Stop\n\t}\n}\n\n$root = \"https://cloud.mongodb.com/api/atlas/v1.0\"\n$uri = New-Object System.Uri(\"$root/groups/$project_source/clusters/$cluster_source/backup/snapshots?itemsPerPage=5\")\n$results = Invoke-Api $uri \"GET\"\n$snapshots = $results.results | Where-Object { $_.status -eq \"completed\" }\n$snapshot = $snapshots[0]\n\n$uri = New-Object System.Uri(\"$root/groups/$project_source/clusters/$cluster_source/backup/restoreJobs\")\n$request = \"{`\"deliveryType`\":`\"automated`\", `\"snapshotId`\":`\"$($snapshot.id)`\", `\"targetClusterName`\":`\"$cluster_target`\", `\"targetGroupId`\":`\"$project_target`\"}\"\n$job = Invoke-Api $uri \"POST\" $request\n\n$uri = New-Object System.Uri(\"$root/groups/$project_source/clusters/$cluster_source/backup/restoreJobs/$($job.id)\")\nwhile ($null -eq $job.finishedAt -or $job.finishedAt -eq \"\") {\n\n\tWrite-Host \"Waiting for restore to complete.\"\t\n\tStart-Sleep -s $check_delay_seconds_nb\n\t$job = Invoke-Api $uri \"GET\"\n}\n\nWrite-Host \"Restore completed.\"\n"
-  },
-  "Parameters": [
-    {
-      "Id": "0cfd5665-9bfc-413a-bc4a-7778a860b7f0",
-      "Name": "matlas-public-key",
-      "Label": "Public key",
-      "HelpText": "Mongo atlas public key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "61cff00c-69b5-44b5-873d-742430ca2beb",
-      "Name": "matlas-private-key",
-      "Label": "Private key",
-      "HelpText": "Mongo atlas private key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "3d86c70a-2a6c-4cb7-a04e-f7f43838554c",
-      "Name": "matlas-project-source",
-      "Label": "Project source's id",
-      "HelpText": "Project id of the cluster that will be the snapshot source.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2a32df2e-641d-41a0-9e56-dba341efe58d",
-      "Name": "matlas-cluster-source",
-      "Label": "Cluster source's name",
-      "HelpText": "Cluster that will be used to get the snapshot.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "bff9846a-980e-4a8f-b6bb-b43de82397c1",
-      "Name": "matlas-project-target",
-      "Label": "Project target's id",
-      "HelpText": "Project id of the cluster that will used to restore the snapshot.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e2aaa07d-9122-47ee-b3e9-008949ed5709",
-      "Name": "matlas-cluster-target",
-      "Label": "Cluster target's name",
-      "HelpText": "Cluster that will be used to restore the snapshot.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ac4c10c6-e487-4cec-902d-7cfaab7a3934",
-      "Name": "matlas-check-delay-seconds",
-      "Label": "Status check delay",
-      "HelpText": "Delay in seconds between each statuses check.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2022-10-03T10:52:04.423Z",
-    "OctopusVersion": "2020.6.5394",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "claude-uceda",
-  "Category": "mongodb"
-}
diff --git a/step-templates/mongodb-create-database.json b/step-templates/mongodb-create-database.json
deleted file mode 100644
index dddd41d84..000000000
--- a/step-templates/mongodb-create-database.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "Id": "4de90708-1f76-4103-ab27-e9fd1916fa07",
-    "Name": "MongoDB - Create Database if not exists",
-    "Description": "Creates a new database on a MongoDB server with an initial collection.",
-    "ActionType": "Octopus.Script",
-    "Version": 4,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    $moduleParameters = @{\n      Name = $PowerShellModuleName\n      Path = $LocalModulesPath\n      Force = $true\n    }\n\n    # Check the version of PowerShell\n    if ($PSVersionTable.PSVersion.Major -lt 7)\n    {\n      # Add specific version of powershell module to use\n      $moduleParameters.Add(\"MaximumVersion\", \"6.7.4\")\n    }\n\n\t# Save the module in the temporary location\n    Save-Module @moduleParameters\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseExists\n{\n\t# Define parameters\n    param ($DatabaseName)\n    \n\t# Execute query\n    $mongodbDatabases = Get-MdbcDatabase\n    \n    return $mongodbDatabases.DatabaseNamespace -contains $DatabaseName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"Mdbc\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Connect to mongodb instance\n$connectionUrl = \"mongodb://$($MongoDBUsername):$($MogoDBUserpassword)@$($MongoDBServerName):$($MongoDBPort)\"\n\n# Connect to MongoDB server\nConnect-Mdbc $connectionUrl \"admin\"\n\n# Get whether the database exits\nif ((Get-DatabaseExists -DatabaseName $MongoDBDatabaseName) -ne $true)\n{\n\t# Create database\n    Write-Output \"Database $MongoDBDatabaseName doesn't exist.\"\n    Connect-Mdbc $connectionUrl \"$MongoDBDatabaseName\"\n    \n    # Databases don't get created unless some data has been added\n    Add-MdbcCollection $MongoDBInitialCollection\n    \n    # Check to make sure it was successful\n    if ((Get-DatabaseExists -DatabaseName $MongoDBDatabaseName))\n    {\n    \t# Display success\n        Write-Output \"$MongoDBDatabaseName created successfully.\"        \n    }\n    else\n    {\n    \tWrite-Error \"Failed to create $MongoDBDatabaseName!\"\n    }\n}\nelse\n{\n\tWrite-Output \"Database $MongoDBDatabaseName already exists.\"\n}\n\n\n\n\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "d6343cb6-40d3-47a8-898f-ff3aeb6f9c1a",
-        "Name": "MongoDBServerName",
-        "Label": "Server Name",
-        "HelpText": "Name or IP address of the MongoDB server instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "75eae92c-0081-481b-b79a-73524a798349",
-        "Name": "MongoDBPort",
-        "Label": "Port",
-        "HelpText": "Port number the MongoDB instance is listening on.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "dbb4ef7a-ab79-4036-ac7b-466d683341f5",
-        "Name": "MongoDBDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8fabfc02-2f33-4663-9af3-b8c2f74e0175",
-        "Name": "MongoDBInitialCollection",
-        "Label": "Initial Collection",
-        "HelpText": "Name of the Initial Collection in the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "0f0612d3-e039-4940-bcb7-a3333266ae95",
-        "Name": "MongoDBUsername",
-        "Label": "Username",
-        "HelpText": "Username to connect with.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fbdb0e70-33d5-41a6-b316-66f1be7e5a18",
-        "Name": "MogoDBUserpassword",
-        "Label": "Password",
-        "HelpText": "Password for the user to connect with.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2024-10-28T21:07:02.249Z",
-      "OctopusVersion": "2024.3.12899",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-    "LastModifiedBy": "twerthi",
-    "Category": "mongodb"
-  }
diff --git a/step-templates/mongodb-create-user.json b/step-templates/mongodb-create-user.json
deleted file mode 100644
index 0206047cc..000000000
--- a/step-templates/mongodb-create-user.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "Id": "d7504483-0d48-49b5-b75c-b65dde8fc2bf",
-    "Name": "MongoDB - Create User if not exists",
-    "Description": "Creates a new database user on a MongoDB server.",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    $moduleParameters = @{\n      Name = $PowerShellModuleName\n      Path = $LocalModulesPath\n      Force = $true\n    }\n\n    # Check the version of PowerShell\n    if ($PSVersionTable.PSVersion.Major -lt 7)\n    {\n      # Add specific version of powershell module to use\n      $moduleParameters.Add(\"MaximumVersion\", \"6.7.4\")\n    }\n\n\t# Save the module in the temporary location\n    Save-Module @moduleParameters\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseUserExists\n{\n\t# Define parameters\n    param ($UserName)\n    \n    # Define working variables\n    $userExists = $false\n    \n\t# Get users for database\n    $command = @\"\n{ usersInfo: 1 }\n\"@\n\n\t$results = Invoke-MdbcCommand -Command $command\n    $users = $results[\"users\"]\n    \n    # Loop through returned results\n    foreach ($user in $users)\n    {\n    \tif ($user[\"user\"] -eq $UserName)\n        {\n        \treturn $true\n        }\n    }\n    \n    return $false\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"Mdbc\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Connect to mongodb instance\n$connectionUrl = \"mongodb://$($MongoDBAdminUsername):$($MogoDBAdminUserpassword)@$($MongoDBServerName):$($MongoDBPort)\"\n\n# Connect to MongoDB server\nConnect-Mdbc $connectionUrl $MongoDBDatabaseName\n\n# Get whether the database exits\nif ((Get-DatabaseUserExists -UserName $MongoDBUsername) -ne $true)\n{\n\t# Create user\n    Write-Output \"User $MongoDBUsername doesn't exist in database $MongoDBDatabaseName.\"\n    \n    # Define create user command\n    $command = @\"\n{\n\tcreateUser: `\"$MongoDBUsername`\"\n    pwd: `\"$MongoDBUserPassword`\"\n    roles: []\n}\n\"@\n\n\t# Create user account\n    $result = Invoke-MdbcCommand -Command $command\n    \n    # Check to make sure it was created successfully\n    if ($result.ContainsKey(\"ok\"))\n    {\n    \tWrite-Output \"User $MongoDBUsername successfully created in database $MongoDBDatabaseName.\"\n    }\n    else\n    {\n    \tWrite-Error \"Failed, $result\"\n    }\n}\nelse\n{\n\tWrite-Output \"User $MongoDBUsername already exists in database $MongoDBDatabaseName.\"\n}\n\n\n\n\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "d6343cb6-40d3-47a8-898f-ff3aeb6f9c1a",
-        "Name": "MongoDBServerName",
-        "Label": "Server Name",
-        "HelpText": "Name or IP address of the MongoDB server instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "75eae92c-0081-481b-b79a-73524a798349",
-        "Name": "MongoDBPort",
-        "Label": "Port",
-        "HelpText": "Port number the MongoDB instance is listening on.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "dbb4ef7a-ab79-4036-ac7b-466d683341f5",
-        "Name": "MongoDBDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to add the user to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0f0612d3-e039-4940-bcb7-a3333266ae95",
-        "Name": "MongoDBAdminUsername",
-        "Label": "Admin Username",
-        "HelpText": "User account with rights to query the users in the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fbdb0e70-33d5-41a6-b316-66f1be7e5a18",
-        "Name": "MogoDBAdminUserpassword",
-        "Label": "Admin Password",
-        "HelpText": "Password for the admin account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "c151f9f5-36f3-47ab-80b7-7dcb18bb7ff8",
-        "Name": "MongoDBUsername",
-        "Label": "Username",
-        "HelpText": "Username to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3cb55ad5-8dc3-4f12-a35f-aaa30957313b",
-        "Name": "MongoDBUserPassword",
-        "Label": "Password",
-        "HelpText": "Password for the account to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2024-10-28T21:10:17.114Z",
-      "OctopusVersion": "2024.3.12899",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "mongodb"
-  }
diff --git a/step-templates/msmq-create-transactional-queue.json b/step-templates/msmq-create-transactional-queue.json
deleted file mode 100644
index 142543168..000000000
--- a/step-templates/msmq-create-transactional-queue.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "Id": "4c22f201-c634-4a22-aa55-ae24dc83d588",
-  "Name": "MSMQ - Create Transactional Queue",
-  "Description": "Create one or more MSMQ transactional queues and configure permissions.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$MSMQQueues = $OctopusParameters['MSMQQueues']\n$MSMQResetPermissions = $OctopusParameters['MSMQResetPermissions']\n$MSMQResetDomains = $OctopusParameters['MSMQResetDomains']\n$MSMQUsers = $OctopusParameters['MSMQUsers']\n$MSMQPermAllow = $OctopusParameters['MSMQPermAllow']\n$MSMQPermDeny = $OctopusParameters['MSMQPermDeny']\n$MSMQAdminUsers = $OctopusParameters['MSMQAdminUsers']\n$MSMQPermAdminAllow = $OctopusParameters['MSMQPermAdminAllow']\n$MSMQPermAdminDeny = $OctopusParameters['MSMQPermAdminDeny']\n\nWrite-Verbose \"`$MSMQQueues = $MSMQQueues\"\nWrite-Verbose \"`$MSMQResetPermissions = $MSMQResetPermissions\"\nWrite-Verbose \"`$MSMQResetDomains = $MSMQResetDomains\"\nWrite-Verbose \"`$MSMQUsers = $MSMQUsers\"\nWrite-Verbose \"`$MSMQPermAllow = $MSMQPermAllow\"\nWrite-Verbose \"`$MSMQPermDeny = $MSMQPermDeny\"\nWrite-Verbose \"`$MSMQAdminUsers = $MSMQAdminUsers\"\nWrite-Verbose \"`$MSMQPermAdminAllow = $MSMQPermAdminAllow\"\nWrite-Verbose \"`$MSMQPermAdminDeny = $MSMQPermAdminDeny\"\n\n#Split the Queues into an array\n$arrQueues = $MSMQQueues.split(\";\")\nforeach ($Queue in $arrQueues) \n{\n    #Does Queue Exists Already?\n    $thisQueue = Get-MSMQQueue $Queue\n    if (!$thisQueue)\n    {\n        #not found, create\n        Write-Output \"Creating Queue: \" $Queue\n        New-MsmqQueue -Name \"$Queue\" -Label \"private$\\$Queue\" -Transactional | Out-Null\n        $thisQueue = Get-MSMQQueue $Queue    \n    }\n    else\n    {\n        Write-Output \"Queue Exists: \" $thisQueue.QueueName\n        \n        if($MSMQResetPermissions -eq \"True\")\n        {\n            foreach($domain in $MSMQResetDomains.split(\";\"))\n            {\n                # reset permissions\n                $QueuePermissions = $thisQueue | Get-MsmqQueueACL\n                foreach ($AccessItem in $MSMQQueuePermissions)\n                {\n                    $userName = [Environment]::UserName\n                    if($AccessItem.AccountName -NotLike \"*$userName\") # not current user\n                    {\n                        $domain = \"$($domain)*\" #append * to end of domain\n                        if ($AccessItem.AccountName -Like \"$($domain)*\")\n                        {\n                            Write-Output \"Removing Permissions $($AccessItem.Right) for $($AccessItem.AccountName)\"\n                            Try\n                            {\n                                $thisQueue | Set-MsmqQueueACL -UserName $AccessItem.AccountName -Remove $AccessItem.Right | Out-Null\n                            }\n                            Catch\n                            {\n                                Write-Output \"Could not set permissions item $_.Exception.Message\"\n                                Break\n                            }\n                        }\n                    }\n                }\n            }\n        }\n    }\n\n    #set acl for users\n    $arrUsers = $MSMQUsers.split(\";\")\n    foreach ($User in $arrUsers)     \n    {    \n        if ($User)\n        {    \n            Write-Output \"Adding ACL for User: \" $User        \n            \n            #allows\n            if ($MSMQPermAllow)\n            {\n                $arrPermissions = $MSMQPermAllow.split(\";\")\n                foreach ($Permission in $arrPermissions)     \n                {\n                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Allow $Permission | Out-Null                \n                    Write-Output \"ACL Allow set: $Permission\"\n                }\n            }\n                \n            #denies\n            if ($MSMQPermDeny)\n            {\n                $arrPermissions = $MSMQPermDeny.split(\";\")\n                foreach ($Permission in $arrPermissions)     \n                {\n                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Deny $Permission | Out-Null\n                    Write-Output \"ACL Deny set: $Permission\"\n                }\n            }\n        }\n    }   \n    \n    \n    $arrAdminUsers = $MSMQAdminUsers.split(\";\") \n    foreach ($User in $arrAdminUsers)     \n    {    \n        if ($User)\n        { \n            Write-Output \"Adding ACL for Admin User: \" $User        \n            \n            #allows\n            if ($MSMQPermAdminAllow)\n            {\n                $arrPermissions = $MSMQPermAdminAllow.split(\";\")\n                foreach ($Permission in $arrPermissions)     \n                {\n                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Allow $Permission | Out-Null                \n                    Write-Output \"ACL Allow admin set: $Permission\"\n                }\n            }\n                \n            #denies\n            if ($MSMQPermAdminDeny)\n            {\n                $arrPermissions = $MSMQPermAdminDeny.split(\";\")\n                foreach ($Permission in $arrPermissions)     \n                {\n                    $thisQueue | Set-MsmqQueueAcl -UserName $User -Deny $Permission | Out-Null\n                    Write-Output \"ACL Deny admin set: $Permission\"\n                }\n            }\n        }\n    }\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "35154cac-d005-4a7b-85c9-8eab276e726b",
-      "Name": "MSMQQueues",
-      "Label": "Queue names",
-      "HelpText": "Queue names, separated by semicolons. Example: _Queue1;Queue2;Queue3_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6f3a90b7-df04-4884-9cd1-f04ad7a1f97b",
-      "Name": "MSMQUsers",
-      "Label": "Queue users",
-      "HelpText": "Users with access to the queue separated by semicolons. Example: _DOMAIN\\User1;DOMAIN\\User2_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3e2e1512-6f75-4e36-80cc-d350a3563a09",
-      "Name": "MSMQPermAllow",
-      "Label": "Allowed permissions",
-      "HelpText": "Permissions granted to the queue users, separated by semicolons. Example: _DeleteMessage;PeekMessage;ReceiveMessage_",
-      "DefaultValue": "DeleteMessage;PeekMessage;ReceiveMessage;WriteMessage",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2063989e-587f-4787-b3ce-6865501316b2",
-      "Name": "MSMQPermDeny",
-      "Label": "Denied permissions",
-      "HelpText": "Denied permissions, separated by semicolons: _TakeQueueOwnership_",
-      "DefaultValue": "TakeQueueOwnership",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "42ec591d-9631-4ff4-ac56-94a1ac7c5994",
-      "Name": "MSMQAdminUsers",
-      "Label": "Admin queue users",
-      "HelpText": "Users with access to the queue separated by semicolons. Example: _DOMAIN\\User1;DOMAIN\\User2_",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "47dee55f-9d5a-4798-a61c-b4c7350774a5",
-      "Name": "MSMQPermAdminAllow",
-      "Label": "Allowed admin permissions",
-      "HelpText": "Permissions granted to the queue admin users, separated by semicolons. Example: _DeleteMessage;PeekMessage;ReceiveMessage_",
-      "DefaultValue": "FullControl",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "949b3efb-5fb7-4350-8336-1dfff67172aa",
-      "Name": "MSMQPermAdminDeny",
-      "Label": "Denied admin permissions",
-      "HelpText": "Denied permissions, separated by semicolons: _TakeQueueOwnership_",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2be54d36-3b81-4a39-8685-adfe8d98ebbb",
-      "Name": "MSMQResetPermissions",
-      "Label": "Reset Permissions",
-      "HelpText": "Remove all existing permissions from the Queue if it already exists",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "54143721-075f-4270-89c1-154719ee0b3c",
-      "Name": "MSMQResetDomains",
-      "Label": "Reset Permissions Domains",
-      "HelpText": "This is used if Reset Permissions is set.\nExample: YOURDOMAIN1;YOURDOMAIN2",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2018-03-28T07:21:22.039Z",
-    "OctopusVersion": "2018.2.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
diff --git a/step-templates/mulesoft-cloudhub.json b/step-templates/mulesoft-cloudhub.json
deleted file mode 100644
index b0d2e64eb..000000000
--- a/step-templates/mulesoft-cloudhub.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "Id": "35450be7-a9a2-415f-82b4-6503ca148f22",
-  "Name": "Mulesoft - Deploy to Cloudhub",
-  "Description": "Deploys a Mulesoft API to Cloudhub",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "a8d60939-169c-4026-a9b3-3789b2bb0152",
-      "Name": "Mulesoft.Asset",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "False",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Mulesoft.Asset.File",
-        "Purpose": ""
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Get-NpmExecutable\n{\n\t# Define parameters\n    param (\n    \t$NodeVersion = \"18.16.0\"\n    )\n       \n    # Declare local variables\n    $npmDownloadUrl = \"https://nodejs.org/dist/v$NodeVersion/\"\n    $downloadFileName = [string]::Empty\n    $npmExecutable = [string]::Empty\n    \n    # Assign download url\n    if ($IsWindows)\n    {\n    \t$downloadFileName += \"node-v$($NodeVersion)-win-x64.zip\"\n    }\n    else\n    {\n    \t$downloadFileName += \"node-v$($NodeVersion)-linux-x64.tar.xz\"\n    }\n\n\t# Create folder for npm\n    if ((Test-Path -Path \"$PWD/npm\") -eq $false)\n    {\n    \tNew-Item -Path \"$PWD/npm\" -ItemType \"Directory\"\n    }\n    \n    # Download npm binary\n    Write-Host \"Downloading $(($npmDownloadUrl + $downloadFileName)) ...\"\n    Invoke-WebRequest -Uri ($npmDownloadUrl + $downloadFileName) -Outfile \"$PWD/$downloadFileName\"\n    \n    Write-Output \"Extracting $downloadFileName ... \"\n    \n    if ($IsWindows)\n    {\n      # Extract\n      Expand-Archive -Path \"$PWD/$downloadFileName\" -DestinationPath \"$PWD/npm\"\n      \n      # Find the executable\n      $npmExecutable = Get-ChildItem -Path \"$PWD/npm/$($downloadFileName.Replace('.zip', ''))\" | Where-Object {$_.Name -eq \"npm.cmd\"}\n    }\n    \n    if ($IsLinux)\n    {\n      # Extract archive\n      tar -xf \"$PWD/$downloadFileName\" --directory \"$PWD/npm\"\n      \n      # Find the executable\n      $npmExecutable = Get-ChildItem -Path \"$PWD/npm/$($downloadFileName.Replace('.tar.xz', ''))/bin\" | Where-Object {$_.Name -eq \"npm\"}      \n    }\n    \n    # Insert location of executable into PATH environment variable so it can be called from anywhere\n    $env:PATH = \"$($npmExecutable.Directory)$([IO.Path]::PathSeparator)\" + $env:PATH\n}\n\nFunction Install-MulesoftCLI\n{\n\t# Define parameters\n    param (\n    \t$CLIVersion = \"4\"\n    )\n\t\n    # Run npm command to install pluguin\n    Write-Host \"Installing anypoint-cli-v$($CLIVersion) node module ...\"\n    \n    # Adjust install command based on operating system\n    if ($IsWindows)\n    {\n    \t& npm install -g \"anypoint-cli-v$($CLIVersion)\" \"2>&1\"\n    }\n    else\n    {\n    \t& npm install -g \"anypoint-cli-v$($CLIVersion)\" 2>&1\n    }\n    \n\t# Check exit code\n\tif ($lastExitCode -ne 0)\n\t{\n\t\t# Fail the step\n    \tWrite-Error \"Installation failed!\"\n\t}\n}\n\nFunction Deploy-MulesoftApplication\n{\n\t# Define parameters\n    param (\n    \t$AssetFilePath,\n        $ApplicationName,\n        $RuntimeVersion,\n        $NumberOfWorkers,\n        $WorkerSize,\n        $Region\n    )\n    \n    # Replace path seperator\n    if ($AssetFilePath.Contains(\"\\\"))\n    {\n    \t# Replace them with forward slash\n        $AssetFilePath = $AssetFilePath.Replace(\"\\\", \"/\")\n    }\n    \n    # Check to see if application already exists\n    $applicationList = (anypoint-cli-v4 runtime-mgr:cloudhub-application:list --output json | ConvertFrom-JSON)\n    $deployResults = $null\n    \n    if ($null -eq ($applicationList | Where-Object {$_.domain -eq $ApplicationName}))\n    {\n    \t# Deploy the application to cloud hub\n        Write-Host \"Deploying new application ...\"\n    \t$deployResults = anypoint-cli-v4 runtime-mgr:cloudhub-application:deploy $ApplicationName $AssetFilePath --output json --runtime $RuntimeVersion --workers $NumberOfWorkers --workerSize $WorkerSize --region $Region\n    }\n    else\n    {\n    \t# Update the application\n        Write-Host \"Updating existing application ...\"\n        $deployResults = anypoint-cli-v4 runtime-mgr:cloudhub-application:modify $ApplicationName $AssetFilePath --output json --runtime $RuntimeVersion --workers $NumberOfWorkers --workerSize $WorkerSize --region $Region\n    }\n    \n    # Display results \n    Write-Host \"Results:\"\n    $deployResults\n}\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nif ($IsWindows)\n{\n\t# Disable progress bar for faster installation\n    $ProgressPreference = 'SilentlyContinue'\n}\n\n# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Get parameters\n$downloadUtils = [System.Convert]::ToBoolean(\"$($OctopusParameters['Mulesoft.Download'])\")\n\n# Check to see if we need to download utilities\nif ($downloadUtils)\n{\n\tGet-NpmExecutable -NodeVersion $OctopusParameters['Mulesoft.Node.CLI.Version']\n\tInstall-MulesoftCLI -CLIVersion $OctopusParameters['Mulesoft.Anypoint.CLI.Version']\n}\n\n# Set environment variables\n$env:ANYPOINT_CLIENT_ID = $OctopusParameters['Mulesoft.Anypoint.Client.Id']\n$env:ANYPOINT_CLIENT_SECRET = $OctopusParameters['Mulesoft.Anypoint.Client.Secret']\n$env:ANYPOINT_ORG = $OctopusParameters['Mulesoft.Anypoint.Organization.Id']\n$env:ANYPOINT_ENV = $OctopusParameters['Mulesoft.Anypoint.Environment']\n\n# Set global variables\n$mulesoftOrganizationId = $OctopusParameters['Mulesoft.Anypoint.Organization.Id']\n$mulesoftAssetVersionNumber = $OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageVersion']\n$mulesoftAssetArtifactId = $OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageId']\n$mulesoftApplicationName = $OctopusParameters['Mulesoft.Anypoint.Application.Name'].ToLower()\n$mulesoftRuntimeVersion = $OctopusParameters['Mulesoft.Anypoint.Runtime.Version']\n$mulesoftNumberOfWorkers = $OctopusParameters['Mulesfot.Anypoint.Worker.Count']\n$mulesoftWorkerSize = $OctopusParameters['Mulesoft.Anypoint.Worker.Size']\n$mulesoftRegion = $OctopusParameters['Mulesoft.Anypoint.Region']\n\n# Check optional parameters\nif ([string]::IsNullOrWhitespace($mulesoftNumberOfWorkers))\n{\n\t$mulesoftNumberOfWorkers = \"1\"\n}\n\nif ([string]::IsNullOrWhitespace($mulesoftWorkerSize))\n{\n\t$mulesoftWorkerSize = \"1\"\n}\n\n# Display variable values\nWrite-Host \"================== Deploying to CloudHub with the following options ==================\"\nWrite-Host \"Organization Id/Group Id: $mulesoftOrganizationId\"\nWrite-Host \"Artifact Id: $mulesoftAssetArtifactId\"\nWrite-Host \"Version number: $mulesoftAssetVersionNumber\"\nWrite-Host \"Application Name: $mulesoftApplicationname\"\nWrite-Host \"Environment: $($env:ANYPOINT_ENV)\"\nWrite-Host \"Runtime version: $mulesoftRuntimeVersion\"\nWrite-Host \"Number of workers: $mulesoftNumberOfWorkers\"\nWrite-Host \"Worker size: $mulesoftWorkerSize\"\nWrite-Host \"Region: $mulesoftRegion\"\nWrite-Host \"=======================================================================================\"\n\n# Get file properties\n$mulesoftApplicationFileExtension = [System.IO.Path]::GetExtension(\"$PWD/$($OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageFileName'])\")\n\n# Rename the file to the original\nRename-Item -Path \"$PWD/$($OctopusParameters['Octopus.Action.Package[Mulesoft.Asset].PackageFileName'])\" -NewName \"$($mulesoftAssetArtifactId).$($mulesoftAssetVersionNumber)$mulesoftApplicationFileExtension\"\n$mulesoftApplicationFilePath = \"$PWD/$($mulesoftAssetArtifactId).$($mulesoftAssetVersionNumber)$mulesoftApplicationFileExtension\"\n\n# Upload asset to exchange\nDeploy-MulesoftApplication -AssetFilePath $mulesoftApplicationFilePath -ApplicationName $mulesoftApplicationName -Region $mulesoftRegion -RuntimeVersion $mulesoftRuntimeVersion -NumberOfWorkers $mulesoftNumberOfWorkers -Workersize $mulesoftWorkerSize\n\n"
-  },
-  "Parameters": [
-    {
-      "Id": "e73b1ba3-df1f-490f-98d3-e564f6c1904a",
-      "Name": "Mulesoft.Anypoint.Organization.Id",
-      "Label": "Anypoint OrganizationID",
-      "HelpText": "The Organization ID of your Anypoint account.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "680c0b8c-a219-466a-840d-a5828247d2e8",
-      "Name": "Mulesoft.Anypoint.Client.Id",
-      "Label": "Anypoint Client ID",
-      "HelpText": "Client ID of the Anypoint user used for deployment.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "f71f9285-acee-4461-83fc-6f281c78ee87",
-      "Name": "Mulesoft.Anypoint.Client.Secret",
-      "Label": "Anypoint Client Secret",
-      "HelpText": "Client Secret of the Anypoint user used for deployment.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "4a7f78d5-3e68-4d04-aa88-327903d86d5c",
-      "Name": "Mulesoft.Anypoint.Environment",
-      "Label": "Anypoint Environment",
-      "HelpText": "Environment name to target.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "669bd6f1-a55e-4017-bc41-7008a166727c",
-      "Name": "Mulesoft.Anypoint.Application.Name",
-      "Label": "Anypoint Application Name",
-      "HelpText": "Name of the deployed application.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "3ad06081-5a16-4fff-8d6d-dd2e9b5ea435",
-      "Name": "Mulesoft.Asset.File",
-      "Label": "Mulesoft Asset File",
-      "HelpText": "Select the package containing the Mulesoft API to upload to Exchange.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "291892c6-9fb0-4fc6-a3a5-d10bcdf70338",
-      "Name": "Mulesoft.Anypoint.Runtime.Version",
-      "Label": "Runtime version",
-      "HelpText": "The version of the runtime to use for your application.",
-      "DefaultValue": "4.4.0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d636b68a-dd56-4201-b2af-bb8faecc17ea",
-      "Name": "Mulesfot.Anypoint.Worker.Count",
-      "Label": "Number of Workers",
-      "HelpText": "(Optional) \t\nNumber of workers. (This value is '1' by default)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ace7c127-6adf-4df3-8e13-e43d596490f4",
-      "Name": "Mulesoft.Anypoint.Worker.Size",
-      "Label": "Worker Size",
-      "HelpText": "(Optional) Size of the workers in vCores. (This value is '1' by default)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a5aa6973-a64a-479e-a080-7fa684f00d45",
-      "Name": "Mulesoft.Anypoint.Region",
-      "Label": "Region",
-      "HelpText": "Name of the region to deploy to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7f527d06-c329-4883-a5cf-15f233fbe319",
-      "Name": "Mulesoft.Anypoint.CLI.AdditionalArguments",
-      "Label": "Additional CLI arguments",
-      "HelpText": "A comma delimited list of additional arguments to add to the CLI.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ada95ba7-64d4-4b0e-a287-b2dd6fac5718",
-      "Name": "Mulesoft.Node.CLI.Version",
-      "Label": "NodeJS version",
-      "HelpText": "Use to specify which version of the NodeJS CLI to use when choosing the Download Node option",
-      "DefaultValue": "18.16.0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9b34443c-bd76-4aa4-b036-10d930d619eb",
-      "Name": "Mulesoft.Anypoint.CLI.Version",
-      "Label": "Anypoint CLI Version",
-      "HelpText": "Specify the version of the CLI being used.",
-      "DefaultValue": "4",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "aa635c7b-bedb-4000-95a0-3c399721ce2b",
-      "Name": "Mulesoft.Download",
-      "Label": "Download NodeJS and Anypoint CLI?",
-      "HelpText": "Tick the box to dynamically download the NodeJS and Anypoint CLI utilities to deploy.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-07-20T17:36:01.897Z",
-    "OctopusVersion": "2023.2.12998",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "mulesoft"
-}
diff --git a/step-templates/mysql-add-database-user-to-role.json b/step-templates/mysql-add-database-user-to-role.json
deleted file mode 100644
index c3747734b..000000000
--- a/step-templates/mysql-add-database-user-to-role.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "Id": "fc7272be-779c-4ef2-8051-0e7271471328",
-    "Name": "MySQL - Add Database User To Role",
-    "Description": "Adds a database user to a role",
-    "Author": "twerthi",
-    "ActionType": "Octopus.Script",
-    "Version": 7,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserInRole\n{\n\t# Define parameters\n    param ($UserHostname,\n    $Username,\n    $RoleHostName,\n    $RoleName)\n    \n\t# Execute query\n    $grants = Invoke-SqlQuery \"SHOW GRANTS FOR '$Username'@'$UserHostName';\" -ConnectionName $connectionName\n\n    # Loop through Grants\n    foreach ($grant in $grants.ItemArray)\n    {\n        # Check grant\n        if ($grant -eq \"GRANT ``$RoleName``@``$RoleHostName`` TO ``$Username``@``$UserHostName``\")\n        {\n            # They're in the group\n            return $true\n        }\n    }\n\n    # Not found\n    return $false\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Import from specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Declare connection string\n$connectionString = \"Server=$addMySQLServerName;Port=$addMySQLServerPort;\"\n\n# Customize connection string based on authentication method\nswitch ($mySqlAuthenticationMethod) {\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($addMySQLServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $addLoginPasswordWithAddRoleRights = (aws rds generate-db-auth-token --hostname $addMySQLServerName --region $region --port $addMySQLServerPort --username $addLoginWithAddRoleRights)\n        \n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$addLoginWithAddRoleRights;Pwd=`\"$addLoginPasswordWithAddRoleRights`\";\"\n\n        break\n    }\n\n    \"usernamepassword\" {\n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$addLoginWithAddRoleRights;Pwd=`\"$addLoginPasswordWithAddRoleRights`\";\"\n        \n        break    \n    }\n\n    \"windowsauthentication\" {\n        # Append remaining portion of connection string\n        $connectionString += \";IntegratedSecurity=yes;Uid=$addLoginWithAddRoleRights;\"\n\n        break\n    }\n\n    \"azuremanagedidentity\" {\n        Write-Host \"Generating Azure Managed Identity token ...\"\n        $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\" }\n\n        $addLoginPasswordWithAddRoleRights = $token.access_token\n\n        $connectionString += \";Uid=$addLoginWithAddRoleRights;Pwd=`\"$addLoginPasswordWithAddRoleRights`\";\"\n\n        break\n    }\n\n    \"gcpserviceaccount\" {\n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\" }\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains(\"iam.gserviceaccount.com\") }\n\n        if ([string]::IsNullOrWhiteSpace(($addLoginWithAddRoleRights))) {\n            $addLoginWithAddRoleRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n        }\n\n        Write-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n        \n        $addLoginPasswordWithAddRoleRights = $token.access_token\n        $connectionString += \";Uid=$addLoginWithAddRoleRights;Pwd=`\"$addLoginPasswordWithAddRoleRights`\";\"\n\n        break\n    }\n}\n\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\ntry\n{\n    if ($addUseSSL -eq \"True\")\n    {\n    \t# Append to connection string\n        $connectionString += \"SslMode=Required;\"\n    }\n    else\n    {\n    \t# Disable SSL\n        $connectionString += \"SslMode=none;\"\n    }\n    \n    if (![string]::IsNullOrWhitespace($mysqlAdditionalParameters))\n    {\n      foreach ($parameter in $mysqlAdditionalParameters.Split(\",\"))\n      {\n          # Check for delimiter\n          if (!$connectionString.EndsWith(\";\") -and !$parameter.StartsWith(\";\"))\n          {\n              # Append delimeter\n              $connectionString +=\";\"\n          }\n\n          $connectionString += $parameter.Trim()\n      }\n    }\n   \n    \n    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName\n    \n\n    # See if database exists\n    $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleHostName $addRoleHostName -RoleName $addRoleName\n\n    if ($userInRole -eq $false)\n    {\n        # Create database\n        Write-Output \"Adding user $addUsername@$addUserHostName to role $addRoleName@$addRoleHostName ...\"\n        $executionResults = Invoke-SqlUpdate \"GRANT '$addRoleName'@'$addRoleHostName' TO '$addUsername'@'$addUserHostName';\" -ConnectionName $connectionName\n\n        # See if it was created\n        $userInRole = Get-UserInRole -UserHostname $addUserHostname -Username $addUsername -RoleHostName $addRoleHostName -RoleName $addRoleName\n            \n        # Check array\n        if ($userInRole -eq $true)\n        {\n            # Success\n            Write-Output \"$addUserName@$addUserHostName added to $addRoleName@$addRoleHostName successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"Failure adding $addUserName@$addUserHostName to $addRoleName@$addRoleHostName!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $addUsername@$addUserHostName is already in role $addRoleName@$addRoleHostName\"\n    }\n}\nfinally\n{\n\t# Close connection if open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n    \tClose-SqlConnection -ConnectionName $connectionName\n    }\n}\n"
-    },
-    "Parameters": [
-        {
-            "Id": "80bf18c2-a2ea-4499-a33d-eea226b9727a",
-            "Name": "addMySQLServerName",
-            "Label": "MySQL Server name",
-            "HelpText": "Name of the MySQL database server",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "2eba54c0-293c-4009-aef0-077b91b568b4",
-            "Name": "addMySQLServerPort",
-            "Label": "Port",
-            "HelpText": "Port the MySQL listens on.",
-            "DefaultValue": "3306",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "c8732b96-bedd-4e4a-be2d-941315e1bddd",
-            "Name": "addLoginWithAddRoleRights",
-            "Label": "Login name",
-            "HelpText": "Login name of a user that can add roles to other users.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "4b669f8a-7309-4aed-81ff-cd5b3ebf5342",
-            "Name": "addLoginPasswordWithAddRoleRights",
-            "Label": "Login password",
-            "HelpText": "Password for the login account.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "7db3f187-ca97-42cc-a10e-fa5cc3f1382c",
-            "Name": "addUsername",
-            "Label": "User name",
-            "HelpText": "Name of the user to add the role to.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "052563dd-c831-4f09-8d59-1e54bc30afa0",
-            "Name": "addUserHostname",
-            "Label": "User Hostname",
-            "HelpText": "Hostname for the user account.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "885c5057-f859-4bed-a765-03c568f9e9a2",
-            "Name": "addRoleName",
-            "Label": "Role name",
-            "HelpText": "Name of the role to add to the user.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "302ac0ce-3128-45bc-8006-ac92a59b7141",
-            "Name": "addRoleHostName",
-            "Label": "Role hostname",
-            "HelpText": "Hostname of the role.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "a54387ea-9e98-45a2-93e9-214ff2fcf67f",
-            "Name": "addUseSSL",
-            "Label": "Use SSL",
-            "HelpText": "Check this box to force the use of SSL.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "89de7391-de67-46cf-b19c-a7b219280dc9",
-            "Name": "mySqlAuthenticationMethod",
-            "Label": "MySQL Authentication Method",
-            "HelpText": "Authentication method used to connect with MySQL. Options include standard Username/Password, Windows Authentication, [AWS IAM Authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html), [Azure Managed Identity](https://docs.microsoft.com/en-us/azure/mysql/single-server/how-to-connect-with-managed-identity), and [Google Cloud IAM for Cloud SQL ](https://cloud.google.com/sql/docs/mysql/iam-overview)",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Select",
-                "Octopus.SelectOptions": "awsiam|AWS IAM\nusernamepassword|Username/password\nwindowsauthentication|Windows Authentication\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP IAM"
-            }
-        },
-        {
-          "Id": "a97452b5-f7ef-4b72-ab2f-b440cda16343",
-          "Name": "mysqlAdditionalParameters",
-          "Label": "Additional connection string parameters",
-          "HelpText": "A comma-delimited list of additional parameters to add to the connection string.  ex `AllowPublicKeyRetrieval=True`\"",
-          "DefaultValue": "",
-          "DisplaySettings": {
-            "Octopus.ControlType": "SingleLineText"
-          }
-        }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "LastModifiedBy": "twerthi",
-    "$Meta": {
-      "ExportedAt": "2024-03-22T16:19:47.074Z",
-      "OctopusVersion": "2024.1.12087",
-      "Type": "ActionTemplate"
-    },
-    "Category": "mysql"
-}
diff --git a/step-templates/mysql-backup-database.json b/step-templates/mysql-backup-database.json
deleted file mode 100644
index 7b7fcb6be..000000000
--- a/step-templates/mysql-backup-database.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "4fa6d062-d4da-4a02-849e-dec804554453",
-  "Name": "MySQL - Backup Database",
-  "Description": "Backs up a MySQL database on a windows instance hosting MySQL. ",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Author": "adamoctoclose",
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-  "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseExists\n{\n\t# Define parameters\n    param ($DatabaseName)\n    \n\t# Execute query\n    return Invoke-SqlQuery \"SHOW DATABASES LIKE '$DatabaseName';\"\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Import from temp location\n    $PowerShellModuleName =  \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n\n# Create credential object for the connection\n#$SecurePassword = ConvertTo-SecureString $BackupMySQL_Password -AsPlainText -Force\n#$ServerCredential = New-Object System.Management.Automation.PSCredential ($BackupMySQL_Username, $BackupMySQL_Password)\n\ntry\n{\n\n\n\t# Connect to MySQL\n    $connectionString = \"Server=$BackupMySQL_ServerName;Port=$BackupMySQL_Port;Uid=$BackupMySQL_Username;Pwd=$BackupMySQL_Password;\"\n\n    if ($BackupMySQL_UseSSL -eq \"True\")\n    {\n\t\t# Append to connection string\n        $connectionString += \"SslMode=Required;\"\n    }\n    else\n    {\n    \t# Disable ssl\n        $connectionString += \"SslMode=none;\"\n    }\n    \n    Open-MySqlConnection -ConnectionString $connectionString\n\n    # See if database exists\n    $databaseExists = Get-DatabaseExists -DatabaseName $BackupMySQL_DatabaseName\n\n    if ($databaseExists.ItemArray.Count -eq 0)\n    {\n        # Display message\n        Write-Error \"Database $BackupMySQL_DatabaseName doesn't exist.\"\n \n    }\n    else\n    {\n\n        cd $BackupMySQL_MySQLPath\n\n        $backupname = '{0}{1}-{2}.sql' -f ($BackupMySQL_BackupDirectory, $BackupMySQL_DatabaseName ,(Get-Date -Format FileDatetime))\n\n        .\\mysqldump.exe --databases $BackupMySQL_DatabaseName > $backupname\n                \n        # Success\n        Write-Output \"$BackupMySQL_DatabaseName was backed up!\"\n    }\n}\nfinally\n{\n    Close-SqlConnection\n}\n"
-},
-"Parameters": [
-  {
-    "Id": "7030ad54-4e10-4854-998a-ca91e3b490a3",
-    "Name": "BackupMySQL_ServerName",
-    "Label": "Server",
-    "HelpText": "Name or IP of the MySQL server",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    }
-  },
-  {
-    "Id": "07dbf251-a982-4cc5-b6c1-dc0af50c519c",
-    "Name": "BackupMySQL_Username",
-    "Label": "Username",
-    "HelpText": "\tUsername with rights to dump database",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    }
-  },
-  {
-    "Id": "ac42a150-b7e7-4414-9dec-f18e105eaedf",
-    "Name": "BackupMySQL_Password",
-    "Label": "Password",
-    "HelpText": "Password for the user account",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Sensitive"
-    }
-  },
-  {
-    "Id": "62ffb949-c5db-4151-bb29-47a37586bda5",
-    "Name": "BackupMySQL_DatabaseName",
-    "Label": "Database Name",
-    "HelpText": "Name of the database to backup",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    }
-  },
-  {
-    "Id": "c54832b1-571f-4475-9159-6a7342a67982",
-    "Name": "BackupMySQL_Port",
-    "Label": "Port",
-    "HelpText": "Port number for the MySQL server",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    }
-  },
-  {
-    "Id": "a33dc26c-15b3-4b5e-a62f-7a5e97576bcc",
-    "Name": "BackupMySQL_UseSSL",
-    "Label": "Use SSL",
-    "HelpText": "Check this box to force the use of SSL.",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Checkbox"
-    }
-  },
-  {
-    "Id": "fc2c1a2f-43ba-4878-8e74-b88dad96c5d2",
-    "Name": "BackupMySQL_MySQLPath",
-    "Label": "MySQL Path",
-    "HelpText": "Path to binaries e.g. C:\\Program Files\\MySQL\\MySQL Server 5.6\\bin\nIf binaries don't exist on the target machine the backup will fail.",
-    "DefaultValue": "C:\\Program Files\\MySQL\\MySQL Server 5.6\\bin",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    }
-  },
-  {
-    "Id": "39063215-b069-4e51-b202-65060db9fd20",
-    "Name": "BackupMySQL_BackupDirectory",
-    "Label": "Backup Directory",
-    "HelpText": "Location to store backup file",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    }
-  }
-],
-  "$Meta": {
-    "ExportedAt": "2020-08-11T15:11:43.135Z",
-    "OctopusVersion": "2020.3.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "adamoctoclose",
-  "Category": "mysql"
-}
diff --git a/step-templates/mysql-create-database.json b/step-templates/mysql-create-database.json
deleted file mode 100644
index 0e26fb903..000000000
--- a/step-templates/mysql-create-database.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "Id": "4a222ac3-ff4b-4328-8778-1c44eebdedde",
-    "Name": "MySQL - Create Database If Not Exists",
-    "Description": "Creates a MySQL database if it doesn't already exist.  This template is also compatible with MariaDB.\n\nNote - this template will install the Nuget package provider if it's not already present.",
-    "ActionType": "Octopus.Script",
-    "Author": "twerthi",
-    "Version": 9,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled {\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {\n        # It is installed\n        return $true\n    }\n    else {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule {\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n    # Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n        # Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseExists {\n    # Define parameters\n    param ($DatabaseName)\n    \n    # Execute query\n    return Invoke-SqlQuery \"SHOW DATABASES LIKE '$DatabaseName';\" -ConnectionName $connectionName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true) {\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true) {\n    # Import from temp location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Declare connection string\n$connectionString = \"Server=$createMySQLServerName;Port=$createPort;\"\n\n# Customize connection string based on authentication method\nswitch ($mySqlAuthenticationMethod) {\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($createMySQLServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $createUserPassword = (aws rds generate-db-auth-token --hostname $createMySQLServerName --region $region --port $createPort --username $createUsername)\n        \n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$createUsername;Pwd=`\"$createUserPassword`\";\"\n\n        break\n    }\n\n    \"usernamepassword\" {\n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$createUsername;Pwd=`\"$createUserPassword`\";\"\n        \n        break    \n    }\n\n    \"windowsauthentication\" {\n        # Append remaining portion of connection string\n        $connectionString += \";IntegratedSecurity=yes;Uid=$createUsername;\"\n\n        break\n    }\n\n    \"azuremanagedidentity\" {\n        Write-Host \"Generating Azure Managed Identity token ...\"\n        $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\" }\n\n        $createUserPassword = $token.access_token\n\n        $connectionString += \";Uid=$createUsername;Pwd=`\"$createUserPassword`\";\"\n\n        break\n    }\n\n    \"gcpserviceaccount\" {\n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\" }\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains(\"iam.gserviceaccount.com\") }\n\n        if ([string]::IsNullOrWhiteSpace(($createUsername))) {\n            $createUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n        }\n\n        Write-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n        \n        $createUserPassword = $token.access_token\n        $connectionString += \";Uid=$createUsername;Pwd=`\"$createUserPassword`\";\"\n\n        break\n    }\n}\n\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n\ntry {\n    # Connect to MySQL\n    $connectionString = \"Server=$createMySQLServerName;Port=$createPort;Uid=$createUsername;Pwd=$createUserPassword;\"\n    if ($createUseSSL -eq \"True\") {\n        # Append to connection string\n        $connectionString += \"SslMode=Required;\"\n    }\n    else {\n        # Disable ssl\n        $connectionString += \"SslMode=none;\"\n    }\n    \n    if (![string]::IsNullOrWhitespace($mysqlAdditionalParameters))\n    {\n      foreach ($parameter in $mysqlAdditionalParameters.Split(\",\"))\n      {\n          # Check for delimiter\n          if (!$connectionString.EndsWith(\";\") -and !$parameter.StartsWith(\";\"))\n          {\n              # Append delimeter\n              $connectionString +=\";\"\n          }\n\n          $connectionString += $parameter.Trim()\n      }\n    }\n       \n    Open-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName\n\n    # See if database exists\n    $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName\n\n    if ($databaseExists.ItemArray.Count -eq 0) {\n        # Create database\n        Write-Output \"Creating database $createDatabaseName ...\"\n        $executionResult = Invoke-SqlUpdate \"CREATE DATABASE $createDatabaseName;\" -ConnectionName $connectionName\n\n        # Check result\n        if ($executionResult -ne 1) {\n            # Commit transaction\n            Write-Error \"Create schema failed.\"\n        }\n        else {\n            # See if it was created\n            $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName\n            \n            # Check array\n            if ($databaseExists.ItemArray.Count -eq 1) {\n                # Success\n                Write-Output \"$createDatabaseName created successfully!\"\n            }\n            else {\n                # Failed\n                Write-Error \"$createDatabaseName was not created!\"\n            }\n        }\n    }\n    else {\n        # Display message\n        Write-Output \"Database $createDatabaseName already exists.\"\n    }\n}\nfinally {\n\t# Close connection if open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n    \tClose-SqlConnection -ConnectionName $connectionName\n    }\n}"
-    },
-    "Parameters": [
-        {
-            "Id": "987155d9-f852-415d-b89d-cd74618d14bb",
-            "Name": "createMySQLServerName",
-            "Label": "Server",
-            "HelpText": "Hostname (or IP) of the MySQL database server.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "aff09ee3-b7c4-4a88-a4e3-70ad0eee04e9",
-            "Name": "createUsername",
-            "Label": "Username",
-            "HelpText": "Username to use for the connection",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "a08b0359-560f-49cb-bc71-d759d49a06fc",
-            "Name": "createUserPassword",
-            "Label": "Password",
-            "HelpText": "Password for the user account",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "e17c8ac9-6b4a-4321-975b-452e2015bc4a",
-            "Name": "createDatabaseName",
-            "Label": "Database Name",
-            "HelpText": "Name of the database to create",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "a1d735f0-3ec2-45a1-af43-d0af7bf13f68",
-            "Name": "createPort",
-            "Label": "Port",
-            "HelpText": "Port for the database instance.",
-            "DefaultValue": "3306",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "ddd1ca9c-04fe-4a43-84f7-dc8d52adb063",
-            "Name": "createUseSSL",
-            "Label": "Use SSL",
-            "HelpText": "Check this box to force the use of SSL.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "4090f423-b47f-4bac-ab38-ab45c92e0ab5",
-            "Name": "mySqlAuthenticationMethod",
-            "Label": "MySQL Authentication Method",
-            "HelpText": "Authentication method used to connect with MySQL. Options include standard Username/Password, Windows Authentication, [AWS IAM Authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html), [Azure Managed Identity](https://docs.microsoft.com/en-us/azure/mysql/single-server/how-to-connect-with-managed-identity), and [Google Cloud IAM for Cloud SQL ](https://cloud.google.com/sql/docs/mysql/iam-overview)",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Select",
-                "Octopus.SelectOptions": "awsiam|AWS IAM\nusernamepassword|Username/password\nwindowsauthentication|Windows Authentication\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP IAM"
-            }
-        },
-        {
-          "Id": "273612dc-5c75-4591-9da9-dc8e40b7bf39",
-          "Name": "mysqlAdditionalParameters",
-          "Label": "Additional connection string parameters",
-          "HelpText": "A comma-delimited list of additional parameters to add to the connection string.  ex `AllowPublicKeyRetrieval=True`",
-          "DefaultValue": "",
-          "DisplaySettings": {
-            "Octopus.ControlType": "SingleLineText"
-          }
-        }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "LastModifiedBy": "twerthi",
-    "$Meta": {
-      "ExportedAt": "2024-03-20T19:31:22.096Z",
-      "OctopusVersion": "2024.2.2075",
-      "Type": "ActionTemplate"
-    },
-    "Category": "mysql"
-}
diff --git a/step-templates/mysql-create-user.json b/step-templates/mysql-create-user.json
deleted file mode 100644
index a33c9cd49..000000000
--- a/step-templates/mysql-create-user.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "Id": "d5e87b36-da2b-4771-9394-0dbdc9587dd4",
-    "Name": "MySQL - Create User If Not Exists",
-    "Description": "Creates a new user account on a MySQL database server",
-    "ActionType": "Octopus.Script",
-    "Version": 7,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserExists\n{\n\t# Define parameters\n    param ($Hostname,\n    $Username)\n    \n\t# Execute query\n    return Invoke-SqlQuery \"SELECT * FROM mysql.user WHERE Host = '$Hostname' AND User = '$Username';\" -ConnectionName $connectionName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Declare connection string\n$connectionString = \"Server=$createMySQLServerName;Port=$createPort;\"\n$connectionString = \"Server=$createMySQLServerName;Port=$createMySQLServerPort;Uid=$createLoginWithAddUserRights;Pwd=$createLoginPasswordWithAddUserRights;\"\n\n\n# Customize connection string based on authentication method\nswitch ($mySqlAuthenticationMethod) {\n    \"awsiam\" {\n        # Region is part of the RDS endpoint, extract\n        $region = ($createMySQLServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $createLoginPasswordWithAddUserRights = (aws rds generate-db-auth-token --hostname $createMySQLServerName --region $region --port $createPort --username $createLoginWithAddUserRights)\n        \n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$createLoginWithAddUserRights;Pwd=`\"$createLoginPasswordWithAddUserRights`\";\"\n\n        break\n    }\n\n    \"usernamepassword\" {\n        # Append remaining portion of connection string\n        $connectionString += \";Uid=$createLoginWithAddUserRights;Pwd=`\"$createLoginPasswordWithAddUserRights`\";\"\n        \n        break    \n    }\n\n    \"windowsauthentication\" {\n        # Append remaining portion of connection string\n        $connectionString += \";IntegratedSecurity=yes;Uid=$createLoginWithAddUserRights;\"\n\n        break\n    }\n\n    \"azuremanagedidentity\" {\n        Write-Host \"Generating Azure Managed Identity token ...\"\n        $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\" }\n\n        $createLoginPasswordWithAddUserRights = $token.access_token\n\n        $connectionString += \";Uid=$createLoginWithAddUserRights;Pwd=`\"$createLoginPasswordWithAddUserRights`\";\"\n\n        break\n    }\n\n    \"gcpserviceaccount\" {\n        # Define header\n        $header = @{ \"Metadata-Flavor\" = \"Google\" }\n\n        # Retrieve service accounts\n        $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n        # Results returned in plain text format, get into array and remove empty entries\n        $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n        # Retreive the specific service account assigned to the VM\n        $serviceAccount = $serviceAccounts | Where-Object { $_.Contains(\"iam.gserviceaccount.com\") }\n\n        if ([string]::IsNullOrWhiteSpace(($createLoginWithAddUserRights)))\n        {\n                $createLoginWithAddUserRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n        }\n\n        Write-Host \"Generating GCP IAM token ...\"\n        # Retrieve token for account\n        $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n        \n        $createLoginPasswordWithAddUserRights = $token.access_token\n        $connectionString += \";Uid=$createLoginWithAddUserRights;Pwd=`\"$createLoginPasswordWithAddUserRights`\";\"\n\n        break\n    }\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\ntry\n{\n\t# Connect to MySQL\n    if ($createUseSSL -eq \"True\")\n    {\n    \t# Append to connection string\n        $connectionString += \"SslMode=Required;\"\n    }\n    else\n    {\n    \t# Disable ssl\n        $connectionString += \"SslMode=none;\"\n    }\n\n    if (![string]::IsNullOrWhitespace($mysqlAdditionalParameters))\n    {\n      foreach ($parameter in $mysqlAdditionalParameters.Split(\",\"))\n      {\n          # Check for delimiter\n          if (!$connectionString.EndsWith(\";\") -and !$parameter.StartsWith(\";\"))\n          {\n              # Append delimeter\n              $connectionString +=\";\"\n          }\n\n          $connectionString += $parameter.Trim()\n      }\n    }\n\n\tOpen-MySqlConnection -ConnectionString $connectionString -ConnectionName $connectionName\n    \n    # See if database exists\n    $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername\n\n    if ($userExists -eq $null)\n    {\n        # Create database\n        Write-Output \"Creating user $createNewUsername ...\"\n        $executionResults = Invoke-SqlUpdate \"CREATE USER '$createNewUsername'@'$createUserHostname' IDENTIFIED BY '$createNewUserPassword';\" -ConnectionName $connectionName\n\n        # See if it was created\n        $userExists = Get-UserExists -Hostname $createUserHostname -Username $createNewUsername\n            \n        # Check array\n        if ($userExists -ne $null)\n        {\n            # Success\n            Write-Output \"$createNewUsername created successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"$createNewUsername was not created!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $createNewUsername on $createUserHostname already exists.\"\n    }\n}\nfinally\n{\n\t# Close connection if open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n    \tClose-SqlConnection -ConnectionName $connectionName\n    }\n}\n"
-    },
-    "Parameters": [
-        {
-            "Id": "0fb5e63d-528c-4e7e-841d-6d4bd1ef47a4",
-            "Name": "createMySQLServerName",
-            "Label": "MySQL Server",
-            "HelpText": "Host name of the MySQL server",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "47364cd4-6c31-43f6-9585-cc97aca28d3c",
-            "Name": "createMySQLServerPort",
-            "Label": "Port",
-            "HelpText": "Port number the MySQL server listens on.",
-            "DefaultValue": "3306",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "cb9b74a5-f444-4b8c-b353-0eebd990e0a3",
-            "Name": "createLoginWithAddUserRights",
-            "Label": "Login name",
-            "HelpText": "Login name of a user with rights to create user accounts.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "699b3521-06dc-4e66-a20e-adce0fddab38",
-            "Name": "createLoginPasswordWithAddUserRights",
-            "Label": "Login Password",
-            "HelpText": "Password Login name.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "5b5ec614-a799-407d-870a-d3098794e049",
-            "Name": "createNewUsername",
-            "Label": "New user name",
-            "HelpText": "Name of the new user account to create.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "8fe190a3-b3d5-4d4b-84d2-a4fe5bf2c99f",
-            "Name": "createNewUserPassword",
-            "Label": "New user password",
-            "HelpText": "Password for the new user account.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "c7fd6115-ec4d-455b-b84b-d6eb19228140",
-            "Name": "createUserHostname",
-            "Label": "New user host name",
-            "HelpText": "Host name that the new user account is allowed to login from.  Enter % to allow the account to connect from anywhere.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "26090b1e-7f56-4f49-990d-5d8022417f13",
-            "Name": "createUseSSL",
-            "Label": "Use SSL",
-            "HelpText": "Check this box to force the use of SSL.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "f6ad5f4c-509a-4533-82d4-b9fad04988f3",
-            "Name": "mySqlAuthenticationMethod",
-            "Label": "MySQL Authentication Method",
-            "HelpText": "Authentication method used to connect with MySQL. Options include standard Username/Password, Windows Authentication, [AWS IAM Authentication](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.IAMDBAuth.html), [Azure Managed Identity](https://docs.microsoft.com/en-us/azure/mysql/single-server/how-to-connect-with-managed-identity), and [Google Cloud IAM for Cloud SQL ](https://cloud.google.com/sql/docs/mysql/iam-overview)",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Select",
-                "Octopus.SelectOptions": "awsiam|AWS IAM\nusernamepassword|Username/password\nwindowsauthentication|Windows Authentication\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP IAM"
-            }
-        },
-        {
-          "Id": "5a8ca84d-ad02-46ac-b8f2-f19191fe9cc5",
-          "Name": "mysqlAdditionalParameters",
-          "Label": "Additional connection string parameters",
-          "HelpText": "A comma-delimited list of additional parameters to add to the connection string.  ex `AllowPublicKeyRetrieval=True`",
-          "DefaultValue": "",
-          "DisplaySettings": {
-            "Octopus.ControlType": "SingleLineText"
-          }
-        }
-    ],
-    "LastModifiedBy": "twerthi",
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2024-03-22T16:22:09.124Z",
-      "OctopusVersion": "2024.1.12087",
-      "Type": "ActionTemplate"
-    },
-    "Category": "mysql"
-}
diff --git a/step-templates/mysql-execute-command.json b/step-templates/mysql-execute-command.json
deleted file mode 100644
index 06f9247ac..000000000
--- a/step-templates/mysql-execute-command.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "Id": "f035cbb1-3400-4808-bfde-d5a8aaf36cf1",
-    "Name": "MySQL - Execute Command",
-    "Description": "Enables ad-hoc command execution on a MySQL server",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "Author": "coryreid",
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled {\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {\n        # It is installed\n        return $true\n    }\n    else {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule {\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n    # Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n        # Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true) {\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true) {\n    # Use specific version\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Get whether trust certificate is necessary\n$mySqlTrustSSL = [System.Convert]::ToBoolean(\"$mySqlTrustSSL\")\n\ntry {\n    # Declare initial connection string\n    $connectionString = \"Server=$mySqlServerName;Port=$mySqlServerPort;Database=$mySqlDatabaseName;\"\n    \n    # Check to see if we need to trust the ssl cert\n    if ($mySqlTrustSSL -eq $true) {\n        # Append SSL connection string components\n        $connectionString += \"SslMode=Required;\"\n    }\n\n    # Update the connection string based on authentication method\n    switch ($mySqlAuthenticationMethod) {\n        \"azuremanagedidentity\" {\n            # Get login token\n            Write-Host \"Generating Azure Managed Identity token ...\"\n            $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\" }\n            \n            # Append remaining portion of connection string\n            $connectionString += \";Uid=$mySqlUsername;Pwd=`\"$($token.access_token)`\";\"\n            \n            break\n        }\n        \"awsiam\" {\n            # Region is part of the RDS endpoint, extract\n            $region = ($mySqlServerName.Split(\".\"))[2]\n\n            Write-Host \"Generating AWS IAM token ...\"\n            $mySqlPassword = (aws rds generate-db-auth-token --hostname $mySqlServerName --region $region --port $mySqlServerPort --username $mySqlUsername)\n\n            # Append remaining portion of connection string\n            $connectionString += \";Uid=$mySqlUsername;Pwd=`\"$mySqlPassword`\";\"\n\n            break\n        }\n        \"gcpserviceaccount\" {\n            # Define header\n            $header = @{ \"Metadata-Flavor\" = \"Google\" }\n\n            # Retrieve service accounts\n            $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n            # Results returned in plain text format, get into array and remove empty entries\n            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n            # Retreive the specific service account assigned to the VM\n            $serviceAccount = $serviceAccounts | Where-Object { $_.Contains(\"iam.gserviceaccount.com\") }\n\n            Write-Host \"Generating GCP IAM token ...\"\n            # Retrieve token for account\n            $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n            \n            # Check to see if there was a username provided\n            if ([string]::IsNullOrWhitespace($mySqlUsername)) {\n                # Use the service account name, but strip off the .gserviceaccount.com part\n                $mySqlUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n            }\n\n            # Append remaining portion of connection string\n            $connectionString += \";Uid=$mySqlUsername;Pwd=`\"$($token.access_token)`\";\"\n\n            break\n        }\n        \"usernamepassword\" {\n            # Append remaining portion of connection string\n            $connectionString += \";Uid=$mySqlUsername;Pwd=`\"$mySqlPassword`\";\"\n\n            break    \n        }\n\n        \"windowsauthentication\" {\n            # Append remaining portion of connection string\n            $connectionString += \";Integrated Security=True;\"\n        }\n    }\n\n    # Open connection\n    Open-MySqlConnection -ConnectionString $connectionString\n\n    # Execute the statement\n    $executionResult = Invoke-SqlUpdate -Query \"$mySqlCommand\" -CommandTimeout $mySqlCommandTimeout\n    \n    # Display the result\n    Get-SqlMessage\n}\nfinally {\n    Close-SqlConnection\n}\n\n\n"
-    },
-    "Parameters": [
-        {
-            "Id": "c1126889-66f0-4bcf-8fca-8164097e73ee",
-            "Name": "mySqlServerName",
-            "Label": "Server",
-            "HelpText": "Hostname (or IP) of the MySQL database server.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "28f4f93c-c6a0-40fd-a0db-5d6830c9779a",
-            "Name": "mySqlAuthenticationMethod",
-            "Label": "Authentication Method",
-            "HelpText": "Method used to authenticate to the MySQL server.",
-            "DefaultValue": "usernamepassword",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Select",
-                "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-            }
-        },
-        {
-            "Id": "a8563d9f-6ce3-4965-9f04-9fab03ec9385",
-            "Name": "mySqlUsername",
-            "Label": "Username",
-            "HelpText": "Username to use for the connection",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "19693759-b161-454f-86cc-535788da366e",
-            "Name": "mySqlPassword",
-            "Label": "Password",
-            "HelpText": "Password for the user account",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "a5e1378b-990a-4ffe-a675-16d6c5f6b802",
-            "Name": "mySqlDatabaseName",
-            "Label": "Database Name",
-            "HelpText": "Name of the database to execute against.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "b2206d1e-cf1e-4305-b58a-0abf835ccc9a",
-            "Name": "mySqlServerPort",
-            "Label": "Server Port",
-            "HelpText": "Port for the database instance.",
-            "DefaultValue": "3306",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "fda16aec-ebcc-47f2-9294-7b37b985209c",
-            "Name": "mySqlTrustSSL",
-            "Label": "Trust SSL Certificate",
-            "HelpText": "Force trusting an SSL Certificate.",
-            "DefaultValue": "False",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Checkbox"
-            }
-        },
-        {
-            "Id": "786d615c-e7cd-4f1d-adb0-7787bd26c476",
-            "Name": "mySqlCommandTimeout",
-            "Label": "Command Timeout",
-            "HelpText": "Timeout value (in seconds) for SQL commands.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "0b10867f-b061-4cab-8044-175e6469e1e1",
-            "Name": "mySqlCommand",
-            "Label": "Command",
-            "HelpText": "SQL statement(s) to execute.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "MultiLineText"
-            }
-        }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-        "ExportedAt": "2022-06-22T18:37:20.847Z",
-        "OctopusVersion": "2022.3.1455",
-        "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "coryreid",
-    "Category": "mysql"
-}
diff --git a/step-templates/netscaler-adc-enable-or-disable-service.json b/step-templates/netscaler-adc-enable-or-disable-service.json
deleted file mode 100644
index 0e0725f2c..000000000
--- a/step-templates/netscaler-adc-enable-or-disable-service.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "Id": "1bd58988-3e56-4cfb-8f87-3769024fcdc3",
-  "Name": "NetScaler ADC - Enable or Disable Service",
-  "Description": "Enables or disables a load balancing service i Citrix NetScaler ADC. For documentation, see https://github.com/jnus/NetScalerPSLib\n",
-  "ActionType": "Octopus.Script",
-  "Version": 21,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "param(\r\n        [string]$NSAddress,\r\n        [string]$ServiceName,\r\n        [string]$Action,\r\n        [string]$NSUserName,\r\n        [string]$NSPassword,\r\n        [string]$NSProtocol\r\n)\r\n\r\n\r\n$ErrorActionPreference = \"Stop\"\r\n\r\nfunction Connect-NSAppliance {\r\n    <#\r\n    .SYNOPSIS\r\n        Connect to NetScaler Appliance\r\n    .DESCRIPTION\r\n        Connect to NetScaler Appliance. A custom web request session object will be returned\r\n    .PARAMETER NSAddress\r\n        NetScaler Management IP address\r\n    .PARAMETER NSName\r\n        NetScaler DNS name or FQDN\r\n    .PARAMETER NSUserName\r\n        UserName to access the NetScaler appliance\r\n    .PARAMETER NSPassword\r\n        Password to access the NetScaler appliance\r\n    .PARAMETER Timeout\r\n        Timeout in seconds to for the token of the connection to the NetScaler appliance. 900 is the default admin configured value.\r\n    .EXAMPLE\r\n         $Session = Connect-NSAppliance -NSAddress 10.108.151.1\r\n    .EXAMPLE\r\n         $Session = Connect-NSAppliance -NSName mynetscaler.mydomain.com\r\n    .OUTPUTS\r\n        CustomPSObject\r\n    .NOTES\r\n        Copyright (c) Citrix Systems, Inc. All rights reserved.\r\n    #>\r\n    [CmdletBinding()]\r\n    param (\r\n        [Parameter(Mandatory=$true,ParameterSetName='Address')] [string]$NSAddress,\r\n        [Parameter(Mandatory=$true,ParameterSetName='Name')] [string]$NSName,\r\n        [Parameter(Mandatory=$false)] [string]$NSUserName=\"nsroot\",\r\n        [Parameter(Mandatory=$false)] [string]$NSPassword=\"nsroot\",\r\n        [Parameter(Mandatory=$false)] [int]$Timeout=900\r\n    )\r\n    Write-Verbose \"$($MyInvocation.MyCommand): Enter\"\r\n\r\n    if ($PSCmdlet.ParameterSetName -eq 'Address') {\r\n        Write-Verbose \"Validating IP Address\"\r\n        $IPAddressObj = New-Object -TypeName System.Net.IPAddress -ArgumentList 0\r\n        if (-not [System.Net.IPAddress]::TryParse($NSAddress,[ref]$IPAddressObj)) {\r\n            throw \"'$NSAddress' is an invalid IP address\"\r\n        }\r\n        $nsEndpoint = $NSAddress\r\n    } elseif ($PSCmdlet.ParameterSetName -eq 'Name') {\r\n        $nsEndpoint = $NSName\r\n    }\r\n\r\n\r\n    $login = @{\"login\" = @{\"username\"=$NSUserName;\"password\"=$NSPassword;\"timeout\"=$Timeout}}\r\n    $loginJson = ConvertTo-Json $login\r\n\r\n    try {\r\n        Write-Verbose \"Calling Invoke-RestMethod for login\"\r\n        $response = Invoke-RestMethod -Uri \"$($Script:NSURLProtocol)://$nsEndpoint/nitro/v1/config/login\" -Body $loginJson -Method POST -SessionVariable saveSession -ContentType application/json\r\n\r\n        if ($response.severity -eq \"ERROR\") {\r\n            throw \"Error. See response: `n$($response | fl * | Out-String)\"\r\n        } else {\r\n            Write-Verbose \"Response:`n$(ConvertTo-Json $response | Out-String)\"\r\n        }\r\n    }\r\n    catch [Exception] {\r\n        throw $_\r\n    }\r\n\r\n\r\n    $nsSession = New-Object -TypeName PSObject\r\n    $nsSession | Add-Member -NotePropertyName Endpoint -NotePropertyValue $nsEndpoint -TypeName String\r\n    $nsSession | Add-Member -NotePropertyName WebSession  -NotePropertyValue $saveSession -TypeName Microsoft.PowerShell.Commands.WebRequestSession\r\n\r\n    Write-Verbose \"$($MyInvocation.MyCommand): Exit\"\r\n\r\n    return $nsSession\r\n}\r\n\r\nfunction Set-NSMgmtProtocol {\r\n    <#\r\n    .SYNOPSIS\r\n        Set $Script:NSURLProtocol, this will be used for all subsequent invocation of NITRO APIs\r\n    .DESCRIPTION\r\n        Set $Script:NSURLProtocol\r\n    .PARAMETER Protocol\r\n        Protocol, acceptable values are \"http\" and \"https\"\r\n    .EXAMPLE\r\n        Set-Protocol -Protocol https\r\n    .NOTES\r\n        Copyright (c) Citrix Systems, Inc. All rights reserved.\r\n    #>\r\n    [CmdletBinding()]\r\n    param (\r\n        [Parameter(Mandatory=$true)] [ValidateSet(\"http\",\"https\")] [string]$Protocol\r\n    )\r\n\r\n    Write-Verbose \"$($MyInvocation.MyCommand): Enter\"\r\n\r\n    $Script:NSURLProtocol = $Protocol\r\n\r\n    Write-Verbose \"$($MyInvocation.MyCommand): Exit\"\r\n}\r\n\r\nfunction Invoke-NSNitroRestApi {\r\n    <#\r\n    .SYNOPSIS\r\n        Invoke NetScaler NITRO REST API\r\n    .DESCRIPTION\r\n        Invoke NetScaler NITRO REST API\r\n    .PARAMETER NSSession\r\n        An existing custom NetScaler Web Request Session object returned by Connect-NSAppliance\r\n    .PARAMETER OperationMethod\r\n        Specifies the method used for the web request\r\n    .PARAMETER ResourceType\r\n        Type of the NS appliance resource\r\n    .PARAMETER ResourceName\r\n        Name of the NS appliance resource, optional\r\n    .PARAMETER Action\r\n        Name of the action to perform on the NS appliance resource\r\n    .PARAMETER Payload\r\n        Payload  of the web request, in hashtable format\r\n    .PARAMETER GetWarning\r\n        Switch parameter, when turned on, warning message will be sent in 'message' field and 'WARNING' value is set in severity field of the response in case there is a warning.\r\n        Turned off by default\r\n    .PARAMETER OnErrorAction\r\n        Use this parameter to set the onerror status for nitro request. Applicable only for bulk requests.\r\n        Acceptable values: \"EXIT\", \"CONTINUE\", \"ROLLBACK\", default to \"EXIT\"\r\n    .EXAMPLE\r\n        Invoke NITRO REST API to add a DNS Server resource.\r\n        $payload = @{ip=\"10.8.115.210\"}\r\n        Invoke-NSNitroRestApi -NSSession $Session -OperationMethod POST -ResourceType dnsnameserver -Payload $payload -Action add\r\n    .OUTPUTS\r\n        Only when the OperationMethod is GET:\r\n        PSCustomObject that represents the JSON response content. This object can be manipulated using the ConvertTo-Json Cmdlet.\r\n    .NOTES\r\n        Copyright (c) Citrix Systems, Inc. All rights reserved.\r\n    #>\r\n    [CmdletBinding()]\r\n    param (\r\n        [Parameter(Mandatory=$true)] [PSObject]$NSSession,\r\n        [Parameter(Mandatory=$true)] [ValidateSet(\"DELETE\",\"GET\",\"POST\",\"PUT\")] [string]$OperationMethod,\r\n        [Parameter(Mandatory=$true)] [string]$ResourceType,\r\n        [Parameter(Mandatory=$false)] [string]$ResourceName,\r\n        [Parameter(Mandatory=$false)] [string]$Action,\r\n        [Parameter(Mandatory=$false)] [ValidateScript({$OperationMethod -eq \"GET\"})] [hashtable]$Arguments=@{},\r\n        [Parameter(Mandatory=$false)] [ValidateScript({$OperationMethod -ne \"GET\"})] [hashtable]$Payload=@{},\r\n        [Parameter(Mandatory=$false)] [switch]$GetWarning=$false,\r\n        [Parameter(Mandatory=$false)] [ValidateSet(\"EXIT\", \"CONTINUE\", \"ROLLBACK\")] [string]$OnErrorAction=\"EXIT\"\r\n    )\r\n\r\n    Write-Verbose \"$($MyInvocation.MyCommand): Enter\"\r\n\r\n    Write-Verbose \"Building URI\"\r\n    $uri = \"$($Script:NSURLProtocol)://$($NSSession.Endpoint)/nitro/v1/config/$ResourceType\"\r\n    if (-not [string]::IsNullOrEmpty($ResourceName)) {\r\n        $uri += \"/$ResourceName\"\r\n    }\r\n    if ($OperationMethod -ne \"GET\") {\r\n        if (-not [string]::IsNullOrEmpty($Action)) {\r\n            $uri += \"?action=$Action\"\r\n        }\r\n    } else {\r\n        if ($Arguments.Count -gt 0) {\r\n            $uri += \"?args=\"\r\n            $argsList = @()\r\n            foreach ($arg in $Arguments.GetEnumerator()) {\r\n                $argsList += \"$($arg.Name):$([System.Uri]::EscapeDataString($arg.Value))\"\r\n            }\r\n            $uri += $argsList -join ','\r\n        }\r\n        #TODO: Add filter, view, and pagesize\r\n    }\r\n    Write-Verbose \"URI: $uri\"\r\n\r\n    if ($OperationMethod -ne \"GET\") {\r\n        Write-Verbose \"Building Payload\"\r\n        $warning = if ($GetWarning) { \"YES\" } else { \"NO\" }\r\n        $hashtablePayload = @{}\r\n        $hashtablePayload.\"params\" = @{\"warning\"=$warning;\"onerror\"=$OnErrorAction;<#\"action\"=$Action#>}\r\n        $hashtablePayload.$ResourceType = $Payload\r\n        $jsonPayload = ConvertTo-Json $hashtablePayload -Depth ([int]::MaxValue)\r\n        Write-Verbose \"JSON Payload:`n$jsonPayload\"\r\n    }\r\n\r\n    try {\r\n        Write-Verbose \"Calling Invoke-RestMethod\"\r\n        $restParams = @{\r\n            Uri = $uri\r\n            ContentType = \"application/json\"\r\n            Method = $OperationMethod\r\n            WebSession = $NSSession.WebSession\r\n            ErrorVariable = \"restError\"\r\n        }\r\n\r\n        if ($OperationMethod -ne \"GET\") {\r\n            $restParams.Add(\"Body\",$jsonPayload)\r\n        }\r\n\r\n        $response = Invoke-RestMethod @restParams\r\n\r\n        if ($response) {\r\n            if ($response.severity -eq \"ERROR\") {\r\n                throw \"Error. See response: `n$($response | fl * | Out-String)\"\r\n            } else {\r\n                Write-Verbose \"Response:`n$(ConvertTo-Json $response | Out-String)\"\r\n            }\r\n        }\r\n    }\r\n    catch [Exception] {\r\n        if ($ResourceType -eq \"reboot\" -and $restError[0].Message -eq \"The underlying connection was closed: The connection was closed unexpectedly.\") {\r\n            Write-Verbose \"Connection closed due to reboot\"\r\n        } else {\r\n            throw $_\r\n        }\r\n    }\r\n\r\n    Write-Verbose \"$($MyInvocation.MyCommand): Exit\"\r\n\r\n    if ($OperationMethod -eq \"GET\") {\r\n        return $response\r\n    }\r\n}\r\n\r\n$psver = $PSVersionTable.PSVersion.Major\r\nif ($psver -eq \"1\" -or $psver -eq \"2\") {\r\n    Write-Error \"NetScaler ADC Enable Disable Service requires PowerShell v3 or newer. Installed version v$psver\"\r\n    return -1\r\n}\r\n\r\n$NSAddress = $OctopusParameters['HostName']\r\n$NSUserName = $OctopusParameters['Username']\r\n$NSPassword = $OctopusParameters['Password']\r\n$NSProtocol=\"http\"\r\n$Action = $OctopusParameters['EnableOrDisable']\r\n$ServiceName = $OctopusParameters['ServiceName']\r\n$GracefulShutdown = $OctopusParameters['Graceful']\r\n$GraceFulShutdownDelay = $OctopusParameters['GracefulDelay']\r\n\r\nif(!$NSAddress) {\r\n    Write-Error \"No NetScaler address specified. Please specify an address\"\r\n    exit -2\r\n}\r\n\r\nif(!$NSUserName) {\r\n    Write-Error \"No username specified. Please specify a username\"\r\n    exit -2\r\n}\r\n\r\nif(!$NSPassword) {\r\n    Write-Error \"No password specified. Please specify a password\"\r\n    exit -2\r\n}\r\n\r\nif(!$Action) {\r\n    Write-Error \"No action set. Action must either be enable or disable. Please select an action\"\r\n    exit -2\r\n}\r\n\r\nif(!$GracefulShutdown) {\r\n    Write-Error \"Graceful shutdown not selected. Must either be yes or no. Please select an option\"\r\n    exit -2\r\n}\r\n\r\nif(!$ServiceName) {\r\n    Write-Error \"Service name must be specified. Please specify service name\"\r\n    exist -2\r\n}\r\n\r\n\r\nSet-NSMgmtProtocol -Protocol $NSProtocol\r\n$myNSSession = Connect-NSAppliance -NSAddress $NSAddress -NSUserName $NSUserName -NSPassword $NSPassword\r\n$payload = @{name=$ServiceName}\r\nif($Action -eq \"disable\") {\r\n    $payload = @{name=$ServiceName;graceful=$GracefulShutdown;delay=$GraceFulShutdownDelay}\r\n}\r\n\r\nInvoke-NSNitroRestApi -NSSession $myNSSession -OperationMethod POST -ResourceType service -Payload $payload -Action $Action\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "EnableOrDisable",
-      "Label": "Service status",
-      "HelpText": "Option whether to disable og enable a Load Balancing Service",
-      "DefaultValue": "enable",
-      "DisplaySettings": {
-        "Octopus.SelectOptions": "enable|Enable\ndisable|Disable",
-        "Octopus.ControlType": "Select"
-      }
-    },
-    {
-      "Name": "ServiceName",
-      "Label": "LB Service Name",
-      "HelpText": "Load Balancing Service Name to enable or diable",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "HostName",
-      "Label": "NetScaler ADC host name",
-      "HelpText": "Address of the primary NetScaler ADC instance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "NetScaler ADC username",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "NetScaler ADC password",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Graceful",
-      "Label": "Graceful shutdown",
-      "HelpText": "The service is disabled only when all the current active client connections are closed by either the server or the client",
-      "DefaultValue": "Yes",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "YES|Yes\nNO|No"
-      }
-    },
-    {
-      "Name": "GracefulDelay",
-      "Label": "Graceful Delay (s)",
-      "HelpText": "The time in seconds after which the service is marked as OUT OF SERVICE.",
-      "DefaultValue": "300",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-01-29T21:49:05.609+00:00",
-  "LastModifiedBy": "jasper@sovs.net",
-  "$Meta": {
-    "ExportedAt": "2015-01-29T21:49:10.234+00:00",
-    "OctopusVersion": "2.6.0.778",
-    "Type": "ActionTemplate"
-  },
-  "Category": "netScaler"
-}
\ No newline at end of file
diff --git a/step-templates/newrelic-complete-deployment.json b/step-templates/newrelic-complete-deployment.json
deleted file mode 100644
index 105527980..000000000
--- a/step-templates/newrelic-complete-deployment.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Id": "7c88ea1e-de71-452d-be7e-b99dda397ba7",
-  "Name": "New Relic - Complete Deployment",
-  "Description": "Notifies [New Relic](https://newrelic.com) of a deployment.\nSends the revision/version number, deployer, etc from the Octopus deployment.",
-  "ActionType": "Octopus.Script",
-  "Version": 27,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Minimum PowerShell version for ConvertTo-Json is 3\n\nAdd-Type -AssemblyName System.Web\n\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12\n\n$apiKey = $OctopusParameters['ApiKey']\n$user = $OctopusParameters['User']\n$appId = $OctopusParameters['AppId']\n\n#https://octopus.com/docs/deployment-process/variables/system-variables\n$releaseNumber = $OctopusParameters['Octopus.Release.Number']\n$releaseNotes = $OctopusParameters['Octopus.Release.Notes']\n$machineName = $OctopusParameters['Octopus.Machine.Name']\n$projectName = $OctopusParameters['Octopus.Project.Name']\n$deploymentLink = $OctopusParameters['Octopus.Web.DeploymentLink']\n\n## --------------------------------------------------------------------------------------\n## Helpers\n## --------------------------------------------------------------------------------------\n# Helper for validating input parameters\nfunction Validate-Parameter([string]$foo, [string[]]$validInput, $parameterName) {\n  Write-Host \"${parameterName}: $foo\"\n  if (! $foo) {\n    throw \"No value was set for $parameterName, and it cannot be empty\"\n  }\n\n  if ($validInput) {\n    if (! $validInput -contains $foo) {\n      throw \"'$input' is not a valid input for '$parameterName'\"\n    }\n  }\n}\n\n## --------------------------------------------------------------------------------------\n## Configuration\n## --------------------------------------------------------------------------------------\nValidate-Parameter $apiKey -parameterName \"Api Key\"\n\nif (!$appId) {\n  Write-Host \"NewRelic Deploy - AppId has not been set yet. Skipping call to API.\"\n  exit 0\n}\n\nif ($appId -eq 0) {\n  Write-Host \"NewRelic Deploy - AppId has been set to zero. Skipping call to API.\"\n  exit 0\n}\n\n$userText = $((\" by user $user\", \"\")[!$user])\nWrite-Host (\"NewRelic Deploy - Notify deployment{0} - App {1} - Revision {2}\" -f $userText, $appId, $revision)\n\n\n# https://rpm.newrelic.com/api/explore/application_deployments/create?application_id=1127348\n$deployment = New-Object -TypeName PSObject\n$deployment | Add-Member -MemberType NoteProperty -Name \"user\" -Value $user\n$deployment | Add-Member -MemberType NoteProperty -Name \"revision\" -Value $releaseNumber\n$deployment | Add-Member -MemberType NoteProperty -Name \"changelog\" -Value $releaseNotes\n$deployment | Add-Member -MemberType NoteProperty -Name \"description\" -Value \"Octopus deployment of $projectName to $machineName. ($deploymentLink)\"\n\n$deploymentContainer = New-Object -TypeName PSObject\n$deploymentContainer | Add-Member -MemberType NoteProperty -Name \"deployment\" -Value $deployment\n\n$post = $deploymentContainer | ConvertTo-Json\nWrite-Debug $post\n\n# in production, we need to\n#Create a URI instance since the HttpWebRequest.Create Method will escape the URL by default.\n$URL = \"https://api.newrelic.com/v2/applications/$appId/deployments.json\"\n$URI = New-Object System.Uri($URL,$true)\n\n#Create a request object using the URI\n$request = [System.Net.HttpWebRequest]::Create($URI)\n$request.Method = \"POST\"\n$request.Headers.Add(\"X-Api-Key\",\"$apiKey\");\n$request.ContentType = \"application/json\"\n\n#Build up a nice User Agent\n$request.UserAgent = $(\n\"{0} (PowerShell {1}; .NET CLR {2}; {3})\" -f $UserAgent,\n$(if($Host.Version){$Host.Version}else{\"1.0\"}),\n[Environment]::Version,\n[Environment]::OSVersion.ToString().Replace(\"Microsoft Windows \", \"Win\")\n)\n$ReturnCode = 0\ntry {\n  Write-Host \"Posting data to $URL\"\n  #Create a new stream writer to write the xml to the request stream.\n  $stream = New-Object IO.StreamWriter $request.GetRequestStream()\n  $stream.AutoFlush = $True\n  $PostStr = [System.Text.Encoding]::UTF8.GetBytes($Post)\n  $stream.Write($PostStr, 0,$PostStr.length)\n  $stream.Close()\n\n  #Make the request and get the response\n  $response = $request.GetResponse()\n\n  if ([int]$response.StatusCode -eq 201) {\n    Write-Host \"NewRelic Deploy - API called succeeded - HTTP $($response.StatusCode).\"\n  } else {\n    Write-Host \"NewRelic Deploy - API called failed - HTTP $($response.StatusCode).\"\n    $ReturnCode = 1\n  }\n  $response.Close()\n} catch {\n  $ErrorMessage = $_.Exception.Message\n  $res = $_.Exception.Response\n  Write-Host \"NewRelic Deploy - API called failed - $ErrorMessage\"\n  $ReturnCode = 1\n}\nexit $ReturnCode\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "caf3f015-671f-4600-bce0-ebcc7d5957fe",
-      "Name": "ApiKey",
-      "Label": "Api Key",
-      "HelpText": "Your New Relic API key.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "3748da93-614d-4040-8c63-7c86a260c79e",
-      "Name": "AppId",
-      "Label": "App ID",
-      "HelpText": "The ID of the application in New Relic RPM.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "719ab099-a361-4a58-ad34-b1d4acb70dd2",
-      "Name": "User",
-      "Label": "User (optional)",
-      "HelpText": "The name of the user/process that triggered this deployment.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2024-04-16T20:50:00.0000000+03:00",
-  "LastModifiedBy": "Softer",
-  "$Meta": {
-    "ExportedAt": "2024-04-16T20:50:00.0000000+03:00",
-    "OctopusVersion": "2019.12.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "newrelic"
-}
diff --git a/step-templates/octopus-artifact-collect.json b/step-templates/octopus-artifact-collect.json
deleted file mode 100644
index 31b6ebdc4..000000000
--- a/step-templates/octopus-artifact-collect.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "Id": "7d09ccec-91b7-4c0c-95d7-27a42b21eb5a",
-  "Name": "Artifact Collect",
-  "Description": "Collect artifacts easily and safely.",
-  "ActionType": "Octopus.Script",
-  "Version": 15,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "try{\n    #region Types - Constants\n    Add-Type -assembly \"system.io.compression.filesystem\"\n    $shaloMaskString = '********'\n    #endregion\n\n    #region Params\n    $shaloArtifactPath = $OctopusParameters['shaloArtifactPath']\n    Write-Host \"     Artifact path: [$shaloArtifactPath]\"\n\n    $shaloCollectedArtifactName = $OctopusParameters['shaloCollectedArtifactName']\n    Write-Host \"     Artifact name: [$shaloCollectedArtifactName]\"\n\n    $shaloArtifactTempPath = $OctopusParameters['shaloArtifactTempPath']\n    if($shaloArtifactTempPath.Length -eq 0){\n        Write-Error \"     Artifact Temporal path not set.\"\n        exit 1\n    }\n    Write-Host \"     Artifact Temporal path: [$shaloArtifactTempPath]\"\n\n    \n\n    $shaloCompressionLevel = $OctopusParameters['shaloCompressionLevel']\n    switch($shaloCompressionLevel) {\n        'Optimal' {$shaloCompressionLevel = [System.IO.Compression.CompressionLevel]::Optimal} \n        'Fastest' {$shaloCompressionLevel = [System.IO.Compression.CompressionLevel]::Fastest} \n        'NoCompression' {$shaloCompressionLevel = [System.IO.Compression.CompressionLevel]::NoCompression} \n    }\n    Write-Host \"     Artifact compresion Level: [$shaloCompressionLevel]\"\n\n    $shaloMaskFilers = $OctopusParameters['shaloMaskFilers']\n    $shaloMaskKeys = $OctopusParameters['shaloMaskKeys']\n    if($shaloMaskFilers.Length -gt 0 -and $shaloMaskKeys.Length -gt 0){\n        Write-Host \"     Scrub sensitive values from this file extensions : [$shaloMaskFilers]\"\n        $shaloMaskFilers = $shaloMaskFilers.Split(',')\n        $shaloMaskKeys = $shaloMaskKeys.Split(',')\n    }\n    #endregion\n\n    \n    if(Test-Path -Path $shaloArtifactPath){\n        Write-Host ''\n        #region Create Temporal Artifact\n        $shaloArtifactObject = Get-Item $shaloArtifactPath\n        try{\n        \tWrite-Host '     Cleaning Artifact Temporal Folder'\n            Remove-Item -Path $shaloArtifactTempPath -Force -Recurse\n        }catch{\n        }\n        if($shaloArtifactObject.PSIsContainer){\n            Write-Host '     Artifact type: [Directory]'\n            Copy-Item -Path $shaloArtifactPath -Destination $shaloArtifactTempPath -Recurse -Force\n        }else{\n            Write-Host '     Artifact type: [File]'\n            New-Item -Path $shaloArtifactTempPath -Force -ItemType Directory\n            Copy-Item -Path $shaloArtifactObject.FullName -Destination ($shaloArtifactTempPath + \"\\\" + $shaloArtifactObject.Name) -Force\n        }\n        Write-Host '     Temporal artifact created'\n        #endregion\n    \n        #region Apply Mask\n        Write-Host ''\n        Write-Host '     Masking sensitive data'\n        if($shaloMaskFilers.Length -gt 0 -and $shaloMaskKeys.Length -gt 0){\n            $shaloArtifactTempObjects = Get-ChildItem -Path $shaloArtifactTempPath -Force -Recurse\n            foreach($shaloItem in $shaloArtifactTempObjects){\n                if($shaloMaskFilers.Trim() -contains $shaloItem.Extension){\n                    foreach($ShaloKey in $shaloMaskKeys){\n                        (Get-Content $shaloItem.FullName) -replace $ShaloKey.Trim(), $shaloMaskString| Set-Content $shaloItem.FullName\n                    }\n                }\n            }\n        }\n        #endregion\n\n        #region Compress and Collect\n        Write-Host ''\n        Write-Host ''\n        Write-Host '     Compressing artifact...'\n        Write-Host \"     Artifact Temporal Path [$shaloArtifactTempPath]\"\n        Compress-Archive -Path $shaloArtifactTempPath -DestinationPath \"$shaloArtifactTempPath\\$shaloCollectedArtifactName.zip\" -Force -CompressionLevel $shaloCompressionLevel\n        Write-Host '     Artifact compressed'\n       \n\n        Write-Host ''\n        Write-Host ''\n        Write-Host '     Collecting artifact...'\n        Write-Host \"     Artifact Path [$shaloArtifactTempPath\\$shaloCollectedArtifactName.zip]\"\n        $Shalohash = Get-FileHash \"$shaloArtifactTempPath\\$shaloCollectedArtifactName.zip\" -Algorithm MD5 | Select Hash\n        Write-Host '     MD5 hash [' $Shalohash.Hash ']'\n        New-OctopusArtifact -Path \"$shaloArtifactTempPath\\$shaloCollectedArtifactName.zip\" -Name \"$shaloCollectedArtifactName.zip\"\n        Write-Host '     Artifact Collected'\n        \n        Write-Host ''\n        Write-Host ''\n    }else{\n        Write-Host ''\n        Write-Host ''\n        Write-Warning '     Artifact not found!'\n    }\n    \n        Write-Host ''\n        Write-Host ''\n        Write-Host 'Done!'\n\n}catch{\n    $ErrorMessage = $_.Exception.Message\n    $FailedItem = $_.Exception.ItemName\n    Write-Error \"We failed to processing $FailedItem. The error message was $ErrorMessage\"\n    exit 1\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "1e50ae45-2a45-43c5-afdb-ac69f2527a37",
-      "Name": "shaloArtifactPath",
-      "Label": "Artifact path",
-      "HelpText": "Folder path or file full name\n\nExample: \n* C:\\somepath\n* C:\\somepath\\file.log",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "bf2684fa-1ddf-4f46-9763-949962c543f3",
-      "Name": "shaloArtifactTempPath",
-      "Label": "Artifact temporal path",
-      "HelpText": "Temporal path that will use to compress files and mask sensitive data",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "380865db-7f30-43bc-9425-6af65a2b9e8d",
-      "Name": "shaloCompressionLevel",
-      "Label": "Compression Level",
-      "HelpText": null,
-      "DefaultValue": "Optimal",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Optimal|Optimal\nFastest|Fastest\nNoCompression|No Compression"
-      }
-    },
-    {
-      "Id": "5161cd62-df8b-4037-83b1-a674f695839b",
-      "Name": "shaloMaskFilers",
-      "Label": "Files with sensitive data",
-      "HelpText": "__Optional__\nComma separated file extensions witch contains sensitive data.\n\nExample: .txt, .config",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2a205ab4-1790-436e-b000-42706ea0524b",
-      "Name": "shaloMaskKeys",
-      "Label": "Keys words that will be masked",
-      "HelpText": "__Optional__\nComma separated sensitive words\n\nExample: username, password, 1234-4567-8912-3456",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "9a5036b8-dc0e-412a-a7ea-4aa2120d8e0d",
-      "Name": "shaloCollectedArtifactName",
-      "Label": "Collected artifact Name",
-      "HelpText": "Artifact Name\n\nExample: DeploymentLogs.#{Octopus.Release.Number}",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2019-05-29T23:09:57.329Z",
-    "OctopusVersion": "2019.3.1",
-    "Type": "ActionTemplate"
-  },
-      "Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/octopus-authenticate-with-oidc.json b/step-templates/octopus-authenticate-with-oidc.json
deleted file mode 100644
index 412fec144..000000000
--- a/step-templates/octopus-authenticate-with-oidc.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "97a36fb9-7b00-4608-866f-53fd459bcdea",
-  "Name": "Octopus - Authenticate with OIDC",
-  "Description": "**This step requires Octopus 2025.3.12525 or later.**\n<br /><br />\nThis step uses Octopus an [OpenID Connect](https://octopus.com/docs/infrastructure/accounts/openid-connect) Account to obtain an access token that can be used in place of an API key in requests against the Octopus API.\n<br /><br />\nThe access token is stored in an [Output Variable](https://octopus.com/docs/projects/variables/output-variables) named **AccessToken**.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Invoke-OctopusApi {\n  param(\n    $Uri,\n    $Method,\n    $Body\n  )\n\n  try {\n    Write-Verbose \"Making request to $Uri\"\n\n    if ($null -eq $Body)\n    {\n      Write-Verbose \"No body to send in the request\"\n      return Invoke-RestMethod -Method $method -Uri $Uri -ContentType \"application/json; charset=utf-8\"\n    } \n\n  $Body = $Body | ConvertTo-Json -Depth 10\n  Write-Verbose $Body\n  \n    return Invoke-RestMethod -Uri $Uri -Method $Method -Body $Body -ContentType \"application/json; charset=utf-8\" -ErrorAction Stop\n  }\n  catch {\n    Write-Host \"Request failed with message `\"$($_.Exception.Message)`\"\"\n\n    if ($_.Exception.Response) {\n        $code = $_.Exception.Response.StatusCode.value__\n        $message = $_.Exception.Message\n        Write-Host \"HTTP response code: $code\"\n\n        Write-Host \"Server returned: $error\"\n      }\n\n    Fail-Step \"Failed to make $method request to $uri\"\n  }\n}\n\nif ([string]::IsNullOrWhiteSpace($OctopusParameters[\"AuthenticateWithOIDC.ServerUri\"])) {\n  Fail-Step \"Octopus Server Uri is required.\"\n}\n\nif ([string]::IsNullOrWhiteSpace($OctopusParameters[\"AuthenticateWithOIDC.OidcAccount\"])) {\n  Fail-Step \"OIDC Account is required.\"\n}\n\n$server = $OctopusParameters[\"AuthenticateWithOIDC.ServerUri\"]\n$serviceAccountId = $OctopusParameters[\"AuthenticateWithOIDC.OidcAccount.Audience\"]\n$jwt = $OctopusParameters[\"AuthenticateWithOIDC.OidcAccount.OpenIdConnect.Jwt\"]\n\n$body = @{\n  grant_type = \"urn:ietf:params:oauth:grant-type:token-exchange\";\n  audience = \"$serviceAccountId\";\n  subject_token_type = \"urn:ietf:params:oauth:token-type:jwt\";\n  subject_token = \"$jwt\"\n}\n\n$uri = \"$server/.well-known/openid-configuration\"\n$response = Invoke-OctopusApi -Uri $uri -Method \"GET\"\n$response = Invoke-OctopusApi -Uri $response.token_endpoint -Method \"POST\" -Body $body\n\nSet-OctopusVariable -name \"AccessToken\" -value $response.access_token -sensitive\n\n$stepName = $OctopusParameters[\"Octopus.Step.Name\"]\nWrite-Host \"Created output variable: ##{Octopus.Action[$stepName].Output.AccessToken}\""
-  },
-  "Parameters": [
-    {
-      "Id": "057c4820-9052-4d87-860e-4f4ef501fd4a",
-      "Name": "AuthenticateWithOIDC.ServerUri",
-      "Label": "Octopus Server Uri",
-      "HelpText": "The URI of the Octopus Server with which to authenticate.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "dbcea301-baeb-4ae5-974e-3161695df254",
-      "Name": "AuthenticateWithOIDC.OidcAccount",
-      "Label": "OIDC Account",
-      "HelpText": "The Generic OIDC Account variable used to authenticate with the Octopus Server.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "GenericOidcAccount"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-09-02T21:56:43.519Z",
-    "OctopusVersion": "2025.3.13248",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "ryanrousseau",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-blue-green-check.json b/step-templates/octopus-blue-green-check.json
deleted file mode 100644
index 4bd50e96a..000000000
--- a/step-templates/octopus-blue-green-check.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Id": "72db001f-ae7f-4a0f-b952-5f80e2fc4cd2",
-  "Name": "Octopus - Check Blue Green Deployment",
-  "Description": "This step checks to ensure that deployments to blue/green environments alternate. The output variable `SequentialDeploy` is set to `True` if two deployments are done to the same environment, and `False` if they are alternating.\n\nA common scenario is to check for `SequentialDeploy` set to `True` and display a warning or the manual intervention step to confirm a deployment.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# We assume that deployments to the production environments alternate between green and blue.\n# For example, if the last production deployment was to blue the next one should be to the green environment.\n# This check is used to provide a warning if a production environment is deployed to twice in a row.\n\n$octopusUrl = \"\"\n\n# Check to make sure targets have been created\nif ([string]::IsNullOrWhitespace(\"#{Octopus.Web.ServerUri}\"))\n{\n    $octopusUrl = \"#{Octopus.Web.BaseUrl}\"\n}\nelse\n{\n    $octopusUrl = \"#{Octopus.Web.ServerUri}\"\n}\n\nif (-not \"#{BlueGreen.Octopus.Api.Key}\".StartsWith(\"API-\")) {\n    Write-Host \"The BlueGreen.Octopus.Api.Key variable has not been defined. We can not validate the deployment environment.\"\n    Write-Highlight \"See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys.\"\n    Write-Highlight \"Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check for deployments to blue/green environments in this space.\"\n    exit 0\n}\n\nif ([string]::IsNullOrWhiteSpace(\"#{BlueGreen.Environment.Blue.Name}\")) {\n    Write-Host \"The BlueGreen.Environment.Blue.Name variable has not been defined. We can not validate the deployment environment.\"\n    exit 0\n}\n\nif ([string]::IsNullOrWhiteSpace(\"#{BlueGreen.Environment.Green.Name}\")) {\n    Write-Host \"The BlueGreen.Environment.Green.Name variable has not been defined. We can not validate the deployment environment.\"\n    exit 0\n}\n\n$header = @{ \"X-Octopus-ApiKey\" = \"#{BlueGreen.Octopus.Api.Key}\" }\n\n# Get environment ID\n$blueEnvironmentName = \"#{BlueGreen.Environment.Blue.Name}\"\n$blueEnvironments = Invoke-RestMethod -Uri \"$octopusURL/api/#{Octopus.Space.Id}/environments?partialName=$([uri]::EscapeDataString($blueEnvironmentName))&skip=0&take=100\" -Headers $header\n$blueEnvironment = $blueEnvironments.Items | Where-Object { $_.Name -eq $blueEnvironmentName } | Select-Object -First 1\n\nif ($null -eq $blueEnvironment) {\n    Write-Host \"Could not find an environment called $blueEnvironmentName. We can not validate the deployment environment.\"\n    exit 0\n}\n\n$greenEnvironmentName = \"#{BlueGreen.Environment.Green.Name}\"\n$greenEnvironments = Invoke-RestMethod -Uri \"$octopusURL/api/#{Octopus.Space.Id}/environments?partialName=$([uri]::EscapeDataString($greenEnvironmentName))&skip=0&take=100\" -Headers $header\n$greenEnvironment = $greenEnvironments.Items | Where-Object { $_.Name -eq $greenEnvironmentName } | Select-Object -First 1\n\nif ($null -eq $greenEnvironment) {\n    Write-Host \"Could not find an environment called $greenEnvironment. We can not validate the deployment environment.\"\n    exit 0\n}\n\n# Get deployments for the environment and project, excluding the current deployment\n$blueDeploymentsUri = \"$octopusUrl/api/#{Octopus.Space.Id}/deployments?environments=$($blueEnvironment.Id)&projects=#{Octopus.Project.Id}&take=2\"\n$blueLatestDeployment = Invoke-RestMethod -Uri $blueDeploymentsUri -Headers $header | Select-Object -ExpandProperty Items | Where-Object { $_.Id -ne \"#{Octopus.Deployment.Id}\" }\n\n$greenDeploymentsUri = \"$octopusUrl/api/#{Octopus.Space.Id}/deployments?environments=$($greenEnvironment.Id)&projects=#{Octopus.Project.Id}&take=2\"\n$greenLatestDeployment = Invoke-RestMethod -Uri $greenDeploymentsUri -Headers $header | Select-Object -ExpandProperty Items | Where-Object { $_.Id -ne \"#{Octopus.Deployment.Id}\" }\n\n# This is the first deployment to any environment. It doesn't matter which one we go to first.\nif ($greenLatestDeployment.Length -eq 0 -and $blueLatestDeployment.Length -eq 0) {\n    Write-Host \"Neither environment has had a deployment, so we are OK to continue\"\n    Set-OctopusVariable -name \"SequentialDeploy\" -value \"False\"\n    exit 0\n}\n\nif (\"#{Octopus.Environment.Name}\" -eq $blueEnvironmentName) {\n    if ($blueLatestDeployment.Length -eq 0)\n    {\n        Write-Host \"We're deploying to blue and there are no blue deployments, so we're OK to continue\"\n        Set-OctopusVariable -name \"SequentialDeploy\" -value \"False\"\n        exit 0\n    }\n\n    # We know we have deployed to blue at least once, but if we have never deployed to green\n    # then we should not continue.\n    if ($greenLatestDeployment.Length -eq 0)\n    {\n        Write-Host \"We're deploying to blue but there are no green deployments, so we should not continue\"\n        Set-OctopusVariable -name \"SequentialDeploy\" -value \"True\"\n        exit 0\n    }\n}\n\nif (\"#{Octopus.Environment.Name}\" -eq $greenEnvironmentName) {\n    if ($greenLatestDeployment.Length -eq 0)\n    {\n        Write-Host \"We're deploying to green and there are no green deployments, so we're OK to continue\"\n        Set-OctopusVariable -name \"SequentialDeploy\" -value \"False\"\n        exit 0\n    }\n\n    # We know we have deployed to green at least once, but if we have never deployed to blue\n    # then we should not continue.\n    if ($blueLatestDeployment.Length -eq 0)\n    {\n        Write-Host \"We're deploying to green but there are no blue deployments, so we should not continue\"\n        Set-OctopusVariable -name \"SequentialDeploy\" -value \"True\"\n        exit 0\n    }\n}\n\n# At this point both blue and green have done at least one deployment. We need to check\n# which environment had the last deployment.\n$blueLastDeploy = [DateTimeOffset]::Parse($blueLatestDeployment[0].Created)\n$greenLastDeploy = [DateTimeOffset]::Parse($greenLatestDeployment[0].Created)\n\nWrite-Host \"Blue Last Deploy: $blueLastDeploy\"\nWrite-Host \"Green Last Deploy: $greenLastDeploy\"\n\n# We now check to see if the current environment has had the last deployment. If so,\n# we have deployed to this environment twice in a row and we should block the deployment.\nif (\"#{Octopus.Environment.Name}\" -eq $blueEnvironmentName -and $blueLastDeploy -gt $greenLastDeploy) {\n    Write-Host \"The last deployment was to the blue environment, so we should not deploy to it again.\"\n    Set-OctopusVariable -name \"SequentialDeploy\" -value \"True\"\n    exit 0\n}\n\nif (\"#{Octopus.Environment.Name}\" -eq $greenEnvironmentName -and $greenLastDeploy -gt $blueLastDeploy) {\n    Write-Host \"The last deployment was to the green environment, so we should not deploy to it again.\"\n    Set-OctopusVariable -name \"SequentialDeploy\" -value \"True\"\n    exit 0\n}\n\nWrite-Host \"We're OK to continue with the deployment.\"\nSet-OctopusVariable -name \"SequentialDeploy\" -value \"False\"",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "OctopusUseBundledTooling": "False"
-  },
-  "Parameters": [
-    {
-      "Id": "825689d8-f465-4887-a8fc-b03821c82910",
-      "Name": "BlueGreen.Octopus.Api.Key",
-      "Label": "The Octopus API key",
-      "HelpText": "Use the documentation at https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key to create an API key.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "b2535aeb-ea47-413b-a387-f2bae47137bd",
-      "Name": "BlueGreen.Environment.Blue.Name",
-      "Label": "The name of the blue environment",
-      "HelpText": "This is the name of the environment in Octopus that represents the blue deployment stack. It will be something like `Production - Blue`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7049503a-b6a1-4ba4-b190-55b2f4508d85",
-      "Name": "BlueGreen.Environment.Green.Name",
-      "Label": "The name of the green environment",
-      "HelpText": "This is the name of the environment in Octopus that represents the green deployment stack. It will be something like `Production - Green`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-10-14T06:35:25.515Z",
-    "OctopusVersion": "2025.3.14357",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "Octopus"
-}
diff --git a/step-templates/octopus-chain-deployment.json b/step-templates/octopus-chain-deployment.json
deleted file mode 100644
index 2c2dedb92..000000000
--- a/step-templates/octopus-chain-deployment.json
+++ /dev/null
@@ -1,187 +0,0 @@
-{
-  "Id": "18392835-d50e-4ce9-9065-8e15a3c30954",
-  "Name": "Chain Deployment",
-  "Description": "Triggers a deployment of another project in Octopus",
-  "ActionType": "Octopus.Script",
-  "Version": 26,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "<#\n----- Chain Deployment -----\nAuthors & Credits\n    Paul Marston @paulmarsy (paul@marston.me)\n    Joe Waid @joewaid\n    Henrik Andersson @alfhenrik\n    Damian Brady @Damovisa\n    Aaron Burke @aburke-incomm (aburke@incomm.com)\n    Bob Hindy @bstr413\n    Leo De Oliveira Dias @LeoDOD\nLinks\n    https://library.octopus.com/step-templates/18392835-d50e-4ce9-9065-8e15a3c30954\n    https://github.com/OctopusDeploy/Library/commits/master/step-templates/octopus-chain-deployment.json\n\n----- Advanced Configuration Settings -----\nVariable names can use either of the following two formats: \n    Octopus.Action.<Setting Name> - will apply to all steps in the deployment, e.g.\n        Octopus.Action.DebugLogging\n    Octopus.Action[Step Name].<Setting Name> - will apply to 'step name' alone, e.g.\n        Octopus.Action[Provision Virtual Machine].DeploymentRetryCount\n\nAvailable Settings:\n    - DebugLogging - set to 'True' or 'False' to log all GET web requests\n    - GuidedFailureMessage - will change the note used when submitting guided failure actions, the following variables will be replaced in the text:\n        #{GuidedFailureActionIndex} - The current count of interrupts for that step e.g. 1\n        #{GuidedFailureAction} - The action being submitted by the step e.g. Retry\n    - DeploymentRetryCount - will override the number of times a deployment will be retried when unsuccessful and enable retrying when the failure option is set for a different option, default is 1\n    - StepRetryCount - will override the number of times a deployment step will be retried before before submitting Ignore or Abort, default is 1\n    - RetryWaitPeriod - an additional delay in seconds wait before retrying a failed step/deployment, default is 0\n    - QueueTimeout - when scheduling a deployment for later a timeout must be provided, this allows a custom value, default is 30:00, format is hh:mm\n    - OctopusServerUrl - will override the base url used for all webrequests, making it possible to chain deployments on a different Octopus instance/server, or as a workaround for misconfigured node settings\n\n----- Changelog -----\n25. Feb 9, 2023 - Bob Hindy @bstr413\n\t- Fixed issue caused by version 23 where script would not work with on premise Octopus servers. (Reverted most of the changes 60ae653 and d614a2d made to this step template.)\n24. Sept 13, 2021 - Mark Harrison @harrisonmeister\n    - Fixed issue where the Invoke-OctopusApi function would error with 404: NotFound when running Chain deployment on an Octopus instance \n      that runs under either a \"virtual directory\" / route prefix other than the route e.g https://my.octopus.app/octo/\n23. Aug 23rd, 2021 - Ben Macpherson benjimac93\n    - Use Octopus.Web.ServerUri in place of Octopus.Web.BaseUrl if present.\n22. Dec 31, 2020 - Josh Slaughter @joshgk00\n\t- Fixed an issue where the script was unable to create a release if Chained project contained a step with multiple package references\n20. Sept 3, 2020 - Mark Harrison @harrisonmeister\n\t- Included setting to TLS 1.2. \n19. July 17, 2020 - Aaron Burke @aburke-incomm\n\t- Update script handle Regex for Channel Tags in the CreateRelease Function\n17. December 18, 2018 - Jim Burger @burgomg\n\t- Added Spaces compatibility\n16. November 22, 2018 - Patrick Kearney @patrickkearney\n    - Fixed an issue where the step was unable to pass a form variable containing an \"=\" in the value.\n15. July 17, 2017 - Robert Glickman @robertglickman\n    - Fixed an issue where the step would fail in Octopus 3.15+ due to templated URIs not being handled\n14. May 5, 2017 - Paul Marston @paulmarsy (paul@marston.me)\n    - Improved step parameter metadata & validation\n    - Added changelog, documentation of advanced settings\n    - Supports deploying to multiple environments in one step by specifying a lifecycle phase name e.g. 'Dev'\n    - Automated retry of the entire deployment as an additional failure handling option\n    - Number of step/deployment retries is configurable using a settings variable\n    - Supports Octopus scheduled deployments (can be used for reoccuring scheduled deploys, or autonomous deployment retry)\n    - Individual tenants as well as tenant tags can be deployed to\n    - Fixing a bug where Guided Failure is always evaluated to true\n    - Improved identification of valid environment&tenant promotions by using the 'deployment template' api\n    - If a release version has already been created, it will be used rather than erroring trying to recreate it\n    - Using 'Fail-Step' for better error logging\n    - Fixed a bug where log messages with an identical timestamp were repeatedly reported\n    - Added an option to wait before retrying a step/deployment\n    - A release's channel is taken into account when checking if an existing release version can be used\n13. Apr 21, 2017 - Paul Marston @paulmarsy (paul@marston.me)\n    - Complete step template rewrite\n    - Improved logging\n        * Logs only written when chained deployment changes\n        * Progress of deployment step states is reported\n        * Errors & warnings are reported without interpretation in parent deployment\n        * Manual intervention & guided failure events are reported\n        * Queue position reported before deployment starts\n        * Verbose logging of useful API urls\n    - Multi-tenancy support and handling multiple tenant deploys from one chain step\n    - Support for skipping steps\n    - Support for prompted form variables\n    - Create release functionality supports using the version from the incremented version template or donor package\n    - Ability to snapshot update variables of a release before deploying\n    - Automated handling of guided failure scenarios e.g. retry on step failure, then abort if it errors a second time\n    - Transient Octopus API request failures are handled (e.g. we saw many deployments failing because of a request timeout)\n    - Post-deploy script support with variable substitution performed using the manifest variable set of the chained deployment with appropriate scoping applied (though not advanced scope specificity)\n    - Defaulting channel to a blank value which looks for one with 'IsDefault' set true\n    - Create release performs a simplified package version lookup to populate the 'SelectedPackages' field\n12. Mar 30, 2017 - Joe Waid @joewaid\n    - Pass the Environments \"Guided Failure\" setting\n    - Check status after deployment when Chain_WaitForDeployment is true\n11. Nov 21, 2016 - Henrik Andersson @alfhenrik\n    - Add Wait for deployment option to chain deployment step template\n10. May 2, 2016 - Damian Brady @Damovisa\n    - Add Chained Deployment step template\n#>\n#Requires -Version 5\n$ErrorActionPreference = 'Stop'\n$ProgressPreference = 'SilentlyContinue'\n$DefaultUrl = $OctopusParameters['Octopus.Web.BaseUrl']\n$Chain_BaseApiUrl = \"/api\"\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n\nfunction Test-String {\n    param([Parameter(Position = 0)]$InputObject, [switch]$ForAbsence)\n\n    $hasNoValue = [System.String]::IsNullOrWhiteSpace($InputObject)\n    if ($ForAbsence) { $hasNoValue }\n    else { -not $hasNoValue }\n}\n\nfunction Get-OctopusSetting {\n    param([Parameter(Position = 0, Mandatory)][string]$Name, [Parameter(Position = 1, Mandatory)]$DefaultValue)\n    $formattedName = 'Octopus.Action.{0}' -f $Name\n    if ($OctopusParameters.ContainsKey($formattedName)) {\n        $value = $OctopusParameters[$formattedName]\n        if ($DefaultValue -is [int]) { return ([int]::Parse($value)) }\n        if ($DefaultValue -is [bool]) { return ([System.Convert]::ToBoolean($value)) }\n        if ($DefaultValue -is [array] -or $DefaultValue -is [hashtable] -or $DefaultValue -is [pscustomobject]) { return (ConvertFrom-Json -InputObject $value) }\n        return $value\n    }\n    else { return $DefaultValue }\n}\n\n# Write functions are re-defined using octopus service messages to preserve formatting of log messages received from the chained deployment and avoid errors being twice wrapped in an ErrorRecord\nfunction Write-Fatal($message, $exitCode = -1) {\n    if (Test-Path Function:\\Fail-Step) {\n        Fail-Step $message\n    }\n    else {\n        Write-Host (\"##octopus[stdout-error]`n{0}\" -f $message)\n        Exit $exitCode\n    }\n}\nfunction Write-Error($message) { Write-Host (\"##octopus[stdout-error]`n{0}`n##octopus[stdout-default]\" -f $message) }\nfunction Write-Warning($message) { Write-Host (\"##octopus[stdout-warning]`n{0}`n##octopus[stdout-default]\" -f $message) }\nfunction Write-Verbose($message) { Write-Host (\"##octopus[stdout-verbose]`n{0}`n##octopus[stdout-default]\" -f $message) }\n\n# Use \"Octopus.Web.ServerUri\" if it is available\nif ([string]::IsNullOrWhiteSpace($OctopusParameters['Octopus.Web.ServerUri']) -eq $False) {\n    $DefaultUrl = $OctopusParameters['Octopus.Web.ServerUri']\n}\n\n$Chain_BaseUrl = (Get-OctopusSetting OctopusServerUrl $DefaultUrl).Trim('/')\nif (Test-String $Chain_ApiKey -ForAbsence) {\n    Write-Fatal \"The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again.\"\n}\n$DebugLogging = Get-OctopusSetting DebugLogging $false\n\n# Replace any \"virtual directory\" or route prefix e.g from the Links collection used\n# with the api e.g. /api\nfunction Format-LinksUri {\n    param(\n        [Parameter(Position = 0, Mandatory)]\n        $Uri\n    )\n    $Uri = $Uri -replace '.*/api', '/api'\n    Return $Uri\n}\n# Replace any \"virtual directory\" or route prefix e.g from the Links collection used\n# with the web app e.g. /app\nfunction Format-WebLinksUri {\n    param(\n        [Parameter(Position = 0, Mandatory)]\n        $Uri\n    )\n    $Uri = $Uri -replace '.*/app', '/app'\n    Return $Uri\n}\n\nfunction Invoke-OctopusApi {\n    param(\n        [Parameter(Position = 0, Mandatory)]$Uri,\n        [ValidateSet('Get', 'Post', 'Put')]$Method = 'Get',\n        $Body,\n        [switch]$GetErrorResponse\n    )\n    # Replace query string example parameters e.g. {?skip,take,partialName} \n    # Replace any \"virtual directory\" or route prefix e.g from the Links collection.\n    $Uri = $Uri -replace '{.*?}', '' -replace '.*/api', '/api'\n    $requestParameters = @{\n        Uri             = ('{0}/{1}' -f $Chain_BaseUrl, $Uri.TrimStart('/'))\n        Method          = $Method\n        Headers         = @{ 'X-Octopus-ApiKey' = $Chain_ApiKey }\n        UseBasicParsing = $true\n    }\n    if ($Method -ne 'Get' -or $DebugLogging) {\n        Write-Verbose ('{0} {1}' -f $Method.ToUpperInvariant(), $requestParameters.Uri)\n    }\n    if ($null -ne $Body) {\n        $requestParameters.Add('Body', (ConvertTo-Json -InputObject $Body -Depth 10))\n        Write-Verbose $requestParameters.Body\n    }\n    \n    $wait = 0\n    $webRequest = $null\n    while ($null -eq $webRequest) {\t\n        try {\n            $webRequest = Invoke-WebRequest @requestParameters\n        }\n        catch {\n            if ($_.Exception -is [System.Net.WebException] -and $null -ne $_.Exception.Response) {\n                $errorResponse = [System.IO.StreamReader]::new($_.Exception.Response.GetResponseStream()).ReadToEnd()\n                Write-Verbose (\"Error Response:`n{0}\" -f $errorResponse)\n                if ($GetErrorResponse) {\n                    return ($errorResponse | ConvertFrom-Json)\n                }\n                if ($_.Exception.Response.StatusCode -in @([System.Net.HttpStatusCode]::NotFound, [System.Net.HttpStatusCode]::InternalServerError, [System.Net.HttpStatusCode]::BadRequest, [System.Net.HttpStatusCode]::Unauthorized)) {\n                    Write-Fatal $_.Exception.Message\n                }\n            }\n            if ($wait -eq 120) {\n                Write-Fatal (\"Octopus web request ({0}: {1}) failed & the maximum number of retries has been exceeded:`n{2}\" -f $Method.ToUpperInvariant(), $requestParameters.Uri, $_.Exception.Message) -43\n            }\n            $wait = switch ($wait) {\n                0 { 30 }\n                30 { 60 }\n                60 { 120 }\n            }\n            Write-Warning (\"Octopus web request ({0}: {1}) failed & will be retried in $wait seconds:`n{2}\" -f $Method.ToUpperInvariant(), $requestParameters.Uri, $_.Exception.Message)\n            Start-Sleep -Seconds $wait\n        }\n    }\n    $webRequest.Content | ConvertFrom-Json | Write-Output\n}\n\nfunction Get-FilteredOctopusItem {\n    param(\n        $itemList,\n        $itemName\n    )\n\n    if ($itemList.Items.Count -eq 0) {\n        Write-Fatal \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        Exit 1\n    }  \n\n    $item = $itemList.Items | Where-Object { $_.Name -eq $itemName }      \n\n    if ($null -eq $item) {\n        Write-Fatal \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        exit 1\n    }\n    \n    if ($item -is [array]) {\n        Write-Fatal \"More than one item exists with the name $itemName.  Exiting with an exit code of 1.\"\n        exit 1\n    }\n\n    return $item\n}\n\nfunction Test-SpacesApi {\n    Write-Verbose \"Checking API compatibility\";\n    $rootDocument = Invoke-OctopusApi \"api/\";\n    if ($null -ne $rootDocument.Links -and $null -ne $rootDocument.Links.Spaces) {\n        Write-Verbose \"Spaces API found\"\n        return $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif (Test-SpacesApi) {\n    $spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if ([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n    }\n    $Chain_BaseApiUrl = \"/api/$spaceId\" ;\n}\n\nenum GuidedFailure {\n    Default\n    Enabled\n    Disabled\n    RetryIgnore\n    RetryAbort\n    Ignore\n    RetryDeployment\n}\n\nclass DeploymentContext {\n    hidden $BaseUrl\n    hidden $BaseApiUrl\n    DeploymentContext($baseUrl, $baseApiUrl) {\n        $this.BaseUrl = $baseUrl\n        $this.BaseApiUrl = $baseApiUrl\n    }\n\n    hidden $Project\n    hidden $Lifecycle\n    [void] SetProject($projectName) {\n        $this.Project = Invoke-OctopusApi \"$($this.BaseApiUrl)/projects/all\" | Where-Object Name -eq $projectName\n        if ($null -eq $this.Project) {\n            Write-Fatal \"Project $projectName not found\"\n        }\n        Write-Host \"Project: $($this.Project.Name)\"\n        Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Project.Links.Self)\"\n        \n        $this.Lifecycle = Invoke-OctopusApi (\"$($this.BaseApiUrl)/lifecycles/{0}\" -f $this.Project.LifecycleId)\n        Write-Host \"Project Lifecycle: $($this.Lifecycle.Name)\"\n        Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Lifecycle.Links.Self)\"\n    }\n    \n    hidden $Channel\n    [void] SetChannel($channelName) {\n        $useDefaultChannel = Test-String $channelName -ForAbsence\n        $this.Channel = Invoke-OctopusApi (Format-LinksUri -Uri $this.Project.Links.Channels) | ForEach-Object Items | Where-Object { $useDefaultChannel -and $_.IsDefault -or $_.Name -eq $channelName }\n        if ($null -eq $this.Channel) {\n            Write-Fatal \"$(if ($useDefaultChannel) { 'Default channel' } else { \"Channel $channelName\" }) not found\"\n        }\n        Write-Host \"Channel: $($this.Channel.Name)\"\n        Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Channel.Links.Self)\"\n\n        if ($null -ne $this.Channel.LifecycleId) {\n            $this.Lifecycle = Invoke-OctopusApi (\"$($this.BaseApiUrl)/lifecycles/{0}\" -f $this.Channel.LifecycleId)\n            Write-Host \"Channel Lifecycle: $($this.Lifecycle.Name)\"\n            Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $this.Lifecycle.Links.Self)\"        \n        }\n    }\n\n    hidden $Release\n    [void] SetRelease($releaseVersion) {\n        if (Test-String $releaseVersion) {\n            $this.Release = Invoke-OctopusApi (\"$($this.BaseApiUrl)/projects/{0}/releases/{1}\" -f $this.Project.Id, $releaseVersion) -GetErrorResponse\n            if ($null -ne $this.Release.ErrorMessage) {\n                Write-Fatal $this.Release.ErrorMessage\n            }\n        }\n        else {\n            $this.Release = Invoke-OctopusApi (Format-LinksUri -Uri $this.Channel.Links.Releases) | ForEach-Object Items | Select-Object -First 1\n            if ($null -eq $this.Release) {\n                Write-Fatal \"There are no releases for channel $($this.Channel.Name)\"\n            }\n        }\n        Write-Host \"Release: $($this.Release.Version)\"\n        Write-Verbose \"`t$($this.BaseUrl)$($this.BaseApiUrl)/releases/$($this.Release.Id)\"\n    }\n\n    [void] CreateRelease($releaseVersion) {\n        $template = Invoke-OctopusApi ('{0}/template?channel={1}' -f (Format-LinksUri -Uri $this.Project.Links.DeploymentProcess), $this.Channel.Id)\n        $selectedPackages = @()\n        Write-Host 'Resolving package versions...'\n        $template.Packages | ForEach-Object {\n            $preReleaseTag = $this.Channel.Rules | Where-Object Actions -contains $_.StepName | Where-Object { $null -ne $_ } | ForEach-Object { '&preReleaseTag={0}' -f $([System.Net.WebUtility]::UrlEncode($_.Tag)) }\n            $versionRange = $this.Channel.Rules | Where-Object Actions -contains $_.StepName | Where-Object { $null -ne $_ } | ForEach-Object { '&versionRange={0}' -f $([System.Net.WebUtility]::UrlEncode($_.VersionRange)) }\n\n            $package = Invoke-OctopusApi (\"$($this.BaseApiUrl)/feeds/{0}/packages?packageId={1}&partialMatch=false&includeMultipleVersions=false&includeNotes=false&includePreRelease=true&take=1{2}{3}\" -f $_.FeedId, $_.PackageId, $preReleaseTag, $versionRange)\n            $packageDesc = \"$($package.Title) @ $($package.Version) for step $($_.StepName)\"\n            if ( $_.PackageReferenceName ) {\n                $packageDesc += \"/$($_.PackageReferenceName)\"\n            }\n            Write-Host \"Found $packageDesc\"\n            \n            $selectedPackages += @{\n                StepName             = $_.StepName\n                ActionName           = $_.ActionName\n                PackageReferenceName = $_.PackageReferenceName\n                Version              = $package.Version\n            }\n\n            if ( (Test-String $releaseVersion -ForAbsence) -and ($_.StepName -eq $template.VersioningPackageStepName) ) {\n                Write-Host \"Release will be created using the version number from package step $($template.VersioningPackageStepName): $($package.Version)\"\n                $releaseVersion = $package.Version\n            }\n        }\n        if (Test-String $releaseVersion) {\n            $this.Release = Invoke-OctopusApi (\"$($this.BaseApiUrl)/projects/{0}/releases/{1}\" -f $this.Project.Id, $releaseVersion) -GetErrorResponse\n            if ( ($null -eq $this.Release.ErrorMessage) -and ($this.Release.Version -ieq $releaseVersion) -and ($this.Release.ChannelId -eq $this.Channel.Id) ) {\n                Write-Host \"Release version $($this.Release.Version) has already been created, selecting it for deployment\"\n                Write-Verbose \"`t$($this.BaseUrl)$($this.BaseApiUrl)/releases/$($this.Release.Id)\"\n                return\n            }\n        }\n        else {\n            Write-Host \"Release will be created using the incremented release version: $($template.NextVersionIncrement)\"\n            $releaseVersion = $template.NextVersionIncrement\n        }\n\n        $this.Release = Invoke-OctopusApi \"$($this.BaseApiUrl)/releases?ignoreChannelRules=false\" -Method Post -Body @{\n            ProjectId        = $this.Project.Id\n            ChannelId        = $this.Channel.Id \n            Version          = $releaseVersion\n            SelectedPackages = $selectedPackages\n        } -GetErrorResponse\n        if ($null -ne $this.Release.ErrorMessage) {\n            Write-Fatal \"$($this.Release.ErrorMessage)`n$($this.Release.Errors -join \"`n\")\"\n        }\n        Write-Host \"Release $($this.Release.Version) has been successfully created\"\n        Write-Verbose \"`t$($this.BaseUrl)$($this.BaseApiUrl)/releases/$($this.Release.Id)\"\n    }\n\n    [void] UpdateVariableSnapshot() {\n        $this.Release = Invoke-OctopusApi (Format-LinksUri -Uri $this.Release.Links.SnapshotVariables) -Method Post\n        Write-Host 'Variables snapshot update performed. The release now references the latest variables.'\n    }\n\n    hidden $DeploymentTemplate\n    [void] GetDeploymentTemplate() {\n        Write-Host 'Getting deployment template for release...'\n        $this.DeploymentTemplate = Invoke-OctopusApi (Format-LinksUri -Uri $this.Release.Links.DeploymentTemplate)\n    }\n\n    hidden [bool]$UseGuidedFailure\n    hidden [string[]]$GuidedFailureActions\n    hidden [string]$GuidedFailureMessage\n    hidden [int]$DeploymentRetryCount\n    [void] SetGuidedFailure([GuidedFailure]$guidedFailure, $guidedFailureMessage) {\n        $this.UseGuidedFailure = switch ($guidedFailure) {\n            ([GuidedFailure]::Default) { [System.Convert]::ToBoolean($global:OctopusUseGuidedFailure) }\n            ([GuidedFailure]::Enabled) { $true }\n            ([GuidedFailure]::Disabled) { $false }\n            ([GuidedFailure]::RetryIgnore) { $true }\n            ([GuidedFailure]::RetryAbort) { $true }\n            ([GuidedFailure]::Ignore) { $true } \n            ([GuidedFailure]::RetryDeployment) { $false }\n        }\n        Write-Host \"Setting Guided Failure: $($this.UseGuidedFailure)\"\n        \n        $retryActions = @(1..(Get-OctopusSetting StepRetryCount 1) | ForEach-Object { 'Retry' })\n        $this.GuidedFailureActions = switch ($guidedFailure) {\n            ([GuidedFailure]::Default) { $null }\n            ([GuidedFailure]::Enabled) { $null }\n            ([GuidedFailure]::Disabled) { $null }\n            ([GuidedFailure]::RetryIgnore) { $retryActions + @('Ignore') }\n            ([GuidedFailure]::RetryAbort) { $retryActions + @('Abort') }\n            ([GuidedFailure]::Ignore) { @('Ignore') }\n            ([GuidedFailure]::RetryDeployment) { $null }\n        }\n        if ($null -ne $this.GuidedFailureActions) {\n            Write-Host \"Automated Failure Guidance: $($this.GuidedFailureActions -join '; ') \"\n        }\n        $this.GuidedFailureMessage = $guidedFailureMessage\n        \n        $defaultRetries = if ($guidedFailure -eq [GuidedFailure]::RetryDeployment) { 1 } else { 0 }\n        $this.DeploymentRetryCount = Get-OctopusSetting DeploymentRetryCount $defaultRetries\n        if ($this.DeploymentRetryCount -ne 0) {\n            Write-Host \"Failed Deployments will be retried #$($this.DeploymentRetryCount) times\"\n        }\n    }\n\n    [bool]$ForcePackageDownload\n    [void] SetForcePackageDownload($forcePackageDownload) {\n        if ($forcePackageDownload -eq $true) {\n            $this.ForcePackageDownload = $true\n            Write-Host 'Deployment will Force Package Download...'\n            return\n        } \n        $this.ForcePackageDownload = $false\n        Write-Host 'Deployment will not Force Package Download.'\n        return\n\n    }\n\n    [bool]$WaitForDeployment\n    hidden [datetime]$QueueTime\n    hidden [datetime]$QueueTimeExpiry\n    [void] SetSchedule($deploySchedule) {\n        if (Test-String $deploySchedule -ForAbsence) {\n            Write-Fatal 'The deployment schedule step parameter was not found.'\n        }\n        if ($deploySchedule -eq 'WaitForDeployment') {\n            $this.WaitForDeployment = $true\n            Write-Host 'Deployment will be queued to start immediatley...'\n            return\n        }\n        $this.WaitForDeployment = $false\n        if ($deploySchedule -eq 'NoWait') {\n            Write-Host 'Deployment will be queued to start immediatley...'\n            return\n        }\n        <#\n            ^(?i) - Case-insensitive matching\n            (?:\n                (?<Day>MON|TUE|WED|THU|FRI|SAT|SUN)? - Capture an optional day\n                \\s*@\\s* - '@' indicates deploying at a specific time\n                (?<TimeOfDay>(?:[01]?[0-9]|2[0-3]):[0-5][0-9]) - Captures the time of day, in 24 hour format\n            )? - Day & TimeOfDay are optional\n            \\s*\n            (?:\n                \\+\\s* - '+' indicates deploying after a length of tie\n                (?<TimeSpan>\n                    \\d{1,3} - Match 1 to 3 digits\n                    (?::[0-5][0-9])? - Optionally match a colon and 00 to 59, this denotes if the previous 1-3 digits are hours or minutes\n                )\n            )?$ - TimeSpan is optional\n        #>\n        $parsedSchedule = [regex]::Match($deploySchedule, '^(?i)(?:(?<Day>MON|TUE|WED|THU|FRI|SAT|SUN)?\\s*@\\s*(?<TimeOfDay>(?:[01]?[0-9]|2[0-3]):[0-5][0-9]))?\\s*(?:\\+\\s*(?<TimeSpan>\\d{1,3}(?::[0-5][0-9])?))?$')\n        if (!$parsedSchedule.Success) {\n            Write-Fatal \"The deployment schedule step parameter contains an invalid value. Valid values are 'WaitForDeployment', 'NoWait' or a schedule in the format '[[DayOfWeek] @ HH:mm] [+ <MMM|HHH:MM>]'\" \n        }\n        $this.QueueTime = Get-Date\n        if ($parsedSchedule.Groups['Day'].Success) {\n            Write-Verbose \"Parsed Day: $($parsedSchedule.Groups['Day'].Value)\"\n            while (!$this.QueueTime.DayOfWeek.ToString().StartsWith($parsedSchedule.Groups['Day'].Value)) {\n                $this.QueueTime = $this.QueueTime.AddDays(1)\n            }\n        }\n        if ($parsedSchedule.Groups['TimeOfDay'].Success) {\n            Write-Verbose \"Parsed Time Of Day: $($parsedSchedule.Groups['TimeOfDay'].Value)\"\n            $timeOfDay = [datetime]::ParseExact($parsedSchedule.Groups['TimeOfDay'].Value, 'HH:mm', $null)\n            $this.QueueTime = $this.QueueTime.Date + $timeOfDay.TimeOfDay\n        }\n        if ($parsedSchedule.Groups['TimeSpan'].Success) {\n            Write-Verbose \"Parsed Time Span: $($parsedSchedule.Groups['TimeSpan'].Value)\"\n            $timeSpan = $parsedSchedule.Groups['TimeSpan'].Value.Split(':')\n            $hoursToAdd = if ($timeSpan.Length -eq 2) { $timeSpan[0] } else { 0 }\n            $minutesToAdd = if ($timeSpan.Length -eq 2) { $timeSpan[1] } else { $timeSpan[0] }\n            $this.QueueTime = $this.QueueTime.Add((New-TimeSpan -Hours $hoursToAdd -Minutes $minutesToAdd))\n        }\n        Write-Host \"Deployment will be queued to start at: $($this.QueueTime.ToLongDateString()) $($this.QueueTime.ToLongTimeString())\"\n        Write-Verbose \"Local Time: $($this.QueueTime.ToLocalTime().ToString('r'))\"\n        Write-Verbose \"Universal Time: $($this.QueueTime.ToUniversalTime().ToString('o'))\"\n        $this.QueueTimeExpiry = $this.QueueTime.Add([timespan]::ParseExact((Get-OctopusSetting QueueTimeout '00:30'), \"hh\\:mm\", $null))\n        Write-Verbose \"Queued deployment will expire on: $($this.QueueTimeExpiry.ToUniversalTime().ToString('o'))\"\n    }\n\n    hidden $Environments\n    [void] SetEnvironment($environmentName) {\n        $lifecyclePhaseEnvironments = $this.Lifecycle.Phases | Where-Object Name -eq $environmentName | ForEach-Object {\n            $_.AutomaticDeploymentTargets\n            $_.OptionalDeploymentTargets\n        }\n        $this.Environments = $this.DeploymentTemplate.PromoteTo | Where-Object { $_.Id -in $lifecyclePhaseEnvironments -or $_.Name -ieq $environmentName }\n        if ($null -eq $this.Environments) {\n            Write-Fatal \"The specified environment ($environmentName) was not found or not eligible for deployment of the release ($($this.Release.Version)). Verify that the release has been deployed to all required environments before it can be promoted to this environment. Once you have corrected these problems you can try again.\" \n        }\n        Write-Host \"Environments: $(($this.Environments | ForEach-Object Name) -join ', ')\"\n    }\n    \n    [bool] $IsTenanted\n    hidden $Tenants\n    [void] SetTenants($tenantFilter) {\n        $this.IsTenanted = Test-String $tenantFilter\n        if (!$this.IsTenanted) {\n            return\n        }\n        $tenantPromotions = $this.DeploymentTemplate.TenantPromotions | ForEach-Object Id\n        $this.Tenants = $tenantFilter.Split(\"`n\") | ForEach-Object { [uri]::EscapeUriString($_.Trim()) } | ForEach-Object {\n            $criteria = if ($_ -like '*/*') { 'tags' } else { 'name' }\n            \n            $tenantResults = Invoke-OctopusApi (\"$($this.BaseApiUrl)/tenants/all?projectId={0}&{1}={2}\" -f $this.Project.Id, $criteria, $_) -GetErrorResponse\n            if ($tenantResults -isnot [array] -and $tenantResults.ErrorMessage) {\n                Write-Warning \"Full Exception: $($tenantResults.FullException)\"\n                Write-Fatal $tenantResults.ErrorMessage\n            }\n            $tenantResults\n        } | Where-Object Id -in $tenantPromotions\n\n        if ($null -eq $this.Tenants) {\n            Write-Fatal \"No eligible tenants found for deployment of the release ($($this.Release.Version)). Verify that the tenants have been associated with the project.\"\n        }\n        Write-Host \"Tenants: $(($this.Tenants | ForEach-Object Name) -join ', ')\"\n    }\n\n    [DeploymentController[]] GetDeploymentControllers() {\n        Write-Verbose 'Determining eligible environments & tenants. Retrieving deployment previews...'\n        $deploymentControllers = @()\n        foreach ($environment in $this.Environments) {\n            $envPrefix = if ($this.Environments.Count -gt 1) { $environment.Name }\n            if ($this.IsTenanted) {\n                foreach ($tenant in $this.Tenants) {\n                    $tenantPrefix = if ($this.Tenants.Count -gt 1) { $tenant.Name }\n                    if ($this.DeploymentTemplate.TenantPromotions | Where-Object Id -eq $tenant.Id | ForEach-Object PromoteTo | Where-Object Id -eq $environment.Id) {\n                        $logPrefix = ($envPrefix, $tenantPrefix | Where-Object { $null -ne $_ }) -join '::'\n                        $deploymentControllers += [DeploymentController]::new($this, $logPrefix, $environment, $tenant)\n                    }\n                }\n            }\n            else {\n                $deploymentControllers += [DeploymentController]::new($this, $envPrefix, $environment, $null)\n            }\n        }\n        return $deploymentControllers\n    }\n}\n\nclass DeploymentController {\n    hidden [string]$BaseUrl\n    hidden [DeploymentContext]$DeploymentContext\n    hidden [string]$LogPrefix\n    hidden [object]$Environment\n    hidden [object]$Tenant\n    hidden [object]$DeploymentPreview\n    hidden [int]$DeploymentRetryCount\n    hidden [int]$DeploymentAttempt\n    \n    DeploymentController($deploymentContext, $logPrefix, $environment, $tenant) {\n        $this.BaseUrl = $deploymentContext.BaseUrl\n        $this.DeploymentContext = $deploymentContext\n        if (Test-String $logPrefix) {\n            $this.LogPrefix = \"[${logPrefix}] \"\n        }\n        $this.Environment = $environment\n        $this.Tenant = $tenant\n        if ($tenant) {\n            $this.DeploymentPreview = Invoke-OctopusApi (\"$($this.DeploymentContext.BaseApiUrl)/releases/{0}/deployments/preview/{1}/{2}\" -f $this.DeploymentContext.Release.Id, $this.Environment.Id, $this.Tenant.Id)\n        }\n        else {\n            $this.DeploymentPreview = Invoke-OctopusApi (\"$($this.DeploymentContext.BaseApiUrl)/releases/{0}/deployments/preview/{1}\" -f $this.DeploymentContext.Release.Id, $this.Environment.Id)\n        }\n        $this.DeploymentRetryCount = $deploymentContext.DeploymentRetryCount\n        $this.DeploymentAttempt = 0\n    }\n\n    hidden [string[]]$SkipActions = @()\n    [void] SetStepsToSkip($stepsToSkip) {\n        $comparisonArray = $stepsToSkip.Split(\"`n\") | ForEach-Object Trim\n        $this.SkipActions = $this.DeploymentPreview.StepsToExecute | Where-Object {\n            $_.CanBeSkipped -and ($_.ActionName -in $comparisonArray -or $_.ActionNumber -in $comparisonArray)\n        } | ForEach-Object {\n            $logMessage = \"Skipping Step $($_.ActionNumber): $($_.ActionName)\"\n            if ($this.LogPrefix) { Write-Verbose \"$($this.LogPrefix)$logMessage\" }\n            else { Write-Host $logMessage }\n            $_.ActionId\n        }\n    }\n\n\n    hidden [string[]]$SpecificMachineIds\n    [void] SetSpecificMachineIds($specificMachineNames) {\n        $this.SpecificMachineIds = @()\n        $specificMachineNames.Split(\"`n\") | ForEach-Object {\n            Write-Host \"Translating $_ to an Id. First checking to see if it is already an Id.\"\n            if ($_.Trim().StartsWith(\"Machines-\")) {\n                Write-Host \"$_ is already an Id, no need to look that up.\"\n                $this.SpecificMachineIds += $_.Trim()\n                continue\n            }\n            $itemNameToFind = $_.Trim()\n            Write-Host \"Attempting to find Deployment Target with the name of $itemNameToFind\"\n            $itemList = Invoke-OctopusApi (\"$($this.DeploymentContext.BaseApiUrl)/machines/?partialName=$([uri]::EscapeDataString($itemNameToFind))&skip=0&take=100\" ) -GetErrorResponse\n            $machineObject = Get-FilteredOctopusItem -itemList $itemList -itemName $itemNameToFind\n            Write-Host \"Successfully found $itemNameToFind with id of $($machineObject.Id)\"\n            $this.SpecificMachineIds += $machineObject.Id\n        }\n    }\n\n    hidden [hashtable]$FormValues\n    [void] SetFormValues($formValuesToSet) {\n        $this.FormValues = @{}\n        $this.DeploymentPreview.Form.Values | Get-Member -MemberType NoteProperty | ForEach-Object {\n            $this.FormValues.Add($_.Name, $this.DeploymentPreview.Form.Values.$($_.Name))\n        }\n\n        $formValuesToSet.Split(\"`n\") | ForEach-Object {\n            $entry = $_.Split('=') | ForEach-Object Trim\n            $entryName, $entryValues = $entry\n            $entry = @($entryName, $($entryValues -join \"=\"))\n            $this.DeploymentPreview.Form.Elements | Where-Object { $_.Control.Name -ieq $entry[0] } | ForEach-Object {\n                $logMessage = \"Setting Form Value '$($_.Control.Label)' to: $($entry[1])\"\n                if ($this.LogPrefix) { Write-Verbose \"$($this.LogPrefix)$logMessage\" }\n                else { Write-Host $logMessage }\n                $this.FormValues[$_.Name] = $entry[1]\n            }\n        }\n    }\n\t\n    [ServerTask]$Task\n    [void] Start() {\n        $request = @{\n            ReleaseId        = $this.DeploymentContext.Release.Id\n            EnvironmentId    = $this.Environment.Id\n            SkipActions      = $this.SkipActions\n            FormValues       = $this.FormValues\n            SpecificMachineIds = $this.SpecificMachineIds\n            ForcePackageDownload = $this.DeploymentContext.ForcePackageDownload\n            UseGuidedFailure = $this.DeploymentContext.UseGuidedFailure\n        }\n        if ($this.DeploymentContext.QueueTime -ne [datetime]::MinValue) { $request.Add('QueueTime', $this.DeploymentContext.QueueTime.ToUniversalTime().ToString('o')) }\n        if ($this.DeploymentContext.QueueTimeExpiry -ne [datetime]::MinValue) { $request.Add('QueueTimeExpiry', $this.DeploymentContext.QueueTimeExpiry.ToUniversalTime().ToString('o')) }\n        if ($this.Tenant) { $request.Add('TenantId', $this.Tenant.Id) }\n\n        $deployment = Invoke-OctopusApi \"$($this.DeploymentContext.BaseApiUrl)/deployments\" -Method Post -Body $request -GetErrorResponse\n        if ($deployment.ErrorMessage) { Write-Fatal \"$($deployment.ErrorMessage)`n$($deployment.Errors -join \"`n\")\" }\n        Write-Host \"Queued $($deployment.Name)...\"\n        Write-Host \"`t$($this.BaseUrl)$(Format-WebLinksUri -Uri $deployment.Links.Web)\"\n        Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $deployment.Links.Self)\"\n        Write-Verbose \"`t$($this.BaseUrl)$($this.DeploymentContext.BaseApiUrl)/deploymentprocesses/$($deployment.DeploymentProcessId)\"\n        Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $deployment.Links.Variables)\"\n        Write-Verbose \"`t$($this.BaseUrl)$(Format-LinksUri -Uri $deployment.Links.Task)/details\"\n\n        $this.Task = [ServerTask]::new($this.DeploymentContext, $deployment, $this.LogPrefix)\n    }\n\n    [bool] PollCheck() {\n        $this.Task.Poll()\n        if ($this.Task.IsCompleted -and !$this.Task.FinishedSuccessfully -and $this.DeploymentAttempt -lt $this.DeploymentRetryCount) {\n            $retryWaitPeriod = New-TimeSpan -Seconds (Get-OctopusSetting RetryWaitPeriod 0)\n            $waitText = if ($retryWaitPeriod.TotalSeconds -gt 0) {\n                $minutesText = if ($retryWaitPeriod.Minutes -gt 1) { \" $($retryWaitPeriod.Minutes) minutes\" } elseif ($retryWaitPeriod.Minutes -eq 1) { \" $($retryWaitPeriod.Minutes) minute\" }\n                $secondsText = if ($retryWaitPeriod.Seconds -gt 1) { \" $($retryWaitPeriod.Seconds) seconds\" } elseif ($retryWaitPeriod.Seconds -eq 1) { \" $($retryWaitPeriod.Seconds) second\" }\n                \"Waiting${minutesText}${secondsText} before \"\n            }\n            $this.DeploymentAttempt++\n            Write-Error \"$($this.LogPrefix)Deployment failed. ${waitText}Queuing retry #$($this.DeploymentAttempt) of $($this.DeploymentRetryCount)...\"\n            if ($retryWaitPeriod.TotalSeconds -gt 0) {\n                Start-Sleep -Seconds $retryWaitPeriod.TotalSeconds\n            }\n            $this.Start()\n            return $true\n        }\n        return !$this.Task.IsCompleted\n    }\n}\n\nclass ServerTask {\n    hidden [DeploymentContext]$DeploymentContext\n    hidden [object]$Deployment\n    hidden [string]$LogPrefix\n\n    hidden [bool] $IsCompleted = $false\n    hidden [bool] $FinishedSuccessfully\n    hidden [string] $ErrorMessage\n    \n    hidden [int]$PollCount = 0\n    hidden [bool]$HasInterruptions = $false\n    hidden [hashtable]$State = @{}\n    hidden [System.Collections.Generic.HashSet[string]]$Logs\n \n    ServerTask($deploymentContext, $deployment, $logPrefix) {\n        $this.DeploymentContext = $deploymentContext\n        $this.Deployment = $deployment\n        $this.LogPrefix = $logPrefix\n        $this.Logs = [System.Collections.Generic.HashSet[string]]::new()\n    }\n    \n    [void] Poll() {\t\n        if ($this.IsCompleted) { return }\n\n        $details = Invoke-OctopusApi (\"$($this.DeploymentContext.BaseApiUrl)/tasks/{0}/details?verbose=false&tail=30\" -f $this.Deployment.TaskId)\n        $this.IsCompleted = $details.Task.IsCompleted\n        $this.FinishedSuccessfully = $details.Task.FinishedSuccessfully\n        $this.ErrorMessage = $details.Task.ErrorMessage\n\n        $this.PollCount++\n        if ($this.PollCount % 10 -eq 0) {\n            $this.Verbose(\"$($details.Task.State). $($details.Task.Duration), $($details.Progress.EstimatedTimeRemaining)\")\n        }\n        \n        if ($details.Task.HasPendingInterruptions) { $this.HasInterruptions = $true }\n        $this.LogQueuePosition($details.Task)\n        $activityLogs = $this.FlattenActivityLogs($details.ActivityLogs)    \n        $this.WriteLogMessages($activityLogs)\n    }\n\n    hidden [bool] IfNewState($firstKey, $secondKey, $value) {\n        $key = '{0}/{1}' -f $firstKey, $secondKey\n        $containsKey = $this.State.ContainsKey($key)\n        if ($containsKey) { return $false }\n        $this.State[$key] = $value\n        return $true\n    }\n\n    hidden [bool] HasChangedState($firstKey, $secondKey, $value) {\n        $key = '{0}/{1}' -f $firstKey, $secondKey\n        $hasChanged = if (!$this.State.ContainsKey($key)) { $true } else { $this.State[$key] -ne $value }\n        if ($hasChanged) {\n            $this.State[$key] = $value\n        }\n        return $hasChanged\n    }\n\n    hidden [object] GetState($firstKey, $secondKey) { return $this.State[('{0}/{1}' -f $firstKey, $secondKey)] }\n\n    hidden [void] ResetState($firstKey, $secondKey) { $this.State.Remove(('{0}/{1}' -f $firstKey, $secondKey)) }\n\n    hidden [void] Error($message) { Write-Error \"$($this.LogPrefix)${message}\" }\n    hidden [void] Warn($message) { Write-Warning \"$($this.LogPrefix)${message}\" }\n    hidden [void] Host($message) { Write-Host \"$($this.LogPrefix)${message}\" }   \n    hidden [void] Verbose($message) { Write-Verbose \"$($this.LogPrefix)${message}\" }\n\n    hidden [psobject[]] FlattenActivityLogs($ActivityLogs) {\n        $flattenedActivityLogs = { @() }.Invoke()\n        $this.FlattenActivityLogs($ActivityLogs, $null, $flattenedActivityLogs)\n        return $flattenedActivityLogs\n    }\n\n    hidden [void] FlattenActivityLogs($ActivityLogs, $Parent, $flattenedActivityLogs) {\n        foreach ($log in $ActivityLogs) {\n            $log | Add-Member -MemberType NoteProperty -Name Parent -Value $Parent\n            $insertBefore = $null -eq $log.Parent -and $log.Status -eq 'Running'\t\n            if ($insertBefore) { $flattenedActivityLogs.Add($log) }\n            foreach ($childLog in $log.Children) {\n                $this.FlattenActivityLogs($childLog, $log, $flattenedActivityLogs)\n            }\n            if (!$insertBefore) { $flattenedActivityLogs.Add($log) }\n        }\n    }\n\n    hidden [void] LogQueuePosition($Task) {\n        if ($Task.HasBeenPickedUpByProcessor) {\n            $this.ResetState($Task.Id, 'QueuePosition')\n            return\n        }\n\t\t\n        $queuePosition = (Invoke-OctopusApi (\"$($this.DeploymentContext.BaseApiUrl)/tasks/{0}/queued-behind\" -f $this.Deployment.TaskId)).Items.Count\n        if ($this.HasChangedState($Task.Id, 'QueuePosition', $queuePosition) -and $queuePosition -ne 0) {\n            $this.Host(\"Queued behind $queuePosition tasks...\")\n        }\n    }\n\n    hidden [void] WriteLogMessages($ActivityLogs) {\n        $interrupts = if ($this.HasInterruptions) {\n            Invoke-OctopusApi (\"$($this.DeploymentContext.BaseApiUrl)/interruptions?regarding={0}\" -f $this.Deployment.TaskId) | ForEach-Object Items\n        }\n        foreach ($activity in $ActivityLogs) {\n            $correlatedInterrupts = $interrupts | Where-Object CorrelationId -eq $activity.Id         \n            $correlatedInterrupts | Where-Object IsPending -eq $false | ForEach-Object { $this.LogInterruptMessages($activity, $_) }\n\n            $this.LogStepTransition($activity)         \n            $this.LogErrorsAndWarnings($activity)\n            $correlatedInterrupts | Where-Object IsPending -eq $true | ForEach-Object { \n                $this.LogInterruptMessages($activity, $_)\n                $this.HandleInterrupt($_)\n            }\n        }\n    }\n\n    hidden [void] LogStepTransition($ActivityLog) {\n        if ($ActivityLog.ShowAtSummaryLevel -and $ActivityLog.Status -ne 'Pending') {\n            $existingState = $this.GetState($ActivityLog.Id, 'Status')\n            if ($this.HasChangedState($ActivityLog.Id, 'Status', $ActivityLog.Status)) {\n                $existingStateText = if ($existingState) { \"$existingState -> \" }\n                $this.Host(\"$($ActivityLog.Name) ($existingStateText$($ActivityLog.Status))\")\n            }\n        }\n    }\n\n    hidden [void] LogErrorsAndWarnings($ActivityLog) {\n        foreach ($logEntry in $ActivityLog.LogElements) {\n            if ($logEntry.Category -eq 'Info') { continue }\n            if ($this.Logs.Add(($ActivityLog.Id, $logEntry.OccurredAt, $logEntry.MessageText -join '/'))) {\n                switch ($logEntry.Category) {\n                    'Fatal' {\n                        if ($ActivityLog.Parent) {\n                            $this.Error(\"FATAL: During $($ActivityLog.Parent.Name)\")\n                            $this.Error(\"FATAL: $($logEntry.MessageText)\")\n                        }\n                    }\n                    'Error' { $this.Error(\"[$($ActivityLog.Parent.Name)] $($logEntry.MessageText)\") }\n                    'Warning' { $this.Warn(\"[$($ActivityLog.Parent.Name)] $($logEntry.MessageText)\") }\n                }\n            }\n        }\n    }\n\n    hidden [void] LogInterruptMessages($ActivityLog, $Interrupt) {\n        $message = $Interrupt.Form.Elements | Where-Object Name -eq Instructions | ForEach-Object Control | ForEach-Object Text\n        if ($Interrupt.IsPending -and $this.HasChangedState($Interrupt.Id, $ActivityLog.Parent.Name, $message)) {\n            $this.Warn(\"Deployment is paused at '$($ActivityLog.Parent.Name)' for manual intervention: $message\")\n        }\n        if ($null -ne $Interrupt.ResponsibleUserId -and $this.HasChangedState($Interrupt.Id, 'ResponsibleUserId', $Interrupt.ResponsibleUserId)) {\n            $user = Invoke-OctopusApi (Format-LinksUri -Uri $Interrupt.Links.User)\n            $emailText = if (Test-String $user.EmailAddress) { \" ($($user.EmailAddress))\" }\n            $this.Warn(\"$($user.DisplayName)$emailText has taken responsibility for the manual intervention\")\n        }\n        $manualAction = $Interrupt.Form.Values.Result\n        if ((Test-String $manualAction) -and $this.HasChangedState($Interrupt.Id, 'Action', $manualAction)) {\n            $this.Warn(\"Manual intervention action '$manualAction' submitted with notes: $($Interrupt.Form.Values.Notes)\")\n        }\n        $guidanceAction = $Interrupt.Form.Values.Guidance\n        if ((Test-String $guidanceAction) -and $this.HasChangedState($Interrupt.Id, 'Action', $guidanceAction)) {\n            $this.Warn(\"Failure guidance to '$guidanceAction' submitted with notes: $($Interrupt.Form.Values.Notes)\")\n        }\n    }\n\n    hidden [void] HandleInterrupt($Interrupt) {\n        $isGuidedFailure = $null -ne ($Interrupt.Form.Elements | Where-Object Name -eq Guidance)\n        if (!$isGuidedFailure -or !$this.DeploymentContext.GuidedFailureActions -or !$Interrupt.IsPending) {\n            return\n        }\n        $this.IfNewState($Interrupt.CorrelationId, 'ActionIndex', 0)\n        if ($Interrupt.CanTakeResponsibility -and $null -eq $Interrupt.ResponsibleUserId) {\n            Invoke-OctopusApi (Format-LinksUri -Uri $Interrupt.Links.Responsible) -Method Put\n        }\n        if ($Interrupt.HasResponsibility) {\n            $guidanceIndex = $this.GetState($Interrupt.CorrelationId, 'ActionIndex')\n            $guidance = $this.DeploymentContext.GuidedFailureActions[$guidanceIndex]\n            $guidanceIndex++\n            \n            $retryWaitPeriod = New-TimeSpan -Seconds (Get-OctopusSetting RetryWaitPeriod 0)\n            if ($guidance -eq 'Retry' -and $retryWaitPeriod.TotalSeconds -gt 0) {\n                $minutesText = if ($retryWaitPeriod.Minutes -gt 1) { \" $($retryWaitPeriod.Minutes) minutes\" } elseif ($retryWaitPeriod.Minutes -eq 1) { \" $($retryWaitPeriod.Minutes) minute\" }\n                $secondsText = if ($retryWaitPeriod.Seconds -gt 1) { \" $($retryWaitPeriod.Seconds) seconds\" } elseif ($retryWaitPeriod.Seconds -eq 1) { \" $($retryWaitPeriod.Seconds) second\" }\n                $this.Warn(\"Waiting${minutesText}${secondsText} before submitting retry failure guidance...\")\n                Start-Sleep -Seconds $retryWaitPeriod.TotalSeconds\n            }\n            Invoke-OctopusApi (Format-LinksUri -Uri $Interrupt.Links.Submit) -Body @{\n                Notes    = $this.DeploymentContext.GuidedFailureMessage.Replace('#{GuidedFailureActionIndex}', $guidanceIndex).Replace('#{GuidedFailureAction}', $guidance)\n                Guidance = $guidance\n            } -Method Post\n\n            $this.HasChangedState($Interrupt.CorrelationId, 'ActionIndex', $guidanceIndex)\n        }\n    }\n}\n\nfunction Show-Heading {\n    param($Text)\n    $padding = ' ' * ((80 - 2 - $Text.Length) / 2)\n    Write-Host \" `n\"\n    Write-Host (@(\"`t\", ([string][char]0x2554), (([string][char]0x2550) * 80), ([string][char]0x2557)) -join '')\n    Write-Host \"`t$(([string][char]0x2551))$padding $Text $padding$([string][char]0x2551)\"  \n    Write-Host (@(\"`t\", ([string][char]0x255A), (([string][char]0x2550) * 80), ([string][char]0x255D)) -join '')\n    Write-Host \" `n\"\n}\n\nif ($OctopusParameters['Octopus.Action.RunOnServer'] -ieq 'False') {\n    Write-Warning \"For optimal performance use 'Run On Server' for this action\"\n}\n\n$deploymentContext = [DeploymentContext]::new($Chain_BaseUrl, $Chain_BaseApiUrl)\n\nif ($Chain_CreateOption -ieq 'True') {\n    Show-Heading 'Creating Release'\n}\nelse {\n    Show-Heading 'Retrieving Release'\n}\n$deploymentContext.SetProject($Chain_ProjectName)\n$deploymentContext.SetChannel($Chain_Channel)\nWrite-Host \"`t$Chain_BaseUrl$(Format-WebLinksUri -Uri $deploymentContext.Project.Links.Web)\"\n\nif ($Chain_CreateOption -ieq 'True') {\n    $deploymentContext.CreateRelease($Chain_ReleaseNum)\n}\nelse {\n    $deploymentContext.SetRelease($Chain_ReleaseNum)\n}\nWrite-Host \"`t$Chain_BaseUrl$(Format-WebLinksUri -Uri $deploymentContext.Release.Links.Web)\"\nif ($Chain_SnapshotVariables -ieq 'True') {\n    $deploymentContext.UpdateVariableSnapshot()\n}\n\n\nShow-Heading 'Configuring Deployment'\n$deploymentContext.GetDeploymentTemplate()\n$email = if (Test-String $OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']) { \"($($OctopusParameters['Octopus.Deployment.CreatedBy.EmailAddress']))\" }\n$guidedFailureMessage = Get-OctopusSetting GuidedFailureMessage @\"\nAutomatic Failure Guidance will #{GuidedFailureAction} (Failure ###{GuidedFailureActionIndex})\nInitiated by $($OctopusParameters['Octopus.Deployment.Name']) of $($OctopusParameters['Octopus.Project.Name']) release $($OctopusParameters['Octopus.Release.Number'])\nCreated By: $($OctopusParameters['Octopus.Deployment.CreatedBy.DisplayName']) $email\n${Chain_BaseUrl}$($OctopusParameters['Octopus.Web.DeploymentLink'])\n\"@\n$deploymentContext.SetGuidedFailure($Chain_GuidedFailure, $guidedFailureMessage)\n$deploymentContext.SetSchedule($Chain_DeploySchedule)\n\n$deploymentContext.SetEnvironment($Chain_DeployTo)\n$deploymentContext.SetTenants($Chain_Tenants)\n$deploymentContext.SetForcePackageDownload($Chain_ForcePackageDownload)\n$deploymentControllers = $deploymentContext.GetDeploymentControllers()\nif (Test-String $Chain_StepsToSkip) {\n    $deploymentControllers | ForEach-Object { $_.SetStepsToSkip($Chain_StepsToSkip) }\n}\nif (Test-String $Chain_FormValues) {\n    $deploymentControllers | ForEach-Object { $_.SetFormValues($Chain_FormValues) }\n}\n\nif (Test-String $Chain_MachineList) {\n    $deploymentControllers | ForEach-Object { $_.SetSpecificMachineIds($Chain_MachineList) }\n}\n\nShow-Heading 'Queue Deployment'\nif ($deploymentContext.IsTenanted) {\n    Write-Host 'Queueing tenant deployments...'\n}\nelse {\n    Write-Host 'Queueing untenanted deployment...'\n}\n$deploymentControllers | ForEach-Object Start\n\nif (!$deploymentContext.WaitForDeployment) {\n    Write-Host 'Deployments have been queued, proceeding to the next step...'\n    return\n}\n\nShow-Heading 'Waiting For Deployment'\ndo {\n    Start-Sleep -Seconds 1\n    $tasksStillRunning = $false\n    foreach ($deployment in $deploymentControllers) {\n        if ($deployment.PollCheck()) {\n            $tasksStillRunning = $true\n        }\n    }\n} while ($tasksStillRunning)\n\nif ($deploymentControllers | ForEach-Object Task | Where-Object FinishedSuccessfully -eq $false) {\n    Show-Heading 'Deployment Failed!'\n    Write-Fatal (($deploymentControllers | ForEach-Object Task | ForEach-Object ErrorMessage) -join \"`n\")\n}\nelse {\n    Show-Heading 'Deployment Successful!'\n}\n\nif (Test-String $Chain_PostDeploy -ForAbsence) {\n    return \n}\n\nShow-Heading 'Post-Deploy Script'\n$rawPostDeployScript = Invoke-OctopusApi (\"$Chain_BaseApiUrl/releases/{0}\" -f $OctopusParameters['Octopus.Release.Id']) |\nForEach-Object { Invoke-OctopusApi (Format-LinksUri -Uri $_.Links.ProjectDeploymentProcessSnapshot) } |\nForEach-Object Steps | Where-Object Id -eq $OctopusParameters['Octopus.Step.Id'] |\nForEach-Object Actions | Where-Object Id -eq $OctopusParameters['Octopus.Action.Id'] |\nForEach-Object { $_.Properties.Chain_PostDeploy }\nWrite-Verbose \"Raw Post-Deploy Script:`n$rawPostDeployScript\"\n\nAdd-Type -Path (Get-WmiObject Win32_Process | Where-Object ProcessId -eq $PID | ForEach-Object { Get-Process -Id $_.ParentProcessId } | ForEach-Object { Join-Path (Split-Path -Path $_.Path -Parent) 'Octostache.dll' })\n\n$deploymentControllers | ForEach-Object {\n    $deployment = $_.Task.Deployment\n    $tenant = $_.Tenant\n    $variablesDictionary = [Octostache.VariableDictionary]::new()\n    Invoke-OctopusApi (\"$Chain_BaseApiUrl/variables/{0}\" -f $deployment.ManifestVariableSetId) | ForEach-Object Variables | Where-Object {\n        ($_.IsSensitive -eq $false) -and `\n        ($_.Scope.Private -ne 'True') -and `\n        ($null -eq $_.Scope.Action) -and `\n        ($null -eq $_.Scope.Machine) -and `\n        ($null -eq $_.Scope.TargetRole) -and `\n        ($null -eq $_.Scope.Role) -and `\n        ($null -eq $_.Scope.Tenant -or $_.Scope.Tenant -contains $tenant.Id) -and `\n        ($null -eq $_.Scope.TenantTag -or (Compare-Object $_.Scope.TenantTag $tenant.TenantTags -ExcludeDifferent -IncludeEqual)) -and `\n        ($null -eq $_.Scope.Environment -or $_.Scope.Environment -contains $deployment.EnvironmentId) -and `\n        ($null -eq $_.Scope.Channel -or $_.Scope.Channel -contains $deployment.ChannelId) -and `\n        ($null -eq $_.Scope.Project -or $_.Scope.Project -contains $deployment.ProjectId)\n    } | ForEach-Object { $variablesDictionary.Set($_.Name, $_.Value) }\n    $postDeployScript = $variablesDictionary.Evaluate($rawPostDeployScript)\n    Write-Host \"$($_.LogPrefix)Evaluated Post-Deploy Script:\"\n    Write-Host $postDeployScript\n    Write-Host 'Script output:'\n    [scriptblock]::Create($postDeployScript).Invoke()\n}"
-  },
-  "Parameters": [{
-    "Id": "61bffab9-bb89-4107-a5e0-79d69eaf8f2a",
-    "Name": "Chain_ApiKey",
-    "Label": "API Key",
-    "HelpText": "An Octopus API Key with appropriate permissions to perform the deployment",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Sensitive"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "a37cac4d-8fd3-4d58-bfda-45a436be8dd5",
-    "Name": "Chain_ProjectName",
-    "Label": "Project Name",
-    "HelpText": "Name of the Octopus project that should be deployed",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "4fd440af-70fe-41ca-bec3-074f05155e81",
-    "Name": "Chain_Channel",
-    "Label": "Channel Name",
-    "HelpText": "The project channel to use when finding or [creating](https://octopus.com/docs/releases/channels#Channels-CreatingReleases) the release to deploy\n\n_Leave blank to use the default channel_",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "78739052-438d-4dc7-862a-d4567eafc5df",
-    "Name": "Chain_ReleaseNum",
-    "Label": "Release Number",
-    "HelpText": "Release number to use for the deployment\n\n_Leave blank to use the latest release in the channel_",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "fd2c3474-7187-4356-aaec-96f4910bb9c5",
-    "Name": "Chain_CreateOption",
-    "Label": "Create new release?",
-    "HelpText": "If a release should be created as part of this deployment\n\n\nThe release is created using either the **Release Number** if specified, or from the project release version template / donor package step if not specified\n\nA release will not be created if it is found to already exist",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Checkbox"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "f648fa0c-b271-4e4a-b4f2-7a88db6b605c",
-    "Name": "Chain_SnapshotVariables",
-    "Label": "Update Variable Snapshot?",
-    "HelpText": "Should variables in the release be updated before deploying?\n\nBy updating the variables, the current snapshot will be discarded, and the latest variables (as seen on the Variables tab) will be imported",
-    "DefaultValue": "False",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Checkbox"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "80634b3b-3171-4643-b164-a5077c6d387b",
-    "Name": "Chain_DeployTo",
-    "Label": "Environment Name",
-    "HelpText": "The name of an environment to deploy to\n\nMultiple environments can be deployed to by entering the name of a [lifecycle phase](https://octopus.com/docs/key-concepts/lifecycles#Lifecycles-LifecyclePhases)",
-    "DefaultValue": "#{Octopus.Environment.Name}",
-    "DisplaySettings": {
-      "Octopus.ControlType": "SingleLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "1334093d-0be4-4115-bb93-d752171a19d8",
-    "Name": "Chain_Tenants",
-    "Label": "Tenants",
-    "HelpText": "_Leave blank to perform an untenanted deployment_\n\nA list of [tenants & tenant tags](https://octopus.com/docs/tenants) to deploy. Tenant Tags are specified in [Canonical Name](https://octopus.com/docs/tenants/tenant-tags#referencing-tenant-tags) format:\n\n    Tag Set Name/Tag Name\n\nIndividual tenants can be listed in addition to tags\n\n    Tenant Name",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "MultiLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "83d9d973-7a72-4f71-a890-8f19d955bc37",
-    "Name": "Chain_FormValues",
-    "Label": "Form Values",
-    "HelpText": "Provide values for [prompted variables](https://octopus.com/docs/projects/variables/prompted-variables) to use in the deployment\n\nVariables should be listed one per line using the format\n\n    VariableName = Value",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "MultiLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "6522ca29-898a-4da6-b0c3-da52991e6812",
-    "Name": "Chain_StepsToSkip",
-    "Label": "Steps To Skip",
-    "HelpText": "A list of steps which should be skipped in the deployment\n\nSteps should be listed one per line, and specified using either the step number (as per the deployment plan) or by the step name",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "MultiLineText"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "acb2cd0e-fc53-42a7-95da-089955ea1870",
-    "Name": "Chain_GuidedFailure",
-    "Label": "Failure Handling",
-    "HelpText": "Determines how deployment failures & [guided failure mode](https://octopus.com/docs/releases/guided-failures) should be handled for the deployment\n\nAutomatic failure handling is performed by using [guided failure](https://octopus.com/docs/releases/guided-failures) and submitting an appropriate action\n\nThe number of retry attempts can be customised by [setting the following variables in indexer notion](https://octopus.com/docs/deploying-applications/variables/system-variables#Systemvariables-Action)\n- Octopus.Action.StepRetryCount\n- Octopus.Action.DeploymentRetryCount",
-    "DefaultValue": "Default",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Select",
-      "Octopus.SelectOptions": "Default|Default - Guided Failure is inherited from this deployment\nEnabled|Enable - Guided Failure is enabled\nDisabled|Disable - Guided Failure is disabled\nRetryIgnore|Retry & Ignore - Automatically retry a failing step, a second failure is ignored\nRetryAbort|Retry & Abort - Automatically retry a failing step, and abort on a second failure\nIgnore|Ignore - Automatically ignore any step failures\nRetryDeployment|Retry Deployment - Automatically retry the entire deployment on failure"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "73a80735-4ca0-4c12-9fa3-f0123db6349f",
-    "Name": "Chain_DeploySchedule",
-    "Label": "Scheduling",
-    "HelpText": "Defines how the deployment should be scheduled & run\n\n_Note: Automated failure handling & post-deploy script functionality is only available when the **Wait For Deployment** option is selected_\n\nA user defined schedule can be set with the **Use a custom expression** option\nFor an exact date & time use the following format, the day is optional and the time is in 24-hour format\n\n    [Mon/Tue/Wed/Thu/Fri/Sat/Sun] @ HH:MM\n\nTo schedule a deployment a relative number of hours & minutes in the future use\n\n    + MMM\n    + HHH:MM\n\n_Note: Reoccurring deployments & automatic retry of failed deployment are possible using a scheduled deployment and the [Always Run or On Failure run conditions](https://octopus.com/docs/deploying-applications#Deployingapplications-Conditions)_",
-    "DefaultValue": "WaitForDeployment",
-    "DisplaySettings": {
-      "Octopus.ControlType": "Select",
-      "Octopus.SelectOptions": "WaitForDeployment|Wait For Deployment\nNoWait|Queue Immediately\n+ 5|Deploy in 5 minutes\n+ 15|Deploy in 15 minutes\n+ 1:00|Deploy in 1 hour\n+ 24:00|Deploy in 24 hours\n@ 00:00|Deploy At Midnight\n@ 00:00 + 12:00|Deploy At Noon Tomorrow\nMon @ 08:00|Deploy At 8am On Monday\nSat @ 00:00 + 168:00|Deploy the following Saturday at Midnight"
-    },
-    "Links": {}
-  },
-  {
-    "Id": "7e7f9ac5-8674-4a91-a94a-896a3ee1334d",
-    "Name": "Chain_PostDeploy",
-    "Label": "Post-Deploy Script",
-    "HelpText": "A PowerShell script which should be run after a successful deployment\n\nVariables are replaced in the script using the resultant **Manifest VariableSet** from the deployment in the [binding syntax](https://octopus.com/docs/projects/variables/variable-substitutions#binding-variables) format\n\nVariables are not available if they are:\n- [Sensitive](https://octopus.com/docs/deploying-applications/variables/sensitive-variables)\n- Action scoped\n- Machine scoped\n- Role scoped\n\n\nWhen performing a tenanted deployment the script will be run once for each tenant using the specific variables from their deployment",
-    "DefaultValue": "",
-    "DisplaySettings": {
-      "Octopus.ControlType": "MultiLineText"
-    },
-    "Links": {}
-  },
-  {
-      "Id": "5c3fddc3-69cb-4762-ac6a-4fdb05f43c6b",
-      "Name": "Chain_ForcePackageDownload",
-      "Label": "Force Package Download",
-      "HelpText": "Should we redownload the package for this release?",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-      }
-  },
-  {
-      "Id": "9ee151bb-78e5-4cb0-8780-6536ea319934",
-      "Name": "Chain_MachineList",
-      "Label": "Machine List",
-      "HelpText": "A list of Machine Names which should be Targeted in the deployment\n\nMachine Names should be listed one per line and specified using either the Machine Id or by the Machine name",
-      "DefaultValue": "",
-      "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-      }
-  }
-],
-"LastModifiedBy": "LeoDOD",
-"$Meta": {
-  "ExportedAt": "2023-02-23T21:40:33.279Z",
-  "OctopusVersion": "2022.3.10847",
-  "Type": "ActionTemplate"
-},
-"Category": "octopus"
-}
diff --git a/step-templates/octopus-check-for-argo-instance.json b/step-templates/octopus-check-for-argo-instance.json
deleted file mode 100644
index 9815de1c5..000000000
--- a/step-templates/octopus-check-for-argo-instance.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "Id": "7da3a76e-57ca-4542-846a-73c00252206c",
-  "Name": "Octopus - Check for Argo CD Instances",
-  "Description": "Checks to see if there are any Argo CD instances registered to the space.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Fix ANSI Color on PWSH Core issues when displaying objects\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n\n# Define variables\n$isArgoPresent = $false\n\n# Check to see if the Octopus.Web.ServerUri variable has a value\nif (![string]::IsNullOrWhitespace($OctopusParameters[\"Octopus.Web.ServerUri\"]))\n{\n    $baseUrl = $OctopusParameters[\"Octopus.Web.ServerUri\"]\n}\nelse\n{\n    $baseUrl = $OctopusParameters[\"Octopus.Web.BaseUrl\"]\n}\n\n# Validate parameters\nif ([string]::IsNullOrWhitespace($OctopusParameters[\"Template.Octopus.API.Key\"]) -or -not $OctopusParameters[\"Template.Octopus.API.Key\"].StartsWith(\"API-\"))\n{\n    Write-Highlight \"An API Key was not provided, unable to check to see if there are any Argo CD instances registered in this space.\"\n    Write-Highlight \"See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys.\"\n    Write-Highlight \"Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check for Argo CD instances in this space.\"\n}\nelse\n{\n    $header = @{ \"X-Octopus-ApiKey\" = $OctopusParameters[\"Template.Octopus.API.Key\"] }\n\n    # Get registered Argo CD instances\n    $argoInstances = Invoke-RestMethod -Method Get -Uri \"$($baseUrl)/api/#{Octopus.Space.Id}/argocdinstances/summaries\" -Headers $header\n\n    # Check the returned values\n    if ($argoInstances.Resources.Count -gt 0)\n    {\n        Write-Highlight \"Found $($argoInstances.Resources.Count) Argo instance(s) registered!\"\n        $isArgoPresent = $true\n    }\n    else\n    {\n        Write-Highlight \"No Argo CD instances registered to space $($OctopusParameters['Octopus.Space.Name']).  Please [register an Argo CD instance](https://octopus.com/docs/argo-cd/instances) with this space.\"\n    }\n}\n\n# Set output variable\nSet-OctopusVariable -Name ArgoPresent -Value $isArgoPresent"
-  },
-  "Parameters": [
-    {
-      "Id": "dfeca839-7c5d-4d5f-a941-27522f918a67",
-      "Name": "Template.Octopus.API.Key",
-      "Label": "Octopus Deploy API Key",
-      "HelpText": "The Octopus Deploy API Key to use when making calls to the Octopus API.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-11-05T23:41:23.320Z",
-    "OctopusVersion": "2025.4.6474",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-check-roles.json b/step-templates/octopus-check-roles.json
deleted file mode 100644
index 065c8d498..000000000
--- a/step-templates/octopus-check-roles.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "Id": "81444e7f-d77a-47db-b287-0f1ab5793880",
-  "Name": "Octopus - Check Targets Available",
-  "Description": "Checks for the presence of targets with the specified tag. If no targets are found, the deployment will fail with the provided message.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$errorCollection = @()\n$setupValid = $false\n\nWrite-Host \"Checking for deployment targets ...\"\n\ntry\n{\n    # Check to make sure targets have been created\n    if ([string]::IsNullOrWhitespace(\"#{Octopus.Web.ServerUri}\"))\n    {\n        $octopusUrl = \"#{Octopus.Web.BaseUrl}\"\n    }\n    else\n    {\n        $octopusUrl = \"#{Octopus.Web.ServerUri}\"\n    }\n\n    $apiKey = \"#{CheckTargets.Octopus.Api.Key}\"\n    $role = \"#{CheckTargets.Octopus.Role}\"\n    $message = \"#{CheckTargets.Message}\"\n\n    if (![string]::IsNullOrWhitespace($apiKey) -and $apiKey.StartsWith(\"API-\"))\n    {\n        $spaceId = \"#{Octopus.Space.Id}\"\n        $headers = @{ \"X-Octopus-ApiKey\" = \"$apiKey\" }\n\n        try\n        {\n            $roleTargets = Invoke-RestMethod -Method Get -Uri \"$octopusUrl/api/$spaceId/machines?roles=$role\" -Headers $headers\n            if ($roleTargets.Items.Count -lt 1)\n            {\n                $errorCollection += @(\"Expected at least 1 target for tag $role, but found $( $roleTargets.Items.Count ). $message\")\n            }\n        }\n        catch\n        {\n            $errorCollection += @(\"Failed to retrieve role targets: $( $_.Exception.Message )\")\n        }\n\n        if ($errorCollection.Count -gt 0)\n        {\n            foreach ($item in $errorCollection)\n            {\n                Write-Highlight \"$item\"\n            }\n        }\n        else\n        {\n            $setupValid = $true\n            Write-Host \"Setup valid!\"\n        }\n    }\n    else\n    {\n        Write-Highlight \"The project variable CheckTargets.Octopus.Api.Key has not been configured, unable to check deployment targets.\"\n        Write-Highlight \"See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys.\"\n        Write-Highlight \"Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check for targets in this space.\"\n    }\n\n    Set-OctopusVariable -Name SetupValid -Value $setupValid\n} catch {\n    Write-Verbose \"Fatal error occurred:\"\n    Write-Verbose \"$($_.Exception.Message)\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "e9713772-81f8-4f0f-af80-10c3ec0bfb17",
-      "Name": "CheckTargets.Octopus.Api.Key",
-      "Label": "Octopus API Key",
-      "HelpText": "The API key used to query the Octopus instance.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "f2c126ad-e907-4fb8-84a3-a5fb80dd6688",
-      "Name": "CheckTargets.Octopus.Role",
-      "Label": "Target Tag to Check",
-      "HelpText": "The name of the target tag to check for.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2d5257e4-288a-456c-ba18-bd2b3c1c1351",
-      "Name": "CheckTargets.Message",
-      "Label": "Message to display if tags not found",
-      "HelpText": "An optional custom message to display if no targets are found with the specified tag.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-10-13T00:52:34.019Z",
-    "OctopusVersion": "2025.3.14357",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "Octopus"
-}
diff --git a/step-templates/octopus-consolidate-releasenotes.json b/step-templates/octopus-consolidate-releasenotes.json
deleted file mode 100644
index 096aaedd1..000000000
--- a/step-templates/octopus-consolidate-releasenotes.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "Id": "fa570d27-1405-4030-87b2-c0abf12bb833",
-  "Name": "Consolidate Release Notes",
-  "Description": "Consolidates all Release Notes between the last successful release in the current Environment and this one by merging or concatenating them.",
-  "ActionType": "Octopus.Script",
-  "Version": 13,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "$baseUri = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}']\n$reqheaders = @{\"X-Octopus-ApiKey\" = $Consolidate_ApiKey }\n$putReqHeaders = @{\"X-HTTP-Method-Override\" = \"PUT\"; \"X-Octopus-ApiKey\" = $Consolidate_ApiKey }\n\n$remWhiteSpace = [bool]::Parse($Consolidate_RemoveWhitespace)\n$deDupe = [bool]::Parse($Consolidate_Dedupe)\n$reverse = ($Consolidate_Order -eq \"Oldest\")\n\n# Get details we'll need\n$projectId = $OctopusParameters['Octopus.Project.Id']\n$thisReleaseNumber = $OctopusParameters['Octopus.Release.Number']\n$lastSuccessfulReleaseId = $OctopusParameters['Octopus.Release.CurrentForEnvironment.Id']\n$lastSuccessfulReleaseNumber = $OctopusParameters['Octopus.Release.CurrentForEnvironment.Number']\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-WebRequest \"$baseUri/api\" -Headers $reqHeaders -UseBasicParsing | ConvertFrom-Json;\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif(Test-SpacesApi) {\n\t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n    }\n\t$baseApiUrl = \"/api/$spaceId\" ;\n} else {\n\t$baseApiUrl = \"/api\" ;\n}\n\n# Get all previous releases to this environment\n$releaseUri = \"$baseUri$baseApiUrl/projects/$projectId/releases\"\ntry {\n    $allReleases = Invoke-WebRequest $releaseUri -Headers $reqheaders -UseBasicParsing | ConvertFrom-Json\n} catch {\n    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {\n        $result = $_.Exception.Response.GetResponseStream()\n        $reader = New-Object System.Io.StreamReader($result);\n        $responseBody = $reader.ReadToEnd();\n        throw \"Error occurred: $responseBody\"\n    }\n}\n\n# Find and aggregate release notes\n$aggregateNotes = @()\n\nWrite-Host \"Finding all release notes between the last successful release: $lastSuccessfulReleaseNumber and this release: $thisReleaseNumber\"\nforeach ($rel in $allReleases.Items) {\n    if ($rel.Id -ne $lastSuccessfulReleaseId) {\n        Write-Host \"Found release notes for $($rel.Version)\"\n        $theseNotes = @()\n        #split into lines\n        $lines = $rel.ReleaseNotes -split \"`n\"\n        foreach ($line in $lines) {\n            if (-not $remWhitespace -or -not [string]::IsNullOrWhiteSpace($line)) {\n                if (-not $deDupe -or -not $aggregateNotes.Contains($line)) {\n                    $theseNotes = $theseNotes + $line\n                }\n            }\n        }\n        if ($reverse) {\n            $aggregateNotes = $theseNotes + $aggregateNotes\n        } else {\n            $aggregateNotes = $aggregateNotes + $theseNotes\n        }\n    } else {\n        break\n    }\n}\n$aggregateNotesText = $aggregateNotes -join \"`n`n\"\n\n# Get the current release\n$releaseUri = \"$baseUri$baseApiUrl/projects/$projectId/releases/$thisReleaseNumber\"\ntry {\n    $currentRelease = Invoke-WebRequest $releaseUri -Headers $reqheaders -UseBasicParsing | ConvertFrom-Json\n} catch {\n    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {\n        $result = $_.Exception.Response.GetResponseStream()\n        $reader = New-Object System.Io.StreamReader($result);\n        $responseBody = $reader.ReadToEnd();\n        throw \"Error occurred: $responseBody\"\n    }\n}\n\n# Update the release notes for the current release\n$currentRelease.ReleaseNotes = $aggregateNotesText\nWrite-Host \"Updating release notes for $thisReleaseNumber`:`n`n\"\nWrite-Host $aggregateNotesText\ntry {\n    $releaseUri = \"$baseUri$baseApiUrl/releases/$($currentRelease.Id)\"\n    $currentReleaseBody = $currentRelease | ConvertTo-Json -Depth 10\n    $result = Invoke-WebRequest $releaseUri -Method Post -Headers $putReqHeaders -Body $currentReleaseBody -UseBasicParsing | ConvertFrom-Json\n} catch {\n    $result = $_.Exception.Response.GetResponseStream()\n    $reader = New-Object System.Io.StreamReader($result);\n    $responseBody = $reader.ReadToEnd();\n    Write-Host $responseBody\n    throw \"Error occurred: $responseBody\"\n}",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "fa5cfdb4-b006-4f92-90ee-affc1791fc79",
-      "Name": "Consolidate_ApiKey",
-      "Type": "String",
-      "Label": "Api Key",
-      "HelpText": "The API Key to use for authentication",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2fe221e5-1f47-4cf9-bde7-ed3b77028bf4",
-      "Name": "Consolidate_Dedupe",
-      "Type": "String",
-      "Label": "Remove Duplicates",
-      "HelpText": "Whether to remove **duplicate** lines when constructing release notes",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox",
-        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "301aa2a8-f06b-4904-9636-99189074f224",
-      "Name": "Consolidate_RemoveWhitespace",
-      "Type": "String",
-      "Label": "Remove Blank Lines",
-      "HelpText": "Whether to remove **blank** lines when constructing release notes",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox",
-        "Octopus.SelectOptions": "Yes|Yes\nNo|No"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "517d4aac-e6ae-451c-b18f-be31c6c153b8",
-      "Name": "Consolidate_Order",
-      "Type": "String",
-      "Label": "Concatenation Order",
-      "HelpText": "The order in which to append release notes",
-      "DefaultValue": "Newest",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Newest|Newest to Oldest\nOldest|Oldest to Newest"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "FinnianDempsey",
-  "$Meta": {
-    "ExportedAt": "2023-03-09T13:12:44.043Z",
-    "OctopusVersion": "2022.3.10936",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
-
-
diff --git a/step-templates/octopus-delete-machine-registration.json b/step-templates/octopus-delete-machine-registration.json
deleted file mode 100644
index 14051c5a4..000000000
--- a/step-templates/octopus-delete-machine-registration.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "Id": "e4255fcb-fe7d-4d5b-8ec0-0243e5f48a9c",
-    "Name": "Delete Target or Worker Registration From Octopus",
-    "Description": "Step that will attempt to delete a target or worker from Octopus Deploy using the API.  If it cannot delete the target or worker it will disable the target and rename it.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Author": "octobob",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$OctopusAPIKey = $OctopusParameters[\"DeleteTarget.Octopus.Api.Key\"]\n$TargetName = $OctopusParameters[\"DeleteTarget.Target.Name\"]\n$OctopusUrl = $OctopusParameters[\"DeleteTarget.Octopus.Base.Url\"]\n$SpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$TargetType = $OctopusParameters[\"DeleteTarget.Target.TargetType\"]\n\nWrite-Host \"Target Name: $TargetName\"\nWrite-Host \"Octopus URL: $OctopusUrl\"\nWrite-Host \"Space Id: $SpaceId\"\nWrite-Host \"Target Type: $TargetType\"\n\n$header = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$header.Add(\"X-Octopus-ApiKey\", $OctopusAPIKey)\n\n$baseApiUrl = \"$OctopusUrl/api\"\n$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header\nif ((Get-Member -InputObject $baseApiInformation.Links -Name \"Spaces\" -MemberType Properties) -ne $null)\n{\n\t$baseApiUrl = \"$baseApiUrl/$SpaceId\"\n}\n\n$baseTargetUrl = \"$baseApiUrl/machines\"\n\nif ($TargetType -eq \"Worker\")\n{\n\t$baseTargetUrl = \"$baseApiUrl/workers\"\n    Write-Host \"Worker was selected, switching over to use the URL $baseTargetUrl\"\n}\n\n$targetListUrl = \"$($baseTargetUrl)?skip=0&take=1000&partialName=$TargetName\"\nWrite-Host \"Get a list of all machine using the URL $targetListUrl\"\n\n$targetList = (Invoke-RestMethod $targetListUrl -Headers $header)\n\nforeach($target in $targetList.Items)\n{\n    if ($target.Name -eq $TargetName)\n    {\n        $targetId = $target.Id\n        $itemToDeleteEndPoint = \"$baseTargetUrl/$targetId\"\n        try\n        {        \t\n        \tWrite-Highlight \"Deleting the machine $targetId because the name $($target.Name) matches the $TargetName $itemToDeleteEndPoint\"\n        \t$deleteResponse = (Invoke-RestMethod $itemToDeleteEndPoint -Headers $header -Method Delete)\n            Write-Highlight \"Successfully deleted machine $TargetName\"\n            Write-Host \"Delete Response $deleteResponse\"\n        }\n        catch\n        {          \t\n        \t$currentDate = Get-Date -Format \"_MMddyyyy_HHmm\"\n        \t$target.Name = \"$($target.Name)-old$currentdate\"\n            $target.IsDisabled = $True\n            \n            $jsonRequest = $target | ConvertTo-Json\n                        \n            Write-Highlight \"There was an error deleting the machine, renaming it to $($target.name) and disabling it\"\n          \tWrite-Host $_\n            $machineResponse = Invoke-RestMethod $itemToDeleteEndPoint -Headers $header -Method PUT -Body $jsonRequest\n        } \n        \n        break\n    }\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "f287ffbb-9b6b-48b8-bea6-2ba399ae570c",
-        "Name": "DeleteTarget.Octopus.Base.Url",
-        "Label": "Octopus Base Url",
-        "HelpText": "The Base URL of the Octopus Deploy Server.  Example: https://samples.octopus.app",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cabd24c3-3eb3-4913-b73a-0df2df02e82d",
-        "Name": "DeleteTarget.Octopus.Api.Key",
-        "Label": "Octopus API Key",
-        "HelpText": "The API key of a user who has permissions to delete a target from Octopus Deploy",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "396591f9-8bd0-4acb-9de6-2dacf0ca2c50",
-        "Name": "DeleteTarget.Target.Name",
-        "Label": "Target Name",
-        "HelpText": "The Name of the Target to delete from Octopus Deploy",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e01b6695-1cef-423b-b53f-b1185cc3b894",
-        "Name": "DeleteTarget.Target.TargetType",
-        "Label": "Target Type",
-        "HelpText": "What kind of registration is it, a worker or a deployment target",
-        "DefaultValue": "Target",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Target|Deployment Target\nWorker|Worker"
-        }
-      }
-    ],
-    "LastModifiedBy": "octobob",
-    "$Meta": {
-      "ExportedAt": "2020-04-13T15:37:29.866Z",
-      "OctopusVersion": "2020.1.10",
-      "Type": "ActionTemplate"
-    },
-    "Category": "octopus"
-  }
diff --git a/step-templates/octopus-find-cac-updates.json b/step-templates/octopus-find-cac-updates.json
deleted file mode 100644
index a5c966b79..000000000
--- a/step-templates/octopus-find-cac-updates.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "Id": "05210515-1a52-45d9-8be3-16caef808326",
-  "Name": "Octopus - Find CaC Updates (S3 Backend)",
-  "Description": "This step queries each workspace in the Terraform state for downstream Octopus CaC enabled projects, extracts the Git repo associated with the CaC project, and determines if there are any changes to merge into the downstream project from the upstream project.\n\nThis indicates if changes to an upstream project are available to be merged into a downstream project, either automatically, or after resolving merge conflicts.",
-  "ActionType": "Octopus.AwsRunScript",
-  "Version": 4,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Aws.AssumeRole": "False",
-    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptBody": "# Check to see if $IsWindows is available\nif ($null -eq $IsWindows) {\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nFunction Get-GitExecutable\n{\n    # Define parameters\n    param (\n        $WorkingDirectory\n    )\n\n    # Define variables\n    $gitExe = \"PortableGit-2.41.0.3-64-bit.7z.exe\"\n    $gitDownloadUrl = \"https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe\"\n    $gitDownloadArguments = @{}\n    $gitDownloadArguments.Add(\"Uri\", $gitDownloadUrl)\n    $gitDownloadArguments.Add(\"OutFile\", \"$WorkingDirectory/git/$gitExe\")\n\n    # This makes downloading faster\n    $ProgressPreference = 'SilentlyContinue'\n\n    # Check to see if git subfolder exists\n    if ((Test-Path -Path \"$WorkingDirectory/git\") -eq $false)\n    {\n        # Create subfolder\n        New-Item -Path \"$WorkingDirectory/git\"  -ItemType Directory | Out-Null\n    }\n\n    # Check PowerShell version\n    if ($PSVersionTable.PSVersion.Major -lt 6)\n    {\n        # Use basic parsing is required\n        $gitDownloadArguments.Add(\"UseBasicParsing\", $true)\n    }\n\n    # Download Git\n    Write-Host \"Downloading Git ...\"\n    Invoke-WebRequest @gitDownloadArguments\n\n    # Extract Git\n    $gitExtractArguments = @()\n    $gitExtractArguments += \"-o\"\n    $gitExtractArguments += \"$WorkingDirectory\\git\"\n    $gitExtractArguments += \"-y\"\n    $gitExtractArguments += \"-bd\"\n\n    Write-Host \"Extracting Git download ...\"\n    & \"$WorkingDirectory\\git\\$gitExe\" $gitExtractArguments\n\n    # Wait until unzip action is complete\n    while ($null -ne (Get-Process | Where-Object {$_.ProcessName -eq ($gitExe.Substring(0, $gitExe.LastIndexOf(\".\")))}))\n    {\n        Start-Sleep 5\n    }\n\n    # Add bin folder to path\n    $env:PATH = \"$WorkingDirectory\\git\\bin$([IO.Path]::PathSeparator)\" + $env:PATH\n\n    # Disable promopt for credential helper\n    Invoke-CustomCommand \"git\" @(\"config\", \"--system\", \"--unset\", \"credential.helper\") | Write-Results\n}\n\nFunction Invoke-CustomCommand\n{\n    Param (\n        $commandPath,\n        $commandArguments,\n        $workingDir = (Get-Location),\n        $path = @()\n    )\n\n    $path += $env:PATH\n    $newPath = $path -join [IO.Path]::PathSeparator\n\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.WorkingDirectory = $workingDir\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $pinfo.EnvironmentVariables[\"PATH\"] = $newPath\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n\n    # Capture output during process execution so we don't hang\n    # if there is too much output.\n    # Microsoft documents a C# solution here:\n    # https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.processstartinfo.redirectstandardoutput?view=net-7.0&redirectedfrom=MSDN#remarks\n    # This code is based on https://stackoverflow.com/a/74748844\n    $stdOut = [System.Text.StringBuilder]::new()\n    $stdErr = [System.Text.StringBuilder]::new()\n    do\n    {\n        if (!$p.StandardOutput.EndOfStream)\n        {\n            $stdOut.AppendLine($p.StandardOutput.ReadLine())\n        }\n        if (!$p.StandardError.EndOfStream)\n        {\n            $stdErr.AppendLine($p.StandardError.ReadLine())\n        }\n\n        Start-Sleep -Milliseconds 10\n    }\n    while (-not $p.HasExited)\n\n    # Capture any standard output generated between our last poll and process end.\n    while (!$p.StandardOutput.EndOfStream)\n    {\n        $stdOut.AppendLine($p.StandardOutput.ReadLine())\n    }\n\n    # Capture any error output generated between our last poll and process end.\n    while (!$p.StandardError.EndOfStream)\n    {\n        $stdErr.AppendLine($p.StandardError.ReadLine())\n    }\n\n    $p.WaitForExit()\n\n    $executionResults = [pscustomobject]@{\n        StdOut = $stdOut.ToString()\n        StdErr = $stdErr.ToString()\n        ExitCode = $p.ExitCode\n    }\n\n    return $executionResults\n\n}\n\nfunction Write-Results\n{\n    [cmdletbinding()]\n    param (\n        [Parameter(Mandatory=$True,ValuefromPipeline=$True)]\n        $results\n    )\n\n    if (![String]::IsNullOrWhiteSpace($results.StdOut))\n    {\n        Write-Verbose $results.StdOut\n    }\n\n    if (![String]::IsNullOrWhiteSpace($results.StdErr))\n    {\n        Write-Verbose $results.StdErr\n    }\n}\n\nfunction Write-TerraformBackend {\n    Set-Content -Path 'backend.tf' -Value @\"\nterraform {\n        backend \"s3\" {}\n        required_providers {\n          octopusdeploy = { source = \"OctopusDeployLabs/octopusdeploy\", version = \"0.14.9\" }\n        }\n    }\n\"@\n}\n\nfunction Format-StringAsNullOrTrimmed {\n    [cmdletbinding()]\n    param (\n        [Parameter(ValuefromPipeline=$True)]\n        $input\n    )\n\n    if ([string]::IsNullOrWhitespace($input)) {\n        return $null\n    }\n\n    return $input.Trim()\n}\n\n$username = $OctopusParameters[\"FindConflicts.Git.Credentials.Username\"]\n$password = $OctopusParameters[\"FindConflicts.Git.Credentials.Password\"]\n$protocol = $OctopusParameters[\"FindConflicts.Git.Url.Protocol\"]\n$gitHost = $OctopusParameters[\"FindConflicts.Git.Url.Host\"]\n$org = $OctopusParameters[\"FindConflicts.Git.Url.Organization\"]\n$repo = $OctopusParameters[\"FindConflicts.Git.Url.Template\"]\n$region = $OctopusParameters[\"FindConflicts.Terraform.Backend.S3Region\"]\n$key = $OctopusParameters[\"FindConflicts.Terraform.Backend.S3Key\"]\n$bucket = $OctopusParameters[\"FindConflicts.Terraform.Backend.S3Bucket\"]\n\n# Validate the inputs\nif ([string]::IsNullOrWhitespace($username)) {\n    Write-Error \"The FindConflicts.Git.Credentials.Username variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($password)) {\n    Write-Error \"The FindConflicts.Git.Credentials.Password variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($protocol)) {\n    Write-Error \"The FindConflicts.Git.Url.Protocol variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($gitHost)) {\n    Write-Error \"The FindConflicts.Git.Url.Host variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($org)) {\n    Write-Error \"The FindConflicts.Git.Url.Organization variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($repo)) {\n    Write-Error \"The FindConflicts.Git.Url.Template variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($region)) {\n    Write-Error \"The FindConflicts.Terraform.Backend.S3Region variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($key)) {\n    Write-Error \"The FindConflicts.Terraform.Backend.S3Key variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($bucket)) {\n    Write-Error \"The FindConflicts.Terraform.Backend.S3Bucket variable must be provided\"\n}\n\n$templateRepoUrl = $protocol + \"://\" + $gitHost + \"/\" + $org + \"/\" + $repo + \".git\"\n$templateRepo = $protocol + \"://\" + $username + \":\" + $password + \"@\" + $gitHost + \"/\" + $org + \"/\" + $repo + \".git\"\n$branch = \"main\"\n\n# Check to see if it's Windows\nif ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq \"Hosted Windows\")\n{\n    # Dynamic worker don't have git, download portable version and add to path for execution\n    Write-Host \"Detected usage of Windows Dynamic Worker ...\"\n    Get-GitExecutable -WorkingDirectory $PWD\n}\n\nWrite-TerraformBackend\n\nInvoke-CustomCommand \"git\" @(\"config\", \"--global\", \"user.email\", \"octopus@octopus.com\") | Write-Results\nInvoke-CustomCommand \"git\" @(\"config\", \"--global\", \"user.name\", \"Octopus Server\") | Write-Results\n\nInvoke-CustomCommand \"terraform\" @(\"init\", \"-no-color\", \"-backend-config=`\"bucket=$bucket`\"\", \"-backend-config=`\"region=$region`\"\", \"-backend-config=`\"key=$key`\"\") | Write-Results\n\nWrite-Host \"- Up to date\"\nWrite-Host \"> Can automatically merge\"\nWrite-Host \"× Merge conflict\"\nWrite-Host \"Verbose logs contain instructions for resolving merge conflicts.\"\n\n$workspaces = Invoke-CustomCommand \"terraform\" @(\"workspace\", \"list\")\n\nWrite-Results $workspaces\n\n$parsedWorkspaces = $workspaces.StdOut.Replace(\"*\", \"\").Split(\"`n\")\n\n$downstreamCount = 0\nforeach ($workspace in $parsedWorkspaces)\n{\n    $trimmedWorkspace = $workspace | Format-StringAsNullOrTrimmed\n\n    if ($trimmedWorkspace -eq \"default\" -or [string]::IsNullOrWhitespace($trimmedWorkspace))\n    {\n        continue\n    }\n\n    Write-Verbose \"Processing workspace $trimmedWorkspace\"\n\n    Invoke-CustomCommand \"terraform\" @(\"workspace\", \"select\", $trimmedWorkspace) | Write-Results\n\n    $state = Invoke-CustomCommand \"terraform\" @(\"show\", \"-json\")\n\n    # state might include sensitive values, so don't print it unless there was an error\n\n    if (-not $state.ExitCode -eq 0)\n    {\n        Write-Results $state\n        continue\n    }\n\n    $parsedState = $state.StdOut | ConvertFrom-Json\n\n    $resources = $parsedState.values.root_module.resources | Where-Object {\n        $_.type -eq \"octopusdeploy_project\"\n    }\n\n    # The outputs allow us to contact the downstream instance)\n    $spaceId = Invoke-CustomCommand \"terraform\" @(\"output\", \"-raw\", \"octopus_space_id\")\n    $spaceName = Invoke-CustomCommand \"terraform\" @(\"output\", \"-raw\", \"octopus_space_name\")\n    $space = if ([string]::IsNullOrWhitespace($spaceName.StdOut))\n    {\n        $spaceId.StdOut | Format-StringAsNullOrTrimmed\n    }\n    else\n    {\n        $spaceName.StdOut | Format-StringAsNullOrTrimmed\n    }\n\n    foreach ($resource in $resources)\n    {\n        $url = $resource.values.git_library_persistence_settings.url | Format-StringAsNullOrTrimmed\n        $spaceId = $resource.values.space_id | Format-StringAsNullOrTrimmed\n        $name = $resource.values.name | Format-StringAsNullOrTrimmed\n\n        if (-not [string]::IsNullOrWhitespace($url))\n        {\n            $downstreamCount++\n\n            mkdir $trimmedWorkspace | Out-Null\n\n            Invoke-CustomCommand \"git\" @(\"clone\", $url, $trimmedWorkspace) | Write-Results\n            Invoke-CustomCommand \"git\" @(\"remote\", 'add', 'upstream', $templateRepo) $trimmedWorkspace | Write-Results\n            Invoke-CustomCommand \"git\" @(\"fetch\", \"--all\") $trimmedWorkspace | Write-Results\n            Invoke-CustomCommand \"git\" @(\"checkout\", \"-b\", \"upstream-$branch\", \"upstream/$branch\") $trimmedWorkspace | Write-Results\n\n            if (-not($branch -eq \"master\" -or $branch -eq \"main\"))\n            {\n                Invoke-CustomCommand \"git\" @(\"checkout\", \"-b\", $branch, \"origin/$branch\") $trimmedWorkspace | Write-Results\n            }\n            else\n            {\n                Invoke-CustomCommand \"git\" @(\"checkout\", $branch) $trimmedWorkspace | Write-Results\n            }\n\n            $mergeBase = Invoke-CustomCommand \"git\" @(\"merge-base\", $branch, \"upstream-$branch\") $trimmedWorkspace\n\n            Write-Results $mergeBase\n\n            $mergeSourceCurrentCommit = Invoke-CustomCommand \"git\" @(\"rev-parse\", \"upstream-$branch\") $trimmedWorkspace\n\n            Write-Results $mergeSourceCurrentCommit\n\n            $mergeResult = Invoke-CustomCommand \"git\" @(\"merge\", \"--no-commit\", \"--no-ff\", \"upstream-$branch\") $trimmedWorkspace\n\n            Write-Results $mergeResult\n\n            if ($mergeBase.StdOut -eq $mergeSourceCurrentCommit.StdOut)\n            {\n                Write-Host \"$space `\"$name`\" $url -\"\n            }\n            elseif (-not $mergeResult.ExitCode -eq 0)\n            {\n                Write-Host \"$space `\"$name`\" $url ×\"\n                Write-Verbose \"To resolve the conflicts, run the following commands:\"\n                Write-Verbose \"mkdir cac\"\n                Write-Verbose \"cd cac\"\n                Write-Verbose \"git clone $url .\"\n                Write-Verbose \"git remote add upstream $templateRepoUrl\"\n                Write-Verbose \"git fetch --all\"\n                Write-Verbose \"git checkout -b upstream-$branch upstream/$branch\"\n                if (-not($branch -eq \"master\" -or $branch -eq \"main\"))\n                {\n                    Write-Verbose \"git checkout -b $branch origin/$branch\"\n                }\n                else\n                {\n                    Write-Verbose \"git checkout $branch\"\n                    Write-Verbose \"git merge-base $branch upstream-$branch\"\n                    Write-Verbose \"git merge --no-commit --no-ff upstream-$branch\"\n                }\n            }\n            else\n            {\n                Write-Host \"$space `\"$name`\" $url >\"\n            }\n        }\n        else {\n            Write-Verbose \"`\"$name`\" is not a CaC project\"\n        }\n    }\n}",
-    "Octopus.Action.Aws.Region": "#{FindConflicts.Terraform.Backend.S3Region}",
-    "Octopus.Action.AwsAccount.Variable": "#{FindConflicts.Terraform.Aws.Account}"
-  },
-  "Parameters": [
-    {
-      "Id": "1eea75a0-74c7-4af9-8569-a9e9ece1bd55",
-      "Name": "FindConflicts.Git.Credentials.Username",
-      "Label": "Git Username",
-      "HelpText": "The git repo username. When using GitHub with an access token, the value is `x-access-token`.",
-      "DefaultValue": "x-access-token",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1cf36824-079a-4cf1-b67c-36f07933f642",
-      "Name": "FindConflicts.Git.Credentials.Password",
-      "Label": "Git Password",
-      "HelpText": "The git repo password or access token.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "e6a7414d-8d84-4fb8-9149-2a87f20502bf",
-      "Name": "FindConflicts.Git.Url.Protocol",
-      "Label": "Git Protocol",
-      "HelpText": "The git repo protocol.",
-      "DefaultValue": "https",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "https|HTTPS\nhttp|HTTP"
-      }
-    },
-    {
-      "Id": "f5d0d829-ef6c-4e06-b115-7b2845339544",
-      "Name": "FindConflicts.Git.Url.Host",
-      "Label": "Git Hostname",
-      "HelpText": "The git repo host name.",
-      "DefaultValue": "github.com",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8b6e78e2-07fa-4783-9f9a-c23f5295f146",
-      "Name": "FindConflicts.Git.Url.Organization",
-      "Label": "Git Organization",
-      "HelpText": "The git repo owner or organization i.e. `owner` in the url `https://github.com/owner/repo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1e99c543-9e80-41b2-9384-8cbefd5c3ee6",
-      "Name": "FindConflicts.Git.Url.Template",
-      "Label": "Git Template Repo",
-      "HelpText": "The repo holding the upstream, or template, CaC project i.e. `repo` in the url `https://github.com/owner/repo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b0131561-4928-4dfb-85a9-a1282ac4a1be",
-      "Name": "FindConflicts.Terraform.Backend.S3Region",
-      "Label": "AWS Region",
-      "HelpText": "The AWS region hosting the S3 bucket persisting the Terraform state.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "652fa73d-99fa-4c81-9ef8-2e79d985222d",
-      "Name": "FindConflicts.Terraform.Backend.S3Key",
-      "Label": "S3 Key",
-      "HelpText": "The name of the file in the S3 bucket hosting the Terraform state.",
-      "DefaultValue": "Project_#{Octopus.Project.Name | Replace \"[^A-Za-z0-9]\" \"_\"}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7102a4ab-0f05-4b97-be26-8361b23df361",
-      "Name": "FindConflicts.Terraform.Backend.S3Bucket",
-      "Label": "S3 Bucket",
-      "HelpText": "The name of the S3 bucket hosting the Terraform state.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7015ee07-f265-41d4-863a-d1f13fcfbc68",
-      "Name": "FindConflicts.Terraform.Aws.Account",
-      "Label": "AWS Account",
-      "HelpText": "The AWS account used to access the S3 bucket.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AmazonWebServicesAccount"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AwsRunScript",
-  "$Meta": {
-    "ExportedAt": "2023-11-16T20:09:13.659Z",
-    "OctopusVersion": "2024.1.1838",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-get-octopus-usage.json b/step-templates/octopus-get-octopus-usage.json
deleted file mode 100644
index 9388f3ef9..000000000
--- a/step-templates/octopus-get-octopus-usage.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "Id": "f70f16a9-7bf3-448c-9532-e5a69364581d",
-  "Name": "Get Octopus Usage",
-  "Description": "Step template to gather Octopus usage details across spaces. The results will be output to the log and also as a downloadable artifact.\n\nTo avoid slowing down your instance, this script will pull back 50 items at a time and count them.  It is designed to run on instances as old as 3.4.\n\n**Required:** An API Key for a user or service account that has read access in every space on the instance.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$OctopusDeployUrl = $OctopusParameters[\"GetUsage.Octopus.ServerUri\"]\n$OctopusDeployApiKey = $OctopusParameters[\"GetUsage.Octopus.ApiKey\"]\n\n## To avoid nuking your instance, this script will pull back 50 items at a time and count them.  It is designed to run on instances as far back as 3.4.\n\nfunction Get-OctopusUrl\n{\n    param (\n        $EndPoint,\n        $SpaceId,\n        $OctopusUrl        \n    )\n\n    $octopusUrlToUse = $OctopusUrl\n    if ($OctopusUrl.EndsWith(\"/\"))\n    {\n        $octopusUrlToUse = $OctopusUrl.Substring(0, $OctopusUrl.Length - 1)\n    }\n\n    if ($EndPoint -match \"/api\")\n    {\n        if (!$EndPoint.StartsWith(\"/api\"))\n        {\n            $EndPoint = $EndPoint.Substring($EndPoint.IndexOf(\"/api\"))\n        }\n\n        return \"$octopusUrlToUse$EndPoint\"\n    }\n\n    if ([string]::IsNullOrWhiteSpace($SpaceId))\n    {\n        return \"$octopusUrlToUse/api/$EndPoint\"\n    }\n\n    return \"$octopusUrlToUse/api/$spaceId/$EndPoint\"\n}\n\nfunction Invoke-OctopusApi\n{\n    param\n    (\n        $endPoint,\n        $spaceId,\n        $octopusUrl,        \n        $apiKey\n    )    \n\n    try\n    {        \n        $url = Get-OctopusUrl -EndPoint $endPoint -SpaceId $spaceId -OctopusUrl $octopusUrl\n\n        Write-Host \"Invoking $url\"\n        return Invoke-RestMethod -Method Get -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$apiKey\" } -ContentType 'application/json; charset=utf-8' -TimeoutSec 60        \n    }\n    catch\n    {\n        Write-Host \"There was an error making a Get call to the $url.  Please check that for more information.\" -ForegroundColor Red\n\n        if ($null -ne $_.Exception.Response)\n        {\n            if ($_.Exception.Response.StatusCode -eq 401)\n            {\n                Write-Host \"Unauthorized error returned from $url, please verify API key and try again\" -ForegroundColor Red\n            }\n            elseif ($_.ErrorDetails.Message)\n            {                \n                Write-Host -Message \"Error calling $url StatusCode: $($_.Exception.Response) $($_.ErrorDetails.Message)\" -ForegroundColor Red\n                Write-Host $_.Exception -ForegroundColor Red\n            }            \n            else \n            {\n                Write-Host $_.Exception -ForegroundColor Red\n            }\n        }\n        else\n        {\n            Write-Host $_.Exception -ForegroundColor Red\n        }\n\n        Write-Host \"Stopping the script from proceeding\" -ForegroundColor Red\n        exit 1\n    }    \n}\n\nfunction Get-OctopusObjectCount\n{\n    param\n    (\n        $endPoint,\n        $spaceId,\n        $octopusUrl,        \n        $apiKey\n    )\n\n    $activeItemCount = 0\n    $disabledItemCount = 0\n    $currentPage = 1\n    $pageSize = 50\n    $skipValue = 0\n    $haveReachedEndOfList = $false\n\n    while ($haveReachedEndOfList -eq $false)\n    {\n        $currentEndPoint = \"$($endPoint)?skip=$skipValue&take=$pageSize\"\n\n        $itemList = Invoke-OctopusApi -endPoint $currentEndPoint -spaceId $spaceId -octopusUrl $octopusUrl -apiKey $apiKey\n\n        foreach ($item in $itemList.Items)\n        {\n            if ($null -ne (Get-Member -InputObject $item -Name \"IsDisabled\" -MemberType Properties))\n            {          \n                if ($item.IsDisabled -eq $false)\n                {\n                    $activeItemCount += 1\n                }\n                else\n                {\n                    $disabledItemCount += 1\n                }\n            }\n            else \n            {\n                $activeItemCount += 1    \n            }\n        }\n\n        if ($currentPage -lt $itemList.NumberOfPages)\n        {\n            $skipValue = $currentPage * $pageSize\n            $currentPage += 1\n\n            Write-Host \"The endpoint $endpoint has reported there are $($itemList.NumberOfPages) pages.  Setting the skip value to $skipValue and re-querying\"\n        }\n        else\n        {\n            $haveReachedEndOfList = $true    \n        }\n    }\n    \n    return @{\n        ActiveItemCount = $activeItemCount\n        DisabledItemCount = $disabledItemCount\n        TotalItemCount = $activeItemCount + $disabledItemCount\n    }\n}\n\nfunction Get-EffectiveLimit \n{\n    param (\n        $limit\n    )\n\n    if ($null -ne (Get-Member -InputObject $limit -Name \"LicensedLimit\" -MemberType Properties))\n    {\n        if ($limit.LicensedLimit -eq 2147483647) # int.MaxValue means it is an unlimited license\n        {\n            return \"of Unlimited\"\n        }\n        else\n        {\n            return \"of $($limit.LicensedLimit)\"\n        }\n    }\n    \n    return \"\"\n}\n\nfunction Get-OctopusDeploymentTargetsCount\n{\n    param\n    (\n        $spaceId,\n        $octopusUrl,        \n        $apiKey\n    )\n\n    $targetCount = @{\n        TargetCount = 0 \n        ActiveTargetCount = 0\n        UnavailableTargetCount = 0        \n        DisabledTargets = 0\n        ActiveListeningTentacleTargets = 0\n        ActivePollingTentacleTargets = 0\n        ActiveSshTargets = 0        \n        ActiveKubernetesCount = 0\n        ActiveAzureWebAppCount = 0\n        ActiveAzureServiceFabricCount = 0\n        ActiveAzureCloudServiceCount = 0\n        ActiveOfflineDropCount = 0    \n        ActiveECSClusterCount = 0\n        ActiveCloudRegions = 0  \n        ActiveFtpTargets = 0\n        DisabledListeningTentacleTargets = 0\n        DisabledPollingTentacleTargets = 0\n        DisabledSshTargets = 0        \n        DisabledKubernetesCount = 0\n        DisabledAzureWebAppCount = 0\n        DisabledAzureServiceFabricCount = 0\n        DisabledAzureCloudServiceCount = 0\n        DisabledOfflineDropCount = 0    \n        DisabledECSClusterCount = 0\n        DisabledCloudRegions = 0  \n        DisabledFtpTargets = 0            \n    }\n\n    $currentPage = 1\n    $pageSize = 50\n    $skipValue = 0\n    $haveReachedEndOfList = $false\n\n    while ($haveReachedEndOfList -eq $false)\n    {\n        $currentEndPoint = \"machines?skip=$skipValue&take=$pageSize\"\n\n        $itemList = Invoke-OctopusApi -endPoint $currentEndPoint -spaceId $spaceId -octopusUrl $octopusUrl -apiKey $apiKey\n\n        foreach ($item in $itemList.Items)\n        {\n            $targetCount.TargetCount += 1\n\n            if ($item.IsDisabled -eq $true)\n            {\n                $targetCount.DisabledTargets += 1                  \n\n                if ($item.EndPoint.CommunicationStyle -eq \"None\")\n                {\n                    $targetCount.DisabledCloudRegions += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"TentacleActive\")\n                {\n                    $targetCount.DisabledPollingTentacleTargets += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"TentaclePassive\")\n                {\n                    $targetCount.DisabledListeningTentacleTargets += 1\n                }\n                # Cover newer k8s agent and traditional worker-API approach\n                elseif ($item.EndPoint.CommunicationStyle -ilike \"Kubernetes*\")\n                {\n                    $targetCount.DisabledKubernetesCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"AzureWebApp\")\n                {\n                    $targetCount.DisabledAzureWebAppCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"Ssh\")\n                {\n                    $targetCount.DisabledSshTargets += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"Ftp\")\n                {\n                    $targetCount.DisabledFtpTargets += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"AzureCloudService\")\n                {\n                    $targetCount.DisabledAzureCloudServiceCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"AzureServiceFabricCluster\")\n                {\n                    $targetCount.DisabledAzureServiceFabricCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"OfflineDrop\")\n                {\n                    $targetCount.DisabledOfflineDropCount += 1\n                }\n                else\n                {\n                    $targetCount.DisabledECSClusterCount += 1\n                }\n            }\n            else\n            {\n                if ($item.HealthStatus -eq \"Healthy\" -or $item.HealthStatus -eq \"HealthyWithWarnings\")\n                {\n                    $targetCount.ActiveTargetCount += 1\n                }\n                else\n                {\n                    $targetCount.UnavailableTargetCount += 1    \n                }\n\n                if ($item.EndPoint.CommunicationStyle -eq \"None\")\n                {\n                    $targetCount.ActiveCloudRegions += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"TentacleActive\")\n                {\n                    $targetCount.ActivePollingTentacleTargets += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"TentaclePassive\")\n                {\n                    $targetCount.ActiveListeningTentacleTargets += 1\n                }\n                # Cover newer k8s agent and traditional worker-API approach\n                elseif ($item.EndPoint.CommunicationStyle -ilike \"Kubernetes*\")\n                {\n                    $targetCount.ActiveKubernetesCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"AzureWebApp\")\n                {\n                    $targetCount.ActiveAzureWebAppCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"Ssh\")\n                {\n                    $targetCount.ActiveSshTargets += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"Ftp\")\n                {\n                    $targetCount.ActiveFtpTargets += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"AzureCloudService\")\n                {\n                    $targetCount.ActiveAzureCloudServiceCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"AzureServiceFabricCluster\")\n                {\n                    $targetCount.ActiveAzureServiceFabricCount += 1\n                }\n                elseif ($item.EndPoint.CommunicationStyle -eq \"OfflineDrop\")\n                {\n                    $targetCount.ActiveOfflineDropCount += 1\n                }\n                else\n                {\n                    $targetCount.ActiveECSClusterCount += 1\n                }\n            }                                \n        }\n\n        if ($currentPage -lt $itemList.NumberOfPages)\n        {\n            $skipValue = $currentPage * $pageSize\n            $currentPage += 1\n\n            Write-Host \"The endpoint $endpoint has reported there are $($itemList.NumberOfPages) pages.  Setting the skip value to $skipValue and re-querying\"\n        }\n        else\n        {\n            $haveReachedEndOfList = $true    \n        }\n    }\n    \n    return $targetCount\n}\n\n# Add support for both TLS 1.2 and TLS 1.3\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12 -bor [System.Net.SecurityProtocolType]::Tls13\n\n$ObjectCounts = @{\n    TotalProjectCount = 0\n    ActiveProjectCount = 0\n    DisabledProjectCount = 0\n    TotalTenantCount = 0        \n    ActiveTenantCount = 0\n    DisabledTenantCount = 0\n    TargetCount = 0 \n    DisabledTargets = 0\n    ActiveTargetCount = 0\n    UnavailableTargetCount = 0\n    ActiveListeningTentacleTargets = 0\n    ActivePollingTentacleTargets = 0\n    ActiveSshTargets = 0        \n    ActiveKubernetesCount = 0\n    ActiveAzureWebAppCount = 0\n    ActiveAzureServiceFabricCount = 0\n    ActiveAzureCloudServiceCount = 0\n    ActiveOfflineDropCount = 0    \n    ActiveECSClusterCount = 0\n    ActiveCloudRegions = 0\n    ActiveFtpTargets = 0 \n    DisabledListeningTentacleTargets = 0\n    DisabledPollingTentacleTargets = 0\n    DisabledSshTargets = 0        \n    DisabledKubernetesCount = 0\n    DisabledAzureWebAppCount = 0\n    DisabledAzureServiceFabricCount = 0\n    DisabledAzureCloudServiceCount = 0\n    DisabledOfflineDropCount = 0    \n    DisabledECSClusterCount = 0\n    DisabledCloudRegions = 0  \n    DisabledFtpTargets = 0             \n    WorkerCount = 0\n    ListeningTentacleWorkers = 0\n    PollingTentacleWorkers = 0\n    SshWorkers = 0\n    ActiveWorkerCount = 0\n    UnavailableWorkerCount = 0\n    WindowsLinuxMachineCount = 0\n    LicensedTargetCount = $null\n    LicensedTargetEntitlement = $null\n    LicensedWorkerCount = 0\n    LicensedWorkerEntitlement = $null\n    LicensedUserCount = 0\n    LicensedUserEntitlement = $null    \n    LicensedProjectCount = 0\n    LicensedProjectEntitlement = $null\n    LicensedTenantCount = $null\n    LicensedTenantEntitlement = $null\n    LicensedMachineCount = $null\n    LicensedMachineEntitlement = $null\n}\n\nWrite-Host \"Getting Octopus Deploy Version Information\"\n$apiInformation = Invoke-OctopusApi -endPoint \"/api\" -spaceId $null -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey\n$splitVersion = $apiInformation.Version -split \"\\.\"\n$OctopusMajorVersion = [int]$splitVersion[0]\n$OctopusMinorVersion = [int]$splitVersion[1]\n$isPtm = $false\n\n$hasLicenseSummary = $OctopusMajorVersion -ge 4\n$hasSpaces = $OctopusMajorVersion -ge 2019\n$hasWorkers = ($OctopusMajorVersion -eq 2018 -and $OctopusMinorVersion -ge 7) -or $OctopusMajorVersion -ge 2019\n\n$spaceIdList = @()\nif ($hasSpaces -eq $true)\n{\n    $OctopusSpaceList = Invoke-OctopusApi -endPoint \"spaces?skip=0&take=10000\" -octopusUrl $OctopusDeployUrl -spaceId $null -apiKey $OctopusDeployApiKey\n    foreach ($space in $OctopusSpaceList.Items)\n    {\n        $spaceIdList += $space.Id\n    }\n}\nelse\n{\n    $spaceIdList += $null    \n}\n\nif ($hasLicenseSummary -eq $true)\n{\n    Write-Host \"Checking the license summary for this instance\"\n    $licenseSummary = Invoke-OctopusApi -endPoint \"licenses/licenses-current-status\" -octopusUrl $OctopusDeployUrl -spaceId $null -apiKey $OctopusDeployApiKey\n\n    if ($null -eq (Get-Member -InputObject $licenseSummary -Name \"IsPtm\" -MemberType Properties))\n    {\n        $isPtm = $false\n    }\n    elseif($licenseSummary.IsPtm -eq $true)\n    {\n        $isPtm = $true\n    }\n    else\n    {\n        $isPtm = $false\n    }\n\n    if ($null -ne (Get-Member -InputObject $licenseSummary -Name \"NumberOfMachines\" -MemberType Properties))\n    {\n        $ObjectCounts.LicensedTargetCount = $licenseSummary.NumberOfMachines\n    }\n    else\n    {\n        foreach ($limit in $licenseSummary.Limits)\n        {\n            if ($limit.Name -eq \"Projects\")\n            {\n                Write-Host \"Your instance is currently using $($limit.CurrentUsage) Projects\"\n                $ObjectCounts.LicensedProjectCount = $limit.CurrentUsage\n                $objectCounts.LicensedProjectEntitlement = Get-EffectiveLimit $limit\n            }\n\n            if ($limit.Name -eq \"Tenants\")\n            {\n                Write-Host \"Your instance is currently using $($limit.CurrentUsage) Tenants\"\n                $ObjectCounts.LicensedTenantCount = $limit.CurrentUsage\n                $objectCounts.LicensedTenantEntitlement = Get-EffectiveLimit $limit\n            }\n\n            if ($limit.Name -eq \"Targets\")\n            {\n                if ($isPtm -eq $true)\n                {                \n                    Write-Host \"Your instance is currently using $($limit.CurrentUsage) Machines\"\n                    $ObjectCounts.LicensedMachineCount = $limit.CurrentUsage\n                    $objectCounts.LicensedMachineEntitlement = Get-EffectiveLimit $limit\n                }\n                else\n                {\n                    Write-Host \"Your instance is currently using $($limit.CurrentUsage) Targets\"\n                    $ObjectCounts.LicensedTargetCount = $limit.CurrentUsage\n                    $objectCounts.LicensedTargetEntitlement = Get-EffectiveLimit $limit\n                }                \n            }\n\n            if ($limit.Name -eq \"Workers\")\n            {\n                Write-Host \"Your instance is currently using $($limit.CurrentUsage) Workers\"\n                $ObjectCounts.LicensedWorkerCount = $limit.CurrentUsage\n                $objectCounts.LicensedWorkerEntitlement = Get-EffectiveLimit $limit\n            }\n\n            if ($limit.Name -eq \"Users\")\n            {\n                Write-Host \"Your instance is currently using $($limit.CurrentUsage) Users\"\n                $ObjectCounts.LicensedUserCount = $limit.CurrentUsage\n                $objectCounts.LicensedUserEntitlement = Get-EffectiveLimit $limit\n            }            \n        }\n    }\n}\n\n\nforeach ($spaceId in $spaceIdList)\n{    \n    Write-Host \"Getting project counts for $spaceId\"\n    $projectCounts = Get-OctopusObjectCount -endPoint \"projects\" -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey\n\n    Write-Host \"$spaceId has $($projectCounts.ActiveItemCount) active projects.\"\n    $ObjectCounts.ActiveProjectCount += $projectCounts.ActiveItemCount\n\n    Write-Host \"$spaceId has $($projectCounts.DisabledItemCount) disabled projects.\"\n    $ObjectCounts.DisabledProjectCount += $projectCounts.DisabledItemCount\n\n    Write-Host \"$spaceId has $($projectCounts.TotalItemCount) total projects.\"\n    $ObjectCounts.TotalProjectCount += $projectCounts.TotalItemCount\n\n    Write-Host \"Getting tenant counts for $spaceId\"\n    $tenantCounts = Get-OctopusObjectCount -endPoint \"tenants\" -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey\n\n    Write-Host \"$spaceId has $($tenantCounts.ActiveItemCount) active tenants.\"\n    $ObjectCounts.ActiveTenantCount += $tenantCounts.ActiveItemCount\n\n    Write-Host \"$spaceId has $($tenantCounts.InactiveItemCount) disabled tenants.\"\n    $ObjectCounts.DisabledTenantCount += $tenantCounts.DisabledItemCount\n\n    Write-Host \"$spaceId has $($tenantCounts.TotalItemCount) total tenants.\"\n    $ObjectCounts.TotalTenantCount += $tenantCounts.TotalItemCount\n    \n    Write-Host \"Getting Infrastructure Summary for $spaceId\"\n    $infrastructureSummary = Get-OctopusDeploymentTargetsCount -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey\n\n    Write-host \"$spaceId has $($infrastructureSummary.TargetCount) targets\"\n    $ObjectCounts.TargetCount += $infrastructureSummary.TargetCount\n\n    Write-Host \"$spaceId has $($infrastructureSummary.ActiveTargetCount) Healthy Targets\"\n    $ObjectCounts.ActiveTargetCount += $infrastructureSummary.ActiveTargetCount\n\n    Write-Host \"$spaceId has $($infrastructureSummary.DisabledTargets) Disabled Targets\"\n    $ObjectCounts.DisabledTargets += $infrastructureSummary.DisabledTargets\n\n    Write-Host \"$spaceId has $($infrastructureSummary.UnavailableTargetCount) Unhealthy Targets\"\n    $ObjectCounts.UnavailableTargetCount += $infrastructureSummary.UnavailableTargetCount    \n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveListeningTentacleTargets) Active Listening Tentacles Targets\"\n    $ObjectCounts.ActiveListeningTentacleTargets += $infrastructureSummary.ActiveListeningTentacleTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActivePollingTentacleTargets) Active Polling Tentacles Targets\"\n    $ObjectCounts.ActivePollingTentacleTargets += $infrastructureSummary.ActivePollingTentacleTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveCloudRegions) Active Cloud Region Targets\"\n    $ObjectCounts.ActiveCloudRegions += $infrastructureSummary.ActiveCloudRegions\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveOfflineDropCount) Active Offline Packages\"\n    $ObjectCounts.ActiveOfflineDropCount += $infrastructureSummary.ActiveOfflineDropCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveSshTargets) Active SSH Targets\"\n    $ObjectCounts.ActiveSshTargets += $infrastructureSummary.ActiveSshTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveSshTargets) Active Kubernetes Targets\"\n    $ObjectCounts.ActiveKubernetesCount += $infrastructureSummary.ActiveKubernetesCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveAzureWebAppCount) Active Azure Web App Targets\"\n    $ObjectCounts.ActiveAzureWebAppCount += $infrastructureSummary.ActiveAzureWebAppCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveAzureServiceFabricCount) Active Azure Service Fabric Cluster Targets\"\n    $ObjectCounts.ActiveAzureServiceFabricCount += $infrastructureSummary.ActiveAzureServiceFabricCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveAzureCloudServiceCount) Active (Legacy) Azure Cloud Service Targets\"\n    $ObjectCounts.ActiveAzureCloudServiceCount += $infrastructureSummary.ActiveAzureCloudServiceCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveECSClusterCount) Active ECS Cluster Targets\"\n    $ObjectCounts.ActiveECSClusterCount += $infrastructureSummary.ActiveECSClusterCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveFtpTargets) Active FTP Targets\"\n    $ObjectCounts.ActiveFtpTargets += $infrastructureSummary.ActiveFtpTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledListeningTentacleTargets) Disabled Listening Tentacles Targets\"\n    $ObjectCounts.DisabledListeningTentacleTargets += $infrastructureSummary.DisabledListeningTentacleTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledPollingTentacleTargets) Disabled Polling Tentacles Targets\"\n    $ObjectCounts.DisabledPollingTentacleTargets += $infrastructureSummary.DisabledPollingTentacleTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledCloudRegions) Disabled Cloud Region Targets\"\n    $ObjectCounts.DisabledCloudRegions += $infrastructureSummary.DisabledCloudRegions\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledOfflineDropCount) Disabled Offline Packages\"\n    $ObjectCounts.DisabledOfflineDropCount += $infrastructureSummary.DisabledOfflineDropCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledSshTargets) Disabled SSH Targets\"\n    $ObjectCounts.DisabledSshTargets += $infrastructureSummary.DisabledSshTargets\n\n    Write-host \"$spaceId has $($infrastructureSummary.ActiveSshTargets) Disabled Kubernetes Targets\"\n    $ObjectCounts.DisabledKubernetesCount += $infrastructureSummary.DisabledKubernetesCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledAzureWebAppCount) Disabled Azure Web App Targets\"\n    $ObjectCounts.DisabledAzureWebAppCount += $infrastructureSummary.DisabledAzureWebAppCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledAzureServiceFabricCount) Disabled Azure Service Fabric Cluster Targets\"\n    $ObjectCounts.DisabledAzureServiceFabricCount += $infrastructureSummary.DisabledAzureServiceFabricCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledAzureCloudServiceCount) Disabled (Legacy) Azure Cloud Service Targets\"\n    $ObjectCounts.DisabledAzureCloudServiceCount += $infrastructureSummary.DisabledAzureCloudServiceCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledECSClusterCount) Disabled ECS Cluster Targets\"\n    $ObjectCounts.DisabledECSClusterCount += $infrastructureSummary.DisabledECSClusterCount\n\n    Write-host \"$spaceId has $($infrastructureSummary.DisabledFtpTargets) Disabled FTP Targets\"\n    $ObjectCounts.DisabledFtpTargets += $infrastructureSummary.DisabledFtpTargets\n\n    if ($hasWorkers -eq $true)\n    {\n        Write-Host \"Getting worker information for $spaceId\"\n        $workerPoolSummary = Invoke-OctopusApi -endPoint \"workerpools/summary\" -spaceId $spaceId -octopusUrl $OctopusDeployUrl -apiKey $OctopusDeployApiKey \n\n        Write-host \"$spaceId has $($workerPoolSummary.TotalMachines) Workers\"\n        $ObjectCounts.WorkerCount += $workerPoolSummary.TotalMachines\n\n        Write-Host \"$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.Healthy) Healthy Workers\"\n        $ObjectCounts.ActiveWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.Healthy\n    \n        Write-Host \"$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.HasWarnings) Healthy with Warning Workers\"\n        $ObjectCounts.ActiveWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.HasWarnings\n    \n        Write-Host \"$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.Unhealthy) Unhealthy Workers\"\n        $ObjectCounts.UnavailableWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.Unhealthy\n    \n        Write-Host \"$spaceId has $($workerPoolSummary.MachineHealthStatusSummaries.Unknown) Workers with a Status of Unknown\"\n        $ObjectCounts.UnavailableWorkerCount += $workerPoolSummary.MachineHealthStatusSummaries.Unknown\n        \n        Write-host \"$spaceId has $($workerPoolSummary.MachineEndpointSummaries.TentaclePassive) Listening Tentacles Workers\"\n        $ObjectCounts.ListeningTentacleWorkers += $workerPoolSummary.MachineEndpointSummaries.TentaclePassive\n\n        Write-host \"$spaceId has $($workerPoolSummary.MachineEndpointSummaries.TentacleActive) Polling Tentacles Workers\"\n        $ObjectCounts.PollingTentacleWorkers += $workerPoolSummary.MachineEndpointSummaries.TentacleActive        \n\n        if ($null -ne (Get-Member -InputObject $workerPoolSummary.MachineEndpointSummaries -Name \"Ssh\" -MemberType Properties))\n        {\n            Write-host \"$spaceId has $($workerPoolSummary.MachineEndpointSummaries.TentacleActive) SSH Targets Workers\"\n            $ObjectCounts.SshWorkers += $workerPoolSummary.MachineEndpointSummaries.Ssh\n        }\n    }\n}\n\nWrite-Host \"Calculating Windows and Linux Machine Count\"\n$ObjectCounts.WindowsLinuxMachineCount = $ObjectCounts.ActivePollingTentacleTargets + $ObjectCounts.ActiveListeningTentacleTargets + $ObjectCounts.ActiveSshTargets\n\nif ($hasLicenseSummary -eq $false)\n{\n    $ObjectCounts.LicensedTargetCount = $ObjectCounts.TargetCount - $ObjectCounts.ActiveCloudRegions - $ObjectCounts.DisabledTargets    \n}\n\n# Get node information\n$nodeInfo = Invoke-OctopusApi -endPoint \"octopusservernodes\" -octopusUrl $OctopusDeployUrl -spaceId $null -apiKey $OctopusDeployApiKey\n      \n$text = @\"\nThe item counts are as follows:\n`tInstance ID: $($apiInformation.InstallationId)\n`tServer Version: $($apiInformation.Version)\n`tNumber of Server Nodes: $($nodeInfo.TotalResults)\n`tEntitlement Usage\n$(if ($isPtm) {\n\"`t`tLicensed Project Count: $($ObjectCounts.LicensedProjectCount) $($ObjectCounts.LicensedProjectEntitlement)\n`t`tLicensed Tenant Count: $($ObjectCounts.LicensedTenantCount) $($ObjectCounts.LicensedTenantEntitlement)\n`t`tLicensed Machine Count: $($ObjectCounts.LicensedMachineCount) $($ObjectCounts.LicensedMachineEntitlement)\"\n} else {\n\"`t`tLicensed Target Count: $($ObjectCounts.LicensedTargetCount) $($ObjectCounts.LicensedTargetEntitlement)\"\n})\n`t`tLicensed User Count: $($ObjectCounts.LicensedUserCount) $($ObjectCounts.LicensedUserEntitlement)\n`t`tLicensed Worker Count: $($ObjectCounts.LicensedWorkerCount) $($ObjectCounts.LicensedWorkerEntitlement)\n`tProject Count: $($ObjectCounts.TotalProjectCount)\n`t`tActive Project Count (Counted against entitlements for all licenses): $($ObjectCounts.ActiveProjectCount)\n`t`tDisabled Project Count (Counted against entitlements for free licenses): $($ObjectCounts.DisabledProjectCount)\n`tTenant Count: $($ObjectCounts.TotalTenantCount)\n`t`tActive Tenant Count (Counted against entitlements for all licenses): $($ObjectCounts.ActiveTenantCount)\n`t`tDisabled Tenant Count (Counted against entitlements for free licenses): $($ObjectCounts.DisabledTenantCount)\n`tMachine Counts (Active Linux and Windows Tentacles and SSH Connections): $($ObjectCounts.WindowsLinuxMachineCount)\n`tDeployment Target Count: $($ObjectCounts.TargetCount)\n`t`tActive and Available Targets: $($ObjectCounts.ActiveTargetCount)\n`t`tActive but Unavailable Targets: $($ObjectCounts.UnavailableTargetCount)\n`t`tActive Target Breakdown\n`t`t`tListening Tentacle Target Count: $($ObjectCounts.ActiveListeningTentacleTargets)\n`t`t`tPolling Tentacle Target Count: $($ObjectCounts.ActivePollingTentacleTargets)\n`t`t`tSSH Target Count: $($ObjectCounts.ActiveSshTargets)\n`t`t`tKubernetes Target Count: $($ObjectCounts.ActiveKubernetesCount)\n`t`t`tAzure Web App Target Count: $($ObjectCounts.ActiveAzureWebAppCount)\n`t`t`tAzure Service Fabric Cluster Target Count: $($ObjectCounts.ActiveAzureServiceFabricCount)\n`t`t`tAzure (Legacy) Cloud Service Target Count: $($ObjectCounts.ActiveAzureCloudServiceCount)\n`t`t`tAWS ECS Cluster Target Count: $($ObjectCounts.ActiveECSClusterCount)\n`t`t`tOffline Target Count: $($ObjectCounts.ActiveOfflineDropCount)\n`t`t`tCloud Region Target Count: $($ObjectCounts.ActiveCloudRegions)\n`t`t`tFtp Target Count: $($ObjectCounts.ActiveFtpTargets)\n`t`tDisabled Targets Targets: $($ObjectCounts.DisabledTargets)\n`t`tDisabled Target Breakdown\n`t`t`tListening Tentacle Target Count: $($ObjectCounts.DisabledListeningTentacleTargets)\n`t`t`tPolling Tentacle Target Count: $($ObjectCounts.DisabledPollingTentacleTargets)\n`t`t`tSSH Target Count: $($ObjectCounts.DisabledSshTargets)\n`t`t`tKubernetes Target Count: $($ObjectCounts.DisabledKubernetesCount)\n`t`t`tAzure Web App Target Count: $($ObjectCounts.DisabledAzureWebAppCount)\n`t`t`tAzure Service Fabric Cluster Target Count: $($ObjectCounts.DisabledAzureServiceFabricCount)\n`t`t`tAzure (Legacy) Cloud Service Target Count: $($ObjectCounts.DisabledAzureCloudServiceCount)\n`t`t`tAWS ECS Cluster Target Count: $($ObjectCounts.DisabledECSClusterCount)\n`t`t`tOffline Target Count: $($ObjectCounts.DisabledOfflineDropCount)\n`t`t`tCloud Region Target Count: $($ObjectCounts.DisabledCloudRegions)\n`t`t`tFtp Target Count: $($ObjectCounts.DisabledFtpTargets)\n`tWorker Count: $($ObjectCounts.WorkerCount)\n`t`tActive Workers: $($ObjectCounts.ActiveWorkerCount)\n`t`tUnavailable Workers: $($ObjectCounts.UnavailableWorkerCount)\n`t`tWorker Breakdown\n`t`t`tListening Tentacle Target Count: $($ObjectCounts.ListeningTentacleWorkers)\n`t`t`tPolling Tentacle Target Count: $($ObjectCounts.PollingTentacleWorkers)\n`t`t`tSSH Target Count: $($ObjectCounts.SshWorkers)\n\"@\n\nWrite-Host $text\n$text > octopus-usage.txt\nNew-OctopusArtifact \"$($PWD)/octopus-usage.txt\""
-  },
-  "Parameters": [
-    {
-      "Id": "afe5d565-c87a-481d-a9d1-005a32763b9e",
-      "Name": "GetUsage.Octopus.ServerUri",
-      "Label": "Octopus Server URI",
-      "HelpText": "The URI of the Octopus Server. For use on the same server, #{Octopus.Web.ServerUri} will work.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "51bfc97d-d174-452d-a852-0e120cc4cba8",
-      "Name": "GetUsage.Octopus.ApiKey",
-      "Label": "Octopus Server API Key",
-      "HelpText": "The API key with read permissions to all spaces in the instance being inspected.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-08-26T10:35:22.719Z",
-    "OctopusVersion": "2025.3.9781",
-    "Type": "ActionTemplate"
-  },
-  "Author": "ryanrousseau",
-  "LastModifiedBy": "harrisonmeister",
-  "Category": "Octopus"
-}
diff --git a/step-templates/octopus-import-certificate.json b/step-templates/octopus-import-certificate.json
deleted file mode 100644
index 3303188a7..000000000
--- a/step-templates/octopus-import-certificate.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  "Id": "3b1f6c62-c2cb-480b-9b14-435686b9f2cc",
-  "Name": "Octopus - Import Certificate",
-  "Description": "Create or replace an [Octopus Certificate](https://octopus.com/docs/deploying-applications/certificates) from a certificate file",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "\n\n<#\n ----- Octopus - Import Certificate ----- \n    Paul Marston @paulmarsy (paul@marston.me)\nLinks\n    https://github.com/OctopusDeploy/Library/commits/master/step-templates/octopus-import-certificate.json\n#>\n\n$securityProtocol = [Net.SecurityProtocolType]::Tls -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls12\n[Net.ServicePointManager]::SecurityProtocol = $securityProtocol\n\n$ErrorActionPreference = 'Stop'\n\n$StepTemplate_BaseUrl = $StepTemplate_OctopusUrl.Trim('/')\n\nif ([string]::IsNullOrWhiteSpace($StepTemplate_ApiKey)) {\n    throw \"The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again.\"\n}\nfilter Out-Verbose {\n    Write-Verbose ($_ | Out-String)\n}\nfilter Out-Indented {\n    $_ | Out-String | % Trim | % Split \"`n\" | % { \"`t$_\" }  \n}\nfunction Invoke-OctopusApi {\n    param(\n        [Parameter(Position = 0, Mandatory)]$Uri,\n        [ValidateSet(\"Get\", \"Post\")]$Method = 'Get',\n        $Body\n    )\n    $requestParameters = @{\n        Uri = ('{0}/{1}' -f $StepTemplate_BaseUrl, $Uri.TrimStart('/'))\n        Method = $Method\n        Headers = @{ \"X-Octopus-ApiKey\" = $StepTemplate_ApiKey }\n        UseBasicParsing = $true\n    }\n    Write-Verbose \"$($Method.ToUpperInvariant()) $($requestParameters.Uri)\"   \n    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }\n    try {\n        Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json | Write-Output\n    }\n    catch [System.Net.WebException] {\n        if ($_.Exception.Response) {\n            $errorResponse = [System.IO.StreamReader]::new($_.Exception.Response.GetResponseStream()).ReadToEnd()\n            throw (\"$($_.Exception.Message)`n{0}\" -f $errorResponse)\n        }\n        \n        if ($_.Exception.Message) {\n        \t$message = $_.Exception.Message\n        \tWrite-Highlight $message\n            throw \"$message\"\n        }\n    }\n}\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-OctopusApi 'api/';\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nfunction Get-OctopusItems\n{\n\t# Define parameters\n    param(\n    \t$OctopusUri,\n        $ApiKey,\n        $SkipCount = 0\n    )\n    \n    # Define working variables\n    $items = @()\n    $skipQueryString = \"\"\n    $headers = @{\"X-Octopus-ApiKey\"=\"$ApiKey\"}\n\n    # Check to see if there there is already a querystring\n    if ($octopusUri.Contains(\"?\"))\n    {\n        $skipQueryString = \"&skip=\"\n    }\n    else\n    {\n        $skipQueryString = \"?skip=\"\n    }\n\n    $skipQueryString += $SkipCount\n    \n    # Get intial set\n    $resultSet = Invoke-RestMethod -Uri \"$($OctopusUri)$skipQueryString\" -Method GET -Headers $headers\n\n    # Check to see if it returned an item collection\n    if ($resultSet.Items)\n    {\n        # Store call results\n        $items += $resultSet.Items\n    \n        # Check to see if resultset is bigger than page amount\n        if (($resultSet.Items.Count -gt 0) -and ($resultSet.Items.Count -eq $resultSet.ItemsPerPage))\n        {\n            # Increment skip count\n            $SkipCount += $resultSet.ItemsPerPage\n\n            # Recurse\n            $items += Get-OctopusItems -OctopusUri $OctopusUri -ApiKey $ApiKey -SkipCount $SkipCount\n        }\n    }\n    else\n    {\n        return $resultSet\n    }\n    \n\n    # Return results\n    return $items\n}\n\nfunction Get-OctopusIds \n{\n\t# Define parameters\n    param (\n    \t$OctopusCollection,\n        $NamesArray\n    )\n    \n    $returnList = @()\n    \n    foreach ($item in $NamesArray)\n    {\n    \t# Trim item\n        $item = $item.Trim()\n        \n        # Compare\n        $octopusItem = $OctopusCollection | Where-Object {$_.Name -eq $item}\n        \n        if ($null -ne $octopusItem)\n        {\n        \t# Add to array\n            $returnList += $item.Id\n        }\n    }\n    \n    # Return list\n    return $returnList\n}\n\nif(Test-SpacesApi) {\n\t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n    }\n\t$baseApiUrl = \"/api/$spaceId\" ;\n} else {\n\t$baseApiUrl = \"/api\" ;\n}\n\n# Get all environments\nWrite-Host \"Getting list of Environments ...$($StepTemplate_BaseUrl)$($baseApiUrl)/environments\"\n$environmentList = Get-OctopusItems -OctopusUri \"$($StepTemplate_BaseUrl)$($baseApiUrl)/environments\" -ApiKey $StepTemplate_ApiKey\n$environmentIds = Get-OctopusIds -OctopusCollection $environmentList -NamesArray $StepTemplate_Environments.Split(\",\")\n\n# Get tenants\nWrite-Host \"Getting list of Tenants ...\"\n$tenantList = Get-OctopusItems -OctopusUri \"$($StepTemplate_BaseUrl)$($baseApiUrl)/tenants\" -ApiKey $StepTemplate_ApiKey\n$tenantIds = Get-OctopusIds -OctopusCollection $tenantList -NamesArray $StepTemplate_Tenants.Split(\",\")\n\n# Get tenant tags\nWrite-Host \"Getting list of Tenant Tags ...\"\n$tenantTagList = Get-OctopusItems -OctopusUri \"$($StepTemplate_BaseUrl)$($baseApiUrl)/tagsets\" -ApiKey $StepTemplate_ApiKey\n$tenantTagIds = Get-OctopusIds -OctopusCollection $tenantTagList -NamesArray $StepTemplate_TenantTags.Split(\",\")\n\n$certificate = switch ($StepTemplate_CertEncoding) {\n    'file' {   \n        if (!(Test-Path $StepTemplate_Certificate)) {\n            throw \"Certificate file $StepTemplate_Certificate does not exist\"\n        }\n        $certificateBytes = Get-Content -Path $StepTemplate_Certificate -Encoding Byte\n        [System.Convert]::ToBase64String($certificateBytes)\n    }\n    'base64' {\n        $StepTemplate_Certificate\n    }\n}\n\n$existingCert = Invoke-OctopusApi \"$baseApiUrl/certificates\" | % Items | ? Name -eq $StepTemplate_CertificateName\nif ($existingCert) {\n    Write-Host 'Existing certificate will be archived & replaced...'\n    Invoke-OctopusApi (\"$baseApiUrl/certificates/{0}/replace\" -f $existingCert.Id) -Method Post -Body @{\n        certificateData = $certificate\n        password = $StepTemplate_Password\n    } | % {\n        $_.CertificateData = $null\n        $_.Password = $null\n        $_\n    } | Out-Verbose\n} else {\n    Write-Host 'Creating & importing new certificate...'\n    Invoke-OctopusApi \"$baseApiUrl/certificates\" -Method Post -Body @{\n        Name = $StepTemplate_CertificateName\n        CertificateData = @{\n            HasValue = $true\n            NewValue = $certificate\n        }\n        Password = @{\n            HasValue = $true\n            NewValue = $StepTemplate_Password\n        }\n        TenantedDeploymentParticipation = $StepTemplate_TenantParticipation\n        EnvironmentIds = $environmentIds\n        TenantIds = $tenantIds\n        TenantTags = $tenantTagIds\n    } | Out-Verbose\n}\nWrite-Host 'Certificate has been imported:'\nInvoke-OctopusApi \"$baseApiUrl/certificates\" | % Items | ? Name -eq $StepTemplate_CertificateName | Out-Indented",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "6a723531-1272-4c7f-ae04-9576051396ad",
-      "Name": "StepTemplate_OctopusUrl",
-      "Label": "Octopus Url",
-      "HelpText": "Provide the URL of your Octopus Server. The default is `#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}`. Cloud instances should use `Octopus.Web.ServerUri`. See [System Variables - Server](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server) for more info.",
-      "DefaultValue": "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9a84f62c-99f7-4349-bf6d-f42397f4de73",
-      "Name": "StepTemplate_ApiKey",
-      "Label": "API Key",
-      "HelpText": "Provide an Octopus API Key with appropriate permissions to save the certificate.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4fcb5ddf-14a9-42b1-8e77-d8d68e69b2fe",
-      "Name": "StepTemplate_CertificateName",
-      "Label": "Certificate Name",
-      "HelpText": "A short, memorable, unique name for this certificate.\n\nIf the certificate already exists it [will be replaced](https://octopus.com/docs/deployments/certificates/replace-certificate).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "0664b204-c11e-47d1-b388-58ef0b0a7b1a",
-      "Name": "StepTemplate_CertEncoding",
-      "Label": "Certificate Encoding",
-      "HelpText": "Defines the format of the **Certificate** parameter.",
-      "DefaultValue": "file",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "file|File Path\nbase64|Base64 Encoded String"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "df336e72-328a-4bad-92b1-374155ec3fb4",
-      "Name": "StepTemplate_Certificate",
-      "Label": "Certificate",
-      "HelpText": "The certificate to import into Octopus, either as a **File Path** to the certificate, or as a **Base64 Encoded String** representation depending on the _Certificate Encoding_ chosen.\n\nSupported formats: [PFX (PKCS #12), DER, PEM](https://octopus.com/docs/deployments/certificates)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b875e962-5edc-44e8-be03-51f8a87eca5d",
-      "Name": "StepTemplate_Password",
-      "Label": "Password",
-      "HelpText": "The password protecting the certificate (if required).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9d87e43f-d17a-40ea-affc-a3755f1cc16a",
-      "Name": "StepTemplate_Environments",
-      "Label": "Environments",
-      "HelpText": "Comma-delimited list of environments to restrict certificate to.  A blank value will not restrict the certificate.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "014474f8-d7a2-4d67-b57f-364ba723ece2",
-      "Name": "StepTemplate_TenantParticipation",
-      "Label": "Tenant Participation",
-      "HelpText": "Select the tenant participation level.",
-      "DefaultValue": "untenanted",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "untenanted|Untenanted\ntenanted|Tenanted\ntenantedoruntenanted|Tenanted or untenanted"
-      }
-    },
-    {
-      "Id": "bf9a1f70-0c67-4070-b4ff-e38f159ff701",
-      "Name": "StepTemplate_Tenants",
-      "Label": "Tenants",
-      "HelpText": "Comma-delimited list of tenants that can use this certificate.  Used with `Tenant Participation` values of `Tenanted` or `Tenanted or untenanted`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e041fbd8-66da-4b6a-ae3e-90d20f110a48",
-      "Name": "StepTemplate_TenantTags",
-      "Label": "Tenant Tags",
-      "HelpText": "Comma-delimited list of tenant tags to apply to the certificate.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2022-11-14T23:22:38.482Z",
-    "OctopusVersion": "2022.4.8111",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus",
-  "Author": "paulmarsy"
-}
diff --git a/step-templates/octopus-merge-cac-updates.json b/step-templates/octopus-merge-cac-updates.json
deleted file mode 100644
index 72f8f5ab2..000000000
--- a/step-templates/octopus-merge-cac-updates.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "Id": "c2536053-024f-499e-bf14-7e55c5a675d0",
-  "Name": "Octopus - Merge CaC Updates (S3 Backend)",
-  "Description": "This step queries each workspace in the Terraform state for downstream Octopus CaC enabled projects, extracts the Git repo associated with the CaC project, and merges any changes so long as there are no merge conflicts.\n\nIf there is a merge conflict between the upstream and downstream repos, instructions for manually resolving the conflict are provided.",
-  "ActionType": "Octopus.AwsRunScript",
-  "Version": 4,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Aws.AssumeRole": "False",
-    "Octopus.Action.AwsAccount.UseInstanceRole": "False",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptBody": "# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n    Write-Host \"Determining Operating System...\"\n    $IsWindows = ([System.Environment]::OSVersion.Platform -eq \"Win32NT\")\n    $IsLinux = ([System.Environment]::OSVersion.Platform -eq \"Unix\")\n}\n\nFunction Get-GitExecutable\n{\n    # Define parameters\n    param (\n        $WorkingDirectory\n    )\n\n    # Define variables\n    $gitExe = \"PortableGit-2.41.0.3-64-bit.7z.exe\"\n    $gitDownloadUrl = \"https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/$gitExe\"\n    $gitDownloadArguments = @{ }\n    $gitDownloadArguments.Add(\"Uri\", $gitDownloadUrl)\n    $gitDownloadArguments.Add(\"OutFile\", \"$WorkingDirectory/git/$gitExe\")\n\n    # This makes downloading faster\n    $ProgressPreference = 'SilentlyContinue'\n\n    # Check to see if git subfolder exists\n    if ((Test-Path -Path \"$WorkingDirectory/git\") -eq $false)\n    {\n        # Create subfolder\n        New-Item -Path \"$WorkingDirectory/git\"  -ItemType Directory | Out-Null\n    }\n\n    # Check PowerShell version\n    if ($PSVersionTable.PSVersion.Major -lt 6)\n    {\n        # Use basic parsing is required\n        $gitDownloadArguments.Add(\"UseBasicParsing\", $true)\n    }\n\n    # Download Git\n    Write-Host \"Downloading Git ...\"\n    Invoke-WebRequest @gitDownloadArguments\n\n    # Extract Git\n    $gitExtractArguments = @()\n    $gitExtractArguments += \"-o\"\n    $gitExtractArguments += \"$WorkingDirectory\\git\"\n    $gitExtractArguments += \"-y\"\n    $gitExtractArguments += \"-bd\"\n\n    Write-Host \"Extracting Git download ...\"\n    & \"$WorkingDirectory\\git\\$gitExe\" $gitExtractArguments\n\n    # Wait until unzip action is complete\n    while ($null -ne (Get-Process | Where-Object { $_.ProcessName -eq ($gitExe.Substring(0,$gitExe.LastIndexOf(\".\"))) }))\n    {\n        Start-Sleep 5\n    }\n\n    # Add bin folder to path\n    $env:PATH = \"$WorkingDirectory\\git\\bin$( [IO.Path]::PathSeparator )\" + $env:PATH\n\n    # Disable promopt for credential helper\n    Invoke-CustomCommand \"git\" @(\"config\", \"--system\", \"--unset\", \"credential.helper\") | Write-Results\n}\n\nFunction Invoke-CustomCommand\n{\n    Param (\n        $commandPath,\n        $commandArguments,\n        $workingDir = (Get-Location),\n        $path = @(),\n        $envVars = @{ }\n    )\n\n    $path += $env:PATH\n    $newPath = $path -join [IO.Path]::PathSeparator\n\n    $pinfo = New-Object System.Diagnostics.ProcessStartInfo\n    $pinfo.FileName = $commandPath\n    $pinfo.WorkingDirectory = $workingDir\n    $pinfo.RedirectStandardError = $true\n    $pinfo.RedirectStandardOutput = $true\n    $pinfo.UseShellExecute = $false\n    $pinfo.Arguments = $commandArguments\n    $pinfo.EnvironmentVariables[\"PATH\"] = $newPath\n\n    foreach ($env in $envVars.Keys)\n    {\n        Write-Verbose \"Setting $env to $( $envVars.$env )\"\n        $pinfo.EnvironmentVariables.Add($env,$envVars.$env.ToString())\n    }\n\n    $p = New-Object System.Diagnostics.Process\n    $p.StartInfo = $pinfo\n    $p.Start() | Out-Null\n\n    # Capture output during process execution so we don't hang\n    # if there is too much output.\n    # Microsoft documents a C# solution here:\n    # https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.processstartinfo.redirectstandardoutput?view=net-7.0&redirectedfrom=MSDN#remarks\n    # This code is based on https://stackoverflow.com/a/74748844\n    $stdOut = [System.Text.StringBuilder]::new()\n    $stdErr = [System.Text.StringBuilder]::new()\n    do\n    {\n        if (!$p.StandardOutput.EndOfStream)\n        {\n            $stdOut.AppendLine($p.StandardOutput.ReadLine())\n        }\n        if (!$p.StandardError.EndOfStream)\n        {\n            $stdErr.AppendLine($p.StandardError.ReadLine())\n        }\n\n        Start-Sleep -Milliseconds 10\n    }\n    while (-not $p.HasExited)\n\n    # Capture any standard output generated between our last poll and process end.\n    while (!$p.StandardOutput.EndOfStream)\n    {\n        $stdOut.AppendLine($p.StandardOutput.ReadLine())\n    }\n\n    # Capture any error output generated between our last poll and process end.\n    while (!$p.StandardError.EndOfStream)\n    {\n        $stdErr.AppendLine($p.StandardError.ReadLine())\n    }\n\n    $p.WaitForExit()\n\n    $executionResults = [pscustomobject]@{\n        StdOut = $stdOut.ToString()\n        StdErr = $stdErr.ToString()\n        ExitCode = $p.ExitCode\n    }\n\n    return $executionResults\n\n}\n\nfunction Write-Results\n{\n    [cmdletbinding()]\n    param (\n        [Parameter(Mandatory = $True, ValuefromPipeline = $True)]\n        $results\n    )\n\n    if (![String]::IsNullOrWhiteSpace($results.StdOut))\n    {\n        Write-Verbose $results.StdOut\n    }\n\n    if (![String]::IsNullOrWhiteSpace($results.StdErr))\n    {\n        Write-Verbose $results.StdErr\n    }\n}\n\nfunction Format-StringAsNullOrTrimmed {\n    [cmdletbinding()]\n    param (\n        [Parameter(ValuefromPipeline=$True)]\n        $input\n    )\n\n    if ([string]::IsNullOrWhitespace($input)) {\n        return $null\n    }\n\n    return $input.Trim()\n}\n\nfunction Write-TerraformBackend\n{\n    Set-Content -Path 'backend.tf' -Value @\"\nterraform {\n        backend \"s3\" {}\n        required_providers {\n          octopusdeploy = { source = \"OctopusDeployLabs/octopusdeploy\", version = \">= 0.21.1\" }\n        }\n    }\n\"@\n}\n\nfunction Set-GitContactDetails\n{\n    $gitEmail = Invoke-CustomCommand \"git\" @(\"config\", \"--global\", \"user.email\", \"octopus@octopus.com\")\n    Write-Results $gitEmail\n    if (-not $gitEmail.ExitCode -eq 0)\n    {\n        Write-Error \"Failed to set the git email address (exit code was $( $gitEmail.ExitCode )).\"\n    }\n\n    $gitUser = Invoke-CustomCommand \"git\" @(\"config\", \"--global\", \"user.name\", \"Octopus Server\")\n    Write-Results $gitUser\n    if (-not $gitUser.ExitCode -eq 0)\n    {\n        Write-Error \"Failed to set the git name (exit code was $( $gitUser.ExitCode )).\"\n    }\n}\n\n$spaceFilter = if (-not [string]::IsNullOrWhitespace($OctopusParameters[\"FindConflicts.Octopus.Spaces\"]))\n{\n    $OctopusParameters[\"FindConflicts.Octopus.Spaces\"].Split(\"`n\")\n}\nelse\n{\n    @()\n}\n$projectFilter = if (-not [string]::IsNullOrWhitespace($OctopusParameters[\"FindConflicts.Octopus.Projects\"]))\n{\n    $OctopusParameters[\"FindConflicts.Octopus.Projects\"].Split(\"`n\")\n}\nelse\n{\n    @()\n}\n$username = $OctopusParameters[\"FindConflicts.Git.Credentials.Username\"]\n$password = $OctopusParameters[\"FindConflicts.Git.Credentials.Password\"]\n$protocol = $OctopusParameters[\"FindConflicts.Git.Url.Protocol\"]\n$gitHost = $OctopusParameters[\"FindConflicts.Git.Url.Host\"]\n$org = $OctopusParameters[\"FindConflicts.Git.Url.Organization\"]\n$repo = $OctopusParameters[\"FindConflicts.Git.Url.Template\"]\n$region = $OctopusParameters[\"FindConflicts.Terraform.Backend.S3Region\"]\n$key = $OctopusParameters[\"FindConflicts.Terraform.Backend.S3Key\"]\n$bucket = $OctopusParameters[\"FindConflicts.Terraform.Backend.S3Bucket\"]\n\nif ([string]::IsNullOrWhitespace($username))\n{\n    Write-Error \"The FindConflicts.Git.Credentials.Username variable must be provided\"\n}\n\nif ([string]::IsNullOrWhitespace($password))\n{\n    Write-Error \"The FindConflicts.Git.Credentials.Password variable must be provided\"\n}\n\nif ( [string]::IsNullOrWhitespace($protocol))\n{\n    Write-Error \"The FindConflicts.Git.Url.Protocol variable must be defined.\"\n}\n\nif ( [string]::IsNullOrWhitespace($gitHost))\n{\n    Write-Error \"The FindConflicts.Git.Url.Host variable must be defined.\"\n}\n\nif ( [string]::IsNullOrWhitespace($repo))\n{\n    Write-Error \"The FindConflicts.Git.Url.Template variable must be defined.\"\n}\n\nif ( [string]::IsNullOrWhitespace($region))\n{\n    Write-Error \"The FindConflicts.Terraform.Backend.S3Region variable must be defined.\"\n}\n\nif ( [string]::IsNullOrWhitespace($key))\n{\n    Write-Error \"The FindConflicts.Terraform.Backend.S3Key variable must be defined.\"\n}\n\nif ( [string]::IsNullOrWhitespace($bucket))\n{\n    Write-Error \"The FindConflicts.Terraform.Backend.S3Bucket variable must be defined.\"\n}\n\n$templateRepoUrl = $protocol + \"://\" + $gitHost + \"/\" + $org + \"/\" + $repo + \".git\"\n$templateRepo = $protocol + \"://\" + $username + \":\" + $password + \"@\" + $gitHost + \"/\" + $org + \"/\" + $repo + \".git\"\n$branch = \"main\"\n\n# Check to see if it's Windows\nif ($IsWindows -and $OctopusParameters['Octopus.Workerpool.Name'] -eq \"Hosted Windows\")\n{\n    # Dynamic worker don't have git, download portable version and add to path for execution\n    Write-Host \"Detected usage of Windows Dynamic Worker ...\"\n    Get-GitExecutable -WorkingDirectory $PWD\n}\n\nWrite-TerraformBackend\nSet-GitContactDetails\n\nInvoke-CustomCommand \"terraform\" @(\"init\", \"-no-color\", \"-backend-config=`\"bucket=$bucket`\"\", \"-backend-config=`\"region=$region`\"\", \"-backend-config=`\"key=$key`\"\") | Write-Results\n\nWrite-Host \"Verbose logs contain instructions for resolving merge conflicts.\"\n\n$workspaces = Invoke-CustomCommand \"terraform\" @(\"workspace\", \"list\")\n\nWrite-Results $workspaces\n\n$parsedWorkspaces = $workspaces.StdOut.Replace(\"*\", \"\").Split(\"`n\")\n\nforeach ($workspace in $parsedWorkspaces)\n{\n    $trimmedWorkspace = $workspace | Format-StringAsNullOrTrimmed\n\n    if ($trimmedWorkspace -eq \"default\" -or [string]::IsNullOrWhitespace($trimmedWorkspace))\n    {\n        continue\n    }\n\n    Write-Verbose \"Processing workspace $trimmedWorkspace\"\n\n    Invoke-CustomCommand \"terraform\" @(\"workspace\", \"select\", $trimmedWorkspace) | Write-Results\n\n    $state = Invoke-CustomCommand \"terraform\" @(\"show\", \"-json\")\n\n    # state might include sensitive values, so don't print it unless there was an error\n\n    if (-not $state.ExitCode -eq 0)\n    {\n        Write-Results $state\n        continue\n    }\n\n    $parsedState = $state.StdOut | ConvertFrom-Json\n\n    $resources = $parsedState.values.root_module.resources | Where-Object {\n        $_.type -eq \"octopusdeploy_project\"\n    }\n\n    # The outputs allow us to contact the downstream instance)\n    $spaceName = (Invoke-CustomCommand \"terraform\" @(\"output\", \"-raw\", \"octopus_space_name\")).StdOut | Format-StringAsNullOrTrimmed\n\n    foreach ($resource in $resources)\n    {\n        $url = $resource.values.git_library_persistence_settings.url | Format-StringAsNullOrTrimmed\n        $name = $resource.values.name | Format-StringAsNullOrTrimmed\n\n        # Optional filtering\n        if (-not($spaceFilter.Count -eq 0 -or $spaceFilter.Contains($spaceName)))\n        {\n            continue\n        }\n\n        if (-not($projectFilter.Count -eq 0 -or $projectFilter.Contains($name)))\n        {\n            continue\n        }\n\n        if (-not [string]::IsNullOrWhitespace($url))\n        {\n            mkdir $trimmedWorkspace | Out-Null\n\n            $parsedUrl = [System.Uri]$url\n            $urlWithCreds = $parsedUrl.Scheme + \"://\" + $username + \":\" + $password + \"@\" + $parsedUrl.Host + \":\" + $parsedUrl.Port + $parsedUrl.AbsolutePath\n\n            Write-Verbose \"Cloning repo\"\n            $cloneRepo = Invoke-CustomCommand \"git\" @(\"clone\", $urlWithCreds, $trimmedWorkspace)\n            Write-Results $cloneRepo\n            if (-not $cloneRepo.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to clone repo (exit code was $( $cloneRepo.ExitCode )).\"\n            }\n\n            Write-Verbose \"Cloning upstream remote\"\n            $addRemote = Invoke-CustomCommand \"git\" @(\"remote\", 'add', 'upstream', $templateRepo) $trimmedWorkspace\n            Write-Results $addRemote\n            if (-not $addRemote.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to clone repo (exit code was $( $addRemote.ExitCode )).\"\n            }\n\n            Write-Verbose \"Fetching all\"\n            $fetchAll = Invoke-CustomCommand \"git\" @(\"fetch\", \"--all\") $trimmedWorkspace\n            Write-Results $fetchAll\n            if (-not $fetchAll.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to fetch all (exit code was $( $fetchAll.ExitCode )).\"\n            }\n\n            Write-Verbose \"Checking out upstream-$branch upstream/$branch\"\n            $checkoutUpstream = Invoke-CustomCommand \"git\" @(\"checkout\", \"-b\", \"upstream-$branch\", \"upstream/$branch\") $trimmedWorkspace\n            Write-Results $checkoutUpstream\n            if (-not $checkoutUpstream.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to checkout upstream (exit code was $( $checkoutUpstream.ExitCode )).\"\n            }\n\n            if (-not($branch -eq \"master\" -or $branch -eq \"main\"))\n            {\n                Write-Verbose \"Checking out $branch origin/$branch\"\n                $checkoutDownstream = Invoke-CustomCommand \"git\" @(\"checkout\", \"-b\", $branch, \"origin/$branch\") $trimmedWorkspace\n            }\n            else\n            {\n                Write-Verbose \"Checking out $branch\"\n                $checkoutDownstream = Invoke-CustomCommand \"git\" @(\"checkout\", $branch) $trimmedWorkspace\n            }\n\n            Write-Results $checkoutDownstream\n            if (-not $checkoutDownstream.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to checkout downstream (exit code was $( $checkoutDownstream.ExitCode )).\"\n            }\n\n            Write-Verbose \"Merge base\"\n            $mergeBase = Invoke-CustomCommand \"git\" @(\"merge-base\", $branch, \"upstream-$branch\") $trimmedWorkspace\n            Write-Results $mergeBase\n            if (-not $mergeBase.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to merge base (exit code was $( $mergeBase.ExitCode )).\"\n            }\n\n            Write-Verbose \"Rev parse\"\n            $mergeSourceCurrentCommit = Invoke-CustomCommand \"git\" @(\"rev-parse\", \"upstream-$branch\") $trimmedWorkspace\n            Write-Results $mergeSourceCurrentCommit\n            if (-not $mergeSourceCurrentCommit.ExitCode -eq 0)\n            {\n                Write-Error \"Failed to rev parse (exit code was $( $mergeSourceCurrentCommit.ExitCode )).\"\n            }\n\n            Write-Verbose \"Merge (no commit)\"\n            $mergeResult = Invoke-CustomCommand \"git\" @(\"merge\", \"--no-commit\", \"--no-ff\", \"upstream-$branch\") $trimmedWorkspace\n            Write-Results $mergeResult\n\n            if ($mergeBase.StdOut -eq $mergeSourceCurrentCommit.StdOut)\n            {\n                Write-Host \"No changes found in the upstream repo $templateRepoUrl that do not exist in the downstream repo $url for project `\"$name`\" in space $spaceName\"\n            }\n            elseif (-not $mergeResult.ExitCode -eq 0)\n            {\n                Write-Warning \"Changes between upstream repo $templateRepoUrl conflict with changes in downstream repo $url for project `\"$name`\" in space $spaceName.\"\n                Write-Verbose \"To resolve the conflicts, run the following commands:\"\n                Write-Verbose \"mkdir cac\"\n                Write-Verbose \"cd cac\"\n                Write-Verbose \"git clone $url .\"\n                Write-Verbose \"git remote add upstream $templateRepoUrl\"\n                Write-Verbose \"git fetch --all\"\n                Write-Verbose \"git checkout -b upstream-$branch upstream/$branch\"\n                if (-not($branch -eq \"master\" -or $branch -eq \"main\"))\n                {\n                    Write-Verbose \"git checkout -b $branch origin/$branch\"\n                }\n                else\n                {\n                    Write-Verbose \"git checkout $branch\"\n                    Write-Verbose \"git merge-base $branch upstream-$branch\"\n                    Write-Verbose \"git merge --no-commit --no-ff upstream-$branch\"\n                }\n            }\n            else\n            {\n                # https://stackoverflow.com/a/76272919\n                # How to commit a merge non-interactively\n                Write-Verbose \"Git commit\"\n                $mergeContinue = Invoke-CustomCommand \"git\" @(\"commit\", \"--no-edit\") $trimmedWorkspace\n                Write-Results $mergeContinue\n                if (-not $mergeContinue.ExitCode -eq 0)\n                {\n                    Write-Error \"Failed to merge continue (exit code was $( $mergeContinue.ExitCode )).\"\n                }\n\n                $diffResult = Invoke-CustomCommand \"git\" @(\"diff\", \"--quiet\", \"--exit-code\", \"@{upstream}\") $trimmedWorkspace\n                Write-Results $diffResult\n\n                if (-not $diffResult.ExitCode -eq 0)\n                {\n                    $pushResult = Invoke-CustomCommand \"git\" @(\"push\", \"origin\") $trimmedWorkspace\n                    Write-Results $pushResult\n\n                    if ($pushResult.ExitCode -eq 0)\n                    {\n                        Write-Host \"Changes were merged between upstream repo $templateRepoUrl and downstream repo $url for project `\"$name`\" in space $spaceName.\"\n                    }\n                    else\n                    {\n                        Write-Warning \"Failed to push changes to downstream repo $url for project `\"$name`\" in space $spaceName (exit code $( $pushResult.ExitCode )).\"\n                    }\n                }\n                else\n                {\n                    Write-Host \"No changes found in the upstream repo $templateRepoUrl that do not exist in the downstream repo $url for project `\"$name`\" in space $spaceName\"\n                }\n            }\n        }\n        else\n        {\n            Write-Verbose \"`\"$name`\" is not a CaC project\"\n        }\n    }\n}",
-    "Octopus.Action.Aws.Region": "#{FindConflicts.Terraform.Backend.S3Region}",
-    "Octopus.Action.AwsAccount.Variable": "#{FindConflicts.Terraform.Aws.Account}"
-  },
-  "Parameters": [
-    {
-      "Id": "5abfbf98-22f0-47a2-8dd8-f16e2227d4ba",
-      "Name": "FindConflicts.Octopus.Spaces",
-      "Label": "Octopus Spaces",
-      "HelpText": "An optional newline-separated list of space names with projects to merge changes into. Leave this field blank to merge changes to projects in all spaces.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "56b85050-7c06-4a84-9565-88730a4859dc",
-      "Name": "FindConflicts.Octopus.Projects",
-      "Label": "Octopus Projects",
-      "HelpText": "A newline-separated list of projects to merge changes into. Leave this field blank to merge changes to all projects.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "539dc165-d880-4bf2-99c2-7024f36f7593",
-      "Name": "FindConflicts.Git.Credentials.Username",
-      "Label": "Git Username",
-      "HelpText": "The git repo username. When using GitHub with an access token, the value is `x-access-token`.",
-      "DefaultValue": "x-access-token",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7cf2352e-7381-485d-994c-ff128ee0fe8b",
-      "Name": "FindConflicts.Git.Credentials.Password",
-      "Label": "Git Password",
-      "HelpText": "The git repo password or access token.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "3887173c-a7f9-4311-848f-6f82736df2ce",
-      "Name": "FindConflicts.Git.Url.Protocol",
-      "Label": "Git Protocol",
-      "HelpText": "The git repo protocol.",
-      "DefaultValue": "https",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "https|HTTPS\nhttp|HTTP"
-      }
-    },
-    {
-      "Id": "0781245e-3f02-4d5b-a2ad-68c5f6270cb5",
-      "Name": "FindConflicts.Git.Url.Host",
-      "Label": "Git Hostname",
-      "HelpText": "The git repo host name.",
-      "DefaultValue": "github.com",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7891f539-752e-4933-abcc-68db8ba9d114",
-      "Name": "FindConflicts.Git.Url.Organization",
-      "Label": "Git Organization",
-      "HelpText": "The git repo owner or organization i.e. `owner` in the url `https://github.com/owner/repo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e5a6f5a3-fec6-47dd-ad46-82ed7df409f7",
-      "Name": "FindConflicts.Git.Url.Template",
-      "Label": "Git Template Repo",
-      "HelpText": "The repo holding the upstream, or template, CaC project i.e. `repo` in the url `https://github.com/owner/repo`.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d8abeacf-b392-4a9e-b95f-50d0d033819f",
-      "Name": "FindConflicts.Terraform.Backend.S3Region",
-      "Label": "AWS Region",
-      "HelpText": "The AWS region hosting the S3 bucket persisting the Terraform state.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c9f76f2e-9c8b-4af2-9768-6449526d52ca",
-      "Name": "FindConflicts.Terraform.Backend.S3Key",
-      "Label": "S3 Key",
-      "HelpText": "The name of the file in the S3 bucket hosting the Terraform state.",
-      "DefaultValue": "Project_#{Octopus.Project.Name | Replace \"[^A-Za-z0-9]\" \"_\"}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fa261df0-01dc-4310-ad1e-1b07c3145e41",
-      "Name": "FindConflicts.Terraform.Backend.S3Bucket",
-      "Label": "S3 Bucket",
-      "HelpText": "The name of the S3 bucket hosting the Terraform state.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "00d184f8-287f-46e4-8848-282138484cfa",
-      "Name": "FindConflicts.Terraform.Aws.Account",
-      "Label": "AWS Account",
-      "HelpText": "The AWS account used to access the S3 bucket.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AmazonWebServicesAccount"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AwsRunScript",
-  "$Meta": {
-    "ExportedAt": "2023-11-17T01:19:30.474Z",
-    "OctopusVersion": "2024.1.1838",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-octolint-a-space.json b/step-templates/octopus-octolint-a-space.json
deleted file mode 100644
index a5aab9892..000000000
--- a/step-templates/octopus-octolint-a-space.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "Id": "48e2b213-324a-43be-8fa1-f8e08a2bb547",
-    "Name": "Octolint a Space",
-    "Description": "Run the [octolint tool](https://github.com/OctopusSolutionsEngineering/OctopusRecommendationEngine) against a Space to get a usage recommendation report.\n\nThis step requires a worker or execution container that has docker installed.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "GitDependencies": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$server = $OctopusParameters[\"Octolint.Octopus.ServerUri\"]\n$apiKey = $OctopusParameters[\"Octolint.Octopus.ApiKey\"]\n$spaceName = $OctopusParameters[\"Octolint.Octopus.SpaceName\"]\n\ndocker pull octopussamples/octolint\ndocker run --rm octopussamples/octolint -url \"$server\" -apiKey \"$apiKey\" -space \"$spaceName\" -verboseErrors"
-    },
-    "Parameters": [
-      {
-        "Id": "5d03c192-1126-4912-986e-799098fcf4a7",
-        "Name": "Octolint.Octopus.ServerUri",
-        "Label": "Octopus Server URI",
-        "HelpText": "The URI of the Octopus Server. For use on the same server, #{Octopus.Web.ServerUri} will work.",
-        "DefaultValue": "#{Octopus.Web.ServerUri}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "58392cba-5d54-4ba1-9447-388b0bc439fb",
-        "Name": "Octolint.Octopus.ApiKey",
-        "Label": "Octopus Server API Key",
-        "HelpText": "The API key with [read permissions](https://github.com/OctopusSolutionsEngineering/OctopusRecommendationEngine#permissions) to the space being linted.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "b51e59f4-86ca-423d-87a0-f29faa1cd159",
-        "Name": "Octolint.Octopus.SpaceName",
-        "Label": "Octopus Space Name",
-        "HelpText": "The name of the Space being linted.",
-        "DefaultValue": "#{Octopus.Space.Name}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2024-01-12T16:25:50.307Z",
-      "OctopusVersion": "2024.1.6809",
-      "Type": "ActionTemplate"
-    },
-    "Author": "ryanrousseau",
-    "LastModifiedBy": "ryanrousseau",
-    "Category": "octopus"
-  }
diff --git a/step-templates/octopus-redeploy-previous-release.json b/step-templates/octopus-redeploy-previous-release.json
deleted file mode 100644
index c1ef4a23f..000000000
--- a/step-templates/octopus-redeploy-previous-release.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "829b2777-144c-498b-b6aa-2b387da76ead",
-  "Name": "Octopus - Re-deploy previous version",
-  "Description": "Re-deploy the previous version of a project.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Get-OctopusItems\n{\n\t# Define parameters\n    param(\n    \t$OctopusUri,\n        $ApiKey,\n        $SkipCount = 0\n    )\n    \n    # Define working variables\n    $items = @()\n    $skipQueryString = \"\"\n    $headers = @{\"X-Octopus-ApiKey\"=\"$ApiKey\"}\n\n    # Check to see if there there is already a querystring\n    if ($octopusUri.Contains(\"?\"))\n    {\n        $skipQueryString = \"&skip=\"\n    }\n    else\n    {\n        $skipQueryString = \"?skip=\"\n    }\n\n    $skipQueryString += $SkipCount\n    \n    # Get intial set\n    Write-Host \"Calling $OctopusUri$skipQueryString\"\n    $resultSet = Invoke-RestMethod -Uri \"$($OctopusUri)$skipQueryString\" -Method GET -Headers $headers\n\n    # Check to see if it returned an item collection\n    if ($null -ne $resultSet.Items)\n    {\n        # Store call results\n        $items += $resultSet.Items\n    \n        # Check to see if resultset is bigger than page amount\n        if (($resultSet.Items.Count -gt 0) -and ($resultSet.Items.Count -eq $resultSet.ItemsPerPage))\n        {\n            # Increment skip count\n            $SkipCount += $resultSet.ItemsPerPage\n\n            # Recurse\n            $items += Get-OctopusItems -OctopusUri $OctopusUri -ApiKey $ApiKey -SkipCount $SkipCount\n        }\n    }\n    else\n    {\n        return $resultSet\n    }\n    \n    # Return results\n    return $items\n}\n\n# Define variables\n$octopusApiKey = $OctopusParameters['redeploy.api.key']\n$octopusUri = $OctopusParameters['redeploy.octopus.server.uri']\n$octopusReleaseNumber = $OctopusParameters['redeploy.release.number']\n$octopusReleaseId = $null\n$header =  @{ \"X-Octopus-ApiKey\" = $octopusApiKey }\n$spaceId = $OctopusParameters['Octopus.Space.Id']\n$environmentId = $OctopusParameters['Octopus.Environment.Id']\n$projectId = $OctopusParameters['Octopus.Project.Id']\n$promptedVariables = $OctopusParameters['redeploy.prompted.variables']\n$usePreviousPromptedVariables = [System.Convert]::ToBoolean($OctopusParameters['redeploy.prompted.useexisting'])\n$deploymentFormValues = @{}\n\nif ($octopusUri.EndsWith(\"/\") -eq $true)\n{\n  # Add trailing slash\n  $octopusUri = $octopusUri.Substring(0, ($octopusUri.Length - 1))\n}\n\n# Check to see if a release number was provided\nif ([string]::IsNullOrWhitespace($octopusReleaseNumber))\n{\n  # Get the previous release number\n  $octopusReleaseId = $OctopusParameters['Octopus.Release.PreviousForEnvironment.Id']\n  \n  $release = Get-OctopusItems -OctopusUri \"$octopusUri/api/$spaceId/releases/$octopusReleaseId\" -ApiKey $octopusApiKey\n}\nelse\n{\n  # Get the specific release\n  $release = Get-OctopusItems -OctopusUri \"$octopusUri/api/$spaceId/projects/$projectId/releases?searchByVersion=$octopusReleaseNumber\" -ApiKey $octopusApiKey\n  \n  # Record the id\n  $octopusReleaseId = $release.Id\n}  \n  \n# Verify result\nif ($null -ne $release)\n{\n  # Get deployments\n  $deployments = Get-OctopusItems -OctopusUri \"$octopusUri/api/$spaceId/releases/$($release.Id)/deployments\" -ApiKey $octopusApiKey\n   \n  # Ensure this release has been deployed to this environment\n  $deployment = ($deployments | Where-Object {$_.EnvironmentId -eq $environmentId})\n    \n  if ($null -eq $deployment)\n  {\n    Write-Error \"Error: $octopusReleaseNumber has not been deployed to $($OctopusParameters['Octopus.Environment.Name'])!\"\n  }\n    \n  # Get the task\n  if ($deployment.Links.Task -is [array])\n  {\n    # Get the last attempt\n    $taskLink = $deployment.Links.Task[-1]\n  }\n  else\n  {\n    $taskLink = $deployment.Links.Task\n  }\n  \n  $serverTask = Invoke-RestMethod -Method Get -Uri \"$octopusUri$($taskLink)\" -Headers $header\n    \n  # Ensure it was successful before continuing\n  if ($serverTask.State -eq \"Failed\")\n  {\n    Write-Error \"The previous deployment of $($release.Version) to $($OctopusParameters['Octopus.Environment.Name']) was not successful, unable to re-deploy.\"\n  }\n  \n  try\n  {\n    $deploymentVariables = Invoke-RestMethod -Method Get -Uri \"$octopusUri/api/$spaceId/variables/variableset-$($serverTask.Arguments.DeploymentId)\" -Headers $header\n  }\n  catch\n  {\n    if ($_.Exception.Response.StatusCode -eq \"NotFound\")\n    {\n      $deploymentVariables = $null\n    }\n    else\n    {\n      throw\n    }\n  }\n  \n  # Get only prompted variables\n  $deploymentVariables = ($deploymentVariables.Variables | Where-Object {$null -ne $_.Prompt})\n}\nelse\n{\n  Write-Error \"Unable to find release version $octopusReleaseNumber!\"\n}\n\n# Check to see if there prompted variables that need to be included\nif ($usePreviousPromptedVariables -or ![string]::IsNullOrWhitespace($promptedVariables))\n{\n    # Ensure the previous deployment variables were retrieved\n    if ($null -eq $deploymentVariables)\n    {\n      throw \"Error: Unable to retrieve previous deployment variables!\"\n    }\n    \n    if ($usePreviousPromptedVariables)\n    {\n      # Create list\n      $promptedValueList = @()\n      foreach ($variable in $deploymentVariables)\n      {\n        $promptedValueList += \"$($variable.Name)=$($variable.Value)\"\n      }\n    }\n    else\n    {\n      $promptedValueList = @(($promptedVariables -Split \"`n\").Trim())\n    }\n\n    # Get deployment preview for prompted variables\n    $deploymentPreview = Invoke-RestMethod \"$OctopusUri/api/$spaceId/releases/$octopusReleaseId/deployments/preview/$($environmentId)?includeDisabledSteps=true\" -Headers $header  \n   \n    foreach($element in $deploymentPreview.Form.Elements)\n    {\n        $nameToSearchFor = $element.Control.Name\n        $uniqueName = $element.Name\n        $isRequired = $element.Control.Required\n    \n        $promptedVariablefound = $false\n    \n        Write-Host \"Looking for the prompted variable value for $nameToSearchFor\"\n        foreach ($promptedValue in $promptedValueList)\n        {\n            $splitValue = $promptedValue -Split \"=\"\n            Write-Host \"Comparing $nameToSearchFor with provided prompted variable $($promptedValue[$nameToSearchFor])\"\n            if ($splitValue.Length -gt 1)\n            {\n                if ($nameToSearchFor -eq $splitValue[0].Trim())\n                {\n                    Write-Host \"Found the prompted variable value $nameToSearchFor\"\n                    $deploymentFormValues[$uniqueName] = $splitValue[1].Trim()\n                    $promptedVariableFound = $true\n                    break\n                }\n            }\n        }\n    \n        if ($promptedVariableFound -eq $false -and $isRequired -eq $true)\n        {\n            Write-Highlight \"Unable to find a value for the required prompted variable $nameToSearchFor, exiting\"\n            Exit 1\n        }\n    }\n \n}\n\n# Create json object to deploy the release\n$deploymentBody = @{\n  ReleaseId = $octopusReleaseId\n  EnvironmentId = $environmentId\n}\n\n# Check to see if there were any Prompted Variables\nif ($deploymentFormValues.Count -gt 0)\n{\n  $deploymentBody.Add(\"FormValues\", $deploymentFormValues)\n}\n\n# Submit deployment\nWrite-Host \"Submitting release $($release.Version) to $($OctopusParameters['Octopus.Environment.Name'])\"\n$submittedRelease = (Invoke-RestMethod -Uri \"$octopusUri/api/$spaceId/deployments\" -Method POST -Headers $header -Body ($deploymentBody | ConvertTo-Json -Depth 10))\n\nWrite-Host \"[View the re-deployment]($octopusUri$($submittedRelease.Links.Web))\""
-  },
-  "Parameters": [
-    {
-      "Id": "9f8d7b00-417c-406e-8788-326fd67d22b3",
-      "Name": "redeploy.octopus.server.uri",
-      "Label": "Octopus URI",
-      "HelpText": "Provide the URI to your Octopus server.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7b2ed439-b215-42fe-8971-3839626988fd",
-      "Name": "redeploy.api.key",
-      "Label": "API Key",
-      "HelpText": "Provide an API key with permission to re-deploy the previous version.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "92461617-cab6-4dc7-8fdd-0fcfc08c5d66",
-      "Name": "redeploy.release.number",
-      "Label": "Release number",
-      "HelpText": "(Optional)\nProvide a release number to re-deploy.  Leave blank to use the immediate previous release number.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "47eaaeaf-e414-4b34-ba7d-7d84715fd2ea",
-      "Name": "redeploy.prompted.variables",
-      "Label": "Prompted variables",
-      "HelpText": "Enter any prompted variables and their values in the format `VariableName=VariableValue`.  Enter one entry per line.\n\nExample: `MyVar=MyValue`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "c0137294-b4e3-406e-a36d-fd7aca2731e7",
-      "Name": "redeploy.prompted.useexisting",
-      "Label": "Use previous prompted variables",
-      "HelpText": "Tick this box to use the same prompted variables and values from the previous deployment.\n\nNote: This setting will override anything in the `Prompted variables` input with the values from the previous deployment.  In addition, it will use the values from the latest deployment of the Release.\n\nNote: Please be aware that this template uses the API to retrieve variable which will not work sensitive values.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2024-06-18T23:04:33.802Z",
-    "OctopusVersion": "2024.2.9220",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-register-aks-k8s-cluster.json b/step-templates/octopus-register-aks-k8s-cluster.json
deleted file mode 100644
index 486f3c80b..000000000
--- a/step-templates/octopus-register-aks-k8s-cluster.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-    "Id": "eff227d2-2cd6-4d86-90ae-6258cee53d0a",
-    "Name": "Register AKS Cluster with Octopus Deploy",
-    "Description": "Step template to Register an AKS Cluster with Octopus Deploy using the Octopus Deploy API",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Author": "octobob",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$OctopusAPIKey = $OctopusParameters[\"RegisterAzureCluster.Octopus.Api.Key\"]\n$RegistrationName = $OctopusParameters[\"RegisterAzureCluster.AKS.Name\"]\n$ClusterResourceGroup = $OctopusParameters[\"RegisterAzureCluster.ResourceGroup.Name\"]\n$OctopusUrl = $OctopusParameters[\"RegisterAzureCluster.Octopus.Base.Url\"]\n$Roles = $OctopusParameters[\"RegisterAzureCluster.Roles.List\"]\n$Environments = $OctopusParameters[\"RegisterAzureCluster.Environment.List\"]\n$SpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$MachinePolicyIdOrName = $OctopusParameters[\"RegisterAzureCluster.MachinePolicy.IdOrName\"]\n$AzureAccountId = $OctopusParameters[\"RegisterAzureCluster.Azure.Account\"]\n$Tenants = $OctopusParameters[\"RegisterAzureCluster.Tenant.List\"]\n$DeploymentType = $OctopusParameters[\"RegisterAzureCluster.Tenant.DeploymentType\"]\n$WorkerPoolNameOrId = $OctopusParameters[\"RegisterAzureCluster.WorkerPool.IdOrName\"]\n$OverwriteExisting = $OctopusParameters[\"RegisterAzureCluster.Overwrite.Existing\"]\n$OverwriteExisting = $OverwriteExisting -eq \"True\"\n\nWrite-Host \"AKS Name: $RegistrationName\"\nWrite-Host \"Resoure Group Name: $ClusterResourceGroup\"\nWrite-Host \"Octopus Url: $OctopusUrl\"\nWrite-Host \"Role List: $Roles\"\nWrite-Host \"Environments: $Environments\"\nWrite-Host \"Machine Policy Name or Id: $MachinePolicyIdOrName\"\nWrite-Host \"Azure Account Id: $AzureAccountId\"\nWrite-Host \"Tenant List: $Tenants\"\nWrite-Host \"Deployment Type: $DeploymentType\"\nWrite-Host \"Worker Pool Name or Id: $WorkerPoolNameOrId\"\nWrite-Host \"Overwrite Existing: $OverwriteExisting\"\n\n$header = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$header.Add(\"X-Octopus-ApiKey\", $OctopusAPIKey)\n\n$baseApiUrl = \"$OctopusUrl/api\"\n$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header\nif ((Get-Member -InputObject $baseApiInformation.Links -Name \"Spaces\" -MemberType Properties) -ne $null)\n{  \t\n\t$baseApiUrl = \"$baseApiUrl/$SpaceId\"    \n}\n\nWrite-Host \"Base API Url: $baseApiUrl\"\n\n$existingMachineResultsUrl = \"$baseApiUrl/machines?partialName=$RegistrationName&skip=0&take=1000\"\nWrite-Host \"Attempting to find existing machine with similar name at $existingMachineResultsUrl\"\n$existingMachineResponse = Invoke-RestMethod $existingMachineResultsUrl -Headers $header\nWrite-Host $existingMachineResponse\n\n$machineFound = $false\n$machineId = $null\nforeach ($item in $existingMachineResponse.Items)\n{\n\tif ($item.Name -eq $RegistrationName)\n    {\n    \t$machineFound = $true\n        if ($OverwriteExisting)\n        {\n        \t$machineId = $item.Id \n        }\n        break\n    }\n}\n\nif ($machineFound -and $OverwriteExisting -eq $false)\n{\n\tWrite-Highlight \"Machine already exists, skipping registration\"\n    Exit 0\n}\n\n$roleList = $Roles -split \",\"\n$environmentList = $Environments -split \",\"\n$environmentIdList = @()\nWrite-Host \"Getting the ids for all environments specified\"\nforeach($environment in $environmentList)\n{\n\tWrite-Host \"Getting the id for the environment $environment\"\n    $environmentEscaped = $environment.Replace(\" \", \"%20\")\n    $environmentUrl = \"$baseApiUrl/environments?skip=0&take=1000&name=$environmentEscaped\"\n    $environmentResponse = Invoke-RestMethod $environmentUrl -Headers $header \n\n    $environmentId = $environmentResponse.Items[0].Id\n    if ($environmentId -eq $null)\n    {\n    \tWrite-Host \"The environment $environment cannot be found in this space, exiting\"\n        exit 1\n    }\n    Write-Host \"The id for environment $environment is $environmentId\"\n    $environmentIdList += $environmentId\n}\n$tenantList = $Tenants -split \",\"\n$tenantIdList = @()\n\nforeach($tenant in $tenantList)\n{\n\tif ([string]::IsNullOrWhiteSpace($tenant) -eq $false)\n    {    \n      Write-Host \"Getting the id for tenant $tenant\"\n      $tenantEscaped = $tenant.Replace(\" \", \"%20\")\n      $tenantUrl = \"$baseApiUrl/tenants?skip=0&take=1000&name=$tenantEscaped\"\n      $tenantResponse = Invoke-RestMethod $tenantUrl -Headers $header \n\n      $tenantId = $tenantResponse.Items[0].Id\n      Write-Host \"The id for tenant $tenant is $tenantId\"\n      $tenantIdList += $tenantId\n    }\n}\n\n$machinePolicyId = $machinePolicyIdOrName\nif ($machinePolicyIdOrName.StartsWith(\"MachinePolicies-\") -eq $false)\n{\n\tWrite-Host \"The machine policy specified $machinePolicyIdOrName appears to be a name\"\n\t$machinePolicyNameEscaped = $machinePolicyIdOrName.Replace(\" \", \"%20\")\n\t$machinePolicyResponse = Invoke-RestMethod \"$baseApiUrl/machinepolicies?partialName=$machinePolicyNameEscaped\" -Headers $header\n        \n    $machinePolicyId = $machinePolicyResponse.Items[0].Id\n    Write-Host \"The machine policy id is $machinePolicyId\"\n}\n\nif ([string]::IsNullOrWhiteSpace($machinePolicyId) -eq $true)\n{\n\tWrite-Host \"The machine policy $machinePolicyIdOrName cannot be found, exiting\"\n    exit 1\n}\n\n$workerPoolId = $WorkerPoolNameOrId\nif ([string]::IsNullOrWhiteSpace($workerPoolId) -eq $false -and $workerPoolId.StartsWith(\"WorkerPools-\") -eq $false)\n{\n\tWrite-Host \"The worker pool $workerPoolId appears to be a name, looking it up\"\n    $workerPoolNameEscaped = $workerPoolId.Replace(\" \", \"%20\")\n    $workerPoolResponse = Invoke-RestMethod \"$baseApiUrl/workerpools?partialName=$workerPoolNameEscaped\" -Headers $header\n    \n    $workerPoolId = $workerPoolResponse.Items[0].Id\n    Write-Host \"The worker pool id is $workerPoolId\"\n}\n\n$rawRequest = @{\n\tId = $machineId;\n    MachinePolicyId = $MachinePolicyId;\n    Name = $RegistrationName;\n\tIsDisabled = $false;\n\tHealthStatus = \"Unknown\";\n\tHasLatestCalamari = $true;\n\tStatusSummary = $null;\n\tIsInProcess = $true;\n\tEndpoint = @{\n    \tId = $null;\n\t\tCommunicationStyle = \"Kubernetes\";\n\t\tLinks = $null;\n\t\tAccountType = \"AzureServicePrincipal\";\n        ClusterUrl = $null;\n        ClusterCertificate = $null;\n        SkipTlsVerification = $false;\n        DefaultWorkerPoolId = $workerPoolId;\n        Authentication = @{\n        \tAuthenticationType = \"KubernetesAzure\";\n            AccountId = $AzureAccountId;\n            ClusterName = $RegistrationName;\n            ClusterResourceGroup = $ClusterResourceGroup\n        };\n    };\n\tLinks = $null;\t\n\tRoles = $roleList;\n\tEnvironmentIds = $environmentIdList;\n\tTenantIds = $tenantIdList;\n    TenantedDeploymentParticipation = $DeploymentType;\n\tTenantTags = @()}\n\n$jsonRequest = $rawRequest | ConvertTo-Json -Depth 10\n\nWrite-Host \"Sending in the request $jsonRequest\"\n\n$machineUrl = \"$baseApiUrl/machines\"\n$method = \"POST\"\nif ($OverwriteExisting -and $machineId -ne $null)\n{\n\t$machineUrl = \"$machineUrl/$machineId\" \n  \t$method = \"PUT\"\n}\n\nWrite-Host \"Posting to url $machineUrl\"\n$machineResponse = Invoke-RestMethod $machineUrl -Headers $header -Method $method -Body $jsonRequest\n\nWrite-Host \"Create machine's response: $machineResponse\""
-    },
-    "Parameters": [
-      {
-        "Id": "e98dc4e2-0766-4d2d-a753-eafe294fdeea",
-        "Name": "RegisterAzureCluster.Octopus.Base.Url",
-        "Label": "Octopus Base Url",
-        "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cb3cdd41-3d1f-49c6-820e-acfa24bf5a88",
-        "Name": "RegisterAzureCluster.Octopus.Api.Key",
-        "Label": "Octopus Api Key",
-        "HelpText": "The API key of a user in Octopus Deploy who has permissions to register the cluster.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "1d3d8695-27a3-4d3e-9457-6b483253a609",
-        "Name": "RegisterAzureCluster.Azure.Account",
-        "Label": "Azure Account",
-        "HelpText": "The Azure Account with permissions to access the AKS cluster",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "AzureAccount"
-        }
-      },
-      {
-        "Id": "ca9d9733-2032-466b-9e80-2aa6abd3c977",
-        "Name": "RegisterAzureCluster.AKS.Name",
-        "Label": "AKS Cluster Name",
-        "HelpText": "The name of the AKS Cluster Name to register with Octopus Deploy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1e3c6a4a-09da-4cd1-989f-93be59ad7f16",
-        "Name": "RegisterAzureCluster.ResourceGroup.Name",
-        "Label": "AKS Resource Group Name",
-        "HelpText": "Name of the Azure Resource Group where the AKS cluster is located.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fa4bd89d-bb86-4d3f-87ff-17125cd88f24",
-        "Name": "RegisterAzureCluster.Roles.List",
-        "Label": "Role CSV List",
-        "HelpText": "Comma separated list of environments to assign to the AKS cluster in Octopus Deploy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0c80326d-cdc1-439d-be6b-fbab4da42cda",
-        "Name": "RegisterAzureCluster.Environment.List",
-        "Label": "Environment CSV List",
-        "HelpText": "Comma separated list of environments to assign to the AKS cluster in Octopus Deploy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "667a18b3-1694-4333-87a4-9be712b59122",
-        "Name": "RegisterAzureCluster.Tenant.List",
-        "Label": "Tenant CSV List",
-        "HelpText": "(Optional) If this is for a tenant, the a comma separated list of tenants to assign the AKS cluster to in Octopus Deploy",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "db2de612-45bb-4e4a-ab95-64083dd80393",
-        "Name": "RegisterAzureCluster.Tenant.DeploymentType",
-        "Label": "Tenanted Deployments",
-        "HelpText": "Choose the kind of deployment where this deployment target should be included.",
-        "DefaultValue": "Untenanted",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Untenanted|Exclude from tenanted deployments (default)\nTenanted|Include only in tenanted deployments\nTenantedOrUntenanted|Include in both tenanted and untenanted deployments"
-        }
-      },
-      {
-        "Id": "5ef91f37-b13b-413d-955c-872c7f274c7e",
-        "Name": "RegisterAzureCluster.MachinePolicy.IdOrName",
-        "Label": "Machine Policy Id Or Name",
-        "HelpText": "Enter in the name or the Id of the Machine Policy in Octopus Deploy for the AKS Cluster.",
-        "DefaultValue": "Default Machine Policy",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c4c45925-d7a4-4e41-9c2d-a8d73a6292b1",
-        "Name": "RegisterAzureCluster.WorkerPool.IdOrName",
-        "Label": "Worker Pool Id or Name",
-        "HelpText": "The name or id of the worker pool all communication will go through for the K8s cluster.  Leave blank for the default worker pool.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "94b90acb-a054-4886-91e0-79e9881709f9",
-        "Name": "RegisterAzureCluster.Overwrite.Existing",
-        "Label": "Overwrite Existing Registration",
-        "HelpText": "Indicates if the existing cluster should be overwritten",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedBy": "octobob",
-    "$Meta": {
-      "ExportedAt": "2020-04-13T15:37:29.866Z",
-      "OctopusVersion": "2020.1.10",
-      "Type": "ActionTemplate"
-    },
-    "Category": "octopus"
-  }
diff --git a/step-templates/octopus-register-listening-target.json b/step-templates/octopus-register-listening-target.json
deleted file mode 100644
index c65fe8d93..000000000
--- a/step-templates/octopus-register-listening-target.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "Id": "6f95a351-a1a1-43d1-a378-410a9acf0e60",
-  "Name": "Register Listening Deployment Target with Octopus",
-  "Description": "Step template to Register an Listening Deployment Target with Octopus Deploy using the API.  Useful when spinning up machines and you want to wait to register until the machine finishes installing all additional software.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Author": "octobob",
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$OctopusAPIKey = $OctopusParameters[\"RegisterListeningTarget.Octopus.Api.Key\"]\n$RegistrationName = $OctopusParameters[\"RegisterListeningTarget.Machine.Name\"]\n$RegistrationAddress = $OctopusParameters[\"RegisterListeningTarget.Machine.Address\"]\n$OctopusUrl = $OctopusParameters[\"RegisterListeningTarget.Octopus.Base.Url\"]\n$Roles = $OctopusParameters[\"RegisterListeningTarget.Roles.List\"]\n$Environments = $OctopusParameters[\"RegisterListeningTarget.Environment.List\"]\n$SpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$MachinePolicyIdOrName = $OctopusParameters[\"RegisterListeningTarget.MachinePolicy.IdOrName\"]\n$Tenants = $OctopusParameters[\"RegisterListeningTarget.Tenant.List\"]\n$DeploymentType = $OctopusParameters[\"RegisterListeningTarget.Tenant.DeploymentType\"]\n$PortNumber = $OctopusParameters[\"RegisterListeningTarget.Machine.Port\"]\n$OverwriteExisting = $OctopusParameters[\"RegisterListeningTarget.Overwrite.Existing\"]\n$OverwriteExisting = $OverwriteExisting -eq \"True\"\n\nWrite-Host \"Machine Name: $RegistrationName\"\nWrite-Host \"Machine Address: $RegistrationAddress\"\nWrite-Host \"Machine Port: $PortNumber\"\nWrite-Host \"Octopus Url: $OctopusUrl\"\nWrite-Host \"Role List: $Roles\"\nWrite-Host \"Environments: $Environments\"\nWrite-Host \"Machine Policy Name or Id: $MachinePolicyIdOrName\"\nWrite-Host \"Tenant List: $Tenants\"\nWrite-Host \"Deployment Type: $DeploymentType\"\nWrite-Host \"Overwrite Existing: $OverwriteExisting\"\n\n$header = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$header.Add(\"X-Octopus-ApiKey\", $OctopusAPIKey)\n\n# If tenanted only deployments is set then you require at least one tenant in the tenant list\nif($tenantList -eq $null -and $DeploymentType -eq \"Tenanted\"){\n\tFail-Step \"Tenanted only deployments require at least one associated tenants!\"\n}\n\n$baseApiUrl = \"$OctopusUrl/api\"\n$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header\nif ((Get-Member -InputObject $baseApiInformation.Links -Name \"Spaces\" -MemberType Properties) -ne $null)\n{  \t\n\t$baseApiUrl = \"$baseApiUrl/$SpaceId\"    \n}\n\nWrite-Host \"Base API Url: $baseApiUrl\"\n\n$existingMachineResultsUrl = \"$baseApiUrl/machines?partialName=$RegistrationName&skip=0&take=1000\"\nWrite-Host \"Attempting to find existing machine with similar name at $existingMachineResultsUrl\"\n$existingMachineResponse = Invoke-RestMethod $existingMachineResultsUrl -Headers $header\nWrite-Host $existingMachineResponse\n\n$machineFound = $false\n$machineId = $null\nforeach ($item in $existingMachineResponse.Items)\n{\n\tif ($item.Name -eq $RegistrationName)\n    {\n    \t$machineFound = $true\n        if ($OverwriteExisting)\n        {\n        \t$machineId = $item.Id \n        }\n        break\n    }\n}\n\nif ($machineFound -and $OverwriteExisting -eq $false)\n{\n\tWrite-Highlight \"Machine already exists, skipping registration\"\n    Exit 0\n}\n\n$roleList = $Roles -split \",\"\n$environmentList = $Environments -split \",\"\n$environmentIdList = @()\nWrite-Host \"Getting the ids for all environments specified\"\nforeach($environment in $environmentList)\n{\n\tWrite-Host \"Getting the id for the environment $environment\"\n    $environmentEscaped = $environment.Replace(\" \", \"%20\")\n    $environmentUrl = \"$baseApiUrl/environments?skip=0&take=1000&name=$environmentEscaped\"\n    $environmentResponse = Invoke-RestMethod $environmentUrl -Headers $header \n\n    $environmentId = $environmentResponse.Items[0].Id\n    Write-Host \"The id for environment $environment is $environmentId\"\n    $environmentIdList += $environmentId\n}\n$tenantList = $Tenants -split \",\"\n$tenantIdList = @()\n\n# If tenant list is null then no need to go trhough this or it will pick the first tenant from all the tenants in Octopus\nif($tenantIdList -ne $null){\n\n\tforeach($tenant in $tenantList)\n\t{\n\t\tWrite-Host \"Getting the id for tenant $tenant\"\n\t\t$tenantEscaped = $tenant.Replace(\" \", \"%20\")\n\t\t$tenantUrl = \"$baseApiUrl/tenants?skip=0&take=1000&name=$tenantEscaped\"\n\t\t$tenantResponse = Invoke-RestMethod $tenantUrl -Headers $header \n\t\n\t\t$tenantId = $tenantResponse.Items[0].Id\n\t\tWrite-Host \"The id for tenant $tenant is $tenantId\"\n\t\t$tenantIdList += $tenantId\n\t}\n\t\n}\n\n\n\n$machinePolicyId = $machinePolicyIdOrName\nif ($machinePolicyIdOrName.StartsWith(\"MachinePolicies-\") -eq $false)\n{\n\tWrite-Host \"The machine policy specified $machinePolicyIdOrName appears to be a name\"\n\t$machinePolicyNameEscaped = $machinePolicyIdOrName.Replace(\" \", \"%20\")\n\t$machinePolicyResponse = Invoke-RestMethod \"$baseApiUrl/machinepolicies?partialName=$machinePolicyNameEscaped\" -Headers $header\n        \n    $machinePolicyId = $machinePolicyResponse.Items[0].Id\n    Write-Host \"The machine policy id is $machinePolicyId\"\n}\n\n$discoverUrl = \"$baseApiUrl/machines/discover?host=$RegistrationAddress&port=$PortNumber&type=TentaclePassive\"\nWrite-Host \"Discovering the machine $discoverUrl\"\n$discoverResponse = Invoke-RestMethod $discoverUrl -Headers $header \nWrite-Host \"ProjectResponse: $discoverResponse\"\n\n$machineThumbprint = $discoverResponse.EndPoint.Thumbprint\nWrite-Host \"Thumbprint = $machineThumbprint\"\n\n$rawRequest = @{\n\tId = $machineId;\n\tMachinePolicyId = $machinePolicyId;\n\tName = $RegistrationName;\n\tIsDisabled = $false;\n\tHealthStatus = \"Unknown\";\n\tHasLatestCalamari = $true;\n\tStatusSummary = $null;\n\tIsInProcess = $true;\n\tEndpoint = @{\n    \t\tId = $null;\n\t\tCommunicationStyle = \"TentaclePassive\";\n\t\tLinks = $null;\n\t\tUri = \"https://$RegistrationAddress`:$PortNumber\";\n\t\tThumbprint = \"$machineThumbprint\";\n\t\tProxyId = $null\n\t};\n\tLinks = $null;\t\n\tRoles = $roleList;\n\tEnvironmentIds = $environmentIdList;\n\tTenantIds = $tenantIdList;\n\tTenantTags = $null;\n\tTenantedDeploymentParticipation = $DeploymentType\n}\n\n$jsonRequest = $rawRequest | ConvertTo-Json -Depth 10\n\nWrite-Host \"Sending in the request $jsonRequest\"\n\n$machineUrl = \"$baseApiUrl/machines\"\n\n$method = \"POST\"\nif ($OverwriteExisting -and $machineId -ne $null)\n{\n\t$machineUrl = \"$machineUrl/$machineId\" \n  \t$method = \"PUT\"\n}\nWrite-Host \"Posting to url $machineUrl\"\n$machineResponse = Invoke-RestMethod $machineUrl -Headers $header -Method $method -Body $jsonRequest\n\nWrite-Host \"Create machine's response: $machineResponse\""
-  },
-  "Parameters": [
-    {
-      "Id": "e98dc4e2-0766-4d2d-a753-eafe294fdeea",
-      "Name": "RegisterListeningTarget.Octopus.Base.Url",
-      "Label": "Octopus Base Url",
-      "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cb3cdd41-3d1f-49c6-820e-acfa24bf5a88",
-      "Name": "RegisterListeningTarget.Octopus.Api.Key",
-      "Label": "Octopus Api Key",
-      "HelpText": "The API key of a user in Octopus Deploy who has permissions to register the cluster.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ca9d9733-2032-466b-9e80-2aa6abd3c977",
-      "Name": "RegisterListeningTarget.Machine.Name",
-      "Label": "Machine Name",
-      "HelpText": "The name of the machine to register with Octopus Deploy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1d3d8695-27a3-4d3e-9457-6b483253a609",
-      "Name": "RegisterListeningTarget.Machine.Address",
-      "Label": "Machine Address",
-      "HelpText": "The machine address (IP Address or Domain Name) to connect to",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ea762a1e-07ee-4eec-af7a-b6e29bf274d8",
-      "Name": "RegisterListeningTarget.Machine.Port",
-      "Label": "Port Number",
-      "HelpText": "The port the tentacle is listening on",
-      "DefaultValue": "10933",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fa4bd89d-bb86-4d3f-87ff-17125cd88f24",
-      "Name": "RegisterListeningTarget.Roles.List",
-      "Label": "Role CSV List",
-      "HelpText": "Comma separated list of environments to assign to the machine in Octopus Deploy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0c80326d-cdc1-439d-be6b-fbab4da42cda",
-      "Name": "RegisterListeningTarget.Environment.List",
-      "Label": "Environment CSV List",
-      "HelpText": "Comma separated list of environments to assign to the the machine in Octopus Deploy.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "667a18b3-1694-4333-87a4-9be712b59122",
-      "Name": "RegisterListeningTarget.Tenant.List",
-      "Label": "Tenant CSV List",
-      "HelpText": "(Optional) If this is for a tenant, the a comma separated list of tenants to assign the machine to in Octopus Deploy",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "db2de612-45bb-4e4a-ab95-64083dd80393",
-      "Name": "RegisterListeningTarget.Tenant.DeploymentType",
-      "Label": "Tenanted Deployments",
-      "HelpText": "Choose the kind of deployment where this deployment target should be included.",
-      "DefaultValue": "Untenanted",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Untenanted|Exclude from tenanted deployments (default)\nTenanted|Include only in tenanted deployments\nTenantedOrUntenanted|Include in both tenanted and untenanted deployments"
-      }
-    },
-    {
-      "Id": "5ef91f37-b13b-413d-955c-872c7f274c7e",
-      "Name": "RegisterListeningTarget.MachinePolicy.IdOrName",
-      "Label": "Machine Policy Id Or Name",
-      "HelpText": "Enter in the name or the Id of the Machine Policy in Octopus Deploy for the AKS Cluster.",
-      "DefaultValue": "Default Machine Policy",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5b2e0993-7f96-4447-b47b-029c8f225688",
-      "Name": "RegisterListeningTarget.Overwrite.Existing",
-      "Label": "Overwrite Existing Registration",
-      "HelpText": "Indicates if the existing listening tentacle should be overwritten in Octopus.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedBy": "adamoctoclose",
-  "$Meta": {
-    "ExportedAt": "2021-03-17T15:37:29.866Z",
-    "OctopusVersion": "2020.5.5",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-register-listening-worker.json b/step-templates/octopus-register-listening-worker.json
deleted file mode 100644
index e1c17b071..000000000
--- a/step-templates/octopus-register-listening-worker.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "Id": "e83b3265-64f9-4870-8802-54884c43eaf0",
-    "Name": "Register Listening Worker with Octopus",
-    "Description": "Step template to Register an Listening Worker with Octopus Deploy using the API.  Useful for when you need to wait to install additional software and a restart when spinning up a new worker.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Author": "octobob",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "true",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$OctopusAPIKey = $OctopusParameters[\"RegisterListeningWorker.Octopus.Api.Key\"]\n$RegistrationName = $OctopusParameters[\"RegisterListeningWorker.Machine.Name\"]\n$RegistrationAddress = $OctopusParameters[\"RegisterListeningWorker.Machine.Address\"]\n$OctopusUrl = $OctopusParameters[\"RegisterListeningWorker.Octopus.Base.Url\"]\n$WorkerPools = $OctopusParameters[\"RegisterListeningWorker.WorkerPool.List\"]\n$SpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$MachinePolicyIdOrName = $OctopusParameters[\"RegisterListeningWorker.MachinePolicy.IdOrName\"]\n$PortNumber = $OctopusParameters[\"RegisterListeningWorker.Machine.Port\"]\n$OverwriteExisting = $OctopusParameters[\"RegisterListeningWorker.Overwrite.Existing\"]\n$OverwriteExisting = $OverwriteExisting -eq \"True\"\n\n\nWrite-Host \"Machine Name: $RegistrationName\"\nWrite-Host \"Machine Address: $RegistrationAddress\"\nWrite-Host \"Machine Port: $PortNumber\"\nWrite-Host \"Octopus Url: $OctopusUrl\"\nWrite-Host \"Worker Pools: $WorkerPools\"\nWrite-Host \"Environments: $Environments\"\nWrite-Host \"Machine Policy Name or Id: $MachinePolicyIdOrName\"\nWrite-Host \"Overwrite Existing: $OverwriteExisting\"\n\n$header = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$header.Add(\"X-Octopus-ApiKey\", $OctopusAPIKey)\n\n$baseApiUrl = \"$OctopusUrl/api\"\n$baseApiInformation = Invoke-RestMethod $baseApiUrl -Headers $header\nif ((Get-Member -InputObject $baseApiInformation.Links -Name \"Spaces\" -MemberType Properties) -ne $null)\n{  \t\n\t$baseApiUrl = \"$baseApiUrl/$SpaceId\"    \n}\n\nWrite-Host \"Base API Url: $baseApiUrl\"\n\n$existingMachineResultsUrl = \"$baseApiUrl/workers?partialName=$RegistrationName&skip=0&take=1000\"\nWrite-Host \"Attempting to find existing machine with similar name at $existingMachineResultsUrl\"\n$existingMachineResponse = Invoke-RestMethod $existingMachineResultsUrl -Headers $header\nWrite-Host $existingMachineResponse\n\n$machineFound = $false\nforeach ($item in $existingMachineResponse.Items)\n{\n\tif ($item.Name -eq $RegistrationName)\n    {\n    \t$machineFound = $true\n        if ($OverwriteExisting)\n        {\n        \t$machineId = $item.Id \n        }\n        break\n    }\n}\n\nif ($machineFound -and $OverwriteExisting -eq $false)\n{\n\tWrite-Highlight \"Machine already exists, skipping registration\"\n    Exit 0\n}\n\n$workerPoolList = $WorkerPools -split \",\"\n$workerPoolIdList = @()\nWrite-Host \"Getting the ids for all environments specified\"\nforeach($workerPool in $workerPoolList)\n{\n\tWrite-Host \"Getting the id for the worker pool $workerPool\"\n    \n    if ($workerPool.StartsWith(\"WorkerPools-\") -eq $true)\n    {\n    \tWrite-Host \"The worker pool is already an id, using that instead of looking it up\"\n    \t$workerPoolIdList += $workerPool\n    }\n    else\n    {\n    \t$workerPoolEscaped = $workerPool.Replace(\" \", \"%20\")\n        $workerPoolUrl = \"$baseApiUrl/workerpools?skip=0&take=1000&partialName=$workerPoolEscaped\"\n        $workerPoolResponse = Invoke-RestMethod $workerPoolUrl -Headers $header \n\n        $workerPoolId = $workerPoolResponse.Items[0].Id\n        Write-Host \"The id for worker pool $workerPool is $workerPoolId\"\n        $workerPoolIdList += $workerPoolId\n    }       \n}\n\n$machinePolicyId = $machinePolicyIdOrName\nif ($machinePolicyIdOrName.StartsWith(\"MachinePolicies-\") -eq $false)\n{\n\tWrite-Host \"The machine policy specified $machinePolicyIdOrName appears to be a name\"\n\t$machinePolicyNameEscaped = $machinePolicyIdOrName.Replace(\" \", \"%20\")\n\t$machinePolicyResponse = Invoke-RestMethod \"$baseApiUrl/machinepolicies?partialName=$machinePolicyNameEscaped\" -Headers $header\n        \n    $machinePolicyId = $machinePolicyResponse.Items[0].Id\n    Write-Host \"The machine policy id is $machinePolicyId\"\n}\n\n$discoverUrl = \"$baseApiUrl/machines/discover?host=$RegistrationAddress&port=$PortNumber&type=TentaclePassive\"\nWrite-Host \"Discovering the machine $discoverUrl\"\n$discoverResponse = Invoke-RestMethod $discoverUrl -Headers $header \nWrite-Host \"ProjectResponse: $discoverResponse\"\n\n$machineThumbprint = $discoverResponse.EndPoint.Thumbprint\nWrite-Host \"Thumbprint = $machineThumbprint\"\n\n$rawRequest = @{\n  Id = $machineId;\n  MachinePolicyId = $MachinePolicyId;\n  Name = $RegistrationName;\n  IsDisabled = $false;\n  HealthStatus = \"Unknown\";\n  HasLatestCalamari = $true;\n  StatusSummary = $null;\n  IsInProcess = $true;\n  Links = $null;\n  WorkerPoolIds = $workerPoolIdList;\n  Endpoint = @{\n    Id = $null;\n    CommunicationStyle = \"TentaclePassive\";\n    Links = $null;\n    Uri = \"https://$RegistrationAddress`:$PortNumber\";\n    Thumbprint = \"$machineThumbprint\";\n    ProxyId = $null\n  }\n}\n\n$jsonRequest = $rawRequest | ConvertTo-Json -Depth 10\n\nWrite-Host \"Sending in the request $jsonRequest\"\n\n$machineUrl = \"$baseApiUrl/workers\"\n$method = \"POST\"\nif ($OverwriteExisting -and $machineId -ne $null)\n{\n\t$machineUrl = \"$machineUrl/$machineId\" \n  \t$method = \"PUT\"\n}\n\nWrite-Host \"Posting to url $machineUrl\"\n$machineResponse = Invoke-RestMethod $machineUrl -Headers $header -Method $method -Body $jsonRequest\n\nWrite-Host \"Create workers's response: $machineResponse\""
-    },
-    "Parameters": [
-      {
-        "Id": "e98dc4e2-0766-4d2d-a753-eafe294fdeea",
-        "Name": "RegisterListeningWorker.Octopus.Base.Url",
-        "Label": "Octopus Base Url",
-        "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cb3cdd41-3d1f-49c6-820e-acfa24bf5a88",
-        "Name": "RegisterListeningWorker.Octopus.Api.Key",
-        "Label": "Octopus Api Key",
-        "HelpText": "The API key of a user in Octopus Deploy who has permissions to register the cluster.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "ca9d9733-2032-466b-9e80-2aa6abd3c977",
-        "Name": "RegisterListeningWorker.Machine.Name",
-        "Label": "Machine Name",
-        "HelpText": "The name of the machine to register with Octopus Deploy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1d3d8695-27a3-4d3e-9457-6b483253a609",
-        "Name": "RegisterListeningWorker.Machine.Address",
-        "Label": "Machine Address",
-        "HelpText": "The machine address (IP Address or Domain Name) to connect to",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ea762a1e-07ee-4eec-af7a-b6e29bf274d8",
-        "Name": "RegisterListeningWorker.Machine.Port",
-        "Label": "Port Number",
-        "HelpText": "The port the tentacle is listening on",
-        "DefaultValue": "10933",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fa4bd89d-bb86-4d3f-87ff-17125cd88f24",
-        "Name": "RegisterListeningWorker.WorkerPool.List",
-        "Label": "Worker Pool CSV List",
-        "HelpText": "Comma separated list of Worker Pools to assign the worker to in Octopus Deploy.  This can be the worker pool name or the id.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5ef91f37-b13b-413d-955c-872c7f274c7e",
-        "Name": "RegisterListeningWorker.MachinePolicy.IdOrName",
-        "Label": "Machine Policy Id Or Name",
-        "HelpText": "Enter in the name or the Id of the Machine Policy in Octopus Deploy for the AKS Cluster.",
-        "DefaultValue": "Default Machine Policy",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d456924c-3720-4893-9a40-36bb1c00b331",
-        "Name": "RegisterListeningWorker.Overwrite.Existing",
-        "Label": "Overwrite Existing Registration",
-        "HelpText": "Indicates if the existing worker should be overwritten",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedBy": "octobob",
-    "$Meta": {
-      "ExportedAt": "2020-04-13T15:37:29.866Z",
-      "OctopusVersion": "2020.1.10",
-      "Type": "ActionTemplate"
-    },
-    "Category": "octopus"
-  }
diff --git a/step-templates/octopus-serialize-runbook-to-terraform.json b/step-templates/octopus-serialize-runbook-to-terraform.json
deleted file mode 100644
index f268e2865..000000000
--- a/step-templates/octopus-serialize-runbook-to-terraform.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "Id": "07b966c3-130c-4f13-ae0f-5105af5b97a1",
-  "Name": "Octopus - Serialize Runbook to Terraform",
-  "Description": "Serialize an Octopus runbook as a Terraform module and upload the resulting package to the Octopus built in feed.\n\nNote the exported runbooks do not include project variables, so any project that the exported runbook is attached to must already have all project and library variables defined.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "import argparse\nimport os\nimport re\nimport socket\nimport subprocess\nimport sys\nfrom datetime import datetime\nfrom urllib.parse import urlparse\nfrom itertools import chain\nimport platform\nfrom urllib.request import urlretrieve\nimport zipfile\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif \"printverbose\" not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    output_no_ansi = re.sub('\\x1b\\[[0-9;]*m', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi):\n    \"\"\"\n        The execute method provides the ability to execute external processes while capturing and returning the\n        output to std err and std out and exit code.\n    \"\"\"\n    process = subprocess.Popen(args,\n                               stdout=subprocess.PIPE,\n                               stderr=subprocess.PIPE,\n                               text=True,\n                               cwd=cwd,\n                               env=env)\n    stdout, stderr = process.communicate()\n    retcode = process.returncode\n\n    if print_args is not None:\n        print_output(' '.join(args))\n\n    if print_output is not None:\n        print_output(stdout)\n        print_output(stderr)\n\n    return stdout, stderr, retcode\n\n\ndef is_windows():\n    return platform.system() == 'Windows'\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION] [FILE]...',\n        description='Serialize an Octopus project to a Terraform module'\n    )\n    parser.add_argument('--ignore-all-changes',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.IgnoreAllChanges') or get_octopusvariable_quiet(\n                            'Exported.Project.IgnoreAllChanges') or 'false',\n                        help='Set to true to set the \"lifecycle.ignore_changes\" ' +\n                             'setting on each exported resource to \"all\"')\n    parser.add_argument('--terraform-backend',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.ThisInstance.Terraform.Backend') or get_octopusvariable_quiet(\n                            'ThisInstance.Terraform.Backend') or 'pg',\n                        help='Set this to the name of the Terraform backend to be included in the generated module.')\n    parser.add_argument('--server-url',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.ThisInstance.Server.Url') or get_octopusvariable_quiet(\n                            'ThisInstance.Server.Url'),\n                        help='Sets the server URL that holds the project to be serialized.')\n    parser.add_argument('--api-key',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.ThisInstance.Api.Key') or get_octopusvariable_quiet(\n                            'ThisInstance.Api.Key'),\n                        help='Sets the Octopus API key.')\n    parser.add_argument('--space-id',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Space.Id') or get_octopusvariable_quiet(\n                            'Exported.Space.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),\n                        help='Set this to the space ID containing the project to be serialized.')\n    parser.add_argument('--project-name',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Project.Name') or get_octopusvariable_quiet(\n                            'Exported.Project.Name') or get_octopusvariable_quiet(\n                            'Octopus.Project.Name'),\n                        help='Set this to the name of the project to be serialized.')\n    parser.add_argument('--runbook-name',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Exported.Runbook.Name') or get_octopusvariable_quiet(\n                            'Exported.Runbook.Name'),\n                        help='Set this to the name of the project to be serialized.')\n    parser.add_argument('--upload-space-id',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeProject.Octopus.UploadSpace.Id') or get_octopusvariable_quiet(\n                            'Octopus.UploadSpace.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),\n                        help='Set this to the space ID of the Octopus space where ' +\n                             'the resulting package will be uploaded to.')\n\n    return parser.parse_known_args()\n\n\ndef ensure_octo_cli_exists():\n    if is_windows():\n        print(\"Checking for the Octopus CLI\")\n        try:\n            stdout, _, exit_code = execute(['octo', 'help'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octo CLI not found\"\n        except:\n            print(\"Downloading the Octopus CLI\")\n            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.win-x64.zip',\n                        'OctopusTools.zip')\n            with zipfile.ZipFile('OctopusTools.zip', 'r') as zip_ref:\n                zip_ref.extractall(os.getcwd())\n\n\ndef check_docker_exists():\n    try:\n        stdout, _, exit_code = execute(['docker', 'version'])\n        printverbose(stdout)\n        if not exit_code == 0:\n            raise \"Docker not found\"\n    except:\n        print('Docker must be installed: https://docs.docker.com/get-docker/')\n        sys.exit(1)\n\n\ncheck_docker_exists()\nensure_octo_cli_exists()\nparser, _ = init_argparse()\n\n# Variable precondition checks\nif len(parser.server_url) == 0:\n    print(\"--server-url, ThisInstance.Server.Url, or SerializeProject.ThisInstance.Server.Url must be defined\")\n    sys.exit(1)\n\nif len(parser.api_key) == 0:\n    print(\"--api-key, ThisInstance.Api.Key, or ThisInstance.Api.Key must be defined\")\n    sys.exit(1)\n    \noctoterra_image = 'ghcr.io/octopussolutionsengineering/octoterra-windows' if is_windows() else 'ghcr.io/octopussolutionsengineering/octoterra'\noctoterra_mount = 'C:/export' if is_windows() else '/export'  \n\nprint(\"Pulling the Docker images\")\nexecute(['docker', 'pull', octoterra_image])\n\nif not is_windows():\n    execute(['docker', 'pull', 'ghcr.io/octopusdeploylabs/octo'])\n\n# Find out the IP address of the Octopus container\nparsed_url = urlparse(parser.server_url)\noctopus = socket.getaddrinfo(parsed_url.hostname, '80')[0][4][0]\n\nprint(\"Octopus hostname: \" + parsed_url.hostname)\nprint(\"Octopus IP: \" + octopus.strip())\n\nos.mkdir(os.getcwd() + '/export')\n\nexport_args = ['docker', 'run',\n               '--rm',\n               '--add-host=' + parsed_url.hostname + ':' + octopus.strip(),\n               '-v', os.getcwd() + '/export:' + octoterra_mount,\n               octoterra_image,\n               # the url of the instance\n               '-url', parser.server_url,\n               # the api key used to access the instance\n               '-apiKey', parser.api_key,\n               # add a postgres backend to the generated modules\n               '-terraformBackend', parser.terraform_backend,\n               # dump the generated HCL to the console\n               '-console',\n               # dump the project from the current space\n               '-space', parser.space_id,\n               # the name of the project to serialize\n               '-projectName', parser.project_name,\n               # the name of the runbook to serialize\n               '-runbookName', parser.runbook_name,\n               # ignoreProjectChanges can be set to ignore all changes to the project, variables, runbooks etc\n               '-ignoreProjectChanges=' + parser.ignore_all_changes,\n               # for any secret variables, add a default value set to the octostache value of the variable\n               # e.g. a secret variable called \"database\" has a default value of \"#{database}\"\n               '-defaultSecretVariableValues',\n               # detach any step templates, allowing the exported project to be used in a new space\n               '-detachProjectTemplates',\n               # Capture the octopus endpoint, space ID, and space name as output vars. This is useful when\n               # querying th Terraform state file to know which space and instance the resources were\n               # created in. The scripts used to update downstream projects in bulk work by querying the\n               # Terraform state, finding all the downstream projects, and using the space name to only process\n               # resources that match the current tenant (because space names and tenant names are the same).\n               # The output variables added by this option are octopus_server, octopus_space_id, and\n               # octopus_space_name.\n               '-includeOctopusOutputVars',\n               # Where steps do not explicitly define a worker pool and reference the default one, this\n               # option explicitly exports the default worker pool by name. This means if two spaces have\n               # different default pools, the exported project still uses the pool that the original project\n               # used.\n               '-lookUpDefaultWorkerPools',\n               # These tenants are linked to the project to support some management runbooks, but should not\n               # be exported\n               '-excludeAllTenants',\n               # The directory where the exported files will be saved\n               '-dest', octoterra_mount]\n\nprint(\"Exporting Terraform module\")\n_, _, octoterra_exit = execute(export_args)\n\nif not octoterra_exit == 0:\n    print(\"Octoterra failed. Please check the logs for more information.\")\n    sys.exit(1)\n\ndate = datetime.now().strftime('%Y.%m.%d.%H%M%S')\n\nprint(\"Creating Terraform module package\")\nif is_windows():\n    execute(['octo',\n             'pack',\n             '--format', 'zip',\n             '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name + \"_\" + parser.runbook_name),\n             '--version', date,\n             '--basePath', os.getcwd() + '\\\\export',\n             '--outFolder', 'C:\\\\export'])\nelse:\n    _, _, _ = execute(['docker', 'run',\n                            '--rm',\n                            '--add-host=' + parsed_url.hostname + ':' + octopus.strip(),\n                            '-v', os.getcwd() + \"/export:/export\",\n                            'ghcr.io/octopusdeploylabs/octo',\n                            'pack',\n                            '--format', 'zip',\n                            '--id', re.sub('[^0-9a-zA-Z]', '_', parser.project_name + \"_\" + parser.runbook_name),\n                            '--version', date,\n                            '--basePath', '/export',\n                            '--outFolder', '/export'])\n\nprint(\"Uploading Terraform module package\")\nif is_windows():\n    _, _, _ = execute(['octo',\n                            'push',\n                            '--apiKey', parser.api_key,\n                            '--server', parser.server_url,\n                            '--space', parser.upload_space_id,\n                            '--package', 'C:\\\\export\\\\' +\n                            re.sub('[^0-9a-zA-Z]', '_', parser.project_name + \"_\" + parser.runbook_name) + '.' + date + '.zip',\n                            '--replace-existing'])\nelse:\n    _, _, _ = execute(['docker', 'run',\n                            '--rm',\n                            '--add-host=' + parsed_url.hostname + ':' + octopus.strip(),\n                            '-v', os.getcwd() + \"/export:/export\",\n                            'ghcr.io/octopusdeploylabs/octo',\n                            'push',\n                            '--apiKey', parser.api_key,\n                            '--server', parser.server_url,\n                            '--space', parser.upload_space_id,\n                            '--package', '/export/' +\n                            re.sub('[^0-9a-zA-Z]', '_', parser.project_name + \"_\" + parser.runbook_name) + '.' + date + '.zip',\n                            '--replace-existing'])\n\nprint(\"##octopus[stdout-default]\")\n\nprint(\"Done\")\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python"
-  },
-  "Parameters": [
-    {
-      "Id": "070f2882-2911-4297-b9e3-2da81abf6e70",
-      "Name": "SerializeProject.Exported.Project.IgnoreAllChanges",
-      "Label": "Ignore All Changes",
-      "HelpText": "Selecting this option creates a Terraform module with the \"lifecycle.ignore_changes\" option set to \"all\". This allows the resources to be created if they do not exist, but won't update them if the module is reapplied.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "4cb3da75-7449-4adb-b81a-e87dff371a27",
-      "Name": "SerializeProject.ThisInstance.Terraform.Backend",
-      "Label": "Terraform Backend",
-      "HelpText": "The [backed](https://developer.hashicorp.com/terraform/language/settings/backends/configuration) to define in the Terraform module.",
-      "DefaultValue": "s3",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "aa3df492-845a-4889-a7fc-c9c6f3a95a30",
-      "Name": "SerializeProject.ThisInstance.Server.Url",
-      "Label": "Octopus Server URL",
-      "HelpText": "The URL of the Octopus Server hosting the project to be serialized.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e92dbdff-dd5a-4c95-91a1-40c0ccbb3b3f",
-      "Name": "SerializeProject.ThisInstance.Api.Key",
-      "Label": "Octopus API Key",
-      "HelpText": "The Octopus API Key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "c906ecbd-f304-48b8-83ea-fe75008c37df",
-      "Name": "SerializeProject.Exported.Space.Id",
-      "Label": "Octopus Space ID",
-      "HelpText": "The Space ID containing the project to be exported",
-      "DefaultValue": "#{Octopus.Space.Id}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fae1f2e4-9be5-4380-9fd3-409a1a538b37",
-      "Name": "SerializeProject.Exported.Project.Name",
-      "Label": "Octopus Project Name",
-      "HelpText": "The name of the project containing the runbook.",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a711f201-fa2f-4b32-9205-13f396c253d7",
-      "Name": "SerializeProject.Exported.Runbook.Name",
-      "Label": "Octopus Runbook Name",
-      "HelpText": "The name of the runbook to serialize.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "27b222da-690c-4da3-8c60-d06bc7d3505b",
-      "Name": "SerializeProject.Octopus.UploadSpace.Id",
-      "Label": "Octopus Upload Space ID",
-      "HelpText": "The ID of the space to upload the Terraform package to. Leave this blank to upload to the space defined in the `Octopus Space ID` parameter.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-11-08T23:36:23.610Z",
-    "OctopusVersion": "2024.1.895",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-serialize-space-to-terraform.json b/step-templates/octopus-serialize-space-to-terraform.json
deleted file mode 100644
index 1b4761d79..000000000
--- a/step-templates/octopus-serialize-space-to-terraform.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  "Id": "e03c56a4-f660-48f6-9d09-df07e1ac90bd",
-  "Name": "Octopus - Serialize Space to Terraform",
-  "Description": "Serialize an Octopus space, excluding all projects, as a Terraform module and upload the resulting package to the Octopus built in feed.\n\nThis step is expected to be used in conjunction with the [Octopus - Serialize Project to Terraform](https://library.octopus.com/step-templates/e9526501-09d5-490f-ac3f-5079735fe041/actiontemplate-octopus-serialize-project-to-terraform) step. This step will serialize the global space resources, which typically do not change much, and have those resources recreated in a downstream space. The `Octopus - Serialize Project to Terraform` step then serializes a project, using `data` blocks to reference space level resources by name.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "import argparse\nimport os\nimport stat\nimport re\nimport socket\nimport subprocess\nimport sys\nfrom datetime import datetime\nfrom urllib.parse import urlparse\nfrom itertools import chain\nimport platform\nfrom urllib.request import urlretrieve\nimport zipfile\nimport urllib.request\nimport urllib.parse\nimport json\nimport tarfile\nimport random, time\n\n# If this script is not being run as part of an Octopus step, return variables from environment variables.\n# Periods are replaced with underscores, and the variable name is converted to uppercase\nif \"get_octopusvariable\" not in globals():\n    def get_octopusvariable(variable):\n        return os.environ[re.sub('\\\\.', '_', variable.upper())]\n\n# If this script is not being run as part of an Octopus step, print directly to std out.\nif \"printverbose\" not in globals():\n    def printverbose(msg):\n        print(msg)\n\n\ndef printverbose_noansi(output):\n    \"\"\"\n    Strip ANSI color codes and print the output as verbose\n    :param output: The output to print\n    \"\"\"\n    if not output:\n        return\n\n    # https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python\n    output_no_ansi = re.sub(r'\\x1B(?:[@-Z\\\\-_]|\\[[0-?]*[ -/]*[@-~])', '', output)\n    printverbose(output_no_ansi)\n\n\ndef get_octopusvariable_quiet(variable):\n    \"\"\"\n    Gets an octopus variable, or an empty string if it does not exist.\n    :param variable: The variable name\n    :return: The variable value, or an empty string if the variable does not exist\n    \"\"\"\n    try:\n        return get_octopusvariable(variable)\n    except:\n        return ''\n\n\ndef retry_with_backoff(fn, retries=5, backoff_in_seconds=1):\n    x = 0\n    while True:\n        try:\n            return fn()\n        except Exception as e:\n\n            print(e)\n\n            if x == retries:\n                raise\n\n            sleep = (backoff_in_seconds * 2 ** x +\n                     random.uniform(0, 1))\n            time.sleep(sleep)\n            x += 1\n\n\ndef execute(args, cwd=None, env=None, print_args=None, print_output=printverbose_noansi):\n    \"\"\"\n        The execute method provides the ability to execute external processes while capturing and returning the\n        output to std err and std out and exit code.\n    \"\"\"\n    process = subprocess.Popen(args,\n                               stdout=subprocess.PIPE,\n                               stderr=subprocess.PIPE,\n                               text=True,\n                               cwd=cwd,\n                               env=env)\n    stdout, stderr = process.communicate()\n    retcode = process.returncode\n\n    if print_args is not None:\n        print_output(' '.join(args))\n\n    if print_output is not None:\n        print_output(stdout)\n        print_output(stderr)\n\n    return stdout, stderr, retcode\n\n\ndef is_windows():\n    return platform.system() == 'Windows'\n\n\ndef init_argparse():\n    parser = argparse.ArgumentParser(\n        usage='%(prog)s [OPTION] [FILE]...',\n        description='Serialize an Octopus project to a Terraform module'\n    )\n    parser.add_argument('--terraform-backend',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.ThisInstance.Terraform.Backend') or get_octopusvariable_quiet(\n                            'ThisInstance.Terraform.Backend') or 'pg',\n                        help='Set this to the name of the Terraform backend to be included in the generated module.')\n    parser.add_argument('--server-url',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.ThisInstance.Server.Url') or get_octopusvariable_quiet(\n                            'ThisInstance.Server.Url'),\n                        help='Sets the server URL that holds the project to be serialized.')\n    parser.add_argument('--api-key',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.ThisInstance.Api.Key') or get_octopusvariable_quiet(\n                            'ThisInstance.Api.Key'),\n                        help='Sets the Octopus API key.')\n    parser.add_argument('--space-id',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.Id') or get_octopusvariable_quiet(\n                            'Exported.Space.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),\n                        help='Set this to the space ID containing the project to be serialized.')\n    parser.add_argument('--upload-space-id',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Octopus.UploadSpace.Id') or get_octopusvariable_quiet(\n                            'Octopus.UploadSpace.Id') or get_octopusvariable_quiet('Octopus.Space.Id'),\n                        help='Set this to the space ID of the Octopus space where ' +\n                             'the resulting package will be uploaded to.')\n    parser.add_argument('--ignored-library-variable-sets',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IgnoredLibraryVariableSet') or get_octopusvariable_quiet(\n                            'Exported.Space.IgnoredLibraryVariableSet'),\n                        help='A comma separated list of library variable sets to ignore.')\n\n    parser.add_argument('--ignored-all-library-variable-sets',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IgnoredAllLibraryVariableSet') or get_octopusvariable_quiet(\n                            'Exported.Space.IgnoredAllLibraryVariableSet') or 'false',\n                        help='Set to true to exclude library variable sets from the exported module')\n\n    parser.add_argument('--ignored-tenants',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IgnoredTenants') or get_octopusvariable_quiet(\n                            'Exported.Space.IgnoredTenants'),\n                        help='A comma separated list of tenants ignore.')\n\n    parser.add_argument('--ignored-tenants-with-tag',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IgnoredTenantTags') or get_octopusvariable_quiet(\n                            'Exported.Space.IgnoredTenants'),\n                        help='A comma separated list of tenant tags that identify tenants to ignore.')\n    parser.add_argument('--ignore-all-targets',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IgnoreTargets') or get_octopusvariable_quiet(\n                            'Exported.Space.IgnoreTargets') or 'false',\n                        help='Set to true to exclude targets from the exported module')\n\n    parser.add_argument('--dummy-secret-variables',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.DummySecrets') or get_octopusvariable_quiet(\n                            'Exported.Space.DummySecrets') or 'false',\n                        help='Set to true to set secret values, like account and feed passwords, to a dummy value by default')\n\n    parser.add_argument('--default-secret-variables',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.DefaultSecrets') or get_octopusvariable_quiet(\n                            'Exported.Space.DefaultSecrets') or 'false',\n                        help='Set to true to set sensitive variables to the octostache template that represents the variable')\n    parser.add_argument('--include-step-templates',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IncludeStepTemplates') or get_octopusvariable_quiet(\n                            'Exported.Space.IncludeStepTemplates') or 'false',\n                        help='Set this to true to include step templates in the exported module. ' +\n                             'This disables the default behaviour of detaching step templates.')\n    parser.add_argument('--ignored-accounts',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.IgnoredAccounts') or get_octopusvariable_quiet(\n                            'Exported.Space.IgnoredAccounts'),\n                        help='A comma separated list of accounts to ignore.')\n    parser.add_argument('--octopus-managed-terraform-vars',\n                        action='store',\n                        default=get_octopusvariable_quiet(\n                            'SerializeSpace.Exported.Space.OctopusManagedTerraformVars') or get_octopusvariable_quiet(\n                            'Exported.Space.OctopusManagedTerraformVars'),\n                        help='The name of an Octopus variable to use as the terraform.tfvars file.')\n\n    return parser.parse_known_args()\n\n\ndef get_latest_github_release(owner, repo, filename):\n    url = f\"https://api.github.com/repos/{owner}/{repo}/releases/latest\"\n    releases = urllib.request.urlopen(url).read()\n    contents = json.loads(releases)\n\n    download = [asset for asset in contents.get('assets') if asset.get('name') == filename]\n\n    if len(download) != 0:\n        return download[0].get('browser_download_url')\n\n    return None\n\n\ndef ensure_octo_cli_exists():\n    if is_windows():\n        print(\"Checking for the Octopus CLI\")\n        try:\n            stdout, _, exit_code = execute(['octo.exe', 'help'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octo CLI not found\"\n            return \"\"\n        except:\n            print(\"Downloading the Octopus CLI\")\n            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.win-x64.zip',\n                        'OctopusTools.zip')\n            with zipfile.ZipFile('OctopusTools.zip', 'r') as zip_ref:\n                zip_ref.extractall(os.getcwd())\n            return os.getcwd()\n    else:\n        print(\"Checking for the Octopus CLI for Linux\")\n        try:\n            stdout, _, exit_code = execute(['octo', 'help'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octo CLI not found\"\n            return \"\"\n        except:\n            print(\"Downloading the Octopus CLI for Linux\")\n            urlretrieve('https://download.octopusdeploy.com/octopus-tools/9.0.0/OctopusTools.9.0.0.linux-x64.tar.gz',\n                        'OctopusTools.tar.gz')\n            with tarfile.open('OctopusTools.tar.gz') as file:\n                file.extractall(os.getcwd())\n                os.chmod(os.path.join(os.getcwd(), 'octo'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)\n            return os.getcwd()\n\n\ndef ensure_octoterra_exists():\n    if is_windows():\n        print(\"Checking for the Octoterra tool for Windows\")\n        try:\n            stdout, _, exit_code = execute(['octoterra.exe', '-version'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octoterra not found\"\n            return \"\"\n        except:\n            print(\"Downloading Octoterra CLI for Windows\")\n            retry_with_backoff(lambda: urlretrieve(\n                \"https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_windows_amd64.exe\",\n                'octoterra.exe'), 10, 30)\n            return os.getcwd()\n    else:\n        print(\"Checking for the Octoterra tool for Linux\")\n        try:\n            stdout, _, exit_code = execute(['octoterra', '-version'])\n            printverbose(stdout)\n            if not exit_code == 0:\n                raise \"Octoterra not found\"\n            return \"\"\n        except:\n            print(\"Downloading Octoterra CLI for Linux\")\n            retry_with_backoff(lambda: urlretrieve(\n                \"https://github.com/OctopusSolutionsEngineering/OctopusTerraformExport/releases/latest/download/octoterra_linux_amd64\",\n                'octoterra'), 10, 30)\n            os.chmod(os.path.join(os.getcwd(), 'octoterra'), stat.S_IRWXO | stat.S_IRWXU | stat.S_IRWXG)\n            return os.getcwd()\n\n\noctocli_path = ensure_octo_cli_exists()\noctoterra_path = ensure_octoterra_exists()\nparser, _ = init_argparse()\n\n# Variable precondition checks\nif len(parser.server_url) == 0:\n    print(\"--server-url, ThisInstance.Server.Url, or SerializeSpace.ThisInstance.Server.Url must be defined\")\n    sys.exit(1)\n\nif len(parser.api_key) == 0:\n    print(\"--api-key, ThisInstance.Api.Key, or SerializeSpace.ThisInstance.Api.Key must be defined\")\n    sys.exit(1)\n\n\nprint(\"Octopus URL: \" + parser.server_url)\nprint(\"Octopus Space ID: \" + parser.space_id)\n\n# Build the arguments to ignore library variable sets\nignores_library_variable_sets = parser.ignored_library_variable_sets.split(',')\nignores_library_variable_sets_args = [['-excludeLibraryVariableSetRegex', x] for x in ignores_library_variable_sets if\n                                      x.strip() != '']\n\n# Build the arguments to ignore tenants\nignores_tenants = parser.ignored_tenants.split(',')\nignores_tenants_args = [['-excludeTenants', x] for x in ignores_tenants if x.strip() != '']\n\n# Build the arguments to ignore tenants with tags\nignored_tenants_with_tag = parser.ignored_tenants_with_tag.split(',')\nignored_tenants_with_tag_args = [['-excludeTenantsWithTag', x] for x in ignored_tenants_with_tag if x.strip() != '']\n\n# Build the arguments to ignore accounts\nignored_accounts = parser.ignored_accounts.split(',')\nignored_accounts = [['-excludeAccountsRegex', x] for x in ignored_accounts]\n\nos.mkdir(os.getcwd() + '/export')\n\nexport_args = [os.path.join(octoterra_path, 'octoterra'),\n               # the url of the instance\n               '-url', parser.server_url,\n               # the api key used to access the instance\n               '-apiKey', parser.api_key,\n               # add a postgres backend to the generated modules\n               '-terraformBackend', parser.terraform_backend,\n               # dump the generated HCL to the console\n               '-console',\n               # dump the project from the current space\n               '-space', parser.space_id,\n               # Use default dummy values for secrets (e.g. a feed password). These values can still be overridden if known,\n               # but allows the module to be deployed and have the secrets updated manually later.\n               '-dummySecretVariableValues=' + parser.dummy_secret_variables,\n               # for any secret variables, add a default value set to the octostache value of the variable\n               # e.g. a secret variable called \"database\" has a default value of \"#{database}\"\n               '-defaultSecretVariableValues=' + parser.default_secret_variables,\n               # Add support for experimental step templates\n               '-experimentalEnableStepTemplates=' + parser.include_step_templates,\n               # Don't export any projects\n               '-excludeAllProjects',\n               # Output variables allow the Octopus space and instance to be determined from the Terraform state file.\n               '-includeOctopusOutputVars',\n               # Provide an option to ignore targets.\n               '-excludeAllTargets=' + parser.ignore_all_targets,\n               # Provide an option to exclude all library variable sets\n               '-excludeAllLibraryVariableSets=' + parser.ignored_all_library_variable_sets,\n               # Define the name of an Octopus variable to populte the terraform.tfvars file\n               '-octopusManagedTerraformVars=' + parser.octopus_managed_terraform_vars,\n               # The directory where the exported files will be saved\n               '-dest', os.getcwd() + '/export'] + list(\n    chain(*ignores_library_variable_sets_args, *ignores_tenants_args, *ignored_tenants_with_tag_args,\n          *ignored_accounts))\n\nprint(\"Exporting Terraform module\")\n_, _, octoterra_exit = execute(export_args)\n\nif not octoterra_exit == 0:\n    print(\"Octoterra failed. Please check the verbose logs for more information.\")\n    sys.exit(1)\n\ndate = datetime.now().strftime('%Y.%m.%d.%H%M%S')\n\nprint('Looking up space name')\nurl = parser.server_url + '/api/Spaces/' + parser.space_id\nheaders = {\n    'X-Octopus-ApiKey': parser.api_key,\n    'Accept': 'application/json'\n}\nrequest = urllib.request.Request(url, headers=headers)\n\n# Retry the request for up to a minute.\nresponse = None\nfor x in range(12):\n    response = urllib.request.urlopen(request)\n    if response.getcode() == 200:\n        break\n    time.sleep(5)\n\nif not response or not response.getcode() == 200:\n    print('The API query failed')\n    sys.exit(1)\n\ndata = json.loads(response.read().decode(\"utf-8\"))\nprint('Space name is ' + data['Name'])\n\nprint(\"Creating Terraform module package\")\nif is_windows():\n    execute([os.path.join(octocli_path, 'octo.exe'),\n             'pack',\n             '--format', 'zip',\n             '--id', re.sub('[^0-9a-zA-Z]', '_', data['Name']),\n             '--version', date,\n             '--basePath', os.getcwd() + '\\\\export',\n             '--outFolder', os.getcwd()])\nelse:\n    _, _, _ = execute([os.path.join(octocli_path, 'octo'),\n                       'pack',\n                       '--format', 'zip',\n                       '--id', re.sub('[^0-9a-zA-Z]', '_', data['Name']),\n                       '--version', date,\n                       '--basePath', os.getcwd() + '/export',\n                       '--outFolder', os.getcwd()])\n\nprint(\"Uploading Terraform module package\")\nif is_windows():\n    _, _, _ = execute([os.path.join(octocli_path, 'octo.exe'),\n                       'push',\n                       '--apiKey', parser.api_key,\n                       '--server', parser.server_url,\n                       '--space', parser.upload_space_id,\n                       '--package', os.getcwd() + \"\\\\\" +\n                       re.sub('[^0-9a-zA-Z]', '_', data['Name']) + '.' + date + '.zip',\n                       '--replace-existing'])\nelse:\n    _, _, _ = execute([os.path.join(octocli_path, 'octo'),\n                       'push',\n                       '--apiKey', parser.api_key,\n                       '--server', parser.server_url,\n                       '--space', parser.upload_space_id,\n                       '--package', os.getcwd() + \"/\" +\n                       re.sub('[^0-9a-zA-Z]', '_', data['Name']) + '.' + date + '.zip',\n                       '--replace-existing'])\n\nprint(\"##octopus[stdout-default]\")\n\nprint(\"Done\")\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "Python"
-  },
-  "Parameters": [
-    {
-      "Id": "b9a96f7f-d8bc-408b-a614-5646bf44d092",
-      "Name": "SerializeSpace.ThisInstance.Terraform.Backend",
-      "Label": "Terraform Backend",
-      "HelpText": "The [backed](https://developer.hashicorp.com/terraform/language/settings/backends/configuration) to define in the Terraform module.",
-      "DefaultValue": "s3",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "941e2310-7ea0-4e76-a528-c65c9b68f8e7",
-      "Name": "SerializeSpace.ThisInstance.Server.Url",
-      "Label": "Octopus Server URL",
-      "HelpText": "The URL of the Octopus Server hosting the project to be serialized.",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6799b358-e3a5-4668-a12f-5e10e092c1c9",
-      "Name": "SerializeSpace.ThisInstance.Api.Key",
-      "Label": "Octopus API Key",
-      "HelpText": "The Octopus API Key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "950d7bb5-c80b-42a8-84a5-a7012d0fe7ca",
-      "Name": "SerializeSpace.Exported.Space.Id",
-      "Label": "Octopus Space ID",
-      "HelpText": "The Space ID containing the project to be exported",
-      "DefaultValue": "#{Octopus.Space.Id}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "64acb2fe-b713-4f69-b08b-34546dd808cd",
-      "Name": "SerializeSpace.Octopus.UploadSpace.Id",
-      "Label": "Octopus Upload Space ID",
-      "HelpText": "The ID of the space to upload the Terraform package to. Leave this blank to upload to the space defined in the `Octopus Space ID` parameter.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e6b3d298-87e8-4965-966e-230537b4dd4c",
-      "Name": "SerializeSpace.Exported.Space.IgnoredLibraryVariableSet",
-      "Label": "Ignored Library Variables Sets",
-      "HelpText": "A comma separated list of library variables sets that will not be included in the Terraform module. These library variable sets are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b946a235-a1c1-4b04-83da-ecef622c018a",
-      "Name": "SerializeSpace.Exported.Space.IgnoredAllLibraryVariableSet",
-      "Label": "Ignore All Library Variable Sets",
-      "HelpText": "Check this option to ignore all library variable sets when serializing the Terraform module. This is useful when the downstream space already has library variable sets created.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "1208c54c-568a-4a48-9340-fbff710079b3",
-      "Name": "SerializeSpace.Exported.Space.IgnoredTenants",
-      "Label": "Ignored Tenants",
-      "HelpText": "A comma separated list of tenants that will not be included in the Terraform module. These tenants are often those used by Runbooks to identify managed spaces or instances, but which must not be recreated.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9121bc1d-df00-4ec7-ae1c-751261d2438d",
-      "Name": "SerializeSpace.Exported.Space.IgnoredAccounts",
-      "Label": "Ignored Accounts",
-      "HelpText": "A comma separated list of accounts that will not be included in the Terraform module. These accounts are often those used by Runbooks that are not included in the module, and so do not need to be referenced.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c33810ae-0f53-421d-b11a-9161bfdd0df8",
-      "Name": "SerializeSpace.Exported.Space.IgnoreTargets",
-      "Label": "Ignore All Targets",
-      "HelpText": "Check this option to ignore the targets when serializing the Terraform module. This is useful when downstream spaces require their own unique targets to work correctly.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "a8e8163e-0981-4496-a844-b16281d8ce1c",
-      "Name": "SerializeSpace.Exported.Space.DummySecrets",
-      "Label": "Default Secrets to Dummy Values",
-      "HelpText": "This option sets the default value of all secrets, like account and feed passwords, to a dummy value. This allows the resources to be created and then updated at a later time with the correct values. Note the default values can be overridden if they are known.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "c068b289-5d29-4e90-b2ca-1098858044a2",
-      "Name": "SerializeSpace.Exported.Space.DefaultSecrets",
-      "Label": "Default Secrets to Default Values",
-      "HelpText": "This option sets the default value of all secrets, like account and feed passwords, to an Octostache template referencing the variable name. This allows the default value to be replaced by Octopus with the sensitive value during deployment.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "e7cbd75d-39f1-40ad-a41a-8eed8a65902c",
-      "Name": "SerializeSpace.Exported.Space.IgnoredTenantTags",
-      "Label": "Ignore Tenants with Tag",
-      "HelpText": "A comma separated list of tenant tags that identify tenants to exclude from the export. Typically tenants that represent internal teams or business units will have a tag like `TenantType/InternalCustomer` to distinguish them from other kinds of tenants.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f312be91-cc8f-49d6-afd7-fc6a6e38926c",
-      "Name": "SerializeSpace.Exported.Space.IncludeStepTemplates",
-      "Label": "Include Step Templates",
-      "HelpText": "Enable this option to export step templates.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "5944a2ce-e435-406b-a878-c499a6db4d6a",
-      "Name": "SerializeSpace.Exported.Space.OctopusManagedTerraformVars",
-      "Label": "Octopus Managed Terraform Vars",
-      "HelpText": "The optional name of an Octopus variable to use as the terraform.tfvars file.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-10-24T05:39:19.004Z",
-    "OctopusVersion": "2023.4.6612",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query.json b/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query.json
deleted file mode 100644
index 34f5b755b..000000000
--- a/step-templates/octopus-set-Octopus-releaese-notes-from-TFS-query.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "Id": "c6faf6be-296c-44ee-abf6-ce87331b2557",
-  "Name": "Set Octopus release notes from TFS query",
-  "Description": "Sets Octopus release notes from TFS query",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#TFS\n$instance = $OctopusParameters[\"tfsInstance\"]\n$collection = $OctopusParameters[\"tfsCollection\"]\n$project = $OctopusParameters[\"tfsProject\"]\n$PAT = $OctopusParameters[\"tfsPat\"]\n$pathquery = $OctopusParameters[\"tfsPathQuery\"]\n\n#Octopus\n$octopusAPIKey = $OctopusParameters['octopusAPIKey']\n$baseUri = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}']\n$octopusProjectId = $OctopusParameters['Octopus.Project.Id']\n$thisReleaseNumber = $OctopusParameters['Octopus.Release.Number']\n\nwrite-host \"Instance: $($instance)\"\nwrite-host \"collection: $($collection)\"\nwrite-host \"project: $($project)\"\nwrite-host \"baseUri: $($baseUri)\"\nwrite-host \"projectId: $($projectId)\"\nwrite-host \"thisReleaseNumber: $($thisReleaseNumber)\"\nwrite-host \"TFS path: $($pathquery)\"\n\n#Create HEADERS\n$bytes = [System.Text.Encoding]::ASCII.GetBytes($PAT)\n$base64 = [System.Convert]::ToBase64String($bytes)\n$basicAuthValue = \"Basic $base64\"\n$headers = @{ }\n$headers.Add(\"Authorization\", $basicAuthValue)\n$headers.Add(\"Accept\",\"application/json\")\n$headers.Add(\"Content-Type\",\"application/json\")\n\n$reqheaders = @{\"X-Octopus-ApiKey\" = $octopusAPIKey }\n$putReqHeaders = @{\"X-HTTP-Method-Override\" = \"PUT\"; \"X-Octopus-ApiKey\" = $octopusAPIKey }\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-WebRequest \"$baseUri/api\" -Headers $reqheaders -UseBasicParsing | ConvertFrom-Json;\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif(Test-SpacesApi) {\n\t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n    }\n\t$baseApiUrl = \"/api/$spaceId\" ;\n} else {\n\t$baseApiUrl = \"/api\" ;\n}\n\n# Get the current release\n$releaseUri = \"$baseUri$baseApiUrl/projects/$octopusProjectId/releases/$thisReleaseNumber\"\nwrite-host \"Release uri $($releaseUri)\"\ntry {\n    $currentRelease = Invoke-RestMethod $releaseUri -Headers $reqheaders -UseBasicParsing \n} catch {\n    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {\n        $result = $_.Exception.Response.GetResponseStream()\n        $reader = New-Object System.Io.StreamReader($result);\n        $responseBody = $reader.ReadToEnd();\n        throw \"Error occurred: $responseBody\"\n    }\n}\n\nif(![string]::IsNullOrWhiteSpace($currentRelease.ReleaseNotes)){\n\twrite-host \"Release notes already filled in. $($currentRelease.ReleaseNotes)\"\n    Set-OctopusVariable -name \"ReleaseNotes\" -value $releaseNotes\n\texit;\n}\n\n\n#Get projectid\n$url = \"http://$($instance)/tfs/$($collection)/$($projectId)/_apis/projects/$($project)?&includeCapabilities=false&includeHistory=false&api-version=2.2\"\nwrite-host \"Invoking url= $($url)\"\n$projectresponse = Invoke-RestMethod $url -Method GET -Headers $headers\n\n$projectid = $projectresponse.id\nwrite-host \"projectid $($projectid)\"\n\n#Get the ID of the query to execute\n$queryResult = Invoke-RestMethod \"http://$($instance)/tfs/$($collection)/$($projectId)/_apis/$($pathquery)?$depth=1&api-version=2.2\" -Method GET -Headers $headers\nwrite-host \"queryResult $($queryResult)\"\n\n#https://{instance}/DefaultCollection/[{project}/]_apis/wit/wiql/{id}?api-version={version}\n$queryResult = Invoke-RestMethod \"http://$($instance)/tfs/$($collection)/$($projectId)/_apis/wit/wiql/$($queryResult.Id)?api-version=2.2\" -Method GET -Headers $headers\n\nWrite-Host \"Found $($queryResult.workItems.Count) number of workitems for query: ReleaseNotes$($releaseTag)\"\n\n$releaseNotes = \"**Work Items:**\"\n\n\nif($queryResult.workItems.Count -eq 0)\n{\n\tWrite-Host \"No work items for release\"\n\t$releaseNotes = \"`n no new work items\"\n}\nelse\n{\n\t#Create a list of ids\n\t$ids = [string]::Join(\"%2C\", ($queryResult.workItems.id))\n\n\t#Get all the work items\n\t$workItems = Invoke-RestMethod  \"http://$($instance)/tfs/$($collection)/_apis/wit/workItems?ids=$($ids)&fields=System.Title\" -Method GET -Headers $headers\n\n\tforeach($workItem in $workItems.value)\n\t{\n\t\t#Add line for each work item\n\t\t$releaseNotes = $releaseNotes + \"`n* [$($workItem.id)] (http://$($instance)/tfs/$($collection)/9981e67f-b27c-4628-b5cf-fba1d327aa07/_workitems/edit/$($workItem.id)) : $($workItem.fields.'System.Title')\"\n\t}\n\n}\n\n\n\n# Update the release notes for the current release\n$currentRelease.ReleaseNotes = $releaseNotes \nwrite-host \"Release notes $($currentRelease.ReleaseNotes)\"\nWrite-Host \"Updating release notes for $thisReleaseNumber`:`n`n\"\ntry {\n    $releaseUri = \"$baseUri$baseApiUrl/releases/$($currentRelease.Id)\"\n    write-host \"Release uri $($releaseUri)\"\n    $currentReleaseBody = $currentRelease | ConvertTo-Json\n    write-host \"Current release body $($currentReleaseBody)\"\n    $result = Invoke-RestMethod $releaseUri -Method Post -Headers $putReqHeaders -Body $currentReleaseBody -UseBasicParsing\n\twrite-host \"result $($result)\"\n} catch {\n    $result = $_.Exception.Response.GetResponseStream()\n    $reader = New-Object System.Io.StreamReader($result);\n    $responseBody = $reader.ReadToEnd();\n    Write-Host \"error $($responseBody)\"\n    throw \"Error occurred: $responseBody\"\n}\n\nSet-OctopusVariable -name \"ReleaseNotes\" -value $releaseNotes\n"
-  },
-  "Parameters": [
-    {
-      "Id": "08ce7e1a-7251-4b9f-bd07-f63cbfbc7f20",
-      "Name": "tfsInstance",
-      "Label": "TFS Instance",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "85eff544-5275-420f-81d8-cf01ea42d903",
-      "Name": "tfsCollection",
-      "Label": "Collection",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "a423bf6c-52be-4994-8bab-2d64f05f167f",
-      "Name": "tfsProject",
-      "Label": "Project",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "1db49bf8-d38a-4ae7-b858-693c584272d5",
-      "Name": "tfsPat",
-      "Label": "Personal access token",
-      "HelpText": "Personal access token to retrieve from TFS",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "0427c73a-2925-4c55-a2ce-5584cd24b1dd",
-      "Name": "octopusAPIKey",
-      "Label": "Octopus API key",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2023-02-16T15:38:44.043Z",
-    "OctopusVersion": "2021.1.7687",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-smtp-server-configured.json b/step-templates/octopus-smtp-server-configured.json
deleted file mode 100644
index 6b46f08f2..000000000
--- a/step-templates/octopus-smtp-server-configured.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "Id": "ad8126be-37af-4297-b46e-fce02ba3987a",
-  "Name": "Octopus - Check SMTP Server Configured",
-  "Description": "Checks that the SMTP server has been configured.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$apiKey = \"#{SmtpCheck.Octopus.Api.Key}\"\n$isSmtpConfigured = $false\n\nif (![string]::IsNullOrWhitespace($apiKey) -and $apiKey.StartsWith(\"API-\"))\n{\n    if ([String]::IsNullOrWhitespace(\"#{Octopus.Web.ServerUri}\"))\n    {\n        $octopusUrl = \"#{Octopus.Web.BaseUrl}\"\n    }\n    else\n    {\n        $octopusUrl = \"#{Octopus.Web.ServerUri}\"\n    }\n\n    $uriBuilder = New-Object System.UriBuilder(\"$octopusUrl/api/smtpconfiguration/isconfigured\")\n    $uri = $uriBuilder.ToString()\n\n    try\n    {\n        $headers = @{ \"X-Octopus-ApiKey\" = $apiKey }\n        $smtpConfigured = Invoke-RestMethod -Method Get -Uri $uri -Headers $headers\n        $isSmtpConfigured = $smtpConfigured.IsConfigured\n    }\n    catch\n    {\n        Write-Host \"Error checking SMTP configuration: $($_.Exception.Message)\"\n    }\n}\nelse\n{\n    Write-Highlight \"The project variable SmtpCheck.Octopus.Api.Key has not been configured, unable to check SMTP configuration.\"\n    Write-Highlight \"See the [Octopus documentation](https://octopus.com/docs/octopus-rest-api/how-to-create-an-api-key) for details on creating API keys.\"\n    Write-Highlight \"Once you have an API key, add it to the $($OctopusParameters['Octopus.Step.Name']) step to enable the ability to check the SMTP configuration.\"\n}\n\nif (-not $isSmtpConfigured)\n{\n    Write-Highlight \"SMTP is not configured. Please [configure SMTP](https://octopus.com/docs/projects/built-in-step-templates/email-notifications#smtp-configuration) settings in Octopus Deploy.\"\n}\n\nSet-OctopusVariable -Name SmtpConfigured -Value $isSmtpConfigured"
-  },
-  "Parameters": [
-    {
-      "Id": "d48a2f7f-f895-459a-ae63-e81c8eb24d43",
-      "Name": "SmtpCheck.Octopus.Api.Key",
-      "Label": "Octopus API Key",
-      "HelpText": "The API key used to access the Octopus instance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-10-12T23:48:48.086Z",
-    "OctopusVersion": "2025.3.14357",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "Octopus"
-}
diff --git a/step-templates/octopus-support-export.json b/step-templates/octopus-support-export.json
deleted file mode 100644
index 02cca6dc9..000000000
--- a/step-templates/octopus-support-export.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "Id": "de1fb4d2-5cc7-43cc-8dfc-633d63e97c92",
-  "Name": "Octopus - Support Export",
-  "Description": "This step template will take an already exported project on your server and do the following:\n- Change all sensitive variables to plain text variables, and the values will become \"Sensitive Variable Was Here\"\n- All accounts will have their details nulled out\n- All certificates will have junk data put into their json\n\nAfter the above is complete, the modified zip file will be attached to the task that you can download and send to support. Please remember, support will still need the password you used to create the original export, but now there will be no sensitive data available.\n\nNOTE: This step template currently DOES NOT purge any Tenant variables. If you have any Tenants connected to this project with variables you are concerned about sharing, you will need to import the modified zip into a blank space and remove the values, and re-export for now. This functionality will come in a future update to the step template.\n\n**NOTE: This template only works on Octopus Server 2021.1 and above, as it requires project import/export to be available.**",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Add-Type -AssemblyName System.Web\n\n#Gathering Parameters\n[string]$SpaceName = $OctopusParameters[\"SupportExportSpaceName\"]\n[string]$APIKey = $OctopusParameters[\"SupportExportAPIKey\"]\n[string]$serverTaskId = $OctopusParameters[\"SupportExportTaskID\"]\n[string]$OctopusURL = $OctopusParameters[\"SupportExportServerURL\"]\n\nif ([string]::IsNullOrEmpty($SpaceName)){\n\tWrite-Error \"You did not supply a space name. The space name is required.\"\n    exit\n}\nif ([string]::IsNullOrEmpty($APIKey)){\n\tWrite-Error \"You did not supply an API Key. An API Key is required.\"\n    exit\n}\nif ([string]::IsNullOrEmpty($serverTaskId)){\n\tWrite-Error \"You did not supply the task ID of the export task you want to be scrubbed. This parameter is required.\"\n    exit\n}\n\n#If the Server URL parameter was empty, use the ServerURI if it exists, if not, use the BaseURL, which could result in a failed connection in some environments so it's a last resort.\nif ([string]::IsNullOrEmpty($OctopusURL))\n{\n    if ([string]::IsNullOrEmpty(\"#{Octopus.Web.ServerUri}\")){\n         $OctopusURL = \"#{Octopus.Web.BaseUrl}\"\n    }\n    else{\n         $OctopusURL = \"#{Octopus.Web.ServerUri}\"\n    }\n}\n$header = @{ \"X-Octopus-ApiKey\" = $APIKey }\n$fileDownloadPath = \"#{env:OctopusCalamariWorkingDirectory}\"\n\n#Junk Certificate to overwrite the exported certs with\n$junkCert = @\"\n {\n  \"CertificateData\": \"ZV+cWXHpMqMfmZrMXndg+8TGup8TkDYQUrHVU8Q/b2wJwjpj5QqDry43RUWUX7FNbGwqCtLI5PtKZ9C6gfGdAUYK6frdal/IatPrVZV+uLQZKEE4S+ky5bu8U8WQ7KjQP70i39ayde2N1nnhXpdjbhYBqky3rFwdzRH3O1qOA+aJWOQs7tUgMP+A+2N+jRGanMAwhBNyAsk//84mgWxBFCdx6HJFAvfD4oxa6uQHURl34GFvk1CS2EKdfyqSjrz8nle1YYD68L4kBvERAyZvnzMW34fpUfNNEd9KepIKWbmNhO87yPgaspUFF2LV2tEsu2AXv1l4Rhzn+8cHsTsCJMEz1VPVPJ217+OZIudSJMo0Zx5YVJHpOsRwKL6n3fYYrFYqMZG/DIoRK+SlmgHcmsZ0YfA5NmCprppLxzOmWbsD6t6gOFUAhPj9G314GDfAmV3B54rWXqWnR/VEGc778rfw+mSHScpJAt0fA/xEZgsbd6CQYYmOGvwx2tOYSE3l56QTQEBatCv+zdWRH3dI7Tdr8Yrf2zrHACXDdk+/19oNBVSWsgwgDg/xu+4p9Y/ZyW1pZFbY6ZEgTTegeNbl5U6Lkb8QlMMFd98yDiQqhKSeDanF4N+yrwefhV+JGmfiOzhgcO3zEHf6gFALZnk9umf2y38fRnOc9rfOymG0rlDr+S6Rx3Xc0vvqH/FeS7e/ctc3dmKB7bYC0KeJNWxEkGpJw0bdudM+nJnjVvCmDfjBCW1ScKTpm9sZ02E/SPiL9gGUds1hAALtdZ70UDSjyDvlPKxPu/w0lPLUqPgSavCeoLTVfGZVVY9rHLOKDTvRlqSMzl90TdovuXGcDHqyQL8T5imRRAhxGaaVZxmLzGXoPWacNkAP79wrnGkKU6GHSNZfC9CtZ21FVGAyEZPyRuXc9nhWPcyl4/rdt+ne/5c96E/lwTmV2thRKdD0awDkQmWji+6+aJUtSCpw69xJcCIVzb3g/4j02ugZAL8/jjDPiLLytWRUNTTSH/RSpPnHUPi0/ciiGev8O7AblGA8Z7g7ok1WOl8FBERvUd3hpX6z0nbrKe4za7ydNivNNouWEpKZoenC82BoQAGkkCHcNio1UJYWn8Ri3W15Eml+bZ2Z4qbeUWp5ro2kwL4vwyte941FGOJEv4YBA4EKeRbr2oY1wzFFxq0kcLXdR42Bqpcn3HXdYSkl/ZmyNh33AWa4ooda51ouBJ6Ae43U201xt8OXow/w2mo913z3uclBG0pJcoHc4o1uQS6/ZTp6hxEPvOmJNc1c14E5gykUNuSs0u1TAVra49W486XOAniSb9RvnJ1iqja2aUeY4B835cjTeAx5xBIL+ESwxBpiFeCy5IyhNINOL3lWW+H1NruCC+otPVUVroYenPXRHXA0dng/koPgQ89Ck0/8dQ/SJM/IP0fyJE7NFZWu9XofcpfTSk6Pte17R3m4VuTYjx/oG0tkq3UL4s0Khj0s+H3CISK2Qc0BwE1S1l9bQ5Ukz1v7HFcn77mKgzk5PB4sowMrwWyBtLMcVF2d460Aa0eM8/OA1m9ZrkzAeBGRUMy9dLQAAowGMYui5TfGNUBlVeBaMc1IoKpJUgcvAu5sYcPJvOOLO1wRUFIhu9qwlHbAx/hl6ZfxShDx5BZV8eN60dMm7N34PuZpe/mL80P3z+SNLz9NuBjM5lg82O25dOBkTYRZFt6Hmmc3431vLLvbCMvhcRJNuaa/p3JPjY/uXEuzknQ2/hw9YvgY2+BrovE6SoWlPsppfisTcGhYx80hOGX4kzMpNNW+XeD0o7SWXvCIq2VrI1dQWgZ0AIgOv7oaVmQ2isaJyaGG4P6Uz39BOoBzH4k/beSFt3RwF2DELk1hVbk8F/XieQlzgrqBalFpJZ8sdlRDAKntdSolxQEMrwKAIHeiJxtV9rwOhubTFlcJEyDISwVTz1j5lWrj6j/dv4lzLVIY58lwzqhOrh734OU/N9pr0rCZViiAl3adh7gVLpMNRZ4RJPBAKbbZImkeA/eFAxXEhi5fS9R3gUyHvqxwOySTIVPXXRENRgjdnq9cmqtszpw/1Bm4cN/iD+H0kh7UA98X48iJ3VxdWfe7qjJFcz6euyRKdejxZMrk2rfHAu7kcMIcDuACsoqRxPADPVJFGbMxJDrB6B0MfLxettxX3crmLfzknkHWsVvCW3mdZcNYszf8N7VJ/fFI7oNhq6ptq3yaeJqOTBNFUD9PcITkH4P3iUYlOf4jS2rXuLmcGDqKGQ2EzUa7YFUa3iwp5iOQnnfG4xpGGYhUz/QZHKNNufklgzFpVONn2rCfxLeHxbaZodny3uAQJiqNPQzLaBLqt1Jh/F+l9h/TEfjfIsXwygoIsPXRW6dlxa/Zkqy7+4fGQp8L7wjYWmZi+icq4pnI6ai4sqIKuz+xQGtwV2JLy8kLKaXzA7jTDV0wzJ7pmwAzbkX24sLznBYD4wUbb0Ix7G8=|AAAAAAAAAAAAAAAAAAAAAA==\",\n  \"Password\": null,\n  \"CertificateMetadata\": {\n    \"Type\": \"Valid\",\n    \"CertificateDataFormat\": \"Pem\",\n    \"HasPrivateKey\": false,\n    \"RootCertificate\": {\n      \"Version\": 3,\n      \"SerialNumber\": \"01\",\n      \"SignatureAlgorithmName\": \"SHA-1withRSA\",\n      \"NotBefore\": \"2014-01-28T15:36:55-05:00\",\n      \"NotAfter\": \"2024-01-26T15:36:55-05:00\",\n      \"SubjectName\": \"CN=www.dimi.fr,O=Internet Widgits Pty Ltd,ST=Some-State,C=FR\",\n      \"IssuerName\": \"E=dimi@dimi.fr,CN=Dimi CA,OU=NSBU,O=Dimi,L=Paris,ST=Some-State,C=FR\",\n      \"Thumbprint\": \"AD42744CC010C079D9CC08A17A45414C8140B1E7\",\n      \"SubjectAlternativeNames\": []\n    },\n    \"CertificateChain\": []\n  }\n  }\n\n\n\"@\n$junkCert = $junkCert | ConvertFrom-Json\n\nWrite-Host \"Getting the space information\"\n$spaceList = Invoke-RestMethod -Method Get -Uri \"$OctopusUrl/api/spaces?skip=0&take=10&partialName=$([System.Web.HTTPUtility]::UrlEncode($spaceName))\" -Headers $header\n$space = $spaceList.Items | Where-Object {$_.Name -eq $spaceName}\n$spaceId = $space.Id\n\n#Getting artifact from the export task\n$artifactList = Invoke-RestMethod -Method Get -Uri \"$OctopusUrl/api/$spaceId/artifacts?regarding=$serverTaskId\" -Headers $header\n$artifact = $artifactList.Items | Where-Object {$_.Filename -like \"*Octopus-Export*\"}\n$fullname = $artifact.Filename\n$artifactId = $artifact.Id\nWrite-Host \"Found $artifactId that matches expected file name Octopus-Export\"\n\nWrite-Host \"Getting file content\"\nInvoke-RestMethod -Method Get -Uri \"$OctopusUrl/api/$spaceId/artifacts/$artifactId/content\" -Headers $header -OutFile \"$($filedownloadpath)\\$($fullname)\"\nWrite-Host \"File content written to $fileDownloadPath\"\n\n$ExportFile = \"$($filedownloadpath)\\$($fullname)\"\n\n$OriginalFileName = (Get-Item $ExportFile).BaseName\n$Path = \"$($fileDownloadPath)\\export\"\nExpand-Archive -Path $ExportFile -DestinationPath $Path\n$SearchInFilesWithFileNameMatching = \"variableset-*\"\n$TextToSearchFor = @(\"Sensitive*\",\"AzureAccount\",\"AmazonWebServicesAccount\",\"GoogleCloudAccount\",\"Certificate\")\n$PathArray = @()\n\n\nforeach ($text in $TextToSearchFor){\n    Get-ChildItem $Path | Where-Object {$_.Name -match $SearchInFilesWithFileNameMatching} | Where-Object { $_.Attributes -ne \"Directory\"} |\n    ForEach-Object {\n        If (Get-Content $_.FullName | Select-String -Pattern $text) {\n            $PathArray += $_.FullName\n        }\n    }\n}\n\n\nforeach ($file in $pathArray) {\n    $variableSnapshot = Get-Content -Path $file | ConvertFrom-Json\n    foreach ($variable in $variableSnapshot.Variables) {\n        #Check if the variable is a sensitive variable and make it a string and put junk there\n        if ($variable.Type -eq \"Sensitive\"){\n            $variable.Type = \"String\"\n            $variable.Value = \"Sensitive Variable Was Here\"        \n        }\n        #Check if the variable is an account, if so, null out everything but the account type and save the json back\n        if (($variable.Type -eq \"AzureAccount\") -or ($variable.Type -eq \"AmazonWebServicesAccount\") -or ($variable.Type -eq\"GoogleCloudAccount\")){\n           \n            if (Test-Path -Path \"$($Path)\\$($variable.value).json\"){\n                $tempJson = Get-Content -Path \"$($Path)\\$($variable.value).json\"\n                $tempJson = $tempJson | ConvertFrom-Json\n                foreach ($item in $tempJson.Details){\n                    $item.PSObject.Properties | ForEach-Object {\n                        if ($_.Name -ne \"AccountType\"){\n                            if ($_.Value -ne $null){\n                                $_.Value = $null\n                            }\n                        }\n                    }\n                }\n                $tempJson = $tempJson | ConvertTo-Json -Depth 10\n                Set-Content -Path \"$($Path)\\$($variable.value).json\" -Value $tempJson\n            }\n        }\n\n        #Check if the variable is a certificate, if so, make it equal to the junk cert that we created in the beginning\n        if ($variable.Type -eq \"Certificate\"){\n            \n            if (Test-Path -Path \"$($Path)\\$($variable.value).json\"){\n                $tempJson = Get-Content -Path \"$($Path)\\$($variable.value).json\"\n                $tempJson = $tempJson | ConvertFrom-Json\n\n                #overwriting pertinent data with junk\n                $tempJson.CertificateData = $junkCert.CertificateData\n                $tempJson.Password = $junkCert.Password\n                $tempJson.CertificateMetadata = $junkCert.CertificateMetadata\n\n\n                $tempJson = $tempJson | ConvertTo-Json -Depth 10\n                Set-Content -Path \"$($Path)\\$($variable.value).json\" -Value $tempJson\n\n            }\n        }\n    }\n    $variableSnapshot | ConvertTo-Json -Depth 100 | Out-File $file -Encoding UTF8\n}\n            \n            \n\nCompress-Archive -Path $Path\\* -DestinationPath \"$($fileDownloadPath)\\$($OriginalFileName)-Modified.zip\"\nRemove-Item $Path -Recurse\n\nNew-OctopusArtifact -Path \"$($fileDownloadPath)\\$($OriginalFileName)-Modified.zip\" -Name \"$($OriginalFileName)-Modified.zip\""
-  },
-  "Parameters": [
-    {
-      "Id": "4833547d-71c7-4b60-bf3e-1bdfb2847f26",
-      "Name": "SupportExportSpaceName",
-      "Label": "Space Name",
-      "HelpText": "The Space that has the project and export task that you want to be scrubbed.",
-      "DefaultValue": "Default",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2aaa1afe-bad9-4eae-b79b-467fd4a19ec5",
-      "Name": "SupportExportAPIKey",
-      "Label": "API Key",
-      "HelpText": "API Key that has access to the project and task.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "68874953-98d4-4c45-8046-90208330e0c8",
-      "Name": "SupportExportTaskID",
-      "Label": "Task ID",
-      "HelpText": "Task ID of the export you want to be scrubbed",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d075d988-210a-4239-b3e3-1923679762c8",
-      "Name": "SupportExportServerURL",
-      "Label": "ServerURL",
-      "HelpText": "This will default to the Defined Server URI in Configuration->Nodes. In some cases, you might want to define the URL that you want the API call to run against rather than letting the default value be used. If you get a connection issue, try defining a known good URL here.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2022-06-01T15:54:33.140Z",
-    "OctopusVersion": "2022.1.2584",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "millerjn21",
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-validate-deploying-user.json b/step-templates/octopus-validate-deploying-user.json
deleted file mode 100644
index 75faa54e8..000000000
--- a/step-templates/octopus-validate-deploying-user.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "Id": "bbcf1894-9cf7-4968-a3e4-3bff08d8c75b",
-  "Name": "Octopus - Validate Deploying User",
-  "Description": "Verifies current deploying user didn't deploy previously to specified environment.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$releaseId = $OctopusParameters[\"Octopus.Release.Id\"]\n$currentDeployerId = $OctopusParameters[\"Octopus.Deployment.CreatedBy.Id\"]\n$userName = $OctopusParameters[\"Octopus.Deployment.CreatedBy.Username\"]\n$environmentId = $OctopusParameters[\"Octopus.Environment.Id\"]\n$spaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$octopusURL = $OctopusParameters[\"ovdu_octopusURL\"]\n$octopusAPIKey = $OctopusParameters[\"ovdu_octopusAPIKey\"]\n$precedingEnvironment = $OctopusParameters[\"ovdu_precedingEnvironment\"]\n\n$header = @{ \"X-Octopus-ApiKey\" = $octopusAPIKey }\n\n$deploymentDetails = (Invoke-RestMethod -Method Get -Uri \"$octopusURL/api/$($spaceId)/releases/$($releaseId)/deployments/\" -Headers $header)\n\n# Get details for deployment to preceding environment\n$allEnvironments = (Invoke-RestMethod -Method Get -Uri \"$octopusURL/api/$($spaceId)/environments\" -Headers $header)\n$environmentItem = $allEnvironments.Items | where-object { $_.Name -eq $precedingEnvironment }\n$environmentId = $environmentItem.Id\n\n# Load all deploys to the previous environment\n$environmentDeploys = $deploymentDetails.Items | Where-Object {$_.EnvironmentId -eq $environmentId}\n\n# Iterate deployments to the previous environment to validate current deployer\nforeach($prevdeployment in $environmentDeploys)\n    {\n    \tif($prevDeployment.Id -eq $OctopusParameters[\"Octopus.Deployment.Id\"])\n        {continue}\n    \telse\n        {\n    \t\tif($prevdeployment.DeployedById -eq $currentDeployerId )\n        \t{\n            \tWrite-Highlight \"$userName previously deployed this project to $precedingEnvironment - deployment cancelled.\"\n            \tThrow \"$userName previously deployed this project to $precedingEnvironment - deployment cancelled.\"\n        \t}\n        }\n    }"
-  },
-  "Parameters": [
-    {
-      "Id": "e99ae8d8-f63c-45b5-967c-703cc89e620c",
-      "Name": "ovdu_octopusURL",
-      "Label": "Octopus Base Url",
-      "HelpText": "The base url of your Octopus Deploy instance.  Example: https://samples.octopus.app",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "781b3394-138e-4aa5-bd26-5a835563bf88",
-      "Name": "ovdu_octopusAPIKey",
-      "Label": "Octopus Api Key",
-      "HelpText": "The API key of a user in Octopus Deploy who has permissions to manage releases.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "a05c4f99-ae6e-48ea-a11e-2cb3b538bf7e",
-      "Name": "ovdu_precedingEnvironment",
-      "Label": "Environment to validate deployer against",
-      "HelpText": "The environment preceding the controlled environment where if the user deployed this release, it will fail in this environment",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-10-22T15:08:53.042Z",
-    "OctopusVersion": "2021.1.7665",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "handplaned",
-  "Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/octopus-wait-for-deployment-target-registration.json b/step-templates/octopus-wait-for-deployment-target-registration.json
deleted file mode 100644
index 0a274d7fe..000000000
--- a/step-templates/octopus-wait-for-deployment-target-registration.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "Id": "dc573fd6-92be-46fa-aab1-861adcd37d82",
-  "Name": "Octopus - Wait for Deployment Target registration",
-  "Description": "This step will poll Octopus Deploy until it detects that the expected Deployment Target has been registered.\n\nThe goal being that a deployment will be paused until the expected Deployment Target is available (eg [Transient Targets](https://octopus.com/docs/infrastructure/environments/elastic-and-transient-environments/deploying-to-transient-targets)). On subsequent deploys, the Deployment Target would quickly be identified as registered, and the deployment would continue as expected.\n\nWith a couple of extra step templates you can:\n- Create a new EC2 Instance (_AWS - Launch EC2 Instance_)\n- Include the new Deployment Target in subsequent deployment steps (_Health Check_)",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$odEnv,\n    [string]$odName,\n    [string]$odRole,\n    [int]$odTimeout,\n    [string]$odUrl,\n    [string]$odApiKey,\n    [switch]$whatIf\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if (!$result -or $result -eq $null) {\n        if ($Default) {\n            $result = $Default\n        } elseif ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n    }\n\n    return $result\n}\n\n& {\n    param(\n        [string]$odEnv,\n        [string]$odName,\n        [string]$odRole,\n        [int]$odTimeout,\n        [string]$odUrl,\n        [string]$odApiKey\n    )\n\n    # If Octopus Deploy's URL/API Key are not provided as params, attempt to retrieve them from Environment Variables\n    if (!$odUrl) {\n        if ([Environment]::GetEnvironmentVariable(\"OD_API_URL\", \"Machine\")) {\n            $odUrl = [Environment]::GetEnvironmentVariable(\"OD_API_URL\", \"Machine\")\n        }\n    }\n    \n    if (!$odUrl) { throw \"Octopus Deploy API URL was not available/provided.\" }\n\n    if (!$odApiKey) {\n        if ([Environment]::GetEnvironmentVariable(\"OD_API_KEY\", \"Machine\")) {\n            $odApiKey = [Environment]::GetEnvironmentVariable(\"OD_API_KEY\", \"Machine\")\n        }\n    } \n    \n    if (!$odApiKey) { throw \"Octopus Deploy API key was not available/provided.\" }\n\n    $header = @{ \"X-Octopus-ApiKey\" = $odApiKey }\n    \n    Write-Verbose \"Checking API compatibility\";\n    $rootDocument = Invoke-WebRequest \"$odUrl/api/\" -Header $header -UseBasicParsing | ConvertFrom-Json;\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n      Write-Verbose \"Spaces API found\"\n      $hasSpacesApi = $true;\n    } else {\n      Write-Verbose \"Pre-spaces API found\"\n      $hasSpacesApi = $false;\n    }\n    \n    if($hasSpacesApi) {\n        $spaceId = $OctopusParameters['Octopus.Space.Id'];\n        if([string]::IsNullOrWhiteSpace($spaceId)) {\n            throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n        }\n        $baseApiUrl = \"/api/$spaceId\" ;\n    } else {\n        $baseApiUrl = \"/api\" ;\n    }    \n    \n    $environments = (Invoke-WebRequest \"$odUrl$baseApiUrl/environments/all\" -Headers $header -UseBasicParsing).content | ConvertFrom-Json\n    $environment = $environments | Where-Object { $_.Name -contains $odEnv }\n    if (@($environment).Count -eq 0) { throw \"Could not find environment with the name '$odEnv'\" }\n    \n    $timeout = new-timespan -Seconds $odTimeout\n    $sw = [diagnostics.stopwatch]::StartNew()\n\n    Write-Output (\"------------------------------\")\n    Write-Output (\"Checking the Deployment Target's registration status:\")\n    Write-Output (\"------------------------------\")\n\n    while ($true)\n    {\n        if ($sw.elapsed -gt $timeout) { throw \"Timed out waiting for the Deployment Target to register\" }\n        \n        $machines = ((Invoke-WebRequest ($odUrl + $environment.Links.Self + \"/machines\") -Headers $header -UseBasicParsing).content | ConvertFrom-Json).items\n        if ($odName) { $machines = $machines | Where-Object { $_.Name -like \"*$odName*\" } }\n        if ($odRole) { $machines = $machines | Where-Object { $_.Roles -like \"*$odRole*\" } }\n        if (@($machines).Count -gt 0) { break }\n\n        Write-Output (\"$(Get-Date) | Waiting for Deployment Target to register with the name '$odName' and role '$odRole'\")\n\n        Start-Sleep -Seconds 5\n    }\n    \n    Write-Output (\"$(Get-Date) | Deployment Target registered with the name '$odName' and role '$odRole'!\")\n } `\n (Get-Param 'odEnv' -Required) `\n (Get-Param 'odName' -Required) `\n (Get-Param 'odRole') `\n (Get-Param 'odTimeout' -Required) `\n (Get-Param 'odUrl') `\n (Get-Param 'odApiKey')"
-  },
-  "Parameters": [
-    {
-      "Id": "46d497f7-f297-4329-a5a3-a32e32dfb85b",
-      "Name": "odEnv",
-      "Label": "Environment",
-      "HelpText": "The Environment you expect the Deployment Target to be registered in.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "28e05635-b343-4a00-a42e-55f5244ddd47",
-      "Name": "odName",
-      "Label": "Expected Display Name",
-      "HelpText": "The Display Name of the expected Deployment Target.\nNote: _Partial matches for the supplied Display Name is enabled (eg \"Machine\" would match a Target called \"Machine01\")_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2df65d31-6a0e-47cb-bcc3-7b5320a23aee",
-      "Name": "odRole",
-      "Label": "Expected Role (Optional)",
-      "HelpText": "The Role of the expected Deployment Target.\nNote: _Partial matches for the supplied Role is enabled (eg \"Database\" would match a Target with the Role \"Database01\")_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ff029a44-af95-4580-95c1-889a06a83f4c",
-      "Name": "odTimeout",
-      "Label": "Timeout",
-      "HelpText": "The amount of time to wait for the expected Deployment Target to be registered. (aka the Timeout)",
-      "DefaultValue": "600",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9fe91ebb-7521-4a91-9284-8398a8e9ad87",
-      "Name": "odUrl",
-      "Label": "Octopus Deploy URL (Kind-of Optional)",
-      "HelpText": "The base URL of your Octopus Deploy installation.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"OD\\_API\\_URL\"",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "054a2fca-6f12-46b2-a2a3-32045a50ea6a",
-      "Name": "odApiKey",
-      "Label": "API Key (Kind-of Optional)",
-      "HelpText": "An API Key with permissions access the Octopus Deploy API.\nNote: If empty, this step will attempt to use the value contained in the Machine Environment Variable \"OD\\_API\\_KEY\"\nFurther Reading:\nhttps://octopus.com/docs/api-and-integration/api/how-to-create-an-api-key",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2020-09-03T08:23:42.851Z",
-    "OctopusVersion": "2020.4.0-rc0003",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
diff --git a/step-templates/octopus-worker-healthcheck.json b/step-templates/octopus-worker-healthcheck.json
deleted file mode 100644
index e91263a6c..000000000
--- a/step-templates/octopus-worker-healthcheck.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "Id": "c6c23c7b-876d-4758-a908-511f066156d7",
-    "Name": "Worker - Health check",
-    "Description": "Run a health check against a worker.",
-    "ActionType": "Octopus.Script",
-    "Version": 4,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define parameters\n$baseUrl = $OctopusParameters['Octopus.Web.ServerUri'] \n$apiKey = $WorkerApiKey\n$spaceId = $OctopusParameters['Octopus.Space.Id']\n$spaceName = $OctopusParameters['Octopus.Space.Name']\n$environmentName = $OctopusParameters['Octopus.Environment.Name']\n$workerName = $OctopusParameters['WorkerName']\n$workerPoolName = $OctopusParameters['WorkerPoolName']\n\n# Check for null or empty\nif ([string]::IsNullOrEmpty($baseUrl))\n{\n\t$baseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}']\n}\n\n# Get worker\nif (![string]::IsNullOrEmpty($workerPoolName))\n{\n    # Get worker pool\n    $workerPool = (Invoke-RestMethod -Method Get -Uri \"$baseUrl/api/$spaceId/workerpools/all\" -Headers @{\"X-Octopus-ApiKey\"=\"$apiKey\"}) | Where-Object {$_.Name -eq $workerPoolName}\n    \n    # Check to make sure it exists\n    if ($null -ne $workerPool)\n    {\n        $worker = (Invoke-RestMethod -Method Get -Uri \"$baseUrl/api/$spaceId/workerpools/$($workerPool.Id)/workers\" -Headers @{\"X-Octopus-ApiKey\"=\"$apiKey\"}).Items | Where-Object {$_.Name -eq \"$workerName\"}\n    }\n    else\n    {\n    \tWrite-Error \"Worker pool $workerPoolName not found!\"\n    }\n}\nelse\n{\n    $worker = (Invoke-RestMethod -Method Get -Uri \"$baseUrl/api/$spaceId/workers/all\" -Headers @{\"X-Octopus-ApiKey\"=\"$apiKey\"}) | Where-Object {$_.Name -eq \"$workerName\"}\n}\n\n# Check to make sure something was returned\nif ($null -eq $worker)\n{\n\tif (![string]::IsNullOrEmpty($workerPoolName))\n    {\n    \tWrite-Error \"Unable to find $workerName in $workerPoolName!\"\n    }\n    else\n    {\n    \tWrite-Error \"Unable to find $workerName!\"\n    }\n}\n\n# Build payload\n$jsonPayload = @{\n\tName = \"Health\"\n    Description = \"Check $workerName health\"\n    Arguments = @{\n    \tTimeout = \"00:05:00\"\n        MachineIds = @(\n        \t$worker.Id\n        )\n    OnlyTestConnection = \"false\"\n    }\n    SpaceId = \"$spaceId\"\n}\n\n# Display message\nWrite-Output \"Beginning health check of $workerName ...\"\n\n# Execute health check\n$healthCheck = (Invoke-RestMethod -Method Post -Uri \"$baseUrl/api/tasks\" -Body ($jsonPayload | ConvertTo-Json -Depth 10) -Headers @{\"X-Octopus-ApiKey\"=\"$apiKey\"})\n\n# Check to see if the health check is queued\nwhile ($healthCheck.IsCompleted -eq $false)\n{\n    $healthCheck = (Invoke-RestMethod -Method Get -Uri \"$baseUrl/api/tasks/$($healthCheck.Id)\" -Headers @{\"X-Octopus-ApiKey\"=\"$apiKey\"})\n}\n\nif ($healthCheck.State -eq \"Failed\")\n{\n\tWrite-Error \"Health check failed!\"\n}\nelse\n{\n\tWrite-Output \"Health check completed with $($healthCheck.State).\"\n}\n"
-    },
-    "Parameters": [
-      {
-        "Id": "4ec84f25-8c23-4576-b7fe-3b60ca6f0f3c",
-        "Name": "WorkerName",
-        "Label": "Worker name",
-        "HelpText": "Name of the worker to do a health check on.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d876958b-1d93-45fa-996e-2005de2919ee",
-        "Name": "WorkerPoolName",
-        "Label": "Worker Pool",
-        "HelpText": "(Optional) Worker pool the worker belongs to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1939947b-e777-4e4a-8caf-729dacb25aed",
-        "Name": "WorkerApiKey",
-        "Label": "Api Key",
-        "HelpText": "Api Key to use to issue health check.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2023-02-16T15:38:44.043Z",
-      "OctopusVersion": "2021.1.7687",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "octopus"
-  }
diff --git a/step-templates/oracle-add-user-to-role.json b/step-templates/oracle-add-user-to-role.json
deleted file mode 100644
index 6df740fb1..000000000
--- a/step-templates/oracle-add-user-to-role.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "Id": "6a0db144-3ad5-46bb-bd7d-02b22b98a559",
-    "Name": "Oracle - Add Database User To Role",
-    "Description": "Adds database user to a role",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserInRole\n{\n\t# Define parameters\n    param (\n    $Username,\n    $RoleName)\n    \n\t# Execute query\n    $userRole = Invoke-SqlQuery \"SELECT * FROM DBA_ROLE_PRIVS WHERE GRANTEE = '$Username' AND GRANTED_ROLE = '$RoleName'\"\n\n    # Check to see if anything was returned\n    if ($userRole.ItemArray.Count -gt 0)\n    {\n        # Found\n        return $true\n    }\n    \n\n    # Not found\n    return $false\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Create credential object for the connection\n$SecurePassword = ConvertTo-SecureString $oracleLoginPasswordWithAddRoleRights -AsPlainText -Force\n$ServerCredential = New-Object System.Management.Automation.PSCredential ($oracleLoginWithAddRoleRights, $SecurePassword)\n\ntry\n{\n\t# Connect to MySQL\n    Open-OracleConnection -Datasource $oracleServerName -Credential $ServerCredential -Port $oracleServerPort -ServiceName $oracleServiceName\n\n    # See if database exists\n    $userInRole = Get-UserInRole -Username $oracleUsername -RoleName $oracleRoleName\n\n    if ($userInRole -eq $false)\n    {\n        # Create database\n        Write-Output \"Adding user $oracleUsername to role $oracleRoleName ...\"\n        $executionResults = Invoke-SqlUpdate \"GRANT `\"$oracleRoleName`\" TO `\"$oracleUsername`\"\"\n\n        # See if it was created\n        $userInRole = Get-UserInRole -Username $oracleUsername -RoleName $oracleRoleName\n            \n        # Check array\n        if ($userInRole -eq $true)\n        {\n            # Success\n            Write-Output \"$oracleUserName added to $oracleRoleName successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"Failure adding $oracleUserName to $oracleRoleName!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $oracleUsername is already in role $oracleRoleName\"\n    }\n}\nfinally\n{\n    Close-SqlConnection\n}\n\n\n",
-      "Octopus.Action.EnabledFeatures": ""
-    },
-    "Parameters": [
-      {
-        "Id": "66790019-ca40-41cc-8849-5995557e34c1",
-        "Name": "oracleServerName",
-        "Label": "Server name",
-        "HelpText": "Name of the Oracle server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d29f262e-74d2-4c7b-acb3-67b642b614c4",
-        "Name": "oracleServerPort",
-        "Label": "Port",
-        "HelpText": "Port that the Oracle server listens on.",
-        "DefaultValue": "1521",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "330f737b-dc2b-4ceb-9d27-168c1b5f6e18",
-        "Name": "oracleServiceName",
-        "Label": "Service Name",
-        "HelpText": "Service name for Oracle database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0531e03b-c152-46e4-ab2d-7cb8093aa641",
-        "Name": "oracleLoginWithAddRoleRights",
-        "Label": "Login name",
-        "HelpText": "Login name of a user that can add roles to other users.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5bddbafe-0ca0-4037-9dd1-d522abc5838e",
-        "Name": "oracleLoginPasswordWithAddRoleRights",
-        "Label": "Login password",
-        "HelpText": "Password for the login account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "2c6ee772-96f6-4803-b6a1-5d57a58b28f0",
-        "Name": "oracleUsername",
-        "Label": "User name",
-        "HelpText": "Name of the user to add the role to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7f806b37-e0d5-4560-873e-de6c73f80161",
-        "Name": "oracleRoleName",
-        "Label": "Role name",
-        "HelpText": "Name of the role to add to the user.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-08-21T21:54:08.753Z",
-      "OctopusVersion": "2020.3.2",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "oracle"
-  }
\ No newline at end of file
diff --git a/step-templates/oracle-create-user-if-not-exists.json b/step-templates/oracle-create-user-if-not-exists.json
deleted file mode 100644
index 462d8bf1b..000000000
--- a/step-templates/oracle-create-user-if-not-exists.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "Id": "d8b21b0b-1a07-4d47-9c72-4260e83a807c",
-    "Name": "Oracle - Create User If Not Exists",
-    "Description": "Creates a new user account on a Oracle database server",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserExists\n{\n\t# Define parameters\n    param ($Hostname,\n    $Username)\n    \n\t# Execute query\n    return Invoke-SqlQuery \"SELECT * FROM ALL_USERS WHERE USERNAME = '$UserName'\" -ConnectionName $connectionName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Create credential object for the connection\n$SecurePassword = ConvertTo-SecureString $oracleLoginPasswordWithAddUserRights -AsPlainText -Force\n$ServerCredential = New-Object System.Management.Automation.PSCredential ($oracleLoginWithAddUserRights, $SecurePassword)\n\ntry\n{\n\t# Connect to MySQL\n    Open-OracleConnection -Datasource $oracleDBServerName -Credential $ServerCredential -Port $oracleDBServerPort -ServiceName $oracleServiceName -ConnectionName $connectionName\n\n    # See if database exists\n    $userExists = Get-UserExists -Username $oracleNewUsername\n\n    if ($userExists -eq $null)\n    {\n        # Create database\n        Write-Output \"Creating user $oracleNewUsername ...\"\n        $executionResults = Invoke-SqlUpdate \"CREATE USER `\"$oracleNewUsername`\" IDENTIFIED BY `\"$oracleNewUserPassword`\"\" -ConnectionName $connectionName\n\n        # See if it was created\n        $userExists = Get-UserExists -Username $oracleNewUsername\n            \n        # Check array\n        if ($userExists -ne $null)\n        {\n            # Success\n            Write-Output \"$oracleNewUsername created successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"$oracleNewUsername was not created!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $oracleNewUsername already exists.\"\n    }\n}\nfinally \n{\n\t# Close connection if open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n    \tClose-SqlConnection -ConnectionName $connectionName\n    }\n}\n\n",
-      "Octopus.Action.EnabledFeatures": ""
-    },
-    "Parameters": [
-      {
-        "Id": "8123da26-a8ed-4b4e-bc04-b5c90546785a",
-        "Name": "oracleDBServerName",
-        "Label": "Oracle Server",
-        "HelpText": "Host name of the Oracle server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a4a4ee03-b166-4324-9bdf-4011c1f4f707",
-        "Name": "oracleDBServerPort",
-        "Label": "Port",
-        "HelpText": "Port number the Oracle server listens on.",
-        "DefaultValue": "1521",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "63cd98dc-359c-4c25-8b84-56ab33d9d05f",
-        "Name": "oracleServiceName",
-        "Label": "Service Name",
-        "HelpText": "Service name for Oracle database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "307a4f0e-92b7-4b2f-8cac-b12771d2cb23",
-        "Name": "oracleLoginWithAddUserRights",
-        "Label": "Admin Login name",
-        "HelpText": "Login name of a user with rights to create user accounts.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "78ccf489-2c68-419e-9b53-bdf96ff9ae8c",
-        "Name": "oracleLoginPasswordWithAddUserRights",
-        "Label": "Login Password",
-        "HelpText": "Password Login name.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "8bf12f2a-7d7b-4b8c-bced-2b438fbb21e4",
-        "Name": "oracleNewUsername",
-        "Label": "New user name",
-        "HelpText": "Name of the new user account to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "45b96db6-4523-4b07-b8e7-848dc2b63053",
-        "Name": "oracleNewUserPassword",
-        "Label": "New user password",
-        "HelpText": "Password for the new user account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2024-10-15T20:26:00.556Z",
-      "OctopusVersion": "2024.3.12828",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "oracle"
-  }
diff --git a/step-templates/pagerduty-close-maintenance-window.json b/step-templates/pagerduty-close-maintenance-window.json
deleted file mode 100644
index 41a2bee6b..000000000
--- a/step-templates/pagerduty-close-maintenance-window.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "Id": "4841c8e6-3f23-4b52-90d0-c363eb0bc526",
-  "Name": "PagerDuty - Close Maintenance Window",
-  "Description": "Closes a maintenance window by Id.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "param(\n    [string]$OpeningStepName = \"\",\n    [string]$Token = \"\"\n) \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $Result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $Result = $OctopusParameters[$Name]\n    }\n\n    if ($Result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $Result = $variable.Value\n        }\n    }\n\n    if ($Result -eq $null -or $Result -eq \"\") {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $Result = $Default\n        }\n    }\n\n    return $Result\n}\n\n& {\n    param([string]$OpeningStepName, [string]$Token)\n\n\t$WindowId = $OctopusParameters[\"Octopus.Action[$OpeningStepName].Output.WindowId\"]\n    $Uri = \"https://api.pagerduty.com/maintenance_windows/$WindowId\"\n    $Headers = @{\n          \"Authorization\" = \"Token token=$Token\"\n          \"Accept\" = \"application/vnd.pagerduty+json;version=2\"\n\t\t}\n\n\ttry {\n\t\tInvoke-RestMethod -Uri $Uri -Method Delete -ContentType \"application/json\" -Headers $Headers\n\t\tWrite-Host \"PagerDuty window closed for window_id: $WindowId\"\n\t} catch [System.Exception] {\n        Write-Host $_.Exception.Message\n        \n        $ResponseStream = $_.Exception.Response.GetResponseStream()\n        $Reader = New-Object System.IO.StreamReader($ResponseStream)\n        $Reader.ReadToEnd() | Write-Host\n\n\t\tExit 0\n    }\n} (Get-Param 'OpeningStepName' -Required) (Get-Param 'Token' -Required)"
-  },
-  "Parameters": [
-    {
-      "Name": "Token",
-      "Label": "Token",
-      "HelpText": "The API token of the PagerDuty instance.\n\nFound here: https://mydomain.pagerduty.com/api_keys",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "OpeningStepName",
-      "Label": "OpeningStepName",
-      "HelpText": "The **previous** step in which the window to close was opened.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    }
-  ],
-  "LastModifiedOn": "2020-07-23T07:38:49.056Z",
-  "LastModifiedBy": "tfbryan",
-  "$Meta": {
-    "ExportedAt": "2020-07-23T07:38:49.056Z",
-    "OctopusVersion": "2020.1.14",
-    "Type": "ActionTemplate"
-  },
-  "Category": "pagerduty"
-}
\ No newline at end of file
diff --git a/step-templates/pagerduty-open-maintenance-window.json b/step-templates/pagerduty-open-maintenance-window.json
deleted file mode 100644
index 510e70c99..000000000
--- a/step-templates/pagerduty-open-maintenance-window.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "Id": "93a10982-f675-42cd-ac3a-46ef28a46afa",
-  "Name": "PagerDuty - Open Maintenance Window",
-  "Description": "Open a new maintenance window for the specified services, using the PagerDuty v2 API.\n\nNo new incidents will be created for a service that is currently in maintenance.\n\nThis script sets an output variable **WindowId** that can be used in the _PagerDuty - Close Maintenance Window_ template.",
-  "ActionType": "Octopus.Script",
-  "Version": 16,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "param(\n    [array]$ServiceIds = @(\"\"),\n    [string]$RequesterId = \"\",\n    [string]$Description = \"\",\n    [int]$Minutes = 10,\n    [string]$Token = \"\"\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $Result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $Result = $OctopusParameters[$Name]\n    }\n\n    if ($Result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $Result = $variable.Value\n        }\n    }\n\n    if ($Result -eq $null -or $Result -eq \"\") {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $Result = $Default\n        }\n    }\n\n    return $Result\n}\n\n& {\n    param([array]$ServiceIds, [string]$RequesterId, [string]$Description, [int]$Minutes, [string]$Token)\n\n    Write-Host \"Opening PagerDuty window for $Description\"\n\n    try {\n        $ArrayOfServices = $ServiceIds.split(\",\") | foreach { $_.trim() }\n        $Start = ((Get-Date)).ToString(\"yyyy-MM-ddTHH:mm:sszzzzZ\");\n        $End = ((Get-Date).AddMinutes($Minutes)).ToString(\"yyyy-MM-ddTHH:mm:sszzzzZ\");\n        $ServiceIdArray = @()\n        \n        foreach($ServiceId in $ArrayOfServices){\n        \t$ServiceIdArray += @{\"id\"=$ServiceId; \"type\"=\"service_reference\"}\n        }\n        \n        $Uri = \"https://api.pagerduty.com/maintenance_windows\"\n        $Headers = @{\n          \"Authorization\" = \"Token token=$Token\"\n          \"Accept\" = \"application/vnd.pagerduty+json;version=2\"\n          \"From\" = $RequesterId\n\t\t}\n\n        Write-Host \"Window will be open from $Start -> $End\"\n\n        $Post = @{\n            maintenance_window= @{\n            \ttype = 'maintenance_window'\n                start_time = $Start\n                end_time = $End\n                description = $Description\n                services = $ServiceIdArray\n            }\n        } | ConvertTo-Json -Depth 4\n\n        $ResponseObj = Invoke-RestMethod -Uri $Uri -Method Post -Body $Post -ContentType \"application/json\" -Headers $Headers\n        $WindowId = $ResponseObj.maintenance_window.id\n\n        Write-Host \"Window Id $WindowId created\"\n\n        if(Get-Command -name \"Set-OctopusVariable\" -ErrorAction SilentlyContinue) {\n            Set-OctopusVariable -name \"WindowId\" -value $WindowId\n        } else {\n            Write-Host \"Octopus output variable not set\"\n        }\n    } catch [System.Exception] {\n        Write-Host \"Error while opening PagerDuty window\"\n        Write-Host $_.Exception.Message\n        \n        $ResponseStream = $_.Exception.Response.GetResponseStream()\n        $Reader = New-Object System.IO.StreamReader($ResponseStream)\n        $Reader.ReadToEnd() | Write-Host\n        \n        Exit 1\n    }\n} (Get-Param 'ServiceIds' -Required) (Get-Param 'RequesterId' -Required) (Get-Param 'Description' -Required) (Get-Param 'Minutes' -Required) (Get-Param 'Token' -Required)",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Name": "Minutes",
-      "Label": "Minutes",
-      "HelpText": "Please set an estimated number of minutes for the maintenance window. The maintenance window will remain open for this duration unless it's proactively closed sooner.",
-      "DefaultValue": "60",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RequesterId",
-      "Label": "RequesterId",
-      "HelpText": "Please configure an email address of the user creating the maintenance window.\n\nExample: Octopus@mydomain.com",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Token",
-      "Label": "Token",
-      "HelpText": "Please supply the API token of your PagerDuty instance.\n\nFound here: https://mydomain.pagerduty.com/api_keys",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Description",
-      "Label": "Description",
-      "HelpText": "Please supply a short description for this maintenance window.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ServiceIds",
-      "Label": "ServiceIds",
-      "HelpText": "Please supply a comma separated list of the PagerDuty service ids that will be included in this maintenance window.\n\nFound here: https://mydomain.pagerduty.com/services/**ABC123**\n\nExample: ABC123, ABC456",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Subdomain",
-      "Label": "Subdomain",
-      "HelpText": "The subdomain of the PagerDuty instance.\n\nFound here: https://**mydomain**.pagerduty.com/",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2020-07-23T08:13:54.382Z",
-  "LastModifiedBy": "tfbryan",
-  "$Meta": {
-    "ExportedAt": "2020-07-23T08:13:54.382Z",
-    "OctopusVersion": "2020.1.14",
-    "Type": "ActionTemplate"
-  },
-  "Category": "pagerduty"
-}
\ No newline at end of file
diff --git a/step-templates/pingdom-create-uptime-check.json b/step-templates/pingdom-create-uptime-check.json
deleted file mode 100644
index da45b9bb3..000000000
--- a/step-templates/pingdom-create-uptime-check.json
+++ /dev/null
@@ -1,247 +0,0 @@
-{
-  "Id": "70ea4820-7d02-4015-a691-8c77b5ab14d5",
-  "Name": "Pingdom - Create Uptime Check",
-  "Description": "Creates Pingdom http check using [Create New Check API method](https://www.pingdom.com/resources/api#MethodCreate+New+Check).",
-  "ActionType": "Octopus.Script",
-  "Version": 43,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Package.DownloadOnTentacle": "False",
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null,
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Ref https://www.pingdom.com/resources/api#MethodCreate+New+Check\n\nFunction Get-Parameter() {\n    Param(\n        [parameter(Mandatory=$true)]\n        [string]$Name, \n        [switch]$Required, \n        $Default, \n        [switch]$FailOnValidate\n    )\n\n    $result = $null\n    $errMessage = [string]::Empty\n\n    If ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n        Write-Host (\"Octopus parameter value for \" + $Name + \": \" + $result)\n    }\n\n    If ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    If ($result -eq $null -or [string]::IsNullOrEmpty($result)) {\n        If ($Required) {\n            $errMessage = \"Missing value for $Name\"\n        } ElseIf (-Not $Default -eq $null) {\n            Write-Host (\"Default value: \" + $Default)\n            $result = $Default\n        }\n    }\n\n    If (-Not [string]::IsNullOrEmpty($errMessage)) {\n        If ($FailOnValidate) {\n            Throw $errMessage\n        } Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    return $result\n}\n\nFunction Test-Any() { \n   begin { \n      $any = $false\n   } \n   process { \n      $any = $true\n   } \n   end { \n      $any\n   } \n} \n\n& {\n    Write-Host \"Start PingdomCreateUptimeCheck\"\n\n    Add-Type -AssemblyName System.Web\n\n    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n    $throwErrorWhenFailed = [System.Convert]::ToBoolean([string](Get-Parameter -Name \"Pingdom.ThrowErrorWhenFailed\" -Default \"False\"))\n\n    $pingdomUsername = [string] (Get-Parameter -Name \"Pingdom.Username\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomPassword = [string] (Get-Parameter -Name \"Pingdom.Password\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomAppKey = [string] (Get-Parameter -Name \"Pingdom.AppKey\" -Required -FailOnValidate:$throwErrorWhenFailed)\n\n    $pingdomCheckName = [string] (Get-Parameter -Name \"Pingdom.CheckName\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckTarget = [string] (Get-Parameter -Name \"Pingdom.CheckTarget\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckType = \"http\"\n    $pingdomCheckIntervalMinutes = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckIntervalMinutes\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckContactIds = [string] (Get-Parameter -Name \"Pingdom.CheckContactIds\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckSendNotificationWhenDown = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckSendNotificationWhenDown\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckNotifyAgainEvery = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckNotifyAgainEvery\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckNotifyWhenBackUp = [string](Get-Parameter -Name \"Pingdom.CheckNotifyWhenBackUp\" -Default \"True\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckTags = [string] (Get-Parameter -Name \"Pingdom.CheckTags\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckHttpUrl = [string] (Get-Parameter -Name \"Pingdom.CheckHttpUrl\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckHttpEncryptionEnabled = [string](Get-Parameter -Name \"Pingdom.CheckHttpEncryptionEnabled\" -Default \"False\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckHttpTargetPort = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckHttpTargetPort\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckAuth = [string] (Get-Parameter -Name \"Pingdom.CheckAuth\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckShouldContain = [string] (Get-Parameter -Name \"Pingdom.CheckShouldContain\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckShouldNotContain = [string] (Get-Parameter -Name \"Pingdom.CheckShouldNotContain\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckPostData = [string] (Get-Parameter -Name \"Pingdom.CheckPostData\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckIntegrationIds = [string] (Get-Parameter -Name \"Pingdom.CheckIntegrationIds\" -FailOnValidate:$throwErrorWhenFailed)\n\n    $apiVersion = \"2.1\"\n    $url = \"https://api.pingdom.com/api/{0}/checks\" -f $apiVersion\n    $securePassword = ConvertTo-SecureString $pingdomPassword -AsPlainText -Force\n    $credential = New-Object System.Management.Automation.PSCredential($pingdomUsername, $securePassword)\n    $headers = @{ \n        \"App-Key\" = $pingdomAppKey\n    }\n\n    # Validate if check already registered\n\n    Write-Host \"Getting uptime check list to find check by name: $url\"\n    Try {\n        $response = Invoke-RestMethod -Uri $url -Method Get -ContentType \"application/json\" -Credential $credential -Headers $headers\n    } Catch {\n        $errMessage = \"Error occured when getting uptime check in Pingdom: \" + $_.Exception.Message\n        If($throwErrorWhenFailed -eq $true) {\n            Write-Error $errMessage\n        }\n        Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    $checkExists = $response.checks | Where-Object { $_.name -eq $pingdomCheckName } | Test-Any\n    If ($checkExists -eq $true) {\n        Write-Host \"Check with name $pingdomCheckName already registered. New check will not be created!\"\n        Exit\n    }\n\n    # Create new check\n\n    $apiParameters = @{}\n    $apiParameters.Add(\"name\", $pingdomCheckName)\n    $apiParameters.Add(\"host\", $pingdomCheckTarget)\n    $apiParameters.Add(\"type\", $pingdomCheckType)\n    $apiParameters.Add(\"contactids\", $pingdomCheckContactIds)\n    $apiParameters.Add(\"integrationids\", $pingdomCheckIntegrationIds)\n    If ($pingdomCheckIntervalMinutes -ne $null) {\n        $apiParameters.Add(\"resolution\", $pingdomCheckIntervalMinutes)\n    }\n    If ($pingdomCheckSendNotificationWhenDown -ne $null) {\n        $apiParameters.Add(\"sendnotificationwhendown\", $pingdomCheckSendNotificationWhenDown)\n    }\n    If ($pingdomCheckNotifyAgainEvery -ne $null) {\n        $apiParameters.Add(\"notifyagainevery\", $pingdomCheckNotifyAgainEvery)\n    }\n    If ($pingdomCheckNotifyWhenBackUp -ne $null) {\n        $apiParameters.Add(\"notifywhenbackup\", $pingdomCheckNotifyWhenBackUp.ToLower())\n    }\n    If ($pingdomCheckTags -ne $null) {\n        $apiParameters.Add(\"tags\", $pingdomCheckTags)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckHttpUrl)) {\n        $apiParameters.Add(\"url\", $pingdomCheckHttpUrl)\n    }\n    If ($pingdomCheckHttpEncryptionEnabled -ne $null) {\n        $apiParameters.Add(\"encryption\", $pingdomCheckHttpEncryptionEnabled.ToLower())\n    }\n    If ($pingdomCheckHttpTargetPort -ne $null) {\n        $apiParameters.Add(\"port\", $pingdomCheckHttpTargetPort)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckAuth)) {\n        $apiParameters.Add(\"auth\", $pingdomCheckAuth)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldContain)) {\n        $apiParameters.Add(\"shouldcontain\", $pingdomCheckShouldContain)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldNotContain)) {\n        $apiParameters.Add(\"shouldnotcontain\", $pingdomCheckShouldNotContain)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckPostData )) {\n        $apiParameters.Add(\"postdata\", $pingdomCheckPostData)\n    }\n\n    If ($apiParameters.Count -gt 0) {\n        $queryString = \"\"\n        $apiParameters.Keys | ForEach-Object { \n            $queryString += ($_ + \"=\" + [System.Web.HttpUtility]::UrlEncode($apiParameters.Item($_)) + \"&\")\n        }\n        $requestBody = $queryString.Substring(0, $queryString.Length - 1)\n        $url += \"?$requestBody\"\n    }\n\n    Write-Host \"Creating new uptime check: $url\"\n    Write-Host \"Request body: $requestBody\"\n    Try {\n        $response = Invoke-RestMethod -Uri $url -Method Post -Body $requestBody -ContentType \"application/json\" -Credential $credential -Headers $headers\n        Write-Host (\"Successfully added uptime check in Pingdom: Name = \" + $response.check.name + \", Id = \" + $response.check.id)\n    } Catch {\n        $errMessage = \"Error occured when adding uptime check in Pingdom: \" + $_.Exception + \"`n\"\n        $errMessage += \"Response: \" + $_\n        If($throwErrorWhenFailed -eq $true) {\n            Write-Error $errMessage\n        }\n        Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    Write-Host \"End PingdomCreateUptimeCheck\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "16cdd666-9822-428c-9c1e-fb8943039a98",
-      "Name": "Pingdom.Username",
-      "Label": "Username",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d5b36e0f-3c55-4b63-9971-4c9147218514",
-      "Name": "Pingdom.Password",
-      "Label": "Password",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "2f33c3ed-202a-4711-8897-a47329c18b8d",
-      "Name": "Pingdom.AppKey",
-      "Label": "App key",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "754d2183-3b3b-4170-898b-f759af555f69",
-      "Name": "Pingdom.CheckName",
-      "Label": "Name",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c04286a9-d4e4-4c33-985e-67f52b3a9549",
-      "Name": "Pingdom.CheckTarget",
-      "Label": "Target",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "96e4c38b-4d43-4083-ace3-510f945a4202",
-      "Name": "Pingdom.CheckIntervalMinutes",
-      "Label": "Interval",
-      "HelpText": "Check interval in minutes. Integer (1, 5, 15, 30, 60)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7fc1f49f-446c-4836-8966-b1786d45f6b1",
-      "Name": "Pingdom.CheckContactIds",
-      "Label": "Contact Ids",
-      "HelpText": "Pingdom contact identifiers. For example contactids=154325,465231,765871.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "f76811df-7a79-4fee-a491-46c6ce4bc813",
-      "Name": "Pingdom.CheckIntegrationIds",
-      "Label": "",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "963c6ff8-b79e-408d-9729-036b58c42857",
-      "Name": "Pingdom.CheckSendNotificationWhenDown",
-      "Label": "Send notification when down",
-      "HelpText": "Send notification when down n times.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6ba72782-3eee-465c-9176-659de024f8dd",
-      "Name": "Pingdom.CheckNotifyAgainEvery",
-      "Label": "Notify every",
-      "HelpText": "Notify again every n result. 0 means that no extra notifications will be sent.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9ad13abe-13ab-466c-bd0e-a51637bece3b",
-      "Name": "Pingdom.CheckSendToEmail",
-      "Label": "Send to email",
-      "HelpText": null,
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "8a958bb9-5a61-4956-b79d-7f990271b127",
-      "Name": "Pingdom.CheckNotifyWhenBackUp",
-      "Label": "Notify when back up",
-      "HelpText": "Notify when back up again.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "93e9f063-b0b9-495b-8774-fd140b96a640",
-      "Name": "Pingdom.CheckTags",
-      "Label": "Tags",
-      "HelpText": "Pingdom check tags. Example: octopus,azure.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9d579e60-2228-4521-9178-2da35817d0b8",
-      "Name": "Pingdom.CheckHttpEncryptionEnabled",
-      "Label": "Http encryption enabled",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e289c1f6-cfbc-4774-ac97-395ac353b3b3",
-      "Name": "Pingdom.CheckHttpTargetPort",
-      "Label": "Http target port",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "dcda6fd8-9e42-40c4-9213-f77e9e67b974",
-      "Name": "Pingdom.CheckAuth",
-      "Label": "Auth",
-      "HelpText": "Username and password for target HTTP authentication. Example: user:password.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "bab9c934-dfb4-42c3-817f-22b58a8ef3d5",
-      "Name": "Pingdom.CheckShouldContain",
-      "Label": "Should contain",
-      "HelpText": "Target site should contain this string.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "96e83352-1dce-4d16-bce7-0f8d4929ced7",
-      "Name": "Pingdom.CheckShouldNotContain",
-      "Label": "Should not contain",
-      "HelpText": "Target site should NOT contain this string. If shouldcontain is also set, this parameter is not allowed.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "60570a61-678f-4ef2-90e5-c70d7b53ecb4",
-      "Name": "Pingdom.CheckPostData",
-      "Label": "Post data",
-      "HelpText": "Data that should be posted to the web page, for example submission data for a sign-up or login form. The data needs to be formatted in the same way as a web browser would send it to the web server",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fdb84b63-f86b-4aff-b9e9-e9166d512f51",
-      "Name": "Pingdom.ThrowErrorWhenFailed",
-      "Label": "Error when failed",
-      "HelpText": "When checked, throws Octopus exception if template script has failed.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "sarbis",
-  "$Meta": {
-    "ExportedAt": "2018-06-11T13:49:31.508Z",
-    "OctopusVersion": "2018.4.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "pingdom"
-}
\ No newline at end of file
diff --git a/step-templates/pingdom-modify-uptime-check.json b/step-templates/pingdom-modify-uptime-check.json
deleted file mode 100644
index 0b527bfd9..000000000
--- a/step-templates/pingdom-modify-uptime-check.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "e2324451-0488-4dbf-acc8-656cc2f8defb",
-  "Name": "Pingdom - Modify Uptime Check",
-  "Description": "Modifies Pingdom http check using [Modify Check API method](https://www.pingdom.com/resources/api#MethodModify+Check).",
-  "ActionType": "Octopus.Script",
-  "Version": 26,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null,
-    "Octopus.Action.Package.DownloadOnTentacle": "False",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Ref: https://www.pingdom.com/resources/api#MethodModify+Check\n\nFunction Get-Parameter() {\n    Param(\n        [parameter(Mandatory=$true)]\n        [string]$Name, \n        [switch]$Required, \n        $Default, \n        [switch]$FailOnValidate\n    )\n\n    $result = $null\n    $errMessage = [string]::Empty\n\n    If ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n        Write-Host (\"Octopus parameter value for \" + $Name + \": \" + $result)\n    }\n\n    If ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    If ($result -eq $null -or [string]::IsNullOrEmpty($result)) {\n        If ($Required) {\n            $errMessage = \"Missing value for $Name\"\n        } ElseIf (-Not $Default -eq $null) {\n            Write-Host (\"Default value: \" + $Default)\n            $result = $Default\n        }\n    }\n\n    If (-Not [string]::IsNullOrEmpty($errMessage)) {\n        If ($FailOnValidate) {\n            Throw $errMessage\n        } Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    return $result\n}\n\n& {\n    Write-Host \"Start PingdomModifyUptimeCheck\"\n\n    Add-Type -AssemblyName System.Web\n\n    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n    $throwErrorWhenFailed = [System.Convert]::ToBoolean([string](Get-Parameter -Name \"Pingdom.ThrowErrorWhenFailed\" -Default \"False\"))\n\n    $pingdomUsername = [string] (Get-Parameter -Name \"Pingdom.Username\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomPassword = [string] (Get-Parameter -Name \"Pingdom.Password\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomAppKey = [string] (Get-Parameter -Name \"Pingdom.AppKey\" -Required -FailOnValidate:$throwErrorWhenFailed)\n\n    $pingdomCheckId = [string] (Get-Parameter -Name \"Pingdom.CheckId\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckPaused = [string] (Get-Parameter -Name \"Pingdom.CheckPaused\" -Default \"False\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckName = [string] (Get-Parameter -Name \"Pingdom.CheckName\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckTarget = [string] (Get-Parameter -Name \"Pingdom.CheckTarget\" -Required -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckIntervalMinutes = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckIntervalMinutes\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckContactIds = [string] (Get-Parameter -Name \"Pingdom.CheckContactIds\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckSendNotificationWhenDown = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckSendNotificationWhenDown\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckNotifyAgainEvery = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckNotifyAgainEvery\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckNotifyWhenBackUp = [string](Get-Parameter -Name \"Pingdom.CheckNotifyWhenBackUp\" -Default \"True\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckTags = [string] (Get-Parameter -Name \"Pingdom.CheckTags\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckHttpUrl = [string] (Get-Parameter -Name \"Pingdom.CheckHttpUrl\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckHttpEncryptionEnabled = [string](Get-Parameter -Name \"Pingdom.CheckHttpEncryptionEnabled\" -Default \"False\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckHttpTargetPort = [System.Nullable[int]] (Get-Parameter -Name \"Pingdom.CheckHttpTargetPort\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckAuth = [string] (Get-Parameter -Name \"Pingdom.CheckAuth\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckShouldContain = [string] (Get-Parameter -Name \"Pingdom.CheckShouldContain\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckShouldNotContain = [string] (Get-Parameter -Name \"Pingdom.CheckShouldNotContain\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckPostData = [string] (Get-Parameter -Name \"Pingdom.CheckPostData\" -FailOnValidate:$throwErrorWhenFailed)\n    $pingdomCheckIntegrationIds = [string] (Get-Parameter -Name \"Pingdom.CheckIntegrationIds\" -FailOnValidate:$throwErrorWhenFailed)\n\n    $apiVersion = \"2.1\"\n    $url = \"https://api.pingdom.com/api/{0}/checks\" -f $apiVersion\n    $securePassword = ConvertTo-SecureString $pingdomPassword -AsPlainText -Force\n    $credential = New-Object System.Management.Automation.PSCredential($pingdomUsername, $securePassword)\n    $headers = @{ \n        \"App-Key\" = $pingdomAppKey\n    }\n\n    If ([string]::IsNullOrEmpty($pingdomCheckId) -and [string]::IsNullOrEmpty($pingdomCheckName)) {\n        $errMessage = \"Please specify CheckId or CheckName!\"\n        If($throwErrorWhenFailed -eq $true) {\n            Write-Error $errMessage\n        }\n        Else {\n            Write-Warning $errMessage\n        }\n        Exit\n    } \n    \n    # Find check id by name\n\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckName)) {\n        Write-Host \"Getting uptime check list to find check by name: $url\"\n        Try {\n            $response = Invoke-RestMethod -Uri $url -Method Get -ContentType \"application/json\" -Credential $credential -Headers $headers\n        } Catch {\n            Write-Host \"Error occured when getting uptime check list in Pingdom: \" + $_.Exception.Message\n        }\n\n        $checkFiltered = $response.checks | Where-Object { $_.name -eq $pingdomCheckName }\n        If ($checkFiltered -eq $null) {\n            Write-Warning \"Check with name $pingdomCheckName not found!\"\n            Exit\n        }\n\n        $pingdomCheckId = $checkFiltered.id\n    }\n\n    If ([string]::IsNullOrEmpty($pingdomCheckId)) {\n        Write-Warning \"Check with name $pingdomCheckName was not found!\"\n        Exit\n    }\n\n    # Pause or resume check\n\n    $url += \"/$pingdomCheckId\"\n\n    $apiParameters = @{}\n    $apiParameters.Add(\"host\", $pingdomCheckTarget)\n    $apiParameters.Add(\"contactids\", $pingdomCheckContactIds)\n    $apiParameters.Add(\"integrationids\", $pingdomCheckIntegrationIds)\n    If ($pingdomCheckPaused -eq \"True\") {\n        $apiParameters.Add(\"paused\", \"true\")\n    } Else {\n        $apiParameters.Add(\"paused\", \"false\")\n    }\n    If ($pingdomCheckIntervalMinutes -ne $null) {\n        $apiParameters.Add(\"resolution\", $pingdomCheckIntervalMinutes)\n    }\n    If ($pingdomCheckSendNotificationWhenDown -ne $null) {\n        $apiParameters.Add(\"sendnotificationwhendown\", $pingdomCheckSendNotificationWhenDown)\n    }\n    If ($pingdomCheckNotifyAgainEvery -ne $null) {\n        $apiParameters.Add(\"notifyagainevery\", $pingdomCheckNotifyAgainEvery)\n    }\n    If ($pingdomCheckNotifyWhenBackUp -ne $null) {\n        $apiParameters.Add(\"notifywhenbackup\", $pingdomCheckNotifyWhenBackUp.ToLower())\n    }\n    If ($pingdomCheckTags -ne $null) {\n        $apiParameters.Add(\"tags\", $pingdomCheckTags)\n    }\n    If ($pingdomCheckHttpUrl -ne $null) {\n        $apiParameters.Add(\"url\", $pingdomCheckHttpUrl)\n    }\n    If ($pingdomCheckHttpEncryptionEnabled -ne $null) {\n        $apiParameters.Add(\"encryption\", $pingdomCheckHttpEncryptionEnabled.ToLower())\n    }\n    If ($pingdomCheckHttpTargetPort -ne $null) {\n        $apiParameters.Add(\"port\", $pingdomCheckHttpTargetPort)\n    }\n    If ($pingdomCheckAuth -ne $null) {\n        $apiParameters.Add(\"auth\", $pingdomCheckAuth)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldContain)) {\n        $apiParameters.Add(\"shouldcontain\", $pingdomCheckShouldContain)\n    }\n    If (-Not [string]::IsNullOrEmpty($pingdomCheckShouldNotContain)) {\n        $apiParameters.Add(\"shouldnotcontain\", $pingdomCheckShouldNotContain)\n    }\n    If ($pingdomCheckPostData -ne $null) {\n        $apiParameters.Add(\"postdata\", $pingdomCheckPostData)\n    }\n\n    If ($apiParameters.Count -gt 0) {\n        $queryString = \"\"\n        $apiParameters.Keys | ForEach-Object { \n            $queryString += ($_ + \"=\" + [Web.HttpUtility]::UrlEncode($apiParameters.Item($_)) + \"&\")  \n        }\n        $queryString = $queryString.Substring(0, $queryString.Length - 1)\n        $url += \"?$queryString\"\n    }\n\n    Write-Host \"Modifying uptime check: $url\"\n    Try {\n        $response = Invoke-RestMethod -Uri $url -Method Put -ContentType \"application/json\" -Credential $credential -Headers $headers\n        Write-Host $response.message\n    } Catch {\n        $errMessage = \"Error occured when adding uptime check in Pingdom: \" + $_.Exception + \"`n\"\n        $errMessage += \"Response: \" + $_\n        If($throwErrorWhenFailed -eq $true) {\n            Write-Error $errMessage\n        }\n        Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    Write-Host \"End PingdomModifyUptimeCheck\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "cc77291a-308c-414a-9e68-3a23ea2207da",
-      "Name": "Pingdom.Username",
-      "Label": "Username",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "815e7620-2f99-4231-a975-5a074b77260c",
-      "Name": "Pingdom.Password",
-      "Label": "Password",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ac459f1c-7688-481c-a954-05779adeac61",
-      "Name": "Pingdom.AppKey",
-      "Label": "App key",
-      "HelpText": "Mandatory.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "df91b159-d961-4a45-bb8b-9521b3e8848f",
-      "Name": "Pingdom.CheckId",
-      "Label": "Id",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "9a3d6294-799b-474c-9cd4-3404e281acb5",
-      "Name": "Pingdom.CheckName",
-      "Label": "Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4508116a-fb26-4500-b1d1-b75d13838204",
-      "Name": "Pingdom.CheckPaused",
-      "Label": "Paused",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "603710c6-e717-44e0-9eac-b84c06ff9351",
-      "Name": "Pingdom.ThrowErrorWhenFailed",
-      "Label": "Error when failed",
-      "HelpText": "When checked, throws Octopus exception if template script has failed.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "sarbis",
-  "$Meta": {
-    "ExportedAt": "2018-06-11T13:50:51.699Z",
-    "OctopusVersion": "2018.4.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "pingdom"
-}
\ No newline at end of file
diff --git a/step-templates/postgres-add-database-user-to-role.json b/step-templates/postgres-add-database-user-to-role.json
deleted file mode 100644
index 668ee3f0d..000000000
--- a/step-templates/postgres-add-database-user-to-role.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "Id": "72f8bfaf-14c3-4807-b687-c07738c14ba1",
-    "Name": "Postgres - Add Database User To Role",
-    "Description": "Adds database user to a role.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
-    "ActionType": "Octopus.Script",
-    "Version": 6,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserInRole\n{\n\t# Define parameters\n    param (\n    $Username,\n    $RoleName)\n    \n\t# Execute query\n    $userRole = Invoke-SqlQuery \"SELECT r.rolname, r1.rolname as `\"role`\" FROM pg_catalog.pg_roles r JOIN pg_catalog.pg_auth_members m ON (m.member = r.oid) JOIN pg_roles r1 ON (m.roleid=r1.oid) WHERE r.rolcanlogin AND r1.rolname = '$RoleName' AND r.rolname = '$Username'\"\n\n    # Check to see if anything was returned\n    if ($userRole.ItemArray.Count -gt 0)\n    {\n        # Found\n        return $true\n    }\n    \n\n    # Not found\n    return $false\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Get whether trust certificate is necessary\n$addTrustSSL = [System.Convert]::ToBoolean(\"$addTrustSSL\")\n\ntry\n{\n\t# Declare initial connection string\n    $connectionString = \"Server=$addPostgresServerName;Port=$addPostgresServerPort;Database=postgres;\"\n\n\t# Check to see if we need to trust the ssl cert\n\tif ($addTrustSSL -eq $true)\n\t{\n        # Append SSL connection string components\n        $connectionString += \"SSL Mode=Require;Trust Server Certificate=true;\"\n\t}\n\n   # Update the connection string based on authentication method\n    switch ($postgreSqlAuthenticationMethod)\n    {\n        \"azuremanagedidentity\"\n        {\n        \t# Get login token\n            Write-Host \"Generating Azure Managed Identity token ...\"\n            $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"}\n            \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$addLoginWithAddRoleRights;Password=`\"$($token.access_token)`\";\"\n            \n            break\n        }    \n        \"awsiam\"\n        {\n            # Region is part of the RDS endpoint, extract\n            $region = ($addPostgresServerName.Split(\".\"))[2]\n\n            Write-Host \"Generating AWS IAM token ...\"\n            $addLoginPasswordWithAddRoleRights = (aws rds generate-db-auth-token --hostname $addPostgresServerName --region $region --port $addPostgresServerPort --username $addLoginWithAddRoleRights)\n\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$addLoginWithAddRoleRights;Password=`\"$addLoginPasswordWithAddRoleRights`\";\"\n\n            break\n        }\n        \"gcpserviceaccount\"\n        {\n            # Define header\n            $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n            # Retrieve service accounts\n            $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n            # Results returned in plain text format, get into array and remove empty entries\n            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n            # Retreive the specific service account assigned to the VM\n            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains(\"iam.gserviceaccount.com\") }\n\n            Write-Host \"Generating GCP IAM token ...\"\n            # Retrieve token for account\n            $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n            \n            # Check to see if there was a username provided\n            if ([string]::IsNullOrWhitespace($addLoginWithAddRoleRights))\n            {\n            \t# Use the service account name, but strip off the .gserviceaccount.com part\n                $addLoginWithAddRoleRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n            }\n  \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$addLoginWithAddRoleRights;Password=`\"$($token.access_token)`\";\"\n  \n            break\n        }\n        \"usernamepassword\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$addLoginWithAddRoleRights;Password=`\"$addLoginPasswordWithAddRoleRights`\";\"\n\n            break    \n        }\n\n        \"windowsauthentication\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";Integrated Security=True;\"\n        }\n    }\n    \n\t# Open connection\n    Open-PostGreConnection -ConnectionString $connectionString   \n    \n    # See if database exists\n    $userInRole = Get-UserInRole -Username $addUsername -RoleName $addRoleName\n\n    if ($userInRole -eq $false)\n    {\n        # Create database\n        Write-Output \"Adding user $addUsername to role $addRoleName ...\"\n        $executionResults = Invoke-SqlUpdate \"GRANT $addRoleName TO `\"$addUsername`\";\"\n\n        # See if it was created\n        $userInRole = Get-UserInRole -Username $addUsername -RoleName $addRoleName\n            \n        # Check array\n        if ($userInRole -eq $true)\n        {\n            # Success\n            Write-Output \"$addUserName added to $addRoleName successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"Failure adding $addUserName to $addRoleName!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $addUsername is already in role $addRoleName\"\n    }\n}\nfinally\n{\n    Close-SqlConnection\n}\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "802920ef-155f-4d43-aba7-0c32b09e90e8",
-        "Name": "addPostgresServerName",
-        "Label": "Server name",
-        "HelpText": "Name of the PostreSQL server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "89dcd174-d798-49be-8a09-d8a528cb6847",
-        "Name": "addPostgresServerPort",
-        "Label": "Port",
-        "HelpText": "Port that the PostgreSQL server listens on.",
-        "DefaultValue": "5432",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e357a82c-a25d-4f0e-ac99-b7928d884c25",
-        "Name": "postgreSqlAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the PostgreSQL server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-        }
-      },      
-      {
-        "Id": "9a975cd9-3891-4150-b747-bb78a76fcfb8",
-        "Name": "addLoginWithAddRoleRights",
-        "Label": "Login name",
-        "HelpText": "Login name of a user that can add roles to other users.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "76b5d5a6-4953-4dc4-92c9-3487b7852a2f",
-        "Name": "addLoginPasswordWithAddRoleRights",
-        "Label": "Login password",
-        "HelpText": "Password for the login account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "cf31a6ae-244f-49bb-b60b-e80987b96cdf",
-        "Name": "addUsername",
-        "Label": "User name",
-        "HelpText": "Name of the user to add the role to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "631a3a6c-203c-4925-9ee9-d2086debde37",
-        "Name": "addRoleName",
-        "Label": "Role name",
-        "HelpText": "Name of the role to add to the user.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c2fa3736-8d0c-4de6-9d11-72d0910c9cb7",
-        "Name": "addTrustSSL",
-        "Label": "Trust SSL certificate",
-        "HelpText": "Force trusting the SSL certificate.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedBy": "twerthi",
-    "$Meta": {
-      "ExportedAt": "2022-06-14T15:09:44.806Z",
-      "OctopusVersion": "2022.2.5111",
-      "Type": "ActionTemplate"
-    },
-    "Category": "postgresql"
-  }
diff --git a/step-templates/postgres-create-database.json b/step-templates/postgres-create-database.json
deleted file mode 100644
index 10ac58a87..000000000
--- a/step-templates/postgres-create-database.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "0a1208c7-4a12-4da1-a60d-2b3197b377c4",
-  "Name": "Postgres - Create Database If Not Exists",
-  "Description": "Creates a Postgres database if it doesn't already exist.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Author": "twerthi",
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-DatabaseExists\n{\n\t# Define parameters\n    param ($DatabaseName)\n    \n\t# Execute query\n    return Invoke-SqlQuery -Query \"SELECT datname FROM pg_catalog.pg_database where datname = '$DatabaseName';\" -CommandTimeout $postgresCommandTimeout -ConnectionName $connectionName\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific version\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Get whether trust certificate is necessary\n$createTrustSSL = [System.Convert]::ToBoolean(\"$createTrustSSL\")\n\ntry\n{\n\t# Declare initial connection string\n    $connectionString = \"Server=$createPosgreSQLServerName;Port=$createPort;Database=postgres;\"\n    \n\t# Check to see if we need to trust the ssl cert\n\tif ($createTrustSSL -eq $true)\n\t{\n        # Append SSL connection string components\n        $connectionString += \"SSL Mode=Require;Trust Server Certificate=true;\"\n\t}\n\n    # Update the connection string based on authentication method\n    switch ($postgreSqlAuthenticationMethod)\n    {\n        \"azuremanagedidentity\"\n        {\n        \t# Get login token\n            Write-Host \"Generating Azure Managed Identity token ...\"\n            $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"}\n            \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createUsername;Password=`\"$($token.access_token)`\";\"\n            \n            break\n        }\n        \"awsiam\"\n        {\n            # Region is part of the RDS endpoint, extract\n            $region = ($createPosgreSQLServerName.Split(\".\"))[2]\n\n            Write-Host \"Generating AWS IAM token ...\"\n            $createUserPassword = (aws rds generate-db-auth-token --hostname $createPosgreSQLServerName --region $region --port $createPort --username $createUsername)\n\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createUsername;Password=`\"$createUserPassword`\";\"\n\n            break\n        }\n        \"gcpserviceaccount\"\n        {\n            # Define header\n            $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n            # Retrieve service accounts\n            $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n            # Results returned in plain text format, get into array and remove empty entries\n            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n            # Retreive the specific service account assigned to the VM\n            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains(\"iam.gserviceaccount.com\") }\n\n            Write-Host \"Generating GCP IAM token ...\"\n            # Retrieve token for account\n            $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n            \n            # Check to see if there was a username provided\n            if ([string]::IsNullOrWhitespace($createUsername))\n            {\n            \t# Use the service account name, but strip off the .gserviceaccount.com part\n                $createUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n            }\n  \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createUsername;Password=`\"$($token.access_token)`\";\"\n  \n            break\n        }\n        \"usernamepassword\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createUsername;Password=`\"$createUserPassword`\";\"\n\n            break    \n        }\n\n        \"windowsauthentication\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";Integrated Security=True;\"\n        }\n    }\n\n\t# Open connection\n    Open-PostGreConnection -ConnectionString $connectionString -ConnectionName $connectionName\n\n    # See if database exists\n    $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName\n\n    if ($databaseExists.ItemArray.Count -eq 0)\n    {\n        # Create database\n        Write-Output \"Creating database $createDatabaseName ...\"\n        $executionResult = Invoke-SqlUpdate -Query \"CREATE DATABASE `\"$createDatabaseName`\";\" -CommandTimeout $postgresCommandTimeout -ConnectionName $connectionName\n\n        # Check result\n        if ($executionResult -ne -1)\n        {\n            # Commit transaction\n            Write-Error \"Create schema failed.\"\n        }\n        else\n        {\n        \t# See if it was created\n            $databaseExists = Get-DatabaseExists -DatabaseName $createDatabaseName\n            \n            # Check array\n            if ($databaseExists.ItemArray.Count -eq 1)\n            {\n            \t# Success\n                Write-Output \"$createDatabaseName created successfully!\"\n            }\n            else\n            {\n            \t# Failed\n                Write-Error \"$createDatabaseName was not created!\"\n            }\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"Database $createDatabaseName already exists.\"\n    }\n}\nfinally\n{\n\t# Close connection if open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n    \tClose-SqlConnection -ConnectionName $connectionName\n    }\n}\n\n\n"
-  },
-  "Parameters": [
-    {
-      "Id": "8fc92b80-5122-44a0-b3d8-a1d022a35055",
-      "Name": "createPosgreSQLServerName",
-      "Label": "Server",
-      "HelpText": "Hostname (or IP) of the MySQL database server.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "32abc8e8-486c-4afb-abe1-f1e84125afc8",
-      "Name": "postgreSqlAuthenticationMethod",
-      "Label": "Authentication Method",
-      "HelpText": "Method used to authenticate to the PostgreSQL server.",
-      "DefaultValue": "usernamepassword",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-      }
-    },
-    {
-      "Id": "df993ccf-71ab-48de-9a67-e2af6653d35e",
-      "Name": "createUsername",
-      "Label": "Username",
-      "HelpText": "Username to use for the connection",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8a07f25d-a7db-466e-a356-9155cbc5f258",
-      "Name": "createUserPassword",
-      "Label": "Password",
-      "HelpText": "Password for the user account",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "2af18465-c8d1-48f6-afce-1b1b30ae9559",
-      "Name": "createDatabaseName",
-      "Label": "Database Name",
-      "HelpText": "Name of the database to create",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f55e2a34-7a82-4d92-83bb-a19f304774d8",
-      "Name": "createPort",
-      "Label": "Port",
-      "HelpText": "Port for the database instance.",
-      "DefaultValue": "5432",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0366424c-ab0b-4895-8d48-2902e3f6de39",
-      "Name": "createTrustSSL",
-      "Label": "Trust SSL Certificate",
-      "HelpText": "Force trusting an SSL Certificate.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "99f987cb-97da-4f0a-8056-33a93ab908dc",
-      "Name": "postgresCommandTimeout",
-      "Label": "Command Timeout",
-      "HelpText": "Timeout value (in seconds) for SQL commands",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2024-05-23T15:30:50.319Z",
-    "OctopusVersion": "2024.3.164",
-    "Type": "ActionTemplate"
-  },
-  "Category": "postgresql"
-}
diff --git a/step-templates/postgres-create-user.json b/step-templates/postgres-create-user.json
deleted file mode 100644
index 5d8d58bb3..000000000
--- a/step-templates/postgres-create-user.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "Id": "6e676055-fb63-450f-9d98-ac99c4a68023",
-    "Name": "Postgres- Create User If Not Exists",
-    "Description": "Creates a new user account on a Postgres database server.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
-    "ActionType": "Octopus.Script",
-    "Version": 8,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-UserExists\n{\n\t# Define parameters\n    param ($Hostname,\n    $Username)\n    \n\t# Execute query\n    return Invoke-SqlQuery \"SELECT * FROM pg_roles WHERE rolname = '$Username';\"\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific location\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Get whether trust certificate is necessary\n$createTrustSSL = [System.Convert]::ToBoolean(\"$createTrustSSL\")\n\ntry\n{\n\t# Declare initial connection string\n    $connectionString = \"Server=$createPostgresSQLServerName;Port=$createPostgreSQLServerPort;Database=postgres;\"\n    \n\t# Check to see if we need to trust the ssl cert\n\tif ($createTrustSSL -eq $true)\n\t{\n        # Append SSL connection string components\n        $connectionString += \"SSL Mode=Require;Trust Server Certificate=true;\"\n\t}\n\n    # Update the connection string based on authentication method\n    switch ($postgreSqlAuthenticationMethod)\n    {\n        \"azuremanagedidentity\"\n        {\n        \t# Get login token\n            Write-Host \"Generating Azure Managed Identity token ...\"\n            $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"}\n            \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createLoginWithAddUserRights;Password=`\"$($token.access_token)`\";\"\n            \n            break\n        }    \n        \"awsiam\"\n        {\n            # Region is part of the RDS endpoint, extract\n            $region = ($createPostgresSQLServerName.Split(\".\"))[2]\n\n            Write-Host \"Generating AWS IAM token ...\"\n            $createLoginPasswordWithAddUserRights = (aws rds generate-db-auth-token --hostname $createPostgresSQLServerName --region $region --port $createPostgreSQLServerPort --username $createLoginWithAddUserRights)\n\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createLoginWithAddUserRights;Password=`\"$createLoginPasswordWithAddUserRights`\";\"\n\n            break\n        }\n        \"gcpserviceaccount\"\n        {\n            # Define header\n            $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n            # Retrieve service accounts\n            $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n            # Results returned in plain text format, get into array and remove empty entries\n            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n            # Retreive the specific service account assigned to the VM\n            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains(\"iam.gserviceaccount.com\") }\n\n            Write-Host \"Generating GCP IAM token ...\"\n            # Retrieve token for account\n            $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n            \n            # Check to see if there was a username provided\n            if ([string]::IsNullOrWhitespace($createLoginWithAddUserRights))\n            {\n            \t# Use the service account name, but strip off the .gserviceaccount.com part\n                $createLoginWithAddUserRights = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n            }\n  \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createLoginWithAddUserRights;Password=`\"$($token.access_token)`\";\"\n  \n            break\n        }\n        \"usernamepassword\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$createLoginWithAddUserRights;Password=`\"$createLoginPasswordWithAddUserRights`\";\"\n\n            break    \n        }\n\n        \"windowsauthentication\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";Integrated Security=True;\"\n        }\n    }\n\n\t# Open connection\n    Open-PostGreConnection -ConnectionString $connectionString\n\n    # See if database exists\n    $userExists = Get-UserExists -Username $createNewUsername\n\n    if ($userExists -eq $null)\n    {\n        # Create user\n        Write-Output \"Creating user $createNewUsername ...\"\n        $createSql = \"\"\n        \n        switch ($postgreSqlAccountType)\n        {\n            \"awsiam\"\n            {\n\t\t\t\t$createSql = \"CREATE ROLE `\"$createNewUsername`\" WITH LOGIN; GRANT rds_iam TO `\"$createNewUsername`\";\"\n                break\n            }\n\n            \"usernamepassword\"\n            {\n\t\t\t\t$createSql = \"CREATE ROLE `\"$createNewUsername`\" WITH LOGIN PASSWORD '$createNewUserPassword';\"\n                break    \n            }\n\n            \"windowsauthentication\"\n            {\n            \t$createSql = \"CREATE ROLE `\"$createNewUsername`\" WITH LOGIN;\"\n            \tbreak\n            }\n        }\n\n        \n        $executionResults = Invoke-SqlUpdate $createSql\n\n        # See if it was created\n        $userExists = Get-UserExists -Username $createNewUsername\n            \n        # Check array\n        if ($userExists -ne $null)\n        {\n            # Success\n            Write-Output \"$createNewUsername created successfully!\"\n        }\n        else\n        {\n            # Failed\n            Write-Error \"$createNewUsername was not created!\"\n        }\n    }\n    else\n    {\n    \t# Display message\n        Write-Output \"User $createNewUsername already exists.\"\n    }\n}\nfinally\n{\n    Close-SqlConnection\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "3ff05fe1-7873-443e-ae6b-f52c7d994664",
-        "Name": "createPostgresSQLServerName",
-        "Label": "Host name of the Postgres server",
-        "HelpText": "Name of the Postgres server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7db491c2-441a-455e-849d-dbb6b61b24e2",
-        "Name": "createPostgreSQLServerPort",
-        "Label": "Port",
-        "HelpText": "Port number the Postgres server listens on.",
-        "DefaultValue": "5432",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cbb7e84e-1492-4e76-b588-b65c76f3bf2b",
-        "Name": "createTrustSSL",
-        "Label": "Trust SSL Certificate",
-        "HelpText": "Force trusting an SSL Certificate.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "c0e8a9e1-e68b-4af7-8dfa-5f1c9872e615",
-        "Name": "postgreSqlAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the PostgreSQL server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-        }
-      },      
-      {
-        "Id": "0e3cb957-541d-436c-b3b5-047ddda28ec8",
-        "Name": "createLoginWithAddUserRights",
-        "Label": "Login name",
-        "HelpText": "Login name of a user with rights to create user accounts.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b9029a8c-e4bd-4993-a163-1f95dfbaf01d",
-        "Name": "createLoginPasswordWithAddUserRights",
-        "Label": "Login Password",
-        "HelpText": "Password for Login name.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "b9986f38-a587-46bd-82d7-97d16baf529f",
-        "Name": "postgreSqlAccountType",
-        "Label": "Account type",
-        "HelpText": null,
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-        }
-      },      
-      {
-        "Id": "43b9e471-e792-49e1-a761-a8fa95679a24",
-        "Name": "createNewUsername",
-        "Label": "New user name",
-        "HelpText": "Name of the new user account to create.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "aeda6f0b-d9e9-4f66-8c61-84cf42c26f27",
-        "Name": "createNewUserPassword",
-        "Label": "New user password",
-        "HelpText": "Password for the new user account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "LastModifiedBy": "twerthi",
-    "$Meta": {
-      "ExportedAt": "2022-06-14T15:09:44.806Z",
-      "OctopusVersion": "2022.2.5111",
-      "Type": "ActionTemplate"
-    },
-    "Category": "postgresql"
-  }
diff --git a/step-templates/postgres-execute-sql.json b/step-templates/postgres-execute-sql.json
deleted file mode 100644
index c6e63606f..000000000
--- a/step-templates/postgres-execute-sql.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "Id": "9a9c8c2c-d50e-4dc8-8e7e-b561f6e8fc15",
-    "Name": "Postgres - Execute SQL",
-    "Description": "Creates a Postgres database if it doesn't already exist.\n\nNote:\n- AWS EC2 IAM Role authentication requires the AWS CLI be installed.",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Define variables\n$connectionName = \"OctopusDeploy\"\n\n# Define functions\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed -ConnectionName $connectionName\n        return $false\n    }\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n$PowerShellModuleName = \"SimplySql\"\n\n# Set secure protocols\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n# Check to see if SimplySql module is installed\nif ((Get-ModuleInstalled -PowerShellModuleName $PowerShellModuleName) -ne $true)\n{\n    # Tell user what we're doing\n    Write-Output \"PowerShell module $PowerShellModuleName is not installed, downloading temporary copy ...\"\n\n    # Install temporary copy\n    Install-PowerShellModule -PowerShellModuleName $PowerShellModuleName -LocalModulesPath $LocalModules\n}\n\n# Display\nWrite-Output \"Importing module $PowerShellModuleName ...\"\n\n# Check to see if it was downloaded\nif ((Test-Path -Path \"$LocalModules\\$PowerShellModuleName\") -eq $true)\n{\n\t# Use specific version\n    $PowerShellModuleName = \"$LocalModules\\$PowerShellModuleName\"\n}\n\n# Import the module\nImport-Module -Name $PowerShellModuleName\n\n# Get whether trust certificate is necessary\n$postgresqlTrustSSL = [System.Convert]::ToBoolean(\"$postgresqlTrustSSL\")\n\ntry\n{\n\t# Declare initial connection string\n    $connectionString = \"Server=$postgresqlServerName;Port=$postgresqlServerPort;Database=$postgresqlDatabaseName;\"\n    \n\t# Check to see if we need to trust the ssl cert\n\tif ($postgresqlTrustSSL -eq $true)\n\t{\n        # Append SSL connection string components\n        $connectionString += \"SSL Mode=Require;Trust Server Certificate=true;\"\n\t}\n\n    # Update the connection string based on authentication method\n    switch ($postgreSqlAuthenticationMethod)\n    {\n        \"azuremanagedidentity\"\n        {\n        \t# Get login token\n            Write-Host \"Generating Azure Managed Identity token ...\"\n            $token = Invoke-RestMethod -Method GET -Uri \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https://ossrdbms-aad.database.windows.net\" -Headers @{\"MetaData\" = \"true\"}\n            \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$postgresqlUsername;Password=`\"$($token.access_token)`\";\"\n            \n            break\n        }\n        \"awsiam\"\n        {\n            # Region is part of the RDS endpoint, extract\n            $region = ($createPosgreSQLServerName.Split(\".\"))[2]\n\n            Write-Host \"Generating AWS IAM token ...\"\n            $createUserPassword = (aws rds generate-db-auth-token --hostname $postgresqlServerName --region $region --port $createPort --username $postgresqlUsername)\n\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$postgresqlUsername;Password=`\"$postgesqlUserPassword`\";\"\n\n            break\n        }\n        \"gcpserviceaccount\"\n        {\n            # Define header\n            $header = @{ \"Metadata-Flavor\" = \"Google\"}\n\n            # Retrieve service accounts\n            $serviceAccounts = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/\" -Headers $header\n\n            # Results returned in plain text format, get into array and remove empty entries\n            $serviceAccounts = $serviceAccounts.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries)\n\n            # Retreive the specific service account assigned to the VM\n            $serviceAccount = $serviceAccounts | Where-Object {$_.Contains(\"iam.gserviceaccount.com\") }\n\n            Write-Host \"Generating GCP IAM token ...\"\n            # Retrieve token for account\n            $token = Invoke-RestMethod -Method Get -Uri \"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/$serviceAccount/token\" -Headers $header\n            \n            # Check to see if there was a username provided\n            if ([string]::IsNullOrWhitespace($postgresqlUsername))\n            {\n            \t# Use the service account name, but strip off the .gserviceaccount.com part\n                $postgresqlUsername = $serviceAccount.SubString(0, $serviceAccount.IndexOf(\".gserviceaccount.com\"))\n            }\n  \n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$postgresqlUsername;Password=`\"$($token.access_token)`\";\"\n  \n            break\n        }\n        \"usernamepassword\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";User Id=$postgresqlUsername;Password=`\"$postgesqlUserPassword`\";\"\n\n            break    \n        }\n\n        \"windowsauthentication\"\n        {\n            # Append remaining portion of connection string\n            $connectionString += \";Integrated Security=True;\"\n        }\n    }\n\n\t# Open connection\n    Open-PostGreConnection -ConnectionString $connectionString -ConnectionName $connectionName\n\n    # Execute the statement\n    $executionResult = Invoke-SqlUpdate -Query \"$postgresqlCommand\" -CommandTimeout $postgresqlCommandTimeout -ConnectionName $connectionName\n    \n    # Display the result\n    Get-SqlMessage -ConnectionName $connectionName\n}\nfinally\n{\n\t# Close connection if open\n    if ((Test-SqlConnection -ConnectionName $connectionName) -eq $true)\n    {\n    \tClose-SqlConnection -ConnectionName $connectionName\n    }\n}\n\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "3adf249d-aef2-41dc-922d-a3cfb67c4afe",
-        "Name": "postgresqlServerName",
-        "Label": "Server",
-        "HelpText": "Hostname (or IP) of the MySQL database server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0fbfc453-3495-42b9-b13a-c7db532bc030",
-        "Name": "postgresqlAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the PostgreSQL server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nazuremanagedidentity|Azure Managed Identity\ngcpserviceaccount|GCP Service Account\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-        }
-      },
-      {
-        "Id": "cba7ecb6-e23d-462e-97d8-2d72e28d3233",
-        "Name": "postgresqlUsername",
-        "Label": "Username",
-        "HelpText": "Username to use for the connection",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0fc033f0-7446-4698-b003-bc18549d45b3",
-        "Name": "postgesqlUserPassword",
-        "Label": "Password",
-        "HelpText": "Password for the user account",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "0f2cea01-dd43-4f3e-87aa-1d1ca2974e3e",
-        "Name": "postgresqlDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to execute against.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ef1a940d-cd67-49b6-b584-c79d918b4707",
-        "Name": "postgresqlServerPort",
-        "Label": "Port",
-        "HelpText": "Port for the database instance.",
-        "DefaultValue": "5432",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "355fb14a-2dfd-4b41-98a3-87b7d177f716",
-        "Name": "postgresqlTrustSSL",
-        "Label": "Trust SSL Certificate",
-        "HelpText": "Force trusting an SSL Certificate.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "4d7dbc06-697c-4585-b18d-043ed1c120a7",
-        "Name": "postgresqlCommandTimeout",
-        "Label": "Command Timeout",
-        "HelpText": "Timeout value (in seconds) for SQL commands",
-        "DefaultValue": "30",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5a810fee-d9e9-4200-8540-2a22b3681be9",
-        "Name": "postgresqlCommand",
-        "Label": "Command",
-        "HelpText": "SQL statement(s) to execute.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2025-10-06T18:58:48.869Z",
-      "OctopusVersion": "2025.3.14336",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "postgresql"
-  }
diff --git a/step-templates/proxmox-deploy-lxc.json b/step-templates/proxmox-deploy-lxc.json
deleted file mode 100644
index c1b024729..000000000
--- a/step-templates/proxmox-deploy-lxc.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-	"Id": "ab90cb93-96ae-4841-8058-1cc5ec6feebe",
-	"Name": "Proxmox Deploy LXC Container",
-	"Description": "Creates a new Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
-	"ActionType": "Octopus.Script",
-	"Version": 3,
-	"CommunityActionTemplateId": null,
-	"Packages": [],
-	"Properties": {
-	  "Octopus.Action.Script.ScriptSource": "Inline",
-	  "Octopus.Action.Script.Syntax": "PowerShell",
-	  "Octopus.Action.Script.ScriptBody": "# Proxmox Connection Variables\n$ProxmoxHost = $OctopusParameters[\"Proxmox.Host\"];\n$ProxmoxPort = [int]$OctopusParameters[\"Proxmox.Port\"];\n$ProxmoxUser = $OctopusParameters[\"Proxmox.User\"];\n\n$ProxmoxNode = $OctopusParameters[\"Proxmox.Node\"];\n\n$ProxmoxTokenID = $OctopusParameters[\"Proxmox.TokenID\"];\n$ProxmoxToken = $OctopusParameters[\"Proxmox.Token\"];\n\n# LXC Variables\n$LXC_VMID = [int]$OctopusParameters[\"Proxmox.LXC.VMID\"];\n$LXC_Hostname = $OctopusParameters[\"Proxmox.LXC.Hostname\"];\n$LXC_OSTemplate = $OctopusParameters[\"Proxmox.LXC.OSTemplate\"];\n$LXC_Storage = $OctopusParameters[\"Proxmox.LXC.Storage\"];\n$LXC_CPU = [int]$OctopusParameters[\"Proxmox.LXC.Cores\"];\n$LXC_Memory = [int]$OctopusParameters[\"Proxmox.LXC.Memory\"];\n$LXC_RootSize = [int]$OctopusParameters[\"Proxmox.LXC.RootSize\"];\n$LXC_Networks = $OctopusParameters[\"Proxmox.LXC.Network\"];\n$LXC_Password = $OctopusParameters[\"Proxmox.LXC.Password\"];\n\n$BaseURL = \"https://$($ProxmoxHost):$($ProxmoxPort)/api2/json\"\n\n$header = @{\n\t\"Authorization\" = \"PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)\"\n}\n\n\nWrite-Host \"Testing Connection To Proxmox Server/Cluster ...\"\n\ntry{\n\tInvoke-RestMethod -Method GET -uri \"$($BaseURL)\" -Headers $header | out-null\n}catch{\n\tthrow \"Couldn't Connect to the Proxmox Server/Cluster\"\n}\n\nWrite-Host \"Successfully Connected To Proxmox Server/Cluster\"\n\n$LXC_Start = 0\ntry {\n  $Start = [System.Convert]::ToBoolean($OctopusParameters[\"Proxmox.LXC.StartOnCreate\"])\n  \n  if($Start -eq $True){\n  \t$LXC_Start = 1\n  }\n  \n} catch {}\n\n$LXC_Force = 0\ntry {\n  $Force = [System.Convert]::ToBoolean($OctopusParameters[\"Proxmox.LXC.Force\"])\n  \n  if($Force -eq $True){\n  \t$LXC_Force = 1\n  }\n  \n} catch {}\n\nif($LXC_CPU -lt 1){\n\t$LXC_CPU=1;\n}\n\nif($LXC_Memory -lt 16){\n\t$LXC_Memory = 16;\n}\n\nif($LXC_RootSize -lt 1){\n\t$LXC_RootSize = 1;\n}\n\nif($LXC_Hostname -eq $null -or $LXC_Hostname -eq \"\"){\n\tthrow \"LXC Hostname must be provided!\"\n}\n\nif($LXC_OSTemplate -eq $null -or $LXC_OSTemplate -eq \"\"){\n\tthrow \"LXC OS Template must be provided!\"\n}\n\nif($LXC_Storage -eq $null -or $LXC_Storage -eq \"\"){\n\tthrow \"LXC Storage must be provided!\"\n}\n\nif($LXC_Networks -eq $null){\n\tthrow \"You must provide at least one network property\"\n}\n\nif($LXC_Password -eq $null -or $LXC_Password -eq \"\"){\n\tthrow \"LXC Password must be provided!\"\n}\n\nif($LXC_VMID -eq \"-1\"){\n\t$LXC_VMID=(Invoke-RestMethod -Method GET -uri \"$($BaseURL)/cluster/nextid\" -headers $header).data\n    Write-Host \"Found next vm id: $($LXC_VMID)\"\n}\n\nif($LXC_VMID -lt 1){\n\tthrow \"The LXC VMID was not valid ($LXC_VMID), Set this to -1 to automatically find the next id\"\n}\n\n$LXCData = @{\n\t\"vmid\" = $LXC_VMID\n    \"hostname\" = $LXC_Hostname\n    \"ostemplate\" = $LXC_OSTemplate\n    \"rootfs\" = \"volume=$($LXC_Storage):$($LXC_RootSize)\"\n    \"cores\" = $LXC_CPU\n    \"memory\" = $LXC_Memory\n    \"storage\" = $LXC_Storage\n    \"password\" = $LXC_Password\n    \"start\" = $LXC_Start\n    \"force\" = $LXC_Force\n}\n\n$NetworkIndex = 0;\n\n$Networks = $LXC_Networks.replace(\"\\n\", \"`n\").split(\"`n\")\n\nif($Networks.Count -lt 1){\n\tthrow \"You must provide at least one network property\"\n}\n\nforeach ($network in $Networks){\n    $LXCData[\"net$($NetworkIndex)\"] = $network;\n    $NetworkIndex++;\n}\n\n$existingLXC = $null;\n\ntry{\n    $existingLXC = Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXCData.vmid)\" -Headers $header\n}catch{}\n\nif($existingLXC -ne $null -and $LXCData.force -eq 0){\n    throw \"LXC with VMID: $($LXCData.vmid) already exists. Use Force parameter to overwrite this LXC.\"\n\n}elseif($existingLXC -ne $null -and $LXCData.force -eq 1){\n\n    Write-host \"Deleting existing LXC with VMID: $($LXCData.vmid)\"\n    $LXCDestroyAsyncTask =Invoke-RestMethod -Method DELETE -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXCData.vmid)\" -Headers $header\n\n    $count = 1;\n    $maxCount = 10;\n    $TaskID = $LXCDestroyAsyncTask.Data;\n\n    DO\n    {\n        Write-Host \"Checking if LXC has finished Deleting..\"\n        $LXCDestroyAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status\" -Headers $header).data\n    \n        if($LXCDestroyAsyncTaskStatus.status -eq \"stopped\"){\n    \t    if($LXCDestroyAsyncTaskStatus.exitstatus -ne \"OK\"){\n        \t    Write-Error \"LXC destroy task finished with error: $($LXCDestroyAsyncTaskStatus.exitstatus)\"\n            }else{\n        \t    Write-Host \"LXC destroy task has successfully completed!\"\n            }\n        \n            break;\n        }\n    \n\t    Write-Host \"LXC destroy task has not finished yet, retrying in 5 seconds..\"\n        Write-Host \"Task Status: $($LXCDestroyAsyncTaskStatus.status)\"\n        sleep 5\n    \n        If($count -gt $maxCount) {\n          Write-Warning \"Task Timed out!\"\n          break;\n        }\n        $count++\n\n    } While ($count -le $maxCount)\n}\n\nWrite-Host \"\"\n\nWrite-Host \"New LXC Summary:\"\n\n$LXCData | Convertto-json -depth 10\n\n$LXCCreateAsyncTask = (Invoke-RestMethod -Method POST -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc\" -Headers $header -Body $LXCData)\n\n\n$count = 1;\n$maxCount = 10;\n\nWrite-Host \"\"\n\nDO\n{\n \n $TaskID = $LXCCreateAsyncTask.Data;\n    Write-Host \"Checking if LXC has finished creating..\"\n    $LXCCreateAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status\" -Headers $header).data\n    \n    if($LXCCreateAsyncTaskStatus.status -eq \"stopped\"){\n    \tif($LXCCreateAsyncTaskStatus.exitstatus -ne \"OK\"){\n        \tWrite-Error \"LXC create task finished with error: $($LXCCreateAsyncTaskStatus.exitstatus)\"\n        }else{\n        \tWrite-Host \"LXC create task has successfully completed!\"\n        }\n        \n        break;\n    }\n    \n\tWrite-Host \"LXC create task has not finished yet, retrying in 5 seconds..\"\n    Write-Host \"Task Status: $($LXCCreateAsyncTaskStatus.status)\"\n    sleep 5\n    \n    If($count -gt $maxCount) {\n      Write-Warning \"Task Timed out!\"\n      break;\n    }\n    $count++\n\n} While ($count -le $maxCount)\n"
-	},
-	"Parameters": [
-	  {
-		"Id": "c75c69c5-bdfb-4cbf-8b5a-aeb6ef93c274",
-		"Name": "Proxmox.Host",
-		"Label": "Proxmox Host",
-		"HelpText": "The hostname or IP address of the Proxmox cluster/host",
-		"DefaultValue": "1.2.3.4",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "eddd73e2-cb63-4c1b-8100-05e8e9586180",
-		"Name": "Proxmox.Port",
-		"Label": "Proxmox Port",
-		"HelpText": "Port number for Proxmox Cluster/Host",
-		"DefaultValue": "8006",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "eae18957-8977-4f51-8e09-2402453fd531",
-		"Name": "Proxmox.User",
-		"Label": "Proxmox User Account",
-		"HelpText": "The Proxmox user account associated with the api token.",
-		"DefaultValue": "root@pam",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "b413ee30-ba94-4ff3-8b4e-148c1fbc52f6",
-		"Name": "Proxmox.Node",
-		"Label": "Proxmox Node",
-		"HelpText": "The Proxmox node in the cluster.",
-		"DefaultValue": "",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "3f70fe63-2b55-44f5-af8e-27d8717ade20",
-		"Name": "Proxmox.TokenID",
-		"Label": "Proxmox Token ID",
-		"HelpText": "This is token id that was used to create an API token in proxmox.",
-		"DefaultValue": "",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "741c3b80-af85-47c6-b49e-36aea9b2bc9a",
-		"Name": "Proxmox.Token",
-		"Label": "Proxmox API Token",
-		"HelpText": "The API Token secret key",
-		"DefaultValue": "",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "Sensitive"
-		}
-	  },
-	  {
-		"Id": "003db066-99a7-4d4c-a794-7a6310c2c86b",
-		"Name": "Proxmox.LXC.VMID",
-		"Label": "LXC VM ID",
-		"HelpText": "The new VMID for the new LXC container default is -1 to find the next ID",
-		"DefaultValue": "-1",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "63ba1450-8c9e-4d06-bedf-00389a63ef3f",
-		"Name": "Proxmox.LXC.Hostname",
-		"Label": "LXC Hostname",
-		"HelpText": "The new LXC hostname",
-		"DefaultValue": "",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "0a13d075-3a2f-4718-9793-f9b2f5963455",
-		"Name": "Proxmox.LXC.OSTemplate",
-		"Label": "LXC OS Template",
-		"HelpText": "The template image or backup image for the LXC",
-		"DefaultValue": "",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "55f7937b-4a5f-49bb-b129-f589c3ce51cc",
-		"Name": "Proxmox.LXC.Password",
-		"Label": "LXC Root Password",
-		"HelpText": "This will be the root password once the LXC container has been created",
-		"DefaultValue": "",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "Sensitive"
-		}
-	  },
-	  {
-		"Id": "671751a5-d213-445a-a73f-dd9f1f33d754",
-		"Name": "Proxmox.LXC.Storage",
-		"Label": "LXC Storage",
-		"HelpText": "Where the rootfs for this LXC will be stored.",
-		"DefaultValue": "local",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "e796b021-0c31-4e03-8825-23c19cbf8876",
-		"Name": "Proxmox.LXC.Network",
-		"Label": "LXC Networks",
-		"HelpText": "The list of network connections this LXC has. Each network connection on a new line.\n\n\n`name=<name>,bridge=<bridge>,firewall=<0|1>,gw=<IPv4>,ip=<IPv4/CIDR|dhcp|manual>`\n\n\nMore Info: [https://pve.proxmox.com/pve-docs/api-viewer/#/nodes/{node}/lxc](https://pve.proxmox.com/pve-docs/api-viewer/#/nodes/{node}/lxc)",
-		"DefaultValue": "name=eth0,bridge=vmbr0",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "MultiLineText"
-		}
-	  },
-	  {
-		"Id": "c9e865ea-a7b2-42d3-aca6-8772e54b893a",
-		"Name": "Proxmox.LXC.Cores",
-		"Label": "LXC CPU Cores",
-		"HelpText": "The amount of CPU cores the LXC is assigned",
-		"DefaultValue": "1",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "74b64687-8aed-433d-bce3-714bfd738927",
-		"Name": "Proxmox.LXC.Memory",
-		"Label": "LXC Memory",
-		"HelpText": "The amount of Memory the LXC is assigned.",
-		"DefaultValue": "2048",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "85c52eb6-a25f-4f8e-a068-2a165160d94d",
-		"Name": "Proxmox.LXC.RootSize",
-		"Label": "LXC Rootfs Size",
-		"HelpText": "The size of the root volume for this LXC, Size is in GB",
-		"DefaultValue": "60",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "SingleLineText"
-		}
-	  },
-	  {
-		"Id": "fd072ced-1c8b-4205-a724-e9456b5152c6",
-		"Name": "Proxmox.LXC.StartOnCreate",
-		"Label": "LXC Start Once Created",
-		"HelpText": "Should the LXC start once the LXC has been created",
-		"DefaultValue": "False",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "Checkbox"
-		}
-	  },
-	  {
-		"Id": "dfea6eea-47ff-4489-9434-8ff80bbb8694",
-		"Name": "Proxmox.LXC.Force",
-		"Label": "LXC Overwrite Container",
-		"HelpText": "Overwrites an existing LXC with the same VMID",
-		"DefaultValue": "False",
-		"DisplaySettings": {
-		  "Octopus.ControlType": "Checkbox"
-		}
-	  }
-	],
-	"StepPackageId": "Octopus.Script",
-	"$Meta": {
-	  "ExportedAt": "2023-05-04T10:44:27.968Z",
-	  "OctopusVersion": "2023.2.9087",
-	  "Type": "ActionTemplate"
-	},
-	"LastModifiedBy": "domrichardson",
-	"Category": "proxmox"
-  }
diff --git a/step-templates/proxmox-destroy-lxc.json b/step-templates/proxmox-destroy-lxc.json
deleted file mode 100644
index 48266f951..000000000
--- a/step-templates/proxmox-destroy-lxc.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "Id": "5facb9eb-5a33-4a67-a254-7ba938d0b5a4",
-    "Name": "Proxmox Destroy LXC Container",
-    "Description": "Destroys a Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Proxmox Connection Variables\n$ProxmoxHost = $OctopusParameters[\"Proxmox.Host\"];\n$ProxmoxPort = [int]$OctopusParameters[\"Proxmox.Port\"];\n$ProxmoxUser = $OctopusParameters[\"Proxmox.User\"];\n\n$ProxmoxNode = $OctopusParameters[\"Proxmox.Node\"];\n\n$ProxmoxTokenID = $OctopusParameters[\"Proxmox.TokenID\"];\n$ProxmoxToken = $OctopusParameters[\"Proxmox.Token\"];\n\n# LXC Variables\n$LXC_VMID = [int]$OctopusParameters[\"Proxmox.LXC.VMID\"];\n\n$BaseURL = \"https://$($ProxmoxHost):$($ProxmoxPort)/api2/json\"\n\n$header = @{\n\t\"Authorization\" = \"PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)\"\n}\n\n\nWrite-Host \"Testing Connection To Proxmox Server/Cluster ...\"\n\ntry{\n\tInvoke-RestMethod -Method GET -uri \"$($BaseURL)\" -Headers $header | out-null\n}catch{\n\tthrow \"Couldn't Connect to the Proxmox Server/Cluster\"\n}\n\nWrite-Host \"Successfully Connected To Proxmox Server/Cluster\"\n\n$CheckLXCExists = Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/current\" -Headers $header\n\nif($CheckLXCExists.data -eq $null){\n\tthrow \"The LXC container with vmid ($LXC_VMID) does not exist!\"\n}\n\n\n$LXC_Force = 0\ntry {\n  $Force = [System.Convert]::ToBoolean($OctopusParameters[\"Proxmox.LXC.Force\"])\n  \n  if($Force -eq $True){\n  \t$LXC_Force = 1\n  }\n  \n} catch {}\n\n$LXCDestroyAsyncTask = (Invoke-RestMethod -Method DELETE -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)?force=$($LXC_Force)\" -Headers $header)\n\n$count = 1;\n$maxCount = 10;\n\n$TaskID = $LXCDestroyAsyncTask.Data;\n\nDO\n{\n    Write-Host \"Checking if LXC has finished Destroying..\"\n    $LXCSDestroyAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status\" -Headers $header).data\n    \n    if($LXCSDestroyAsyncTaskStatus.status -eq \"stopped\"){\n    \tif($LXCSDestroyAsyncTaskStatus.exitstatus -ne \"OK\"){\n        \tWrite-Error \"LXC destroy task finished with error: $($LXCSDestroyAsyncTaskStatus.exitstatus)\"\n        }else{\n        \tWrite-Host \"LXC destroy task has successfully completed!\"\n        }\n        \n        break;\n    }\n    \n\tWrite-Host \"LXC destroy task has not finished yet, retring in 5 seconds..\"\n    Write-Host \"Task Status: $($LXCSDestroyAsyncTaskStatus.status)\"\n    sleep 5\n    \n    If($count -gt $maxCount) {\n      Write-Warning \"Task Timed out!\"\n      break;\n    }\n    $count++\n\n} While ($count -le $maxCount)\n"
-    },
-    "Parameters": [
-      {
-        "Id": "9f1a3789-a4fe-4fc4-9a66-78e73d384248",
-        "Name": "Proxmox.Host",
-        "Label": "Proxmox Host",
-        "HelpText": "The hostname or IP address of the Proxmox cluster/host",
-        "DefaultValue": "1.2.3.4",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "240b1180-7b10-48ac-90fb-796fc8eaaf41",
-        "Name": "Proxmox.Port",
-        "Label": "Proxmox Port",
-        "HelpText": "Port number for Proxmox Cluster/Host",
-        "DefaultValue": "8006",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "37d5fad7-2bd3-45da-b30c-62116f0b1940",
-        "Name": "Proxmox.User",
-        "Label": "Proxmox User Account",
-        "HelpText": "The Proxmox user account associated with the api token.",
-        "DefaultValue": "root@pam",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "72a89f72-2571-435b-b0f7-a383f08572b9",
-        "Name": "Proxmox.Node",
-        "Label": "Proxmox Node",
-        "HelpText": "The Proxmox node in the cluster.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b33b88c3-3949-4563-91a2-4ae264bc2d7f",
-        "Name": "Proxmox.TokenID",
-        "Label": "Proxmox Token ID",
-        "HelpText": "This is token id that was used to create an API token in proxmox.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "eff9ca9b-b3ea-44e9-aa79-489d1d9161ee",
-        "Name": "Proxmox.Token",
-        "Label": "Proxmox API Token",
-        "HelpText": "The API Token secret key",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "f7be6495-cc3b-4492-bb1b-e8a178a36a91",
-        "Name": "Proxmox.LXC.VMID",
-        "Label": "LXC VM ID",
-        "HelpText": "The LXC VMID you want to destroy",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "94de0cbc-b722-4788-858f-fb2b32b57fd8",
-        "Name": "Proxmox.LXC.Force",
-        "Label": "Force Destroy LXC",
-        "HelpText": "Do you want to force destroy the LXC container even if its running",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2023-03-16T12:26:59.412Z",
-      "OctopusVersion": "2023.2.2028",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "domrichardson",
-    "Category": "proxmox"
-  }
diff --git a/step-templates/proxmox-start-lxc.json b/step-templates/proxmox-start-lxc.json
deleted file mode 100644
index 71149dc88..000000000
--- a/step-templates/proxmox-start-lxc.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "Id": "f68d54f4-ddcb-4bda-b743-1182b0d82335",
-    "Name": "Proxmox Start LXC Container",
-    "Description": "Starts or Reboots a Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Proxmox Connection Variables\n$ProxmoxHost = $OctopusParameters[\"Proxmox.Host\"];\n$ProxmoxPort = [int]$OctopusParameters[\"Proxmox.Port\"];\n$ProxmoxUser = $OctopusParameters[\"Proxmox.User\"];\n\n$ProxmoxNode = $OctopusParameters[\"Proxmox.Node\"];\n\n$ProxmoxTokenID = $OctopusParameters[\"Proxmox.TokenID\"];\n$ProxmoxToken = $OctopusParameters[\"Proxmox.Token\"];\n\n# LXC Variables\n$LXC_VMID = [int]$OctopusParameters[\"Proxmox.LXC.VMID\"];\n\n$BaseURL = \"https://$($ProxmoxHost):$($ProxmoxPort)/api2/json\"\n\n$header = @{\n\t\"Authorization\" = \"PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)\"\n}\n\n\nWrite-Host \"Testing Connection To Proxmox Server/Cluster ...\"\n\ntry{\n\tInvoke-RestMethod -Method GET -uri \"$($BaseURL)\" -Headers $header | out-null\n}catch{\n\tthrow \"Couldn't Connect to the Proxmox Server/Cluster\"\n}\n\nWrite-Host \"Successfully Connected To Proxmox Server/Cluster\"\n\n$CheckLXCExists = Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/current\" -Headers $header\n\nif($CheckLXCExists.data -eq $null){\n\tthrow \"The LXC container with vmid ($LXC_VMID) does not exist!\"\n}\n\n\n$LXC_Reboot = $False\ntry {\n  $Start = [System.Convert]::ToBoolean($OctopusParameters[\"Proxmox.LXC.Reboot\"])\n  \n  if($Start -eq $True){\n  \t$LXC_Reboot = $True\n  }\n  \n} catch {}\n\n$LXCData = @{}\n\nif($LXC_Reboot -eq $True){\n\t$LXCStartAsyncTask = (Invoke-RestMethod -Method POST -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/reboot\" -Headers $header -Body $LXCData)\n} else{\n\t$LXCStartAsyncTask = (Invoke-RestMethod -Method POST -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/start\" -Headers $header -Body $LXCData)\n}\n\n$count = 1;\n$maxCount = 10;\n\n$TaskID = $LXCStartAsyncTask.Data;\n\nDO\n{\n    Write-Host \"Checking if LXC has finished Starting..\"\n    $LXCStartAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status\" -Headers $header).data\n    \n    if($LXCStartAsyncTaskStatus.status -eq \"stopped\"){\n    \tif($LXCStartAsyncTaskStatus.exitstatus -ne \"OK\"){\n        \tWrite-Error \"LXC start task finished with error: $($LXCStartAsyncTaskStatus.exitstatus)\"\n        }else{\n        \tWrite-Host \"LXC start task has successfully completed!\"\n        }\n        \n        break;\n    }\n    \n\tWrite-Host \"LXC start task has not finished yet, retring in 5 seconds..\"\n    Write-Host \"Task Status: $($LXCStartAsyncTaskStatus.status)\"\n    sleep 5\n    \n    If($count -gt $maxCount) {\n      Write-Warning \"Task Timed out!\"\n      break;\n    }\n    $count++\n\n} While ($count -le $maxCount)\n"
-    },
-    "Parameters": [
-      {
-        "Id": "9f1a3789-a4fe-4fc4-9a66-78e73d384248",
-        "Name": "Proxmox.Host",
-        "Label": "Proxmox Host",
-        "HelpText": "The hostname or IP address of the Proxmox cluster/host",
-        "DefaultValue": "1.2.3.4",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "240b1180-7b10-48ac-90fb-796fc8eaaf41",
-        "Name": "Proxmox.Port",
-        "Label": "Proxmox Port",
-        "HelpText": "Port number for Proxmox Cluster/Host",
-        "DefaultValue": "8006",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "37d5fad7-2bd3-45da-b30c-62116f0b1940",
-        "Name": "Proxmox.User",
-        "Label": "Proxmox User Account",
-        "HelpText": "The Proxmox user account associated with the api token.",
-        "DefaultValue": "root@pam",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "72a89f72-2571-435b-b0f7-a383f08572b9",
-        "Name": "Proxmox.Node",
-        "Label": "Proxmox Node",
-        "HelpText": "The Proxmox node in the cluster.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b33b88c3-3949-4563-91a2-4ae264bc2d7f",
-        "Name": "Proxmox.TokenID",
-        "Label": "Proxmox Token ID",
-        "HelpText": "This is token id that was used to create an API token in proxmox.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "eff9ca9b-b3ea-44e9-aa79-489d1d9161ee",
-        "Name": "Proxmox.Token",
-        "Label": "Proxmox API Token",
-        "HelpText": "The API Token secret key",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "f7be6495-cc3b-4492-bb1b-e8a178a36a91",
-        "Name": "Proxmox.LXC.VMID",
-        "Label": "LXC VM ID",
-        "HelpText": "The LXC VMID you want to start",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "94de0cbc-b722-4788-858f-fb2b32b57fd8",
-        "Name": "Proxmox.LXC.Reboot",
-        "Label": "Reboot LXC",
-        "HelpText": "Do you want to reboot the LXC container",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2023-03-16T12:29:02.350Z",
-      "OctopusVersion": "2023.2.2028",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "domrichardson",
-    "Category": "proxmox"
-  }
diff --git a/step-templates/proxmox-stop-lxc.json b/step-templates/proxmox-stop-lxc.json
deleted file mode 100644
index 3867983f4..000000000
--- a/step-templates/proxmox-stop-lxc.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "Id": "402a0407-9fa7-4d6a-8e13-9bbfa7228960",
-    "Name": "Proxmox Shutdown LXC Container",
-    "Description": "Shutdown or Stop a Proxmox LXC container using the Proxmox API.\n\nRequires a Proxmox [API token](https://pve.proxmox.com/wiki/Proxmox_VE_API#API_Tokens) to authenticate to the Proxmox Server/Cluster",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Proxmox Connection Variables\n$ProxmoxHost = $OctopusParameters[\"Proxmox.Host\"];\n$ProxmoxPort = [int]$OctopusParameters[\"Proxmox.Port\"];\n$ProxmoxUser = $OctopusParameters[\"Proxmox.User\"];\n\n$ProxmoxNode = $OctopusParameters[\"Proxmox.Node\"];\n\n$ProxmoxTokenID = $OctopusParameters[\"Proxmox.TokenID\"];\n$ProxmoxToken = $OctopusParameters[\"Proxmox.Token\"];\n\n# LXC Variables\n$LXC_VMID = [int]$OctopusParameters[\"Proxmox.LXC.VMID\"];\n\n$BaseURL = \"https://$($ProxmoxHost):$($ProxmoxPort)/api2/json\"\n\n$header = @{\n\t\"Authorization\" = \"PVEAPIToken=$($ProxmoxUser)!$($ProxmoxTokenID)=$($ProxmoxToken)\"\n}\n\n\nWrite-Host \"Testing Connection To Proxmox Server/Cluster ...\"\n\ntry{\n\tInvoke-RestMethod -Method GET -uri \"$($BaseURL)\" -Headers $header | out-null\n}catch{\n\tthrow \"Couldn't Connect to the Proxmox Server/Cluster\"\n}\n\nWrite-Host \"Successfully Connected To Proxmox Server/Cluster\"\n\n$CheckLXCExists = Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/current\" -Headers $header\n\nif($CheckLXCExists.data -eq $null){\n\tthrow \"The LXC container with vmid ($LXC_VMID) does not exist!\"\n}\n\n\n$LXC_Stop = $False\ntry {\n  $Stop = [System.Convert]::ToBoolean($OctopusParameters[\"Proxmox.LXC.Stop\"])\n  \n  if($Stop -eq $True){\n  \t$LXC_Stop = $True\n  }\n  \n} catch {}\n\n$LXCData = @{}\n\nif($LXC_Stop -eq $True){\n\t$LXCStopAsyncTask = (Invoke-RestMethod -Method POST -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/stop\" -Headers $header -Body $LXCData)\n} else{\n\t$LXCStopAsyncTask = (Invoke-RestMethod -Method POST -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/lxc/$($LXC_VMID)/status/shutdown\" -Headers $header -Body $LXCData)\n}\n\n$count = 1;\n$maxCount = 10;\n\n$TaskID = $LXCStopAsyncTask.Data;\n\nDO\n{\n    Write-Host \"Checking if LXC has finished Shutting Down..\"\n    $LXCStopAsyncTaskStatus = (Invoke-RestMethod -Method GET -uri \"$($BaseURL)/nodes/$($ProxmoxNode)/tasks/$($TaskID)/status\" -Headers $header).data\n    \n    if($LXCStopAsyncTaskStatus.status -eq \"stopped\"){\n    \tif($LXCStopAsyncTaskStatus.exitstatus -ne \"OK\"){\n        \tWrite-Error \"LXC shutdown task finished with error: $($LXCStopAsyncTaskStatus.exitstatus)\"\n        }else{\n        \tWrite-Host \"LXC shutdown task has successfully completed!\"\n        }\n        \n        break;\n    }\n    \n\tWrite-Host \"LXC shutdown task has not finished yet, retring in 5 seconds..\"\n    Write-Host \"Task Status: $($LXCStopAsyncTaskStatus.status)\"\n    sleep 5\n    \n    If($count -gt $maxCount) {\n      Write-Warning \"Task Timed out!\"\n      break;\n    }\n    $count++\n\n} While ($count -le $maxCount)\n"
-    },
-    "Parameters": [
-      {
-        "Id": "9f1a3789-a4fe-4fc4-9a66-78e73d384248",
-        "Name": "Proxmox.Host",
-        "Label": "Proxmox Host",
-        "HelpText": "The hostname or IP address of the Proxmox cluster/host",
-        "DefaultValue": "1.2.3.4",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "240b1180-7b10-48ac-90fb-796fc8eaaf41",
-        "Name": "Proxmox.Port",
-        "Label": "Proxmox Port",
-        "HelpText": "Port number for Proxmox Cluster/Host",
-        "DefaultValue": "8006",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "37d5fad7-2bd3-45da-b30c-62116f0b1940",
-        "Name": "Proxmox.User",
-        "Label": "Proxmox User Account",
-        "HelpText": "The Proxmox user account associated with the api token.",
-        "DefaultValue": "root@pam",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "72a89f72-2571-435b-b0f7-a383f08572b9",
-        "Name": "Proxmox.Node",
-        "Label": "Proxmox Node",
-        "HelpText": "The Proxmox node in the cluster.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b33b88c3-3949-4563-91a2-4ae264bc2d7f",
-        "Name": "Proxmox.TokenID",
-        "Label": "Proxmox Token ID",
-        "HelpText": "This is token id that was used to create an API token in proxmox.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "eff9ca9b-b3ea-44e9-aa79-489d1d9161ee",
-        "Name": "Proxmox.Token",
-        "Label": "Proxmox API Token",
-        "HelpText": "The API Token secret key",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "f7be6495-cc3b-4492-bb1b-e8a178a36a91",
-        "Name": "Proxmox.LXC.VMID",
-        "Label": "LXC VM ID",
-        "HelpText": "The LXC VMID you want to shutdown",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "94de0cbc-b722-4788-858f-fb2b32b57fd8",
-        "Name": "Proxmox.LXC.Stop",
-        "Label": "Force Stop LXC",
-        "HelpText": "If enabled it will Force Stop the LXC Container Non-gracefully.\nIf disabled it will gracefully shutdown the LXC Container.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2023-03-16T12:30:15.168Z",
-      "OctopusVersion": "2023.2.2028",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "domrichardson",
-    "Category": "proxmox"
-  }
diff --git a/step-templates/rabbitmq-notify-deploy.json b/step-templates/rabbitmq-notify-deploy.json
deleted file mode 100644
index 6d1b60ea8..000000000
--- a/step-templates/rabbitmq-notify-deploy.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "Id": "309f8497-7f79-4979-89a6-5d7e15d83ae2",
-  "Name": "RabbitMQ - Notify Deploy",
-  "Description": "Notifies a deploy by sending a message into rabbitMQ. The message contains all octopus variables and these can be used to have some insight on the deploy. The step is very beta, it is advised to improve it to match real case scenarios.",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Add-ValueToHashtable\r\n{\r\n    param(\r\n    [Parameter(Mandatory = 1)][object]$variable,\r\n    [Parameter(Mandatory = 1)][hashtable]$hashtable\r\n    )\r\n\r\n    if ($variable.value.GetType() -eq [System.String])\r\n    {\r\n        $hashtable.Add($variable.Name, $variable.value)\r\n        return\r\n    }\r\n\r\n    if (($variable.value.GetType() -eq (New-Object 'System.Collections.Generic.Dictionary[String,String]').GetType()) -or ($variable.value.GetType() -eq [Hashtable]))\r\n    {\r\n        foreach ($element in $variable.Value.GetEnumerator())\r\n        {\r\n            $obj = New-Object PsObject -Property @{ Name = $element.Key; Value = $element.Value }\r\n            Add-ValueToHashtable -variable $obj -hashtable $hashtable\r\n        }\r\n        return\r\n    }\r\n\r\n    throw \"Add-ValueToHashtable method does not know what to do with type \" + $variable.value.GetType().Name\r\n}\r\n\r\nfunction Get-UnixDate\r\n{\r\n    $epoch = Get-Date -Year 1970 -Month 1 -Day 1 -Hour 0 -Minute 0 -Second 0\t\r\n    $now = Get-Date\r\n    return ([math]::truncate($now.ToUniversalTime().Subtract($epoch).TotalMilliSeconds))\r\n}\r\n\r\nfunction Get-IsRollback\r\n{\r\n    $currentVersion = New-Object -TypeName System.Version -ArgumentList $OctopusReleaseNumber\r\n    $prevVersion = New-Object -TypeName System.Version -ArgumentList $OctopusReleasePreviousNumber\r\n\r\n    return ($currentVersion.CompareTo($prevVersion) -lt 0)\r\n}\r\n\r\nfunction Get-OctopusVariablesJson\r\n{\r\n    $octoVariables = @{}\r\n\r\n    foreach ($var in (Get-Variable -Name OctopusParameters*))\r\n    {\r\n        Add-ValueToHashtable -variable $var -hashtable $octoVariables\r\n    }\r\n\r\n    $octoVariables.Add(\"isrollback\", (Get-IsRollback))\r\n    $octoVariables.Add(\"timestamp\", (Get-UnixDate))\r\n    $octoVariables.Add(\"safeprojectname\", $OctopusParameters[\"Octopus.Project.Name\"].Replace(\" \", \"_\"))\r\n\r\n    return ($octoVariables | ConvertTo-Json -Compress)\r\n}\r\n\r\nfunction ConvertTo-AsciiString\r\n{\r\n    param(  \r\n    [Parameter(Mandatory = $true, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]\r\n    [string]$input)\r\n    \r\n    process {\r\n        #custom desired transformation\r\n        $tmp = $input.Replace([char]0x00EC, \"i\")\r\n        #fallback\r\n        $bytes = [System.Text.Encoding]::UTF8.GetBytes($tmp)\r\n        $asciiArray = [System.Text.Encoding]::Convert([System.Text.Encoding]::UTF8, [System.Text.Encoding]::ASCII, $bytes)\r\n        $ascistring = [System.Text.Encoding]::ASCII.GetString($asciiArray)\r\n        return $ascistring\r\n    }\r\n}\r\n\r\n$json = Get-OctopusVariablesJson | ConvertTo-AsciiString\r\n$body = New-Object PsObject -Property @{ properties = @{}; routing_key = \"#\"; payload = $json; payload_encoding = \"string\" } | ConvertTo-Json -Compress\r\n\r\n$securepassword = ConvertTo-SecureString $rabbitPassword -AsPlainText -Force\r\n$cred = New-Object System.Management.Automation.PSCredential ($rabbitUsername, $securepassword)\r\n\r\nInvoke-RestMethod -Uri \"$rabbitUrl/api/exchanges/$rabbitVirtualHost/$rabbitExchange/publish\" -Method Post -Credential $cred -Body $body -ContentType \"application/json\""
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "rabbitUsername",
-      "Label": "rabbitmq username",
-      "HelpText": "username used to publish message",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "rabbitPassword",
-      "Label": "rabbitmq user password",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "rabbitExchange",
-      "Label": "rabbitMQ exchange",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "rabbitVirtualHost",
-      "Label": "rabbitmq virtual host",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "rabbitUrl",
-      "Label": "rabbitmq url endpoint",
-      "HelpText": null,
-      "DefaultValue": "http://localhost:15672",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "alfhenrik",
-  "$Meta": {
-    "ExportedAt": "2015-07-05T08:47:05.572+00:00",
-    "OctopusVersion": "3.0.0.1666",
-    "Type": "ActionTemplate"
-  },
-  "Category": "rabbitmq"
-}
\ No newline at end of file
diff --git a/step-templates/rackspace-update-load-balancer.json b/step-templates/rackspace-update-load-balancer.json
deleted file mode 100644
index c1b918b40..000000000
--- a/step-templates/rackspace-update-load-balancer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Id": "94aa35a3-0a0c-4c45-8781-98006bda3bcd",
-  "Name": "Rackspace - Update Load Balancer",
-  "Description": "Change the condition of a node in a Rackspace Cloud Load Balancer.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$username = $OctopusParameters['Username']\n$apiKey = $OctopusParameters['ApiKey']\n$loadbalanderId = $OctopusParameters['LoadBalancerID']\n$newNodeCondition = $OctopusParameters['NewCondition']\n$ipAddress = $OctopusParameters['NodeIpAddress']\n\nif ($newNodeCondition -ne \"ENABLED\" -and $newNodeCondition -ne \"DISABLED\" -and $newNodeCondition -ne \"DRAINING\")\n{\n    throw \"Condition must be one of 'ENABLED', 'DISABLED' or 'DRAINING'\"\n}\n\n# Get token and manipulation URL\n\n$tokensUri = \"https://lon.identity.api.rackspacecloud.com/v2.0/tokens\"\n$tokensBody = @\"\n{\n    \"auth\":\n    {\n       \"RAX-KSKEY:apiKeyCredentials\":\n       {  \n          \"username\": \"$username\",  \n          \"apiKey\": \"$apiKey\"\n       }\n    }  \n}\n\"@\n\nWrite-Host \"Sending request $tokensBody to $tokensUri\"\n\n$tokensResponse = Invoke-WebRequest -Uri $tokensUri -Method Post -Body $tokensBody -ContentType \"application/json\" -UseBasicParsing\n\nif ($tokensResponse.StatusCode -ne 200)\n{\n    throw \"Authorisation failed\"\n}\n\n$tokensObj = ConvertFrom-Json -InputObject $tokensResponse.Content\n\n$loadBalancerDetails = $tokensObj.access.serviceCatalog | Where {$_.name -eq \"cloudLoadBalancers\"}\n$endpoints = $loadBalancerDetails.endpoints | Select -First 1\n$loadbalancerUrl = $endpoints.publicURL\n$token = $tokensObj.access.token.id\n\n# Update node\n\n$header = @{}\n$header.Add(\"X-Auth-Token\", $token)\n$nodesUrl = \"$loadbalancerUrl/loadbalancers/$loadbalancerId/nodes\"\n\nWrite-Host \"Getting node details from $nodesUrl\"\n\n$nodesResponse = Invoke-WebRequest -Uri $nodesUrl -Method Get -Headers $header -ContentType \"application/json\" -UseBasicParsing\n\nif ($nodesResponse.StatusCode -ne 200)\n{\n    throw \"Getting load balancer details failed\"\n}\n\n$nodesObj = ConvertFrom-Json -InputObject $nodesResponse.Content\n$node = $nodesObj.nodes | Where {$_.address -eq $ipAddress}\n$nodeId = $node.id\n\n$updateBody = @\"\n{\n    \"node\": {\n        \"condition\" : \"$newNodeCondition\"\n    }\n}\n\"@\n$updateUrl = \"$loadbalancerUrl/loadbalancers/$loadbalancerId/nodes/$nodeId\"\n\nWrite-Host \"Updating node $nodeId to $newNodeCondition\"\nWrite-Host \"$updateBody\"\nWrite-Host \"$updateUrl\"\n\n$updateResponse = Invoke-WebRequest -Uri $updateUrl -Body $updateBody -Method Put -Headers $header -ContentType \"application/json\" -UseBasicParsing\n\nif ($updateResponse.StatusCode -ne 202)\n{\n    throw \"Updating load balancer failed\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Rackspace control panel username",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApiKey",
-      "Label": "API key",
-      "HelpText": "Rackspace control panel user API key",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "LoadBalancerID",
-      "Label": "Load Balancer ID",
-      "HelpText": "ID of the load balancer, found on the details page in the Rackspace control panel",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NodeIpAddress",
-      "Label": "Node IP address",
-      "HelpText": "IP address of load balanced node. Found on the load balancer details page of the Rackspace control panel",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NewCondition",
-      "Label": "New Node Condition",
-      "HelpText": "Condition to set the node to. Can either be 'ENABLED', 'DISABLED' or 'DRAINING'",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-16T10:29:42.481+00:00",
-    "OctopusVersion": "2.4.5.46",
-    "Type": "ActionTemplate"
-  },
-  "Category": "rackspace"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-create-database.json b/step-templates/ravendb-create-database.json
deleted file mode 100644
index 57c567e3d..000000000
--- a/step-templates/ravendb-create-database.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "ffa7c244-f835-42d1-ad38-15f96037f114",
-  "Name": "RavenDB - Create Database",
-  "Description": "Used to create a new database on a server",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#--------------------------------------------------------------------\r\n#Octopus Variables\r\n\r\n#URL where the database will be create\r\n$ravenDatabaseURL = $OctopusParameters[\"ravenDatabaseURL\"]\r\n\r\n#Name of the new database\r\n$ravenDatabaseName = $OctopusParameters[\"ravenDatabaseName\"]\r\n\r\n#Name of Active Bundles (Replication; Versioning; etc) (Default is null)\r\n$ravenActiveBundles = $OctopusParameters[\"ravenActiveBundles\"]\r\n\r\n#storage Type Name (esent or voron)\r\n$ravenStorageTypeName = $OctopusParameters[\"ravenStorageTypeName\"]\r\n\r\n#directory the database will be located on the server\r\n$ravenDataDir = $OctopusParameters[\"ravenDataDir\"]\r\n\r\n#allow incremental back ups: boolean\r\n$allowIncrementalBackups = $OctopusParameters[\"allowIncrementalBackups\"]\r\n\r\n#temporary files will be created at this location\r\n$voronTempPath = $OctopusParameters[\"voronTempPath\"]\r\n\r\n#The path for the esent logs\r\n$esentLogsPath = $OctopusParameters[\"esentLogsPath\"]\r\n\r\n#The path for the indexes on a disk\r\n$indexStoragePath = $OctopusParameters[\"indexStoragePath\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#checks to see if the entered database exists, return a boolean value depending on the outcome\r\nfunction doesRavenDBExist([string] $databaseChecking, [string]$URL)\r\n{\r\n    #retrieves the list of databases at the specified URL\r\n    $database_list = Invoke-RestMethod -Uri \"$URL/databases\" -Method Get\r\n    #checks if the database is at the specified URL\r\n    if ($database_list -contains $databaseChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n}#ends does ravenDB exist function\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#check to see if database exists\r\nWrite-Output \"Checking to see if $ravenDatabaseName exists\"\r\n\r\n$database_exists = doesRavenDBExist -databaseChecking $ravenDatabaseName -URL $ravenDatabaseURL\r\n\r\nif($database_exists -eq $TRUE)\r\n{\r\n    Write-Error \"$ravenDatabaseName already exists\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n#--------------------------------------------------------------------\r\n#check setting variables \r\n\r\nif($ravenActiveBundles -eq $null)\r\n{\r\n   $ravenActiveBundles = \"\" \r\n}\r\n\r\nif($ravenDataDir -eq \"\")\r\n{\r\n    Write-Warning \"A directory for the database has NOT been entered. The default directory ~\\Databases\\System is being used.\"\r\n    $ravenDataDir  = \"~\\Databases\\System\"\r\n}\r\n\r\nif($esentLogsPath -eq \"\")\r\n{\r\n    Write-Warning \"The path for the esent logs has NOT been entered. The default path of ~/Data/Logs will be used\"\r\n    $esentLogsPath =  \"~/Data/Logs\"\r\n}\r\n\r\nif($indexStoragePath -eq \"\")\r\n{\r\n    Write-Warning \"The path for the indexes has NOT been entered. The default path of ~/Data/Indexes will be used\"\r\n    $indexStoragePath = \"~/Data/Indexes\"\r\n}\r\n\r\n\r\n$ravenDataDir = $ravenDataDir.Replace(\"\\\", \"\\\\\")\r\n\r\n$voronTempPath = $voronTempPath.Replace(\"\\\", \"\\\\\")\r\n\r\n$esentLogsPath = $esentLogsPath.Replace(\"\\\", \"\\\\\")\r\n\r\n$indexStoragePath = $indexStoragePath.Replace(\"\\\", \"\\\\\")\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#database Settings \r\n\r\n$db_settings = @\"\r\n{\r\n   \"Settings\":\r\n   {\r\n   \"Raven/ActiveBundles\": \"$ravenActiveBundles\",\r\n    \"Raven/StorageTypeName\": \"$ravenStorageTypeName\",\r\n    \"Raven/DataDir\": \"$ravenDataDir\",\r\n    \"Raven/Voron/AllowIncrementalBackups\": \"$allowIncrementalBackups\",\r\n    \"Raven/Voron/TempPath\": \"$voronTempPath\",\r\n    \"Raven/Esent/LogsPath\": \"$esentLogsPath\",\r\n    \"Raven/IndexStoragePath\": \"$indexStoragePath\"\r\n   }\r\n}\r\n\"@\r\n\r\n#--------------------------------------------------------------------\r\n#create Database\r\n\r\nWrite-Output \"Create database: $ravenDatabaseName\"\r\n\r\n$createURI = \"$ravenDatabaseURL/admin/databases/$ravenDatabaseName\"\r\n\r\nInvoke-RestMethod -Uri $createURI -Body $db_settings -Method Put\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenDatabaseURL",
-      "Label": "URL of the RavenDB",
-      "HelpText": "URL of the RavenDB, where you would like the database to be created.  \n\nFor example **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenDatabaseName",
-      "Label": "Name of the Database",
-      "HelpText": "The name the database will be called. Make sure that name is not already being used.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenActiveBundles",
-      "Label": "Active Bundles",
-      "HelpText": "A settings option, Active Bundles refers bundles that RavenDB has (Replication;Versioning; etc)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenStorageTypeName",
-      "Label": "Name of the Storage Type",
-      "HelpText": "What storage type to use",
-      "DefaultValue": "Esent",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Esent| Esent\nVoron| Voron"
-      }
-    },
-    {
-      "Name": "ravenDataDir",
-      "Label": "Path for the database directory",
-      "HelpText": "The path for the database directory on the server",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "allowIncrementalBackups",
-      "Label": "Allow Incremental Backups",
-      "HelpText": "Allow Incremental Backups to be perform on this Database",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "voronTempPath",
-      "Label": "Path to Temporary Files",
-      "HelpText": "A different path where the temporary files will be stored",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "esentLogsPath",
-      "Label": "Path for the Esent Logs",
-      "HelpText": "The path for the Esent logs",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "indexStoragePath",
-      "Label": "Path for the Indexes",
-      "HelpText": "The path for the indexes on a disk, if you want to store the indexes on another HDD for performance reasons",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-12T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-15T22:07:42.439+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-create-filesystem.json b/step-templates/ravendb-create-filesystem.json
deleted file mode 100644
index cd2fd1714..000000000
--- a/step-templates/ravendb-create-filesystem.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "35e74a1b-3d6a-4d68-be07-51d0dfb56f23",
-  "Name": "RavenDB - Create File System",
-  "Description": "Used to create a new file system on a server",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#--------------------------------------------------------------------\r\n#File System Octopus Variables\r\n\r\n#URL of RavenFS that is being deleted \r\n$ravenFileSystemURL = $OctopusParameters[\"ravenFileSystemURL\"]\r\n\r\n#name of the RavenFS that is being deleted\r\n$ravenFileSystemName = $OctopusParameters[\"ravenFileSystemName\"]\r\n\r\n#--------------------------------------------------------------------\r\n#Settings Octopus Variables\r\n\r\n#Name of Active Bundles (Replication; Versioning; etc) (Default is none)\r\n$ravenActiveBundles = $OctopusParameters[\"ravenActiveBundles\"]\r\n\r\n#storage Type Name (esent or voron)\r\n$ravenStorageTypeName = $OctopusParameters[\"ravenStorageTypeName\"]\r\n\r\n#directory the database will be located on the server\r\n$ravenDataDir = $OctopusParameters[\"ravenDataDir\"]\r\n\r\n#allow incremental back ups: boolean\r\n$allowIncrementalBackups = $OctopusParameters[\"allowIncrementalBackups\"]\r\n\r\n#temporary files will be created at this location\r\n$voronTempPath = $OctopusParameters[\"voronTempPath\"]\r\n\r\n#The path for the esent logs\r\n$esentLogsPath = $OctopusParameters[\"esentLogsPath\"]\r\n\r\n#The path for the indexes on a disk\r\n$indexStoragePath = $OctopusParameters[\"indexStoragePath\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#checks to see if the entered file system exists, return a Boolean value depending on the outcome\r\nfunction doesRavenFSExist([string] $FSChecking, [string]$URL)\r\n{\r\n    #retrieves the list of File Systems at the specified URL\r\n    $fs_list = Invoke-RestMethod -Uri \"$URL/fs\" -Method Get\r\n    #checks if the File System is at the specified URL\r\n    if ($fs_list -contains $FSChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n}#ends does File System exist function\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#check to see if File System exists\r\n\r\nWrite-Output \"Checking if $ravenFileSystemName exists\"\r\n\r\n$fs_exists = doesRavenFSExist -FSChecking $ravenFileSystemName -URL $ravenFileSystemURL\r\n\r\nif($fs_exists -eq $TRUE)\r\n{\r\n    Write-Error \"$ravenFileSystemName already exists\" -ErrorId E4\r\n    Exit 1\r\n}\r\nelse\r\n{\r\n    Write-Output \"$ravenFileSystemName doesn't exist. Creating $ravenFileSystemName now\"\r\n}\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#check setting variables \r\n\r\nif($ravenActiveBundles -eq $null)\r\n{\r\n   $ravenActiveBundles = \"\" \r\n}\r\n\r\nif($ravenDataDir -eq \"\")\r\n{\r\n    Write-Warning \"A directory for the database has NOT been entered. The default directory ~\\Databases\\System is being used.\"\r\n    $ravenDataDir  = \"~\\Databases\\System\"\r\n}\r\n\r\nif($esentLogsPath -eq \"\")\r\n{\r\n    Write-Warning \"The path for the esent logs has NOT been entered. The default path of ~/Data/Logs will be used\"\r\n    $esentLogsPath =  \"~/Data/Logs\"\r\n}\r\n\r\nif($indexStoragePath -eq \"\")\r\n{\r\n    Write-Warning \"The path for the indexes has NOT been entered. The default path of ~/Data/Indexes will be used\"\r\n    $indexStoragePath = \"~/Data/Indexes\"\r\n}\r\n\r\n\r\n$ravenDataDir = $ravenDataDir.Replace(\"\\\", \"\\\\\")\r\n\r\n$voronTempPath = $voronTempPath.Replace(\"\\\", \"\\\\\")\r\n\r\n$esentLogsPath = $esentLogsPath.Replace(\"\\\", \"\\\\\")\r\n\r\n$indexStoragePath = $indexStoragePath.Replace(\"\\\", \"\\\\\")\r\n\r\n$ravenDataDir = $ravenDataDir.Replace(\"DB\", \"FS\")\r\n\r\n$voronTempPath = $voronTempPath.Replace(\"DB\", \"FS\")\r\n\r\n$esentLogsPath = $esentLogsPath.Replace(\"DB\", \"FS\")\r\n\r\n$indexStoragePath = $indexStoragePath.Replace(\"DB\", \"FS\")\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#file system settings\r\n\r\n\r\n$fs_settings = @\"\r\n{\r\n   \"Settings\":\r\n   {\r\n   \"Raven/ActiveBundles\": \"$ravenActiveBundles\",\r\n    \"Raven/StorageTypeName\": \"$ravenStorageTypeName\",\r\n    \"Raven/DataDir\": \"$ravenDataDir\",\r\n    \"Raven/Voron/AllowIncrementalBackups\": \"$allowIncrementalBackups\",\r\n    \"Raven/Voron/TempPath\": \"$voronTempPath\",\r\n    \"Raven/Esent/LogsPath\": \"$esentLogsPath\",\r\n    \"Raven/IndexStoragePath\": \"$indexStoragePath\"\r\n   }\r\n}\r\n\"@\r\n\r\n#--------------------------------------------------------------------\r\n#Create File System\r\n\r\nWrite-Output \"Creating File System: $ravenFileSystemName\"\r\n\r\n$createURI = \"$ravenFileSystemURL/admin/fs/$ravenFileSystemName\"\r\n\r\nInvoke-RestMethod -Uri $createURI -Body $fs_settings -Method Put\r\n\r\nWrite-Output \"$ravenFileSystemName created.\"\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenFileSystemURL",
-      "Label": "URL of RavenDB",
-      "HelpText": "URL of the RavenDB, where you would like the file system to be created. \n\nFor example **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenFileSystemName",
-      "Label": "Name of the File System",
-      "HelpText": "Name the new File System will be called. Make sure the name is not being used already within this instance of RavenDB",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenActiveBundles",
-      "Label": "Active Bundles",
-      "HelpText": "A settings option, Active Bundles refers bundles that RavenDB has (Replication;Versioning; etc)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenStorageTypeName",
-      "Label": "Name of the Storage Type",
-      "HelpText": "What storage type to use",
-      "DefaultValue": "Esent",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Esent| Esent\nVoron| Voron"
-      }
-    },
-    {
-      "Name": "ravenDataDir",
-      "Label": "Path for the database directory",
-      "HelpText": "The path for the database directory on the server",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "allowIncrementalBackups",
-      "Label": "Allow Incremental Backups",
-      "HelpText": "Allow Incremental Backups to be perform on this Database",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "voronTempPath",
-      "Label": "Path to Temporary Files",
-      "HelpText": "A different path where the temporary files will be stored",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "esentLogsPath",
-      "Label": "Path for the Esent Logs",
-      "HelpText": "The path for the Esent logs",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "indexStoragePath",
-      "Label": "Path for the Indexes",
-      "HelpText": "The path for the indexes on a disk, if you want to store the indexes on another HDD for performance reasons",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-12T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-15T22:10:59.092+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-delete-database.json b/step-templates/ravendb-delete-database.json
deleted file mode 100644
index bf550d55a..000000000
--- a/step-templates/ravendb-delete-database.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "474d4dff-e91b-4580-b074-c39763741cd6",
-  "Name": "RavenDB - Delete Database",
-  "Description": "Used to delete a database from a server, with a possibility to remove all the data from hard drive.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#--------------------------------------------------------------------\r\n#Octopus Variables\r\n\r\n#URL where the database can be found\r\n$ravenDatabaseURL = $OctopusParameters[\"ravenDatabaseURL\"]\r\n\r\n#Name of the Database\r\n$ravenDatabaseName = $OctopusParameters[\"ravenDatabaseName\"]\r\n\r\n#hard delete (true or false)\r\n$hardDelete = $OctopusParameters[\"hardDelete\"]\r\n\r\n#Allow Database to be deleted\r\n$allowDelete = $OctopusParameters[\"allowDelete\"]\r\n\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n#--------------------------------------------------------------------\r\n#checks to see if the database can be deleted\r\n\r\nif($allowDelete -eq $FALSE)\r\n{\r\n    Write-Error \"$ravenDatabaseName cannot be deleted. Please try this on a database that can be delete.\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#checks to see if the entered database exists, return a boolean value depending on the outcome\r\nfunction doesRavenDBExist([string] $databaseChecking, [string]$URL)\r\n{\r\n    #retrieves the list of databases at the specified URL\r\n    $database_list = Invoke-RestMethod -Uri \"$URL/databases\" -Method Get\r\n    #checks if the database is at the specified URL\r\n    if ($database_list -contains $databaseChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n}#ends does ravenDB exist function\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#check to see if database exists\r\nWrite-Output \"Checking to see if $ravenDatabaseName exists\"\r\n\r\n$database_exists = doesRavenDBExist -databaseChecking $ravenDatabaseName -URL $ravenDatabaseURL\r\n\r\nif($database_exists -eq $TRUE)\r\n{\r\n    Write-Output \"$ravenDatabaseName exists\"\r\n    $doWork = $TRUE\r\n}\r\nelse\r\n{\r\n    Write-Warning \"$ravenDatabaseName does not exist already.\" \r\n    $doWork = $FALSE\r\n}\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#hard delete option\r\n\r\n$hardDeleteString = $hardDelete.ToString().ToLower()\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#Delete database\r\n\r\nif($doWork -eq $TRUE)\r\n{\r\n\r\n    Write-Output \"Deleting Database: $ravenDatabaseName\"\r\n\r\n    $deleteURI = \"$ravenDatabaseURL/admin/databases/$ravenDatabaseName\" + \"?hard-delete=$hardDeleteString\"\r\n\r\n    Invoke-RestMethod -Uri $deleteURI -Method Delete\r\n\r\n    #Waits 10 seconds before it continues\r\n    Start-Sleep -Seconds 10\r\n    \r\n    Write-Output \"Database has successfuly been deleted\"\r\n\r\n}"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenDatabaseURL",
-      "Label": "URL of the Raven Database",
-      "HelpText": "The URL of the Raven database, where the Database is located. \n\nFor example **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenDatabaseName",
-      "Label": "Name of the Raven Database",
-      "HelpText": "Name of the Database in Raven.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "hardDelete",
-      "Label": "Hard Delete",
-      "HelpText": "Should all of the data be removed from the hard drive as well",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "allowDelete",
-      "Label": "Allow Deletion",
-      "HelpText": "Is the database allowed to be deleted. **TRUE OR FALSE** value must be entered\n\n**For example**: you don't want a production server to be deleted, the script will stop it from happening\n\n**HINT**: have a variable within Octopus that returns true if it is allowed to be deleted and vice versa.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-26T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-26T03:54:46.614+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-delete-filesystem.json b/step-templates/ravendb-delete-filesystem.json
deleted file mode 100644
index 1bb315c09..000000000
--- a/step-templates/ravendb-delete-filesystem.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "365ae5c6-8f97-4e99-82c8-9973b9b0d8ff",
-  "Name": "RavenDB - Delete File System",
-  "Description": "Used to delete a file system from a server, with a possibility to remove its all data from the hard drive.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#--------------------------------------------------------------------\r\n#Octopus Variables\r\n\r\n#URL of RavenFS that is being deleted \r\n$ravenFileSystemURL = $OctopusParameters[\"ravenFileSystemURL\"]\r\n\r\n#name of the RavenFS that is being deleted\r\n$ravenFileSystemName = $OctopusParameters[\"ravenFileSystemName\"]\r\n\r\n#hard delete (true or false)\r\n$hardDelete = $OctopusParameters[\"hardDelete\"]\r\n\r\n#Allow File System to be deleted\r\n$allowDelete = $OctopusParameters[\"allowDelete\"]\r\n\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n#--------------------------------------------------------------------\r\n#checks to see if the File System can be deleted\r\n\r\nif($allowDelete -eq $FALSE)\r\n{\r\n    Write-Error \"$ravenFileSystemName cannot be deleted. Please try this on a database that can be delete.\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#checks to see if the entered file system exists, return a Boolean value depending on the outcome\r\nfunction doesRavenFSExist([string] $FSChecking, [string]$URL)\r\n{\r\n    #retrieves the list of File Systems at the specified URL\r\n    $fs_list = Invoke-RestMethod -Uri \"$URL/fs\" -Method Get\r\n    #checks if the File System is at the specified URL\r\n    if ($fs_list -contains $FSChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n}#ends does File System exist function\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#check to see if File System exists\r\n\r\nWrite-Output \"Checking if $ravenFileSystemName exists\"\r\n\r\n$fs_exists = doesRavenFSExist -FSChecking $ravenFileSystemName -URL $ravenFileSystemURL\r\n\r\nif($fs_exists -eq $TRUE)\r\n{\r\n    Write-Output \"$ravenFileSystemName exists\"\r\n    $doWork = $TRUE\r\n}\r\nelse\r\n{\r\n    Write-Warning \"$ravenFileSystemName doesn't exist already.\"\r\n    $doWork = $FALSE\r\n}\r\n\r\n#--------------------------------------------------------------------\r\n#converts hard delete option to a string\r\n\r\n$hardDeleteString = $hardDelete.ToString().ToLower()\r\n\r\n#--------------------------------------------------------------------\r\n#Delete File System\r\n\r\nif($doWork -eq $TRUE)\r\n{\r\n\r\n    Write-Output \"Deleting File System: $ravenFileSystemName\"\r\n\r\n    $deleteURI = \"$ravenFileSystemURL/admin/fs/$ravenFileSystemName\" + \"?hard-delete=$hardDeleteString\"\r\n\r\n    Invoke-RestMethod -Uri $deleteURI -Method Delete\r\n\r\n\r\n    #Waits 10 seconds before it continues\r\n    Start-Sleep -Seconds 10\r\n    \r\n    Write-Output \"File System has successfuly been deleted\"\r\n\r\n}"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenFileSystemURL",
-      "Label": "URL of the Raven Database",
-      "HelpText": "The URL of the Raven File System, where the File System is located.\n\nFor example: **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenFileSystemName",
-      "Label": "Name of the File System",
-      "HelpText": "Name of the File System in Raven",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "hardDelete",
-      "Label": "Hard Delete",
-      "HelpText": "Should all of the data be removed from the hard drive as well",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "allowDelete",
-      "Label": "Allow Deletion",
-      "HelpText": "Is the File System allowed to be deleted. **TRUE OR FALSE** value must be entered\n\n**For example**: you don't want a production server to be deleted, the script will stop it from happening\n\n**HINT**: have a variable within Octopus that returns true if it is allowed to be deleted and vice versa.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-26T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-26T03:55:48.036+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-smuggler-move-data-between-database.json b/step-templates/ravendb-smuggler-move-data-between-database.json
deleted file mode 100644
index 24520100a..000000000
--- a/step-templates/ravendb-smuggler-move-data-between-database.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-  "Id": "82f804fe-682e-4e0b-8c2a-a5f289a9cabc",
-  "Name": "RavenDB - Smuggler - Move Data Between Databases",
-  "Description": "To move data directly between two instances (or different databases in the same instance) using the between option introduced in Smuggler version 3.",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "\r\n# Variables\r\n\r\n#Location of the Raven Smuggler exe\r\n$ravenSmugglerPath = $OctopusParameters[\"ravenSmugglerPath\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n# Source Database Variables\r\n\r\n#URL of RavenDB that is being backed up \r\n$sourceDatabaseURL = $OctopusParameters[\"sourceDatabaseURL\"]\r\n\r\n#name of the RavenDB that is being backed up\r\n$sourceDatabaseName = $OctopusParameters[\"sourceDatabaseName\"]\r\n\r\n#API Key for the Source Database\r\n$sourceDatabaseApiKey = $OctopusParameters[\"sourceDatabaseApiKey\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#Destination Database Variables\r\n\r\n#URL of destination RavenDB \r\n$destinationDatabaseURL = $OctopusParameters[\"destinationDatabaseURL\"]\r\n\r\n#Name of the destination RavenDB\r\n$destinationDatabaseName = $OctopusParameters[\"destinationDatabaseName\"]\r\n\r\n#API Key for the Destination Database\r\n$destinationDatabaseAPIKey = $OctopusParameters[\"destinationDatabaseAPIKey\"]\r\n\r\n\r\n\r\n#------------------------------------------------------------------------------\r\n# Other Variables retrieved from Octopus\r\n\r\n#Limit the back up to different types in the database\r\n#Get document option (true/false)\r\n$operateOnDocuments = $OctopusParameters[\"operateOnDocuments\"]\r\n\r\n#Get attachments option (true/false)\r\n$operateOnAttachments = $OctopusParameters[\"operateOnAttachments\"]\r\n\r\n#Get indexes option (true/false)\r\n$operateOnIndexes = $OctopusParameters[\"operateOnIndexes\"]\r\n\r\n#Get transformers option (true/false)\r\n$operateOnTransformers = $OctopusParameters[\"operateOnTransformers\"]\r\n\r\n#Get timeout option \r\n$timeout = $OctopusParameters[\"timeout\"]\r\n\r\n#Get wait for indexing option (true/false)\r\n$waitForIndexing = $OctopusParameters[\"waitForIndexing\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#checks to see if the entered database exists, return a boolean value depending on the outcome\r\nfunction doesRavenDBExist([string] $databaseChecking, [string]$URL)\r\n{\r\n    #retrieves the list of databases at the specified URL\r\n    $database_list = Invoke-RestMethod -Uri \"$URL/databases\" -Method Get\r\n    #checks if the database is at the specified URL\r\n    if ($database_list -contains $databaseChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n}#ends does ravenDB exist function\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#Checking the versions of Raven Server of both databases to see if they are compatible \r\n\r\nWrite-Output \"Checking that both $sourceDatabaseName and $destinationDatabaseName are running the same version of RavenDB\"\r\n\r\n#Getting Source Database's build version\r\n$sourceVersionURL = \"$sourceDatabaseURL/databases/$sourceDatabaseName/build/version\"\r\n\r\n$sourceDatabaseVersion = Invoke-RestMethod -Uri $sourceVersionURL -Method Get\r\n\r\n#Getting destination Database's build version\r\n$destinationVersionURL = \"$destinationDatabaseURL/databases/$destinationDatabaseName/build/version\"\r\n\r\n$destinationDatabaseVersion = Invoke-RestMethod -Uri $destinationVersionURL -Method Get\r\n\r\n#Checks to see if they are the same version and build number\r\nif(($sourceDatabaseVersion.ProductVersion -eq $destinationDatabaseVersion.ProductVersion) -and ($sourceDatabaseVersion.BuildVersion -eq $destinationDatabaseVersion.BuildVersion))\r\n{\r\n    \r\n    Write-Output \"Source Database Product Version:\" $sourceDatabaseVersion.ProductVersion \r\n    Write-Output \"Source Database Build Version:\" $sourceDatabaseVersion.BuildVersion\r\n    Write-Output \"Destination Database Version:\" $destinationDatabaseVersion.ProductVersion \r\n    Write-Output \"Destination Database Build Version:\" $destinationDatabaseVersion.BuildVersion\r\n    Write-Output \"Source and destination Databases are running the same version of Raven Server\"\r\n    \r\n}\r\nelse \r\n{\r\n    Write-Warning \"Source Database Version: $sourceDatabaseVersion\"\r\n    Write-Warning \"Destination Database Version: $destinationDatabaseVersion\"\r\n    Write-Warning \"The databases are running different versions of Raven Server\"\r\n}\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#Check path to smuggler\r\nWrite-Output \"Checking if Smuggler path is correct`n\"\r\n\r\n$smugglerPath = \"$ravenSmugglerPath\"\r\n\r\n$smuggler_Exists = Test-Path -Path $smugglerPath\r\n\r\n\r\n\r\n#if the path is correct, the script continues, throws an error if the path is wrong\r\nIf($smuggler_Exists -eq $TRUE)\r\n{\r\n    Write-Output \"Smuggler exists\"\r\n\r\n}#ends if smuggler exists \r\nelse\r\n{\r\n    Write-Error \"Smuggler can not be found `nCheck the directory: $ravenSmugglerPath\" -ErrorId E4\r\n    Exit 1\r\n}#ends else, smuggler can't be found\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#Checking the version of smuggler\r\n\r\n$SmugglerVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ravenSmugglerPath).FileVersion\r\n\r\nif($SmugglerVersion -cgt \"3\")\r\n{\r\n    Write-Output \"Smuggler Version: $SmugglerVersion\"\r\n}\r\nelse\r\n{\r\n    Write-Error \"The version of Smuggler that is installed can NOT complete this step `nPlease update Smuggler before continuing\" -ErrorId E4\r\n    Exit 1\r\n}\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n\r\n#Checks if both Source database and destination database exist\r\nWrite-Output \"Checking if both $sourceDatabaseName and $destinationDatabaseName exist`n\"\r\n\r\n$sourceDatabase_exists = doesRavenDBExist -databaseChecking $sourceDatabaseName -URL $sourceDatabaseURL \r\n\r\n$destinationDatabase_exists = doesRavenDBExist -databaseChecking $destinationDatabaseName -URL $destinationDatabaseURL\r\n\r\n\r\n#if both database exist a backup occurs\r\nif(($sourceDatabase_exists -eq $TRUE) -and ($destinationDatabase_exists -eq $TRUE))\r\n{\r\n\r\n    Write-Output \"Both $sourceDatabaseName and $destinationDatabaseName exist`n\"\r\n\r\n}#ends if \r\n#if the source database doesn’t exist an error is throw\r\nelseIf(($sourceDatabase_exists -eq $FALSE) -and ($destinationDatabase_exists -eq $TRUE))\r\n{\r\n\r\n    Write-Error \"$sourceDatabaseName does not exist. `nMake sure the database exists before continuing\" -ErrorId E4\r\n    Exit 1\r\n\r\n}\r\n#if the destination database doesn’t exist an error is throw\r\nelseIf(($destinationDatabase_exists -eq $FALSE) -and ($sourceDatabase_exists -eq $TRUE))\r\n{\r\n\r\n    Write-Error \"$destinationDatabaseName does not exist. `nMake sure the database exists before continuing\" -ErrorId E4\r\n    Exit 1\r\n\r\n}#ends destination db not exists\r\nelse\r\n{\r\n\r\n    Write-Error \"Neither $sourceDatabaseName or $destinationDatabaseName exists. `nMake sure both databases exists\" -ErrorId E4\r\n    Exit 1\r\n\r\n}#ends else\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#changing the types to export/import\r\n\r\n$operateTypes = @()\r\n\r\n\r\nif($operateOnDocuments -eq $TRUE)\r\n{\r\n    $operateTypes += \"Documents\"\r\n}\r\nif($operateOnIndexes -eq $TRUE)\r\n{\r\n    $operateTypes += \"Indexes\"\r\n}\r\nif($operateOnAttachments -eq $TRUE)\r\n{\r\n    $operateTypes += \"Attachments\"\r\n}\r\nif($operateOnTransformers -eq $TRUE)\r\n{\r\n    $operateTypes += \"Transformers\"\r\n}\r\n\r\n$Types = $operateTypes -join \",\"\r\n\r\nif($Types -ne \"\")\r\n{\r\n    Write-Output \"This back up is only operating on $Types\"\r\n\r\n    Write-Output \"`n-------------------------`n\"\r\n}\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#check if wait for indexing is selected\r\n$Indexing = \"\"\r\n\r\nif($waitForIndexing -eq $TRUE)\r\n{\r\n    $Indexing = \"--wait-for-indexing\"\r\n}\r\n\r\n#--------------------------------------------------------------------\r\n#backing up source database into the destination database\r\n\r\ntry\r\n{\r\n    Write-Output \"Attempting Backup up now\"\r\n    Write-Output \"`n-------------------------`n\"\r\n    & $ravenSmugglerPath between $sourceDatabaseURL $destinationDatabaseURL --database=$sourceDatabaseName --database2=$destinationDatabaseName --api-key=$sourceDatabaseApiKey --api-key2=$destinationDatabaseAPIKey --timeout=$Timeout $Indexing \r\n    Write-Output \"`n-------------------------`n\"\r\n    Write-Output \"Backup successful\" \r\n}#ends try\r\ncatch\r\n{\r\n    Write-Error \"An error occurred during backup, please try again\" -ErrorId E4\r\n    Exit 1\r\n}#ends catch \r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenSmugglerPath",
-      "Label": "Raven Smuggler Path",
-      "HelpText": "Full path to the Smuggler EXE. \n \nFor example **C:\\RavenDB\\Smuggler\\Raven.Smuggler.exe**",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "sourceDatabaseUrl",
-      "Label": "Source Database URL",
-      "HelpText": "The URL of the Raven database, where the **Source Database** is located. \n\nFor example **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "sourceDatabaseName",
-      "Label": "Name of the Source Database",
-      "HelpText": "Name of the **Source Database** in Raven.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "sourceDatabaseApiKey",
-      "Label": "API Key for the Source Database",
-      "HelpText": "API Key needed to access the **Source Database**. \n\nIf key is not provided, anonymous authentication will be used.\n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "destinationDatabaseUrl",
-      "Label": "Destination Database URL",
-      "HelpText": "The URL of the Raven database, where the **Destination Database** is located. \n\nFor example **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "destinationDatabaseName",
-      "Label": "Name of the Destination Database",
-      "HelpText": "Name of the **Destination Database** in Raven.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "destinationDatabaseApiKey",
-      "Label": "API Key for the Destination Database",
-      "HelpText": "API Key needed to access the **Destination Database**. \n\nIf key is not provided, anonymous authentication will be used.\n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "OperateDocuments",
-      "Label": "Operate on Documents",
-      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Documents** from the copying process.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "OperateAttachments",
-      "Label": "Operate on Attachments",
-      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Attachments** from the copying process.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "OperateIndexes",
-      "Label": "Operate on Indexes",
-      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Indexes** from the copying process.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "OperateTransformers",
-      "Label": "Operate on Transformers",
-      "HelpText": "With Raven backup, you can choose which types are operated during the backup.\n\nUnselect this option to exclude **Transformers** from the copying process.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "timeout",
-      "Label": "Timeout",
-      "HelpText": "The timeout (in milliseconds) to use for requests.",
-      "DefaultValue": "300000",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WaitIndexing",
-      "Label": "Wait for Indexing",
-      "HelpText": "Wait until all indexing activity has been completed (Import Only).",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-12T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-15T22:01:49.385+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-smuggler-move-data-between-filesystems.json b/step-templates/ravendb-smuggler-move-data-between-filesystems.json
deleted file mode 100644
index 6220538b2..000000000
--- a/step-templates/ravendb-smuggler-move-data-between-filesystems.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "Id": "4ec55f5e-ab8b-409d-b404-dc0bf705d057",
-  "Name": "RavenDB - Smuggler - Moving Data between File Systems",
-  "Description": "To move data directly between two instances (or different file systems in the same instance) using the between option introduced in Smuggler version 3.",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "\r\n# Variables\r\n\r\n#Location of the Raven Smuggler exe\r\n$ravenSmugglerPath = $OctopusParameters[\"ravenSmugglerPath\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n# Source File System Variables\r\n\r\n#URL of RavenFS that is being backed up \r\n$sourceFileSystemURL = $OctopusParameters[\"sourceFileSystemURL\"]\r\n\r\n#name of the RavenFS that is being backed up\r\n$sourceFileSystemName = $OctopusParameters[\"sourceFileSystemName\"]\r\n\r\n#API Key for the Source File System\r\n$sourceFileSystemApiKey = $OctopusParameters[\"sourceFileSystemApiKey\"]\r\n\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#Destination File System Variables\r\n\r\n#URL of destination RavenFS \r\n$destinationFileSystemURL = $OctopusParameters[\"destinationFileSystemURL\"]\r\n\r\n#Name of the destination RavenFS\r\n$destinationFileSystemName = $OctopusParameters[\"destinationFileSystemName\"]\r\n\r\n#API Key for the Destination File System\r\n$destinationFileSystemAPIKey = $OctopusParameters[\"destinationFileSystemAPIKey\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n# Other Variables retrieved from Octopus\r\n\r\n#Get timeout variable\r\n$timeout = $OctopusParameters[\"timeout\"]\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#checks to see if the entered file system exists, return a Boolean value depending on the outcome\r\nfunction doesRavenFSExist([string] $FSChecking, [string]$URL)\r\n{\r\n    #retrieves the list of File Systems at the specified URL\r\n    $fs_list = Invoke-RestMethod -Uri \"$URL/fs\" -Method Get\r\n    #checks if the File System is at the specified URL\r\n    if ($fs_list -contains $FSChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n}#ends does File System exist function\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#Check path to smuggler\r\nWrite-Output \"Checking if Smuggler path is correct`n\"\r\n\r\n$smuggler_Exists = Test-Path -Path $ravenSmugglerPath\r\n\r\n\r\n\r\n#if the path is correct, the script continues, throws an error if the path is wrong\r\nIf($smuggler_Exists -eq $TRUE)\r\n{\r\n    Write-Output \"Smuggler exists\"\r\n\r\n}#ends if smuggler exists \r\nelse\r\n{\r\n    Write-Error \"Smuggler cannot be found `nCheck the directory: $ravenSmugglerPath\" -ErrorId E4\r\n    Exit 1\r\n}#ends else, smuggler can't be found\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#Checking the version of smuggler\r\n\r\n$SmugglerVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ravenSmugglerPath).FileVersion\r\n\r\nif($SmugglerVersion -cgt \"3\")\r\n{\r\n    Write-Host \"Smuggler Version: $SmugglerVersion\"\r\n}\r\nelse\r\n{\r\n    Write-Error \"The version of Smuggler that is installed can NOT complete this step. `nPlease update Smuggler before continuing\" -ErrorId E4\r\n    Exit 1\r\n}\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n\r\n#Check if Source File System and destination File System exists\r\nWrite-Output \"Checking if both $sourceFileSystemName and $destinationFileSystemName exist`n\"\r\n\r\n$sourceFS_exists = doesRavenFSExist -FSChecking $sourceFileSystemName -URL $sourceFileSystemURL \r\n\r\n$DestinationFS_Exist = doesRavenFSExist -FSChecking $destinationFileSystemName -URL $destinationFileSystemURL\r\n\r\n\r\n#if both File System exist a backup occurs\r\nif(($sourceFS_exists -eq $TRUE) -and ($DestinationFS_Exist -eq $TRUE))\r\n{\r\n\r\n    Write-Output \"Both $sourceFileSystemName and $destinationFileSystemName exist`n\"\r\n\r\n}#ends if \r\n#if the source File System doesn’t exist an error is throw\r\nelseIf(($sourceFS_exists -eq $FALSE) -and ($DestinationFS_Exist -eq $TRUE))\r\n{\r\n\r\n    Write-Error \"$sourceFileSystemName does not exist. `nMake sure the File System exists before continuing\" -ErrorId E4\r\n    Exit 1\r\n\r\n}\r\n#if the destination File System doesn’t exist an error is throw\r\nelseIf(($DestinationFS_Exist -eq $FALSE) -and ($sourceFS_exists -eq $TRUE))\r\n{\r\n\r\n    Write-Error \"$destinationFileSystemName does not exist. `nMake sure the File System exists before continuing\" -ErrorId E4\r\n    Exit 1\r\n\r\n}#ends destination FS not exists\r\nelse\r\n{\r\n \r\n    Write-Error \"Neither $sourceFileSystemName or $destinationFileSystemName exists. `nMake sure both File Systems exists\" -ErrorId E4\r\n    Exit 1\r\n\r\n}#ends else\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#start Backup\r\n\r\ntry\r\n{\r\n    Write-Output \"Attempting Backup up now\"\r\n    Write-Output \"`n-------------------------`n\"\r\n    & $ravenSmugglerPath between $sourceFileSystemURL $destinationFileSystemURL --filesystem=$sourceFileSystemName --filesystem2=$destinationFileSystemName --api-key=$sourceFileSystemApiKey --api-key2=$destinationFileSystemAPIKey --timeout=$timeout\r\n    Write-Output \"`n-------------------------`n\"\r\n    Write-Output \"Backup successful\"\r\n\r\n\r\n}#ends try\r\ncatch\r\n{\r\n    Write-Error \"An error occurred during backup, please try again\" -ErrorId E4\r\n    Exit 1\r\n}#ends catch\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenSmugglerPath",
-      "Label": "Raven Smuggler Path",
-      "HelpText": "Full path to the Smuggler EXE.\n\nFor example: **C:\\RavenDB\\Smuggler\\Raven.Smuggler.exe**",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "sourceFileSystemURL",
-      "Label": "Source File System URL",
-      "HelpText": "The URL of the Raven File System, where the **Source File System** is located.\n\nFor example: **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "sourceFileSystemName",
-      "Label": "Name of the Source File System",
-      "HelpText": "Name of the **Source File System** in Raven.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "sourceFileSystemApiKey",
-      "Label": "Api Key for the Source File System",
-      "HelpText": "API Key needed to access the **Source File System**.\n\nIf key is not provided, anonymous authentication will be used. \n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "destinationFileSystemURL",
-      "Label": "Destination File System URL",
-      "HelpText": "The URL for the Raven File System where the **Destination File System** is located.\n\nFor example: **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "destinationFileSystemName",
-      "Label": "Name of the Destination File System",
-      "HelpText": "Name of the **Destination File System** in Raven.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "destinationFileSystemAPIKey",
-      "Label": "API Key for the Destination File System",
-      "HelpText": "API Key needed to access the **Destination File System**.\n\nIf key is not provided, anonymous authentication will be used.\n\nFor more information: http://ravendb.net/docs/article-page/3.0/csharp/studio/accessing-studio",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "timeout",
-      "Label": "Timeout",
-      "HelpText": "The timeout (in milliseconds) to use for requests.",
-      "DefaultValue": "300000",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-12T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-15T22:06:33.737+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/ravendb-update-properties-within-a-document.json b/step-templates/ravendb-update-properties-within-a-document.json
deleted file mode 100644
index 5ea50a056..000000000
--- a/step-templates/ravendb-update-properties-within-a-document.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "Id": "89806198-6216-4034-a934-6de6a3f445b0",
-  "Name": "RavenDB - Update Properties within a Document",
-  "Description": "Retrieves the specified document by a Raven Query, updates selected variables with values from octopus Variables. Replaces the current document with the newly created document with the updated values.\n**IMPORTANT**: Any variable that is being updated **MUST** have an Octopus Variable that has exactly the same name (including capitals, any special characters, etc.) prefixed with “Property_”. This is the case of **BOTH** document variables and Metadata variables. I.E. if you wanted TestMode change, you **MUST** have an Octopus Variable named Property_TestMode (same name, and capitals, etc.).\n",
-  "ActionType": "Octopus.Script",
-  "Version": 50,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "\r\n#Variables\r\n\r\n#--------------------------------------------------------------------\r\n#RavenDB database variables\r\n\r\n#URL address of RavenDB\r\n$ravenDatabaseURL = $OctopusParameters[\"ravenDatabaseURL\"]\r\n\r\n#Name of the database\r\n$ravenDatabaseName = $OctopusParameters[\"ravenDatabaseName\"]\r\n\r\n#--------------------------------------------------------------------\r\n#RavenDB Query variables\r\n\r\n#Raven Query\r\n#$ravenQuery = $OctopusParameters[\"ravenQuery\"]\r\n\r\n#Name of the settings document\r\n$ravenDocumentName = $OctopusParameters[\"ravenDocumentName\"]\r\n\r\n#--------------------------------------------------------------------\r\n#Setting Variables\r\n\r\n#list of settings variables that are to be changed\r\n$includeSettingList = $OctopusParameters[\"includeSettingList\"]\r\n\r\n#list of settings variables that are NOT to be changed\r\n$excludeSettingList = $OctopusParameters[\"excludeSettingList\"]\r\n\r\n#--------------------------------------------------------------------\r\n#Metadata variables\r\n\r\n#list of metadata variables that are to be changed\r\n$includeMetadataList = $OctopusParameters[\"includeMetadataList\"]\r\n\r\n#list of metadata variables that are NOT to be changed\r\n$excludeMetadataList = $OctopusParameters[\"excludeMetadataList\"]\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#other variables\r\n\r\n$octopusVariableList = $OctopusParameters.GetEnumerator()\r\n\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n#--------------------------------------------------------------------\r\n#checks to see if the entered database exists, return a Boolean value depending on the outcome\r\nfunction doesRavenDBExist([string] $databaseChecking, [string]$URL)\r\n{\r\n    #retrieves the list of databases at the specified URL\r\n    $database_list = Invoke-RestMethod -Uri \"$ravenDatabaseURL/databases\" -Method Get\r\n    #checks if the database is at the specified URL\r\n    if ($database_list -contains $databaseChecking.ToString()) \r\n    {\r\n        return $TRUE\r\n    }\r\n    else \r\n    {\r\n        return $FALSE\r\n    }\r\n\r\n    \r\n\r\n}#ends does ravenDB exist function\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n#--------------------------------------------------------------------    \r\n#check to see if the database exists\r\n       \r\n\r\nWrite-Output \"Checking if $ravenDatabaseName exists\"\r\n\r\n$database_exists = doesRavenDBExist -databaseChecking $ravenDatabaseName -URL $ravenDatabaseURL\r\n\r\n\r\n#only proceeds if database exists\r\nif ($database_exists -eq $TRUE)\r\n{\r\n    Write-Output \"$ravenDatabaseName exists\"\r\n            \r\n}#ends database exists if statement \r\nelse \r\n{\r\n    Write-Error \"$ravenDatabaseName doesn't exists. `nMake sure the database exists before continuing\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"   \r\n         \r\n#--------------------------------------------------------------------\r\n#Get current setings and change them accordingly\r\n\r\n$allSettingsJSON = $null\r\n\r\nWrite-Output \"Getting Document: $ravenDatabaseName\"\r\n\r\n$settingsURI = \"$ravenDatabaseURL/databases/$ravenDatabaseName/docs/$ravenDocumentName\"\r\n\r\n    \r\n\r\ntry {\r\n    #Gets settings from the specific Uri\r\n    $allSettings = Invoke-RestMethod -Uri $settingsURI -Method Get\r\n\r\n} catch {\r\n    if ($_.Exception.Response.StatusCode.Value__ -ne 404) {\r\n  \r\n    $_.Exception\r\n    }\r\n}\r\n\r\n#check to make sure the query return some results\r\nif($allSettings -eq $null)\r\n{\r\n    Write-Error \"An error occurred while querying the database. `nThe query did not return any values. `nPlease enter a new query\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n$includeList = @()\r\n\r\n($includeSettingList.Split(\", \") | ForEach {\r\n    $includeList += $_.ToString()\r\n})\r\n\r\n     \r\nWrite-Output \"Updating the Settings document\"\r\ntry\r\n{\r\n    \r\n\r\n    #changes the values of the included settings within the original settings document to values from Octopus Variables\r\n    for($i = 0; $i -lt $includeList.length; $i++)\r\n    {\r\n        \r\n        \r\n        #checks if the any of the include setting list is in the exclude setting list\r\n        if($excludeSettingList -notcontains $includeList[$i])\r\n        {\r\n            \r\n            \r\n            $octopusVariableList = $OctopusParameters.GetEnumerator()\r\n            \r\n            #loops through the variable list to find the corresponding value to the settings variable\r\n            foreach($varKey in $octopusVariableList)\r\n            {\r\n                \r\n                \r\n                $newSettingVar = $includeList[$i].ToString()\r\n                \r\n                $newSettingVar = \"Property_$newSettingVar\"\r\n                \r\n                #sets the setting variable to the correct variable in octopus\r\n                if($varKey.Key -eq $newSettingVar)\r\n                {\r\n                    \r\n                    \r\n\r\n                    $allSettings.($includeList[$i]) = $varKey.Value \r\n\r\n                }#ends if\r\n\r\n            }#ends for each\r\n\r\n\r\n\r\n        }#ends check if settings in excluded list\r\n\r\n\r\n    }#ends for\r\n}#ends try\r\ncatch\r\n{\r\n    Write-Error \"An error occurred while trying to find the Setting Variables.\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n\r\nWrite-Output \"Update complete\"\r\n\r\nWrite-Output \"`n-----------------------------\"\r\n\r\n#--------------------------------------------------------------------\r\n#set update metadata information\r\n\r\nWrite-Output \"Updating the Metadata of the document\"\r\n\r\n$metadata = @{}\r\n\r\n$metadataList = @()\r\n\r\n($includeMetadataList.Split(\", \") | Foreach {\r\n    $metadataList += $_.ToString()\r\n})\r\n\r\n\r\ntry\r\n{\r\n    for($i = 0; $i -lt $metadataList.length; $i++)\r\n    {\r\n    \r\n        if($excludeMetadataList -notcontains $metadataList[$i])\r\n        {\r\n        \r\n            $octopusVariableList = $OctopusParameters.GetEnumerator()\r\n        \r\n            foreach($varKey in $octopusVariableList)\r\n            {\r\n                \r\n                $newMetadataVar = $metadataList[$i]\r\n                \r\n                $newMetadataVar = \"Property_$newMetadataVar\"\r\n\r\n                if($varKey.Key -eq $newMetadataVar)\r\n                {\r\n                    \r\n                    $temp = $metadataList[$i].ToString()\r\n                    \r\n                    $metadata.Add(\"$temp\", $varKey.Value)\r\n                    \r\n                    \r\n                }\r\n            \r\n            }#ends foreach\r\n\r\n        }#ends if\r\n\r\n    }#Ends for \r\n}#ends try\r\ncatch\r\n{\r\n    Write-Error \"An error occurred while trying to find the Metadata Variables.\" -ErrorId E4\r\n    Exit 1\r\n}\r\n\r\n\r\nWrite-Output \"Metadata update complete\"\r\n\r\n\r\n\r\n#--------------------------------------------------------------------\r\n#converting settings to a JSON document\r\n\r\nWrite-Output \"Converting settings to a JSON document\"\r\n\r\n#Converts allSettings to JSON so it can be added to RavenDB\r\nif ($allSettingsJSON -eq $null) \r\n{\r\n    $allSettingsJSON = ConvertTo-Json -InputObject $allSettings\r\n}\r\n\r\n\r\n\r\nWrite-Output \"`n-------------------------`n\"\r\n\r\n#--------------------------------------------------------------------\r\n#inserting settings document\r\n\r\nWrite-Output \"Restoring Document: $ravenDatabaseName . Inserting the new settings document to the database\"\r\n\r\n#URL to put the JSON document\r\n$putSettingsURI = \"$ravenDatabaseURL/databases/$ravenDatabaseName/docs/$ravenDocumentName\"\r\n\r\n#Puts the settings and metadata in the specified RavenDB\r\ntry\r\n{\r\n\r\n    Invoke-RestMethod -Uri $putSettingsURI -Headers $metadata -Body $allSettingsJSON -Method Put\r\n        \r\n    Write-Output \"New settings have been successfully added to the database\"\r\n}\r\ncatch\r\n{\r\n    Write-Error \"An error occurred while inserting the new settings document to the database\" -ErrorId E4\r\n} \r\n\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ravenDatabaseURL",
-      "Label": "URL of the Database",
-      "HelpText": "The URL of the database.\n\nFor example: **http://localhost:8080/**",
-      "DefaultValue": "http://localhost:8080/",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenDatabaseName",
-      "Label": "Name of the Database",
-      "HelpText": "Name of the database in Raven",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ravenDocumentName",
-      "Label": "Name of the Document",
-      "HelpText": "Name of the document in Raven that the program will retrieve.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "includeSettingList",
-      "Label": "List of Included Document Variables",
-      "HelpText": "A List of document variables that the program will update based on values within Octopus Variables\n\n**IMPORTANT:** The names of the variables **MUST** be the same (including capitals, special characters, etc.)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "excludeSettingList",
-      "Label": "List of Excluded Document Variables",
-      "HelpText": "A list of document variables that the step will exclude from the updated version. \n\nFor example: if TestMode is in both the include and exclude document list, then TestMode will be excluded from the update.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "includeMetadataList",
-      "Label": "List of Included Metadata Variables",
-      "HelpText": "A List of Metadata variables that the program will update based on values within Octopus Variables\n\n**IMPORTANT:** The names of the variables **MUST** be the same (including capitals, special characters, etc.)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "excludeMetadataList",
-      "Label": "List of Excluded Metadata Variables",
-      "HelpText": "A list of Metadata variables that the step will exclude from the updated version. \n\nFor example: if Raven-Entity-Name is in both the include and exclude metadata lists, then Raven-Entity-Name will be excluded from the update.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-11-26T22:39:11.556+00:00",
-  "LastModifiedBy": "timhunt303",
-  "$Meta": {
-    "ExportedAt": "2015-11-26T22:00:53.359+00:00",
-    "OctopusVersion": "3.1.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ravendb"
-}
\ No newline at end of file
diff --git a/step-templates/raygun-api-register-deployment.json b/step-templates/raygun-api-register-deployment.json
deleted file mode 100644
index 39c34739d..000000000
--- a/step-templates/raygun-api-register-deployment.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "bb7de751-edba-4c5f-9845-1bd1b26f6b62",
-  "Name": "Raygun API - Register Deployment",
-  "Description": "Notifies [Raygun](https://raygun.com) of a deployment using their [Deployments API](https://raygun.com/documentation/product-guides/deployment-tracking/powershell/).\nSends the release number, deployer, release notes from the Octopus deployment.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Get-Parameter($Name, [switch]$Required, $Default, [switch]$FailOnValidate) {\n    $result = $null\n    $errMessage = [string]::Empty\n\n    If ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n        Write-Host \"Octopus paramter value for $Name : $result\"\n    }\n\n    If ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    If ($result -eq $null) {\n        If ($Required) {\n            $errMessage = \"Missing parameter value $Name\"\n        } Else {\n            $result = $Default\n        }\n    } \n\n    If (-Not [string]::IsNullOrEmpty($errMessage)) {\n        If ($FailOnValidate) {\n            Throw $errMessage\n        } Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    return $result\n}\n\n& {\n    Write-Host \"Start AddInRaygun\"\n\n    $deploymentId = [string] (Get-Parameter \"Octopus.Release.Number\" $true [string]::Empty $true)\n    $ownerName = [string] (Get-Parameter \"Octopus.Deployment.CreatedBy.DisplayName\" $true [string]::Empty $true)\n    $emailAddress = [string] (Get-Parameter \"Octopus.Deployment.CreatedBy.EmailAddress\" $false [string]::Empty $true)\n    $releaseNotes = [string] (Get-Parameter \"Octopus.Release.Notes\" $false [string]::Empty $true)\n    $personAccessToken = [string] (Get-Parameter \"Raygun.PersonalAccessToken\" $true [string]::Empty $true)\n    $apiKey = [string] (Get-Parameter \"Raygun.ApiKey\" $true [string]::Empty $true)\n    $deployedAt = Get-Date -Format \"o\"\n\n    Write-Host \"Registering deployment with Raygun\"\n\n    # Some older API keys may contain URL reserved characters (eg '/', '=', '+') and will need to be encoded.\n    # If your API key does not contain any reserved characters you can exclude the following line.\n    $urlEncodedApiKey = [System.Uri]::EscapeDataString($apiKey);\n\n    $url = \"https://api.raygun.com/v3/applications/api-key/\" + $urlEncodedApiKey + \"/deployments\"\n\n    $headers = @{\n        Authorization=\"Bearer \" + $personAccessToken\n    }\n\n    $payload = @{\n        version = $deploymentId\n        ownerName = $ownerName\n        emailAddress = $emailAddress\n        comment = $releaseNotes\n        deployedAt = $deployedAt\n    }\n\n    $payloadJson = $payload | ConvertTo-Json \n\n\n    try {\n        Invoke-RestMethod -Uri $url -Body $payloadJson -Method Post -Headers $headers -ContentType \"application/json\" -AllowInsecureRedirect\n        Write-Host \"Deployment registered with Raygun\"\n    } catch {\n        Write-Host \"Tried to send a deployment to \" $url \" with payload \" $payloadJson\n        Write-Error \"Error received when registering deployment with Raygun: $_\"\n    }\n\n    Write-Host \"End AddInRaygun\"\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "0dd429d3-28f6-46b8-8fb7-e2ceb9124c15",
-      "Name": "Raygun.ApiKey",
-      "Label": "Api Key",
-      "HelpText": "Raygun Application's ApiKey (the same one you use to set Raygun up within your app)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "22d41dfb-f8f3-479d-8e72-08f456529f04",
-      "Name": "Raygun.PersonalAccessToken",
-      "Label": "Personal Access Token",
-      "HelpText": "Personal Access Token to use from your [Raygun User Settings page](https://app.raygun.io/user).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2024-04-09T08:20:04.075Z",
-    "OctopusVersion": "2024.2.4248",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "benjimac93",
-  "Category": "raygun"
-}
diff --git a/step-templates/re-prioritize-octopus-deploy-tasks.json b/step-templates/re-prioritize-octopus-deploy-tasks.json
deleted file mode 100644
index ddc244032..000000000
--- a/step-templates/re-prioritize-octopus-deploy-tasks.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "Id": "c9d5c96f-f731-4e6c-b9b3-d93f84a9bb74",
-    "Name": "Re-prioritize Octopus Deploy Tasks",
-    "Description": "This step will allow you to re-prioritize tasks in the Octopus Deploy queue.  \n\nIt will check the task queue for pending tasks and if it finds a task that should be prioritized based on the matching criteria it will cancel any tasks before it to move it to the top of the queue.  \n\nThe matching logic supports:\n- Task Id - you provide a list of task ids and it will move those to the top of the queue\n- Space, Environment, Project, Tenant - you provide a list of spaces, environments, projects, or tenants and the step will find matching deployments or runbook runs and move them to the top of the queue.  \n\nHow it works:\n1) The step template pulls the list of unscheduled queued tasks (if you schedule a task to run at 7 PM it will exclude that from the check).\n2) Attempts to find matching tasks based on task id or space/environment/project/tenant criteria.\n3) If it finds one or more matching tasks it checks the position of those tasks in the queue.  Any tasks ahead of them are cancelled.\n4) if the step template cancels any deployments or runbook runs it will resubmit them using the same criteria as before (this moves them to the bottom of the queue).\n\n**Important** It will not cancel running tasks.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n\n$octopusApiKey = $OctopusParameters[\"TaskPriority.Api.Key\"]\n$spaceList = $OctopusParameters[\"TaskPriority.Space.List\"]\n$environmentList = $OctopusParameters[\"TaskPriority.Environment.List\"]\n$projectList = $OctopusParameters[\"TaskPriority.Project.List\"]\n$tenantList = $OctopusParameters[\"TaskPriority.Tenant.List\"]\n$matchType =  $OctopusParameters[\"TaskPriority.Match.Type\"]\n$taskType = $OctopusParameters[\"TaskPriority.Task.Type\"]\n$octopusUrl = $OctopusParameters[\"TaskPriority.Octopus.Url\"]\n$taskIdList = $OctopusParameters[\"TaskPriority.TaskId.List\"]\n\n$cachedResults = @{}\n\nfunction Write-OctopusVerbose\n{\n    param($message)\n    \n    Write-Verbose $message  \n}\n\nfunction Write-OctopusInformation\n{\n    param($message)\n    \n    Write-Host $message  \n}\n\nfunction Write-OctopusSuccess\n{\n    param($message)\n\n    Write-Highlight $message \n}\n\nfunction Write-OctopusWarning\n{\n    param($message)\n\n    Write-Warning \"$message\" \n}\n\nfunction Write-OctopusCritical\n{\n    param ($message)\n\n    Write-Error \"$message\" \n}\n\nfunction Invoke-OctopusApi\n{\n    param\n    (\n        $octopusUrl,\n        $endPoint,\n        $spaceId,\n        $apiKey,\n        $method,\n        $item,\n        $ignoreCache     \n    )\n\n    $octopusUrlToUse = $OctopusUrl\n    if ($OctopusUrl.EndsWith(\"/\"))\n    {\n        $octopusUrlToUse = $OctopusUrl.Substring(0, $OctopusUrl.Length - 1)\n    }\n\n    if ([string]::IsNullOrWhiteSpace($SpaceId))\n    {\n        $url = \"$octopusUrlToUse/api/$EndPoint\"\n    }\n    else\n    {\n        $url = \"$octopusUrlToUse/api/$spaceId/$EndPoint\"    \n    }  \n\n    try\n    {        \n        if ($null -ne $item)\n        {\n            $body = $item | ConvertTo-Json -Depth 10\n            Write-OctopusVerbose $body\n\n            Write-OctopusInformation \"Invoking $method $url\"\n            return Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -Body $body -ContentType 'application/json; charset=utf-8' \n        }\n\n        if (($null -eq $ignoreCache -or $ignoreCache -eq $false) -and $method.ToUpper().Trim() -eq \"GET\")\n        {\n            Write-OctopusVerbose \"Checking to see if $url is already in the cache\"\n            if ($cachedResults.ContainsKey($url) -eq $true)\n            {\n                Write-OctopusVerbose \"$url is already in the cache, returning the result\"\n                return $cachedResults[$url]\n            }\n        }\n        else\n        {\n            Write-OctopusVerbose \"Ignoring cache.\"    \n        }\n\n        Write-OctopusVerbose \"No data to post or put, calling bog standard invoke-restmethod for $url\"\n        $result = Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -ContentType 'application/json; charset=utf-8'\n\n        if ($cachedResults.ContainsKey($url) -eq $true)\n        {\n            $cachedResults.Remove($url)\n        }\n        Write-OctopusVerbose \"Adding $url to the cache\"\n        $cachedResults.add($url, $result)\n\n        return $result\n\n               \n    }\n    catch\n    {\n        if ($null -ne $_.Exception.Response)\n        {\n            if ($_.Exception.Response.StatusCode -eq 401)\n            {\n                Write-OctopusCritical \"Unauthorized error returned from $url, please verify API key and try again\"\n            }\n            elseif ($_.Exception.Response.statusCode -eq 403)\n            {\n                Write-OctopusCritical \"Forbidden error returned from $url, please verify API key and try again\"\n            }\n            else\n            {                \n                Write-OctopusVerbose -Message \"Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )\"\n            }            \n        }\n        else\n        {\n            Write-OctopusVerbose $_.Exception\n        }\n    }\n\n    Throw \"There was an error calling the Octopus API please check the log for more details\"\n}\n\nfunction Get-FilteredOctopusItem\n{\n    param(\n        $itemList,\n        $itemName\n    )\n\n    if ($itemList.Items.Count -eq 0)\n    {\n        Write-OctopusCritical \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        return $null\n    }  \n\n    $item = $itemList.Items | Where-Object { $_.Name -eq $itemName}      \n\n    if ($null -eq $item)\n    {\n        Write-OctopusCritical \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        return $null\n    }\n\n    return $item\n}\n\nfunction Get-OctopusItemByName\n{\n    param(\n        $itemName,\n        $itemType,\n        $endpoint,        \n        $spaceId,\n        $octopusUrl,\n        $octopusApiKey\n    )\n\n    if ([string]::IsNullOrWhiteSpace($itemName))\n    {\n        return $null\n    }\n\n    Write-OctopusInformation \"Attempting to find $itemType with the name of $itemName\"\n    \n    $itemList = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"$($endPoint)?partialName=$([uri]::EscapeDataString($itemName))&skip=0&take=100\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"    \n    $item = Get-FilteredOctopusItem -itemList $itemList -itemName $itemName\n\n    if ($null -eq $item)\n    {\n        Write-OctopusInformation \"Unable to find $itemType $itemName\"    \n        return $null\n    }\n    \n    Write-OctopusInformation \"Successfully found $itemType $itemName with an id of $($item.Id)\"\n\n    return $item\n}\n\nfunction Get-SplitItemIntoArray\n{\n    param (\n        $itemToSplit\n    )\n\n    if ($itemToSplit -like \"*`n*\")\n    {\n        return @(($itemToSplit -Split \"`n\").Trim())\n    }\n\n    if ($itemToSplit -like \"*,*\")\n    {\n        return @(($itemToSplit -Split \",\").Trim())\n    }\n\n    return @($itemToSplit)\n}\n\nfunction Get-OctopusSpaceList\n{\n\tparam(\n    \t$spaceList,        \n        $octopusUrl,\n        $octopusApiKey    \n    )\n    \n    if ([string]::IsNullOrWhiteSpace($spaceList))\n    {\n        $rawOctopusSpaceList = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"spaces?skip=0&take=10000\" -spaceId $null -apiKey $octopusApiKey -method \"GET\"    \n\n        return $rawOctopusSpaceList.Items\n    }\n    \n    $spaceListSplit = @(Get-SplitItemIntoArray -itemToSplit $spaceList)\n    $returnList = @()\n\n    foreach ($spaceName in $spaceListSplit)\n    {\n        if ([string]::IsNullOrWhiteSpace($spaceName) -eq $false)\n        {\n            $octopusSpace = Get-OctopusItemByName -itemName $spaceName -itemType \"Space\" -endpoint \"spaces\" -spaceId $null -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n\n            if ($null -ne $octopusSpace)\n            {\n                $returnList += $octopusSpace\n            }            \n        }        \n    }    \n    \n    return $returnList\n}\n\nfunction Get-OctopusItemList\n{\n    param(\n        $octopusSpaceList,\n        $itemList,\n        $itemType,\n        $endpoint,\n        $octopusApiKey,\n        $octopusUrl\n    )\n\n    if ([string]::IsNullOrWhiteSpace($itemList))\n    {\n        Write-Host \"The list for $itemType was empty\"        \n        return @()\n    }\n\n    $itemListSplit = @(Get-SplitItemIntoArray -itemToSplit $itemList)\n    $returnList = @()\n    \n    foreach ($itemName in $itemListSplit)\n    {\n        $splitItem = $itemName -split \"::\"\n        if ($splitItem.Count -gt 1 -and [string]::IsNullOrWhiteSpace($splitItem[1]) -eq $false)\n        {\n            Write-OctopusInformation \"The item $itemName included a space name, only pulling back the information for that space\"\n            $spaceId = $octopusSpaceList | Where-Object { $_.Name.ToLower().Trim() -eq $splitItem[1].ToLower().Trim() }\n\n            if ($null -eq $spaceId)\n            {\n                Write-OctopusInformation \"The space name $($splitItem[1]) was not included in the space filter.  Skipping this option.\"\n                continue\n            }\n\n            $octopusItem = Get-OctopusItemByName -itemName $splitItem[0] -itemType $itemType -endpoint $endpoint -spaceId $spaceId -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n\n            if ($null -ne $octopusItem)\n            {\n                $returnList += $octopusItem\n            }\n\n            continue\n        }\n\n        foreach ($space in $octopusSpaceList)\n        {\n            $octopusItem = Get-OctopusItemByName -itemName $itemName -itemType $itemType -endpoint $endpoint -spaceId $space.Id -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n\n            if ($null -ne $octopusItem)\n            {\n                $returnList += $octopusItem\n            }\n        }\n    }\n\n    return $returnList\n}\n\nfunction Get-QueuedOctopusTasks\n{\n    param (\n        $octopusApiKey,\n        $octopusUrl\n    )\n\n    $queuedTasks = Invoke-OctopusApi -octopusUrl $octopusUrl -endPoint \"Tasks?states=Queued&skip=0&take=1000\" -spaceId $null -apiKey $octopusApiKey -method \"GET\" -ignoreCache $true\n\n    $returnList = @()\n    $currentTime = $(Get-Date).ToUniversalTime()\n\n    Write-OctopusInformation \"Looping through the found items in reverse order because the Queue is FIFO but the return object is ordered by date DESC\"\n\n    for($i = $queuedTasks.Items.Count - 1; $i -ge 0; $i--)    \n    {\n        $task = $queuedTasks.Items[$i]\n        \n        if ($null -ne $task.QueueTime)\n        {\n            $compareTime = [DateTime]::Parse($task.QueueTime)\n            $compareTime = $compareTime.ToUniversalTime()\n\n            Write-OctopusVerbose \"Checking to see if $compareTime is ahead of the $currentTime\"\n            if ($compareTime -gt $currentTime)\n            {\n                Write-OctopusInformation \"The queued task $($task.Id) has a queue time $($task.QueueTime) in the future.  That means this is a scheduled deployment.  Skipping this task.\"\n                continue\n            }\n        }\n\n        if ($null -ne $task.StartTime)\n        {\n            Write-OctopusInformation \"The queued task $($task.Id) has a start time, meaning it was picked up, work was done, then it was added back to the queue.  Skipping.\"\n            continue\n        }\n\n        if ($true -eq $task.HasPendingInterruptions)\n        {\n            Write-OctopusInformation \"The task $($task.Id) has pending interruptions, this means the deployment has started and is awaiting someone to respond.  Skipping this task.\"\n            continue\n        }\n\n        $returnList += $task\n    }\n\n    return $returnList\n}\n\nfunction Test-OctopusListHasId\n{\n    param (\n        $octopusList,\n        $octopusId\n    )\n\n    $findItem = $octopusList | Where-Object { $_.Id -eq $octopusId }\n\n    if ($null -eq $findItem)\n    {\n        return $false\n    }\n\n    return $true\n}\n\nfunction Get-RunbookRunDetailsFromTask\n{\n    param (\n        $runbookTask,\n        $octopusUrl,\n        $octopusApiKey\n    )\n\n    return Invoke-OctopusApi -endPoint \"runbookRuns/$($runbookTask.Arguments.RunbookRunId)\" -octopusUrl $octopusUrl -spaceId $runbookTask.SpaceId -apiKey $octopusApiKey -method \"GET\"\n}\n\nfunction Get-DeploymentDetailsFromTask\n{\n    param (\n        $deploymentTask,\n        $octopusUrl,\n        $octopusApiKey\n    )\n\n    return Invoke-OctopusApi -endPoint \"deployments/$($deploymentTask.Arguments.DeploymentId)\" -octopusUrl $octopusUrl -spaceId $deploymentTask.SpaceId -apiKey $octopusApiKey -method \"GET\"\n}\n\nWrite-OctopusInformation \"Space List: $spaceList\"\nWrite-OctopusInformation \"Environment List: $environmentList\"\nWrite-OctopusInformation \"Project List: $projectList\"\nWrite-OctopusInformation \"Tenant List: $tenantList\"\nWrite-OctopusInformation \"Octopus URL: $octopusUrl\"\nWrite-OctopusInformation \"Match Type: $matchType\"\nWrite-OctopusInformation \"Task Id List: $taskIdList\"\n\n$queuedTasks = @(Get-QueuedOctopusTasks -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)\n\nif ($queuedTasks.Length -eq 0)\n{\n    Write-OctopusSuccess \"No queued tasks found that can block a deployment.  Exiting.\"\n    exit 0\n}\n\n$octopusInformation = @{\n    TaskIdList = @(Get-SplitItemIntoArray -itemToSplit $taskIdList)\n}\n\nif ([string]::IsNullOrWhiteSpace($taskIdList))\n{\n    $octopusInformation.SpaceList = @(Get-OctopusSpaceList -spaceList $spaceList -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey)\n\n    $octopusInformation.EnvironmentList = @(Get-OctopusItemList -octopusSpaceList $octopusInformation.SpaceList -itemList $environmentList -itemType \"Environment\" -endpoint \"environments\" -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)\n    $octopusInformation.HasEnvironmentFilter = $octopusInformation.EnvironmentList.Count -gt 0\n\n    $octopusInformation.ProjectList = @(Get-OctopusItemList -octopusSpaceList $octopusInformation.SpaceList -itemList $projectList -itemType \"Project\" -endpoint \"projects\" -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)\n    $octopusInformation.HasProjectFilter = $octopusInformation.ProjectList.Count -gt 0\n\n    $octopusInformation.TenantList = @(Get-OctopusItemList -octopusSpaceList $octopusInformation.SpaceList -itemList $tenantList -itemType \"Tenant\" -endpoint \"tenants\" -octopusApiKey $octopusApiKey -octopusUrl $octopusUrl)\n    $octopusInformation.HasTenantFilter = $octopusInformation.TenantList.Count -gt 0\n\n    if ($octopusInformation.EnvironmentList.Count -eq 0 -and $octopusInformation.ProjectList.Count -eq 0 -and $octopusInformation.TenantList.Count -eq 0)\n    {\n        Write-OctopusCritical \"No environments OR projects OR tenants provided to filter on.  You must provide at least one environment OR project OR tenant.\"\n        exit 1\n    }\n\n    Write-OctopusSuccess \"Going to look for any $taskType in the spaces ($(($octopusInformation.SpaceList | Select-Object -ExpandProperty Id) -join \", \")) matching \"\n    Write-OctopusSuccess \"Environments ($(($octopusInformation.EnvironmentList | Select-Object -ExpandProperty Id) -join \" OR \")) $matchType\"\n    Write-OctopusSuccess \"Projects ($(($octopusInformation.ProjectList | Select-Object -ExpandProperty Id) -join \" OR \")) $matchType\"\n    Write-OctopusSuccess \"Tenants ($(($octopusInformation.TenantList | Select-Object -ExpandProperty Id) -join \" OR \"))\"\n}\nelse\n{\n    Write-OctopusSuccess \"Going to look for the tasks ($($octopusInformation.TaskIdList -join \", \"))\"    \n}\n\n$matchingTasks = @()\n\nWrite-OctopusInformation \"Attempting to find any matching tasks based on the filtering criteria.\"\nforeach ($task in $queuedTasks)\n{\n    if ($octopusInformation.TaskIdList -contains $task.Id)\n    {\n        Write-OctopusInformation \"The task $($task.Id) was found in the list of task ids.  Adding to list.\"\n        $matchingTasks += $task\n\n        continue\n    }\n\n    if ($task.Name -ne \"Deploy\" -and $task.Name -ne \"RunbookRun\")\n    {\n        Write-Information \"The task not a deployment or a runbook run.  It is $($task.Description).  Moving onto next task.\"\n        continue\n    }\n\n    if ($taskType -ne \"Both\" -and $taskType -ne $task.Name)\n    {\n        Write-Information \"You have selected to filter on $taskType only and this task is a $($task.Name).  Moving onto the next task.\"\n        continue\n    }\n\n    if ((Test-OctopusListHasId -octopusList $octopusInformation.SpaceList -octopusId $task.SpaceId) -eq $false)\n    {\n        Write-Information \"The task is not for any spaces specified.  Moving onto the next task.\"\n        continue\n    }\n\n    if ($task.Name -eq \"RunbookRun\")\n    {\n        $itemDetails = Get-RunbookRunDetailsFromTask -runbookTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n    }\n    else\n    {\n        $itemDetails = Get-DeploymentDetailsFromTask -deploymentTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n    }        \n\n    $matchesEnvironmentFilter = $octopusInformation.HasEnvironmentFilter -eq $true -and (Test-OctopusListHasId -octopusList $octopusInformation.EnvironmentList -octopusId $itemDetails.EnvironmentId)\n    Write-OctopusInformation \"$($task.Name) $($itemDetails.Id) Matches Environment Filter $matchesEnvironmentFilter\"\n\n    $matchesProjectFilter = $octopusInformation.HasProjectFilter -eq $true -and (Test-OctopusListHasId -octopusList $octopusInformation.ProjectList -octopusId $itemDetails.ProjectId)\n    Write-OctopusInformation \"$($task.Name) $($itemDetails.Id) Matches Project Filter $matchesProjectFilter\"\n\n    $matchesTenantFilter = $octopusInformation.HasTenantFilter -eq $true -and $null -ne $itemDetails.TenantId -and (Test-OctopusListHasId -octopusList $octopusInformation.TenantList -octopusId $itemDetails.TenantId)\n    Write-OctopusInformation \"$($task.Name) $($itemDetails.Id) Matches Tenant Filter $matchesTenantFilter\"\n\n    if ($matchType -eq \"Or\" -and ($matchesTenantFilter -eq $true -or $matchesProjectFilter -eq $true -or $matchesEnvironmentFilter -eq $true))\n    {\n        Write-OctopusInformation \"The match type was OR and one of the filters matched, adding this task to the matching list\"\n        $matchingTasks += $task\n\n        continue\n    }\n\n    Write-OctopusInformation \"The match type is AND, checking to see if the task matches all the filters\"\n\n    if ($octopusInformation.HasEnvironmentFilter -eq $true -and $matchesEnvironmentFilter -eq $false)\n    {\n        Write-OctopusInformation \"The environment filter was provided and the environment $($itemDetails.EnvironmentId) didn't match any environments.  Moving onto next task.\"\n        continue\n    }\n\n    if ($octopusInformation.HasProjectFilter -eq $true -and $matchesProjectFilter -eq $false)\n    {\n        Write-OctopusInformation \"The project filter was provided and the project $($itemDetails.ProjectId) didn't match any projects.  Moving onto next task.\"\n        continue\n    }\n\n    if ($octopusInformation.HasTenantFilter -eq $true -and $matchesTenantFilter -eq $false)\n    {\n        Write-OctopusInformation \"The tenant filter was provided and the tenant $($itemDetails.TenantId) didn't match any tenants.  Moving onto next task.\"\n        continue\n    }\n\n    $matchingTasks += $task\n}\n\nif ($matchingTasks.Count -eq 0)\n{\n    Write-OctopusSuccess \"No matching tasks found, exiting.\"\n    exit 0\n}\n\nWrite-OctopusSuccess \"Matching tasks found, checking where they are in the queue.\"\n\n$matchingTaskCounter = 0\n\nWrite-OctopusInformation \"Looping through all the queued tasks again to find which tasks to cancel.\"\nforeach ($task in $queuedTasks)\n{        \n    if ((Test-OctopusListHasId -octopusList $matchingTasks -octopusId $task.Id))\n    {\n        $matchingTaskCounter += 1\n        Write-OctopusInformation \"The task $($task.Id) is one we want to move to the top of queue, leaving as is.\"\n\n        if ($matchingTaskCounter -eq $matchingTasks.Count)\n        {\n            Write-OctopusSuccess \"All the matching tasks we want to move to the top of the queue have been found, exiting\"\n            break\n        }\n\n        continue\n    }\n\n    $updatedTask = Invoke-OctopusApi -endPoint \"tasks/$($task.Id)\" -octopusUrl $octopusUrl -spaceId $null -apiKey $octopusApiKey -method \"GET\" -ignoreCache $true\n\n    if ($updatedTask.HasBeenPickedUpByProcssor -eq $true)\n    {\n        Write-OctopusInformation \"The task $($task.Id) has already been picked up and started processing, moving on.\"\n        continue\n    }\n\n    $canceledTaskResult = Invoke-OctopusApi -endPoint \"tasks/$($task.Id)/cancel\" -octopusUrl $octopusUrl -spaceId $null -apiKey $octopusApiKey -method \"POST\" -ignoreCache $true\n\n    Write-OctopusSuccess \"Task $($canceledTaskResult.Description) has been successfully cancelled\" \n\n    if ($task.Name -eq \"Deploy\")\n    {\n        Write-OctopusInformation \"Task $($task.Id) is a deployment, setting up a redeploy.\"\n\n        $deploymentInfo = Get-DeploymentDetailsFromTask -deploymentTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n\n        $bodyRaw = @{\n            EnvironmentId = $deploymentInfo.EnvironmentId\n            ExcludedMachineIds = $deploymentInfo.ExcludedMachineIds\n            ForcePackageDownload = $deploymentInfo.ForcePackageDownload\n            ForcePackageRedeployment = $deploymentInfo.ForcePackageRedeployment\n            FormValues = $deploymentInfo.FormValues\n            QueueTime = $null\n            QueueTimeExpiry = $null\n            ReleaseId = $deploymentInfo.ReleaseId\n            SkipActions = $deploymentInfo.SkipActions\n            SpecificMachineIds = $deploymentInfo.SpecificMachineIds\n            TenantId = $deploymentInfo.TenantId\n            UseGuidedFailure = $deploymentInfo.UseGuidedFailure\n        } \n\n        $newDeployment = Invoke-OctopusApi -endPoint \"deployments\" -spaceId $task.SpaceId -octopusUrl $octopusUrl -apiKey $octopusApiKey -method \"POST\" -item $bodyRaw\n\n        Write-OctopusSuccess \"$($task.Description) has been successfully resubmitted with the new id $($newDeployment.TaskId)\"        \n    }\n\n    if ($task.Name -eq \"RunbookRun\")\n    {\n        Write-OctopusInformation \"Task $($task.Id) is a runbook run, configuring a re-run.\"\n\n        $runbookInfo = Get-RunbookRunDetailsFromTask -runbookTask $task -octopusUrl $octopusUrl -octopusApiKey $octopusApiKey\n\n        $bodyRaw = @{\n            EnvironmentId = $runbookInfo.EnvironmentId\n            ExcludedMachineIds = $runbookInfo.ExcludedMachineIds\n            ForcePackageDownload = $runbookInfo.ForcePackageDownload\n            ForcePackageRedeployment = $runbookInfo.ForcePackageRedeployment\n            FormValues = $runbookInfo.FormValues\n            QueueTime = $null\n            QueueTimeExpiry = $null\n            RunbookId = $runbookInfo.RunbookId\n            SkipActions = $runbookInfo.SkipActions\n            SpecificMachineIds = $runbookInfo.SpecificMachineIds\n            TenantId = $runbookInfo.TenantId\n            UseGuidedFailure = $runbookInfo.UseGuidedFailure\n            FrozenRunbookProcessId = $runbookInfo.FrozenRunbookProcessId\n            RunbookSnapshotId = $runbookInfo.RunbookSnapshotId            \n        } \n\n        $newDeployment = Invoke-OctopusApi -endPoint \"runbookRuns\" -spaceId $task.SpaceId -octopusUrl $octopusUrl -apiKey $octopusApiKey -method \"POST\" -item $bodyRaw\n\n        Write-OctopusSuccess \"$($task.Description) has been successfully resubmitted with the new id $($newDeployment.TaskId)\" \n    }\n}\n\nWrite-OctopusSuccess \"Finished re-prioritizing tasks\""
-    },
-    "Parameters": [
-      {
-        "Id": "f7357d18-33c3-4f1e-883d-613e13e098cd",
-        "Name": "TaskPriority.Api.Key",
-        "Label": "Octopus API Key",
-        "HelpText": "*Required* \n\n\nThe API key of the user authorized to cancel tasks and resubmit them.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "82ef3721-aef1-4624-a306-9f20ad2ef64d",
-        "Name": "TaskPriority.Octopus.Url",
-        "Label": "Octopus URL",
-        "HelpText": "*Required*\n\nThe URL of the Octopus Deploy instance you wish to query.  \n\nPlease only pass in the base URL, eg `https://samples.octopus.app`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b2e14858-7309-46ab-b624-ec811ad95618",
-        "Name": "TaskPriority.TaskId.List",
-        "Label": "Task Id List",
-        "HelpText": "A comma-separated or new-line separated list of task ids to move to the top of the queue.\n\n**IMPORTANT** when this is provided all other matching logic is ignored, including the task type and the space list.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "2434bd05-791b-45e9-9ffa-7fbde9524e5f",
-        "Name": "TaskPriority.Space.List",
-        "Label": "Space List",
-        "HelpText": "List of spaces to monitor.  Separate spaces by using a new line.\n\nWhen left empty this step will query all spaces.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "87a7ec4a-128b-4b74-8f6b-ea66c9261dec",
-        "Name": "TaskPriority.Environment.List",
-        "Label": "Environment List",
-        "HelpText": "List of environment names to monitor for.  Separate environment names by a new line.\n\nOptions:\n- `EnvironmentName` - looks for matching environment names in all spaces in the space list.\n- `EnvironmentName::SpaceName` - looks for the environment name in the specified space.  Use this when the same environment appears in multiple spaces and you want to filter to only apply to an item in a specific space.\n\nThe default `Production`.  \n\nWhen not specifying a value for the Task Id parameter; a entry must appear in the Environment List, Project List, OR Tenant List.  Otherwise, this step will not do anything.",
-        "DefaultValue": "Production",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "b94bd70b-6554-4ea5-86f1-fbfb1827dfc5",
-        "Name": "TaskPriority.Project.List",
-        "Label": "Project List",
-        "HelpText": "List of projects to monitor.  Separate project names by a new line.\n\nOptions:\n- `ProjectName` - looks for the specified project name in all spaces in the space list.\n- `ProjectName::SpaceName` - looks for that project in a specific space.  Use this when the same project appears in multiple spaces and you want to filter to only apply to an item in a specific space.\n\nWhen left empty it will not look for any projects.\n\nWhen not specifying a value for the Task Id parameter; a entry must appear in the Environment List, Project List, OR Tenant List.  Otherwise, this step will not do anything.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "0958b7b3-94b6-4a3e-b78c-f2436950728a",
-        "Name": "TaskPriority.Tenant.List",
-        "Label": "Tenant List",
-        "HelpText": "List of tenant names to monitor.  Separate tenant names by a new line.\n\nOptions:\n- `TenantName` - looks for the tenant name in any spaces in the space list\n- `TenantName::SpaceName` - looks for the tenant name in the specified space.  Use this when the same tenant appears in multiple spaces and you want to filter to only apply to an item in a specific space.\n\nWhen left empty it will not filter anything by the tenant.\n\nWhen not specifying a value for the Task Id parameter; a entry must appear in the Environment List, Project List, OR Tenant List.  Otherwise, this step will not do anything.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "a6382a5c-df7f-4dee-bdc9-df89459e1d14",
-        "Name": "TaskPriority.Task.Match",
-        "Label": "Task Match",
-        "HelpText": "Indicates how the matching will occur.\n\nOptions:\n- `And` - means the deployment has to be for the Environment AND the project AND the tenant (when they are specified)\n- `Or` - means the deployment can be for Environment OR the project OR the tenant\n\nDefault is `Or`\n",
-        "DefaultValue": "Or",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Or|Or\nAnd|And"
-        }
-      },
-      {
-        "Id": "1e8d3fc8-36b5-4c84-bfe5-4bfc5b4f5869",
-        "Name": "TaskPriority.Task.Type",
-        "Label": "Task Type",
-        "HelpText": "The type of task to move to the top of the queue.\n\nOptions:\n- `Deploy` - monitors deployments only\n- `RunbookRun` - monitors runbook runs only\n- `Both` - monitors both deployments and runbooks\n\nDefaults to `Both`",
-        "DefaultValue": "Both",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Both|Both\nDeploy|Deploy\nRunbookRun|RunbookRun"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-02-22T15:40:24.604Z",
-      "OctopusVersion": "2021.1.0-ci1022",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "octobob",
-    "Category": "octopus"
-  }
diff --git a/step-templates/readyroll-deploy-database-package.json b/step-templates/readyroll-deploy-database-package.json
deleted file mode 100644
index d57273271..000000000
--- a/step-templates/readyroll-deploy-database-package.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "Id": "14e87c33-b34a-429f-be2c-e44d3d631649",
-  "Name": "ReadyRoll - Deploy Database Package",
-  "Description": "Deploy database changes packaged with Redgate's [ReadyRoll](http://www.ready-roll.com/). Requires the Microsoft SQL Command Line Utilities 11 or later to be installed on the tentacle.\n\n*Version date: 14th January, 2016*",
-  "ActionType": "Octopus.TentaclePackage",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-    "Packages": [
-      {
-        "Id": "536b0ad2-6439-4e6a-aff0-64ba07a33733",
-        "Name": "",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "SelectionMode": "deferred",
-          "PackageParameterName": "PackageName"
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Package.DownloadOnTentacle": "False"
-    },
-    "Parameters": [
-      {
-        "Id": "43af2bc5-668d-482f-a23b-1e46189fcd69",
-        "Name": "PackageName",
-        "Label": "Package to deploy",
-        "HelpText": "The package you want to deploy. If using NuGet, this matches the package ID from the NuSpec file in your ReadyRoll project.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "c7d2a8f5-0b33-4b1d-94cd-0f0f11ecf9d1",
-        "Name": "DatabaseServer",
-        "Label": "Target SQL Server instance",
-        "HelpText": "The fully qualified SQL Server instance name for the target database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a0c8e52f-e7f2-4859-9769-f749f6705a08",
-        "Name": "DatabaseName",
-        "Label": "Target database name",
-        "HelpText": "The name of the database to deploy to. ReadyRoll will create a new database if it does not exist.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8c448c0e-27c8-4572-8a96-0e9dad5c8091",
-        "Name": "UseWindowsAuth",
-        "Label": "Use Windows Authentication",
-        "HelpText": "If you check this field, Windows authentication will be used to connect, using the account that runs the Tentacle service. Otherwise, SQL Server authentication will be used and you will need to specify a username and password below.",
-        "DefaultValue": "True",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "53358be8-b6fb-4dce-b107-a501c5ef5b1e",
-        "Name": "DatabaseUsername",
-        "Label": "Username",
-        "HelpText": "The SQL Server username used to connect to the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "60688c6e-db91-4a6f-971f-e52901d7b732",
-        "Name": "DatabasePassword",
-        "Label": "Password",
-        "HelpText": "The SQL Server password used to connect to the database.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "LastModifiedBy": "harrisonmeister",
-    "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-    "StepPackageId": "Octopus.TentaclePackage",
-    "$Meta": {
-      "ExportedAt": "2023-11-15T14:12:59.832Z",
-      "OctopusVersion": "2024.1.1169",
-      "Type": "ActionTemplate"
-    },
-  "Category": "readyroll"
-}
diff --git a/step-templates/redgate-create-database-release-worker-friendly.json b/step-templates/redgate-create-database-release-worker-friendly.json
deleted file mode 100644
index c380f600c..000000000
--- a/step-templates/redgate-create-database-release-worker-friendly.json
+++ /dev/null
@@ -1,207 +0,0 @@
-{
-  "Id": "47d29b57-5bca-4205-ac62-ce10cdf8bab9",
-  "Name": "Redgate - Create Database Release (Worker Friendly)",
-  "Description": "Creates the resources (including the SQL update script) to deploy database changes using Redgate's [SQL Change Automation](https://www.red-gate.com/products/sql-development/sql-change-automation/), and exports them as Octopus artifacts so you can review the changes before deploying.\n\nRequires SQL Change Automation version 3.0.2 or later.\n\n*Version date: 2019-07-26*\n\nThis step template is worker friendly, you can pass in a package reference rather than having to reference a previous step which downloaded the package. This step requires Octopus Deploy **2019.10.0** or higher.",
-  "ActionType": "Octopus.Script",
-  "Author": "octobob",
-  "Version": 4,
-  "Packages": [
-    {
-      "Id": "86e63d39-4d9f-4d9d-a0f6-4d830d37811e",
-      "Name": "DLMAutomation.Package.Name",
-      "PackageId": null,
-      "FeedId": "#{DLMAutomationFeedId}",
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "DLMAutomationPackageName"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#Improve performance by turning off progress bar\n#More details here: https://redgate.uservoice.com/forums/267000-sql-change-automation/suggestions/44882212-improve-performance-invoke-databasebuild-by-re\n$ProgressPreference = \"SilentlyContinue\"\n\n$DlmAutomationModuleName = \"DLMAutomation\"\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\n$ModulesFolder = \"$Home\\Documents\\WindowsPowerShell\\Modules\"\n\nif ([string]::IsNullOrWhiteSpace($DLMModuleInstallLocation) -eq $false)\n{\n\tif ((Test-Path $DLMModuleInstallLocation -IsValid) -eq $false)\n    {\n    \tWrite-Error \"The path $DLMModuleInstallLocation is not valid, please use a relative or absolute path.\"\n        exit 1\n    }\n    \n    $ModulesFolder = [System.IO.Path]::GetFullPath($DLMModuleInstallLocation)            \n}\n\nWrite-Host \"Modules will be installed into $ModulesFolder\"\n\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\nWrite-Host \"LocalModules: $LocalModules\"\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\nWrite-Host $env:PSModulePath\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction IsScaAvailable\n{\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\n        return $true\n    }\n\n    return $false\n}\n\nfunction InstallCorrectSqlChangeAutomation\n{\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $false)]\n        [Version]$requiredVersion\n    )    \n\n    $moduleName = $SqlChangeAutomationModuleName\n\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\n    $maximumVersion = $requiredVersion\n\n    if ($requiredVersion) {\n        if ($requiredVersion.Revision -eq -1) {\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\n        }\n\n        if ($requiredVersion.Major -lt 3) {\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\n            $moduleName = $DlmAutomationModuleName\n        }\n    }\n\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n\n    if (!$installedModule) {\n        #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed\n        Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\n        InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n    }\n    elseif (!$requiredVersion) {\n        #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade\n        $newest = GetHighestInstallableModule $moduleName\n        if ($newest -and ($installedModule.Version -lt $newest.Version)) {\n            Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\n            InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\n        }\n    }\n\n    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements\n\n    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\n    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n\n    if (!$installedModule -and !$requiredVersion) {\n        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName        \n    }\n    \n    if ($installedModule) {\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\n        Import-Module $installedModule -Force\n    }\n    else {\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\n    }\n}\n\nfunction InstallPowerShellGet {\n    [CmdletBinding()]\n    Param()\n    $psget = GetHighestInstalledModule PowerShellGet\n    if (!$psget)\n    {\n        Write-Warning @\"\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\n\"@\n        throw \"PowerShellGet is not available\"\n    }\n\n    if ($psget.Version -lt [Version]'1.6') {\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\n        Write-Debug \"Installing NuGet package provider\"\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n\n        #Use the currently-installed version of PowerShellGet\n        Import-PackageProvider PowerShellGet \n        \n        #Download the version of PowerShellGet that we actually need\n        Write-Debug \"Installing PowershellGet\"\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\n    }\n\n    Write-Debug \"Importing PowershellGet\"\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\n    #Make sure we're actually using the package provider from the imported version of PowerShellGet\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\n}\n\nfunction InstallLocalModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$moduleName,\n        [Parameter(Mandatory = $false)]\n        [Version]$minimumVersion,\n        [Parameter(Mandatory = $false)]\n        [Version]$maximumVersion\n    )\n    try {\n        InstallPowerShellGet\n\n        Write-Debug \"Install $moduleName $requiredVersion\"\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\n    }\n    catch {\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\n    }\n}\n\nfunction GetHighestInstalledModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $moduleName,\n\n        [Parameter(Mandatory = $false)]\n        [Version]$minimumVersion,\n        [Parameter(Mandatory = $false)]\n        [Version]$maximumVersion\n    )    \n\n    return Get-Module $moduleName -ListAvailable | \n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} | \n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\n           Select -First 1\n}\n\nfunction GetHighestInstallableModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $moduleName\n    )\n\n    try {\n        InstallPowerShellGet\n        Find-Module SqlChangeAutomation -AllVersions | \n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\n            Select -First 1    \n    }\n    catch {\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\n    }\n}\n\nfunction GetInstalledSqlChangeAutomationVersion {\t\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\n\n    if ($scaModule -ne $null) {\n        return $scaModule.Version\n    }\n\t\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\n\n    if ($dlmaModule -ne $null) {\n        return $dlmaModule.Version\n    }\n\n    return $null\n}\n\n\n$ErrorActionPreference = 'Stop'\n$VerbosePreference = 'Continue'\n\n# Set process level FUR environment\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\n\n#Helper functions for paramter handling\nfunction Required() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for '$Name'\" }\n}\nfunction Optional() {\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $false)]$Default\n    )\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { \n        $Default\n    } else { \n        $Parameter\n    }\n}\nfunction RequireBool() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    $Result = $False\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"'$Name' must be a boolean value.\" }\n    $Result\n}\nfunction RequirePositiveNumber() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    $Result = 0\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"'$Name' must be a numerical value.\" }\n    if ($Result -lt 0) { throw \"'$Name' must be >= 0.\" }\n    $Result\n}\n\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion\n\n# Check if SQL Change Automation is installed.\t\n$powershellModule = Get-Module -Name SqlChangeAutomation\t\nif ($powershellModule -eq $null) { \t\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\t\n}\n\n$currentVersion = $powershellModule.Version\t\n$minimumRequiredVersion = [version] '3.0.3'\t\nif ($currentVersion -lt $minimumRequiredVersion) { \t\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\t\n}\n\n$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'\n\n# Check the parameters.\n$DLMAutomationCustomConnectionString = Optional -Parameter $DLMAutomationCustomConnectionString\n\nRequired -Parameter $DLMAutomationDeploymentResourcesPath -Name 'Export Path'\nRequired -Parameter $DLMAutomationDeleteExistingFiles -Name 'Delete files in export folder'\n\nif ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)\n{\n    Required -Parameter $DLMAutomationDatabaseServer -Name 'Target SQL Server instance'\n    Required -Parameter $DLMAutomationDatabaseName -Name 'Target database name'\n}\n\n$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername\n$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword\n$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath\n$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions\n$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions\n$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default 'Serializable'\n$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default 'False'\n$DLMAutomationIncludeIdenticalsInReport = Optional -Parameter $DLMAutomationIncludeIdenticalsInReport -Default 'False'\n$DLMAutomationTrustServerCertificate = [Convert]::ToBoolean($OctopusParameters[\"DLMAutomationTrustServerCertificate\"])\n\n# Constructing the unique export path.\n$projectId = $OctopusParameters[\"Octopus.Project.Id\"]\n$releaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$nugetPackageId = $OctopusParameters[\"Octopus.Action.Package[DLMAutomation.Package.Name].PackageId\"]\n$exportPath =  Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId\n\n# Make sure the directory we're about to create doesn't already exist, and delete any files if requested.\nif ((Test-Path $exportPath) -AND ((Get-ChildItem $exportPath | Measure-Object).Count -ne 0)) {\n    if ($DLMAutomationDeleteExistingFiles -eq 'True') {\n        Write-Host \"Deleting all files in $exportPath\"\n        rmdir $exportPath -Recurse -Force\n    } else {\n        throw \"The export path is not empty: $exportPath.  Select the 'Delete files in export folder' option to overwrite the existing folder contents.\"\n    }\n}\n\n\n# Create and test connection to the database.\nif ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)\n{\n    $databaseConnection = New-DatabaseConnection -ServerInstance $DLMAutomationDatabaseServer `\n                                                    -Database $DLMAutomationDatabaseName `\n                                                    -Username $DLMAutomationDatabaseUsername `\n                                                    -Password $DLMAutomationDatabasePassword `\n                                                    -TrustServerCertificate $DLMAutomationTrustServerCertificate | Test-DatabaseConnection\n} else {\n    $databaseConnection = New-Object -TypeName RedGate.Versioning.Automation.Compare.SchemaSources.DatabaseConnection `\n                                        -ArgumentList $DLMAutomationCustomConnectionString | Test-DatabaseConnection\n}\n\n$packagePath = $OctopusParameters[\"Octopus.Action.Package[DLMAutomation.Package.Name].ExtractedPath\"]\n\n$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packagePath\n\n# Only allow sqlcmd variables that don't have special characters like spaces, colon or dashes\n$regex = '^[a-zA-Z_][a-zA-Z0-9_]+$'\n$sqlCmdVariables = @{}\n$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {\n\t$sqlCmdVariables[$_] = $OctopusParameters[$_]\n}\n\n# Create the deployment resources from the database to the NuGet package\n$releaseParams = @{\n    Target = $databaseConnection\n    Source = $importedBuildArtifact\n    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel\n    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)\n    FilterPath = $DLMAutomationFilterPath\n    SQLCompareOptions = $DLMAutomationCompareOptions\n    IncludeIdenticalsInReport = [bool]::Parse($DLMAutomationIncludeIdenticalsInReport)\n    SqlCmdVariables = $sqlCmdVariables\n}\n\nif($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {\n    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions\n} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {\n    Write-Warning \"SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion.\"\n}\n\n$release = New-DatabaseReleaseArtifact @releaseParams\n\n# Export the deployment resources to disk\n$release | Export-DatabaseReleaseArtifact -Path $exportPath\n\n# Import the changes summary, deployment warnings, and update script as Octopus artifacts, so you can review them.\nfunction UploadIfExists() {\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$ArtifactPath,\n        [Parameter(Mandatory = $true)]\n        [string]$Name\n    ) \n    if (Test-Path $ArtifactPath) {\n        New-OctopusArtifact $ArtifactPath -Name $Name\n    }\n}\n\nUploadIfExists -ArtifactPath \"$exportPath\\Reports\\Changes.html\" -Name \"Changes-$DLMAutomationDatabaseName.html\"\nUploadIfExists -ArtifactPath \"$exportPath\\Reports\\Drift.html\" -Name \"Drift-$DLMAutomationDatabaseName.html\"\nUploadIfExists -ArtifactPath \"$exportPath\\Reports\\Warnings.xml\" -Name \"Warnings-$DLMAutomationDatabaseName.xml\"\nUploadIfExists -ArtifactPath \"$exportPath\\Update.sql\" -Name \"Update-$DLMAutomationDatabaseName.sql\"\nUploadIfExists -ArtifactPath \"$exportPath\\TargetedDeploymentScript.sql\" -Name \"TargetedDeploymentScript-$DLMAutomationDatabaseName.sql\"\nUploadIfExists -ArtifactPath \"$exportPath\\DriftRevertScript.sql\" -Name \"DriftRevertScript-$DLMAutomationDatabaseName.sql\"\n\n# Sets a variable if there are changes to deploy. Useful if you want to have steps run only when this is set\nif ($release.UpdateSQL -notlike '*This script is empty because the Target and Source schemas are equivalent*')\n{\n  Set-OctopusVariable -name \"ChangesToDeploy\" -value \"True\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "851de66e-5ebd-49f3-ae26-d7e276438313",
-      "Name": "DLMAutomationDeploymentResourcesPath",
-      "Label": "Export path",
-      "HelpText": "The path that the database deployment resources will be exported to.\n\nThis path is used in the \"Redgate - Deploy from Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0d3a301d-dbe3-4e49-a3cd-4d5c8cee8483",
-      "Name": "DLMAutomationPackageName",
-      "Label": "Package",
-      "HelpText": "The name of the package to extract",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "011c4343-85f0-4b10-8789-e8654723f355",
-      "Name": "DLMAutomationDeleteExistingFiles",
-      "Label": "Delete files in export folder",
-      "HelpText": "If the folder that the deployment resources are exported to isn't empty, this step will fail. Select this option to delete any files in the folder.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "b3bf1847-5167-4aa6-a559-d72d563569ae",
-      "Name": "DLMAutomationDatabaseServer",
-      "Label": "Target SQL Server instance",
-      "HelpText": "The fully qualified SQL Server instance name for the target database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "dfec97ea-de71-4b80-92cc-406830b278be",
-      "Name": "DLMAutomationDatabaseName",
-      "Label": "Target database name",
-      "HelpText": "The name of the database that the source schema (the database package) will be compared with to generate the deployment resources. This must be an existing database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "cdeee900-0313-4a40-9256-9432ae3d6e7a",
-      "Name": "DLMAutomationDatabaseUsername",
-      "Label": "Username (optional)",
-      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "552ee2df-2581-4061-a406-449b28de6bf6",
-      "Name": "DLMAutomationDatabasePassword",
-      "Label": "Password (optional)",
-      "HelpText": "You must enter a password if you entered a username.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "45bfb972-d44b-476b-8988-934bcc56da1f",
-      "Name": "DLMAutomationFilterPath",
-      "Label": "Filter path (optional)",
-      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d867564b-2134-4a41-8c39-b3828e168444",
-      "Name": "DLMAutomationCompareOptions",
-      "Label": "SQL Compare options (optional)",
-      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "26764c18-7f04-4b69-b53e-4c61b1d8eeda",
-      "Name": "DLMAutomationDataCompareOptions",
-      "Label": "SQL Data Compare options (optional)",
-      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](https://documentation.red-gate.com/sca4/deploying-database-changes/automated-deployment-with-sql-source-control-projects/using-comparison-options-with-sql-change-automation-powershell-module-for-sql-source-control-projects).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "53313b06-05ef-4a17-9d65-91ffa17bd3c4",
-      "Name": "DLMAutomationTransactionIsolationLevel",
-      "Label": "Transaction isolation level (optional)",
-      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
-      "DefaultValue": "Serializable",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
-      }
-    },
-    {
-      "Id": "e462b1ae-76f5-400e-b772-c36f36fae241",
-      "Name": "DLMAutomationIgnoreStaticData",
-      "Label": "Ignore static data",
-      "HelpText": "Exclude changes to static data when generating the deployment resources.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "13252389-53ff-4cea-8651-76c9cde85ca5",
-      "Name": "DLMAutomationIncludeIdenticalsInReport",
-      "Label": "Include identical objects in the change report",
-      "HelpText": "By default, the change report only includes added, modified and removed objects. Choose this option to also include identical objects.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "91d18ab6-88bf-4f9f-baec-baf44ec53cf1",
-      "Name": "SpecificModuleVersion",
-      "Label": "SQL Change Automation version (optional)",
-      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "61adc6ec-4216-41c8-ab30-dba6cfcd37d0",
-      "Name": "DLMModuleInstallLocation",
-      "Label": "SQL Change Automation Install Location (optional)",
-      "HelpText": "The SQL Change Automation cmdlets will be downloaded from the [PowerShell gallery](https://www.powershellgallery.com/packages/SqlChangeAutomation).  Please specify the folder folder where those packages will be saved to.  It can be relative or absolute.\n\n\nIf this is empty it will default `$Home\\Documents\\WindowsPowerShell\\Modules` which is the [recommended location](https://docs.microsoft.com/en-us/powershell/scripting/developer/module/installing-a-powershell-module?view=powershell-7#where-to-install-modules) from Microsoft.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4844f3e7-1f3b-491f-8dc8-5e2b03c164d5",
-      "Name": "DLMAutomationTrustServerCertificate",
-      "Label": "Trust Server Certificate",
-      "HelpText": "Trust SQL Server Certificate",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "cb2b74bb-9481-4aab-b18f-b032746e3edd",
-      "Name": "DLMAutomationCustomConnectionString",
-      "Label": "Connection String (Optional)",
-      "HelpText": "If set, uses this as the full connection string. Allows for advanced configuration.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedBy": "markgould",
-  "$Meta": {
-    "ExportedAt": "2020-05-01T15:18:51.685Z",
-    "OctopusVersion": "2020.1.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "redgate"
-}
\ No newline at end of file
diff --git a/step-templates/redgate-create-database-release.json b/step-templates/redgate-create-database-release.json
deleted file mode 100644
index 104ceaaa3..000000000
--- a/step-templates/redgate-create-database-release.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-    "Id":  "c20b70dc-69aa-42a1-85db-6d37341b63e3",
-    "Name":  "Redgate - Create Database Release",
-    "Description":  "Creates the resources (including the SQL update script) to deploy database changes using Redgate\u0027s [SQL Change Automation](http://www.red-gate.com/sca/productpage), and exports them as Octopus artifacts so you can review the changes before deploying.\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
-    "ActionType":  "Octopus.Script",
-    "Version":  22,
-    "Properties":  {
-                       "Octopus.Action.Script.ScriptBody":  "function GetModuleInstallationFolder\r\n{\r\n    if (ModuleInstallationFolderIsValid)\r\n    {\r\n        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)\r\n    }\r\n\r\n    return \"$PSScriptRoot\\Modules\"\r\n}\r\n\r\nfunction ModuleInstallationFolderIsValid\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))\r\n    {\r\n        return $false\r\n    }\r\n\r\n    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;\r\n}\r\n\r\n$DlmAutomationModuleName = \"DLMAutomation\"\r\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\r\n$ModulesFolder = GetModuleInstallationFolder\r\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\r\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\r\n\r\nfunction IsScaAvailable\r\n{\r\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\r\n        return $true\r\n    }\r\n\r\n    return $false\r\n}\r\n\r\nfunction InstallCorrectSqlChangeAutomation\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$requiredVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [bool]$useInstalledVersion\r\n    )\r\n\r\n    $moduleName = $SqlChangeAutomationModuleName\r\n\r\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\r\n    $maximumVersion = $requiredVersion\r\n\r\n    if ($requiredVersion) {\r\n        if ($requiredVersion.Revision -eq -1) {\r\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\r\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\r\n        }\r\n\r\n        if ($requiredVersion.Major -lt 3) {\r\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\r\n            $moduleName = $DlmAutomationModuleName\r\n        }\r\n    }\r\n\r\n    if ($useInstalledVersion) {\r\n        Write-Verbose \"Option to use installed version is selected. Skipping update/install using PowerShellGet.\"\r\n    }\r\n    else {\r\n        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n        if (!$installedModule) {\r\n            #Either SCA isn\u0027t installed at all or $requiredVersion is specified but that version of SCA isn\u0027t installed\r\n            Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\r\n            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n        }\r\n        elseif (!$requiredVersion) {\r\n            #We\u0027ve got a version of SCA installed, but $requiredVersion isn\u0027t specified so we might be able to upgrade\r\n            $newest = GetHighestInstallableModule $moduleName\r\n            if ($newest -and ($installedModule.Version -lt $newest.Version)) {\r\n                Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\r\n                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\r\n            }\r\n        }\r\n    }\r\n\r\n    # Now we\u0027re done with install/upgrade, try to import the highest available module that matches our version requirements\r\n\r\n    # We can\u0027t just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn\u0027t have them,\r\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\r\n    # $requiredVersion and $maximumVersion might be null when there\u0027s no specific version we need.\r\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n    if (!$installedModule -and !$requiredVersion) {\r\n        #Did not find SCA, and we don\u0027t have a required version so we might be able to use an installed DLMA instead.\r\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\r\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName\r\n    }\r\n\r\n    if ($installedModule) {\r\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\r\n        Import-Module $installedModule -Force\r\n    }\r\n    else {\r\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\r\n    }\r\n}\r\n\r\nfunction InstallPowerShellGet {\r\n    [CmdletBinding()]\r\n    Param()\r\n\r\n    ConfigureProxyIfVariableSet\r\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12\r\n\r\n    $psget = GetHighestInstalledModule PowerShellGet\r\n    if (!$psget)\r\n    {\r\n        Write-Warning @\"\r\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\r\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\r\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\r\n\"@\r\n        throw \"PowerShellGet is not available\"\r\n    }\r\n\r\n    if ($psget.Version -lt [Version]\u00271.6\u0027) {\r\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\r\n        Write-Debug \"Installing NuGet package provider\"\r\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\r\n\r\n        #Use the currently-installed version of PowerShellGet\r\n        Import-PackageProvider PowerShellGet\r\n\r\n        #Download the version of PowerShellGet that we actually need\r\n        Write-Debug \"Installing PowershellGet\"\r\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\r\n    }\r\n\r\n    Write-Debug \"Importing PowershellGet\"\r\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\r\n    #Make sure we\u0027re actually using the package provider from the imported version of PowerShellGet\r\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\r\n}\r\n\r\nfunction InstallLocalModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true)]\r\n        [string]$moduleName,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n    try {\r\n        InstallPowerShellGet\r\n\r\n        Write-Debug \"Install $moduleName $requiredVersion\"\r\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetHighestInstalledModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName,\r\n\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n\r\n    return Get-Module $moduleName -ListAvailable |\r\n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |\r\n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n           Select -First 1\r\n}\r\n\r\nfunction GetHighestInstallableModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName\r\n    )\r\n\r\n    try {\r\n        InstallPowerShellGet\r\n        Find-Module SqlChangeAutomation -AllVersions |\r\n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n            Select -First 1\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetInstalledSqlChangeAutomationVersion {\r\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\r\n\r\n    if ($scaModule -ne $null) {\r\n        return $scaModule.Version\r\n    }\r\n\r\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\r\n\r\n    if ($dlmaModule -ne $null) {\r\n        return $dlmaModule.Version\r\n    }\r\n\r\n    return $null\r\n}\r\n\r\nfunction ConfigureProxyIfVariableSet\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)\r\n    {\r\n        Write-Debug \"Setting DefaultWebProxy to $proxyUrl\"\r\n\r\n        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)\r\n        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials\r\n        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True\r\n    }\r\n}\r\n\r\n\r\n$ErrorActionPreference = \u0027Stop\u0027\r\n$VerbosePreference = \u0027Continue\u0027\r\n\r\n# Set process level FUR environment\r\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\r\n\r\n#Helper functions for paramter handling\r\nfunction Required() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for \u0027$Name\u0027\" }\r\n}\r\nfunction Optional() {\r\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $false)]$Default\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) {\r\n        $Default\r\n    } else {\r\n        $Parameter\r\n    }\r\n}\r\nfunction RequireBool() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = $False\r\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a boolean value.\" }\r\n    $Result\r\n}\r\nfunction RequirePositiveNumber() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = 0\r\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a numerical value.\" }\r\n    if ($Result -lt 0) { throw \"\u0027$Name\u0027 must be \u003e= 0.\" }\r\n    $Result\r\n}\r\n\r\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\r\n$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default \u0027False\u0027\r\n$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)\r\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch\r\n\r\n# Check if SQL Change Automation is installed.\r\n$powershellModule = Get-Module -Name SqlChangeAutomation\r\nif ($powershellModule -eq $null) {\r\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\r\n}\r\n\r\n$currentVersion = $powershellModule.Version\r\n$minimumRequiredVersion = [version] \u00273.0.3\u0027\r\nif ($currentVersion -lt $minimumRequiredVersion) {\r\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\r\n}\r\n\r\n$minimumRequiredVersionDataCompareOptions = [version] \u00273.3.0\u0027\r\n$minimumRequiredVersionTrustServerCertificate = [version]\u00274.3.20267\u0027\r\n\r\nfunction AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)\r\n    {\r\n        return $true\r\n    }\r\n    elseif($encryptConnection -or $trustServerCertificate)\r\n    {\r\n        Write-Warning \"Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion.\"\r\n        return $false\r\n    }\r\n}\r\n\r\n# Check the parameters.\r\nRequired -Parameter $DLMAutomationDeploymentResourcesPath -Name \u0027Export Path\u0027\r\nRequired -Parameter $DLMAutomationDeleteExistingFiles -Name \u0027Delete files in export folder\u0027\r\nRequired -Parameter $DLMAutomationNuGetDbPackageDownloadStepName -Name \u0027Database package step\u0027\r\nRequired -Parameter $DLMAutomationDatabaseServer -Name \u0027Target SQL Server instance\u0027\r\nRequired -Parameter $DLMAutomationDatabaseName -Name \u0027Target database name\u0027\r\n$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername\r\n$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword\r\n$DLMAutomationEncrypt = Optional -Parameter $DLMAutomationEncrypt\r\n$DLMAutomationTrustServerCertificate = Optional -Parameter $DLMAutomationTrustServerCertificate\r\n$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath\r\n$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions\r\n$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions\r\n$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default \u0027Serializable\u0027\r\n$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default \u0027False\u0027\r\n$DLMAutomationIncludeIdenticalsInReport = Optional -Parameter $DLMAutomationIncludeIdenticalsInReport -Default \u0027False\u0027\r\n$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder\r\n$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl\r\n\r\n# Get the NuGet package installation directory path.\r\n$packagePath = $OctopusParameters[\"Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Output.Package.InstallationDirectoryPath\"]\r\nif($packagePath -eq $null) {\r\n    throw \"The \u0027Database package download step\u0027 is not a \u0027Deploy a NuGet package\u0027 step: \u0027$DLMAutomationNuGetDbPackageDownloadStepName\u0027\"\r\n}\r\n\r\n# Constructing the unique export path.\r\n$projectId = $OctopusParameters[\"Octopus.Project.Id\"]\r\n$releaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\r\n$nugetPackageId = $OctopusParameters[\"Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Package.NuGetPackageId\"]\r\n$exportPath = Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId\r\n\r\n# Make sure the directory we\u0027re about to create doesn\u0027t already exist, and delete any files if requested.\r\nif ((Test-Path $exportPath) -AND ((Get-ChildItem $exportPath | Measure-Object).Count -ne 0)) {\r\n    if ($DLMAutomationDeleteExistingFiles -eq \u0027True\u0027) {\r\n        Write-Host \"Deleting all files in $exportPath\"\r\n        rmdir $exportPath -Recurse -Force\r\n    } else {\r\n        throw \"The export path is not empty: $exportPath.  Select the \u0027Delete files in export folder\u0027 option to overwrite the existing folder contents.\"\r\n    }\r\n}\r\n\r\n$connectionOptions = @{ }\r\n\r\nif(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationEncrypt), [bool]::Parse($DLMAutomationTrustServerCertificate))) {\r\n    $connectionOptions += @{ \u0027Encrypt\u0027 = [bool]::Parse($DLMAutomationEncrypt) }\r\n    $connectionOptions += @{ \u0027TrustServerCertificate\u0027 = [bool]::Parse($DLMAutomationTrustServerCertificate) }\r\n}\r\n\r\n# Determine whether or not to include identical objects in the report.\r\n$targetDB = New-DatabaseConnection @connectionOptions `\r\n                                   -ServerInstance $DLMAutomationDatabaseServer `\r\n                                   -Database $DLMAutomationDatabaseName `\r\n                                   -Username $DLMAutomationDatabaseUsername `\r\n                                   -Password $DLMAutomationDatabasePassword | Test-DatabaseConnection\r\n\r\n$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packagePath\r\n\r\n# Only allow sqlcmd variables that don\u0027t have special characters like spaces, colon or dashes\r\n$regex = \u0027^[a-zA-Z_][a-zA-Z0-9_]+$\u0027\r\n$sqlCmdVariables = @{}\r\n$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {\r\n\t$sqlCmdVariables[$_] = $OctopusParameters[$_]\r\n}\r\n\r\n# Create the deployment resources from the database to the NuGet package\r\n$releaseParams = @{\r\n    Target = $targetDB\r\n    Source = $importedBuildArtifact\r\n    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel\r\n    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)\r\n    FilterPath = $DLMAutomationFilterPath\r\n    SQLCompareOptions = $DLMAutomationCompareOptions\r\n    IncludeIdenticalsInReport = [bool]::Parse($DLMAutomationIncludeIdenticalsInReport)\r\n    SqlCmdVariables = $sqlCmdVariables\r\n}\r\n\r\nif($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {\r\n    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions\r\n} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {\r\n    Write-Warning \"SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion.\"\r\n}\r\n\r\n$release = New-DatabaseReleaseArtifact @releaseParams\r\n\r\n# Export the deployment resources to disk\r\n$release | Export-DatabaseReleaseArtifact -Path $exportPath\r\n\r\n# Import the changes summary, deployment warnings, and update script as Octopus artifacts, so you can review them.\r\nfunction UploadIfExists() {\r\n    Param(\r\n        [Parameter(Mandatory = $true)]\r\n        [string]$ArtifactPath,\r\n        [Parameter(Mandatory = $true)]\r\n        [string]$Name\r\n    )\r\n    if (Test-Path $ArtifactPath) {\r\n        New-OctopusArtifact $ArtifactPath -Name $Name\r\n    }\r\n}\r\n\r\nUploadIfExists -ArtifactPath \"$exportPath\\Reports\\Changes.html\" -Name \"Changes-$DLMAutomationDatabaseName.html\"\r\nUploadIfExists -ArtifactPath \"$exportPath\\Reports\\Drift.html\" -Name \"Drift-$DLMAutomationDatabaseName.html\"\r\nUploadIfExists -ArtifactPath \"$exportPath\\Reports\\Warnings.xml\" -Name \"Warnings-$DLMAutomationDatabaseName.xml\"\r\nUploadIfExists -ArtifactPath \"$exportPath\\Update.sql\" -Name \"Update-$DLMAutomationDatabaseName.sql\"\r\nUploadIfExists -ArtifactPath \"$exportPath\\TargetedDeploymentScript.sql\" -Name \"TargetedDeploymentScript-$DLMAutomationDatabaseName.sql\"\r\nUploadIfExists -ArtifactPath \"$exportPath\\DriftRevertScript.sql\" -Name \"DriftRevertScript-$DLMAutomationDatabaseName.sql\"\r\n\r\n# Sets a variable if there are changes to deploy. Useful if you want to have steps run only when this is set\r\nif ($release.UpdateSQL -notlike \u0027*This script is empty because the Target and Source schemas are equivalent*\u0027)\r\n{\r\n  Set-OctopusVariable -name \"ChangesToDeploy\" -value \"True\"\r\n}\r\n",
-                       "Octopus.Action.Script.Syntax":  "PowerShell"
-                   },
-    "SensitiveProperties":  {
-
-                            },
-    "Parameters":  [
-                       {
-                           "Name":  "DLMAutomationDeploymentResourcesPath",
-                           "Label":  "Export path",
-                           "HelpText":  "The path that the database deployment resources will be exported to.\n\nThis path is used in the \"Redgate - Deploy from Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDeleteExistingFiles",
-                           "Label":  "Delete files in export folder",
-                           "HelpText":  "If the folder that the deployment resources are exported to isn\u0027t empty, this step will fail. Select this option to delete any files in the folder.",
-                           "DefaultValue":  "True",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationNuGetDbPackageDownloadStepName",
-                           "Label":  "Database package step",
-                           "HelpText":  "Select the step in this project which downloads the database package.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "StepName"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabaseServer",
-                           "Label":  "Target SQL Server instance",
-                           "HelpText":  "The fully qualified SQL Server instance name for the target database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabaseName",
-                           "Label":  "Target database name",
-                           "HelpText":  "The name of the database that the source schema (the database package) will be compared with to generate the deployment resources. This must be an existing database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabaseUsername",
-                           "Label":  "Username (optional)",
-                           "HelpText":  "The SQL Server username used to connect to the database. If you leave this field and \u0027Password\u0027 blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabasePassword",
-                           "Label":  "Password (optional)",
-                           "HelpText":  "You must enter a password if you entered a username.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Sensitive"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationEncrypt",
-                           "Label":  "Encrypt",
-                           "HelpText":  "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTrustServerCertificate",
-                           "Label":  "Trust Server Certificate",
-                           "HelpText":  "Specify whether to force SQL Server to skip certificate validation.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationFilterPath",
-                           "Label":  "Filter path (optional)",
-                           "HelpText":  "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationCompareOptions",
-                           "Label":  "SQL Compare options (optional)",
-                           "HelpText":  "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDataCompareOptions",
-                           "Label":  "SQL Data Compare options (optional)",
-                           "HelpText":  "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTransactionIsolationLevel",
-                           "Label":  "Transaction isolation level (optional)",
-                           "HelpText":  "Select the transaction isolation level to be used in deployment scripts.",
-                           "DefaultValue":  "Serializable",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Select",
-                                                   "Octopus.SelectOptions":  "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationIgnoreStaticData",
-                           "Label":  "Ignore static data",
-                           "HelpText":  "Exclude changes to static data when generating the deployment resources.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationIncludeIdenticalsInReport",
-                           "Label":  "Include identical objects in the change report",
-                           "HelpText":  "By default, the change report only includes added, modified and removed objects. Choose this option to also include identical objects.",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "SpecificModuleVersion",
-                           "Label":  "SQL Change Automation version (optional)",
-                           "HelpText":  "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "UseInstalledModuleVersion",
-                           "Label":  "Only use a version of SQL Change Automation that is already installed",
-                           "HelpText":  "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationModuleInstallationFolder",
-                           "Label":  "Module Installation Folder (optional)",
-                           "HelpText":  "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationProxyUrl",
-                           "Label":  "Proxy URL (optional)",
-                           "HelpText":  "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       }
-                   ],
-    "LastModifiedOn":  "2021-03-19T10:01:37.110+00:00",
-    "LastModifiedBy":  "support@red-gate.com",
-    "$Meta":  {
-                  "ExportedAt":  "2015-07-17T11:04:21.348Z",
-                  "OctopusVersion":  "2.6.5.1010",
-                  "Type":  "ActionTemplate"
-              },
-    "Category":  "redgate"
-}
diff --git a/step-templates/redgate-deploy-database-release-worker-friendly.json b/step-templates/redgate-deploy-database-release-worker-friendly.json
deleted file mode 100644
index 550c374a1..000000000
--- a/step-templates/redgate-deploy-database-release-worker-friendly.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "Id": "adf9a009-8bbb-4b82-8f3b-6fb12ef4ba18",
-  "Name": "Redgate - Deploy from Database Release (Worker Friendly)",
-  "Description": "Uses the deployment resources from the 'Redgate - Create Database Release' step to deploy the database changes using Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage).\n\nRequires SQL Change Automation version 3.0.2 or later.\n\n*Version date: 2019-07-26*\n\nThis step template is worker friendly, you can pass in a package reference rather than having to reference a previous step which downloaded the package. This step requires Octopus Deploy **2019.10.0** or higher.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Author": "octobob",
-  "Packages": [
-    {
-      "Id": "cbac673c-43fb-4f6f-8204-31597bb57077",
-      "Name": "DLMAutomationPackageName",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "DLMAutomationPackageName"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#Improve performance by turning off progress bar\n#More details here: https://redgate.uservoice.com/forums/267000-sql-change-automation/suggestions/44882212-improve-performance-invoke-databasebuild-by-re\n$ProgressPreference = \"SilentlyContinue\"\n\n$DlmAutomationModuleName = \"DLMAutomation\"\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\n$ModulesFolder = \"$Home\\Documents\\WindowsPowerShell\\Modules\"\n\nif ([string]::IsNullOrWhiteSpace($DLMModuleInstallLocation) -eq $false)\n{\n\tif ((Test-Path $DLMModuleInstallLocation -IsValid) -eq $false)\n    {\n    \tWrite-Error \"The path $DLMModuleInstallLocation is not valid, please use a relative or absolute path.\"\n        exit 1\n    }\n    \n    $ModulesFolder = [System.IO.Path]::GetFullPath($DLMModuleInstallLocation)            \n}\n\nWrite-Host \"Modules will be installed into $ModulesFolder\"\n\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nfunction IsScaAvailable\n{\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\n        return $true\n    }\n\n    return $false\n}\n\nfunction InstallCorrectSqlChangeAutomation\n{\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $false)]\n        [Version]$requiredVersion\n    )\n    \n    $moduleName = $SqlChangeAutomationModuleName\n\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\n    $maximumVersion = $requiredVersion\n\n    if ($requiredVersion) {\n        if ($requiredVersion.Revision -eq -1) {\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\n        }\n\n        if ($requiredVersion.Major -lt 3) {\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\n            $moduleName = $DlmAutomationModuleName\n        }\n    }\n\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n\n    if (!$installedModule) {\n        #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed\n        Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\n        InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n    }\n    elseif (!$requiredVersion) {\n        #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade\n        $newest = GetHighestInstallableModule $moduleName\n        if ($newest -and ($installedModule.Version -lt $newest.Version)) {\n            Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\n            InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\n        }\n    }\n\n    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements\n\n    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\n    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n\n    if (!$installedModule -and !$requiredVersion) {\n        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName        \n    }\n    \n    if ($installedModule) {\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\n        Import-Module $installedModule -Force\n    }\n    else {\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\n    }\n}\n\nfunction InstallPowerShellGet {\n    [CmdletBinding()]\n    Param()\n    $psget = GetHighestInstalledModule PowerShellGet\n    if (!$psget)\n    {\n        Write-Warning @\"\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\n\"@\n        throw \"PowerShellGet is not available\"\n    }\n\n    if ($psget.Version -lt [Version]'1.6') {\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\n        Write-Debug \"Installing NuGet package provider\"\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n\n        #Use the currently-installed version of PowerShellGet\n        Import-PackageProvider PowerShellGet \n        \n        #Download the version of PowerShellGet that we actually need\n        Write-Debug \"Installing PowershellGet\"\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\n    }\n\n    Write-Debug \"Importing PowershellGet\"\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\n    #Make sure we're actually using the package provider from the imported version of PowerShellGet\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\n}\n\nfunction InstallLocalModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$moduleName,\n        [Parameter(Mandatory = $false)]\n        [Version]$minimumVersion,\n        [Parameter(Mandatory = $false)]\n        [Version]$maximumVersion\n    )\n    try {\n        InstallPowerShellGet\n\n        Write-Debug \"Install $moduleName $requiredVersion\"\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\n    }\n    catch {\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\n    }\n}\n\nfunction GetHighestInstalledModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $moduleName,\n\n        [Parameter(Mandatory = $false)]\n        [Version]$minimumVersion,\n        [Parameter(Mandatory = $false)]\n        [Version]$maximumVersion\n    )\n\n    return Get-Module $moduleName -ListAvailable | \n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} | \n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\n           Select -First 1\n}\n\nfunction GetHighestInstallableModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $moduleName\n    )\n\n    try {\n        InstallPowerShellGet\n        Find-Module SqlChangeAutomation -AllVersions | \n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\n            Select -First 1   \n    }\n    catch {\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\n    }\n}\n\nfunction GetInstalledSqlChangeAutomationVersion {\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\n\n    if ($scaModule -ne $null) {\n        return $scaModule.Version\n    }\n\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\n\n    if ($dlmaModule -ne $null) {\n        return $dlmaModule.Version\n    }\n\n    return $null\n}\n\n\n$ErrorActionPreference = 'Stop'\n$VerbosePreference = 'Continue'\n\n# Set process level FUR environment\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\n\n#Helper functions for paramter handling\nfunction Required() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for '$Name'\" }\n}\nfunction Optional() {\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $false)]$Default\n    )\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { \n        $Default\n    } else { \n        $Parameter\n    }\n}\nfunction RequireBool() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    $Result = $False\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"'$Name' must be a boolean value.\" }\n    $Result\n}\nfunction RequirePositiveNumber() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    $Result = 0\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"'$Name' must be a numerical value.\" }\n    if ($Result -lt 0) { throw \"'$Name' must be >= 0.\" }\n    $Result\n}\n\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion\n\n# Check if SQL Change Automation is installed.\t\n$powershellModule = Get-Module -Name SqlChangeAutomation\t\nif ($powershellModule -eq $null) { \t\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\t\n}\n\n$currentVersion = $powershellModule.Version\t\n$minimumRequiredVersion = [version] '3.0.3'\t\nif ($currentVersion -lt $minimumRequiredVersion) { \t\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\t\n}\n\n$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'\n\n# Check the parameters.\n$DLMAutomationCustomConnectionString = Optional -Parameter $DLMAutomationCustomConnectionString\n\nRequired -Parameter $DLMAutomationDeploymentResourcesPath -Name 'Export Path'\n\nif ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)\n{\n    Required -Parameter $DLMAutomationDatabaseServer -Name 'Target SQL Server instance'\n    Required -Parameter $DLMAutomationDatabaseName -Name 'Target database name'\n}\n\n$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername\n$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword\n$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default \"False\"\n$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'\n$DLMAutomationTrustServerCertificate = [Convert]::ToBoolean($OctopusParameters[\"DLMAutomationTrustServerCertificate\"])\n\n$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'\n$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'\n\n# Check whether database deployment resources export path exists and is a valid directory path \nif((Test-Path $DLMAutomationDeploymentResourcesPath) -eq $true) {\n    if((Get-Item $DLMAutomationDeploymentResourcesPath) -isnot [System.IO.DirectoryInfo]) {\n        throw \"The export path is not a valid folder: $DLMAutomationDeploymentResourcesPath\"\n    }\n} else {\n    throw \"The export path folder doesn't exist, or the current Windows account can't access it: $DLMAutomationDeploymentResourcesPath\"\n}\n\n# Constructing the unique export path.\n$nugetPackageId = $OctopusParameters[\"Octopus.Action.Package[DLMAutomationPackageName].PackageId\"]\n$projectId = $OctopusParameters['Octopus.Project.Id']\n$releaseNumber = $OctopusParameters['Octopus.Release.Number']\n$exportPath = Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId\n\n# Create and test connection to the database.\nif ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)\n{\n    $databaseConnection = New-DatabaseConnection -ServerInstance $DLMAutomationDatabaseServer `\n                                                    -Database $DLMAutomationDatabaseName `\n                                                    -Username $DLMAutomationDatabaseUsername `\n                                                    -Password $DLMAutomationDatabasePassword `\n                                                    -TrustServerCertificate $DLMAutomationTrustServerCertificate | Test-DatabaseConnection\n} else {\n    $databaseConnection = New-Object -TypeName RedGate.Versioning.Automation.Compare.SchemaSources.DatabaseConnection `\n                                        -ArgumentList $DLMAutomationCustomConnectionString | Test-DatabaseConnection\n}\n\n$releaseUrl = $OctopusParameters['Octopus.Web.ServerUri'] + $OctopusParameters['Octopus.Web.DeploymentLink']; \n# Import and deploy the release.\nImport-DatabaseReleaseArtifact $exportPath | Use-DatabaseReleaseArtifact -DeployTo $databaseConnection -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "57b50569-40cb-42b2-80a0-d607fff366ec",
-      "Name": "DLMAutomationDeploymentResourcesPath",
-      "Label": "Export path",
-      "HelpText": "The path the database deployment resources were exported to.\n\nThis should be the same path specified in the \"Redgate - Create Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "30a84de3-af9a-4c00-b9d4-ad9a96c59df6",
-      "Name": "DLMAutomationDatabaseServer",
-      "Label": "Target SQL Server instance",
-      "HelpText": "The fully qualified SQL Server instance name for the target database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9bd39d00-e163-4051-bce5-635cbab28068",
-      "Name": "DLMAutomationDatabaseName",
-      "Label": "Target database name",
-      "HelpText": "The name of the database to deploy changes to. This must be an existing database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "91c79e89-f988-4ec1-90ec-7ba64e3b7be7",
-      "Name": "DLMAutomationDatabaseUsername",
-      "Label": "Username (optional)",
-      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2074e5f7-9987-411a-bbfe-87ad28c4d3ab",
-      "Name": "DLMAutomationDatabasePassword",
-      "Label": "Password (optional)",
-      "HelpText": "You must enter a password if you entered a username.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "da1aa9b7-3e11-4982-b027-274d6b6c7561",
-      "Name": "DLMAutomationQueryBatchTimeout",
-      "Label": "Query batch timeout (in seconds)",
-      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "411b3ad1-4968-4cdb-b47b-3ddb4eab0468",
-      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
-      "Label": "Skip post update schema check",
-      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "e824b03b-802c-45c9-ba1e-c1540888789a",
-      "Name": "SpecificModuleVersion",
-      "Label": "SQL Change Automation version (optional)",
-      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "25a16ceb-d668-4ea9-a645-fbf2001c1615",
-      "Name": "DLMAutomationPackageName",
-      "Label": "Package",
-      "HelpText": "The package which is being deployed",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "61adc6ec-4216-41c8-ab30-dba6cfcd37d0",
-      "Name": "DLMModuleInstallLocation",
-      "Label": "SQL Change Automation Install Location (optional)",
-      "HelpText": "The SQL Change Automation cmdlets will be downloaded from the [PowerShell gallery](https://www.powershellgallery.com/packages/SqlChangeAutomation).  Please specify the folder folder where those packages will be saved to.  It can be relative or absolute.\n\n\nIf this is empty it will default `$Home\\Documents\\WindowsPowerShell\\Modules` which is the [recommended location](https://docs.microsoft.com/en-us/powershell/scripting/developer/module/installing-a-powershell-module?view=powershell-7#where-to-install-modules) from Microsoft.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4844f3e7-1f3b-491f-8dc8-5e2b03c164d5",
-      "Name": "DLMAutomationTrustServerCertificate",
-      "Label": "Trust Server Certificate",
-      "HelpText": "Trust SQL Server Certificate",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "cb2b74bb-9481-4aab-b18f-b032746e3edd",
-      "Name": "DLMAutomationCustomConnectionString",
-      "Label": "Connection String (Optional)",
-      "HelpText": "If set, uses this as the full connection string. Allows for advanced configuration.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedBy": "markgould",
-  "$Meta": {
-    "ExportedAt": "2020-05-01T15:21:38.717Z",
-    "OctopusVersion": "2020.1.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "redgate"
-}
\ No newline at end of file
diff --git a/step-templates/redgate-deploy-from-database-release.json b/step-templates/redgate-deploy-from-database-release.json
deleted file mode 100644
index 29c0c39ef..000000000
--- a/step-templates/redgate-deploy-from-database-release.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "Id":  "7d18aeb8-5e69-4c91-aca4-0d71022944e8",
-    "Name":  "Redgate - Deploy from Database Release",
-    "Description":  "Uses the deployment resources from the \u0027Redgate - Create Database Release\u0027 step to deploy the database changes using Redgate\u0027s [SQL Change Automation](http://www.red-gate.com/sca/productpage).\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
-    "ActionType":  "Octopus.Script",
-    "Version":  18,
-    "Properties":  {
-                       "Octopus.Action.Script.ScriptBody":  "function GetModuleInstallationFolder\r\n{\r\n    if (ModuleInstallationFolderIsValid)\r\n    {\r\n        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)\r\n    }\r\n\r\n    return \"$PSScriptRoot\\Modules\"\r\n}\r\n\r\nfunction ModuleInstallationFolderIsValid\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))\r\n    {\r\n        return $false\r\n    }\r\n\r\n    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;\r\n}\r\n\r\n$DlmAutomationModuleName = \"DLMAutomation\"\r\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\r\n$ModulesFolder = GetModuleInstallationFolder\r\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\r\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\r\n\r\nfunction IsScaAvailable\r\n{\r\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\r\n        return $true\r\n    }\r\n\r\n    return $false\r\n}\r\n\r\nfunction InstallCorrectSqlChangeAutomation\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$requiredVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [bool]$useInstalledVersion\r\n    )\r\n\r\n    $moduleName = $SqlChangeAutomationModuleName\r\n\r\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\r\n    $maximumVersion = $requiredVersion\r\n\r\n    if ($requiredVersion) {\r\n        if ($requiredVersion.Revision -eq -1) {\r\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\r\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\r\n        }\r\n\r\n        if ($requiredVersion.Major -lt 3) {\r\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\r\n            $moduleName = $DlmAutomationModuleName\r\n        }\r\n    }\r\n\r\n    if ($useInstalledVersion) {\r\n        Write-Verbose \"Option to use installed version is selected. Skipping update/install using PowerShellGet.\"\r\n    }\r\n    else {\r\n        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n        if (!$installedModule) {\r\n            #Either SCA isn\u0027t installed at all or $requiredVersion is specified but that version of SCA isn\u0027t installed\r\n            Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\r\n            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n        }\r\n        elseif (!$requiredVersion) {\r\n            #We\u0027ve got a version of SCA installed, but $requiredVersion isn\u0027t specified so we might be able to upgrade\r\n            $newest = GetHighestInstallableModule $moduleName\r\n            if ($newest -and ($installedModule.Version -lt $newest.Version)) {\r\n                Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\r\n                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\r\n            }\r\n        }\r\n    }\r\n\r\n    # Now we\u0027re done with install/upgrade, try to import the highest available module that matches our version requirements\r\n\r\n    # We can\u0027t just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn\u0027t have them,\r\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\r\n    # $requiredVersion and $maximumVersion might be null when there\u0027s no specific version we need.\r\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n    if (!$installedModule -and !$requiredVersion) {\r\n        #Did not find SCA, and we don\u0027t have a required version so we might be able to use an installed DLMA instead.\r\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\r\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName\r\n    }\r\n\r\n    if ($installedModule) {\r\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\r\n        Import-Module $installedModule -Force\r\n    }\r\n    else {\r\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\r\n    }\r\n}\r\n\r\nfunction InstallPowerShellGet {\r\n    [CmdletBinding()]\r\n    Param()\r\n\r\n    ConfigureProxyIfVariableSet\r\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12\r\n\r\n    $psget = GetHighestInstalledModule PowerShellGet\r\n    if (!$psget)\r\n    {\r\n        Write-Warning @\"\r\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\r\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\r\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\r\n\"@\r\n        throw \"PowerShellGet is not available\"\r\n    }\r\n\r\n    if ($psget.Version -lt [Version]\u00271.6\u0027) {\r\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\r\n        Write-Debug \"Installing NuGet package provider\"\r\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\r\n\r\n        #Use the currently-installed version of PowerShellGet\r\n        Import-PackageProvider PowerShellGet\r\n\r\n        #Download the version of PowerShellGet that we actually need\r\n        Write-Debug \"Installing PowershellGet\"\r\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\r\n    }\r\n\r\n    Write-Debug \"Importing PowershellGet\"\r\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\r\n    #Make sure we\u0027re actually using the package provider from the imported version of PowerShellGet\r\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\r\n}\r\n\r\nfunction InstallLocalModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true)]\r\n        [string]$moduleName,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n    try {\r\n        InstallPowerShellGet\r\n\r\n        Write-Debug \"Install $moduleName $requiredVersion\"\r\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetHighestInstalledModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName,\r\n\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n\r\n    return Get-Module $moduleName -ListAvailable |\r\n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |\r\n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n           Select -First 1\r\n}\r\n\r\nfunction GetHighestInstallableModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName\r\n    )\r\n\r\n    try {\r\n        InstallPowerShellGet\r\n        Find-Module SqlChangeAutomation -AllVersions |\r\n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n            Select -First 1\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetInstalledSqlChangeAutomationVersion {\r\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\r\n\r\n    if ($scaModule -ne $null) {\r\n        return $scaModule.Version\r\n    }\r\n\r\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\r\n\r\n    if ($dlmaModule -ne $null) {\r\n        return $dlmaModule.Version\r\n    }\r\n\r\n    return $null\r\n}\r\n\r\nfunction ConfigureProxyIfVariableSet\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)\r\n    {\r\n        Write-Debug \"Setting DefaultWebProxy to $proxyUrl\"\r\n\r\n        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)\r\n        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials\r\n        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True\r\n    }\r\n}\r\n\r\n\r\n$ErrorActionPreference = \u0027Stop\u0027\r\n$VerbosePreference = \u0027Continue\u0027\r\n\r\n# Set process level FUR environment\r\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\r\n\r\n#Helper functions for paramter handling\r\nfunction Required() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for \u0027$Name\u0027\" }\r\n}\r\nfunction Optional() {\r\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $false)]$Default\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) {\r\n        $Default\r\n    } else {\r\n        $Parameter\r\n    }\r\n}\r\nfunction RequireBool() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = $False\r\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a boolean value.\" }\r\n    $Result\r\n}\r\nfunction RequirePositiveNumber() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = 0\r\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a numerical value.\" }\r\n    if ($Result -lt 0) { throw \"\u0027$Name\u0027 must be \u003e= 0.\" }\r\n    $Result\r\n}\r\n\r\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\r\n$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default \u0027False\u0027\r\n$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)\r\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch\r\n\r\n# Check if SQL Change Automation is installed.\r\n$powershellModule = Get-Module -Name SqlChangeAutomation\r\nif ($powershellModule -eq $null) {\r\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\r\n}\r\n\r\n$currentVersion = $powershellModule.Version\r\n$minimumRequiredVersion = [version] \u00273.0.3\u0027\r\nif ($currentVersion -lt $minimumRequiredVersion) {\r\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\r\n}\r\n\r\n$minimumRequiredVersionDataCompareOptions = [version] \u00273.3.0\u0027\r\n$minimumRequiredVersionTrustServerCertificate = [version]\u00274.3.20267\u0027\r\n\r\nfunction AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)\r\n    {\r\n        return $true\r\n    }\r\n    elseif($encryptConnection -or $trustServerCertificate)\r\n    {\r\n        Write-Warning \"Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion.\"\r\n        return $false\r\n    }\r\n}\r\n\r\n# Check the parameters.\r\nRequired -Parameter $DLMAutomationDeploymentResourcesPath -Name \u0027Export path\u0027\r\nRequired -Parameter $DLMAutomationNuGetDbPackageDownloadStepName -Name \u0027Database package step\u0027\r\nRequired -Parameter $DLMAutomationDatabaseServer -Name  \u0027Target SQL Server instance\u0027\r\nRequired -Parameter $DLMAutomationDatabaseName -Name  \u0027Target database name\u0027\r\n$DLMAutomationDatabaseUsername = Optional -Parameter $DLMAutomationDatabaseUsername\r\n$DLMAutomationDatabasePassword = Optional -Parameter $DLMAutomationDatabasePassword\r\n$DLMAutomationTrustServerCertificate = Optional -Parameter $DLMAutomationTrustServerCertificate\r\n$DLMAutomationEncrypt = Optional -Parameter $DLMAutomationEncrypt\r\n$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default \"False\"\r\n$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default \u002730\u0027\r\n$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder\r\n$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl\r\n\r\n$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name \u0027Skip post update schema check\u0027\r\n$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name \u0027Query Batch Timeout\u0027\r\n\r\n# Check whether database deployment resources export path exists and is a valid directory path\r\nif((Test-Path $DLMAutomationDeploymentResourcesPath) -eq $true) {\r\n    if((Get-Item $DLMAutomationDeploymentResourcesPath) -isnot [System.IO.DirectoryInfo]) {\r\n        throw \"The export path is not a valid folder: $DLMAutomationDeploymentResourcesPath\"\r\n    }\r\n} else {\r\n    throw \"The export path folder doesn\u0027t exist, or the current Windows account can\u0027t access it: $DLMAutomationDeploymentResourcesPath\"\r\n}\r\n\r\n# Get the NuGet package ID and validate the step name.\r\n$nugetPackageId = $OctopusParameters[\"Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Package.NuGetPackageId\"]\r\nif ($nugetPackageId -eq $null) {\r\n    throw \"The \u0027Database package download step\u0027 is not a \u0027Deploy a NuGet package\u0027 step: \u0027$DLMAutomationNuGetDbPackageDownloadStepName\u0027\"\r\n}\r\n\r\n# Constructing the unique export path.\r\n$projectId = $OctopusParameters[\u0027Octopus.Project.Id\u0027]\r\n$releaseNumber = $OctopusParameters[\u0027Octopus.Release.Number\u0027]\r\n$exportPath = Join-Path (Join-Path (Join-Path $DLMAutomationDeploymentResourcesPath $projectId) $releaseNumber) $nugetPackageId\r\n\r\n$connectionOptions = @{ }\r\n\r\nif(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationEncrypt), [bool]::Parse($DLMAutomationTrustServerCertificate))) {\r\n    $connectionOptions += @{ \u0027Encrypt\u0027 = [bool]::Parse($DLMAutomationEncrypt) }\r\n    $connectionOptions += @{ \u0027TrustServerCertificate\u0027 = [bool]::Parse($DLMAutomationTrustServerCertificate) }\r\n}\r\n\r\n# Create and test connection to the database.\r\n$databaseConnection = New-DatabaseConnection @connectionOptions `\r\n                                             -ServerInstance $DLMAutomationDatabaseServer `\r\n                                             -Database $DLMAutomationDatabaseName `\r\n                                             -Username $DLMAutomationDatabaseUsername `\r\n                                             -Password $DLMAutomationDatabasePassword | Test-DatabaseConnection\r\n\r\n$releaseUrl = $OctopusParameters[\u0027#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}\u0027] + $OctopusParameters[\u0027Octopus.Web.DeploymentLink\u0027];\r\n# Import and deploy the release.\r\nImport-DatabaseReleaseArtifact $exportPath | Use-DatabaseReleaseArtifact -DeployTo $databaseConnection -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck\r\n",
-                       "Octopus.Action.Script.Syntax":  "PowerShell"
-                   },
-    "SensitiveProperties":  {
-
-                            },
-    "Parameters":  [
-                       {
-                           "Name":  "DLMAutomationDeploymentResourcesPath",
-                           "Label":  "Export path",
-                           "HelpText":  "The path the database deployment resources were exported to.\n\nThis should be the same path specified in the \"Redgate - Create Database Release\" step, and must be accessible to all tentacles used in database deployment steps.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationNuGetDbPackageDownloadStepName",
-                           "Label":  "Database package step",
-                           "HelpText":  "Select the step in this project which downloads the database package.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "StepName"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabaseServer",
-                           "Label":  "Target SQL Server instance",
-                           "HelpText":  "The fully qualified SQL Server instance name for the target database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabaseName",
-                           "Label":  "Target database name",
-                           "HelpText":  "The name of the database to deploy changes to. This must be an existing database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabaseUsername",
-                           "Label":  "Username (optional)",
-                           "HelpText":  "The SQL Server username used to connect to the database. If you leave this field and \u0027Password\u0027 blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDatabasePassword",
-                           "Label":  "Password (optional)",
-                           "HelpText":  "You must enter a password if you entered a username.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Sensitive"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationEncrypt",
-                           "Label":  "Encrypt",
-                           "HelpText":  "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTrustServerCertificate",
-                           "Label":  "Trust Server Certificate",
-                           "HelpText":  "Specify whether to force SQL Server to skip certificate validation.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationQueryBatchTimeout",
-                           "Label":  "Query batch timeout (in seconds)",
-                           "HelpText":  "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
-                           "DefaultValue":  "30",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSkipPostUpdateSchemaCheck",
-                           "Label":  "Skip post update schema check",
-                           "HelpText":  "Don\u0027t check that the target database has the correct schema after the update has run.",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "SpecificModuleVersion",
-                           "Label":  "SQL Change Automation version (optional)",
-                           "HelpText":  "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "UseInstalledModuleVersion",
-                           "Label":  "Only use a version of SQL Change Automation that is already installed",
-                           "HelpText":  "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationModuleInstallationFolder",
-                           "Label":  "Module Installation Folder (optional)",
-                           "HelpText":  "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationProxyUrl",
-                           "Label":  "Proxy URL (optional)",
-                           "HelpText":  "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       }
-                   ],
-    "LastModifiedOn":  "2021-03-19T10:01:37.125+00:00",
-    "LastModifiedBy":  "benimac93",
-    "$Meta":  {
-        "ExportedAt": "2021-08-23T12:40:10.975Z",
-        "OctopusVersion": "2021.1.7687",
-                  "Type":  "ActionTemplate"
-              },
-    "Category":  "redgate"
-}
diff --git a/step-templates/redgate-deploy-from-database.json b/step-templates/redgate-deploy-from-database.json
deleted file mode 100644
index 99ac29c36..000000000
--- a/step-templates/redgate-deploy-from-database.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-    "Id":  "548a661f-0c77-479d-acbd-da1e0875df1d",
-    "Name":  "Redgate - Deploy from Database",
-    "Description":  "Uses Redgate\u0027s [SQL Change Automation](http://www.red-gate.com/sca/productpage) to deploy a source schema to a SQL Server database without a review step.\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
-    "ActionType":  "Octopus.Script",
-    "Version":  37,
-    "Properties":  {
-                       "Octopus.Action.Script.ScriptBody":  "function GetModuleInstallationFolder\r\n{\r\n    if (ModuleInstallationFolderIsValid)\r\n    {\r\n        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)\r\n    }\r\n\r\n    return \"$PSScriptRoot\\Modules\"\r\n}\r\n\r\nfunction ModuleInstallationFolderIsValid\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))\r\n    {\r\n        return $false\r\n    }\r\n\r\n    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;\r\n}\r\n\r\n$DlmAutomationModuleName = \"DLMAutomation\"\r\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\r\n$ModulesFolder = GetModuleInstallationFolder\r\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\r\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\r\n\r\nfunction IsScaAvailable\r\n{\r\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\r\n        return $true\r\n    }\r\n\r\n    return $false\r\n}\r\n\r\nfunction InstallCorrectSqlChangeAutomation\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$requiredVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [bool]$useInstalledVersion\r\n    )\r\n\r\n    $moduleName = $SqlChangeAutomationModuleName\r\n\r\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\r\n    $maximumVersion = $requiredVersion\r\n\r\n    if ($requiredVersion) {\r\n        if ($requiredVersion.Revision -eq -1) {\r\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\r\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\r\n        }\r\n\r\n        if ($requiredVersion.Major -lt 3) {\r\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\r\n            $moduleName = $DlmAutomationModuleName\r\n        }\r\n    }\r\n\r\n    if ($useInstalledVersion) {\r\n        Write-Verbose \"Option to use installed version is selected. Skipping update/install using PowerShellGet.\"\r\n    }\r\n    else {\r\n        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n        if (!$installedModule) {\r\n            #Either SCA isn\u0027t installed at all or $requiredVersion is specified but that version of SCA isn\u0027t installed\r\n            Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\r\n            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n        }\r\n        elseif (!$requiredVersion) {\r\n            #We\u0027ve got a version of SCA installed, but $requiredVersion isn\u0027t specified so we might be able to upgrade\r\n            $newest = GetHighestInstallableModule $moduleName\r\n            if ($newest -and ($installedModule.Version -lt $newest.Version)) {\r\n                Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\r\n                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\r\n            }\r\n        }\r\n    }\r\n\r\n    # Now we\u0027re done with install/upgrade, try to import the highest available module that matches our version requirements\r\n\r\n    # We can\u0027t just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn\u0027t have them,\r\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\r\n    # $requiredVersion and $maximumVersion might be null when there\u0027s no specific version we need.\r\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n    if (!$installedModule -and !$requiredVersion) {\r\n        #Did not find SCA, and we don\u0027t have a required version so we might be able to use an installed DLMA instead.\r\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\r\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName\r\n    }\r\n\r\n    if ($installedModule) {\r\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\r\n        Import-Module $installedModule -Force\r\n    }\r\n    else {\r\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\r\n    }\r\n}\r\n\r\nfunction InstallPowerShellGet {\r\n    [CmdletBinding()]\r\n    Param()\r\n\r\n    ConfigureProxyIfVariableSet\r\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12\r\n\r\n    $psget = GetHighestInstalledModule PowerShellGet\r\n    if (!$psget)\r\n    {\r\n        Write-Warning @\"\r\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\r\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\r\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\r\n\"@\r\n        throw \"PowerShellGet is not available\"\r\n    }\r\n\r\n    if ($psget.Version -lt [Version]\u00271.6\u0027) {\r\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\r\n        Write-Debug \"Installing NuGet package provider\"\r\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\r\n\r\n        #Use the currently-installed version of PowerShellGet\r\n        Import-PackageProvider PowerShellGet\r\n\r\n        #Download the version of PowerShellGet that we actually need\r\n        Write-Debug \"Installing PowershellGet\"\r\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\r\n    }\r\n\r\n    Write-Debug \"Importing PowershellGet\"\r\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\r\n    #Make sure we\u0027re actually using the package provider from the imported version of PowerShellGet\r\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\r\n}\r\n\r\nfunction InstallLocalModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true)]\r\n        [string]$moduleName,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n    try {\r\n        InstallPowerShellGet\r\n\r\n        Write-Debug \"Install $moduleName $requiredVersion\"\r\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetHighestInstalledModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName,\r\n\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n\r\n    return Get-Module $moduleName -ListAvailable |\r\n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |\r\n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n           Select -First 1\r\n}\r\n\r\nfunction GetHighestInstallableModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName\r\n    )\r\n\r\n    try {\r\n        InstallPowerShellGet\r\n        Find-Module SqlChangeAutomation -AllVersions |\r\n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n            Select -First 1\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetInstalledSqlChangeAutomationVersion {\r\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\r\n\r\n    if ($scaModule -ne $null) {\r\n        return $scaModule.Version\r\n    }\r\n\r\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\r\n\r\n    if ($dlmaModule -ne $null) {\r\n        return $dlmaModule.Version\r\n    }\r\n\r\n    return $null\r\n}\r\n\r\nfunction ConfigureProxyIfVariableSet\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)\r\n    {\r\n        Write-Debug \"Setting DefaultWebProxy to $proxyUrl\"\r\n\r\n        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)\r\n        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials\r\n        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True\r\n    }\r\n}\r\n\r\n\r\n$ErrorActionPreference = \u0027Stop\u0027\r\n$VerbosePreference = \u0027Continue\u0027\r\n\r\n# Set process level FUR environment\r\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\r\n\r\n#Helper functions for paramter handling\r\nfunction Required() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for \u0027$Name\u0027\" }\r\n}\r\nfunction Optional() {\r\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $false)]$Default\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) {\r\n        $Default\r\n    } else {\r\n        $Parameter\r\n    }\r\n}\r\nfunction RequireBool() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = $False\r\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a boolean value.\" }\r\n    $Result\r\n}\r\nfunction RequirePositiveNumber() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = 0\r\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a numerical value.\" }\r\n    if ($Result -lt 0) { throw \"\u0027$Name\u0027 must be \u003e= 0.\" }\r\n    $Result\r\n}\r\n\r\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\r\n$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default \u0027False\u0027\r\n$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)\r\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch\r\n\r\n# Check if SQL Change Automation is installed.\r\n$powershellModule = Get-Module -Name SqlChangeAutomation\r\nif ($powershellModule -eq $null) {\r\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\r\n}\r\n\r\n$currentVersion = $powershellModule.Version\r\n$minimumRequiredVersion = [version] \u00273.0.3\u0027\r\nif ($currentVersion -lt $minimumRequiredVersion) {\r\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\r\n}\r\n\r\n$minimumRequiredVersionDataCompareOptions = [version] \u00273.3.0\u0027\r\n$minimumRequiredVersionTrustServerCertificate = [version]\u00274.3.20267\u0027\r\n\r\nfunction AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)\r\n    {\r\n        return $true\r\n    }\r\n    elseif($encryptConnection -or $trustServerCertificate)\r\n    {\r\n        Write-Warning \"Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion.\"\r\n        return $false\r\n    }\r\n}\r\n\r\n# Check the parameters.\r\nRequired -Parameter $DLMAutomationSourceDatabaseServer -Name \u0027Source SQL Server instance\u0027\r\nRequired -Parameter $DLMAutomationSourceDatabaseName -Name \u0027Source database name\u0027\r\n$DLMAutomationSourceUsername = Optional -Parameter $DLMAutomationSourceUsername\r\n$DLMAutomationSourcePassword = Optional -Parameter $DLMAutomationSourcePassword\r\n$DLMAutomationSourceTrustServerCertificate = Optional -Parameter $DLMAutomationSourceTrustServerCertificate\r\n$DLMAutomationSourceEncrypt = Optional -Parameter $DLMAutomationSourceEncrypt\r\nRequired -Parameter $DLMAutomationTargetDatabaseServer -Name \u0027Target SQL Server instance\u0027\r\nRequired -Parameter $DLMAutomationTargetDatabaseName -Name \u0027Target database name\u0027\r\n$DLMAutomationTargetUsername = Optional -Parameter $DLMAutomationTargetUsername\r\n$DLMAutomationTargetPassword = Optional -Parameter $DLMAutomationTargetPassword\r\n$DLMAutomationTargetTrustServerCertificate = Optional -Parameter $DLMAutomationTargetTrustServerCertificate\r\n$DLMAutomationTargetEncrypt = Optional -Parameter $DLMAutomationTargetEncrypt\r\n$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath\r\n$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions\r\n$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions\r\n$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default \u0027Serializable\u0027\r\n$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default \"False\"\r\n$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default \u002730\u0027\r\n$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder\r\n$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl\r\n\r\n$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name \u0027Skip post update schema check\u0027\r\n$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name \u0027Query Batch Timeout\u0027\r\n\r\n\r\n$targetConnectionOptions = @{ }\r\n$sourceConnectionOptions = @{ }\r\n\r\nif(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationTargetEncrypt) -or [bool]::Parse($DLMAutomationSourceEncrypt), `\r\n                               [bool]::Parse($DLMAutomationTargetTrustServerCertificate) -or [bool]::Parse($DLMAutomationSourceTrustServerCertificate))) {\r\n    $targetConnectionOptions += @{ \u0027Encrypt\u0027 = [bool]::Parse($DLMAutomationTargetEncrypt) }\r\n    $targetConnectionOptions += @{ \u0027TrustServerCertificate\u0027 = [bool]::Parse($DLMAutomationTargetTrustServerCertificate) }\r\n\t$sourceConnectionOptions += @{ \u0027Encrypt\u0027 = [bool]::Parse($DLMAutomationSourceEncrypt) }\r\n    $sourceConnectionOptions += @{ \u0027TrustServerCertificate\u0027 = [bool]::Parse($DLMAutomationSourceTrustServerCertificate) }\r\n}\r\n\r\n$targetDB = New-DatabaseConnection @targetConnectionOptions `\r\n                                   -ServerInstance $DLMAutomationTargetDatabaseServer `\r\n                                   -Database $DLMAutomationTargetDatabaseName `\r\n                                   -Username $DLMAutomationTargetUsername `\r\n                                   -Password $DLMAutomationTargetPassword | Test-DatabaseConnection\r\n\r\n$sourceDB = New-DatabaseConnection @sourceConnectionOptions `\r\n\t\t\t\t\t\t\t\t   -ServerInstance $DLMAutomationSourceDatabaseServer `\r\n                                   -Database $DLMAutomationSourceDatabaseName `\r\n                                   -Username $DLMAutomationSourceUsername `\r\n                                   -Password $DLMAutomationSourcePassword | Test-DatabaseConnection\r\n\r\n# Create the deployment resources, only adding the arguments that are not null or empty.\r\n$releaseParams = @{\r\n    Target = $targetDB\r\n    Source = $sourceDB\r\n    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel\r\n    FilterPath = $DLMAutomationFilterPath\r\n    SQLCompareOptions = $DLMAutomationCompareOptions\r\n}\r\n\r\nif($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {\r\n    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions\r\n} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {\r\n    Write-Warning \"SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion.\"\r\n}\r\n\r\n$release = New-DatabaseReleaseArtifact @releaseParams\r\n\r\n$releaseUrl = $OctopusParameters[\u0027#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}\u0027] + $OctopusParameters[\u0027Octopus.Web.DeploymentLink\u0027];\r\n# Deploy the source schema to the target database.\r\n$release | Use-DatabaseReleaseArtifact -DeployTo $targetDB -SkipPreUpdateSchemaCheck -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck\r\n",
-                       "Octopus.Action.Script.Syntax":  "PowerShell"
-                   },
-    "SensitiveProperties":  {
-
-                            },
-    "Parameters":  [
-                       {
-                           "Name":  "DLMAutomationSourceDatabaseServer",
-                           "Label":  "Source SQL Server instance",
-                           "HelpText":  "The fully qualified instance name of the SQL Server that hosts the source database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSourceDatabaseName",
-                           "Label":  "Source database name",
-                           "HelpText":  "The name of the database with the source schema (the schema that will be deployed).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSourceUsername",
-                           "Label":  "Username (optional)",
-                           "HelpText":  "The SQL Server username used to connect to the source database. If you leave this field and \u0027Password\u0027 blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSourcePassword",
-                           "Label":  "Password (optional)",
-                           "HelpText":  "You must enter a password if you entered a username for source database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Sensitive"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSourceEncrypt",
-                           "Label":  "Encrypt",
-                           "HelpText":  "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
-                           "DefaultValue":  "true",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSourceTrustServerCertificate",
-                           "Label":  "Trust Server Certificate",
-                           "HelpText":  "Specify whether to force SQL Server to skip certificate validation.",
-                           "DefaultValue":  "true",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetDatabaseServer",
-                           "Label":  "Target SQL Server instance",
-                           "HelpText":  "The fully qualified SQL Server instance name for the target database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetDatabaseName",
-                           "Label":  "Target database name",
-                           "HelpText":  "The name of the database to deploy changes to. This must be an existing database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetUsername",
-                           "Label":  "Username (optional)",
-                           "HelpText":  "The SQL Server username used to connect to the target database. If you leave this field and \u0027Password\u0027 blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetPassword",
-                           "Label":  "Password (optional)",
-                           "HelpText":  "You must enter a password if you entered a username for target database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Sensitive"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetEncrypt",
-                           "Label":  "Encrypt",
-                           "HelpText":  "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetTrustServerCertificate",
-                           "Label":  "Trust Server Certificate",
-                           "HelpText":  "Specify whether to force SQL Server to skip certificate validation.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationFilterPath",
-                           "Label":  "Filter path (optional)",
-                           "HelpText":  "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationCompareOptions",
-                           "Label":  "SQL Compare options (optional)",
-                           "HelpText":  "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDataCompareOptions",
-                           "Label":  "SQL Data Compare options (optional)",
-                           "HelpText":  "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTransactionIsolationLevel",
-                           "Label":  "Transaction isolation level (optional)",
-                           "HelpText":  "Select the transaction isolation level to be used in deployment scripts.",
-                           "DefaultValue":  "Serializable",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Select",
-                                                   "Octopus.SelectOptions":  "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationQueryBatchTimeout",
-                           "Label":  "Query batch timeout (in seconds)",
-                           "HelpText":  "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
-                           "DefaultValue":  "30",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSkipPostUpdateSchemaCheck",
-                           "Label":  "Skip post update schema check",
-                           "HelpText":  "Don\u0027t check that the target database has the correct schema after the update has run.",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "SpecificModuleVersion",
-                           "Label":  "SQL Change Automation version (optional)",
-                           "HelpText":  "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "UseInstalledModuleVersion",
-                           "Label":  "Only use a version of SQL Change Automation that is already installed",
-                           "HelpText":  "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationModuleInstallationFolder",
-                           "Label":  "Module Installation Folder (optional)",
-                           "HelpText":  "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationProxyUrl",
-                           "Label":  "Proxy URL (optional)",
-                           "HelpText":  "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       }
-                   ],
-    "LastModifiedOn":  "2021-03-19T10:01:37.141+00:00",
-    "LastModifiedBy":  "benjimac93",
-    "$Meta":  {
-        "ExportedAt": "2021-08-23T12:40:10.975Z",
-        "OctopusVersion": "2021.1.7687",
-                  "Type":  "ActionTemplate"
-              },
-    "Category":  "redgate"
-}
diff --git a/step-templates/redgate-deploy-from-package-worker-friendly.json b/step-templates/redgate-deploy-from-package-worker-friendly.json
deleted file mode 100644
index 26fb2949f..000000000
--- a/step-templates/redgate-deploy-from-package-worker-friendly.json
+++ /dev/null
@@ -1,197 +0,0 @@
-{
-  "Id": "02b5b305-92ca-4612-a632-92eb840bd2a8",
-  "Name": "Redgate - Deploy from Package (Worker Friendly)",
-  "Description": "Uses Redgate's [SQL Change Automation](http://www.red-gate.com/sca/productpage) to deploy a package containing a database schema to a SQL Server database, without a review step.\n\nRequires SQL Change Automation version 3.0.2 or later.\n\n*Version date: 2022-01-24*\n\nThis step template is worker friendly, you can pass in a package reference rather than having to reference a previous step which downloaded the package. This step requires Octopus Deploy **2019.10.0** or higher.\n\n**NOTE**: This template requires the SQLCMD utility, if not found, the template will install the following: \n - Visual Studio 2017 C++ Redistributable \n - SQL Server 2017 ODBC driver \n - SQLCMD utility",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "8ec6200a-24c9-4273-bdcc-5ff46ce3111f",
-      "Name": "DLMAutomation.Package.Name",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "DLMAutomationPackageName"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$DlmAutomationModuleName = \"DLMAutomation\"\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\n$ModulesFolder = \"$Home\\Documents\\WindowsPowerShell\\Modules\"\n\n\nif ([string]::IsNullOrWhiteSpace($DLMModuleInstallLocation) -eq $false)\n{\n\tif ((Test-Path $DLMModuleInstallLocation -IsValid) -eq $false)\n    {\n    \tWrite-Error \"The path $DLMModuleInstallLocation is not valid, please use a relative or absolute path.\"\n        exit 1\n    }\n    \n    $ModulesFolder = [System.IO.Path]::GetFullPath($DLMModuleInstallLocation)            \n}\n\nWrite-Host \"Modules will be installed into $ModulesFolder\"\n\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n\nfunction IsScaAvailable\n{\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\n        return $true\n    }\n\n    return $false\n}\n\nfunction InstallCorrectSqlChangeAutomation\n{\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $false)]\n        [Version]$requiredVersion\n    )\n\n    $moduleName = $SqlChangeAutomationModuleName\n\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\n    $maximumVersion = $requiredVersion\n\n    if ($requiredVersion) {\n        if ($requiredVersion.Revision -eq -1) {\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\n        }\n\n        if ($requiredVersion.Major -lt 3) {\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\n            $moduleName = $DlmAutomationModuleName\n        }\n    }\n\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n\n    if (!$installedModule) {\n        #Either SCA isn't installed at all or $requiredVersion is specified but that version of SCA isn't installed\n        Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\n        InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n    }\n    elseif (!$requiredVersion) {\n        #We've got a version of SCA installed, but $requiredVersion isn't specified so we might be able to upgrade\n        $newest = GetHighestInstallableModule $moduleName\n        if ($newest -and ($installedModule.Version -lt $newest.Version)) {\n            Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\n            InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\n        }\n    }\n\n    # Now we're done with install/upgrade, try to import the highest available module that matches our version requirements\n\n    # We can't just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn't have them,\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\n    # $requiredVersion and $maximumVersion might be null when there's no specific version we need.\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\n\n    if (!$installedModule -and !$requiredVersion) {\n        #Did not find SCA, and we don't have a required version so we might be able to use an installed DLMA instead.\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName\n    }\n\n    if ($installedModule) {\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\n        Import-Module $installedModule -Force\n    }\n    else {\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\n    }\n}\n\nfunction InstallPowerShellGet {\n    [CmdletBinding()]\n    Param()\n\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12\n    $psget = GetHighestInstalledModule PowerShellGet\n    if (!$psget)\n    {\n        Write-Warning @\"\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\n\"@\n        throw \"PowerShellGet is not available\"\n    }\n\n    if ($psget.Version -lt [Version]'1.6') {\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\n        Write-Debug \"Installing NuGet package provider\"\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\n\n        #Use the currently-installed version of PowerShellGet\n        Import-PackageProvider PowerShellGet\n\n        #Download the version of PowerShellGet that we actually need\n        Write-Debug \"Installing PowershellGet\"\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\n    }\n\n    Write-Debug \"Importing PowershellGet\"\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\n    #Make sure we're actually using the package provider from the imported version of PowerShellGet\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\n}\n\nfunction InstallLocalModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true)]\n        [string]$moduleName,\n        [Parameter(Mandatory = $false)]\n        [Version]$minimumVersion,\n        [Parameter(Mandatory = $false)]\n        [Version]$maximumVersion\n    )\n    try {\n        InstallPowerShellGet\n\n        Write-Debug \"Install $moduleName $requiredVersion\"\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\n    }\n    catch {\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\n    }\n}\n\nfunction GetHighestInstalledModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $moduleName,\n\n        [Parameter(Mandatory = $false)]\n        [Version]$minimumVersion,\n        [Parameter(Mandatory = $false)]\n        [Version]$maximumVersion\n    )\n\n    return Get-Module $moduleName -ListAvailable |\n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |\n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\n           Select -First 1\n}\n\nfunction GetHighestInstallableModule {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Mandatory = $true, Position = 0)]\n        [string] $moduleName\n    )\n\n    try {\n        InstallPowerShellGet\n        Find-Module SqlChangeAutomation -AllVersions |\n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\n            Select -First 1\n    }\n    catch {\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\n    }\n}\n\nfunction GetInstalledSqlChangeAutomationVersion {\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\n\n    if ($scaModule -ne $null) {\n        return $scaModule.Version\n    }\n\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\n\n    if ($dlmaModule -ne $null) {\n        return $dlmaModule.Version\n    }\n\n    return $null\n}\n\n$ErrorActionPreference = 'Stop'\n$VerbosePreference = 'Continue'\n\n# Set process level FUR environment\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\n\n#Helper functions for paramter handling\nfunction Required() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for '$Name'\" }\n}\nfunction Optional() {\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $false)]$Default\n    )\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { \n        $Default\n    } else { \n        $Parameter\n    }\n}\nfunction RequireBool() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    $Result = $False\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"'$Name' must be a boolean value.\" }\n    $Result\n}\nfunction RequirePositiveNumber() {\n    Param(\n        [Parameter(Mandatory = $false)][string]$Parameter, \n        [Parameter(Mandatory = $true)][string]$Name\n    )\n    $Result = 0\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"'$Name' must be a numerical value.\" }\n    if ($Result -lt 0) { throw \"'$Name' must be >= 0.\" }\n    $Result\n}\n\nfunction Get-SqlcmdInstalled\n{\n\t# Define variables\n    $searchPaths = @(\"c:\\program files\\microsoft sql server\", \"c:\\program files (x86)\\microsoft sql server\")\n    \n    # Loop through search paths\n    foreach ($searchPath in $searchPaths)\n    {\n    \t# Ensure folder exists\n        if (Test-Path -Path $searchPath)\n        {\n        \t# Search the path\n            return ($null -ne (Get-ChildItem -Path $searchPath -Recurse | Where-Object {$_.Name -eq \"sqlcmd.exe\"}))\n        }\n    }\n    \n    # Not found\n    return $false\n}\n\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion\n\n# Check if SQL Change Automation is installed.\t\n$powershellModule = Get-Module -Name SqlChangeAutomation\t\nif ($powershellModule -eq $null) { \t\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\t\n}\n\n# Check to for sqlcmd\n$sqlCmdExists = Get-SqlCmdInstalled\n\nif ($sqlCmdExists -eq $false)\n{\n\tWrite-Verbose \"This template requires the sqlcmd utility, downloading ...\"\n\t$tempPath = (New-Item \"$PSScriptRoot\\sqlcmd\" -ItemType Directory -Force).FullName\n    \n\t$sqlCmdUrl = \"\"\n    $odbcUrl = \"\"\n    $redistributableUrl = \"\"\n    \n    switch ($Env:PROCESSOR_ARCHITECTURE)\n    {\n    \t\"AMD64\"\n        {\n        \t$sqlCmdUrl = \"https://go.microsoft.com/fwlink/?linkid=2142258\"\n            $odbcUrl = \"https://go.microsoft.com/fwlink/?linkid=2168524\"\n            $redistributableUrl = \"https://aka.ms/vs/17/release/vc_redist.x64.exe\"\n            break\n        }\n        \"x86\"\n        {\n        \t$sqlCmdUrl = \"https://go.microsoft.com/fwlink/?linkid=2142257\"\n            $odbcUrl = \"https://go.microsoft.com/fwlink/?linkid=2168713\"\n            $redistributableUrl = \"https://aka.ms/vs/17/release/vc_redist.x86.exe\"\n            break\n        }\n    }\n    \n    Invoke-WebRequest -Uri $sqlCmdUrl -OutFile \"$tempPath\\sqlcmd.msi\" -UseBasicParsing\n\tInvoke-WebRequest -Uri $odbcUrl -OutFile \"$tempPath\\msodbc.msi\" -UseBasicParsing\n\tInvoke-WebRequest -Uri $redistributableUrl -Outfile \"$tempPath\\vc_redist.exe\" -UseBasicParsing\n\n\tWrite-Verbose \"Installing Visual Studio 2017 C++ redistrutable prequisite ...\"\n\tStart-Process -FilePath \"$tempPath\\vc_redist.exe\" -ArgumentList @(\"/install\", \"/passive\", \"/norestart\") -NoNewWindow -Wait\n    Write-Verbose \"Installing SQL Server 2017 ODBC driver prequisite ...\"\n\tStart-Process -FilePath \"msiexec.exe\" -ArgumentList @(\"/i\", \"$tempPath\\msodbc.msi\", \"IACCEPTMSODBCSQLLICENSETERMS=YES\", \"/qn\") -NoNewWindow -Wait\n    Write-Verbose \"Installing SQLCMD utility ...\"\n\tStart-Process -FilePath \"msiexec.exe\" -ArgumentList @(\"/i\", \"$tempPath\\sqlcmd.msi\", \"IACCEPTMSSQLCMDLNUTILSLICENSETERMS=YES\", \"/qn\") -NoNewWindow -Wait\n\n\tWrite-Verbose \"Sqlcmd Installation complete!\"\n}\n\n$currentVersion = $powershellModule.Version\t\n$minimumRequiredVersion = [version] '3.0.3'\t\nif ($currentVersion -lt $minimumRequiredVersion) { \t\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\t\n}\n\n$minimumRequiredVersionDataCompareOptions = [version] '3.3.0'\n\n# Check the parameters.\n$DLMAutomationCustomConnectionString = Optional -Parameter $DLMAutomationCustomConnectionString\n\nif ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)\n{\n    Required -Parameter $DLMAutomationTargetDatabaseServer -Name 'Target SQL Server instance'\n    Required -Parameter $DLMAutomationTargetDatabaseName -Name 'Target database name'\n}\n\n$DLMAutomationTargetUsername = Optional -Parameter $DLMAutomationTargetUsername\n$DLMAutomationTargetPassword = Optional -Parameter $DLMAutomationTargetPassword\n$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath\n$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions\n$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions\n$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default \"Serializable\"\n$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default 'False'\n$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default \"False\"\n$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default '30'\n$DLMAutomationTrustServerCertificate = [Convert]::ToBoolean($OctopusParameters[\"DLMAutomationTrustServerCertificate\"])\n\n$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name 'Skip post update schema check'\n$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name 'Query Batch Timeout'\n\n# Create and test connection to the database.\nif ([string]::IsNullOrWhiteSpace($DLMAutomationCustomConnectionString) -eq $true)\n{\n    $databaseConnection = New-DatabaseConnection -ServerInstance $DLMAutomationTargetDatabaseServer `\n                                                    -Database $DLMAutomationTargetDatabaseName `\n                                                    -Username $DLMAutomationTargetUsername `\n                                                    -Password $DLMAutomationTargetPassword `\n                                                    -TrustServerCertificate $DLMAutomationTrustServerCertificate | Test-DatabaseConnection\n} else {\n    $databaseConnection = New-Object -TypeName RedGate.Versioning.Automation.Compare.SchemaSources.DatabaseConnection `\n                                        -ArgumentList $DLMAutomationCustomConnectionString | Test-DatabaseConnection\n}\n$packageExtractPath = $OctopusParameters[\"Octopus.Action.Package[DLMAutomation.Package.Name].ExtractedPath\"]\n$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packageExtractPath\n\n# Only allow sqlcmd variables that don't have special characters like spaces, colon or dashes\n$regex = '^[a-zA-Z_][a-zA-Z0-9_]+$'\n$sqlCmdVariables = @{}\n$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {\n\t$sqlCmdVariables[$_] = $OctopusParameters[$_]\n}\n\n# Create database deployment resources from the NuGet package to the database\n$releaseParams = @{\n    Target = $databaseConnection\n    Source = $importedBuildArtifact\n    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel\n    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)\n    FilterPath = $DLMAutomationFilterPath\n    SQLCompareOptions = $DLMAutomationCompareOptions\n    SqlCmdVariables = $sqlCmdVariables\n}\n\nif($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {\n    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions\n} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {\n    Write-Warning \"SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion.\"\n}\n\n$release = New-DatabaseReleaseArtifact @releaseParams\n\n# Deploy the source schema to the target database.\nWrite-Host \"Timeout = $queryBatchTimeout\"\n$releaseUrl = $OctopusParameters['Octopus.Web.ServerUri'] + $OctopusParameters['Octopus.Web.DeploymentLink']; \n$release | Use-DatabaseReleaseArtifact -DeployTo $databaseConnection -SkipPreUpdateSchemaCheck -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck\n\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "3aa8db8b-94e7-4a13-8ac3-054ad5456f3f",
-      "Name": "DLMAutomationPackageName",
-      "Label": "Package",
-      "HelpText": "The name of the package to extract and deploy",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "529e5641-44a7-42fe-9a55-72c3c08d2b7d",
-      "Name": "DLMAutomationTargetDatabaseServer",
-      "Label": "Target SQL Server instance",
-      "HelpText": "The fully qualified SQL Server instance name for the target database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "29c48d57-c4f2-4dda-9866-b97a20f84c60",
-      "Name": "DLMAutomationTargetDatabaseName",
-      "Label": "Target database name",
-      "HelpText": "The name of the database to deploy changes to. This must be an existing database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "96c56aaf-ed86-4728-a68c-bac95e9e1040",
-      "Name": "DLMAutomationTargetUsername",
-      "Label": "Username (optional)",
-      "HelpText": "The SQL Server username used to connect to the database. If you leave this field and 'Password' blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "515c98af-ff2b-488c-bebd-81bff7b82761",
-      "Name": "DLMAutomationTargetPassword",
-      "Label": "Password (optional)",
-      "HelpText": "You must enter a password if you entered a username.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "cfebb7c8-497b-4406-8d64-34973c12711c",
-      "Name": "DLMAutomationFilterPath",
-      "Label": "Filter path (optional)",
-      "HelpText": "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a305bef9-af25-44f6-a78b-d641d7b6609a",
-      "Name": "DLMAutomationCompareOptions",
-      "Label": "SQL Compare options (optional)",
-      "HelpText": "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1bbdec30-e207-4e5e-b08c-26bae87f78b3",
-      "Name": "DLMAutomationDataCompareOptions",
-      "Label": "SQL Data Compare options (optional)",
-      "HelpText": "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "367a4913-6c79-451a-bfe6-269462f784f8",
-      "Name": "DLMAutomationTransactionIsolationLevel",
-      "Label": "Transaction isolation level (optional)",
-      "HelpText": "Select the transaction isolation level to be used in deployment scripts.",
-      "DefaultValue": "Serializable",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
-      }
-    },
-    {
-      "Id": "b5e1544c-45c9-455c-9c5c-ab5c3ec37c8a",
-      "Name": "DLMAutomationIgnoreStaticData",
-      "Label": "Ignore static data",
-      "HelpText": "Exclude changes to static data when generating the deployment resources.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "56644eed-84d2-4efb-a645-8a690770af01",
-      "Name": "DLMAutomationQueryBatchTimeout",
-      "Label": "Query batch timeout (in seconds)",
-      "HelpText": "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a5d870d2-bef0-43e2-888a-265a8c7bccf3",
-      "Name": "DLMAutomationSkipPostUpdateSchemaCheck",
-      "Label": "Skip post update schema check",
-      "HelpText": "Don't check that the target database has the correct schema after the update has run.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "66a03c11-eb4c-4c59-81cf-e1f09c31aee7",
-      "Name": "SpecificModuleVersion",
-      "Label": "SQL Change Automation version (optional)",
-      "HelpText": "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2d38d44f-409f-407b-9cc2-401a95f07d01",
-      "Name": "DLMModuleInstallLocation",
-      "Label": "SQL Change Automation Install Location (optional)",
-      "HelpText": "The SQL Change Automation cmdlets will be downloaded from the [PowerShell gallery](https://www.powershellgallery.com/packages/SqlChangeAutomation).  Please specify the folder folder where those packages will be saved to.  It can be relative or absolute.\n\n\nIf this is empty it will default `$Home\\Documents\\WindowsPowerShell\\Modules` which is the [recommended location](https://docs.microsoft.com/en-us/powershell/scripting/developer/module/installing-a-powershell-module?view=powershell-7#where-to-install-modules) from Microsoft.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4daa7ac9-65b8-47ff-b00a-616f94896664",
-      "Name": "DLMAutomationTrustServerCertificate",
-      "Label": "Trust server certificate",
-      "HelpText": "Check this box to trust the SQL Server certificate.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "cb2b74bb-9481-4aab-b18f-b032746e3edd",
-      "Name": "DLMAutomationCustomConnectionString",
-      "Label": "Connection String (Optional)",
-      "HelpText": "If set, uses this as the full connection string. Allows for advanced configuration.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2022-01-25T16:00:25.269Z",
-    "OctopusVersion": "2022.1.80",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "markgould",
-  "Category": "redgate"
-}
\ No newline at end of file
diff --git a/step-templates/redgate-deploy-from-package.json b/step-templates/redgate-deploy-from-package.json
deleted file mode 100644
index 5315edc5d..000000000
--- a/step-templates/redgate-deploy-from-package.json
+++ /dev/null
@@ -1,187 +0,0 @@
-{
-    "Id":  "19f750fb-2ce8-4361-859e-2dfcdf08a952",
-    "Name":  "Redgate - Deploy from Package",
-    "Description":  "Uses Redgate\u0027s [SQL Change Automation](http://www.red-gate.com/sca/productpage) to deploy a package containing a database schema to a SQL Server database, without a review step.\r\n\r\nRequires SQL Change Automation version 3.0.2 or later.\r\n\r\n*Version date: 2020-12-21*",
-    "ActionType":  "Octopus.Script",
-    "Version":  18,
-    "Properties":  {
-                       "Octopus.Action.Script.ScriptBody":  "function GetModuleInstallationFolder\r\n{\r\n    if (ModuleInstallationFolderIsValid)\r\n    {\r\n        return [System.IO.Path]::GetFullPath($DLMAutomationModuleInstallationFolder)\r\n    }\r\n\r\n    return \"$PSScriptRoot\\Modules\"\r\n}\r\n\r\nfunction ModuleInstallationFolderIsValid\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationModuleInstallationFolder))\r\n    {\r\n        return $false\r\n    }\r\n\r\n    return (Test-Path $DLMAutomationModuleInstallationFolder -IsValid) -eq $true;\r\n}\r\n\r\n$DlmAutomationModuleName = \"DLMAutomation\"\r\n$SqlChangeAutomationModuleName = \"SqlChangeAutomation\"\r\n$ModulesFolder = GetModuleInstallationFolder\r\n$LocalModules = (New-Item \"$ModulesFolder\" -ItemType Directory -Force).FullName\r\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\r\n\r\nfunction IsScaAvailable\r\n{\r\n    if ((Get-Module $SqlChangeAutomationModuleName) -ne $null) {\r\n        return $true\r\n    }\r\n\r\n    return $false\r\n}\r\n\r\nfunction InstallCorrectSqlChangeAutomation\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$requiredVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [bool]$useInstalledVersion\r\n    )\r\n\r\n    $moduleName = $SqlChangeAutomationModuleName\r\n\r\n    # this will be null if $requiredVersion is not specified - which is exactly what we want\r\n    $maximumVersion = $requiredVersion\r\n\r\n    if ($requiredVersion) {\r\n        if ($requiredVersion.Revision -eq -1) {\r\n            #If provided with a 3 part version number (the 4th part, revision, == -1), we should allow any value for the revision\r\n            $maximumVersion = [Version]\"$requiredVersion.$([System.Int32]::MaxValue)\"\r\n        }\r\n\r\n        if ($requiredVersion.Major -lt 3) {\r\n            # If the specified version is below V3 then the user is requesting a version of DLMA. We should look for that module name instead\r\n            $moduleName = $DlmAutomationModuleName\r\n        }\r\n    }\r\n\r\n    if ($useInstalledVersion) {\r\n        Write-Verbose \"Option to use installed version is selected. Skipping update/install using PowerShellGet.\"\r\n    }\r\n    else {\r\n        $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n        if (!$installedModule) {\r\n            #Either SCA isn\u0027t installed at all or $requiredVersion is specified but that version of SCA isn\u0027t installed\r\n            Write-Verbose \"$moduleName $requiredVersion not available - attempting to download from gallery\"\r\n            InstallLocalModule -moduleName $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n        }\r\n        elseif (!$requiredVersion) {\r\n            #We\u0027ve got a version of SCA installed, but $requiredVersion isn\u0027t specified so we might be able to upgrade\r\n            $newest = GetHighestInstallableModule $moduleName\r\n            if ($newest -and ($installedModule.Version -lt $newest.Version)) {\r\n                Write-Verbose \"Updating $moduleName to version $($newest.Version)\"\r\n                InstallLocalModule -moduleName $moduleName -minimumVersion $newest.Version\r\n            }\r\n        }\r\n    }\r\n\r\n    # Now we\u0027re done with install/upgrade, try to import the highest available module that matches our version requirements\r\n\r\n    # We can\u0027t just use -minimumVersion and -maximumVersion arguments on Import-Module because PowerShell 3 doesn\u0027t have them,\r\n    # so we have to find the precise matching installed version using our code, then import that specifically. Note that\r\n    # $requiredVersion and $maximumVersion might be null when there\u0027s no specific version we need.\r\n    $installedModule = GetHighestInstalledModule $moduleName -minimumVersion $requiredVersion -maximumVersion $maximumVersion\r\n\r\n    if (!$installedModule -and !$requiredVersion) {\r\n        #Did not find SCA, and we don\u0027t have a required version so we might be able to use an installed DLMA instead.\r\n        Write-Verbose \"$moduleName is not installed - trying to fall back to $DlmAutomationModuleName\"\r\n        $installedModule = GetHighestInstalledModule $DlmAutomationModuleName\r\n    }\r\n\r\n    if ($installedModule) {\r\n        Write-Verbose \"Importing installed $($installedModule.Name) version $($installedModule.Version)\"\r\n        Import-Module $installedModule -Force\r\n    }\r\n    else {\r\n        throw \"$moduleName $requiredVersion is not installed, and could not be downloaded from the PowerShell gallery\"\r\n    }\r\n}\r\n\r\nfunction InstallPowerShellGet {\r\n    [CmdletBinding()]\r\n    Param()\r\n\r\n    ConfigureProxyIfVariableSet\r\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12\r\n\r\n    $psget = GetHighestInstalledModule PowerShellGet\r\n    if (!$psget)\r\n    {\r\n        Write-Warning @\"\r\nCannot access the PowerShell Gallery because PowerShellGet is not installed.\r\nTo install PowerShellGet, either upgrade to PowerShell 5 or install the PackageManagement MSI.\r\nSee https://docs.microsoft.com/en-us/powershell/gallery/installing-psget for more details.\r\n\"@\r\n        throw \"PowerShellGet is not available\"\r\n    }\r\n\r\n    if ($psget.Version -lt [Version]\u00271.6\u0027) {\r\n        #Bootstrap the NuGet package provider, which updates NuGet without requiring admin rights\r\n        Write-Debug \"Installing NuGet package provider\"\r\n        Get-PackageProvider NuGet -ForceBootstrap | Out-Null\r\n\r\n        #Use the currently-installed version of PowerShellGet\r\n        Import-PackageProvider PowerShellGet\r\n\r\n        #Download the version of PowerShellGet that we actually need\r\n        Write-Debug \"Installing PowershellGet\"\r\n        Save-Module -Name PowerShellGet -Path $LocalModules -MinimumVersion 1.6 -Force -ErrorAction SilentlyContinue\r\n    }\r\n\r\n    Write-Debug \"Importing PowershellGet\"\r\n    Import-Module PowerShellGet -MinimumVersion 1.6 -Force\r\n    #Make sure we\u0027re actually using the package provider from the imported version of PowerShellGet\r\n    Import-PackageProvider ((Get-Module PowerShellGet).Path) | Out-Null\r\n}\r\n\r\nfunction InstallLocalModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true)]\r\n        [string]$moduleName,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n    try {\r\n        InstallPowerShellGet\r\n\r\n        Write-Debug \"Install $moduleName $requiredVersion\"\r\n        Save-Module -Name $moduleName -Path $LocalModules -Force -AcceptLicense -MinimumVersion $minimumVersion -MaximumVersion $maximumVersion -ErrorAction Stop\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not install $moduleName $requiredVersion from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetHighestInstalledModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName,\r\n\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$minimumVersion,\r\n        [Parameter(Mandatory = $false)]\r\n        [Version]$maximumVersion\r\n    )\r\n\r\n    return Get-Module $moduleName -ListAvailable |\r\n           Where {(!$minimumVersion -or ($_.Version -ge $minimumVersion)) -and (!$maximumVersion -or ($_.Version -le $maximumVersion))} |\r\n           Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n           Select -First 1\r\n}\r\n\r\nfunction GetHighestInstallableModule {\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory = $true, Position = 0)]\r\n        [string] $moduleName\r\n    )\r\n\r\n    try {\r\n        InstallPowerShellGet\r\n        Find-Module SqlChangeAutomation -AllVersions |\r\n            Sort -Property @{Expression = {[System.Version]($_.Version)}; Descending = $True} |\r\n            Select -First 1\r\n    }\r\n    catch {\r\n        Write-Warning \"Could not find any suitable versions of $moduleName from any registered PSRepository\"\r\n    }\r\n}\r\n\r\nfunction GetInstalledSqlChangeAutomationVersion {\r\n    $scaModule = (Get-Module $SqlChangeAutomationModuleName)\r\n\r\n    if ($scaModule -ne $null) {\r\n        return $scaModule.Version\r\n    }\r\n\r\n    $dlmaModule = (Get-Module $DlmAutomationModuleName)\r\n\r\n    if ($dlmaModule -ne $null) {\r\n        return $dlmaModule.Version\r\n    }\r\n\r\n    return $null\r\n}\r\n\r\nfunction ConfigureProxyIfVariableSet\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($DLMAutomationProxyUrl) -eq $false)\r\n    {\r\n        Write-Debug \"Setting DefaultWebProxy to $proxyUrl\"\r\n\r\n        [System.Net.WebRequest]::DefaultWebProxy = New-Object System.Net.WebProxy($DLMAutomationProxyUrl)\r\n        [System.Net.WebRequest]::DefaultWebProxy.credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials\r\n        [System.Net.WebRequest]::DefaultWebProxy.BypassProxyOnLocal = $True\r\n    }\r\n}\r\n\r\n\r\n$ErrorActionPreference = \u0027Stop\u0027\r\n$VerbosePreference = \u0027Continue\u0027\r\n\r\n# Set process level FUR environment\r\n$env:REDGATE_FUR_ENVIRONMENT = \"Octopus Step Templates\"\r\n\r\n#Helper functions for paramter handling\r\nfunction Required() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) { throw \"You must enter a value for \u0027$Name\u0027\" }\r\n}\r\nfunction Optional() {\r\n    #Default is untyped here - if we specify [string] powershell will convert nulls into empty string\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $false)]$Default\r\n    )\r\n    if ([string]::IsNullOrWhiteSpace($Parameter)) {\r\n        $Default\r\n    } else {\r\n        $Parameter\r\n    }\r\n}\r\nfunction RequireBool() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = $False\r\n    if (![bool]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a boolean value.\" }\r\n    $Result\r\n}\r\nfunction RequirePositiveNumber() {\r\n    Param(\r\n        [Parameter(Mandatory = $false)][string]$Parameter,\r\n        [Parameter(Mandatory = $true)][string]$Name\r\n    )\r\n    $Result = 0\r\n    if (![int32]::TryParse($Parameter , [ref]$Result )) { throw \"\u0027$Name\u0027 must be a numerical value.\" }\r\n    if ($Result -lt 0) { throw \"\u0027$Name\u0027 must be \u003e= 0.\" }\r\n    $Result\r\n}\r\n\r\n$SpecificModuleVersion = Optional -Parameter $SpecificModuleVersion\r\n$UseInstalledModuleVersion = Optional -Parameter $UseInstalledModuleVersion -Default \u0027False\u0027\r\n$UseInstalledVersionSwitch = [bool]::Parse($UseInstalledModuleVersion)\r\nInstallCorrectSqlChangeAutomation -requiredVersion $SpecificModuleVersion -useInstalledVersion $UseInstalledVersionSwitch\r\n\r\n# Check if SQL Change Automation is installed.\r\n$powershellModule = Get-Module -Name SqlChangeAutomation\r\nif ($powershellModule -eq $null) {\r\n    throw \"Cannot find SQL Change Automation on your Octopus Tentacle. If SQL Change Automation is installed, try restarting the Tentacle service for it to be detected.\"\r\n}\r\n\r\n$currentVersion = $powershellModule.Version\r\n$minimumRequiredVersion = [version] \u00273.0.3\u0027\r\nif ($currentVersion -lt $minimumRequiredVersion) {\r\n    throw \"This step requires SQL Change Automation version $minimumRequiredVersion or later. The current version is $currentVersion. The latest version can be found at http://www.red-gate.com/sca/productpage\"\r\n}\r\n\r\n$minimumRequiredVersionDataCompareOptions = [version] \u00273.3.0\u0027\r\n$minimumRequiredVersionTrustServerCertificate = [version]\u00274.3.20267\u0027\r\n\r\nfunction AreConnectionOptionsHandled($encryptConnection, $trustServerCertificate)\r\n{\r\n    if ([string]::IsNullOrWhiteSpace($currentVersion) -or $currentVersion -ge $minimumRequiredVersionTrustServerCertificate)\r\n    {\r\n        return $true\r\n    }\r\n    elseif($encryptConnection -or $trustServerCertificate)\r\n    {\r\n        Write-Warning \"Encrypt and TrustServerCertificate options require SQL Change Automation version $minimumRequiredVersionTrustServerCertificate or later. The current version is $currentVersion.\"\r\n        return $false\r\n    }\r\n}\r\n\r\n# Check the parameters.\r\nRequired -Parameter $DLMAutomationNuGetDbPackageDownloadStepName -Name \u0027Database package step\u0027\r\nRequired -Parameter $DLMAutomationTargetDatabaseServer -Name \u0027Target SQL Server instance\u0027\r\nRequired -Parameter $DLMAutomationTargetDatabaseName -Name \u0027Target database name\u0027\r\n$DLMAutomationTargetTrustServerCertificate = Optional -Parameter $DLMAutomationTargetTrustServerCertificate\r\n$DLMAutomationTargetEncrypt = Optional -Parameter $DLMAutomationTargetEncrypt\r\n$DLMAutomationTargetUsername = Optional -Parameter $DLMAutomationTargetUsername\r\n$DLMAutomationTargetPassword = Optional -Parameter $DLMAutomationTargetPassword\r\n$DLMAutomationFilterPath = Optional -Parameter $DLMAutomationFilterPath\r\n$DLMAutomationCompareOptions = Optional -Parameter $DLMAutomationCompareOptions\r\n$DLMAutomationDataCompareOptions = Optional -Parameter $DLMAutomationDataCompareOptions\r\n$DLMAutomationTransactionIsolationLevel = Optional -Parameter $DLMAutomationTransactionIsolationLevel -Default \"Serializable\"\r\n$DLMAutomationIgnoreStaticData = Optional -Parameter $DLMAutomationIgnoreStaticData -Default \u0027False\u0027\r\n$DLMAutomationSkipPostUpdateSchemaCheck = Optional -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Default \"False\"\r\n$DLMAutomationQueryBatchTimeout = Optional -Parameter $DLMAutomationQueryBatchTimeout -Default \u002730\u0027\r\n$DLMAutomationModuleInstallationFolder = Optional -Parameter $DLMAutomationModuleInstallationFolder\r\n$DLMAutomationProxyUrl = Optional -Parameter $DLMAutomationProxyUrl\r\n\r\n$skipPostUpdateSchemaCheck = RequireBool -Parameter $DLMAutomationSkipPostUpdateSchemaCheck -Name \u0027Skip post update schema check\u0027\r\n$queryBatchTimeout = RequirePositiveNumber -Parameter $DLMAutomationQueryBatchTimeout -Name \u0027Query Batch Timeout\u0027\r\n\r\n# Get the NuGet package installation directory path.\r\n$packageExtractPath = $OctopusParameters[\"Octopus.Action[$DLMAutomationNuGetDbPackageDownloadStepName].Output.Package.InstallationDirectoryPath\"]\r\nif($packageExtractPath -eq $null) {\r\n    throw \"The \u0027Database package download step\u0027 is not a \u0027Deploy a NuGet package\u0027 step: \u0027$DLMAutomationNuGetDbPackageDownloadStepName\u0027\"\r\n}\r\n\r\n$targetConnectionOptions = @{ }\r\n\r\nif(AreConnectionOptionsHandled([bool]::Parse($DLMAutomationTargetEncrypt), [bool]::Parse($DLMAutomationTargetTrustServerCertificate))) {\r\n    $targetConnectionOptions += @{ \u0027Encrypt\u0027 = [bool]::Parse($DLMAutomationTargetEncrypt) }\r\n    $targetConnectionOptions += @{ \u0027TrustServerCertificate\u0027 = [bool]::Parse($DLMAutomationTargetTrustServerCertificate) }\r\n}\r\n\r\n$targetDB = New-DatabaseConnection @targetConnectionOptions `\r\n                                   -ServerInstance $DLMAutomationTargetDatabaseServer `\r\n                                   -Database $DLMAutomationTargetDatabaseName `\r\n                                   -Username $DLMAutomationTargetUsername `\r\n                                   -Password $DLMAutomationTargetPassword\r\n\r\n$importedBuildArtifact = Import-DatabaseBuildArtifact -Path $packageExtractPath\r\n\r\n# Only allow sqlcmd variables that don\u0027t have special characters like spaces, colon or dashes\r\n$regex = \u0027^[a-zA-Z_][a-zA-Z0-9_]+$\u0027\r\n$sqlCmdVariables = @{}\r\n$OctopusParameters.Keys | Where { $_ -match $regex } | ForEach {\r\n\t$sqlCmdVariables[$_] = $OctopusParameters[$_]\r\n}\r\n\r\n# Create database deployment resources from the NuGet package to the database\r\n$releaseParams = @{\r\n    Target = $targetDB\r\n    Source = $importedBuildArtifact\r\n    TransactionIsolationLevel = $DLMAutomationTransactionIsolationLevel\r\n    IgnoreStaticData = [bool]::Parse($DLMAutomationIgnoreStaticData)\r\n    FilterPath = $DLMAutomationFilterPath\r\n    SQLCompareOptions = $DLMAutomationCompareOptions\r\n    SqlCmdVariables = $sqlCmdVariables\r\n}\r\n\r\nif($currentVersion -ge $minimumRequiredVersionDataCompareOptions) {\r\n    $releaseParams.SQLDataCompareOptions = $DLMAutomationDataCompareOptions\r\n} elseif(-not [string]::IsNullOrWhiteSpace($DLMAutomationDataCompareOptions)) {\r\n    Write-Warning \"SQL Data Compare options requires SQL Change Automation version $minimumRequiredVersionDataCompareOptions or later. The current version is $currentVersion.\"\r\n}\r\n\r\n$release = New-DatabaseReleaseArtifact @releaseParams\r\n\r\n# Deploy the source schema to the target database.\r\nWrite-Host \"Timeout = $queryBatchTimeout\"\r\n$releaseUrl = $OctopusParameters[\u0027#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}\u0027] + $OctopusParameters[\u0027Octopus.Web.DeploymentLink\u0027];\r\n$release | Use-DatabaseReleaseArtifact -DeployTo $targetDB -SkipPreUpdateSchemaCheck -QueryBatchTimeout $queryBatchTimeout -ReleaseUrl $releaseUrl -SkipPostUpdateSchemaCheck:$skipPostUpdateSchemaCheck\r\n\r\n",
-                       "Octopus.Action.Script.Syntax":  "PowerShell"
-                   },
-    "SensitiveProperties":  {
-
-                            },
-    "Parameters":  [
-                       {
-                           "Name":  "DLMAutomationNuGetDbPackageDownloadStepName",
-                           "Label":  "Database package step",
-                           "HelpText":  "Select the step in this project which downloads the database package.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "StepName"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetDatabaseServer",
-                           "Label":  "Target SQL Server instance",
-                           "HelpText":  "The fully qualified SQL Server instance name for the target database.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetDatabaseName",
-                           "Label":  "Target database name",
-                           "HelpText":  "The name of the database to deploy changes to.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetUsername",
-                           "Label":  "Username (optional)",
-                           "HelpText":  "The SQL Server username used to connect to the database. If you leave this field and \u0027Password\u0027 blank, Windows authentication will be used to connect instead, using the account that runs the Tentacle service.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetPassword",
-                           "Label":  "Password (optional)",
-                           "HelpText":  "You must enter a password if you entered a username.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Sensitive"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetEncrypt",
-                           "Label":  "Encrypt",
-                           "HelpText":  "Specify whether SSL encryption is used by SQL Server when a certificate is installed.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTargetTrustServerCertificate",
-                           "Label":  "Trust Server Certificate",
-                           "HelpText":  "Specify whether to force SQL Server to skip certificate validation.",
-                           "DefaultValue":  "false",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationFilterPath",
-                           "Label":  "Filter path (optional)",
-                           "HelpText":  "Specify the location of a SQL Compare filter file (.scpf), which defines objects to include/exclude in the schema comparison. Filter files are generated by SQL Source Control.\n\nFor more help see [Using SQL Compare filters in SQL Change Automation](http://www.red-gate.com/sca/ps/help/filters).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationCompareOptions",
-                           "Label":  "SQL Compare options (optional)",
-                           "HelpText":  "Enter SQL Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Compare options in SQL Change Automation](http://www.red-gate.com/sca/add-ons/compare-options).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationDataCompareOptions",
-                           "Label":  "SQL Data Compare options (optional)",
-                           "HelpText":  "Enter SQL Data Compare options to apply when generating the update script. Use a comma-separated list to enter multiple values. For more help see [Using SQL Data Compare options in SQL Change Automation](http://www.red-gate.com/sca/ps/help/datacompareoptions).",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationTransactionIsolationLevel",
-                           "Label":  "Transaction isolation level (optional)",
-                           "HelpText":  "Select the transaction isolation level to be used in deployment scripts.",
-                           "DefaultValue":  "Serializable",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Select",
-                                                   "Octopus.SelectOptions":  "Serializable\nSnapshot\nRepeatableRead\nReadCommitted\nReadUncommitted"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationIgnoreStaticData",
-                           "Label":  "Ignore static data",
-                           "HelpText":  "Exclude changes to static data when generating the deployment resources.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationQueryBatchTimeout",
-                           "Label":  "Query batch timeout (in seconds)",
-                           "HelpText":  "The execution timeout, in seconds, for each batch of queries in the update script. The default value is 30 seconds. A value of zero indicates no execution timeout.",
-                           "DefaultValue":  "30",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationSkipPostUpdateSchemaCheck",
-                           "Label":  "Skip post update schema check",
-                           "HelpText":  "Don\u0027t check that the target database has the correct schema after the update has run.",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "SpecificModuleVersion",
-                           "Label":  "SQL Change Automation version (optional)",
-                           "HelpText":  "If you wish to use a specific version of SQL Change Automation rather than the latest, enter the version number here.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "UseInstalledModuleVersion",
-                           "Label":  "Only use a version of SQL Change Automation that is already installed",
-                           "HelpText":  "This prevents attempting to access PowerShell Gallery, which can be helpful when the build agent does not have access to the internet",
-                           "DefaultValue":  "False",
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "Checkbox"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationModuleInstallationFolder",
-                           "Label":  "Module Installation Folder (optional)",
-                           "HelpText":  "By default, module folders do not persist between steps. Setting this field to a specific folder will ensure that modules persist, and do not have to be downloaded again.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       },
-                       {
-                           "Name":  "DLMAutomationProxyUrl",
-                           "Label":  "Proxy URL (optional)",
-                           "HelpText":  "By default, no proxy is used when connecting to Powershell Gallery. Alternatively, a proxy URL can be specified here that can be used for Powershell Gallery.",
-                           "DefaultValue":  null,
-                           "DisplaySettings":  {
-                                                   "Octopus.ControlType":  "SingleLineText"
-                                               }
-                       }
-                   ],
-    "LastModifiedOn":  "2021-03-19T10:01:37.152+00:00",
-    "LastModifiedBy":  "benjimac93",
-    "$Meta":  {
-        "ExportedAt": "2021-08-23T12:40:10.975Z",
-        "OctopusVersion": "2021.1.7687",
-                  "Type":  "ActionTemplate"
-              },
-    "Category":  "redgate"
-}

From 943bd7b7dc15c8c4096bcc48e4d79e649c64c6d7 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 01:08:24 -0700
Subject: [PATCH 11/21] refactor: migrate step template batch 5 to src

---
 .../Remove-Hosts-File-Entry/metadata.json     |    4 +-
 .../Remove-Hosts-File-Entry/scriptbody.ps1    |   20 +
 .../metadata.json                             |   93 ++
 .../scriptbody.ps1                            |  129 ++
 .../TeamCity-Pin-Build/metadata.json          |  134 +-
 .../TeamCity-Pin-Build/scriptbody.ps1         |   22 +
 .../metadata.json                             |  104 ++
 .../scriptbody.ps1                            |  103 ++
 .../metadata.json                             |  135 ++
 .../scriptbody.ps1                            |  124 ++
 .../metadata.json                             |   74 +
 .../scriptbody.ps1                            |   78 +
 .../metadata.json                             |   10 +-
 .../scriptbody.ps1                            |   45 +
 .../redis-install/metadata.json               |   70 +
 .../redis-install/scriptbody.ps1              |   67 +
 .../redis-uninstall/metadata.json             |    6 +-
 .../redis-uninstall/scriptbody.ps1            |   24 +
 .../register-linux-tentacle/metadata.json     |   82 +
 .../register-linux-tentacle/scriptbody.ps1    |   60 +
 .../metadata.json                             |   31 +
 .../scriptbody.ps1                            |   79 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   18 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   28 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   48 +
 .../retention-policy/metadata.json            |   70 +
 .../retention-policy/scriptbody.ps1           |  116 ++
 .../rollbar-notify-deployment/metadata.json   |    8 +-
 .../rollbar-notify-deployment/scriptbody.ps1  |    1 +
 .../metadata.json                             |   76 +
 .../scriptbody.ps1                            |   95 ++
 .../metadata.json                             |  288 ++++
 .../scriptbody.ps1                            |  299 ++++
 .../metadata.json                             |   75 +
 .../scriptbody.ps1                            |  108 ++
 .../run-mabl-tests/metadata.json              |   82 +
 .../run-mabl-tests/scriptbody.ps1             |  231 +++
 .../step-templates/run-mstest/metadata.json   |    8 +-
 src/step-templates/run-mstest/scriptbody.ps1  |   23 +
 .../run-octopus-runbook/metadata.json         |  215 +++
 .../run-octopus-runbook/scriptbody.ps1        | 1349 +++++++++++++++++
 .../run-pulumi-on-linux/metadata.json         |    7 +-
 .../run-pulumi-on-linux/scriptbody.sh         |   64 +
 .../run-pulumi-on-windows/metadata.json       |    7 +-
 .../run-pulumi-on-windows/scriptbody.ps1      |   94 ++
 .../run-windows-installer/metadata.json       |   96 ++
 .../run-windows-installer/scriptbody.ps1      |  282 ++++
 .../step-templates/run-xunit/metadata.json    |  132 +-
 src/step-templates/run-xunit/scriptbody.ps1   |   43 +
 .../metadata.json                             |  166 ++
 .../scriptbody.ps1                            |  199 +++
 .../metadata.json                             |   92 ++
 .../scriptbody.ps1                            |  104 ++
 src/step-templates/sbom-scan/metadata.json    |   49 +
 src/step-templates/sbom-scan/scriptbody.ps1   |  129 ++
 .../metadata.json                             |   49 +
 .../scriptbody.ps1                            |  111 ++
 .../send-email-using-mailkit/metadata.json    |  148 ++
 .../send-email-using-mailkit/scriptbody.ps1   |  121 ++
 .../send-sms-using-messagebird/metadata.json  |   63 +
 .../send-sms-using-messagebird/scriptbody.ps1 |   13 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   26 +
 .../sentry-release-tracking/metadata.json     |    8 +-
 .../sentry-release-tracking/scriptbody.ps1    |   41 +
 .../seq-log-deployment/metadata.json          |   39 +
 .../seq-log-deployment/scriptbody.ps1         |   78 +
 .../metadata.json                             |   31 +
 .../scriptbody.ps1                            |  113 ++
 .../sitecore-deploy-scwdp/metadata.json       |    8 +-
 .../sitecore-deploy-scwdp/scriptbody.ps1      |   18 +
 .../metadata.json                             |   34 +
 .../scriptbody.ps1                            |   58 +
 .../sitecore-unicorn-sync/metadata.json       |   58 +
 .../sitecore-unicorn-sync/scriptbody.ps1      |   58 +
 .../metadata.json                             |  175 +++
 .../scriptbody.sh                             |  176 +++
 .../slack-detailed-notification/metadata.json |    6 +-
 .../scriptbody.ps1                            |  216 +++
 .../slack-notify-deployment/metadata.json     |   75 +
 .../slack-notify-deployment/scriptbody.ps1    |   55 +
 .../metadata.json                             |    2 +-
 .../scriptbody.ps1                            |   22 +
 .../metadata.json                             |   94 ++
 .../scriptbody.sh                             |   35 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   31 +
 .../snowchange-deploy-scripts/metadata.json   |    4 +-
 .../snowchange-deploy-scripts/scriptbody.ps1  |  109 ++
 .../solarwinds-manage/metadata.json           |   67 +
 .../solarwinds-manage/scriptbody.ps1          |   75 +
 .../solarwinds-unmanage/metadata.json         |   76 +
 .../solarwinds-unmanage/scriptbody.ps1        |   86 ++
 .../spark-sendnotification/metadata.json      |   92 ++
 .../spark-sendnotification/scriptbody.ps1     |  154 ++
 .../splunk-forward-file/metadata.json         |   49 +
 .../splunk-forward-file/scriptbody.ps1        |   50 +
 .../splunk-log-event-collector/metadata.json  |   61 +
 .../splunk-log-event-collector/scriptbody.ps1 |   53 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   25 +
 .../sql-backup-database/metadata.json         |  150 ++
 .../sql-backup-database/scriptbody.ps1        |  293 ++++
 .../metadata.json                             |  107 ++
 .../scriptbody.ps1                            |   68 +
 .../sql-create-database-user/metadata.json    |    8 +-
 .../sql-create-database-user/scriptbody.ps1   |   33 +
 .../sql-create-database/metadata.json         |    8 +-
 .../sql-create-database/scriptbody.ps1        |  102 ++
 .../sql-create-job-category/metadata.json     |    8 +-
 .../sql-create-job-category/scriptbody.ps1    |    4 +
 .../sql-create-sql-user/metadata.json         |   82 +
 .../sql-create-sql-user/scriptbody.ps1        |  105 ++
 .../sql-delete-database/metadata.json         |    6 +-
 .../sql-delete-database/scriptbody.ps1        |   29 +
 .../sql-delete-sql-user/metadata.json         |    6 +-
 .../sql-delete-sql-user/scriptbody.ps1        |   28 +
 .../metadata.json                             |  179 +++
 .../scriptbody.ps1                            |  573 +++++++
 .../sql-deploylog-read/metadata.json          |   73 +
 .../sql-deploylog-read/scriptbody.ps1         |   81 +
 .../sql-deploylog-update/metadata.json        |   83 +
 .../sql-deploylog-update/scriptbody.ps1       |  127 ++
 .../sql-execute-script-file/metadata.json     |    6 +-
 .../sql-execute-script-file/scriptbody.ps1    |    1 +
 .../metadata.json                             |   94 ++
 .../scriptbody.ps1                            |  148 ++
 .../sql-execute-script/metadata.json          |   73 +
 .../sql-execute-script/scriptbody.ps1         |   84 +
 .../sql-execute-scripts-ordered/metadata.json |    8 +-
 .../scriptbody.ps1                            |   79 +
 .../sql-execute-sql-agent-job/metadata.json   |   58 +
 .../sql-execute-sql-agent-job/scriptbody.ps1  |  119 ++
 .../sql-execute-sql-files/metadata.json       |  130 ++
 .../sql-execute-sql-files/scriptbody.ps1      |  208 +++
 .../sql-fix-orphaned-user/metadata.json       |   73 +
 .../sql-fix-orphaned-user/scriptbody.ps1      |  108 ++
 .../sql-restore-database/metadata.json        |  114 ++
 .../sql-restore-database/scriptbody.ps1       |  143 ++
 .../sql-smo-change-usermode/metadata.json     |    8 +-
 .../sql-smo-change-usermode/scriptbody.ps1    |   47 +
 .../sql-smo-create-database/metadata.json     |    8 +-
 .../sql-smo-create-database/scriptbody.ps1    |   39 +
 .../metadata.json                             |   62 +
 .../scriptbody.ps1                            |   75 +
 .../sql-smo-drop-database/metadata.json       |    8 +-
 .../sql-smo-drop-database/scriptbody.ps1      |   27 +
 .../sql-test-connection-string/metadata.json  |    8 +-
 .../sql-test-connection-string/scriptbody.ps1 |   19 +
 .../sql-update-job/metadata.json              |   65 +
 .../sql-update-job/scriptbody.ps1             |  109 ++
 .../metadata.json                             |  132 ++
 .../scriptbody.ps1                            |  148 ++
 .../metadata.json                             |   48 +
 .../scriptbody.ps1                            |   56 +
 .../metadata.json                             |   70 +
 .../scriptbody.ps1                            |  275 ++++
 .../ssas-deploy-from-package/metadata.json    |   82 +
 .../ssas-deploy-from-package/scriptbody.ps1   |  133 ++
 .../metadata.json                             |  196 +++
 .../scriptbody.ps1                            |  707 +++++++++
 .../metadata.json                             |  172 +++
 .../scriptbody.ps1                            |  511 +++++++
 .../metadata.json                             |  215 +++
 .../scriptbody.ps1                            |  610 ++++++++
 .../metadata.json                             |   72 +
 .../scriptbody.ps1                            |  424 ++++++
 .../ssis-deploy-sqlagentjob/metadata.json     |  178 +++
 .../ssis-deploy-sqlagentjob/scriptbody.ps1    |  306 ++++
 .../ssl-certificate-install/metadata.json     |    8 +-
 .../ssl-certificate-install/scriptbody.ps1    |   13 +
 .../ssl-disable-sslv2/metadata.json           |   31 +
 .../ssl-disable-sslv2/scriptbody.ps1          |   60 +
 .../metadata.json                             |   65 +
 .../scriptbody.ps1                            |   15 +
 .../metadata.json                             |  187 +++
 .../scriptbody.ps1                            | 1109 ++++++++++++++
 .../ssrs-deploy-from-package/metadata.json    |  174 +++
 .../ssrs-deploy-from-package/scriptbody.ps1   | 1107 ++++++++++++++
 .../ssrs-report-backup/metadata.json          |   49 +
 .../ssrs-report-backup/scriptbody.ps1         |   69 +
 .../stackify-api-template/metadata.json       |    4 +-
 .../stackify-api-template/scriptbody.ps1      |   36 +
 .../metadata.json                             |    6 +-
 .../scriptbody.ps1                            |   25 +
 .../metadata.json                             |    4 +-
 .../scriptbody.ps1                            |   72 +
 .../metadata.json                             |   76 +
 .../scriptbody.ps1                            |   84 +
 .../swaggerhub-post-api/metadata.json         |  116 ++
 .../swaggerhub-post-api/scriptbody.ps1        |   70 +
 .../teamcity-download-artifact/metadata.json  |    8 +-
 .../teamcity-download-artifact/scriptbody.ps1 |   18 +
 .../metadata.json                             |    8 +-
 .../scriptbody.ps1                            |   32 +
 .../teamcity-run-build/metadata.json          |   77 +
 .../teamcity-run-build/scriptbody.ps1         |   93 ++
 ...ry-Octopus-Database-for-Fragmentation.json |   93 --
 .../redgate-sql-clone-create-clone.json       |  104 --
 .../redgate-sql-clone-create-image.json       |  135 --
 .../redgate-sql-clone-delete-clone.json       |   74 -
 step-templates/redis-install.json             |   71 -
 step-templates/register-linux-tentacle.json   |   82 -
 ...onfiguration-variables-in-export-file.json |   31 -
 step-templates/retention-policy.json          |   70 -
 .../rotate_azure_load_balancer_pool.json      |   76 -
 .../roundhouse-database-migration.json        |  288 ----
 .../run-entity-framework-migrations.json      |   75 -
 step-templates/run-mabl-tests.json            |   82 -
 step-templates/run-octopus-runbook.json       |  215 ---
 step-templates/run-windows-installer.json     |   96 --
 ...-octopus-output-variable-with-scoping.json |  166 --
 .../save-octopus-output-variable.json         |   92 --
 step-templates/sbom-scan.json                 |   49 -
 .../scheduled-task-create-from-xml.json       |   49 -
 step-templates/send-email-using-mailkit.json  |  148 --
 .../send-sms-using-messagebird.json           |   62 -
 step-templates/seq-log-deployment.json        |   39 -
 .../sharepoint-solution-deployment.json       |   31 -
 ...itecore-settings-variable-replacement.json |   34 -
 step-templates/sitecore-unicorn-sync.json     |   58 -
 .../slack-detailed-notification-bash.json     |  175 ---
 step-templates/slack-notify-deployment.json   |   75 -
 .../slack-send-simple-notification-bash.json  |   94 --
 step-templates/solarwinds-manage.json         |   67 -
 step-templates/solarwinds-unmanage.json       |   76 -
 step-templates/spark-sendnotification.json    |   92 --
 step-templates/splunk-forward-file.json       |   49 -
 .../splunk-log-event-collector.json           |   61 -
 step-templates/sql-backup-database.json       |  150 --
 .../sql-create-database-enhanced.json         |  107 --
 step-templates/sql-create-sql-user.json       |   82 -
 .../sql-deploy-dacpac-sqlpackage.json         |  179 ---
 step-templates/sql-deploylog-read.json        |   73 -
 step-templates/sql-deploylog-update.json      |   83 -
 ...ql-execute-script-with-authentication.json |   94 --
 step-templates/sql-execute-script.json        |   73 -
 step-templates/sql-execute-sql-agent-job.json |   58 -
 step-templates/sql-execute-sql-files.json     |  130 --
 step-templates/sql-fix-orphaned-user.json     |   73 -
 step-templates/sql-restore-database.json      |  114 --
 .../sql-smo-create-login-and-user.json        |   62 -
 step-templates/sql-update-job.json            |   65 -
 ...e-restore-database-from-azure-storage.json |  132 --
 .../sqlserver-high-availability-group.json    |   48 -
 ...project-deployment-model-ispac-deploy.json |   70 -
 step-templates/ssas-deploy-from-package.json  |   82 -
 ...s-deploy-ispac-from-package-parameter.json |  196 ---
 .../ssis-deploy-ispac-from-package.json       |  172 ---
 ...-deploy-ispac-from-referenced-package.json |  215 ---
 .../ssis-deploy-ispac-with-enviroment.json    |   72 -
 step-templates/ssis-deploy-sqlagentjob.json   |  178 ---
 step-templates/ssl-disable-sslv2.json         |   31 -
 .../ssl-write-certificate-pem-and-key.json    |   65 -
 .../ssrs-deploy-from-package-parameter.json   |  187 ---
 step-templates/ssrs-deploy-from-package.json  |  174 ---
 step-templates/ssrs-report-backup.json        |   49 -
 ...update-scheduled-maintenance-incident.json |   76 -
 step-templates/swaggerhub-post-api.json       |  116 --
 step-templates/teamcity-run-build.json        |   77 -
 263 files changed, 20769 insertions(+), 6439 deletions(-)
 rename step-templates/Remove-Hosts-File-Entry.json => src/step-templates/Remove-Hosts-File-Entry/metadata.json (65%)
 create mode 100644 src/step-templates/Remove-Hosts-File-Entry/scriptbody.ps1
 create mode 100644 src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/metadata.json
 create mode 100644 src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/scriptbody.ps1
 rename step-templates/TeamCity-Pin-Build.json => src/step-templates/TeamCity-Pin-Build/metadata.json (62%)
 create mode 100644 src/step-templates/TeamCity-Pin-Build/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-sql-clone-create-clone/metadata.json
 create mode 100644 src/step-templates/redgate-sql-clone-create-clone/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-sql-clone-create-image/metadata.json
 create mode 100644 src/step-templates/redgate-sql-clone-create-image/scriptbody.ps1
 create mode 100644 src/step-templates/redgate-sql-clone-delete-clone/metadata.json
 create mode 100644 src/step-templates/redgate-sql-clone-delete-clone/scriptbody.ps1
 rename step-templates/redgate-sql-clone-delete-image.json => src/step-templates/redgate-sql-clone-delete-image/metadata.json (51%)
 create mode 100644 src/step-templates/redgate-sql-clone-delete-image/scriptbody.ps1
 create mode 100644 src/step-templates/redis-install/metadata.json
 create mode 100644 src/step-templates/redis-install/scriptbody.ps1
 rename step-templates/redis-uninstall.json => src/step-templates/redis-uninstall/metadata.json (58%)
 create mode 100644 src/step-templates/redis-uninstall/scriptbody.ps1
 create mode 100644 src/step-templates/register-linux-tentacle/metadata.json
 create mode 100644 src/step-templates/register-linux-tentacle/scriptbody.ps1
 create mode 100644 src/step-templates/registry-update-configuration-variables-in-export-file/metadata.json
 create mode 100644 src/step-templates/registry-update-configuration-variables-in-export-file/scriptbody.ps1
 rename step-templates/releasenoteshub-add-release-association.json => src/step-templates/releasenoteshub-add-release-association/metadata.json (78%)
 create mode 100644 src/step-templates/releasenoteshub-add-release-association/scriptbody.ps1
 rename step-templates/releasenoteshub-pull-trigger.json => src/step-templates/releasenoteshub-pull-trigger/metadata.json (78%)
 create mode 100644 src/step-templates/releasenoteshub-pull-trigger/scriptbody.ps1
 rename step-templates/remove-server-from-azure-load-balancer.json => src/step-templates/remove-server-from-azure-load-balancer/metadata.json (54%)
 create mode 100644 src/step-templates/remove-server-from-azure-load-balancer/scriptbody.ps1
 create mode 100644 src/step-templates/retention-policy/metadata.json
 create mode 100644 src/step-templates/retention-policy/scriptbody.ps1
 rename step-templates/rollbar-notify-deployment.json => src/step-templates/rollbar-notify-deployment/metadata.json (75%)
 create mode 100644 src/step-templates/rollbar-notify-deployment/scriptbody.ps1
 create mode 100644 src/step-templates/rotate_azure_load_balancer_pool/metadata.json
 create mode 100644 src/step-templates/rotate_azure_load_balancer_pool/scriptbody.ps1
 create mode 100644 src/step-templates/roundhouse-database-migration/metadata.json
 create mode 100644 src/step-templates/roundhouse-database-migration/scriptbody.ps1
 create mode 100644 src/step-templates/run-entity-framework-migrations/metadata.json
 create mode 100644 src/step-templates/run-entity-framework-migrations/scriptbody.ps1
 create mode 100644 src/step-templates/run-mabl-tests/metadata.json
 create mode 100644 src/step-templates/run-mabl-tests/scriptbody.ps1
 rename step-templates/run-mstest.json => src/step-templates/run-mstest/metadata.json (67%)
 create mode 100644 src/step-templates/run-mstest/scriptbody.ps1
 create mode 100644 src/step-templates/run-octopus-runbook/metadata.json
 create mode 100644 src/step-templates/run-octopus-runbook/scriptbody.ps1
 rename step-templates/run-pulumi-on-linux.json => src/step-templates/run-pulumi-on-linux/metadata.json (63%)
 create mode 100644 src/step-templates/run-pulumi-on-linux/scriptbody.sh
 rename step-templates/run-pulumi-on-windows.json => src/step-templates/run-pulumi-on-windows/metadata.json (60%)
 create mode 100644 src/step-templates/run-pulumi-on-windows/scriptbody.ps1
 create mode 100644 src/step-templates/run-windows-installer/metadata.json
 create mode 100644 src/step-templates/run-windows-installer/scriptbody.ps1
 rename step-templates/run-xunit.json => src/step-templates/run-xunit/metadata.json (58%)
 create mode 100644 src/step-templates/run-xunit/scriptbody.ps1
 create mode 100644 src/step-templates/save-octopus-output-variable-with-scoping/metadata.json
 create mode 100644 src/step-templates/save-octopus-output-variable-with-scoping/scriptbody.ps1
 create mode 100644 src/step-templates/save-octopus-output-variable/metadata.json
 create mode 100644 src/step-templates/save-octopus-output-variable/scriptbody.ps1
 create mode 100644 src/step-templates/sbom-scan/metadata.json
 create mode 100644 src/step-templates/sbom-scan/scriptbody.ps1
 create mode 100644 src/step-templates/scheduled-task-create-from-xml/metadata.json
 create mode 100644 src/step-templates/scheduled-task-create-from-xml/scriptbody.ps1
 create mode 100644 src/step-templates/send-email-using-mailkit/metadata.json
 create mode 100644 src/step-templates/send-email-using-mailkit/scriptbody.ps1
 create mode 100644 src/step-templates/send-sms-using-messagebird/metadata.json
 create mode 100644 src/step-templates/send-sms-using-messagebird/scriptbody.ps1
 rename step-templates/sentry-release-tracking-token-auth.json => src/step-templates/sentry-release-tracking-token-auth/metadata.json (65%)
 create mode 100644 src/step-templates/sentry-release-tracking-token-auth/scriptbody.ps1
 rename step-templates/sentry-release-tracking.json => src/step-templates/sentry-release-tracking/metadata.json (51%)
 create mode 100644 src/step-templates/sentry-release-tracking/scriptbody.ps1
 create mode 100644 src/step-templates/seq-log-deployment/metadata.json
 create mode 100644 src/step-templates/seq-log-deployment/scriptbody.ps1
 create mode 100644 src/step-templates/sharepoint-solution-deployment/metadata.json
 create mode 100644 src/step-templates/sharepoint-solution-deployment/scriptbody.ps1
 rename step-templates/sitecore-deploy-scwdp.json => src/step-templates/sitecore-deploy-scwdp/metadata.json (73%)
 create mode 100644 src/step-templates/sitecore-deploy-scwdp/scriptbody.ps1
 create mode 100644 src/step-templates/sitecore-settings-variable-replacement/metadata.json
 create mode 100644 src/step-templates/sitecore-settings-variable-replacement/scriptbody.ps1
 create mode 100644 src/step-templates/sitecore-unicorn-sync/metadata.json
 create mode 100644 src/step-templates/sitecore-unicorn-sync/scriptbody.ps1
 create mode 100644 src/step-templates/slack-detailed-notification-bash/metadata.json
 create mode 100644 src/step-templates/slack-detailed-notification-bash/scriptbody.sh
 rename step-templates/slack-detailed-notification.json => src/step-templates/slack-detailed-notification/metadata.json (50%)
 create mode 100644 src/step-templates/slack-detailed-notification/scriptbody.ps1
 create mode 100644 src/step-templates/slack-notify-deployment/metadata.json
 create mode 100644 src/step-templates/slack-notify-deployment/scriptbody.ps1
 rename step-templates/slack-send-notification-using-block-kit.json => src/step-templates/slack-send-notification-using-block-kit/metadata.json (70%)
 create mode 100644 src/step-templates/slack-send-notification-using-block-kit/scriptbody.ps1
 create mode 100644 src/step-templates/slack-send-simple-notification-bash/metadata.json
 create mode 100644 src/step-templates/slack-send-simple-notification-bash/scriptbody.sh
 rename step-templates/slack-send-simple-notification.json => src/step-templates/slack-send-simple-notification/metadata.json (71%)
 create mode 100644 src/step-templates/slack-send-simple-notification/scriptbody.ps1
 rename step-templates/snowchange-deploy-scripts.json => src/step-templates/snowchange-deploy-scripts/metadata.json (56%)
 create mode 100644 src/step-templates/snowchange-deploy-scripts/scriptbody.ps1
 create mode 100644 src/step-templates/solarwinds-manage/metadata.json
 create mode 100644 src/step-templates/solarwinds-manage/scriptbody.ps1
 create mode 100644 src/step-templates/solarwinds-unmanage/metadata.json
 create mode 100644 src/step-templates/solarwinds-unmanage/scriptbody.ps1
 create mode 100644 src/step-templates/spark-sendnotification/metadata.json
 create mode 100644 src/step-templates/spark-sendnotification/scriptbody.ps1
 create mode 100644 src/step-templates/splunk-forward-file/metadata.json
 create mode 100644 src/step-templates/splunk-forward-file/scriptbody.ps1
 create mode 100644 src/step-templates/splunk-log-event-collector/metadata.json
 create mode 100644 src/step-templates/splunk-log-event-collector/scriptbody.ps1
 rename step-templates/sql-add-database-user-to-role.json => src/step-templates/sql-add-database-user-to-role/metadata.json (68%)
 create mode 100644 src/step-templates/sql-add-database-user-to-role/scriptbody.ps1
 create mode 100755 src/step-templates/sql-backup-database/metadata.json
 create mode 100644 src/step-templates/sql-backup-database/scriptbody.ps1
 create mode 100644 src/step-templates/sql-create-database-enhanced/metadata.json
 create mode 100644 src/step-templates/sql-create-database-enhanced/scriptbody.ps1
 rename step-templates/sql-create-database-user.json => src/step-templates/sql-create-database-user/metadata.json (60%)
 create mode 100644 src/step-templates/sql-create-database-user/scriptbody.ps1
 rename step-templates/sql-create-database.json => src/step-templates/sql-create-database/metadata.json (51%)
 create mode 100644 src/step-templates/sql-create-database/scriptbody.ps1
 rename step-templates/sql-create-job-category.json => src/step-templates/sql-create-job-category/metadata.json (75%)
 create mode 100644 src/step-templates/sql-create-job-category/scriptbody.ps1
 create mode 100644 src/step-templates/sql-create-sql-user/metadata.json
 create mode 100644 src/step-templates/sql-create-sql-user/scriptbody.ps1
 rename step-templates/sql-delete-database.json => src/step-templates/sql-delete-database/metadata.json (56%)
 create mode 100644 src/step-templates/sql-delete-database/scriptbody.ps1
 rename step-templates/sql-delete-sql-user.json => src/step-templates/sql-delete-sql-user/metadata.json (56%)
 create mode 100644 src/step-templates/sql-delete-sql-user/scriptbody.ps1
 create mode 100644 src/step-templates/sql-deploy-dacpac-sqlpackage/metadata.json
 create mode 100644 src/step-templates/sql-deploy-dacpac-sqlpackage/scriptbody.ps1
 create mode 100644 src/step-templates/sql-deploylog-read/metadata.json
 create mode 100644 src/step-templates/sql-deploylog-read/scriptbody.ps1
 create mode 100644 src/step-templates/sql-deploylog-update/metadata.json
 create mode 100644 src/step-templates/sql-deploylog-update/scriptbody.ps1
 rename step-templates/sql-execute-script-file.json => src/step-templates/sql-execute-script-file/metadata.json (55%)
 create mode 100644 src/step-templates/sql-execute-script-file/scriptbody.ps1
 create mode 100644 src/step-templates/sql-execute-script-with-authentication/metadata.json
 create mode 100644 src/step-templates/sql-execute-script-with-authentication/scriptbody.ps1
 create mode 100644 src/step-templates/sql-execute-script/metadata.json
 create mode 100644 src/step-templates/sql-execute-script/scriptbody.ps1
 rename step-templates/sql-execute-scripts-ordered.json => src/step-templates/sql-execute-scripts-ordered/metadata.json (51%)
 create mode 100644 src/step-templates/sql-execute-scripts-ordered/scriptbody.ps1
 create mode 100644 src/step-templates/sql-execute-sql-agent-job/metadata.json
 create mode 100644 src/step-templates/sql-execute-sql-agent-job/scriptbody.ps1
 create mode 100644 src/step-templates/sql-execute-sql-files/metadata.json
 create mode 100644 src/step-templates/sql-execute-sql-files/scriptbody.ps1
 create mode 100644 src/step-templates/sql-fix-orphaned-user/metadata.json
 create mode 100644 src/step-templates/sql-fix-orphaned-user/scriptbody.ps1
 create mode 100644 src/step-templates/sql-restore-database/metadata.json
 create mode 100644 src/step-templates/sql-restore-database/scriptbody.ps1
 rename step-templates/sql-smo-change-usermode.json => src/step-templates/sql-smo-change-usermode/metadata.json (62%)
 create mode 100644 src/step-templates/sql-smo-change-usermode/scriptbody.ps1
 rename step-templates/sql-smo-create-database.json => src/step-templates/sql-smo-create-database/metadata.json (56%)
 create mode 100644 src/step-templates/sql-smo-create-database/scriptbody.ps1
 create mode 100644 src/step-templates/sql-smo-create-login-and-user/metadata.json
 create mode 100644 src/step-templates/sql-smo-create-login-and-user/scriptbody.ps1
 rename step-templates/sql-smo-drop-database.json => src/step-templates/sql-smo-drop-database/metadata.json (64%)
 create mode 100644 src/step-templates/sql-smo-drop-database/scriptbody.ps1
 rename step-templates/sql-test-connection-string.json => src/step-templates/sql-test-connection-string/metadata.json (56%)
 create mode 100644 src/step-templates/sql-test-connection-string/scriptbody.ps1
 create mode 100644 src/step-templates/sql-update-job/metadata.json
 create mode 100644 src/step-templates/sql-update-job/scriptbody.ps1
 create mode 100644 src/step-templates/sqlazure-restore-database-from-azure-storage/metadata.json
 create mode 100644 src/step-templates/sqlazure-restore-database-from-azure-storage/scriptbody.ps1
 create mode 100644 src/step-templates/sqlserver-high-availability-group/metadata.json
 create mode 100644 src/step-templates/sqlserver-high-availability-group/scriptbody.ps1
 create mode 100644 src/step-templates/sqlserver-project-deployment-model-ispac-deploy/metadata.json
 create mode 100644 src/step-templates/sqlserver-project-deployment-model-ispac-deploy/scriptbody.ps1
 create mode 100644 src/step-templates/ssas-deploy-from-package/metadata.json
 create mode 100644 src/step-templates/ssas-deploy-from-package/scriptbody.ps1
 create mode 100644 src/step-templates/ssis-deploy-ispac-from-package-parameter/metadata.json
 create mode 100644 src/step-templates/ssis-deploy-ispac-from-package-parameter/scriptbody.ps1
 create mode 100644 src/step-templates/ssis-deploy-ispac-from-package/metadata.json
 create mode 100644 src/step-templates/ssis-deploy-ispac-from-package/scriptbody.ps1
 create mode 100644 src/step-templates/ssis-deploy-ispac-from-referenced-package/metadata.json
 create mode 100644 src/step-templates/ssis-deploy-ispac-from-referenced-package/scriptbody.ps1
 create mode 100644 src/step-templates/ssis-deploy-ispac-with-enviroment/metadata.json
 create mode 100644 src/step-templates/ssis-deploy-ispac-with-enviroment/scriptbody.ps1
 create mode 100644 src/step-templates/ssis-deploy-sqlagentjob/metadata.json
 create mode 100644 src/step-templates/ssis-deploy-sqlagentjob/scriptbody.ps1
 rename step-templates/ssl-certificate-install.json => src/step-templates/ssl-certificate-install/metadata.json (67%)
 create mode 100644 src/step-templates/ssl-certificate-install/scriptbody.ps1
 create mode 100644 src/step-templates/ssl-disable-sslv2/metadata.json
 create mode 100644 src/step-templates/ssl-disable-sslv2/scriptbody.ps1
 create mode 100644 src/step-templates/ssl-write-certificate-pem-and-key/metadata.json
 create mode 100644 src/step-templates/ssl-write-certificate-pem-and-key/scriptbody.ps1
 create mode 100644 src/step-templates/ssrs-deploy-from-package-parameter/metadata.json
 create mode 100644 src/step-templates/ssrs-deploy-from-package-parameter/scriptbody.ps1
 create mode 100644 src/step-templates/ssrs-deploy-from-package/metadata.json
 create mode 100644 src/step-templates/ssrs-deploy-from-package/scriptbody.ps1
 create mode 100644 src/step-templates/ssrs-report-backup/metadata.json
 create mode 100644 src/step-templates/ssrs-report-backup/scriptbody.ps1
 rename step-templates/stackify-api-template.json => src/step-templates/stackify-api-template/metadata.json (79%)
 create mode 100644 src/step-templates/stackify-api-template/scriptbody.ps1
 rename step-templates/statuscake-maintenance-window.json => src/step-templates/statuscake-maintenance-window/metadata.json (94%)
 create mode 100644 src/step-templates/statuscake-maintenance-window/scriptbody.ps1
 rename step-templates/statuspageio-create-scheduled-maintenance-incident.json => src/step-templates/statuspageio-create-scheduled-maintenance-incident/metadata.json (51%)
 create mode 100644 src/step-templates/statuspageio-create-scheduled-maintenance-incident/scriptbody.ps1
 create mode 100644 src/step-templates/statuspageio-update-scheduled-maintenance-incident/metadata.json
 create mode 100644 src/step-templates/statuspageio-update-scheduled-maintenance-incident/scriptbody.ps1
 create mode 100644 src/step-templates/swaggerhub-post-api/metadata.json
 create mode 100644 src/step-templates/swaggerhub-post-api/scriptbody.ps1
 rename step-templates/teamcity-download-artifact.json => src/step-templates/teamcity-download-artifact/metadata.json (68%)
 create mode 100644 src/step-templates/teamcity-download-artifact/scriptbody.ps1
 rename step-templates/teamcity-pin-build-and-dependencies.json => src/step-templates/teamcity-pin-build-and-dependencies/metadata.json (60%)
 create mode 100644 src/step-templates/teamcity-pin-build-and-dependencies/scriptbody.ps1
 create mode 100644 src/step-templates/teamcity-run-build/metadata.json
 create mode 100644 src/step-templates/teamcity-run-build/scriptbody.ps1
 delete mode 100644 step-templates/SQL-Query-Octopus-Database-for-Fragmentation.json
 delete mode 100644 step-templates/redgate-sql-clone-create-clone.json
 delete mode 100644 step-templates/redgate-sql-clone-create-image.json
 delete mode 100644 step-templates/redgate-sql-clone-delete-clone.json
 delete mode 100644 step-templates/redis-install.json
 delete mode 100644 step-templates/register-linux-tentacle.json
 delete mode 100644 step-templates/registry-update-configuration-variables-in-export-file.json
 delete mode 100644 step-templates/retention-policy.json
 delete mode 100644 step-templates/rotate_azure_load_balancer_pool.json
 delete mode 100644 step-templates/roundhouse-database-migration.json
 delete mode 100644 step-templates/run-entity-framework-migrations.json
 delete mode 100644 step-templates/run-mabl-tests.json
 delete mode 100644 step-templates/run-octopus-runbook.json
 delete mode 100644 step-templates/run-windows-installer.json
 delete mode 100644 step-templates/save-octopus-output-variable-with-scoping.json
 delete mode 100644 step-templates/save-octopus-output-variable.json
 delete mode 100644 step-templates/sbom-scan.json
 delete mode 100644 step-templates/scheduled-task-create-from-xml.json
 delete mode 100644 step-templates/send-email-using-mailkit.json
 delete mode 100644 step-templates/send-sms-using-messagebird.json
 delete mode 100644 step-templates/seq-log-deployment.json
 delete mode 100644 step-templates/sharepoint-solution-deployment.json
 delete mode 100644 step-templates/sitecore-settings-variable-replacement.json
 delete mode 100644 step-templates/sitecore-unicorn-sync.json
 delete mode 100644 step-templates/slack-detailed-notification-bash.json
 delete mode 100644 step-templates/slack-notify-deployment.json
 delete mode 100644 step-templates/slack-send-simple-notification-bash.json
 delete mode 100644 step-templates/solarwinds-manage.json
 delete mode 100644 step-templates/solarwinds-unmanage.json
 delete mode 100644 step-templates/spark-sendnotification.json
 delete mode 100644 step-templates/splunk-forward-file.json
 delete mode 100644 step-templates/splunk-log-event-collector.json
 delete mode 100755 step-templates/sql-backup-database.json
 delete mode 100644 step-templates/sql-create-database-enhanced.json
 delete mode 100644 step-templates/sql-create-sql-user.json
 delete mode 100644 step-templates/sql-deploy-dacpac-sqlpackage.json
 delete mode 100644 step-templates/sql-deploylog-read.json
 delete mode 100644 step-templates/sql-deploylog-update.json
 delete mode 100644 step-templates/sql-execute-script-with-authentication.json
 delete mode 100644 step-templates/sql-execute-script.json
 delete mode 100644 step-templates/sql-execute-sql-agent-job.json
 delete mode 100644 step-templates/sql-execute-sql-files.json
 delete mode 100644 step-templates/sql-fix-orphaned-user.json
 delete mode 100644 step-templates/sql-restore-database.json
 delete mode 100644 step-templates/sql-smo-create-login-and-user.json
 delete mode 100644 step-templates/sql-update-job.json
 delete mode 100644 step-templates/sqlazure-restore-database-from-azure-storage.json
 delete mode 100644 step-templates/sqlserver-high-availability-group.json
 delete mode 100644 step-templates/sqlserver-project-deployment-model-ispac-deploy.json
 delete mode 100644 step-templates/ssas-deploy-from-package.json
 delete mode 100644 step-templates/ssis-deploy-ispac-from-package-parameter.json
 delete mode 100644 step-templates/ssis-deploy-ispac-from-package.json
 delete mode 100644 step-templates/ssis-deploy-ispac-from-referenced-package.json
 delete mode 100644 step-templates/ssis-deploy-ispac-with-enviroment.json
 delete mode 100644 step-templates/ssis-deploy-sqlagentjob.json
 delete mode 100644 step-templates/ssl-disable-sslv2.json
 delete mode 100644 step-templates/ssl-write-certificate-pem-and-key.json
 delete mode 100644 step-templates/ssrs-deploy-from-package-parameter.json
 delete mode 100644 step-templates/ssrs-deploy-from-package.json
 delete mode 100644 step-templates/ssrs-report-backup.json
 delete mode 100644 step-templates/statuspageio-update-scheduled-maintenance-incident.json
 delete mode 100644 step-templates/swaggerhub-post-api.json
 delete mode 100644 step-templates/teamcity-run-build.json

diff --git a/step-templates/Remove-Hosts-File-Entry.json b/src/step-templates/Remove-Hosts-File-Entry/metadata.json
similarity index 65%
rename from step-templates/Remove-Hosts-File-Entry.json
rename to src/step-templates/Remove-Hosts-File-Entry/metadata.json
index 88154e071..8b09f05e3 100644
--- a/step-templates/Remove-Hosts-File-Entry.json
+++ b/src/step-templates/Remove-Hosts-File-Entry/metadata.json
@@ -7,7 +7,7 @@
   "CommunityActionTemplateId": null,
   "Packages": [],
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ip = $OctopusParameters['IP']\n$hostName = $OctopusParameters['HostName']\n\n$hostsPath = \"$env:windir\\System32\\drivers\\etc\\hosts\"\n$hosts = Get-Content $hostsPath\n$match = $hosts -match (\"^\\s*$ip\\s+$hostName\" -replace '\\.', '\\.')\n$hostsEntry = \"$ip`t$hostName\"\n\nIf ($match) {\nwrite-host $hostsPath $hostsEntry \" exist, then it will be removed.\"\n}\nelse\n{\nwrite-host $hostsPath $hostsEntry \"not exist\"\nExit\n}\n\n(Get-Content -Path $hostsPath) |\n    ForEach-Object {$_ -Replace \"$hostsEntry\"} |\n        Set-Content -Path $hostsPath -Verbose",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
@@ -34,7 +34,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-08-04T20:32:55.063Z",
+    "ExportedAt": "2021-08-04T20:32:55.0630000Z",
     "OctopusVersion": "2020.4.6",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/Remove-Hosts-File-Entry/scriptbody.ps1 b/src/step-templates/Remove-Hosts-File-Entry/scriptbody.ps1
new file mode 100644
index 000000000..0749f372c
--- /dev/null
+++ b/src/step-templates/Remove-Hosts-File-Entry/scriptbody.ps1
@@ -0,0 +1,20 @@
+$ip = $OctopusParameters['IP']
+$hostName = $OctopusParameters['HostName']
+
+$hostsPath = "$env:windir\System32\drivers\etc\hosts"
+$hosts = Get-Content $hostsPath
+$match = $hosts -match ("^\s*$ip\s+$hostName" -replace '\.', '\.')
+$hostsEntry = "$ip`t$hostName"
+
+If ($match) {
+write-host $hostsPath $hostsEntry " exist, then it will be removed."
+}
+else
+{
+write-host $hostsPath $hostsEntry "not exist"
+Exit
+}
+
+(Get-Content -Path $hostsPath) |
+    ForEach-Object {$_ -Replace "$hostsEntry"} |
+        Set-Content -Path $hostsPath -Verbose
\ No newline at end of file
diff --git a/src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/metadata.json b/src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/metadata.json
new file mode 100644
index 000000000..2316deb6e
--- /dev/null
+++ b/src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/metadata.json
@@ -0,0 +1,93 @@
+{
+  "Id": "b362bd69-4a69-42c1-bcb5-2a134549ef3f",
+  "Name": "SQL - Query Octopus Database for Fragmentation",
+  "Description": "This step template will run a fragmentation query on your Octopus database and report the results of the tables.\n\nIf you would like to set this up as a scheduled runbook and get the results in an email, please follow these instructions:\n1) Create a Send an Email step after this step in your process\n2) Set the body type of that email to HTML, and the body to#{Octopus.Action[STEPNAMEHERE].Output.EmailData} \n3) Set the Run Condition of that Send an Email step to Variable, and the value to #{if Octopus.Action[STEPNAMEHERE].Output.Alert== \"True\"}True#{/if}. If you don't do this, you will receive an email regardless of if the threshold was hit.'",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "05a6a3f3-3cb9-4d75-abac-b2125fb84a3b",
+      "Name": "IndexFragmentSQLServer",
+      "Label": "SQL Server",
+      "HelpText": "Enter the Hostname or IP address of your server. Include \\Instance if necessary.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8d6081b3-b934-475b-8b73-cde72f5d085d",
+      "Name": "IndexFragmentSQLPort",
+      "Label": "SQL Server Port",
+      "HelpText": "If left blank, 1433 will be used by default.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "42671f3c-763e-4dbd-836d-ed794d4b0005",
+      "Name": "IndexFragmentDatabaseName",
+      "Label": "SQL Server Database Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0e439749-1fa9-40f2-9843-126ade5576b1",
+      "Name": "IndexFragmentFragmentation",
+      "Label": "Fragmentation Threshold",
+      "HelpText": "Input the percentage of Fragmentation you would like to be alerted for.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7050d208-a267-412a-9677-95e90909264c",
+      "Name": "IndexFragmentPageCount",
+      "Label": "Page Count Threshold",
+      "HelpText": "Input the minimum page count a table must have to be considered in the results.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4a9d3846-c454-483f-9066-60a1f2cf7413",
+      "Name": "IndexFragmentSQLUsername",
+      "Label": "SQL Server Authentication Username",
+      "HelpText": "Please leave blank if you want to use Integrated Security.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f04df930-bb05-49c1-b6f0-51e97dce3bad",
+      "Name": "IndexFragmentSQLPassword",
+      "Label": "SQL Server Authentication Password",
+      "HelpText": "Please leave blank if you want to use Integrated Security.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-05-25T19:02:40.3820000Z",
+    "OctopusVersion": "2020.6.4722",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "millerjn21",
+  "Category": "sql"
+}
diff --git a/src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/scriptbody.ps1 b/src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/scriptbody.ps1
new file mode 100644
index 000000000..9d3e9bbcc
--- /dev/null
+++ b/src/step-templates/SQL-Query-Octopus-Database-for-Fragmentation/scriptbody.ps1
@@ -0,0 +1,129 @@
+###PARAMETERS
+
+[string]$sqlUsername = $OctopusParameters["IndexFragmentSQLUsername"]
+[string]$sqlPassword = $OctopusParameters["IndexFragmentSQLPassword"]
+[int]$threshold = $OctopusParameters["IndexFragmentFragmentation"]
+[string]$SQLServer = $OctopusParameters["IndexFragmentSQLServer"]
+[string]$SQLPort = $OctopusParameters["IndexFragmentSQLPort"]
+[string]$databaseName = $OctopusParameters["IndexFragmentDatabaseName"]
+[string]$pageCount = $OctopusParameters["IndexFragmentPageCount"]
+
+
+if ([string]::IsNullOrWhiteSpace($SQLPort)){
+$SQLPort = "1433"
+}
+
+#create the full sql server string
+[string]$SQLServerFull = $SQLServer + "," + $SQLPort
+
+#creating the connectionString based on choice of auth
+if ([string]::IsNullOrWhiteSpace($sqlUserName)){
+	Write-Highlight "Integrated Authentication being used to connect to SQL."
+    $connectionString = "Server=$SQLServerFull;Database=$databaseName;integrated security=true;"
+}
+else {
+	Write-Highlight "SQL Authentication being used to connect to SQL"
+    $connectionString = "Server=$SQLServerFull;Database=$databaseName;User ID=$sqlUsername;Password=$sqlPassword;"
+}
+
+#function for running the query
+function ExecuteSqlQuery ($connectionString, $SQLQuery) {
+    $Datatable = New-Object System.Data.DataTable
+    $Connection = New-Object System.Data.SQLClient.SQLConnection
+    $Connection.ConnectionString = $connectionString
+	try{
+    	$Connection.Open()
+    	$Command = New-Object System.Data.SQLClient.SQLCommand
+    	$Command.Connection = $Connection
+    	$Command.CommandText = $SQLQuery
+    	$Reader = $Command.ExecuteReader()
+    	$Datatable.Load($Reader)
+    }
+    catch{
+    	Write-Error $_.Exception.Message
+    }
+    finally{
+    	if (($Connection.State) -ne "Closed"){
+        Write-Highlight "Closing the SQL Connection."
+    	$Connection.Close()   
+        }
+    }
+    return $Datatable
+}
+
+#Create the query for fragmentation check
+$query = @"
+SELECT S.name as 'Schema',
+T.name as 'Table',
+I.name as 'Index',
+DDIPS.avg_fragmentation_in_percent,
+DDIPS.page_count
+FROM sys.dm_db_index_physical_stats (DB_ID(), NULL, NULL, NULL, NULL) AS DDIPS
+INNER JOIN sys.tables T on T.object_id = DDIPS.object_id
+INNER JOIN sys.schemas S on T.schema_id = S.schema_id
+INNER JOIN sys.indexes I ON I.object_id = DDIPS.object_id
+AND DDIPS.index_id = I.index_id
+WHERE DDIPS.database_id = DB_ID()
+and I.name is not null
+AND DDIPS.avg_fragmentation_in_percent > 0
+ORDER BY DDIPS.avg_fragmentation_in_percent desc
+"@
+
+#Run the query against the server and return as a dataset
+$resultsDataTable = New-Object System.Data.DataTable
+$resultsDataTable = ExecuteSqlQuery $connectionString $query 
+
+#creating variables for later use
+$highestFrag = 0
+$array = @()
+
+#build an array of html so the data is readable
+$dataforemail = @()
+$dataforemail += "<header>  <h1>SQL Fragmentation Report</h1></header><br>"
+$dataforemail += '<table border="1">'
+$dataforemail += "<tr> <td> Table </td><td>Index</td><td>Fragmentation %</td><td>Page Count</td></td>"
+foreach ($row in $resultsDataTable){
+	#checking if the current row's fragmentation % is higher than our highest if it is, set it
+	if ($row.avg_fragmentation_in_percent -gt $highestFrag -and $row.page_count -gt $pageCount){
+		$highestFrag = $row.avg_fragmentation_in_percent
+	}
+    #if both thresholds are hit, put the data in HTML format and also an array to later write to console.
+	if ($row.avg_fragmentation_in_percent -gt $threshold -and $row.page_count -gt $pageCount){
+        $percent = [math]::Round($row.avg_fragmentation_in_percent,2)
+		$dataforemail += "<tr>" 
+		$dataforemail += "<td>" + $row.Table + "</td>"
+		$dataforemail += "<td>" + $row.Index + "</td>"
+        $dataforemail += "<td>" + [string]$percent + "</td>"
+        $dataforemail += "<td>" + $row.page_count + "</td>"
+		$dataforemail += "</tr>"
+        
+        $arrayRow = "" | Select Table,Index,avg_fragmentation_in_percent,page_count
+    	$arrayRow.Table = $Row.Table
+    	$arrayRow.Index = $Row.Index
+        $arrayRow.avg_fragmentation_in_percent = [string]$percent
+        $arrayRow.page_count = $Row.page_count
+    	$array += $arrayRow
+	}
+}
+$dataforemail += "</table>"
+
+#if the threshold has been reached, output data and create output variable for sending email.
+if ($highestFrag -gt $threshold){
+
+	#convert the array to a string to email
+	[string]$bodyofemail = [string]$dataforemail
+
+	#Create all of the necessary variables and output the data
+		Set-OctopusVariable -name "EmailData" -value "$dataforemail"
+        Set-OctopusVariable -name "Alert" -value "True"
+        $output = $array | Out-String
+        Write-Highlight 'Here are the results for your database fragmentation. The following tables had above the provided fragmentation % and minimum page count. If you would like to get an email alert with the data, please refer to the description of the step template for instructions on setting that up.'
+        Write-Highlight $output
+}
+else{
+
+	Write-Highlight "No alert is required."
+    Set-OctopusVariable -name "Alert" -value "False"
+
+
+}
diff --git a/step-templates/TeamCity-Pin-Build.json b/src/step-templates/TeamCity-Pin-Build/metadata.json
similarity index 62%
rename from step-templates/TeamCity-Pin-Build.json
rename to src/step-templates/TeamCity-Pin-Build/metadata.json
index f4eff28bd..757128cb2 100644
--- a/step-templates/TeamCity-Pin-Build.json
+++ b/src/step-templates/TeamCity-Pin-Build/metadata.json
@@ -1,67 +1,67 @@
-{
-  "Id": "b3137de8-93c9-4a10-8f6a-5dd14175b843",
-  "Name": "Pin TeamCity Build Version",
-  "Description": "Try to pin the TeamCity build version. (Requires Octopus version to match TeamCity version)",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$buildNumber = $OctopusParameters['buildNumber']\r\n$buildTypeId = $OctopusParameters['buildTypeId']\r\n\r\n$tcUrl = $OctopusParameters['TeamCityUrl']\r\n$tcUser = $OctopusParameters['TeamCityUser']\r\n$tcPass = $OctopusParameters['TeamCityPassword']\r\n\r\n[string]$tcRestUrl = $tcUrl + '/httpAuth/app/rest/builds/buildType:{1},number:{0}/pin/'\r\n$url = $tcRestUrl -f $buildNumber,$buildTypeId\r\n\r\nWrite-Host \"****************************\"\r\nWrite-Host \"Pinning build in TeamCity at:\"$url \r\nWrite-Host \"****************************\"\r\n\r\n$req = [System.Net.WebRequest]::Create($url)\r\n$req.Credentials = new-object System.Net.NetworkCredential($tcUser, $tcPass)\r\n$req.Method =\"PUT\"\r\n$req.ContentLength = 0\r\n\r\n$resp = $req.GetResponse()\r\n$reader = new-object System.IO.StreamReader($resp.GetResponseStream())\r\n$reader.ReadToEnd() | Write-Host\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "buildNumber",
-      "Label": "Build Number",
-      "HelpText": null,
-      "DefaultValue": "#{Octopus.Release.Number}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "buildTypeId",
-      "Label": "Build Configuration ID",
-      "HelpText": "The build configuration id to look for the build to pin.\n\nGeneral Settings of the Build Configuration",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "TeamCityUrl",
-      "Label": "Url of TeamCity Server",
-      "HelpText": "The url to the TeamCity server.",
-      "DefaultValue": "http://localhost:8082",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "TeamCityUser",
-      "Label": "TeamCity User",
-      "HelpText": "The TeamCity user used for pinning the build",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "TeamCityPassword",
-      "Label": "TeamCity User Password",
-      "HelpText": "The password for the TeamCity user.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2015-02-11T08:20:13.192+00:00",
-    "OctopusVersion": "2.6.1.796",
-    "Type": "ActionTemplate"
-  },
-  "Category": "teamcity"
-}
\ No newline at end of file
+{
+  "Id": "b3137de8-93c9-4a10-8f6a-5dd14175b843",
+  "Name": "Pin TeamCity Build Version",
+  "Description": "Try to pin the TeamCity build version. (Requires Octopus version to match TeamCity version)",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "buildNumber",
+      "Label": "Build Number",
+      "HelpText": null,
+      "DefaultValue": "#{Octopus.Release.Number}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "buildTypeId",
+      "Label": "Build Configuration ID",
+      "HelpText": "The build configuration id to look for the build to pin.\n\nGeneral Settings of the Build Configuration",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "TeamCityUrl",
+      "Label": "Url of TeamCity Server",
+      "HelpText": "The url to the TeamCity server.",
+      "DefaultValue": "http://localhost:8082",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "TeamCityUser",
+      "Label": "TeamCity User",
+      "HelpText": "The TeamCity user used for pinning the build",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "TeamCityPassword",
+      "Label": "TeamCity User Password",
+      "HelpText": "The password for the TeamCity user.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2015-02-11T00:20:13.1920000-08:00",
+    "OctopusVersion": "2.6.1.796",
+    "Type": "ActionTemplate"
+  },
+  "Category": "teamcity"
+}
diff --git a/src/step-templates/TeamCity-Pin-Build/scriptbody.ps1 b/src/step-templates/TeamCity-Pin-Build/scriptbody.ps1
new file mode 100644
index 000000000..969d0dcf8
--- /dev/null
+++ b/src/step-templates/TeamCity-Pin-Build/scriptbody.ps1
@@ -0,0 +1,22 @@
+$buildNumber = $OctopusParameters['buildNumber']
+$buildTypeId = $OctopusParameters['buildTypeId']
+
+$tcUrl = $OctopusParameters['TeamCityUrl']
+$tcUser = $OctopusParameters['TeamCityUser']
+$tcPass = $OctopusParameters['TeamCityPassword']
+
+[string]$tcRestUrl = $tcUrl + '/httpAuth/app/rest/builds/buildType:{1},number:{0}/pin/'
+$url = $tcRestUrl -f $buildNumber,$buildTypeId
+
+Write-Host "****************************"
+Write-Host "Pinning build in TeamCity at:"$url 
+Write-Host "****************************"
+
+$req = [System.Net.WebRequest]::Create($url)
+$req.Credentials = new-object System.Net.NetworkCredential($tcUser, $tcPass)
+$req.Method ="PUT"
+$req.ContentLength = 0
+
+$resp = $req.GetResponse()
+$reader = new-object System.IO.StreamReader($resp.GetResponseStream())
+$reader.ReadToEnd() | Write-Host
diff --git a/src/step-templates/redgate-sql-clone-create-clone/metadata.json b/src/step-templates/redgate-sql-clone-create-clone/metadata.json
new file mode 100644
index 000000000..92d15de68
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-create-clone/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "96d88bbf-2e0a-4630-b4b6-bd179effedd7",
+  "Name": "Redgate - SQL Clone, Create Clone",
+  "Description": "Creates a database clone with [Redgate SQL Clone](https://www.red-gate.com/products/dba/sql-clone/index).\n\nRequires SQL Clone.\n\n*Version date: 16th May 2019*",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "8c140a4c-65a2-4341-a604-73d14775b3a0",
+      "Name": "cloneServer",
+      "Label": "SQL Clone Server (required)",
+      "HelpText": "The URL for your SQL Clone server (e.g. http://sql-clone.example.com:14145)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e5ac1d04-b8a5-440e-ba69-a5d66a53abba",
+      "Name": "cloneUser",
+      "Label": "SQL Clone User (optional)",
+      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5f6288f2-57c9-4a11-91f2-b0c2e3cb9ccd",
+      "Name": "clonePassword",
+      "Label": "SQL Clone Password (optional)",
+      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ee5286d3-f233-410c-92ab-36743f8743e7",
+      "Name": "imageNameForClone",
+      "Label": "Image Name For Clone (required)",
+      "HelpText": "The name of the database image from which to create database clone.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0edb1e1f-0c27-428b-9ff0-7c76faf1369e",
+      "Name": "templateName",
+      "Label": "Template Name (optional)",
+      "HelpText": "A template to modify this clone (optional).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5e9f4d95-4776-4a0e-8245-05d645bd0997",
+      "Name": "cloneSqlServer",
+      "Label": "SQL Server (required)",
+      "HelpText": "The target SQL Server to create the clone on. This SQL Server instance must have already been added to the SQL Clone Server specified above.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "62da0567-35f5-4c3f-ac9e-61b75a399053",
+      "Name": "cloneName",
+      "Label": "Clone Name (required)",
+      "HelpText": "The name of the clone, which will also be the database name.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ab892024-c4b5-46c2-9434-2ad150e3e014",
+      "Name": "deleteClone",
+      "Label": "Delete clone if exists",
+      "HelpText": "Delete any existing clone with the same name prior to creating this clone.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-05-16T11:37:47.3600000Z",
+  "LastModifiedBy": "alex-yates",
+  "$Meta": {
+    "ExportedAt": "2019-05-16T11:37:47.3600000Z",
+    "OctopusVersion": "2019.2.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-sql-clone-create-clone/scriptbody.ps1 b/src/step-templates/redgate-sql-clone-create-clone/scriptbody.ps1
new file mode 100644
index 000000000..1594535ed
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-create-clone/scriptbody.ps1
@@ -0,0 +1,103 @@
+$ErrorActionPreference = 'Stop'
+
+# The code for this step template is largely a copy/paste job from the
+# Azure DevOps Services step template which is maintained by Redgate:
+# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/ImageTask/SQLCloneCloneTask.ps1
+# The code was copied and adapted on 16th May 2019.
+
+Write-Verbose "cloneServer is $cloneServer"
+Write-Verbose "cloneUser is $cloneUser"
+Write-Verbose "clonePassword is $clonePassword"
+Write-Verbose "imageNameForClone is $imageNameForClone"
+Write-Verbose "templateName is $templateName"
+Write-Verbose "cloneSqlServer is $cloneSqlServer"
+Write-Verbose "cloneName is $cloneName"
+Write-Verbose "deleteClone is $deleteClone"
+
+Write-Debug "Entering script SQLCloneCloneTask.ps1"
+
+# This line is broken: Import-Module "$PSScriptRoot\Modules\RedGate.SQLClone.PowerShell.dll"
+
+if($cloneUser){
+    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force
+    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password
+
+}
+Connect-SqlClone -ServerUrl $cloneServer -Credential $credential
+Write-Output "Connected to SQL Clone server"
+
+        $sqlServerParts = $cloneSqlServer.Split('\', [System.StringSplitOptions]::RemoveEmptyEntries)
+        if ($sqlServerParts.Count -ge 3)
+        {
+            write-error 'SQL Server instance ' + $cloneSqlServer + ' has not been recognised, if specifying a named instance please use "machine\instance"'
+            exit 1
+        }
+        $cloneSqlServerHost = $sqlServerParts[0]
+        $instanceName = ''
+        if ($sqlServerParts.Count -ge 2)
+        {
+            $instanceName = $sqlServerParts[1]
+        }
+        
+        try
+        {
+            $instance = Get-SqlCloneSqlServerInstance -MachineName $cloneSqlServerHost -InstanceName $instanceName
+            Write-Output "Found SQL Server instance"
+        }
+        catch
+        {
+            $instances = Get-SqlCloneSqlServerInstance
+            $instanceNames = "`n"
+            Foreach ($cInstance in $instances)
+            {
+                $instanceNames += $cInstance.Name + "`n"
+            }
+            $message = 'SQL Server instance "' + $cloneSqlServer + '"  has not been added to SQL Clone, available instances:' + $instanceNames
+            write-error $message
+            exit 1
+        }
+        
+        try
+        {
+            $image = Get-SqlCloneImage -Name $imageNameForClone
+            Write-Output "Found image"
+        }
+        catch
+        {
+            $images = Get-SqlCloneImage
+            $imageNames = "`n"
+            Foreach ($cImage in $images)
+            {
+                $imageNames += $cImage.Name + "`n"
+            }
+            $message = 'SQL Clone image "' + $imageNameForClone + '"  has not been added to SQL Clone, available images:' + $imageNames
+            write-error $message
+            exit 1
+        }
+        
+        if($deleteClone)
+        {
+            try
+            {
+                $clone = Get-SqlClone -Name $cloneName -Location $instance
+                Write-Output "Deleting existing clone"
+                Remove-SqlClone -Clone $clone | Wait-SqlCloneOperation
+            }
+            catch
+            {
+                # Clone didn't exist so nothing to do
+            }
+        }
+        if($templateName)
+        {
+            Write-Output "Creating clone with template:" + $templateName
+            $image | New-SqlClone -Name $cloneName -Location $instance -Template $templateName | Wait-SqlCloneOperation
+        }
+        else
+        {            
+            Write-Output "Creating clone"
+            $image | New-SqlClone -Name $cloneName -Location $instance | Wait-SqlCloneOperation            
+        }
+        Write-Output "Finished creating clone"        
+
+Write-Debug "Leaving script SQLCloneCloneTask.ps1"
\ No newline at end of file
diff --git a/src/step-templates/redgate-sql-clone-create-image/metadata.json b/src/step-templates/redgate-sql-clone-create-image/metadata.json
new file mode 100644
index 000000000..fa0eff98a
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-create-image/metadata.json
@@ -0,0 +1,135 @@
+{
+  "Id": "4ff62eff-f615-453e-9a14-ca7bf67cb586",
+  "Name": "Redgate - SQL Clone, Create Image",
+  "Description": "Creates a database image with [Redgate SQL Clone](https://www.red-gate.com/products/dba/sql-clone/index).\n\nRequires SQL Clone.\n\n*Version date: 16th May 2019*",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "8c140a4c-65a2-4341-a604-73d14775b3a0",
+      "Name": "cloneServer",
+      "Label": "SQL Clone Server (required)",
+      "HelpText": "The URL for your SQL Clone server (e.g. http://sql-clone.example.com:14145)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e5ac1d04-b8a5-440e-ba69-a5d66a53abba",
+      "Name": "cloneUser",
+      "Label": "SQL Clone User (optional)",
+      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5f6288f2-57c9-4a11-91f2-b0c2e3cb9ccd",
+      "Name": "clonePassword",
+      "Label": "SQL Clone Password (optional)",
+      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ee5286d3-f233-410c-92ab-36743f8743e7",
+      "Name": "imageName",
+      "Label": "Image Name (required)",
+      "HelpText": "The name of your database image.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0edb1e1f-0c27-428b-9ff0-7c76faf1369e",
+      "Name": "imageLocation",
+      "Label": "Image Location (required)",
+      "HelpText": "Images need to have a UNC (network share) path destination in order to be shared with other machines. For example: \\\\servername\\fileshare\\images",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "aa803a9d-ab55-4e36-969c-3b0e3637d36e",
+      "Name": "sourceInstance",
+      "Label": "Source SQL Server Instance (required)",
+      "HelpText": "For example: MYSERVER\\MYINSTANCE",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "39c29a4a-f483-4b96-bf08-238bb677835d",
+      "Name": "sourceType",
+      "Label": "Image Source Type (required)",
+      "HelpText": "Images can be created from a backup file (.bak or .sqb) or from a SQL Server database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "database|SQL Server Database\nbackup|Backup file(s)"
+      }
+    },
+    {
+      "Id": "5e9f4d95-4776-4a0e-8245-05d645bd0997",
+      "Name": "sourceDatabase",
+      "Label": "Source Database (required if Source Type is SQL Server Database)",
+      "HelpText": "The database from which to create the image.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "62da0567-35f5-4c3f-ac9e-61b75a399053",
+      "Name": "sourceFileNames",
+      "Label": "Source File Names (required if Source Type is Backup File(s))",
+      "HelpText": "For striped and/or differential backups, separate multiple file paths with ;",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ab892024-c4b5-46c2-9434-2ad150e3e014",
+      "Name": "sourceFilePassword",
+      "Label": "Source File Password (optional)",
+      "HelpText": "Source backup file password.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "a758e9de-05c6-4879-8541-d7f73215fe87",
+      "Name": "modificationScriptFiles",
+      "Label": "Modification Script Files (optional)",
+      "HelpText": "SQL scripts and/or Data Masker masking set files (Data Masker must be installed on the clone agent machine), separate multiple file paths with ;",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-05-16T11:37:47.3600000Z",
+  "LastModifiedBy": "alex-yates",
+  "$Meta": {
+    "ExportedAt": "2019-05-16T11:37:47.3600000Z",
+    "OctopusVersion": "2019.2.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-sql-clone-create-image/scriptbody.ps1 b/src/step-templates/redgate-sql-clone-create-image/scriptbody.ps1
new file mode 100644
index 000000000..db21f2e31
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-create-image/scriptbody.ps1
@@ -0,0 +1,124 @@
+$ErrorActionPreference = 'Stop'
+
+# The code for this step template is largely a copy/paste job from the
+# Azure DevOps Services step template which is maintained by Redgate:
+# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/ImageTask/SQLCloneImageTask.ps1
+# The code was copied and adapted on 16th May 2019.
+
+Write-Verbose "cloneServer is $cloneServer"
+Write-Verbose "cloneUser is $cloneUser"
+Write-Verbose "clonePassword is $clonePassword"
+Write-Verbose "sourceType is $sourceType"
+Write-Verbose "imageName is $imageName"
+Write-Verbose "imageLocation is $imageLocation"
+Write-Verbose "sourceInstance is $sourceInstance"
+Write-Verbose "sourceDatabase is $sourceDatabase"
+Write-Verbose "sourceFileNames is $sourceFileNames"
+Write-Verbose "sourceFilePassword is $sourceFilePassword"
+Write-Verbose "modificationScriptFiles is $modificationScriptFiles"
+
+Write-Debug "Entering script SQLCloneImageTask.ps1"
+
+# This line is broken: Import-Module "$PSScriptRoot\Modules\RedGate.SQLClone.PowerShell.dll"
+
+if($cloneUser){
+    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force
+    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password
+
+}
+Connect-SqlClone -ServerUrl $cloneServer -Credential $credential
+Write-Output "Connected to SQL Clone server"
+
+    try
+    {
+        $cloneImageLocation = Get-SqlCloneImageLocation $imageLocation
+        Write-Output "Found image location"
+    }
+    catch
+    {
+        $imageLocations = Get-SqlCloneImageLocation
+        $imageLocationNames = "`n"
+        Foreach ($cImageLocation in $imageLocations)
+        {
+            $imageLocationNames += $cImageLocation.Path + "`n"
+        }
+        $message = 'SQL Clone image location "' + $imageLocation + '"  has not been added to SQL Clone, available locations:' + $imageLocationNames
+        write-error $message
+        exit 1
+    }
+
+    $sqlServerParts = $sourceInstance.Split('\', [System.StringSplitOptions]::RemoveEmptyEntries)
+    if ($sqlServerParts.Count -ge 3)
+    {
+        write-error 'SQL Server instance ' + $sourceInstance + ' has not been recognised, if specifying a named instance please use "machine\instance"'
+        exit 1
+    }
+    $cloneSqlServerHost = $sqlServerParts[0]
+    $instanceName = ''
+    if ($sqlServerParts.Count -ge 2)
+    {
+        $instanceName = $sqlServerParts[1]
+    }
+    
+    try
+    {
+        $instance = Get-SqlCloneSqlServerInstance -MachineName $cloneSqlServerHost -InstanceName $instanceName
+        Write-Output "Found SQL Server instance"
+    }
+    catch
+    {
+        $instances = Get-SqlCloneSqlServerInstance
+        $instanceNames = "`n"
+        Foreach ($cInstance in $instances)
+        {
+            $instanceNames += $cInstance.Name + "`n"
+        }
+        $message = 'SQL Server instance "' + $sourceInstance + '"  has not been added to SQL Clone, available instances:' + $instanceNames
+        write-error $message
+        exit 1
+    }
+
+    $modificationScripts = @()
+    if($modificationScriptFiles){
+        $modificationFiles = $modificationScriptFiles.Split(';', [System.StringSplitOptions]::RemoveEmptyEntries)
+            
+        Foreach ($modificationScriptFile in $modificationFiles)
+        {
+            if ($modificationScriptFile -Like "*.sql")
+            {
+                $modificationScripts += New-SqlCloneSqlScript -Path $modificationScriptFile
+            }
+
+            if ($modificationScriptFile -Like "*.dmsmaskset")
+            {
+                $modificationScripts += New-SqlCloneMask -Path $modificationScriptFile
+            }
+        }
+    }
+    
+    if ($sourceType -eq 'database')
+    {
+        Write-Output "Source type = database"
+        Write-Output "Creating image"
+        $NewImage = New-SqlCloneImage -Name $imageName -SqlServerInstance $instance -DatabaseName $sourceDatabase -Destination $cloneImageLocation -Modifications $modificationScripts | Wait-SqlCloneOperation    
+        Write-Output "Finished creating image"
+    }
+    else
+    {
+        Write-Output "Source type = backup"
+        $backupFiles = $sourceFileNames.Split(';', [System.StringSplitOptions]::RemoveEmptyEntries)
+        Write-Output "Creating image from backup"
+        if($sourceFilePassword)
+        {
+            $NewImage = New-SqlCloneImage -Name $imageName -SqlServerInstance $instance -BackupFileName $backupFiles -BackupPassword $sourceFilePassword -Destination $cloneImageLocation -Modifications $modificationScripts | Wait-SqlCloneOperation
+        }
+        else
+        {
+            $NewImage = New-SqlCloneImage -Name $imageName -SqlServerInstance $instance -BackupFileName $backupFiles -Destination $cloneImageLocation -Modifications $modificationScripts | Wait-SqlCloneOperation
+        }
+        Write-Output "Finished creating image from backup"        
+    }
+
+    
+
+Write-Debug "Leaving script SQLCloneImageTask.ps1"
diff --git a/src/step-templates/redgate-sql-clone-delete-clone/metadata.json b/src/step-templates/redgate-sql-clone-delete-clone/metadata.json
new file mode 100644
index 000000000..f9a76b02b
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-delete-clone/metadata.json
@@ -0,0 +1,74 @@
+{
+  "Id": "b13ba90b-3e67-4175-aad4-9531783c4c11",
+  "Name": "Redgate - SQL Clone, Delete Clone",
+  "Description": "Deletes a database clone with [Redgate SQL Clone](https://www.red-gate.com/products/dba/sql-clone/index).\n\nRequires SQL Clone.\n\n*Version date: 16th May 2019*",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "8c140a4c-65a2-4341-a604-73d14775b3a0",
+      "Name": "cloneServer",
+      "Label": "SQL Clone Server (required)",
+      "HelpText": "The URL for your SQL Clone server (e.g. http://sql-clone.example.com:14145)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e5ac1d04-b8a5-440e-ba69-a5d66a53abba",
+      "Name": "cloneUser",
+      "Label": "SQL Clone User (optional)",
+      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5f6288f2-57c9-4a11-91f2-b0c2e3cb9ccd",
+      "Name": "clonePassword",
+      "Label": "SQL Clone Password (optional)",
+      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ab892024-c4b5-46c2-9434-2ad150e3e014",
+      "Name": "cloneSqlServer",
+      "Label": "SQL Server Instance (required)",
+      "HelpText": "The SQL Server instance the clone exists on. This SQL Server instance must have already been added to the SQL Clone Server specified above.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a758e9de-05c6-4879-8541-d7f73215fe87",
+      "Name": "cloneName",
+      "Label": "Clone Name (required)",
+      "HelpText": "The name of the clone to delete.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2019-05-16T11:37:47.3600000Z",
+  "LastModifiedBy": "alex-yates",
+  "$Meta": {
+    "ExportedAt": "2019-05-16T11:37:47.3600000Z",
+    "OctopusVersion": "2019.2.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redgate"
+}
diff --git a/src/step-templates/redgate-sql-clone-delete-clone/scriptbody.ps1 b/src/step-templates/redgate-sql-clone-delete-clone/scriptbody.ps1
new file mode 100644
index 000000000..28781e001
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-delete-clone/scriptbody.ps1
@@ -0,0 +1,78 @@
+$ErrorActionPreference = 'Stop'
+
+Write-Debug "Entering script SQLCloneDeleteTask.ps1"
+
+# The code for this step template is largely a copy/paste job from the
+# Azure DevOps Services step template which is maintained by Redgate:
+# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/ImageTask/SQLCloneImageTask.ps1
+# The code was copied and adapted on 16th May 2019.
+
+Write-Verbose "cloneServer is $cloneServer"
+Write-Verbose "cloneUser is $cloneUser"
+Write-Verbose "clonePassword is $clonePassword"
+Write-Verbose "cloneSqlServer is $cloneSqlServer"
+Write-Verbose "cloneName is $cloneName"
+
+# This line is broken: Import-Module "$PSScriptRoot\Modules\RedGate.SQLClone.PowerShell.dll"
+
+if($cloneUser){
+    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force
+    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password
+
+}
+Connect-SqlClone -ServerUrl $cloneServer -Credential $credential
+Write-Output "Connected to SQL Clone server"
+
+        $sqlServerParts = $cloneSqlServer.Split('\', [System.StringSplitOptions]::RemoveEmptyEntries)
+        if ($sqlServerParts.Count -ge 3)
+        {
+            write-error 'SQL Server instance "' + $cloneSqlServer + '" has not been recognised, if specifying a named instance please use "machine\instance"'
+            exit 1
+        }
+        $cloneSqlServerHost = $sqlServerParts[0]
+        $instanceName = ''
+        if ($sqlServerParts.Count -ge 2)
+        {
+            $instanceName = $sqlServerParts[1]
+        }
+        try
+        {
+            $instance = Get-SqlCloneSqlServerInstance -MachineName $cloneSqlServerHost -InstanceName $instanceName
+            Write-Output "Found SQL Server instance"
+        }
+        catch
+        {
+            $instances = Get-SqlCloneSqlServerInstance
+            $instanceNames = "`n"
+            Foreach ($cInstance in $instances)
+            {
+                $instanceNames += $cInstance.Name + "`n"
+            }
+            $message = 'SQL Server instance "' + $cloneSqlServer + '"  has not been added to SQL Clone, available instances:' + $instanceNames
+            write-error $message
+            exit 1
+        }
+        
+        try
+        {
+            $clone = Get-SqlClone -Name $cloneName -Location $instance
+            Write-Output "Found clone"
+        }
+        catch
+        {
+            $clones = Get-SqlClone -Location $instance
+            $cloneNames = "`n"
+            Foreach ($cClone in $clones)
+            {
+                $cloneNames += $cClone.Name + "`n"
+            }
+            $message = 'SQL Clone clone ' + $cloneName + ' does not exist, available clones on SQL instance "' + $cloneSqlServer + '":' + $cloneNames
+            write-error $message
+            exit 1
+        }
+        
+        Write-Output "Deleting clone"
+        Remove-SqlClone -Clone $clone | Wait-SqlCloneOperation
+        Write-Output "Finished deleting clone"     
+
+Write-Debug "Leaving script SQLCloneDeleteTask.ps1"
\ No newline at end of file
diff --git a/step-templates/redgate-sql-clone-delete-image.json b/src/step-templates/redgate-sql-clone-delete-image/metadata.json
similarity index 51%
rename from step-templates/redgate-sql-clone-delete-image.json
rename to src/step-templates/redgate-sql-clone-delete-image/metadata.json
index c0ab11fcd..71b25a134 100644
--- a/step-templates/redgate-sql-clone-delete-image.json
+++ b/src/step-templates/redgate-sql-clone-delete-image/metadata.json
@@ -6,10 +6,10 @@
   "Version": 1,
   "CommunityActionTemplateId": null,
   "Packages": [],
-  "Properties":  {
+  "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# The code for this step template is largely a copy/paste job from the\n# Azure DevOps Services step template which is maintained by Redgate:\n# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/DeleteImageTask/SQLCloneDeleteImageTask.ps1\n# The code was copied and adapted on 16th May 2019.\n\nWrite-Verbose \"cloneServer is $cloneServer\"\nWrite-Verbose \"cloneUser is $cloneUser\"\nWrite-Verbose \"clonePassword is $clonePassword\"\nWrite-Verbose \"imageName is $imageName\"\n\n# This line is broken: Import-Module \"$PSScriptRoot\\Modules\\RedGate.SQLClone.PowerShell.dll\"\n\nif($cloneUser){\n    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force\n    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password\n\n}\nConnect-SqlClone -ServerUrl $cloneServer -Credential $credential\nWrite-Output \"Connected to SQL Clone server\"\n        \n        try\n        {\n            $image = Get-SqlCloneImage -Name $imageName\n            Write-Output \"Found image\"\n        }\n        catch\n        {\n            $images = Get-SqlCloneImage\n            $imageNames = \"`n\"\n            Foreach ($cImage in $images)\n            {\n                $imageNames += $cImage.Name + \"`n\"\n            }\n            $message = 'SQL Clone image ' + $imageName + ' does not exist, available images: ' + $imageNames\n            write-error $message\n            exit 1\n        }\n        \n        Write-Output \"Deleting image\"\n        Remove-SqlCloneImage -Image $image | Wait-SqlCloneOperation\n        Write-Output \"Finished deleting image\"     \n\nWrite-Debug \"Leaving script SQLCloneDeleteImageTask.ps1\"\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -53,12 +53,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2019-05-16T11:37:47.360Z",
+  "LastModifiedOn": "2019-05-16T11:37:47.3600000Z",
   "LastModifiedBy": "alex-yates",
   "$Meta": {
-    "ExportedAt": "2019-05-16T11:37:47.360Z",
+    "ExportedAt": "2019-05-16T11:37:47.3600000Z",
     "OctopusVersion": "2019.2.7",
     "Type": "ActionTemplate"
   },
   "Category": "redgate"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/redgate-sql-clone-delete-image/scriptbody.ps1 b/src/step-templates/redgate-sql-clone-delete-image/scriptbody.ps1
new file mode 100644
index 000000000..e40a0abd7
--- /dev/null
+++ b/src/step-templates/redgate-sql-clone-delete-image/scriptbody.ps1
@@ -0,0 +1,45 @@
+$ErrorActionPreference = 'Stop'
+
+# The code for this step template is largely a copy/paste job from the
+# Azure DevOps Services step template which is maintained by Redgate:
+# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/DeleteImageTask/SQLCloneDeleteImageTask.ps1
+# The code was copied and adapted on 16th May 2019.
+
+Write-Verbose "cloneServer is $cloneServer"
+Write-Verbose "cloneUser is $cloneUser"
+Write-Verbose "clonePassword is $clonePassword"
+Write-Verbose "imageName is $imageName"
+
+# This line is broken: Import-Module "$PSScriptRoot\Modules\RedGate.SQLClone.PowerShell.dll"
+
+if($cloneUser){
+    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force
+    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password
+
+}
+Connect-SqlClone -ServerUrl $cloneServer -Credential $credential
+Write-Output "Connected to SQL Clone server"
+        
+        try
+        {
+            $image = Get-SqlCloneImage -Name $imageName
+            Write-Output "Found image"
+        }
+        catch
+        {
+            $images = Get-SqlCloneImage
+            $imageNames = "`n"
+            Foreach ($cImage in $images)
+            {
+                $imageNames += $cImage.Name + "`n"
+            }
+            $message = 'SQL Clone image ' + $imageName + ' does not exist, available images: ' + $imageNames
+            write-error $message
+            exit 1
+        }
+        
+        Write-Output "Deleting image"
+        Remove-SqlCloneImage -Image $image | Wait-SqlCloneOperation
+        Write-Output "Finished deleting image"     
+
+Write-Debug "Leaving script SQLCloneDeleteImageTask.ps1"
diff --git a/src/step-templates/redis-install/metadata.json b/src/step-templates/redis-install/metadata.json
new file mode 100644
index 000000000..4c1d36a99
--- /dev/null
+++ b/src/step-templates/redis-install/metadata.json
@@ -0,0 +1,70 @@
+{
+  "Id": "3cf1dadf-169d-4fd2-b95b-f5f07343b911",
+  "Name": "Redis - Install service",
+  "Description": "Script will make sure that Redis server is installed as a Windows service\n\n- It will start Redis inside package directory\n- To provide custom config you can prepare your own package (e.g. my-redis-64) or improve this template",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "2fdb42bf-b1f0-4187-b925-bdf4975090e4",
+      "Name": "ris_UnpackageStep",
+      "Label": "Unpackage step",
+      "HelpText": "The step where you unpack the topshelf service",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "58802353-e686-421c-b71c-8866759eca42",
+      "Name": "ris_ServiceName",
+      "Label": "Service name",
+      "HelpText": null,
+      "DefaultValue": "Redis",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "0f7fdded-881d-4bb8-94ee-5d6d71d38575",
+      "Name": "ris_Port",
+      "Label": "Port",
+      "HelpText": null,
+      "DefaultValue": "6379",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "e7411860-8679-4519-b871-dd9724ee357e",
+      "Name": "ris_ForceReinstall",
+      "Label": "Force reinstall",
+      "HelpText": "Service with the same name will be removed before installation",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "J-Sek",
+  "$Meta": {
+    "ExportedAt": "2017-08-31T23:11:05.0000000Z",
+    "OctopusVersion": "3.16.6",
+    "Type": "ActionTemplate"
+  },
+  "Category": "redis"
+}
diff --git a/src/step-templates/redis-install/scriptbody.ps1 b/src/step-templates/redis-install/scriptbody.ps1
new file mode 100644
index 000000000..6b2e5e201
--- /dev/null
+++ b/src/step-templates/redis-install/scriptbody.ps1
@@ -0,0 +1,67 @@
+$step  = $OctopusParameters['ris_UnpackageStep']
+$force = $OctopusParameters['ris_ForceReinstall']
+$name  = $OctopusParameters['ris_ServiceName']
+$port  = $OctopusParameters['ris_Port']
+
+$outputPath = $OctopusParameters["Octopus.Action[$step].Package.CustomInstallationDirectory"]
+if(!$outputPath) 
+{
+    $outputPath = $OctopusParameters["Octopus.Action[$step].Output.Package.InstallationDirectoryPath"]
+}
+if(!$outputPath) 
+{
+    Throw "Unable to find output path for step $step. Make sure you've selected the correct step for your package."
+}
+
+$path   = Join-Path $outputPath '\tools\redis-server.exe'
+if (-not (Test-Path $path) )
+{
+    Throw "$path was not found"
+}
+
+$service = Get-Service -Name $name -ErrorAction SilentlyContinue
+if ($service) {
+
+    if (-not $force) {
+        Write-Host "Service already installed. Skipping this time."
+        return
+    }
+
+    Write-Host ">>> Uninstalling with: sc.exe"
+    if ($service.Status -eq 'Running') {
+        &"sc.exe" stop $name | Write-Host
+    }
+    &"sc.exe" delete $name | Write-Host
+
+    $limit = 15
+    while (Get-Service -Name $name -ErrorAction SilentlyContinue) {
+        Start-Sleep -s 1
+        
+        $limit = $limit - 1
+        if ($limit -eq 0) {
+            Throw "Unable to stop Redis service within 15s"
+        }
+    }
+}
+
+Write-Host ">>> Installing with: $path"
+
+Set-Location $outputPath
+
+& $path --service-install --service-name $name --port $port | echo
+& $path --service-start   --service-name $name              | echo
+
+Write-Host ">>> Verification: Expecting the service with 'Running' status"
+
+$limit = 15
+do {
+    Start-Sleep -s 1
+
+    $limit = $limit - 1
+    if ($limit -eq 0) {
+        Throw "Redis service did not start within 15s"
+    }
+
+    $service = Get-Service -Name $name -ErrorAction SilentlyContinue
+
+} until ($service -and $service.Status -eq 'Running')
\ No newline at end of file
diff --git a/step-templates/redis-uninstall.json b/src/step-templates/redis-uninstall/metadata.json
similarity index 58%
rename from step-templates/redis-uninstall.json
rename to src/step-templates/redis-uninstall/metadata.json
index d06d774fe..b87d37a11 100644
--- a/step-templates/redis-uninstall.json
+++ b/src/step-templates/redis-uninstall/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$name = $OctopusParameters['rus_ServiceName']\r\n\r\n$service = Get-Service -Name $name -ErrorAction SilentlyContinue\r\n\r\nif (-not $service) {\r\n    Write-Host \">>> $name service not found. Skipping this time.\"\r\n    return\r\n}\r\n\r\nWrite-Host \">>> Uninstalling with: sc.exe\"\r\nif ($service.Status -eq 'Running') {\r\n    &\"sc.exe\" stop $name | Write-Host\r\n}\r\n&\"sc.exe\" delete $name | Write-Host\r\n\r\n$limit = 15\r\nwhile (Get-Service -Name $name -ErrorAction SilentlyContinue) {\r\n    Start-Sleep -s 1\r\n    \r\n    $limit = $limit - 1\r\n    if ($limit -eq 0) {\r\n        Throw \"Unable to stop Redis service within 15s\"\r\n    }\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -29,9 +29,9 @@
   ],
   "LastModifiedBy": "J-Sek",
   "$Meta": {
-    "ExportedAt": "2017-08-31T23:11:05.000Z",
+    "ExportedAt": "2017-08-31T23:11:05.0000000Z",
     "OctopusVersion": "3.16.6",
     "Type": "ActionTemplate"
   },
   "Category": "redis"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/redis-uninstall/scriptbody.ps1 b/src/step-templates/redis-uninstall/scriptbody.ps1
new file mode 100644
index 000000000..1e10d965f
--- /dev/null
+++ b/src/step-templates/redis-uninstall/scriptbody.ps1
@@ -0,0 +1,24 @@
+$name = $OctopusParameters['rus_ServiceName']
+
+$service = Get-Service -Name $name -ErrorAction SilentlyContinue
+
+if (-not $service) {
+    Write-Host ">>> $name service not found. Skipping this time."
+    return
+}
+
+Write-Host ">>> Uninstalling with: sc.exe"
+if ($service.Status -eq 'Running') {
+    &"sc.exe" stop $name | Write-Host
+}
+&"sc.exe" delete $name | Write-Host
+
+$limit = 15
+while (Get-Service -Name $name -ErrorAction SilentlyContinue) {
+    Start-Sleep -s 1
+    
+    $limit = $limit - 1
+    if ($limit -eq 0) {
+        Throw "Unable to stop Redis service within 15s"
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/register-linux-tentacle/metadata.json b/src/step-templates/register-linux-tentacle/metadata.json
new file mode 100644
index 000000000..9d7b322dc
--- /dev/null
+++ b/src/step-templates/register-linux-tentacle/metadata.json
@@ -0,0 +1,82 @@
+{
+  "Id": "0f119877-288c-4110-aec9-0f693c2e7922",
+  "Name": "Register Linux Tentacle",
+  "Description": "This Step Template will Register a Linux Tentacle.\n[Reference](https://octopus.com/docs/infrastructure/deployment-targets/linux).",
+  "ActionType": "Octopus.Script",
+  "Version": 17,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "c79678c9-4d64-417d-982f-904683631240",
+      "Name": "apikey",
+      "Label": "API Key",
+      "HelpText": "API Key with appropriate access",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "bca181ad-f28b-42a3-ab2c-c79274224c11",
+      "Name": "accountname",
+      "Label": "Account Name",
+      "HelpText": "The Account Name with access to the Host name to register",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3ace411d-18d2-4349-ab8d-02823e933f6e",
+      "Name": "hostdetails",
+      "Label": "HostName/IPaddress",
+      "HelpText": "HostName or IPaddress of the Machine to register",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "517a89a1-be83-4cce-9e32-8359d0715686",
+      "Name": "role",
+      "Label": "Role Name",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "37527e4f-643a-4e06-9650-1a40d11d7b7a",
+      "Name": "machineName",
+      "Label": "Machine Name",
+      "HelpText": "Machine Name to register",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2017-01-09T12:46:19.0410000-08:00",
+  "LastModifiedBy": "benjimac93",
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Linux"
+}
diff --git a/src/step-templates/register-linux-tentacle/scriptbody.ps1 b/src/step-templates/register-linux-tentacle/scriptbody.ps1
new file mode 100644
index 000000000..368fb7632
--- /dev/null
+++ b/src/step-templates/register-linux-tentacle/scriptbody.ps1
@@ -0,0 +1,60 @@
+$envname = "#{Octopus.Environment.Name}"
+$serverurl = "#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}"
+
+$headers = @{"X-Octopus-ApiKey"="$apikey"}
+$putHeaders = @{"X-HTTP-Method-Override"="PUT"; "X-Octopus-ApiKey"="$apikey"}
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-WebRequest "$serverurl/api" -Headers $headers -Method Get -UseBasicParsing | ConvertFrom-Json;
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if(Test-SpacesApi) {
+	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which could indicate you do not have the correct permissions.";
+    }
+	$baseApiUrl = "/api/$spaceId" ;
+} else {
+	$baseApiUrl = "/api" ;
+}
+
+$environments = Invoke-RestMethod "$serverurl$baseApiUrl/environments/all" -Headers $headers -Method Get
+$theEnvironment = $environments | ? { $_.Name -eq $envname }
+
+$machines = Invoke-RestMethod "$serverurl$baseApiUrl/machines/all" -Headers $headers -Method Get
+$theMachine = $machines | ? { $_.Name -eq $machineName }
+
+$accounts = Invoke-RestMethod "$serverurl$baseApiUrl/accounts/all" -Headers $headers -Method Get
+$theAccount = $accounts | ? { $_.Name -eq $accountname }
+
+if (!($theMachine.Name -eq $machineName))
+{
+	#this returns a MachineResource, but we need to post a DeploymentTargetResource which requires environments and roles
+	$discovered = Invoke-RestMethod "$serverurl$baseApiUrl/machines/discover?host=$hostdetails&type=Ssh" -Headers $headers -Method Get
+    $discovered.Endpoint.AccountId = $theAccount.Id
+    $discovered.Name = $machineName
+	$discovered | add-member -Name "Roles" -value @($role) -MemberType NoteProperty
+    $discovered | add-member -Name "EnvironmentIds" -value @($theEnvironment.Id) -MemberType NoteProperty
+	
+    $registerStatus = Invoke-RestMethod "$serverurl$baseApiUrl/machines" -Headers $headers -Method Post -Body ($discovered | ConvertTo-Json -Depth 10)
+    
+    If ($registerStatus.Status -eq "Online")
+    {
+        Write-Output "$registerStatus.Name is Successfully Registered"
+    }
+    else
+    {
+        Write-Warning "$hostdetails had issues, Please check Environments Page"
+    }
+}
+else
+{
+    Write-Output "Machine with name $machineName already exists with the status $($theMachine.Status)" 
+}
\ No newline at end of file
diff --git a/src/step-templates/registry-update-configuration-variables-in-export-file/metadata.json b/src/step-templates/registry-update-configuration-variables-in-export-file/metadata.json
new file mode 100644
index 000000000..c416e4950
--- /dev/null
+++ b/src/step-templates/registry-update-configuration-variables-in-export-file/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "7f9c1f6d-8305-4a37-a4c6-9b47ea4699d9",
+  "Name": "Registry - Update Configuration Variables In Export File",
+  "Description": "Replace values in a .reg file (Registry Export) automatically with octopus variables.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "regExports",
+      "Label": "Registry Exports",
+      "HelpText": "A list of .reg files (Registry exports) separated by a ;",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-07-02T07:58:41.3110000-07:00",
+  "LastModifiedBy": "jbennett",
+  "$Meta": {
+    "ExportedAt": "2015-07-02T07:59:00.3220000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/registry-update-configuration-variables-in-export-file/scriptbody.ps1 b/src/step-templates/registry-update-configuration-variables-in-export-file/scriptbody.ps1
new file mode 100644
index 000000000..1b029d059
--- /dev/null
+++ b/src/step-templates/registry-update-configuration-variables-in-export-file/scriptbody.ps1
@@ -0,0 +1,79 @@
+# Running outside octopus
+param(
+    [string]$regExports
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+# More custom functions would go here
+
+& {
+    param(
+        [string]$regExports
+    ) 
+
+    Write-Host "Registry Export Configuration Variables"
+    Write-Host "regExports: $regExports"
+
+    ForEach ($regExp in $regExports.Split(';'))  {
+        
+        $regFile = $regExp.Trim()
+        
+        if( $regFile.Length -lt 1 ){ break }
+
+        $output = ""
+
+        $fi=Get-Item $regFile
+        $file=$fi.OpenText()
+
+        While(!($file.EndOfStream)){
+            $line=$file.ReadLine()
+            $outputLine = $line
+
+            if($line -match "`"=`""){
+                $keyValue = $line -split "`"=`""
+                $key = $keyValue[0] -replace "^`"" , ""
+                $oldVal = $keyValue[1] -replace "`"$" , ""
+                $newVal = $OctopusParameters[$key]
+                
+                Write-Host "Looking for key $key in OctopusParameters hash"
+
+                if($newVal){
+                    Write-Host "Updating $key from $oldVal to $newVal"
+                    $outputLine = "`"$key`"=`"$newVal`""
+                }
+            }
+            
+            $output += $outputLine + "`r`n"
+        }
+
+        $output | Out-File "c:\temp\output.reg"
+    }
+
+ } `
+(Get-Param 'regExports' -Required)
\ No newline at end of file
diff --git a/step-templates/releasenoteshub-add-release-association.json b/src/step-templates/releasenoteshub-add-release-association/metadata.json
similarity index 78%
rename from step-templates/releasenoteshub-add-release-association.json
rename to src/step-templates/releasenoteshub-add-release-association/metadata.json
index 69fd2b49a..ba2a51778 100644
--- a/step-templates/releasenoteshub-add-release-association.json
+++ b/src/step-templates/releasenoteshub-add-release-association/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$headers = @{\n    \"Authorization\" = \"ApiKey $ReleaseNotesHub_ApiKey\"\n}\n\n$body = @{\n    \"projectId\" = $ReleaseNotesHub_ProjectId;\n    \"releaseVersion\" = $ReleaseNotesHub_Version;\n    \"associatedProjectId\" = $ReleaseNotesHub_AssociatedProjectId;\n    \"associatedReleaseVersion\" = $ReleaseNotesHub_AssociatedVersion      \n} | ConvertTo-Json\n\ntry {\n     Invoke-RestMethod -Method Post -Uri \"https://api.releasenoteshub.com/api/releaseassociations/createforversion\" -Headers $headers -Body $body -ContentType application/json-patch+json\n} catch {\n    Write-Host \"StatusCode:\" $_.Exception.Response.StatusCode.value__ \n    Write-Host \"StatusDescription:\" $_.Exception.Response.StatusDescription\n    throw $_.Exception\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -64,10 +64,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-10-02T06:04:09.192Z",
+    "ExportedAt": "2020-10-02T06:04:09.1920000Z",
     "OctopusVersion": "2020.4.2",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "ReleaseNotesHub",
   "Category": "RnHub"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/releasenoteshub-add-release-association/scriptbody.ps1 b/src/step-templates/releasenoteshub-add-release-association/scriptbody.ps1
new file mode 100644
index 000000000..74578752f
--- /dev/null
+++ b/src/step-templates/releasenoteshub-add-release-association/scriptbody.ps1
@@ -0,0 +1,18 @@
+$headers = @{
+    "Authorization" = "ApiKey $ReleaseNotesHub_ApiKey"
+}
+
+$body = @{
+    "projectId" = $ReleaseNotesHub_ProjectId;
+    "releaseVersion" = $ReleaseNotesHub_Version;
+    "associatedProjectId" = $ReleaseNotesHub_AssociatedProjectId;
+    "associatedReleaseVersion" = $ReleaseNotesHub_AssociatedVersion      
+} | ConvertTo-Json
+
+try {
+     Invoke-RestMethod -Method Post -Uri "https://api.releasenoteshub.com/api/releaseassociations/createforversion" -Headers $headers -Body $body -ContentType application/json-patch+json
+} catch {
+    Write-Host "StatusCode:" $_.Exception.Response.StatusCode.value__ 
+    Write-Host "StatusDescription:" $_.Exception.Response.StatusDescription
+    throw $_.Exception
+}
\ No newline at end of file
diff --git a/step-templates/releasenoteshub-pull-trigger.json b/src/step-templates/releasenoteshub-pull-trigger/metadata.json
similarity index 78%
rename from step-templates/releasenoteshub-pull-trigger.json
rename to src/step-templates/releasenoteshub-pull-trigger/metadata.json
index 5a0f797ca..6358c6aaf 100644
--- a/step-templates/releasenoteshub-pull-trigger.json
+++ b/src/step-templates/releasenoteshub-pull-trigger/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if ( -not [string]::IsNullOrEmpty( $ReleaseNotesHub_Version ) )\n{\n\t$v = $ReleaseNotesHub_Version\n}\nelse\n{\n\t$v = $OctopusParameters['Octopus.Release.Number']\n}\n\n$headers = @{\n    \"Authorization\" = \"ApiKey $ReleaseNotesHub_ApiKey\"\n}\n\n$body = @{\n    \"name\" = $ReleaseNotesHub_Name;\n    \"version\" = $v;\n    \"createOnNotFound\" = $ReleaseNotesHub_CreateOnNotFound;\n    \"IgnoreIfExists\" = $ReleaseNotesHub_IgnoreIfExists;\n    \"publish\" = $ReleaseNotesHub_Publish     \n} | ConvertTo-Json\n\ntry {\n     Invoke-RestMethod -Method Post -Uri \"https://api.releasenoteshub.com/api/pull/PullVersion/$ReleaseNotesHub_ProjectId\" -Headers $headers -Body $body -ContentType application/json-patch+json\n} catch {\n    Write-Host \"StatusCode:\" $_.Exception.Response.StatusCode.value__ \n    Write-Host \"StatusDescription:\" $_.Exception.Response.StatusDescription\n    throw $_.Exception\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -31,7 +31,7 @@
       "DisplaySettings": {
         "Octopus.ControlType": "SingleLineText"
       }
-    },	
+    },
     {
       "Id": "02e58f68-5a86-41cd-9b21-636d5eb162bf",
       "Name": "ReleaseNotesHub_Version",
@@ -83,10 +83,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-12T04:02:39.748Z",
+    "ExportedAt": "2020-08-12T04:02:39.7480000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "ReleaseNotesHub",
   "Category": "RnHub"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/releasenoteshub-pull-trigger/scriptbody.ps1 b/src/step-templates/releasenoteshub-pull-trigger/scriptbody.ps1
new file mode 100644
index 000000000..f1f612da5
--- /dev/null
+++ b/src/step-templates/releasenoteshub-pull-trigger/scriptbody.ps1
@@ -0,0 +1,28 @@
+if ( -not [string]::IsNullOrEmpty( $ReleaseNotesHub_Version ) )
+{
+	$v = $ReleaseNotesHub_Version
+}
+else
+{
+	$v = $OctopusParameters['Octopus.Release.Number']
+}
+
+$headers = @{
+    "Authorization" = "ApiKey $ReleaseNotesHub_ApiKey"
+}
+
+$body = @{
+    "name" = $ReleaseNotesHub_Name;
+    "version" = $v;
+    "createOnNotFound" = $ReleaseNotesHub_CreateOnNotFound;
+    "IgnoreIfExists" = $ReleaseNotesHub_IgnoreIfExists;
+    "publish" = $ReleaseNotesHub_Publish     
+} | ConvertTo-Json
+
+try {
+     Invoke-RestMethod -Method Post -Uri "https://api.releasenoteshub.com/api/pull/PullVersion/$ReleaseNotesHub_ProjectId" -Headers $headers -Body $body -ContentType application/json-patch+json
+} catch {
+    Write-Host "StatusCode:" $_.Exception.Response.StatusCode.value__ 
+    Write-Host "StatusDescription:" $_.Exception.Response.StatusDescription
+    throw $_.Exception
+}
\ No newline at end of file
diff --git a/step-templates/remove-server-from-azure-load-balancer.json b/src/step-templates/remove-server-from-azure-load-balancer/metadata.json
similarity index 54%
rename from step-templates/remove-server-from-azure-load-balancer.json
rename to src/step-templates/remove-server-from-azure-load-balancer/metadata.json
index 895ae7e3d..b7b086495 100644
--- a/step-templates/remove-server-from-azure-load-balancer.json
+++ b/src/step-templates/remove-server-from-azure-load-balancer/metadata.json
@@ -8,7 +8,7 @@
   "Packages": [],
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "#region Verify variables\n\n#Verify rsflbAzureSubscription is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['rsflbAzureSubscription']))\n{\n  Throw 'Azure Subscription cannot be null.'\n}\n$azureSubscription = $OctopusParameters['rsflbAzureSubscription']\nWrite-Host ('Azure Subscription: ' + $azureSubscription)\n\n#Verify rsflbAzureResourceGroup is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['rsflbAzureResourceGroup']))\n{\n  Throw 'Azure Resource Group cannot be null.'\n}\n$azureResourceGroup = $OctopusParameters['rsflbAzureResourceGroup']\nWrite-Host ('Azure Resource Group: ' + $azureResourceGroup)\n\n#Verify rsflbAzureMachineName is not null.\nIf ([string]::IsNullOrEmpty($OctopusParameters['rsflbAzureMachineName']))\n{\n  Throw 'Azure Machine Name cannot be null.'\n}\n$azureMachineName = $OctopusParameters['rsflbAzureMachineName']\nWrite-Host ('Azure Machine Name: ' + $azureMachineName)\n\n#endregion\n\n#region Process\n\nSet-AzureRmContext -SubscriptionName $azureSubscription\n\n$azureVM = Get-AzureRmVM -ResourceGroupName $azureResourceGroup -Name $azureMachineName\nIf (!$azureVM)\n{\n  Throw 'Could not retrieve server from Azure needed to remove from Load Balancer.'\n}\n\n$nic = (Get-AzureRmNetworkInterface -ResourceGroupName $azureResourceGroup | Where-Object {$_.VirtualMachine.Id -eq $azureVM.Id})\nIf (!$nic)\n{\n  Throw 'Could not retrieve NIC from Azure needed to remove from Load Balancer.'\n}\n\n$nic.IpConfigurations[0].LoadBalancerBackendAddressPools = $null\n$nic | Set-AzureRmNetworkInterface\n\n#endregion",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Azure.AccountId": "#{rsflbAzureAccount}"
   },
@@ -55,7 +55,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-22T10:40:51.529Z",
+    "ExportedAt": "2020-06-22T10:40:51.5290000Z",
     "OctopusVersion": "2020.2.8",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/remove-server-from-azure-load-balancer/scriptbody.ps1 b/src/step-templates/remove-server-from-azure-load-balancer/scriptbody.ps1
new file mode 100644
index 000000000..f2d6dba10
--- /dev/null
+++ b/src/step-templates/remove-server-from-azure-load-balancer/scriptbody.ps1
@@ -0,0 +1,48 @@
+#region Verify variables
+
+#Verify rsflbAzureSubscription is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['rsflbAzureSubscription']))
+{
+  Throw 'Azure Subscription cannot be null.'
+}
+$azureSubscription = $OctopusParameters['rsflbAzureSubscription']
+Write-Host ('Azure Subscription: ' + $azureSubscription)
+
+#Verify rsflbAzureResourceGroup is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['rsflbAzureResourceGroup']))
+{
+  Throw 'Azure Resource Group cannot be null.'
+}
+$azureResourceGroup = $OctopusParameters['rsflbAzureResourceGroup']
+Write-Host ('Azure Resource Group: ' + $azureResourceGroup)
+
+#Verify rsflbAzureMachineName is not null.
+If ([string]::IsNullOrEmpty($OctopusParameters['rsflbAzureMachineName']))
+{
+  Throw 'Azure Machine Name cannot be null.'
+}
+$azureMachineName = $OctopusParameters['rsflbAzureMachineName']
+Write-Host ('Azure Machine Name: ' + $azureMachineName)
+
+#endregion
+
+#region Process
+
+Set-AzureRmContext -SubscriptionName $azureSubscription
+
+$azureVM = Get-AzureRmVM -ResourceGroupName $azureResourceGroup -Name $azureMachineName
+If (!$azureVM)
+{
+  Throw 'Could not retrieve server from Azure needed to remove from Load Balancer.'
+}
+
+$nic = (Get-AzureRmNetworkInterface -ResourceGroupName $azureResourceGroup | Where-Object {$_.VirtualMachine.Id -eq $azureVM.Id})
+If (!$nic)
+{
+  Throw 'Could not retrieve NIC from Azure needed to remove from Load Balancer.'
+}
+
+$nic.IpConfigurations[0].LoadBalancerBackendAddressPools = $null
+$nic | Set-AzureRmNetworkInterface
+
+#endregion
\ No newline at end of file
diff --git a/src/step-templates/retention-policy/metadata.json b/src/step-templates/retention-policy/metadata.json
new file mode 100644
index 000000000..6b146a3f6
--- /dev/null
+++ b/src/step-templates/retention-policy/metadata.json
@@ -0,0 +1,70 @@
+{
+  "Id": "46705230-c116-41c6-ba4b-b58d43f4f0e1",
+  "Name": "Retention Policy",
+  "Description": "Applies retention policy for built-in package repository by specified package id. Useful when you are using variables in PackageId parameter of deploy package step and built-in retention policy for package repository is not deleting packages.",
+  "ActionType": "Octopus.Script",
+  "Version": 15,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "Retention.PackagesRootDirectory",
+      "Label": "Packages root directory",
+      "HelpText": "Packages directory path on Octopus server (e.g. D:\\Octopus\\Packages).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Retention.Criteria",
+      "Label": "Criteria",
+      "HelpText": "Criteria by which to apply retention policy - days or number of packages.",
+      "DefaultValue": "days",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "days|Days\nnumber|Number of packages"
+      }
+    },
+    {
+      "Name": "Retention.Value",
+      "Label": "Value",
+      "HelpText": "Value for selected criteria.\nMin value for days criteria - 3.\nMin value for number criteria - 10.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Retention.PackageId",
+      "Label": "Package Id",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Retention.FailOnValidate",
+      "Label": "Fail on validate",
+      "HelpText": "If true throws exception when parameter validation fails. If false just outputs warning messages to deployment log and doesn't fail whole deployment.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "sarbis",
+  "$Meta": {
+    "ExportedAt": "2016-08-27T13:53:13.7640000-07:00",
+    "OctopusVersion": "3.3.16",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/retention-policy/scriptbody.ps1 b/src/step-templates/retention-policy/scriptbody.ps1
new file mode 100644
index 000000000..90d6cd067
--- /dev/null
+++ b/src/step-templates/retention-policy/scriptbody.ps1
@@ -0,0 +1,116 @@
+Function Get-Parameter($Name, [switch]$Required, $Default, [switch]$FailOnValidate) {
+    $result = $null
+    $errMessage = [string]::Empty
+
+    If ($OctopusParameters -ne $null) {
+        $octopusParameterName = ("Retention." + $Name)
+        $result = $OctopusParameters[$octopusParameterName]
+        Write-Host "Octopus paramter value for $octopusParameterName : $result"
+    }
+
+    If ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    If ($result -eq $null) {
+        If ($Required) {
+            $errMessage = "Missing parameter value $Name"
+        } Else {
+            $result = $Default
+        }
+    } 
+
+    If (-Not [string]::IsNullOrEmpty($errMessage)) {
+        If ($FailOnValidate) {
+            Throw $errMessage
+        } Else {
+            Write-Warning $errMessage
+        }
+    }
+
+    return $result
+}
+
+Function Validate-Parameters([switch]$FailOnValidate) {
+    $errMessage = [string]::Empty
+
+    If ($retentionCriteria.ToLower() -eq "days") {
+        If ($retentionValue -lt 3) {
+            $errMessage = "Retention Value not specified or must be greater than 3 days!"
+        }
+    } ElseIf ($retentionCriteria.ToLower() -eq "number") {
+        If ($retentionValue -lt 10) {
+            $errMessage = "Retention Value not specified or must be greater than 9 packages!"
+        }
+    } Else {
+        $errMessage = "Retention Criteria must be 'days' or 'number'!"
+    }
+    
+    If ([string]::IsNullOrEmpty($errMessage)) {
+       return $true;
+    } Else {
+        If ($FailOnValidate) {
+            Throw $errMessage
+        } Else {
+            Write-Warning $errMessage
+            return $false;
+        }
+    }
+}
+
+& {
+    Write-Host "Start RetentionPolicy"
+
+    $retentionFailOnValidate = [System.Convert]::ToBoolean([string](Get-Parameter "FailOnValidate" $false "False" $false))
+    $packagesRootDirectoryPath = [string] (Get-Parameter "PackagesRootDirectory" $true [string]::Empty $retentionFailOnValidate)
+    $retentionCriteria = [string] (Get-Parameter "Criteria" $true "days" $retentionFailOnValidate)
+    $retentionValue = [int] (Get-Parameter "Value" $true 30 $retentionFailOnValidate)
+    $retentionPackageId = [string] (Get-Parameter "PackageId" $true [string]::Empty $retentionFailOnValidate)
+
+    If ((Validate-Parameters $retentionFailOnValidate)) {
+
+        # Filter out package folders by name if parameter specified
+        $packageDirectories = Get-ChildItem $packagesRootDirectoryPath | ?{ $_.PSIsContainer } | ?{ $_.Name -eq $retentionPackageId }
+
+        If ($packageDirectories.Length -le 0) {
+            Write-Warning "No package directories found!"
+        } Else {
+            ForEach ($packageDirectory in $packageDirectories) {
+                $packageFiles = Get-ChildItem $packageDirectory.FullName
+                If ($packageFiles.Length -gt 0) {
+                    Write-Host ("Package files found in directory: " + $packageDirectory.FullName + " - " + $packageFiles.Length)
+                    $packageFilesObsolete = @()
+
+                    If ($retentionCriteria -eq "days") {
+                        $packageFilesObsolete = $packageFiles | ?{ $_.LastWriteTime -le ((Get-Date).AddDays($retentionValue * -1)) }
+                    } ElseIf ($retentionCriteria -eq "number") {
+                        $filesToDelete = ($packageFiles.Length - $retentionValue)
+                        If ($filesToDelete -gt 0) {
+                            $packageFilesObsolete = $packageFiles | Sort-Object LastWriteTime | Select-Object -First $filesToDelete
+                        }
+                    }
+
+                    If ($packageFilesObsolete.Length -gt 0) {
+                        Write-Host ("Applying retention policy for " + $packageFilesObsolete.Length + " obsolete files in directory: " + $packageDirectory.FullName)
+                        ForEach ($packageVersionFileObsolete in $packageFilesObsolete) {
+                            Remove-Item -Path $packageVersionFileObsolete.FullName -Force -Recurse
+                        }
+                    } Else {
+                        Write-Host ("No package files deleted, all files match policy rules!")
+                    }
+                } Else {
+                    Write-Host ("No files found, removing empty directory: " + $packageDirectory.FullName)
+                    Remove-Item -Path $packageDirectory.FullName -Force -Recurse
+                }
+            }
+        }
+    } ElseIf ($retentionFailOnValidate -eq $true) {
+        throw "Missing or invalid parameter values!"
+    }
+
+    Write-Host "End RetentionPolicy"
+}
+
diff --git a/step-templates/rollbar-notify-deployment.json b/src/step-templates/rollbar-notify-deployment/metadata.json
similarity index 75%
rename from step-templates/rollbar-notify-deployment.json
rename to src/step-templates/rollbar-notify-deployment/metadata.json
index 210d9005b..9e9494628 100644
--- a/step-templates/rollbar-notify-deployment.json
+++ b/src/step-templates/rollbar-notify-deployment/metadata.json
@@ -6,7 +6,7 @@
   "Version": 2,
   "CommunityActionTemplateId": null,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "try {\r    $uri = $OctopusParameters[\"URI\"];    \r    $accessToken = $OctopusParameters[\"AccessToken\"];\r    $environment = $OctopusParameters[\"Environment\"];\r    $revision = $OctopusParameters[\"Revision\"];\r    $revisionFilename = $OctopusParameters[\"RevisionFilename\"];\r    $localUsername = $OctopusParameters[\"LocalUsername\"];\r    $rollbarUsername = $OctopusParameters[\"RollbarUsername\"];\r    $comment = $OctopusParameters[\"Comment\"];\r    \r    if ($revisionFilename) {\r        $revision = Get-Content $revisionFilename;\r    }\r    \r    $arguments = \"access_token=$accessToken&environment=$environment&revision=$revision&local_username=$localUsername&rollbar_username=$rollbarUsername&comment=$comment\";\r    \r    Write-Host 'Notifying Deployment to Rollbar';\r    Write-Host $arguments;\r    \r    (new-object net.webclient).UploadString($uri, $arguments);\r    \r} catch {\r    $ErrorMessage = $_.Exception.Message;\r    Write-Error $ErrorMessage;\r}\r",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
@@ -104,12 +104,12 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2017-04-26T14:41:00.000Z",
+  "LastModifiedOn": "2017-04-26T14:41:00.0000000Z",
   "LastModifiedBy": "sandord",
   "$Meta": {
-    "ExportedAt": "2017-02-07T13:42:26.852Z",
+    "ExportedAt": "2017-02-07T13:42:26.8520000Z",
     "OctopusVersion": "3.7.10",
     "Type": "ActionTemplate"
   },
   "Category": "rollbar"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/rollbar-notify-deployment/scriptbody.ps1 b/src/step-templates/rollbar-notify-deployment/scriptbody.ps1
new file mode 100644
index 000000000..867894f23
--- /dev/null
+++ b/src/step-templates/rollbar-notify-deployment/scriptbody.ps1
@@ -0,0 +1 @@
+try {
    $uri = $OctopusParameters["URI"];    
    $accessToken = $OctopusParameters["AccessToken"];
    $environment = $OctopusParameters["Environment"];
    $revision = $OctopusParameters["Revision"];
    $revisionFilename = $OctopusParameters["RevisionFilename"];
    $localUsername = $OctopusParameters["LocalUsername"];
    $rollbarUsername = $OctopusParameters["RollbarUsername"];
    $comment = $OctopusParameters["Comment"];
    
    if ($revisionFilename) {
        $revision = Get-Content $revisionFilename;
    }
    
    $arguments = "access_token=$accessToken&environment=$environment&revision=$revision&local_username=$localUsername&rollbar_username=$rollbarUsername&comment=$comment";
    
    Write-Host 'Notifying Deployment to Rollbar';
    Write-Host $arguments;
    
    (new-object net.webclient).UploadString($uri, $arguments);
    
} catch {
    $ErrorMessage = $_.Exception.Message;
    Write-Error $ErrorMessage;
}
\ No newline at end of file
diff --git a/src/step-templates/rotate_azure_load_balancer_pool/metadata.json b/src/step-templates/rotate_azure_load_balancer_pool/metadata.json
new file mode 100644
index 000000000..66f2e4205
--- /dev/null
+++ b/src/step-templates/rotate_azure_load_balancer_pool/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "947623c6-940d-4a54-a18b-c755a1035dce",
+  "Name": "Rotate Azure Load Balancer Pool",
+  "Description": "Updates all rules on an Azure load balancer to point to the next backend pool in a specified list. The current backend pool will be determined and the next pool in a provided list will become the target of all rules. If the current pool doesn't exist in the list, the first pool in the list will be used. This means that a specific pool can be chosen by specifying only a single pool.",
+  "ActionType": "Octopus.AzurePowerShell",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Azure.AccountId": "#{RotateAzureLoadBalancerPool.Account}"
+  },
+  "Parameters": [
+    {
+      "Id": "cef3a407-e9e1-44e5-9dcf-9dcf586f4958",
+      "Name": "RotateAzureLoadBalancerPool.Account",
+      "Label": "Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "7a8c14dd-072d-432e-9071-296381dd9cc9",
+      "Name": "RotateAzureLoadBalancerPool.LoadBalancerName",
+      "Label": "Load Balancer",
+      "HelpText": "The name of the load balancer to use. Multiple load balancers can be selected if they have the same pool names. Wildcards are supported.\n\nEnter one load balancer per line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "1295c989-efbd-4605-a362-b72ea9762c4f",
+      "Name": "RotateAzureLoadBalancerPool.AvailablePools",
+      "Label": "Available Pools",
+      "HelpText": "A list of available pools to use. If multiple pools are specified, rules will be updated to use the next pool in the list. If a single pool is specified, rules will use that pool. Wildcards are supported.\n\nEnter one pool per line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "ed5fc080-37c8-44ce-a89a-76313c89f10d",
+      "Name": "RotateAzureLoadBalancerPool.RuleNames",
+      "Label": "Rule Names",
+      "HelpText": "A list of rule names to update. Wildcards are supported.\n\nEnter one rule per line.",
+      "DefaultValue": "*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "27caa59c-5f1a-42f8-a545-5075d47f3182",
+      "Name": "RotateAzureLoadBalancerPool.WhatIf",
+      "Label": "What If",
+      "HelpText": "Will just report expected changes, but not update the load balancer.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.AzurePowerShell",
+  "$Meta": {
+    "ExportedAt": "2023-11-22T03:48:35.0190000Z",
+    "OctopusVersion": "2023.2.13113",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "REOScotte",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/rotate_azure_load_balancer_pool/scriptbody.ps1 b/src/step-templates/rotate_azure_load_balancer_pool/scriptbody.ps1
new file mode 100644
index 000000000..c520b3853
--- /dev/null
+++ b/src/step-templates/rotate_azure_load_balancer_pool/scriptbody.ps1
@@ -0,0 +1,95 @@
+$LoadBalancerNames = [string]$OctopusParameters['RotateAzureLoadBalancerPool.LoadBalancerName']
+$AvailablePools = [string]$OctopusParameters['RotateAzureLoadBalancerPool.AvailablePools']
+$RuleNames = [string]$OctopusParameters['RotateAzureLoadBalancerPool.RuleNames']
+$WhatIf = [bool]::Parse($OctopusParameters['RotateAzureLoadBalancerPool.WhatIf'])
+
+if ($null -eq $LoadBalancerNames) {
+    throw 'No load balancers selected. Please select at least one load balancer.'
+} else {
+    # Trim white space and blank lines and get all load balancers that match the names.
+    $loadBalancers = $LoadBalancerNames.Split("`n").Trim().Where({ $_ }) | ForEach-Object { Get-AzLoadBalancer -Name $_ }
+}
+if ($null -eq $AvailablePools) {
+    throw 'No pools selected. Please select at least one pool.'
+} else {
+    $AvailablePools = $AvailablePools.Split("`n").Trim().Where({ $_ }) # Trim white space and blank lines.
+}
+if ($null -eq $RuleNames) {
+    throw 'No rules selected. Please select at least one rule name or use an asterisk (*) to select all rules.'
+} else {
+    $RuleNames = $RuleNames.Split("`n").Trim().Where({ $_ }) # Trim white space and blank lines.
+}
+
+foreach ($loadBalancer in $loadBalancers) {
+    $loadBalancerName = $loadBalancer.Name
+    $resourceGroupName = $loadBalancer.ResourceGroupName
+    $allPools = Get-AzLoadBalancerBackendAddressPool -LoadBalancerName $loadBalancerName -ResourceGroupName $resourceGroupName
+
+    Write-Host "Updating Load Balancer '$loadBalancerName'."
+
+    # Start by assuming no rules match
+    $rules = @()
+
+    # Add each distinct rule that matches one of the rule names
+    foreach ($ruleName in $RuleNames) {
+        $rules += $LoadBalancer.LoadBalancingRules | Where-Object {
+            $_.Id.Split('/')[-1] -like $ruleName -and
+            $_.Id -notin $rules.Id
+        }
+    }
+
+    if ($rules.Count -eq 0) {
+        Write-Warning "No matching rules were found on load balancer '$loadBalancerName'."
+        continue
+    }
+
+    # Resolve any wildcards in AvailablePools to get a list of valid pool names.
+    $validPoolNames = @()
+    foreach ($name in $AvailablePools) {
+        $validPoolNames += $allPools.Name | Where-Object { $_ -like $name }
+    }
+
+    # The same pool could match multiple wildcards so get a unique list
+    if ($validPoolNames) {
+        $validPoolNames = [array]($validPoolNames | Select-Object -Unique)
+    } else {
+        Write-Warning "No valid pools were found on load balancer '$loadBalancerName'."
+        continue
+    }
+
+    # Update each rule with a new pool 
+    foreach ($rule in $rules) {
+        $currentPoolName = $rule.BackendAddressPool.Id.Split('/')[-1]
+
+        # This will find the next pool in the list, cycling back to the beginning if at the end. If the current pool isn't in the list,
+        # its index will be -1. The next index will be zero so the first pool will be selected. 
+        $index = $validPoolNames.IndexOf($currentPoolName)
+        $nextIndex = ($index + 1) % $validPoolNames.Count
+        $newPoolName = $validPoolNames[$nextIndex]
+
+        # Get the new pool to use
+        if ($newPoolName -in $allPools.Name) {
+            $newPool = Get-AzLoadBalancerBackendAddressPool -ResourceGroupName $resourceGroupName -LoadBalancerName $loadBalancerName -Name $newPoolName
+        } else {
+            throw "Backend Pool '$newPoolName' does not exist on load balancer '$loadBalancerName'."
+        }
+
+        if ($currentPoolName -eq $newPoolName) {
+            Write-Highlight "Rule '$($rule.Name)' is already pointing to pool '$currentPoolName' on load balancer '$loadBalancerName'."
+        } else {
+            Write-Highlight "Rule '$($rule.Name)' is pointing to pool '$currentPoolName'. Updating to pool '$newPoolName' on load balancer '$loadBalancerName'."
+            $rule.BackendAddressPool.Id = $newPool.Id
+
+            foreach ($pool in $rule.BackendAddressPools) {
+                $pool.Id = $newPool.Id
+            }
+        }
+    }
+
+    if ($WhatIf) {
+        Write-Highlight "WhatIf is set to true so skipping changes on Azure for load balancer '$loadBalancerName'."
+    } else {
+        Write-Verbose "Writing changes to Azure for load balancer '$loadBalancerName'."
+        Set-AzLoadBalancer -LoadBalancer $loadBalancer | Out-Null
+    }
+}
diff --git a/src/step-templates/roundhouse-database-migration/metadata.json b/src/step-templates/roundhouse-database-migration/metadata.json
new file mode 100644
index 000000000..cc3bb6799
--- /dev/null
+++ b/src/step-templates/roundhouse-database-migration/metadata.json
@@ -0,0 +1,288 @@
+{
+  "Id": "6da0afee-ed55-4c75-a13b-5e8ce42ef027",
+  "Name": "RoundhousE Database Migrations",
+  "Description": "Database migrations using [RoundhousE](https://github.com/chucknorris/roundhouse).\nWith this template you can either include RoundhousE with your package or use the `Download RoundhousE?` feature to download it at deploy time.  If you're downloading, you can choose the version by specifying it in the `Version of RoundhousE`.\n\nNOTE: \n - AWS EC2 IAM Role authentication requires the AWS CLI be installed.\n - To run on Linux, the machine must have both PowerShell Core and .NET Core 3.1 installed.\n\nNote - The RoundhousE GitHub Project has been abandoned and as a result this template is now deprecated.  Version 9 will be the last release of this template.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "Id": "249cd84b-2e41-4001-8222-f1a60f9a50ea",
+      "Name": "roundhousePackage",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "roundhousePackage"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "7ab35b02-b5c7-4818-b282-4915a93d78ce",
+      "Name": "roundhousePackage",
+      "Label": "RoundhousEPackage",
+      "HelpText": "The package containing the scripts for RoundhousE to deploy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "b2bb212c-cf5a-4c48-88c7-045ae7841fcc",
+      "Name": "roundhouseServerName",
+      "Label": "Database Server Name",
+      "HelpText": "Name or IP address of the server being deployed to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7d78b1fb-e45a-484a-bcc7-e3360ab69342",
+      "Name": "roundhouseServerPort",
+      "Label": "Database Server Port",
+      "HelpText": "Port number for the database server.  Uses default server port if left blank.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8363dfa2-4509-4c57-9784-5baf27e96397",
+      "Name": "roundhouseAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Method used to authenticate to the database server.",
+      "DefaultValue": "usernamepassword",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
+      }
+    },
+    {
+      "Id": "a49823d8-9269-48e1-92fb-819712fb56a4",
+      "Name": "roundhouseDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "Name of the database to deploy to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c4988c69-539d-48c7-8218-51b82b6253a6",
+      "Name": "roundhouseSsl",
+      "Label": "Force SSL",
+      "HelpText": "Check this box for force connection string to use SSL.  Only applicable to MariaDB, MySQL, and PostgreSQL database types.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "99efe391-c705-4124-9b89-b8c95481d537",
+      "Name": "roundhouseVersion",
+      "Label": "Database Version",
+      "HelpText": "Version number of your database migration.  Default value is the version of the RoundhousE package.",
+      "DefaultValue": "#{Octopus.Action.Package[RoundhousEPackage].PackageVersion}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2e27695f-4789-456a-9158-a847b2059d32",
+      "Name": "roundhouseUsername",
+      "Label": "Database Username",
+      "HelpText": "Username of the account with sufficient permissions to execute scripts.  (Leave blank for Integrated Authentication.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2bf4e801-263f-49d0-af19-339310c63856",
+      "Name": "roundhouseUserPassword",
+      "Label": "Database User Password",
+      "HelpText": "Password for the Database Username account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "9ddd49a7-92a9-419a-aa07-70c569d88540",
+      "Name": "roundhouseDatabaseServerType",
+      "Label": "Database Server Type",
+      "HelpText": "The database technology being deployed to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "mariadb|MariaDB\nmysql|MySQL\noracle|Oracle\npostgres|PostgreSQL\nsqlserver|SQL Server"
+      }
+    },
+    {
+      "Id": "0d748383-fd88-4dc2-ad8e-7b6f12137e3b",
+      "Name": "roundhouseWithTransaction",
+      "Label": "Use Transaction?",
+      "HelpText": "Check this box if you want all scripts to be run within the same transaction.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "06f538af-087a-4d59-958d-90c2e4decebf",
+      "Name": "roundhouseDryRun",
+      "Label": "Dry Run?",
+      "HelpText": "Check this box if you want to perform a dry run.  Results are recorded and attached as deployment artifacts if you check Record Output.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ec772c86-c12a-4f4f-8710-6426152faa72",
+      "Name": "roundhouseRecordOutput",
+      "Label": "Record Output?",
+      "HelpText": "Check this box to record the output of the run.  Useful for gathering what would be changed for approval purposes.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "46ee4671-67b2-4e45-b484-6773b41c2bf8",
+      "Name": "roundhouseUpFolder",
+      "Label": "Up Folder Path",
+      "HelpText": "Relative location of the Up folder.  If left blank, .\\up is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "55e0bf86-b675-4204-9e0b-d39d20b15eea",
+      "Name": "roundhouseAlterDatabaseFolder",
+      "Label": "AlterDatabase Folder Path",
+      "HelpText": "AlterDatabase folder path.  If left blank, .\\alterDatabase is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "cd473440-f9a9-4a5d-b48c-46ee63a92e7a",
+      "Name": "roundhouseRunBeforeUpFolder",
+      "Label": "RunBeforeUp Folder Path",
+      "HelpText": "RunBeforeUp folder path.  If left blank, .\\runbeforeUp is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "53fab9f0-f310-482c-985c-e6efdf206117",
+      "Name": "roundhouseFunctionsFolder",
+      "Label": "Functions Folder Path",
+      "HelpText": "Filepath for user defined functions.  If left blank, .\\functions is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "66e7ce09-798a-42a6-9e4e-f4c952789af8",
+      "Name": "roundhouseViewsFolder",
+      "Label": "Views Folder Path",
+      "HelpText": "Filepath for view scripts.  If left blank, .\\views is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5d905d17-c041-4981-9521-7a827bac3a87",
+      "Name": "roundhouseSprocsFolder",
+      "Label": "Sprocs Folder Path",
+      "HelpText": "File path for stored procedures.  If left blank, .\\sprocs is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d9994dc7-3118-45c6-b8eb-80501daf03e9",
+      "Name": "roundhouseTriggerFolder",
+      "Label": "Trigger folder path",
+      "HelpText": "File path for database triggers.  If left blank .\\triggers is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fa34cd00-3479-47cd-94d1-637263ebab71",
+      "Name": "roundhouseIndexFolder",
+      "Label": "Index Folder Path",
+      "HelpText": "File path for Index scripts.  If left blank, .\\indexes is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e97ba5b9-da0d-4395-887f-f49dcce521f3",
+      "Name": "roundhouseRunAfterAnyTimeFolder",
+      "Label": "RunAfterAnytime Folder Path",
+      "HelpText": "File path for running scripts after the Other Anytime scripts.  If left blank, .\\runAfterOtherAnyTimeScripts is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ac179614-fa54-4a5c-a736-7a0cbaa7e4bf",
+      "Name": "roundhousePermissionsFolder",
+      "Label": "Permissions Folder path",
+      "HelpText": "Folder path that holds permission scripts.  If left blank, .\\permissions is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fcf2e6c4-db73-4b44-bf36-44e7b1cdc8c1",
+      "Name": "roundhouseDownloadNuget",
+      "Label": "Download RoundhousE?",
+      "HelpText": "Check this box if you want the template to download RoundhousE and use the downloaded version for deployment.  Requires .NET Core be installed on the machine executing the deployment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "62b65afa-1a88-4013-83ab-0b23e162d3cf",
+      "Name": "roundhouseNugetVersion",
+      "Label": "Version of RoundhousE",
+      "HelpText": "Version of RoundhousE to download (used with Download RoundhousE option), leave blank for latest.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2022-06-15T00:15:18.0030000Z",
+    "OctopusVersion": "2022.3.1591",
+    "Type": "ActionTemplate"
+  },
+  "Category": "roundhouse"
+}
diff --git a/src/step-templates/roundhouse-database-migration/scriptbody.ps1 b/src/step-templates/roundhouse-database-migration/scriptbody.ps1
new file mode 100644
index 000000000..51a73b77a
--- /dev/null
+++ b/src/step-templates/roundhouse-database-migration/scriptbody.ps1
@@ -0,0 +1,299 @@
+# Configure template
+
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+	Write-Host "Determining Operating System..."
+    switch ([System.Environment]::OSVersion.Platform)
+    {
+    	"Win32NT"
+        {
+        	# Set variable
+            $IsWindows = $true
+            $IsLinux = $false
+        }
+        "Unix"
+        {
+        	$IsWindows = $false
+            $IsLinux = $true
+        }
+    }
+}
+
+# Define parameters
+$roundhouseExecutable = ""
+$roundhouseOutputPath = [System.IO.Path]::Combine($OctopusParameters["Octopus.Action.Package[RoundhousEPackage].ExtractedPath"], "output")
+$roundhouseSsl = [System.Convert]::ToBoolean($roundhouseSsl)
+
+# Determines latest version of github repo
+Function Get-LatestVersionNumber
+{
+    # Define parameters
+    param ($GitHubRepository)
+        
+    # Define local variables
+    $releases = "https://api.github.com/repos/$GitHubRepository/releases"
+    
+    # Get latest version
+    Write-Host "Determining latest release ($releases) ..."
+    
+    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)
+    
+    # Find the latest version with a downloadable asset
+    foreach ($tag in $tags)
+    {
+        if ($tag.assets.Count -gt 0)
+        {
+            #return $tag.assets.browser_download_url
+            return $tag.tag_name
+        }
+    }
+
+    # Return the version
+    return $null    
+}
+
+# Change the location to the extract path
+Set-Location -Path $OctopusParameters["Octopus.Action.Package[RoundhousEPackage].ExtractedPath"]
+
+# Check to see if download is specified
+if ([System.Boolean]::Parse($roundhouseDownloadNuget))
+{
+    # Set secure protocols
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+	# Check to see if version number specified
+    if ([string]::IsNullOrEmpty($roundhouseNugetVersion))
+    {
+    	# Get the latest version number
+        $roundhouseNugetVersion = Get-LatestVersionNumber -GitHubRepository "chucknorris/roundhouse"
+    }
+
+    # Check for download folder
+    if ((Test-Path -Path "$PSSCriptRoot\roundhouse") -eq $false)
+    {
+        # Create the folder
+        New-Item -ItemType Directory -Path "$PSSCriptRoot\roundhouse"
+    }
+    
+    # Download nuget package
+    Write-Output "Downloading https://github.com/chucknorris/roundhouse/releases/download/$roundhouseNugetVersion/dotnet-roundhouse.$roundhouseNugetVersion.nupkg ..."
+    Invoke-WebRequest -Uri "https://github.com/chucknorris/roundhouse/releases/download/$roundhouseNugetVersion/dotnet-roundhouse.$roundhouseNugetVersion.nupkg" -OutFile "$PSSCriptRoot\roundhouse\dotnet-roundhouse.$roundhouseNugetVersion.nupkg"
+
+    # Change file extension
+    $nugetPackage = Get-ChildItem -Path "$PSSCriptRoot\roundhouse\dotnet-roundhouse.$roundhouseNugetVersion.nupkg"
+    $nugetPackage | Rename-Item -NewName $nugetPackage.Name.Replace(".nupkg", ".zip")
+    
+    # Extract the package
+    Write-Output "Extracting dotnet-roundhouse.$roundhouseNugetVersion.nupkg ..."
+    Expand-Archive -Path "$PSSCriptRoot\roundhouse\dotnet-roundhouse.$roundhouseNugetVersion.zip" -DestinationPath "$PSSCriptRoot\roundhouse"
+}
+
+# Set Executable depending on OS
+if ($IsWindows)
+{
+  # Look for older .exe
+  $roundhouseExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq "rh.exe"}
+}
+
+if ([string]::IsNullOrWhitespace($roundhouseExecutable))
+{
+	# Look for just rh.dll
+    $roundhouseExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq "rh.dll"}
+}
+
+if ([string]::IsNullOrWhitespace($roundhouseExecutable))
+{
+    # Couldn't find RoundhousE
+    Write-Error "Couldn't find the RoundhousE executable!"
+}
+
+# Build the arguments
+$roundhouseSwitches = @()
+
+# Update the connection string based on authentication method
+switch ($roundhouseAuthenticationMethod)
+{
+    "awsiam"
+    {
+        # Region is part of the RDS endpoint, extract
+        $region = ($roundhouseServerName.Split("."))[2]
+
+        Write-Host "Generating AWS IAM token ..."
+        $roundhouseUserPassword = (aws rds generate-db-auth-token --hostname $roundhouseServerName --region $region --port $roundhouseServerPort --username $roundhouseUserName)       
+        $roundhouseUserInfo = "Uid=$roundhouseUserName;Pwd=$roundhouseUserPassword;"
+
+        break
+    }
+
+    "usernamepassword"
+    {
+    	# Append remaining portion of connection string
+        $roundhouseUserInfo = "Uid=$roundhouseUserName;Pwd=$roundhouseUserPassword;"
+
+		break    
+	}
+
+    "windowsauthentication"
+    {
+      # Append remaining portion of connection string
+	  $roundhouseUserInfo = "integrated security=true;"
+      
+      # Append username (required for non
+      $roundhouseUserInfo += "Uid=$roundhouseUserName;"
+    }
+}
+
+
+# Configure connnection string based on technology
+switch ($roundhouseDatabaseServerType)
+{
+    "sqlserver"
+    {
+        # Check to see if port has been defined
+        if (![string]::IsNullOrEmpty($roundhouseServerPort))
+        {
+            # Append to servername
+            $roundhouseServerName += ",$roundhouseServerPort"
+
+            # Empty the port
+            $roundhouseServerPort = [string]::Empty
+        }
+    }
+    "mariadb"
+    {
+    	# Use the MySQL client
+        $roundhouseDatabaseServerType = "mysql"
+        $roundhouseServerPort = "Port=$roundhouseServerPort;"
+    }
+    default
+    {
+        $roundhouseServerPort = "Port=$roundhouseServerPort;"
+    }
+}
+
+# Build base connection string
+$roundhouseServerConnectionString = "--connectionstring=Server=$roundhouseServerName;$roundhouseServerPort $roundhouseUserInfo Database=$roundhouseDatabaseName;"
+
+if ($roundhouseSsl -eq $true)
+{
+	if (($roundhouseDatabaseServerType -eq "mariadb") -or ($roundhouseDatabaseServerType -eq "mysql") -or ($roundhouseDatabaseServerType -eq "postgres"))
+    {
+    	# Add sslmode
+        $roundhouseServerConnectionString += "SslMode=Require;Trust Server Certificate=true;"
+    }
+    else
+    {
+    	Write-Warning "Invalid Database Server Type selection for SSL, ignoring setting."
+    }
+}
+
+$roundhouseSwitches += $roundhouseServerConnectionString
+
+$roundhouseSwitches += "--databasetype=$roundhouseDatabaseServerType"
+$roundhouseSwitches += "--silent"
+
+
+# Check for folder definitions
+if (![string]::IsNullOrEmpty($roundhouseUpFolder))
+{
+    # Add up folder
+    $roundhouseSwitches += "--up=$roundhouseUpFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseAlterDatabaseFolder))
+{
+    $roundhouseSwitches += "--alterdatabasefolder=$roundhouseAlterDatabaseFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseRunBeforeUpFolder))
+{
+    $roundhouseSwitches += "--runbeforeupfolder=$roundhouseRunBeforeUpFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseFunctionsFolder))
+{
+    $roundhouseSwitches += "--functionsfolder=$roundhouseFunctionsFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseViewsFolder))
+{
+    $roundhouseSwitches += "--viewsfolder=$roundhouseViewsFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseSprocsFolder))
+{
+    $roundhouseSwitches += "--sprocsfolder=$roundhouseSprocsFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseIndexFolder))
+{
+    $roundhouseSwitches += "--indexesfolder=$roundhouseIndexFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseRunAfterAnyTimeFolder))
+{
+    $roundhouseSwitches += "--runAfterOtherAnyTimeScriptsFolder=$roundhouseRunAfterAnyTimeFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhousePermissionsFolder))
+{
+    $roundhouseSwitches += "--permissionsfolder=$roundhousePermissionsFolder"
+}
+
+if (![string]::IsNullOrEmpty($roundhouseTriggerFolder))
+{
+    $roundhouseSwitches += "--triggersfolder=$roundhouseTriggerFolder"
+}
+
+if ([System.Boolean]::Parse($roundhouseDryRun))
+{
+    $roundhouseSwitches += "--dryrun"
+}
+
+if ([System.Boolean]::Parse($roundhouseRecordOutput))
+{
+    $roundhouseSwitches += "--outputpath=$roundhouseOutputPath"
+}
+
+# Add transaction switch
+$roundhouseSwitches += "--withtransaction=$($roundhouseWithTransaction.ToLower())"
+
+# Check for version
+if (![string]::IsNullOrEmpty($roundhouseVersion))
+{
+    # Add version
+    $roundhouseSwitches += "--version=$roundhouseVersion"
+}
+
+# Display what's going to be run
+if (![string]::IsNullOrWhitespace($roundhouseUserPassword))
+{
+	Write-Host "Executing $($roundhouseExecutable.FullName) with $($roundhouseSwitches.Replace($roundhouseUserPassword, "****"))"
+}
+else
+{
+	Write-Host "Executing $($roundhouseExecutable.FullName) with $($roundhouseSwitches)"
+}
+
+# Execute RoundhousE
+if ($roundhouseExecutable.FullName.EndsWith(".dll"))
+{
+	& dotnet $roundhouseExecutable.FullName $roundhouseSwitches
+}
+else
+{
+	& $roundhouseExecutable.FullName $roundhouseSwitches
+}
+
+# If the output path was specified, attach artifacts
+if ([System.Boolean]::Parse($roundhouseRecordOutput))
+{    
+    # Zip up output folder content
+    Add-Type -Assembly 'System.IO.Compression.FileSystem'
+    
+    $zipFile = "$($OctopusParameters["Octopus.Action.Package[RoundhousEPackage].ExtractedPath"])/output.zip"
+    
+	[System.IO.Compression.ZipFile]::CreateFromDirectory($roundhouseOutputPath, $zipFile)
+    New-OctopusArtifact -Path "$zipFile" -Name "output.zip"
+}
diff --git a/src/step-templates/run-entity-framework-migrations/metadata.json b/src/step-templates/run-entity-framework-migrations/metadata.json
new file mode 100644
index 000000000..e397aa078
--- /dev/null
+++ b/src/step-templates/run-entity-framework-migrations/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "a6cd35d6-164a-4e57-a0f8-0d327129783a",
+  "Name": "Run Entity Framework migrations (Update-Database)",
+  "Description": "Runs `Update-Database` to update the database to the latest Entity Framework migrations",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Name": "EfToolsFolder",
+      "Label": "Path to EF Tools folder",
+      "HelpText": "Please provide a full path to a folder where Migrate.exe (along with other EF files are contained, available from EF nuget package) on Tentacle",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BaseDirectory",
+      "Label": "Base Directory",
+      "HelpText": "Path to where your application files are located. For ASP.NET applications this would be `/bin`",
+      "DefaultValue": "/bin",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NugetPackageStepName",
+      "Label": "Site Path",
+      "HelpText": "Name of the previously-deployed package step that contains the applications files",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "configFileName",
+      "Label": "Config File Name",
+      "HelpText": "Name of your applications config file. For ASP.NET applications this would be `web.config`, for Windows Service applications this would be `yourapplication.dll.config` and for console applications this would be `yourapplication.exe.config`",
+      "DefaultValue": "web.config",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AssemblyDllName",
+      "Label": "Name of Assembly file with EF-Context",
+      "HelpText": "Please provide a name of the assembly file where EF-context is stored",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ConnectionStringName",
+      "Label": "ConnectionStringName",
+      "HelpText": "Name of the key in <connectionStrings> section in Web.Config",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "rikrak",
+  "$Meta": {
+    "ExportedAt": "2019-10-18T09:11:34.9090000Z",
+    "OctopusVersion": "2018.10.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "entityframework"
+}
diff --git a/src/step-templates/run-entity-framework-migrations/scriptbody.ps1 b/src/step-templates/run-entity-framework-migrations/scriptbody.ps1
new file mode 100644
index 000000000..b071dbb6d
--- /dev/null
+++ b/src/step-templates/run-entity-framework-migrations/scriptbody.ps1
@@ -0,0 +1,108 @@
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+ 
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+function Test-LastExit($cmd) {
+    if ($LastExitCode -ne 0) {
+        Write-Host "##octopus[stderr-error]"
+        write-error "$cmd failed with exit code: $LastExitCode"
+    }
+}
+
+
+
+
+$stepName = $OctopusParameters['NugetPackageStepName']
+
+$stepPath = ""
+if (-not [string]::IsNullOrEmpty($stepName)) {
+    Write-Host "Finding path to package step: $stepName"
+    $stepPath = Find-InstallLocation $stepName
+} else {
+    $stepPath = Find-SingleInstallLocation
+}
+Write-Host "Package was installed to: $stepPath"
+
+$baseDirectory = $OctopusParameters['BaseDirectory']
+
+$binPath = Join-Path $stepPath $baseDirectory
+
+#Locate Migrate.exe
+$efToolsFolder = $OctopusParameters['EfToolsFolder']
+$originalMigrateExe = Join-Path $efToolsFolder "migrate.exe"
+
+if (-Not(Test-Path $originalMigrateExe)){
+    throw ("Unable to locate migrate.exe file. Specifed path $originalMigrateExe does not exist.")
+}
+Write-Host("Found Migrate.Exe from $originalMigrateExe")
+
+$migrateExe = Join-Path $binPath "migrate.exe"
+if (-Not(Test-Path $migrateExe)) {
+    # Move migrate.exe to ASP.NET Project's bin folder as per https://msdn.microsoft.com/de-de/data/jj618307.aspx?f=255&MSPPError=-2147217396
+    Copy-Item $originalMigrateExe -Destination $binPath
+    Write-Host("Copied $originalMigrateExe into $binPath")
+}
+
+#Locate Assembly with DbContext class
+$contextDllName = $OctopusParameters['AssemblyDllName']
+$contextDllPath = Join-Path $binPath $contextDllName
+if (-Not(Test-Path $contextDllPath)){
+    throw ("Unable to locate assembly file with DbContext class. Specifed path $contextDllPath does not exist.")
+}
+Write-Host("Using $contextDllName from $contextDllPath")
+
+#Locate web.config. Migrate.exe needs it for some reason, even if connection string is provided
+$configFile = $OctopusParameters['ConfigFileName']
+$configPath = Join-Path $stepPath $configFile
+if (-Not(Test-Path $configPath)){
+    throw ("Unable to locate config file. Specifed path $webConfigPath does not exist.")
+}
+
+$connectionStringName = $OctopusParameters['ConnectionStringName']
+
+$migrateCommand = "& ""$migrateExe"" ""$contextDllName"" /connectionStringName=""$connectionStringName"" /startupConfigurationFile=""$configPath"" /startUpDirectory=""$binPath"" /Verbose"
+
+Write-Host "##octopus[stderr-error]"        # Stderr is an error
+Write-Host "Executing: " $migrateCommand
+Write-Host 
+
+Invoke-Expression $migrateCommand | Write-Host
+
+# Remove migrate.exe from the bin folder as it is not part of the application
+If (Test-Path $migrateExe)
+{
+  Write-Host "Deleting " $migrateExe
+  Remove-Item $migrateExe
+}
diff --git a/src/step-templates/run-mabl-tests/metadata.json b/src/step-templates/run-mabl-tests/metadata.json
new file mode 100644
index 000000000..8ba278a69
--- /dev/null
+++ b/src/step-templates/run-mabl-tests/metadata.json
@@ -0,0 +1,82 @@
+{
+  "Id": "422be361-640c-4ac1-a305-cd5d618ccf10",
+  "Name": "Run mabl tests",
+  "Description": "Trigger specific application or environment plans in mabl.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "f5a9d523-f97e-49a9-b946-0c56e1018345",
+      "Name": "mablApiKey",
+      "Label": "mabl Integration Key",
+      "HelpText": "(Required) The API key of your workspace. You can find the API key on the Settings/API page.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "364c4c30-0ba3-4eee-9b01-9fb00f718ade",
+      "Name": "mablEnvId",
+      "Label": "Environment ID",
+      "HelpText": "The environment ID to run the tests in. Note that either an environment ID or an application ID must be provided.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0bf3fd34-1104-4d29-8677-0d91e78fc483",
+      "Name": "mablAppId",
+      "Label": "Application ID",
+      "HelpText": "The application ID to run tests on. Note that either an environment ID or an application ID must be provided.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "549d9ef4-2461-45d4-a8bc-44fb79758b52",
+      "Name": "mablPlanLabels",
+      "Label": "Plan Labels",
+      "HelpText": "(Optional) A comma-separated list of plan labels. Plans with any of the labels will be executed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "db7398c4-2abc-4c56-99af-d32d054db50d",
+      "Name": "mablBranch",
+      "Label": "Test Branch",
+      "HelpText": "(Optional) The mabl branch to run test against.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "DefaultValue": "True",
+      "Name": "mablAwaitCompletion",
+      "Label": "Await Completion",
+      "HelpText": "When checked, the step will wait for all triggered tests to complete."
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-08-26T20:24:23.9520000Z",
+    "OctopusVersion": "2020.3.3",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "bertold",
+  "Category": "mabl"
+}
diff --git a/src/step-templates/run-mabl-tests/scriptbody.ps1 b/src/step-templates/run-mabl-tests/scriptbody.ps1
new file mode 100644
index 000000000..365aa23fe
--- /dev/null
+++ b/src/step-templates/run-mabl-tests/scriptbody.ps1
@@ -0,0 +1,231 @@
+param(
+    [string]$mablApiKey,
+    [string]$mablEnvId,
+    [string]$mablAppId,
+    [string]$mablPlanLabels,
+    [string]$mablBranch,
+    [string]$mablAwaitCompletion
+) 
+
+$ErrorActionPreference = "Stop" 
+
+# Constants
+$PollSec = 10
+$UserAgent = "mabl-octopus-plugin/0.0.3"
+$ApiBase = "https://api.mabl.com"
+$DeploymentEventsUri = "$ApiBase/events/deployment"
+$ExecutionResultBaseUri = "$ApiBase/execution/result/event"
+
+function Get-Param($Name, [switch]$Required, $MatchingPattern, $Explanation) {
+    $result = $null
+
+    if ($null -ne $OctopusParameters) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($null -eq $result) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($null -ne $variable) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($null -eq $result -or $result -eq "") {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        }
+    }
+
+    if ($null -ne $result -and "" -ne $result -and $null -ne $MatchingPattern -and $result -notmatch $MatchingPattern) {
+        throw "$Explanation"
+    }
+
+    return $result
+}
+
+function Write-Result($Result) {
+    foreach ($execution in $Result.executions) {
+        $planName = $execution.plan.name
+        $planId = $execution.plan.id
+        $planStatus = $execution.plan_execution.status
+        $t = New-TimeSpan -seconds (($execution.stop_time - $execution.start_time) /  1000)
+        $planTime = Get-Date -Hour $t.Hours -Minute $t.Minutes -Second $t.Seconds -UFormat "%T"
+
+        Write-Host "Plan name: ${planName}, id: ${planId}, status: ${planStatus}, run time: ${planTime}"
+
+        $tests = $execution.journeys
+        $testExecutions = $execution.journey_executions
+
+        foreach ($test in $tests) {
+            $testId = $test.id
+            $testName = $test.name
+
+            foreach ($testExecution in $testExecutions) {
+                if ($testExecution.journey_id -eq $testId) {
+                    $t = New-TimeSpan -seconds (($testExecution.stop_time - $testExecution.start_time) / 1000)
+                    $testTime = Get-Date -Hour $t.Hours -Minute $t.Minutes -Second $t.Seconds -UFormat "%T"
+                    $testStatus = $testExecution.status
+                    $testBrowser = $testExecution.browser_type
+                    $testExecutionId = $testExecution.journey_execution_id
+                    Write-Host "  Test name: ${testName}, id: ${testExecutionId}, status: ${testStatus}," `
+                        "browser: ${testBrowser}, run time: ${testTime}"
+                    break
+                }
+            }
+
+        }
+    }
+}
+
+& {
+    param (
+        [string]$mablApiKey,
+        [string]$mablEnvId,
+        [string]$mablAppId,
+        [string]$mablPlanLabels,
+        [string]$mablAwaitCompletion
+    )
+
+    $kv = "key:$($mablApiKey)"
+    $encodedCreds = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($kv))
+    $basicAuthValue = "Basic $encodedCreds"
+    $headers = @{
+        Authorization = $basicAuthValue
+        accept        = "application/json"
+    }
+
+    # Submit Deployment Event
+    $resp = ""
+    $eventId = ""
+    try {
+        $m = @{}
+        if ($null -ne $mablEnvId -and "" -ne $mablEnvId) {
+            $m.add("environment_id", $mablEnvId)
+        }
+        if ($null -ne $mablAppId -and "" -ne $mablAppId) {
+            $m.add("application_id", $mablAppId)
+        }
+        if ($m.count -eq 0) {
+            Write-Host "Either an environment ID or an application ID must be provided"
+            exit 1
+        }
+        if ($null -ne $mablPlanLabels -and "" -ne $mablPlanLabels) {
+            $planLabelArray = $mablPlanLabels.Split(",")
+            $m.add("plan_labels", $planLabelArray)
+        }
+        if ($null -ne $mablBranch -and "" -ne $mablBranch) {
+            $m.add("source_control_tag", $mablBranch)
+        }
+        $body = ConvertTo-Json -InputObject $m
+        Write-Host "Creating Deployment..."
+        $resp = Invoke-RestMethod -URI $DeploymentEventsUri -Method Post `
+            -Headers $headers -ContentType 'application/json' `
+            -UserAgent $UserAgent -Body $body
+
+        $workspaceId = $resp.workspace_id
+        $eventId = $resp.id
+        Write-Host "View output at https://app.mabl.com/workspaces/${workspaceId}/events/${eventId}"
+    }
+    catch {
+        $statusCode = $_.Exception.Response.StatusCode.value__
+    
+        Write-Host "Failed to invoke deployment events API, status code: " `
+            $statusCode " description: " `
+            $_.Exception.Response.StatusDescription
+    
+        switch ($statusCode) {
+            400 {
+                Write-Host "At least one of environment ID or application ID must be specified"
+                break
+            }
+            401 { 
+                Write-Host "Invalid API key has been provided"
+                break
+            }
+            403 {
+                Write-Host "The provided API key is not authorized to submit deployment events"
+                break
+            }
+            404 {
+                Write-Host "The provided application or environment could not be found"
+                break
+            }
+        }
+        exit 1
+    }
+
+
+    # Poll Execution Result at least once based on await completion parameter
+    $awaitCompletion = $mablAwaitCompletion -eq "True"
+    $totalPlans = 0
+    $passedPlans = 0
+    $failedPlans = 0
+    $totalTests = 0
+    $passedTests = 0
+    $failedTests = 0
+    $execResult = ""
+    try {
+        $complete = -Not $awaitCompletion
+        do {
+            Start-Sleep -s $PollSec
+            $eventId = $resp.id
+            $uri = "$ExecutionResultBaseUri/$eventId"
+            $execResult = Invoke-RestMethod -URI $uri -Method Get -Headers $headers
+            $totalPlans = $execResult.plan_execution_metrics.total
+            $passedPlans = $execResult.plan_execution_metrics.passed
+            $failedPlans = $execResult.plan_execution_metrics.failed
+            $totalTests = $execResult.journey_execution_metrics.total
+            $passedTests = $execResult.journey_execution_metrics.passed
+            $failedTests = $execResult.journey_execution_metrics.failed
+
+            if ($passedPlans + $failedPlans -eq $totalPlans) {
+                $complete = $TRUE
+            }
+            elseif (!$complete) {
+                Write-Host "Plan runs" `
+                    "[passed: $passedTests, failed: $failedTests, total: $totalTests]"
+            }
+        } while (!$complete)
+    } 
+    catch {
+        $statusCode = $_.Exception.Response.StatusCode.value__
+
+        Write-Host "Failed to invoke execution result API, status code:" `
+            $statusCode " description: `
+                " $_.Exception.Response.StatusDescription
+    
+        switch ($statusCode) {
+            401 {
+                Write-Host "Invalid API key has been provided"
+                break
+            }
+            403 {
+                Write-Host "The provided API key is not authorized to retrieve execution results"
+                break
+            }
+            404 {
+                Write-Host "The deployment event could not be found"
+                break
+            }
+        }
+    
+        exit 1
+    }
+
+    if ($awaitCompletion) {
+        # Display results
+        Write-Host "Tests complete with status" `
+            $(If ($execResult.event_status.succeeded) { "PASSED" } else { "FAILED"})
+        Write-Result($execResult)
+
+        If ($execResult.event_status.succeeded) { exit 0 } else { exit 1 }
+    }
+
+    Write-Host "Successfully triggered $totalPlans plan(s)"
+    exit 0
+} `
+(Get-Param 'mablApiKey' -Required) `
+(Get-Param 'mablEnvId' '-e$' 'Environment IDs must end with -e') `
+(Get-Param 'mablAppId' '-a$' 'Application IDs must end with -a') `
+(Get-Param 'mablPlanLabels') `
+(Get-Param 'mablAwaitCompletion')
diff --git a/step-templates/run-mstest.json b/src/step-templates/run-mstest/metadata.json
similarity index 67%
rename from step-templates/run-mstest.json
rename to src/step-templates/run-mstest/metadata.json
index a855015cf..f6f787dc7 100644
--- a/step-templates/run-mstest.json
+++ b/src/step-templates/run-mstest/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 14,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Write-Output \"Running MsTests tests...\"\r\n\r\n$exePath = '\"' + $MsTestExePath + '\"'\r\nif (-not $exePath) {\r\n    $exePath = \"mstest.exe\"\r\n}\r\n\r\n$runMsTest = \"& $exePath \"\r\n\r\n$MsTestAssemblies.Split(\";\") | ForEach {\r\n    $asm = \" /testcontainer:\"+$_.Trim()\r\n    Write-Output \"Including test container assembly $asm\"\r\n    $runMsTest += \"$asm\"\r\n}\r\nWrite-Host $runMsTest\r\ncd $MsTestWorkingDirectoryPath\r\nWrite-Host $MsTestWorkingDirectoryPath  \r\n\r\niex $runMsTest\r\n$mstestExit = $lastExitCode\r\n\r\n\r\nexit $mstestExit",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -38,12 +38,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-04-30T12:44:24.644+00:00",
+    "ExportedAt": "2015-04-30T05:44:24.6440000-07:00",
     "OctopusVersion": "2.6.4.951",
     "Type": "ActionTemplate"
   },
   "Category": "tests"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/run-mstest/scriptbody.ps1 b/src/step-templates/run-mstest/scriptbody.ps1
new file mode 100644
index 000000000..ab36c8a95
--- /dev/null
+++ b/src/step-templates/run-mstest/scriptbody.ps1
@@ -0,0 +1,23 @@
+Write-Output "Running MsTests tests..."
+
+$exePath = '"' + $MsTestExePath + '"'
+if (-not $exePath) {
+    $exePath = "mstest.exe"
+}
+
+$runMsTest = "& $exePath "
+
+$MsTestAssemblies.Split(";") | ForEach {
+    $asm = " /testcontainer:"+$_.Trim()
+    Write-Output "Including test container assembly $asm"
+    $runMsTest += "$asm"
+}
+Write-Host $runMsTest
+cd $MsTestWorkingDirectoryPath
+Write-Host $MsTestWorkingDirectoryPath  
+
+iex $runMsTest
+$mstestExit = $lastExitCode
+
+
+exit $mstestExit
\ No newline at end of file
diff --git a/src/step-templates/run-octopus-runbook/metadata.json b/src/step-templates/run-octopus-runbook/metadata.json
new file mode 100644
index 000000000..0ca0a0362
--- /dev/null
+++ b/src/step-templates/run-octopus-runbook/metadata.json
@@ -0,0 +1,215 @@
+{
+  "Id": "0444b0b3-088e-4689-b755-112d1360ffe3",
+  "Name": "Run Octopus Deploy Runbook",
+  "Description": "This step will kick off a runbook.  The runbook can exist in the same space and project, or it can exist on a different instance altogether.  \n\n**Please Note**: Prompted variable values have to be text or sensitive variables.  Variable types such as AWS or Azure accounts will not work.\n\nThis step should be called from a worker machine.  If it is called from a target and the runbook runs on the same target you run the risk of a deadlock.\n\n",
+  "ActionType": "Octopus.Script",
+  "Version": 18,
+  "Author": "bobjwalker",
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "Parameters": [
+    {
+      "Id": "e9e93cff-973a-4107-afa2-8efa30947979",
+      "Name": "Run.Runbook.Name",
+      "Label": "Runbook Name",
+      "HelpText": "**Required**\n\nThe name of the runbook to run.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d998db57-3574-4598-81f9-7dd145cab81a",
+      "Name": "Run.Runbook.Base.Url",
+      "Label": "Base Url",
+      "HelpText": "**Required**\n\nThe base URL of your instance, IE https://samples.octopus.app.  Defaults to the system variable [Octopus.Web.ServerUri](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server).",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "24884bf3-ca1d-4c17-8ee0-017339d6d87e",
+      "Name": "Run.Runbook.Api.Key",
+      "Label": "Api Key",
+      "HelpText": "**Required**\n\nThe API key of a user who has permissions to run the runbook specified",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "bc2d33fe-d05b-49bd-b02b-eb6de4737eff",
+      "Name": "Run.Runbook.Space.Name",
+      "Label": "Runbook Space",
+      "HelpText": "**Required**\n\nThe name of the space the child project is located in.  Defaults to the current space name using the variable `#{Octopus.Space.Name}`.",
+      "DefaultValue": "#{Octopus.Space.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a1f44858-809a-48ce-9127-e59f02be40a1",
+      "Name": "Run.Runbook.Project.Name",
+      "Label": "Project name",
+      "HelpText": "**Required**\n\nThe name of the project containing the runbook.  Previous versions of this step allowed this parameter to be optional.  With the addition of CaC, this is now a required step for everyone.",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "07bd5b03-4151-4f32-8893-417bf22c4df2",
+      "Name": "Run.Runbook.Environment.Name",
+      "Label": "Environment Name",
+      "HelpText": "**Required**\n\nName of the environment to run the runbook on.  The default is the current environment name using the system variable `#{Octopus.Environment.Name}`.",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bf4ae98a-4901-474a-8984-08b0258304ca",
+      "Name": "Run.Runbook.Tenant.Name",
+      "Label": "Tenant Name",
+      "HelpText": "**Optional**\n\nName of Tenant to run the runbook for.  If you want to run a runbook using the same tenant as the deployment or runbook run then use the system variable `#{Octopus.Deployment.Tenant.Name}`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ffc33a7a-2a8e-4f7e-969f-bf5a377a078a",
+      "Name": "Run.Runbook.CaCBranchName",
+      "Label": "Runbook CaC Branch Name",
+      "HelpText": "**Optional**\n\nThe branch name to be used when invoking a CaC enabled runbook.  \n\n**Tip:** If you call this step from a deployment, you can use `#{Octopus.Release.Git.BranchName}`.\n\n**Warning:** It will use the project's default branch if you do not provide a branch name for a CaC-enabled runbook.  ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9c49ba5c-337b-454a-8837-282353276aea",
+      "Name": "Run.Runbook.UsePublishedSnapShot",
+      "Label": "Use Published Snapshot",
+      "HelpText": "Indicates if the run should use the most recent published snapshot.  When not set it will use the most recent snapshot, regardless if it was published or not.\n\nDefault is to use only published snapshots.\n\nIf you select to use unpublished snapshots then the runbook will:\n- If no published snapshots exist, then it will create a new unpublished snapshot on each run.\n- Create a new snapshot if anything has changed since the last published snapshot.\n- Use the existing published snapshot if nothing has changed since it was last published.\n\n**Please note:** A runbook is considered \"changed\" when any of the following are true:\n\n- Runbook process has changed.\n- Project variables have changed.\n- Library Variable Sets referenced by the project have changed.\n- A newer version of any referenced packages is found.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "1a3e3ff6-456a-49e0-a0ce-83bfb30bfcaa",
+      "Name": "Run.Runbook.Waitforfinish",
+      "Label": "Wait for finish",
+      "HelpText": "Indicates if the process should be paused and wait for the runbook to finish",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "c36715c5-b583-43c4-b3e3-a74f44f2b2c4",
+      "Name": "Run.Runbook.UseGuidedFailure",
+      "Label": "Use Guided Failure",
+      "HelpText": "Should the runbook run use guided failure (not a good idea if you are waiting for this to finish)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "6b951d28-b027-4f16-aaa6-39e91bd906d4",
+      "Name": "Run.Runbook.CancelInSeconds",
+      "Label": "Cancel Seconds",
+      "HelpText": "**Optional**\n\nThe number of seconds to wait before canceling the runbook run.  Default is 1800 seconds (30 minutes).",
+      "DefaultValue": "1800",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c847668d-b4fa-4405-a15b-f03691147597",
+      "Name": "Run.Runbook.PromptedVariables",
+      "Label": "Prompted Variable Values",
+      "HelpText": "**Optional**\n\nValues for any prompted variables for the runbook.  Each new line represents a new variable.  This will only work with string variable types, text and sensitive values.    \n\nUse the format **Name::Value**  IE:\n\n\nPromptedVariableName::My Super Awesome Value\n\nOtherPromptedVariable::Other Super Awesome Value",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "dd65f24d-7546-4271-b78b-28101170410c",
+      "Name": "Run.Runbook.DateTime",
+      "Label": "Scheduling",
+      "HelpText": "**Optional**\n\nSchedule the runbook to run in the future.  Please note, if this is set, the `Wait for Finish` option is ignored.\n\nUses `DateTime.TryParse` and specific keywords to determine the value sent in.  Supported formats:\n\n- `7:00 PM` will deploy at 7:00 PM today\n- `21:00` will deploy at 21:00 hours or 9 PM today\n- `YYYY-MM-DD HH:mm:ss` or `2021-01-14 21:00:00` will deploy at 9 PM on the 14th of January, 2021\n- `YYYY/MM/DD HH:mm:ss` or `2021/03/20 22:00:00` will deploy at 10 PM on the 20th of March, 2021\n- `MM/DD/YYYY HH:mm:ss` or `06/25/2021 19:00:00` will deploy at 7 PM on the 25th of June, 2021\n- `DD MMM YYYY HH:mm:ss` or `01 Jan 2021 18:00:00` will deploy at 6 PM on the 1st of January, 2021\n- `Tomorrow HH:mm:ss` or `Tomorrow 18:00:00` will deploy at 6 PM tomorrow\n\nUses the Octopus Server's Timezone.  The queue expiry time will be set to 1 hour from the supplied date.\n\nDefault is `N/A` or not applicable.  ",
+      "DefaultValue": "N/A",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "22158e31-8061-4ada-b61b-a7bdacb5dd37",
+      "Name": "Run.Runbook.Machines",
+      "Label": "Machine List",
+      "HelpText": "**Optional**\n\nA comma-separated list of Machine Ids or Machine Names to target with this runbook.  \n\n**Please Note:** The step template will remove any machines that cannot be found or are not applicable to the runbook.\n\nThe default is `N/A`.  Set to `#{Octopus.Deployment.Machines}` if you want to target the same machines as the current runbook run or deployment.",
+      "DefaultValue": "N/A",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "95788fe2-f770-460c-b012-e6a586fe04d7",
+      "Name": "Run.Runbook.AutoApproveManualInterventions",
+      "Label": "Auto approve runbook manual interventions",
+      "HelpText": "**Optional**\n\nIf the child project has manual interventions the step will look for manual interventions in the parent project or parent runbook.\n\nWhen a manual intervention in the parent project or parent runbook is found it will check that user's assigned teams.  If that user's assigned teams can approve the child project it will do so.\n\nPlease note, the user associated with the API key must be able to approve the child project manual interventions as well.  \n\nThe default is `No`, allow this to happen.  Set it to `Yes` to enable this functionality.",
+      "DefaultValue": "No",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "No|No\nYes|Yes"
+      }
+    },
+    {
+      "Id": "ea7c213e-380b-46ba-85b7-5c2c0f7b01d7",
+      "Name": "Run.Runbook.CustomNotes.Toggle",
+      "Label": "Custom Manual Intervention Notes Toggle",
+      "HelpText": "Check this box if you would like custom notes to be submitted with the automatic manual intervention approval.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "70549ad5-b451-4587-b8ed-b4afad1752f9",
+      "Name": "Run.Runbook.CustomNotes",
+      "Label": "Custom Manual Intervention Approval Notes",
+      "HelpText": "Use this field to supply custom manual intervention notes if the above toggle is checked.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b1cd0181-c5a8-4d4d-9746-f7cfe41f6794",
+      "Name": "Run.Runbook.ManualIntervention.EnvironmentToUse",
+      "Label": "Environment name to pull approvals from",
+      "HelpText": "**Optional**\n\nThe name of the environment you wish to pull the approvals from for the parent project or parent runbook.   It will look at all the deployments for the current release of the parent project and select the latest deployment to the specified environment.  If this step is being called from a runbook, it will look at the latest runbook run for the environment specified\n\nUsed when you are deploying to `Production` but want to pull the approvals from `Staging` or a `Prod Approval` environment.\n\nDefaults to the current environment name.",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2025-05-22T14:07:03.3090000Z",
+    "OctopusVersion": "2025.2.11677",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/run-octopus-runbook/scriptbody.ps1 b/src/step-templates/run-octopus-runbook/scriptbody.ps1
new file mode 100644
index 000000000..b8db46ab8
--- /dev/null
+++ b/src/step-templates/run-octopus-runbook/scriptbody.ps1
@@ -0,0 +1,1349 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+# Octopus Variables
+$octopusSpaceId = $OctopusParameters["Octopus.Space.Id"]
+$parentTaskId = $OctopusParameters["Octopus.Task.Id"]
+$parentReleaseId = $OctopusParameters["Octopus.Release.Id"]
+$parentChannelId = $OctopusParameters["Octopus.Release.Channel.Id"]
+$parentEnvironmentId = $OctopusParameters["Octopus.Environment.Id"]
+$parentRunbookId = $OctopusParameters["Octopus.Runbook.Id"]
+$parentEnvironmentName = $OctopusParameters["Octopus.Environment.Name"]
+$parentReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+
+# Step Template Parameters
+$runbookRunName = $OctopusParameters["Run.Runbook.Name"]
+$runbookBaseUrl = $OctopusParameters["Run.Runbook.Base.Url"]
+$runbookApiKey = $OctopusParameters["Run.Runbook.Api.Key"]
+$runbookEnvironmentName = $OctopusParameters["Run.Runbook.Environment.Name"]
+$runbookTenantName = $OctopusParameters["Run.Runbook.Tenant.Name"]
+$runbookWaitForFinish = $OctopusParameters["Run.Runbook.Waitforfinish"]
+$runbookUseGuidedFailure = $OctopusParameters["Run.Runbook.UseGuidedFailure"]
+$runbookUsePublishedSnapshot = $OctopusParameters["Run.Runbook.UsePublishedSnapShot"]
+$runbookPromptedVariables = $OctopusParameters["Run.Runbook.PromptedVariables"]
+$runbookCancelInSeconds = $OctopusParameters["Run.Runbook.CancelInSeconds"]
+$runbookProjectName = $OctopusParameters["Run.Runbook.Project.Name"]
+$runbookCustomNotesToggle = $OctopusParameters["Run.Runbook.CustomNotes.Toggle"]
+$runbookCustomNotes = $OctopusParameters["Run.Runbook.CustomNotes"]
+$parentBranchName = $OctopusParameters["Run.Runbook.CaCBranchName"]
+
+$runbookSpaceName = $OctopusParameters["Run.Runbook.Space.Name"]
+$runbookFutureDeploymentDate = $OctopusParameters["Run.Runbook.DateTime"]
+$runbookMachines = $OctopusParameters["Run.Runbook.Machines"]
+$autoApproveRunbookRunManualInterventions = $OctopusParameters["Run.Runbook.AutoApproveManualInterventions"]
+$approvalEnvironmentName = $OctopusParameters["Run.Runbook.ManualIntervention.EnvironmentToUse"]
+
+function Write-OctopusVerbose
+{
+    param($message)
+    
+    Write-Verbose $message  
+}
+
+function Write-OctopusInformation
+{
+    param($message)
+    
+    Write-Host $message  
+}
+
+function Write-OctopusSuccess
+{
+    param($message)
+
+    try 
+    {
+        Write-Highlight $message     
+    }
+    catch 
+    {
+        Write-Host $message ## Using a try-catch block so we can test this locally
+    }
+    
+}
+
+function Write-OctopusWarning
+{
+    param($message)
+
+    Write-Warning "$message" 
+}
+
+function Write-OctopusCritical
+{
+    param ($message)
+
+    Write-Error "$message" 
+}
+
+function Invoke-OctopusApi
+{
+    param
+    (
+        $octopusUrl,
+        $endPoint,
+        $spaceId,
+        $apiKey,
+        $method,
+        $item    
+    )
+
+    if ([string]::IsNullOrWhiteSpace($SpaceId))
+    {
+        $url = "$OctopusUrl/api/$EndPoint"
+    }
+    else
+    {
+        $url = "$OctopusUrl/api/$spaceId/$EndPoint"    
+    }  
+
+    try
+    {
+        if ($null -eq $item)
+        {
+            Write-Verbose "No data to post or put, calling bog standard invoke-restmethod for $url"
+            return Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -ContentType 'application/json; charset=utf-8'
+        }        
+        
+        $body = $item | ConvertTo-Json -Depth 10
+        Write-Verbose $body
+
+        Write-OctopusInformation "Invoking $method $url"
+        return Invoke-RestMethod -Method $method -Uri $url -Headers @{"X-Octopus-ApiKey" = "$ApiKey" } -Body $body -ContentType 'application/json; charset=utf-8'
+    }
+    catch
+    {
+        if ($null -ne $_.Exception.Response)
+        {
+            if ($_.Exception.Response.StatusCode -eq 401)
+            {
+                Write-Error "Unauthorized error returned from $url, please verify API key and try again"
+            }
+            elseif ($_.Exception.Response.statusCode -eq 403)
+            {
+                Write-Error "Forbidden error returned from $url, please verify API key and try again"
+            }
+            else
+            {                
+                Write-Error -Message "Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )"
+            }            
+        }
+        else
+        {
+            Write-Verbose $_.Exception
+        }
+    }
+
+    Throw "There was an error calling the Octopus API please check the log for more details"
+}
+
+function Test-RequiredValues
+{
+	param (
+    	$variableToCheck,
+        $variableName
+    )
+
+    if ([string]::IsNullOrWhiteSpace($variableToCheck) -eq $true)
+    {
+    	Write-OctopusCritical "$variableName is required."
+        return $false
+    }    
+    
+    return $true
+}
+
+function GetCheckBoxBoolean
+{
+	param (
+    	[string]$Value
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($value) -eq $true)
+    {
+    	return $false
+    }
+    
+    return $value -eq "True"
+}
+
+function Get-FilteredOctopusItem
+{
+    param(
+        $itemList,
+        $itemName
+    )
+
+    if ($itemList.Items.Count -eq 0)
+    {
+        Write-OctopusCritical "Unable to find $itemName.  Exiting with an exit code of 1."
+        Exit 1
+    }  
+
+    $item = $itemList.Items | Where-Object { $_.Name -eq $itemName}      
+
+    if ($null -eq $item)
+    {
+        Write-OctopusCritical "Unable to find $itemName.  Exiting with an exit code of 1."
+        exit 1
+    }
+    
+    if ($item -is [array])
+    {
+    	Write-OctopusCritical "More than one item exists with the name $itemName.  Exiting with an exit code of 1."
+        exit 1
+    }
+
+    return $item
+}
+
+function Get-OctopusItemFromListEndpoint
+{
+    param(
+        $endpoint,
+        $itemNameToFind,
+        $itemType,
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId,
+        $defaultValue
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($itemNameToFind))
+    {
+    	return $defaultValue
+    }
+    
+    Write-OctopusInformation "Attempting to find $itemType with the name of $itemNameToFind"
+    
+    $itemList = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "$($endpoint)?partialName=$([uri]::EscapeDataString($itemNameToFind))&skip=0&take=100" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"   
+    $item = Get-FilteredOctopusItem -itemList $itemList -itemName $itemNameToFind
+
+    Write-OctopusInformation "Successfully found $itemNameToFind with id of $($item.Id)"
+
+    return $item
+}
+
+function Get-MachineIdsFromMachineNames
+{
+    param (
+        $targetMachines,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    $targetMachineList = $targetMachines -split ","
+    $translatedList = @()
+
+    foreach ($machineName in $targetMachineList)
+    {
+        Write-OctopusVerbose "Translating $machineName to an Id.  First checking to see if it is already an Id."
+    	if ($machineName.Trim() -like "Machines*")
+        {
+            Write-OctopusVerbose "$machineName is already an Id, no need to look that up."
+        	$translatedList += $machineName
+            continue
+        }
+        
+        $machineObject = Get-OctopusItemFromListEndpoint -itemNameToFind $machineName.Trim() -itemType "Deployment Target" -endpoint "machines" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey
+
+        $translatedList += $machineObject.Id
+    }
+
+    return $translatedList
+}
+
+function Get-RunbookSnapshotIdToRun
+{
+    param (
+        $runbookToRun,
+        $runbookUsePublishedSnapshot,
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId
+    )
+
+    $runbookSnapShotIdToUse = $runbookToRun.PublishedRunbookSnapshotId
+    Write-OctopusInformation "The last published snapshot for $runbookRunName is $runbookSnapShotIdToUse"
+
+    if ($null -eq $runbookSnapShotIdToUse -and $runbookUsePublishedSnapshot -eq $true)
+    {
+        Write-OctopusCritical "Use Published Snapshot was set; yet the runbook doesn't have a published snapshot.  Exiting."
+        Exit 1
+    }
+
+    if ($runbookUsePublishedSnapshot -eq $true)
+    {
+        Write-OctopusInformation "Use published snapshot set to true, using the published runbook snapshot."
+        return $runbookSnapShotIdToUse
+    }
+
+    if ($null -eq $runbookToRun.PublishedRunbookSnapshotId)
+    {
+        Write-OctopusInformation "There have been no published runbook snapshots, going to create a new snapshot."
+        return New-RunbookUnpublishedSnapshot -runbookToRun $runbookToRun -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId
+    }
+
+    $runbookSnapShotTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "runbookSnapshots/$($runbookToRun.PublishedRunbookSnapshotId)/runbookRuns/template" -method "Get" -item $null
+
+    if ($runbookSnapShotTemplate.IsRunbookProcessModified -eq $false -and $runbookSnapShotTemplate.IsVariableSetModified -eq $false -and $runbookSnapShotTemplate.IsLibraryVariableSetModified -eq $false)
+    {        
+        Write-OctopusInformation "The runbook has not been modified since the published snapshot was created.  Checking to see if any of the packages have a new version."    
+        $runbookSnapShot = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "runbookSnapshots/$($runbookToRun.PublishedRunbookSnapshotId)" -method "Get" -item $null
+        $snapshotTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "runbooks/$($runbookToRun.Id)/runbookSnapShotTemplate" -method "Get" -item $null
+
+        foreach ($package in $runbookSnapShot.SelectedPackages)
+        {
+            foreach ($templatePackage in $snapshotTemplate.Packages)
+            {
+                if ($package.StepName -eq $templatePackage.StepName -and $package.ActionName -eq $templatePackage.ActionName -and $package.PackageReferenceName -eq $templatePackage.PackageReferenceName)
+                {
+                    $packageVersion = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "feeds/$($templatePackage.FeedId)/packages/versions?packageId=$($templatePackage.PackageId)&take=1" -method "Get" -item $null
+
+                    if ($packageVersion -ne $package.Version)
+                    {
+                        Write-OctopusInformation "A newer version of a package was found, going to use that and create a new snapshot."
+                        return New-RunbookUnpublishedSnapshot -runbookToRun $runbookToRun -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId                    
+                    }
+                }
+            }
+        }
+
+        Write-OctopusInformation "No new package versions have been found, using the published snapshot."
+        return $runbookToRun.PublishedRunbookSnapshotId
+    }
+    
+    Write-OctopusInformation "The runbook has been modified since the snapshot was created, creating a new one."
+    return New-RunbookUnpublishedSnapshot -runbookToRun $runbookToRun -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId
+}
+
+function New-RunbookUnpublishedSnapshot
+{
+    param (
+        $runbookToRun,
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId
+    )
+
+    $octopusProject = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "projects/$($runbookToRun.ProjectId)" -method "Get" -item $null
+    $snapshotTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "runbooks/$($runbookToRun.Id)/runbookSnapShotTemplate" -method "Get" -item $null
+
+    $runbookPackages = Get-RunbookPackages -snapshotTemplate $snapshotTemplate -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -usingCaC $false
+
+    $runbookSnapShotRequest = @{
+        FrozenProjectVariableSetId = "variableset-$($runbookToRun.ProjectId)"
+        FrozenRunbookProcessId = $($runbookToRun.RunbookProcessId)
+        LibraryVariableSetSnapshotIds = @($octopusProject.IncludedLibraryVariableSetIds)
+        Name = $($snapshotTemplate.NextNameIncrement)
+        ProjectId = $($runbookToRun.ProjectId)
+        ProjectVariableSetSnapshotId = "variableset-$($runbookToRun.ProjectId)"
+        RunbookId = $($runbookToRun.Id)
+        SelectedPackages = @($runbookPackages)
+    }
+
+    $newSnapShot = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint "runbookSnapshots" -method "POST" -item $runbookSnapShotRequest
+
+    return $($newSnapShot.Id)
+}
+
+function Get-RunbookPackages
+{
+    param(
+        $snapshotTemplate,
+        $octopusUrl,
+        $apiKey,
+        $spaceId,
+        $usingCaC
+    )
+
+    $runbookPackages = @()
+    foreach ($package in $snapshotTemplate.Packages)
+    {
+        $packageVersion = Invoke-OctopusApi -octopusUrl $octopusUrl -apiKey $apiKey -spaceId $spaceId -endPoint "feeds/$($package.FeedId)/packages/versions?packageId=$($package.PackageId)&take=1" -method "Get" -item $null
+
+        if ($packageVersion.TotalResults -le 0)
+        {
+            Write-Error "Unable to find a package version for $($package.PackageId).  This is required to create a new unpublished snapshot.  Exiting."
+            exit 1
+        }
+
+        $runbookPackages += @{
+            StepName = $package.StepName
+            ActionName = $package.ActionName
+            Version = $packageVersion.Items[0].Version
+            PackageReferenceName = $package.PackageReferenceName
+        }
+        
+    }
+
+    return $runbookPackages
+}
+
+function Get-RunbookGitReferences
+{
+    param(
+        $snapshotTemplate
+    )
+
+    $runbookReferences = @()
+    foreach ($reference in $snapshotTemplate.SelectedGitResources)
+    {        
+        $gitReference = $reference.DefaultBranch
+        if (($gitReference -contains "refs/heads/") -eq $false)
+        {
+            $gitReference = "refs/heads/$gitReference"
+        }
+
+        $runbookReferences += @{
+            StepName = $reference.ActionName
+            GitReferenceResource = @{
+                GitRef = $gitReference
+            }
+            GitResourceReferenceName = ""            
+        }
+    }
+
+    return $runbookReferences
+}
+
+function Get-ProjectSlug
+{
+    param
+    (
+        $runbookToRun,
+        $projectToUse,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    if ($null -ne $projectToUse)
+    {
+        return $projectToUse.Slug
+    }
+
+    $project = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint "projects/$($runbookToRun.ProjectId)" -method "GET" -item $null
+
+    return $project.Slug
+}
+
+function Get-RunbookFormValues
+{
+    param (
+        $runbookPreview,
+        $runbookPromptedVariables        
+    )
+
+    $runbookFormValues = @{}
+
+    if ([string]::IsNullOrWhiteSpace($runbookPromptedVariables) -eq $true)
+    {
+        return $runbookFormValues
+    }    
+    
+    $promptedValueList = @(($runbookPromptedVariables -Split "`n").Trim())
+    Write-OctopusInformation $promptedValueList.Length
+    
+    foreach($element in $runbookPreview.Form.Elements)
+    {
+    	$nameToSearchFor = $element.Control.Name
+        $uniqueName = $element.Name
+        $isRequired = $element.Control.Required
+        
+        $promptedVariablefound = $false
+        
+        Write-OctopusInformation "Looking for the prompted variable value for $nameToSearchFor"
+    	foreach ($promptedValue in $promptedValueList)
+        {
+        	$splitValue = $promptedValue -Split "::"
+            Write-OctopusInformation "Comparing $nameToSearchFor with provided prompted variable $($promptedValue[0])"
+            if ($splitValue.Length -gt 1)
+            {
+            	if ($nameToSearchFor -eq $splitValue[0])
+                {
+                	Write-OctopusInformation "Found the prompted variable value $nameToSearchFor"
+                	$runbookFormValues[$uniqueName] = $splitValue[1]
+                    $promptedVariableFound = $true
+                    break
+                }
+            }
+        }
+        
+        if ($promptedVariableFound -eq $false -and $isRequired -eq $true)
+        {
+        	Write-OctopusCritical "Unable to find a value for the required prompted variable $nameToSearchFor, exiting"
+            Exit 1
+        }
+    }
+
+    return $runbookFormValues
+}
+
+function Invoke-OctopusDeployRunbook
+{
+    param (
+        $runbookBody,
+        $runbookWaitForFinish,
+        $runbookCancelInSeconds,
+        $projectNameForUrl,        
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId,
+        $parentTaskApprovers,
+        $autoApproveRunbookRunManualInterventions,
+        $parentProjectName,
+        $parentReleaseNumber,
+        $approvalEnvironmentName,
+        $parentRunbookId,
+        $parentTaskId,
+        $usingCaC,
+        $cacRunbookEndpoint,
+        $runbookNameForUrl        
+    )
+
+    if ($usingCaC -eq $true)
+    {
+        $runbookResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -item $runbookBody -method "POST" -endPoint "$($cacRunbookEndpoint)/$runbookNameForUrl/run/v1"
+
+        $runbookServerTaskId = $runBookResponse.Resources[0].TaskId
+        Write-OctopusInformation "The task id of the new task is $runbookServerTaskId"
+
+        $runbookRunId = $runbookResponse.Resources[0].Id
+        Write-OctopusInformation "The runbook run id is $runbookRunId"            
+    }
+    else 
+    {
+        $runbookResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -item $runbookBody -method "POST" -endPoint "runbookRuns"
+
+        $runbookServerTaskId = $runBookResponse.TaskId
+        Write-OctopusInformation "The task id of the new task is $runbookServerTaskId"
+
+        $runbookRunId = $runbookResponse.Id
+        Write-OctopusInformation "The runbook run id is $runbookRunId"        
+    }
+
+    Write-OctopusSuccess "Runbook was successfully invoked, you can access the launched runbook [here]($defaultUrl/app#/$spaceId/tasks/$($runbookServerTaskId))"    
+    
+    if ($runbookWaitForFinish -eq $false)
+    {
+        Write-OctopusInformation "The wait for finish setting is set to no, exiting step"
+        return
+    }
+    
+    if ($null -ne $runbookBody.QueueTime)
+    {
+    	Write-OctopusInformation "The runbook queue time is set.  Exiting step"
+        return
+    }
+
+    Write-OctopusSuccess "The setting to wait for completion was set, waiting until task has finished"
+    $startTime = Get-Date
+    $currentTime = Get-Date
+    $dateDifference = $currentTime - $startTime
+	
+    $taskStatusUrl = "tasks/$runbookServerTaskId"
+    $numberOfWaits = 0    
+    
+    While ($dateDifference.TotalSeconds -lt $runbookCancelInSeconds)
+    {
+        Write-OctopusInformation "Waiting 5 seconds to check status"
+        Start-Sleep -Seconds 5
+        $taskStatusResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint $taskStatusUrl -method "GET" -item $null
+        $taskStatusResponseState = $taskStatusResponse.State
+
+        if ($taskStatusResponseState -eq "Success")
+        {
+            Write-OctopusSuccess "The task has finished with a status of Success"
+            exit 0            
+        }
+        elseif($taskStatusResponseState -eq "Failed" -or $taskStatusResponseState -eq "Canceled")
+        {
+            Write-OctopusSuccess "The task has finished with a status of $taskStatusResponseState status."
+            exit 1            
+        }
+        elseif($taskStatusResponse.HasPendingInterruptions -eq $true)
+        {
+            if ($autoApproveRunbookRunManualInterventions -eq "Yes")
+            {
+                Submit-RunbookRunForAutoApproval -createdRunbookRun $createdRunbookRun -parentTaskApprovers $parentTaskApprovers -defaultUrl $DefaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -parentProjectName $parentProjectName -parentReleaseNumber $parentReleaseNumber -parentEnvironmentName $approvalEnvironmentName -parentRunbookId $parentRunbookId -parentTaskId $parentTaskId
+            }
+            else
+            {
+                if ($numberOfWaits -ge 10)
+                {
+                    Write-OctopusSuccess "The child project has pending manual intervention(s).  Unless you approve it, this task will time out."
+                }
+                else
+                {
+                    Write-OctopusInformation "The child project has pending manual intervention(s).  Unless you approve it, this task will time out."                        
+                }
+            }
+        }
+        
+        $numberOfWaits += 1
+        if ($numberOfWaits -ge 10)
+        {
+        	Write-OctopusSuccess "The task state is currently $taskStatusResponseState"
+        	$numberOfWaits = 0
+        }
+        else
+        {
+        	Write-OctopusInformation "The task state is currently $taskStatusResponseState"
+        }  
+        
+        $startTime = $taskStatusResponse.StartTime
+        if ($startTime -eq $null -or [string]::IsNullOrWhiteSpace($startTime) -eq $true)
+        {        
+        	Write-OctopusInformation "The task is still queued, let's wait a bit longer"
+        	$startTime = Get-Date
+        }
+        $startTime = [DateTime]$startTime
+        
+        $currentTime = Get-Date
+        $dateDifference = $currentTime - $startTime        
+    }
+    
+    Write-OctopusSuccess "The cancel timeout has been reached, cancelling the runbook run"
+    $cancelResponse = Invoke-RestMethod "$runbookBaseUrl/api/tasks/$runbookServerTaskId/cancel" -Headers $header -Method Post
+    Write-OctopusSuccess "Exiting with an error code of 1 because we reached the timeout"
+    exit 1
+}
+
+function Get-QueueDate
+{
+	param ( 
+    	$futureDeploymentDate
+    )
+    
+    if ([string]::IsNullOrWhiteSpace($futureDeploymentDate) -or $futureDeploymentDate -eq "N/A")
+    {
+    	return $null
+    }
+    
+    $addOneDay = $false
+    $textToParse = $futureDeploymentDate.ToLower()
+    if ($textToParse -like "tomorrow*")
+    {
+    	Write-OctopusInformation "The future date $futureDeploymentDate supplied contains tomorrow, will add one day to whatever the parsed result is."
+    	$addOneDay = $true
+        $textToParse = $textToParse -replace "tomorrow", ""
+    }
+    
+    [datetime]$outputDate = New-Object DateTime
+    $currentDate = Get-Date
+    $currentDate = $currentDate.AddMinutes(2)
+
+    if ([datetime]::TryParse($textToParse, [ref]$outputDate) -eq $false)
+    {
+        Write-OctopusCritical "The suppplied date $textToParse cannot be parsed by DateTime.TryParse.  Please verify format and try again.  Please [refer to Microsoft's Documentation](https://docs.microsoft.com/en-us/dotnet/api/system.datetime.tryparse) on supported formats."
+        exit 1
+    }
+    
+    Write-OctopusInformation "The proposed date is $outputDate.  Checking to see if this will occur in the past."
+    
+    if ($addOneDay -eq $true)
+    {
+    	$outputDate = $outputDate.AddDays(1)
+    	Write-OctopusInformation "The text supplied included tomorrow, adding one day.  The new proposed date is $outputDate."
+    }
+    
+    if ($currentDate -gt $outputDate)
+    {
+    	Write-OctopusCritical "The supplied date $futureDeploymentDate is set for the past.  All queued deployments must be in the future."
+        exit 1
+    }
+    
+    return $outputDate
+}
+
+function Get-QueueExpiryDate
+{
+	param (
+    	$queueDate
+    )
+    
+    if ($null -eq $queueDate)
+    {
+    	return $null
+    }
+    
+    return $queueDate.AddHours(1)
+}
+
+function Get-RunbookSpecificMachines
+{
+    param (
+        $defaultUrl,
+        $octopusApiKey,    
+        $runbookPreview,
+        $runbookMachines,        
+        $runbookRunName        
+    )
+
+    if ($runbookMachines -eq "N/A")
+    {
+        return @()
+    }
+
+    if ([string]::IsNullOrWhiteSpace($runbookMachines) -eq $true)
+    {
+        return @()
+    }
+
+    $translatedList = Get-MachineIdsFromMachineNames -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -targetMachines $runbookMachines
+
+    $filteredList = @()    
+    foreach ($runbookMachine in $translatedList)
+    {    	
+    	$runbookMachineId = $runbookMachine.Trim().ToLower()
+    	Write-OctopusVerbose "Checking if $runbookMachineId is set to run on any of the runbook steps"
+        
+        foreach ($step in $runbookPreview.StepsToExecute)
+        {
+            foreach ($machine in $step.Machines)
+            {
+            	Write-OctopusVerbose "Checking if $runbookMachineId matches $($machine.Id) and it isn't already in the $($filteredList -join ",")"
+                if ($runbookMachineId -eq $machine.Id.Trim().ToLower() -and $filteredList -notcontains $machine.Id)
+                {
+                	Write-OctopusInformation "Adding $($machine.Id) to the list"
+                    $filteredList += $machine.Id
+                }
+            }
+        }
+    }
+
+    if ($filteredList.Length -le 0)
+    {
+        Write-OctopusSuccess "The current task is targeting specific machines, but the runbook $runBookRunName does not run against any of these machines $runbookMachines. Skipping this run."
+        exit 0
+    }
+
+    return $filteredList
+}
+
+function Get-ParentTaskApprovers
+{
+    param (
+        $parentTaskId,
+        $spaceId,
+        $defaultUrl,
+        $octopusApiKey
+    )
+    
+    $approverList = @()
+    if ($null -eq $parentTaskId)
+    {
+    	Write-OctopusInformation "The deployment task id to pull the approvers from is null, return an empty approver list"
+    	return $approverList
+    }
+
+    Write-OctopusInformation "Getting all the events from the parent project"
+    $parentEvents = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "events?regardingAny=$parentTaskId&spaces=$spaceId&includeSystem=true" -apiKey $octopusApiKey -method "GET"
+    
+    foreach ($parentEvent in $parentEvents.Items)
+    {
+        Write-OctopusVerbose "Checking $($parentEvent.Message) for manual intervention"
+        if ($parentEvent.Message -like "Submitted interruption*")
+        {
+            Write-OctopusVerbose "The event $($parentEvent.Id) is a manual intervention approval event which was approved by $($parentEvent.Username)."
+
+            $approverExists = $approverList | Where-Object {$_.Id -eq $parentEvent.UserId}        
+
+            if ($null -eq $approverExists)
+            {
+                $approverInformation = @{
+                    Id = $parentEvent.UserId;
+                    Username = $parentEvent.Username;
+                    Teams = @()
+                }
+
+                $approverInformation.Teams = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "teammembership?userId=$($approverInformation.Id)&spaces=$spaceId&includeSystem=true" -apiKey $octopusApiKey -method "GET"            
+
+                Write-OctopusVerbose "Adding $($approverInformation.Id) to the approval list"
+                $approverList += $approverInformation
+            }        
+        }
+    }
+
+    return $approverList
+}
+
+function Get-ApprovalTaskIdFromDeployment
+{
+    param (
+        $parentReleaseId,
+        $approvalEnvironment,
+        $parentChannelId,    
+        $parentEnvironmentId,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey 
+    )
+
+    $releaseDeploymentList = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "releases/$parentReleaseId/deployments" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId
+    
+    $lastDeploymentTime = $(Get-Date).AddYears(-50)
+    $approvalTaskId = $null
+    foreach ($deployment in $releaseDeploymentList.Items)
+    {
+        if ($deployment.EnvironmentId -ne $approvalEnvironment.Id)
+        {
+            Write-OctopusInformation "The deployment $($deployment.Id) deployed to $($deployment.EnvironmentId) which doesn't match $($approvalEnvironment.Id)."
+            continue
+        }
+        
+        Write-OctopusInformation "The deployment $($deployment.Id) was deployed to the approval environment $($approvalEnvironment.Id)."
+
+        $deploymentTask = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $null -endPoint "tasks/$($deployment.TaskId)" -apiKey $octopusApiKey -Method "Get"
+        if ($deploymentTask.IsCompleted -eq $true -and $deploymentTask.FinishedSuccessfully -eq $false)
+        {
+            Write-Information "The deployment $($deployment.Id) was deployed to the approval environment, but it encountered a failure, moving onto the next deployment."
+            continue
+        }
+
+        if ($deploymentTask.StartTime -gt $lastDeploymentTime)
+        {
+            $approvalTaskId = $deploymentTask.Id
+            $lastDeploymentTime = $deploymentTask.StartTime
+        }
+    }        
+
+    if ($null -eq $approvalTaskId)
+    {
+    	Write-OctopusVerbose "Unable to find a deployment to the environment, determining if it should've happened already."
+        $channelInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint "channels/$parentChannelId" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId
+        $lifecycle = Get-OctopusLifeCycle -channel $channelInformation -defaultUrl $defaultUrl -spaceId $spaceId -OctopusApiKey $octopusApiKey
+        $lifecyclePhases = Get-LifecyclePhases -lifecycle $lifecycle -defaultUrl $defaultUrl -spaceId $spaceid -OctopusApiKey $octopusApiKey
+        
+        $foundDestinationFirst = $false
+        $foundApprovalFirst = $false
+        
+        foreach ($phase in $lifecyclePhases.Phases)
+        {
+        	if ($phase.AutomaticDeploymentTargets -contains $parentEnvironmentId -or $phase.OptionalDeploymentTargets -contains $parentEnvironmentId)
+            {
+            	if ($foundApprovalFirst -eq $false)
+                {
+                	$foundDestinationFirst = $true
+                }
+            }
+            
+            if ($phase.AutomaticDeploymentTargets -contains $approvalEnvironment.Id -or $phase.OptionalDeploymentTargets -contains $approvalEnvironment.Id)
+            {
+            	if ($foundDestinationFirst -eq $false)
+                {
+                	$foundApprovalFirst = $true
+                }
+            }
+        }
+        
+        $messageToLog = "Unable to find a deployment for the environment $approvalEnvironmentName.  Auto approvals are disabled."
+        if ($foundApprovalFirst -eq $true)
+        {
+        	Write-OctopusWarning $messageToLog
+        }
+        else
+        {
+        	Write-OctopusInformation $messageToLog
+        }
+        
+        return $null
+    }
+
+    return $approvalTaskId
+}
+
+function Get-ApprovalTaskIdFromRunbook
+{
+    param (
+        $parentRunbookId,
+        $approvalEnvironment,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey 
+    )
+}
+
+function Get-ApprovalTaskId
+{
+	param (
+    	$autoApproveRunbookRunManualInterventions,
+        $parentTaskId,
+        $parentReleaseId,
+        $parentRunbookId,
+        $parentEnvironmentName,
+        $approvalEnvironmentName,
+        $parentChannelId,    
+        $parentEnvironmentId,
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey        
+    )
+    
+    if ($autoApproveRunbookRunManualInterventions -eq $false)
+    {
+    	Write-OctopusInformation "Auto approvals are disabled, skipping pulling the approval deployment task id"
+        return $null
+    }
+    
+    if ([string]::IsNullOrWhiteSpace($approvalEnvironmentName) -eq $true)
+    {
+    	Write-OctopusInformation "Approval environment not supplied, using the current environment id for approvals."
+        return $parentTaskId
+    }
+    
+    if ($approvalEnvironmentName.ToLower().Trim() -eq $parentEnvironmentName.ToLower().Trim())
+    {
+        Write-OctopusInformation "The approval environment is the same as the current environment, using the current task id $parentTaskId"
+        return $parentTaskId
+    }
+    
+    $approvalEnvironment = Get-OctopusItemFromListEndpoint -itemNameToFind $approvalEnvironmentName -itemType "Environment" -defaultUrl $DefaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -defaultValue $null -endpoint "environments"
+    
+    if ([string]::IsNullOrWhiteSpace($parentReleaseId) -eq $false)
+    {
+        return Get-ApprovalTaskIdFromDeployment -parentReleaseId $parentReleaseId -approvalEnvironment $approvalEnvironment -parentChannelId $parentChannelId -parentEnvironmentId $parentEnvironmentId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId
+    }
+
+    return Get-ApprovalTaskIdFromRunbook -parentRunbookId $parentRunbookId -approvalEnvironment $approvalEnvironment -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey
+}
+
+function Get-OctopusLifecycle
+{
+    param (
+        $channel,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    Write-OctopusInformation "Attempting to find the lifecycle information $($channel.Name)"
+    if ($null -eq $channel.LifecycleId)
+    {
+        $lifecycleName = "Default Lifecycle"
+        $lifecycleList = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "lifecycles?partialName=$([uri]::EscapeDataString($lifecycleName))&skip=0&take=1" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+        $lifecycle = $lifecycleList.Items[0]
+    }
+    else
+    {
+        $lifecycle = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "lifecycles/$($channel.LifecycleId)" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+    }
+
+    Write-OctopusInformation "Successfully found the lifecycle $($lifecycle.Name) to use for this channel."
+
+    return $lifecycle
+}
+
+function Get-LifecyclePhases
+{
+    param (
+        $lifecycle,        
+        $defaultUrl,
+        $spaceId,
+        $octopusApiKey
+    )
+
+    Write-OctopusInformation "Attempting to find the phase in the lifecycle $($lifecycle.Name) with the environment $environmentName to find the previous phase."
+    if ($lifecycle.Phases.Count -eq 0)
+    {
+        Write-OctopusInformation "The lifecycle $($lifecycle.Name) has no set phases, calling the preview endpoint."
+        $lifecyclePreview = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "lifecycles/$($lifecycle.Id)/preview" -spaceId $spaceId -apiKey $octopusApiKey -method "GET"
+        $phases = $lifecyclePreview.Phases
+    }
+    else
+    {
+        Write-OctopusInformation "The lifecycle $($lifecycle.Name) has set phases, using those."
+        $phases = $lifecycle.Phases    
+    }
+
+    Write-OctopusInformation "Found $($phases.Length) phases in this lifecycle."
+    return $phases
+}
+
+function Submit-RunbookRunForAutoApproval
+{
+    param (
+        $createdRunbookRun,
+        $parentTaskApprovers,
+        $defaultUrl,
+        $octopusApiKey,
+        $spaceId,
+        $parentProjectName,
+        $parentReleaseNumber,
+        $parentRunbookId,
+        $parentEnvironmentName,
+        $parentTaskId        
+    )
+
+    Write-OctopusSuccess "The task has a pending manual intervention.  Checking parent approvals."    
+    $manualInterventionInformation = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "interruptions?regarding=$($createdRunbookRun.TaskId)" -method "GET" -apiKey $octopusApiKey -spaceId $spaceId
+    foreach ($manualIntervention in $manualInterventionInformation.Items)
+    {
+        if ($manualIntervention.IsPending -eq $false)
+        {
+            Write-OctopusInformation "This manual intervention has already been approved.  Proceeding onto the next one."
+            continue
+        }
+
+        if ($manualIntervention.CanTakeResponsibility -eq $false)
+        {
+            Write-OctopusSuccess "The user associated with the API key doesn't have permissions to take responsibility for the manual intervention."
+            Write-OctopusSuccess "If you wish to leverage the auto-approval functionality give the user permissions."
+            continue
+        }        
+
+        $automaticApprover = $null
+        Write-OctopusVerbose "Checking to see if one of the parent project approvers is assigned to one of the manual intervention teams $($manualIntervention.ResponsibleTeamIds)"
+        foreach ($approver in $parentTaskApprovers)
+        {
+            foreach ($approverTeam in $approver.Teams)
+            {
+                Write-OctopusVerbose "Checking to see if $($manualIntervention.ResponsibleTeamIds) contains $($approverTeam.TeamId)"
+                if ($manualIntervention.ResponsibleTeamIds -contains $approverTeam.TeamId)
+                {
+                    $automaticApprover = $approver
+                    break
+                }
+            }
+
+            if ($null -ne $automaticApprover)
+            {
+                break
+            }
+        }
+
+        if ($null -ne $automaticApprover)
+        {
+        	Write-OctopusSuccess "Matching approver found auto-approving."
+            if ($manualIntervention.HasResponsibility -eq $false)
+            {
+                Write-OctopusInformation "Taking over responsibility for this manual intervention."
+                $takeResponsiblilityResponse = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "interruptions/$($manualIntervention.Id)/responsible" -method "PUT" -apiKey $octopusApiKey -spaceId $spaceId
+                Write-OctopusVerbose "Response from taking responsibility $($takeResponsiblilityResponse.Id)"
+            }
+            
+            if ([string]::IsNullOrWhiteSpace($parentReleaseNumber) -eq $false)
+            {
+                $notes = "Auto-approving this runbook run.  Parent project $parentProjectName release $parentReleaseNumber to $parentEnvironmentName with the task id $parentTaskId was approved by $($automaticApprover.UserName).  That user is a member of one of the teams this manual intervention requires.  You can view that deployment $defaultUrl/app#/$spaceId/tasks/$parentTaskId"
+            }
+            else 
+            {
+                $notes = "Auto-approving this runbook run.  Parent project $parentProjectName runbook run $parentRunbookId to $parentEnvironmentName with the task id $parentTaskId was approved by $($automaticApprover.UserName).  That user is a member of one of the teams this manual intervention requires.  You can view that runbook run $defaultUrl/app#/$spaceId/tasks/$parentTaskId"
+            }
+            if ($runbookCustomNotesToggle -eq $true){
+              $notes = $runbookCustomNotes
+            }
+            $submitApprovalBody = @{
+                Instructions = $null;
+                Notes = $notes
+                Result = "Proceed"
+            }
+            $submitResult = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint "interruptions/$($manualIntervention.Id)/submit" -method "POST" -apiKey $octopusApiKey -item $submitApprovalBody -spaceId $spaceId
+            Write-OctopusSuccess "Successfully auto approved the manual intervention $($submitResult.Id)"
+        }
+        else
+        {
+            Write-OctopusSuccess "Couldn't find an approver to auto-approve the child project.  Waiting until timeout or child project is approved."    
+        }
+    }
+}
+
+function Get-NonTenantedRunbookPreview
+{
+    param(
+        $octopusUrl,
+        $spaceId, 
+        $apiKey,
+        $runbookSnapShotIdToUse,
+        $runbookEnvironmentId,
+        $runbookToRun,
+        $usingCaC,
+        $cacRunbookEndPoint
+    )
+
+    $runbookPreview = $null
+
+    try
+    {
+        $runbookPreviewEndpoint = "runbookSnapshots/$($runbookSnapShotIdToUse)/runbookRuns/preview/$($runbookEnvironmentId)?includeDisabledSteps=true"
+        if ($usingCaC -eq $true)
+        {
+            Write-OctopusInformation "Using the CaC non-tenanted preview step"
+    	    $runbookPreviewEndpoint = "$($cacRunbookEndPoint)/$($runbookToRun.Slug)/runbookRuns/preview/$($runbookEnvironmentId)?includeDisabledSteps=true"
+        }        
+
+        $runBookPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint $runbookPreviewEndpoint -method "GET" -item $null
+    	
+    }
+    catch
+    {
+    	Write-OctopusInformation "The current version of Octopus Deploy doesn't support Runbook Snapshot Preview"
+    	$runBookPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint "runbooks/$($runbookToRun.Id)/runbookRuns/preview/$($environmentToUse.Id)" -method "GET" -item $null
+   	}
+
+    return $runbookPreview
+}
+
+function Get-TenantedRunbookPreview 
+{
+    param(
+        $octopusUrl,
+        $spaceId, 
+        $apiKey,
+        $runbookSnapShotIdToUse,
+        $runbookEnvironmentId,
+        $runbookToRun,
+        $tenantIdToUse,
+        $usingCaC,
+        $cacRunbookEndPoint
+    )
+
+    $runbookPreview = $null
+
+    if ($usingCaC -eq $true)
+    {
+        Write-OctopusInformation "Using the CaC tenanted preview step that requires a POST instead of GET"        
+        $runbookPreviewBody = @{
+            DeploymentPreviews = @( 
+                @{
+                    EnvironmentId = $runbookEnvironmentId;
+                    TenantId = $tenantIdToUse;
+                }
+            )
+        }                     
+                
+        $runBookGroupedPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint "$($runbookEndPoint)/$($runbookToRun.Slug)/runbookRuns/previews" -method "POST" -item $runbookPreviewBody 
+        $runbookPreview = $runBookGroupedPreview[0]
+    }
+    else
+    {
+        $runBookPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint "runbooks/$($runbookToRun.Id)/runbookRuns/preview/$($runbookEnvironmentId)/$($tenantIdToUse)" -method "GET"       
+    }   
+
+    return $runbookPreview
+}
+function Get-RunbookEndPoint
+{
+    param (        
+        $cacBranchName,
+        $projectToUse,
+        $usingCaC
+    )
+
+    if ($usingCaC -eq $true)
+    {
+        return "projects/$($projectToUse.Id)/$([uri]::EscapeDataString($cacBranchName))/runbooks"        
+    }
+    else
+    {
+        return "projects/$($projectToUse.Id)/runbooks"
+    }
+}
+
+function Get-IsProjectUsingCaCRunbooks
+{
+    param(
+        $projectToUse
+    )
+
+    $hasPersistenceSettings = Get-Member -InputObject $projectToUse -Name "PersistenceSettings" -MemberType Properties
+    if (!$hasPersistenceSettings)
+    {
+        return $false;        
+    }
+
+    Write-OctopusInformation "The project has the PersistenceSettings object."
+    $hasConversionState = Get-Member -InputObject $projectToUse.PersistenceSettings -Name "ConversionState" -MemberType Properties        
+    if (!$hasConversionState)
+    {
+        return $false;
+    }
+
+    Write-OctopusInformation "The project has the PersistenceSettings object."
+    $hasRunbooksInGit = Get-Member -InputObject $projectToUse.PersistenceSettings.ConversionState -Name "RunbooksAreInGit" -MemberType Properties    
+    
+    if (!$hasRunbooksInGit)
+    {
+        return $false;
+    }
+
+    $isUsingCaC = $projectToUse.PersistenceSettings.ConversionState.RunbooksAreInGit    
+    Write-OctopusInformation "The project is using CaC: $isUsingCaC"
+
+    return $isUsingCaC
+}
+
+function Get-CaCBranchName
+{
+    param(
+        $usingCac,
+        $projectToUse,
+        $providedBranchName
+    )
+
+    if ($usingCac -eq $false)
+    {
+        Write-OctopusInformation "The project isn't using CaC, so no need to pull the branch name"
+        return $null
+    }
+
+    if ([string]::IsNullOrWhiteSpace($providedBranchName) -eq $false)
+    {
+        if ($providedBranchName -like "refs/heads/*")
+        {
+            Write-OctopusInformation "The provided branch name is $providedBranchName, using that"
+            return $providedBranchName
+        }
+
+        Write-OctopusInformation "The provided branch name $providedBranchName doesn't include refs/heads, adding it."
+        return "refs/heads/$providedBranchName"
+    }
+
+    $returnedBranchName = "refs/heads/$($projectToUse.PersistenceSettings.DefaultBranch)"
+    Write-OctopusInformation "The branch name wasn't provided, using the default branch name $returnedBranchName"
+    return $returnedBranchName
+}
+
+
+$runbookWaitForFinish = GetCheckboxBoolean -Value $runbookWaitForFinish
+$runbookUseGuidedFailure = GetCheckboxBoolean -Value $runbookUseGuidedFailure
+$runbookUsePublishedSnapshot = GetCheckboxBoolean -Value $runbookUsePublishedSnapshot
+$runbookCancelInSeconds = [int]$runbookCancelInSeconds
+
+Write-OctopusInformation "Wait for Finish Before Check: $runbookWaitForFinish"
+Write-OctopusInformation "Use Guided Failure Before Check: $runbookUseGuidedFailure"
+Write-OctopusInformation "Use Published Snapshot Before Check: $runbookUsePublishedSnapshot"
+Write-OctopusInformation "Runbook Name $runbookRunName"
+Write-OctopusInformation "Runbook Base Url: $runbookBaseUrl"
+Write-OctopusInformation "Runbook Space Name: $runbookSpaceName"
+Write-OctopusInformation "Runbook Environment Name: $runbookEnvironmentName"
+Write-OctopusInformation "Runbook Tenant Name: $runbookTenantName"
+Write-OctopusInformation "Wait for Finish: $runbookWaitForFinish"
+Write-OctopusInformation "Use Guided Failure: $runbookUseGuidedFailure"
+Write-OctopusInformation "Cancel run in seconds: $runbookCancelInSeconds"
+Write-OctopusInformation "Use Published Snapshot: $runbookUsePublishedSnapshot"
+Write-OctopusInformation "Auto Approve Runbook Run Manual Interventions: $autoApproveRunbookRunManualInterventions"
+Write-OctopusInformation "Auto Approve environment name to pull approvals from: $approvalEnvironmentName"
+
+Write-OctopusInformation "Octopus runbook run machines: $runbookMachines"
+Write-OctopusInformation "Parent Task Id: $parentTaskId"
+Write-OctopusInformation "Parent Release Id: $parentReleaseId"
+Write-OctopusInformation "Parent Channel Id: $parentChannelId"
+Write-OctopusInformation "Parent Environment Id: $parentEnvironmentId"
+Write-OctopusInformation "Parent Runbook Id: $parentRunbookId"
+Write-OctopusInformation "Parent Environment Name: $parentEnvironmentName"
+Write-OctopusInformation "Parent Release Number: $parentReleaseNumber"
+Write-OctopusInformation "Parent Branch Name: $parentBranchName"
+
+$verificationPassed = @()
+$verificationPassed += Test-RequiredValues -variableToCheck $runbookRunName -variableName "Runbook Name"
+$verificationPassed += Test-RequiredValues -variableToCheck $runbookBaseUrl -variableName "Base Url"
+$verificationPassed += Test-RequiredValues -variableToCheck $runbookApiKey -variableName "Api Key"
+$verificationPassed += Test-RequiredValues -variableToCheck $runbookEnvironmentName -variableName "Environment Name"
+
+$projectVerificationPassed = Test-RequiredValues -variableToCheck $runbookProjectName -variableName "Project Name"
+if ($projectVerificationPassed -eq $false)
+{
+    Write-OctopusCritical "Project Name previously wasn't required in earlier versions, but you need to include it now.  Without it, this step will find the first runbook that matches the name.  And it is required for CaC going forward.  Please add it to the step and try again."    
+    $verificationPassed += $projectVerificationPassed
+}
+
+if ($verificationPassed -contains $false)
+{
+	Write-OctopusInformation "Required values missing"
+	Exit 1
+}
+
+$runbookSpace = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookSpaceName -endpoint "spaces" -spaceId $null -octopusApiKey $runbookApiKey -defaultUrl $runbookBaseUrl -itemType "Space" -defaultValue $octopusSpaceId
+$runbookSpaceId = $runbookSpace.Id
+
+$projectToUse = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookProjectName -endpoint "projects" -spaceId $runbookSpaceId -defaultValue $null -itemType "Project" -octopusApiKey $runbookApiKey -defaultUrl $runbookBaseUrl
+
+$usingCaC = Get-IsProjectUsingCaCRunbooks -projectToUse $projectToUse
+$cacBranchName = Get-CaCBranchName -usingCac $usingCac -projectToUse $projectToUse -providedBranchName $parentBranchName
+$runbookEndPoint = Get-RunbookEndPoint -cacBranchName $cacBranchName -projectToUse $projectToUse -usingCaC $usingCaC
+
+$environmentToUse = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookEnvironmentName -itemType "Environment" -defaultUrl $runbookBaseUrl -spaceId $runbookSpaceId -octopusApiKey $runbookApiKey -defaultValue $null -endpoint "environments"
+
+$runbookToRun = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookRunName -itemType "Runbook" -defaultUrl $runbookBaseUrl -spaceId $runbookSpaceId -endpoint $runbookEndPoint -octopusApiKey $runbookApiKey -defaultValue $null
+
+if ($usingCaC -eq $false)
+{
+    $runbookSnapShotIdToUse = Get-RunbookSnapshotIdToRun -runbookToRun $runbookToRun -runbookUsePublishedSnapshot $runbookUsePublishedSnapshot -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $octopusSpaceId
+    $projectNameForUrl = Get-ProjectSlug -projectToUse $projectToUse -runbookToRun $runbookToRun -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $runbookSpaceId
+}
+else
+{
+    $runbookSnapShotIdToUse = $null
+    $projectNameForUrl = $projectToUse.Slug
+}
+
+$tenantToUse = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookTenantName -itemType "Tenant" -defaultValue $null -spaceId $runbookSpaceId -octopusApiKey $runbookApiKey -endpoint "tenants" -defaultUrl $runbookBaseUrl
+if ($null -ne $tenantToUse)
+{	
+    $tenantIdToUse = $tenantToUse.Id
+    $runbookPreview = Get-TenantedRunbookPreview -octopusUrl $runbookBaseUrl -spaceId $runbookSpaceId -apiKey $runbookApiKey -runbookSnapShotIdToUse $runbookSnapShotIdToUse -runbookEnvironmentId $environmentToUse.Id -runbookToRun $runbookToRun -tenantIdToUse $tenantToUse.Id -usingCaC $usingCaC -cacRunbookEndPoint $runbookEndPoint         
+}
+else
+{
+	$runbookPreview = Get-NonTenantedRunbookPreview -octopusUrl $runbookBaseUrl -spaceId $runbookSpaceId -apiKey $runbookApiKey -runbookSnapShotIdToUse $runbookSnapShotIdToUse -runbookEnvironmentId $environmentToUse.Id -runbookToRun $runbookToRun -usingCaC $usingCaC -cacRunbookEndPoint $runbookEndPoint
+}
+
+$childRunbookRunSpecificMachines = Get-RunbookSpecificMachines -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -runbookPreview $runBookPreview -runbookMachines $runbookMachines -runbookRunName $runbookRunName
+$runbookFormValues = Get-RunbookFormValues -runbookPreview $runBookPreview -runbookPromptedVariables $runbookPromptedVariables
+
+$queueDate = Get-QueueDate -futureDeploymentDate $runbookFutureDeploymentDate
+$queueExpiryDate = Get-QueueExpiryDate -queueDate $queueDate
+
+$approvalTaskId = Get-ApprovalTaskId -autoApproveRunbookRunManualInterventions $autoApproveRunbookRunManualInterventions -parentTaskId $parentTaskId -parentReleaseId $parentReleaseId -parentRunbookId $parentRunbookId -parentEnvironmentName $parentEnvironmentName -approvalEnvironmentName $approvalEnvironmentName -parentChannelId $parentChannelId -parentEnvironmentId $parentEnvironmentId -defaultUrl $runbookBaseUrl -spaceId $runbookSpaceId -octopusApiKey $runbookApiKey
+$parentTaskApprovers = Get-ParentTaskApprovers -parentTaskId $approvalTaskId -spaceId $runbookSpaceId -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey
+
+if ($usingCaC -eq $true)
+{
+    $snapshotTemplate = Invoke-OctopusApi -octopusUrl $runbookBaseUrl -apiKey $runbookApiKey -spaceId $runbookSpaceId -endPoint "$runbookEndPoint/$($runbookToRun.Slug)/runbookSnapShotTemplate" -method "Get"
+    $selectedGitResources = @(Get-RunbookGitReferences -snapshotTemplate $snapshotTemplate)
+    $selectedPackages = @(Get-RunbookPackages -snapshotTemplate $snapshotTemplate -octopusUrl $runbookBaseUrl -apiKey $runbookApiKey -spaceId $runbookSpaceId -usingCaC $usingCaC)
+
+    $runbookBody = @{
+        SelectedGitResources = $selectedGitResources;
+        SelectedPackages = $selectedPackages;
+        Runs= @(
+            @{
+                EnvironmentId = $($environmentToUse.Id);
+                ExcludedMachineIds = @();                
+                ForcePackageDownload = $false;
+                FormValues = $runbookFormValues;
+                QueueTime = $queueDate;
+                QueueTimeExpiry = $queueExpiryDate;
+                SpecificMachineIds = @($childRunbookRunSpecificMachines);
+                SkipActions = @();
+                TenantId = $tenantIdToUse;
+                UseGuidedFailure = $runbookUseGuidedFailure;                
+            }
+        );                
+    }
+
+    Invoke-OctopusDeployRunbook -runbookBody $runbookBody -runbookWaitForFinish $runbookWaitForFinish -runbookCancelInSeconds $runbookCancelInSeconds -projectNameForUrl $projectNameForUrl -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $runbookSpaceId -parentTaskApprovers $parentTaskApprovers -autoApproveRunbookRunManualInterventions $autoApproveRunbookRunManualInterventions -parentProjectName $projectNameForUrl -parentReleaseNumber $parentReleaseNumber -approvalEnvironmentName $approvalEnvironmentName -parentRunbookId $parentRunbookId -parentTaskId $approvalTaskId -usingCaC $true -cacRunbookEndpoint $runbookEndPoint -runbookNameForUrl $runbookToRun.Slug
+}
+else
+{
+    $runbookBody = @{
+        RunbookId = $($runbookToRun.Id);
+        RunbookSnapShotId = $runbookSnapShotIdToUse;
+        FrozenRunbookProcessId = $null;
+        EnvironmentId = $($environmentToUse.Id);
+        TenantId = $tenantIdToUse;
+        SkipActions = @();
+        QueueTime = $queueDate;
+        QueueTimeExpiry = $queueExpiryDate;
+        FormValues = $runbookFormValues;
+        ForcePackageDownload = $false;
+        ForcePackageRedeployment = $true;
+        UseGuidedFailure = $runbookUseGuidedFailure;
+        SpecificMachineIds = @($childRunbookRunSpecificMachines);
+        ExcludedMachineIds = @()
+    }
+    
+    Invoke-OctopusDeployRunbook -runbookBody $runbookBody -runbookWaitForFinish $runbookWaitForFinish -runbookCancelInSeconds $runbookCancelInSeconds -projectNameForUrl $projectNameForUrl -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $runbookSpaceId -parentTaskApprovers $parentTaskApprovers -autoApproveRunbookRunManualInterventions $autoApproveRunbookRunManualInterventions -parentProjectName $projectNameForUrl -parentReleaseNumber $parentReleaseNumber -approvalEnvironmentName $approvalEnvironmentName -parentRunbookId $parentRunbookId -parentTaskId $approvalTaskId
+}
\ No newline at end of file
diff --git a/step-templates/run-pulumi-on-linux.json b/src/step-templates/run-pulumi-on-linux/metadata.json
similarity index 63%
rename from step-templates/run-pulumi-on-linux.json
rename to src/step-templates/run-pulumi-on-linux/metadata.json
index 332e1646d..4d4003c1a 100644
--- a/step-templates/run-pulumi-on-linux.json
+++ b/src/step-templates/run-pulumi-on-linux/metadata.json
@@ -9,9 +9,10 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# Check if the pulumi command is in the path and if not, download and install it.\n# Additionally, add pulumi to the path.\nif ! [ -x \"$(command -v pulumi)\" ]; then\n\tcurl -fsSL https://get.pulumi.com | sh\n    export PATH=$PATH:$HOME/.pulumi/bin\n\techo \"Pulumi version: $(pulumi version)\"\nfi\n\naccessToken=$(get_octopusvariable \"Pulumi.AccessToken\")\nif [ -z \"${accessToken:-}\" ]; then\n\tfail_step \"Pulumi Access Token must be specified.\"\nfi\nexport PULUMI_ACCESS_TOKEN=$accessToken\n\n# Check for AWS access key credentials and set those in the env.\nexport AWS_ACCESS_KEY_ID=$(get_octopusvariable \"AWS.AccessKey\")\nexport AWS_SECRET_ACCESS_KEY=$(get_octopusvariable \"AWS.SecretKey\")\n\n# Check for Azure SP/personal account credentials and set those in the env.\nexport ARM_SUBSCRIPTION_ID=$(get_octopusvariable \"Azure.SubscriptionNumber\")\nexport ARM_TENANT_ID=$(get_octopusvariable \"Azure.TenantId\")\nexport ARM_CLIENT_ID=$(get_octopusvariable \"Azure.Client\")\nexport ARM_CLIENT_SECRET=$(get_octopusvariable \"Azure.Password\")\n\nif [ -z \"${AWS_SECRET_ACCESS_KEY:-}\" ]; then\n\tif [ -z \"${ARM_CLIENT_SECRET:-}\" ]; then\n    \tfail_step \"Neither secrets for AWS or Azure were detected.\"\n    fi\nfi\n\npulumi login\n\ncwd=$(get_octopusvariable \"Pulumi.WorkingDirectory\")\nif [ -n \"${cwd:-}\" ]; then\n\tpushd $cwd\nfi\n\nrestoreDeps=$(get_octopusvariable \"Pulumi.Restore\")\nif [ \"$restoreDeps\" = \"True\" ]; then\n\techo \"Restoring dependencies...\"\n\tnpm install\nfi\n\ncreateStackIfNotExists=$(get_octopusvariable \"Pulumi.CreateStack\")\nstackName=$(get_octopusvariable \"Pulumi.StackName\")\necho \"Selecting stack $stackName\"\npulumi stack select $stackName || (\n\tif [ \"$createStackIfNotExists\" = \"True\" ]; then\n    \tpulumi stack init $stackName\n    fi\n)\n\npulCmd=$(get_octopusvariable \"Pulumi.Command\")\npulArgs=$(get_octopusvariable \"Pulumi.Args\")\nif [ -n \"${pulArgs:-}\" ]; then\n\tpulumi $pulCmd $pulArgs\nelse\n\tpulumi $pulCmd\nfi\n\n# If a working directory was specified, we would have `pushd`, so let's `popd` now.\nif [ -n \"${cwd:-}\" ]; then\n\tpopd\nfi\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
-  "Parameters": [{
+  "Parameters": [
+    {
       "Id": "94a93122-235e-4edd-8217-adbe63db85f1",
       "Name": "Pulumi.StackName",
       "Label": "Stack Name",
@@ -84,7 +85,7 @@
   ],
   "LastModifiedBy": "praneetloke",
   "$Meta": {
-    "ExportedAt": "2019-09-26T01:21:54.376Z",
+    "ExportedAt": "2019-09-26T01:21:54.3760000Z",
     "OctopusVersion": "2019.8.4",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/run-pulumi-on-linux/scriptbody.sh b/src/step-templates/run-pulumi-on-linux/scriptbody.sh
new file mode 100644
index 000000000..afa436fc4
--- /dev/null
+++ b/src/step-templates/run-pulumi-on-linux/scriptbody.sh
@@ -0,0 +1,64 @@
+# Check if the pulumi command is in the path and if not, download and install it.
+# Additionally, add pulumi to the path.
+if ! [ -x "$(command -v pulumi)" ]; then
+	curl -fsSL https://get.pulumi.com | sh
+    export PATH=$PATH:$HOME/.pulumi/bin
+	echo "Pulumi version: $(pulumi version)"
+fi
+
+accessToken=$(get_octopusvariable "Pulumi.AccessToken")
+if [ -z "${accessToken:-}" ]; then
+	fail_step "Pulumi Access Token must be specified."
+fi
+export PULUMI_ACCESS_TOKEN=$accessToken
+
+# Check for AWS access key credentials and set those in the env.
+export AWS_ACCESS_KEY_ID=$(get_octopusvariable "AWS.AccessKey")
+export AWS_SECRET_ACCESS_KEY=$(get_octopusvariable "AWS.SecretKey")
+
+# Check for Azure SP/personal account credentials and set those in the env.
+export ARM_SUBSCRIPTION_ID=$(get_octopusvariable "Azure.SubscriptionNumber")
+export ARM_TENANT_ID=$(get_octopusvariable "Azure.TenantId")
+export ARM_CLIENT_ID=$(get_octopusvariable "Azure.Client")
+export ARM_CLIENT_SECRET=$(get_octopusvariable "Azure.Password")
+
+if [ -z "${AWS_SECRET_ACCESS_KEY:-}" ]; then
+	if [ -z "${ARM_CLIENT_SECRET:-}" ]; then
+    	fail_step "Neither secrets for AWS or Azure were detected."
+    fi
+fi
+
+pulumi login
+
+cwd=$(get_octopusvariable "Pulumi.WorkingDirectory")
+if [ -n "${cwd:-}" ]; then
+	pushd $cwd
+fi
+
+restoreDeps=$(get_octopusvariable "Pulumi.Restore")
+if [ "$restoreDeps" = "True" ]; then
+	echo "Restoring dependencies..."
+	npm install
+fi
+
+createStackIfNotExists=$(get_octopusvariable "Pulumi.CreateStack")
+stackName=$(get_octopusvariable "Pulumi.StackName")
+echo "Selecting stack $stackName"
+pulumi stack select $stackName || (
+	if [ "$createStackIfNotExists" = "True" ]; then
+    	pulumi stack init $stackName
+    fi
+)
+
+pulCmd=$(get_octopusvariable "Pulumi.Command")
+pulArgs=$(get_octopusvariable "Pulumi.Args")
+if [ -n "${pulArgs:-}" ]; then
+	pulumi $pulCmd $pulArgs
+else
+	pulumi $pulCmd
+fi
+
+# If a working directory was specified, we would have `pushd`, so let's `popd` now.
+if [ -n "${cwd:-}" ]; then
+	popd
+fi
diff --git a/step-templates/run-pulumi-on-windows.json b/src/step-templates/run-pulumi-on-windows/metadata.json
similarity index 60%
rename from step-templates/run-pulumi-on-windows.json
rename to src/step-templates/run-pulumi-on-windows/metadata.json
index e8fc5b8c5..e1f75e902 100644
--- a/step-templates/run-pulumi-on-windows.json
+++ b/src/step-templates/run-pulumi-on-windows/metadata.json
@@ -9,9 +9,10 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Test-CommandExists\n{\n\tParam ($command)\n\t$oldPreference = $ErrorActionPreference\n\t$ErrorActionPreference = 'stop'\n\tTry {\n    \tif(Get-Command $command){\n        \treturn $true\n        }\n    } Catch {\n    \tWrite-Host \"$command does not exist\"\n        return $false\n    } Finally {\n    \t$ErrorActionPreference=$oldPreference\n   \t}\n}\n\nIf ([string]::IsNullOrWhiteSpace($OctopusParameters[\"Pulumi.AccessToken\"])) {\n\tFail-Step \"Parameter Pulumi.AccessToken cannot be empty.\"\n}\n\n$env:PULUMI_ACCESS_TOKEN=$OctopusParameters[\"Pulumi.AccessToken\"]\n\nIf ((Test-CommandExists pulumi) -eq $false) {\n\t(new-object net.webclient).DownloadFile(\"https://get.pulumi.com/install.ps1\",\"local.ps1\")\n    ./local.ps1\n\t$pulumiInstallRoot=(Join-Path $env:UserProfile \".pulumi\")\n\t$binRoot=(Join-Path $pulumiInstallRoot \"bin\")\n\t$env:Path+=\";$binRoot\"\n}\n\n# Check for AWS access key credentials and set those in the env.\nIf (![string]::IsNullOrWhiteSpace($OctopusParameters[\"AWS.AccessKey\"])) {\n\t$env:AWS_ACCESS_KEY_ID=$OctopusParameters[\"AWS.AccessKey\"]\n}\n\nIf (![string]::IsNullOrWhiteSpace($OctopusParameters[\"AWS.SecretKey\"])) {\n\t$env:AWS_SECRET_ACCESS_KEY=$OctopusParameters[\"AWS.SecretKey\"]\n}\n\n# Check for Azure SP/personal account credentials and set those in the env.\nIf (![string]::IsNullOrWhiteSpace($OctopusParameters[\"Azure.Client\"])) {\n\t$env:ARM_CLIENT_ID=$OctopusParameters[\"Azure.Client\"]\n}\n\nIf (![string]::IsNullOrWhiteSpace($OctopusParameters[\"Azure.Password\"])) {\n\t$env:ARM_CLIENT_SECRET=$OctopusParameters[\"Azure.Password\"]\n}\n\nIf (![string]::IsNullOrWhiteSpace($OctopusParameters[\"Azure.TenantId\"])) {\n\t$env:ARM_TENANT_ID=$OctopusParameters[\"Azure.TenantId\"]\n}\n\nIf (![string]::IsNullOrWhiteSpace($OctopusParameters[\"Azure.SubscriptionNumber\"])) {\n\t$env:ARM_SUBSCRIPTION_ID=$OctopusParameters[\"Azure.SubscriptionNumber\"]\n}\n\nWrite-Host \"Logging in to Pulumi using access token\"\npulumi login\n\n$cwd=$OctopusParameters[\"Pulumi.WorkingDirectory\"]\nIf (![string]::IsNullOrWhiteSpace($cwd)) {\n\tcd $cwd\n}\n\n$stackName=$OctopusParameters[\"Pulumi.StackName\"]\nWrite-Host \"Selecting stack $stackName\"\nTry {\n\tpulumi stack select $stackName\n}\nCatch {\n\t$createStackIfNotExists = $OctopusParameters[\"Pulumi.CreateStack\"]\n\tIf ($createStackIfNotExists -eq \"True\") {\n    \tpulumi stack init $stackName\n    } Else {\n    \tFail-Step \"Stack $stackName does not exist.\"\n    }\n}\n\n$restoreDeps=$OctopusParameters[\"Pulumi.RestoreDeps\"]\nIf ($restoreDeps -eq \"True\") {\n\tWrite-Host \"Restoring dependencies...\"\n    $restoreDepsCmd = $OctopusParameters[\"Pulumi.RestoreCmd\"]\n    Invoke-Expression $restoreDepsCmd\n}\n\n$pulCmd=$OctopusParameters[\"Pulumi.Command\"]\n$pulArgs=$OctopusParameters[\"Pulumi.Args\"]\nIf (![string]::IsNullOrWhiteSpace($pulArgs)) {\n\tpulumi $pulCmd $pulArgs\n}\nElse {\n\tpulumi $pulCmd\n}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
-  "Parameters": [{
+  "Parameters": [
+    {
       "Id": "94a93122-235e-4edd-8217-adbe63db85f1",
       "Name": "Pulumi.StackName",
       "Label": "Stack Name",
@@ -94,7 +95,7 @@
   ],
   "LastModifiedBy": "praneetloke",
   "$Meta": {
-    "ExportedAt": "2019-12-03T05:49:17.461Z",
+    "ExportedAt": "2019-12-03T05:49:17.4610000Z",
     "OctopusVersion": "2019.10.4",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/run-pulumi-on-windows/scriptbody.ps1 b/src/step-templates/run-pulumi-on-windows/scriptbody.ps1
new file mode 100644
index 000000000..16cbd4b0e
--- /dev/null
+++ b/src/step-templates/run-pulumi-on-windows/scriptbody.ps1
@@ -0,0 +1,94 @@
+Function Test-CommandExists
+{
+	Param ($command)
+	$oldPreference = $ErrorActionPreference
+	$ErrorActionPreference = 'stop'
+	Try {
+    	if(Get-Command $command){
+        	return $true
+        }
+    } Catch {
+    	Write-Host "$command does not exist"
+        return $false
+    } Finally {
+    	$ErrorActionPreference=$oldPreference
+   	}
+}
+
+If ([string]::IsNullOrWhiteSpace($OctopusParameters["Pulumi.AccessToken"])) {
+	Fail-Step "Parameter Pulumi.AccessToken cannot be empty."
+}
+
+$env:PULUMI_ACCESS_TOKEN=$OctopusParameters["Pulumi.AccessToken"]
+
+If ((Test-CommandExists pulumi) -eq $false) {
+	(new-object net.webclient).DownloadFile("https://get.pulumi.com/install.ps1","local.ps1")
+    ./local.ps1
+	$pulumiInstallRoot=(Join-Path $env:UserProfile ".pulumi")
+	$binRoot=(Join-Path $pulumiInstallRoot "bin")
+	$env:Path+=";$binRoot"
+}
+
+# Check for AWS access key credentials and set those in the env.
+If (![string]::IsNullOrWhiteSpace($OctopusParameters["AWS.AccessKey"])) {
+	$env:AWS_ACCESS_KEY_ID=$OctopusParameters["AWS.AccessKey"]
+}
+
+If (![string]::IsNullOrWhiteSpace($OctopusParameters["AWS.SecretKey"])) {
+	$env:AWS_SECRET_ACCESS_KEY=$OctopusParameters["AWS.SecretKey"]
+}
+
+# Check for Azure SP/personal account credentials and set those in the env.
+If (![string]::IsNullOrWhiteSpace($OctopusParameters["Azure.Client"])) {
+	$env:ARM_CLIENT_ID=$OctopusParameters["Azure.Client"]
+}
+
+If (![string]::IsNullOrWhiteSpace($OctopusParameters["Azure.Password"])) {
+	$env:ARM_CLIENT_SECRET=$OctopusParameters["Azure.Password"]
+}
+
+If (![string]::IsNullOrWhiteSpace($OctopusParameters["Azure.TenantId"])) {
+	$env:ARM_TENANT_ID=$OctopusParameters["Azure.TenantId"]
+}
+
+If (![string]::IsNullOrWhiteSpace($OctopusParameters["Azure.SubscriptionNumber"])) {
+	$env:ARM_SUBSCRIPTION_ID=$OctopusParameters["Azure.SubscriptionNumber"]
+}
+
+Write-Host "Logging in to Pulumi using access token"
+pulumi login
+
+$cwd=$OctopusParameters["Pulumi.WorkingDirectory"]
+If (![string]::IsNullOrWhiteSpace($cwd)) {
+	cd $cwd
+}
+
+$stackName=$OctopusParameters["Pulumi.StackName"]
+Write-Host "Selecting stack $stackName"
+Try {
+	pulumi stack select $stackName
+}
+Catch {
+	$createStackIfNotExists = $OctopusParameters["Pulumi.CreateStack"]
+	If ($createStackIfNotExists -eq "True") {
+    	pulumi stack init $stackName
+    } Else {
+    	Fail-Step "Stack $stackName does not exist."
+    }
+}
+
+$restoreDeps=$OctopusParameters["Pulumi.RestoreDeps"]
+If ($restoreDeps -eq "True") {
+	Write-Host "Restoring dependencies..."
+    $restoreDepsCmd = $OctopusParameters["Pulumi.RestoreCmd"]
+    Invoke-Expression $restoreDepsCmd
+}
+
+$pulCmd=$OctopusParameters["Pulumi.Command"]
+$pulArgs=$OctopusParameters["Pulumi.Args"]
+If (![string]::IsNullOrWhiteSpace($pulArgs)) {
+	pulumi $pulCmd $pulArgs
+}
+Else {
+	pulumi $pulCmd
+}
diff --git a/src/step-templates/run-windows-installer/metadata.json b/src/step-templates/run-windows-installer/metadata.json
new file mode 100644
index 000000000..aa59daa50
--- /dev/null
+++ b/src/step-templates/run-windows-installer/metadata.json
@@ -0,0 +1,96 @@
+{
+  "Id": "f56647ac-7762-4986-bc98-c3fb74bb844f",
+  "Name": "Windows - Install MSI From Filesystem",
+  "Description": "Runs the Windows Installer to non-interactively install an MSI",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "381f31f3-2cad-45fa-96ea-d99b2299667c",
+      "Name": "MsiFilePath",
+      "Label": "Msi File Path",
+      "HelpText": "This is the path of the MSI file that will be installed. If the path includes wildcards, then the first match will be used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6e056c08-d73e-4e3e-bf45-c12e0d3d1d24",
+      "Name": "Action",
+      "Label": "Action",
+      "HelpText": "The task to perform with the MSI, options include install, repair or remove.",
+      "DefaultValue": "Install",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Install\nRepair\nRemove"
+      }
+    },
+    {
+      "Id": "7343a832-0673-472c-ae8f-1a328d65cafe",
+      "Name": "ActionModifier",
+      "Label": "Action Modifier",
+      "HelpText": "Use this to specify a different behavior for the Repair action",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "698d3bfb-2c14-4783-aa19-2a2ae2f49645",
+      "Name": "Properties",
+      "Label": "Properties",
+      "HelpText": "Properties that will be passed to the MSI separated by lines. Properties are in the format key=value, note that values with spaces in the must be quoted. \n\n    Key=Value\n    Key=\"Value\"",
+      "DefaultValue": "REBOOT=ReallySuppress",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "d78748d0-2f38-485d-b76e-c41e5dbde429",
+      "Name": "LoggingOptions",
+      "Label": "Logging Options",
+      "HelpText": "One or more of:\n\n    [i|w|e|a|r|u|c|m|o|p|v|x|+|!|*]\n\n-  i - Status messages\n-  w - Nonfatal warnings\n-  e - All error messages\n-  a - Start-up of actions\n-  r - Action-specific records\n-  u - User requests\n-  c - Initial UI parameters\n-  m - Out-of-memory or fatal exit information\n-  o - Out-of-disk-space messages\n-  p - Terminal properties\n-  v - Verbose output\n-  x - Extra debugging information\n-  \\+ - Append to existing log file\n-  ! - Flush each line to the log\n-  \\* - Log all information, except for v and x options",
+      "DefaultValue": "*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "532b5a46-9510-4558-a17c-a580153fbaff",
+      "Name": "LogAsArtifact",
+      "Label": "Log as artifact",
+      "HelpText": "If selected, then return log output as an artifact.\nIf unselected then return log output as inline content",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "dc10c5e9-d988-4136-9f3e-c0c881a103b3",
+      "Name": "IgnoredErrorCodes",
+      "Label": "Ignored Error Codes",
+      "HelpText": "Use commas to separate integer values.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2025-08-21T16:07:30.8180000Z",
+  "$Meta": {
+    "ExportedAt": "2025-08-21T16:07:30.8180000Z",
+    "OctopusVersion": "2025.2.13043",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "windows"
+}
diff --git a/src/step-templates/run-windows-installer/scriptbody.ps1 b/src/step-templates/run-windows-installer/scriptbody.ps1
new file mode 100644
index 000000000..b1e1351fa
--- /dev/null
+++ b/src/step-templates/run-windows-installer/scriptbody.ps1
@@ -0,0 +1,282 @@
+# Running outside octopus
+param(
+    [string]$MsiFilePath,
+	[ValidateSet("Install", "Repair", "Remove", IgnoreCase=$true)]
+	[string]$Action,
+	[string]$ActionModifier,
+    [string]$LoggingOptions = "*",
+    [ValidateSet("False", "True")]
+    [string]$LogAsArtifact,
+	[string]$Properties,
+	[int[]]$IgnoredErrorCodes,
+    [switch]$WhatIf
+) 
+
+$ErrorActionPreference = "Stop"
+
+$ErrorMessages = @{
+	"0" = "Action completed successfully.";
+	"13" = "The data is invalid.";
+	"87" = "One of the parameters was invalid.";
+	"1601" = "The Windows Installer service could not be accessed. Contact your support personnel to verify that the Windows Installer service is properly registered.";
+	"1602" = "User cancel installation.";
+	"1603" = "Fatal error during installation.";
+	"1604" = "Installation suspended, incomplete.";
+	"1605" = "This action is only valid for products that are currently installed.";
+	"1606" = "Feature ID not registered.";
+	"1607" = "Component ID not registered.";
+	"1608" = "Unknown property.";
+	"1609" = "Handle is in an invalid state.";
+	"1610" = "The configuration data for this product is corrupt. Contact your support personnel.";
+	"1611" = "Component qualifier not present.";
+	"1612" = "The installation source for this product is not available. Verify that the source exists and that you can access it.";
+	"1613" = "This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.";
+	"1614" = "Product is uninstalled.";
+	"1615" = "SQL query syntax invalid or unsupported.";
+	"1616" = "Record field does not exist.";
+	"1618" = "Another installation is already in progress. Complete that installation before proceeding with this install.";
+	"1619" = "This installation package could not be opened. Verify that the package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer package.";
+	"1620" = "This installation package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer package.";
+	"1621" = "There was an error starting the Windows Installer service user interface. Contact your support personnel.";
+	"1622" = "Error opening installation log file. Verify that the specified log file location exists and is writable.";
+	"1623" = "This language of this installation package is not supported by your system.";
+	"1624" = "Error applying transforms. Verify that the specified transform paths are valid.";
+	"1625" = "This installation is forbidden by system policy. Contact your system administrator.";
+	"1626" = "Function could not be executed.";
+	"1627" = "Function failed during execution.";
+	"1628" = "Invalid or unknown table specified.";
+	"1629" = "Data supplied is of wrong type.";
+	"1630" = "Data of this type is not supported.";
+	"1631" = "The Windows Installer service failed to start. Contact your support personnel.";
+	"1632" = "The temp folder is either full or inaccessible. Verify that the temp folder exists and that you can write to it.";
+	"1633" = "This installation package is not supported on this platform. Contact your application vendor.";
+	"1634" = "Component not used on this machine.";
+	"1635" = "This patch package could not be opened. Verify that the patch package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer patch package.";
+	"1636" = "This patch package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer patch package.";
+	"1637" = "This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.";
+	"1638" = "Another version of this product is already installed. Installation of this version cannot continue. To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.";
+	"1639" = "Invalid command line argument. Consult the Windows Installer SDK for detailed command line help.";
+	"1640" = "Installation from a Terminal Server client session not permitted for current user.";
+	"1641" = "The installer has started a reboot.";
+	"1642" = "The installer cannot install the upgrade patch because the program being upgraded may be missing, or the upgrade patch updates a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch.";
+	"3010" = "A restart is required to complete the install. This does not include installs where the ForceReboot action is run. Note that this error will not be available until future version of the installer."
+};
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Resolve-PotentialPath($Path) {
+	[Environment]::CurrentDirectory = $pwd
+	return [IO.Path]::GetFullPath($Path)
+}
+
+function Get-LogOptionFile($msiFile, $streamLog) {
+	$logPath = Resolve-PotentialPath "$msiFile.log"
+	
+	if (Test-Path $logPath) {
+		Remove-Item $logPath
+	}
+	
+	return $logPath
+}
+
+function Exec
+{
+    [CmdletBinding()]
+    param(
+        [Parameter(Position=0,Mandatory=1)][scriptblock]$cmd,
+        [string]$errorMessage = ($msgs.error_bad_command -f $cmd),
+		[switch]$ReturnCode
+    )
+
+	$lastexitcode = 0
+    & $cmd
+	
+	if ($ReturnCode) {
+		return $lastexitcode
+	} else  {
+		if ($lastexitcode -ne 0) {
+			throw ("Exec: " + $errorMessage)
+		}		
+	}
+}
+
+function Wrap-Arguments($Arguments)
+{
+	return $Arguments | % { 
+		
+		[string]$val = $_
+		
+		#calling msiexec fails when arguments are quoted
+		if (($val.StartsWith("/") -and $val.IndexOf(" ") -eq -1) -or ($val.IndexOf("=") -ne -1) -or ($val.IndexOf('"') -ne -1)) {
+			return $val
+		}
+	
+		return '"{0}"' -f $val
+	}
+}
+
+function Start-Process2($FilePath, $ArgumentList, [switch]$showCall, [switch]$whatIf)
+{
+	$ArgumentListString = (Wrap-Arguments $ArgumentList) -Join " "
+
+	$pinfo = New-Object System.Diagnostics.ProcessStartInfo
+	$pinfo.FileName = $FilePath
+	$pinfo.UseShellExecute = $false
+	$pinfo.CreateNoWindow = $true
+	$pinfo.RedirectStandardOutput = $true
+	$pinfo.RedirectStandardError = $true
+	$pinfo.Arguments = $ArgumentListString;
+	$pinfo.WorkingDirectory = $pwd
+
+	$exitCode = 0
+	
+	if (!$whatIf) {
+	
+		if ($showCall) {
+			$x = Write-Output "$FilePath $ArgumentListString"
+		}
+		
+		$p = New-Object System.Diagnostics.Process
+		$p.StartInfo = $pinfo
+		$started = $p.Start()
+		$p.WaitForExit()
+
+		$stdout = $p.StandardOutput.ReadToEnd()
+		$stderr = $p.StandardError.ReadToEnd()
+		$x = Write-Output $stdout
+		$x = Write-Output $stderr
+		
+		$exitCode = $p.ExitCode
+	} else {
+		Write-Output "skipping: $FilePath $ArgumentListString"
+	}
+	
+	return $exitCode
+}
+
+function Get-EscapedFilePath($FilePath)
+{
+    return [Management.Automation.WildcardPattern]::Escape($FilePath)
+}
+
+& {
+    param(
+        [string]$MsiFilePath,
+		[string]$Action,
+		[string]$ActionModifier,
+        [string]$LoggingOptions,
+        [bool]$LogAsArtifact,
+		[string]$Properties,
+		[int[]]$IgnoredErrorCodes
+    ) 
+
+    $MsiFilePathLeaf = Split-Path -Path $MsiFilePath -Leaf
+    $EscapedMsiFilePath = Get-EscapedFilePath (Split-Path -Path $MsiFilePath)
+    
+	$MsiFilePath = Get-EscapedFilePath (Resolve-Path "$EscapedMsiFilePath\$MsiFilePathLeaf" | Select-Object -First 1).ProviderPath
+
+    Write-Output "Installing MSI"
+    Write-Host " MsiFilePath: $MsiFilePath" -f Gray
+	Write-Host " Action: $Action" -f Gray
+	Write-Host " Properties: $Properties" -f Gray
+	Write-Host
+
+	if ((Get-Command msiexec) -Eq $Null) {
+		throw "Command msiexec could not be found"
+	}
+	
+	if (!(Test-Path $MsiFilePath)) {
+		throw "Could not find the file $MsiFilePath"
+	}
+
+	$actions = @{
+		"Install" = "/i";
+		"Repair" = "/f";
+		"Remove" = "/x";
+	};
+	
+	$actionOption = $actions[$action]
+	$actionOptionFile = $MsiFilePath
+	if ($ActionModifier)
+	{
+		$actionOption += $ActionModifier
+	}
+	
+    if ($LoggingOptions) {
+	    $logOption = "/L$LoggingOptions"
+	    $logOptionFile = Get-LogOptionFile $MsiFilePath
+	}
+	$quiteOption = "/qn"
+	$noRestartOption = "/norestart"
+	
+	$parameterOptions = $Properties -Split "\r\n?|\n" | ? { !([string]::IsNullOrEmpty($_)) } | % { $_.Trim() }
+	
+	$options = @($actionOption, $actionOptionFile, $logOption, $logOptionFile, $quiteOption, $noRestartOption) + $parameterOptions
+
+	$exePath = "msiexec.exe"
+
+	$exitCode = Start-Process2 -FilePath $exePath -ArgumentList $options -whatIf:$whatIf -ShowCall
+	
+	Write-Output "Exit Code was! $exitCode"
+	
+	if (Test-Path $logOptionFile) {
+
+		Write-Output "Reading installer log"
+
+        # always write out these (http://robmensching.com/blog/posts/2010/8/2/the-first-thing-i-do-with-an-msi-log/)
+        (Get-Content $logOptionFile) | Select-String -SimpleMatch "value 3" -Context 10,0 | ForEach-Object { Write-Warning $_ }
+
+        if ($LogAsArtifact) {
+            New-OctopusArtifact -Path $logOptionFile -Name "$Action-$([IO.Path]::GetFileNameWithoutExtension($MsiFilePath)).log"
+        } else {
+	    	Get-Content $logOptionFile | Write-Output
+        }
+
+	} else {
+		Write-Output "No logs were generated"
+	}
+
+	if ($exitCode -Ne 0) {
+		$errorCodeString = $exitCode.ToString()
+		$errorMessage = $ErrorMessages[$errorCodeString]
+		
+		if ($IgnoredErrorCodes -notcontains $exitCode) {
+
+			throw "Error code $exitCodeString was returned: $errorMessage"
+		}
+		else {
+			Write-Output "Error code [$exitCodeString] was ignored because it was in the IgnoredErrorCodes [$($IgnoredErrorCodes -join ',')] parameter. Error Message [$errorMessage]"
+		}
+	}
+	
+} `
+(Get-Param 'MsiFilePath' -Required) `
+(Get-Param 'Action' -Required) `
+(Get-Param 'ActionModifier') `
+(Get-Param 'LoggingOptions') `
+((Get-Param 'LogAsArtifact') -eq "True") `
+(Get-Param 'Properties') `
+(Get-Param 'IgnoredErrorCodes')
diff --git a/step-templates/run-xunit.json b/src/step-templates/run-xunit/metadata.json
similarity index 58%
rename from step-templates/run-xunit.json
rename to src/step-templates/run-xunit/metadata.json
index a4159c186..e8f3b676a 100644
--- a/step-templates/run-xunit.json
+++ b/src/step-templates/run-xunit/metadata.json
@@ -1,66 +1,66 @@
-{
-  "Id": "f70a5c02-f6c0-40d4-a59a-7157cb2c2dc8",
-  "Name": "Execute xUnit Tests",
-  "Description": "Run xUnit tests with dotnet and vstest and some filters.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,  
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Write-Output \"Running xUnit tests with dotnet and vstest...\"\n$dotNetVer = dotnet --version\nWrite-Output \"DotNet version: $dotNetVer\"\n$dirPath = $PackageDirectoryPath\n$testFiles = $TestPackages\n$testFilter = $TestCaseFilter\n$xUnitAdditionalParams = $XUnitAdditionalParameters\n\nIf(-Not $dirPath){\n    Write-Output \"Directory with tests is missing!\"\n    exit 1\n}\n\nIf(-Not $testFiles){\n    Write-Output \"Test Package(s) missing!\"\n    exit 1\n}\n\nWrite-Output \"Execute test package(s): $testFiles\"\nWrite-Output \"With following filter(s): $testFilter\"\nWrite-Output \"From Package Directory: $dirPath\"\n\ncd $dirPath\n\nIf($testFilter){\n\t$runxUnit = \"dotnet vstest $testFiles --testcasefilter:'($testFilter)'\"\n    Write-Output \"Run xUnit with filter $testFilter\"\n    } Else {\n    $runxUnit = \"dotnet vstest $testFiles\"    \n    }\n\nif($xUnitAdditionalParams){\n\t$runxUnit = $runxUnit + \" \" + $xUnitAdditionalParams\n\tWrite-Output \"Run xUnit with Additional Params $xUnitAdditionalParams\"\n}\n\nWrite-Output \"Run xUnit with command: $runxUnit\"\n\niex $runxUnit\n\n$xunitExit = $lastExitCode\n\nexit $xunitExit"
-  },
-  "Parameters": [
-    {
-      "Id": "ffd652f9-7186-44a7-9d16-63dcb30bd044",
-      "Name": "PackageDirectoryPath",
-      "Label": "Package directory path",
-      "HelpText": "Path to directory with test package",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fd5ae46f-1b5b-45bb-bf34-605351eeedea",
-      "Name": "TestPackages",
-      "Label": "Test package(s)",
-      "HelpText": "Provide test file(s) here. Accepted .dll or .exe.\nSeparate multiple test file names by spaces.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "f4630f67-3309-49cf-8fbd-51bcb4b040c8",
-      "Name": "TestCaseFilter",
-      "Label": "Test case filter",
-      "HelpText": "Only tests that match the given expression will be executed. \nSeparate filter conditions with pipe.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "74312a1f-f6ba-4518-a475-f308b545f398",
-      "Name": "XUnitAdditionalParameters",
-      "Label": "xUnit Additional Parameters",
-      "HelpText": "Pass any additional parameters you like here, they will be added to dotNet vstest command",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2018-10-25T10:33:18.672Z",
-    "OctopusVersion": "2018.3.4",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedOn": "2018-10-24T12:44:19.041+00:00",
-  "LastModifiedBy": "yakuramori",
-  "Category": "xunit"
-}
+{
+  "Id": "f70a5c02-f6c0-40d4-a59a-7157cb2c2dc8",
+  "Name": "Execute xUnit Tests",
+  "Description": "Run xUnit tests with dotnet and vstest and some filters.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "ffd652f9-7186-44a7-9d16-63dcb30bd044",
+      "Name": "PackageDirectoryPath",
+      "Label": "Package directory path",
+      "HelpText": "Path to directory with test package",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fd5ae46f-1b5b-45bb-bf34-605351eeedea",
+      "Name": "TestPackages",
+      "Label": "Test package(s)",
+      "HelpText": "Provide test file(s) here. Accepted .dll or .exe.\nSeparate multiple test file names by spaces.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "f4630f67-3309-49cf-8fbd-51bcb4b040c8",
+      "Name": "TestCaseFilter",
+      "Label": "Test case filter",
+      "HelpText": "Only tests that match the given expression will be executed. \nSeparate filter conditions with pipe.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "74312a1f-f6ba-4518-a475-f308b545f398",
+      "Name": "XUnitAdditionalParameters",
+      "Label": "xUnit Additional Parameters",
+      "HelpText": "Pass any additional parameters you like here, they will be added to dotNet vstest command",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2018-10-25T10:33:18.6720000Z",
+    "OctopusVersion": "2018.3.4",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedOn": "2018-10-24T05:44:19.0410000-07:00",
+  "LastModifiedBy": "yakuramori",
+  "Category": "xunit"
+}
diff --git a/src/step-templates/run-xunit/scriptbody.ps1 b/src/step-templates/run-xunit/scriptbody.ps1
new file mode 100644
index 000000000..617885a45
--- /dev/null
+++ b/src/step-templates/run-xunit/scriptbody.ps1
@@ -0,0 +1,43 @@
+Write-Output "Running xUnit tests with dotnet and vstest..."
+$dotNetVer = dotnet --version
+Write-Output "DotNet version: $dotNetVer"
+$dirPath = $PackageDirectoryPath
+$testFiles = $TestPackages
+$testFilter = $TestCaseFilter
+$xUnitAdditionalParams = $XUnitAdditionalParameters
+
+If(-Not $dirPath){
+    Write-Output "Directory with tests is missing!"
+    exit 1
+}
+
+If(-Not $testFiles){
+    Write-Output "Test Package(s) missing!"
+    exit 1
+}
+
+Write-Output "Execute test package(s): $testFiles"
+Write-Output "With following filter(s): $testFilter"
+Write-Output "From Package Directory: $dirPath"
+
+cd $dirPath
+
+If($testFilter){
+	$runxUnit = "dotnet vstest $testFiles --testcasefilter:'($testFilter)'"
+    Write-Output "Run xUnit with filter $testFilter"
+    } Else {
+    $runxUnit = "dotnet vstest $testFiles"    
+    }
+
+if($xUnitAdditionalParams){
+	$runxUnit = $runxUnit + " " + $xUnitAdditionalParams
+	Write-Output "Run xUnit with Additional Params $xUnitAdditionalParams"
+}
+
+Write-Output "Run xUnit with command: $runxUnit"
+
+iex $runxUnit
+
+$xunitExit = $lastExitCode
+
+exit $xunitExit
\ No newline at end of file
diff --git a/src/step-templates/save-octopus-output-variable-with-scoping/metadata.json b/src/step-templates/save-octopus-output-variable-with-scoping/metadata.json
new file mode 100644
index 000000000..b298a1543
--- /dev/null
+++ b/src/step-templates/save-octopus-output-variable-with-scoping/metadata.json
@@ -0,0 +1,166 @@
+{
+  "Id": "75a8f263-b690-4a55-84b7-9165ac9b6196",
+  "Name": "Save Octopus Output Variable With Scoping",
+  "Description": "Saves an [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables) to the given project / library variable set with scoping",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "bdbd77a9-cc0f-49f0-afac-6403e8ba87e4",
+      "Name": "StepTemplate_ApiKey",
+      "Label": "API Key",
+      "HelpText": "Provide an Octopus API Key with appropriate permissions to save the variable",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ed5cf637-06ed-4c38-8a8d-f17c523ec6ba",
+      "Name": "StepTemplate_DeploymentStep",
+      "Label": "Deployment Step",
+      "HelpText": "Select the step with the [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "3d6f35a9-99ae-481e-b393-4319b70e0ac0",
+      "Name": "StepTemplate_VariableName",
+      "Label": "Variable Name",
+      "HelpText": "Name of the [variable used when it was set](https://octopus.com/docs/deploying-applications/variables/output-variables#Outputvariables-Settingoutputvariablesusingscripts)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9265ca02-9c0f-48ad-9cb1-65d28d5a446e",
+      "Name": "StepTemplate_VariableSetType",
+      "Label": "Variable Set Type",
+      "HelpText": "If the output variable is being saved to a project or [library variable set](https://octopus.com/docs/deploying-applications/variables/library-variable-sets)",
+      "DefaultValue": "project",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "project|Project Variable\nlibrary|Library Variable Set"
+      }
+    },
+    {
+      "Id": "f511bbd7-1b75-430f-be48-d3b0787d839e",
+      "Name": "StepTemplate_VariableSetName",
+      "Label": "Variable Set Name",
+      "HelpText": "Name of the project or [library](https://octopus.com/docs/deploying-applications/variables/library-variable-sets) variable set where the output variable should be saved",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "50a10535-b36b-4972-a9a0-ff9bb42451c7",
+      "Name": "StepTemplate_TargetName",
+      "Label": "Target Variable Name",
+      "HelpText": "The name to use when saving the variable.\n\n_Note: The original variable name the default value._",
+      "DefaultValue": "#{StepTemplate_VariableName}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "204ad3d5-804a-43cd-90ad-8bb359800c78",
+      "Name": "StepTemplate_IsSensitive",
+      "Label": "Is Sensitive?",
+      "HelpText": "If the variable should be marked as [sensitive](https://octopus.com/docs/deploying-applications/variables/sensitive-variables) and the value masked from logs",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "fdbcad6b-ff48-4f4f-8cda-afc404fb7f10",
+      "Name": "StepTemplate_EnvironmentScope",
+      "Label": "Environment Scope",
+      "HelpText": "The environment scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c4df3719-1f46-4d10-a3b7-52227f78815f",
+      "Name": "StepTemplate_RoleScope",
+      "Label": "Role Scope",
+      "HelpText": "The role scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1782abd1-ed68-4cbb-85b2-efd2baaa1eae",
+      "Name": "StepTemplate_MachineScope",
+      "Label": "Target Scope",
+      "HelpText": "The target scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "85f14553-6425-4298-ba77-bdf31f852d0b",
+      "Name": "StepTemplate_ActionScope",
+      "Label": "Action Scope",
+      "HelpText": "The action scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e4152038-fc42-4ed6-8ad5-4aa94d76a5d1",
+      "Name": "StepTemplate_ChannelScope",
+      "Label": "Channel Scope",
+      "HelpText": "The channel scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a5bcd57b-d0bb-4b1c-be1b-56314e0b9684",
+      "Name": "StepTemplate_TenantTagScope",
+      "Label": "Tenant Tag Scope",
+      "HelpText": "The tenant tag scope to use when creating or updating the variable. The value should be in the format TagSetName/TagValue.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7de754f7-d8b6-4b6e-a7d1-6306cf8f7ab8",
+      "Name": "StepTemplate_ScopeDelimiter",
+      "Label": "Scope Delimiter",
+      "HelpText": "The delimiter used by scope lists.",
+      "DefaultValue": ",",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2021-10-21T15:24:33.5190000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-10-21T15:24:33.5190000Z",
+    "OctopusVersion": "2021.2.7706",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/save-octopus-output-variable-with-scoping/scriptbody.ps1 b/src/step-templates/save-octopus-output-variable-with-scoping/scriptbody.ps1
new file mode 100644
index 000000000..df094e80a
--- /dev/null
+++ b/src/step-templates/save-octopus-output-variable-with-scoping/scriptbody.ps1
@@ -0,0 +1,199 @@
+$ErrorActionPreference = 'Stop'
+
+$StepTemplate_BaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}'].Trim('/')
+if ([string]::IsNullOrWhiteSpace($StepTemplate_ApiKey)) {
+    throw "The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again."
+}
+
+function Invoke-OctopusApi {
+    param(
+        [Parameter(Position = 0, Mandatory)]$Uri,
+        [ValidateSet("Get", "Put")]$Method = 'Get',
+        $Body
+    )
+    $requestParameters = @{
+        Uri = ('{0}/{1}' -f $StepTemplate_BaseUrl, $Uri.TrimStart('/'))
+        Method = $Method
+        Headers = @{ "X-Octopus-ApiKey" = $StepTemplate_ApiKey }
+        UseBasicParsing = $true
+    }
+    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }
+    Write-Verbose "$($Method.ToUpperInvariant()) $($requestParameters.Uri)"   
+    Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json | Write-Output
+}
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-OctopusApi 'api/';
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if(Test-SpacesApi) {
+	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+    }
+	$baseApiUrl = "api/$spaceId" ;
+} else {
+	$baseApiUrl = "api" ;
+}
+
+function Check-Scope {
+	param(
+    	[Parameter(Position = 0, Mandatory)]
+        [string]$ScopeName,
+        [Parameter(Position = 1, Mandatory)]
+        [AllowEmptyCollection()]
+        [array]$ScopeValues,
+        [Parameter(Position = 2)]
+        [array]$ExistingScopeValue,
+        [Parameter(Position = 3)]
+        [string]$LookingForScopeValue
+    )
+    
+    if ($LookingForScopeValue) {
+     	
+    	Write-Host "Checking $ScopeName Scope"
+        
+        $scopes = Create-Scope $ScopeName $ScopeValues $LookingForScopeValue
+        
+        if (-not ($ExistingScopeValue -and (Compare-Object $ExistingScopeValue $scopes) -eq $null)) {
+        	Write-Host "$ScopeName scope does not match"
+        	return $false
+        }
+        Write-Host "$ScopeName scope matches"
+    } else {
+    	if ($ExistingScopeValue) {
+        	Write-Host "$ScopeName scope does not match"
+        	return $false
+        }
+    }
+    
+    return $true
+}
+
+function Create-Scope {
+	param(
+    	[Parameter(Position = 0, Mandatory)]
+        [string]$ScopeName,
+        [Parameter(Position = 1, Mandatory)]
+        [array]$ScopeValues,
+        [Parameter(Position = 2)]
+        [string]$ScopeValue
+    )
+    
+    $scopes = @()
+    
+    foreach ($scope in $ScopeValue.Split($StepTemplate_ScopeDelimiter)) {
+    	if ($ScopeName -eq "TenantTag") {
+    		$value = $ScopeValues | Where { $_.Id -eq $scope } | Select -First 1
+    	}
+        else {
+    		$value = $ScopeValues | Where { $_.Name -eq $scope } | Select -First 1
+    	}
+    	$scopes += $value.Id
+    }
+    
+    return $scopes
+}
+
+$outputVariableKey = "Octopus.Action[${StepTemplate_DeploymentStep}].Output.${StepTemplate_VariableName}"
+if (!$OctopusParameters.ContainsKey($outputVariableKey)) {
+    throw "Variable '$StepTemplate_VariableName' has not been output from '$StepTemplate_DeploymentStep'"
+}
+$isSensitive = [System.Convert]::ToBoolean($StepTemplate_IsSensitive)
+$variableType = if ($isSensitive) { "Sensitive" } else { "String" }
+
+$variableValue = $OctopusParameters[$outputVariableKey]
+Write-Host "Name: $StepTemplate_VariableName"
+Write-Host "Type: $variableType"
+Write-Host "Value: $(if ($isSensitive) { "********" } else { $variableValue })"
+Write-Host ' '
+
+Write-Host "Retrieving $StepTemplate_VariableSetType variable set..."
+if ($StepTemplate_VariableSetType -eq 'project') {
+    $variableSet = Invoke-OctopusApi "$baseApiUrl/projects/all" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }
+}
+if ($StepTemplate_VariableSetType -eq 'library') {
+    $variableSet = Invoke-OctopusApi "$baseApiUrl/libraryvariablesets/all?ContentType=Variables" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }
+}
+if ($null -eq $variableSet) {
+    throw "Unable to find $StepTemplate_VariableSetType variable set '$StepTemplate_VariableSetName'"
+}
+
+$variableExists = $false
+
+$variableSet.Variables | ? Name -eq $StepTemplate_TargetName | % {
+	if (-not (Check-Scope 'Environment' $variableSet.ScopeValues.Environments $_.Scope.Environment $StepTemplate_EnvironmentScope)) {
+    	return
+    }
+
+	if (-not (Check-Scope 'Machine' $variableSet.ScopeValues.Machines $_.Scope.Machine $StepTemplate_MachineScope)) {
+    	return
+    }
+    
+    if (-not (Check-Scope 'Role' $variableSet.ScopeValues.Roles $_.Scope.Role $StepTemplate_RoleScope)) {
+    	return
+    }
+    
+    if (-not (Check-Scope 'Action' $variableSet.ScopeValues.Actions $_.Scope.Action $StepTemplate_ActionScope)) {
+    	return
+    }
+    
+    if (-not (Check-Scope 'Channel' $variableSet.ScopeValues.Channels $_.Scope.Channel $StepTemplate_ChannelScope)) {
+    	return
+    }
+    
+    if (-not (Check-Scope 'TenantTag' $variableSet.ScopeValues.TenantTags $_.Scope.TenantTag $StepTemplate_TenantTagScope)) {
+    	return
+    }
+
+    Write-Host "Updating existing variable..."
+    Write-Host "Existing value:"
+	Write-Host "$(if ($isSensitive) { "********" } else { $_.Value })"
+    $_.Value = $variableValue
+    $_.Type = $variableType
+    $_.IsSensitive = $isSensitive
+    $variableExists = $true
+}
+
+if (!$variableExists) {
+    Write-Host "Creating new variable..."
+    
+    $variable = @{
+        Name = $StepTemplate_TargetName
+        Value = $variableValue
+        Type = $variableType
+        IsSensitive = $isSensitive
+        Scope = @{}
+    }
+    
+    if ($StepTemplate_EnvironmentScope) {
+    	$variable.Scope['Environment'] = (Create-Scope 'Environment' $variableSet.ScopeValues.Environments $StepTemplate_EnvironmentScope)
+    }
+    if ($StepTemplate_RoleScope) {
+    	$variable.Scope['Role'] = (Create-Scope 'Role' $variableSet.ScopeValues.Roles $StepTemplate_RoleScope)
+    }
+    if ($StepTemplate_MachineScope) {
+    	$variable.Scope['Machine'] = (Create-Scope 'Machine' $variableSet.ScopeValues.Machines $StepTemplate_MachineScope)
+    }
+    if ($StepTemplate_ActionScope) {
+    	$variable.Scope['Action'] = (Create-Scope 'Action' $variableSet.ScopeValues.Actions $StepTemplate_ActionScope)
+    }
+    if ($StepTemplate_ChannelScope) {
+    	$variable.Scope['Channel'] = (Create-Scope 'Channel' $variableSet.ScopeValues.Channels $StepTemplate_ChannelScope)
+    }
+    if ($StepTemplate_TenantTagScope) {
+        $variable.Scope['TenantTag'] = (Create-Scope 'TenantTag' $variableSet.ScopeValues.TenantTags $StepTemplate_TenantTagScope)
+    }
+    
+    $variableSet.Variables += $variable
+}
+
+Write-Host "Saving updated variable set..."
+Invoke-OctopusApi $variableSet.Links.Self -Method Put -Body $variableSet | Out-Null
diff --git a/src/step-templates/save-octopus-output-variable/metadata.json b/src/step-templates/save-octopus-output-variable/metadata.json
new file mode 100644
index 000000000..ec2b4e0da
--- /dev/null
+++ b/src/step-templates/save-octopus-output-variable/metadata.json
@@ -0,0 +1,92 @@
+{
+  "Id": "54b22700-3217-48ac-8749-e4a31b424834",
+  "Name": "Save Octopus Output Variable",
+  "Description": "Saves an [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables) to the given project / library variable set",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "41e164af-94b1-42ac-8462-3e1a6ba49bbb",
+      "Name": "StepTemplate_ApiKey",
+      "Label": "API Key",
+      "HelpText": "Provide an Octopus API Key with appropriate permissions to save the variable",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ceddb0a2-621a-4cce-94e1-42ad1bf4ba72",
+      "Name": "StepTemplate_DeploymentStep",
+      "Label": "Deployment Step",
+      "HelpText": "Select the step with the [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "fdd47428-d7ce-4f8d-b73b-e4d513d1aea8",
+      "Name": "StepTemplate_VariableName",
+      "Label": "Variable Name",
+      "HelpText": "Name of the [variable used when it was set](https://octopus.com/docs/deploying-applications/variables/output-variables#Outputvariables-Settingoutputvariablesusingscripts)\n\n_Note: The same name will be given to the saved variable_",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7a81c569-063f-41cb-ae61-1c4ebb67293a",
+      "Name": "StepTemplate_VariableSetType",
+      "Label": "Variable Set Type",
+      "HelpText": "If the output variable is being saved to a project or [library variable set](https://octopus.com/docs/deploying-applications/variables/library-variable-sets)",
+      "DefaultValue": "project",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "project|Project Variable\nlibrary|Library Variable Set"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "09e61027-ab16-4171-80c7-c7656f68833a",
+      "Name": "StepTemplate_VariableSetName",
+      "Label": "Variable Set Name",
+      "HelpText": "Name of the project or [library](https://octopus.com/docs/deploying-applications/variables/library-variable-sets) variable set where the output variable should be saved",
+      "DefaultValue": "#{Octopus.Project.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6e3cf177-1dcc-4b7c-9d24-ec7805167cef",
+      "Name": "StepTemplate_IsSensitive",
+      "Label": "Is Sensitive?",
+      "HelpText": "If the variable should be marked as [sensitive](https://octopus.com/docs/deploying-applications/variables/sensitive-variables) and the value masked from logs",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-10-21T15:24:33.5190000Z",
+    "OctopusVersion": "2021.2.7706",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/save-octopus-output-variable/scriptbody.ps1 b/src/step-templates/save-octopus-output-variable/scriptbody.ps1
new file mode 100644
index 000000000..efa6cf96c
--- /dev/null
+++ b/src/step-templates/save-octopus-output-variable/scriptbody.ps1
@@ -0,0 +1,104 @@
+$ErrorActionPreference = 'Stop'
+
+$StepTemplate_BaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}'].Trim('/')
+if ([string]::IsNullOrWhiteSpace($StepTemplate_ApiKey)) {
+    throw "The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again."
+}
+
+function Invoke-OctopusApi {
+    param(
+        [Parameter(Position = 0, Mandatory)]$Uri,
+        [ValidateSet("Get", "Put")]$Method = 'Get',
+        $Body
+    )
+    $requestParameters = @{
+        Uri = ('{0}/{1}' -f $StepTemplate_BaseUrl, $Uri.TrimStart('/'))
+        Method = $Method
+        Headers = @{ "X-Octopus-ApiKey" = $StepTemplate_ApiKey }
+        UseBasicParsing = $true
+    }
+    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }
+    Write-Verbose "$($Method.ToUpperInvariant()) $($requestParameters.Uri)"   
+    Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json | Write-Output
+}
+
+function Test-SpacesApi {
+	Write-Verbose "Checking API compatibility";
+	$rootDocument = Invoke-OctopusApi 'api/';
+    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {
+    	Write-Verbose "Spaces API found"
+    	return $true;
+    }
+    Write-Verbose "Pre-spaces API found"
+    return $false;
+}
+
+if(Test-SpacesApi) {
+	$spaceId = $OctopusParameters['Octopus.Space.Id'];
+    if([string]::IsNullOrWhiteSpace($spaceId)) {
+        throw "This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.";
+    }
+	$baseApiUrl = "api/$spaceId" ;
+} else {
+	$baseApiUrl = "api" ;
+}
+
+function Get-OctopusSetting {
+    param([Parameter(Position = 0, Mandatory)][string]$Name, [Parameter(Position = 1, Mandatory)]$DefaultValue)
+    $formattedName = 'Octopus.Action.{0}' -f $Name
+    if ($OctopusParameters.ContainsKey($formattedName)) {
+        $value = $OctopusParameters[$formattedName]
+        if ($DefaultValue -is [bool]) { return ([System.Convert]::ToBoolean($value)) }
+        if ($DefaultValue -is [array] -or $DefaultValue -is [hashtable] -or $DefaultValue -is [pscustomobject]) { return (ConvertFrom-Json -InputObject $value) }
+        return $value
+    }
+    else { return $DefaultValue }
+}
+
+$outputVariableKey = "Octopus.Action[${StepTemplate_DeploymentStep}].Output.${StepTemplate_VariableName}"
+if (!$OctopusParameters.ContainsKey($outputVariableKey)) {
+    throw "Variable '$StepTemplate_VariableName' has not been output from '$StepTemplate_DeploymentStep'"
+}
+$isSensitive = [System.Convert]::ToBoolean($StepTemplate_IsSensitive)
+$variableType = if ($isSensitive) { "Sensitive" } else { "String" }
+
+$variableValue = $OctopusParameters[$outputVariableKey]
+Write-Host "Name: $StepTemplate_VariableName"
+Write-Host "Type: $variableType"
+Write-Host "Value: $(if ($isSensitive) { "********" } else { $variableValue })"
+Write-Host ' '
+
+Write-Host "Retrieving $StepTemplate_VariableSetType variable set..."
+if ($StepTemplate_VariableSetType -eq 'project') {
+    $variableSet = Invoke-OctopusApi "$baseApiUrl/projects/all" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }
+}
+if ($StepTemplate_VariableSetType -eq 'library') {
+    $variableSet = Invoke-OctopusApi "$baseApiUrl/libraryvariablesets/all?ContentType=Variables" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }
+}
+if ($null -eq $variableSet) {
+    throw "Unable to find $StepTemplate_VariableSetType variable set '$StepTemplate_VariableSetName'"
+}
+
+$variableExists = $false
+$variableSet.Variables | ? Name -eq $StepTemplate_VariableName | % {
+    Write-Host "Updating existing variable..."
+    Write-Verbose "Existing value: $(if ($isSensitive) { "********" } else { $_.Value })"
+    $_.Value = $variableValue
+    $_.Type = $variableType
+    $_.IsSensitive = $isSensitive
+    $_.Scope = Get-OctopusSetting Scope $_.Scope
+    $variableExists = $true
+}
+if (!$variableExists) {
+    Write-Host "Creating new variable..."
+    $variableSet.Variables += @{
+        Name = $StepTemplate_VariableName
+        Value = $variableValue
+        Type = $variableType
+        IsSensitive = $isSensitive
+        Scope = (Get-OctopusSetting Scope @{})
+    }
+}
+
+Write-Host "Saving updated variable set..."
+Invoke-OctopusApi $variableSet.Links.Self -Method Put -Body $variableSet | Out-Null
\ No newline at end of file
diff --git a/src/step-templates/sbom-scan/metadata.json b/src/step-templates/sbom-scan/metadata.json
new file mode 100644
index 000000000..e35b3a5da
--- /dev/null
+++ b/src/step-templates/sbom-scan/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "a38bfff8-8dde-4dd6-9fd0-c90bb4709d5a",
+  "Name": "Scan for Vulnerabilities",
+  "Description": "This step extracts the Docker image, finds any bom.json files, and scans them for vulnerabilities using Trivy.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "9b495093-0020-4df8-bc44-2fd65ab13943",
+      "Name": "application",
+      "PackageId": "",
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Sbom.Package"
+      }
+    }
+  ],
+  "GitDependencies": [],
+  "Properties": {
+    "OctopusUseBundledTooling": "False",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9cea163a-a048-4ff5-9405-56fdcb9015c7",
+      "Name": "Sbom.Package",
+      "Label": "Application package containing the SBOM to scan",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-11-02T21:42:33.6620000Z",
+    "OctopusVersion": "2025.4.6337",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mcasperson",
+  "Category": "sbom"
+}
diff --git a/src/step-templates/sbom-scan/scriptbody.ps1 b/src/step-templates/sbom-scan/scriptbody.ps1
new file mode 100644
index 000000000..bf034d530
--- /dev/null
+++ b/src/step-templates/sbom-scan/scriptbody.ps1
@@ -0,0 +1,129 @@
+Write-Host "Pulling Trivy Docker Image"
+Write-Host "##octopus[stdout-verbose]"
+docker pull ghcr.io/aquasecurity/trivy
+Write-Host "##octopus[stdout-default]"
+
+$SUCCESS = 0
+
+Write-Host "##octopus[stdout-verbose]"
+Get-ChildItem -Path "." | Out-String
+Write-Host "##octopus[stdout-default]"
+
+# Find all bom.json files
+$bomFiles = Get-ChildItem -Path "." -Filter "bom.json" -Recurse -File
+
+if ($bomFiles.Count -eq 0) {
+    Write-Host "No bom.json files found in the current directory."
+    exit 0
+}
+
+foreach ($file in $bomFiles) {
+    Write-Host "Scanning $($file.FullName)"
+
+    # Delete any existing report file
+    if (Test-Path "$($file.FullName)/depscan-bom.json") {
+        Remove-Item "$($file.FullName)/depscan-bom.json" -Force
+    }
+
+    # Generate the report, capturing the output
+    try {
+        $OUTPUT = docker run --rm -v "$($file.FullName):/input/$($file.Name)" ghcr.io/aquasecurity/trivy sbom -q "/input/$($file.Name)"
+        $exitCode = $LASTEXITCODE
+    }
+    catch {
+        $OUTPUT = $_.Exception.Message
+        $exitCode = 1
+    }
+
+    # Run again to generate the JSON output in the same directory as the bom.json file
+    docker run --rm -v "$($file.DirectoryName):/output" -v "$($file.FullName):/input/$($file.Name)" ghcr.io/aquasecurity/trivy sbom -q -f json -o /output/depscan-bom.json "/input/$($file.Name)"
+
+    # Parse JSON output to count vulnerabilities
+    $jsonContent = Get-Content -Path "$($file.DirectoryName)/depscan-bom.json" | ConvertFrom-Json
+    $CRITICAL = ($jsonContent.Results | ForEach-Object { $_.Vulnerabilities } | Where-Object { $_.Severity -eq "CRITICAL" }).Count
+    $HIGH = ($jsonContent.Results | ForEach-Object { $_.Vulnerabilities } | Where-Object { $_.Severity -eq "HIGH" }).Count
+
+    if ("#{Octopus.Environment.Name}" -eq "Security") {
+        Write-Highlight "🟥 $CRITICAL critical vulnerabilities"
+        Write-Highlight "🟧 $HIGH high vulnerabilities"
+    }
+
+    # Set success to 1 if exit code is not zero
+    if ($exitCode -ne 0) {
+        $SUCCESS = 1
+    }
+
+    # Print the output
+    $OUTPUT | ForEach-Object {
+        if ($_.Length -gt 0) {
+            Write-Host $_
+        }
+    }
+}
+
+# Find all depscan-bom.json files recursively
+$depscanFiles = Get-ChildItem -Path "." -Filter "depscan-bom.json" -Recurse -File
+
+if ($depscanFiles.Count -gt 0) {
+    $zipPath = "$PWD/depscan-bom.zip"
+
+    # Remove existing zip if present
+    if (Test-Path $zipPath) {
+        Remove-Item $zipPath -Force
+    }
+
+    # Create a temporary directory structure and copy files with relative paths
+    $tempDir = "$PWD/temp_zip"
+
+    if (Test-Path $tempDir) {
+        Remove-Item $tempDir -Recurse -Force
+    }
+
+    New-Item -ItemType Directory -Path $tempDir -Force | Out-Null
+
+    foreach ($file in $depscanFiles) {
+        $relativePath = $file.FullName.Substring($PWD.Path.Length + 1)
+        $targetPath = Join-Path $tempDir $relativePath
+        $targetDir = Split-Path $targetPath -Parent
+
+        Write-Host "Adding $relativePath to zip"
+
+        if (-not (Test-Path $targetDir)) {
+            New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
+        }
+
+        Copy-Item $file.FullName -Destination $targetPath
+    }
+
+    # Compress with relative paths
+    Compress-Archive -Path "$tempDir/*" -DestinationPath $zipPath
+
+    # Cleanup temp directory
+    Remove-Item $tempDir -Recurse -Force
+
+    # Octopus Deploy artifact
+    New-OctopusArtifact $zipPath
+
+} else {
+    Write-Host "No depscan-bom.json files found to zip."
+}
+
+# Cleanup
+for ($i = 1; $i -le 10; $i++) {
+    try {
+        if (Test-Path "bundle") {
+            Set-ItemProperty -Path "bundle" -Name IsReadOnly -Value $false -Recurse -ErrorAction SilentlyContinue
+            Remove-Item -Path "bundle" -Recurse -Force -ErrorAction Stop
+            break
+        }
+    }
+    catch {
+        Write-Host "Attempting to clean up files"
+        Start-Sleep -Seconds 1
+    }
+}
+
+# Set Octopus variable
+Set-OctopusVariable -Name "VerificationResult" -Value $SUCCESS
+
+exit 0
\ No newline at end of file
diff --git a/src/step-templates/scheduled-task-create-from-xml/metadata.json b/src/step-templates/scheduled-task-create-from-xml/metadata.json
new file mode 100644
index 000000000..236e78b72
--- /dev/null
+++ b/src/step-templates/scheduled-task-create-from-xml/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "26c779af-4cce-447e-98bb-4741c25e0b3c",
+  "Name": "Create Scheduled Tasks From XML",
+  "Description": "This will create a schedule task based on exported xml. See https://msdn.microsoft.com/en-us/library/windows/desktop/bb736357%28v=vs.85%29.aspx for instructions on how to export scheduled tasks as xml.",
+  "ActionType": "Octopus.Script",
+  "Version": 27,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "xmlFileName",
+      "Label": "Xml File List",
+      "HelpText": "A list of XML files, separated by ';', containing the scheduled tasks to create.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "username",
+      "Label": "User Name",
+      "HelpText": "The User that the task will run as",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "password",
+      "Label": "Password",
+      "HelpText": "The password of the user the task will run as",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-04-29T07:04:16.6390000-07:00",
+  "LastModifiedBy": "josh3ennett",
+  "$Meta": {
+    "ExportedAt": "2015-04-29T07:15:45.9380000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "xml"
+}
diff --git a/src/step-templates/scheduled-task-create-from-xml/scriptbody.ps1 b/src/step-templates/scheduled-task-create-from-xml/scriptbody.ps1
new file mode 100644
index 000000000..c00a77951
--- /dev/null
+++ b/src/step-templates/scheduled-task-create-from-xml/scriptbody.ps1
@@ -0,0 +1,111 @@
+# Running outside octopus
+param(
+    [string]$xmlFileName,
+    [string]$userName,
+    [string]$password
+)
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue    
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+Function Create-ScheduledTask($xmlFileName, $taskName, $username, $password){
+	$Command = "schtasks.exe /create /tn $($taskName) /RU $($username) /RP $($password) /XML $($xmlFileName)"
+
+	Write-Host $Command
+	Invoke-Expression $Command
+ }
+
+Function Delete-ScheduledTask($TaskName) {   
+	$Command = "schtasks.exe /delete /tn `"$TaskName`" /F"            
+	Invoke-Expression $Command 
+}
+
+Function Stop-ScheduledTask($TaskName) {  
+	$Command = "schtasks.exe /end /tn `"$TaskName`""            
+	Invoke-Expression $Command 
+}
+
+Function Start-ScheduledTask($TaskName) {   
+	$Command = "schtasks.exe /run /tn `"$TaskName`""            
+	Invoke-Expression $Command 
+}
+
+Function ScheduledTask-Exists($taskName) {
+   $schedule = new-object -com Schedule.Service 
+   $schedule.connect() 
+   $tasks = $schedule.getfolder("\").gettasks(0)
+
+   foreach ($task in ($tasks | select Name)) {
+	  #echo "TASK: $($task.name)"
+	  if($task.Name -eq $taskName) {
+		 #write-output "$task already exists"
+		 return $true
+	  }
+   }
+
+   return $false
+}
+
+Function GetTaskNameFromXmlPath($xmlFile){
+    return (Split-Path -Path $xmlFile -Leaf -Resolve).Split(".")[0]
+}
+
+& {
+    param(
+        [string]$xmlFileName,
+        [string]$userName,
+        [string]$password
+    ) 
+
+    Write-Host "Create Schedule Task From XML"
+    Write-Host "xmlFileName: $xmlFileName"
+    Write-Host "userName: $userName"
+    Write-Host "password: <Hidden>"
+
+    $xmlFileName.Split(";") | foreach{
+        $xmlFile = $_.Trim()
+        $taskName = GetTaskNameFromXmlPath($xmlFile)
+
+
+        if((ScheduledTask-Exists($taskName))){
+	        Write-Output "$taskName already exists, Tearing down..."
+	        Write-Output "Stopping $taskName..."
+	        Stop-ScheduledTask($taskName)
+	        Write-Output "Successfully Stopped $taskName"
+	        Write-Output "Deleting $taskName..."
+	        Delete-ScheduledTask($taskName)
+	        Write-Output "Successfully Deleted $taskName"
+        }
+
+        Write-Output "Create a Scheduled Task from $xmlFile called $taskName. Run as $username" 
+        Create-ScheduledTask "$($xmlFile)" $taskName $username $password
+    }
+
+}`
+(Get-Param 'xmlFileName' -Required)`
+(Get-Param 'userName' -Required)`
+(Get-Param 'password' -Required)
\ No newline at end of file
diff --git a/src/step-templates/send-email-using-mailkit/metadata.json b/src/step-templates/send-email-using-mailkit/metadata.json
new file mode 100644
index 000000000..5cd473452
--- /dev/null
+++ b/src/step-templates/send-email-using-mailkit/metadata.json
@@ -0,0 +1,148 @@
+{
+  "Id": "b163a315-24b7-4bf8-9cca-d9011f57019a",
+  "Name": "Send Email using MailKit",
+  "Description": "This step template supports sending an email using the [MailKit](https://github.com/jstedfast/MailKit) library, a cross-platform .NET library for IMAP, POP3, and SMTP.\n\n- Support for multiple TO addresses (separated by `,`).\n- Support for multiple CC addresses (separated by `,`).\n- *Optional* support for a separate `reply-to` address.\n\nThis step **does not** support running on PowerShell: Windows Desktop Edition.\n\n---\n\n**Required:** \n- The `MailKit` and `MimeKit` packages are installed on the target or worker. If the packages can't be found, the step will attempt to download them from [https://www.nuget.org](https://www.nuget.org).\n- PowerShell Core (including when running on Windows).\n\n*Notes:*\n\n- Tested on Octopus `2025.1`.\n- Tested on Windows and Linux with PowerShell Core only.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.PowerShell.Edition": "Core",
+    "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "65b67843-2cd5-48a5-ac9d-611de16246a7",
+      "Name": "SendEmail.SmtpServer",
+      "Label": "SMTP Server",
+      "HelpText": "The SMTP Server address e.g. `smtp.gmail.com`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3d87558e-aa18-46af-85bb-644890d6654b",
+      "Name": "SendEmail.SmtpPort",
+      "Label": "SMTP Port",
+      "HelpText": "The SMTP Port used for connecting. Typical SMTP ports are: \n- `25`\n- `587` (STARTTLS)\n- `465` (SSL)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0c1f7ae0-8cd4-45a5-b53b-e5019ad5ecb0",
+      "Name": "SendEmail.SecureSocketOption",
+      "Label": "SSL Option",
+      "HelpText": "The [SSL Option](https://mimekit.net/docs/html/T_MailKit_Security_SecureSocketOptions.htm) to use:\n- `None`: No SSL or TLS encryption should be used\n- `Auto`: Allow the [IMailService](https://mimekit.net/docs/html/T_MailKit_IMailService.htm) to decide which SSL or TLS options to use (default). If the server does not support SSL or TLS, then the connection will continue without any encryption.\n- `SslOnConnect`: The connection should use SSL or TLS encryption immediately.\n- `StartTls`: Elevates the connection to use TLS encryption immediately after reading the greeting and capabilities of the server. If the server does not support the STARTTLS extension, then the connection will fail and a NotSupportedException will be thrown.\n- `StartTlsWhenAvailable`: Elevates the connection to use TLS encryption immediately after reading the greeting and capabilities of the server, but only if the server supports the STARTTLS extension.\n\nDefault: `Auto`.",
+      "DefaultValue": "Auto",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "None|None\nAuto|Auto\nSslOnConnect|Use SSL\nStartTls|Use STARTTLS\nStartTlsWhenAvailable|Start Tls When Available"
+      }
+    },
+    {
+      "Id": "208a3bab-b331-4fa6-a122-459593a4c98f",
+      "Name": "SendEmail.Credentials.Username",
+      "Label": "Authentication Username",
+      "HelpText": "The username to authenticate with the SMTP Server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "d42aba20-174a-4b51-af88-78d332f09a08",
+      "Name": "SendEmail.Credentials.Password",
+      "Label": "Authentication Password",
+      "HelpText": "The password to authenticate with the SMTP Server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "8eafb51b-599b-4c51-8d35-974c5843c9cb",
+      "Name": "SendEmail.Subject",
+      "Label": "Email Subject",
+      "HelpText": "The Email Subject",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bc4d18f8-e096-4911-84ce-e35268c83934",
+      "Name": "SendEmail.FromAddress",
+      "Label": "From Address",
+      "HelpText": "The sender address of the Email",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "302fb573-5720-47b6-bbd7-7d0077ca75ba",
+      "Name": "SendEmail.TOAddresses",
+      "Label": "TO addresses",
+      "HelpText": "The recipients of the Email. Multiple addresses can be supplied, separated by a `,`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "be2267f6-36b0-4f7e-a7cf-f274e56aff2f",
+      "Name": "SendEmail.CCAddresses",
+      "Label": "(Optional) CC addresses",
+      "HelpText": "The *optional* CC (carbon-copy) recipients of the Email. Multiple addresses can be supplied, separated by a `,`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b43c49fd-3214-4310-a8cf-10489a3c858f",
+      "Name": "SendEmail.ReplyToAddress",
+      "Label": "(Optional) Reply-to address",
+      "HelpText": "The *optional* `reply-to` address.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9e07a17f-a044-4f6f-ac0c-5d131058a270",
+      "Name": "SendEmail.HtmlBody",
+      "Label": "HTML Message Body",
+      "HelpText": "The HTML message body of the Email.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "bd111434-193d-413b-9d7e-279381061a0c",
+      "Name": "SendEmail.TextBody",
+      "Label": "Plain Text Message Body",
+      "HelpText": "The Text message body of the Email.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-02-26T14:52:39.5640000Z",
+    "OctopusVersion": "2025.2.937",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "email"
+}
diff --git a/src/step-templates/send-email-using-mailkit/scriptbody.ps1 b/src/step-templates/send-email-using-mailkit/scriptbody.ps1
new file mode 100644
index 000000000..43edaeac9
--- /dev/null
+++ b/src/step-templates/send-email-using-mailkit/scriptbody.ps1
@@ -0,0 +1,121 @@
+$ErrorActionPreference = "Stop";
+
+if ($PSEdition -eq "Core") {
+    $PSStyle.OutputRendering = "PlainText"
+}
+$emailSubject = $OctopusParameters["SendEmail.Subject"]
+$emailSmtpServer = $OctopusParameters["SendEmail.SmtpServer"]
+$emailSmtpPort = $OctopusParameters["SendEmail.SmtpPort"]
+$emailCredentialsUsername = $OctopusParameters["SendEmail.Credentials.Username"]
+$emailCredentialsPassword = $OctopusParameters["SendEmail.Credentials.Password"]
+$emailSecureSocketOption = $OctopusParameters["SendEmail.SecureSocketOption"]
+
+$validSecureSocketOptions = @("None", "Auto", "SslOnConnect", "StartTls", "StartTlsWhenAvailable")
+if(-not $validSecureSocketOptions.Contains($emailSecureSocketOption)) {
+    Write-Error "Invalid SecureSocketOption: $emailSecureSocketOption. Must be one of: $($validSecureSocketOptions -join ", ")."
+    return
+}
+
+$emailFromAddress = $OctopusParameters["SendEmail.FromAddress"]
+$emailToAddresses = $OctopusParameters["SendEmail.TOAddresses"]
+$emailCcAddresses = $OctopusParameters["SendEmail.CCAddresses"]
+$emailReplyToAddress = $OctopusParameters["SendEmail.ReplyToAddress"]
+
+$HtmlBody = $OctopusParameters["SendEmail.HtmlBody"]
+$TextBody = $OctopusParameters["SendEmail.TextBody"]
+
+Write-Verbose "Checking for MimeKit and MailKit packages."
+try {
+    
+    $MimeKitPackage = (Get-Package MimeKit -ErrorAction Stop) | Select-Object -First 1
+} 
+catch {
+    $MimeKitPackage = $null
+}
+if ($null -eq $MimeKitPackage) {
+    Write-Output "Downloading MimeKit from nuget.org."
+    Install-Package -Name 'MimeKit' -Source "https://www.nuget.org/api/v2" -SkipDependencies -Force -Scope CurrentUser
+    $MimeKitPackage = (Get-Package MimeKit) | Select-Object -First 1
+}
+
+try {
+    $MailKitPackage = (Get-Package MailKit -ErrorAction Stop) | Select-Object -First 1
+} 
+catch {
+    $MailKitPackage = $null
+}
+if ($null -eq $MailKitPackage) {
+    Write-Output "Downloading MailKit from nuget.org."
+    Install-Package -Name 'MailKit' -Source "https://www.nuget.org/api/v2" -SkipDependencies -Force -Scope CurrentUser
+    $MailKitPackage = (Get-Package MailKit) | Select-Object -First 1
+}
+
+$MimeKitPath = Join-Path (Get-Item $MimeKitPackage.source).Directory.FullName "lib/netstandard2.1/MimeKit.dll"
+$MailKitPath = Join-Path (Get-Item $MailKitPackage.source).Directory.FullName "lib/netstandard2.1/MailKit.dll"
+
+Add-Type -Path $MimeKitPath
+Add-Type -Path $MailKitPath
+
+# Validation/Setting of Secure Socket Options needed after libraries loaded
+switch($emailSecureSocketOption) {
+    "Auto" {
+        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::Auto
+    }
+    "None" {
+        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::None
+    }
+    "SslOnConnect" {
+        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::SslOnConnect
+    }
+    "StartTls" {
+        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::StartTls
+    }
+    "StartTlsWhenAvailable" {
+        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::StartTlsWhenAvailable
+    }
+    default {
+        Write-Error "Invalid SecureSocketOption: $emailSecureSocketOption. Must be one of: $($validSecureSocketOptions -join ", ")."
+        return
+    }
+}
+
+$SMTP = New-Object MailKit.Net.Smtp.SmtpClient
+
+$Message = New-Object MimeKit.MimeMessage
+$ContentBuilder = [MimeKit.BodyBuilder]::new()
+
+$ContentBuilder.HtmlBody = $HtmlBody
+$ContentBuilder.TextBody = $TextBody
+Write-Verbose "Setting From address: $emailFromAddress" 
+$Message.From.Add($emailFromAddress)
+$toAddresses = $emailToAddresses -split ","
+Write-Verbose "Setting TO addresses: $emailToAddresses"
+foreach($toAddress in $toAddresses) {
+    $Message.To.Add($toAddress)
+}
+
+if(-not [string]::IsNullOrWhitespace($emailCcAddresses)) {
+    Write-Verbose "Setting CC addresses: $emailCcAddresses"
+    $ccAddresses = $emailCcAddresses -split ","
+    foreach($ccAddress in $ccAddresses) {
+        $Message.Cc.Add($ccAddress)
+    }
+}
+if(-not [string]::IsNullOrWhitespace($emailReplyToAddress)) {
+    Write-Verbose "Setting ReplyTo address: $emailReplyToAddress"
+    $Message.ReplyTo.Add($emailReplyToAddress)
+}
+
+Write-Verbose "Setting subject to: $emailSubject"
+$Message.Subject = $emailSubject
+Write-Verbose "Setting MimeMessage Body contents"
+$Message.Body = $ContentBuilder.ToMessageBody()
+Write-Verbose "Connecting to SMTP server: $emailSmtpServer on port: $emailSmtpPort (using SecureSocketOption=$emailSecureSocketOption)"
+$SMTP.Connect($emailSmtpServer, $emailSmtpPort, $secureSocketOption)
+Write-Verbose "Authenticating..."
+$SMTP.Authenticate($emailCredentialsUsername, $emailCredentialsPassword)
+Write-Output "Sending email..."
+$SMTP.Send($Message)
+Write-Output "Email sent."
+$SMTP.Disconnect($true)
+$SMTP.Dispose()
\ No newline at end of file
diff --git a/src/step-templates/send-sms-using-messagebird/metadata.json b/src/step-templates/send-sms-using-messagebird/metadata.json
new file mode 100644
index 000000000..ac3b07ca4
--- /dev/null
+++ b/src/step-templates/send-sms-using-messagebird/metadata.json
@@ -0,0 +1,63 @@
+{
+  "Id": "d5dba42f-ab60-4342-bdaf-b8ecd2f763c3",
+  "Name": "MessageBird Send SMS",
+  "Description": "Send an SMS using MessageBird API.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "8fcbce8e-5d10-442c-a50d-470b2458a481",
+      "Name": "MessageBird_Key",
+      "Label": "MessageBird Key",
+      "HelpText": "API keys give you access to all our REST API methods.\nThis can be created/copied [here](https://dashboard.messagebird.com/en/developers/access)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7c06f0e6-84e8-4ed0-b804-aed47d580667",
+      "Name": "MessageBird_originator",
+      "Label": "From",
+      "HelpText": "The sender of the message. This can be a telephone number (including country code) or an alphanumeric string. In case of an alphanumeric string, the maximum length is 11 characters. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e4b45a2d-f7ca-4329-88fc-d6f23b1249c4",
+      "Name": "MessageBird_Recipients",
+      "Label": "To",
+      "HelpText": "The number to send the message to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e882db5e-d780-4183-956e-e51806163b60",
+      "Name": "MessageBird_body",
+      "Label": "Message",
+      "HelpText": "The content of the SMS message.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-01-21T13:54:53.6100000Z",
+    "OctopusVersion": "2020.4.6",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "bilalmajali",
+  "Category": "other"
+}
diff --git a/src/step-templates/send-sms-using-messagebird/scriptbody.ps1 b/src/step-templates/send-sms-using-messagebird/scriptbody.ps1
new file mode 100644
index 000000000..1ed379747
--- /dev/null
+++ b/src/step-templates/send-sms-using-messagebird/scriptbody.ps1
@@ -0,0 +1,13 @@
+#-----------------------------
+#Latest Update 2021-01-21
+#Bilal Aljbour - FRISS
+#-----------------------------
+$url = "https://rest.messagebird.com/messages?access_key=$MessageBird_Key"
+$params = @{
+href = 'https://rest.messagebird.com/messages'
+recipients = "$MessageBird_Recipients"
+originator = "$MessageBird_originator"
+body = "$MessageBird_body"
+}
+Invoke-WebRequest $url -Method Post -Body $params -UseBasicParsing | Out-Null
+Write-Host 'Message has been sent!'
\ No newline at end of file
diff --git a/step-templates/sentry-release-tracking-token-auth.json b/src/step-templates/sentry-release-tracking-token-auth/metadata.json
similarity index 65%
rename from step-templates/sentry-release-tracking-token-auth.json
rename to src/step-templates/sentry-release-tracking-token-auth/metadata.json
index 8f487a6eb..eff50dc43 100644
--- a/step-templates/sentry-release-tracking-token-auth.json
+++ b/src/step-templates/sentry-release-tracking-token-auth/metadata.json
@@ -8,7 +8,7 @@
   "Packages": [],
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$organization = $OctopusParameters[\"SentryReleaseTracking.organization\"]\n$projects = $OctopusParameters[\"SentryReleaseTracking.projects\"]\n$apiToken = $OctopusParameters[\"SentryReleaseTracking.apiToken\"]\n\n$url = \"https://sentry.io/api/0/organizations/$organization/releases/\"\nWrite-Host $url\n\n$headers = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n$headers.Add(\"Authorization\", \"Bearer $apiToken\")\n$body = ConvertTo-Json @{ \n\t\"version\" = $OctopusParameters['Octopus.Release.Number']\n    \"projects\" = $projects.Split(\";\")\n}\n\nWrite-Host $body\nTry\n{\n\t$response = Invoke-RestMethod -Method Post -Uri \"$url\" -Body $body -Headers $headers -ContentType \"application/json\"\n\tWrite-Host $response\n}\nCatch { \n\tif($_.Exception.Response.StatusCode -ne 400)\n\t{\n  \t\tThrow $_\n    }\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
   "Parameters": [
@@ -44,7 +44,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-09-10T12:19:29.946Z",
+    "ExportedAt": "2021-09-10T12:19:29.9460000Z",
     "OctopusVersion": "2021.2.7428",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/sentry-release-tracking-token-auth/scriptbody.ps1 b/src/step-templates/sentry-release-tracking-token-auth/scriptbody.ps1
new file mode 100644
index 000000000..dbac2474e
--- /dev/null
+++ b/src/step-templates/sentry-release-tracking-token-auth/scriptbody.ps1
@@ -0,0 +1,26 @@
+$organization = $OctopusParameters["SentryReleaseTracking.organization"]
+$projects = $OctopusParameters["SentryReleaseTracking.projects"]
+$apiToken = $OctopusParameters["SentryReleaseTracking.apiToken"]
+
+$url = "https://sentry.io/api/0/organizations/$organization/releases/"
+Write-Host $url
+
+$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$headers.Add("Authorization", "Bearer $apiToken")
+$body = ConvertTo-Json @{ 
+	"version" = $OctopusParameters['Octopus.Release.Number']
+    "projects" = $projects.Split(";")
+}
+
+Write-Host $body
+Try
+{
+	$response = Invoke-RestMethod -Method Post -Uri "$url" -Body $body -Headers $headers -ContentType "application/json"
+	Write-Host $response
+}
+Catch { 
+	if($_.Exception.Response.StatusCode -ne 400)
+	{
+  		Throw $_
+    }
+}
diff --git a/step-templates/sentry-release-tracking.json b/src/step-templates/sentry-release-tracking/metadata.json
similarity index 51%
rename from step-templates/sentry-release-tracking.json
rename to src/step-templates/sentry-release-tracking/metadata.json
index 16c5bde9a..a0780068c 100644
--- a/step-templates/sentry-release-tracking.json
+++ b/src/step-templates/sentry-release-tracking/metadata.json
@@ -6,7 +6,7 @@
   "Version": 47,
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$token  = [System.Text.Encoding]::UTF8.GetBytes($sentryApiKey+\":\")\n$base64Token = [System.Convert]::ToBase64String($token)\n\nWrite-Host $base64Token\n\nForEach ($project in $projects.Split(';'))  \n{\n    $url = \"https://app.getsentry.com/api/0/projects/$organization/$project/releases/\"\n    Write-Host $url\n    \n    $headers = New-Object \"System.Collections.Generic.Dictionary[[String],[String]]\"\n    $headers.Add(\"Authorization\", \"Basic $base64Token\")\n    \n    $body = @{ \"version\" = $OctopusParameters['Octopus.Release.Number'] }\n    \n    $body = ConvertTo-Json $body\n    \n    Write-Host $body\n    Try\n    {\n        $response = Invoke-RestMethod -Method Post -Uri \"$url\" -Body $body -Headers $headers -ContentType \"application/json\"\n        Write-Host $response\n    }\n    Catch [System.Net.WebException] \n    {\n        Write-Host $_\n        if($_.Exception.Response.StatusCode.Value__ -ne 400)\n        {\n            Throw\n        }\n    }\n    if ($resolveIssues)\n    {\n        $resolveBody = '{\"status\":\"resolved\"}'\n        Write-Host $resolveBody\n        $url = \"https://app.getsentry.com/api/0/projects/$organization/$project/groups/\"\n        Write-Host $url\n        $response = Invoke-RestMethod -Method Put -Uri \"$url\" -Body $resolveBody -Headers $headers -ContentType \"application/json\"\n        Write-Host $response\n    }\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "SensitiveProperties": {},
   "Parameters": [
@@ -47,12 +47,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-11-27T12:26:31.568+00:00",
+    "ExportedAt": "2015-11-27T04:26:31.5680000-08:00",
     "OctopusVersion": "3.2.4",
     "Type": "ActionTemplate"
   },
   "Category": "sentry"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sentry-release-tracking/scriptbody.ps1 b/src/step-templates/sentry-release-tracking/scriptbody.ps1
new file mode 100644
index 000000000..b45073595
--- /dev/null
+++ b/src/step-templates/sentry-release-tracking/scriptbody.ps1
@@ -0,0 +1,41 @@
+$token  = [System.Text.Encoding]::UTF8.GetBytes($sentryApiKey+":")
+$base64Token = [System.Convert]::ToBase64String($token)
+
+Write-Host $base64Token
+
+ForEach ($project in $projects.Split(';'))  
+{
+    $url = "https://app.getsentry.com/api/0/projects/$organization/$project/releases/"
+    Write-Host $url
+    
+    $headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+    $headers.Add("Authorization", "Basic $base64Token")
+    
+    $body = @{ "version" = $OctopusParameters['Octopus.Release.Number'] }
+    
+    $body = ConvertTo-Json $body
+    
+    Write-Host $body
+    Try
+    {
+        $response = Invoke-RestMethod -Method Post -Uri "$url" -Body $body -Headers $headers -ContentType "application/json"
+        Write-Host $response
+    }
+    Catch [System.Net.WebException] 
+    {
+        Write-Host $_
+        if($_.Exception.Response.StatusCode.Value__ -ne 400)
+        {
+            Throw
+        }
+    }
+    if ($resolveIssues)
+    {
+        $resolveBody = '{"status":"resolved"}'
+        Write-Host $resolveBody
+        $url = "https://app.getsentry.com/api/0/projects/$organization/$project/groups/"
+        Write-Host $url
+        $response = Invoke-RestMethod -Method Put -Uri "$url" -Body $resolveBody -Headers $headers -ContentType "application/json"
+        Write-Host $response
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/seq-log-deployment/metadata.json b/src/step-templates/seq-log-deployment/metadata.json
new file mode 100644
index 000000000..0a103c24a
--- /dev/null
+++ b/src/step-templates/seq-log-deployment/metadata.json
@@ -0,0 +1,39 @@
+{
+  "Id": "a55a825b-8e8b-4995-8143-0f9dd7b6bcfa",
+  "Name": "Seq - Log Deployment",
+  "Description": "Post details of the deployment to a [Seq](https://getseq.net) log server. Add this as the last step in a process, and ensure it is set to run always (on success and failure).",
+  "ActionType": "Octopus.Script",
+  "Version": 22,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "SeqServerUrl",
+      "Label": "Seq server URL",
+      "HelpText": "The URL of the Seq server.",
+      "DefaultValue": "http://localhost:5341",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SeqApiKey",
+      "Label": "Seq API key",
+      "HelpText": "If an [API key](http://docs.getseq.net/docs/api-keys) is required for writing events, specify it here.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2023-02-16T15:38:44.0430000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "seq"
+}
diff --git a/src/step-templates/seq-log-deployment/scriptbody.ps1 b/src/step-templates/seq-log-deployment/scriptbody.ps1
new file mode 100644
index 000000000..571d0f633
--- /dev/null
+++ b/src/step-templates/seq-log-deployment/scriptbody.ps1
@@ -0,0 +1,78 @@
+function Open-Seq ([string] $url, [string] $apiKey, $properties = @{})
+{
+  return @{ Url = $url; ApiKey = $apiKey; Properties = $properties.Clone() }
+}
+  
+function Send-SeqEvent (
+    $seq,
+    [string] $text,
+    [string] $level,
+    $properties = @{},
+    [string] $exception = $null,
+    [switch] $template)
+{
+  if (-not $level) {
+    $level = 'Information'
+  }
+   
+  if (@('Verbose', 'Debug', 'Information', 'Warning', 'Error', 'Fatal') -notcontains $level) {
+    $level = 'Information'
+  }
+  
+  $allProperties = $seq["Properties"].Clone()
+  $allProperties += $properties
+  
+  $messageTemplate = "{Text}"
+  
+  if ($template) {
+    $messageTemplate = $text;
+  } else {
+    $allProperties += @{ Text = $text; }
+  }
+  
+  $exceptionProperty = ""
+  if ($exception) {
+      $exceptionProperty = """Exception"": $($exception | ConvertTo-Json),"
+  }
+  
+  $body = "{""Events"": [ {
+    ""Timestamp"": ""$([System.DateTimeOffset]::Now.ToString('o'))"",
+    ""Level"": ""$level"",
+    $exceptionProperty
+    ""MessageTemplate"": $($messageTemplate | ConvertTo-Json),
+    ""Properties"": $($allProperties | ConvertTo-Json) }]}"
+  
+  $target = "$($seq["Url"])/api/events/raw?apiKey=$($seq["ApiKey"])"
+  
+  Invoke-RestMethod -Uri $target -Body $body -ContentType "application/json" -Method POST
+}
+
+Write-Output "Logging the deployment result to Seq at $SeqServerUrl..."
+
+$seq = Open-Seq $SeqServerUrl -apiKey $SeqApiKey
+
+$properties = @{
+    ProjectName = $OctopusParameters['Octopus.Project.Name'];
+    ReleaseNumber = $OctopusParameters['Octopus.Release.Number'];
+    Result = "succeeded";
+    EnvironmentName = $OctopusParameters['Octopus.Environment.Name'];
+    DeploymentName = $OctopusParameters['Octopus.Deployment.Name'];
+    Channel = $OctopusParameters['Octopus.Release.Channel.Name'];
+    DeploymentLink = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}'] + $OctopusParameters['Octopus.Web.DeploymentLink']
+}
+
+$level = "Information"
+$exception = $null
+if ($OctopusParameters['Octopus.Deployment.Error']) {
+    $level = "Error"
+    $properties["Result"] = "failed"
+    $properties["Error"] = $OctopusParameters['Octopus.Deployment.Error']
+    $exception = $OctopusParameters['Octopus.Deployment.ErrorDetail']
+}
+
+try {
+    Send-SeqEvent $seq "A deployment of {ProjectName} release {ReleaseNumber} {Result} in {EnvironmentName}" -level $level -template -properties $properties -exception $exception
+} catch [Exception] {
+    [System.Console]::Error.WriteLine("Unable to write deployment details to Seq")
+    $_.Exception | format-list -force
+}
diff --git a/src/step-templates/sharepoint-solution-deployment/metadata.json b/src/step-templates/sharepoint-solution-deployment/metadata.json
new file mode 100644
index 000000000..941671b27
--- /dev/null
+++ b/src/step-templates/sharepoint-solution-deployment/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "7ac03a43-cb18-4e83-a114-b158a2bb2a52",
+  "Name": "SharePoint Solution Deployment",
+  "Description": "SharePoint Solution Deployment for 2010 & 2013.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "NugetPackageStepName",
+      "Label": "SharePoint Solution Package Step",
+      "HelpText": "Select the step in this project which downloads the SharePoint package.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-10-09T05:33:38.7980000-07:00",
+  "LastModifiedBy": "jasmin-mistry",
+  "$Meta": {
+    "ExportedAt": "2015-10-09T09:20:24.3300000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sharepoint"
+}
diff --git a/src/step-templates/sharepoint-solution-deployment/scriptbody.ps1 b/src/step-templates/sharepoint-solution-deployment/scriptbody.ps1
new file mode 100644
index 000000000..4dda82126
--- /dev/null
+++ b/src/step-templates/sharepoint-solution-deployment/scriptbody.ps1
@@ -0,0 +1,113 @@
+$DeployedPath = $OctopusParameters["Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath"]
+$ReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+
+Write-Host "Deploy Path: $DeployedPath"
+Write-Host "Release Number: $ReleaseNumber"
+
+function Deploy-SPSolution($wsp) {
+
+	$wspName = $wsp.SubString($wsp.LastIndexOf("\") + 1)
+
+	$solution = Get-SPSolution -Identity $wspName -ErrorAction silentlycontinue
+
+	if ($solution -ne $null) 
+	{ 
+	    Write-Output "'$wspName' solution already installed - removing solution"
+		
+		# need to take a back up of this wsp before uninstalling it.		
+		if($solution.ContainsWebApplicationResource) {
+	        $solution | Uninstall-SPSolution -AllWebApplications -Confirm:$false
+	    }
+	    else {
+	        $solution | Uninstall-SPSolution -Confirm:$false
+	    }
+		
+		while ($solution.JobExists) {
+		    Start-Sleep 30
+		}
+		
+		Write-Output "$wspName has been uninstalled successfully."
+
+	    Write-Output "Removing '$wspName' solution from farm" 
+	    $solution | Remove-SPSolution -Force -Confirm:$false 
+	
+		# now install 
+		Write-Output "Installing solution '$wspName'" 
+		Add-SPSolution -LiteralPath "$wsp" | Out-Null
+		
+		Write-Output "$wsp solution added sucessfully"
+		if(($solution -ne $null) -and ($solution.ContainsWebApplicationResource)) {
+			Install-SPSolution -Identity $wspName –AllwebApplications -GACDeployment -Force -Confirm:$false
+		}
+		else {
+			Install-SPSolution -Identity $wspName -GACDeployment -Force -Confirm:$false
+		}
+
+		<#
+		while ($Solution.Deployed -eq $false) {
+		    Start-Sleep 30
+		}
+		#>
+	}
+	else {
+		Write-Output "Installing solution '$wspName'" 
+		Add-SPSolution -LiteralPath "$wsp"  -ErrorAction Stop
+		Install-SPSolution -Identity $wspName -GACDeployment -Force -ErrorAction Stop
+	}
+}
+
+function Start-AdminService() {
+	$AdminServiceName = "SPAdminV4"
+	
+	if ($(Get-Service $AdminServiceName).Status -eq "Stopped") {
+	    Start-Service $AdminServiceName
+	   	Write-Host "$AdminServiceName service was not running, now started."
+		return $false;
+	}
+	
+	return $true
+}
+
+function Stop-AdminService($IsAdminServiceWasRunning) {
+	$AdminServiceName = "SPAdminV4"	
+	if ($IsAdminServiceWasRunning -eq $false ) { 
+		Stop-Service $AdminServiceName	
+	}
+}
+
+#region Main
+try
+{
+	# add powershell snap in for sharepoint functions
+	if ((Get-PSSnapin "Microsoft.SharePoint.PowerShell" -ErrorAction SilentlyContinue) -eq $null) { 
+	    Add-PSSnapin "Microsoft.SharePoint.PowerShell" -ErrorAction SilentlyContinue
+	}
+	
+	#Admin service
+	$IsAdminServiceWasRunning = $true;
+	
+	$IsAdminServiceWasRunning = Start-AdminService
+	
+	$wspFiles = @()
+	
+	# get all report files for deployment
+    Write-Host "Getting all .wsp files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.wsp" | ForEach-Object { If(($wspFiles -contains $_.FullName) -eq $false) {$wspFiles += $_.FullName}}
+    Write-Host "# of wsp files found: $($wspFiles.Count)"
+	
+	# loop through array
+    foreach($wsp in $wspFiles) {
+		Deploy-SPSolution $wsp
+	}	
+	
+	Stop-AdminService $IsAdminServiceWasRunning
+	
+	#Remove SharePoint Snapin
+	Remove-PsSnapin Microsoft.SharePoint.PowerShell
+}
+finally
+{
+    
+}
+
+#endregion
\ No newline at end of file
diff --git a/step-templates/sitecore-deploy-scwdp.json b/src/step-templates/sitecore-deploy-scwdp/metadata.json
similarity index 73%
rename from step-templates/sitecore-deploy-scwdp.json
rename to src/step-templates/sitecore-deploy-scwdp/metadata.json
index f2043ed20..ddd6b2892 100644
--- a/step-templates/sitecore-deploy-scwdp.json
+++ b/src/step-templates/sitecore-deploy-scwdp/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "try { \n  $applicationPath = $OctopusParameters[\"SCWDP Application Path\"]\n  $coreConnection = $OctopusParameters[\"SCWDP Core Admin Connection String\"]\n  $masterConnection = $OctopusParameters[\"SCWDP Master Admin Connection String\"]\n  $webConnection = $OctopusParameters[\"SCWDP Web Admin Connection String\"] \n  $msDeploy = $OctopusParameters[\"SCWDP MsDeploy Path\"] \n  \n  $package = $OctopusParameters[\"SCWDP Package\"]\n\n  $cmd = \"`\"\"+$msDeploy+\"`\" -verb:sync -source:package=`\"\"+$package+\"`\" -dest:auto -enableRule:DoNotDeleteRule -setParam:`\"Application Path`\"=`\"\"+$applicationPath+\"`\" -setParam:`\"Core Admin Connection String`\"=`\"\"+$coreConnection+\"`\" -setParam:`\"Master Admin Connection String`\"=`\"\"+$masterConnection+\"`\" -setParam:`\"Web Admin Connection String`\"=`\"\"+$webConnection+\"`\" -verbose\"\n\n  Write-Output $cmd\n  cmd.exe /c $cmd\n}\ncatch {\n  Write-Error \"An error occurred:\"\n  Write-Error $_\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -74,11 +74,11 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-06-19T05:40:59.376Z",
+    "ExportedAt": "2020-06-19T05:40:59.3760000Z",
     "OctopusVersion": "2020.2.13",
     "Type": "ActionTemplate"
   },
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "Category": "sitecore"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sitecore-deploy-scwdp/scriptbody.ps1 b/src/step-templates/sitecore-deploy-scwdp/scriptbody.ps1
new file mode 100644
index 000000000..ae8bc04ae
--- /dev/null
+++ b/src/step-templates/sitecore-deploy-scwdp/scriptbody.ps1
@@ -0,0 +1,18 @@
+try { 
+  $applicationPath = $OctopusParameters["SCWDP Application Path"]
+  $coreConnection = $OctopusParameters["SCWDP Core Admin Connection String"]
+  $masterConnection = $OctopusParameters["SCWDP Master Admin Connection String"]
+  $webConnection = $OctopusParameters["SCWDP Web Admin Connection String"] 
+  $msDeploy = $OctopusParameters["SCWDP MsDeploy Path"] 
+  
+  $package = $OctopusParameters["SCWDP Package"]
+
+  $cmd = "`""+$msDeploy+"`" -verb:sync -source:package=`""+$package+"`" -dest:auto -enableRule:DoNotDeleteRule -setParam:`"Application Path`"=`""+$applicationPath+"`" -setParam:`"Core Admin Connection String`"=`""+$coreConnection+"`" -setParam:`"Master Admin Connection String`"=`""+$masterConnection+"`" -setParam:`"Web Admin Connection String`"=`""+$webConnection+"`" -verbose"
+
+  Write-Output $cmd
+  cmd.exe /c $cmd
+}
+catch {
+  Write-Error "An error occurred:"
+  Write-Error $_
+}
\ No newline at end of file
diff --git a/src/step-templates/sitecore-settings-variable-replacement/metadata.json b/src/step-templates/sitecore-settings-variable-replacement/metadata.json
new file mode 100644
index 000000000..6fc7311bb
--- /dev/null
+++ b/src/step-templates/sitecore-settings-variable-replacement/metadata.json
@@ -0,0 +1,34 @@
+{
+  "Id": "382b9610-64c4-4c64-a31c-34d07f262ed4",
+  "Name": "Sitecore - Settings & Variable Replacement",
+  "Description": "The default [Configuration Variables](https://octopus.com/docs/deployment-process/configuration-features#Configurationfiles-ConfigurationVariables) functionality replaces **appSettings** and **connectionStrings** entries. This step template extends this functionality to the Sitecore configuration **settings** and **sc.variable** nodes within the configuration file(s) that you specify. Variables that are defined for the Octopus project will automatically replace those defined in the target Sitecore configuration file(s).",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "Sitecore.ReplaceConfigFiles",
+      "Label": "Sitecore.ReplaceConfigFiles",
+      "HelpText": "Enter the full path to your Sitecore configuration file(s) that contains the **sitecore** node, one per line. For versions of Sitecore prior to 8.1, this should point to your primary Web.config at the root of your website, and for versions 8.1+, to the Sitecore.config file within your App_Config folder. Alternatively, this value can be left empty and defined within your Octopus project's variable collection using the variable name **Sitecore.ReplaceConfigFiles**.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-06-13T10:19:09.0030000-07:00",
+  "LastModifiedBy": "dthunziker",
+  "$Meta": {
+    "ExportedAt": "2016-06-13T10:19:09.0030000-07:00",
+    "OctopusVersion": "3.3.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sitecore"
+}
diff --git a/src/step-templates/sitecore-settings-variable-replacement/scriptbody.ps1 b/src/step-templates/sitecore-settings-variable-replacement/scriptbody.ps1
new file mode 100644
index 000000000..135b0e783
--- /dev/null
+++ b/src/step-templates/sitecore-settings-variable-replacement/scriptbody.ps1
@@ -0,0 +1,58 @@
+$ErrorActionPreference = "Stop" 
+$configFiles = $OctopusParameters["Sitecore.ReplaceConfigFiles"]
+
+if ([string]::IsNullOrEmpty($configFiles)) {
+    throw [System.ArgumentNullException] "Sitecore.ReplaceConfigFiles"
+}
+
+($configFiles -split '[\r\n]') | ForEach-Object {
+    
+    $configPath = $_
+
+    if ([string]::IsNullOrEmpty($configPath)) { 
+        return
+    }
+    
+    $configPath = $configPath.Trim()
+
+    if (-not (Test-Path -LiteralPath $configPath)) {
+        Write-Host "$configPath was not found."
+        return
+    }
+
+    Write-Host "Searching Sitecore config file for replacement variables:" $configPath
+        
+    $configXml = [xml](Get-Content $configPath)
+    $sitecoreNode = $configXml.sitecore
+    
+    # Look for sitecore node for versions prior to 8.1
+    if ($sitecoreNode -eq $null) {
+        $sitecoreNode = $configXml.configuration.sitecore
+    }
+    
+    # Ensure that we have a sitecore node to work from
+    if ($sitecoreNode -eq $null -or $sitecoreNode.settings -eq $null) {
+        Write-Host "The sitecore settings node was not found in" $configPath ". Skipping this file..."
+        return
+    }
+    
+    foreach ($key in $OctopusParameters.Keys) {
+    
+        # Replace Sitecore settings
+        $setting = $sitecoreNode.settings.setting | where { $_.name -ceq $key }
+        if ($setting -ne $null) {
+            Write-Host $setting.name "setting will be updated from" $setting.value "to" $OctopusParameters[$key] "in" $configPath
+            $setting.value = $OctopusParameters[$key]
+        }
+    
+        # Replace Sitecore variables
+        $variable = $sitecoreNode.'sc.variable' | where { $_.name -ceq $key }
+        if ($variable -ne $null) {
+            Write-Host $variable.name "Sitecore variable will be updated from" $settingsNode.value "to" $OctopusParameters[$key] "in" $configPath
+            $variable.value = $OctopusParameters[$key]
+        }
+    
+    }
+    
+    $configXml.Save($configPath)
+}
\ No newline at end of file
diff --git a/src/step-templates/sitecore-unicorn-sync/metadata.json b/src/step-templates/sitecore-unicorn-sync/metadata.json
new file mode 100644
index 000000000..9dd57f234
--- /dev/null
+++ b/src/step-templates/sitecore-unicorn-sync/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "d5adc467-69a8-49ca-b4d0-4f793fad4d62",
+  "Name": "Sitecore Unicorn Sync",
+  "Description": "Syncs all the specified configurations via the Unicorn remote sync PowerShell script. Uses the newer MicroChap security layer. Please see the following post for instructions: http://www.sitecorenutsbolts.net/2016/03/14/Octopus-Deploy-Step-for-Unicorn-Sync/",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Name": "SharedSecret",
+      "Label": "Shared Secret",
+      "HelpText": "The shared secret used for the MicroChap handshake",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "SiteUrl",
+      "Label": "Site Url",
+      "HelpText": "The Url of your content authoring system. Must be able to view `/unicorn.aspx`",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "MicroChap",
+      "Label": "MicroCHAP DLL Location",
+      "HelpText": "The location of the MicroCHAP.dll file in your project",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Configurations",
+      "Label": "Configurations",
+      "HelpText": "Add a configuration per line",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-07-14T04:48:03.5770000-07:00",
+  "LastModifiedBy": "GuitarRich",
+  "$Meta": {
+    "ExportedAt": "2016-07-14T08:40:31.3490000-07:00",
+    "OctopusVersion": "3.3.4",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sitecore"
+}
diff --git a/src/step-templates/sitecore-unicorn-sync/scriptbody.ps1 b/src/step-templates/sitecore-unicorn-sync/scriptbody.ps1
new file mode 100644
index 000000000..49b9433bc
--- /dev/null
+++ b/src/step-templates/sitecore-unicorn-sync/scriptbody.ps1
@@ -0,0 +1,58 @@
+$ErrorActionPreference = 'Stop'
+
+Add-Type -Path "${MicroChap}\MicroCHAP.dll"
+
+Function Sync-Unicorn {
+	Param(
+		[Parameter(Mandatory=$True)]
+		[string]$ControlPanelUrl,
+
+		[Parameter(Mandatory=$True)]
+		[string]$SharedSecret,
+
+		[Parameter(Mandatory=$True)]
+		[string[]]$Configurations,
+
+		[string]$Verb = 'Sync'
+	)
+
+	# PARSE THE URL TO REQUEST
+	$parsedConfigurations = ($Configurations) -join "^"
+
+	$url = "{0}?verb={1}&configuration={2}" -f $ControlPanelUrl, $Verb, $parsedConfigurations
+
+	Write-Host "Sync-Unicorn: Preparing authorization for $url"
+
+	# GET AN AUTH CHALLENGE
+	$challenge = Get-Challenge -ControlPanelUrl $ControlPanelUrl
+
+	Write-Host "Sync-Unicorn: Received challenge: $challenge"
+
+	# CREATE A SIGNATURE WITH THE SHARED SECRET AND CHALLENGE
+	$signatureService = New-Object MicroCHAP.SignatureService -ArgumentList $SharedSecret
+
+	$signature = $signatureService.CreateSignature($challenge, $url, $null)
+
+	Write-Host "Sync-Unicorn: Created signature $signature, executing $Verb..."
+
+	# USING THE SIGNATURE, EXECUTE UNICORN
+	$result = Invoke-WebRequest -Uri $url -Headers @{ "X-MC-MAC" = $signature; "X-MC-Nonce" = $challenge } -TimeoutSec 10800 -UseBasicParsing
+
+	$result.Content
+}
+
+Function Get-Challenge {
+	Param(
+		[Parameter(Mandatory=$True)]
+		[string]$ControlPanelUrl
+	)
+
+	$url = "$($ControlPanelUrl)?verb=Challenge"
+
+	$result = Invoke-WebRequest -Uri $url -TimeoutSec 360 -UseBasicParsing
+
+	$result.Content
+}
+
+$configs = $Configurations.split("`n")
+Sync-Unicorn -ControlPanelUrl "$($SiteUrl)/unicorn.aspx" -SharedSecret $SharedSecret -Configurations $configs
diff --git a/src/step-templates/slack-detailed-notification-bash/metadata.json b/src/step-templates/slack-detailed-notification-bash/metadata.json
new file mode 100644
index 000000000..8e22efb6a
--- /dev/null
+++ b/src/step-templates/slack-detailed-notification-bash/metadata.json
@@ -0,0 +1,175 @@
+{
+  "Id": "cd3b6172-ed9a-4c42-a588-4c78c3e3b08a",
+  "Name": "Slack - Detailed Notification - Bash",
+  "Description": "Posts deployment status to Slack optionally including additional details (release number, environment name, release notes etc.) as well as error description and link to failure log page.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh",
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "d9109767-c4a0-44d4-9501-bdd82be0f935",
+      "Name": "HookUrl",
+      "Label": "Webhook URL",
+      "HelpText": "The Webhook URL provided by Slack, including token.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "d0a459eb-4a63-48e2-8a81-a03540eb1576",
+      "Name": "Channel",
+      "Label": "Channel handle",
+      "HelpText": "Which Slack channel to post notifications to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "706ba5da-6c0f-487f-9ac2-90c32fd04a84",
+      "Name": "IconUrl",
+      "Label": "Icon URL",
+      "HelpText": "The icon to use for this user in Slack",
+      "DefaultValue": "https://octopus.com/content/resources/favicon.png",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "53a41383-6e54-42ba-ad91-d85c28651299",
+      "Name": "Username",
+      "Label": "",
+      "HelpText": "The username shown in Slack against these notifications",
+      "DefaultValue": "Octopus Deploy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1f5c2164-f4a5-485b-adb0-2714eea6cff8",
+      "Name": "DeploymentInfoText",
+      "Label": "Main message",
+      "HelpText": "Long information message shown in slack. This message is prefixed with \"Deployed successfully\" or \"Failed to deploy\" depending on status.",
+      "DefaultValue": "#{Octopus.Project.Name} release #{Octopus.Release.Number} to #{Octopus.Environment.Name} (#{Octopus.Machine.Name})",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3538eb46-3c2f-4f81-aad1-434da1e2c30b",
+      "Name": "IncludeFieldRelease",
+      "Label": "Include release number field",
+      "HelpText": "Shows short field with release number name",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "57985f0b-6bf6-4b41-aaf8-f8a6ce65547b",
+      "Name": "IncludeFieldReleaseNotes",
+      "Label": "Include release notes Field",
+      "HelpText": "Release notes are only included on successful deployment",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "97309be1-e7cb-43ab-9721-13ceab6bf7ca",
+      "Name": "IncludeFieldMachine",
+      "Label": "Include machine name field",
+      "HelpText": "Shows short field with machine name",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b0415f67-00e5-4568-b099-0f107d5e54ae",
+      "Name": "IncludeFieldProject",
+      "Label": "Include project field",
+      "HelpText": null,
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "29772dc0-ddd2-4406-932b-e09e87d3d1c6",
+      "Name": "IncludeFieldEnvironment",
+      "Label": "Include environment name field",
+      "HelpText": "Shows short field with environment name",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ee313203-4485-4320-b27b-03562724352a",
+      "Name": "IncludeFieldTenant",
+      "Label": "Include tenant name field",
+      "HelpText": "Shows short field with name of tenant",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "0f113c63-9a5c-493d-8942-3db978b41240",
+      "Name": "IncludeFieldUsername",
+      "Label": "Include username field",
+      "HelpText": "Shows the username of user that initiated deployment",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "0cdec31d-400b-4615-b91a-4f2a5b640b45",
+      "Name": "IncludeLinkOnFailure",
+      "Label": "Include deployment process link on failure",
+      "HelpText": "When deployment failed a link \"Open process page\" is added to the notification pointing to deployment process page",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "51fc4209-a97a-4868-8f27-c1076350b581",
+      "Name": "IncludeErrorMessageOnFailure",
+      "Label": "Include error message text on failure",
+      "HelpText": "When deployment failed error text is shown as part of notification",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d33e02de-a949-472f-a1f4-447425507e6b",
+      "Name": "OctopusBaseUrl",
+      "Label": "Octopus base url",
+      "HelpText": "Base URL to add to the links in the notification. If octopus server dashboard is at \"http://octopus/app\" include all before the \"app\" part (\"http://octopus\").",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2022-07-19T01:50:00.0000000-07:00",
+  "LastModifiedBy": "TristanUnibuddy",
+  "$Meta": {
+    "ExportedAt": "2022-07-19T08:54:06.5950000Z",
+    "OctopusVersion": "2022.3.2617-hotfix.4278",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Slack"
+}
diff --git a/src/step-templates/slack-detailed-notification-bash/scriptbody.sh b/src/step-templates/slack-detailed-notification-bash/scriptbody.sh
new file mode 100644
index 000000000..1854b5335
--- /dev/null
+++ b/src/step-templates/slack-detailed-notification-bash/scriptbody.sh
@@ -0,0 +1,176 @@
+# Get values into variables
+includeFieldProject=$(get_octopusvariable "IncludeFieldProject")
+includeFieldEnvironment=$(get_octopusvariable "IncludeFieldEnvironment")
+includeFieldMachine=$(get_octopusvariable "includeFieldMachine")
+includeFieldTenant=$(get_octopusvariable "IncludeFieldTenant")
+includeFieldUsername=$(get_octopusvariable "IncludeFieldUsername")
+includeFieldRelease=$(get_octopusvariable "IncludeFieldRelease")
+includeFieldReleaseNotes=$(get_octopusvariable "IncludeFieldReleaseNotes")
+includeFieldErrorMessageOnFailure=$(get_octopusvariable "IncludeErrorMessageOnFailure")
+includeFieldLinkOnFailure=$(get_octopusvariable "IncludeLinkOnFailure")
+
+function convert_ToBoolean () {
+	local stringValue=$1
+    local returnValue=""
+
+    if [[ "$stringValue" == "True" ]]
+    then
+    	returnValue=true
+    else
+    	returnValue=false
+    fi
+    
+    echo "$returnValue"
+}
+
+function slack_Populate_StatusInfo (){
+    	local success=$1
+    	local deployment_info=$(get_octopusvariable "DeploymentInfoText")
+		local jsonBody="{ "
+		
+        if [[ "$success" == true ]]
+        then
+        	jsonBody+='"color": "good",'
+            jsonBody+='"title": "Success",'
+            jsonBody+='"fallback": "Deployed successfully '
+            jsonBody+="$deployment_info\""
+        else
+        	jsonBody+='"color": "danger",'
+            jsonBody+='"title": "Failed",'
+            jsonBody+='"fallback": "Failed to deploy '
+            jsonBody+="$deployment_info\""
+        fi
+        
+        #jsonBody+="}"
+        
+        echo $jsonBody
+}
+
+function populate_field () {
+	local title=$1
+    local value=$2
+    local body=""
+    
+    body+='{'
+    body+='"short": "true",'
+    body+='"title": '
+    body+="\"$title\""
+    body+=","
+    body+='"value": '
+    body+="\"$value\""
+    body+='}'
+    
+    echo "$body"
+}
+
+
+function slack_Populate_Fields (){
+	local status_info=$1
+    local fieldsJsonBody=""
+    declare -a testArray
+    
+   if [[ "$includeFieldProject" == true ]]
+   then
+    testArray+=("$(populate_field "Project" "$(get_octopusvariable "Octopus.Project.Name")")")
+   fi
+    
+   if [[ "$includeFieldEnvironment" == true ]]
+   then
+    testArray+=("$(populate_field "Environment" "$(get_octopusvariable "Octopus.Environment.Name")")")
+   fi
+   
+   if [[ "$includeFieldMachine" == true ]]
+   then
+    testArray+=("$(populate_field "Machine" "$(get_octopusvariable "Octopus.Machine.Name")")")
+   fi
+      
+   if [[ "$includeFieldTenant" == true ]]
+   then
+    testArray+=("$(populate_field "Tenant" "$(get_octopusvariable "Octopus.Deployment.Tenant.Name")")")
+   fi
+   
+   if [[ "$includeFieldUsername" == true ]]
+   then
+    testArray+=("$(populate_field "Username" "$(get_octopusvariable "Octopus.Deployment.CreatedBy.Username")")")
+   fi
+   
+   if [[ "$includeFieldRelease" == true ]]
+   then
+    testArray+=("$(populate_field "Release" "$(get_octopusvariable "Octopus.Release.Number")")")
+   fi
+   
+   if [[ "$includeFieldReleaseNotes" == true ]]
+   then
+    testArray+=("$(populate_field "Changes in this release" "$(get_octopusvariable "Octopus.Release.Notes")")")
+   fi
+      
+   if [[ "$status_info" == false ]]
+   then
+     if [[ "$includeFieldErrorMessageOnFailure" == true ]]
+     then
+      testArray+=("$(populate_field "Error text" "$(get_octopusvariable "Octopus.Deployment.Error")")")
+     fi
+
+     if [[ "$includeFieldLinkOnFailure" == true ]]
+     then
+      baseUrl="$(get_octopusvariable "Octopus.Web.ServerUri")"
+      testArray+=("$(populate_field "See the process" "$baseUrl$(get_octopusvariable "Octopus.Web.DeploymentLink")")")
+     fi
+   fi
+   
+   
+   ( IFS=$','; echo "${testArray[*]}" )   
+   
+}
+
+function slack_rich_notification () {
+	local success=$1
+    local jsonBody="{ "
+    
+    jsonBody+='"channel": '
+    jsonBody+="\"$(get_octopusvariable "Channel")\","
+    jsonBody+='"username": '
+    jsonBody+="\"$(get_octopusvariable "Username")\","
+    jsonBody+='"icon_url": '
+    jsonBody+="\"$(get_octopusvariable "IconUrl")\","
+    jsonBody+='"attachments": ['
+    jsonBody+=$(slack_Populate_StatusInfo "$success")
+    jsonBody+=',"fields": '
+    jsonBody+="[$(slack_Populate_Fields "$success")]"
+    jsonBody+="}]}"
+    
+    echo "$jsonBody"
+}
+
+# Convert include* variables to actual boolean values
+includeFieldProject=$(convert_ToBoolean "$includeFieldProject")
+includeFieldEnvironment=$(convert_ToBoolean "$includeFieldEnvironment")
+includeFieldMachine=$(convert_ToBoolean "$includeFieldMachine")
+includeFieldTenant=$(convert_ToBoolean "$includeFieldTenant")
+includeFieldUsername=$(convert_ToBoolean "$includeFieldUsername")
+includeFieldRelease=$(convert_ToBoolean "$includeFieldRelease")
+includeFieldReleaseNotes=$(convert_ToBoolean "$includeFieldReleaseNotes")
+includeFieldErrorMessageOnFailure=$(convert_ToBoolean "$includeFieldErrorMessageOnFailure")
+includeFieldLinkOnFailure=$(convert_ToBoolean "$includeFieldLinkOnFailure")
+
+success=true
+
+if [[ ! -z $(get_octopusvariable "Octopus.Deployment.Error") ]]
+then
+	success=false
+fi
+
+# Build json payload
+json_payload=$(slack_rich_notification $success)
+
+webook_url=$(get_octopusvariable "HookUrl")
+
+# Send webhook - redirect stderr to stdout
+wget --post-data="$json_payload" --secure-protocol="auto" "$webook_url" 2>&1
+
+# Check for error
+if [[ $? -ne 0 ]]
+then
+    fail_step "Failed!"
+fi
+
diff --git a/step-templates/slack-detailed-notification.json b/src/step-templates/slack-detailed-notification/metadata.json
similarity index 50%
rename from step-templates/slack-detailed-notification.json
rename to src/step-templates/slack-detailed-notification/metadata.json
index 414e7a0df..63d204401 100644
--- a/step-templates/slack-detailed-notification.json
+++ b/src/step-templates/slack-detailed-notification/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 12,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Slack-Populate-StatusInfo ([boolean] $Success = $true) {\n\n\t$deployment_info = $OctopusParameters['DeploymentInfoText'];\n\t\n\tif ($Success){\n\t\t$status_info = @{\n\t\t\tcolor = \"good\";\n\t\t\t\n\t\t\ttitle = \"Success\";\n\t\t\tmessage = \"$deployment_info\";\n\n\t\t\tfallback = \"Deployed successfully $deployment_info\";\n\t\t\t\n\t\t\tsuccess = $Success;\n\t\t}\n\t} else {\n\t\t$status_info = @{\n\t\t\tcolor = \"danger\";\n\t\t\t\n\t\t\ttitle = \"Failed\";\t\t\t\n\t\t\tmessage = \"$deployment_info\";\n\n\t\t\tfallback = \"Failed to deploy $deployment_info\";\t\n\t\t\t\n\t\t\tsuccess = $Success;\n\t\t}\n\t}\n\t\n\treturn $status_info;\n}\n\nfunction Slack-Populate-Fields ($StatusInfo) {\n\n\t# We use += instead of .Add() to prevent returning values returned by .Add() function\n\t# it clutters the code, but seems the easiest solution here\n\t\n\t$fields = @()\n\t\n\t$fields += \n\t\t@{\n\t\t\ttitle = $StatusInfo.title;\n\t\t\tvalue = $StatusInfo.message;\n\t\t}\n\t;\n\n\t$IncludeFieldEnvironment = [boolean]::Parse($OctopusParameters['IncludeFieldEnvironment'])\n\tif ($IncludeFieldEnvironment) {\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"Environment\";\n\t\t\t\tvalue = $OctopusEnvironmentName;\n\t\t\t\tshort = \"true\";\n\t\t\t}\n\t\t;\t\n\t}\n\n\n\t$IncludeFieldMachine = [boolean]::Parse($OctopusParameters['IncludeFieldMachine'])\n\tif ($IncludeFieldMachine) {\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"Machine\";\n\t\t\t\tvalue = $OctopusParameters['Octopus.Machine.Name'];\n\t\t\t\tshort = \"true\";\n\t\t\t}\n\t\t;\t\n\t}\t\n\t\n\t$IncludeFieldTenant = [boolean]::Parse($OctopusParameters['IncludeFieldTenant'])\n\tif ($IncludeFieldTenant) {\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"Tenant\";\n\t\t\t\tvalue = $OctopusParameters['Octopus.Deployment.Tenant.Name'];\n\t\t\t\tshort = \"true\";\n\t\t\t}\n\t\t;\t\n\t}\t\n\t\n\t$IncludeFieldUsername = [boolean]::Parse($OctopusParameters['IncludeFieldUsername'])\n\tif ($IncludeFieldUsername) {\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"Username\";\n\t\t\t\tvalue = $OctopusParameters['Octopus.Deployment.CreatedBy.Username'];\n\t\t\t\tshort = \"true\";\n\t\t\t}\n\t\t;\t\n\t}\t\n\t\n\t$IncludeFieldRelease = [boolean]::Parse($OctopusParameters['IncludeFieldRelease'])\n\tif ($IncludeFieldRelease) {\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"Release\";\n\t\t\t\tvalue = $OctopusReleaseNumber;\n\t\t\t\tshort = \"true\";\n\t\t\t}\n\t\t;\t\n\t}\n\t\n\t\n\t$IncludeFieldReleaseNotes = [boolean]::Parse($OctopusParameters['IncludeFieldReleaseNotes'])\n\tif ($StatusInfo[\"success\"] -and $IncludeFieldReleaseNotes) {\n    \n\t\t$link = $OctopusParameters['Octopus.Web.ReleaseLink'];\n\t\t$baseurl = $OctopusParameters['OctopusBaseUrl'];\n\t\t\n\t\t# Handle double quotes in the notes\n        $notes = $OctopusParameters['Octopus.Release.Notes'].Replace(\"`\"\", \"\\\"\"\")\n\t\t\n\t\tif ($notes.Length -gt 300) {\n\t\t\t$shortened = $notes.Substring(0,300);\n\t\t\t$notes = \"$shortened `n `<${baseurl}${link}|view all changes`>\"\n\t\t}\n\t\t\n\t\t$fields +=  \n\t\t\t@{\n\t\t\t\ttitle = \"Changes in this release\";\n\t\t\t\tvalue = $notes;\n\t\t\t}\n\t\t;\t\n\t}\t\n\t\n\t#failure fields\n\t\n\t$IncludeErrorMessageOnFailure = [boolean]::Parse($OctopusParameters['IncludeErrorMessageOnFailure'])\n\tif (-not  $StatusInfo[\"success\"] -and $IncludeErrorMessageOnFailure) {\n\t\t\t\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"Error text\";\n\t\t\t\tvalue = $OctopusParameters['Octopus.Deployment.Error'];\n\t\t\t}\n\t\t;\t\n\t}\t\n\t\t\n\n\t$IncludeLinkOnFailure = [boolean]::Parse($OctopusParameters['IncludeLinkOnFailure'])\n\tif (-not $StatusInfo[\"success\"] -and $IncludeLinkOnFailure) {\n\t\t\n\t\t$link = $OctopusParameters['Octopus.Web.DeploymentLink'];\n\t\t$baseurl = $OctopusParameters['OctopusBaseUrl'];\n\t\n\t\t$fields += \n\t\t\t@{\n\t\t\t\ttitle = \"See the process\";\n\t\t\t\tvalue = \"`<${baseurl}${link}|Open process page`>\";\n\t\t\t\tshort = \"true\";\n\t\t\t}\n\t\t;\t\n\t}\n\t\n\t\n\treturn $fields;\n\t\n}\n\nfunction Slack-Rich-Notification ($Success)\n{\n    $status_info = Slack-Populate-StatusInfo -Success $Success\n\t$fields = Slack-Populate-Fields -StatusInfo $status_info\n\n\t\n\t$payload = @{\n        channel = $OctopusParameters['Channel']\n        username = $OctopusParameters['Username'];\n        icon_url = $OctopusParameters['IconUrl'];\n\t\t\n        attachments = @(\n            @{\n\t\t\t\tfallback = $status_info[\"fallback\"];\n\t\t\t\tcolor = $status_info[\"color\"];\n\t\t\t\n\t\t\t\tfields = $fields\n            };\n        );\n    }\n\t\n\t#We unescape here to allow links in the Json, as ConvertTo-Json escapes <,> and other special symbols\n\t$json_body = ($payload | ConvertTo-Json -Depth 4 | % { [System.Text.RegularExpressions.Regex]::Unescape($_) });\n\n\t\n    try {\n    \t$invokeParameters = @{}\n        $invokeParameters.Add(\"Method\", \"POST\")\n        $invokeParameters.Add(\"Body\", $json_body)\n        $invokeParameters.Add(\"Uri\", $OctopusParameters['HookUrl'])\n        $invokeParameters.Add(\"ContentType\", \"application/json\")\n        \n            # Check for UseBasicParsing\n        if ((Get-Command Invoke-RestMethod).Parameters.ContainsKey(\"UseBasicParsing\"))\n        {\n            # Add the basic parsing argument\n            $invokeParameters.Add(\"UseBasicParsing\", $true)\n        }\n\n        \n        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n        Invoke-RestMethod @invokeParameters\n        \n    } catch {\n        echo \"Something occured\"\n        echo  $_.Exception\n        echo  $_\n        #echo $json_body\n        throw\n    }\n    \n}\n\n\n\n$success = ($OctopusParameters['Octopus.Deployment.Error'] -eq $null);\n\nSlack-Rich-Notification -Success $success\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
@@ -169,10 +169,10 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2026-02-24T01:28:50.335Z",
+  "LastModifiedOn": "2026-02-24T01:28:50.3350000Z",
   "LastModifiedBy": "twerthi",
   "$Meta": {
-    "ExportedAt": "2026-02-24T01:28:50.335Z",
+    "ExportedAt": "2026-02-24T01:28:50.3350000Z",
     "OctopusVersion": "2025.4.10453",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/slack-detailed-notification/scriptbody.ps1 b/src/step-templates/slack-detailed-notification/scriptbody.ps1
new file mode 100644
index 000000000..5ae492dea
--- /dev/null
+++ b/src/step-templates/slack-detailed-notification/scriptbody.ps1
@@ -0,0 +1,216 @@
+function Slack-Populate-StatusInfo ([boolean] $Success = $true) {
+
+	$deployment_info = $OctopusParameters['DeploymentInfoText'];
+	
+	if ($Success){
+		$status_info = @{
+			color = "good";
+			
+			title = "Success";
+			message = "$deployment_info";
+
+			fallback = "Deployed successfully $deployment_info";
+			
+			success = $Success;
+		}
+	} else {
+		$status_info = @{
+			color = "danger";
+			
+			title = "Failed";			
+			message = "$deployment_info";
+
+			fallback = "Failed to deploy $deployment_info";	
+			
+			success = $Success;
+		}
+	}
+	
+	return $status_info;
+}
+
+function Slack-Populate-Fields ($StatusInfo) {
+
+	# We use += instead of .Add() to prevent returning values returned by .Add() function
+	# it clutters the code, but seems the easiest solution here
+	
+	$fields = @()
+	
+	$fields += 
+		@{
+			title = $StatusInfo.title;
+			value = $StatusInfo.message;
+		}
+	;
+
+	$IncludeFieldEnvironment = [boolean]::Parse($OctopusParameters['IncludeFieldEnvironment'])
+	if ($IncludeFieldEnvironment) {
+		$fields += 
+			@{
+				title = "Environment";
+				value = $OctopusEnvironmentName;
+				short = "true";
+			}
+		;	
+	}
+
+
+	$IncludeFieldMachine = [boolean]::Parse($OctopusParameters['IncludeFieldMachine'])
+	if ($IncludeFieldMachine) {
+		$fields += 
+			@{
+				title = "Machine";
+				value = $OctopusParameters['Octopus.Machine.Name'];
+				short = "true";
+			}
+		;	
+	}	
+	
+	$IncludeFieldTenant = [boolean]::Parse($OctopusParameters['IncludeFieldTenant'])
+	if ($IncludeFieldTenant) {
+		$fields += 
+			@{
+				title = "Tenant";
+				value = $OctopusParameters['Octopus.Deployment.Tenant.Name'];
+				short = "true";
+			}
+		;	
+	}	
+	
+	$IncludeFieldUsername = [boolean]::Parse($OctopusParameters['IncludeFieldUsername'])
+	if ($IncludeFieldUsername) {
+		$fields += 
+			@{
+				title = "Username";
+				value = $OctopusParameters['Octopus.Deployment.CreatedBy.Username'];
+				short = "true";
+			}
+		;	
+	}	
+	
+	$IncludeFieldRelease = [boolean]::Parse($OctopusParameters['IncludeFieldRelease'])
+	if ($IncludeFieldRelease) {
+		$fields += 
+			@{
+				title = "Release";
+				value = $OctopusReleaseNumber;
+				short = "true";
+			}
+		;	
+	}
+	
+	
+	$IncludeFieldReleaseNotes = [boolean]::Parse($OctopusParameters['IncludeFieldReleaseNotes'])
+	if ($StatusInfo["success"] -and $IncludeFieldReleaseNotes) {
+    
+		$link = $OctopusParameters['Octopus.Web.ReleaseLink'];
+		$baseurl = $OctopusParameters['OctopusBaseUrl'];
+		
+		# Handle double quotes in the notes
+        $notes = $OctopusParameters['Octopus.Release.Notes'].Replace("`"", "\""")
+		
+		if ($notes.Length -gt 300) {
+			$shortened = $notes.Substring(0,300);
+			$notes = "$shortened `n `<${baseurl}${link}|view all changes`>"
+		}
+		
+		$fields +=  
+			@{
+				title = "Changes in this release";
+				value = $notes;
+			}
+		;	
+	}	
+	
+	#failure fields
+	
+	$IncludeErrorMessageOnFailure = [boolean]::Parse($OctopusParameters['IncludeErrorMessageOnFailure'])
+	if (-not  $StatusInfo["success"] -and $IncludeErrorMessageOnFailure) {
+			
+		$fields += 
+			@{
+				title = "Error text";
+				value = $OctopusParameters['Octopus.Deployment.Error'];
+			}
+		;	
+	}	
+		
+
+	$IncludeLinkOnFailure = [boolean]::Parse($OctopusParameters['IncludeLinkOnFailure'])
+	if (-not $StatusInfo["success"] -and $IncludeLinkOnFailure) {
+		
+		$link = $OctopusParameters['Octopus.Web.DeploymentLink'];
+		$baseurl = $OctopusParameters['OctopusBaseUrl'];
+	
+		$fields += 
+			@{
+				title = "See the process";
+				value = "`<${baseurl}${link}|Open process page`>";
+				short = "true";
+			}
+		;	
+	}
+	
+	
+	return $fields;
+	
+}
+
+function Slack-Rich-Notification ($Success)
+{
+    $status_info = Slack-Populate-StatusInfo -Success $Success
+	$fields = Slack-Populate-Fields -StatusInfo $status_info
+
+	
+	$payload = @{
+        channel = $OctopusParameters['Channel']
+        username = $OctopusParameters['Username'];
+        icon_url = $OctopusParameters['IconUrl'];
+		
+        attachments = @(
+            @{
+				fallback = $status_info["fallback"];
+				color = $status_info["color"];
+			
+				fields = $fields
+            };
+        );
+    }
+	
+	#We unescape here to allow links in the Json, as ConvertTo-Json escapes <,> and other special symbols
+	$json_body = ($payload | ConvertTo-Json -Depth 4 | % { [System.Text.RegularExpressions.Regex]::Unescape($_) });
+
+	
+    try {
+    	$invokeParameters = @{}
+        $invokeParameters.Add("Method", "POST")
+        $invokeParameters.Add("Body", $json_body)
+        $invokeParameters.Add("Uri", $OctopusParameters['HookUrl'])
+        $invokeParameters.Add("ContentType", "application/json")
+        
+            # Check for UseBasicParsing
+        if ((Get-Command Invoke-RestMethod).Parameters.ContainsKey("UseBasicParsing"))
+        {
+            # Add the basic parsing argument
+            $invokeParameters.Add("UseBasicParsing", $true)
+        }
+
+        
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+        Invoke-RestMethod @invokeParameters
+        
+    } catch {
+        echo "Something occured"
+        echo  $_.Exception
+        echo  $_
+        #echo $json_body
+        throw
+    }
+    
+}
+
+
+
+$success = ($OctopusParameters['Octopus.Deployment.Error'] -eq $null);
+
+Slack-Rich-Notification -Success $success
diff --git a/src/step-templates/slack-notify-deployment/metadata.json b/src/step-templates/slack-notify-deployment/metadata.json
new file mode 100644
index 000000000..937e33571
--- /dev/null
+++ b/src/step-templates/slack-notify-deployment/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "21a2ae12-e721-42c1-901d-d6ed08007ca7",
+  "Name": "Slack - Notify Deployment",
+  "Description": "Notifies Slack of deployment status. Uses the Octopus Deploy system variable to determine whether a deployment was successful.",
+  "ActionType": "Octopus.Script",
+  "Version": 12,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "Parameters": [
+    {
+      "Name": "HookUrl",
+      "Label": "Webhook URL",
+      "HelpText": "The Webhook URL provided by Slack, including token.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "Channel",
+      "Label": "Channel handle",
+      "HelpText": "Which Slack channel to post notifications to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "IconUrl",
+      "Label": "Icon URL",
+      "HelpText": "The icon to use for this user in Slack.",
+      "DefaultValue": "https://octopus.com/content/resources/favicon.png",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": null,
+      "HelpText": "The username shown in Slack against these notifications.",
+      "DefaultValue": "Octopus Deploy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "IncludeMachineName",
+      "Label": "Include machine name",
+      "HelpText": "Should machine name be included in notification to Slack?",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "UseServerUri",
+      "Label": "Use ServerUri",
+      "HelpText": "If checked then uses `Octopus.Web.ServerUri` instead of `#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2022-03-07T20:18:00.0000000-08:00",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2022-09-08T17:58:51.9380000Z",
+    "OctopusVersion": "2022.2.8136",
+    "Type": "ActionTemplate"
+  },
+  "Category": "slack"
+}
diff --git a/src/step-templates/slack-notify-deployment/scriptbody.ps1 b/src/step-templates/slack-notify-deployment/scriptbody.ps1
new file mode 100644
index 000000000..ae02d2cd1
--- /dev/null
+++ b/src/step-templates/slack-notify-deployment/scriptbody.ps1
@@ -0,0 +1,55 @@
+function Slack-Rich-Notification ($notification)
+{
+    $payload = @{
+        channel = $OctopusParameters['Channel']
+        username = $OctopusParameters['Username'];
+        icon_url = $OctopusParameters['IconUrl'];
+        attachments = @(
+            @{
+            fallback = $notification["fallback"];
+            color = $notification["color"];
+            fields = @(
+                @{
+                title = $notification["title"];
+                title_link = $notification["title_link"];
+                value = $notification["value"];
+                });
+            };
+        );
+    }
+
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+        Invoke-RestMethod -Method POST -Body ($payload | ConvertTo-Json -Depth 4) -Uri $OctopusParameters['HookUrl']  -ContentType 'application/json' -UseBasicParsing
+}
+
+$OctopusBaseUri = $OctopusWebBaseUrl
+$UseServerUri = [boolean]::Parse($OctopusParameters['UseServerUri']);
+if ($UseServerUri) {
+	$OctopusBaseUri = $OctopusWebServerUri
+}
+
+$IncludeMachineName = [boolean]::Parse($OctopusParameters['IncludeMachineName']);
+if ($IncludeMachineName) {
+    $MachineName = $OctopusParameters['Octopus.Machine.Name'];
+    if ($MachineName) {
+      $FormattedMachineName = "($MachineName)";
+    }
+}
+
+if ($OctopusParameters['Octopus.Deployment.Error'] -eq $null){
+    Slack-Rich-Notification @{
+        title = "Success";
+        title_link = "$OctopusBaseUri$OctopusWebDeploymentLink";
+        value = "Deploy <$OctopusBaseUri$OctopusWebProjectLink|$OctopusProjectName> release <$OctopusBaseUri$OctopusWebReleaseLink|$OctopusReleaseNumber> to $OctopusEnvironmentName $OctopusActionTargetRoles $OctopusDeploymentTenantName $FormattedMachineName";
+        fallback = "Deployed $OctopusProjectName release $OctopusReleaseNumber to $OctopusEnvironmentName successfully";
+        color = "good";
+    };
+} else {
+    Slack-Rich-Notification @{
+        title = "Failed";
+        title_link = "$OctopusBaseUri$OctopusWebDeploymentLink";
+        value = "Deploy <$OctopusBaseUri$OctopusWebProjectLink|$OctopusProjectName> release <$OctopusBaseUri$OctopusWebReleaseLink|$OctopusReleaseNumber> to $OctopusEnvironmentName $OctopusActionTargetRoles $OctopusDeploymentTenantName $FormattedMachineName";
+        fallback = "Failed to deploy $OctopusProjectName release $OctopusReleaseNumber to $OctopusEnvironmentName";
+        color = "danger";
+    };
+}
\ No newline at end of file
diff --git a/step-templates/slack-send-notification-using-block-kit.json b/src/step-templates/slack-send-notification-using-block-kit/metadata.json
similarity index 70%
rename from step-templates/slack-send-notification-using-block-kit.json
rename to src/step-templates/slack-send-notification-using-block-kit/metadata.json
index 660447e90..14229b1e3 100644
--- a/step-templates/slack-send-notification-using-block-kit.json
+++ b/src/step-templates/slack-send-notification-using-block-kit/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$payload = ($OctopusParameters['ssn_BlockObj'] | ConvertFrom-Json)\n$payload | Add-Member -MemberType NoteProperty -Name channel -Value $OctopusParameters['ssn_Channel']\n$payload | Add-Member -MemberType NoteProperty -Name username -Value $OctopusParameters['ssn_Username']\n$payload | Add-Member -MemberType NoteProperty -Name icon_url -Value $OctopusParameters['ssn_IconUrl']\n$payload | Add-Member -MemberType NoteProperty -Name link_names -Value \"true\"\n\ntry {\n\t[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls13 -bor [System.Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls11\n    if ($PSVersionTable.PSVersion.Major -ge 6)\n    {\n        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 10) -Uri $OctopusParameters['ssn_HookUrl']\n    }\n    else\n    {\n        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 10) -Uri $OctopusParameters['ssn_HookUrl'] -UseBasicParsing\n    }\n} catch {\n    Write-Host \"An error occurred while attempting to send Slack notification\"\n    Write-Host $_.Exception\n    Write-Host $_\n    throw\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
diff --git a/src/step-templates/slack-send-notification-using-block-kit/scriptbody.ps1 b/src/step-templates/slack-send-notification-using-block-kit/scriptbody.ps1
new file mode 100644
index 000000000..390d6df02
--- /dev/null
+++ b/src/step-templates/slack-send-notification-using-block-kit/scriptbody.ps1
@@ -0,0 +1,22 @@
+$payload = ($OctopusParameters['ssn_BlockObj'] | ConvertFrom-Json)
+$payload | Add-Member -MemberType NoteProperty -Name channel -Value $OctopusParameters['ssn_Channel']
+$payload | Add-Member -MemberType NoteProperty -Name username -Value $OctopusParameters['ssn_Username']
+$payload | Add-Member -MemberType NoteProperty -Name icon_url -Value $OctopusParameters['ssn_IconUrl']
+$payload | Add-Member -MemberType NoteProperty -Name link_names -Value "true"
+
+try {
+	[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls13 -bor [System.Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls11
+    if ($PSVersionTable.PSVersion.Major -ge 6)
+    {
+        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 10) -Uri $OctopusParameters['ssn_HookUrl']
+    }
+    else
+    {
+        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 10) -Uri $OctopusParameters['ssn_HookUrl'] -UseBasicParsing
+    }
+} catch {
+    Write-Host "An error occurred while attempting to send Slack notification"
+    Write-Host $_.Exception
+    Write-Host $_
+    throw
+}
\ No newline at end of file
diff --git a/src/step-templates/slack-send-simple-notification-bash/metadata.json b/src/step-templates/slack-send-simple-notification-bash/metadata.json
new file mode 100644
index 000000000..921a39e97
--- /dev/null
+++ b/src/step-templates/slack-send-simple-notification-bash/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "4ec2225e-9ffa-4072-9852-b986e8a98222",
+  "Name": "Slack - Send Simple Notification - Bash",
+  "Description": "Send a basic message notification to Slack.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "Bash",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
+  },
+  "Parameters": [
+    {
+      "Id": "0de9bf5f-302c-4b94-91eb-9e5fb0e37eb4",
+      "Name": "ssn_HookUrl",
+      "Label": "Hook URL",
+      "HelpText": "The Webhook URL provided by Slack, including token.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "d55d5c10-9b82-43b1-8278-aedb72ba165f",
+      "Name": "ssn_Channel",
+      "Label": "Channel handle",
+      "HelpText": "Which Slack channel to post notification to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e753bbfe-efc1-4d3b-a15d-036b5e8ae510",
+      "Name": "ssn_IconUrl",
+      "Label": "Icon URL",
+      "HelpText": "The icon shown in Slack against the notification.",
+      "DefaultValue": "https://octopus.com/content/resources/favicon.png",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f25b4299-cfd0-4cb0-9c8c-48a706a01f02",
+      "Name": "ssn_Username",
+      "Label": "Username",
+      "HelpText": "The username shown in Slack against the notification.",
+      "DefaultValue": "Octopus Deploy",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "811722e7-c3d2-495f-822c-eb5a974407e3",
+      "Name": "ssn_Title",
+      "Label": "Title",
+      "HelpText": "The title of the notification in Slack.\n\nSupported formatting includes: ` ```pre``` `, `_italic_`, `*bold*`, and even `~strike~`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b65a034b-d0b8-486b-a20a-2d105779a6db",
+      "Name": "ssn_Message",
+      "Label": "Message",
+      "HelpText": "The body of the notification in Slack.\n\nSupported formatting includes: ` ```pre``` `, `_italic_`, `*bold*`, and even `~strike~`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "a9be62b0-a3a8-4940-baa4-47c6cd2f2312",
+      "Name": "ssn_Color",
+      "Label": "Color",
+      "HelpText": "Like traffic signals, color-coding messages can quickly communicate intent and help separate them from the flow of other messages in the timeline.",
+      "DefaultValue": "good",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "good|Green\nwarning|Orange\ndanger|Red"
+      }
+    }
+  ],
+  "LastModifiedBy": "liam-mackie",
+  "$Meta": {
+    "ExportedAt": "2020-03-02T19:22:48.9220000Z",
+    "OctopusVersion": "2019.13.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Slack"
+}
diff --git a/src/step-templates/slack-send-simple-notification-bash/scriptbody.sh b/src/step-templates/slack-send-simple-notification-bash/scriptbody.sh
new file mode 100644
index 000000000..8cc844c7b
--- /dev/null
+++ b/src/step-templates/slack-send-simple-notification-bash/scriptbody.sh
@@ -0,0 +1,35 @@
+# Define variables
+channel=$(get_octopusvariable "ssn_Channel")
+username=$(get_octopusvariable "ssn_Username")
+icon_url=$(get_octopusvariable "ssn_IconUrl")
+parse="full"
+pretext=$(get_octopusvariable "ssn_Title")
+text=$(get_octopusvariable "ssn_Message")
+color=$(get_octopusvariable "ssn_Color")
+webook_url=$(get_octopusvariable "ssn_HookUrl")
+
+# Create JSON payload
+json_payload='{"username": '
+json_payload+="\"$username\""
+json_payload+=', "parse": '
+json_payload+="\"$parse\""
+json_payload+=', "channel": '
+json_payload+="\"$channel\""
+json_payload+=', "icon_url": '
+json_payload+="\"$icon_url\""
+json_payload+=', "attachments" : [{"text": '
+json_payload+="\"$text\""
+json_payload+=', "color": '
+json_payload+="\"$color\""
+json_payload+=', "pretext": '
+json_payload+="\"$pretext\""
+json_payload+=', "mrkdwn_in": ["pretext","text"]}]}'
+
+# Send webhook - redirect stderr to stdout
+wget --post-data="$json_payload" --secure-protocol="auto" "$webook_url" 2>&1
+
+# Check for error
+if [[ $? -ne 0 ]]
+then
+    fail_step "Failed!"
+fi
\ No newline at end of file
diff --git a/step-templates/slack-send-simple-notification.json b/src/step-templates/slack-send-simple-notification/metadata.json
similarity index 71%
rename from step-templates/slack-send-simple-notification.json
rename to src/step-templates/slack-send-simple-notification/metadata.json
index ecfd4616a..cb381d306 100644
--- a/step-templates/slack-send-simple-notification.json
+++ b/src/step-templates/slack-send-simple-notification/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$payload = @{\n    channel = $OctopusParameters['ssn_Channel']\n    username = $OctopusParameters['ssn_Username'];\n    icon_url = $OctopusParameters['ssn_IconUrl'];\n    link_names = \"true\";\n    attachments = @(\n        @{\n            mrkdwn_in = $('pretext', 'text');\n            pretext = $OctopusParameters['ssn_Title'];\n            text = $OctopusParameters['ssn_Message'];\n            color = $OctopusParameters['ssn_Color'];\n        }\n    )\n}\n\ntry {\n\t[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n    if ($PSVersionTable.PSVersion.Major -ge 6)\n    {\n        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 4) -Uri $OctopusParameters['ssn_HookUrl']\n    }\n    else\n    {\n        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 4) -Uri $OctopusParameters['ssn_HookUrl'] -UseBasicParsing\n    }\n} catch {\n    Write-Host \"An error occurred while attempting to send Slack notification\"\n    Write-Host $_.Exception\n    Write-Host $_\n    throw\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -92,7 +92,7 @@
   ],
   "LastModifiedBy": "twerthi",
   "$Meta": {
-    "ExportedAt": "2022-12-02T23:43:25.720Z",
+    "ExportedAt": "2022-12-02T23:43:25.7200000Z",
     "OctopusVersion": "2022.3.10828",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/slack-send-simple-notification/scriptbody.ps1 b/src/step-templates/slack-send-simple-notification/scriptbody.ps1
new file mode 100644
index 000000000..1489f5f3d
--- /dev/null
+++ b/src/step-templates/slack-send-simple-notification/scriptbody.ps1
@@ -0,0 +1,31 @@
+$payload = @{
+    channel = $OctopusParameters['ssn_Channel']
+    username = $OctopusParameters['ssn_Username'];
+    icon_url = $OctopusParameters['ssn_IconUrl'];
+    link_names = "true";
+    attachments = @(
+        @{
+            mrkdwn_in = $('pretext', 'text');
+            pretext = $OctopusParameters['ssn_Title'];
+            text = $OctopusParameters['ssn_Message'];
+            color = $OctopusParameters['ssn_Color'];
+        }
+    )
+}
+
+try {
+	[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+    if ($PSVersionTable.PSVersion.Major -ge 6)
+    {
+        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 4) -Uri $OctopusParameters['ssn_HookUrl']
+    }
+    else
+    {
+        Invoke-Restmethod -Method POST -Body ($payload | ConvertTo-Json -Depth 4) -Uri $OctopusParameters['ssn_HookUrl'] -UseBasicParsing
+    }
+} catch {
+    Write-Host "An error occurred while attempting to send Slack notification"
+    Write-Host $_.Exception
+    Write-Host $_
+    throw
+}
\ No newline at end of file
diff --git a/step-templates/snowchange-deploy-scripts.json b/src/step-templates/snowchange-deploy-scripts/metadata.json
similarity index 56%
rename from step-templates/snowchange-deploy-scripts.json
rename to src/step-templates/snowchange-deploy-scripts/metadata.json
index f4b45c676..64d2d7c77 100644
--- a/step-templates/snowchange-deploy-scripts.json
+++ b/src/step-templates/snowchange-deploy-scripts/metadata.json
@@ -23,7 +23,7 @@
     "Octopus.Action.RunOnServer": "false",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\n& {\n\tparam(\n    \t[string]$SnowChangeDeploySnowflakeDatabaseName,\n    \t[string]$SnowChangeDeploySnowflakeWarehouse,\n        [string]$SnowChangeDeploySnowflakeDeploymentRole,\n        [string]$SnowChangeDeploySnowflakeDeploymentUser,\n        [string]$SnowChangeDeploySnowflakeRegion,\n        [string]$SnowChangeDeploySnowflakeAccountName,\n        [string]$SnowChangeDeploySNOWSQL_PWD,\n        [string]$SnowChangeDeployPath\n      )\n\n\tpython --version\n\n# Acquire snowchange.py dependencies\n\tpython.exe -m pip install --upgrade pip\n\tpip install --upgrade wheel\n\tpip install --upgrade snowflake-connector-python\n\n# Identify or acquire path to snowchange.py\n\n\tif (!$SnowChangeDeployPath) {\n      Write-Host \"Snowchange path not provided. Downloading from Github.\"\n\n      $wc = New-Object System.Net.WebClient\n      $wc.Encoding = [System.Text.Encoding]::UTF8\n\n      $targetFolder = Join-Path $Env:OctopusCalamariWorkingDirectory 'snowchange'\n      $file = \"snowchange.py\"\n      $targetPath = Join-Path $targetFolder $file\n      $url = \"https://raw.githubusercontent.com/jamesweakley/snowchange/master/$file\"\n\n      Write-Host -Message \"Attempting to create $targetFolder\"\n      New-Item -ItemType \"directory\" -Path \"$targetFolder\"                \n      Write-Host -Message \"Attempting to download from $url\"\n      $wc.DownloadFile(\"$url\", \"$targetPath\")\n\n\t\t$SnowChangeDeployPath = $targetPath\n\t}\n\n# Identify path to Scripts for snowchange.py to execute\n\n\t$scriptsPath = $OctopusParameters[\"Octopus.Action.Package[SnowChangeDeploySnowflakeScriptsPackage].ExtractedPath\"]\n\n# Set Process-level Environment variable for SNOWSQL_PWD\n\n\t$pword = \"$SnowChangeDeploySNOWSQL_PWD\"\n\tSet-Item -Path Env:SNOWSQL_PWD -Value $pword\n\n# If a DB was specified, generate the metadata table name\n\n\tif ($SnowChangeDeploySnowflakeDatabaseName) {\n    \t$metadataTable = \"$SnowChangeDeploySnowflakeDatabaseName\",\".SNOWCHANGE.CHANGE_HISTORY\" -Join \"\"\n    }\n\n# Invoke snowchange.py\n\n\tif ($metadataTable) {\n      python $SnowChangeDeployPath `\n      -f \"$scriptsPath\" `\n      -a \"$SnowChangeDeploySnowflakeAccountName\" `\n      --snowflake-region \"$SnowChangeDeploySnowflakeRegion\" `\n      -u \"$SnowChangeDeploySnowflakeDeploymentUser\" `\n      -r \"$SnowChangeDeploySnowflakeDeploymentRole\" `\n      -w \"$SnowChangeDeploySnowflakeWarehouse\" `\n      -c \"$metadataTable\"\n    } else {\n      python $SnowChangeDeployPath `\n      -f \"$scriptsPath\" `\n      -a \"$SnowChangeDeploySnowflakeAccountName\" `\n      --snowflake-region \"$SnowChangeDeploySnowflakeRegion\" `\n      -u \"$SnowChangeDeploySnowflakeDeploymentUser\" `\n      -r \"$SnowChangeDeploySnowflakeDeploymentRole\" `\n      -w \"$SnowChangeDeploySnowflakeWarehouse\"    \n    }\n} `\n(Get-Param 'SnowChangeDeploySnowflakeDatabaseName') `\n(Get-Param 'SnowChangeDeploySnowflakeWarehouse' -Required) `\n(Get-Param 'SnowChangeDeploySnowflakeDeploymentRole' -Required) `\n(Get-Param 'SnowChangeDeploySnowflakeDeploymentUser' -Required) `\n(Get-Param 'SnowChangeDeploySnowflakeRegion' -Required) `\n(Get-Param 'SnowChangeDeploySnowflakeAccountName' -Required) `\n(Get-Param 'SnowChangeDeploySNOWSQL_PWD' -Required) `\n(Get-Param 'SnowChangeDeployPath')\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -118,7 +118,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-10T15:44:23.481Z",
+    "ExportedAt": "2020-08-10T15:44:23.4810000Z",
     "OctopusVersion": "2019.13.7",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/snowchange-deploy-scripts/scriptbody.ps1 b/src/step-templates/snowchange-deploy-scripts/scriptbody.ps1
new file mode 100644
index 000000000..adb994fd8
--- /dev/null
+++ b/src/step-templates/snowchange-deploy-scripts/scriptbody.ps1
@@ -0,0 +1,109 @@
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+& {
+	param(
+    	[string]$SnowChangeDeploySnowflakeDatabaseName,
+    	[string]$SnowChangeDeploySnowflakeWarehouse,
+        [string]$SnowChangeDeploySnowflakeDeploymentRole,
+        [string]$SnowChangeDeploySnowflakeDeploymentUser,
+        [string]$SnowChangeDeploySnowflakeRegion,
+        [string]$SnowChangeDeploySnowflakeAccountName,
+        [string]$SnowChangeDeploySNOWSQL_PWD,
+        [string]$SnowChangeDeployPath
+      )
+
+	python --version
+
+# Acquire snowchange.py dependencies
+	python.exe -m pip install --upgrade pip
+	pip install --upgrade wheel
+	pip install --upgrade snowflake-connector-python
+
+# Identify or acquire path to snowchange.py
+
+	if (!$SnowChangeDeployPath) {
+      Write-Host "Snowchange path not provided. Downloading from Github."
+
+      $wc = New-Object System.Net.WebClient
+      $wc.Encoding = [System.Text.Encoding]::UTF8
+
+      $targetFolder = Join-Path $Env:OctopusCalamariWorkingDirectory 'snowchange'
+      $file = "snowchange.py"
+      $targetPath = Join-Path $targetFolder $file
+      $url = "https://raw.githubusercontent.com/jamesweakley/snowchange/master/$file"
+
+      Write-Host -Message "Attempting to create $targetFolder"
+      New-Item -ItemType "directory" -Path "$targetFolder"                
+      Write-Host -Message "Attempting to download from $url"
+      $wc.DownloadFile("$url", "$targetPath")
+
+		$SnowChangeDeployPath = $targetPath
+	}
+
+# Identify path to Scripts for snowchange.py to execute
+
+	$scriptsPath = $OctopusParameters["Octopus.Action.Package[SnowChangeDeploySnowflakeScriptsPackage].ExtractedPath"]
+
+# Set Process-level Environment variable for SNOWSQL_PWD
+
+	$pword = "$SnowChangeDeploySNOWSQL_PWD"
+	Set-Item -Path Env:SNOWSQL_PWD -Value $pword
+
+# If a DB was specified, generate the metadata table name
+
+	if ($SnowChangeDeploySnowflakeDatabaseName) {
+    	$metadataTable = "$SnowChangeDeploySnowflakeDatabaseName",".SNOWCHANGE.CHANGE_HISTORY" -Join ""
+    }
+
+# Invoke snowchange.py
+
+	if ($metadataTable) {
+      python $SnowChangeDeployPath `
+      -f "$scriptsPath" `
+      -a "$SnowChangeDeploySnowflakeAccountName" `
+      --snowflake-region "$SnowChangeDeploySnowflakeRegion" `
+      -u "$SnowChangeDeploySnowflakeDeploymentUser" `
+      -r "$SnowChangeDeploySnowflakeDeploymentRole" `
+      -w "$SnowChangeDeploySnowflakeWarehouse" `
+      -c "$metadataTable"
+    } else {
+      python $SnowChangeDeployPath `
+      -f "$scriptsPath" `
+      -a "$SnowChangeDeploySnowflakeAccountName" `
+      --snowflake-region "$SnowChangeDeploySnowflakeRegion" `
+      -u "$SnowChangeDeploySnowflakeDeploymentUser" `
+      -r "$SnowChangeDeploySnowflakeDeploymentRole" `
+      -w "$SnowChangeDeploySnowflakeWarehouse"    
+    }
+} `
+(Get-Param 'SnowChangeDeploySnowflakeDatabaseName') `
+(Get-Param 'SnowChangeDeploySnowflakeWarehouse' -Required) `
+(Get-Param 'SnowChangeDeploySnowflakeDeploymentRole' -Required) `
+(Get-Param 'SnowChangeDeploySnowflakeDeploymentUser' -Required) `
+(Get-Param 'SnowChangeDeploySnowflakeRegion' -Required) `
+(Get-Param 'SnowChangeDeploySnowflakeAccountName' -Required) `
+(Get-Param 'SnowChangeDeploySNOWSQL_PWD' -Required) `
+(Get-Param 'SnowChangeDeployPath')
diff --git a/src/step-templates/solarwinds-manage/metadata.json b/src/step-templates/solarwinds-manage/metadata.json
new file mode 100644
index 000000000..c2c00c4c3
--- /dev/null
+++ b/src/step-templates/solarwinds-manage/metadata.json
@@ -0,0 +1,67 @@
+{
+  "Id": "4e870b0d-0715-4b98-9fa3-48500f6a42e4",
+  "Name": "Solarwinds - Manage",
+  "Description": "Start monitoring for a Solarwinds node, application or both",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Host",
+      "Label": "Host",
+      "HelpText": "IP or DNS of the Solarwinds monitoring server",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NodeId",
+      "Label": "Node ID",
+      "HelpText": "Solarwinds ID of machine to be unmonitored. Starts with 'N:'.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApplicationId",
+      "Label": "Application ID",
+      "HelpText": "Solarwinds ID of application to be unmonitored. Starts with 'AA:'.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Username for the Solarwinds console user",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Password for the Solarwinds console user",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-16T03:22:27.0310000-07:00",
+    "OctopusVersion": "2.4.5.46",
+    "Type": "ActionTemplate"
+  },
+  "Category": "solarwinds"
+}
diff --git a/src/step-templates/solarwinds-manage/scriptbody.ps1 b/src/step-templates/solarwinds-manage/scriptbody.ps1
new file mode 100644
index 000000000..a4258478e
--- /dev/null
+++ b/src/step-templates/solarwinds-manage/scriptbody.ps1
@@ -0,0 +1,75 @@
+[System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true}
+
+$solarwindsHost =  $OctopusParameters['Host']
+$node =  $OctopusParameters['NodeId']
+$application =  $OctopusParameters['ApplicationId']
+$username =  $OctopusParameters['Username']
+$password =  $OctopusParameters['Password']
+
+Write-Host "Starting Solarwinds monitoring for node " + $node
+
+if ($node -ne "")
+{
+    $success = $false
+    try
+    {
+        $body = "[""$node""]"
+        $header = @{}
+        $header.Add("Authorization", "Basic "+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+":"+$password)))
+        $uri = "https://" + $solarwindsHost + ":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.Nodes/Remanage"
+
+        Write-Host "Sending request $body to $uri"
+
+        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType "application/json" -UseBasicParsing
+
+        if ($response.StatusCode -eq 200)
+        {
+            $success = $true
+        }
+    }
+    catch
+    {
+        Write-Host "Something went wrong:"
+        Write-Host $_.Exception
+    }
+
+    if (!$success)
+    {
+        throw "Remanaging node failed."
+    }
+
+    Write-Host "Remanaged node $node."
+}
+
+if ($application -ne "")
+{
+    $success = $false
+    try
+    {
+        $body = "[""$application""]"
+        $header = @{}
+        $header.Add("Authorization", "Basic "+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+":"+$password)))
+        $uri = "https://" + $solarwindsHost + ":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.APM.Application/Remanage"
+
+        Write-Host "Sending request $body to $uri"
+
+        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType "application/json" -UseBasicParsing
+
+        if ($response.StatusCode -eq 200)
+        {
+            $success = $true
+        }
+    }
+    catch
+    {
+        Write-Host "Something went wrong:"
+        Write-Host $_.Exception
+    }
+
+    if (!$success)
+    {
+        throw "Remanaging application failed."
+    }
+
+    Write-Host "Remanaged application $application."
+}
\ No newline at end of file
diff --git a/src/step-templates/solarwinds-unmanage/metadata.json b/src/step-templates/solarwinds-unmanage/metadata.json
new file mode 100644
index 000000000..466120475
--- /dev/null
+++ b/src/step-templates/solarwinds-unmanage/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "8da75dc4-f430-4c52-ac50-b37629445ff5",
+  "Name": "Solarwinds - Unmanage",
+  "Description": "Stop monitoring for a Solarwinds node, application or both",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Host",
+      "Label": "Host",
+      "HelpText": "IP or DNS of the Solarwinds monitoring server",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "NodeId",
+      "Label": "Node ID",
+      "HelpText": "Solarwinds ID of machine to be unmonitored. Starts with 'N:'.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApplicationId",
+      "Label": "Application ID",
+      "HelpText": "Solarwinds ID of application to be unmonitored. Starts with 'AA:'.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RemanageMinutes",
+      "Label": "Re-manage after (minutes)",
+      "HelpText": "Automatically begins monitoring of a node after given minutes.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Username for the Solarwinds console user.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "Password for the Solarwinds console user",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-16T03:24:13.6980000-07:00",
+    "OctopusVersion": "2.4.5.46",
+    "Type": "ActionTemplate"
+  },
+  "Category": "solarwinds"
+}
diff --git a/src/step-templates/solarwinds-unmanage/scriptbody.ps1 b/src/step-templates/solarwinds-unmanage/scriptbody.ps1
new file mode 100644
index 000000000..6cd1934fc
--- /dev/null
+++ b/src/step-templates/solarwinds-unmanage/scriptbody.ps1
@@ -0,0 +1,86 @@
+[System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true}
+
+$solarwindsHost =  $OctopusParameters['Host']
+$node =  $OctopusParameters['NodeId']
+$application =  $OctopusParameters['ApplicationId']
+$timeout = [int] $OctopusParameters['RemanageMinutes']
+$username =  $OctopusParameters['Username']
+$password =  $OctopusParameters['Password']
+
+if ($node -ne "")
+{
+    Write-Host "Stopping Solarwinds monitoring for node $node"
+
+    $success = $false
+    try
+    {
+        $now = (Get-Date).ToUniversalTime().AddSeconds(5);
+        $remanage = $now.AddMinutes($timeout);
+        $nowString = $now.ToString("yyyy-MM-ddTHH:mm:ssZ")
+        $remanageString = $remanage.ToString("yyyy-MM-ddTHH:mm:ssZ")
+        $body = "[""$node"", ""$nowString"", ""$remanageString"", ""false""]"
+        $header = @{}
+        $header.Add("Authorization", "Basic "+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+":"+$password)))
+        $uri = "https://" + $solarwindsHost + ":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.Nodes/Unmanage"
+
+        Write-Host "Sending request $body to $uri"
+
+        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType "application/json" -UseBasicParsing
+
+        if ($response.StatusCode -eq 200)
+        {
+            $success = $true
+        }
+    }
+    catch
+    {
+        Write-Host "Something went wrong:"
+        Write-Host $_.Exception
+    }
+
+    if (!$success)
+    {
+        throw "Unmanaging node failed."
+    }
+
+    Write-Host "Unmanaged node $node. Will automatically remanage at $remanage.ToString()"
+}
+
+if ($application -ne "")
+{
+    Write-Host "Stopping Solarwinds monitoring for application $application"
+
+    $success = $false
+    try
+    {
+        $now = (Get-Date).ToUniversalTime().AddSeconds(5);
+        $remanage = $now.AddMinutes($timeout);
+        $nowString = $now.ToString("yyyy-MM-ddTHH:mm:ssZ")
+        $remanageString = $remanage.ToString("yyyy-MM-ddTHH:mm:ssZ")
+        $body = "[""$application"", ""$nowString"", ""$remanageString"", ""false""]"
+        $header = @{}
+        $header.Add("Authorization", "Basic "+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+":"+$password)))
+        $uri = "https://" + $solarwindsHost + ":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.APM.Application/Unmanage"
+
+        Write-Host "Sending request $body to $uri"
+
+        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType "application/json" -UseBasicParsing
+
+        if ($response.StatusCode -eq 200)
+        {
+            $success = $true
+        }
+    }
+    catch
+    {
+        Write-Host "Something went wrong:"
+        Write-Host $_.Exception
+    }
+
+    if (!$success)
+    {
+        throw "Unmanaging application failed."
+    }
+
+    Write-Host "Unmanaged application $application. Will automatically remanage at $remanage.ToString()"
+}
\ No newline at end of file
diff --git a/src/step-templates/spark-sendnotification/metadata.json b/src/step-templates/spark-sendnotification/metadata.json
new file mode 100644
index 000000000..90d1ecac6
--- /dev/null
+++ b/src/step-templates/spark-sendnotification/metadata.json
@@ -0,0 +1,92 @@
+{
+  "Id": "cab1e42d-6b8e-4e3e-980d-82fc8e0e2178",
+  "Name": "Notification - Spark",
+  "Description": "Send a message to Spark user or room",
+  "ActionType": "Octopus.Script",
+  "Version": 16,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "01f83e29-94e6-4fbb-aef5-065a08243d6f",
+      "Name": "message",
+      "Label": "Message to send",
+      "HelpText": "Can use markdown notation",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d0a2f4f0-61dc-4e04-8d5e-b421f0fe64a3",
+      "Name": "auth_token",
+      "Label": "Authentication token",
+      "HelpText": "Bot token",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4ae608b1-d659-45d0-b377-223edea6e520",
+      "Name": "api_uri",
+      "Label": "API URL",
+      "HelpText": null,
+      "DefaultValue": "https://api.ciscospark.com/v1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1c1ca24b-cd7e-4b77-90d0-5cd2d8ad8a74",
+      "Name": "proxy",
+      "Label": "Proxy",
+      "HelpText": "Proxy address",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b5c9688f-d899-4356-ac65-aaa098dd48a7",
+      "Name": "contactmethod",
+      "Label": "Contact Method",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "useremail|User Email\nuserid|User ID\nroomid|Room ID"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b26814c8-7a05-4a04-bcc6-073691df972b",
+      "Name": "contactdetails",
+      "Label": "Contact Details",
+      "HelpText": "Enter contact details depending on Contact Method choice. Set multiple entries with ','.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "2o1o0",
+  "$Meta": {
+    "ExportedAt": "2017-02-24T10:38:27.0800000Z",
+    "OctopusVersion": "3.5.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "spark"
+}
diff --git a/src/step-templates/spark-sendnotification/scriptbody.ps1 b/src/step-templates/spark-sendnotification/scriptbody.ps1
new file mode 100644
index 000000000..a16234521
--- /dev/null
+++ b/src/step-templates/spark-sendnotification/scriptbody.ps1
@@ -0,0 +1,154 @@
+function send-sparkmessage
+{
+<#
+	.SYNOPSIS
+		Send a message to a spark user
+	
+	.DESCRIPTION
+		A detailed description of the send-sparkmessagetouser function.
+	
+	.PARAMETER useremail
+		user email
+	
+	.PARAMETER message
+		Message to send to the user. Can use markdown.
+	
+	.PARAMETER auth_token
+		OAuth token
+	
+	.PARAMETER api_uri
+		API url if different from default (https://api.ciscospark.com/v1)
+	
+	.PARAMETER userid
+		user id
+	
+	.PARAMETER proxy
+		proxy url
+	
+	.PARAMETER roomid
+		A description of the roomid parameter.
+	
+	.PARAMETER room_id
+		Id for room to send message to.
+	
+	.NOTES
+		Additional information about the function.
+#>
+	
+	param
+	(
+		[Parameter(ParameterSetName = 'toPersonEmail',
+				   Mandatory = $true,
+				   HelpMessage = 'User email to contact')]
+		[string]$useremail,
+		[Parameter(Mandatory = $true,
+				   HelpMessage = 'Set a message to send to the user. Can use markdown.')]
+		[string]$message,
+		[Parameter(Mandatory = $true,
+				   HelpMessage = 'Set OAuth token')]
+		[string]$auth_token,
+		[Parameter(Mandatory = $false,
+				   HelpMessage = 'API url if different from default.')]
+		[uri]$api_uri = "https://api.ciscospark.com/v1",
+		[Parameter(ParameterSetName = 'toPersonID',
+				   Mandatory = $true)]
+		[string]$userid,
+		[string]$proxy,
+		[Parameter(ParameterSetName = 'toRoomID',
+				   Mandatory = $true)]
+		[string]$roomid
+	)
+	
+	$header = @{ 'Authorization' = " Bearer $auth_token" }
+	
+	switch ($PsCmdlet.ParameterSetName)
+	{
+		"toPersonEmail" {
+			$body = @{
+				toPersonEmail = $useremail
+				markdown = $message
+			}
+		}
+		"toPersonID" {
+			$body = @{
+				toPersonId = $userid
+				markdown = $message
+			}
+		}
+		"toRoomID"{
+			$body = @{
+				roomId = $roomid
+				markdown = $message
+			}
+		}
+		
+	}
+	
+	if ($proxy)
+	{
+		Invoke-RestMethod -Uri "$api_uri/messages" -Method Post -headers $header -Body (ConvertTo-Json $body) -ContentType "application/json" -Proxy $proxy
+	}
+	else
+	{
+		Invoke-RestMethod -Uri "$api_uri/messages" -Method Post -headers $header -Body (ConvertTo-Json $body) -ContentType "application/json"
+	}
+}
+
+
+$useremail = $OctopusParameters['useremail']
+$message = $OctopusParameters['message']
+$auth_token = $OctopusParameters['auth_token']
+$proxy = $OctopusParameters['proxy']
+$contactmethod = $OctopusParameters['contactmethod']
+$contactdetails = $OctopusParameters['contactdetails']
+
+Write-Verbose "contact details : $contactdetails"
+Write-Verbose "contact method : $contactmethod"
+Write-Verbose "message : $message"
+Write-Verbose "proxy: $proxy"
+foreach ($contactdetail in $contactdetails.Replace(" ", "").Split(","))
+{
+	switch ($contactmethod)
+	{
+		"useremail" {
+			if ($proxy)
+			{
+				Write-Host "Sending Spark message via $contactmethod to $contactdetail"
+				send-sparkmessage -useremail $contactdetail -message $message -auth_token $auth_token -proxy $proxy
+			}
+			else
+			{
+				Write-Host "Sending Spark message via $contactmethod to $contactdetail"
+				send-sparkmessage -useremail $contactdetail -message $message -auth_token $auth_token
+			}
+		}
+		
+		
+		"userid" {
+			if ($proxy)
+			{
+				Write-Host "Sending Spark message via $contactmethod to $contactdetail"
+				send-sparkmessage -userid $contactdetail -message $message -auth_token $auth_token -proxy $proxy
+			}
+			else
+			{
+				Write-Host "Sending Spark message via $contactmethod to $contactdetail"
+				send-sparkmessage -userid $contactdetail -message $message -auth_token $auth_token
+			}
+		}
+		
+		"roomid"{
+			if ($proxy)
+			{
+				Write-Host "Sending Spark message via $contactmethod to $contactdetail"
+				send-sparkmessage -roomid $contactdetail -message $message -auth_token $auth_token -proxy $proxy
+			}
+			else
+			{
+				Write-Host "Sending Spark message via $contactmethod to $contactdetail"
+				send-sparkmessage -roomid $contactdetail -message $message -auth_token $auth_token
+			}
+		}
+	}
+	
+}
diff --git a/src/step-templates/splunk-forward-file/metadata.json b/src/step-templates/splunk-forward-file/metadata.json
new file mode 100644
index 000000000..22ae92305
--- /dev/null
+++ b/src/step-templates/splunk-forward-file/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "0e5d7444-1be1-47c4-a776-ec0f51cf04b3",
+  "Name": "Splunk - Forward File",
+  "Description": "Configures splunk forwarding for the specified file. (The splunk forwarder service should be installed on the target server)",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "File",
+      "Label": "File",
+      "HelpText": "The path to the file to forward",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Index",
+      "Label": "Index",
+      "HelpText": "The Splunk index to forward to",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AppName",
+      "Label": "App name",
+      "HelpText": "The application name outputting to the file",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-16T03:27:19.1920000-07:00",
+    "OctopusVersion": "2.4.5.46",
+    "Type": "ActionTemplate"
+  },
+  "Category": "splunk"
+}
diff --git a/src/step-templates/splunk-forward-file/scriptbody.ps1 b/src/step-templates/splunk-forward-file/scriptbody.ps1
new file mode 100644
index 000000000..1d2c13c62
--- /dev/null
+++ b/src/step-templates/splunk-forward-file/scriptbody.ps1
@@ -0,0 +1,50 @@
+$file = $OctopusParameters['File']
+$index = $OctopusParameters['Index']
+$appName = $OctopusParameters['AppName']
+
+# Enable splunk forwarding
+
+Set-Service SplunkForwarder -startuptype Automatic
+
+# Create log file
+
+if(!(Test-Path "$file"))
+{
+    Write-Host "Creating new log file"
+    New-Item "$file" -type File -Force
+}
+else
+{
+    Write-Host "Log file already exists"
+}
+
+# Create/prepare splunk forwarder directory
+
+$appPath = "$env:ProgramFiles\SplunkUniversalForwarder\etc\apps\$appName\default"
+
+if(Test-Path "$appPath")
+{
+    Write-Host "Splunk app directory already exists. Removing existing configs"
+	
+	# Remove-Item recursion does not work correctly - http://technet.microsoft.com/library/hh849765.aspx (-Recurse section)
+    # Remove files first then directories (leaf -> root) so we don't get the recursion confirm popup
+    Get-ChildItem $appPath -Recurse | Where { ! $_.PSIsContainer } | Remove-Item -Force
+    Get-ChildItem $appPath -Recurse | Where { $_.PSIsContainer } | Sort @{ Expression = { $_.FullName.length } } -Descending | Remove-Item -Force
+}
+else
+{
+    Write-Host "Creating splunk app directory"
+    New-Item "$appPath" -type Directory
+}
+
+# Create forwarder config
+
+Write-Host "Creating splunk forwarder config"
+
+$str = "[monitor://$file]`r`ndisabled = false`r`nfollowTail = 0`r`nsourcetype = $appName`r`nindex = $index"
+New-Item "$appPath\inputs.conf" -type File -value $str
+
+# Restart forwarder service
+
+Write-Host "Restarting splunk forwarder"
+Restart-Service "SplunkForwarder"
\ No newline at end of file
diff --git a/src/step-templates/splunk-log-event-collector/metadata.json b/src/step-templates/splunk-log-event-collector/metadata.json
new file mode 100644
index 000000000..fdf3bda22
--- /dev/null
+++ b/src/step-templates/splunk-log-event-collector/metadata.json
@@ -0,0 +1,61 @@
+{
+  "Id": "eb2ef48d-d4d1-40c9-9dab-769c1bac7608",
+  "Name": "Log to a Splunk Event Collector",
+  "Description": "A step template that logs a given message to the Splunk [Event Collector](http://dev.splunk.com/view/event-collector/SP-CAAAE6M) along with related Octopus Deploy variables.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "SplunkHost",
+      "Label": "The host endpoint of the Splunk Event Collector",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SplunkEventCollectorPort",
+      "Label": "The port of the Event Collector",
+      "HelpText": null,
+      "DefaultValue": "8088",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SplunkEventCollectorToken",
+      "Label": "The token for the Event Collector",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Message",
+      "Label": "The message to send to the event collector",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2016-05-10T23:13:32.8000000-07:00",
+    "OctopusVersion": "3.3.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "splunk"
+}
diff --git a/src/step-templates/splunk-log-event-collector/scriptbody.ps1 b/src/step-templates/splunk-log-event-collector/scriptbody.ps1
new file mode 100644
index 000000000..1843c1497
--- /dev/null
+++ b/src/step-templates/splunk-log-event-collector/scriptbody.ps1
@@ -0,0 +1,53 @@
+If ([System.Net.ServicePointManager]::CertificatePolicy -ne $null)
+{
+add-type @" 
+    using System.Net; 
+    using System.Security.Cryptography.X509Certificates; 
+
+    public class NoSSLCheckPolicy : ICertificatePolicy { 
+        public NoSSLCheckPolicy() {} 
+        public bool CheckValidationResult( 
+            ServicePoint sPoint, X509Certificate cert, 
+            WebRequest wRequest, int certProb) { 
+            return true; 
+        } 
+    } 
+"@ 
+[System.Net.ServicePointManager]::CertificatePolicy = new-object NoSSLCheckPolicy 
+}
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType] "Ssl3"
+
+
+# Check the parameters.
+if (-NOT $SplunkHost) { throw "You must enter a value for 'Splunk Host'." }
+if (-NOT $SplunkEventCollectorPort) { throw "You must enter a value for 'Splunk Event Collector Port'." }
+if (-NOT $SplunkEventCollectorToken) { throw "You must enter a value for 'Event Collector Token'." } 
+if (-NOT $Message) { throw "You must enter a value for 'Message'." } 
+  
+$properties = @{
+Message = $Message;
+ProjectName = $OctopusParameters['Octopus.Project.Name'];
+ReleaseNumber = $OctopusParameters['Octopus.Release.Number']; 
+EnvironmentName = $OctopusParameters['Octopus.Environment.Name'];
+DeploymentName = $OctopusParameters['Octopus.Deployment.Name'];
+Channel = $OctopusParameters['Octopus.Release.Channel.Name']; 
+ReleaseUri = $OctopusParameters['Octopus.Web.ReleaseLink'];
+DeploymentUri = $OctopusParameters['Octopus.Web.DeploymentLink'];
+DeploymentCreatedBy = $OctopusParameters['Octopus.Deployment.CreatedBy.Username'];
+Comments = $OctopusParameters['Octopus.Deployment.Comments'];
+}  
+
+$exception = $null
+if ($OctopusParameters['Octopus.Deployment.Error']) {  
+    $properties["DeploymentError"] = $OctopusParameters['Octopus.Deployment.Error']
+    $properties["DeploymentDetailedError"] = $OctopusParameters['Octopus.Deployment.ErrorDetail']
+}  
+
+$body = @{
+    event =(ConvertTo-Json $properties)
+}
+ 
+$uri = "https://" + $SplunkHost + ":" + $SplunkEventCollectorPort + "/services/collector"
+$header = @{"Authorization"="Splunk " + $SplunkEventCollectorToken}
+
+Invoke-RestMethod -Method Post -Uri $uri -Body (ConvertTo-Json $body) -Header $header
diff --git a/step-templates/sql-add-database-user-to-role.json b/src/step-templates/sql-add-database-user-to-role/metadata.json
similarity index 68%
rename from step-templates/sql-add-database-user-to-role.json
rename to src/step-templates/sql-add-database-user-to-role/metadata.json
index fcb99d063..9407e77f4 100644
--- a/step-templates/sql-add-database-user-to-role.json
+++ b/src/step-templates/sql-add-database-user-to-role/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$createSqlServer;Database=$createDatabaseName;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$createSqlServer;Database=$createDatabaseName;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = $sqlConnection.CreateCommand()\n$command.CommandType = [System.Data.CommandType]'Text'\n\nWrite-Host \"Opening the connection to $createSqlServer\"\n$sqlConnection.Open()\n\nWrite-Host \"Running the script to add the user $createSqlLogin to the role $createRoleName\"\n$command.CommandText = \"ALTER ROLE [$createRoleName] ADD MEMBER [$createSqlLogin]\"            \n$command.ExecuteNonQuery()\n\nWrite-Host \"Successfully ran the script to add the user $createSqlLogin to the role $createRoleName\"\nWrite-Host \"Closing the connection to $createSqlServer\"\n$sqlConnection.Close()"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -74,9 +74,9 @@
   "LastModifiedOn": "2020-12-01T20:33:56.8643571Z",
   "LastModifiedBy": "pstephenson02",
   "$Meta": {
-    "ExportedAt": "2018-07-11T20:25:03.053Z",
+    "ExportedAt": "2018-07-11T20:25:03.0530000Z",
     "OctopusVersion": "2018.6.10",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-add-database-user-to-role/scriptbody.ps1 b/src/step-templates/sql-add-database-user-to-role/scriptbody.ps1
new file mode 100644
index 000000000..0d7c8c7de
--- /dev/null
+++ b/src/step-templates/sql-add-database-user-to-role/scriptbody.ps1
@@ -0,0 +1,25 @@
+if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$createSqlServer;Database=$createDatabaseName;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$createSqlServer;Database=$createDatabaseName;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = $sqlConnection.CreateCommand()
+$command.CommandType = [System.Data.CommandType]'Text'
+
+Write-Host "Opening the connection to $createSqlServer"
+$sqlConnection.Open()
+
+Write-Host "Running the script to add the user $createSqlLogin to the role $createRoleName"
+$command.CommandText = "ALTER ROLE [$createRoleName] ADD MEMBER [$createSqlLogin]"            
+$command.ExecuteNonQuery()
+
+Write-Host "Successfully ran the script to add the user $createSqlLogin to the role $createRoleName"
+Write-Host "Closing the connection to $createSqlServer"
+$sqlConnection.Close()
\ No newline at end of file
diff --git a/src/step-templates/sql-backup-database/metadata.json b/src/step-templates/sql-backup-database/metadata.json
new file mode 100755
index 000000000..4b16fdb1d
--- /dev/null
+++ b/src/step-templates/sql-backup-database/metadata.json
@@ -0,0 +1,150 @@
+{
+  "Id": "34b4fa10-329f-4c50-ab7c-d6b047264b83",
+  "Name": "SQL - Backup Database",
+  "Description": "Backup a MS SQL Server database to the file system.",
+  "ActionType": "Octopus.Script",
+  "Version": 13,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Server",
+      "Label": "Server",
+      "HelpText": "The name of the SQL Server instance that the database resides in.",
+      "DefaultValue": ".",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Database",
+      "Label": "Database",
+      "HelpText": "The name of the database to back up.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BackupDirectory",
+      "Label": "Backup Directory",
+      "HelpText": "The output directory to drop the database backup into.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SqlLogin",
+      "Label": "SQL login",
+      "HelpText": "The SQL auth login to connect with. If specified, the SQL Password must also be entered.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SqlPassword",
+      "Label": "SQL password",
+      "HelpText": "The password for the SQL auth login to connect with. Only used if SQL Login is specified.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "Compression",
+      "Label": "Compression Option",
+      "HelpText": "- 0  -   Use the default backup compression server configuration\n- 1  -   Enable the backup compression\n- 2  -   Disable the backup compression",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "0|Default\n1|Enabled\n2|Disabled"
+      }
+    },
+    {
+      "Name": "Devices",
+      "Label": "Devices",
+      "HelpText": "The number of backup devices to use for the backup.",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "1|1\n2|2\n3|3\n4|4"
+      }
+    },
+    {
+      "Name": "Stamp",
+      "Label": "Backup file suffix",
+      "HelpText": "Specify a suffix to add to the backup file names. If left blank the backup will use the current timestamp.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "UseSqlServerTimeStamp",
+      "Label": "Use SQL Server timestamp format",
+      "HelpText": "If no suffix is specified, use the MSSQL timestamp format.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "ConnectionTimeout",
+      "Label": "Connection Timeout",
+      "HelpText": "Specify the connection timeout settings (in seconds) for the SQL connection. If the backup takes longer than this value, the backup will fail.",
+      "DefaultValue": "36000",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Incremental",
+      "Label": "Backup Action",
+      "HelpText": "Specify the Database backup action",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "false|Full\ntrue|Log (Incremental)"
+      }
+    },
+    {
+      "Name": "CopyOnly",
+      "Label": "Copy Only",
+      "HelpText": "Specify whether the backup is Copy Only",
+      "DefaultValue": "true",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "RetentionPolicyEnabled",
+      "Label": "Retention Policy Enabled",
+      "HelpText": "Specify if a limit should be imposed on retaining older backups. Will only be applied if Retention Policy Count is set, and is greater than 0.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "RetentionPolicyCount",
+      "Label": "Retention Policy Count",
+      "HelpText": "Specify how many old copies of the DB should be retained",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2024-09-11T09:30:00.0000000-07:00",
+  "LastModifiedBy": "bcullman",
+  "$Meta": {
+    "ExportedAt": "2024-09-11T09:30:00.0000000-07:00",
+    "OctopusVersion": "2022.3.10640",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-backup-database/scriptbody.ps1 b/src/step-templates/sql-backup-database/scriptbody.ps1
new file mode 100644
index 000000000..43fa4b6b6
--- /dev/null
+++ b/src/step-templates/sql-backup-database/scriptbody.ps1
@@ -0,0 +1,293 @@
+$ErrorActionPreference = "Stop"
+$EnableVerboseOutput = $false # pester does not support -Verbose; this is a workaround
+
+function ConnectToDatabase() {
+  param($server, $SqlLogin, $SqlPassword, $ConnectionTimeout)
+
+  $server.ConnectionContext.StatementTimeout = $ConnectionTimeout
+
+  if ($null -ne $SqlLogin) {
+
+    if ($null -eq $SqlPassword) {
+      throw "SQL Password must be specified when using SQL authentication."
+    }
+
+    $server.ConnectionContext.LoginSecure = $false
+    $server.ConnectionContext.Login = $SqlLogin
+    $server.ConnectionContext.Password = $SqlPassword
+
+    Write-Host "Connecting to server using SQL authentication as $SqlLogin."
+    $server = New-Object Microsoft.SqlServer.Management.Smo.Server $server.ConnectionContext
+  }
+  else {
+    Write-Host "Connecting to server using Windows authentication."
+  }
+
+  try {
+    $server.ConnectionContext.Connect()
+  }
+  catch {
+    Write-Error "An error occurred connecting to the database server!`r`n$($_.Exception.ToString())"
+  }
+}
+
+function AddPercentHandler {
+  param($smoBackupRestore, $action)
+
+  $percentEventHandler = [Microsoft.SqlServer.Management.Smo.PercentCompleteEventHandler] { Write-Host $dbName $action $_.Percent "%" }
+  $completedEventHandler = [Microsoft.SqlServer.Management.Common.ServerMessageEventHandler] { Write-Host $_.Error.Message }
+
+  $smoBackupRestore.add_PercentComplete($percentEventHandler)
+  $smoBackupRestore.add_Complete($completedEventHandler)
+  $smoBackupRestore.PercentCompleteNotification = 10
+}
+
+function CreateDevice {
+  param($smoBackupRestore, $directory, $name)
+
+  $devicePath = [System.IO.Path]::Combine($directory, $name)
+  $smoBackupRestore.Devices.AddDevice($devicePath, "File")
+  return $devicePath
+}
+
+function CreateDevices {
+  param($smoBackupRestore, $devices, $directory, $dbName, $incremental, $timestamp)
+
+  $targetPaths = New-Object System.Collections.Generic.List[System.String]
+
+  $extension = ".bak"
+
+  if ($incremental -eq $true) {
+    $extension = ".trn"
+  }
+
+  if ($devices -eq 1) {
+    $deviceName = $dbName + "_" + $timestamp + $extension
+    $targetPath = CreateDevice $smoBackupRestore $directory $deviceName
+    $targetPaths.Add($targetPath)
+  }
+  else {
+    for ($i = 1; $i -le $devices; $i++) {
+      $deviceName = $dbName + "_" + $timestamp + "_" + $i + $extension
+      $targetPath = CreateDevice $smoBackupRestore $directory $deviceName
+      $targetPaths.Add($targetPath)
+    }
+  }
+  return $targetPaths
+}
+
+function BackupDatabase {
+  param (
+    [Microsoft.SqlServer.Management.Smo.Server]$server,
+    [string]$dbName,
+    [string]$BackupDirectory,
+    [int]$devices,
+    [int]$compressionOption,
+    [boolean]$incremental,
+    [boolean]$copyonly,
+    [string]$timestamp,
+    [string]$timestampFormat,
+    [boolean]$RetentionPolicyEnabled,
+    [int]$RetentionPolicyCount
+  )
+
+  $smoBackup = New-Object Microsoft.SqlServer.Management.Smo.Backup
+  $targetPaths = CreateDevices $smoBackup $devices $BackupDirectory $dbName $incremental $timestamp
+
+  Write-Host "Attempting to backup database $server.Name.$dbName to:"
+  $targetPaths | ForEach-Object { Write-Host $_ }
+  Write-Host ""
+
+  if ($incremental -eq $true) {
+    $smoBackup.Action = "Log"
+    $smoBackup.BackupSetDescription = "Log backup of " + $dbName
+    $smoBackup.LogTruncation = "Truncate"
+  }
+  else {
+    $smoBackup.Action = "Database"
+    $smoBackup.BackupSetDescription = "Full Backup of " + $dbName
+  }
+
+  $smoBackup.BackupSetName = $dbName + " Backup"
+  $smoBackup.MediaDescription = "Disk"
+  $smoBackup.CompressionOption = $compressionOption
+  $smoBackup.CopyOnly = $copyonly
+  $smoBackup.Initialize = $true
+  $smoBackup.Database = $dbName
+
+  try {
+    AddPercentHandler $smoBackup "backed up"
+    $smoBackup.SqlBackup($server)
+    Write-Host "Backup completed successfully."
+
+    if ($RetentionPolicyEnabled -eq $true) {
+      ApplyRetentionPolicy $BackupDirectory $dbName $RetentionPolicyCount $Incremental $Devices $timestampFormat
+    }
+  }
+  catch {
+    Write-Error "An error occurred backing up the database!`r`n$($_.Exception.ToString())"
+  }
+}
+
+function ApplyRetentionPolicy {
+  param (
+      [string]$BackupDirectory,
+      [string]$dbName,
+      [int]$RetentionPolicyCount,
+      [bool]$Incremental = $false,
+      [int]$Devices = 1,
+      [string]$timestampFormat = "yyyy-MM-dd-HHmmss"
+  )
+
+  # Check if RetentionPolicyCount is defined
+  if (-not $PSBoundParameters.ContainsKey('RetentionPolicyCount')) {
+      Write-Host "Retention policy not applied as RetentionPolicyCount is undefined."
+      return
+  }
+
+  # Set the appropriate file extension
+  $extension = if ($Incremental) { '.trn' } else { '.bak' }
+
+  # Prepare the regex pattern for matching the files
+  $dateRegex = $timestampFormat -replace "yyyy", "\d{4}" -replace "MM", "\d{2}" -replace "dd", "\d{2}" -replace "HH", "\d{2}" -replace "mm", "\d{2}" -replace "ss", "\d{2}"
+  $devicePattern = if ($Devices -gt 1) { "(_\d+)" } else { "" }
+  $regexPattern = "^${dbName}_${dateRegex}${devicePattern}${extension}$"
+
+  # Get all matching files in the directory
+  $allBackups = Get-ChildItem -Path $BackupDirectory -Filter "*$extension" | Where-Object { $_.Name -match $regexPattern }
+
+  # If there are no matching backups, exit
+  if (-not $allBackups) {
+      Write-Host "No matching backups found."
+      return
+  }
+
+  # If RetentionPolicyCount is zero, don't delete or keep any backups
+  if ($RetentionPolicyCount -le 0) {
+      if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround
+        Write-Host "Retention policy not applied as RetentionPolicyCount is set to 0."
+      }
+  } elseif ($Devices -gt 1) {
+      # Group by the timestamp part (ignore the device number)
+      $groupedBackups = $allBackups | Group-Object {
+          # Extract the timestamp, ignoring the device part if there are multiple devices
+          ($_.Name -replace "${devicePattern}${extension}$", "") -replace "^${dbName}_", ""
+      }
+
+      # Sort the groups by the timestamp
+      $sortedGroups = $groupedBackups | Sort-Object Name
+
+      # Get the groups to keep
+      $groupsToKeep = $sortedGroups | Select-Object -Last $RetentionPolicyCount
+      $filesToKeep = $groupsToKeep | ForEach-Object { $_.Group }
+
+      # Flatten the collection of files to keep, ensuring that FullName is accessed correctly
+      $filesToKeepFlattened = $filesToKeep | ForEach-Object { $_ | Select-Object -ExpandProperty FullName }
+      $filesToDelete = $allBackups | Where-Object { $filesToKeepFlattened -notcontains $_.FullName }
+
+      # Delete the old backups
+      $filesToDelete | ForEach-Object {
+          if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround
+            Write-Host "Deleting old backup: $($_.FullName)"
+          }
+          Remove-Item -Path $_.FullName -Force
+      }
+
+      # List the files to keep
+      $filesToKeepFlattened | ForEach-Object {
+          Write-Verbose "Keeping backup: $($_)"
+      }
+
+      Write-Host "Retention policy applied. Kept $RetentionPolicyCount most recent backups."
+  } else {
+      # Single device: simply sort the backups by timestamp
+      $sortedBackups = $allBackups | Sort-Object Name
+
+      # Get the backups to keep
+      $backupsToKeep = $sortedBackups | Select-Object -Last $RetentionPolicyCount
+      $filesToDelete = $allBackups | Where-Object { $backupsToKeep -notcontains $_ }
+
+      # Delete the old backups
+      $filesToDelete | ForEach-Object {
+        if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround
+          Write-Host "Deleting old backup: $($_.FullName)"
+        }
+        Remove-Item -Path $_.FullName -Force
+      }
+
+      # List the files to keep
+      $backupsToKeep | ForEach-Object {
+        if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround
+          Write-Host "Keeping backup: $($_.FullName)"
+        }
+      }
+
+      if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround
+        Write-Host "Retention policy applied. Kept $RetentionPolicyCount most recent backups."
+      }
+  }
+}
+
+function Invoke-SqlBackupProcess {
+  param (
+    [hashtable]$OctopusParameters
+  )
+
+  # Extracting parameters from the hashtable
+  $ServerName = $OctopusParameters['Server']
+  $DatabaseName = $OctopusParameters['Database']
+  $BackupDirectory = $OctopusParameters['BackupDirectory']
+  $CompressionOption = [int]$OctopusParameters['Compression']
+  $Devices = [int]$OctopusParameters['Devices']
+  $Stamp = $OctopusParameters['Stamp']
+  $UseSqlServerTimeStamp = $OctopusParameters['UseSqlServerTimeStamp']
+  $SqlLogin = $OctopusParameters['SqlLogin']
+  $SqlPassword = $OctopusParameters['SqlPassword']
+  $ConnectionTimeout = $OctopusParameters['ConnectionTimeout']
+  $Incremental = [boolean]::Parse($OctopusParameters['Incremental'])
+  $CopyOnly = [boolean]::Parse($OctopusParameters['CopyOnly'])
+  $RetentionPolicyEnabled = [boolean]::Parse($OctopusParameters['RetentionPolicyEnabled'])
+  $RetentionPolicyCount = [int]$OctopusParameters['RetentionPolicyCount']
+
+  [System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | Out-Null
+  [System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SmoExtended") | Out-Null
+  [System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.ConnectionInfo") | Out-Null
+  [System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SmoEnum") | Out-Null
+
+  $server = New-Object Microsoft.SqlServer.Management.Smo.Server $ServerName
+
+  ConnectToDatabase $server $SqlLogin $SqlPassword $ConnectionTimeout
+
+  $database = $server.Databases | Where-Object { $_.Name -eq $DatabaseName }
+  $timestampFormat = "yyyy-MM-dd-HHmmss"
+  if ($UseSqlServerTimeStamp -eq $true) {
+    $timestampFormat = "yyyyMMdd_HHmmss"
+  }
+  $timestamp = if (-not [string]::IsNullOrEmpty($Stamp)) { $Stamp } else { Get-Date -format $timestampFormat }
+
+  if ($null -eq $database) {
+    Write-Error "Database $DatabaseName does not exist on $ServerName"
+  }
+
+  if ($Incremental -eq $true) {
+    if ($database.RecoveryModel -eq 3) {
+      write-error "$DatabaseName has Recovery Model set to Simple. Log backup cannot be run."
+    }
+
+    if ($database.LastBackupDate -eq "1/1/0001 12:00 AM") {
+      write-error "$DatabaseName has no Full backups. Log backup cannot be run."
+    }
+  }
+
+  if ($RetentionPolicyEnabled -eq $true -and $RetentionPolicyCount -gt 0) {
+    if (-not [int]::TryParse($RetentionPolicyCount, [ref]$null) -or $RetentionPolicyCount -le 0) {
+      Write-Error "RetentionPolicyCount must be an integer greater than zero."
+    }
+  }
+
+  BackupDatabase $server $DatabaseName $BackupDirectory $Devices $CompressionOption $Incremental $CopyOnly $timestamp $timestampFormat $RetentionPolicyEnabled $RetentionPolicyCount
+}
+
+if (Test-Path -Path "Variable:OctopusParameters") {
+  Invoke-SqlBackupProcess -OctopusParameters $OctopusParameters
+}
diff --git a/src/step-templates/sql-create-database-enhanced/metadata.json b/src/step-templates/sql-create-database-enhanced/metadata.json
new file mode 100644
index 000000000..45d69be29
--- /dev/null
+++ b/src/step-templates/sql-create-database-enhanced/metadata.json
@@ -0,0 +1,107 @@
+{
+  "Id": "ba43c3a7-fb77-4377-a1e2-e7918fb6df0b",
+  "Name": "SQL - Create Database If Not Exists Enhanced",
+  "Description": "Creates a database if the database does not exist without using SMO. ",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4a30febf-479b-4427-a382-04a84183e1ae",
+      "Name": "createSqlServer",
+      "Label": "SQL Server",
+      "HelpText": "The SQL Server to perform the work on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9cfe1756-9e7d-4670-af75-1bb4a1899ce1",
+      "Name": "createAuthenticationMethod",
+      "Label": "Authentication Method",
+      "HelpText": "Select the method for authentication to the SQL Server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "AzureADManaged|Azure Active Directory Managed Identity\nSqlAuthentication|SQL Authentication\nWindowsIntegrated|Windows Integrated"
+      }
+    },
+    {
+      "Id": "ba759a10-c230-4530-855a-2d7e210fe822",
+      "Name": "createSqlLoginUserWhoHasCreateUserRights",
+      "Label": "SQL Login",
+      "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0519fc45-e342-4982-beea-ab5123cad39b",
+      "Name": "createSqlLoginPasswordWhoHasRights",
+      "Label": "SQL Password",
+      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "0662b998-acf3-425d-8fff-abd93a4a038d",
+      "Name": "createDatabaseName",
+      "Label": "Database to create",
+      "HelpText": "The name of the database to create",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4617d70a-fb52-4b1b-95f1-07929e47e7c0",
+      "Name": "createCommandTimeout",
+      "Label": "Command timeout",
+      "HelpText": "Number of seconds before throwing a timeout error.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7be71f0c-4df5-4f41-9b2f-3a29800a2e00",
+      "Name": "createAzureEdition",
+      "Label": "Azure database edition",
+      "HelpText": "Defines the database edition for Azure SQL Databases, leave blank if not using Azure.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "basic|Basic Edition\nstandard|Standard Edition\npremium|Premium Edition\ngeneralpurpose|General Purpose Edition\nbusinesscritical|Business Critical Edition\nhyperscale|Hyperscale Edition"
+      }
+    },
+    {
+      "Id": "85c8ad9c-2515-45d5-b521-49d3518f2a15",
+      "Name": "createAzureBackupStorageRedundancy",
+      "Label": "Azure Backup Storage Redundacy",
+      "HelpText": "Defines the Azure [database backup storage redundancy](https://learn.microsoft.com/en-us/sql/t-sql/statements/create-database-transact-sql?view=azuresqldb-current&tabs=sqlpool#backup_storage_redundancy). The default option is `GRS` when not specified. Leave blank if not using Azure.\n\nNote: `GZRS` is only available in a subset of Azure regions that have the current requirements: \n\n- Database cannot be a `Basic` edition.\n- Have a geo-paired region \n- Have multiple availability zones within both data centers (primary and secondary). ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "LOCAL|Locally redundant storage (LRS)\nZONE|Zone-redundant storage (ZRS)\nGEO|Geo-redundant storage (GRS)\nGEOZONE|Geo-Zone Redundant Storage (GZRS)"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2022-12-15T11:00:58.3120000Z",
+    "OctopusVersion": "2023.1.4314",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-create-database-enhanced/scriptbody.ps1 b/src/step-templates/sql-create-database-enhanced/scriptbody.ps1
new file mode 100644
index 000000000..d30caf162
--- /dev/null
+++ b/src/step-templates/sql-create-database-enhanced/scriptbody.ps1
@@ -0,0 +1,68 @@
+# Initialize variables
+$connectionString = ""
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+
+# Determine authentication method
+switch ($createAuthenticationMethod)
+{
+	"AzureADManaged"
+    {
+    	Write-Host "Using Azure Managed Identity authentication ..."
+        $connectionString = "Server=$createSqlServer;Database=master;"
+        
+        $response = Invoke-WebRequest -Uri 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fdatabase.windows.net%2F' -Method GET -Headers @{Metadata="true"} -UseBasicParsing
+        $content = $response.Content | ConvertFrom-Json
+        $AccessToken = $content.access_token
+        
+        $sqlConnection.AccessToken = $AccessToken
+        break
+    }
+    "SqlAuthentication"
+    {
+    	Write-Host "Using Sql account authentication ..."
+        $connectionString = "Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+        break
+    }
+    "WindowsIntegrated"
+    {
+    	Write-Host "Using Windows Integrated authentication ..."
+        $connectionString = "Server=$createSqlServer;Database=master;integrated security=true;"
+        break
+    }
+}
+
+
+$sqlConnection.ConnectionString = $connectionString
+
+$command = $sqlConnection.CreateCommand()
+$command.CommandType = [System.Data.CommandType]'Text'
+$command.CommandTimeout = $createCommandTimeout
+
+Write-Host "Opening the connection to $createSqlServer"
+$sqlConnection.Open()
+
+$escapedDatabaseName = $createDatabaseName.Replace("'", "''")
+
+Write-Host "Running the if not exists then create for $createDatabaseName"
+$command.CommandText = "IF NOT EXISTS (select Name from sys.databases where Name = '$escapedDatabaseName')
+        create database [$createDatabaseName]"
+        
+if (![string]::IsNullOrWhiteSpace($createAzureEdition))
+{
+	Write-Verbose "Specifying Azure SqlDb Edition: $($createAzureEdition)"
+	$command.CommandText += ("`r`n (EDITION = '{0}')" -f $createAzureEdition)
+}
+
+if (![string]::IsNullOrWhiteSpace($createAzureBackupStorageRedundancy))
+{
+	Write-Verbose "Specifying Azure Backup storage redundancy: $($createAzureBackupStorageRedundancy)"
+	$command.CommandText += ("`r`n WITH BACKUP_STORAGE_REDUNDANCY='{0}'" -f $createAzureBackupStorageRedundancy)
+}
+
+$command.CommandText += ";"
+
+$command.ExecuteNonQuery()
+
+Write-Host "Successfully created the account $createDatabaseName"
+Write-Host "Closing the connection to $createSqlServer"
+$sqlConnection.Close()
\ No newline at end of file
diff --git a/step-templates/sql-create-database-user.json b/src/step-templates/sql-create-database-user/metadata.json
similarity index 60%
rename from step-templates/sql-create-database-user.json
rename to src/step-templates/sql-create-database-user/metadata.json
index 72c95d7b1..5e8ff05d5 100644
--- a/step-templates/sql-create-database-user.json
+++ b/src/step-templates/sql-create-database-user/metadata.json
@@ -3,11 +3,11 @@
   "Name": "SQL - Create Database User If Not Exists",
   "Description": "Will create a database user using an existing server user if that database user does not exist without using SMO.",
   "ActionType": "Octopus.Script",
-  "Version": 2,  
+  "Version": 2,
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"SqlLoginWhoHasRights $createSqlLoginUserWhoHasCreateUserRights\"\nWrite-Host \"CreateSqlServer $createSqlServer\"\nWrite-Host \"CreateDatabaseName $createDatabaseName\"\nWrite-Host \"CreateSqlLogin $createSqlLogin\"\n\nif ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$createSqlServer;Database=$createDatabaseName;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$createSqlServer;Database=$createDatabaseName;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = $sqlConnection.CreateCommand()\n$command.CommandType = [System.Data.CommandType]'Text'\n\nWrite-Host \"Opening the connection to $createSqlServer\"\n$sqlConnection.Open()\n\n$escapedSqlLogin = $createSqlLogin.Replace(\"'\", \"''\")\n\nWrite-Host \"Running the if not exists then create for $createSqlLogin\"\n$command.CommandText = \"If Not Exists (select 1 from sysusers where name = '$escapedSqlLogin')\n\tCREATE USER [$createSqlLogin] FOR LOGIN [$createSqlLogin] WITH DEFAULT_SCHEMA=[dbo]\"            \n$command.ExecuteNonQuery()\n\nWrite-Host \"Successfully created the account $createSqlLogin\"\nWrite-Host \"Closing the connection to $createSqlServer\"\n$sqlConnection.Close()"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -64,9 +64,9 @@
   "LastModifiedOn": "2020-12-01T20:33:56.8643571Z",
   "LastModifiedBy": "pstephenson02",
   "$Meta": {
-    "ExportedAt": "2018-07-11T20:40:58.281Z",
+    "ExportedAt": "2018-07-11T20:40:58.2810000Z",
     "OctopusVersion": "2018.6.10",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-create-database-user/scriptbody.ps1 b/src/step-templates/sql-create-database-user/scriptbody.ps1
new file mode 100644
index 000000000..9019fda4b
--- /dev/null
+++ b/src/step-templates/sql-create-database-user/scriptbody.ps1
@@ -0,0 +1,33 @@
+Write-Host "SqlLoginWhoHasRights $createSqlLoginUserWhoHasCreateUserRights"
+Write-Host "CreateSqlServer $createSqlServer"
+Write-Host "CreateDatabaseName $createDatabaseName"
+Write-Host "CreateSqlLogin $createSqlLogin"
+
+if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$createSqlServer;Database=$createDatabaseName;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$createSqlServer;Database=$createDatabaseName;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = $sqlConnection.CreateCommand()
+$command.CommandType = [System.Data.CommandType]'Text'
+
+Write-Host "Opening the connection to $createSqlServer"
+$sqlConnection.Open()
+
+$escapedSqlLogin = $createSqlLogin.Replace("'", "''")
+
+Write-Host "Running the if not exists then create for $createSqlLogin"
+$command.CommandText = "If Not Exists (select 1 from sysusers where name = '$escapedSqlLogin')
+	CREATE USER [$createSqlLogin] FOR LOGIN [$createSqlLogin] WITH DEFAULT_SCHEMA=[dbo]"            
+$command.ExecuteNonQuery()
+
+Write-Host "Successfully created the account $createSqlLogin"
+Write-Host "Closing the connection to $createSqlServer"
+$sqlConnection.Close()
\ No newline at end of file
diff --git a/step-templates/sql-create-database.json b/src/step-templates/sql-create-database/metadata.json
similarity index 51%
rename from step-templates/sql-create-database.json
rename to src/step-templates/sql-create-database/metadata.json
index 2125ec8bb..806995134 100644
--- a/step-templates/sql-create-database.json
+++ b/src/step-templates/sql-create-database/metadata.json
@@ -3,11 +3,11 @@
   "Name": "SQL - Create Database If Not Exists",
   "Description": "Creates a database if the database does not exist without using SMO.",
   "ActionType": "Octopus.Script",
-  "Version": 5,  
+  "Version": 5,
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true) {\n    Write-Output \"No username found, using integrated security\"\n    $connectionString = \"Server=$createSqlServer;Database=master;integrated security=true;\"\n}\nelse {\n    Write-Output \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n}\n\n\nfunction Retry-Command {\n    [CmdletBinding()]\n    Param(\n        [Parameter(Position = 0, Mandatory = $true)]\n        [scriptblock]$ScriptBlock,\n \n        [Parameter(Position = 1, Mandatory = $false)]\n        [int]$Maximum = 1,\n\n        [Parameter(Position = 2, Mandatory = $false)]\n        [int]$Delay = 100\n    )\n\n    Begin {\n        $count = 0\n    }\n\n    Process {\n        $ex = $null\n        do {\n            $count++\n            \n            try {\n                Write-Verbose \"Attempt $count of $Maximum\"\n                $ScriptBlock.Invoke()\n                return\n            }\n            catch {\n                $ex = $_\n                Write-Warning \"Error occurred executing command (on attempt $count of $Maximum): $($ex.Exception.Message)\"\n                Start-Sleep -Milliseconds $Delay\n            }\n        } while ($count -lt $Maximum)\n\n        # Throw an error after $Maximum unsuccessful invocations. Doesn't need\n        # a condition, since the function returns upon successful invocation.\n        throw \"Execution failed (after $count attempts): $($ex.Exception.Message)\"\n    }\n}\n\n[int]$maximum = 0\n[int]$delay = 100\n\nif (-not [int]::TryParse($createSqlDatabaseRetryAttempts, [ref]$maximum)) { $maximum = 0 }\n\n# We add 1 here as if retry attempts is 1, this means we make 2 attempts overall\n$maximum = $maximum + 1\n\nRetry-Command -Maximum $maximum -Delay $delay -ScriptBlock {\n\t\n    $sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n    $sqlConnection.ConnectionString = $connectionString\n    try {\n        \n        $command = $sqlConnection.CreateCommand()\n        $command.CommandType = [System.Data.CommandType]'Text'\n        $command.CommandTimeout = $createCommandTimeout\n\n        Write-Output \"Opening the connection to $createSqlServer\"\n        $sqlConnection.Open()\n\n        $escapedDatabaseName = $createDatabaseName.Replace(\"'\", \"''\")\n\n        Write-Output \"Running the if not exists then create for $createDatabaseName\"\n        $command.CommandText = \"IF NOT EXISTS (select Name from sys.databases where Name = '$escapedDatabaseName')\n        create database [$createDatabaseName]\"\n        \n        if (![string]::IsNullOrWhiteSpace($createAzureEdition)) {\n            Write-Verbose \"Specifying Azure SqlDb Edition: $($createAzureEdition)\"\n            $command.CommandText += (\"`r`n (EDITION = '{0}')\" -f $createAzureEdition)\n        }\n\n        if (![string]::IsNullOrWhiteSpace($createAzureBackupStorageRedundancy)) {\n            Write-Verbose \"Specifying Azure Backup storage redundancy: $($createAzureBackupStorageRedundancy)\"\n            $command.CommandText += (\"`r`n WITH BACKUP_STORAGE_REDUNDANCY='{0}'\" -f $createAzureBackupStorageRedundancy)\n        }\n\n        $command.CommandText += \";\"\n\n        $result = $command.ExecuteNonQuery()\n        Write-Verbose \"ExecuteNonQuery result: $result\"\n\n        Write-Output \"Successfully executed the database creation script for $createDatabaseName\"\n    }\n\n    finally {\n        if ($null -ne $sqlConnection) {\n            Write-Output \"Closing the connection to $createSqlServer\"\n            $sqlConnection.Dispose()\n        }\n    }\n}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -93,10 +93,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2023-01-11T13:24:28.274Z",
+  "LastModifiedOn": "2023-01-11T13:24:28.2740000Z",
   "LastModifiedBy": "harrisonmeister",
   "$Meta": {
-    "ExportedAt": "2023-01-11T13:24:28.274Z",
+    "ExportedAt": "2023-01-11T13:24:28.2740000Z",
     "OctopusVersion": "2023.1.5972",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/sql-create-database/scriptbody.ps1 b/src/step-templates/sql-create-database/scriptbody.ps1
new file mode 100644
index 000000000..9c75ed807
--- /dev/null
+++ b/src/step-templates/sql-create-database/scriptbody.ps1
@@ -0,0 +1,102 @@
+if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true) {
+    Write-Output "No username found, using integrated security"
+    $connectionString = "Server=$createSqlServer;Database=master;integrated security=true;"
+}
+else {
+    Write-Output "Username found, using SQL Authentication"
+    $connectionString = "Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+}
+
+
+function Retry-Command {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Position = 0, Mandatory = $true)]
+        [scriptblock]$ScriptBlock,
+ 
+        [Parameter(Position = 1, Mandatory = $false)]
+        [int]$Maximum = 1,
+
+        [Parameter(Position = 2, Mandatory = $false)]
+        [int]$Delay = 100
+    )
+
+    Begin {
+        $count = 0
+    }
+
+    Process {
+        $ex = $null
+        do {
+            $count++
+            
+            try {
+                Write-Verbose "Attempt $count of $Maximum"
+                $ScriptBlock.Invoke()
+                return
+            }
+            catch {
+                $ex = $_
+                Write-Warning "Error occurred executing command (on attempt $count of $Maximum): $($ex.Exception.Message)"
+                Start-Sleep -Milliseconds $Delay
+            }
+        } while ($count -lt $Maximum)
+
+        # Throw an error after $Maximum unsuccessful invocations. Doesn't need
+        # a condition, since the function returns upon successful invocation.
+        throw "Execution failed (after $count attempts): $($ex.Exception.Message)"
+    }
+}
+
+[int]$maximum = 0
+[int]$delay = 100
+
+if (-not [int]::TryParse($createSqlDatabaseRetryAttempts, [ref]$maximum)) { $maximum = 0 }
+
+# We add 1 here as if retry attempts is 1, this means we make 2 attempts overall
+$maximum = $maximum + 1
+
+Retry-Command -Maximum $maximum -Delay $delay -ScriptBlock {
+	
+    $sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+    $sqlConnection.ConnectionString = $connectionString
+    try {
+        
+        $command = $sqlConnection.CreateCommand()
+        $command.CommandType = [System.Data.CommandType]'Text'
+        $command.CommandTimeout = $createCommandTimeout
+
+        Write-Output "Opening the connection to $createSqlServer"
+        $sqlConnection.Open()
+
+        $escapedDatabaseName = $createDatabaseName.Replace("'", "''")
+
+        Write-Output "Running the if not exists then create for $createDatabaseName"
+        $command.CommandText = "IF NOT EXISTS (select Name from sys.databases where Name = '$escapedDatabaseName')
+        create database [$createDatabaseName]"
+        
+        if (![string]::IsNullOrWhiteSpace($createAzureEdition)) {
+            Write-Verbose "Specifying Azure SqlDb Edition: $($createAzureEdition)"
+            $command.CommandText += ("`r`n (EDITION = '{0}')" -f $createAzureEdition)
+        }
+
+        if (![string]::IsNullOrWhiteSpace($createAzureBackupStorageRedundancy)) {
+            Write-Verbose "Specifying Azure Backup storage redundancy: $($createAzureBackupStorageRedundancy)"
+            $command.CommandText += ("`r`n WITH BACKUP_STORAGE_REDUNDANCY='{0}'" -f $createAzureBackupStorageRedundancy)
+        }
+
+        $command.CommandText += ";"
+
+        $result = $command.ExecuteNonQuery()
+        Write-Verbose "ExecuteNonQuery result: $result"
+
+        Write-Output "Successfully executed the database creation script for $createDatabaseName"
+    }
+
+    finally {
+        if ($null -ne $sqlConnection) {
+            Write-Output "Closing the connection to $createSqlServer"
+            $sqlConnection.Dispose()
+        }
+    }
+}
\ No newline at end of file
diff --git a/step-templates/sql-create-job-category.json b/src/step-templates/sql-create-job-category/metadata.json
similarity index 75%
rename from step-templates/sql-create-job-category.json
rename to src/step-templates/sql-create-job-category/metadata.json
index dcccfc301..273223545 100644
--- a/step-templates/sql-create-job-category.json
+++ b/src/step-templates/sql-create-job-category/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Running command against database server: $DbServer\"\nWrite-Host \"Creating Job category: $JobCatName\"\nInvoke-Sqlcmd -ServerInstance \"$DbServer\" -Verbose -Query \"EXEC dbo.sp_add_category @class=N'JOB', @type=N'LOCAL', @name=N'$JobCatName';\" -Database \"msdb\"\nWrite-Host \"Job category created\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -42,9 +42,9 @@
   ],
   "LastModifiedBy": "ahmedig",
   "$Meta": {
-    "ExportedAt": "2017-03-09T03:35:46.804Z",
+    "ExportedAt": "2017-03-09T03:35:46.8040000Z",
     "OctopusVersion": "3.11.2",
     "Type": "ActionTemplate"
   },
-  "Category" : "sql"
-}
\ No newline at end of file
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-create-job-category/scriptbody.ps1 b/src/step-templates/sql-create-job-category/scriptbody.ps1
new file mode 100644
index 000000000..a71bb130e
--- /dev/null
+++ b/src/step-templates/sql-create-job-category/scriptbody.ps1
@@ -0,0 +1,4 @@
+Write-Host "Running command against database server: $DbServer"
+Write-Host "Creating Job category: $JobCatName"
+Invoke-Sqlcmd -ServerInstance "$DbServer" -Verbose -Query "EXEC dbo.sp_add_category @class=N'JOB', @type=N'LOCAL', @name=N'$JobCatName';" -Database "msdb"
+Write-Host "Job category created"
\ No newline at end of file
diff --git a/src/step-templates/sql-create-sql-user/metadata.json b/src/step-templates/sql-create-sql-user/metadata.json
new file mode 100644
index 000000000..b3a26f2b3
--- /dev/null
+++ b/src/step-templates/sql-create-sql-user/metadata.json
@@ -0,0 +1,82 @@
+{
+  "Id": "d4d7d32d-0aec-4a9e-8455-7f91fcd0d6fb",
+  "Name": "SQL - Create SQL User If Not Exists",
+  "Description": "Create a SQL Login if the login doesn't already exist without using SMO.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "95996aae-c3ec-4d6f-ac24-486d33513620",
+      "Name": "createSqlServer",
+      "Label": "SQL Server",
+      "HelpText": "The SQL Server to perform the action on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "443c9e33-4f94-4141-bae8-24eec4f133d2",
+      "Name": "createSqlLoginUserWhoHasCreateUserRights",
+      "Label": "SQL Login",
+      "HelpText": "The user who has permissions to create the user\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0bf48c89-31a2-4462-9be3-3f80e816f0de",
+      "Name": "createSqlLoginPasswordWhoHasRights",
+      "Label": "SQL Password",
+      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "3f9a4254-db16-4aa5-9ab9-bb8e369ee69e",
+      "Name": "createSqlLogin",
+      "Label": "Username to create",
+      "HelpText": "The SQL Login name that will be created",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b73a9fb0-1b09-473c-956b-07198e5028cc",
+      "Name": "createSqlPassword",
+      "Label": "Password",
+      "HelpText": "The password of the user being created.  Leave this blank if you want to use windows authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "f9746a86-33b5-49b2-9bb2-d528585e9759",
+      "Name": "createSqlDefaultDatabase",
+      "Label": "Default Database",
+      "HelpText": "The default database for the user",
+      "DefaultValue": "master",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-02-12T17:21:40.7620000Z",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2021-02-12T17:21:40.7620000Z",
+    "OctopusVersion": "2020.5.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-create-sql-user/scriptbody.ps1 b/src/step-templates/sql-create-sql-user/scriptbody.ps1
new file mode 100644
index 000000000..c6267f863
--- /dev/null
+++ b/src/step-templates/sql-create-sql-user/scriptbody.ps1
@@ -0,0 +1,105 @@
+Function Test-AzureSQL
+{
+	# Define parameters
+    param ($SqlConnection)
+    
+    # Define local variables
+    $azureDetected = $false
+    
+    # Create command object
+    $command = $SqlConnection.CreateCommand()
+
+    # Check state
+    if ($SqlConnection.State -ne [System.Data.ConnectionState]::Open)
+    {
+    	# Open the connection
+        $SqlConnection.Open()
+    }
+    
+    # Set command text
+    $command.CommandType = [System.Data.CommandType]::Text
+    $command.CommandText = "SELECT SERVERPROPERTY ('edition')"
+    
+    # Execute statement
+    $reader = $command.ExecuteReader()
+    
+    # Read results
+    while ($reader.Read())
+    {
+    	# Get value from field
+        $value = $reader.GetValue(0)
+        
+        # Check to see if it's Azure
+        if ($value -like "*Azure*")
+        {
+        	# It's azure
+            $azureDetected = $true
+            
+            # break
+            break
+        }
+    }
+    
+    # Check to see if reader is open
+    if ($reader.IsClosed -eq $false)
+    {
+    	# Close reader object
+        $reader.Close()
+    }
+    
+    # Not found
+    return $azureDetected
+}
+
+if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security" 
+    $connectionString = "Server=$createSqlServer;Database=master;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = $sqlConnection.CreateCommand()
+$command.CommandType = [System.Data.CommandType]'Text'
+
+Write-Host "Opening the connection to $createSqlServer"
+$sqlConnection.Open()
+
+$isAzureSQL = Test-AzureSQL -SqlConnection $sqlConnection
+
+$escapedLogin = $createSqlLogin.Replace("'", "''")
+Write-Host "Running the if not exists then create user command on the server for $escapedLogin"
+
+if ([string]::IsNullOrWhiteSpace($createSqlPassword) -eq $true) {
+	Write-Host "The password sent in was empty, creating account as domain login"
+    $command.CommandText = "IF NOT EXISTS(SELECT 1 FROM sys.server_principals WHERE name = '$escapedLogin')
+	CREATE LOGIN [$createSqlLogin] FROM WINDOWS"
+    
+    if ($isAzureSQL -eq $false)
+    {
+        $command.CommandText += " with default_database=[$createSqlDefaultDatabase]"
+    }
+    
+}
+else {
+	Write-Host "A password was sent in, creating account as SQL Login"
+	$escapedPassword = $createSqlPassword.Replace("'", "''")
+	$command.CommandText = "IF NOT EXISTS(SELECT 1 FROM sys.sql_logins WHERE name = '$escapedLogin')
+	CREATE LOGIN [$createSqlLogin] with Password='$escapedPassword'"  
+
+    if ($isAzureSQL -eq $false)
+    {
+        $command.CommandText += ", default_database=[$createSqlDefaultDatabase]"
+    }
+}
+
+
+$command.ExecuteNonQuery()
+
+Write-Host "Successfully created the account $createSqlLogin"
+Write-Host "Closing the connection to $createSqlServer"
+$sqlConnection.Close()
\ No newline at end of file
diff --git a/step-templates/sql-delete-database.json b/src/step-templates/sql-delete-database/metadata.json
similarity index 56%
rename from step-templates/sql-delete-database.json
rename to src/step-templates/sql-delete-database/metadata.json
index e6210bb06..acdfeaea4 100644
--- a/step-templates/sql-delete-database.json
+++ b/src/step-templates/sql-delete-database/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$createSqlServer;Database=master;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = $sqlConnection.CreateCommand()\n$command.CommandType = [System.Data.CommandType]'Text'\n\nWrite-Host \"Opening the connection to $createSqlServer\"\n$sqlConnection.Open()\n\n$escapedDatabaseName = $deleteDatabaseName.Replace(\"'\", \"''\")\n\nWrite-Host \"Running the if exists then delete for $createDatabaseName\"\n$command.CommandText = \"IF EXISTS (select Name from sys.databases where Name = '$escapedDatabaseName')\n        drop database [$deleteDatabaseName]\"            \n$command.ExecuteNonQuery()\n\n\nWrite-Host \"Successfully dropped the database $createDatabaseName\"\nWrite-Host \"Closing the connection to $createSqlServer\"\n$sqlConnection.Close()"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -51,10 +51,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2018-07-11T20:39:04.366Z",
+  "LastModifiedOn": "2018-07-11T20:39:04.3660000Z",
   "LastModifiedBy": "octobob",
   "$Meta": {
-    "ExportedAt": "2018-07-11T20:39:04.366Z",
+    "ExportedAt": "2018-07-11T20:39:04.3660000Z",
     "OctopusVersion": "2018.6.10",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/sql-delete-database/scriptbody.ps1 b/src/step-templates/sql-delete-database/scriptbody.ps1
new file mode 100644
index 000000000..d24b5c92e
--- /dev/null
+++ b/src/step-templates/sql-delete-database/scriptbody.ps1
@@ -0,0 +1,29 @@
+if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$createSqlServer;Database=master;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = $sqlConnection.CreateCommand()
+$command.CommandType = [System.Data.CommandType]'Text'
+
+Write-Host "Opening the connection to $createSqlServer"
+$sqlConnection.Open()
+
+$escapedDatabaseName = $deleteDatabaseName.Replace("'", "''")
+
+Write-Host "Running the if exists then delete for $createDatabaseName"
+$command.CommandText = "IF EXISTS (select Name from sys.databases where Name = '$escapedDatabaseName')
+        drop database [$deleteDatabaseName]"            
+$command.ExecuteNonQuery()
+
+
+Write-Host "Successfully dropped the database $createDatabaseName"
+Write-Host "Closing the connection to $createSqlServer"
+$sqlConnection.Close()
\ No newline at end of file
diff --git a/step-templates/sql-delete-sql-user.json b/src/step-templates/sql-delete-sql-user/metadata.json
similarity index 56%
rename from step-templates/sql-delete-sql-user.json
rename to src/step-templates/sql-delete-sql-user/metadata.json
index 2c5173df2..62fd0a955 100644
--- a/step-templates/sql-delete-sql-user.json
+++ b/src/step-templates/sql-delete-sql-user/metadata.json
@@ -7,7 +7,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$createSqlServer;Database=master;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = $sqlConnection.CreateCommand()\n$command.CommandType = [System.Data.CommandType]'Text'\n\nWrite-Host \"Opening the connection to $createSqlServer\"\n$sqlConnection.Open()\n\n$escapedLogin = $deleteSqlLogin.Replace(\"'\", \"''\")\n\nWrite-Host \"Running the if not exists then delete user command on the server\"\n$command.CommandText = \"IF EXISTS(SELECT 1 FROM sys.server_principals WHERE name = '$escapedLogin')\n\tDROP LOGIN [$deleteSqlLogin]\"            \n$command.ExecuteNonQuery()\n\nWrite-Host \"Successfully deleted the account $createSqlLogin\"\nWrite-Host \"Closing the connection to $createSqlServer\"\n$sqlConnection.Close()"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -51,10 +51,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2018-07-11T20:39:04.366Z",
+  "LastModifiedOn": "2018-07-11T20:39:04.3660000Z",
   "LastModifiedBy": "octobob",
   "$Meta": {
-    "ExportedAt": "2018-07-11T20:39:04.366Z",
+    "ExportedAt": "2018-07-11T20:39:04.3660000Z",
     "OctopusVersion": "2018.6.10",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/sql-delete-sql-user/scriptbody.ps1 b/src/step-templates/sql-delete-sql-user/scriptbody.ps1
new file mode 100644
index 000000000..52dcb2dd6
--- /dev/null
+++ b/src/step-templates/sql-delete-sql-user/scriptbody.ps1
@@ -0,0 +1,28 @@
+if ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$createSqlServer;Database=master;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;"
+}
+
+$sqlConnection = New-Object System.Data.SqlClient.SqlConnection
+$sqlConnection.ConnectionString = $connectionString
+
+$command = $sqlConnection.CreateCommand()
+$command.CommandType = [System.Data.CommandType]'Text'
+
+Write-Host "Opening the connection to $createSqlServer"
+$sqlConnection.Open()
+
+$escapedLogin = $deleteSqlLogin.Replace("'", "''")
+
+Write-Host "Running the if not exists then delete user command on the server"
+$command.CommandText = "IF EXISTS(SELECT 1 FROM sys.server_principals WHERE name = '$escapedLogin')
+	DROP LOGIN [$deleteSqlLogin]"            
+$command.ExecuteNonQuery()
+
+Write-Host "Successfully deleted the account $createSqlLogin"
+Write-Host "Closing the connection to $createSqlServer"
+$sqlConnection.Close()
\ No newline at end of file
diff --git a/src/step-templates/sql-deploy-dacpac-sqlpackage/metadata.json b/src/step-templates/sql-deploy-dacpac-sqlpackage/metadata.json
new file mode 100644
index 000000000..e01f75df0
--- /dev/null
+++ b/src/step-templates/sql-deploy-dacpac-sqlpackage/metadata.json
@@ -0,0 +1,179 @@
+{
+  "Id": "c323cbcd-aab8-4229-b07c-e6c26f7e9a8a",
+  "Name": "SQL - Deploy DACPAC using SqlPackage",
+  "Description": "Calls SqlPackage commands such as:\n * [Deploy](https://learn.microsoft.com/en-us/sql/tools/sqlpackage/sqlpackage-publish?view=sql-server-ver16)\n * [Script](https://learn.microsoft.com/en-us/sql/tools/sqlpackage/sqlpackage-script?view=sql-server-ver16)\n * [DeployReport](https://learn.microsoft.com/en-us/sql/tools/sqlpackage/sqlpackage-deploy-drift-report?view=sql-server-ver16)\n\nAs SqlPackage is cross-platform, this template is both Windows and Linux* compatible.\n\nResults of `Deploy script` and `deploy report` options will upload to Octopus Deploy as an artifact. This allows you to put in place a manual intervention step if required. It is also useful for auditing purposes.\n\nSqlCmd variables are now supported.  To specify SqlCmd variables, create your Octopus variable with the following naming convention: SqlCmdVariable.<Variable name> (case insensitive) and then assign it a value.  Examples:\n* SqlCmdVariable.Variable1\n* my.sqlcmdvariable.variable2\n\nNOTE: \n - Requires version 2019.10 or above. \n - `TrustServerCertificate=true` is set by default\n - Requires PowerShell or *PowerShell Core",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "edff7d94-0feb-48a9-8185-48feb084a94f",
+      "Name": "DACPACPackage",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "DACPACPackage"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "f2fcbf76-89ad-4fa2-9be3-cd80de2e39a1",
+      "Name": "DACPACPackageName",
+      "Label": "DACPACPackageName",
+      "HelpText": "The name of the .dacpac file that contains the SSDT model.  Include the .dacpac extensions.  To use a specific folder, use the relative location ex: dacpac/mydacpac.dacpac",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0d21c2a7-3e6e-4411-81d7-0e5866faa8fd",
+      "Name": "DACPACPublishProfile",
+      "Label": "Publish profile file name",
+      "HelpText": "Searches the package for the specified file name.  To use a specific folder, use the relative location ex: publish/publish-profile.xml",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7b302914-8d6c-4df2-b392-e45a44e0147c",
+      "Name": "DACPACReport",
+      "Label": "Report",
+      "HelpText": "Whether a deployment report should be generated and loaded into OctopusDeploy as an artifact",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "aa612324-c2ea-4e86-921a-8ad7494df752",
+      "Name": "DACPACScript",
+      "Label": "Script",
+      "HelpText": "Whether a deploy script should be generated and loaded into OctopusDeploy as an artifact",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "94c4da0b-5c55-4d3d-ab0b-e175a767694f",
+      "Name": "DACPACDeploy",
+      "Label": "Deploy",
+      "HelpText": "Whether a deployment of the dacpac should occur",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d2265a95-ee58-4430-8db0-c7bb03826de0",
+      "Name": "DACPACTargetServer",
+      "Label": "Target Servername",
+      "HelpText": "Name of the server to target this deployment against",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "74397a3b-b007-43cf-bc26-7a1fc2690e24",
+      "Name": "DACPACTargetDatabase",
+      "Label": "Target Database",
+      "HelpText": "Name of the database to target this deployment against",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e1710f37-5f38-4d77-8a05-5fbb6d79132e",
+      "Name": "DACPACAuthenticationType",
+      "Label": "Authentication type",
+      "HelpText": "Select the method to authenticate to the SQL Server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "SqlAuthentication|SQL Authentication\nWindowsIntegrated|Windows Integrated\nAzureADManaged|Azure Active Directory Managed Identity\nAzureADPassword|Azure Active Directory Username/Password\nAzureADIntegrated|Azure Active Directory Integrated\nAzureADServicePrincipal|Azure Active Directory Service Principal"
+      }
+    },
+    {
+      "Id": "a51747d3-514d-4110-bf6b-e5f3932d4f22",
+      "Name": "DACPACSQLUsername",
+      "Label": "Username",
+      "HelpText": "User name to use to connect to the server if we are not using Integrated Security.\n\nIf using the Azure Active Directory Service Principal Authentication Type, use the Azure Account variable here. For example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Client}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1afb7ff1-4447-425e-8625-33d76f32c321",
+      "Name": "DACPACSQLPassword",
+      "Label": "Password",
+      "HelpText": "Password to use to connect to the server if we are not using Integrated Security.\n\nIf using the Azure Active Directory Service Principal Authentication Type, use the Azure Account variable here. For example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Password}`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "fa1d3a63-f2c0-4969-a4ac-d797df53bed1",
+      "Name": "DACPACPackage",
+      "Label": "DACPAC Package",
+      "HelpText": "The package containing the `.dacpac` file from the specified repository.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "2afcffb6-6c2c-4012-8ea8-80ce9f3f4a19",
+      "Name": "DACPACCommandTimeout",
+      "Label": "Command Timeout",
+      "HelpText": "Override the default command timeout for longer-running scripts.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "17444647-1f19-42e9-bde2-839601de5347",
+      "Name": "DACPACExeLocation",
+      "Label": "SqlPackage executable location",
+      "HelpText": "Location of the SqlPackage executable.  Leave blank to dynamically download.<br />\nExamples:<br />\nEmbedded within the package:`#{Octopus.Action.Package[DACPACPackage].ExtractedPath}/MySubFolder`<br />\nOn disk:`c:\\sqlpackage\\sqlpackage.exe` or `/etc/sqlpackage/sqlpackage`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "99d63959-edbb-4f06-a4be-15dd7cf24c35",
+      "Name": "DACPACAdditionalArguments",
+      "Label": "Additional arguments",
+      "HelpText": "A comma-delimited list of additional arguments to add to the SqlPackage command.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-06-01T22:27:25.5640000Z",
+    "OctopusVersion": "2023.1.10766",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-deploy-dacpac-sqlpackage/scriptbody.ps1 b/src/step-templates/sql-deploy-dacpac-sqlpackage/scriptbody.ps1
new file mode 100644
index 000000000..ca79ca9e6
--- /dev/null
+++ b/src/step-templates/sql-deploy-dacpac-sqlpackage/scriptbody.ps1
@@ -0,0 +1,573 @@
+# Set TLS
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+Write-Host "Determining Operating System..."
+# Check to see if $IsWindows is available
+if ($null -eq $IsWindows)
+{
+    switch ([System.Environment]::OSVersion.Platform)
+    {
+    	"Win32NT"
+        {
+        	# Set variable
+            $IsWindows = $true
+            $IsLinux = $false
+        }
+        "Unix"
+        {
+        	$IsWindows = $false
+            $IsLinux = $true
+        }
+    }
+}
+
+if ($IsWindows)
+{
+	Write-Host "Detected OS is Windows"
+    $ProgressPreference = 'SilentlyContinue'
+}
+else
+{
+	Write-Host "Detected OS is Linux"
+}
+
+<#
+ .SYNOPSIS
+ Finds the DAC File that you specify
+
+ .DESCRIPTION
+ Looks through the supplied PathList array and searches for the file you specify.  It will return the first one that it finds.
+
+ .PARAMETER FileName
+ Name of the file you are looking for
+
+ .PARAMETER PathList
+ Array of Paths to search through.
+
+ .EXAMPLE
+ Find-DacFile -FileName "Microsoft.SqlServer.TransactSql.ScriptDom.dll" -PathList @("${env:ProgramFiles}\Microsoft SQL Server", "${env:ProgramFiles(x86)}\Microsoft SQL Server")
+#>
+Function Find-DacFile {
+    Param(
+        [Parameter(Mandatory=$true)]
+        [string]$FileName,
+        [Parameter(Mandatory=$true)]
+        [string[]]$PathList
+    )
+
+    $File = $null
+
+    ForEach($Path in $PathList)
+    {
+        Write-Debug ("Searching: {0}" -f $Path)
+
+        If (!($File))
+        {
+            $File = (
+                Get-ChildItem $Path -ErrorAction SilentlyContinue -Filter $FileName -Recurse |
+                    Sort-Object FullName -Descending |
+                    Select-Object -First 1
+                )
+
+            If ($File)
+            {
+                Write-Debug ("Found: {0}" -f $File.FullName)
+            }
+        }
+    }
+
+    Return $File
+}
+
+
+<#
+ .SYNOPSIS
+ Generates a connection string
+
+ .DESCRIPTION
+ Derive a connection string from the supplied variables
+
+ .PARAMETER ServerName
+ Name of the server to connect to
+
+ .PARAMETER Database
+ Name of the database to connect to
+
+ .PARAMETER UseIntegratedSecurity
+ Boolean value to indicate if Integrated Security should be used or not
+
+ .PARAMETER UserName
+ User name to use if we are not using integrated security
+
+ .PASSWORD Password
+ Password to use if we are not using integrated security
+
+ .PARAMETER EnableMultiSubnetFailover
+ Flag as to whether we should enable multi subnet failover
+
+ .EXAMPLE
+ Get-ConnectionString -ServerName localhost -UseIntegratedSecurity -Database OctopusDeploy
+
+ .EXAMPLE
+ Get-ConnectionString -ServerName localhost -UserName sa -Password ProbablyNotSecure -Database OctopusDeploy
+#>
+Function Get-ConnectionString {
+    Param(
+        [Parameter(Mandatory=$True)]
+        [string]$ServerName,
+        [string]$UserName,
+        [string]$Password,
+        [string]$Database,
+        [string]$AuthenticationType
+    )
+
+    $ApplicationName = "OctopusDeploy"
+    $connectionString = ("Application Name={0};Server={1}" -f $ApplicationName, $ServerName)
+
+    switch ($AuthenticationType)
+    {
+    	"AzureADPassword"
+        {
+            Write-Verbose "Using Azure Active Directory username and password"
+            $connectionString += (";Authentication='Active Directory Password';Uid={0};Pwd={1}" -f $UserName, $Password)                
+            break
+        }
+        "AzureADIntegrated"
+        {
+            Write-Verbose "Using Azure Active Directory integrated"
+            $connectionString += (";Authentication='Active Directory Integrated'")                
+            break
+        }
+        "AzureADManaged"
+        {
+        	Write-Verbose "Using Azure Active Directory managed identity"
+            break
+        }
+        "AzureADServicePrincipal"
+        {
+             Write-Verbose "Using Azure Active Directory username and password"
+            $connectionString += (";Authentication='ActiveDirectoryServicePrincipal';Uid={0};Pwd={1}" -f $UserName, $Password)                
+            break       	
+        }
+        "SqlAuthentication"
+        {
+            Write-Verbose "Using SQL Authentication username and password"
+            $connectionString += (";Uid={0};Pwd={1}" -f $UserName, $Password)                
+            break        
+        }
+        "WindowsIntegrated"
+        {
+            Write-Verbose "Using integrated security"
+            $connectionString += ";Trusted_Connection=True"
+            break
+        }
+    }
+    
+    if ($EnableMultiSubnetFailover)
+    {
+        Write-Verbose "Enabling multi subnet failover"
+        $connectionString += ";MultisubnetFailover=True"
+    }
+
+    If ($Database)
+    {
+        $connectionString += (";Initial Catalog={0}" -f $Database)
+    }
+
+	$connectionString += ";TrustServerCertificate=true;"
+
+    Return $connectionString
+}
+
+<#
+ .SYNOPSIS
+ Will find the full path of a given filename (For dacpac or publish profile)
+ .DESCRIPTION
+ Will search through an extracted package folder provided as the BasePath and hunt for any matches for the given filename.
+ .PARAMETER BasePath
+ String value of the root folder to begine the recursive search.
+ .PARAMETER FileName
+ String value of the name of the file to search for.
+ .PARAMETER FileType
+ String value of "DacPac" or "PublishProfile" to identify the type of file to search for.
+ .EXAMPLE
+ Get-DacFilePath -BasePath $ExtractPath -FileName $DACPACPackageName -FileType "DacPac"
+#>
+function Get-DacFilePath {
+    [cmdletbinding()]
+    param(
+        [parameter(Mandatory=$true)]
+        [string]$BasePath,
+
+        [parameter(Mandatory=$true)]
+        [string]$FileName,
+
+        [parameter(Mandatory=$true)]
+        [ValidateSet("DacPac","PublishProfile")]
+        [string]$FileType
+    )
+
+    # Add file extension for a dacpac if it's missing
+    if($FileName.Split(".")[-1] -ne "dacpac" -and $FileType -eq "DacPac"){
+        $FileName = "$FileName.dacpac"
+    }
+
+    Write-Verbose "Looking for $FileType $FileName in $BasePath."
+
+    $filePath = (Get-ChildItem -Path $BasePath -Recurse -Filter $FileName).FullName
+
+    if(@($filePath).Length -gt 1){
+        Write-Warning "Found $(@($filePath).Length) instances of $FileName. Using $($filePath[0])."
+        Write-Warning "Multiple paths for $FileName`: $(@($filePath) -join "; ")"
+        $filePath = $filePath[0]
+    }
+    elseif(@($filePath).Length -lt 1 -or $null -eq $filePath){
+        Throw "Could not find $FileName."
+    }
+
+    return $filePath
+}
+
+function Add-SqlCmdVariables
+{
+	# Get all SqlCmdVariables
+    $sqlCmdVariables = $OctopusParameters.Keys -imatch "SqlCmdVariable.*"
+    $argumentList = @()
+        
+	# Check to see if something is there
+	if ($null -ne $sqlCmdVariables)
+    {
+    	Write-Host "Adding SqlCmdVariables ..."
+        
+		# Loop through the variable collection
+        foreach ($sqlCmdVariable in $sqlCmdVariables)
+        {
+        	# Add variable to the deploy options
+            $sqlCmdVariableKey = $sqlCmdVariable.Substring(($sqlCmdVariable.ToLower().IndexOf("sqlcmdvariable.") + "sqlcmdvariable.".Length))
+            
+            Write-Host "Adding variable: $sqlCmdVariableKey with value: $($OctopusParameters[$sqlCmdVariable])"
+            
+            $argumentList += ("/variables:{0}={1}" -f $sqlCmdVariableKey, $OctopusParameters[$sqlCmdVariable])
+        }
+    }
+    
+    # return the list of variables
+    return $argumentList
+}
+
+function Add-AdditionalArguments
+{
+	# Define parameters
+    param (
+    	$AdditionalArguments
+    )
+    
+    # Define local variables
+    $argumentsToAdd = @()
+    
+    # Check for emmpty or null
+    if (![string]::IsNullOrWhitespace($AdditionalArguments))
+    {
+    	# Split the arguments
+    	$argumentsToAdd += $AdditionalArguments.Split(',', [System.StringSplitOptions]::RemoveEmptyEntries).Trim()
+    }
+    
+    # Return list
+    return $argumentsToAdd
+}
+
+function Get-SqlPackage
+{
+	# Define local variables
+    $workFolder = $OctopusParameters['Octopus.Action.Package[DACPACPackage].ExtractedPath']
+    $downloadUrl = ""
+
+	# Check to see if a folder needs to be created
+    if((Test-Path -Path "$workFolder/sqlpackage") -eq $false)
+    {
+        # Create new folder
+        New-Item -ItemType Directory -Path "$workFolder/sqlpackage"
+    }
+    
+    Write-Host "Downloading SqlPackage ..."
+    
+    if ($IsWindows)
+    {
+    	# Set url
+        $downloadUrl = "https://aka.ms/sqlpackage-windows"
+    }
+    
+    if ($IsLinux)
+    {
+    	# Set url
+        $downloadUrl = "https://aka.ms/sqlpackage-linux"
+    }
+    
+    # Download sql package
+    if ($PSVersionTable.PSVersion.Major -ge 6)
+    {
+    	# Download
+        Invoke-WebRequest -Uri $downloadUrl -OutFile "$workFolder/sqlpackage/sqlpackage.zip"
+    }
+    else
+    {
+    	Invoke-WebRequest -Uri $downloadUrl -OutFile "$workFolder/sqlpackage/sqlpackage.zip" -UseBasicParsing
+    }
+    
+    # Expand the archive
+    Write-Host "Extracting .zip ..."
+    Expand-Archive -Path "$workFolder/sqlpackage/sqlpackage.zip" -DestinationPath "$workFolder/sqlpackage"
+    
+    # Add to PATH
+    $env:PATH = "$workFolder/sqlpackage$([IO.Path]::PathSeparator)" + $env:PATH
+    
+    # Make it executable
+    if ($IsLinux)
+    {
+    	& chmod a+x "$workFolder/sqlpackage/sqlpackage"
+    }
+}
+
+Function Format-OctopusArgument {
+
+    Param(
+        [string]$Value
+    )
+
+    $Value = $Value.Trim()
+
+    # There must be a better way to do this
+    Switch -Wildcard ($Value){
+
+        "True" { Return $True }
+        "False" { Return $False }
+        "#{*}" { Return $null }
+        Default { Return $Value }
+    }
+}
+
+Function Get-ManagedIdentityToken
+{
+	# Get the identity token
+    Write-Host "Getting Azure Managed Identity token ..."
+    $token = $null
+    $tokenUrl = "http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fdatabase.windows.net%2F"
+    
+    if ($PSVersionTable.PSVersion.Major -ge 6)
+    {
+    	$token = Invoke-RestMethod -Method GET -Uri $tokenUrl -Headers @{"MetaData" = "true"}
+    }
+    else
+    {
+    	$token = Invoke-RestMethod -Method GET -Uri $tokenUrl -Headers @{"MetaData" = "true"} -UseBasicParsing
+    }
+    
+    # Return the token
+    return $token.access_token
+}
+
+function Invoke-SqlPackage
+{
+	# Define parameters
+    param (
+    	$Action,
+        $Arguments
+    )
+    
+    # Add the action
+    $Arguments += "/Action:$Action"
+
+    # Display what's going to be run
+    if (![string]::IsNullOrWhitespace($Password))
+    {
+        $displayArguments = $Arguments.PSObject.Copy()
+        for ($i = 0; $i -lt $displayArguments.Count; $i++)
+        {
+            if ($null -ne $displayArguments[$i])
+            {
+                if ($displayArguments[$i].Contains($Password))
+                {
+                    $DisplayArguments[$i] = $displayArguments[$i].Replace($Password, "****")
+                }
+            }
+        }
+
+        Write-Host "Executing the following command: sqlpackage $displayArguments"
+    }
+    else 
+    {
+        Write-Host "Executing the following command: sqlpackage $Arguments"
+    }    
+    
+    & sqlpackage $Arguments
+
+	# Check exit code
+	if ($lastExitCode -ne 0)
+	{
+		# Fail the step
+    	Write-Error "Execution failed!"
+	}
+}
+
+function Validate-Folder
+{
+	# Define parameters
+    param (
+    	$TestPath
+    )
+    
+    # Check for folder
+    if ((Test-Path -Path $TestPath) -eq $false)
+    {
+    	# Create the folder
+        New-Item -Path "$TestPath" -ItemType "directory"
+    }
+}
+
+Function Remove-InvalidFileNameChars {
+
+	Param(
+		[string]$FileName
+	)
+
+	[IO.Path]::GetinvalidFileNameChars() | ForEach-Object { $FileName = $FileName.Replace($_, "_") }
+	Return $FileName
+}
+
+# Get the supplied parameters
+$PublishProfile = $OctopusParameters["DACPACPublishProfile"]
+$DACPACReport = Format-OctopusArgument -Value $OctopusParameters["DACPACReport"]
+$DACPACScript = Format-OctopusArgument -Value $OctopusParameters["DACPACScript"]
+$DACPACDeploy = Format-OctopusArgument -Value $OctopusParameters["DACPACDeploy"]
+$DACPACTargetServer = $OctopusParameters["DACPACTargetServer"]
+$DACPACTargetDatabase = $OctopusParameters["DACPACTargetDatabase"]
+$DACPACAdditionalArguments = $OctopusParameters["DACPACAdditionalArguments"]
+$DACPACExeLocation = $OctopusParameters["DACPACExeLocation"]
+$DACPACDateTime = ((Get-Date).ToUniversalTime().ToString("yyyyMMddHHmmss"))
+
+$Username = $OctopusParameters["DACPACSQLUsername"]
+$Password = $OctopusParameters["DACPACSQLPassword"]
+$PackageReferenceName = "DACPACPackage"
+
+$authenticationType = $OctopusParameters["DACPACAuthenticationType"]
+
+$ExtractPathKey = ("Octopus.Action.Package[{0}].ExtractedPath" -f $PackageReferenceName)
+$ExtractPath = $OctopusParameters[$ExtractPathKey]
+
+if(!(Test-Path $ExtractPath)) {
+    Throw ("The package extraction folder '{0}' does not exist or the Octopus Tentacle does not have permission to access it." -f $ExtractPath)
+}
+
+# Get the DACPAC location
+$dacpacFolderName = [System.IO.Path]::GetDirectoryName($DACPACPackageName)
+$dacpacFileName = [System.IO.Path]::GetFileName($DACPACPackageName)
+$DACPACPackagePath = Get-DacFilePath -BasePath ($ExtractPath + ([IO.Path]::DirectorySeparatorChar) + $dacpacFolderName) -FileName $dacpacFileName -FileType "DacPac"
+
+# Invoke the DacPac utility
+try
+{
+	# Declare working variables
+    $sqlPackageArguments = @()
+    
+    # Build arugment list
+    $sqlPackageArguments += "/SourceFile:`"$DACPACPackagePath`""
+    $sqlPackageArguments += "/TargetConnectionString:`"$(Get-ConnectionString -ServerName $DACPACTargetServer -Database $DACPACTargetDatabase -UserName $UserName -Password $Password -AuthenticationType $AuthenticationType)`""
+    
+	# Check to see if a publish profile was designated
+	If ($PublishProfile){
+    	$profileFolderName = [System.IO.Path]::GetDirectoryName($PublishProfile)
+        $profileFileName = [System.IO.Path]::GetFileName($PublishProfile)
+    	$PublishProfilePath = Get-DacFilePath -BasePath ($ExtractPath + ([IO.Path]::DirectorySeparatorChar) + $profileFolderName) -FileName $profileFileName -FileType "PublishProfile"
+    
+    	# Add to arguments
+    	$sqlPackageArguments += "/Profile:`"$PublishProfilePath`""
+	}    
+    
+    # Check to see if it's using managed identity
+    if ($authenticationType -eq "AzureADManaged")
+    {
+    	# Add access token
+        $Password = Get-ManagedIdentityToken
+        $sqlPackageArguments += "/AccessToken:$Password"
+    }
+    
+    # Add sqlcmd variables
+    $sqlPackageArguments += Add-SqlCmdVariables
+    
+	# Add addtional arguments
+    $sqlPackageArguments += Add-AdditionalArguments -AdditionalArguments $DACPACAdditionalArguments
+    
+    # Check to see if command timeout was specified
+    if (![string]::IsNullOrWhitespace($DACPACCommandTimeout))
+    {
+    	# Add timeout parameter
+        $sqlPackageArguments += "/Properties:CommandTimeout=$DACPACCommandTimeout"
+    }
+    
+    # Check to see if sqlpackage needs to be downloaded
+    if ([string]::IsNullOrWhitespace($DACPACExeLocation))
+    {
+    	# Download and extract sqlpackage
+        Get-SqlPackage
+    }
+    else
+    {
+    	# Add folder location to path
+        $env:PATH = "$([IO.Path]::GetDirectoryName($DACPACExeLocation))$([IO.Path]::PathSeparator)" + $env:PATH
+        Write-Host "It is $($env:PATH)"
+    }
+    
+    # Execute the actions
+    if ($DACPACReport)
+    {
+    	$workFolder = "$($OctopusParameters['Octopus.Action.Package[DACPACPackage].ExtractedPath'])/reports"
+        $sqlReportArguments = @()
+        $reportArtifact = Remove-InvalidFileNameChars -FileName ("{0}.{1}.{2}.{3}" -f $DACPACTargetServer, $DACPACTargetDatabase, $DACPACDateTime, "DeployReport.xml")
+        $sqlReportArguments += "/OutputPath:$workFolder/$reportArtifact"
+        
+        # Validate the folder
+        Validate-Folder -TestPath $workFolder
+        
+        # Execute the action
+        Invoke-SqlPackage -Action "DeployReport" -Arguments ($sqlPackageArguments + $sqlReportArguments)
+        
+        # Attach artifacts
+        foreach ($item in (Get-ChildItem -Path $workFolder))
+        {
+        	# Upload artifact
+            New-OctopusArtifact $item.FullName
+        }
+    }
+    
+    if ($DACPACScript)
+    {
+    	$workFolder = "$($OctopusParameters['Octopus.Action.Package[DACPACPackage].ExtractedPath'])/scripts"
+        $sqlScriptArguments = @()
+        $scriptArtifact = Remove-InvalidFileNameChars -FileName ("{0}.{1}.{2}.{3}" -f $DACPACTargetServer, $DACPACTargetDatabase, $DACPACDateTime, "DeployScript.sql")
+        $sqlScriptArguments += "/OutputPath:$workFolder/$scriptArtifact"
+        
+        # Validate folder
+        Validate-Folder -TestPath $workFolder
+        
+        # Execute the action
+        Invoke-SqlPackage -Action "Script" -Arguments ($sqlPackageArguments + $sqlScriptArguments)
+        
+        # Attach artifacts
+        foreach ($item in (Get-ChildItem -Path $workFolder))
+        {
+        	# Upload artifact
+            New-OctopusArtifact $item.FullName
+        }        
+    }
+    
+    if ($DACPACDeploy)
+    {
+    	# Execute action
+        Invoke-SqlPackage -Action "Publish" -Arguments $sqlPackageArguments
+    }
+}
+catch
+{
+    Write-Host $_.Exception.ToString()
+    throw;
+}
diff --git a/src/step-templates/sql-deploylog-read/metadata.json b/src/step-templates/sql-deploylog-read/metadata.json
new file mode 100644
index 000000000..d9fb4c291
--- /dev/null
+++ b/src/step-templates/sql-deploylog-read/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "8a446e55-6554-40fa-bbd9-70bd2a69a13e",
+  "Name": "SQL Server __DeployLog: Read",
+  "Description": "To be used with:\nSQL Server __DeployLog: Update\r\n\r\nRequires sqlserver PowerShell module on target machine.\r\n\r\nFor more information: https://octopus.com/blog/100x-faster-db-deploys",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "a2328977-2df7-42bb-9f23-263031f27fe7",
+      "Name": "DLM_PackageStep",
+      "Label": "Database package deployment step (Required)",
+      "HelpText": "The step that deploys the package containing the database source code to the target machine.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "871c40e6-9435-4cc5-8f52-a54eaf8c71ad",
+      "Name": "DLM_ServerInstance",
+      "Label": "Target SQL Server Instance (Required)",
+      "HelpText": "The name of the target SQL Server instance.\ne.g. SQLSERVER01\\myInstance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "553359a5-9ee8-43a8-b6fc-aa7e5f9d9d9e",
+      "Name": "DLM_Database",
+      "Label": "Target SQL Server Database (Required)",
+      "HelpText": "The name of the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "61f123b1-cb7d-423f-bf3e-da979c3aa539",
+      "Name": "DLM_Username",
+      "Label": "SQL Auth User (Optional)",
+      "HelpText": "The SQL Auth user used to authenticate against the target database. (For Windows Auth, leave blank.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b373aa81-7807-4653-928b-acf39f6a4888",
+      "Name": "DLM_Password",
+      "Label": "SQL Auth Password (Optional)",
+      "HelpText": "The SQL Auth password used to authenticate against the target database. (For Windows Auth, leave blank.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-10-02T14:36:09.3490000Z",
+    "OctopusVersion": "2020.4.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "Alex-Yates",
+  "Category": "dlm"
+}
diff --git a/src/step-templates/sql-deploylog-read/scriptbody.ps1 b/src/step-templates/sql-deploylog-read/scriptbody.ps1
new file mode 100644
index 000000000..7ee06197e
--- /dev/null
+++ b/src/step-templates/sql-deploylog-read/scriptbody.ps1
@@ -0,0 +1,81 @@
+$errorActionPreference = "stop"
+
+# Verifying that sqlserver module is installed
+If (-not(Get-InstalledModule sqlserver -ErrorAction silentlycontinue)) {
+  Write-Error "This step requires the sqlserver PowerShell module. Please install it and try again."
+}
+Else {
+  Write-Output "PowerShell module sqlserver is already installed."
+}
+
+# Declaring variabes
+$deployed_by = ([Environment]::UserDomainName + "\" + [Environment]::UserName)
+$currentPackageVersion = $OctopusParameters["Octopus.Action[$DLM_PackageStep].Package.PackageVersion"]
+$deployRequired = "False"
+
+# Logging input variables
+Write-Verbose "DLM_PackageStep step is: $DLM_PackageStep"
+Write-Verbose "DLM_ServerInstance instance is: $DLM_ServerInstance"
+Write-Verbose "DLM_Database is: $DLM_Database"
+Write-Verbose "deployed_by is: $deployed_by"
+Write-Verbose "currentPackageVersion is: $currentPackageVersion"
+
+# For invoke-sqlcmd authentication
+$auth=@{}
+if($DLM_Username){$auth=@{UserName=$DLM_Username;Password=$DLM_Password}}
+
+# Script to check whether __DeployLog exists in target database
+$CheckDeployLogExists = @'
+IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES
+           WHERE TABLE_NAME = N'__DeployLog')
+    BEGIN
+    SELECT 'TRUE'
+    END 
+ELSE
+    BEGIN
+    SELECT 'FALSE'
+    End
+'@
+
+# Verifying whether _DeployLog exists
+$DeployLogExists = Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $CheckDeployLogExists @Auth 
+$DeployLogExists = $DeployLogExists[0]
+if($DeployLogExists -eq 'FALSE') {
+    Write-Warning "Table __DeployLog does not exist in $DLM_Database on $DLM_ServerInstance pre-deployment."
+}
+
+# Script to read the last successful package version from __DeployLog
+$getLastPackageVersion = @'
+SELECT TOP (1) package_version 
+FROM [dbo].[__DeployLog]
+WHERE  status_code='Succeeded'
+ORDER BY utc_time DESC
+'@
+
+# Condition 1: If there is no __DeployLog table we don't know the prior state so we need to deploy the package
+if($DeployLogExists -eq 'FALSE') {
+    Write-Output "There is no __DeployLog table on target database. Assuming re-deployment is required."
+    $deployRequired = "True"}
+else{
+    # Condition 2: If the package version has changed we need to deploy the new package
+    $lastPackageVersion = Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $getLastPackageVersion @Auth
+    try{
+        $lastPackageVersion = $lastPackageVersion[0]
+    }
+    catch{
+        Write-Warning "__DeployLog is empty"
+        $lastPackageVersion = "NULL"
+    }
+    if($lastPackageVersion -ne $currentPackageVersion){
+        Write-Output "Package version ($currentPackageVersion) differs from previous package version ($lastPackageVersion), re-deployment is required."
+        $deployRequired = "True"
+    }
+}
+
+# If neither condition 1 or 2 above are met, __DeployLog indicates that this 
+# package has already been successfully deployed - so we can skip the deployment
+if($deployRequired -like "False"){
+    Write-Output "Skipping the deployment because the __DeployLog table in $DLM_Database on $DLM_ServerInstance indicates that package $currentPackageVersion has already been successfully deployed."
+}
+
+Set-OctopusVariable -name "Deploy:$DLM_ServerInstance-$DLM_Database" -value $deployRequired
diff --git a/src/step-templates/sql-deploylog-update/metadata.json b/src/step-templates/sql-deploylog-update/metadata.json
new file mode 100644
index 000000000..79beaef7b
--- /dev/null
+++ b/src/step-templates/sql-deploylog-update/metadata.json
@@ -0,0 +1,83 @@
+{
+  "Id": "a9f7644c-3e27-4e46-a591-eee7f3542032",
+  "Name": "SQL Server __DeployLog: Update",
+  "Description": "To be used with:\nSQL Server __DeployLog: Read\r\n\r\nRequires sqlserver PowerShell module on target machine.\r\n\r\nFor more information: https://octopus.com/blog/100x-faster-db-deploys",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "a2328977-2df7-42bb-9f23-263031f27fe7",
+      "Name": "DLM_PackageStep",
+      "Label": "Database package deployment step (Required)",
+      "HelpText": "The step that deploys the package containing the database source code to the target machine.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "c4668938-09ea-4b42-9be5-61dfcee9eae6",
+      "Name": "DLM_DeployStep",
+      "Label": "Database update step (Required)",
+      "HelpText": "The step that updates the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "871c40e6-9435-4cc5-8f52-a54eaf8c71ad",
+      "Name": "DLM_ServerInstance",
+      "Label": "Target SQL Server Instance (Required)",
+      "HelpText": "The name of the target SQL Server instance.\ne.g. SQLSERVER01\\myInstance",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "553359a5-9ee8-43a8-b6fc-aa7e5f9d9d9e",
+      "Name": "DLM_Database",
+      "Label": "Target SQL Server Database (Required)",
+      "HelpText": "The name of the target database.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "61f123b1-cb7d-423f-bf3e-da979c3aa539",
+      "Name": "DLM_Username",
+      "Label": "SQL Auth User (Optional)",
+      "HelpText": "The SQL Auth user used to authenticate against the target database. (For Windows Auth, leave blank.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b373aa81-7807-4653-928b-acf39f6a4888",
+      "Name": "DLM_Password",
+      "Label": "SQL Auth Password (Optional)",
+      "HelpText": "The SQL Auth password used to authenticate against the target database. (For Windows Auth, leave blank.)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-10-02T14:46:20.4830000Z",
+    "OctopusVersion": "2020.4.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "Alex-Yates",
+  "Category": "dlm"
+}
diff --git a/src/step-templates/sql-deploylog-update/scriptbody.ps1 b/src/step-templates/sql-deploylog-update/scriptbody.ps1
new file mode 100644
index 000000000..9b5431bc0
--- /dev/null
+++ b/src/step-templates/sql-deploylog-update/scriptbody.ps1
@@ -0,0 +1,127 @@
+<#
+Required variables:
+$DLM_PackageStep
+$DLM_DeployStep
+$DLM_ServerInstance
+$DLM_Database
+
+Optional variables (include for SQL Auth, exclude for WinAuth):
+$DLM_Username
+$DLM_Password
+#>
+
+$errorActionPreference = "stop"
+
+# Verifying that sqlserver module is installed
+If (-not(Get-InstalledModule sqlserver -ErrorAction silentlycontinue)) {
+  Write-Error "This step requires the sqlserver PowerShell module. Please install it and try again."
+}
+Else {
+  Write-Output "PowerShell module sqlserver is already installed."
+}
+
+# Declaring variabes
+$deployed_by = ([Environment]::UserDomainName + "\" + [Environment]::UserName)
+$currentPackageVersion = $OctopusParameters["Octopus.Action[$DLM_PackageStep].Package.PackageVersion"]
+$octo_release_number = $OctopusParameters["Octopus.Release.Number"]
+$octo_deployment_id = $OctopusParameters["Octopus.Deployment.Id"]
+$octo_deployment_created_by = $OctopusParameters["Octopus.Deployment.CreatedBy.Username"]
+$deployStatusCode = $OctopusParameters["Octopus.Step[$DLM_DeployStep].Status.Code"]
+$deployStatusError = $OctopusParameters["Octopus.Step[$DLM_DeployStep].Status.Error"]
+$deployStatusErrorDetail = $OctopusParameters["Octopus.Step[$DLM_DeployStep].Status.ErrorDetail"]
+$timestamp = Get-Date
+$utcTime = [datetime]::Now.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ss")
+
+# Escaping single quotes to avoid breaking T-SQL INSERT statements
+$deployStatusError = $deployStatusError -replace "'", "''"
+$deployStatusErrorDetail = $deployStatusErrorDetail -replace "'", "''"
+
+# Logging input variables
+Write-Verbose "DLM_PackageStep step is: $DLM_PackageStep"
+Write-Verbose "DLM_DeployStep step is: $DLM_DeployStep"
+Write-Verbose "DLM_ServerInstance instance is: $DLM_ServerInstance"
+Write-Verbose "DLM_Database is: $DLM_Database"
+Write-Verbose "DLM_Username is: $DLM_Username"
+Write-Verbose "deployed_by is: $deployed_by"
+Write-Verbose "currentPackageVersion is: $currentPackageVersion"
+Write-Verbose "octo_release_number is: $octo_release_number"
+Write-Verbose "octo_deployment_id is: $octo_deployment_id"
+Write-Verbose "octo_deployment_created_by is: $octo_deployment_created_by"
+Write-Verbose "deployStatusCode is: $deployStatusCode"
+Write-Verbose "deployStatusError is: $deployStatusError"
+Write-Verbose "deployStatusErrorDetail is: $deployStatusErrorDetail"
+Write-Verbose "utcTime is: $utcTime"
+
+# For invoke-sqlcmd authentication
+$auth=@{}
+if($DLM_Username){$auth=@{UserName=$DLM_Username;Password=$DLM_Password}}
+
+# Script to check whether __DeployLog exists in target database
+$CheckDeployLogExists = @'
+IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES
+           WHERE TABLE_NAME = N'__DeployLog')
+    BEGIN
+    SELECT 'TRUE'
+    END 
+ELSE
+    BEGIN
+    SELECT 'FALSE'
+    End
+'@
+
+# Script to create the __DeployLog table if it does not already exist
+$CreateDeployLogTbl = @'
+CREATE TABLE [dbo].[__DeployLog](
+	[deploy_id] [int] IDENTITY(1,1) PRIMARY KEY,
+	[package_version] [varchar](255) NOT NULL,
+ 	[octo_release_number] [nvarchar](50) NOT NULL,
+   	[octo_deployment_id] [nvarchar](50) NOT NULL,
+    [octo_deployment_created_by] [nvarchar](255) NOT NULL,
+	[utc_time] [datetime2](7) NOT NULL,
+	[deployed_by] [nvarchar](50) NULL,
+    [status_code] [nvarchar](50) NULL,
+    [status_error] [nvarchar](MAX) NULL,
+    [status_error_detail] [nvarchar](MAX) NULL
+    )
+GO
+'@
+
+# Checking if __DeployLog still exists following deployment 
+# (it may have been dropped if it wasn't included in source code)
+$DeployLogExists = Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $CheckDeployLogExists @Auth
+$DeployLogExists = $DeployLogExists[0]
+
+# If __DeployLog has been dropped, recreate it
+if($DeployLogExists -eq "FALSE") {
+    Write-Warning "Table __DeployLog does not exist in $DLM_Database on $DLM_ServerInstance post-deployment. It may have been deleted. You should either add the table to your source code or your filter to avoid data loss."
+    Write-Output "Redeploying __DeployLog table"
+    Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $CreateDeployLogTbl @Auth
+}
+
+# Script to update __DeployLog with info about this deployment
+$updateDeployLog = @"
+INSERT INTO [dbo].[__DeployLog]
+           ([package_version]
+           ,[octo_release_number]
+           ,[octo_deployment_id]
+           ,[octo_deployment_created_by]
+           ,[utc_time]
+           ,[deployed_by]
+           ,[status_code]
+           ,[status_error]
+           ,[status_error_detail])
+     VALUES
+           ('$currentPackageVersion'
+           ,'$octo_release_number'
+           ,'$octo_deployment_id'
+           ,'$octo_deployment_created_by'
+           ,'$utcTime'
+           ,'$deployed_by'
+           ,'$deployStatusCode'
+           ,'$deployStatusError'
+           ,'$deployStatusErrorDetail')
+GO
+"@
+
+Write-Output "Updating __DeployLog in $DLM_Database on $DLM_ServerInstance."
+Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $updateDeployLog @Auth
\ No newline at end of file
diff --git a/step-templates/sql-execute-script-file.json b/src/step-templates/sql-execute-script-file/metadata.json
similarity index 55%
rename from step-templates/sql-execute-script-file.json
rename to src/step-templates/sql-execute-script-file/metadata.json
index 0779f846b..6672c8644 100644
--- a/step-templates/sql-execute-script-file.json
+++ b/src/step-templates/sql-execute-script-file/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 9,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$connection = New-Object System.Data.SqlClient.SqlConnection\r$connection.ConnectionString = $OctopusParameters['ConnectionString']\rRegister-ObjectEvent -inputobject $connection -eventname InfoMessage -action {\r    write-host $event.SourceEventArgs\r} | Out-Null\r\rfunction Execute-SqlQuery($query) {\r    $queries = [System.Text.RegularExpressions.Regex]::Split($query, \"^\\s*GO\\s*`$\", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Multiline)\r\r    $queries | ForEach-Object {\r        $q = $_\r        if ((-not [String]::IsNullOrWhiteSpace($q)) -and ($q.Trim().ToLowerInvariant() -ne \"go\")) {            \r            $command = $connection.CreateCommand()\r            $command.CommandText = $q\r            $command.CommandTimeout = $OctopusParameters['CommandTimeout']\r            $command.ExecuteNonQuery() | Out-Null\r        }\r    }\r}\r\rWrite-Host \"Connecting\"\rtry {\r    $connection.Open()\r    Write-Host \"Executing script in\" $OctopusParameters['SqlScriptFile']\r    $content = [IO.File]::ReadAllText($OctopusParameters['SqlScriptFile'])\r    Execute-SqlQuery -query $content\r}\rcatch {\r\tif ($OctopusParameters['ContinueOnError']) {\r\t\tWrite-Host $_.Exception.Message\r\t}\r\telse {\r\t\tthrow\r\t}\r}\rfinally {\r    Write-Host \"Closing connection\"\r    $connection.Dispose()\r}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -49,9 +49,9 @@
   ],
   "LastModifiedBy": "joaoasrosa",
   "$Meta": {
-    "ExportedAt": "2016-02-23T16:47:43.715+00:00",
+    "ExportedAt": "2016-02-23T08:47:43.7150000-08:00",
     "OctopusVersion": "3.2.8",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-execute-script-file/scriptbody.ps1 b/src/step-templates/sql-execute-script-file/scriptbody.ps1
new file mode 100644
index 000000000..0a9aa87f6
--- /dev/null
+++ b/src/step-templates/sql-execute-script-file/scriptbody.ps1
@@ -0,0 +1 @@
+$connection = New-Object System.Data.SqlClient.SqlConnection
$connection.ConnectionString = $OctopusParameters['ConnectionString']
Register-ObjectEvent -inputobject $connection -eventname InfoMessage -action {
    write-host $event.SourceEventArgs
} | Out-Null

function Execute-SqlQuery($query) {
    $queries = [System.Text.RegularExpressions.Regex]::Split($query, "^\s*GO\s*`$", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Multiline)

    $queries | ForEach-Object {
        $q = $_
        if ((-not [String]::IsNullOrWhiteSpace($q)) -and ($q.Trim().ToLowerInvariant() -ne "go")) {            
            $command = $connection.CreateCommand()
            $command.CommandText = $q
            $command.CommandTimeout = $OctopusParameters['CommandTimeout']
            $command.ExecuteNonQuery() | Out-Null
        }
    }
}

Write-Host "Connecting"
try {
    $connection.Open()
    Write-Host "Executing script in" $OctopusParameters['SqlScriptFile']
    $content = [IO.File]::ReadAllText($OctopusParameters['SqlScriptFile'])
    Execute-SqlQuery -query $content
}
catch {
	if ($OctopusParameters['ContinueOnError']) {
		Write-Host $_.Exception.Message
	}
	else {
		throw
	}
}
finally {
    Write-Host "Closing connection"
    $connection.Dispose()
}
\ No newline at end of file
diff --git a/src/step-templates/sql-execute-script-with-authentication/metadata.json b/src/step-templates/sql-execute-script-with-authentication/metadata.json
new file mode 100644
index 000000000..d08a41fb4
--- /dev/null
+++ b/src/step-templates/sql-execute-script-with-authentication/metadata.json
@@ -0,0 +1,94 @@
+{
+  "Id": "3ec610a8-f75c-43da-8d82-8c9b7b334084",
+  "Name": "SQL - Execute SQL Script with SQL or Windows Authentication",
+  "Description": "Executes SQL script file(s) against the specified database using either SQL or Windows authentication. SQL Scripts can be hardcoded value or can be from an extracted NuGet package.",
+  "ActionType": "Octopus.Script",
+  "Version": 169,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "0ac8c815-697d-4212-aa73-85e265bd1a7a",
+      "Name": "serverInstance",
+      "Label": "Server Instance Name",
+      "HelpText": "The SQL Server Instance name",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "63a2671c-cd1e-4bd3-acad-59f656f9a698",
+      "Name": "dbName",
+      "Label": "Database Name",
+      "HelpText": "The database name",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "bc768cdf-3d5f-4a94-8b08-647056eb3977",
+      "Name": "Authentication",
+      "Label": "Authentication",
+      "HelpText": "The authentication method",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "SqlAuthentication\nWindowsIntegrated"
+      }
+    },
+    {
+      "Id": "e4d6eca3-5de6-4901-8f94-5253c2aea18d",
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "The username to use to connect (only applies with SqlAuthentication selected)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d00b988d-bdf3-4376-aec7-90954e3cb635",
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "The password to use to connect (only applies with SqlAuthentication selected)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4de1507a-3824-46b0-bf11-126b953c73da",
+      "Name": "SQLScripts",
+      "Label": "SQL Scripts",
+      "HelpText": "Full path to each script name on a new line\nWildcards are accepted, eg. C:\\Scripts\\*.sql, C:\\Scripts\\Deploy*.sql",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "0fd3b146-02d1-41fc-9f5c-a830e062b239",
+      "Name": "DacpacPackageExtractStepName",
+      "Label": "DACPAC Package Extract Step Name",
+      "HelpText": "Optional: The step in which the DACPAC package was installed. Can be left as blank if SQLScripts is a hardcoded value.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-09-16T01:42:00.0000000-07:00",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-09-16T01:42:00.0000000-07:00",
+    "OctopusVersion": "2021.3.2156",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-execute-script-with-authentication/scriptbody.ps1 b/src/step-templates/sql-execute-script-with-authentication/scriptbody.ps1
new file mode 100644
index 000000000..f0b6c7333
--- /dev/null
+++ b/src/step-templates/sql-execute-script-with-authentication/scriptbody.ps1
@@ -0,0 +1,148 @@
+function Get-DBConnection
+{
+    [CmdletBinding()]
+    param
+    (
+        [Parameter(Position = 0)]
+        [string]
+        [ValidateNotNullorEmpty()]
+        $serverInstance,
+
+        [switch]
+        $SqlAuthentication,
+
+        [string]
+        $Username,
+
+        [string]
+        $Password
+    )
+    try
+    {
+        $connection = (New-Object Microsoft.SqlServer.Management.Smo.Server($serverInstance))
+
+        if ($SqlAuthentication)
+        {
+            $connection.ConnectionContext.LoginSecure = $false
+            $connection.ConnectionContext.set_Login($Username)
+            $securePassword = ConvertTo-SecureString $Password -AsPlainText -Force
+            $connection.ConnectionContext.set_SecurePassword($securePassword)
+        }
+        
+        $connection.Refresh()
+        
+        return $connection
+    }
+    catch
+    {
+        throw $_.Exception.ToString()
+    }
+        
+}
+
+function Invoke-ExecuteSQLScript {
+
+    [CmdletBinding()]
+    param
+    (
+        [parameter(Mandatory = $true, Position = 0)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $serverInstance,
+
+        [parameter(Mandatory = $true, Position = 1)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $dbName,
+
+        [string]
+        $Authentication,
+
+        [string]
+        $Username,
+
+        [string]
+        $Password,
+
+        [string]
+        $SQLScripts
+    )
+
+    [System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | out-null
+
+    if ($Authentication -eq "SqlAuthentication")
+    {
+        $SqlServer = Get-DBConnection -serverInstance $serverInstance -SqlAuthentication -Username $Username -Password $Password
+    }
+    else
+    {
+        $SqlServer = Get-DBConnection -serverInstance $serverInstance
+    }
+
+    if ($null -eq $SqlServer.Databases[$dbName])
+    {
+        throw "Database $dbName does not exist on server $serverInstance"
+    }
+    
+    if ($null -ne $SqlServer)
+    {
+        foreach ($SQLScript in $SQLScripts.Split("`n"))
+        {
+            try 
+            {
+                $children = $SQLScript -replace ".*\\"
+                $replacematch = $children -replace "\*","\*" -replace "\.","\."
+                $parent = $SQLScript -replace $replacematch
+
+                $scripts = Get-ChildItem -Path $parent -Filter $children
+
+                foreach ($script in $scripts)
+                {
+                    $sr = New-Object System.IO.StreamReader($script.FullName)
+                    $scriptContent = $sr.ReadToEnd()
+                    $SqlServer.Databases[$dbName].ExecuteNonQuery($scriptContent)
+                    $sr.Close()
+
+					write-verbose ("Executed manual script - {0}" -f $script.Name)
+                }
+            }
+            catch 
+            {
+                Write-Error $_.Exception
+            }
+        }
+    }
+}
+
+if (Test-Path Variable:OctopusParameters)
+{
+	if ($null -ne $DacpacPackageExtractStepName -and $DacpacPackageExtractStepName -ne '')
+    {
+        Write-Verbose "Dacpac Package Extract Step Name not empty. Locating scripts located in the Dacpac Extract Step."
+        $installDirPathKey = 'Octopus.Action[{0}].Output.Package.InstallationDirectoryPath' -f $DacpacPackageExtractStepName
+        $installDirPath = $OctopusParameters[$installDirPathKey]
+        $ScriptsToExecute = Join-Path $installDirPath $SqlScripts
+    }
+    else
+    {   
+        Write-Verbose "Locating scripts from the literal entry of Octopus Parameter SQLScripts"
+        $ScriptsToExecute = $OctopusParameters["SQLScripts"]
+    }
+    if ($OctopusParameters["Authentication"] -eq "SqlAuthentication")
+    {
+        Write-Verbose "Using Sql Authentication"
+        Invoke-ExecuteSQLScript -serverInstance $OctopusParameters["serverInstance"] `
+                                -dbName $OctopusParameters["dbName"] `
+                                -Authentication $OctopusParameters["Authentication"] `
+                                -Username $OctopusParameters["Username"] `
+                                -Password $OctopusParameters["Password"] `
+                                -SQLScripts $ScriptsToExecute
+    }
+    else
+    {
+        Write-Verbose "Using Windows Integrated Authentication"
+        Invoke-ExecuteSQLScript -serverInstance $OctopusParameters["serverInstance"] `
+                                -dbName $OctopusParameters["dbName"] `
+                                -SQLScripts $ScriptsToExecute
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/sql-execute-script/metadata.json b/src/step-templates/sql-execute-script/metadata.json
new file mode 100644
index 000000000..784d9ce1e
--- /dev/null
+++ b/src/step-templates/sql-execute-script/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "73f89638-51d1-4fbb-b68f-b71ba9e86720",
+  "Name": "SQL - Execute Script",
+  "Description": "Execute a SQL script",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "802db0cd-f6eb-4cc6-9388-c5f6a4ae63ea",
+      "Name": "ConnectionString",
+      "Label": "Connection string",
+      "HelpText": "Connection string for the SQL connection. Example:\n\n    Server=.\\SQLExpress;Database=OctoFX;Integrated Security=True;\n\nBind to a variable to provide different values for different environments.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ec5a5223-3415-4cda-a888-3655f2b3e98c",
+      "Name": "SqlScript",
+      "Label": "SQL Script",
+      "HelpText": "Script to run. Can be bound to a variable split over multiple lines. Text output by the PRINT statement in SQL will be logged to the deployment log. Use 'GO' to separate multiple commands\n\nExample:\n\n    USE MASTER\n    go\n\n    BACKUP DATABASE [OctoFX] TO DISK = N'#{FilePath}' WITH  COPY_ONLY, NOFORMAT, NOINIT,  NAME = N'Backup created by Octopus', SKIP, NOREWIND, NOUNLOAD,  STATS = 10",
+      "DefaultValue": "PRINT 'Hello from SQL'",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "1360f453-ad5b-4cc9-bf56-c565f62e2542",
+      "Name": "ContinueOnError",
+      "Label": "Continue On Error",
+      "HelpText": "If set to true, an error with the SQL statement will simply write to the log and not cause an error in the deployment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d2f77e7a-a3d2-453c-a784-e3587db28e12",
+      "Name": "CommandTimeout",
+      "Label": "Command Timeout",
+      "HelpText": "The SQL Command Timeout. By default is 30 seconds.",
+      "DefaultValue": "30",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "90b930a8-39d9-43a2-991d-e2a7d374d30b",
+      "Name": "CaptureOutputToVariables",
+      "Label": "Capture SQL Output to Variable(s)",
+      "HelpText": "If set to true, output received from each command (via the `SqlInfoMessageEventHandler`) will be added to an Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) named **SQLOutput**, and will be suffixed with a number corresponding to the command that generated the output. The default is `False`.\n\nExample:\n\n1. `#{Octopus.Action[STEP NAME].Output.SQLOutput-1}`\n2. `#{Octopus.Action[STEP NAME].Output.SQLOutput-2}`",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2022-01-21T11:31:23.4260000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-01-21T11:31:23.4260000Z",
+    "OctopusVersion": "2021.3.12033",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-execute-script/scriptbody.ps1 b/src/step-templates/sql-execute-script/scriptbody.ps1
new file mode 100644
index 000000000..515dc15ea
--- /dev/null
+++ b/src/step-templates/sql-execute-script/scriptbody.ps1
@@ -0,0 +1,84 @@
+# Parameters
+$ConnectionString = $OctopusParameters["ConnectionString"]
+$ContinueOnError = $OctopusParameters["ContinueOnError"] -ieq "True"
+$SqlQuery = $OctopusParameters["SqlScript"]
+$CommandTimeout = $OctopusParameters["CommandTimeout"]
+$CaptureOutputToVariables = $OctopusParameters["CaptureOutputToVariables"] -ieq "True"
+
+# Local Variables
+$connection = New-Object System.Data.SqlClient.SqlConnection
+$connection.ConnectionString = $ConnectionString
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+$global:outputs = @()
+
+Register-ObjectEvent -InputObject $connection -EventName InfoMessage -Action {
+    Write-Output $event.SourceEventArgs
+} | Out-Null
+
+function Execute-SqlQuery($SqlQuery) {
+    $queries = [System.Text.RegularExpressions.Regex]::Split($SqlQuery, "^s*GOs*`$", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Multiline)
+
+    $queries | ForEach-Object {
+        $query = $_
+        if ((-not [String]::IsNullOrWhiteSpace($query)) -and ($query.Trim() -ine "GO")) {            
+            $command = $connection.CreateCommand()
+            $command.CommandText = $query
+            $command.CommandTimeout = $CommandTimeout
+            $command.ExecuteNonQuery() | Out-Null
+        }
+    }
+}
+
+$handler = [System.Data.SqlClient.SqlInfoMessageEventHandler] { param($sender, $event) 
+    $eventMessage = $event.Message
+    Write-Verbose $eventMessage
+    if ($CaptureOutputToVariables -eq $True) {
+        $global:outputs += $eventMessage
+    }
+}
+
+try {
+	
+    Write-Output "Attach InfoMessage event handler"
+    $connection.add_InfoMessage($handler)
+    
+    Write-Output "Connecting"
+    $connection.Open()
+
+    Write-Output "Executing script"
+    Execute-SqlQuery -SqlQuery $SqlQuery
+}
+catch {
+    if ($ContinueOnError) {
+        Write-Output "Error: $($_.Exception.Message)"
+    }
+    else {
+        throw
+    }
+}
+finally {
+    if ($null -ne $connection) {
+        Write-Output "Detach InfoMessage event handler"
+        $connection.remove_InfoMessage($handler)
+        Write-Output "Closing connection"
+        $connection.Dispose()
+    }
+}
+
+if ($CaptureOutputToVariables -eq $True) {
+    Write-Output "Capture output to variables is true"
+    Write-Output "Output Count: $($global:outputs.Length)"
+    if ($global:outputs.Length -gt 0) {
+        Write-Verbose "Setting Octopus output variables"
+        for ($i = 0; $i -lt $global:outputs.Length; $i++) {
+            $variableName = "SQLOutput-$($i+1)"
+            $variableValue = $global:outputs[$i]
+            Set-OctopusVariable -Name $variableName -Value $variableValue
+            Write-Verbose "Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}"
+        }
+    }
+    else {
+        Write-Verbose "No Octopus output variables to set"
+    }
+}
\ No newline at end of file
diff --git a/step-templates/sql-execute-scripts-ordered.json b/src/step-templates/sql-execute-scripts-ordered/metadata.json
similarity index 51%
rename from step-templates/sql-execute-scripts-ordered.json
rename to src/step-templates/sql-execute-scripts-ordered/metadata.json
index ee1c4a333..610ccbe5e 100644
--- a/step-templates/sql-execute-scripts-ordered.json
+++ b/src/step-templates/sql-execute-scripts-ordered/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "\n$paramContinueOnError = $OctopusParameters['ContinueOnError']\nif($paramContinueOnError -eq $null) { $paramContinueOnError = 'False' }\n\n$paramVersionRegEx = $OctopusParameters['VersionRegEx']\nif($paramVersionRegEx -eq $null) { $paramVersionRegEx = 'Release(\\d+)_(\\d+)\\.' }\n\n$paramPathToScripts = $OctopusParameters['PathToScripts'] \nif($paramPathToScripts -eq $null) { throw \"*** Path to scrips must be defined.\" }\n\n$paramCommandTimeout = $OctopusParameters['CommandTimeout'] \nif($paramCommandTimeout -eq $null) { $paramCommandTimeout = '0' }\n\n$paramConnectionString = $OctopusParameters['ConnectionString']\nif($paramConnectionString -eq $null) { throw \"*** Connection string must be defined.\" }\n\n$continueOnError = $paramContinueOnError.ToLower() -eq 'true'\n\n$connection = New-Object System.Data.SqlClient.SqlConnection\n$connection.ConnectionString = $paramConnectionString\n\nRegister-ObjectEvent -inputobject $connection -eventname InfoMessage -action {\n    write-host $event.SourceEventArgs\n} | Out-Null\n\nfunction Execute-SqlQuery($fileName) \n{\n    Write-Host \"Executing scripts in file '$fileName'\"\n\n    $content = gc $fileName -raw\n    $queries = [System.Text.RegularExpressions.Regex]::Split($content, '\\r\\n\\s*GO\\s*\\r\\n', [System.Text.RegularExpressions.RegexOptions]::IgnoreCase) | ? { $_ -ne '' }\n\n    foreach($q in $queries)\n    {\n        if ((-not [String]::IsNullOrWhiteSpace($q)) -and ($q.Trim().ToLowerInvariant() -ne \"go\")) \n        {   \n            $command = $connection.CreateCommand()\n            $command.CommandText = $q\n            $command.CommandTimeout = $paramCommandTimeout\n            $command.ExecuteNonQuery() | Out-Null\n        }\n    }\n}\n\ntry \n{\n    Write-Host \"Executing scripts in folder '$paramPathToScripts'\"\n\n    Write-Host \"Sorting script files based on regular expression '$paramVersionRegEx'\"\n    \n    Write-Host \"Opening SQL server connection...\"\n    $connection.Open()\n\n    Get-ChildItem $paramPathToScripts *.sql |\n        % { \n            $matches = [System.Text.RegularExpressions.Regex]::Match($_.Name, $paramVersionRegEx, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase )\n            new-object psobject -Property @{ \"File\"=$_; \"Level1\"=$matches.Groups[1]; \"Level2\"=$matches.Groups[2] }\n          } | \n          sort Level1, Level2 |\n          % {\n              Execute-SqlQuery -fileName $_.File.FullName\n            }\n}\ncatch \n{\n\tif ($continueOnError) \n\t{\n\t\tWrite-Host $_.Exception.Message\n\t}\n\telse \n\t{\n\t\tthrow\n\t}\n}\nfinally \n{\n    Write-Host \"Closing connection.\"\n    $connection.Dispose()\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -76,11 +76,11 @@
       "Links": {}
     }
   ],
-  "LastModifiedBy":"tylerrbrown",
+  "LastModifiedBy": "tylerrbrown",
   "$Meta": {
-    "ExportedAt": "2017-03-20T21:28:30.917Z",
+    "ExportedAt": "2017-03-20T21:28:30.9170000Z",
     "OctopusVersion": "3.11.12",
     "Type": "ActionTemplate"
   },
-  "Category":"SQL"
+  "Category": "SQL"
 }
diff --git a/src/step-templates/sql-execute-scripts-ordered/scriptbody.ps1 b/src/step-templates/sql-execute-scripts-ordered/scriptbody.ps1
new file mode 100644
index 000000000..65e79ef43
--- /dev/null
+++ b/src/step-templates/sql-execute-scripts-ordered/scriptbody.ps1
@@ -0,0 +1,79 @@
+
+$paramContinueOnError = $OctopusParameters['ContinueOnError']
+if($paramContinueOnError -eq $null) { $paramContinueOnError = 'False' }
+
+$paramVersionRegEx = $OctopusParameters['VersionRegEx']
+if($paramVersionRegEx -eq $null) { $paramVersionRegEx = 'Release(\d+)_(\d+)\.' }
+
+$paramPathToScripts = $OctopusParameters['PathToScripts'] 
+if($paramPathToScripts -eq $null) { throw "*** Path to scrips must be defined." }
+
+$paramCommandTimeout = $OctopusParameters['CommandTimeout'] 
+if($paramCommandTimeout -eq $null) { $paramCommandTimeout = '0' }
+
+$paramConnectionString = $OctopusParameters['ConnectionString']
+if($paramConnectionString -eq $null) { throw "*** Connection string must be defined." }
+
+$continueOnError = $paramContinueOnError.ToLower() -eq 'true'
+
+$connection = New-Object System.Data.SqlClient.SqlConnection
+$connection.ConnectionString = $paramConnectionString
+
+Register-ObjectEvent -inputobject $connection -eventname InfoMessage -action {
+    write-host $event.SourceEventArgs
+} | Out-Null
+
+function Execute-SqlQuery($fileName) 
+{
+    Write-Host "Executing scripts in file '$fileName'"
+
+    $content = gc $fileName -raw
+    $queries = [System.Text.RegularExpressions.Regex]::Split($content, '\r\n\s*GO\s*\r\n', [System.Text.RegularExpressions.RegexOptions]::IgnoreCase) | ? { $_ -ne '' }
+
+    foreach($q in $queries)
+    {
+        if ((-not [String]::IsNullOrWhiteSpace($q)) -and ($q.Trim().ToLowerInvariant() -ne "go")) 
+        {   
+            $command = $connection.CreateCommand()
+            $command.CommandText = $q
+            $command.CommandTimeout = $paramCommandTimeout
+            $command.ExecuteNonQuery() | Out-Null
+        }
+    }
+}
+
+try 
+{
+    Write-Host "Executing scripts in folder '$paramPathToScripts'"
+
+    Write-Host "Sorting script files based on regular expression '$paramVersionRegEx'"
+    
+    Write-Host "Opening SQL server connection..."
+    $connection.Open()
+
+    Get-ChildItem $paramPathToScripts *.sql |
+        % { 
+            $matches = [System.Text.RegularExpressions.Regex]::Match($_.Name, $paramVersionRegEx, [System.Text.RegularExpressions.RegexOptions]::IgnoreCase )
+            new-object psobject -Property @{ "File"=$_; "Level1"=$matches.Groups[1]; "Level2"=$matches.Groups[2] }
+          } | 
+          sort Level1, Level2 |
+          % {
+              Execute-SqlQuery -fileName $_.File.FullName
+            }
+}
+catch 
+{
+	if ($continueOnError) 
+	{
+		Write-Host $_.Exception.Message
+	}
+	else 
+	{
+		throw
+	}
+}
+finally 
+{
+    Write-Host "Closing connection."
+    $connection.Dispose()
+}
diff --git a/src/step-templates/sql-execute-sql-agent-job/metadata.json b/src/step-templates/sql-execute-sql-agent-job/metadata.json
new file mode 100644
index 000000000..8cd17bdc5
--- /dev/null
+++ b/src/step-templates/sql-execute-sql-agent-job/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "7bf5fc6b-9174-48ab-8da5-abf0eeef297a",
+  "Name": "SQL - Execute SQL Agent Job",
+  "Description": "Execute a SQL Agent Job and wait for results.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ConnectionString",
+      "Label": "Connection String",
+      "HelpText": "Connection string for the SQL connection. Example:\n\nServer=.\\SQLExpress;Database=OctoFX;Integrated Security=True;\nBind to a variable to provide different values for different environments.",
+      "DefaultValue": "Server=;Database=msdb;Integrated Security=True;",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "JobName",
+      "Label": "Job Name",
+      "HelpText": "SQL Agent job to run. Can be bound to a variable split. \nText output by the PRINT statement in SQL will be logged to the deployment log.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Timeout",
+      "Label": "Timeout Value",
+      "HelpText": "The maximum length of time in 5 second intervals to wait for job completion. \nThe default value is 600 seconds (120 intervals x 5s = 600s)",
+      "DefaultValue": "120",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Step",
+      "Label": "Last Job Step",
+      "HelpText": "The number of the last step to run for the given job. \nThe default value is 1",
+      "DefaultValue": 1,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-04-06T13:01:31.9480000-07:00",
+  "LastModifiedBy": "chrisgelhaus",
+  "$Meta": {
+    "ExportedAt": "2015-04-06T13:01:54.5520000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-execute-sql-agent-job/scriptbody.ps1 b/src/step-templates/sql-execute-sql-agent-job/scriptbody.ps1
new file mode 100644
index 000000000..b5ccccf99
--- /dev/null
+++ b/src/step-templates/sql-execute-sql-agent-job/scriptbody.ps1
@@ -0,0 +1,119 @@
+$connection = New-Object System.Data.SqlClient.SqlConnection
+$connection.ConnectionString = $OctopusParameters['ConnectionString']
+Register-ObjectEvent -inputobject $connection -eventname InfoMessage -action {
+    write-host $event.SourceEventArgs
+} | Out-Null
+
+function Run-SqlAgentJob($jobname,$timeout,$stepid) {
+	$sqlstring = @"
+		SET NOCOUNT ON
+
+		--Declaration
+		DECLARE @jobtorun VARCHAR(MAX) = '<JobName>'
+		DECLARE @jobid	VARCHAR(50) = ''
+		DECLARE @previousid INT
+        DECLARE @previous_status INT 
+		declare @newid	INT
+		DECLARE @runstatus	INT
+
+		CREATE TABLE #results
+		(
+			instance_id INT,
+			job_id	varchar(255),
+			job_name VARCHAR(255),
+			step_id	INT,
+			step_name VARCHAR(255),
+			sql_message_id INT,
+			sql_severity INT,
+			message VARCHAR(MAX),
+			run_status INT,
+			run_date INT,
+			run_time INT,
+			run_duration INT,
+			operator_emailed VARCHAR(255),
+			operator_netsent VARCHAR(255),
+			operator_paged VARCHAR(255),
+			retries_attempted INT,
+			server sysname
+		)
+
+		--Get Job ID
+		SELECT @jobid = job_id FROM msdb.dbo.sysjobs where name = @jobtorun
+		IF @jobid = ''
+        BEGIN 
+        	RAISERROR ('Job Name Not Found.', -- Message text.
+        				16, -- Severity.
+        				1 -- State.
+        				);
+        	RETURN
+        END
+
+		--Store previous job history
+		INSERT INTO #results
+		EXEC sp_help_jobhistory @job_id = @jobid, @mode = 'full', @step_id = <StepId>
+        SELECT @previousid = t.instance_id, @previous_status = t.run_status FROM (SELECT TOP 1 instance_id, run_status FROM #results ORDER BY instance_id DESC) t
+        PRINT 'Previous job ID: ' + CAST(@previousid AS VARCHAR(5)) + '		Run Status:' + CAST(@previous_status AS VARCHAR(5))
+		SET @newid = @previousid
+
+		--Start SQL Agent Job
+		EXEC msdb.dbo.sp_start_job @jobtorun
+
+		--Loop for x seconds or until jobhistory has been updated with a new record
+		DECLARE @loopct	INT = 1
+		WHILE (@newid = @previousid) and (@loopct < <Timeout>)
+		BEGIN
+			TRUNCATE TABLE #results
+			INSERT INTO #results
+				EXEC sp_help_jobhistory @job_id = @jobid, @mode = 'full', @step_id = <StepId>
+
+			SELECT @newid = instance_id, @runstatus = run_status FROM #results WHERE instance_id = (SELECT MAX(instance_id) FROM #results)
+
+			PRINT 'Poll ' + CAST(@loopct AS VARCHAR(5)) + '		Time: ' + CONVERT(VARCHAR(8), GETDATE(), 108) 
+
+			SET @loopct += 1
+			WAITFOR DELAY '00:00:05'
+		END
+
+		IF @newid = @previousid
+			RAISERROR ('Job did not complete in time.', -- Message text.
+					   16, -- Severity.
+					   1 -- State.
+					   );
+		IF @runstatus <> 1
+			RAISERROR ('Job did not complete successfully.', -- Message text.
+					   16, -- Severity.
+					   1 -- State.
+					   );
+
+		PRINT ''
+		PRINT 'Time: ' + CONVERT(VARCHAR(8), GETDATE(), 108) + '	New Job ID:' + CAST(@newid AS VARCHAR(5)) + '		Run Status:' + CAST(@runstatus AS VARCHAR(5))
+
+		--Cleanup
+		DROP TABLE #results
+"@
+
+    $jobname = $jobname -replace "'", "''"
+	$sqlstring = $sqlstring -replace "<JobName>", $jobname
+	$sqlstring = $sqlstring -replace "<Timeout>", $timeout
+	$sqlstring = $sqlstring -replace "<StepId>", $stepid
+	
+	#Debug Code
+	#Write-Host $sqlstring
+	
+	$command = $connection.CreateCommand()
+	$command.CommandText = $sqlstring
+	$command.CommandTimeout = 0
+	$command.ExecuteNonQuery() | Out-Null
+}
+
+Write-Host "Connecting"
+try {
+    $connection.Open()
+
+    Write-Host "Running SQL Agent Job"
+    Run-SqlAgentJob -jobname $OctopusParameters['JobName'] -timeout $OctopusParameters['Timeout'] -step $OctopusParameters['Step']
+}
+finally {
+    Write-Host "Closing connection"
+    $connection.Dispose()
+}
diff --git a/src/step-templates/sql-execute-sql-files/metadata.json b/src/step-templates/sql-execute-sql-files/metadata.json
new file mode 100644
index 000000000..4f132f340
--- /dev/null
+++ b/src/step-templates/sql-execute-sql-files/metadata.json
@@ -0,0 +1,130 @@
+{
+  "Id": "2bd3b8ef-35b4-43e9-b6de-8e0c515f3f10",
+  "Name": "SQL - Execute SQL Script Files",
+  "Description": "Executes SQL script file(s) against the specified database using the `SQLServer` Powershell Module.  This template includes an `Authentication` selector and supports SQL Authentication, Windows Authentication, and Azure Managed Identity.\n\nNote: If the `SqlServer` PowerShell module is not present, the template will download a temporary copy to perform the task.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "8473acaf-aaeb-4c23-923a-91f664290f16",
+      "Name": "template.Package",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "template.Package",
+        "Purpose": ""
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "1f2b60c9-b85c-4c23-a313-fc18e82cd500",
+      "Name": "serverInstance",
+      "Label": "Server Instance Name",
+      "HelpText": "The SQL Server Instance name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9884b8c1-01a0-4c6f-97b1-ff5146fa0836",
+      "Name": "dbName",
+      "Label": "Database Name",
+      "HelpText": "The database name",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "05dc20d9-f75c-4971-9efb-e9aaad82a3a9",
+      "Name": "Authentication",
+      "Label": "Authentication",
+      "HelpText": "The authentication method",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "SqlAuthentication|SQL Authentication\nWindowsIntegrated|Windows Integrated\nAzureADManaged|Azure Active Directory Managed Identity"
+      }
+    },
+    {
+      "Id": "4c2fc1b4-bdd0-4a9a-adb1-da1e818e62bc",
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "The username to use to connect (only applies with SqlAuthentication selected)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "819f9b19-042d-42d8-9d19-5f5bf28c06b7",
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "The password to use to connect (only applies with SqlAuthentication selected)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "dd22f955-8317-4d58-8173-fc7d44df1192",
+      "Name": "SQLScripts",
+      "Label": "SQL Scripts",
+      "HelpText": "Provide the path to search for matching scripts, each one on a new line. Wildcards for filenames only are accepted, e.g.\n- `/Scripts/*.sql`\n- `/Scripts/SQL/Deploy*.sql`\n- `src/Permissions/Pre*Permissions.sql`\n\n**Please Note:** The step looks for files relative to the extracted package location, and does *not* recursively search the folder hierarchy.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3bfed638-6649-438f-a02b-353e36a63c87",
+      "Name": "template.Package",
+      "Label": "Package",
+      "HelpText": "Package containing the SQL scripts to be executed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "c6b85a12-bf2f-4963-8526-ebbe8f14707d",
+      "Name": "ExecuteSQL.DisplaySQLServerOutput",
+      "Label": "Display SQL Output",
+      "HelpText": "You can display SQL Server message output, such as those that result from the SQL `PRINT` statement, by checking this parameter",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "52d8f897-696b-4f77-87b5-383d6ce559c3",
+      "Name": "ExecuteSQL.TrustServerCertificate",
+      "Label": "Trust Server Certificate",
+      "HelpText": "Force connection to trust the server certificate.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2024-07-12T22:26:51.4800000Z",
+    "OctopusVersion": "2024.2.9303",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-execute-sql-files/scriptbody.ps1 b/src/step-templates/sql-execute-sql-files/scriptbody.ps1
new file mode 100644
index 000000000..bbea06114
--- /dev/null
+++ b/src/step-templates/sql-execute-sql-files/scriptbody.ps1
@@ -0,0 +1,208 @@
+
+function Get-ModuleInstalled {
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {
+        # It is installed
+        return $true
+    }
+    else {
+        # Module not installed
+        return $false 
+    }
+}
+
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Install-PowerShellModule {
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+    
+    # Set TLS order
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+    # Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+        # Display that we need the nuget package provider
+        Write-Output "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+}
+
+
+function Invoke-ExecuteSQLScript {
+
+    [CmdletBinding()]
+    param
+    (
+        [parameter(Mandatory = $true, Position = 0)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $serverInstance,
+
+        [parameter(Mandatory = $true, Position = 1)]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $dbName,
+
+        [string]
+        $Authentication,
+
+        [string]
+        $SQLScripts,
+
+        [bool]
+        $DisplaySqlServerOutput,
+        
+        [bool]
+        $TrustServerCertificate
+    )
+    
+    # Check to see if SqlServer module is installed
+    if ((Get-ModuleInstalled -PowerShellModuleName "SqlServer") -ne $true) {
+        # Display message
+        Write-Output "PowerShell module SqlServer not present, downloading temporary copy ..."
+
+        # Download and install temporary copy
+        Install-PowerShellModule -PowerShellModuleName "SqlServer" -LocalModulesPath $LocalModules
+    }
+
+    # Display
+    Write-Output "Importing module SqlServer ..."
+
+    # Import the module
+    Import-Module -Name "SqlServer"
+    
+    $ExtractedPackageLocation = $($OctopusParameters['Octopus.Action.Package[template.Package].ExtractedPath'])
+
+    $matchingScripts = @()
+
+    # 1. Locate matching scripts
+    foreach ($SQLScript in $SQLScripts.Split("`n", [System.StringSplitOptions]::RemoveEmptyEntries)) {
+        try {
+            
+            Write-Verbose "Searching for scripts matching '$($SQLScript)'"
+            $scripts = @()
+            $parent = Split-Path -Path $SQLScript -Parent
+            $leaf = Split-Path -Path $SQLScript -Leaf
+            Write-Verbose "Parent: '$parent', Leaf: '$leaf'"
+            if (-not [string]::IsNullOrWhiteSpace($parent)) {
+                $path = Join-Path $ExtractedPackageLocation $parent
+                if (Test-Path $path) {
+                    Write-Verbose "Searching for items in '$path' matching '$leaf'"
+                    $scripts += @(Get-ChildItem -Path $path -Filter $leaf)
+                }
+                else {
+                    Write-Warning "Path '$path' not found. Please check the path exists, and is relative to the package contents."
+                }
+            }
+            else {
+                Write-Verbose "Searching in root of package for '$leaf'"
+                $scripts += @(Get-ChildItem -Path $ExtractedPackageLocation -Filter $leaf)
+            }
+    
+            Write-Output "Found $($scripts.Count) SQL scripts matching input '$SQLScript'"
+
+            $matchingScripts += $scripts
+        }
+        catch {
+            Write-Error $_.Exception
+        }
+    }
+    
+    # Create arguments hash table
+    $sqlcmdArguments = @{}
+
+	# Add bound parameters
+    $sqlcmdArguments.Add("ServerInstance", $serverInstance)
+    $sqlcmdArguments.Add("Database", $dbName)
+    #$sqlcmdArguments.Add("Query", $SQLScripts)
+    
+    if ($DisplaySqlServerOutput)
+    {
+    	Write-Host "Adding Verbose to argument list to display output ..."
+        $sqlcmdArguments.Add("Verbose", $DisplaySqlServerOutput)
+    }
+    
+    if ($TrustServerCertificate)
+    {
+    	$sqlcmdArguments.Add("TrustServerCertificate", $TrustServerCertificate)
+    }
+
+    # Only execute if we have matching scripts
+    if ($matchingScripts.Count -gt 0) {
+        foreach ($script in $matchingScripts) {
+            $sr = New-Object System.IO.StreamReader($script.FullName)
+            $scriptContent = $sr.ReadToEnd()
+        
+            # Execute based on selected authentication method
+            switch ($Authentication) {
+                "AzureADManaged" {
+                    # Get login token
+                    Write-Verbose "Authenticating with Azure Managed Identity ..."
+                
+                    $response = Invoke-WebRequest -Uri 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fdatabase.windows.net%2F' -Method GET -Headers @{Metadata = "true" } -UseBasicParsing
+                    $content = $response.Content | ConvertFrom-Json
+                    $AccessToken = $content.access_token
+                    
+                    $sqlcmdArguments.Add("AccessToken", $AccessToken)
+
+                    break
+                }
+                "SqlAuthentication" {
+                    Write-Verbose "Authentication with SQL Authentication ..."
+                    $sqlcmdArguments.Add("Username", $username)
+                    $sqlcmdArguments.Add("Password", $password)
+
+                    break
+                }
+                "WindowsIntegrated" {
+                    Write-Verbose "Authenticating with Windows Authentication ..."
+                    break
+                }
+            }
+            
+            $sqlcmdArguments.Add("Query", $scriptContent)
+            
+            # Invoke sql cmd
+            Invoke-SqlCmd @sqlcmdArguments
+        
+            $sr.Close()
+
+            Write-Verbose ("Executed manual script - {0}" -f $script.Name)
+        }
+    }
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath"
+
+if (Test-Path Variable:OctopusParameters) {
+    Write-Verbose "Locating scripts from the literal entry of Octopus Parameter SQLScripts"
+    $ScriptsToExecute = $OctopusParameters["SQLScripts"]
+    $DisplaySqlServerOutput = $OctopusParameters["ExecuteSQL.DisplaySQLServerOutput"] -ieq "True"
+    $TemplateTrustServerCertificate = [System.Convert]::ToBoolean($OctopusParameters["ExecuteSQL.TrustServerCertificate"])
+    
+    Invoke-ExecuteSQLScript -serverInstance $OctopusParameters["serverInstance"] `
+        -dbName $OctopusParameters["dbName"] `
+        -Authentication $OctopusParameters["Authentication"] `
+        -SQLScripts $ScriptsToExecute `
+        -DisplaySqlServerOutput $DisplaySqlServerOutput `
+        -TrustServerCertificate $TemplateTrustServerCertificate
+}
\ No newline at end of file
diff --git a/src/step-templates/sql-fix-orphaned-user/metadata.json b/src/step-templates/sql-fix-orphaned-user/metadata.json
new file mode 100644
index 000000000..014a73017
--- /dev/null
+++ b/src/step-templates/sql-fix-orphaned-user/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "e56e9b28-1cf2-4646-af70-93e31bcdb86b",
+  "Name": "SQL - Fix Orphaned User",
+  "Description": "Will fix an orphaned user in the database by re-associating the SID.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "083897f2-d65d-45a5-b9fb-ef760a727303",
+      "Name": "autoFixSqlServer",
+      "Label": "SQL Server",
+      "HelpText": "The SQL Server to perform the work on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ead6a85f-71e6-4c42-b6b2-ef048edabcbd",
+      "Name": "autoFixSqlLoginUserWhoHasRights",
+      "Label": "SQL Login",
+      "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "eb648cdd-0390-4569-8af9-e4e51946585f",
+      "Name": "autoFixSqlLoginPasswordWhoHasRights",
+      "Label": "SQL Password",
+      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "835159c0-7c5a-4714-ad9e-888dd29e6cd3",
+      "Name": "autoFixDatabaseName",
+      "Label": "Database Name",
+      "HelpText": "The name of the database to create the user on",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7be27e8c-efef-4700-8b7f-fba78a25788f",
+      "Name": "autoFixSqlLogin",
+      "Label": "SQL Login",
+      "HelpText": "The username to attach to the database if it does not exist",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-07-22T00:41:40.0860000Z",
+    "OctopusVersion": "2020.2.16",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-fix-orphaned-user/scriptbody.ps1 b/src/step-templates/sql-fix-orphaned-user/scriptbody.ps1
new file mode 100644
index 000000000..ee7020c4a
--- /dev/null
+++ b/src/step-templates/sql-fix-orphaned-user/scriptbody.ps1
@@ -0,0 +1,108 @@
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Install-PowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+    
+    # Set TLS order
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+
+}
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+# Check to see if SqlServer module is installed
+if (((Get-ModuleInstalled -PowerShellModuleName "SqlServer") -ne $true) -and ((Get-ModuleInstalled -PowerShellModuleName "SQLPS") -ne $true))
+{
+  # Display message
+  Write-Output "PowerShell module SqlServer not present, downloading temporary copy ..."
+
+  # Download and install temporary copy
+  Install-PowerShellModule -PowerShellModuleName "SqlServer" -LocalModulesPath $LocalModules
+  
+  # Display
+  Write-Output "Importing module SqlServer ..."
+
+  # Import the module
+  Import-Module -Name "SqlServer"  
+}
+
+Write-Host "SqlLoginWhoHasRights $autoFixSqlLoginUserWhoHasRights"
+Write-Host "SqlServer $autoFixSqlServer"
+Write-Host "DatabaseName $autoFixDatabaseName"
+Write-Host "SqlLogin $autoFixSqlLogin"
+
+if ([string]::IsNullOrWhiteSpace($autoFixSqlLoginUserWhoHasRights) -eq $true){
+	Write-Host "No username found, using integrated security"
+    $connectionString = "Server=$autoFixSqlServer;Database=$autoFixDatabaseName;integrated security=true;"
+}
+else {
+	Write-Host "Username found, using SQL Authentication"
+    $connectionString = "Server=$autoFixSqlServer;Database=$autoFixDatabaseName;User ID=$autoFixSqlLoginUserWhoHasRights;Password=$autoFixSqlLoginPasswordWhoHasRights;"
+}
+
+# Build sql query
+$sqlQuery = @"
+DECLARE @OrphanedUsers TABLE
+(
+	UserName VARCHAR(50) null,
+	UserSID VARBINARY(100) null
+)
+
+INSERT INTO @OrphanedUsers EXEC sp_change_users_login 'Report'
+
+IF EXISTS ( SELECT UserName FROM @OrphanedUsers WHERE UserName = '$autoFixSqlLogin' )
+	BEGIN
+		PRINT '$autoFixSqlLogin is orphaned, fixing ...'
+        EXEC sp_change_users_login 'Auto_Fix', '$autoFixSqlLogin'
+    END
+ELSE
+	PRINT '$autoFixSqlLogin is not orphaned.'
+"@
+
+# Execute the command to find orphaned users, then fix if matching
+Invoke-SqlCmd -ConnectionString $connectionString -Query $sqlQuery -Verbose
+
diff --git a/src/step-templates/sql-restore-database/metadata.json b/src/step-templates/sql-restore-database/metadata.json
new file mode 100644
index 000000000..baf206af1
--- /dev/null
+++ b/src/step-templates/sql-restore-database/metadata.json
@@ -0,0 +1,114 @@
+{
+  "Id": "469b6d9d-761a-4f94-9745-20e9c2f93841",
+  "Name": "SQL - Restore Database",
+  "Description": "Restore a MS SQL Server database to the file system.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Server",
+      "Label": "Server",
+      "HelpText": "The name of the SQL Server instance that the database resides in.",
+      "DefaultValue": ".",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Database",
+      "Label": "Database",
+      "HelpText": "The name of the database to restore.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BackupDirectory",
+      "Label": "Backup Directory",
+      "HelpText": "The backup directory to retrieve the database backup from.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SqlLogin",
+      "Label": "SQL login",
+      "HelpText": "The SQL auth login to connect with. If specified, the SQL Password must also be entered.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SqlPassword",
+      "Label": "SQL password",
+      "HelpText": "The password for the SQL auth login to connect with. Only used if SQL Login is specified.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "Compression",
+      "Label": "Compression Option",
+      "HelpText": "- 0  -   Use the default backup compression server configuration\n- 1  -   Enable the backup compression\n- 2  -   Disable the backup compression",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "0|Default\n1|Enabled\n2|Disabled"
+      }
+    },
+    {
+      "Name": "Devices",
+      "Label": "Devices",
+      "HelpText": "The number of backup devices to use for the backup.",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "1|1\n2|2\n3|3\n4|4"
+      }
+    },
+    {
+      "Name": "Stamp",
+      "Label": "Backup file suffix",
+      "HelpText": "Specify a suffix to add to the backup file names. If left blank, the current date, in the format given by the DateFormat parameter, is used.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Name": "Separator",
+      "Label": "Separator",
+      "HelpText": "Separator used between database name and suffix.",
+      "DefaultValue": "_"
+    },
+    {
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Name": "DateFormat",
+      "Label": "Date Format",
+      "HelpText": "Date format to use if backup is suffixed with a date stamp (e.g. yyyy-MM-dd)",
+      "DefaultValue": "yyyy-MM-dd"
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2016-03-24T09:32:09.2720000-07:00",
+    "OctopusVersion": "3.2.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-restore-database/scriptbody.ps1 b/src/step-templates/sql-restore-database/scriptbody.ps1
new file mode 100644
index 000000000..065aec25f
--- /dev/null
+++ b/src/step-templates/sql-restore-database/scriptbody.ps1
@@ -0,0 +1,143 @@
+$ServerName = $OctopusParameters['Server']
+$DatabaseName = $OctopusParameters['Database']
+$BackupDirectory = $OctopusParameters['BackupDirectory']
+$CompressionOption = [int]$OctopusParameters['Compression']
+$Devices = [int]$OctopusParameters['Devices']
+$Stamp = $OctopusParameters['Stamp']
+$SqlLogin = $OctopusParameters['SqlLogin']
+$SqlPassword = $OctopusParameters['SqlPassword']
+$DateFormat = $OctopusParameters['DateFormat']
+$Separator = $OctopusParameters['Separator']
+$ErrorActionPreference = "Stop"
+
+function ConnectToDatabase()
+{
+    param($server, $SqlLogin, $SqlPassword)
+        
+    if ($SqlLogin -ne $null) {
+
+        if ($SqlPassword -eq $null) {
+            throw "SQL Password must be specified when using SQL authentication."
+        }
+    
+        $server.ConnectionContext.LoginSecure = $false
+        $server.ConnectionContext.Login = $SqlLogin
+        $server.ConnectionContext.Password = $SqlPassword
+    
+        Write-Host "Connecting to server using SQL authentication as $SqlLogin."
+        $server = New-Object Microsoft.SqlServer.Management.Smo.Server $server.ConnectionContext
+    }
+    else {
+        Write-Host "Connecting to server using Windows authentication."
+    }
+
+    try {
+        $server.ConnectionContext.Connect()
+    } catch {
+        Write-Error "An error occurred connecting to the database server!`r`n$($_.Exception.ToString())"
+    }
+}
+
+function AddPercentHandler {
+    param($smoBackupRestore, $action)
+
+    $percentEventHandler = [Microsoft.SqlServer.Management.Smo.PercentCompleteEventHandler] { Write-Host $dbName $action $_.Percent "%" }
+    $completedEventHandler = [Microsoft.SqlServer.Management.Common.ServerMessageEventHandler] { Write-Host $_.Error.Message}
+        
+    $smoBackupRestore.add_PercentComplete($percentEventHandler)
+    $smoBackupRestore.add_Complete($completedEventHandler)
+    $smoBackupRestore.PercentCompleteNotification=10
+}
+
+function CreateDevice {
+    param($smoBackupRestore, $directory, $name)
+
+    $devicePath = Join-Path $directory ($name)
+    $smoBackupRestore.Devices.AddDevice($devicePath, "File")    
+    return $devicePath
+}
+
+function CreateDevices {
+    param($smoBackupRestore, $devices, $directory, $dbName)
+        
+    $targetPaths = New-Object System.Collections.Generic.List[System.String]
+    
+    if ($devices -eq 1){
+        $deviceName = $dbName + $Separator + $timestamp + ".bak"
+        $targetPath = CreateDevice $smoBackupRestore $directory $deviceName
+        $targetPaths.Add($targetPath)
+    } else {
+        for ($i=1; $i -le $devices; $i++){
+            $deviceName = $dbName + "_" + $timestamp + "_" + $i + ".bak"
+            $targetPath = CreateDevice $smoBackupRestore $directory $deviceName
+            $targetPaths.Add($targetPath)
+        }
+    }
+    return $targetPaths
+}
+
+function RelocateFiles{
+    param($smoRestore)
+    
+    foreach($file in $smoRestore.ReadFileList($server))
+    {
+        $relocateFile = New-Object Microsoft.SqlServer.Management.Smo.RelocateFile
+        $relocateFile.PhysicalFileName = $server.Settings.DefaultFile + $file.LogicalName + [System.IO.Path]::GetExtension($file.PhysicalName)
+        $relocateFile.LogicalFileName = $file.LogicalName
+        $smoRestore.RelocateFiles.Add($relocateFile)
+    }
+}
+
+function RestoreDatabase {
+    param($dbName, $devices)
+
+    $smoRestore = New-Object Microsoft.SqlServer.Management.Smo.Restore
+    $targetPaths = CreateDevices $smoRestore $devices $BackupDirectory $dbName $timestamp
+
+    Write-Host "Attempting to restore database $ServerName.$dbName from:"
+    $targetPaths
+    Write-Host ""
+
+    foreach ($path in $targetPaths) {
+        if (-not (Test-Path $path)) {
+            Write-Host "Cannot find backup device "($path)
+            return          
+        }
+    }
+    
+    if ($server.Databases[$dbName] -ne $null)  
+    {  
+        $server.KillAllProcesses($dbName)
+        $server.KillDatabase($dbName)
+    }
+
+    $smoRestore.Action = "Database"
+    $smoRestore.NoRecovery = $false;
+    $smoRestore.ReplaceDatabase = $true;
+    $smoRestore.Database = $dbName
+
+    RelocateFiles $smoRestore
+    
+    try {
+        AddPercentHandler $smoRestore "restored"        
+        $smoRestore.SqlRestore($server)
+    } catch {
+        Write-Error "An error occurred restoring the database!`r`n$($_.Exception.ToString())"
+    }
+        
+    Write-Host "Restore completed successfully."
+}
+
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | Out-Null
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SmoExtended") | Out-Null
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.ConnectionInfo") | Out-Null
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SmoEnum") | Out-Null
+ 
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server $ServerName
+
+ConnectToDatabase $server $SqlLogin $SqlPassword
+
+$database = $server.Databases | Where-Object { $_.Name -eq $DatabaseName }
+$timestamp = if(-not [string]::IsNullOrEmpty($Stamp)) { $Stamp } else { Get-Date -format $DateFormat }
+
+RestoreDatabase $DatabaseName $Devices
\ No newline at end of file
diff --git a/step-templates/sql-smo-change-usermode.json b/src/step-templates/sql-smo-change-usermode/metadata.json
similarity index 62%
rename from step-templates/sql-smo-change-usermode.json
rename to src/step-templates/sql-smo-change-usermode/metadata.json
index 625890491..ef6075f3b 100644
--- a/step-templates/sql-smo-change-usermode.json
+++ b/src/step-templates/sql-smo-change-usermode/metadata.json
@@ -6,7 +6,7 @@
   "Version": 2,
   "CommunityActionTemplateId": null,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | out-null\n\n$SqlUsername = $OctopusParameters['SqlUsername']\n$SqlServer = $OctopusParameters['SqlServer']\n$SqlPassword = $OctopusParameters['SqlPassword']\n$SqlDatabase = $OctopusParameters['SqlDatabase']\n$UserAccess = $OctopusParameters['UserAccess']\n$Condition = $OctopusParameters['Condition']\n\ntry\n{    \n    $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $SqlServer\n  \n    if ($SqlUsername -and $SqlPassword)\n    {\n        Write-Host \"Connecting to $SqlServer as $SqlUsername\"\n        $server.ConnectionContext.LoginSecure = $false\n        $server.ConnectionContext.set_Login($SqlUsername)\n        $server.ConnectionContext.set_Password($SqlPassword)      \n    } \n    else {\n        Write-Host \"Connecting to $SqlServer with integrated security\"\n        $server.ConnectionContext.LoginSecure = $true\n    }\n    \n    $db = $server.Databases[$SqlDatabase]\n\tif ($db -eq $null)\n\t{\n        Write-Host \"Database $SqlDatabase not found, skipping step...\"\n\t} else {\n\t    Write-Host \"Setting user mode to $UserAccess for database $SqlDatabase with condition $Condition\"\n        $db.UserAccess = $UserAccess\n\n        if ($Condition -eq 'Force'){\n            $db.Alter([Microsoft.SqlServer.Management.Smo.TerminationClause]::RollbackTransactionsImmediately)\n        } elseif ($Condition -eq 'Fail'){\n            $db.Alter([Microsoft.SqlServer.Management.Smo.TerminationClause]::FailOnOpenTransactions)\n        } else {\n            $db.Alter()\n        }\n\t}\n}\ncatch\n{    \n    $error[0] | format-list -force\n    Exit 1\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
@@ -85,12 +85,12 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2017-03-29T12:50:15.802Z",
+    "ExportedAt": "2017-03-29T12:50:15.8020000Z",
     "OctopusVersion": "3.10.0",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-smo-change-usermode/scriptbody.ps1 b/src/step-templates/sql-smo-change-usermode/scriptbody.ps1
new file mode 100644
index 000000000..4f7d1deed
--- /dev/null
+++ b/src/step-templates/sql-smo-change-usermode/scriptbody.ps1
@@ -0,0 +1,47 @@
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | out-null
+
+$SqlUsername = $OctopusParameters['SqlUsername']
+$SqlServer = $OctopusParameters['SqlServer']
+$SqlPassword = $OctopusParameters['SqlPassword']
+$SqlDatabase = $OctopusParameters['SqlDatabase']
+$UserAccess = $OctopusParameters['UserAccess']
+$Condition = $OctopusParameters['Condition']
+
+try
+{    
+    $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $SqlServer
+  
+    if ($SqlUsername -and $SqlPassword)
+    {
+        Write-Host "Connecting to $SqlServer as $SqlUsername"
+        $server.ConnectionContext.LoginSecure = $false
+        $server.ConnectionContext.set_Login($SqlUsername)
+        $server.ConnectionContext.set_Password($SqlPassword)      
+    } 
+    else {
+        Write-Host "Connecting to $SqlServer with integrated security"
+        $server.ConnectionContext.LoginSecure = $true
+    }
+    
+    $db = $server.Databases[$SqlDatabase]
+	if ($db -eq $null)
+	{
+        Write-Host "Database $SqlDatabase not found, skipping step..."
+	} else {
+	    Write-Host "Setting user mode to $UserAccess for database $SqlDatabase with condition $Condition"
+        $db.UserAccess = $UserAccess
+
+        if ($Condition -eq 'Force'){
+            $db.Alter([Microsoft.SqlServer.Management.Smo.TerminationClause]::RollbackTransactionsImmediately)
+        } elseif ($Condition -eq 'Fail'){
+            $db.Alter([Microsoft.SqlServer.Management.Smo.TerminationClause]::FailOnOpenTransactions)
+        } else {
+            $db.Alter()
+        }
+	}
+}
+catch
+{    
+    $error[0] | format-list -force
+    Exit 1
+}
\ No newline at end of file
diff --git a/step-templates/sql-smo-create-database.json b/src/step-templates/sql-smo-create-database/metadata.json
similarity index 56%
rename from step-templates/sql-smo-create-database.json
rename to src/step-templates/sql-smo-create-database/metadata.json
index d7bffa58d..abbd73543 100644
--- a/step-templates/sql-smo-create-database.json
+++ b/src/step-templates/sql-smo-create-database/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 11,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | out-null\n\n\n$SqlUsername = $OctopusParameters['SqlUsername']\n$SqlServer = $OctopusParameters['SqlServer']\n$SqlPassword = $OctopusParameters['SqlPassword']\n$SqlDatabase = $OctopusParameters['SqlDatabase']\n\ntry\n{    \n    $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $SqlServer\n  \n    if ($SqlUsername -and $SqlPassword)\n    {\n        Write-Host \"Connecting to $SqlServer as $SqlUsername\"\n        $server.ConnectionContext.LoginSecure = $false\n        $server.ConnectionContext.set_Login($SqlUsername)\n        $server.ConnectionContext.set_Password($SqlPassword)      \n    } \n    else {\n        Write-Host \"Connecting to $SqlServer with integrated security\"\n        $server.ConnectionContext.LoginSecure = $true\n    }\n    \n\tif ($server.databases[$SqlDatabase] -eq $null)\n\t{\n\t    Write-Host \"Creating database $SqlDatabase\"\n    \t$db = New-Object Microsoft.SqlServer.Management.Smo.Database($server, $SqlDatabase)\n        $db.Create()\n\t} else {\n\t    Write-Host \"Database $SqlDatabase already exists, skipping step...\"\n\t}\n}\ncatch\n{    \n    $error[0] | format-list -force\n    Exit 1\n}\n    ",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.ScriptFileName": null,
@@ -50,12 +50,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2016-07-12T12:33:49.751+00:00",
+    "ExportedAt": "2016-07-12T05:33:49.7510000-07:00",
     "OctopusVersion": "3.3.10",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-smo-create-database/scriptbody.ps1 b/src/step-templates/sql-smo-create-database/scriptbody.ps1
new file mode 100644
index 000000000..a69904866
--- /dev/null
+++ b/src/step-templates/sql-smo-create-database/scriptbody.ps1
@@ -0,0 +1,39 @@
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | out-null
+
+
+$SqlUsername = $OctopusParameters['SqlUsername']
+$SqlServer = $OctopusParameters['SqlServer']
+$SqlPassword = $OctopusParameters['SqlPassword']
+$SqlDatabase = $OctopusParameters['SqlDatabase']
+
+try
+{    
+    $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $SqlServer
+  
+    if ($SqlUsername -and $SqlPassword)
+    {
+        Write-Host "Connecting to $SqlServer as $SqlUsername"
+        $server.ConnectionContext.LoginSecure = $false
+        $server.ConnectionContext.set_Login($SqlUsername)
+        $server.ConnectionContext.set_Password($SqlPassword)      
+    } 
+    else {
+        Write-Host "Connecting to $SqlServer with integrated security"
+        $server.ConnectionContext.LoginSecure = $true
+    }
+    
+	if ($server.databases[$SqlDatabase] -eq $null)
+	{
+	    Write-Host "Creating database $SqlDatabase"
+    	$db = New-Object Microsoft.SqlServer.Management.Smo.Database($server, $SqlDatabase)
+        $db.Create()
+	} else {
+	    Write-Host "Database $SqlDatabase already exists, skipping step..."
+	}
+}
+catch
+{    
+    $error[0] | format-list -force
+    Exit 1
+}
+    
\ No newline at end of file
diff --git a/src/step-templates/sql-smo-create-login-and-user/metadata.json b/src/step-templates/sql-smo-create-login-and-user/metadata.json
new file mode 100644
index 000000000..9915d235f
--- /dev/null
+++ b/src/step-templates/sql-smo-create-login-and-user/metadata.json
@@ -0,0 +1,62 @@
+{
+  "Id": "7ed93dfa-b137-4341-9c6c-84fa0565d865",
+  "Name": "SQL - Create Database Login and User using SMO",
+  "Description": "Requires SMO to be installed on the machine where this step will be run.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Id": "24633e35-94cb-4b69-befe-0ef2616c3071",
+      "Name": "SMO_SqlServer",
+      "Label": "Database Server Name",
+      "HelpText": "Name of the to create the login for.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b79baa48-af97-4ee0-bf79-822fbd529636",
+      "Name": "SMO_SqlDatabase",
+      "Label": "Database Name",
+      "HelpText": "Name of the database. The created Login and User will get the role dbowner by defaultfor this database.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d189015a-237d-46eb-839b-84c3572c40d1",
+      "Name": "SMO_LoginName",
+      "Label": "Windows Login Name",
+      "HelpText": "The login name to create a login and user in the database for. In our projects we use integrated security - you should too.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9bf187dd-bcf1-4fba-a5b0-2bcddde7ef73",
+      "Name": "SMO_SqlRole",
+      "Label": "Database Role Names",
+      "HelpText": "We default to `db_owner`, you might want to change this to suit your needs. You may specify multiple roles separated by a comma (e.g. `db_datareader,db_datawriter`)",
+      "DefaultValue": "db_owner",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2022-08-30T06:37:42.2140000-07:00",
+  "LastModifiedBy": "thomasdc",
+  "$Meta": {
+    "ExportedAt": "2022-08-30T13:37:42.2140000Z",
+    "OctopusVersion": "3.12.5",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-smo-create-login-and-user/scriptbody.ps1 b/src/step-templates/sql-smo-create-login-and-user/scriptbody.ps1
new file mode 100644
index 000000000..5a727ee1d
--- /dev/null
+++ b/src/step-templates/sql-smo-create-login-and-user/scriptbody.ps1
@@ -0,0 +1,75 @@
+[System.Reflection.Assembly]::LoadWithPartialName('Microsoft.SqlServer.SMO') | out-null
+
+try
+{
+    $server = New-Object ('Microsoft.SqlServer.Management.Smo.Server') $SMO_SqlServer
+    
+    $server.ConnectionContext.LoginSecure = $true
+
+    if(!$server.Databases.Contains($SMO_SqlDatabase))
+    {
+        throw "Server $SMO_SqlServer does not contain a database named $SMO_SqlDatabase"
+    }
+
+    if ($server.Logins.Contains($SMO_LoginName))
+    {
+        Write-Host "Login $SMO_LoginName already exists in the server $SMO_SqlServer"
+    }
+    else
+    {
+        Write-Host "Login $SMO_LoginName does not exist, creating"
+        $login = New-Object -TypeName Microsoft.SqlServer.Management.Smo.Login -ArgumentList $SMO_SqlServer, $SMO_LoginName
+        $login.LoginType = [Microsoft.SqlServer.Management.Smo.LoginType]::WindowsUser
+        $login.PasswordExpirationEnabled = $false
+        $login.Create()
+        Write-Host "Login $SMO_LoginName created successfully."
+    }
+
+    $database = $server.Databases[$SMO_SqlDatabase]
+
+    if ($database.Users[$SMO_LoginName])
+    {
+        Write-Host "User $SMO_LoginName already exists in the database $SMO_SqlDatabase"
+    }
+    else
+    {
+        Write-Host "User $SMO_LoginName does not exist in the database $SMO_SqlDatabase, creating."
+        $dbUser = New-Object -TypeName Microsoft.SqlServer.Management.Smo.User -ArgumentList $database, $SMO_LoginName
+        $dbUser.Login = $SMO_LoginName
+        $dbUser.Create()
+        Write-Host "User $SMO_LoginName created successfully in the database $SMO_SqlDatabase."
+    }
+
+    if($SMO_SqlRole -ne $null)
+    {
+        $SMO_SqlRoles = $SMO_SqlRole.Split(",")
+            
+        # Remove the user from any roles which aren't specified in the $SMO_SqlRole parameter if they are a member
+        $database.Users[$SMO_LoginName].EnumRoles() | ForEach {
+            if (!$SMO_SqlRoles.Contains($_)) {
+                $dbRole = $database.Roles[$_]
+                $dbRole.DropMember($SMO_LoginName)
+                $dbRole.Alter()
+                Write-Host "User $SMO_LoginName removed from $_ role in the database $SMO_SqlDatabase."
+            }
+        }
+            
+        # Add the user to any roles which are specified in the $SMO_SqlRole parameter if they are not already a member
+        $SMO_SqlRoles | ForEach {
+            $dbRole = $database.Roles[$_]
+            if(!$dbRole)  { throw "Database $SMO_SqlDatabase does not contain a role named $_" }
+
+            if (!$dbRole.EnumMembers().Contains($SMO_LoginName))
+            {
+                $dbRole.AddMember($SMO_LoginName)
+                $dbRole.Alter()
+                Write-Host "User $SMO_LoginName successfully added to $_ role in the database $SMO_SqlDatabase."
+            }
+        }
+    }
+}
+catch
+{
+    $error[0] | format-list -force
+    Exit 1
+}
\ No newline at end of file
diff --git a/step-templates/sql-smo-drop-database.json b/src/step-templates/sql-smo-drop-database/metadata.json
similarity index 64%
rename from step-templates/sql-smo-drop-database.json
rename to src/step-templates/sql-smo-drop-database/metadata.json
index 025e25d2a..ca2f80589 100644
--- a/step-templates/sql-smo-drop-database.json
+++ b/src/step-templates/sql-smo-drop-database/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 9,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | out-null\n\ntry\n{    \n    $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $SqlServer\n    \n    if (!$SqlUsername -and !$SqlPassword)\n    {\n        $server.ConnectionContext.LoginSecure = $true\n    } else {\n        $server.ConnectionContext.LoginSecure = $false\n        $server.ConnectionContext.set_Login($SqlUsername)\n        $server.ConnectionContext.set_Password($SqlPassword)      \n    }\n\n\tif ($server.databases[$SqlDatabase] -ne $null)\n\t{\n    \t$server.killallprocesses($SqlDatabase)\n    \t$server.databases[$SqlDatabase].drop()\n\t}\n}\ncatch\n{    \n    $error[0] | format-list -force\n    Exit 1\n}\n    ",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -47,12 +47,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-05-20T13:00:12.964+00:00",
+    "ExportedAt": "2015-05-20T06:00:12.9640000-07:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-smo-drop-database/scriptbody.ps1 b/src/step-templates/sql-smo-drop-database/scriptbody.ps1
new file mode 100644
index 000000000..54f3c7954
--- /dev/null
+++ b/src/step-templates/sql-smo-drop-database/scriptbody.ps1
@@ -0,0 +1,27 @@
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | out-null
+
+try
+{    
+    $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $SqlServer
+    
+    if (!$SqlUsername -and !$SqlPassword)
+    {
+        $server.ConnectionContext.LoginSecure = $true
+    } else {
+        $server.ConnectionContext.LoginSecure = $false
+        $server.ConnectionContext.set_Login($SqlUsername)
+        $server.ConnectionContext.set_Password($SqlPassword)      
+    }
+
+	if ($server.databases[$SqlDatabase] -ne $null)
+	{
+    	$server.killallprocesses($SqlDatabase)
+    	$server.databases[$SqlDatabase].drop()
+	}
+}
+catch
+{    
+    $error[0] | format-list -force
+    Exit 1
+}
+    
\ No newline at end of file
diff --git a/step-templates/sql-test-connection-string.json b/src/step-templates/sql-test-connection-string/metadata.json
similarity index 56%
rename from step-templates/sql-test-connection-string.json
rename to src/step-templates/sql-test-connection-string/metadata.json
index 737517b7f..6f06f78ab 100644
--- a/step-templates/sql-test-connection-string.json
+++ b/src/step-templates/sql-test-connection-string/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 5,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#Create SQL Connection\r\n$con = new-object \"System.data.sqlclient.SQLconnection\"\r\nWrite-Host \"Opening SQL connection to $ConnectionString\"\r\n\r\n$con.ConnectionString =(\"$ConnectionString\")\r\ntry {\r\n    $con.Open()\r\n    Write-Host \"Successfully opened connection to the database\"\r\n}\r\ncatch {\r\n    $error[0]\r\n    exit 1\r\n}\r\nfinally{\r\n    Write-Host \"Closing SQL connection\"\r\n    $con.Close()\r\n    $con.Dispose()\r\n    Write-Host \"Connection closed.\"\r\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-06-26T10:19:31.547+00:00",
+    "ExportedAt": "2014-06-26T03:19:31.5470000-07:00",
     "OctopusVersion": "2.4.8.107",
     "Type": "ActionTemplate"
   },
   "Category": "sql"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/sql-test-connection-string/scriptbody.ps1 b/src/step-templates/sql-test-connection-string/scriptbody.ps1
new file mode 100644
index 000000000..c4962eb2c
--- /dev/null
+++ b/src/step-templates/sql-test-connection-string/scriptbody.ps1
@@ -0,0 +1,19 @@
+#Create SQL Connection
+$con = new-object "System.data.sqlclient.SQLconnection"
+Write-Host "Opening SQL connection to $ConnectionString"
+
+$con.ConnectionString =("$ConnectionString")
+try {
+    $con.Open()
+    Write-Host "Successfully opened connection to the database"
+}
+catch {
+    $error[0]
+    exit 1
+}
+finally{
+    Write-Host "Closing SQL connection"
+    $con.Close()
+    $con.Dispose()
+    Write-Host "Connection closed."
+}
\ No newline at end of file
diff --git a/src/step-templates/sql-update-job/metadata.json b/src/step-templates/sql-update-job/metadata.json
new file mode 100644
index 000000000..1595fb956
--- /dev/null
+++ b/src/step-templates/sql-update-job/metadata.json
@@ -0,0 +1,65 @@
+{
+  "Id": "91bbd24f-8975-4d0e-9f55-736587f945e9",
+  "Name": "SQL - Update Job",
+  "Description": "Updates a MS SQL server job with provided ID to be enabled or disabled",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "41a33da5-012d-4871-a3e8-983fa4a5dcbe",
+      "Name": "JobId",
+      "Label": "Job Id",
+      "HelpText": "The SQL server job id which is a `GUID`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ba6bdd3b-ebfb-4c47-b214-f95044c8460e",
+      "Name": "JobName",
+      "Label": "Job name",
+      "HelpText": "Optional job name to show on the logs instead of JobId",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a2ea4eca-77e3-4733-9714-9fa2b87929e7",
+      "Name": "JobStatus",
+      "Label": "Job Status",
+      "HelpText": "Choose `Enable` to enable the job, and `Disabled` to disable the job",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "0|Disabled\n1|Enabled"
+      }
+    },
+    {
+      "Id": "0bdc16b0-0086-4597-9dcd-970ddbdda258",
+      "Name": "ConnectionString",
+      "Label": "ConnectionString",
+      "HelpText": "The connection string to connect to the target SQL Server",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-11-20T12:26:07.8170000Z",
+    "OctopusVersion": "2020.4.0",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "aqovia",
+  "Category": "sql"
+}
diff --git a/src/step-templates/sql-update-job/scriptbody.ps1 b/src/step-templates/sql-update-job/scriptbody.ps1
new file mode 100644
index 000000000..94a758a68
--- /dev/null
+++ b/src/step-templates/sql-update-job/scriptbody.ps1
@@ -0,0 +1,109 @@
+param(
+    [string]$ConnectionString,
+    [string]$JobId,
+    [string]$JobName,
+    [string]$JobStatus
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Execute-SqlQuery($query) {
+    $queries = [System.Text.RegularExpressions.Regex]::Split($query, "^\s*GO\s*$$", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Multiline)
+
+    $queries | ForEach-Object {
+        $q = $_
+        if (!(StringIsNullOrWhitespace($q)) -and ($q.Trim().ToLowerInvariant() -ne "go")) {
+            $command = $connection.CreateCommand()
+            $command.CommandText = $q
+            $command.ExecuteNonQuery() | Out-Null
+        }
+    }
+}
+
+& {
+    param(
+        [string]$ConnectionString,
+        [string]$JobId,
+        [string]$JobName,
+        [string]$JobStatus
+    )
+
+    $jobStatusText = ''
+    if ($JobStatus -eq '1') {
+        $jobStatusText = "Enabling"
+    } elseif ($JobStatus -eq '0') {
+        $jobStatusText = "Disabling"
+    }
+
+    $jobDisplayName = ''
+    if ($JobName) {
+        $jobDisplayName = $JobName
+    } else {
+    	$jobDisplayName = $JobId
+    }
+
+    Write-Highlight "$jobStatusText SQL Server job: [$jobDisplayName]"
+    Write-Verbose "SQL Server Job Id: [$JobId]"
+
+    $query = @"
+GO
+USE [msdb]
+GO
+EXEC msdb.dbo.sp_update_job @job_id=N'$JobId', @enabled=$JobStatus
+GO
+"@
+
+	$connection = New-Object System.Data.SqlClient.SqlConnection
+    $connection.ConnectionString = $ConnectionString
+    Register-ObjectEvent -inputobject $connection -eventname InfoMessage -action {
+        write-host $event.SourceEventArgs
+    } | Out-Null
+
+    Write-Verbose "Connecting"
+    try {
+        $connection.Open()
+
+        Write-Verbose "Executing script"
+        Write-Verbose $query
+        Execute-SqlQuery -query $query
+    }
+    catch [Exception]
+    {
+        Write-Verbose $_.Exception|format-list -force
+        throw $_
+    }
+    finally {
+        Write-Verbose "Closing connection"
+        $connection.Dispose()
+    }
+
+  } `
+   (Get-Param 'ConnectionString' -Required) `
+   (Get-Param 'JobId' -Required) `
+   (Get-Param 'JobName') `
+   (Get-Param 'JobStatus' -Required)
\ No newline at end of file
diff --git a/src/step-templates/sqlazure-restore-database-from-azure-storage/metadata.json b/src/step-templates/sqlazure-restore-database-from-azure-storage/metadata.json
new file mode 100644
index 000000000..759ae151c
--- /dev/null
+++ b/src/step-templates/sqlazure-restore-database-from-azure-storage/metadata.json
@@ -0,0 +1,132 @@
+{
+  "Id": "6936e720-17a2-4a17-97d6-8f19ee040b01",
+  "Name": "SQLAzure - Restore a SQL Azure database from a .bacpac located in Azure Storage",
+  "Description": "Given an existing [.bacpac](https://msdn.microsoft.com/en-us/library/azure/hh335292.aspx) in Azure Storage this template restores a SQL Azure database.\n\n**Note** - The storage account used needs to reside in the the same subscription as the SQL Azure Server.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "AzureManagementCertificate",
+      "Label": "The Azure management certificate associated with the subscription",
+      "HelpText": "The Azure Management Certificate that can be sourced via https://manage.windowsazure.com/publishsettings",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AzureSubscriptionId",
+      "Label": "The Azure Subscription ID",
+      "HelpText": "The Azure Subscription ID that can be sourced via the [Azure Portal](https://portal.azure.com) or https://manage.windowsazure.com/publishsettings",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AzureSubscriptionName",
+      "Label": "The Azure Subscription Name",
+      "HelpText": "The Azure Subscription Name that can be sourced via the [Azure Portal](https://portal.azure.com) or https://manage.windowsazure.com/publishsettings",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SqlAzureAdminUser",
+      "Label": "The SQL Azure Server Admin User",
+      "HelpText": "The SQL Azure Server Administrator User",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SqlAzureAdminUserPassword",
+      "Label": "The SQL Azure Admin Password",
+      "HelpText": "The SQL Azure Server Administrator Password",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "SQLAzureServerName",
+      "Label": "The SQL Azure Server",
+      "HelpText": "The name of the SQL Azure Server.  Just the server name e.g.  wyn4its2by",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "DatabaseName",
+      "Label": "The SQL Azure Database used for the  bacpac restore",
+      "HelpText": "The name of the SQL Azure Database to which you wish to restore the .bacpac file.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SQLAzureDatabaseEdition",
+      "Label": "The SQL Azure database edition to use",
+      "HelpText": "The [SQL Azure Database Edition](https://msdn.microsoft.com/en-us/library/dn546725.aspx) to use for the restore",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText",
+        "Octopus.SelectOptions": "Web|Web\nBusiness|Business"
+      }
+    },
+    {
+      "Name": "SQLAzureServiceObjective",
+      "Label": "The SQL Azure SQL Service Objective to use",
+      "HelpText": "The [SQL Azure Database Objective](https://msdn.microsoft.com/en-us/library/dn546721.aspx) for the database being restored.\n\nBasic, S0, S1, S2, P1, P2, or P3.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Basic|Basic\nS0|Standard (S0)\nS1|Standard (S1)\nS2|Standard (S2)\nS3|Standard (S3)\nP1|Premium (P1)\nP2|Premium (P2)\nP3|Premium (P3)"
+      }
+    },
+    {
+      "Name": "AzureStorageAccountName",
+      "Label": "The Azure Storage Account where the .bacpac file is located",
+      "HelpText": "The Azure Storage Account where the .bacpac file is located",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AzureStorageContainerName",
+      "Label": "The container name of the bacpac file",
+      "HelpText": "The container in Azure storage where the .bacpac file is located.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "BacPacFileName",
+      "Label": "The name of the bacpac file to restore",
+      "HelpText": "The name of the .bacpac file to restore.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2015-04-01T04:36:52.6860000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sqlazure-restore-database-from-azure-storage/scriptbody.ps1 b/src/step-templates/sqlazure-restore-database-from-azure-storage/scriptbody.ps1
new file mode 100644
index 000000000..15c9afe97
--- /dev/null
+++ b/src/step-templates/sqlazure-restore-database-from-azure-storage/scriptbody.ps1
@@ -0,0 +1,148 @@
+#Check for the PowerShell cmdlets
+try{ 
+    Import-Module Azure -ErrorAction Stop
+}catch{
+    
+    $azureServiceModulePath = "C:\Program Files (x86)\Microsoft SDKs\Azure\PowerShell\ServiceManagement\Azure\Azure.psd1"
+    Write-Output "Unable to find the module checking $azureServiceModulePath" 
+    
+    try{
+        Import-Module $azureServiceModulePath
+        
+    }
+    catch{
+        throw "Windows Azure PowerShell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools" 
+    }
+}
+
+function Set-TempAzureSubscription{
+    param(   
+        [Parameter(Mandatory=$true)][string] $subscriptionId,
+        [Parameter(Mandatory=$true)][string] $subscriptionName,
+        [Parameter(Mandatory=$true)][string] $managementCertificate
+    )
+
+    #Ensure no other subscriptions or accounts    
+    Get-AzureSubscription | ForEach-Object { 
+        $id = $_.SubscriptionId 
+        Write-Output "Removing Subscription $id"
+        Remove-AzureSubscription -SubscriptionId $id -Force
+    }
+
+    #Ensure there are no other 
+    Get-AzureAccount | ForEach-Object { Remove-AzureAccount $_.ID -Force }
+   
+    [byte[]]$certificateData = [System.Convert]::FromBase64String($managementCertificate)
+    $certificate = [System.Security.Cryptography.X509Certificates.X509Certificate2] $certificateData
+
+    Set-AzureSubscription -Certificate $certificate -SubscriptionId $subscriptionId -SubscriptionName $subscriptionName
+    Select-AzureSubscription $subscriptionName
+
+    Write-Output "Azure Subscription set Id: $subscriptionId Name: $subscriptionName "
+
+    $subscription = Get-AzureSubscription -Current
+
+    return  $subscription
+}
+
+
+function Restore-SqlAzureDatabase{
+    Param(    
+    [Parameter(Mandatory=$true)][string]$databaseServerName,
+    [Parameter(Mandatory=$true)][string]$databaseName,
+    [Parameter(Mandatory=$true)][string]$edition,
+    [Parameter(Mandatory=$true)][string]$serviceObjectiveName, 
+    [Parameter(Mandatory=$true)][string]$storageName,
+    [Parameter(Mandatory=$true)][string]$containerName,
+    [Parameter(Mandatory=$true)][string]$sqlAdminUser,                       
+    [Parameter(Mandatory=$true)][string]$sqlAdminPassword,
+    [Parameter(Mandatory=$true)][string]$bacpacFileName,    
+    [Parameter(Mandatory=$false)][bool]$errorIfDatabaseExists=$true
+    )
+
+    $subscription = Get-AzureSubscription -Current 
+         
+    $storageKey = (Get-AzureStorageKey -StorageAccountName $storageName).Primary
+    $storageCtx = New-AzureStorageContext -storageaccountname $storageName -storageaccountkey $storageKey
+    $password = $sqlAdminPassword | ConvertTo-SecureString -asPlainText -Force                                                      
+    $sqlCred = New-Object System.Management.Automation.PSCredential($sqlAdminUser,$password)
+    $sqlCtx = New-AzureSqlDatabaseServerContext -ServerName $databaseServerName -Credential $sqlCred    
+  
+    $databases = Get-AzureSqlDatabase -ServerName $databaseServerName
+
+    #Check to see there is a database on the server
+    Foreach ($d in $databases){
+        if($d.Name -eq $databaseName){
+            $database = $d
+            break
+        }    
+    }
+
+    if ($database -eq $null) {
+        Write-Output "The SQL Azure Database: $databaseName WAS NOT found on $databaseServerName"  
+    }
+     
+    if($database -ne $null){
+        if ($errorIfDatabaseExists -eq $true) {
+            Write-Output "A database named $databaseName already exists. If you wish to override this database set the -errorIfDatabaseExists parameter to false." 
+            return;
+        } else {
+            #Delete the existing database.
+            Write-Output "The SQL Azure Database: $databaseName WAS found on $databaseServerName"  
+            Write-Output "WARNING! Removing SQL Azure database: $databaseName"
+            Remove-AzureSqlDatabase -ServerName $databaseServerName -DatabaseName $databaseName -Force
+        }
+    } 
+
+    Write-Output "Starting database import..."
+    $importRequest = Start-AzureSqlDatabaseImport -SqlConnectionContext $sqlCtx -StorageContext $storageCtx -StorageContainerName $containerName -DatabaseName $databaseName -BlobName $bacpacFileName -Edition $edition
+    
+    Write-Output "Database import request submitted.  Request Id: $($importRequest.RequestGuid)"  
+
+    Write-Output "Checking import status..."
+    $status = Get-AzureSqlDatabaseImportExportStatus -Username $sqlAdminUser -Password $sqlAdminPassword -ServerName $databaseServerName -RequestId $importRequest.RequestGuid
+    Write-Output "Status: $($status.Status)"
+    
+    while($status.Status.StartsWith("Running") -Or $status.Status.StartsWith("Pending")){
+        Start-Sleep -s 10
+        Write-Output "Checking import status..."  
+        $status = Get-AzureSqlDatabaseImportExportStatus -Username $sqlAdminUser -Password $sqlAdminPassword -ServerName $databaseServerName -RequestId $importRequest.RequestGuid
+        Write-Output "Status: $($status.Status)" 
+    }
+
+    Get-AzureSqlDatabaseImportExportStatus -Username $sqlAdminUser -Password $sqlAdminPassword -ServerName $databaseServerName -RequestId $importRequest.RequestGuid   
+
+    if ($status.Status -eq "Completed") {
+        Write-Output "Updating database service objective..."
+
+        #Get the service objective.
+        $serviceObjective = Get-AzureSqlDatabaseServiceObjective -ServerName $databaseServerName -ServiceObjectiveName $serviceObjectiveName
+        Set-AzureSqlDatabase -ConnectionContext $sqlCtx -DatabaseName $databaseName -Force -ServiceObjective $serviceObjective
+        
+        Write-Output "Updated database service objective." 
+    }
+
+    return $importRequest
+}
+
+
+#Set the Azure Subscription
+$subscription = Set-TempAzureSubscription -managementCertificate $AzureManagementCertificate -subscriptionId $AzureSubscriptionId -subscriptionName $AzureSubscriptionName 
+
+Write-Output "============================================================="
+Write-Output "Using SQL Azure Server $SQLAzureServerName"
+Write-Output "Using Azure Storage Account: $AzureStorageAccountName"
+Write-Output "Using Azure Storeage Container: $AzureStorageContainerName"
+Write-Output "Using bacpac file: $BacPacFileName"
+Write-Output "============================================================="
+
+Restore-SqlAzureDatabase -databaseServerName $SQLAzureServerName `
+    -databaseName $databaseName `
+    -edition $SQLAzureDatabaseEdition `
+    -serviceObjectiveName $SQLAzureServiceObjective `
+    -storageName $AzureStorageAccountName `
+    -containerName $AzureStorageContainerName `
+    -sqlAdminUser $SqlAzureAdminUser `
+    -sqlAdminPassword $SqlAzureAdminUserPassword `
+    -bacpacFileName $BacPacFileName `
+    -errorIfDatabaseExists $false
diff --git a/src/step-templates/sqlserver-high-availability-group/metadata.json b/src/step-templates/sqlserver-high-availability-group/metadata.json
new file mode 100644
index 000000000..468172dec
--- /dev/null
+++ b/src/step-templates/sqlserver-high-availability-group/metadata.json
@@ -0,0 +1,48 @@
+{
+  "Id": "735d2f76-fdbb-4232-9f36-07020cad120d",
+  "Name": "Check SQL Server in High Availability Group",
+  "Description": "Checks for SQL Node currently being serving as primary on high availability group and sets Octopus variable : SQLIsOnSecondary to true if secondary is active in High Availability Group",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "afe518f5-5778-45b4-86c7-3715fa55b4d9",
+      "Name": "HAGroupSQLServer",
+      "Label": "Enter server name",
+      "HelpText": "SQL Server name used in connection string from website code",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "c3c49b74-9982-400d-bc8f-b292ea7b2488",
+      "Name": "HAGroupPrimaryNode",
+      "Label": "Enter primary node",
+      "HelpText": "Enter primary SQL server name which serves traffic",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "vasant-horapeti",
+  "$Meta": {
+    "ExportedAt": "2019-10-13T08:11:56.5320000Z",
+    "OctopusVersion": "2018.10.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sqlserver-high-availability-group/scriptbody.ps1 b/src/step-templates/sqlserver-high-availability-group/scriptbody.ps1
new file mode 100644
index 000000000..6e7af0e95
--- /dev/null
+++ b/src/step-templates/sqlserver-high-availability-group/scriptbody.ps1
@@ -0,0 +1,56 @@
+function CheckSQLServerInAOAG($SqlServer, $PrimaryNode)
+{
+    $serverConn = new-object ('Microsoft.SqlServer.Management.Common.ServerConnection') $SqlServer
+    
+    try{
+            $serverConn.Connect();
+            $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $serverConn  
+            if (!$server.IsHadrEnabled)
+            {
+    	        Write-Host "The SQL Server [$SqlServer] is not configured with High Availability Group."
+            }
+            else
+            {
+                # Get SQL Availability Group
+                $SQLAvailabilityGroup = $server.AvailabilityGroups[0]
+    
+                Write-Host "Getting High Availability Group properties."
+                
+                # Get SQL Availability Groups Properties
+	            $SQLAvailabilityGroupName = $SQLAvailabilityGroup.Name;
+	            $SQLAvailabilityGroupID = $SQLAvailabilityGroup.Id;
+	            $SQLAvailabilityGroupGuid = $SQLAvailabilityGroup.UniqueId;
+	            $SQLLocalReplicaRole = $SQLAvailabilityGroup.LocalReplicaRole;
+	            $SQLPrimaryReplicaServerName = $SQLAvailabilityGroup.PrimaryReplicaServerName;
+	            
+	            Write-Host	"SQLAvailabilityGroupName : $SQLAvailabilityGroupName"
+                Write-Host	"SQLAvailabilityGroupID : $SQLAvailabilityGroupID"
+                Write-Host	"SQLAvailabilityGroupGuid : $SQLAvailabilityGroupGuid"
+                Write-Host	"SQLLocalReplicaRole : $SQLLocalReplicaRole"
+                Write-Host	"SQLPrimaryReplicaServerName : $SQLPrimaryReplicaServerName"    
+    
+                if ($SQLPrimaryReplicaServerName -eq $PrimaryNode)
+                {
+    	            Write-Host "Setting Octopus variable SQLIsOnSecondary false"
+                    Set-OctopusVariable -name "SQLIsOnSecondary" -value "false"        
+                }
+                else 
+                {
+    	            Write-Host "Setting Octopus variable SQLIsOnSecondary true"
+    	            Set-OctopusVariable -name "SQLIsOnSecondary" -value "true"
+                }
+            }
+        }
+        catch
+        {
+            throw "Could not connect to server $SqlServer.  Exception is:`r`n$($_ | fl -force | out-string)"
+        }
+        finally
+        {
+            $serverConn.Disconnect();
+        }
+}
+
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | out-null
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.ConnectionInfo") | out-null
+CheckSQLServerInAOAG $HAGroupSQLServer $HAGroupPrimaryNode
\ No newline at end of file
diff --git a/src/step-templates/sqlserver-project-deployment-model-ispac-deploy/metadata.json b/src/step-templates/sqlserver-project-deployment-model-ispac-deploy/metadata.json
new file mode 100644
index 000000000..15b855801
--- /dev/null
+++ b/src/step-templates/sqlserver-project-deployment-model-ispac-deploy/metadata.json
@@ -0,0 +1,70 @@
+{
+  "Id": "efe39ac7-3ab8-4f99-bfdc-aba342278d1a",
+  "Name": "SQL Server - Project Deployment Model - Deploy ISPAC",
+  "Description": "This is to deploy ssis packages using 'project deployment model' (ISPAC file )",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "ISPAC_FILE_PATH",
+      "Label": "Ispac file path",
+      "HelpText": "Once the SSIS project is compiled \"ispac\" file gets created, this variable must hold the path of the ispac file.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "deploy.dts.server",
+      "Label": "SSIS Server name",
+      "HelpText": "SSIS Server name where this ssis packages must be deployed.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SSIS_Folder",
+      "Label": "SSIS Folder name",
+      "HelpText": "SSIS folder name which is created under SSISDB",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SSIS_Project",
+      "Label": "Project Name",
+      "HelpText": "SSIS Project name - this is the physical folder name where the OD is referring to .",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Environment_Name",
+      "Label": "Environment Name",
+      "HelpText": "This is the environment name where variables exists.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2016-07-20T03:15:20.2410000-07:00",
+    "OctopusVersion": "3.3.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/sqlserver-project-deployment-model-ispac-deploy/scriptbody.ps1 b/src/step-templates/sqlserver-project-deployment-model-ispac-deploy/scriptbody.ps1
new file mode 100644
index 000000000..d5f4901a4
--- /dev/null
+++ b/src/step-templates/sqlserver-project-deployment-model-ispac-deploy/scriptbody.ps1
@@ -0,0 +1,275 @@
+#################################################################################################
+# Change source and destination properties
+#################################################################################################
+
+# Source
+$IspacFilePath = "#{ISPAC_FILE_PATH}"
+ 
+# Destination
+$SsisServer =   $OctopusParameters['deploy.dts.server'] 
+$FolderName = $OctopusParameters['SSIS_Folder']
+$ProjectName = $OctopusParameters['SSIS_Project']
+
+# Environment
+$EnvironmentName = $OctopusParameters['Environment_Name']  
+$EnvironmentFolderName = $OctopusParameters['SSIS_Folder']
+
+
+# Replace empty projectname with filename
+if (-not $ProjectName)
+{
+  $ProjectName = [system.io.path]::GetFileNameWithoutExtension($IspacFilePath)
+}
+# Replace empty Environment folder with project folder
+if (-not $EnvironmentFolderName)
+{
+  $EnvironmentFolderName = $FolderName
+}
+
+clear
+Write-Host "========================================================================================================================================================"
+Write-Host "==                                                         Used parameters                                                                            =="
+Write-Host "========================================================================================================================================================"
+Write-Host "Ispac File Path        : " $IspacFilePath
+Write-Host "SSIS Server            : " $SsisServer
+Write-Host "Project Folder Path    : " $FolderName
+Write-Host "Project Name           : " $ProjectName
+Write-Host "Environment Name       : " $EnvironmentName
+Write-Host "Environment Folder Path: " $EnvironmentFolderName
+Write-Host "========================================================================================================================================================"
+Write-Host ""
+
+###########################
+########## ISPAC ##########
+###########################
+# Check if ispac file exists
+if (-Not (Test-Path $IspacFilePath))
+{
+    Throw  [System.IO.FileNotFoundException] "Ispac file $IspacFilePath doesn't exists!"
+}
+else
+{
+    $IspacFileName = split-path $IspacFilePath -leaf
+    Write-Host "Ispac file" $IspacFileName "found"
+}
+
+
+############################
+########## SERVER ##########
+############################
+# Load the Integration Services Assembly
+Write-Host "Connecting to server $SsisServer "
+$SsisNamespace = "Microsoft.SqlServer.Management.IntegrationServices"
+[System.Reflection.Assembly]::LoadWithPartialName($SsisNamespace) | Out-Null;
+
+# Create a connection to the server
+$SqlConnectionstring = "Data Source=" + $SsisServer + ";Initial Catalog=master;Integrated Security=SSPI;"
+$SqlConnection = New-Object System.Data.SqlClient.SqlConnection $SqlConnectionstring
+
+# Create the Integration Services object
+$IntegrationServices = New-Object $SsisNamespace".IntegrationServices" $SqlConnection
+
+# Check if connection succeeded
+if (-not $IntegrationServices)
+{
+  Throw  [System.Exception] "Failed to connect to server $SsisServer "
+}
+else
+{
+   Write-Host "Connected to server" $SsisServer
+}
+
+
+#############################
+########## CATALOG ##########
+#############################
+# Create object for SSISDB Catalog
+$Catalog = $IntegrationServices.Catalogs["SSISDB"]
+
+# Check if the SSISDB Catalog exists
+if (-not $Catalog)
+{
+    # Catalog doesn't exists. The user should create it manually.
+    # It is possible to create it, but that shouldn't be part of
+    # deployment of packages.
+    Throw  [System.Exception] "SSISDB catalog doesn't exist. Create it manually!"
+}
+else
+{
+    Write-Host "Catalog SSISDB found"
+}
+
+
+############################
+########## FOLDER ##########
+############################
+# Create object to the (new) folder
+$Folder = $Catalog.Folders[$FolderName]
+
+# Check if folder already exists
+if (-not $Folder)
+{
+    # Folder doesn't exists, so create the new folder.
+    Write-Host "Creating new folder" $FolderName
+    $Folder = New-Object $SsisNamespace".CatalogFolder" ($Catalog, $FolderName, $FolderName)
+    $Folder.Create()
+}
+else
+{
+    Write-Host "Folder" $FolderName "found"
+}
+
+
+#############################
+########## PROJECT ##########
+#############################
+# Deploying project to folder
+if($Folder.Projects.Contains($ProjectName)) {
+    Write-Host "Deploying" $ProjectName "to" $FolderName "(REPLACE)"
+}
+else
+{
+    Write-Host "Deploying" $ProjectName "to" $FolderName "(NEW)"
+}
+# Reading ispac file as binary
+[byte[]] $IspacFile = [System.IO.File]::ReadAllBytes($IspacFilePath)
+$Folder.DeployProject($ProjectName, $IspacFile)
+$Project = $Folder.Projects[$ProjectName]
+if (-not $Project)
+{
+    # Something went wrong with the deployment
+    # Don't continue with the rest of the script
+    return ""
+}
+
+
+#################################
+########## ENVIRONMENT ##########
+#################################
+# Check if environment name is filled
+if (-not $EnvironmentName)
+{
+    # Kill connection to SSIS
+    $IntegrationServices = $null 
+
+    # Stop the deployment script
+    Return "Ready deploying $IspacFileName without adding environment references"
+}
+
+# Create object to the (new) folder
+$EnvironmentFolder = $Catalog.Folders[$EnvironmentFolderName]
+
+# Check if environment folder exists
+if (-not $EnvironmentFolder)
+{
+  Throw  [System.Exception] "Environment folder $EnvironmentFolderName doesn't exist"
+}
+
+# Check if environment exists
+if(-not $EnvironmentFolder.Environments.Contains($EnvironmentName))
+{
+  Throw  [System.Exception] "Environment $EnvironmentName doesn't exist in $EnvironmentFolderName "
+}
+else
+{
+    # Create object for the environment
+    $Environment = $Catalog.Folders[$EnvironmentFolderName].Environments[$EnvironmentName]
+
+    if ($Project.References.Contains($EnvironmentName, $EnvironmentFolderName))
+    {
+        Write-Host "Reference to" $EnvironmentName "found"
+    }
+    else
+    {
+        Write-Host "Adding reference to" $EnvironmentName
+        $Project.References.Add($EnvironmentName, $EnvironmentFolderName)
+        $Project.Alter() 
+    }
+}
+
+
+########################################
+########## PROJECT PARAMETERS ##########
+########################################
+$ParameterCount = 0
+# Loop through all project parameters
+foreach ($Parameter in $Project.Parameters)
+{
+    # Get parameter name and check if it exists in the environment
+    $ParameterName = $Parameter.Name
+    if ($ParameterName.StartsWith("CM.","CurrentCultureIgnoreCase")) 
+    { 
+        # Ignoring connection managers 
+    } 
+    elseif ($ParameterName.StartsWith("INTERN_","CurrentCultureIgnoreCase")) 
+    { 
+        # Optional:
+        # Internal parameters are ignored (where name starts with INTERN_) 
+        Write-Host "Ignoring Project parameter" $ParameterName " (internal use only)" 
+    } 
+    elseif ($Environment.Variables.Contains($Parameter.Name))
+    {
+        $ParameterCount = $ParameterCount + 1
+        Write-Host "Project parameter" $ParameterName "connected to environment"
+        $Project.Parameters[$Parameter.Name].Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, $Parameter.Name)
+        $Project.Alter()
+    }
+    else
+    {
+        # Variable with the name of the project parameter is not found in the environment
+        # Throw an exeception or remove next line to ignore parameter
+        Throw  [System.Exception]  "Project parameter $ParameterName doesn't exist in environment"
+    }
+}
+Write-Host "Number of project parameters mapped:" $ParameterCount
+
+
+########################################
+########## PACKAGE PARAMETERS ##########
+########################################
+$ParameterCount = 0
+# Loop through all packages
+foreach ($Package in $Project.Packages)
+{
+    # Loop through all package parameters
+    foreach ($Parameter in $Package.Parameters)
+    {
+        # Get parameter name and check if it exists in the environment
+        $PackageName = $Package.Name
+        $ParameterName = $Parameter.Name 
+        if ($ParameterName.StartsWith("CM.","CurrentCultureIgnoreCase")) 
+        { 
+            # Ignoring connection managers 
+        } 
+        elseif ($ParameterName.StartsWith("INTERN_","CurrentCultureIgnoreCase")) 
+        { 
+            # Optional:
+            # Internal parameters are ignored (where name starts with INTERN_) 
+            Write-Host "Ignoring Package parameter" $ParameterName " (internal use only)" 
+        } 
+        elseif ($Environment.Variables.Contains($Parameter.Name))
+        {
+            $ParameterCount = $ParameterCount + 1
+            Write-Host "Package parameter" $ParameterName "from package" $PackageName "connected to environment"
+            $Package.Parameters[$Parameter.Name].Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, $Parameter.Name)
+            $Package.Alter()
+        }
+        else
+        {
+            # Variable with the name of the package parameter is not found in the environment
+            # Throw an exeception or remove next line to ignore parameter
+            Throw  [System.Exception]  "Package parameter $ParameterName from package $PackageName doesn't exist in environment"
+        }
+    }
+}
+Write-Host "Number of package parameters mapped:" $ParameterCount
+
+
+###########################
+########## READY ##########
+###########################
+# Kill connection to SSIS
+$IntegrationServices = $null 
+
+
+Return "Ready deploying $IspacFileName "
\ No newline at end of file
diff --git a/src/step-templates/ssas-deploy-from-package/metadata.json b/src/step-templates/ssas-deploy-from-package/metadata.json
new file mode 100644
index 000000000..9eedb1223
--- /dev/null
+++ b/src/step-templates/ssas-deploy-from-package/metadata.json
@@ -0,0 +1,82 @@
+{
+  "Id": "1409c3dd-e87d-49f1-9b4f-382af800b75d",
+  "Name": "Deploy SSAS from Package",
+  "Description": "Deploys SSAS packages using Microsoft.AnalysisServices.Deployment.exe.",
+  "ActionType": "Octopus.Script",
+  "Version": 14,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "435fbf52-470d-442f-88d3-0b708dfc3657",
+      "Name": "SsasPackageStepName",
+      "Label": "",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "a0713297-cdeb-47cd-ac43-4bf9603c8052",
+      "Name": "SsasServer",
+      "Label": "Server",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7bf5ec64-3383-40ae-935e-e78c236cdf21",
+      "Name": "SsasDatabase",
+      "Label": "Database",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "d7d4fcbc-d0d4-4a3b-b477-28d23fbe1f9b",
+      "Name": "SrcServer",
+      "Label": "Data Source - Server",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "45b60a3f-9339-4c69-bc14-df94b47be9e7",
+      "Name": "SrcDatabase",
+      "Label": "Data Source - Database",
+      "HelpText": null,
+      "DefaultValue": "Warehouse",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2020-09-25T23:49:43.0030000Z",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2020-09-25T23:49:43.0030000Z",
+    "OctopusVersion": "2020.4.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssas-deploy-from-package/scriptbody.ps1 b/src/step-templates/ssas-deploy-from-package/scriptbody.ps1
new file mode 100644
index 000000000..ae4f10b99
--- /dev/null
+++ b/src/step-templates/ssas-deploy-from-package/scriptbody.ps1
@@ -0,0 +1,133 @@
+$ErrorActionPreference = 'Stop'
+
+function Confirm-Argument($name, $value) {
+    if (!$value) {
+        throw ('Missing required value for parameter ''{0}''.' -f $name)
+    }
+    return $value
+}
+
+# Returns the Microsoft.AnalysisServices.Deployment.exe path
+function Get-SSASexe
+{
+	# Search for file
+    $ssasExe = Get-ChildItem -Path "C:\Program Files (x86)" -Recurse | Where-Object {$_.Name -eq "Microsoft.AnalysisServices.Deployment.exe"}
+    
+    # Check for null
+    if ($null -eq $ssasExe)
+    {
+    	# Display error
+        Write-Error "Unable to find Microsoft.AnalysisServices.Deployment.exe!"
+    }
+
+    # Check for mulitple results
+    if ($ssasExe.GetType().IsArray)
+    {
+        # Declare local variables
+        $highestVersion = $null
+        
+        # Display multiple returned
+        Write-Host "Multiple files returned, finding highest version ..."
+
+        # Loop through results
+        foreach ($file in $ssasExe)
+        {
+            # Check version 
+            if (($null -eq $highestVersion) -or ([version]$file.VersionInfo.ProductVersion) -gt [version]$highestVersion.VersionInfo.ProductVersion)
+            {
+                # Assign it
+                $highestVersion = $file
+            }
+        }
+
+        # Overwrite original
+        $ssasExe = $highestVersion
+    }
+    
+    # Return the path
+    return $ssasExe.FullName
+}
+
+# Update Deploy xml (.deploymenttargets)
+function Update-Deploy {
+	[xml]$deployContent = Get-Content $file
+	$deployContent.DeploymentTarget.Database = $ssasDatabase 
+	$deployContent.DeploymentTarget.Server = $ssasServer
+	$deployContent.DeploymentTarget.ConnectionString = 'DataSource=' + $ssasServer + ';Timeout=0'
+	$deployContent.Save($file)
+}
+# Update Config xml (.configsettings)
+function Update-Config {
+	[xml]$configContent = Get-Content $file
+    $configContent.ConfigurationSettings.Database.DataSources.DataSource.ConnectionString = 'Provider=SQLNCLI11.1;Data Source=' + $dbServer + ';Integrated Security=SSPI;Initial Catalog=' + $dbDatabase
+	$configContent.Save($file)
+}
+# Update Config xml (.deploymentoptions)
+function Update-Option {
+	[xml]$optionContent = Get-Content $file
+    $optionContent.DeploymentOptions.ProcessingOption = 'DoNotProcess'
+	$optionContent.Save($file)
+}
+
+# Get arguments
+$ssasPackageStepName = Confirm-Argument 'SSAS Package Step Name' $OctopusParameters['SsasPackageStepName']
+$ssasServer = Confirm-Argument 'SSAS server name' $OctopusParameters['SsasServer']
+$ssasDatabase = Confirm-Argument 'SSAS database name' $OctopusParameters['SsasDatabase']
+$dbServer = Confirm-Argument 'SSAS source server' $OctopusParameters['SrcServer']
+$dbDatabase = Confirm-Argument 'SSAS source database' $OctopusParameters['SrcDatabase']
+
+# Set .NET CurrentDirectory to package installation path
+$installDirPathFormat = 'Octopus.Action[{0}].Output.Package.InstallationDirectoryPath' -f $ssasPackageStepName
+$installDirPath = $OctopusParameters[$installDirPathFormat]
+
+Write-Verbose ('Setting CurrentDirectory to ''{0}''' -f $installDirPath)
+[System.Environment]::CurrentDirectory = $installDirPath
+
+# Get SSAS exe location
+$exe = Get-SSASexe
+
+$files = Get-ChildItem –Path $installDirPath\* -Include *.deploymenttargets
+foreach ($file in $files) {
+  $name = [IO.Path]::GetFileNameWithoutExtension($file)
+
+  Write-Host 'Updating' $file
+  Update-Deploy
+  $file = $installDirPath + '\' + $name + '.configsettings'
+  if(Test-Path $file) {
+      Write-Host 'Updating' $file
+      Update-Config
+  } else {
+    Write-Host "Config settings doesn't exist. Skipping."
+  }
+  $file = $installDirPath + '\' + $name + '.deploymentoptions'
+  Write-Host 'Updating' $file
+  Update-Option
+
+  $ssasArguments = @()
+  $ssasArguments += ('"' + $installDirPath + '\' + $name + '.asdatabase"')
+  $ssasArguments += '/s:"' + $installDirPath + '\Log.txt"'
+  
+  Write-Host $exe $ssasArguments
+  & $exe $ssasArguments
+  
+  # Get last exit code
+  $ssasExitCode = $LastExitcode
+  
+  # Check to make sure log file exists
+  if ((Test-Path -Path "$installDirPath\Log.txt") -eq $true)
+  {
+    # Upload log as artifact
+    New-OctopusArtifact -Path "$installDirPath\Log.txt" -Name "Log.txt"
+  }
+  else
+  {
+    # Write error
+    Write-Error "Error: $installDirPath\Log.txt not found!"
+  }
+  
+  # Check the code
+  if ($ssasExitCode -ne 0)
+  {
+  	Write-Error "Operation failed, see log for details."
+  }
+}
diff --git a/src/step-templates/ssis-deploy-ispac-from-package-parameter/metadata.json b/src/step-templates/ssis-deploy-ispac-from-package-parameter/metadata.json
new file mode 100644
index 000000000..fa0a46a0c
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-from-package-parameter/metadata.json
@@ -0,0 +1,196 @@
+{
+  "Id": "27567d46-b935-4ee6-8b2d-8c165edada4e",
+  "Name": "Deploy ispac SSIS project from a Package parameter",
+  "Description": "This step template will deploy SSIS ispac projects to SQL Server Integration Services Catalog.  The template uses a referenced package and is Worker compatible.\n\nThis template will install the Nuget package provider if it is not present on the machine it is running on.\n\nNOTE:  The SqlServer PowerShell module this template utilizes removed the assemblies necessary to interface with SSIS as of version 22.0.59.  Version 21.1.18256 has been pinned and will be used if the SqlServer PowerShell module is not installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "Id": "5ce9da08-a4ed-4b69-92d1-ab88c705cf08",
+      "Name": "SSIS.Template.ssisPackageId",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "SSIS.Template.ssisPackageId"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "53aa9e3e-1292-4e75-8095-3666ebd5886b",
+      "Name": "SSIS.Template.ServerName",
+      "Label": "Database server name (\\instance)",
+      "HelpText": "Name of the SQL Server you are deploying to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c0605196-f184-44f6-9b3d-c043323e017c",
+      "Name": "SSIS.Template.sqlAccountUsername",
+      "Label": "SQL Authentication Username",
+      "HelpText": "(Optional) Username of the SQL Authentication account.  Use this approach when deploying to Azure Databases with SSIS configured.  If SQL Authentication Username and Password are blank, Integrated Authentication is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "224b913f-657c-4d1c-a3d8-0f286203c1ec",
+      "Name": "SSIS.Template.sqlAccountPassword",
+      "Label": "SQL Authentication Password",
+      "HelpText": "(Optional) Password of the SQL Authentication account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "0abbb06c-5f98-44d8-b20d-b811b6bf18da",
+      "Name": "SSIS.Template.EnableCLR",
+      "Label": "Enable SQL CLR",
+      "HelpText": "This will reconfigure SQL Server to enable the SQL CLR.  It is highly recommended that this be previously authorized by your Database Administrator.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ebe9ab8b-3433-4aeb-bafb-642033a9b0a0",
+      "Name": "SSIS.Template.CatalogName",
+      "Label": "Catalog name",
+      "HelpText": "Name of the catalog to create in Integration Services Catalogs on SQL Server.  When using the GUI, this value gets hardcoded to SSISDB and cannot be changed.  It is recommended that you do not change the default value.",
+      "DefaultValue": "SSISDB",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d111401b-504f-41f4-96de-b7667fcbf990",
+      "Name": "SSIS.Template.CatalogPwd",
+      "Label": "Catalog password",
+      "HelpText": "Password to the Integration Services Catalog.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "d2fefbf6-c68f-4a66-a5d1-3beb9e51a331",
+      "Name": "SSIS.Template.FolderName",
+      "Label": "Folder name",
+      "HelpText": "Name of the folder to use within the Integration Services Catalog",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ec3589c1-360b-44fc-a19c-f2de0f57a323",
+      "Name": "SSIS.Template.UseEnvironment",
+      "Label": "Use environment",
+      "HelpText": "This will make a project reference to the defined environment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "718f2836-1c49-4119-a294-9b5488ead33b",
+      "Name": "SSIS.Template.EnvironmentName",
+      "Label": "Environment name",
+      "HelpText": "Name of the environment to reference the project to. If the environment doesn't exist, it will create it.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "303dd486-a389-48c2-a653-fe881c3b7d9a",
+      "Name": "SSIS.Template.ReferenceProjectParametersToEnvironmentVairables",
+      "Label": "Reference project parameters to environment variables",
+      "HelpText": "Checking this box will make Project Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects that an Octopus variable of the same name exists.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "06079e96-3c10-4137-9c99-83da2051f8be",
+      "Name": "SSIS.Template.ReferencePackageParametersToEnvironmentVairables",
+      "Label": "Reference package parameters to environment variables",
+      "HelpText": "Checking this box will make Package Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects than an Octopus variable of the same name exists.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "8c219bf1-0715-4c21-a131-f7bfb44690cd",
+      "Name": "SSIS.Template.UseFullyQualifiedVariableNames",
+      "Label": "Use Fully Qualified Variable Names",
+      "HelpText": "When true the package variables names must be represented in `dtsx_name_without_extension.variable_name`",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "6b29c969-3928-4faf-af17-0911d777d5b1",
+      "Name": "SSIS.Template.UseCustomFilter",
+      "Label": "Use Custom Filter for connection manager properties",
+      "HelpText": "Custom filter should contain the regular expression for ignoring properties when setting will occur during the auto-mapping",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b33575e2-7246-4c04-b4fa-cd58e2b5e516",
+      "Name": "SSIS.Template.CustomFilter",
+      "Label": "Custom Filter for connection manager properties",
+      "HelpText": "Regular expression for filtering out the connection manager properties during the auto-mapping process. This string is used when `UseCustomFilter` is set to true",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "92b546d9-abf3-45e4-a61b-0315c21455df",
+      "Name": "SSIS.Template.SyncEnvironment",
+      "Label": "Clean obsolete variables from environment",
+      "HelpText": "When `true` synchronizes the environment:\n- Removes obsolete variables\n- Removes renamed variables\n- Replaces values of valid variables (also when `false`)",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "6a1fa441-9e14-4c13-b7f3-9c932d9b4e8e",
+      "Name": "SSIS.Template.ssisPackageId",
+      "Label": "Package Id",
+      "HelpText": "Id of the package to deploy, used to support deployment with Workers.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2026-03-13T09:17:00.0000000",
+    "OctopusVersion": "2025.4.10250",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "bcullman",
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssis-deploy-ispac-from-package-parameter/scriptbody.ps1 b/src/step-templates/ssis-deploy-ispac-from-package-parameter/scriptbody.ps1
new file mode 100644
index 000000000..dc41b6698
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-from-package-parameter/scriptbody.ps1
@@ -0,0 +1,707 @@
+function Add-TemporaryPinnedSqlServerModule
+{
+    # Define parameters
+    param(
+        $LocalModulesPath
+    )
+
+    $PowerShellModuleName = "SqlServer"
+    $RequiredVersion = [version]'21.1.18256'
+
+    # Check to see if the package provider has been installed
+    if ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+    {
+        # Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force -RequiredVersion $RequiredVersion -Repository "PSGallery"
+
+    # Display
+    Write-Output "Saved module $PowerShellModuleName v$RequiredVersion to $LocalModulesPath"
+
+    # Import the module
+    Import-Module -Name $PowerShellModuleName
+}
+
+Function Remove-TemporaryPinnedSqlServerModule
+{
+    param(
+        [Parameter(Mandatory = $true)][string]$LocalModulesPath,
+        [Parameter(Mandatory = $true)][version]$PinnedVersion
+    )
+
+    try { Remove-Module SqlServer -Force -ErrorAction SilentlyContinue } catch {}
+
+    $moduleRoot = Join-Path $LocalModulesPath 'SqlServer'
+    $pinnedPath = Join-Path $moduleRoot $PinnedVersion.ToString()
+
+    if (Test-Path $pinnedPath)
+    {
+        Write-Host "Removing temporary pinned SqlServer module folder: $pinnedPath"
+        Remove-Item -Path $pinnedPath -Recurse -Force -ErrorAction SilentlyContinue
+    }
+
+    # Optional: remove parent if empty
+    if (Test-Path $moduleRoot)
+    {
+        $remaining = Get-ChildItem -Path $moduleRoot -Force -ErrorAction SilentlyContinue
+        if (-not $remaining)
+        {
+            Remove-Item -Path $moduleRoot -Force -ErrorAction SilentlyContinue
+        }
+    }
+}
+
+Function Test-IntegrationServicesTypeAvailable
+{
+    # True if the IntegrationServices type resolves in this PowerShell session, else false
+    $typeName = 'Microsoft.SqlServer.Management.IntegrationServices.IntegrationServices'
+    $aqn = "$typeName, Microsoft.SqlServer.Management.IntegrationServices"
+
+    try
+    {
+        if ([Type]::GetType($aqn, $false)) { return $true }
+    }
+    catch {}
+
+    # Try to load assembly (strong name), may fail on some boxes
+    try { [void][Reflection.Assembly]::Load('Microsoft.SqlServer.Management.IntegrationServices') } catch {}
+
+    try
+    {
+        if ([Type]::GetType($aqn, $false)) { return $true }
+    }
+    catch {}
+
+    # Fall back to explicit GAC path load (LoadFrom) if present
+    $gacRoot = Join-Path $env:windir 'Microsoft.NET\assembly\GAC_MSIL\Microsoft.SqlServer.Management.IntegrationServices'
+    if (Test-Path $gacRoot)
+    {
+        $gacDll = Get-ChildItem -Path $gacRoot -Recurse -Filter 'Microsoft.SqlServer.Management.IntegrationServices.dll' -File -ErrorAction SilentlyContinue |
+                  Sort-Object FullName -Descending |
+                  Select-Object -First 1
+
+        if ($null -eq $gacDll)
+        {
+            try
+            {
+                $asm = [Reflection.Assembly]::LoadFrom($gacDll.FullName)
+                if ($asm.GetType('Microsoft.SqlServer.Management.IntegrationServices.IntegrationServices', $false)) { return $true }
+            }
+            catch {}
+        }
+    }
+
+    try
+    {
+        if ([Type]::GetType($aqn, $false)) { return $true }
+    }
+    catch {}
+
+    return $false
+}
+
+Function Load-SqlServerAssemblies
+{
+    # Get the folder where the SqlServer module ended up in
+    $sqlServerModulePath = [System.IO.Path]::GetDirectoryName((Get-Module SqlServer).Path)
+
+    # Loop through the assemblies
+    foreach($assemblyFile in (Get-ChildItem -Path $sqlServerModulePath -Exclude msv*.dll | Where-Object {$_.Extension -eq ".dll"}))
+    {
+        try
+        {
+            # Only load managed .NET assemblies (native DLLs will throw)
+            [void][System.Reflection.AssemblyName]::GetAssemblyName($assemblyFile.FullName)
+
+            # Load the managed assembly
+            [Reflection.Assembly]::LoadFrom($assemblyFile.FullName) | Out-Null
+        }
+        catch [System.BadImageFormatException]
+        {
+            # Native DLL (or wrong format), skip
+        }
+    }
+}
+
+Function Initialize-SsisDeploymentRuntime
+{
+    param(
+        [Parameter(Mandatory = $true)][string]$LocalModulesPath,
+        [Parameter(Mandatory = $true)][version]$PinnedSqlServerVersion
+    )
+
+    # Define PowerShell Modules path
+    $env:PSModulePath = "$LocalModulesPath;$env:PSModulePath"
+
+    $runtime = [pscustomobject]@{
+        UsedPinnedSqlServerModule = $false
+        SsisTypeAvailable         = $false
+    }
+
+    # First preference: use SSIS assemblies already available on the machine/session
+    $runtime.SsisTypeAvailable = Test-IntegrationServicesTypeAvailable
+
+    if ($runtime.SsisTypeAvailable)
+    {
+        Write-Host "SSIS IntegrationServices type is already available."
+
+        # Only need a SqlServer module for cmdlets such as Invoke-Sqlcmd
+        if ($null -ne (Get-Module -ListAvailable -Name "SqlServer"))
+        {
+            Import-Module -Name SqlServer -ErrorAction Stop
+        }
+        else
+        {
+            Write-Output "PowerShell module SqlServer not present, downloading temporary pinned copy for cmdlets ..."
+            [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12
+
+            Add-TemporaryPinnedSqlServerModule -LocalModulesPath $LocalModulesPath
+
+            $manifestPath = Join-Path (Join-Path (Join-Path $LocalModulesPath 'SqlServer') $PinnedSqlServerVersion.ToString()) 'SqlServer.psd1'
+            Write-Host "Importing pinned SqlServer module from: $manifestPath"
+            Import-Module -Name $manifestPath -Force -DisableNameChecking -ErrorAction Stop
+
+            $runtime.UsedPinnedSqlServerModule = $true
+        }
+
+        # SSIS type already resolved, no need to bulk-load module assemblies
+        return $runtime
+    }
+
+    # Second preference: fall back to pinned SqlServer module that still contains SSIS assemblies
+    Write-Output "SSIS IntegrationServices type not available via installed components. Downloading pinned SqlServer module $PinnedSqlServerVersion temporarily ..."
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12
+
+    $manifestPath = Join-Path (Join-Path (Join-Path $LocalModulesPath 'SqlServer') $PinnedSqlServerVersion.ToString()) 'SqlServer.psd1'
+    if (-not (Test-Path $manifestPath))
+    {
+        Add-TemporaryPinnedSqlServerModule -LocalModulesPath $LocalModulesPath
+    }
+
+    Write-Host "Importing pinned SqlServer module from: $manifestPath"
+    Import-Module -Name $manifestPath -Force -DisableNameChecking -ErrorAction Stop
+    Load-SqlServerAssemblies
+
+    $runtime.UsedPinnedSqlServerModule = $true
+    $runtime.SsisTypeAvailable = Test-IntegrationServicesTypeAvailable
+
+    return $runtime
+}
+
+Function Get-Catalog
+{
+    # define parameters
+    Param ($CatalogName)
+    # NOTE: using $integrationServices variable defined in main
+
+    # define working variables
+    $Catalog = $null
+    # check to see if there are any catalogs
+    if($integrationServices.Catalogs.Count -gt 0 -and $integrationServices.Catalogs[$CatalogName])
+    {
+        # get reference to catalog
+        $Catalog = $integrationServices.Catalogs[$CatalogName]
+    }
+    else
+    {
+        if((Get-CLREnabled) -eq 0)
+        {
+            if(-not $EnableCLR)
+            {
+                # throw error
+                throw "SQL CLR is not enabled."
+            }
+            else
+            {
+                # display sql clr isn't enabled
+                Write-Warning "SQL CLR is not enabled on $($sqlConnection.DataSource).  This feature must be enabled for SSIS catalogs."
+
+                # enabling SQLCLR
+                Write-Host "Enabling SQL CLR ..."
+                Enable-SQLCLR
+                Write-Host "SQL CLR enabled"
+            }
+        }
+
+        # Provision a new SSIS Catalog
+        Write-Host "Creating SSIS Catalog ..."
+
+        $Catalog = New-Object "$ISNamespace.Catalog" ($integrationServices, $CatalogName, $OctopusParameters['SSIS.Template.CatalogPwd'])
+        $Catalog.Create()
+    }
+
+    # return the catalog
+    return $Catalog
+}
+
+Function Get-CLREnabled
+{
+    # define parameters
+    # Not using any parameters, but am using $sqlConnection defined in main
+
+    # define working variables
+    $Query = "SELECT * FROM sys.configurations WHERE name = 'clr enabled'"
+
+    # execute script
+    $CLREnabled = Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database "master" -Query $Query | Select value
+
+    # return value
+    return $CLREnabled.Value
+}
+
+Function Enable-SQLCLR
+{
+    $QueryArray = "sp_configure 'show advanced options', 1", "RECONFIGURE", "sp_configure 'clr enabled', 1", "RECONFIGURE "
+    # execute script
+
+    foreach($Query in $QueryArray)
+    {
+        Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database "master" -Query $Query
+    }
+
+    # check that it's enabled
+    if((Get-CLREnabled) -ne 1)
+    {
+        # throw error
+        throw "Failed to enable SQL CLR"
+    }
+}
+
+Function Get-Folder
+{
+    # parameters
+    Param($FolderName, $Catalog)
+
+    $Folder = $null
+    # try to get reference to folder
+
+    if(!($Catalog.Folders -eq $null))
+    {
+        $Folder = $Catalog.Folders[$FolderName]
+    }
+
+    # check to see if $Folder has a value
+    if($Folder -eq $null)
+    {
+        # display
+        Write-Host "Folder $FolderName doesn't exist, creating folder..."
+
+        # create the folder
+        $Folder = New-Object "$ISNamespace.CatalogFolder" ($Catalog, $FolderName, $FolderName)
+        $Folder.Create()
+    }
+
+    # return the folder reference
+    return $Folder
+}
+
+Function Get-Environment
+{
+    # define parameters
+    Param($Folder, $EnvironmentName)
+
+    $Environment = $null
+    # get reference to Environment
+    if(!($Folder.Environments -eq $null) -and $Folder.Environments.Count -gt 0)
+    {
+        $Environment = $Folder.Environments[$EnvironmentName]
+    }
+
+    # check to see if it's a null reference
+    if($Environment -eq $null)
+    {
+        # display
+        Write-Host "Environment $EnvironmentName doesn't exist, creating environment..."
+
+        # create environment
+        $Environment = New-Object "$ISNamespace.EnvironmentInfo" ($Folder, $EnvironmentName, $EnvironmentName)
+        $Environment.Create()
+    }
+
+    # return the environment
+    return $Environment
+}
+
+Function Set-EnvironmentReference
+{
+    # define parameters
+    Param($Project, $Environment, $Folder)
+
+    # get reference
+    $Reference = $null
+
+    if(!($Project.References -eq $null))
+    {
+        $Reference = $Project.References[$Environment.Name, $Folder.Name]
+    }
+
+    # check to see if it's a null reference
+    if($Reference -eq $null)
+    {
+        # display
+        Write-Host "Project does not reference environment $($Environment.Name), creating reference..."
+
+        # create reference
+        $Project.References.Add($Environment.Name, $Folder.Name)
+        $Project.Alter()
+    }
+}
+
+Function Set-ProjectParametersToEnvironmentVariablesReference
+{
+    # define parameters
+    Param($Project, $Environment)
+
+    $UpsertedVariables = @()
+
+    if($Project.Parameters -eq $null)
+    {
+        Write-Host "No project parameters exist"
+        return
+    }
+
+    # loop through project parameters
+    foreach($Parameter in $Project.Parameters)
+    {
+        # skip if the parameter is included in custom filters
+        if ($UseCustomFilter)
+        {
+            if ($Parameter.Name -match $CustomFilter)
+            {
+                Write-Host "- $($Parameter.Name) skipped due to CustomFilters."
+                continue
+            }
+        }
+
+        # Add variable to list of variable
+        $UpsertedVariables += $Parameter.Name
+
+        $Variable = $null
+        if(!($Environment.Variables -eq $null))
+        {
+            # get reference to variable
+            $Variable = $Environment.Variables[$Parameter.Name]
+        }
+
+        # check to see if variable exists
+        if($Variable -eq $null)
+        {
+            # add the environment variable
+            Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name
+
+            # get reference to the newly created variable
+            $Variable = $Environment.Variables[$Parameter.Name]
+        }
+
+        # set the environment variable value
+        Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $Parameter.Name
+    }
+
+    # alter the environment
+    $Environment.Alter()
+    $Project.Alter()
+
+    return $UpsertedVariables
+}
+
+Function Set-PackageVariablesToEnvironmentVariablesReference
+{
+    # define parameters
+    Param($Project, $Environment)
+
+    $Variables = @()
+    $UpsertedVariables = @()
+
+    # loop through packages in project in order to store a temp collection of variables
+    foreach($Package in $Project.Packages)
+    {
+        # loop through parameters of package
+        foreach($Parameter in $Package.Parameters)
+        {
+            # add to the temporary variable collection
+            $Variables += $Parameter.Name
+        }
+    }
+
+    # loop through packages in project
+    foreach($Package in $Project.Packages)
+    {
+        # loop through parameters of package
+        foreach($Parameter in $Package.Parameters)
+        {
+            if ($UseFullyQualifiedVariableNames)
+            {
+                # Set fully qualified variable name
+                $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "")+"."+$Parameter.Name
+            }
+            else
+            {
+                # check if exists a variable with the same name
+                $VariableNameOccurrences = $($Variables | Where-Object { $_ -eq $Parameter.Name }).count
+                $ParameterName = $Parameter.Name
+
+                if ($VariableNameOccurrences -gt 1)
+                {
+                    $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "")+"."+$Parameter.Name
+                }
+            }
+
+            if ($UseCustomFilter)
+            {
+                if ($ParameterName -match $CustomFilter)
+                {
+                    Write-Host "- $($Parameter.Name) skipped due to CustomFilters."
+                    continue
+                }
+            }
+
+            # get reference to variable
+            $Variable = $Environment.Variables[$ParameterName]
+
+            # Add variable to list of variable
+            $UpsertedVariables += $ParameterName
+
+            # check to see if the parameter exists
+            if(!$Variable)
+            {
+                # add the environment variable
+                Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName
+
+                # get reference to the newly created variable
+                $Variable = $Environment.Variables[$ParameterName]
+            }
+
+            # set the environment variable value
+            Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $ParameterName
+        }
+
+        # alter the package
+        $Package.Alter()
+    }
+
+    # alter the environment
+    $Environment.Alter()
+
+    return $UpsertedVariables
+}
+
+Function Sync-EnvironmentVariables
+{
+    # define parameters
+    Param($Environment, $VariablesToPreserveInEnvironment)
+
+    foreach($VariableToEvaluate in $Environment.Variables)
+    {
+        if ($VariablesToPreserveInEnvironment -notcontains $VariableToEvaluate.Name)
+        {
+            Write-Host "- Removing environment variable: $($VariableToEvaluate.Name)"
+            $VariableToRemove = $Environment.Variables[$VariableToEvaluate.Name]
+            $Environment.Variables.Remove($VariableToRemove) | Out-Null
+        }
+    }
+
+    # alter the environment
+    $Environment.Alter()
+}
+
+Function Add-EnvironmentVariable
+{
+    # define parameters
+    Param($Environment, $Parameter, $ParameterName)
+
+    # display
+    Write-Host "- Adding environment variable $($ParameterName)"
+
+    # check to see if design default value is empty or null
+    if([string]::IsNullOrEmpty($Parameter.DesignDefaultValue))
+    {
+        # give it something
+        $DefaultValue = "" # sensitive variables will not return anything so when trying to use the property of $Parameter.DesignDefaultValue, the Alter method will fail.
+    }
+    else
+    {
+        # take the design
+        $DefaultValue = $Parameter.DesignDefaultValue
+    }
+
+    # add variable with an initial value
+    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $DefaultValue, $Parameter.Sensitive, $Parameter.Description)
+}
+
+Function Set-EnvironmentVariableValue
+{
+     # define parameters
+    Param($Variable, $Parameter, $ParameterName)
+
+    # check to make sure variable value is available
+    if (-not $OctopusParameters){
+        Write-Host "[WARN] - OctopusParameters collection is empty"
+    }
+    else
+    {
+        if($OctopusParameters.ContainsKey($ParameterName))
+        {
+            # display
+            Write-Host "[ OK ] - $($ParameterName) updated."
+
+            # set the variable value
+            $Variable.Value = $OctopusParameters["$($ParameterName)"]
+        }
+        else
+        {
+            # warning
+            Write-Host "[WARN] - $($ParameterName) not in OctopusParameters collection."
+        }
+    }
+
+    # Set reference
+    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, "$($ParameterName)")
+}
+
+Function Invoke-SsisProjectDeployment
+{
+    $LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+    $pinnedSqlServerVersion = [version]'21.1.18256'
+    $sqlConnection = $null
+    $runtime = $null
+
+    try
+    {
+        $runtime = Initialize-SsisDeploymentRuntime -LocalModulesPath $LocalModules -PinnedSqlServerVersion $pinnedSqlServerVersion
+
+        # Store the IntegrationServices Assembly namespace to avoid typing it every time
+        $ISNamespace = "Microsoft.SqlServer.Management.IntegrationServices"
+
+        # ensure all boolean variables are true booleans
+        $EnableCLR = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.EnableCLR'])")
+        $UseEnvironment = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.UseEnvironment'])")
+        $ReferenceProjectParametersToEnvironmentVairables = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.ReferenceProjectParametersToEnvironmentVairables'])")
+
+        $ReferencePackageParametersToEnvironmentVairables = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.ReferencePackageParametersToEnvironmentVairables'])")
+        $UseFullyQualifiedVariableNames = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.UseFullyQualifiedVariableNames'])")
+        $SyncEnvironment = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.SyncEnvironment'])")
+        # custom names for filtering out the excluded variables by design
+        $UseCustomFilter = [System.Convert]::ToBoolean("$($OctopusParameters['SSIS.Template.UseCustomFilter'])")
+        $CustomFilter = [System.Convert]::ToString("$($OctopusParameters['SSIS.Template.CustomFilter'])")
+        # list of variables names to keep in target environment
+        $VariablesToPreserveInEnvironment = @()
+        $ssisPackageId = $OctopusParameters['SSIS.Template.ssisPackageId']
+
+        # Get the extracted path
+        $DeployedPath = $OctopusParameters["Octopus.Action.Package[$ssisPackageId].ExtractedPath"]
+
+        # Get all .ispac files from the deployed path
+        $IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where {$_.Extension.ToLower() -eq ".ispac"}
+
+        # display number of files
+        Write-Host "$($IsPacFiles.Count) .ispac file(s) found."
+
+        Write-Host "Connecting to server ..."
+
+        # Create a connection to the server
+        $sqlConnectionString = "Data Source=$($OctopusParameters['SSIS.Template.ServerName']);Initial Catalog=SSISDB;"
+
+        if (![string]::IsNullOrEmpty($OctopusParameters['SSIS.Template.sqlAccountUsername']) -and ![string]::IsNullOrEmpty($OctopusParameters['SSIS.Template.sqlAccountPassword']))
+        {
+            # Add username and password to connection string
+            $sqlConnectionString += "User ID=$($OctopusParameters['SSIS.Template.sqlAccountUsername']); Password=$($OctopusParameters['SSIS.Template.sqlAccountPassword']);"
+        }
+        else
+        {
+            # Use integrated
+            $sqlConnectionString += "Integrated Security=SSPI;"
+        }
+
+        # Create new connection object with connection string
+        $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString
+
+        # create integration services object
+        $integrationServices = New-Object "$ISNamespace.IntegrationServices" $sqlConnection
+
+        # get reference to the catalog
+        Write-Host "Getting reference to catalog $($OctopusParameters['SSIS.Template.CataLogName'])"
+        $Catalog = Get-Catalog -CatalogName $OctopusParameters['SSIS.Template.CataLogName']
+
+        # get folder reference
+        $Folder = Get-Folder -FolderName $OctopusParameters['SSIS.Template.FolderName'] -Catalog $Catalog
+
+        # loop through ispac files
+        foreach($IsPacFile in $IsPacFiles)
+        {
+            # read project file
+            $ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)
+            $ProjectName = $IsPacFile.Name.SubString(0, $IsPacFile.Name.LastIndexOf("."))
+
+            # deploy project
+            Write-Host "Deploying project $($IsPacFile.Name)..."
+            $Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null
+
+            # get reference to deployed project
+            $Project = $Folder.Projects[$ProjectName]
+
+            # check to see if they want to use environments
+            if($UseEnvironment)
+            {
+                # get environment reference
+                $Environment = Get-Environment -Folder $Folder -EnvironmentName $OctopusParameters['SSIS.Template.EnvironmentName']
+
+                # set environment reference
+                Set-EnvironmentReference -Project $Project -Environment $Environment -Folder $Folder
+
+                # check to see if the user wants to convert project parameters to environment variables
+                if($ReferenceProjectParametersToEnvironmentVairables)
+                {
+                    # set environment variables
+                    Write-Host "Referencing Project Parameters to Environment Variables..."
+                    $VariablesToPreserveInEnvironment += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment
+                }
+
+                # check to see if the user wants to convert the package parameters to environment variables
+                if($ReferencePackageParametersToEnvironmentVairables)
+                {
+                    # set package variables
+                    Write-Host "Referencing Package Parameters to Environment Variables..."
+                    $VariablesToPreserveInEnvironment += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment
+                }
+
+                # Removes all unused variables from the environment
+                if ($SyncEnvironment)
+                {
+                    Write-Host "Sync package environment variables..."
+                    Sync-EnvironmentVariables -Environment $Environment -VariablesToPreserveInEnvironment $VariablesToPreserveInEnvironment
+                }
+            }
+        }
+    }
+
+    finally
+    {
+        # check to make sure sqlconnection isn't null
+        if($sqlConnection)
+        {
+            # check state of sqlconnection
+            if($sqlConnection.State -eq [System.Data.ConnectionState]::Open)
+            {
+                # close the connection
+                $sqlConnection.Close()
+            }
+
+            # cleanup
+            $sqlConnection.Dispose()
+        }
+
+        # cleanup temporary pinned SqlServer module only when it was actually used
+        if ($runtime -and $runtime.UsedPinnedSqlServerModule)
+        {
+            Remove-TemporaryPinnedSqlServerModule -LocalModulesPath $LocalModules -PinnedVersion $pinnedSqlServerVersion
+        }
+    }
+}
+
+Invoke-SsisProjectDeployment
\ No newline at end of file
diff --git a/src/step-templates/ssis-deploy-ispac-from-package/metadata.json b/src/step-templates/ssis-deploy-ispac-from-package/metadata.json
new file mode 100644
index 000000000..de9213fc5
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-from-package/metadata.json
@@ -0,0 +1,172 @@
+{
+  "Id": "bf005449-60c2-4746-8e07-8ba857f93605",
+  "Name": "Deploy ispac SSIS project from a package",
+  "Description": "This step template will deploy SSIS ispac projects to SQL Server Integration Services Catalog",
+  "ActionType": "Octopus.Script",
+  "Version": 15,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "da92ad6a-23ac-4f24-b243-b42507737422",
+      "Name": "ServerName",
+      "Label": "Database server name (\\instance)",
+      "HelpText": "Name of the SQL Server you are deploying to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a3e3e7e5-aa53-429c-b63b-166ddc875e45",
+      "Name": "EnableCLR",
+      "Label": "Enable SQL CLR",
+      "HelpText": "This will reconfigure SQL Server to enable the SQL CLR.  It is highly recommended that this be previously authorized by your Database Administrator.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "bb659731-de74-470b-94fe-24b61e27e176",
+      "Name": "CatalogName",
+      "Label": "Catalog name",
+      "HelpText": "Name of the catalog to create in Integration Services Catalogs on SQL Server.  When using the GUI, this value gets hardcoded to SSISDB and cannot be changed.  It is recommended that you do not change the default value.",
+      "DefaultValue": "SSISDB",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "af66e1ad-3631-4d4b-99d4-215a1b2beb9d",
+      "Name": "CatalogPwd",
+      "Label": "Catalog password",
+      "HelpText": "Password to the Integration Services Catalog.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "db080c05-a746-4c27-b964-d98b63b00a29",
+      "Name": "FolderName",
+      "Label": "Folder name",
+      "HelpText": "Name of the folder to use within the Integration Services Catalog",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c6264016-2c14-4e24-949c-d8a9d73599ac",
+      "Name": "ProjectName",
+      "Label": "Project name",
+      "HelpText": "Name of the project within the folder of the Integration Services catalog",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f628a71c-5399-4137-926b-3c8d170ba61c",
+      "Name": "UseEnvironment",
+      "Label": "Use environment",
+      "HelpText": "This will make a project reference to the defined environment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "66eee7ee-7f89-4675-a32a-f33dac895311",
+      "Name": "EnvironmentName",
+      "Label": "Environment name",
+      "HelpText": "Name of the environment to reference the project to. If the environment doesn't exist, it will create it.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a014a370-9b9d-4284-b6be-a603f9f97942",
+      "Name": "ReferenceProjectParametersToEnvironmentVairables",
+      "Label": "Reference project parameters to environment variables",
+      "HelpText": "Checking this box will make Project Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects that an Octopus variable of the same name exists.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "4441ed46-3cc3-42bb-9baa-5753cd4d6d5c",
+      "Name": "ReferencePackageParametersToEnvironmentVairables",
+      "Label": "Reference package parameters to environment variables",
+      "HelpText": "Checking this box will make Package Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects than an Octopus variable of the same name exists.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "3d4e78ec-fe77-4221-be40-1b3d2fbfc3c4",
+      "Name": "NugetPackageStepName",
+      "Label": "NuGet package step",
+      "HelpText": "The step that uploaded the NuGet package to the server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "7c9d808d-60f3-4648-b8a4-e4865268740b",
+      "Name": "UseFullyQualifiedVariableNames",
+      "Label": "Use Fully Qualified Variable Names",
+      "HelpText": "When true the package variables names must be represented in `dtsx_name_without_extension.variable_name`",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "fef889a5-1f5b-48c7-bb65-2f2c3498e6cd",
+      "Name": "UseCustomFilter",
+      "Label": "Use Custom Filter for connection manager properties",
+      "HelpText": "Custom filter should contain the regular expression for ignoring properties when setting will occur during the auto-mapping",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ebefb099-ce7a-45bf-b52a-bb8ea9915b1b",
+      "Name": "CustomFilter",
+      "Label": "Custom Filter for connection manager properties",
+      "HelpText": "Regular expression for filtering out the connection manager properties during the auto-mapping process. This string is used when `UseCustomFilter` is set to true",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "dbe29935-d3c6-4b77-b796-26347abdbf2c",
+      "Name": "SyncEnvironment",
+      "Label": "Clean obsolete variables from environment",
+      "HelpText": "When `true` synchronizes the environment:\n- Removes obsolete variables\n- Removes renamed variables\n- Replaces values of valid variables (also when `false`)",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "suxstellino",
+  "$Meta": {
+    "ExportedAt": "2019-04-18T13:43:05.4930000Z",
+    "OctopusVersion": "2018.10.5",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssis-deploy-ispac-from-package/scriptbody.ps1 b/src/step-templates/ssis-deploy-ispac-from-package/scriptbody.ps1
new file mode 100644
index 000000000..e89f97964
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-from-package/scriptbody.ps1
@@ -0,0 +1,511 @@
+#region Functions
+
+#region Get-Catalog
+Function Get-Catalog
+{
+     # define parameters
+    Param ($CatalogName)
+    # NOTE: using $integrationServices variable defined in main
+    
+    # define working varaibles
+    $Catalog = $null
+    # check to see if there are any catalogs
+    if($integrationServices.Catalogs.Count -gt 0 -and $integrationServices.Catalogs[$CatalogName])
+    {
+    	# get reference to catalog
+    	$Catalog = $integrationServices.Catalogs[$CatalogName]
+    }
+    else
+    {
+    	if((Get-CLREnabled) -eq 0)
+    	{
+    		if(-not $EnableCLR)
+    		{
+    			# throw error
+    			throw "SQL CLR is not enabled."
+    		}
+    		else
+    		{
+    			# display sql clr isn't enabled
+    			Write-Warning "SQL CLR is not enabled on $($sqlConnection.DataSource).  This feature must be enabled for SSIS catalogs."
+    
+    			# enablign SQLCLR
+    			Write-Host "Enabling SQL CLR ..."
+    			Enable-SQLCLR
+    			Write-Host "SQL CLR enabled"
+    		}
+    	}
+    
+    	# Provision a new SSIS Catalog
+    	Write-Host "Creating SSIS Catalog ..."
+    
+    	$Catalog = New-Object "$ISNamespace.Catalog" ($integrationServices, $CatalogName, $CatalogPwd)
+    	$Catalog.Create()
+    
+    
+    }
+    
+    # return the catalog
+    return $Catalog
+}
+#endregion
+
+#region Get-CLREnabled
+Function Get-CLREnabled
+{
+    # define parameters
+    # Not using any parameters, but am using $sqlConnection defined in main
+    
+    # define working variables
+    $Query = "SELECT * FROM sys.configurations WHERE name = 'clr enabled'"
+    
+    # execute script
+    $CLREnabled = Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database "master" -Query $Query | Select value
+    
+    # return value
+    return $CLREnabled.Value
+}
+#endregion
+
+#region Enable-SQLCLR
+Function Enable-SQLCLR
+{
+    $QueryArray = "sp_configure 'show advanced options', 1", "RECONFIGURE", "sp_configure 'clr enabled', 1", "RECONFIGURE "
+    # execute script
+    
+    foreach($Query in $QueryArray)
+    {
+    	Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database "master" -Query $Query
+    }
+    
+    # check that it's enabled
+    if((Get-CLREnabled) -ne 1)
+    {
+    	# throw error
+    	throw "Failed to enable SQL CLR"
+    }
+}
+#endregion
+
+#region Get-Folder
+Function Get-Folder
+{
+ # parameters
+    Param($FolderName, $Catalog)
+    
+    $Folder = $null
+    # try to get reference to folder
+    
+    if(!($Catalog.Folders -eq $null))
+    {
+    	$Folder = $Catalog.Folders[$FolderName]
+    }
+    
+    # check to see if $Folder has a value
+    if($Folder -eq $null)
+    {
+    	# display
+    	Write-Host "Folder $FolderName doesn't exist, creating folder..."
+    
+    	# create the folder
+    	$Folder = New-Object "$ISNamespace.CatalogFolder" ($Catalog, $FolderName, $FolderName) 
+    	$Folder.Create() 
+    }
+    
+    # return the folde reference
+    return $Folder
+}
+#endregion
+
+#region Get-Environment
+Function Get-Environment
+{
+     # define parameters
+    Param($Folder, $EnvironmentName)
+    
+    $Environment = $null
+    # get reference to Environment
+    if(!($Folder.Environments -eq $null) -and $Folder.Environments.Count -gt 0)
+    {
+    	$Environment = $Folder.Environments[$EnvironmentName]
+    }
+    
+    # check to see if it's a null reference
+    if($Environment -eq $null)
+    {
+    	# display
+    	Write-Host "Environment $EnvironmentName doesn't exist, creating environment..."
+    
+    	# create environment
+    	$Environment = New-Object "$ISNamespace.EnvironmentInfo" ($Folder, $EnvironmentName, $EnvironmentName)
+    	$Environment.Create() 
+    }
+    
+    # return the environment
+    return $Environment
+}
+#endregion
+
+#region Set-EnvironmentReference
+Function Set-EnvironmentReference
+{
+     # define parameters
+    Param($Project, $Environment, $Folder)
+    
+    # get reference
+    $Reference = $null
+    
+    if(!($Project.References -eq $null))
+    {
+    	$Reference = $Project.References[$Environment.Name, $Folder.Name]
+    
+    }
+    
+    # check to see if it's a null reference
+    if($Reference -eq $null)
+    {
+    	# display
+    	Write-Host "Project does not reference environment $($Environment.Name), creating reference..."
+    
+    	# create reference
+    	$Project.References.Add($Environment.Name, $Folder.Name)
+    	$Project.Alter() 
+    }
+}
+#endregion
+
+#region Set-ProjectParametersToEnvironmentVariablesReference
+Function Set-ProjectParametersToEnvironmentVariablesReference
+{
+     # define parameters
+    Param($Project, $Environment)
+    
+    $UpsertedVariables = @()
+
+    if($Project.Parameters -eq $null)
+    {
+        Write-Host "No project parameters exist"
+        return
+    }
+
+    # loop through project parameters
+    foreach($Parameter in $Project.Parameters)
+    {
+        # skip if the parameter is included in custom filters
+        if ($UseCustomFilter) 
+        {
+            if ($Parameter.Name -match $CustomFilter)
+            {
+                Write-Host "- $($Parameter.Name) skipped due to CustomFilters."            
+                continue
+            }
+        }
+
+        # Add variable to list of variable
+        $UpsertedVariables += $Parameter.Name
+
+        $Variable = $null
+        if(!($Environment.Variables -eq $null))
+        {
+    	    # get reference to variable
+    	    $Variable = $Environment.Variables[$Parameter.Name]
+        }
+    
+    	# check to see if variable exists
+    	if($Variable -eq $null)
+    	{
+    		# add the environment variable
+    		Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name
+    
+    		# get reference to the newly created variable
+    		$Variable = $Environment.Variables[$Parameter.Name]
+    	}
+    
+    	# set the environment variable value
+    	Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $Parameter.Name
+    }
+    
+    # alter the environment
+    $Environment.Alter()
+    $Project.Alter()
+
+    return $UpsertedVariables
+}
+#endregion
+
+Function Set-PackageVariablesToEnvironmentVariablesReference
+{
+    # define parameters
+    Param($Project, $Environment)
+
+    $Variables = @()
+    $UpsertedVariables = @()
+
+    # loop through packages in project in order to store a temp collection of variables
+    foreach($Package in $Project.Packages)
+    {
+    	# loop through parameters of package
+    	foreach($Parameter in $Package.Parameters)
+    	{
+    		# add to the temporary variable collection
+    		$Variables += $Parameter.Name
+    	}
+    }
+
+    # loop through packages in project
+    foreach($Package in $Project.Packages)
+    {
+    	# loop through parameters of package
+    	foreach($Parameter in $Package.Parameters)
+    	{
+            if ($UseFullyQualifiedVariableNames)
+            {
+                # Set fully qualified variable name
+                $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "")+"."+$Parameter.Name
+            }
+            else
+            {
+                # check if exists a variable with the same name
+                $VariableNameOccurrences = $($Variables | Where-Object { $_ -eq $Parameter.Name }).count
+                $ParameterName = $Parameter.Name
+                
+                if ($VariableNameOccurrences -gt 1)
+                {
+                    $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "")+"."+$Parameter.Name
+                }
+            }
+            
+            if ($UseCustomFilter)
+            {
+                if ($ParameterName -match $CustomFilter)
+                {
+                    Write-Host "- $($Parameter.Name) skipped due to CustomFilters."            
+                    continue
+                }
+            }
+
+            # get reference to variable
+    		$Variable = $Environment.Variables[$ParameterName]
+
+            # Add variable to list of variable
+            $UpsertedVariables += $ParameterName
+
+            # check to see if the parameter exists
+    		if(!$Variable)
+    		{
+    			# add the environment variable
+    			Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName
+    
+    			# get reference to the newly created variable
+    			$Variable = $Environment.Variables[$ParameterName]
+    		}
+    
+    		# set the environment variable value
+    		Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $ParameterName
+    	}
+    
+    	# alter the package
+    	$Package.Alter()
+    }
+    
+    # alter the environment
+    $Environment.Alter()
+
+    return $UpsertedVariables
+}
+
+Function Sync-EnvironmentVariables
+{
+    # define parameters
+    Param($Environment, $VariablesToPreserveInEnvironment)
+
+    foreach($VariableToEvaluate in $Environment.Variables)
+    {
+        if ($VariablesToPreserveInEnvironment -notcontains $VariableToEvaluate.Name)
+        {
+            Write-Host "- Removing environment variable: $($VariableToEvaluate.Name)"
+            $VariableToRemove = $Environment.Variables[$VariableToEvaluate.Name]
+            $Environment.Variables.Remove($VariableToRemove) | Out-Null
+        }
+    }
+
+    # alter the environment
+    $Environment.Alter()
+}
+
+#region Add-EnvironmentVariable
+Function Add-EnvironmentVariable
+{
+    # define parameters
+    Param($Environment, $Parameter, $ParameterName)
+    
+    # display 
+    Write-Host "- Adding environment variable $($ParameterName)"
+    
+    # check to see if design default value is emtpy or null
+    if([string]::IsNullOrEmpty($Parameter.DesignDefaultValue))
+    {
+    	# give it something
+    	$DefaultValue = "" # sensitive variables will not return anything so when trying to use the property of $Parameter.DesignDefaultValue, the Alter method will fail.
+    }
+    else
+    {
+    	# take the design
+    	$DefaultValue = $Parameter.DesignDefaultValue
+    }
+    
+    # add variable with an initial value
+    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $DefaultValue, $Parameter.Sensitive, $Parameter.Description)
+}
+#endregion
+
+#region Set-EnvironmentVariableValue
+Function Set-EnvironmentVariableValue
+{
+     # define parameters
+    Param($Variable, $Parameter, $ParameterName)
+
+    # check to make sure variable value is available
+    if($OctopusParameters -and $OctopusParameters.ContainsKey($ParameterName))
+    {
+        # display 
+        Write-Host "- Updating environment variable $($ParameterName)"
+
+    	# set the variable value
+    	$Variable.Value = $OctopusParameters["$($ParameterName)"]
+    }
+    else
+    {
+    	# warning
+    	Write-Host "**- OctopusParameters collection is empty or $($ParameterName) not in the collection -**"
+    }
+    
+    # Set reference
+    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, "$($ParameterName)")
+}
+#endregion
+
+
+#endregion
+
+#region Dependent assemblies
+
+# Load the IntegrationServices Assembly
+[Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.Management.IntegrationServices") | Out-Null # Out-Null supresses a message that would normally be displayed saying it loaded out of GAC
+
+# Store the IntegrationServices Assembly namespace to avoid typing it every time
+$ISNamespace = "Microsoft.SqlServer.Management.IntegrationServices"
+
+#endregion
+
+#region Main
+try
+{
+	# ensure all boolean variables are true booleans
+    $EnableCLR = [System.Convert]::ToBoolean("$EnableCLR")
+    $UseEnvironment = [System.Convert]::ToBoolean("$UseEnvironment")
+    $ReferenceProjectParametersToEnvironmentVairables = [System.Convert]::ToBoolean("$ReferenceProjectParametersToEnvironmentVairables")
+    Write-Host "Value is $ReferencePackageParametersToEnvironmentVairables"
+    $ReferencePackageParametersToEnvironmentVairables = [System.Convert]::ToBoolean("$ReferencePackageParametersToEnvironmentVairables")
+    $UseFullyQualifiedVariableNames = [System.Convert]::ToBoolean("$UseFullyQualifiedVariableNames")
+    $SyncEnvironment = [System.Convert]::ToBoolean("$SyncEnvironment")
+    # custom names for filtering out the excluded variables by design
+    $UseCustomFilter = [System.Convert]::ToBoolean("$UseCustomFilter")
+    $CustomFilter = [System.Convert]::ToString("$CustomFilter")
+    # list of variables names to keep in target environment
+    $VariablesToPreserveInEnvironment = @()
+        
+    # Get file path where Octopus deployed it
+    $DeployedPath = $OctopusParameters["Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath"]
+
+    
+    # display the path where it's referencing
+    Write-Host "Package deployed to $DeployedPath"
+
+	# Get all .ispac files from the deployed path
+	$IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where {$_.Extension.ToLower() -eq ".ispac"}
+
+	# display number of files
+	Write-Host "$($IsPacFiles.Count) .ispac file(s) found."
+
+	Write-Host "Connecting to server ..."
+
+	# Create a connection to the server
+    $sqlConnectionString = "Data Source=$ServerName;Initial Catalog=master;Integrated Security=SSPI;"
+    $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString
+
+	# create integration services object
+	$integrationServices = New-Object "$ISNamespace.IntegrationServices" $sqlConnection
+
+	# get reference to the catalog
+	Write-Host "Getting reference to catalog $CataLogName"
+	$Catalog = Get-Catalog -CatalogName $CataLogName
+
+	# get folder reference
+	$Folder = Get-Folder -FolderName $FolderName -Catalog $Catalog
+
+	# loop through ispac files
+	foreach($IsPacFile in $IsPacFiles)
+	{
+		# read project file
+		$ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)
+
+		# deploy project
+		Write-Host "Deploying project $($IsPacFile.Name)..."
+		$Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null
+
+		# get reference to deployed project
+		$Project = $Folder.Projects[$ProjectName]
+
+		# check to see if they want to use environments
+		if($UseEnvironment)
+		{
+			# get environment reference
+			$Environment = Get-Environment -Folder $Folder -EnvironmentName $EnvironmentName
+
+			# set environment reference
+			Set-EnvironmentReference -Project $Project -Environment $Environment -Folder $Folder
+
+			# check to see if the user wants to convert project parameters to environment variables
+			if($ReferenceProjectParametersToEnvironmentVairables)
+			{
+				# set environment variables
+				Write-Host "Referencing Project Parameters to Environment Variables..."
+				$VariablesToPreserveInEnvironment += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment
+			}
+
+			# check to see if the user wants to convert the package parameters to environment variables
+			if($ReferencePackageParametersToEnvironmentVairables)
+			{
+				# set package variables
+				Write-Host "Referencing Package Parameters to Environment Variables..."
+				$VariablesToPreserveInEnvironment += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment
+			}
+            
+            # Removes all unused variables from the environment
+            if ($SyncEnvironment)
+            {
+                Write-Host "Sync package environment variables..."
+                Sync-EnvironmentVariables -Environment $Environment -VariablesToPreserveInEnvironment $VariablesToPreserveInEnvironment
+            }
+		}
+	}
+}
+
+finally
+{
+	# check to make sure sqlconnection isn't null
+	if($sqlConnection)
+	{
+		# check state of sqlconnection
+		if($sqlConnection.State -eq [System.Data.ConnectionState]::Open)
+		{
+			# close the connection
+			$sqlConnection.Close()
+		}
+
+		# cleanup
+		$sqlConnection.Dispose()
+	}
+}
+#endregion
diff --git a/src/step-templates/ssis-deploy-ispac-from-referenced-package/metadata.json b/src/step-templates/ssis-deploy-ispac-from-referenced-package/metadata.json
new file mode 100644
index 000000000..e6ce3bd16
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-from-referenced-package/metadata.json
@@ -0,0 +1,215 @@
+{
+  "Id": "0c8167e9-49fe-4f2a-a007-df5ef2e63fac",
+  "Name": "Deploy ispac SSIS project from Referenced Package",
+  "Description": "This step template will deploy SSIS ispac projects to SQL Server Integration Services Catalog.  The template uses a referenced package and is Worker compatible.\n\nThis template will install the Nuget package provider if it is not present on the machine it is running on.",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "Id": "7a1f5eb6-0b6a-4319-a0e8-7b4d13ea609e",
+      "Name": "SSIS Package",
+      "PackageId": "#{ssisPackageId}",
+      "FeedId": "#{TemplatePackageFeedId}",
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "97e5d9db-fd73-4620-84f7-91d6e31e0c4b",
+      "Name": "ServerName",
+      "Label": "Database server name (\\instance)",
+      "HelpText": "Name of the SQL Server you are deploying to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b5adc9a7-2bcb-45c8-9a64-02e0dc286981",
+      "Name": "sqlAccountUsername",
+      "Label": "SQL Authentication Username",
+      "HelpText": "(Optional) Username of the SQL Authentication account.  Use this approach when deploying to Azure Databases with SSIS configured.  If SQL Authentication Username and Password are blank, Integrated Authentication is used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0646a66e-5ba5-4761-a388-8a8bc73492ec",
+      "Name": "sqlAccountPassword",
+      "Label": "SQL Authentication Password",
+      "HelpText": "(Optional) Password of the SQL Authentication account.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "46e7103c-2833-4bf0-9f98-b5d2a0bbcabf",
+      "Name": "EnableCLR",
+      "Label": "Enable SQL CLR",
+      "HelpText": "This will reconfigure SQL Server to enable the SQL CLR.  It is highly recommended that this be previously authorized by your Database Administrator.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "970702e3-e0bf-4ea7-b1ba-067128a3f8c3",
+      "Name": "CatalogName",
+      "Label": "Catalog name",
+      "HelpText": "Name of the catalog to create in Integration Services Catalogs on SQL Server.  When using the GUI, this value gets hardcoded to SSISDB and cannot be changed.  It is recommended that you do not change the default value.",
+      "DefaultValue": "SSISDB",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "ccc0a5bf-467b-4695-bcef-912043e27d49",
+      "Name": "CatalogPwd",
+      "Label": "Catalog password",
+      "HelpText": "Password to the Integration Services Catalog.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "5c02a114-b06e-4547-bb0f-b2aba1869d8e",
+      "Name": "FolderName",
+      "Label": "Folder name",
+      "HelpText": "Name of the folder to use within the Integration Services Catalog",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "88ffb943-5525-4484-9963-0a34c89a7085",
+      "Name": "ProjectName",
+      "Label": "Project name",
+      "HelpText": "Name of the project within the folder of the Integration Services catalog",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b8c29eac-a60f-4b25-96b8-f3b2e3fd8806",
+      "Name": "UseEnvironment",
+      "Label": "Use environment",
+      "HelpText": "This will make a project reference to the defined environment.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "156a4b55-26e4-4c70-bf91-8729ca131c62",
+      "Name": "EnvironmentName",
+      "Label": "Environment name",
+      "HelpText": "Name of the environment to reference the project to. If the environment doesn't exist, it will create it.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0339168d-9a53-4d8a-97d9-7a76605bdc55",
+      "Name": "ReferenceProjectParametersToEnvironmentVairables",
+      "Label": "Reference project parameters to environment variables",
+      "HelpText": "Checking this box will make Project Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects that an Octopus variable of the same name exists.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "5f6b7788-4957-451a-bec7-092e471291f2",
+      "Name": "ReferencePackageParametersToEnvironmentVairables",
+      "Label": "Reference package parameters to environment variables",
+      "HelpText": "Checking this box will make Package Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects than an Octopus variable of the same name exists.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "cc4819a4-a6e4-4220-a581-0f2aed51f4a6",
+      "Name": "UseFullyQualifiedVariableNames",
+      "Label": "Use Fully Qualified Variable Names",
+      "HelpText": "When true the package variables names must be represented in `dtsx_name_without_extension.variable_name`",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "bb22984a-43ed-45c7-978d-72fddec96fe1",
+      "Name": "UseCustomFilter",
+      "Label": "Use Custom Filter for connection manager properties",
+      "HelpText": "Custom filter should contain the regular expression for ignoring properties when setting will occur during the auto-mapping",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d9bba05b-d8a7-40b0-9893-4c878a264de6",
+      "Name": "CustomFilter",
+      "Label": "Custom Filter for connection manager properties",
+      "HelpText": "Regular expression for filtering out the connection manager properties during the auto-mapping process. This string is used when `UseCustomFilter` is set to true",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "77237f87-bc01-4541-b477-005f7416dce2",
+      "Name": "SyncEnvironment",
+      "Label": "Clean obsolete variables from environment",
+      "HelpText": "When `true` synchronizes the environment:\n- Removes obsolete variables\n- Removes renamed variables\n- Replaces values of valid variables (also when `false`)",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "34dcc677-6091-4e92-8b40-9ab09ed18fa3",
+      "Name": "ssisPackageId",
+      "Label": "Package Id",
+      "HelpText": "Id of the package to deploy, used to support deployment with Workers.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8338dc00-27ab-4c60-809a-2badd22250e9",
+      "Name": "TemplatePackageFeedId",
+      "Label": "Package Feed Id",
+      "HelpText": "ID of the package feed the referenced package resides in.",
+      "DefaultValue": "feeds-builtin",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2020-06-15T18:38:53.1700000Z",
+    "OctopusVersion": "2020.2.13",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssis-deploy-ispac-from-referenced-package/scriptbody.ps1 b/src/step-templates/ssis-deploy-ispac-from-referenced-package/scriptbody.ps1
new file mode 100644
index 000000000..44e447d7c
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-from-referenced-package/scriptbody.ps1
@@ -0,0 +1,610 @@
+#region Functions
+
+# Define functions
+function Get-SqlModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Install-SqlServerPowerShellModule
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+	# Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+    {
+    	# Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+	# Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force -RequiredVersion "21.1.18256" 
+
+	# Display
+    Write-Output "Importing module $PowerShellModuleName ..."
+
+    # Import the module
+    Import-Module -Name $PowerShellModuleName
+}
+
+Function Load-SqlServerAssmblies
+{
+	# Declare parameters
+    
+	# Get the folder where the SqlServer module ended up in
+	$sqlServerModulePath = [System.IO.Path]::GetDirectoryName((Get-Module SqlServer).Path)
+    
+    # Loop through the assemblies
+    foreach($assemblyFile in (Get-ChildItem -Path $sqlServerModulePath -Exclude msv*.dll | Where-Object {$_.Extension -eq ".dll"}))
+    {
+        # Load the assembly
+        [Reflection.Assembly]::LoadFile($assemblyFile.FullName) | Out-Null
+    }    
+}
+
+#region Get-Catalog
+Function Get-Catalog
+{
+     # define parameters
+    Param ($CatalogName)
+    # NOTE: using $integrationServices variable defined in main
+    
+    # define working varaibles
+    $Catalog = $null
+    # check to see if there are any catalogs
+    if($integrationServices.Catalogs.Count -gt 0 -and $integrationServices.Catalogs[$CatalogName])
+    {
+    	# get reference to catalog
+    	$Catalog = $integrationServices.Catalogs[$CatalogName]
+    }
+    else
+    {
+    	if((Get-CLREnabled) -eq 0)
+    	{
+    		if(-not $EnableCLR)
+    		{
+    			# throw error
+    			throw "SQL CLR is not enabled."
+    		}
+    		else
+    		{
+    			# display sql clr isn't enabled
+    			Write-Warning "SQL CLR is not enabled on $($sqlConnection.DataSource).  This feature must be enabled for SSIS catalogs."
+    
+    			# enablign SQLCLR
+    			Write-Host "Enabling SQL CLR ..."
+    			Enable-SQLCLR
+    			Write-Host "SQL CLR enabled"
+    		}
+    	}
+    
+    	# Provision a new SSIS Catalog
+    	Write-Host "Creating SSIS Catalog ..."
+    
+    	$Catalog = New-Object "$ISNamespace.Catalog" ($integrationServices, $CatalogName, $CatalogPwd)
+    	$Catalog.Create()
+    
+    
+    }
+    
+    # return the catalog
+    return $Catalog
+}
+#endregion
+
+#region Get-CLREnabled
+Function Get-CLREnabled
+{
+    # define parameters
+    # Not using any parameters, but am using $sqlConnection defined in main
+    
+    # define working variables
+    $Query = "SELECT * FROM sys.configurations WHERE name = 'clr enabled'"
+    
+    # execute script
+    $CLREnabled = Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database "master" -Query $Query | Select value
+    
+    # return value
+    return $CLREnabled.Value
+}
+#endregion
+
+#region Enable-SQLCLR
+Function Enable-SQLCLR
+{
+    $QueryArray = "sp_configure 'show advanced options', 1", "RECONFIGURE", "sp_configure 'clr enabled', 1", "RECONFIGURE "
+    # execute script
+    
+    foreach($Query in $QueryArray)
+    {
+    	Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database "master" -Query $Query
+    }
+    
+    # check that it's enabled
+    if((Get-CLREnabled) -ne 1)
+    {
+    	# throw error
+    	throw "Failed to enable SQL CLR"
+    }
+}
+#endregion
+
+#region Get-Folder
+Function Get-Folder
+{
+ # parameters
+    Param($FolderName, $Catalog)
+    
+    $Folder = $null
+    # try to get reference to folder
+    
+    if(!($Catalog.Folders -eq $null))
+    {
+    	$Folder = $Catalog.Folders[$FolderName]
+    }
+    
+    # check to see if $Folder has a value
+    if($Folder -eq $null)
+    {
+    	# display
+    	Write-Host "Folder $FolderName doesn't exist, creating folder..."
+    
+    	# create the folder
+    	$Folder = New-Object "$ISNamespace.CatalogFolder" ($Catalog, $FolderName, $FolderName) 
+    	$Folder.Create() 
+    }
+    
+    # return the folde reference
+    return $Folder
+}
+#endregion
+
+#region Get-Environment
+Function Get-Environment
+{
+     # define parameters
+    Param($Folder, $EnvironmentName)
+    
+    $Environment = $null
+    # get reference to Environment
+    if(!($Folder.Environments -eq $null) -and $Folder.Environments.Count -gt 0)
+    {
+    	$Environment = $Folder.Environments[$EnvironmentName]
+    }
+    
+    # check to see if it's a null reference
+    if($Environment -eq $null)
+    {
+    	# display
+    	Write-Host "Environment $EnvironmentName doesn't exist, creating environment..."
+    
+    	# create environment
+    	$Environment = New-Object "$ISNamespace.EnvironmentInfo" ($Folder, $EnvironmentName, $EnvironmentName)
+    	$Environment.Create() 
+    }
+    
+    # return the environment
+    return $Environment
+}
+#endregion
+
+#region Set-EnvironmentReference
+Function Set-EnvironmentReference
+{
+     # define parameters
+    Param($Project, $Environment, $Folder)
+    
+    # get reference
+    $Reference = $null
+    
+    if(!($Project.References -eq $null))
+    {
+    	$Reference = $Project.References[$Environment.Name, $Folder.Name]
+    
+    }
+    
+    # check to see if it's a null reference
+    if($Reference -eq $null)
+    {
+    	# display
+    	Write-Host "Project does not reference environment $($Environment.Name), creating reference..."
+    
+    	# create reference
+    	$Project.References.Add($Environment.Name, $Folder.Name)
+    	$Project.Alter() 
+    }
+}
+#endregion
+
+#region Set-ProjectParametersToEnvironmentVariablesReference
+Function Set-ProjectParametersToEnvironmentVariablesReference
+{
+     # define parameters
+    Param($Project, $Environment)
+    
+    $UpsertedVariables = @()
+
+    if($Project.Parameters -eq $null)
+    {
+        Write-Host "No project parameters exist"
+        return
+    }
+
+    # loop through project parameters
+    foreach($Parameter in $Project.Parameters)
+    {
+        # skip if the parameter is included in custom filters
+        if ($UseCustomFilter) 
+        {
+            if ($Parameter.Name -match $CustomFilter)
+            {
+                Write-Host "- $($Parameter.Name) skipped due to CustomFilters."            
+                continue
+            }
+        }
+
+        # Add variable to list of variable
+        $UpsertedVariables += $Parameter.Name
+
+        $Variable = $null
+        if(!($Environment.Variables -eq $null))
+        {
+    	    # get reference to variable
+    	    $Variable = $Environment.Variables[$Parameter.Name]
+        }
+    
+    	# check to see if variable exists
+    	if($Variable -eq $null)
+    	{
+    		# add the environment variable
+    		Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name
+    
+    		# get reference to the newly created variable
+    		$Variable = $Environment.Variables[$Parameter.Name]
+    	}
+    
+    	# set the environment variable value
+    	Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $Parameter.Name
+    }
+    
+    # alter the environment
+    $Environment.Alter()
+    $Project.Alter()
+
+    return $UpsertedVariables
+}
+#endregion
+
+Function Set-PackageVariablesToEnvironmentVariablesReference
+{
+    # define parameters
+    Param($Project, $Environment)
+
+    $Variables = @()
+    $UpsertedVariables = @()
+
+    # loop through packages in project in order to store a temp collection of variables
+    foreach($Package in $Project.Packages)
+    {
+    	# loop through parameters of package
+    	foreach($Parameter in $Package.Parameters)
+    	{
+    		# add to the temporary variable collection
+    		$Variables += $Parameter.Name
+    	}
+    }
+
+    # loop through packages in project
+    foreach($Package in $Project.Packages)
+    {
+    	# loop through parameters of package
+    	foreach($Parameter in $Package.Parameters)
+    	{
+            if ($UseFullyQualifiedVariableNames)
+            {
+                # Set fully qualified variable name
+                $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "")+"."+$Parameter.Name
+            }
+            else
+            {
+                # check if exists a variable with the same name
+                $VariableNameOccurrences = $($Variables | Where-Object { $_ -eq $Parameter.Name }).count
+                $ParameterName = $Parameter.Name
+                
+                if ($VariableNameOccurrences -gt 1)
+                {
+                    $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "")+"."+$Parameter.Name
+                }
+            }
+            
+            if ($UseCustomFilter)
+            {
+                if ($ParameterName -match $CustomFilter)
+                {
+                    Write-Host "- $($Parameter.Name) skipped due to CustomFilters."            
+                    continue
+                }
+            }
+
+            # get reference to variable
+    		$Variable = $Environment.Variables[$ParameterName]
+
+            # Add variable to list of variable
+            $UpsertedVariables += $ParameterName
+
+            # check to see if the parameter exists
+    		if(!$Variable)
+    		{
+    			# add the environment variable
+    			Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName
+    
+    			# get reference to the newly created variable
+    			$Variable = $Environment.Variables[$ParameterName]
+    		}
+    
+    		# set the environment variable value
+    		Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $ParameterName
+    	}
+    
+    	# alter the package
+    	$Package.Alter()
+    }
+    
+    # alter the environment
+    $Environment.Alter()
+
+    return $UpsertedVariables
+}
+
+Function Sync-EnvironmentVariables
+{
+    # define parameters
+    Param($Environment, $VariablesToPreserveInEnvironment)
+
+    foreach($VariableToEvaluate in $Environment.Variables)
+    {
+        if ($VariablesToPreserveInEnvironment -notcontains $VariableToEvaluate.Name)
+        {
+            Write-Host "- Removing environment variable: $($VariableToEvaluate.Name)"
+            $VariableToRemove = $Environment.Variables[$VariableToEvaluate.Name]
+            $Environment.Variables.Remove($VariableToRemove) | Out-Null
+        }
+    }
+
+    # alter the environment
+    $Environment.Alter()
+}
+
+#region Add-EnvironmentVariable
+Function Add-EnvironmentVariable
+{
+    # define parameters
+    Param($Environment, $Parameter, $ParameterName)
+    
+    # display 
+    Write-Host "- Adding environment variable $($ParameterName)"
+    
+    # check to see if design default value is emtpy or null
+    if([string]::IsNullOrEmpty($Parameter.DesignDefaultValue))
+    {
+    	# give it something
+    	$DefaultValue = "" # sensitive variables will not return anything so when trying to use the property of $Parameter.DesignDefaultValue, the Alter method will fail.
+    }
+    else
+    {
+    	# take the design
+    	$DefaultValue = $Parameter.DesignDefaultValue
+    }
+    
+    # add variable with an initial value
+    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $DefaultValue, $Parameter.Sensitive, $Parameter.Description)
+}
+#endregion
+
+#region Set-EnvironmentVariableValue
+Function Set-EnvironmentVariableValue
+{
+     # define parameters
+    Param($Variable, $Parameter, $ParameterName)
+
+    # check to make sure variable value is available
+    if($OctopusParameters -and $OctopusParameters.ContainsKey($ParameterName))
+    {
+        # display 
+        Write-Host "- Updating environment variable $($ParameterName)"
+
+    	# set the variable value
+    	$Variable.Value = $OctopusParameters["$($ParameterName)"]
+    }
+    else
+    {
+    	# warning
+    	Write-Host "**- OctopusParameters collection is empty or $($ParameterName) not in the collection -**"
+    }
+    
+    # Set reference
+    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, "$($ParameterName)")
+}
+#endregion
+
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+# Check to see if SqlServer module is installed
+if ((Get-SqlModuleInstalled -PowerShellModuleName "SqlServer") -ne $true)
+{
+	# Display message
+    Write-Output "PowerShell module SqlServer not present, downloading temporary copy ..."
+
+	#Enable TLS 1.2 as default protocol
+	[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12
+
+    # Download and install temporary copy
+    Install-SqlServerPowerShellModule -PowerShellModuleName "SqlServer" -LocalModulesPath $LocalModules
+    
+	#region Dependent assemblies
+	Load-SqlServerAssmblies    
+}
+else
+{
+	# Load the IntegrationServices Assembly
+	[Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.Management.IntegrationServices") | Out-Null # Out-Null supresses a message that would normally be displayed saying it loaded out of GAC
+}
+
+#endregion
+
+# Store the IntegrationServices Assembly namespace to avoid typing it every time
+$ISNamespace = "Microsoft.SqlServer.Management.IntegrationServices"
+
+#endregion
+
+#region Main
+try
+{   
+    # ensure all boolean variables are true booleans
+    $EnableCLR = [System.Convert]::ToBoolean("$EnableCLR")
+    $UseEnvironment = [System.Convert]::ToBoolean("$UseEnvironment")
+    $ReferenceProjectParametersToEnvironmentVairables = [System.Convert]::ToBoolean("$ReferenceProjectParametersToEnvironmentVairables")
+    
+    $ReferencePackageParametersToEnvironmentVairables = [System.Convert]::ToBoolean("$ReferencePackageParametersToEnvironmentVairables")
+    $UseFullyQualifiedVariableNames = [System.Convert]::ToBoolean("$UseFullyQualifiedVariableNames")
+    $SyncEnvironment = [System.Convert]::ToBoolean("$SyncEnvironment")
+    # custom names for filtering out the excluded variables by design
+    $UseCustomFilter = [System.Convert]::ToBoolean("$UseCustomFilter")
+    $CustomFilter = [System.Convert]::ToString("$CustomFilter")
+    # list of variables names to keep in target environment
+    $VariablesToPreserveInEnvironment = @()
+        
+	# Get the extracted path
+	$DeployedPath = $OctopusParameters["Octopus.Action.Package[$ssisPackageId].ExtractedPath"]
+    
+	# Get all .ispac files from the deployed path
+	$IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where {$_.Extension.ToLower() -eq ".ispac"}
+
+	# display number of files
+	Write-Host "$($IsPacFiles.Count) .ispac file(s) found."
+
+	Write-Host "Connecting to server ..."
+
+	# Create a connection to the server
+    $sqlConnectionString = "Data Source=$ServerName;Initial Catalog=SSISDB;"
+    
+    if (![string]::IsNullOrEmpty($sqlAccountUsername) -and ![string]::IsNullOrEmpty($sqlAccountPassword))
+    {
+    	# Add username and password to connection string
+        $sqlConnectionString += "User ID=$sqlAccountUsername; Password=$sqlAccountPassword;"
+    }
+    else
+    {
+    	# Use integrated
+        $sqlConnectionString += "Integrated Security=SSPI;"
+    }
+    
+    
+    # Create new connection object with connection string
+    $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString
+
+	# create integration services object
+	$integrationServices = New-Object "$ISNamespace.IntegrationServices" $sqlConnection
+
+	# get reference to the catalog
+	Write-Host "Getting reference to catalog $CataLogName"
+	$Catalog = Get-Catalog -CatalogName $CataLogName
+
+	# get folder reference
+	$Folder = Get-Folder -FolderName $FolderName -Catalog $Catalog
+
+	# loop through ispac files
+	foreach($IsPacFile in $IsPacFiles)
+	{
+		# read project file
+		$ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)
+
+		# deploy project
+		Write-Host "Deploying project $($IsPacFile.Name)..."
+		$Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null
+
+		# get reference to deployed project
+		$Project = $Folder.Projects[$ProjectName]
+
+		# check to see if they want to use environments
+		if($UseEnvironment)
+		{
+			# get environment reference
+			$Environment = Get-Environment -Folder $Folder -EnvironmentName $EnvironmentName
+
+			# set environment reference
+			Set-EnvironmentReference -Project $Project -Environment $Environment -Folder $Folder
+
+			# check to see if the user wants to convert project parameters to environment variables
+			if($ReferenceProjectParametersToEnvironmentVairables)
+			{
+				# set environment variables
+				Write-Host "Referencing Project Parameters to Environment Variables..."
+				$VariablesToPreserveInEnvironment += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment
+			}
+
+			# check to see if the user wants to convert the package parameters to environment variables
+			if($ReferencePackageParametersToEnvironmentVairables)
+			{
+				# set package variables
+				Write-Host "Referencing Package Parameters to Environment Variables..."
+				$VariablesToPreserveInEnvironment += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment
+			}
+            
+            # Removes all unused variables from the environment
+            if ($SyncEnvironment)
+            {
+                Write-Host "Sync package environment variables..."
+                Sync-EnvironmentVariables -Environment $Environment -VariablesToPreserveInEnvironment $VariablesToPreserveInEnvironment
+            }
+		}
+	}
+}
+
+finally
+{
+	# check to make sure sqlconnection isn't null
+	if($sqlConnection)
+	{
+		# check state of sqlconnection
+		if($sqlConnection.State -eq [System.Data.ConnectionState]::Open)
+		{
+			# close the connection
+			$sqlConnection.Close()
+		}
+
+		# cleanup
+		$sqlConnection.Dispose()
+	}
+}
+#endregion
diff --git a/src/step-templates/ssis-deploy-ispac-with-enviroment/metadata.json b/src/step-templates/ssis-deploy-ispac-with-enviroment/metadata.json
new file mode 100644
index 000000000..31ad42383
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-with-enviroment/metadata.json
@@ -0,0 +1,72 @@
+{
+  "Id": "b791c0c2-03ce-40ef-9446-78beb585c0b8",
+  "Name": "SSIS deploy ISPAC With Environment",
+  "Description": "A Template which will deploy any .ISPAC files from the published package step selected to the SQL Server catalog database. \n\nThe template will create a environment config and use variables that are wrapped in SSIS[<SSIS Parameter Path>] extracting the SSIS Parameter Path using that as the name and value linked the Octopus Variable and then assign parameter in the SSIS project to the name environment configuration.  \n\nWhen the SSIS Parameter Path is at the Package level then SSIS Parameter will need to have the Package Name (without .dtsx) added to front of the SSIS Parameter path.\n\nTo remove and environment config delete the variable or remove the SSIS[].\n",
+  "ActionType": "Octopus.Script",
+  "Version": 18,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "4d49a1f7-f7bf-40e2-b845-8c9c8e4deda9",
+      "Name": "NugetPackageStepName",
+      "Label": "NuGet package step",
+      "HelpText": "The step that uploaded the NuGet package to the server.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "6e97bd67-aeb5-4a92-b4d8-9e5b9a13ad93",
+      "Name": "ServerName",
+      "Label": "SSIS SQL Server Name",
+      "HelpText": "The name of SSIS SQL Server ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6b0007eb-81eb-459f-b8c6-2f8c9465beb2",
+      "Name": "CatalogName",
+      "Label": "SSISDB Catlog Name",
+      "HelpText": "The name of the SSISDB Catlog",
+      "DefaultValue": "SSISDB",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "00cadc4e-17bd-41bb-b4bd-87ca01b483eb",
+      "Name": "FolderName",
+      "Label": "SSIS Folder",
+      "HelpText": "The SSIS folder to deploy to project to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5e88fe40-d502-4e2e-8c96-c7ed8f2d82c4",
+      "Name": "EnvironmentTag",
+      "Label": "Environment Tag",
+      "HelpText": "The text to add at the end Environment configuration name.  Currently default to append the Environment Value begin deploy to.",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "Zogamorph",
+  "$Meta": {
+    "ExportedAt": "2019-10-29T18:58:17.7990000Z",
+    "OctopusVersion": "2019.10.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssis-deploy-ispac-with-enviroment/scriptbody.ps1 b/src/step-templates/ssis-deploy-ispac-with-enviroment/scriptbody.ps1
new file mode 100644
index 000000000..db39046aa
--- /dev/null
+++ b/src/step-templates/ssis-deploy-ispac-with-enviroment/scriptbody.ps1
@@ -0,0 +1,424 @@
+# Define PowerShell Modules path
+$LocalModules = (New-Item "$PSScriptRoot\Modules" -ItemType Directory -Force).FullName
+$env:PSModulePath = "$LocalModules;$env:PSModulePath"
+
+#region Functions
+
+#region SQLPS functions 
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-SqlModuleInstalled {
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {
+        # It is installed
+        return $true
+    }
+    else {
+        # Module not installed
+        return $false
+    }
+}
+
+function Install-SqlServerPowerShellModule {
+    # Define parameters
+    param(
+        $PowerShellModuleName,
+        $LocalModulesPath
+    )
+
+    # Check to see if the package provider has been installed
+    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+        # Display that we need the nuget package provider
+        Write-Host "Nuget package provider not found, installing ..."
+        
+        # Install Nuget package provider
+        Install-PackageProvider -Name Nuget -Force
+    }
+
+    # Save the module in the temporary location
+    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force
+
+    # Display
+    Write-Output "Importing module $PowerShellModuleName ..."
+
+    # Import the module
+    Import-Module -Name $PowerShellModuleName
+}
+
+Function Get-SqlServerAssmblies {
+    # Declare parameters
+    
+    # Get the folder where the SqlServer module ended up in
+    $sqlServerModulePath = [System.IO.Path]::GetDirectoryName((Get-Module -ListAvailable -Name "SqlServer").Path)
+    
+    # Loop through the assemblies
+    foreach ($assemblyFile in (Get-ChildItem -Path $sqlServerModulePath -Exclude msv*.dll | Where-Object { $_.Extension -eq ".dll" })) {
+        # Load the assembly
+        [Reflection.Assembly]::LoadFile($assemblyFile.FullName) | Out-Null
+    }    
+}
+
+#endregion SQLPS functions 
+
+#region SQL Server functions 
+function Get-ConnectionObject {
+    param
+    (
+        [parameter(ParameterSetName = 'Default', HelpMessage = 'Name of the server', Mandatory = $true)]
+        [parameter(ParameterSetName = 'SQLAuth', HelpMessage = 'Name of the server', Mandatory = $true)]
+        [string]
+        $SQLServerName,
+        [parameter(ParameterSetName = 'SQLAuth')]
+        [switch] $UseSQLAuth,
+        [parameter(ParameterSetName = 'SQLAuth', HelpMessage = 'SQL Server Login', Mandatory = $true)]
+        [string] $SQLLogin,
+        [parameter(ParameterSetName = 'SQLAuth', HelpMessage = 'SQL Server Password', Mandatory = $true)]
+        [string] $Password
+          
+    ) 
+    # Create a connection to the server
+    $sqlConnectionString = "Data Source=$ServerName;Initial Catalog=SSISDB;"
+    
+    if ($UseSQLAuth) {
+        # Add username and password to connection string
+        $sqlConnectionString += "User ID=$SQLLogin; Password=$Password;"
+    }
+    else {
+        # Use integrated
+        $sqlConnectionString += "Integrated Security=SSPI;"
+    }
+     
+    # Create new connection object with connection string
+    return (New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString)
+}
+#endregion SQL Server functions 
+
+#region SQL SSIS functions
+Function Get-Catalog {
+    # define parameters
+    Param ($CatalogName)
+    
+    # define working varaibles
+    $Catalog = $null
+    # check to see if there are any catalogs
+    if ($integrationServices.Catalogs.Count -eq 0 -or -not $integrationServices.Catalogs[$CatalogName]) {
+        throw "SSIS Catalog not found $CatalogName"
+        # get reference to catalog
+    }
+
+    $Catalog = $integrationServices.Catalogs[$CatalogName]
+    
+    # return the catalog
+    return $Catalog
+}
+
+Function Get-Folder {
+    # parameters
+    Param($FolderName, $Catalog)
+    
+    $Folder = $null
+    # try to get reference to folder
+    
+    if (!($null -eq $Catalog.Folders)) {
+        $Folder = $Catalog.Folders[$FolderName]
+    }
+    
+    # check to see if $Folder has a value
+    if ($null -eq $Folder) {
+        # display
+        Write-Host "Folder $FolderName doesn't exist, creating folder..."
+    
+        # create the folder
+        $Folder = New-Object "$ISNamespace.CatalogFolder" ($Catalog, $FolderName, $FolderName) 
+        $Folder.Create() 
+    }
+    
+    # return the folde reference
+    return $Folder
+}
+
+Function Get-Environment {
+    # define parameters
+    Param($Folder, $EnvironmentName)
+    
+    $Environment = $null
+    # get reference to Environment
+    if (!($null -eq $Folder.Environments) -and $Folder.Environments.Count -gt 0) {
+        $Environment = $Folder.Environments[$EnvironmentName]
+    }
+    
+    # check to see if it's a null reference
+    if ($null -eq $Environment) {
+        # display
+        Write-Host "Environment $EnvironmentName doesn't exist, creating environment..."
+    
+        # create environment
+        $Environment = New-Object "$ISNamespace.EnvironmentInfo" ($Folder, $EnvironmentName, $EnvironmentName)
+        $Environment.Create() 
+    }
+    
+    # return the environment
+    return $Environment
+}
+Function Set-PojectEnvironmentReference {
+    # define parameters
+    Param($Project, $Environment, $Folder)
+    
+    # get reference
+    $Reference = $null
+    
+    if (!($null -eq $Project.References)) {
+        $Reference = $Project.References[$Environment.Name, $Folder.Name]
+    
+    }
+
+    # check to see if it's a null reference
+    if ($null -eq $Reference) {
+        # display
+        Write-Host "Removeing old Project reference environment creating reference..."
+        foreach ( $Reference in  $Project.References) {
+            $Project.References.Remove($Reference.Name, $Reference.EnvironmentFolderName)
+        }
+        Write-Host "Project does not reference environment $($Environment.Name), creating reference..."
+        # create reference
+        $Project.References.Add($Environment.Name, $Folder.Name)
+        $Project.Alter() 
+    }
+}
+
+Function Add-EnvironmentVariable {
+    # define parameters
+    Param($Environment, $Parameter, $ParameterName, $EnvironmentValue )
+    
+    # display 
+    Write-Host "- Adding environment variable $($ParameterName)"
+        
+    # add variable with an initial value
+    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $EnvironmentValue, $Parameter.Sensitive, $Parameter.Description)
+    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, $ParameterName)
+}
+
+Function Remove-ReferencedValue {
+    Param($Project
+        , $ParameterName
+    )
+  
+    if ($ParameterName -match "\|") {
+        $ParameterPath = $ParameterName.Split("|")
+        $Project.Packages[$ParameterPath[0]].Parameters[$ParameterPath[1]].Clear()
+        $Project.Packages[$ParameterPath[0]].Alter()
+    }
+    else {
+        $Project.Parameters[$ParameterName].Clear()  
+    }
+}
+
+Function Sync-EnvironmentVariables {
+    # define parameters
+    Param($Environment
+        , $Project
+        , $ReferencedVariables
+        , $OctopusParameters
+        , $OctopusSSISParameterKey )
+
+    foreach ($VariableToEvaluate in $Environment.Variables) {
+        $OctopusParameterKey = $OctopusSSISParameterKey -f $VariableToEvaluate.Name
+`       if (-not $OctopusParameters.Keys.Contains($OctopusParameterKey)) {
+            Write-Host "- Removing environment variable: $($VariableToEvaluate.Name)"    
+            $Environment.Variables.Remove($VariableToEvaluate) | Out-Null
+            if ($ReferencedVariables.Keys.Contains($VariableToEvaluate.Name)) {
+                Remove-ReferencedValue -Project $Project -ParameterName $ReferencedVariables[$VariableToEvaluate.Name]
+                $ReferencedVariables.Remove($VariableToEvaluate.Name)
+            }
+        }
+    }
+
+    foreach ($ReferencedKeyName in $ReferencedVariables.Keys) {
+`       if (-not $Environment.Variables.Contains($ReferencedKeyName)) {
+            Write-Host "- Removing Prodect referenace  $($ReferencedVariables[$ReferencedKeyName] -replace "\|", " ")"
+            Remove-ReferencedValue -Project $Project -ParameterName $ReferencedVariables[$ReferencedKeyName] 
+        }
+    }
+
+    $Project.Alter()
+    # alter the environment
+    $Environment.Alter()
+}
+
+Function Set-ProjectParametersToEnvironmentVariablesReference {
+    # define parameters
+    Param($Project
+        , $Environment
+        , $OctopusParameters
+        , $OctopusSSISParameterKey
+    )
+    
+    $ReferencedVariables = @{ }
+
+    if ($null -eq $Project.Parameters) {
+        Write-Host "No project parameters exist"
+        return
+    }
+
+    # loop through project parameters
+    foreach ($Parameter in $Project.Parameters) {
+        $OctopusParameterKey = $OctopusSSISParameterKey -f $Parameter.Name
+        # Add variable to list of variable
+        if ($OctopusParameters.Keys.Contains($OctopusParameterKey)) {
+            Write-Host $("Updating Project / Environment {0} Parameter Value ..." -f $Parameter.Name)
+            $EnvironmentValue = $OctopusParameters[$OctopusParameterKey]
+            $Variable = $null
+            if (!($null -eq $Environment.Variables)) {
+                # get reference to variable
+                $Variable = $Environment.Variables[$Parameter.Name]
+            }
+            # check to see if variable exists
+            if ($null -eq $Variable) {
+                # add the environment variable
+                Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name -EnvironmentValue $EnvironmentValue            
+            }
+            else {
+                $Variable.value = $EnvironmentValue
+            }            
+        }
+        if ($Parameter.ValueType -eq [Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced) {
+            $ReferencedVariables.Add($Parameter.ReferencedVariableName, $Parameter.Name)
+        }
+    }
+    
+    # alter the environment
+    $Environment.Alter()
+    $Project.Alter()
+    return $ReferencedVariables
+}
+
+Function Set-PackageVariablesToEnvironmentVariablesReference {
+    # define parameters
+    Param($Project
+        , $Environment        
+        , $OctopusParameters
+        , $OctopusSSISParameterKey)
+
+    $ReferencedVariables = @{ }
+
+    # loop through packages in project
+    foreach ($Package in $Project.Packages) {
+        # loop through parameters of package
+        foreach ($Parameter in $Package.Parameters) {
+            
+            $ParameterName = $Parameter.ObjectName.Replace(".dtsx", "") + "." + $Parameter.Name
+            $OctopusParameterKey = $OctopusSSISParameterKey -f $ParameterName
+        
+            # Add variable to list of variable
+            if ($OctopusParameters.Keys.Contains($OctopusParameterKey)) {
+                Write-Host $("Updating {0} Package / Environment {1} Parameter Value ..." -f $Parameter.ObjectName, $ParameterName)
+                $EnvironmentValue = $OctopusParameters[$OctopusParameterKey]
+                $Variable = $null
+                if (!($null -eq $Environment.Variables)) {
+                    # get reference to variable
+                    $Variable = $Environment.Variables[$ParameterName]
+                }
+                # check to see if the parameter exists
+                if (!$Variable) {
+                    # add the environment variable
+                    Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName -EnvironmentValue $EnvironmentValue
+                }          
+                else {
+                    $Variable.value = $EnvironmentValue
+                }            
+            }
+            if ($Parameter.ValueType -eq [Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced) {
+                $ReferencedVariables.Add($Parameter.ReferencedVariableName, $("{0}|{1}" -f $Package.Name, $Parameter.Name))
+            }  
+        }
+    
+        # alter the package
+        $Package.Alter()
+    }
+    
+    # alter the environment
+    $Environment.Alter()
+
+    return $ReferencedVariables
+}
+
+#endregion SQL SSIS functions
+
+#endregion Functions
+
+#region Script Main
+
+#region Get enviroment configured
+if ((Get-SqlModuleInstalled -PowerShellModuleName "SqlServer") -ne $true) {
+    # Display message
+    Write-Output "PowerShell module SqlServer not present, downloading temporary copy ..."
+    
+    # Download and install temporary copy
+    Install-SqlServerPowerShellModule -PowerShellModuleName "SqlServer" -LocalModulesPath $LocalModules
+}
+
+# Dependent assemblies
+Get-SqlServerAssmblies    
+
+
+# add snapins-- applies to sql server 2008 r2, newer version of SQL do not require this.
+Add-PSSnapin SqlServerCmdletSnapin100 -ErrorAction SilentlyContinue
+Add-PSSnapin SqlServerProviderSnapin100 -ErrorAction SilentlyContinue
+#endregion Get enviroment configured
+
+
+$ISNamespace = "Microsoft.SqlServer.Management.IntegrationServices"
+$OctopusSSISParameterKey = "SSIS[{0}]"
+$DeployedPath = $OctopusParameters["Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath"]
+
+Write-Host "Connecting to server ..."
+
+if ([string]::IsNullOrEmpty($sqlAccountUsername) -and [string]::IsNullOrEmpty($sqlAccountPassword)) {
+    # Add username and password to connection string
+    $sqlConnection = Get-ConnectionObject -SQLServerName $ServerName 
+}
+else {
+    # Use integrated
+    $sqlConnection = Get-ConnectionObject -SQLServerName $ServerName -UseSQLAuth -SQLLogin $sqlAccountUsername -Password=$sqlAccountPassword
+}
+
+$integrationServices = New-Object "$ISNamespace.IntegrationServices" $sqlConnection
+
+
+$IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where-Object { $_.Extension.ToLower() -eq ".ispac" }
+Write-Host "$($IsPacFiles.Count) .ispac file(s) found."
+
+# get reference to the catalog
+Write-Host "Getting reference to catalog $CatalogName"
+$Catalog = Get-Catalog -CatalogName $CatalogName
+$Folder = Get-Folder -FolderName $FolderName -Catalog $Catalog
+
+$ReferencedVariables = @{ }
+foreach ($IsPacFile in $IsPacFiles) {
+    $ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)
+    $ProjectName = $IsPacFile.Name -replace $IsPacFile.Extension , ""
+    $EnvironmentName = "{0}_{1}" -f $ProjectName , $EnvironmentTag
+    # deploy project
+    Write-Host "Deploying project $($IsPacFile.Name)..."
+    $Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null
+
+    # get reference to deployed project
+    $Project = $Folder.Projects[$ProjectName]
+    # get environment reference
+    $Environment = Get-Environment -Folder $Folder -EnvironmentName $EnvironmentName 
+    Set-PojectEnvironmentReference -Project $Project -Environment $Environment -Folder $Folder 
+    Write-Host "Referencing Project Parameters to Environment Variables..."
+    $ReferencedVariables += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment -OctopusParameters $OctopusParameters -OctopusSSISParameterKey $OctopusSSISParameterKey
+    Write-Host "Referencing Project Parameters to Environment Variables..."
+    $ReferencedVariables += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment -OctopusParameters $OctopusParameters -OctopusSSISParameterKey $OctopusSSISParameterKey
+    Write-Host "Sync package environment variables..."
+    Sync-EnvironmentVariables -Environment $Environment -Project $Project -ReferencedVariables $ReferencedVariables -OctopusParameters $OctopusParameters -OctopusSSISParameterKey $OctopusSSISParameterKey
+}   
\ No newline at end of file
diff --git a/src/step-templates/ssis-deploy-sqlagentjob/metadata.json b/src/step-templates/ssis-deploy-sqlagentjob/metadata.json
new file mode 100644
index 000000000..6a617cf1f
--- /dev/null
+++ b/src/step-templates/ssis-deploy-sqlagentjob/metadata.json
@@ -0,0 +1,178 @@
+{
+  "Id": "f69ea863-ab61-4c58-bcbe-a133450113c9",
+  "Name": "SSIS - Deploy SQL Agent Job",
+  "Description": "Deploy a SQL Agent Job for SSIS Ispac Deployment. Requires SMO to be installed on the machine where this step will be run. ",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "44a2fa3c-3117-450b-8004-ebdbfd2362e9",
+      "Name": "SSIS_ServerName",
+      "Label": "Server Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ae040e98-f686-4f44-ad80-8939fbd902e4",
+      "Name": "SSIS_FolderName",
+      "Label": "Folder Name",
+      "HelpText": "Folder Name of the deployed package",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "3e755e91-afb5-46c3-ad61-47bf80ac88b8",
+      "Name": "SSIS_ProjectName",
+      "Label": "Project Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "21dc0b13-7db0-4c99-b512-53dbfad55893",
+      "Name": "SSIS_CatalogName",
+      "Label": "Catalog Name",
+      "HelpText": "By default SSISDB",
+      "DefaultValue": "SSISDB",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "eb197ae7-99e1-41a2-aee4-5b379fdb349c",
+      "Name": "SSIS_EnvironmentName",
+      "Label": "Environment Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "94f97e01-d04c-4696-ad0a-e170a21ecd87",
+      "Name": "SSIS_PackageName",
+      "Label": "Package Name",
+      "HelpText": "Complete name of the package to execute, without dtsx extension",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "cb138aa6-2f51-4ebd-b744-9b0d17535ea1",
+      "Name": "SSIS_JobName",
+      "Label": "Job Name",
+      "HelpText": "Name of the SQL Job",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "458225af-7d11-4f98-b984-2fe02e66996e",
+      "Name": "SSIS_JobStepName",
+      "Label": "Job Step Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "07d85895-e548-4f54-a403-25cc53fa1a88",
+      "Name": "SSIS_JobSheduleName",
+      "Label": "Job Schedule Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "023f21b1-7757-42f2-8b69-e9a95deb7bae",
+      "Name": "SSIS_JobExecutionFrequency",
+      "Label": "Job Execution Frequency",
+      "HelpText": "Frequency of execution\nOnly supported:\nOneTime\nDaily\nAutoStart",
+      "DefaultValue": "Daily",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "AutoStart\nDaily\nOneTime"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "25efa439-5490-4ed4-a70f-7b514bd18446",
+      "Name": "SSIS_JobFrequencyInterval",
+      "Label": "Job Frequency Interval",
+      "HelpText": "Depends of Job Execution Frequency.\nFor now only works with Days\nExample:\n1 -> Recurs every 1 Day\n2 -> Recurs every 2 Weeks",
+      "DefaultValue": "1",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "50b3ab13-8635-4631-a247-092792364902",
+      "Name": "SSIS_JobExecutionTimeHour",
+      "Label": "Job Execution Time Hour",
+      "HelpText": "Hour of the day to execute the job",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4d57dc4e-8717-4f05-bdad-0f16cc9b566d",
+      "Name": "SSIS_JobExecutionTimeMinute",
+      "Label": "Job Execution Time Minute",
+      "HelpText": "Minutes of the day to execute the job",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7a4c18db-51c3-48e7-ab04-b4f084dde3de",
+      "Name": "SSIS_JobCategory",
+      "Label": "Job Category",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2018-17-04T10:59:08.819Z",
+  "LastModifiedBy": "andrescolodrero",
+  "$Meta": {
+    "ExportedAt": "2018-17-04T10:59:08.819Z",
+    "OctopusVersion": "3.14.15",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssis-deploy-sqlagentjob/scriptbody.ps1 b/src/step-templates/ssis-deploy-sqlagentjob/scriptbody.ps1
new file mode 100644
index 000000000..dec5a28d0
--- /dev/null
+++ b/src/step-templates/ssis-deploy-sqlagentjob/scriptbody.ps1
@@ -0,0 +1,306 @@
+Function Format-OctopusArgument
+{
+
+    <#
+    .SYNOPSIS
+    Converts boolean values to boolean types
+
+    .DESCRIPTION
+    Converts boolean values to boolean types
+
+    .PARAMETER Value
+    The value to convert
+
+    .EXAMPLE
+    Format-OctopusArgument "true"
+    #>
+    Param(
+        [string]$Value
+    )
+
+    $Value = $Value.Trim()
+
+    # There must be a better way to do this
+    Switch -Wildcard ($Value)
+    {
+
+        "True"
+        { Return $True
+        }
+        "False"
+        { Return $False
+        }
+        "#{*}"
+        { Return $null
+        }
+        Default
+        { Return $Value
+        }
+    }
+}
+
+
+Function Get-SSISCommand
+{
+
+    <#
+    .SYNOPSIS
+    Format the SSIS Command that execute the package.
+    Only valid for now for Project Deployment ($typecommand = '/ISSERVER "\')
+
+    .DESCRIPTION
+    Return a string with the correct format to execute a Project Package Deploy (Step).
+    The SSIS Command can be built by paramaters (ServerName, CatalogName, ProjectName, FolderName, Package and Environment)
+    @TO-DO:
+    But most of the cases need an ending string that could be the same for most of the deployments.
+    I will keep this as a Octopus Parameter by now.
+
+
+    #>
+
+    Param($ServerName, $CatalogName, $FolderName, $ProjectName, $PackageName, $EnvironmentName)
+    process {
+        $environmentid = Get-EnvironmentId -ServerName $ServerName -EnvironmentName $EnvironmentName -PackageName $PackageName -ProjectName $ProjectName
+        write-host "The Environmemnt Id found for $EnvironmentName is $environmentid"
+        $slash = '\'
+        $quotes = '"'
+        $typecommand = '/ISSERVER "\'
+        $environmentCommand = '\"" /ENVREFERENCE ' + $environmentid.ToString()
+        $packagep = $slash + $CatalogName + $slash + $FolderName + $slash + $ProjectName + $slash + $PackageName + '.dtsx' + $slash
+        $servertype = '" /SERVER "\"'
+        $commandoptions = ' /Par "\"$ServerOption::LOGGING_LEVEL(Int16)\"";1 /Par "\"$ServerOption::SYNCHRONIZED(Boolean)\"";True /CALLERINFO SQLAGENT /REPORTING E'
+    }
+    end {
+        return $typecommand + $quotes + $packagep + $quotes + $servertype + $ServerName + $environmentCommand + $commandoptions
+    }
+
+}
+
+Function Get-EnvironmentId
+{
+    <#
+    .SYNOPSIS
+    Get the ID of the Environment by Name of Environment
+
+    .DESCRIPTION
+    ProjectDeploy Packages use Enviroments for variables previously deployed for the package.
+    To be able to format the SSIS Command, we will need the Environment ID
+
+    .PARAMETER ServerName
+    .PARAMETER CatalogName
+    .PARAMETER FolderName
+    .PARAMETER ProjectName
+    .PARAMETER PackageName
+    .PARAMETER EnvironmentName
+    #>
+
+    Param($ServerName, $EnvironmentName,$PackageName, $ProjectName)
+
+
+    $query = "SELECT er.reference_id
+    FROM [SSISDB].[internal].[folders] AS f
+         JOIN [SSISDB].[internal].[projects] AS p
+              ON f.folder_id = p.folder_id
+              JOIN [SSISDB].[internal].[environment_references] AS er
+                   ON p.project_id = er.project_id
+                   where f.name = '$FolderName'
+						and er.environment_name = '$EnvironmentName'
+						 and p.name = '$ProjectName'"
+
+    $EnvironmentId = Invoke-Sqlcmd  -Query $query -ServerInstance $ServerName -Verbose
+
+    return $EnvironmentId.reference_id
+}
+
+Function Add-Job
+{
+    <#
+    .SYNOPSIS
+    Add a new type of Job in SQL Agent Job
+
+    .DESCRIPTION
+    The function will remove an existing Job with same name (SQL SMO Job doesnt contains update function)
+    and it will return as GlobalVariable the JOb Object.
+
+    .PARAMETER JobName
+    .PARAMETER ServerName
+    .PARAMETER EnvironmentName
+    .PARAMETER JobStepName
+    .PARAMETER JobStepCommand
+    #>
+
+    param($JobName, $ServerName, $EnvironmentName, $JobsStepName, $JobStepCommand, $JobCategory )
+    try
+    {
+        $server = New-Object Microsoft.SqlServer.Management.Smo.Server($ServerName)
+        $server.exe
+        $server.JobServer.HostLoginName
+        $existingjob = $server.Jobserver.Jobs|where-object {$_.Name -like $JobName}
+        if ($existingjob)
+        {
+            Write-Host "|- Dropping Job [$JobName]..." -NoNewline
+            $existingjob.drop()
+            Write-Host "|- Done" -ForegroundColor Green
+        }
+
+        $job = New-Object Microsoft.SqlServer.Management.SMO.Agent.Job($server.JobServer, $jobName)
+        #$job.DropIfExists() only for sqlserver 2016
+        $job.Create()
+        $job.OwnerLoginName = "sa"
+        $job.Category = $JobCategory
+        $job.ApplyToTargetServer($server.Name)
+
+
+    }
+    catch
+    {
+        write-host "####### Error Adding a job" -ForegroundColor Red
+        write-host $_.Exception.Message
+    }
+    #Instead of creating a class and return a Job, lets settup a global variable. Return statament doenst return all script output
+    $Global:newjob = $job
+
+}
+
+Function Add-JobStep
+{
+    <#
+    .SYNOPSIS
+    Add a job step to a Job
+
+    .DESCRIPTION
+    The function will remove an existing Job with same name (SQL SMO Job doesnt contains update function)
+    and it will return as GlobalVariable t
+     he JOb Object.
+    .PARAMETER Job
+    .PARAMETER JobStepName
+    .PARAMETER JobStepCommand
+    #>
+    param($job, $JobStepName, $CommandJob )
+    try
+    {
+        $jobStep = New-Object Microsoft.SqlServer.Management.Smo.Agent.JobStep($job, $JobStepName)
+        $jobStep.Subsystem = [Microsoft.SqlServer.Management.Smo.Agent.AgentSubSystem]::SSIS
+
+        $jobStep.Command = $CommandJob
+        $jobStep.Create()
+    }
+    catch
+    {
+        write-host "#########   Error adding a job step" -ForegroundColor Red
+        write-host $_.Exception.Message
+    }
+
+
+}
+
+Function Add-JobSchedule
+{
+    # ToDO: Add more types of frequenct: Weekly, Monthly
+    param($job, $JobScheduleName,$JobExecutionFrequency, $FrecuencyInterval, $startHour, $startMinutes)
+    try
+    {
+        $name = $job.Name
+        $SQLJobSchedule = New-Object -TypeName Microsoft.SqlServer.Management.SMO.Agent.JobSchedule($job, $JobScheduleName)
+
+        switch ($JobExecutionFrequency) {
+            "Daily" {
+                     $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::Daily
+                     $subdayTypes =  [Microsoft.SqlServer.Management.SMO.Agent.FrequencySubDayTypes]::Hour
+                    }
+            "OneTime" {
+                 $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::OneTime
+                 $subdayTypes = [Microsoft.SqlServer.Management.SMO.Agent.FrequencySubDayTypes]::Once
+                 }
+            "AutoStart" {
+                    $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::AutoStart
+                   }
+            default  {
+                $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::Daily
+              }
+        }
+
+
+        $SQLJobSchedule.FrequencyTypes =  $result
+        # Setup Frequency Interval
+        $SQLJobSchedule.FrequencyInterval = $FrecuencyInterval
+
+
+
+        # Job Start
+        $timeofday = New-TimeSpan -hours $startHour -minutes $startMinutes
+        $SQLJobSchedule.ActiveStartTimeOfDay = $timeofday
+        #Activate the Job
+        $SQLJobSchedule.ActiveStartDate = Get-Date
+        $SQLJobSchedule.Create()
+    }
+    catch
+    {
+        Write-Host "Error" -ForegroundColor Red
+        write-host "Exception Type: $($_.Exception.GetType().FullName)" -ForegroundColor Red
+        write-host "Exception Message: $($_.Exception.Message)" -ForegroundColor Red
+        $error[0]|format-list -force
+
+    }
+
+}
+
+Function Set-SQLJob
+{
+    #Get-Octopus Variables
+    Write-Host "Collecting Octopus Variables"
+
+    $ServerName = Format-OctopusArgument -Value $OctopusParameters["SSIS_ServerName"]
+    $FolderName = Format-OctopusArgument -Value $OctopusParameters["SSIS_FolderName"]
+    $ProjectName = Format-OctopusArgument -Value $OctopusParameters["SSIS_ProjectName"]
+    $CatalogName = Format-OctopusArgument -Value $OctopusParameters["SSIS_CatalogName"]
+    $EnvironmentName = Format-OctopusArgument -Value $OctopusParameters["SSIS_EnvironmentName"]
+    $PackageName = Format-OctopusArgument -Value $OctopusParameters["SSIS_PackageName"]
+    $JobName = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobName"]
+    $JobCategory =  Format-OctopusArgument -Value $OctopusParameters["SSIS_JobCategory"]
+    $JobStepName = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobStepName"]
+    $JobScheduleName = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobScheduleName"]
+    $JobExecutionFrequency = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobExecutionFrequency"]
+    $JobFrequencyInterval = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobFrequencyInterval"]
+    $JobExecutionTimeHour = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobExecutionTimeHour"]
+    $JobExecutionTimeMinute = Format-OctopusArgument -Value $OctopusParameters["SSIS_JobExecutionTimeMinute"]
+
+
+   # FrecuencyType is hardcoded
+
+    #Getting Module sqlserver if possible.
+    $Module = get-module -ListAvailable -name sqlserver
+    if ($Module.Name -eq 'sqlserver') {
+        write-host "Importing Module SqlServer"
+        Import-Module sqlserver -DisableNameChecking
+    } else {
+        write-host "Importing Module sqlps"
+        import-module sqlps -Verbose -DisableNameChecking
+    }
+
+    #First step is to generate the command execution for Job Step.
+    $JobStepCommand = Get-SSISCommand -ServerName $ServerName -CatalogName $CatalogName -FolderName $FolderName -ProjectName $ProjectName -PackageName $PackageName -EnvironmentName $EnvironmentName -Verbose
+
+    write-Host "Command found to deploy Step is "
+    write-Host $JobStepCommand
+    write-Host "STARTING DEPLOYMENT "
+    write-Host "|- Start Adding the Job $JobName"
+    Add-Job -JobName $JobName -ServerName $ServerName -EnvironmentName $EnvironmentName -JobsStepName $JobStepName -JobStepCommand $JobStepCommandmand
+    write-Host "|- $JobName Added to $ServerName"
+
+    write-Host "|--- Start Adding the JobStep $JobStepName to Job $JobName"
+    Add-JobStep -JobStepName $JobStepName -CommandJob $JobStepCommand -Job $Global:newjob
+    write-Host "|--- $JobStepName added to Job $JobName"
+
+    write-Host "|----  Start Adding JobShedule  $JobScheduleName JobStep $JobName"
+    Add-JobSchedule -job $Global:newjob  -JobScheduleName $JobScheduleName  -JobExecutionFrequency $JobExecutionFrequency -FrecuencyInterval $JobFrequencyInterval -startHour $JobExecutionTimeHour -startMinutes $JobExecutionTimeMinute
+    write-Host "|---- $JobStepName added to Job $JobName"
+}
+
+Write-Host "Starting deployment of SQL Job"
+
+
+Set-SQLJob
+
+
+Write-Host "Finishing Install"
diff --git a/step-templates/ssl-certificate-install.json b/src/step-templates/ssl-certificate-install/metadata.json
similarity index 67%
rename from step-templates/ssl-certificate-install.json
rename to src/step-templates/ssl-certificate-install/metadata.json
index bd8add766..d60812a5b 100644
--- a/step-templates/ssl-certificate-install.json
+++ b/src/step-templates/ssl-certificate-install/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 4,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$base64Certificate = $OctopusParameters['Base64Certificate']\n$password = $OctopusParameters['Password']\n$location = $OctopusParameters['StoreLocation']\n$name = $OctopusParameters['StoreName']\n\nWrite-Host \"Adding/updating certificate in store\"\n\n$certBytes = [System.Convert]::FromBase64String($base64Certificate)\n$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($certBytes, $password, \"MachineKeySet,PersistKeySet\")\n$store = New-Object System.Security.Cryptography.X509Certificates.X509Store($name, $location)\n$store.Open(\"ReadWrite\")\n$store.Add($cert)\n$store.Close()",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -49,12 +49,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2016-10-14T03:01:44.952+00:00",
+  "LastModifiedOn": "2016-10-13T20:01:44.9520000-07:00",
   "LastModifiedBy": "kp-tseng",
   "$Meta": {
-    "ExportedAt": "2014-10-01T07:43:57.503+00:00",
+    "ExportedAt": "2014-10-01T00:43:57.5030000-07:00",
     "OctopusVersion": "2.5.8.447",
     "Type": "ActionTemplate"
   },
   "Category": "ssl"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/ssl-certificate-install/scriptbody.ps1 b/src/step-templates/ssl-certificate-install/scriptbody.ps1
new file mode 100644
index 000000000..1d9cbbc74
--- /dev/null
+++ b/src/step-templates/ssl-certificate-install/scriptbody.ps1
@@ -0,0 +1,13 @@
+$base64Certificate = $OctopusParameters['Base64Certificate']
+$password = $OctopusParameters['Password']
+$location = $OctopusParameters['StoreLocation']
+$name = $OctopusParameters['StoreName']
+
+Write-Host "Adding/updating certificate in store"
+
+$certBytes = [System.Convert]::FromBase64String($base64Certificate)
+$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($certBytes, $password, "MachineKeySet,PersistKeySet")
+$store = New-Object System.Security.Cryptography.X509Certificates.X509Store($name, $location)
+$store.Open("ReadWrite")
+$store.Add($cert)
+$store.Close()
\ No newline at end of file
diff --git a/src/step-templates/ssl-disable-sslv2/metadata.json b/src/step-templates/ssl-disable-sslv2/metadata.json
new file mode 100644
index 000000000..4fee89968
--- /dev/null
+++ b/src/step-templates/ssl-disable-sslv2/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "ea274d21-80ca-4c1b-aa82-f0d124c6a707",
+  "Name": "SSL - Disable SSLv2",
+  "Description": "Disables SSL v2, requires restart.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Server",
+      "Label": "Server name",
+      "HelpText": "Server name to disable SSL v2 on.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-30T13:48:41.1720000-07:00",
+    "OctopusVersion": "2.4.7.85",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ssl"
+}
diff --git a/src/step-templates/ssl-disable-sslv2/scriptbody.ps1 b/src/step-templates/ssl-disable-sslv2/scriptbody.ps1
new file mode 100644
index 000000000..8d70f65b1
--- /dev/null
+++ b/src/step-templates/ssl-disable-sslv2/scriptbody.ps1
@@ -0,0 +1,60 @@
+Write-host "Server : $Server"
+	$ClientEnabled = $false
+	$ServerEnabled = $false
+    $reg = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey('LocalMachine', $Server)
+    $regkey = $reg.OpenSubkey("SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCHANNEL\\Protocols\\SSL 2.0",$true)
+	$regkeyC = $reg.OpenSubkey("SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCHANNEL\\Protocols\\SSL 2.0\\Client",$true)
+	$regkeyS = $reg.OpenSubkey("SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCHANNEL\\Protocols\\SSL 2.0\\Server",$true)
+	
+	foreach($subkeyName in $regkey.GetSubKeyNames())
+	{
+#CLIENT
+		# Check for Client SubKey
+		if (!$regkeyC)			
+		{
+			$regkey.CreateSubKey('Client')
+			#reload
+			$regkeyC = $reg.OpenSubkey("SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCHANNEL\\Protocols\\SSL 2.0\\Client",$true)
+			$regkeyC.SetValue('DisabledByDefault','1','DWORD')
+		}		
+		foreach($subkeyNameC in $regkeyC.GetValueNames())
+		{					
+			if ($subkeyNameC)
+			{
+				if ($subkeyNameC -eq 'Enabled')
+				{
+					$ClientEnabled = $true
+				}
+			}
+		}
+		# Check to see if the Enabled Key was found
+		if (!$ClientEnabled)
+		{
+			#Add enabled SubKey with DWORD value
+			$regkeyC.SetValue('Enabled','0','DWORD')				
+		}
+#SERVER
+		# Check for Server SubKey
+		if (!$regkeyS)
+		{
+			$regkey.CreateSubKey('Server')
+			#reload
+			$regkeyS = $reg.OpenSubkey("SYSTEM\\CurrentControlSet\\Control\\SecurityProviders\\SCHANNEL\\Protocols\\SSL 2.0\\Server",$true)
+		}		
+		foreach($subkeyNameS in $regkeyS.GetValueNames())
+		{
+			if ($subkeyNameS)
+			{
+				if ($subkeyNameS -eq 'Enabled')
+				{
+					$ServerEnabled = $true
+				}
+			}
+		}		
+		if (!$ServerEnabled)
+		{
+			#Add enabled SubKey with DWORD value
+			$regkeyS.SetValue('Enabled','0','DWORD')
+		}			
+	} 
+	Write-host "Server : $Server : Complete"
\ No newline at end of file
diff --git a/src/step-templates/ssl-write-certificate-pem-and-key/metadata.json b/src/step-templates/ssl-write-certificate-pem-and-key/metadata.json
new file mode 100644
index 000000000..53467995c
--- /dev/null
+++ b/src/step-templates/ssl-write-certificate-pem-and-key/metadata.json
@@ -0,0 +1,65 @@
+{
+  "Id": "9e7f1836-c7c5-4d52-bd9e-0948114b2a0e",
+  "Name": "SSL - Write Certificate Pem and Key to the Filesystem",
+  "Description": "Export the PEM and Key from an SSL certificate to the File System. This is useful in Linux for securing websites or Docker containers",
+  "ActionType": "Octopus.Script",
+  "Version": 7,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "c9cdd622-1a9a-4e5e-9eaa-ad738b76b356",
+      "Name": "sslExportPath",
+      "Label": "Root SSL Export Path",
+      "HelpText": "The base directory the key and pem file will be saved to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9211d56c-068e-47c5-9613-0f77eda72dca",
+      "Name": "sslPemFile",
+      "Label": "PEM File Name",
+      "HelpText": "The filename to write the PEM to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "39dbe4a6-60c5-4bd2-8ad9-03a28f7148f0",
+      "Name": "sslKeyFile",
+      "Label": "Key File Name",
+      "HelpText": "The filename to write the Key to",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "65d6687e-badf-4772-ac14-70bd2790cd4d",
+      "Name": "sslCertificate",
+      "Label": "SSL Certificate Variable",
+      "HelpText": "The name of the SSL certificate Variable",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Certificate"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2020-08-13T07:41:35.9490000Z",
+    "OctopusVersion": "2020.1.18",
+    "Type": "ActionTemplate"
+  },
+  "Category": "ssl"
+}
diff --git a/src/step-templates/ssl-write-certificate-pem-and-key/scriptbody.ps1 b/src/step-templates/ssl-write-certificate-pem-and-key/scriptbody.ps1
new file mode 100644
index 000000000..83b59e467
--- /dev/null
+++ b/src/step-templates/ssl-write-certificate-pem-and-key/scriptbody.ps1
@@ -0,0 +1,15 @@
+
+$CertName = $OctopusParameters["sslCertificate.Name"] 
+Write-Host "Writing PEM and Key files for $Certname"
+
+New-Item -ItemType directory $sslExportPath -Force -Verbose
+
+"Certificate Pem:"
+$pemPath = join-path $sslExportPath $sslPemFile
+$OctopusParameters["sslCertificate.CertificatePem"] | out-file $pemPath -Force -Verbose
+
+"-" * 30
+
+"Certificate Key: "
+$keypath = join-path $sslExportPath $sslKeyFile
+$OctopusParameters["sslCertificate.PrivateKeyPem"] | out-file $keyPath -Force -Verbose
diff --git a/src/step-templates/ssrs-deploy-from-package-parameter/metadata.json b/src/step-templates/ssrs-deploy-from-package-parameter/metadata.json
new file mode 100644
index 000000000..db60f4f5c
--- /dev/null
+++ b/src/step-templates/ssrs-deploy-from-package-parameter/metadata.json
@@ -0,0 +1,187 @@
+{
+  "Id": "2c118ec9-4c3e-45a4-85b7-9f3c8ae99ca9",
+  "Name": "Deploy SSRS Reports from a package parameter",
+  "Description": "Uploads SSRS reports to an SSRS server from a package.\n\nThe following Datasource properties can be overidden: ConnectionString, Username, Password, and CredentialRetrieval (valid values are: Integrated, Prompt, Store, or None).  To override the property, create a Variable using the syntax of DatasourceName.PropertyName.  For example: MyDatasource.Username \n\nTo specify the Username and Password are Windows Credentials, create a variable called DatasourceName.WindowsCredentials and set the value to the string value 'true' (minus the quotes).",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Author": "twerthi",
+  "Packages": [
+    {
+      "Name": "SSRSPackage",
+      "Id": "5f4c7059-081e-44d7-bfea-6b9a90c4e77c",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "SSRSPackage"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "e339fdfe-376f-4d6b-9226-9d5fc07c0a62",
+      "Name": "SSRSPackage",
+      "Label": "Package",
+      "HelpText": "Select the package containing the SSRS reports.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ReportServiceUrl",
+      "Label": "Url of SSRS Server service",
+      "HelpText": "The complete Url to the SSRS server.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/reportservice2010.asmx?wsdl",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ReportExecutionUrl",
+      "Label": "Report Execution Url",
+      "HelpText": "The complete Url to the Report Execution service.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/ReportExecution2005.asmx?wsdl",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ReportFolder",
+      "Label": "Report folder",
+      "HelpText": "Relative Url to the folder in which the reports will be deployed.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ReportDatasourceFolder",
+      "Label": "Report data source folder",
+      "HelpText": "Relative Url where the data sources for the reports are located, starting with '/'",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "OverwriteDataSources",
+      "Label": "Overwrite datasource(s)",
+      "HelpText": "Tick if the existing report data source file needs to e replaced.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "BackupLocation",
+      "Label": "Backup Location",
+      "HelpText": "Directory path to take a backup of existing reports (.rdl) and data source (.rds) files.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ReportDataSetFolder",
+      "Label": "DataSet folder",
+      "HelpText": "Relative Url where Shared Data Sets are stored",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ReportPartsFolder",
+      "Label": "Report Parts Folder",
+      "HelpText": "Relative folder where Report Parts are uploaded to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ServiceUserDomain",
+      "Label": "Service Domain",
+      "HelpText": "(Optional - leave blank to use Tentacle identity) Name of the domain for the user account to execute as",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ServiceUserName",
+      "Label": "Service Username",
+      "HelpText": "(Optional - leave blank to use Tentacle identity) Username of the user account to execute as",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ServicePassword",
+      "Label": "Service Password",
+      "HelpText": "(Optional - leave blank to use Tentacle identity) Password of the user account to execute as",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "ClearReportFolder",
+      "Label": "Clear the Report Folder",
+      "HelpText": "Optional - This will delete all items in the Report Folder before adding items.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "UseArchiveStructure",
+      "Label": "Use package folder structure",
+      "HelpText": "Tick this box to create folders matching the package folder structure and upload items into their respective folders.  Ticking this box ignores all other folder specifications except Root folder",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "",
+      "Name": "RootFolder",
+      "Label": "Root folder",
+      "HelpText": "Used only when 'Use package folder structure' is checked.  This specifies the root folder on SSRS to start in.  Value is relative so it begins with a /",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-03-11T19:29:06.4520000Z",
+    "OctopusVersion": "2020.6.4671",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssrs-deploy-from-package-parameter/scriptbody.ps1 b/src/step-templates/ssrs-deploy-from-package-parameter/scriptbody.ps1
new file mode 100644
index 000000000..37f430a15
--- /dev/null
+++ b/src/step-templates/ssrs-deploy-from-package-parameter/scriptbody.ps1
@@ -0,0 +1,1109 @@
+$DeployedPath = $OctopusParameters["Octopus.Action.Package[SSRSPackage].ExtractedPath"]
+$ReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$UseArchiveStructure = [Convert]::ToBoolean($OctopusParameters["UseArchiveStructure"])
+
+#region Upload-Item
+Function Upload-Item
+{
+    # parameters
+    param ([string] $Item, [string]$ItemType, [string] $ItemFolder)
+
+    Write-Host "Loading data from $Item"
+    $ItemData = [System.IO.File]::ReadAllBytes($Item)
+
+    # Create local variables
+    $Warnings = $null
+    $ItemName = $Item.SubString($Item.LastIndexOf("\") + 1)
+    #$ItemName = $ItemName.SubString(0, $ItemName.IndexOf("."))
+    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf("."))
+   
+	# upload item
+    if ($IsReportService2005) {
+        if($ItemType -eq "Report")
+        {
+	        [void]$ReportServerProxy.CreateReport($ItemName, $ItemFolder, $true, $ItemData, $null)
+        }
+        else
+        {
+            # error
+            Write-Error "$ItemType is not supported in ReportService2005"
+        }
+	}
+	elseif ($IsReportService2010) {
+		[void]$ReportServerProxy.CreateCatalogItem($ItemType, $ItemName, $ItemFolder, $true, $ItemData, $null, [ref] $Warnings);
+	}
+	else { Write-Warning 'Report Service Unknown in Upload-Item method. Use ReportService2005 or ReportService2010.' }
+}
+#endregion
+
+#region Get-ItemDataSourceNames()
+Function Get-ItemDataSourceNames
+{
+    # Parameters
+    Param ($ItemFile, $DataSourceName)
+
+    # declare working variables
+    $DataSourceNames = @()
+    
+    # load the xml
+    [xml]$Xml = Get-Content $ItemFile
+
+    # retrieve the datasource nodes
+    $DataSourceReferenceNodes = $Xml.GetElementsByTagName("DataSource")
+
+    # loop through returned results
+    foreach($Node in $DataSourceReferenceNodes)
+    {
+        # check to see if we're looking for a specific one
+        if($DataSourceName -ne $null)
+        {
+            # check to see if it's the current node
+            if($DataSourceName -eq $Node.Name)
+            {
+                # add
+                $DataSourceNames += $Node.DataSourceReference
+            }
+        }
+        else
+        {
+            # store the name
+            $DataSourceNames += $Node.DataSourceReference
+        }
+    }
+
+    # return the results
+    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?
+}
+#endregion
+
+#region Get-ItemDataSources()
+Function Get-ItemDataSources
+{
+    # Parameters
+    Param ($ItemFile)
+
+    # declare working variables
+    $DataSourceNames = @()
+    
+    # load the xml
+    [xml]$Xml = Get-Content $ItemFile
+
+    # retrieve the datasource nodes
+    $DataSourceReferenceNodes = $Xml.GetElementsByTagName("DataSource")
+
+    # loop through returned results
+    foreach($Node in $DataSourceReferenceNodes)
+    {
+        # store the name
+        $DataSourceNames += $Node.Name
+    }
+
+    # return the results
+    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?
+}
+#endregion
+
+#region Get-ItemDataSourceReferenceNames
+Function Get-ItemDataSourceReferenceNames
+{
+    # Parameters
+    Param ($ItemFile)
+
+    # declare working variables
+    $DataSourceNames = @()
+    
+    # load the xml
+    [xml]$Xml = Get-Content $ItemFile
+
+    # retrieve the datasource nodes
+    $DataSourceReferenceNodes = $Xml.GetElementsByTagName("DataSourceReference")
+
+    # loop through returned results
+    foreach($Node in $DataSourceReferenceNodes)
+    {
+        # get the data
+        $DataSourceNames += $Node.InnerText
+    }
+
+    # return the results
+    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?
+}
+#endregion
+
+#region Get-DataSetSharedReferenceName
+Function Get-DataSetSharedReferenceName
+{
+    # parameters
+    param($ReportFile, $DataSetName)
+
+    # load the xml
+    [xml]$ReportXml = Get-Content $ReportFile
+
+    # Get the DataSet nodes
+    $DataSetNode = $ReportXml.GetElementsByTagName("DataSet") | Where-Object {$_.Name -eq $DataSetName}
+
+    # return the name
+    $DataSetNode.SharedDataSet.SharedDataSetReference
+}
+#endregion
+
+#region Item-Exists()
+Function Item-Exists($ItemFolderPath, $ItemName)
+{
+    # declare search condition
+    $SearchCondition = New-Object "$ReportServerProxyNamespace.SearchCondition";
+
+    # fill in properties
+    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.ConditionEnum" -EnumName "Equals"
+    $SearchCondition.ConditionSpecified = $true
+    $SearchCondition.Name = "Name"
+    $SearchPath = $(if ([string]::IsNullOrWhitespace($ItemFolderPath)) { "/"} else { $ItemFolderPath } )
+
+	if ($IsReportService2005) {
+		$SearchCondition.Value = $ItemName
+		# search
+	    $items = $ReportServerProxy.FindItems($SearchPath, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $SearchCondition)
+	}
+	elseif ($IsReportService2010) {
+		$SearchCondition.Values = @($ItemName)
+		# search
+	    $items = $ReportServerProxy.FindItems($SearchPath, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $null, $SearchCondition)
+	}
+	else { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    
+
+
+    # check to see if anything was returned
+    if($items.Length -gt 0)
+    {
+        # loop through returned items
+        foreach($item in $items)
+        {
+            # check the path
+            if($item.Path -eq "$ItemFolderPath/$ItemName")
+            {
+                # return true
+                return $true
+            }
+            else
+            {
+                # warn
+                Write-Warning "Unexpected path for $($item.Name); path is $($item.Path) exepected $ItemFolderPath/$ItemName"
+            }
+        }
+
+        # items were found, but the path doesn't match
+        
+        return $false
+    }
+    else
+    {
+        return $false
+    }
+}
+#endregion
+
+Function Get-ItemPath
+{
+    # Define parameters
+    param(
+    $ItemName,
+    $StartFolder,
+    $CompareFolderPath)
+
+    # declare search condition
+    $SearchCondition = New-Object "$ReportServerProxyNamespace.SearchCondition";
+
+    # fill in properties
+    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.ConditionEnum" -EnumName "Equals"
+    $SearchCondition.ConditionSpecified = $true
+    $SearchCondition.Name = "Name"
+
+	if ($IsReportService2005) {
+		$SearchCondition.Value = $ItemName
+		# search
+	    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $SearchCondition)
+	}
+	elseif ($IsReportService2010) {
+		$SearchCondition.Values = @($ItemName)
+		# search
+	    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $null, $SearchCondition)
+	}
+	else { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    
+
+    # Check how many items were returned
+    if ($items.Length -eq 1)
+    {
+        return $items[0].Path
+    }
+    else
+    {
+        # Loop through returned items
+        foreach ($item in $items)
+        {
+            # compare folders
+            if ($CompareFolderPath -eq ($item.Path.SubString(0, $item.Path.LastIndexOf("/"))))
+            {
+                # Display message we're guessing
+                Write-Host "Multiple items were found with name $ItemName, assuming location is same folder as reference, $CompareFolderPath."
+                return $item.Path
+            }
+        }
+
+        # Display warning
+        Write-Warning "Multiple items were returned for $ItemName, unable to determine which one to return."
+        return [string]::Empty
+    }    
+}
+
+#region Set-ItemDataSources()
+Function Set-ItemDataSources
+{
+    # parameters
+    Param($ItemFile, $ItemFolder)
+
+    # declare local variables
+    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf("\") + 1)
+    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf("."))
+    $AllDataSourcesFound = $true
+    
+    # get the datasources
+    $DataSources = $ReportServerProxy.GetItemDataSources([string]::Format("{0}/{1}", $ItemFolder, $ItemName))
+
+    #loop through retrieved datasources
+    foreach($DataSource in $DataSources)
+    {
+        # check to see if it's a dataset
+        if([System.IO.Path]::GetExtension($ItemFile).ToLower() -eq ".rsd")
+        {
+            # datasets can have one and only one datasource
+            # The method GetItemDataSources does not return the name of the datasource for datasets like it does for reports
+            # instead, it alaways returns DataSetDataSource.  This made the call to Get-ItemDataSourceNames necessary,
+            # otherwise it would not link correctly
+            $DataSourceName = (Get-ItemDataSourceReferenceNames -ItemFile $ItemFile)[0]
+        }
+        else
+        {
+            # get the anme from teh source itself
+            $DataSourceName = (Get-ItemDataSourceNames -ItemFile $ItemFile -DataSourceName $DataSource.Name)[0]
+        }        
+        
+        if ([string]::IsNullOrWhiteSpace($DataSourceName))
+        {
+            Write-Host "Datasource $($DataSource.Name) is not a shared datasource, skipping."
+            $AllDataSourcesFound = $false
+            continue
+        }
+       
+        # Check to see if datasourcename contains the folder -- this can happen if the report was created by Report Builder
+        if((![string]::IsNullOrEmpty($ReportDataSource)) -and ($DataSourceName.ToLower().Contains($ReportDatasourceFolder.ToLower())))
+        {
+            # Remove teh path from the item name
+            $DataSourceName = $DataSourceName.ToLower().Replace("$($ReportDatasourceFolder.ToLower())/","")
+        }
+
+        $DatasourcePath = ""
+
+        if ($UseArchiveStructure -eq $true)
+        {
+            $DatasourcePath = Get-ItemPath -ItemName $DataSourceName -StartFolder $RootFolder -CompareFolderPath $ItemFolder
+            $DatasourcePath = $DatasourcePath.SubString(0, $DatasourcePath.LastIndexOf("/"))
+        }
+        else
+        {
+            $DatasourcePath = $ReportDatasourceFolder
+        }
+
+        # check to make sure the datasource exists in the location specified
+        if((Item-Exists -ItemFolderPath $DatasourcePath -ItemName $DataSourceName) -eq $true)
+        {
+            # create datasource reference variable
+            $DataSourceReference = New-Object "$ReportServerProxyNamespace.DataSourceReference";
+
+            # assign
+            $DataSourceReference.Reference = "$DatasourcePath/" + $DataSourceName
+            $DataSource.Item = $DataSourceReference            
+        }
+        else
+        {
+            # display warning
+            Write-Warning "Unable to find datasource $($DataSourceName) in $DatasourcePath"
+
+            # update to false
+            $AllDataSourcesFound = $false
+        }        
+    }
+
+    # check to see if found all datasources
+    if($AllDataSourcesFound -eq $true)
+    {
+        Write-Host "Linking datasources to $ItemFolder/$ItemName"
+        
+        # save the references
+        $ReportServerProxy.SetItemDataSources("$ItemFolder/$ItemName", $DataSources)
+    }
+}
+#endregion
+
+#region Set-ReportDataSets()
+Function Set-ReportDataSets
+{
+    # parameters
+    param($ReportFile, $ReportFolderPath)
+
+    # declare local variables
+    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf("\") + 1)
+    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf("."))
+    $AllDataSetsFound = $true
+    $DataSetFolder = ""
+
+    # get the datasources
+    $DataSets = $ReportServerProxy.GetItemReferences([string]::Format("{0}/{1}", $ReportFolderPath, $ReportName), "DataSet")
+
+    # loop through returned values
+    foreach($DataSet in $DataSets)
+    {
+        # get the name of the shared data set reference
+        $SharedDataSetReferenceName = Get-DataSetSharedReferenceName -ReportFile $ReportFile -DataSetName $DataSet.Name
+
+        # Check to see if the SharedDataSetReferenceName contains the folder path -- this can happen if the report was built using Report Builder
+        if((![string]::IsNullOrEmpty($ReportDataSetFolder)) -and ($SharedDataSetReferenceName.ToLower().Contains($ReportDataSetFolder.ToLower())))
+        {
+            # Remove the folder path from the name, it will cause issues when trying to set
+            $SharedDataSetReferenceName = $SharedDataSetReferenceName.ToLower().Replace("$($ReportDataSetFolder.ToLower())/", "")
+        }
+        
+        # Check to see if we're using the archive folder structure
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Set dataset folder
+            $DataSetFolder = Get-ItemPath -ItemName $SharedDataSetReferenceName -StartFolder $RootFolder -CompareFolderPath $ReportFolderPath
+            $DataSetFolder = $DataSetFolder.SubString(0, $DataSetFolder.LastIndexOf("/"))
+        }
+        else
+        {
+            $DataSetFolder = $ReportDataSetFolder
+        }
+
+        # check to make sure the datasource exists in the location specified
+        if((Item-Exists -ItemFolderPath $DataSetFolder -ItemName $SharedDataSetReferenceName) -eq $true)
+        {
+            # create datasource reference variable
+            $DataSetReference = New-Object "$ReportServerProxyNamespace.ItemReference";
+
+            # assign
+            $DataSetReference.Reference = "$DataSetFolder/" + $SharedDataSetReferenceName
+            $DataSetReference.Name = $DataSet.Name
+
+            # log
+            Write-Host "Linking Shared Data Set $($DataSet.Name) to $ReportName"
+            
+            # update reference
+            $ReportServerProxy.SetItemReferences("$ReportFolderPath/$ReportName", @($DataSetReference))
+        }
+        else
+        {
+            # get the datasource name to include in warning message -- I know there must be a way to use the property in a string literal, but I wasn't able to figure it out while trying
+            # to solve a reported bug so I took the easy way.
+            $DataSetName = $DataSet.Name
+            
+            # display warning
+            Write-Warning "Unable to find dataset $DataSetName in $ReportDataSetFolder"
+
+            # update to false
+            $AllDataSetsFound = $false
+        }            
+    }
+
+    # check to see if all datsets were found
+    if($AllDataSetsFound -eq $False)
+    {
+        Write-Warning "Not all datasets found"
+
+        # save the references
+        $ReportServerProxy.SetItemReferences("$ReportFolder/$ReportName", @($DataSets))
+    }
+}
+
+#endregion
+
+#region Get-ObjectNamespace()
+Function Get-ObjectNamespace($Object)
+{
+    # return the value
+    ($Object).GetType().ToString().SubString(0, ($Object).GetType().ToString().LastIndexOf("."))
+}
+#endregion
+
+#region Get-SpecificEnumValue()
+Function Get-SpecificEnumValue($EnumNamespace, $EnumName)
+{
+    # get the enum values
+    $EnumValues = [Enum]::GetValues($EnumNamespace)
+
+    # Loop through to find the specific value
+    foreach($EnumValue in $EnumValues)
+    {
+        # check current
+        if($EnumValue -eq $EnumName)
+        {
+            # return it
+            return $EnumValue
+        }
+    }
+
+    # nothing was found
+    return $null
+}
+#endregion
+
+#region Update-ReportParamters()
+Function Update-ReportParameters($ReportFile, $ReportFolderPath)
+{
+    # declare local variables
+    $ReportParameters = @();
+    
+    # necessary so that when attempting to use the report execution service, it doesn't puke on you when it can't find the data source
+    $ReportData = (Remove-SharedReferences -ReportFile $ReportFile)
+
+    # get just the report name
+    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf("\") + 1)
+    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf("."))
+    
+    # create warnings object
+    $ReportExecutionWarnings = $null
+
+    # set the report full path
+    $ReportPath = "$ReportFolderPath/$ReportName" 
+
+    # load the report definition
+    $ExecutionInfo = $ReportExecutionProxy.LoadReportDefinition($ReportData, [ref] $ReportExecutionWarnings);
+
+    # loop through the report execution parameters
+    foreach($Parameter in $ExecutionInfo.Parameters)
+    {
+        # create new item parameter object
+        $ItemParameter = New-Object "$ReportServerProxyNamespace.ItemParameter";
+
+        # fill in the properties except valid values, that one needs special processing
+        Copy-ObjectProperties -SourceObject $Parameter -TargetObject $ItemParameter;
+
+        # fill in the valid values
+        $ItemParameter.ValidValues = Convert-ValidValues -SourceValidValues $Parameter.ValidValues;
+
+        # exclude if it's query based
+        if($Parameter.DefaultValuesQueryBased -ne $true)
+        {
+            # add to list
+            $ReportParameters += $ItemParameter;
+        }
+    }
+
+    # force the parameters to update
+    Write-Host "Updating report parameters for $ReportFolderPath/$ReportName"
+	if ($IsReportService2005) {
+		$ReportServerProxy.SetReportParameters("$ReportFolderPath/$ReportName", $ReportParameters);
+	}
+	elseif ($IsReportService2010) {
+		$ReportServerProxy.SetItemParameters("$ReportFolderPath/$ReportName", $ReportParameters);
+	}
+	else { Write-Warning 'Report Service Unknown in Update-ReportParameters method. Use ReportService2005 or ReportService2010.' }
+}
+#endregion
+
+#region Remove-ShareReferences()
+Function Remove-SharedReferences($ReportFile)
+{
+    ######################################################################################################
+    #You'll notice that I've used the keyword of [void] in front of some of these method calls, this is so
+    #that the operation isn't captured as output of the function
+    ######################################################################################################
+
+    # read xml
+    [xml]$ReportXml = Get-Content $ReportFile -Encoding UTF8;
+    
+    # create new memory stream object
+    $MemoryStream = New-Object System.IO.MemoryStream
+
+    try
+    {
+
+        # declare array of nodes to remove
+        $NodesToRemove = @();
+
+        # get datasource names
+        $DataSourceNames = Get-ItemDataSources -ItemFile $ReportFile
+
+        # check to see if report has datasourcenames
+        if($DataSourceNames.Count -eq 0)
+        {
+            # Get reference to reportnode
+            $ReportNode = $ReportXml.FirstChild.NextSibling # Kind of a funky way of getting it, but the SelectSingleNode("//Report") wasn't working due to Namespaces in the node
+
+            # create new DataSources node
+            $DataSourcesNode = $ReportXml.CreateNode($ReportNode.NodeType, "DataSources", $null)
+
+            # create new datasource node
+            $DataSourceNode = $ReportXml.CreateNode($ReportNode.NodeType, "DataSource", $null)
+
+            # create new datasourcereference node
+            $DataSourceReferenceNode = $ReportXml.CreateNode($ReportNode.NodeType, "DataSourceReference", $null)
+
+            # create new attribute
+            $DataSourceNameAttribute = $ReportXml.CreateAttribute("Name")
+            $DataSourceNameAttribute.Value = "DataSource1"
+            $dataSourceReferenceNode.InnerText = "DataSource1"
+
+            # add attribute to datasource node
+            [void]$DataSourceNode.Attributes.Append($DataSourceNameAttribute)
+            [void]$DataSourceNode.AppendChild($DataSourceReferenceNode)
+
+            # add nodes
+            [void]$ReportNode.AppendChild($DataSourcesNode)
+            [void]$DataSourcesNode.AppendChild($DataSourceNode)
+
+            # add fake datasource name to array
+            $DataSourceNames += "DataSource1"
+        }
+
+        # get all datasource nodes
+        $DatasourceNodes = $ReportXml.GetElementsByTagName("DataSourceReference");
+
+        # loop through returned nodes
+        foreach($DataSourceNode in $DatasourceNodes)
+        {
+            # create a new connection properties node
+            $ConnectionProperties = $ReportXml.CreateNode($DataSourceNode.NodeType, "ConnectionProperties", $null);
+
+            # create a new dataprovider node
+            $DataProvider = $ReportXml.CreateNode($DataSourceNode.NodeType, "DataProvider", $null);
+            $DataProvider.InnerText = "SQL";
+
+            # create new connection string node
+            $ConnectString = $ReportXml.CreateNode($DataSourceNode.NodeType, "ConnectString", $null);
+            $ConnectString.InnerText = "Data Source=Server Name Here;Initial Catalog=database name here";
+
+            # add new node to parent node
+            [void] $DataSourceNode.ParentNode.AppendChild($ConnectionProperties);
+
+            # append childeren
+            [void] $ConnectionProperties.AppendChild($DataProvider);
+            [void] $ConnectionProperties.AppendChild($ConnectString);
+
+            # Add to remove list 
+            $NodesToRemove += $DataSourceNode;
+        }
+
+        # get all shareddataset nodes
+        $SharedDataSetNodes = $ReportXml.GetElementsByTagName("SharedDataSet")
+
+        #loop through the returned nodes
+        foreach($SharedDataSetNode in $SharedDataSetNodes)
+        {
+            # create holder nodes so it won't error
+            $QueryNode = $ReportXml.CreateNode($SharedDataSetNode.NodeType, "Query", $null);
+            $DataSourceNameNode = $ReportXml.CreateNode($QueryNode.NodeType, "DataSourceName", $null);
+            $CommandTextNode = $ReportXml.CreateNode($QueryNode.NodeType, "CommandText", $null);
+
+            # add valid datasource name, just get the first in the list
+            $DataSourceNameNode.InnerText = $DataSourceNames[0]
+            
+            # add node to parent
+            [void] $SharedDataSetNode.ParentNode.Appendchild($QueryNode)
+            
+            # add datasourcename and commandtext to query node
+            [void]$QueryNode.AppendChild($DataSourceNameNode)
+            [void]$QueryNode.AppendChild($CommandTextNode)
+
+            # add node to removelist
+            $NodesToRemove += $SharedDataSetNode
+        }
+
+
+        # loop through nodes to remove
+        foreach($Node in $NodesToRemove)
+        {
+            # remove from parent
+            [void] $Node.ParentNode.RemoveChild($Node);
+        }
+    
+        $ReportXml.InnerXml = $ReportXml.InnerXml.Replace("xmlns=`"`"", "")
+
+        # save altered xml to memory stream
+        $ReportXml.Save($MemoryStream);
+
+        # return the altered xml as byte array
+        return $MemoryStream.ToArray();
+    }
+    finally
+    {
+        # close and dispose
+        $MemoryStream.Close();
+        $MemoryStream.Dispose();
+    }
+}
+#endregion
+
+
+#region Copy-ObjectProperties()
+Function Copy-ObjectProperties($SourceObject, $TargetObject)
+{
+    # Get source object property array
+    $SourcePropertyCollection = $SourceObject.GetType().GetProperties();
+
+    # get the destination
+    $TargetPropertyCollection = $TargetObject.GetType().GetProperties();
+
+    # loop through source property collection
+    for($i = 0; $i -lt $SourcePropertyCollection.Length; $i++)
+    {
+        # get the target property
+        $TargetProperty = $TargetPropertyCollection | Where {$_.Name -eq $SourcePropertyCollection[$i].Name}
+        
+        # check to see if it's null
+        if($TargetProperty -ne $null)
+        {
+            # check to see if it's the valid values property
+            if($TargetProperty.Name -ne "ValidValues")
+            {
+                 # set the value
+                $TargetProperty.SetValue($TargetObject, $SourcePropertyCollection[$i].GetValue($SourceObject));
+            }
+        }
+    }
+}
+#endregion
+
+#region ConvertValidValues()
+Function Convert-ValidValues($SourceValidValues)
+{
+    # declare local values
+    $TargetValidValues = @();
+    
+    # loop through source values
+    foreach($SourceValidValue in $SourceValidValues)
+    {
+        # create target valid value object
+        $TargetValidValue = New-Object "$ReportServerProxyNamespace.ValidValue";
+
+        # copy properties
+        Copy-ObjectProperties -SourceObject $SourceValidValue -TargetObject $TargetValidValue
+
+        # add to list
+        $TargetValidValues += $TargetValidValue
+    }
+
+    # return the values
+    return ,$TargetValidValues
+}
+#endregion
+
+#region Backup-ExistingItem()
+Function Backup-ExistingItem
+{
+    # parameters
+    Param($ItemFile, $ItemFolder)
+
+    # declare local variables
+    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf("\") + 1)
+    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf("."))
+
+    # check to see if the item exists
+    if((Item-Exists -ItemFolderPath $ItemFolder -ItemName $ItemName) -eq $true)
+    {
+        # get file extension
+        $FileExtension = [System.IO.Path]::GetExtension($ItemFile)
+    
+        # check backuplocation
+        if($BackupLocation.EndsWith("\") -ne $true)
+        {
+            # append ending slash
+            $BackupLocation = $BackupLocation + "\"
+        }
+		
+		# add the release number to the backup location
+		$BackupLocation = $BackupLocation + $ReleaseNumber + "\"
+
+        # ensure the backup location actually exists
+        if((Test-Path $BackupLocation) -ne $true)
+        {
+            # create it
+            New-Item -ItemType Directory -Path $BackupLocation
+        }
+
+        # download the item
+        $Item = $ReportServerProxy.GetItemDefinition("$ItemFolder/$ItemName")
+
+        # form the backup path
+        $BackupPath = "{0}{1}{2}" -f $BackupLocation, $ItemName, $FileExtension;
+
+        # write to disk
+        [System.IO.File]::WriteAllBytes("$BackupPath", $Item);
+
+        # write to screen
+        Write-Host "Backed up $ItemFolder/$ItemName to $BackupPath";
+    }
+}
+#endregion
+
+#region Normalize-SSRSFolder()
+function Normalize-SSRSFolder ([string]$Folder) {
+    if (-not $Folder.StartsWith('/')) {
+        $Folder = '/' + $Folder
+    }
+    
+    return $Folder
+}
+#endregion
+
+#region New-SSRSFolder()
+function New-SSRSFolder ([string] $Name) {
+    Write-Verbose "New-SSRSFolder -Name $Name"
+ 
+    $Name = Normalize-SSRSFolder -Folder $Name
+ 
+    if ($ReportServerProxy.GetItemType($Name) -ne 'Folder') {
+        $Parts = $Name -split '/'
+        $Leaf = $Parts[-1]
+        $Parent = $Parts[0..($Parts.Length-2)] -join '/'
+ 
+        if ($Parent) {
+            New-SSRSFolder -Name $Parent
+        } else {
+            $Parent = '/'
+        }
+        
+        $ReportServerProxy.CreateFolder($Leaf, $Parent, $null)
+    }
+}
+#endregion
+
+#region Clear-SSRSFolder()
+function Clear-SSRSFolder ([string] $Name) {
+    Write-Verbose "Clear-SSRSFolder -Name $Name"
+    
+    $Name = Normalize-SSRSFolder -Folder $Name
+    
+    if ($ReportServerProxy.GetItemType($Name) -eq 'Folder' -and $ClearReportFolder) {
+        Write-Host ("Clearing the {0} folder" -f $Name)
+        $ReportServerProxy.ListChildren($Name, $false) | ForEach-Object {
+            Write-Verbose "Deleting item: $($_.Path)"
+            $ReportServerProxy.DeleteItem($_.Path)
+        }
+    }
+}
+#endregion
+
+#region New-SSRSDataSource()
+function New-SSRSDataSource ([string]$RdsPath, [string]$Folder, [bool]$OverwriteDataSources) {
+    Write-Verbose "New-SSRSDataSource -RdsPath $RdsPath -Folder $Folder"
+
+    $Folder = Normalize-SSRSFolder -Folder $Folder
+    
+    [xml]$Rds = Get-Content -Path $RdsPath
+    $dsName = $Rds.RptDataSource.Name
+    $ConnProps = $Rds.RptDataSource.ConnectionProperties
+    
+	$type = $ReportServerProxy.GetType().Namespace #Get proxy type
+	$DSDdatatype = ($type + '.DataSourceDefinition')
+	 
+	$Definition = new-object ($DSDdatatype)
+	if($Definition -eq $null){
+	 Write-Error Failed to create data source definition object
+	}
+	
+	$dsConnectionString = $($OctopusParameters["$($dsName).ConnectionString"])
+    $dsUsername = $($OctopusParameters["$($dsName).Username"])
+    $dsPassword = $($OctopusParameters["$($dsName).Password"])
+    $dsCredentialRetrieval = $($OctopusParameters["$($dsName).CredentialRetrieval"])
+    
+	# replace the connection string variable that is configured in the octopus project
+	if ($dsConnectionString) {
+	    $Definition.ConnectString = $dsConnectionString
+	} else {
+	    $Definition.ConnectString = $ConnProps.ConnectString
+	}
+	
+    $Definition.Extension = $ConnProps.Extension 
+
+	# Check to see if the credential retrieval is overridden
+    if ($null -ne $dsCredentialRetrieval)
+    {
+    	Write-Host "Forcing CredentialRetrieval property to: $dsCredentialRetrieval."
+        $Definition.CredentialRetrieval = $dsCredentialRetrieval
+    }
+    else
+    {
+    	# Set the Credential Retrieval method
+    	if ([Convert]::ToBoolean($ConnProps.IntegratedSecurity)) {
+			$Definition.CredentialRetrieval = 'Integrated'
+		}
+        elseif (![string]::IsNullOrWhitespace($dsUsername) -and ![string]::IsNullOrWhitespace($dsPassword))
+        {
+        	$Definition.CredentialRetrieval = 'Store'
+        }
+    }
+       
+	if ($Definition.CredentialRetrieval -eq 'Store')
+    {		
+		Write-Host "$($dsName).Username = '$dsUsername'"
+		Write-Host "$($dsName).Password = '$dsPassword'"
+		
+		$Definition.UserName = $dsUsername;
+        $Definition.Password = $dsPassword;
+	}
+    
+    # Check to see if this is supposed to be an Windows Authentication stored account
+    if ($OctopusParameters["$($dsName).WindowsCredentials"] -eq "true")
+    {
+	    # Set the definition to Windows Credentials
+    	$Definition.WindowsCredentials = $true
+    }
+    
+
+    $DataSource = New-Object -TypeName PSObject -Property @{
+        Name = $Rds.RptDataSource.Name
+        Path =  $Folder + '/' + $Rds.RptDataSource.Name
+    }
+    
+    if ($OverwriteDataSources -or $ReportServerProxy.GetItemType($DataSource.Path) -eq 'Unknown') {
+        Write-Host "Overwriting datasource $($DataSource.Name)"
+        $ReportServerProxy.CreateDataSource($DataSource.Name, $Folder, $OverwriteDataSources, $Definition, $null)
+    }
+    
+    return $DataSource 
+}
+#endregion
+
+#region Main
+
+try
+{
+    # declare array for reports
+    $ReportFiles = @()
+	$ReportDataSourceFiles = @()
+    $ReportDataSetFiles = @()
+    $ReportPartFiles = @()
+	
+	$IsReportService2005 = $false
+	$IsReportService2010 = $false
+	
+	if ($ReportServiceUrl.ToLower().Contains('reportservice2005.asmx')) {
+		$IsReportService2005 = $true
+		Write-Host "2005 Report Service found."
+	}
+	elseif ($ReportServiceUrl.ToLower().Contains('reportservice2010.asmx')) {
+		$IsReportService2010 = $true
+		Write-Host "2010 Report Service found."
+	}
+	
+	Write-Host "Deploy Path: $DeployedPath"
+	
+    # get all report files for deployment
+    Write-Host "Getting all .rdl files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rdl" | ForEach-Object { If(($ReportFiles -contains $_.FullName) -eq $false) {$ReportFiles += $_.FullName}}
+    Write-Host "# of rdl files found: $($ReportFiles.Count)"
+
+    # get all report datasource files for deployment
+    Write-Host "Getting all .rds files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rds" | ForEach-Object { If(($ReportDataSourceFiles -contains $_.FullName) -eq $false) {$ReportDataSourceFiles += $_.FullName}}
+    Write-Host "# of rds files found: $($ReportDataSourceFiles.Count)"
+
+    # get all report datset files for deployment
+    Write-Host "Getting all .rsd files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rsd" | ForEach-Object { If(($ReportDataSetFiles -contains $_.FullName) -eq $false) {$ReportDataSetFiles += $_.FullName}}
+    Write-Host "# of rsd files found: $($ReportDataSetFiles.Count)"
+
+    # get all report part files for deployment
+    Write-Host "Getting all .rsc files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rsc" | ForEach-Object { If(($ReportPartFiles -contains $_.FullName) -eq $false) {$ReportPartFiles += $_.FullName}}
+    Write-Host "# of rsc files found: $($ReportPartFiles.Count)"
+
+    # set the report proxies
+    Write-Host "Creating SSRS Web Service proxies"
+
+    # check to see if credentials were supplied for the services
+    if(([string]::IsNullOrEmpty($ServiceUserDomain) -ne $true) -and ([string]::IsNullOrEmpty($ServiceUserName) -ne $true) -and ([string]::IsNullOrEmpty($ServicePassword) -ne $true))
+    {
+        # secure the password
+        $secpasswd = ConvertTo-SecureString "$ServicePassword" -AsPlainText -Force
+
+        # create credential object
+        $ServiceCredential = New-Object System.Management.Automation.PSCredential ("$ServiceUserDomain\$ServiceUserName", $secpasswd)
+
+        # create proxies
+        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -Credential $ServiceCredential
+        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -Credential $ServiceCredential
+    }
+    else
+    {
+        # create proxies using current identity
+        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -UseDefaultCredential 
+        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -UseDefaultCredential 
+    }
+
+
+
+	#Create folder information for DataSource and Report
+    if ($UseArchiveStructure -eq $false)
+    {
+	    New-SSRSFolder -Name $ReportFolder
+	    New-SSRSFolder -Name $ReportDatasourceFolder
+        New-SSRSFolder -Name $ReportDataSetFolder
+        New-SSRSFolder -Name $ReportPartsFolder
+    }
+    else
+    {
+        New-SSRSFolder -Name $RootFolder
+    }
+    
+    #Clear destination folder if specified
+    if([System.Convert]::ToBoolean("$ClearReportFolder")) {
+        Clear-SSRSFolder -Name $ReportFolder
+    }
+	 
+	#Create DataSource
+    foreach($RDSFile in $ReportDataSourceFiles) {
+        Write-Host "New-SSRSDataSource $RdsFile"
+
+        $DatasourceFolder = ""
+
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Adjust report folder to archive path
+            $DatasourceFolder = $(if ($RootFolder -eq "/") { [string]::Empty} else { $RootFolder } ) + $RDSFile.Replace($DeployedPath, '').Replace('\', '/').Replace((Split-Path $RDSFile -Leaf), '')
+
+            # Remove final slash
+            $DatasourceFolder = $DatasourceFolder.Substring(0, $DatasourceFolder.LastIndexOf('/'))    
+            
+            # Check if folder exists
+            New-SSRSFolder -Name $DatasourceFolder                    
+        }
+        else
+        {
+            $DatasourceFolder = $ReportDatasourceFolder
+        }
+        
+		$DataSource = New-SSRSDataSource -RdsPath $RdsFile -Folder $DatasourceFolder -Overwrite ([System.Convert]::ToBoolean("$OverwriteDataSources"))
+	}
+
+    # get the service proxy namespaces - this is necessary because of a bug documented here http://stackoverflow.com/questions/7921040/error-calling-reportingservice2005-finditems-specifically-concerning-the-bool and http://www.vistax64.com/powershell/273120-bug-when-using-namespace-parameter-new-webserviceproxy.html
+    $ReportServerProxyNamespace = Get-ObjectNamespace -Object $ReportServerProxy
+    $ReportExecutionProxyNamespace = Get-ObjectNamespace -Object $ReportExecutionProxy
+
+    # Create dat sets
+    foreach($DataSet in $ReportDataSetFiles)
+    {
+        $DataSetPath = ""
+
+        # Check to see if it's set to follow archive structure
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Adjust report folder to archive path
+            $DataSetPath = $(if ($RootFolder -eq "/") { [string]::Empty} else { $RootFolder } ) + $DataSet.Replace($DeployedPath, '').Replace('\', '/').Replace((Split-Path $DataSet -Leaf), '')
+
+            # Remove final slash
+            $DataSetPath = $DataSetPath.Substring(0, $DataSetPath.LastIndexOf('/'))
+
+            # Check if folder exists
+            New-SSRSFolder -Name $DataSetPath
+        }
+        else
+        {
+            $DataSetPath = $ReportDataSetFolder
+        }
+
+        # check to see if we need to back up
+        if($BackupLocation -ne $null -and $BackupLocation -ne "")
+        {
+            # backup the item
+            Backup-ExistingItem -ItemFile $DataSet -ItemFolder $DataSetPath
+        }
+
+        # upload the dataset
+        Upload-Item -Item $DataSet -ItemType "DataSet" -ItemFolder $DataSetPath
+
+        # update the dataset datasource
+        Set-ItemDataSources -ItemFile $DataSet -ItemFolder $DataSetPath
+    }
+
+    # get the proxy auto generated name spaces
+
+    # loop through array
+    foreach($ReportFile in $ReportFiles)
+    {
+        $ReportPath = ""
+
+        # Check to see if it's set to follow archive structure
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Adjust report folder to archive path
+            $ReportPath = $(if ($RootFolder -eq "/") { [string]::Empty} else { $RootFolder } ) + $ReportFile.Replace($DeployedPath, '').Replace('\', '/').Replace((Split-Path $ReportFile -Leaf), '')
+
+            # Remove final slash
+            $ReportPath = $ReportPath.Substring(0, $ReportPath.LastIndexOf('/'))
+
+            # Check if folder exists
+            New-SSRSFolder -Name $ReportPath
+        }
+        else
+        {
+            $ReportPath = $ReportFolder
+        }
+
+        # check to see if we need to back up
+        if($BackupLocation -ne $null -and $BackupLocation -ne "")
+        {
+            # backup the item
+            Backup-ExistingItem -ItemFile $ReportFile -ItemFolder $ReportPath
+        }
+        
+        
+        # upload report
+        Upload-Item -Item $ReportFile -ItemType "Report" -ItemFolder $ReportPath
+
+        # extract datasources
+        #Write-Host "Extracting datasource names for $ReportFile"
+        #$ReportDataSourceNames = Get-ReportDataSourceNames $ReportFile
+
+        # set the datasources
+        Set-ItemDataSources -ItemFile $ReportFile -ItemFolder $ReportPath
+
+        # set the datasets
+        Set-ReportDataSets -ReportFile $ReportFile -ReportFolderPath $ReportPath
+
+        # update the report parameters
+        Update-ReportParameters -ReportFile $ReportFile -ReportFolderPath $ReportPath
+    }
+    
+    # loop through rsc files
+    foreach($ReportPartFile in $ReportPartFiles)
+    {
+        # check to see if we need to back up
+        if($BackupLocation -ne $null -and $BackupLocation -ne "")
+        {
+            # backup the item
+            Backup-ExistingItem -ItemFile $ReportPartFile -ItemFolder $ReportPartsFolder
+        }
+
+		# upload item
+        Upload-Item -Item $ReportPartFile -ItemType "Component" -ItemFolder $ReportPartsFolder
+    }
+    
+}
+finally
+{
+    # check to see if the proxies are null
+    if($ReportServerProxy -ne $null)
+    {
+        # dispose
+        $ReportServerProxy.Dispose();
+    }
+
+    if($ReportExecutionProxy -ne $null)
+    {
+        # dispose
+        $ReportExecutionProxy.Dispose();
+    }
+}
+
+#endregion
diff --git a/src/step-templates/ssrs-deploy-from-package/metadata.json b/src/step-templates/ssrs-deploy-from-package/metadata.json
new file mode 100644
index 000000000..5401c0520
--- /dev/null
+++ b/src/step-templates/ssrs-deploy-from-package/metadata.json
@@ -0,0 +1,174 @@
+{
+  "Id": "4e3a1163-e157-4675-a60c-4dc569d14348",
+  "Name": "Deploy SSRS Reports from a package",
+  "Description": "Uploads SSRS reports to an SSRS server from a package.\n\nThe following Datasource properties can be overidden: ConnectionString, Username, Password, and CredentialRetrieval (valid values are: Integrated, Prompt, Store, or None).  To override the property, create a Variable using the syntax of DatasourceName.PropertyName.  For example: MyDatasource.Username \n\nTo specify the Username and Password are Windows Credentials, create a variable called DatasourceName.WindowsCredentials and set the value to the string value 'true' (minus the quotes).",
+  "ActionType": "Octopus.Script",
+  "Version": 58,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "92daa94e-73f3-466e-a8db-35149646df2b",
+      "Name": "NugetPackageStepName",
+      "Label": "SSRS package step",
+      "HelpText": "Select the step in this project which downloads the SSRS package.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Id": "0bb2f003-fda9-4571-86aa-3bad13775874",
+      "Name": "ReportServiceUrl",
+      "Label": "Url of SSRS Server service",
+      "HelpText": "The complete Url to the SSRS server.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/reportservice2010.asmx?wsdl",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "feca8cfe-fe9e-4e8f-ac7e-b370b5ef3ef6",
+      "Name": "ReportExecutionUrl",
+      "Label": "Report Execution Url",
+      "HelpText": "The complete Url to the Report Execution service.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/ReportExecution2005.asmx?wsdl",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1924b3a6-d5bf-4713-8bc7-6b77422a7944",
+      "Name": "ReportFolder",
+      "Label": "Report folder",
+      "HelpText": "Relative Url to the folder in which the reports will be deployed.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "28cc63a0-5a3e-4d22-8406-574bdb332fe1",
+      "Name": "ReportDatasourceFolder",
+      "Label": "Report data source folder",
+      "HelpText": "Relative Url where the data sources for the reports are located, starting with '/'",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b1cdc16e-c2db-41eb-9ae8-8df02b05f03d",
+      "Name": "OverwriteDataSources",
+      "Label": "Overwrite datasource(s)",
+      "HelpText": "Tick if the existing report data source file needs to e replaced.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "b0e69f02-1f99-431a-852e-b0084ed23fd4",
+      "Name": "BackupLocation",
+      "Label": "Backup Location",
+      "HelpText": "Directory path to take a backup of existing reports (.rdl) and data source (.rds) files.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a736f0b8-aa27-45ae-b6a0-43a76e44d85a",
+      "Name": "ReportDataSetFolder",
+      "Label": "DataSet folder",
+      "HelpText": "Relative Url where Shared Data Sets are stored",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c88b150a-9f70-4700-9981-ed1514dc5a2b",
+      "Name": "ReportPartsFolder",
+      "Label": "Report Parts Folder",
+      "HelpText": "Relative folder where Report Parts are uploaded to.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "47575f66-9b1b-4cbb-a062-30d811e6159d",
+      "Name": "ServiceUserDomain",
+      "Label": "Service Domain",
+      "HelpText": "(Optional - leave blank to use Tentacle identity) Name of the domain for the user account to execute as",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "98b43d45-5a5a-456a-aac7-1f4cc6fe8e55",
+      "Name": "ServiceUserName",
+      "Label": "Service Username",
+      "HelpText": "(Optional - leave blank to use Tentacle identity) Username of the user account to execute as",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fd48bde1-3874-45ea-ab99-b40c13b91d5a",
+      "Name": "ServicePassword",
+      "Label": "Service Password",
+      "HelpText": "(Optional - leave blank to use Tentacle identity) Password of the user account to execute as",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "1310ffde-1f98-4ebf-bf6a-605bb83ea54e",
+      "Name": "ClearReportFolder",
+      "Label": "Clear the Report Folder",
+      "HelpText": "Optional - This will delete all items in the Report Folder before adding items.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "9d64d192-b645-4aac-ba52-3c86aebe8d72",
+      "Name": "UseArchiveStructure",
+      "Label": "Use package folder structure",
+      "HelpText": "Tick this box to create folders matching the package folder structure and upload items into their respective folders.  Ticking this box ignores all other folder specifications except Root folder",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "ad0280e7-25a6-48cc-bc90-4e6ee3c8951b",
+      "Name": "RootFolder",
+      "Label": "Root folder",
+      "HelpText": "Used only when 'Use package folder structure' is checked.  This specifies the root folder on SSRS to start in.  Value is relative so it begins with a /",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2021-03-11T19:19:00.1020000Z",
+    "OctopusVersion": "2020.6.4671",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssrs-deploy-from-package/scriptbody.ps1 b/src/step-templates/ssrs-deploy-from-package/scriptbody.ps1
new file mode 100644
index 000000000..908437aff
--- /dev/null
+++ b/src/step-templates/ssrs-deploy-from-package/scriptbody.ps1
@@ -0,0 +1,1107 @@
+$DeployedPath = $OctopusParameters["Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath"]
+$ReleaseNumber = $OctopusParameters["Octopus.Release.Number"]
+$UseArchiveStructure = [Convert]::ToBoolean($OctopusParameters["UseArchiveStructure"])
+
+#region Upload-Item
+Function Upload-Item 
+{
+    # parameters
+    param ([string] $Item, [string]$ItemType, [string] $ItemFolder)
+
+    Write-Host "Loading data from $Item"
+    $ItemData = [System.IO.File]::ReadAllBytes($Item)
+
+    # Create local variables
+    $Warnings = $null
+    $ItemName = $Item.SubString($Item.LastIndexOf("\") + 1)
+    #$ItemName = $ItemName.SubString(0, $ItemName.IndexOf("."))
+    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf("."))
+   
+	# upload item
+    if ($IsReportService2005) {
+        if($ItemType -eq "Report")
+        {
+	        [void]$ReportServerProxy.CreateReport($ItemName, $ItemFolder, $true, $ItemData, $null)
+        }
+        else
+        {
+            # error
+            Write-Error "$ItemType is not supported in ReportService2005"
+        }
+	}
+	elseif ($IsReportService2010) {
+		[void]$ReportServerProxy.CreateCatalogItem($ItemType, $ItemName, $ItemFolder, $true, $ItemData, $null, [ref] $Warnings);
+	}
+	else { Write-Warning 'Report Service Unknown in Upload-Item method. Use ReportService2005 or ReportService2010.' }
+}
+#endregion
+
+#region Get-ItemDataSourceNames()
+Function Get-ItemDataSourceNames
+{
+    # Parameters
+    Param ($ItemFile, $DataSourceName)
+
+    # declare working variables
+    $DataSourceNames = @()
+    
+    # load the xml
+    [xml]$Xml = Get-Content $ItemFile
+
+    # retrieve the datasource nodes
+    $DataSourceReferenceNodes = $Xml.GetElementsByTagName("DataSource")
+
+    # loop through returned results
+    foreach($Node in $DataSourceReferenceNodes)
+    {
+        # check to see if we're looking for a specific one
+        if($DataSourceName -ne $null)
+        {
+            # check to see if it's the current node
+            if($DataSourceName -eq $Node.Name)
+            {
+                # add
+                $DataSourceNames += $Node.DataSourceReference
+            }
+        }
+        else
+        {
+            # store the name
+            $DataSourceNames += $Node.DataSourceReference
+        }
+    }
+
+    # return the results
+    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?
+}
+#endregion
+
+#region Get-ItemDataSources()
+Function Get-ItemDataSources
+{
+    # Parameters
+    Param ($ItemFile)
+
+    # declare working variables
+    $DataSourceNames = @()
+    
+    # load the xml
+    [xml]$Xml = Get-Content $ItemFile
+
+    # retrieve the datasource nodes
+    $DataSourceReferenceNodes = $Xml.GetElementsByTagName("DataSource")
+
+    # loop through returned results
+    foreach($Node in $DataSourceReferenceNodes)
+    {
+        # store the name
+        $DataSourceNames += $Node.Name
+    }
+
+    # return the results
+    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?
+}
+#endregion
+
+#region Get-ItemDataSourceReferenceNames
+Function Get-ItemDataSourceReferenceNames
+{
+    # Parameters
+    Param ($ItemFile)
+
+    # declare working variables
+    $DataSourceNames = @()
+    
+    # load the xml
+    [xml]$Xml = Get-Content $ItemFile
+
+    # retrieve the datasource nodes
+    $DataSourceReferenceNodes = $Xml.GetElementsByTagName("DataSourceReference")
+
+    # loop through returned results
+    foreach($Node in $DataSourceReferenceNodes)
+    {
+        # get the data
+        $DataSourceNames += $Node.InnerText
+    }
+
+    # return the results
+    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?
+}
+#endregion
+
+#region Get-DataSetSharedReferenceName
+Function Get-DataSetSharedReferenceName
+{
+    # parameters
+    param($ReportFile, $DataSetName)
+
+    # load the xml
+    [xml]$ReportXml = Get-Content $ReportFile
+
+    # Get the DataSet nodes
+    $DataSetNode = $ReportXml.GetElementsByTagName("DataSet") | Where-Object {$_.Name -eq $DataSetName}
+
+    # return the name
+    $DataSetNode.SharedDataSet.SharedDataSetReference
+}
+#endregion
+
+#region Item-Exists()
+Function Item-Exists($ItemFolderPath, $ItemName)
+{
+    # declare search condition
+    $SearchCondition = New-Object "$ReportServerProxyNamespace.SearchCondition";
+
+    # fill in properties
+    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.ConditionEnum" -EnumName "Equals"
+    $SearchCondition.ConditionSpecified = $true
+    $SearchCondition.Name = "Name"
+
+	if ($IsReportService2005) {
+		$SearchCondition.Value = $ItemName
+		# search
+	    $items = $ReportServerProxy.FindItems($ItemFolderPath, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $SearchCondition)
+	}
+	elseif ($IsReportService2010) {
+		$SearchCondition.Values = @($ItemName)
+		# search
+	    $items = $ReportServerProxy.FindItems($ItemFolderPath, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $null, $SearchCondition)
+	}
+	else { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    
+
+    # check to see if anything was returned
+    if($items.Length -gt 0)
+    {
+        # loop through returned items
+        foreach($item in $items)
+        {
+            # check the path
+            if($item.Path -eq "$ItemFolderPath/$ItemName")
+            {
+                # return true
+                return $true
+            }
+            else
+            {
+                # warn
+                Write-Warning "Unexpected path for $($item.Name); path is $($item.Path) exepected $ItemFolderPath/$ItemName"
+            }
+        }
+
+        # items were found, but the path doesn't match
+        
+        return $false
+    }
+    else
+    {
+        return $false
+    }
+}
+#endregion
+
+Function Get-ItemPath
+{
+    # Define parameters
+    param(
+    $ItemName,
+    $StartFolder,
+    $CompareFolderPath)
+
+    # declare search condition
+    $SearchCondition = New-Object "$ReportServerProxyNamespace.SearchCondition";
+
+    # fill in properties
+    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.ConditionEnum" -EnumName "Equals"
+    $SearchCondition.ConditionSpecified = $true
+    $SearchCondition.Name = "Name"
+
+	if ($IsReportService2005) {
+		$SearchCondition.Value = $ItemName
+		# search
+	    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $SearchCondition)
+	}
+	elseif ($IsReportService2010) {
+		$SearchCondition.Values = @($ItemName)
+		# search
+	    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace "$ReportServerProxyNamespace.BooleanOperatorEnum" -EnumName "And"), $null, $SearchCondition)
+	}
+	else { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    
+
+    # Check how many items were returned
+    if ($items.Length -eq 1)
+    {
+        return $items[0].Path
+    }
+    else
+    {
+        # Loop through returned items
+        foreach ($item in $items)
+        {
+            # compare folders
+            if ($CompareFolderPath -eq ($item.Path.SubString(0, $item.Path.LastIndexOf("/"))))
+            {
+                # Display message we're guessing
+                Write-Host "Multiple items were found with name $ItemName, assuming location is same folder as reference, $CompareFolderPath."
+                return $item.Path
+            }
+        }
+
+        # Display warning
+        Write-Warning "Multiple items were returned for $ItemName, unable to determine which one to return."
+        return [string]::Empty
+    }    
+}
+
+#region Set-ItemDataSources()
+Function Set-ItemDataSources
+{
+    # parameters
+    Param($ItemFile, $ItemFolder)
+
+    # declare local variables
+    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf("\") + 1)
+    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf("."))
+    $AllDataSourcesFound = $true
+    
+    # get the datasources
+    $DataSources = $ReportServerProxy.GetItemDataSources([string]::Format("{0}/{1}", $ItemFolder, $ItemName))
+
+    #loop through retrieved datasources
+    foreach($DataSource in $DataSources)
+    {
+        # check to see if it's a dataset
+        if([System.IO.Path]::GetExtension($ItemFile).ToLower() -eq ".rsd")
+        {
+            # datasets can have one and only one datasource
+            # The method GetItemDataSources does not return the name of the datasource for datasets like it does for reports
+            # instead, it alaways returns DataSetDataSource.  This made the call to Get-ItemDataSourceNames necessary,
+            # otherwise it would not link correctly
+            $DataSourceName = (Get-ItemDataSourceReferenceNames -ItemFile $ItemFile)[0]
+        }
+        else
+        {
+            # get the anme from teh source itself
+            $DataSourceName = (Get-ItemDataSourceNames -ItemFile $ItemFile -DataSourceName $DataSource.Name)[0]
+        }        
+
+        if ([string]::IsNullOrWhiteSpace($DataSourceName))
+        {
+            Write-Host "Datasource $($DataSource.Name) is not a shared datasource, skipping."
+            $AllDataSourcesFound = $false
+            continue
+        }
+
+        # Check to see if datasourcename contains the folder -- this can happen if the report was created by Report Builder
+        if((![string]::IsNullOrEmpty($ReportDataSource)) -and ($DataSourceName.ToLower().Contains($ReportDatasourceFolder.ToLower())))
+        {
+            # Remove teh path from the item name
+            $DataSourceName = $DataSourceName.ToLower().Replace("$($ReportDatasourceFolder.ToLower())/","")
+        }
+
+        $DatasourcePath = ""
+
+        if ($UseArchiveStructure -eq $true)
+        {
+            $DatasourcePath = Get-ItemPath -ItemName $DataSourceName -StartFolder $RootFolder -CompareFolderPath $ItemFolder
+            $DatasourcePath = $DatasourcePath.SubString(0, $DatasourcePath.LastIndexOf("/"))
+        }
+        else
+        {
+            $DatasourcePath = $ReportDatasourceFolder
+        }
+
+        # check to make sure the datasource exists in the location specified
+        if((Item-Exists -ItemFolderPath $DatasourcePath -ItemName $DataSourceName) -eq $true)
+        {
+            # create datasource reference variable
+            $DataSourceReference = New-Object "$ReportServerProxyNamespace.DataSourceReference";
+
+            # assign
+            $DataSourceReference.Reference = "$DatasourcePath/" + $DataSourceName
+            $DataSource.Item = $DataSourceReference            
+        }
+        else
+        {
+            # display warning
+            Write-Warning "Unable to find datasource $($DataSourceName) in $DatasourcePath"
+
+            # update to false
+            $AllDataSourcesFound = $false
+        }        
+    }
+
+    # check to see if found all datasources
+    if($AllDataSourcesFound -eq $true)
+    {
+        Write-Host "Linking datasources to $ItemFolder/$ItemName"
+        
+        # save the references
+        $ReportServerProxy.SetItemDataSources("$ItemFolder/$ItemName", $DataSources)
+    }
+}
+#endregion
+
+#region Set-ReportDataSets()
+Function Set-ReportDataSets
+{
+    # parameters
+    param($ReportFile, $ReportFolderPath)
+
+    # declare local variables
+    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf("\") + 1)
+    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf("."))
+    $AllDataSetsFound = $true
+    $DataSetFolder = ""
+
+    # get the datasources
+    $DataSets = $ReportServerProxy.GetItemReferences([string]::Format("{0}/{1}", $ReportFolderPath, $ReportName), "DataSet")
+
+    # loop through returned values
+    foreach($DataSet in $DataSets)
+    {
+        # get the name of the shared data set reference
+        $SharedDataSetReferenceName = Get-DataSetSharedReferenceName -ReportFile $ReportFile -DataSetName $DataSet.Name
+
+        # Check to see if the SharedDataSetReferenceName contains the folder path -- this can happen if the report was built using Report Builder
+        if((![string]::IsNullOrEmpty($ReportDataSetFolder)) -and ($SharedDataSetReferenceName.ToLower().Contains($ReportDataSetFolder.ToLower())))
+        {
+            # Remove the folder path from the name, it will cause issues when trying to set
+            $SharedDataSetReferenceName = $SharedDataSetReferenceName.ToLower().Replace("$($ReportDataSetFolder.ToLower())/", "")
+        }
+        
+        # Check to see if we're using the archive folder structure
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Set dataset folder
+            $DataSetFolder = Get-ItemPath -ItemName $SharedDataSetReferenceName -StartFolder $RootFolder -CompareFolderPath $ReportFolderPath
+            $DataSetFolder = $DataSetFolder.SubString(0, $DataSetFolder.LastIndexOf("/"))
+        }
+        else
+        {
+            $DataSetFolder = $ReportDataSetFolder
+        }
+
+        # check to make sure the datasource exists in the location specified
+        if((Item-Exists -ItemFolderPath $DataSetFolder -ItemName $SharedDataSetReferenceName) -eq $true)
+        {
+            # create datasource reference variable
+            $DataSetReference = New-Object "$ReportServerProxyNamespace.ItemReference";
+
+            # assign
+            $DataSetReference.Reference = "$DataSetFolder/" + $SharedDataSetReferenceName
+            $DataSetReference.Name = $DataSet.Name
+
+            # log
+            Write-Host "Linking Shared Data Set $($DataSet.Name) to $ReportName"
+            
+            # update reference
+            $ReportServerProxy.SetItemReferences("$ReportFolderPath/$ReportName", @($DataSetReference))
+        }
+        else
+        {
+            # get the datasource name to include in warning message -- I know there must be a way to use the property in a string literal, but I wasn't able to figure it out while trying
+            # to solve a reported bug so I took the easy way.
+            $DataSetName = $DataSet.Name
+            
+            # display warning
+            Write-Warning "Unable to find dataset $DataSetName in $ReportDataSetFolder"
+
+            # update to false
+            $AllDataSetsFound = $false
+        }            
+    }
+
+    # check to see if all datsets were found
+    if($AllDataSetsFound -eq $False)
+    {
+        Write-Warning "Not all datasets found"
+
+        # save the references
+        $ReportServerProxy.SetItemReferences("$ReportFolder/$ReportName", @($DataSets))
+    }
+}
+
+#endregion
+
+#region Get-ObjectNamespace()
+Function Get-ObjectNamespace($Object)
+{
+    # return the value
+    ($Object).GetType().ToString().SubString(0, ($Object).GetType().ToString().LastIndexOf("."))
+}
+#endregion
+
+#region Get-SpecificEnumValue()
+Function Get-SpecificEnumValue($EnumNamespace, $EnumName)
+{
+    # get the enum values
+    $EnumValues = [Enum]::GetValues($EnumNamespace)
+
+    # Loop through to find the specific value
+    foreach($EnumValue in $EnumValues)
+    {
+        # check current
+        if($EnumValue -eq $EnumName)
+        {
+            # return it
+            return $EnumValue
+        }
+    }
+
+    # nothing was found
+    return $null
+}
+#endregion
+
+#region Update-ReportParamters()
+Function Update-ReportParameters($ReportFile, $ReportFolderPath)
+{
+    # declare local variables
+    $ReportParameters = @();
+    
+    # necessary so that when attempting to use the report execution service, it doesn't puke on you when it can't find the data source
+    $ReportData = (Remove-SharedReferences -ReportFile $ReportFile)
+
+    # get just the report name
+    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf("\") + 1)
+    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf("."))
+    
+    # create warnings object
+    $ReportExecutionWarnings = $null
+
+    # set the report full path
+    $ReportPath = "$ReportFolderPath/$ReportName" 
+
+    # load the report definition
+    $ExecutionInfo = $ReportExecutionProxy.LoadReportDefinition($ReportData, [ref] $ReportExecutionWarnings);
+
+    # loop through the report execution parameters
+    foreach($Parameter in $ExecutionInfo.Parameters)
+    {
+        # create new item parameter object
+        $ItemParameter = New-Object "$ReportServerProxyNamespace.ItemParameter";
+
+        # fill in the properties except valid values, that one needs special processing
+        Copy-ObjectProperties -SourceObject $Parameter -TargetObject $ItemParameter;
+
+        # fill in the valid values
+        $ItemParameter.ValidValues = Convert-ValidValues -SourceValidValues $Parameter.ValidValues;
+
+        # exclude if it's query based
+        if($Parameter.DefaultValuesQueryBased -ne $true)
+        {
+            # add to list
+            $ReportParameters += $ItemParameter;
+        }
+    }
+
+    # force the parameters to update
+    Write-Host "Updating report parameters for $ReportFolderPath/$ReportName"
+	if ($IsReportService2005) {
+		$ReportServerProxy.SetReportParameters("$ReportFolderPath/$ReportName", $ReportParameters);
+	}
+	elseif ($IsReportService2010) {
+		$ReportServerProxy.SetItemParameters("$ReportFolderPath/$ReportName", $ReportParameters);
+	}
+	else { Write-Warning 'Report Service Unknown in Update-ReportParameters method. Use ReportService2005 or ReportService2010.' }
+}
+#endregion
+
+#region Remove-ShareReferences()
+Function Remove-SharedReferences($ReportFile)
+{
+    ######################################################################################################
+    #You'll notice that I've used the keyword of [void] in front of some of these method calls, this is so
+    #that the operation isn't captured as output of the function
+    ######################################################################################################
+
+    # read xml
+    [xml]$ReportXml = Get-Content $ReportFile -Encoding UTF8;
+    
+    # create new memory stream object
+    $MemoryStream = New-Object System.IO.MemoryStream
+
+    try
+    {
+
+        # declare array of nodes to remove
+        $NodesToRemove = @();
+
+        # get datasource names
+        $DataSourceNames = Get-ItemDataSources -ItemFile $ReportFile
+
+        # check to see if report has datasourcenames
+        if($DataSourceNames.Count -eq 0)
+        {
+            # Get reference to reportnode
+            $ReportNode = $ReportXml.FirstChild.NextSibling # Kind of a funky way of getting it, but the SelectSingleNode("//Report") wasn't working due to Namespaces in the node
+
+            # create new DataSources node
+            $DataSourcesNode = $ReportXml.CreateNode($ReportNode.NodeType, "DataSources", $null)
+
+            # create new datasource node
+            $DataSourceNode = $ReportXml.CreateNode($ReportNode.NodeType, "DataSource", $null)
+
+            # create new datasourcereference node
+            $DataSourceReferenceNode = $ReportXml.CreateNode($ReportNode.NodeType, "DataSourceReference", $null)
+
+            # create new attribute
+            $DataSourceNameAttribute = $ReportXml.CreateAttribute("Name")
+            $DataSourceNameAttribute.Value = "DataSource1"
+            $dataSourceReferenceNode.InnerText = "DataSource1"
+
+            # add attribute to datasource node
+            [void]$DataSourceNode.Attributes.Append($DataSourceNameAttribute)
+            [void]$DataSourceNode.AppendChild($DataSourceReferenceNode)
+
+            # add nodes
+            [void]$ReportNode.AppendChild($DataSourcesNode)
+            [void]$DataSourcesNode.AppendChild($DataSourceNode)
+
+            # add fake datasource name to array
+            $DataSourceNames += "DataSource1"
+        }
+
+        # get all datasource nodes
+        $DatasourceNodes = $ReportXml.GetElementsByTagName("DataSourceReference");
+
+        # loop through returned nodes
+        foreach($DataSourceNode in $DatasourceNodes)
+        {
+            # create a new connection properties node
+            $ConnectionProperties = $ReportXml.CreateNode($DataSourceNode.NodeType, "ConnectionProperties", $null);
+
+            # create a new dataprovider node
+            $DataProvider = $ReportXml.CreateNode($DataSourceNode.NodeType, "DataProvider", $null);
+            $DataProvider.InnerText = "SQL";
+
+            # create new connection string node
+            $ConnectString = $ReportXml.CreateNode($DataSourceNode.NodeType, "ConnectString", $null);
+            $ConnectString.InnerText = "Data Source=Server Name Here;Initial Catalog=database name here";
+
+            # add new node to parent node
+            [void] $DataSourceNode.ParentNode.AppendChild($ConnectionProperties);
+
+            # append childeren
+            [void] $ConnectionProperties.AppendChild($DataProvider);
+            [void] $ConnectionProperties.AppendChild($ConnectString);
+
+            # Add to remove list 
+            $NodesToRemove += $DataSourceNode;
+        }
+
+        # get all shareddataset nodes
+        $SharedDataSetNodes = $ReportXml.GetElementsByTagName("SharedDataSet")
+
+        #loop through the returned nodes
+        foreach($SharedDataSetNode in $SharedDataSetNodes)
+        {
+            # create holder nodes so it won't error
+            $QueryNode = $ReportXml.CreateNode($SharedDataSetNode.NodeType, "Query", $null);
+            $DataSourceNameNode = $ReportXml.CreateNode($QueryNode.NodeType, "DataSourceName", $null);
+            $CommandTextNode = $ReportXml.CreateNode($QueryNode.NodeType, "CommandText", $null);
+
+            # add valid datasource name, just get the first in the list
+            $DataSourceNameNode.InnerText = $DataSourceNames[0]
+            
+            # add node to parent
+            [void] $SharedDataSetNode.ParentNode.Appendchild($QueryNode)
+            
+            # add datasourcename and commandtext to query node
+            [void]$QueryNode.AppendChild($DataSourceNameNode)
+            [void]$QueryNode.AppendChild($CommandTextNode)
+
+            # add node to removelist
+            $NodesToRemove += $SharedDataSetNode
+        }
+
+
+        # loop through nodes to remove
+        foreach($Node in $NodesToRemove)
+        {
+            # remove from parent
+            [void] $Node.ParentNode.RemoveChild($Node);
+        }
+    
+        $ReportXml.InnerXml = $ReportXml.InnerXml.Replace("xmlns=`"`"", "")
+
+        # save altered xml to memory stream
+        $ReportXml.Save($MemoryStream);
+
+        # return the altered xml as byte array
+        return $MemoryStream.ToArray();
+    }
+    finally
+    {
+        # close and dispose
+        $MemoryStream.Close();
+        $MemoryStream.Dispose();
+    }
+}
+#endregion
+
+
+#region Copy-ObjectProperties()
+Function Copy-ObjectProperties($SourceObject, $TargetObject)
+{
+    # Get source object property array
+    $SourcePropertyCollection = $SourceObject.GetType().GetProperties();
+
+    # get the destination
+    $TargetPropertyCollection = $TargetObject.GetType().GetProperties();
+
+    # loop through source property collection
+    for($i = 0; $i -lt $SourcePropertyCollection.Length; $i++)
+    {
+        # get the target property
+        $TargetProperty = $TargetPropertyCollection | Where {$_.Name -eq $SourcePropertyCollection[$i].Name}
+        
+        # check to see if it's null
+        if($TargetProperty -ne $null)
+        {
+            # check to see if it's the valid values property
+            if($TargetProperty.Name -ne "ValidValues")
+            {
+                 # set the value
+                $TargetProperty.SetValue($TargetObject, $SourcePropertyCollection[$i].GetValue($SourceObject));
+            }
+        }
+    }
+}
+#endregion
+
+#region ConvertValidValues()
+Function Convert-ValidValues($SourceValidValues)
+{
+    # declare local values
+    $TargetValidValues = @();
+    
+    # loop through source values
+    foreach($SourceValidValue in $SourceValidValues)
+    {
+        # create target valid value object
+        $TargetValidValue = New-Object "$ReportServerProxyNamespace.ValidValue";
+
+        # copy properties
+        Copy-ObjectProperties -SourceObject $SourceValidValue -TargetObject $TargetValidValue
+
+        # add to list
+        $TargetValidValues += $TargetValidValue
+    }
+
+    # return the values
+    return ,$TargetValidValues
+}
+#endregion
+
+#region Backup-ExistingItem()
+Function Backup-ExistingItem
+{
+    # parameters
+    Param($ItemFile, $ItemFolder)
+
+    # declare local variables
+    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf("\") + 1)
+    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf("."))
+
+    # check to see if the item exists
+    if((Item-Exists -ItemFolderPath $ItemFolder -ItemName $ItemName) -eq $true)
+    {
+        # get file extension
+        $FileExtension = [System.IO.Path]::GetExtension($ItemFile)
+    
+        # check backuplocation
+        if($BackupLocation.EndsWith("\") -ne $true)
+        {
+            # append ending slash
+            $BackupLocation = $BackupLocation + "\"
+        }
+		
+		# add the release number to the backup location
+		$BackupLocation = $BackupLocation + $ReleaseNumber + "\"
+
+        # ensure the backup location actually exists
+        if((Test-Path $BackupLocation) -ne $true)
+        {
+            # create it
+            New-Item -ItemType Directory -Path $BackupLocation
+        }
+
+        # download the item
+        $Item = $ReportServerProxy.GetItemDefinition("$ItemFolder/$ItemName")
+
+        # form the backup path
+        $BackupPath = "{0}{1}{2}" -f $BackupLocation, $ItemName, $FileExtension;
+
+        # write to disk
+        [System.IO.File]::WriteAllBytes("$BackupPath", $Item);
+
+        # write to screen
+        Write-Host "Backed up $ItemFolder/$ItemName to $BackupPath";
+    }
+}
+#endregion
+
+#region Normalize-SSRSFolder()
+function Normalize-SSRSFolder ([string]$Folder) {
+    if (-not $Folder.StartsWith('/')) {
+        $Folder = '/' + $Folder
+    }
+    
+    return $Folder
+}
+#endregion
+
+#region New-SSRSFolder()
+function New-SSRSFolder ([string] $Name) {
+    Write-Verbose "New-SSRSFolder -Name $Name"
+ 
+    $Name = Normalize-SSRSFolder -Folder $Name
+ 
+    if ($ReportServerProxy.GetItemType($Name) -ne 'Folder') {
+        $Parts = $Name -split '/'
+        $Leaf = $Parts[-1]
+        $Parent = $Parts[0..($Parts.Length-2)] -join '/'
+ 
+        if ($Parent) {
+            New-SSRSFolder -Name $Parent
+        } else {
+            $Parent = '/'
+        }
+        
+        $ReportServerProxy.CreateFolder($Leaf, $Parent, $null)
+    }
+}
+#endregion
+
+#region Clear-SSRSFolder()
+function Clear-SSRSFolder ([string] $Name) {
+    Write-Verbose "Clear-SSRSFolder -Name $Name"
+    
+    $Name = Normalize-SSRSFolder -Folder $Name
+    
+    if ($ReportServerProxy.GetItemType($Name) -eq 'Folder' -and $ClearReportFolder) {
+        Write-Host ("Clearing the {0} folder" -f $Name)
+        $ReportServerProxy.ListChildren($Name, $false) | ForEach-Object {
+            Write-Verbose "Deleting item: $($_.Path)"
+            $ReportServerProxy.DeleteItem($_.Path)
+        }
+    }
+}
+#endregion
+
+#region New-SSRSDataSource()
+function New-SSRSDataSource ([string]$RdsPath, [string]$Folder, [bool]$OverwriteDataSources) {
+    Write-Verbose "New-SSRSDataSource -RdsPath $RdsPath -Folder $Folder"
+
+    $Folder = Normalize-SSRSFolder -Folder $Folder
+    
+    [xml]$Rds = Get-Content -Path $RdsPath
+    $dsName = $Rds.RptDataSource.Name
+    $ConnProps = $Rds.RptDataSource.ConnectionProperties
+    
+	$type = $ReportServerProxy.GetType().Namespace #Get proxy type
+	$DSDdatatype = ($type + '.DataSourceDefinition')
+	 
+	$Definition = new-object ($DSDdatatype)
+	if($Definition -eq $null){
+	 Write-Error Failed to create data source definition object
+	}
+	
+	$dsConnectionString = $($OctopusParameters["$($dsName).ConnectionString"])
+    $dsUsername = $($OctopusParameters["$($dsName).Username"])
+    $dsPassword = $($OctopusParameters["$($dsName).Password"])
+    $dsCredentialRetrieval = $($OctopusParameters["$($dsName).CredentialRetrieval"])
+    
+	# replace the connection string variable that is configured in the octopus project
+	if ($dsConnectionString) {
+	    $Definition.ConnectString = $dsConnectionString
+	} else {
+	    $Definition.ConnectString = $ConnProps.ConnectString
+	}
+	
+    $Definition.Extension = $ConnProps.Extension 
+
+	# Check to see if the credential retrieval is overridden
+    if ($null -ne $dsCredentialRetrieval)
+    {
+    	Write-Host "Forcing CredentialRetrieval property to: $dsCredentialRetrieval."
+        $Definition.CredentialRetrieval = $dsCredentialRetrieval
+    }
+    else
+    {
+    	# Set the Credential Retrieval method
+    	if ([Convert]::ToBoolean($ConnProps.IntegratedSecurity)) {
+			$Definition.CredentialRetrieval = 'Integrated'
+		}
+        elseif (![string]::IsNullOrWhitespace($dsUsername) -and ![string]::IsNullOrWhitespace($dsPassword))
+        {
+        	$Definition.CredentialRetrieval = 'Store'
+        }
+    }
+       
+	if ($Definition.CredentialRetrieval -eq 'Store')
+    {		
+		Write-Host "$($dsName).Username = '$dsUsername'"
+		Write-Host "$($dsName).Password = '$dsPassword'"
+		
+		$Definition.UserName = $dsUsername;
+        $Definition.Password = $dsPassword;
+	}
+    
+    # Check to see if this is supposed to be an Windows Authentication stored account
+    if ($OctopusParameters["$($dsName).WindowsCredentials"] -eq "true")
+    {
+	    # Set the definition to Windows Credentials
+    	$Definition.WindowsCredentials = $true
+    }
+    
+
+    $DataSource = New-Object -TypeName PSObject -Property @{
+        Name = $Rds.RptDataSource.Name
+        Path =  $Folder + '/' + $Rds.RptDataSource.Name
+    }
+    
+    if ($OverwriteDataSources -or $ReportServerProxy.GetItemType($DataSource.Path) -eq 'Unknown') {
+        Write-Host "Overwriting datasource $($DataSource.Name)"
+        $ReportServerProxy.CreateDataSource($DataSource.Name, $Folder, $OverwriteDataSources, $Definition, $null)
+    }
+    
+    return $DataSource 
+}
+#endregion
+
+#region Main
+
+try
+{
+    # declare array for reports
+    $ReportFiles = @()
+	$ReportDataSourceFiles = @()
+    $ReportDataSetFiles = @()
+    $ReportPartFiles = @()
+	
+	$IsReportService2005 = $false
+	$IsReportService2010 = $false
+	
+	if ($ReportServiceUrl.ToLower().Contains('reportservice2005.asmx')) {
+		$IsReportService2005 = $true
+		Write-Host "2005 Report Service found."
+	}
+	elseif ($ReportServiceUrl.ToLower().Contains('reportservice2010.asmx')) {
+		$IsReportService2010 = $true
+		Write-Host "2010 Report Service found."
+	}
+	
+	Write-Host "Deploy Path: $DeployedPath"
+	
+    # get all report files for deployment
+    Write-Host "Getting all .rdl files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rdl" | ForEach-Object { If(($ReportFiles -contains $_.FullName) -eq $false) {$ReportFiles += $_.FullName}}
+    Write-Host "# of rdl files found: $($ReportFiles.Count)"
+
+    # get all report datasource files for deployment
+    Write-Host "Getting all .rds files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rds" | ForEach-Object { If(($ReportDataSourceFiles -contains $_.FullName) -eq $false) {$ReportDataSourceFiles += $_.FullName}}
+    Write-Host "# of rds files found: $($ReportDataSourceFiles.Count)"
+
+    # get all report datset files for deployment
+    Write-Host "Getting all .rsd files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rsd" | ForEach-Object { If(($ReportDataSetFiles -contains $_.FullName) -eq $false) {$ReportDataSetFiles += $_.FullName}}
+    Write-Host "# of rsd files found: $($ReportDataSetFiles.Count)"
+
+    # get all report part files for deployment
+    Write-Host "Getting all .rsc files"
+    Get-ChildItem $DeployedPath -Recurse -Filter "*.rsc" | ForEach-Object { If(($ReportPartFiles -contains $_.FullName) -eq $false) {$ReportPartFiles += $_.FullName}}
+    Write-Host "# of rsc files found: $($ReportPartFiles.Count)"
+
+    # set the report proxies
+    Write-Host "Creating SSRS Web Service proxies"
+
+    # check to see if credentials were supplied for the services
+    if(([string]::IsNullOrEmpty($ServiceUserDomain) -ne $true) -and ([string]::IsNullOrEmpty($ServiceUserName) -ne $true) -and ([string]::IsNullOrEmpty($ServicePassword) -ne $true))
+    {
+        # secure the password
+        $secpasswd = ConvertTo-SecureString "$ServicePassword" -AsPlainText -Force
+
+        # create credential object
+        $ServiceCredential = New-Object System.Management.Automation.PSCredential ("$ServiceUserDomain\$ServiceUserName", $secpasswd)
+
+        # create proxies
+        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -Credential $ServiceCredential
+        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -Credential $ServiceCredential
+    }
+    else
+    {
+        # create proxies using current identity
+        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -UseDefaultCredential 
+        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -UseDefaultCredential 
+    }
+
+
+
+	#Create folder information for DataSource and Report
+    if ($UseArchiveStructure -eq $false)
+    {
+	    New-SSRSFolder -Name $ReportFolder
+	    New-SSRSFolder -Name $ReportDatasourceFolder
+        New-SSRSFolder -Name $ReportDataSetFolder
+        New-SSRSFolder -Name $ReportPartsFolder
+    }
+    else
+    {
+        New-SSRSFolder -Name $RootFolder
+    }
+    
+    #Clear destination folder if specified
+    if([System.Convert]::ToBoolean("$ClearReportFolder")) {
+        Clear-SSRSFolder -Name $ReportFolder
+    }
+	 
+	#Create DataSource
+    foreach($RDSFile in $ReportDataSourceFiles) {
+        Write-Host "New-SSRSDataSource $RdsFile"
+
+        $DatasourceFolder = ""
+
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Adjust report folder to archive path
+            $DatasourceFolder = $(if ($RootFolder -eq "/") { [string]::Empty} else { $RootFolder } ) + $RDSFile.Replace($DeployedPath, '').Replace('\', '/').Replace((Split-Path $RDSFile -Leaf), '')
+
+            # Remove final slash
+            $DatasourceFolder = $DatasourceFolder.Substring(0, $DatasourceFolder.LastIndexOf('/'))    
+            
+            # Check if folder exists
+            New-SSRSFolder -Name $DatasourceFolder                    
+        }
+        else
+        {
+            $DatasourceFolder = $ReportDatasourceFolder
+        }
+        
+		$DataSource = New-SSRSDataSource -RdsPath $RdsFile -Folder $DatasourceFolder -Overwrite ([System.Convert]::ToBoolean("$OverwriteDataSources"))
+	}
+
+    # get the service proxy namespaces - this is necessary because of a bug documented here http://stackoverflow.com/questions/7921040/error-calling-reportingservice2005-finditems-specifically-concerning-the-bool and http://www.vistax64.com/powershell/273120-bug-when-using-namespace-parameter-new-webserviceproxy.html
+    $ReportServerProxyNamespace = Get-ObjectNamespace -Object $ReportServerProxy
+    $ReportExecutionProxyNamespace = Get-ObjectNamespace -Object $ReportExecutionProxy
+
+    # Create dat sets
+    foreach($DataSet in $ReportDataSetFiles)
+    {
+        $DataSetPath = ""
+
+        # Check to see if it's set to follow archive structure
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Adjust report folder to archive path
+            $DataSetPath = $(if ($RootFolder -eq "/") { [string]::Empty} else { $RootFolder } ) + $DataSet.Replace($DeployedPath, '').Replace('\', '/').Replace((Split-Path $DataSet -Leaf), '')
+
+            # Remove final slash
+            $DataSetPath = $DataSetPath.Substring(0, $DataSetPath.LastIndexOf('/'))
+
+            # Check if folder exists
+            New-SSRSFolder -Name $DataSetPath
+        }
+        else
+        {
+            $DataSetPath = $ReportDataSetFolder
+        }
+
+        # check to see if we need to back up
+        if($BackupLocation -ne $null -and $BackupLocation -ne "")
+        {
+            # backup the item
+            Backup-ExistingItem -ItemFile $DataSet -ItemFolder $DataSetPath
+        }
+
+        # upload the dataset
+        Upload-Item -Item $DataSet -ItemType "DataSet" -ItemFolder $DataSetPath
+
+        # update the dataset datasource
+        Set-ItemDataSources -ItemFile $DataSet -ItemFolder $DataSetPath
+    }
+
+    # get the proxy auto generated name spaces
+
+    # loop through array
+    foreach($ReportFile in $ReportFiles)
+    {
+        $ReportPath = ""
+
+        # Check to see if it's set to follow archive structure
+        if ($UseArchiveStructure -eq $true)
+        {
+            # Adjust report folder to archive path
+            $ReportPath = $(if ($RootFolder -eq "/") { [string]::Empty} else { $RootFolder } ) + $ReportFile.Replace($DeployedPath, '').Replace('\', '/').Replace((Split-Path $ReportFile -Leaf), '')
+
+            # Remove final slash
+            $ReportPath = $ReportPath.Substring(0, $ReportPath.LastIndexOf('/'))
+
+            # Check if folder exists
+            New-SSRSFolder -Name $ReportPath
+        }
+        else
+        {
+            $ReportPath = $ReportFolder
+        }
+
+        # check to see if we need to back up
+        if($BackupLocation -ne $null -and $BackupLocation -ne "")
+        {
+            # backup the item
+            Backup-ExistingItem -ItemFile $ReportFile -ItemFolder $ReportPath
+        }
+        
+        
+        # upload report
+        Upload-Item -Item $ReportFile -ItemType "Report" -ItemFolder $ReportPath
+
+        # extract datasources
+        #Write-Host "Extracting datasource names for $ReportFile"
+        #$ReportDataSourceNames = Get-ReportDataSourceNames $ReportFile
+
+        # set the datasources
+        Set-ItemDataSources -ItemFile $ReportFile -ItemFolder $ReportPath
+
+        # set the datasets
+        Set-ReportDataSets -ReportFile $ReportFile -ReportFolderPath $ReportPath
+
+        # update the report parameters
+        Update-ReportParameters -ReportFile $ReportFile -ReportFolderPath $ReportPath
+    }
+    
+    # loop through rsc files
+    foreach($ReportPartFile in $ReportPartFiles)
+    {
+        # check to see if we need to back up
+        if($BackupLocation -ne $null -and $BackupLocation -ne "")
+        {
+            # backup the item
+            Backup-ExistingItem -ItemFile $ReportPartFile -ItemFolder $ReportPartsFolder
+        }
+
+		# upload item
+        Upload-Item -Item $ReportPartFile -ItemType "Component" -ItemFolder $ReportPartsFolder
+    }
+    
+}
+finally
+{
+    # check to see if the proxies are null
+    if($ReportServerProxy -ne $null)
+    {
+        # dispose
+        $ReportServerProxy.Dispose();
+    }
+
+    if($ReportExecutionProxy -ne $null)
+    {
+        # dispose
+        $ReportExecutionProxy.Dispose();
+    }
+}
+
+#endregion
diff --git a/src/step-templates/ssrs-report-backup/metadata.json b/src/step-templates/ssrs-report-backup/metadata.json
new file mode 100644
index 000000000..3b628c3ab
--- /dev/null
+++ b/src/step-templates/ssrs-report-backup/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "69c9eb25-9005-47c3-abb6-032e2ef909e3",
+  "Name": "SSRS Report Backup",
+  "Description": "Automatically performs a back up of all SSRS reports on an SSRS Server.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "reportServer",
+      "Label": "SSRS URL",
+      "HelpText": "The URL of the Report Server including any ports.",
+      "DefaultValue": "localhost",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "version",
+      "Label": "SSRS Version",
+      "HelpText": "The version of your SSRS instance e.g. 2005, 2008, 2012",
+      "DefaultValue": "2008",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "folder",
+      "Label": "Export Folder",
+      "HelpText": "The folder on the Deployment machine where the reports should be Saved.",
+      "DefaultValue": "c:\\temp\\",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-02-24T03:44:03.5160000-08:00",
+  "LastModifiedBy": "bleep-io",
+  "$Meta": {
+    "ExportedAt": "2016-02-24T04:10:04.8070000-08:00",
+    "OctopusVersion": "2.6.2.845",
+    "Type": "ActionTemplate"
+  },
+  "Category": "sql"
+}
diff --git a/src/step-templates/ssrs-report-backup/scriptbody.ps1 b/src/step-templates/ssrs-report-backup/scriptbody.ps1
new file mode 100644
index 000000000..43600583d
--- /dev/null
+++ b/src/step-templates/ssrs-report-backup/scriptbody.ps1
@@ -0,0 +1,69 @@
+
+[void][System.Reflection.Assembly]::LoadWithPartialName("System.Xml.XmlDocument");
+[void][System.Reflection.Assembly]::LoadWithPartialName("System.IO");
+ 
+$reportServerName = $reportServer;
+$ReportServiceWebServiceURL = "http://$reportServerName/ReportServer/"
+$ssrsVersion = $version;
+$exportFolder = $folder;
+
+
+if ($ssrsVersion -gt 2005) 
+	{
+		# SSRS 2008/2012
+		$reportServerUri = "$ReportServiceWebServiceURL/ReportService2010.asmx" -f $reportServerName
+	} else {
+		# SSRS 2005
+		$reportServerUri = "$ReportServiceWebServiceURL/ReportService2005.asmx" -f $reportServerName
+	}
+
+
+$Proxy = New-WebServiceProxy -Uri $reportServerUri -Namespace SSRS.ReportingService2005 -UseDefaultCredential ;
+
+
+if ($ssrsVersion -gt 2005) {		 
+		$items = $Proxy.ListChildren("/", $true) | `
+				 Select-Object TypeName, Path, ID, Name | `
+				 Where-Object {$_.typeName -eq "Report"};
+	} else {
+		$items = $Proxy.ListChildren("/", $true) | `
+             Select-Object Type, Path, ID, Name | `
+             Where-Object {$_.type -eq "Report"};
+	}
+
+
+$folderName = $exportFolder + "\" + (Get-Date -format "yyyy-MM-dd-hhmmtt");
+
+ 
+foreach($item in $items)
+{
+
+    $subfolderName = split-path $item.Path;
+    $reportName = split-path $item.Path -Leaf;
+    $fullSubfolderName = $folderName + $fullFolderName + $subfolderName;
+    if(-not(Test-Path $fullSubfolderName))
+    {
+
+        [System.IO.Directory]::CreateDirectory($fullSubfolderName) | out-null
+    }
+ 
+    $rdlFile = New-Object System.Xml.XmlDocument;
+    [byte[]] $reportDefinition = $null;
+    
+    if ($ssrsVersion -gt 2005) {
+			$reportDefinition = $Proxy.GetItemDefinition($item.Path);
+		} else {
+			$reportDefinition = $Proxy.GetReportDefinition($item.Path);
+		}
+    
+    [System.IO.MemoryStream] $memStream = New-Object System.IO.MemoryStream(@(,$reportDefinition));
+    $rdlFile.Load($memStream);
+ 
+    $fullReportFileName = $fullSubfolderName + "\" + $item.Name +  ".rdl";
+    
+    Write-Output $fullReportFileName;
+    
+    $rdlFile.Save($fullReportFileName);
+    
+ 
+}
\ No newline at end of file
diff --git a/step-templates/stackify-api-template.json b/src/step-templates/stackify-api-template/metadata.json
similarity index 79%
rename from step-templates/stackify-api-template.json
rename to src/step-templates/stackify-api-template/metadata.json
index e91eff717..bde0bee97 100644
--- a/step-templates/stackify-api-template.json
+++ b/src/step-templates/stackify-api-template/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "if (!$hostApi) { $hostApi= 'https://api.stackify.net' }\n\nif ($OctopusParameters[\"Octopus.Deployment.Error\"] -eq $null)\n{\n$post = $hostApi.TrimEnd('/') + '/api/v1/deployments/' + $action\n}\nelse\n{\n$post = $hostApi.TrimEnd('/') + '/api/v1/deployments/cancel'\n}\n# build the authorization header\n\n$headers = @{'authorization'='ApiKey ' + $apiKey}\n\n# build the body of the post\n\nif (!$name) { $name = $version }\n\n$bodyObj = @{ Version=$version; AppName=$app; EnvironmentName=$env; }\n\nif ($action -eq \"start\" -or $action -eq \"complete\"){\n\n        $bodyObj.Name = $name\n\n        if ($uri) { $bodyObj.Uri = $uri }\n\n        if ($branch) { $bodyObj.Branch = $branch }\n\n        if ($commit) { $bodyObj.Commit = $commit }\n\n}\n\n$body = ConvertTo-Json $bodyObj\n\n# send the request\nInvoke-WebRequest -Uri $post -Method POST -ContentType \"application/json\" -Headers $headers -Body $body -UseBasicParsing",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Package.DownloadOnTentacle": "False"
   },
   "Parameters": [
@@ -115,7 +115,7 @@
   ],
   "LastModifiedBy": "mattjbrooksii",
   "$Meta": {
-    "ExportedAt": "2018-01-29T22:12:56.674Z",
+    "ExportedAt": "2018-01-29T22:12:56.6740000Z",
     "OctopusVersion": "4.1.8",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/stackify-api-template/scriptbody.ps1 b/src/step-templates/stackify-api-template/scriptbody.ps1
new file mode 100644
index 000000000..9630352a0
--- /dev/null
+++ b/src/step-templates/stackify-api-template/scriptbody.ps1
@@ -0,0 +1,36 @@
+if (!$hostApi) { $hostApi= 'https://api.stackify.net' }
+
+if ($OctopusParameters["Octopus.Deployment.Error"] -eq $null)
+{
+$post = $hostApi.TrimEnd('/') + '/api/v1/deployments/' + $action
+}
+else
+{
+$post = $hostApi.TrimEnd('/') + '/api/v1/deployments/cancel'
+}
+# build the authorization header
+
+$headers = @{'authorization'='ApiKey ' + $apiKey}
+
+# build the body of the post
+
+if (!$name) { $name = $version }
+
+$bodyObj = @{ Version=$version; AppName=$app; EnvironmentName=$env; }
+
+if ($action -eq "start" -or $action -eq "complete"){
+
+        $bodyObj.Name = $name
+
+        if ($uri) { $bodyObj.Uri = $uri }
+
+        if ($branch) { $bodyObj.Branch = $branch }
+
+        if ($commit) { $bodyObj.Commit = $commit }
+
+}
+
+$body = ConvertTo-Json $bodyObj
+
+# send the request
+Invoke-WebRequest -Uri $post -Method POST -ContentType "application/json" -Headers $headers -Body $body -UseBasicParsing
\ No newline at end of file
diff --git a/step-templates/statuscake-maintenance-window.json b/src/step-templates/statuscake-maintenance-window/metadata.json
similarity index 94%
rename from step-templates/statuscake-maintenance-window.json
rename to src/step-templates/statuscake-maintenance-window/metadata.json
index d86411523..b39348394 100644
--- a/step-templates/statuscake-maintenance-window.json
+++ b/src/step-templates/statuscake-maintenance-window/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$apiKey = $OctopusParameters[\"StatusCake.ApiKey\"]\n$username = $OctopusParameters[\"StatusCake.Username\"]\n$name = $OctopusParameters[\"StatusCake.Name\"]\n$tid = $OctopusParameters[\"StatusCake.TestIds\"]\n$timezone = $OctopusParameters[\"StatusCake.Timezone\"]\n$length = $OctopusParameters[\"StatusCake.Length\"]\n\n$now = (Get-Date).ToUniversalTime()\n$start = [int64](Get-Date($now) -UFormat %s)\n$end = [int64](Get-Date($now.AddMinutes($length)) -UFormat %s)\n\n$headers = @{\n    \"API\" = $apiKey;\n    \"Username\" = $username\n}\n\n$body = @{\n    \"name\" = $name;\n    \"start_unix\" = $start;\n    \"end_unix\" = $end;\n    \"raw_tests\" = $tid;\n    \"timezone\" = $timezone;\n}\n\nInvoke-WebRequest -Uri https://app.statuscake.com/API/Maintenance/Update -Method POST -Headers $headers -Body $body -UseBasicParsing",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.PowerShell.Edition": "Desktop",
     "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows"
   },
@@ -77,10 +77,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-03-15T06:00:28.045Z",
+    "ExportedAt": "2021-03-15T06:00:28.0450000Z",
     "OctopusVersion": "2020.6.4688",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "svenkle",
   "Category": "statuscake"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/statuscake-maintenance-window/scriptbody.ps1 b/src/step-templates/statuscake-maintenance-window/scriptbody.ps1
new file mode 100644
index 000000000..a65275810
--- /dev/null
+++ b/src/step-templates/statuscake-maintenance-window/scriptbody.ps1
@@ -0,0 +1,25 @@
+$apiKey = $OctopusParameters["StatusCake.ApiKey"]
+$username = $OctopusParameters["StatusCake.Username"]
+$name = $OctopusParameters["StatusCake.Name"]
+$tid = $OctopusParameters["StatusCake.TestIds"]
+$timezone = $OctopusParameters["StatusCake.Timezone"]
+$length = $OctopusParameters["StatusCake.Length"]
+
+$now = (Get-Date).ToUniversalTime()
+$start = [int64](Get-Date($now) -UFormat %s)
+$end = [int64](Get-Date($now.AddMinutes($length)) -UFormat %s)
+
+$headers = @{
+    "API" = $apiKey;
+    "Username" = $username
+}
+
+$body = @{
+    "name" = $name;
+    "start_unix" = $start;
+    "end_unix" = $end;
+    "raw_tests" = $tid;
+    "timezone" = $timezone;
+}
+
+Invoke-WebRequest -Uri https://app.statuscake.com/API/Maintenance/Update -Method POST -Headers $headers -Body $body -UseBasicParsing
\ No newline at end of file
diff --git a/step-templates/statuspageio-create-scheduled-maintenance-incident.json b/src/step-templates/statuspageio-create-scheduled-maintenance-incident/metadata.json
similarity index 51%
rename from step-templates/statuspageio-create-scheduled-maintenance-incident.json
rename to src/step-templates/statuspageio-create-scheduled-maintenance-incident/metadata.json
index 84d585d0c..52c5cceca 100644
--- a/step-templates/statuspageio-create-scheduled-maintenance-incident.json
+++ b/src/step-templates/statuspageio-create-scheduled-maintenance-incident/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Input\r\n## --------------------------------------------------------------------------------------\r\n$pageId = $OctopusParameters['PageId']\r\n$apiKey = $OctopusParameters['ApiKey']\r\n$incidentName = $OctopusParameters['IncidentName']\r\n$incidentStatus = $OctopusParameters['IncidentStatus']\r\n$incidentMessage = $OctopusParameters['IncidentMessage']\r\n$componentId = $OctopusParameters['ComponentId']\r\n\r\nfunction Validate-Parameter($parameterValue, $parameterName) {\r\n    if(!$parameterName -contains \"Key\") {\r\n        Write-Host \"${parameterName}: ${parameterValue}\"\r\n    }\r\n\r\n    if (! $parameterValue) {\r\n        throw \"$parameterName cannot be empty, please specify a value\"\r\n    }\r\n}\r\n\r\nfunction New-ScheduledIncident\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$PageId,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$ApiKey,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$Name,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [ValidateSet(\"scheduled\", \"in_progress\", \"verifying\", \"completed\")]\r\n        [string]$Status,\r\n        \r\n        [Parameter(Mandatory=$false)]\r\n        [string]$Message,\r\n\r\n        [Parameter(Mandatory=$false)]\r\n        [string]$Componentid\r\n    )\r\n\r\n    $date = [System.DateTime]::Now.ToString(\"o\")\r\n    $dateTomorrow = [System.DateTime]::Now.AddDays(1).ToString(\"o\")\r\n    $url = \"https://api.statuspage.io/v1/pages/$PageId/incidents.json\"\r\n    $headers = @{\"Authorization\"=\"OAuth $ApiKey\"}\r\n    $body = \"incident[name]=$Name&incident[status]=$Status&incident[scheduled_for]=$date&incident[scheduled_until]=$dateTomorrow\"\r\n\r\n    if($Message)\r\n    {\r\n        $body += \"&incident[message]=$Message\"\r\n    }\r\n\r\n    if($Componentid)\r\n    {\r\n        $body += \"&incident[component_ids][]=$Componentid\"\r\n    }\r\n\r\n    $response = iwr -UseBasicParsing -Uri $url -Headers $headers -Method POST -Body $body\r\n    $content = ConvertFrom-Json $response\r\n    $content.id\r\n}\r\n\r\nValidate-Parameter $pageId -parameterName 'PageId'\r\nValidate-Parameter $apiKey = -parameterName 'ApiKey'\r\nValidate-Parameter $incidentName = -parameterName 'IncidentName'\r\nValidate-Parameter $incidentStatus -parameterName 'IncidentStatus'\r\n\r\nWrite-Output \"Creating new scheduled maintenance incident `\"$incidentName`\" ...\"\r\nNew-ScheduledIncident -PageId $pageId -ApiKey $apiKey -Name $incidentName -Status $incidentStatus -Message $incidentMessage -ComponentId $componentId\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -78,7 +78,7 @@
   ],
   "LastModifiedBy": "Sam-Kudo",
   "$Meta": {
-    "ExportedAt": "2025-02-17T14:35:00.000+00:00",
+    "ExportedAt": "2025-02-17T06:35:00.0000000-08:00",
     "OctopusVersion": "2025.1.8967",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/statuspageio-create-scheduled-maintenance-incident/scriptbody.ps1 b/src/step-templates/statuspageio-create-scheduled-maintenance-incident/scriptbody.ps1
new file mode 100644
index 000000000..048456ff0
--- /dev/null
+++ b/src/step-templates/statuspageio-create-scheduled-maintenance-incident/scriptbody.ps1
@@ -0,0 +1,72 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+$pageId = $OctopusParameters['PageId']
+$apiKey = $OctopusParameters['ApiKey']
+$incidentName = $OctopusParameters['IncidentName']
+$incidentStatus = $OctopusParameters['IncidentStatus']
+$incidentMessage = $OctopusParameters['IncidentMessage']
+$componentId = $OctopusParameters['ComponentId']
+
+function Validate-Parameter($parameterValue, $parameterName) {
+    if(!$parameterName -contains "Key") {
+        Write-Host "${parameterName}: ${parameterValue}"
+    }
+
+    if (! $parameterValue) {
+        throw "$parameterName cannot be empty, please specify a value"
+    }
+}
+
+function New-ScheduledIncident
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory=$true)]
+        [string]$PageId,
+
+        [Parameter(Mandatory=$true)]
+        [string]$ApiKey,
+
+        [Parameter(Mandatory=$true)]
+        [string]$Name,
+
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("scheduled", "in_progress", "verifying", "completed")]
+        [string]$Status,
+        
+        [Parameter(Mandatory=$false)]
+        [string]$Message,
+
+        [Parameter(Mandatory=$false)]
+        [string]$Componentid
+    )
+
+    $date = [System.DateTime]::Now.ToString("o")
+    $dateTomorrow = [System.DateTime]::Now.AddDays(1).ToString("o")
+    $url = "https://api.statuspage.io/v1/pages/$PageId/incidents.json"
+    $headers = @{"Authorization"="OAuth $ApiKey"}
+    $body = "incident[name]=$Name&incident[status]=$Status&incident[scheduled_for]=$date&incident[scheduled_until]=$dateTomorrow"
+
+    if($Message)
+    {
+        $body += "&incident[message]=$Message"
+    }
+
+    if($Componentid)
+    {
+        $body += "&incident[component_ids][]=$Componentid"
+    }
+
+    $response = iwr -UseBasicParsing -Uri $url -Headers $headers -Method POST -Body $body
+    $content = ConvertFrom-Json $response
+    $content.id
+}
+
+Validate-Parameter $pageId -parameterName 'PageId'
+Validate-Parameter $apiKey = -parameterName 'ApiKey'
+Validate-Parameter $incidentName = -parameterName 'IncidentName'
+Validate-Parameter $incidentStatus -parameterName 'IncidentStatus'
+
+Write-Output "Creating new scheduled maintenance incident `"$incidentName`" ..."
+New-ScheduledIncident -PageId $pageId -ApiKey $apiKey -Name $incidentName -Status $incidentStatus -Message $incidentMessage -ComponentId $componentId
diff --git a/src/step-templates/statuspageio-update-scheduled-maintenance-incident/metadata.json b/src/step-templates/statuspageio-update-scheduled-maintenance-incident/metadata.json
new file mode 100644
index 000000000..a46787388
--- /dev/null
+++ b/src/step-templates/statuspageio-update-scheduled-maintenance-incident/metadata.json
@@ -0,0 +1,76 @@
+{
+  "Id": "7bc83a07-8927-467e-a2eb-922609212e3a",
+  "Name": "StatusPage.io - Update Scheduled Maintenance Incident",
+  "Description": "Updates an existing scheduled maintenance incident on StatusPage.io",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "b1044b12-8cdc-4b55-b429-a08711a66339",
+      "Name": "IncidentName",
+      "Label": "Scheduled Maintenance Name",
+      "HelpText": "The name of the scheduled maintenance incident.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "6d9277b0-3cab-43ea-9946-d772c9d3aebf",
+      "Name": "IncidentStatus",
+      "Label": "Status",
+      "HelpText": "The status of the incident, one of scheduled|in_progress|verifying|completed",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "scheduled|Scheduled\nin_progress|In Progress\nverifying|Verifying\ncompleted|Completed"
+      }
+    },
+    {
+      "Id": "a2121f55-09ea-4200-ae4f-0131f7db06b1",
+      "Name": "IncidentMessage",
+      "Label": "Message",
+      "HelpText": "Optional message to add to scheduled maintenance incident.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d0504e1f-150d-46b2-8127-449a708e55c6",
+      "Name": "PageId",
+      "Label": "StatusPage.io Page Id",
+      "HelpText": "StatusPage.io Organization or \"Page ID\". Visit the [API authentication docs](http://doers.statuspage.io/api/authentication/) for details.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "48c90b4b-d9ca-419a-8c8f-98d301db2015",
+      "Name": "ApiKey",
+      "Label": "StatusPage.io API Key",
+      "HelpText": "StatusPage.io API key for the organization. Visit the [API Authentication docs](http://doers.statuspage.io/api/authentication/) for details.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedBy": "nshenoy",
+  "$Meta": {
+    "ExportedAt": "2016-10-26T11:51:37.9670000-07:00",
+    "OctopusVersion": "3.4.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "statusPage"
+}
diff --git a/src/step-templates/statuspageio-update-scheduled-maintenance-incident/scriptbody.ps1 b/src/step-templates/statuspageio-update-scheduled-maintenance-incident/scriptbody.ps1
new file mode 100644
index 000000000..6ce8e8551
--- /dev/null
+++ b/src/step-templates/statuspageio-update-scheduled-maintenance-incident/scriptbody.ps1
@@ -0,0 +1,84 @@
+## --------------------------------------------------------------------------------------
+## Input
+## --------------------------------------------------------------------------------------
+$pageId = $OctopusParameters['PageId']
+$apiKey = $OctopusParameters['ApiKey']
+$incidentName = $OctopusParameters['IncidentName']
+$incidentStatus = $OctopusParameters['IncidentStatus']
+$incidentMessage = $OctopusParameters['IncidentMessage']
+
+function Validate-Parameter($parameterValue, $parameterName) {
+    if(!$parameterName -contains "Key") {
+        Write-Host "${parameterName}: ${parameterValue}"
+    }
+
+    if (! $parameterValue) {
+        throw "$parameterName cannot be empty, please specify a value"
+    }
+}
+
+function Get-InProgressScheduledIncidentByName
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory=$true)]
+        [string]$PageId,
+
+        [Parameter(Mandatory=$true)]
+        [string]$ApiKey,
+
+        [Parameter(Mandatory=$true)]
+        [string]$Name
+    )
+
+    $url = "https://api.statuspage.io/v1/pages/$PageId/incidents/unresolved.json"
+    $headers = @{"Authorization"="OAuth $ApiKey"}
+
+    $response = iwr -UseBasicParsing -Uri $url -Headers $headers -Method GET
+    $content = ConvertFrom-Json $response
+    $incident = $content | where {$_.name -eq $Name}
+    $incident.id
+}
+
+function Update-ScheduledIncident
+{
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory=$true)]
+        [string]$PageId,
+
+        [Parameter(Mandatory=$true)]
+        [string]$ApiKey,
+
+        [Parameter(Mandatory=$true)]
+        [string]$IncidentId,
+
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("scheduled", "in_progress", "verifying", "completed")]
+        [string]$Status,
+        
+        [Parameter(Mandatory=$false)]
+        [string]$Message
+    )
+
+    $url = "https://api.statuspage.io/v1/pages/$PageId/incidents/$IncidentId.json"
+    $headers = @{"Authorization"="OAuth $ApiKey"}
+    $body = "incident[status]=$Status"
+
+    if($Message)
+    {
+        $body += "&incident[message]=$Message"
+    }
+
+    $response = iwr -UseBasicParsing -Uri $url -Headers $headers -Method PATCH -Body $body -ContentType application/x-www-form-urlencoded
+}
+
+Validate-Parameter $pageId -parameterName 'PageId'
+Validate-Parameter $apiKey = -parameterName 'ApiKey'
+Validate-Parameter $incidentName = -parameterName 'IncidentName'
+Validate-Parameter $incidentStatus -parameterName 'IncidentStatus'
+
+$incidentId = Get-InProgressScheduledIncidentByName -PageId $pageId -ApiKey $apiKey -Name $incidentName
+Write-Verbose "Found incident id: $incidentId"
+Write-Output "Updating scheduled maintenance incident `"$incidentName`" [IncidentId: $incidentId]"
+Update-ScheduledIncident -PageId $pageId -ApiKey $apiKey -IncidentId $incidentId -Status $incidentStatus -Message $incidentMessage 
diff --git a/src/step-templates/swaggerhub-post-api/metadata.json b/src/step-templates/swaggerhub-post-api/metadata.json
new file mode 100644
index 000000000..737793f64
--- /dev/null
+++ b/src/step-templates/swaggerhub-post-api/metadata.json
@@ -0,0 +1,116 @@
+{
+  "Id": "0f60f13c-bc00-4035-a0ba-5aeef6a2c1e5",
+  "Author": "waxtell",
+  "Name": "SwaggerHub Post Api",
+  "Description": "Post your Swagger/OAS to SwaggerHub",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "c71e96a7-5e25-4624-9e57-976cc18eb348",
+      "Name": "shpApiKey",
+      "Label": "SwaggerHub API Key",
+      "HelpText": "Your SwaggerHub API key",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "7047922F-8AA3-476F-B2E6-89E9C6F0DB3F",
+      "Name": "shpOwner",
+      "Label": "Owner",
+      "HelpText": "API owner (user or organization, case-sensitive)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "BBE8AB7A-2BFE-4413-ACFF-384F6B6F953C",
+      "Name": "shpApi",
+      "Label": "Api Name",
+      "HelpText": "API name (case-sensitive)",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "409EAF93-FF98-4430-89CD-19C30E1CC792",
+      "Name": "shpIsPrivate",
+      "Label": "Is Private",
+      "HelpText": "Defines whether the API has to be private",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "3643C071-B51F-4611-900C-FAB22B4C5698",
+      "Name": "shpVersion",
+      "Label": "Version",
+      "HelpText": "API version",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "25550589-4208-476C-B581-20EF0A4F1453",
+      "Name": "shpOas",
+      "Label": "OAS Version",
+      "HelpText": "The OpenApi Specification (OAS) version.",
+      "DefaultValue": "2.0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "2.0|2.0\n3.0.0|3.0.0\n3.0.1|3.0.1"
+      }
+    },
+    {
+      "Id": "AF1EF8F1-A829-4D40-86B1-9D18D909037E",
+      "Name": "shpDefinition",
+      "Label": "Definition",
+      "HelpText": "The Swagger definition, or the path to the file that contains the definition, of this API",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "F99E5B74-55BF-4C91-83E6-E6AC17284F4C",
+      "Name": "shpContentType",
+      "Label": "Definition Content Type",
+      "HelpText": "Definition Content Type",
+      "DefaultValue": "application/json",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "application/json|application/json\napplication/yaml|application/yaml"
+      }
+    },
+    {
+      "Id": "3790F1C7-3FA8-4908-B4C3-F96DCD02B96D",
+      "Name": "shpForce",
+      "Label": "Force",
+      "HelpText": "Force update",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedBy": "waxtell",
+  "$Meta": {
+    "ExportedAt": "2020-01-29T17:02:59.1550000Z",
+    "OctopusVersion": "2019.12.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "SwaggerHub"
+}
diff --git a/src/step-templates/swaggerhub-post-api/scriptbody.ps1 b/src/step-templates/swaggerhub-post-api/scriptbody.ps1
new file mode 100644
index 000000000..02ee17782
--- /dev/null
+++ b/src/step-templates/swaggerhub-post-api/scriptbody.ps1
@@ -0,0 +1,70 @@
+function Coalesce($a, $b) { 
+    if ($null -ne $a) { 
+        $a 
+    } else { 
+        $b 
+    } 
+}
+
+function Validate([string]$parameterValue, [string[]]$validInput, $parameterName) {
+    Write-Host "${parameterName}: $parameterValue"
+
+    if (!$parameterValue) {
+        throw "Parameter $parameterName is required!"
+    }
+    
+    if ($validInput) {
+        if (! $validInput -contains $parameterValue) {
+            throw "'$input' is not a valid value for '$parameterName'"
+        }
+    }
+}
+
+$apiKey = $OctopusParameters['shpApiKey']
+$owner = $OctopusParameters['shpOwner']
+$apiName = $OctopusParameters['shpApi']
+$definition = $OctopusParameters['shpDefinition']
+$contentType = Coalesce $OctopusParameters['shpContentType'] "application/json"
+$oas = Coalesce $OctopusParameters['shpOas'] "2.0"
+$isPrivate = (Coalesce $OctopusParameters['shpIsPrivate'] "False").ToLower()
+$force = (Coalesce $OctopusParameters['shpForce'] "False").ToLower()
+$version = $OctopusParameters['shpVersion']
+
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12
+
+Validate $apiKey -parameterName "Api Key"
+Validate $owner -parameterName "Owner"
+Validate $apiName -parameterName "Api Name"
+Validate $definition -parameterName "Definition"
+
+try {
+    Write-Host "Updating $($apiName)..."
+
+    $headers = @{ 
+        'Authorization' = $apiKey 
+        'Accept' = 'application/json'
+    }    
+    
+    $query = "https://api.swaggerhub.com/apis/$($owner)/$($apiName)?isPrivate=$($isPrivate.ToLower())&oas=$($oas)&force=$($force.ToLower())"
+
+    if($version) {
+        $query = $query+"&version=$($version)"
+    }
+    
+    $specification = $definition
+    
+    # If $definition contains a file path, load the content of the provided value
+    if((Test-Path $definition -ErrorAction SilentlyContinue)[0]) {
+        $specification = get-content $definition
+    }
+
+    Invoke-RestMethod $query -Headers $headers -ContentType $contentType -Method Post -Body $specification
+
+    Write-Host "SwaggerHub post successful"
+} catch {
+    Write-Host $_.Exception.Message
+    Write-Host "SwaggerHub post failed!"
+    Write-Host "  HttpStatus: $($_.Exception.Response.StatusCode.value__)" 
+
+    exit 1
+}
diff --git a/step-templates/teamcity-download-artifact.json b/src/step-templates/teamcity-download-artifact/metadata.json
similarity index 68%
rename from step-templates/teamcity-download-artifact.json
rename to src/step-templates/teamcity-download-artifact/metadata.json
index 97628a11a..630b8c898 100644
--- a/step-templates/teamcity-download-artifact.json
+++ b/src/step-templates/teamcity-download-artifact/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Expected parameters:\r\n#  $TeamCityHost     - The domain name and optional port (teamcity.mycompany.com:8080) of the TeamCity build server.\r\n#  $TeamCityUsername - The TeamCity username.\r\n#  $TeamCityPassword - The TeamCity password.\r\n#  $BuildType        - The unique identifier of the TeamCity build configuration.\r\n#  $BranchName       - The name of the branch.\r\n#  $ArtifactName     - The filename of the artifact.\r\n#  $OutputLocation   - The name of the folder where the artifact will be downloaded.\r\n\r\n$secure_password = ConvertTo-SecureString $TeamCityPassword -AsPlainText -Force\r\n$credential = New-Object System.Management.Automation.PSCredential($TeamCityUsername, $secure_password)\r\n\r\n$resource_identifier = \"buildType:$BuildType,branch:$BranchName\"\r\n\r\n$source = \"http://$TeamCityHost/httpAuth/app/rest/builds/$resource_identifier/artifacts/content/$ArtifactName\"\r\n$destination = \"$OutputLocation\\$Artifactname\"\r\n\r\nInvoke-WebRequest $source -OutFile $destination -Credential $credential",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -74,12 +74,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-01-23T04:15:51.361+00:00",
+    "ExportedAt": "2015-01-22T20:15:51.3610000-08:00",
     "OctopusVersion": "2.6.0.778",
     "Type": "ActionTemplate"
   },
   "Category": "teamcity"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/teamcity-download-artifact/scriptbody.ps1 b/src/step-templates/teamcity-download-artifact/scriptbody.ps1
new file mode 100644
index 000000000..a6da8c2c2
--- /dev/null
+++ b/src/step-templates/teamcity-download-artifact/scriptbody.ps1
@@ -0,0 +1,18 @@
+# Expected parameters:
+#  $TeamCityHost     - The domain name and optional port (teamcity.mycompany.com:8080) of the TeamCity build server.
+#  $TeamCityUsername - The TeamCity username.
+#  $TeamCityPassword - The TeamCity password.
+#  $BuildType        - The unique identifier of the TeamCity build configuration.
+#  $BranchName       - The name of the branch.
+#  $ArtifactName     - The filename of the artifact.
+#  $OutputLocation   - The name of the folder where the artifact will be downloaded.
+
+$secure_password = ConvertTo-SecureString $TeamCityPassword -AsPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential($TeamCityUsername, $secure_password)
+
+$resource_identifier = "buildType:$BuildType,branch:$BranchName"
+
+$source = "http://$TeamCityHost/httpAuth/app/rest/builds/$resource_identifier/artifacts/content/$ArtifactName"
+$destination = "$OutputLocation\$Artifactname"
+
+Invoke-WebRequest $source -OutFile $destination -Credential $credential
\ No newline at end of file
diff --git a/step-templates/teamcity-pin-build-and-dependencies.json b/src/step-templates/teamcity-pin-build-and-dependencies/metadata.json
similarity index 60%
rename from step-templates/teamcity-pin-build-and-dependencies.json
rename to src/step-templates/teamcity-pin-build-and-dependencies/metadata.json
index 12c820274..2961701da 100644
--- a/step-templates/teamcity-pin-build-and-dependencies.json
+++ b/src/step-templates/teamcity-pin-build-and-dependencies/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 1,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$buildNumber = $OctopusParameters['buildNumber']\n$buildTypeId = $OctopusParameters['buildTypeId']\n\n$tcUrl = $OctopusParameters['TeamCityUrl']\n$tcUser = $OctopusParameters['TeamCityUser']\n$tcPass = $OctopusParameters['TeamCityPassword']\n$tcComments = $OctopusParameters['TeamCityPinComment']\n$tcTags = $OctopusParameters['TeamCityTags']\n\n$credentials = [System.Text.Encoding]::UTF8.GetBytes(\"$($tcUser):$($tcPass)\")\n$headers = @{ \"Authorization\" = \"Basic $([System.Convert]::ToBase64String($credentials))\" }\n\n[string]$restUri = $tcUrl + (\"/httpAuth/app/rest/builds/?locator=buildType:{1},branch:default:any,number:{0}\" -f $buildNumber,$buildTypeId)\n\n$response = Invoke-RestMethod -Headers $headers -DisableKeepAlive -Method GET -Uri $restUri\n\nif ($response -ne $null -and $response.builds.count -eq 1) {\n    $id = $response.builds.build.id\n    \n    [string]$pinUri = $tcUrl + (\"/ajax.html?pinComment={1}&pin=true&buildId={0}&buildTagsInfo={2}&applyToChainBuilds=true\" -f $id,$tcComments,$tcTags)\n\n    Write-Output \"Pinning Build with ID $($id)\"\n\n    try {\n        Invoke-RestMethod -Headers $headers -DisableKeepAlive -Method POST -Uri $pinUri\n        Write-Output \"Build ID $($id) pinned successfully\"\n    } catch {\n        Write-Output \"Build ID $($id) not pinned: $($_.Exception.Message)\"\n    }\n} else {\n    Write-Warning \"Build not found, unable to pin\"\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -74,12 +74,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2016-05-17T09:18:00.000+00:00",
+  "LastModifiedOn": "2016-05-17T02:18:00.0000000-07:00",
   "LastModifiedBy": "roberto-mardeni",
   "$Meta": {
-    "ExportedAt": "2016-05-06T17:36:39.661+00:00",
+    "ExportedAt": "2016-05-06T10:36:39.6610000-07:00",
     "OctopusVersion": "3.2.19",
     "Type": "ActionTemplate"
   },
   "Category": "teamcity"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/teamcity-pin-build-and-dependencies/scriptbody.ps1 b/src/step-templates/teamcity-pin-build-and-dependencies/scriptbody.ps1
new file mode 100644
index 000000000..e6f44fa2a
--- /dev/null
+++ b/src/step-templates/teamcity-pin-build-and-dependencies/scriptbody.ps1
@@ -0,0 +1,32 @@
+$buildNumber = $OctopusParameters['buildNumber']
+$buildTypeId = $OctopusParameters['buildTypeId']
+
+$tcUrl = $OctopusParameters['TeamCityUrl']
+$tcUser = $OctopusParameters['TeamCityUser']
+$tcPass = $OctopusParameters['TeamCityPassword']
+$tcComments = $OctopusParameters['TeamCityPinComment']
+$tcTags = $OctopusParameters['TeamCityTags']
+
+$credentials = [System.Text.Encoding]::UTF8.GetBytes("$($tcUser):$($tcPass)")
+$headers = @{ "Authorization" = "Basic $([System.Convert]::ToBase64String($credentials))" }
+
+[string]$restUri = $tcUrl + ("/httpAuth/app/rest/builds/?locator=buildType:{1},branch:default:any,number:{0}" -f $buildNumber,$buildTypeId)
+
+$response = Invoke-RestMethod -Headers $headers -DisableKeepAlive -Method GET -Uri $restUri
+
+if ($response -ne $null -and $response.builds.count -eq 1) {
+    $id = $response.builds.build.id
+    
+    [string]$pinUri = $tcUrl + ("/ajax.html?pinComment={1}&pin=true&buildId={0}&buildTagsInfo={2}&applyToChainBuilds=true" -f $id,$tcComments,$tcTags)
+
+    Write-Output "Pinning Build with ID $($id)"
+
+    try {
+        Invoke-RestMethod -Headers $headers -DisableKeepAlive -Method POST -Uri $pinUri
+        Write-Output "Build ID $($id) pinned successfully"
+    } catch {
+        Write-Output "Build ID $($id) not pinned: $($_.Exception.Message)"
+    }
+} else {
+    Write-Warning "Build not found, unable to pin"
+}
diff --git a/src/step-templates/teamcity-run-build/metadata.json b/src/step-templates/teamcity-run-build/metadata.json
new file mode 100644
index 000000000..e7fd2fa90
--- /dev/null
+++ b/src/step-templates/teamcity-run-build/metadata.json
@@ -0,0 +1,77 @@
+{
+  "Id": "a7fa3e51-14aa-4bb9-8686-781adc9bf93e",
+  "Name": "TeamCity - Run Build",
+  "Description": "Trigger a specific Team City build from an Octopus Deploy process and wait for the result. The step will fail if the build fails.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptFileName": null
+  },
+  "Parameters": [
+    {
+      "Name": "tcrb_TeamCityBuildConfigurationId",
+      "Label": "BuildConfigurationId",
+      "HelpText": "The Id of the build configuration to trigger.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "tcrb_TeamCityUrl",
+      "Label": "TeamCityUrl",
+      "HelpText": "The URL of the Team City server.\nE.g. `http://teamcity.example.com`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "tcrb_TeamCityUsername",
+      "Label": "TeamCityUsername",
+      "HelpText": "The username to use for accessing TeamCity.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "tcrb_TeamCityPassword",
+      "Label": "TeamCityPassword",
+      "HelpText": "The password for the TeamCity user.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "tcrb_TeamCityInterval",
+      "Label": "TeamCityInterval",
+      "HelpText": "Number of seconds to wait between each check of the build's state.",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "tcrb_BuildParams",
+      "Label": "BuildParameters",
+      "HelpText": "Line-delimited list of parameters to add to the build in the form <name>=<value>\n<name> and <value> can be contained in quotes.\nE.g.\nparam1=param_value1\nenv.param2=\"env_param2\"\nsystem.param3=sys_param2",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-11-03T09:42:34.5060000Z",
+    "OctopusVersion": "2020.4.10",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "teamcity"
+}
diff --git a/src/step-templates/teamcity-run-build/scriptbody.ps1 b/src/step-templates/teamcity-run-build/scriptbody.ps1
new file mode 100644
index 000000000..28e541742
--- /dev/null
+++ b/src/step-templates/teamcity-run-build/scriptbody.ps1
@@ -0,0 +1,93 @@
+# Set TLS 1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+
+$teamCityBuildConfigId = $OctopusParameters['tcrb_TeamCityBuildConfigurationId']
+$teamCityUrl = $OctopusParameters['tcrb_TeamCityUrl']
+$teamCityUsername = $OctopusParameters['tcrb_TeamCityUsername']
+$teamCityPassword = $OctopusParameters['tcrb_TeamCityPassword']
+$teamCityInterval = [int]::Parse($OctopusParameters['tcrb_TeamCityInterval'])
+$teamCityBuildParams = $OctopusParameters['tcrb_BuildParams']
+
+function Start-TeamCityBuild($Url, $Username, $Password, $BuildConfigId, $BuildParams) {
+    $endpoint = "${Url}/httpAuth/app/rest/buildQueue"
+    $content = "<build><buildType id=`"${BuildConfigId}`" /><properties>"
+    if (-not [String]::IsNullOrEmpty($BuildParams)) {
+        foreach ($param in (ConvertFrom-Csv -Delimiter '=' -Header Name,Value -InputObject $BuildParams)) {
+            $name = $param.Name.Replace('"', '&quot;')
+            $value = $param.Value.Replace('"', '&quot;')
+            $content += "<property name=`"${name}`" value=`"${value}`" />"
+        }
+    }
+    $content += "</properties></build>"    
+    $encodedContent = [System.Text.Encoding]::UTF8.GetBytes($content)
+
+    Write-Host "Triggering build with Id ${BuildConfigId} in TeamCity. Server: ${Url}"
+
+    $req = [System.Net.WebRequest]::Create($endpoint)
+    $req.Credentials = New-Object System.Net.NetworkCredential($Username, $Password)
+    $req.Method = "POST"
+    $req.ContentType = "application/xml"
+
+    $req.ContentLength = $encodedContent.length
+    $requestStream = $req.GetRequestStream()
+    $requestStream.Write($encodedContent, 0, $encodedContent.length)
+    $requestStream.Close()
+
+    $resp = $req.GetResponse()
+    $reader = New-Object System.IO.StreamReader($resp.GetResponseStream())
+    $result = [xml]$reader.ReadToEnd()
+    $buildUrl = $result.build.webUrl
+
+    Write-Host $buildUrl
+    Write-Host "================================================================================"
+
+    return $result
+}
+
+function Get-TeamCityBuildState($Url, $Username, $Password, $BuildInfo) {
+    $href = $BuildInfo.href
+    $buildId = $BuildInfo.id
+    $endpoint = "${Url}${href}"
+
+    Write-Host "Getting state of build ${buildId} in TeamCity. Server: ${Url}"
+
+    $req = [System.Net.WebRequest]::Create($endpoint)
+    $req.Credentials = New-Object System.Net.NetworkCredential($Username, $Password)
+    $req.Method = "GET"
+
+    $resp = $req.GetResponse()
+    $reader = New-Object System.IO.StreamReader($resp.GetResponseStream())
+    return [xml]$reader.ReadToEnd();
+}
+
+function Invoke-TeamCityBuild ($Url, $Username, $Password, $BuildConfigId, $Interval, $BuildParams) {
+    $build = Start-TeamCityBuild -Url $Url -Username $Username -Password $Password -BuildConfigId $BuildConfigId -BuildParams $teamCityBuildParams
+    $buildInfo = $build.build
+
+    while ($true) {
+        $buildState = Get-TeamCityBuildState -Url $teamCityUrl -Username $teamCityUsername -Password $teamCityPassword -BuildInfo $buildInfo
+        Write-Host $buildState.build.state
+        if ($buildState.build.state -eq 'finished') {
+            return $buildState.build
+        }
+        
+        Start-Sleep -Seconds $Interval
+    }
+}
+
+$buildResult = Invoke-TeamCityBuild -Url $teamCityUrl -Username $teamCityUsername -Password $teamCityPassword -BuildConfigId $teamCityBuildConfigId -Interval $teamCityInterval -BuildParams $teamCityBuildParams
+$message = $buildResult.statusText
+Write-Host "================================================================================"
+Write-Host $buildResult.webUrl
+if ($buildResult.status -eq 'FAILURE') {
+    Write-Host "Build failed: ${message}"
+    exit 1
+}
+elseif ($message -eq 'Canceled') {
+    Write-Host "Build canceled: ${message}"
+    exit 2
+}
+else {
+    Write-Host "Build successful: ${message}"
+    exit 0
+}
diff --git a/step-templates/SQL-Query-Octopus-Database-for-Fragmentation.json b/step-templates/SQL-Query-Octopus-Database-for-Fragmentation.json
deleted file mode 100644
index ba1dbfe5e..000000000
--- a/step-templates/SQL-Query-Octopus-Database-for-Fragmentation.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "Id": "b362bd69-4a69-42c1-bcb5-2a134549ef3f",
-  "Name": "SQL - Query Octopus Database for Fragmentation",
-  "Description": "This step template will run a fragmentation query on your Octopus database and report the results of the tables.\n\nIf you would like to set this up as a scheduled runbook and get the results in an email, please follow these instructions:\n1) Create a Send an Email step after this step in your process\n2) Set the body type of that email to HTML, and the body to#{Octopus.Action[STEPNAMEHERE].Output.EmailData} \n3) Set the Run Condition of that Send an Email step to Variable, and the value to #{if Octopus.Action[STEPNAMEHERE].Output.Alert== \"True\"}True#{/if}. If you don't do this, you will receive an email regardless of if the threshold was hit.'",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "###PARAMETERS\n\n[string]$sqlUsername = $OctopusParameters[\"IndexFragmentSQLUsername\"]\n[string]$sqlPassword = $OctopusParameters[\"IndexFragmentSQLPassword\"]\n[int]$threshold = $OctopusParameters[\"IndexFragmentFragmentation\"]\n[string]$SQLServer = $OctopusParameters[\"IndexFragmentSQLServer\"]\n[string]$SQLPort = $OctopusParameters[\"IndexFragmentSQLPort\"]\n[string]$databaseName = $OctopusParameters[\"IndexFragmentDatabaseName\"]\n[string]$pageCount = $OctopusParameters[\"IndexFragmentPageCount\"]\n\n\nif ([string]::IsNullOrWhiteSpace($SQLPort)){\n$SQLPort = \"1433\"\n}\n\n#create the full sql server string\n[string]$SQLServerFull = $SQLServer + \",\" + $SQLPort\n\n#creating the connectionString based on choice of auth\nif ([string]::IsNullOrWhiteSpace($sqlUserName)){\n\tWrite-Highlight \"Integrated Authentication being used to connect to SQL.\"\n    $connectionString = \"Server=$SQLServerFull;Database=$databaseName;integrated security=true;\"\n}\nelse {\n\tWrite-Highlight \"SQL Authentication being used to connect to SQL\"\n    $connectionString = \"Server=$SQLServerFull;Database=$databaseName;User ID=$sqlUsername;Password=$sqlPassword;\"\n}\n\n#function for running the query\nfunction ExecuteSqlQuery ($connectionString, $SQLQuery) {\n    $Datatable = New-Object System.Data.DataTable\n    $Connection = New-Object System.Data.SQLClient.SQLConnection\n    $Connection.ConnectionString = $connectionString\n\ttry{\n    \t$Connection.Open()\n    \t$Command = New-Object System.Data.SQLClient.SQLCommand\n    \t$Command.Connection = $Connection\n    \t$Command.CommandText = $SQLQuery\n    \t$Reader = $Command.ExecuteReader()\n    \t$Datatable.Load($Reader)\n    }\n    catch{\n    \tWrite-Error $_.Exception.Message\n    }\n    finally{\n    \tif (($Connection.State) -ne \"Closed\"){\n        Write-Highlight \"Closing the SQL Connection.\"\n    \t$Connection.Close()   \n        }\n    }\n    return $Datatable\n}\n\n#Create the query for fragmentation check\n$query = @\"\nSELECT S.name as 'Schema',\nT.name as 'Table',\nI.name as 'Index',\nDDIPS.avg_fragmentation_in_percent,\nDDIPS.page_count\nFROM sys.dm_db_index_physical_stats (DB_ID(), NULL, NULL, NULL, NULL) AS DDIPS\nINNER JOIN sys.tables T on T.object_id = DDIPS.object_id\nINNER JOIN sys.schemas S on T.schema_id = S.schema_id\nINNER JOIN sys.indexes I ON I.object_id = DDIPS.object_id\nAND DDIPS.index_id = I.index_id\nWHERE DDIPS.database_id = DB_ID()\nand I.name is not null\nAND DDIPS.avg_fragmentation_in_percent > 0\nORDER BY DDIPS.avg_fragmentation_in_percent desc\n\"@\n\n#Run the query against the server and return as a dataset\n$resultsDataTable = New-Object System.Data.DataTable\n$resultsDataTable = ExecuteSqlQuery $connectionString $query \n\n#creating variables for later use\n$highestFrag = 0\n$array = @()\n\n#build an array of html so the data is readable\n$dataforemail = @()\n$dataforemail += \"<header>  <h1>SQL Fragmentation Report</h1></header><br>\"\n$dataforemail += '<table border=\"1\">'\n$dataforemail += \"<tr> <td> Table </td><td>Index</td><td>Fragmentation %</td><td>Page Count</td></td>\"\nforeach ($row in $resultsDataTable){\n\t#checking if the current row's fragmentation % is higher than our highest if it is, set it\n\tif ($row.avg_fragmentation_in_percent -gt $highestFrag -and $row.page_count -gt $pageCount){\n\t\t$highestFrag = $row.avg_fragmentation_in_percent\n\t}\n    #if both thresholds are hit, put the data in HTML format and also an array to later write to console.\n\tif ($row.avg_fragmentation_in_percent -gt $threshold -and $row.page_count -gt $pageCount){\n        $percent = [math]::Round($row.avg_fragmentation_in_percent,2)\n\t\t$dataforemail += \"<tr>\" \n\t\t$dataforemail += \"<td>\" + $row.Table + \"</td>\"\n\t\t$dataforemail += \"<td>\" + $row.Index + \"</td>\"\n        $dataforemail += \"<td>\" + [string]$percent + \"</td>\"\n        $dataforemail += \"<td>\" + $row.page_count + \"</td>\"\n\t\t$dataforemail += \"</tr>\"\n        \n        $arrayRow = \"\" | Select Table,Index,avg_fragmentation_in_percent,page_count\n    \t$arrayRow.Table = $Row.Table\n    \t$arrayRow.Index = $Row.Index\n        $arrayRow.avg_fragmentation_in_percent = [string]$percent\n        $arrayRow.page_count = $Row.page_count\n    \t$array += $arrayRow\n\t}\n}\n$dataforemail += \"</table>\"\n\n#if the threshold has been reached, output data and create output variable for sending email.\nif ($highestFrag -gt $threshold){\n\n\t#convert the array to a string to email\n\t[string]$bodyofemail = [string]$dataforemail\n\n\t#Create all of the necessary variables and output the data\n\t\tSet-OctopusVariable -name \"EmailData\" -value \"$dataforemail\"\n        Set-OctopusVariable -name \"Alert\" -value \"True\"\n        $output = $array | Out-String\n        Write-Highlight 'Here are the results for your database fragmentation. The following tables had above the provided fragmentation % and minimum page count. If you would like to get an email alert with the data, please refer to the description of the step template for instructions on setting that up.'\n        Write-Highlight $output\n}\nelse{\n\n\tWrite-Highlight \"No alert is required.\"\n    Set-OctopusVariable -name \"Alert\" -value \"False\"\n\n\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "05a6a3f3-3cb9-4d75-abac-b2125fb84a3b",
-      "Name": "IndexFragmentSQLServer",
-      "Label": "SQL Server",
-      "HelpText": "Enter the Hostname or IP address of your server. Include \\Instance if necessary.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8d6081b3-b934-475b-8b73-cde72f5d085d",
-      "Name": "IndexFragmentSQLPort",
-      "Label": "SQL Server Port",
-      "HelpText": "If left blank, 1433 will be used by default.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "42671f3c-763e-4dbd-836d-ed794d4b0005",
-      "Name": "IndexFragmentDatabaseName",
-      "Label": "SQL Server Database Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0e439749-1fa9-40f2-9843-126ade5576b1",
-      "Name": "IndexFragmentFragmentation",
-      "Label": "Fragmentation Threshold",
-      "HelpText": "Input the percentage of Fragmentation you would like to be alerted for.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7050d208-a267-412a-9677-95e90909264c",
-      "Name": "IndexFragmentPageCount",
-      "Label": "Page Count Threshold",
-      "HelpText": "Input the minimum page count a table must have to be considered in the results.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4a9d3846-c454-483f-9066-60a1f2cf7413",
-      "Name": "IndexFragmentSQLUsername",
-      "Label": "SQL Server Authentication Username",
-      "HelpText": "Please leave blank if you want to use Integrated Security.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f04df930-bb05-49c1-b6f0-51e97dce3bad",
-      "Name": "IndexFragmentSQLPassword",
-      "Label": "SQL Server Authentication Password",
-      "HelpText": "Please leave blank if you want to use Integrated Security.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-05-25T19:02:40.382Z",
-    "OctopusVersion": "2020.6.4722",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "millerjn21",
-  "Category": "sql"
-}
diff --git a/step-templates/redgate-sql-clone-create-clone.json b/step-templates/redgate-sql-clone-create-clone.json
deleted file mode 100644
index 7e5480f2a..000000000
--- a/step-templates/redgate-sql-clone-create-clone.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "96d88bbf-2e0a-4630-b4b6-bd179effedd7",
-  "Name": "Redgate - SQL Clone, Create Clone",
-  "Description": "Creates a database clone with [Redgate SQL Clone](https://www.red-gate.com/products/dba/sql-clone/index).\n\nRequires SQL Clone.\n\n*Version date: 16th May 2019*",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# The code for this step template is largely a copy/paste job from the\n# Azure DevOps Services step template which is maintained by Redgate:\n# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/ImageTask/SQLCloneCloneTask.ps1\n# The code was copied and adapted on 16th May 2019.\n\nWrite-Verbose \"cloneServer is $cloneServer\"\nWrite-Verbose \"cloneUser is $cloneUser\"\nWrite-Verbose \"clonePassword is $clonePassword\"\nWrite-Verbose \"imageNameForClone is $imageNameForClone\"\nWrite-Verbose \"templateName is $templateName\"\nWrite-Verbose \"cloneSqlServer is $cloneSqlServer\"\nWrite-Verbose \"cloneName is $cloneName\"\nWrite-Verbose \"deleteClone is $deleteClone\"\n\nWrite-Debug \"Entering script SQLCloneCloneTask.ps1\"\n\n# This line is broken: Import-Module \"$PSScriptRoot\\Modules\\RedGate.SQLClone.PowerShell.dll\"\n\nif($cloneUser){\n    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force\n    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password\n\n}\nConnect-SqlClone -ServerUrl $cloneServer -Credential $credential\nWrite-Output \"Connected to SQL Clone server\"\n\n        $sqlServerParts = $cloneSqlServer.Split('\\', [System.StringSplitOptions]::RemoveEmptyEntries)\n        if ($sqlServerParts.Count -ge 3)\n        {\n            write-error 'SQL Server instance ' + $cloneSqlServer + ' has not been recognised, if specifying a named instance please use \"machine\\instance\"'\n            exit 1\n        }\n        $cloneSqlServerHost = $sqlServerParts[0]\n        $instanceName = ''\n        if ($sqlServerParts.Count -ge 2)\n        {\n            $instanceName = $sqlServerParts[1]\n        }\n        \n        try\n        {\n            $instance = Get-SqlCloneSqlServerInstance -MachineName $cloneSqlServerHost -InstanceName $instanceName\n            Write-Output \"Found SQL Server instance\"\n        }\n        catch\n        {\n            $instances = Get-SqlCloneSqlServerInstance\n            $instanceNames = \"`n\"\n            Foreach ($cInstance in $instances)\n            {\n                $instanceNames += $cInstance.Name + \"`n\"\n            }\n            $message = 'SQL Server instance \"' + $cloneSqlServer + '\"  has not been added to SQL Clone, available instances:' + $instanceNames\n            write-error $message\n            exit 1\n        }\n        \n        try\n        {\n            $image = Get-SqlCloneImage -Name $imageNameForClone\n            Write-Output \"Found image\"\n        }\n        catch\n        {\n            $images = Get-SqlCloneImage\n            $imageNames = \"`n\"\n            Foreach ($cImage in $images)\n            {\n                $imageNames += $cImage.Name + \"`n\"\n            }\n            $message = 'SQL Clone image \"' + $imageNameForClone + '\"  has not been added to SQL Clone, available images:' + $imageNames\n            write-error $message\n            exit 1\n        }\n        \n        if($deleteClone)\n        {\n            try\n            {\n                $clone = Get-SqlClone -Name $cloneName -Location $instance\n                Write-Output \"Deleting existing clone\"\n                Remove-SqlClone -Clone $clone | Wait-SqlCloneOperation\n            }\n            catch\n            {\n                # Clone didn't exist so nothing to do\n            }\n        }\n        if($templateName)\n        {\n            Write-Output \"Creating clone with template:\" + $templateName\n            $image | New-SqlClone -Name $cloneName -Location $instance -Template $templateName | Wait-SqlCloneOperation\n        }\n        else\n        {            \n            Write-Output \"Creating clone\"\n            $image | New-SqlClone -Name $cloneName -Location $instance | Wait-SqlCloneOperation            \n        }\n        Write-Output \"Finished creating clone\"        \n\nWrite-Debug \"Leaving script SQLCloneCloneTask.ps1\""
-  },
-  "Parameters": [
-    {
-      "Id": "8c140a4c-65a2-4341-a604-73d14775b3a0",
-      "Name": "cloneServer",
-      "Label": "SQL Clone Server (required)",
-      "HelpText": "The URL for your SQL Clone server (e.g. http://sql-clone.example.com:14145)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e5ac1d04-b8a5-440e-ba69-a5d66a53abba",
-      "Name": "cloneUser",
-      "Label": "SQL Clone User (optional)",
-      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5f6288f2-57c9-4a11-91f2-b0c2e3cb9ccd",
-      "Name": "clonePassword",
-      "Label": "SQL Clone Password (optional)",
-      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ee5286d3-f233-410c-92ab-36743f8743e7",
-      "Name": "imageNameForClone",
-      "Label": "Image Name For Clone (required)",
-      "HelpText": "The name of the database image from which to create database clone.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0edb1e1f-0c27-428b-9ff0-7c76faf1369e",
-      "Name": "templateName",
-      "Label": "Template Name (optional)",
-      "HelpText": "A template to modify this clone (optional).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5e9f4d95-4776-4a0e-8245-05d645bd0997",
-      "Name": "cloneSqlServer",
-      "Label": "SQL Server (required)",
-      "HelpText": "The target SQL Server to create the clone on. This SQL Server instance must have already been added to the SQL Clone Server specified above.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "62da0567-35f5-4c3f-ac9e-61b75a399053",
-      "Name": "cloneName",
-      "Label": "Clone Name (required)",
-      "HelpText": "The name of the clone, which will also be the database name.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ab892024-c4b5-46c2-9434-2ad150e3e014",
-      "Name": "deleteClone",
-      "Label": "Delete clone if exists",
-      "HelpText": "Delete any existing clone with the same name prior to creating this clone.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
- "LastModifiedOn": "2019-05-16T11:37:47.360Z",
-  "LastModifiedBy": "alex-yates",
-  "$Meta": {
-    "ExportedAt": "2019-05-16T11:37:47.360Z",
-    "OctopusVersion": "2019.2.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "redgate"
-}
\ No newline at end of file
diff --git a/step-templates/redgate-sql-clone-create-image.json b/step-templates/redgate-sql-clone-create-image.json
deleted file mode 100644
index 10388833f..000000000
--- a/step-templates/redgate-sql-clone-create-image.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "Id": "4ff62eff-f615-453e-9a14-ca7bf67cb586",
-  "Name": "Redgate - SQL Clone, Create Image",
-  "Description": "Creates a database image with [Redgate SQL Clone](https://www.red-gate.com/products/dba/sql-clone/index).\n\nRequires SQL Clone.\n\n*Version date: 16th May 2019*",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n# The code for this step template is largely a copy/paste job from the\n# Azure DevOps Services step template which is maintained by Redgate:\n# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/ImageTask/SQLCloneImageTask.ps1\n# The code was copied and adapted on 16th May 2019.\n\nWrite-Verbose \"cloneServer is $cloneServer\"\nWrite-Verbose \"cloneUser is $cloneUser\"\nWrite-Verbose \"clonePassword is $clonePassword\"\nWrite-Verbose \"sourceType is $sourceType\"\nWrite-Verbose \"imageName is $imageName\"\nWrite-Verbose \"imageLocation is $imageLocation\"\nWrite-Verbose \"sourceInstance is $sourceInstance\"\nWrite-Verbose \"sourceDatabase is $sourceDatabase\"\nWrite-Verbose \"sourceFileNames is $sourceFileNames\"\nWrite-Verbose \"sourceFilePassword is $sourceFilePassword\"\nWrite-Verbose \"modificationScriptFiles is $modificationScriptFiles\"\n\nWrite-Debug \"Entering script SQLCloneImageTask.ps1\"\n\n# This line is broken: Import-Module \"$PSScriptRoot\\Modules\\RedGate.SQLClone.PowerShell.dll\"\n\nif($cloneUser){\n    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force\n    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password\n\n}\nConnect-SqlClone -ServerUrl $cloneServer -Credential $credential\nWrite-Output \"Connected to SQL Clone server\"\n\n    try\n    {\n        $cloneImageLocation = Get-SqlCloneImageLocation $imageLocation\n        Write-Output \"Found image location\"\n    }\n    catch\n    {\n        $imageLocations = Get-SqlCloneImageLocation\n        $imageLocationNames = \"`n\"\n        Foreach ($cImageLocation in $imageLocations)\n        {\n            $imageLocationNames += $cImageLocation.Path + \"`n\"\n        }\n        $message = 'SQL Clone image location \"' + $imageLocation + '\"  has not been added to SQL Clone, available locations:' + $imageLocationNames\n        write-error $message\n        exit 1\n    }\n\n    $sqlServerParts = $sourceInstance.Split('\\', [System.StringSplitOptions]::RemoveEmptyEntries)\n    if ($sqlServerParts.Count -ge 3)\n    {\n        write-error 'SQL Server instance ' + $sourceInstance + ' has not been recognised, if specifying a named instance please use \"machine\\instance\"'\n        exit 1\n    }\n    $cloneSqlServerHost = $sqlServerParts[0]\n    $instanceName = ''\n    if ($sqlServerParts.Count -ge 2)\n    {\n        $instanceName = $sqlServerParts[1]\n    }\n    \n    try\n    {\n        $instance = Get-SqlCloneSqlServerInstance -MachineName $cloneSqlServerHost -InstanceName $instanceName\n        Write-Output \"Found SQL Server instance\"\n    }\n    catch\n    {\n        $instances = Get-SqlCloneSqlServerInstance\n        $instanceNames = \"`n\"\n        Foreach ($cInstance in $instances)\n        {\n            $instanceNames += $cInstance.Name + \"`n\"\n        }\n        $message = 'SQL Server instance \"' + $sourceInstance + '\"  has not been added to SQL Clone, available instances:' + $instanceNames\n        write-error $message\n        exit 1\n    }\n\n    $modificationScripts = @()\n    if($modificationScriptFiles){\n        $modificationFiles = $modificationScriptFiles.Split(';', [System.StringSplitOptions]::RemoveEmptyEntries)\n            \n        Foreach ($modificationScriptFile in $modificationFiles)\n        {\n            if ($modificationScriptFile -Like \"*.sql\")\n            {\n                $modificationScripts += New-SqlCloneSqlScript -Path $modificationScriptFile\n            }\n\n            if ($modificationScriptFile -Like \"*.dmsmaskset\")\n            {\n                $modificationScripts += New-SqlCloneMask -Path $modificationScriptFile\n            }\n        }\n    }\n    \n    if ($sourceType -eq 'database')\n    {\n        Write-Output \"Source type = database\"\n        Write-Output \"Creating image\"\n        $NewImage = New-SqlCloneImage -Name $imageName -SqlServerInstance $instance -DatabaseName $sourceDatabase -Destination $cloneImageLocation -Modifications $modificationScripts | Wait-SqlCloneOperation    \n        Write-Output \"Finished creating image\"\n    }\n    else\n    {\n        Write-Output \"Source type = backup\"\n        $backupFiles = $sourceFileNames.Split(';', [System.StringSplitOptions]::RemoveEmptyEntries)\n        Write-Output \"Creating image from backup\"\n        if($sourceFilePassword)\n        {\n            $NewImage = New-SqlCloneImage -Name $imageName -SqlServerInstance $instance -BackupFileName $backupFiles -BackupPassword $sourceFilePassword -Destination $cloneImageLocation -Modifications $modificationScripts | Wait-SqlCloneOperation\n        }\n        else\n        {\n            $NewImage = New-SqlCloneImage -Name $imageName -SqlServerInstance $instance -BackupFileName $backupFiles -Destination $cloneImageLocation -Modifications $modificationScripts | Wait-SqlCloneOperation\n        }\n        Write-Output \"Finished creating image from backup\"        \n    }\n\n    \n\nWrite-Debug \"Leaving script SQLCloneImageTask.ps1\"\n"
-  },
-  "Parameters": [
-    {
-      "Id": "8c140a4c-65a2-4341-a604-73d14775b3a0",
-      "Name": "cloneServer",
-      "Label": "SQL Clone Server (required)",
-      "HelpText": "The URL for your SQL Clone server (e.g. http://sql-clone.example.com:14145)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e5ac1d04-b8a5-440e-ba69-a5d66a53abba",
-      "Name": "cloneUser",
-      "Label": "SQL Clone User (optional)",
-      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5f6288f2-57c9-4a11-91f2-b0c2e3cb9ccd",
-      "Name": "clonePassword",
-      "Label": "SQL Clone Password (optional)",
-      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ee5286d3-f233-410c-92ab-36743f8743e7",
-      "Name": "imageName",
-      "Label": "Image Name (required)",
-      "HelpText": "The name of your database image.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0edb1e1f-0c27-428b-9ff0-7c76faf1369e",
-      "Name": "imageLocation",
-      "Label": "Image Location (required)",
-      "HelpText": "Images need to have a UNC (network share) path destination in order to be shared with other machines. For example: \\\\servername\\fileshare\\images",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "aa803a9d-ab55-4e36-969c-3b0e3637d36e",
-      "Name": "sourceInstance",
-      "Label": "Source SQL Server Instance (required)",
-      "HelpText": "For example: MYSERVER\\MYINSTANCE",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "39c29a4a-f483-4b96-bf08-238bb677835d",
-      "Name": "sourceType",
-      "Label": "Image Source Type (required)",
-      "HelpText": "Images can be created from a backup file (.bak or .sqb) or from a SQL Server database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "database|SQL Server Database\nbackup|Backup file(s)"
-      }
-    },
-    {
-      "Id": "5e9f4d95-4776-4a0e-8245-05d645bd0997",
-      "Name": "sourceDatabase",
-      "Label": "Source Database (required if Source Type is SQL Server Database)",
-      "HelpText": "The database from which to create the image.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "62da0567-35f5-4c3f-ac9e-61b75a399053",
-      "Name": "sourceFileNames",
-      "Label": "Source File Names (required if Source Type is Backup File(s))",
-      "HelpText": "For striped and/or differential backups, separate multiple file paths with ;",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ab892024-c4b5-46c2-9434-2ad150e3e014",
-      "Name": "sourceFilePassword",
-      "Label": "Source File Password (optional)",
-      "HelpText": "Source backup file password.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "a758e9de-05c6-4879-8541-d7f73215fe87",
-      "Name": "modificationScriptFiles",
-      "Label": "Modification Script Files (optional)",
-      "HelpText": "SQL scripts and/or Data Masker masking set files (Data Masker must be installed on the clone agent machine), separate multiple file paths with ;",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2019-05-16T11:37:47.360Z",
-  "LastModifiedBy": "alex-yates",
-  "$Meta": {
-    "ExportedAt": "2019-05-16T11:37:47.360Z",
-    "OctopusVersion": "2019.2.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "redgate"
-}
\ No newline at end of file
diff --git a/step-templates/redgate-sql-clone-delete-clone.json b/step-templates/redgate-sql-clone-delete-clone.json
deleted file mode 100644
index 400a67367..000000000
--- a/step-templates/redgate-sql-clone-delete-clone.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "Id": "b13ba90b-3e67-4175-aad4-9531783c4c11",
-  "Name": "Redgate - SQL Clone, Delete Clone",
-  "Description": "Deletes a database clone with [Redgate SQL Clone](https://www.red-gate.com/products/dba/sql-clone/index).\n\nRequires SQL Clone.\n\n*Version date: 16th May 2019*",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\nWrite-Debug \"Entering script SQLCloneDeleteTask.ps1\"\n\n# The code for this step template is largely a copy/paste job from the\n# Azure DevOps Services step template which is maintained by Redgate:\n# https://github.com/red-gate/SqlCloneVSTSExtension/blob/master/ImageTask/SQLCloneImageTask.ps1\n# The code was copied and adapted on 16th May 2019.\n\nWrite-Verbose \"cloneServer is $cloneServer\"\nWrite-Verbose \"cloneUser is $cloneUser\"\nWrite-Verbose \"clonePassword is $clonePassword\"\nWrite-Verbose \"cloneSqlServer is $cloneSqlServer\"\nWrite-Verbose \"cloneName is $cloneName\"\n\n# This line is broken: Import-Module \"$PSScriptRoot\\Modules\\RedGate.SQLClone.PowerShell.dll\"\n\nif($cloneUser){\n    $password = ConvertTo-SecureString -String $clonePassword -AsPlainText -Force\n    $credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $cloneUser,$password\n\n}\nConnect-SqlClone -ServerUrl $cloneServer -Credential $credential\nWrite-Output \"Connected to SQL Clone server\"\n\n        $sqlServerParts = $cloneSqlServer.Split('\\', [System.StringSplitOptions]::RemoveEmptyEntries)\n        if ($sqlServerParts.Count -ge 3)\n        {\n            write-error 'SQL Server instance \"' + $cloneSqlServer + '\" has not been recognised, if specifying a named instance please use \"machine\\instance\"'\n            exit 1\n        }\n        $cloneSqlServerHost = $sqlServerParts[0]\n        $instanceName = ''\n        if ($sqlServerParts.Count -ge 2)\n        {\n            $instanceName = $sqlServerParts[1]\n        }\n        try\n        {\n            $instance = Get-SqlCloneSqlServerInstance -MachineName $cloneSqlServerHost -InstanceName $instanceName\n            Write-Output \"Found SQL Server instance\"\n        }\n        catch\n        {\n            $instances = Get-SqlCloneSqlServerInstance\n            $instanceNames = \"`n\"\n            Foreach ($cInstance in $instances)\n            {\n                $instanceNames += $cInstance.Name + \"`n\"\n            }\n            $message = 'SQL Server instance \"' + $cloneSqlServer + '\"  has not been added to SQL Clone, available instances:' + $instanceNames\n            write-error $message\n            exit 1\n        }\n        \n        try\n        {\n            $clone = Get-SqlClone -Name $cloneName -Location $instance\n            Write-Output \"Found clone\"\n        }\n        catch\n        {\n            $clones = Get-SqlClone -Location $instance\n            $cloneNames = \"`n\"\n            Foreach ($cClone in $clones)\n            {\n                $cloneNames += $cClone.Name + \"`n\"\n            }\n            $message = 'SQL Clone clone ' + $cloneName + ' does not exist, available clones on SQL instance \"' + $cloneSqlServer + '\":' + $cloneNames\n            write-error $message\n            exit 1\n        }\n        \n        Write-Output \"Deleting clone\"\n        Remove-SqlClone -Clone $clone | Wait-SqlCloneOperation\n        Write-Output \"Finished deleting clone\"     \n\nWrite-Debug \"Leaving script SQLCloneDeleteTask.ps1\""
-  },
-  "Parameters": [
-    {
-      "Id": "8c140a4c-65a2-4341-a604-73d14775b3a0",
-      "Name": "cloneServer",
-      "Label": "SQL Clone Server (required)",
-      "HelpText": "The URL for your SQL Clone server (e.g. http://sql-clone.example.com:14145)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e5ac1d04-b8a5-440e-ba69-a5d66a53abba",
-      "Name": "cloneUser",
-      "Label": "SQL Clone User (optional)",
-      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5f6288f2-57c9-4a11-91f2-b0c2e3cb9ccd",
-      "Name": "clonePassword",
-      "Label": "SQL Clone Password (optional)",
-      "HelpText": "User account to access SQL Clone. (If left blank Octopus tentacle account will be used.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ab892024-c4b5-46c2-9434-2ad150e3e014",
-      "Name": "cloneSqlServer",
-      "Label": "SQL Server Instance (required)",
-      "HelpText": "The SQL Server instance the clone exists on. This SQL Server instance must have already been added to the SQL Clone Server specified above.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a758e9de-05c6-4879-8541-d7f73215fe87",
-      "Name": "cloneName",
-      "Label": "Clone Name (required)",
-      "HelpText": "The name of the clone to delete.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2019-05-16T11:37:47.360Z",
-  "LastModifiedBy": "alex-yates",
-  "$Meta": {
-    "ExportedAt": "2019-05-16T11:37:47.360Z",
-    "OctopusVersion": "2019.2.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "redgate"
-}
diff --git a/step-templates/redis-install.json b/step-templates/redis-install.json
deleted file mode 100644
index 83c14eb97..000000000
--- a/step-templates/redis-install.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "Id": "3cf1dadf-169d-4fd2-b95b-f5f07343b911",
-  "Name": "Redis - Install service",
-  "Description": "Script will make sure that Redis server is installed as a Windows service\n\n- It will start Redis inside package directory\n- To provide custom config you can prepare your own package (e.g. my-redis-64) or improve this template",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$step  = $OctopusParameters['ris_UnpackageStep']\r\n$force = $OctopusParameters['ris_ForceReinstall']\r\n$name  = $OctopusParameters['ris_ServiceName']\r\n$port  = $OctopusParameters['ris_Port']\r\n\r\n$outputPath = $OctopusParameters[\"Octopus.Action[$step].Package.CustomInstallationDirectory\"]\r\nif(!$outputPath) \r\n{\r\n    $outputPath = $OctopusParameters[\"Octopus.Action[$step].Output.Package.InstallationDirectoryPath\"]\r\n}\r\nif(!$outputPath) \r\n{\r\n    Throw \"Unable to find output path for step $step. Make sure you've selected the correct step for your package.\"\r\n}\r\n\r\n$path   = Join-Path $outputPath '\\tools\\redis-server.exe'\r\nif (-not (Test-Path $path) )\r\n{\r\n    Throw \"$path was not found\"\r\n}\r\n\r\n$service = Get-Service -Name $name -ErrorAction SilentlyContinue\r\nif ($service) {\r\n\r\n    if (-not $force) {\r\n        Write-Host \"Service already installed. Skipping this time.\"\r\n        return\r\n    }\r\n\r\n    Write-Host \">>> Uninstalling with: sc.exe\"\r\n    if ($service.Status -eq 'Running') {\r\n        &\"sc.exe\" stop $name | Write-Host\r\n    }\r\n    &\"sc.exe\" delete $name | Write-Host\r\n\r\n    $limit = 15\r\n    while (Get-Service -Name $name -ErrorAction SilentlyContinue) {\r\n        Start-Sleep -s 1\r\n        \r\n        $limit = $limit - 1\r\n        if ($limit -eq 0) {\r\n            Throw \"Unable to stop Redis service within 15s\"\r\n        }\r\n    }\r\n}\r\n\r\nWrite-Host \">>> Installing with: $path\"\r\n\r\nSet-Location $outputPath\r\n\r\n& $path --service-install --service-name $name --port $port | echo\r\n& $path --service-start   --service-name $name              | echo\r\n\r\nWrite-Host \">>> Verification: Expecting the service with 'Running' status\"\r\n\r\n$limit = 15\r\ndo {\r\n    Start-Sleep -s 1\r\n\r\n    $limit = $limit - 1\r\n    if ($limit -eq 0) {\r\n        Throw \"Redis service did not start within 15s\"\r\n    }\r\n\r\n    $service = Get-Service -Name $name -ErrorAction SilentlyContinue\r\n\r\n} until ($service -and $service.Status -eq 'Running')",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "2fdb42bf-b1f0-4187-b925-bdf4975090e4",
-      "Name": "ris_UnpackageStep",
-      "Label": "Unpackage step",
-      "HelpText": "The step where you unpack the topshelf service",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "58802353-e686-421c-b71c-8866759eca42",
-      "Name": "ris_ServiceName",
-      "Label": "Service name",
-      "HelpText": null,
-      "DefaultValue": "Redis",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "0f7fdded-881d-4bb8-94ee-5d6d71d38575",
-      "Name": "ris_Port",
-      "Label": "Port",
-      "HelpText": null,
-      "DefaultValue": "6379",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "e7411860-8679-4519-b871-dd9724ee357e",
-      "Name": "ris_ForceReinstall",
-      "Label": "Force reinstall",
-      "HelpText": "Service with the same name will be removed before installation",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "J-Sek",
-  "$Meta": {
-    "ExportedAt": "2017-08-31T23:11:05.000Z",
-    "OctopusVersion": "3.16.6",
-    "Type": "ActionTemplate"
-  },
-  "Category": "redis"
-}
-
diff --git a/step-templates/register-linux-tentacle.json b/step-templates/register-linux-tentacle.json
deleted file mode 100644
index d6f90e929..000000000
--- a/step-templates/register-linux-tentacle.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Id": "0f119877-288c-4110-aec9-0f693c2e7922",
-  "Name": "Register Linux Tentacle",
-  "Description": "This Step Template will Register a Linux Tentacle.\n[Reference](https://octopus.com/docs/infrastructure/deployment-targets/linux).",
-  "ActionType": "Octopus.Script",
-  "Version": 17,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$envname = \"#{Octopus.Environment.Name}\"\n$serverurl = \"#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}\"\n\n$headers = @{\"X-Octopus-ApiKey\"=\"$apikey\"}\n$putHeaders = @{\"X-HTTP-Method-Override\"=\"PUT\"; \"X-Octopus-ApiKey\"=\"$apikey\"}\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-WebRequest \"$serverurl/api\" -Headers $headers -Method Get -UseBasicParsing | ConvertFrom-Json;\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif(Test-SpacesApi) {\n\t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which could indicate you do not have the correct permissions.\";\n    }\n\t$baseApiUrl = \"/api/$spaceId\" ;\n} else {\n\t$baseApiUrl = \"/api\" ;\n}\n\n$environments = Invoke-RestMethod \"$serverurl$baseApiUrl/environments/all\" -Headers $headers -Method Get\n$theEnvironment = $environments | ? { $_.Name -eq $envname }\n\n$machines = Invoke-RestMethod \"$serverurl$baseApiUrl/machines/all\" -Headers $headers -Method Get\n$theMachine = $machines | ? { $_.Name -eq $machineName }\n\n$accounts = Invoke-RestMethod \"$serverurl$baseApiUrl/accounts/all\" -Headers $headers -Method Get\n$theAccount = $accounts | ? { $_.Name -eq $accountname }\n\nif (!($theMachine.Name -eq $machineName))\n{\n\t#this returns a MachineResource, but we need to post a DeploymentTargetResource which requires environments and roles\n\t$discovered = Invoke-RestMethod \"$serverurl$baseApiUrl/machines/discover?host=$hostdetails&type=Ssh\" -Headers $headers -Method Get\n    $discovered.Endpoint.AccountId = $theAccount.Id\n    $discovered.Name = $machineName\n\t$discovered | add-member -Name \"Roles\" -value @($role) -MemberType NoteProperty\n    $discovered | add-member -Name \"EnvironmentIds\" -value @($theEnvironment.Id) -MemberType NoteProperty\n\t\n    $registerStatus = Invoke-RestMethod \"$serverurl$baseApiUrl/machines\" -Headers $headers -Method Post -Body ($discovered | ConvertTo-Json -Depth 10)\n    \n    If ($registerStatus.Status -eq \"Online\")\n    {\n        Write-Output \"$registerStatus.Name is Successfully Registered\"\n    }\n    else\n    {\n        Write-Warning \"$hostdetails had issues, Please check Environments Page\"\n    }\n}\nelse\n{\n    Write-Output \"Machine with name $machineName already exists with the status $($theMachine.Status)\" \n}",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "c79678c9-4d64-417d-982f-904683631240",
-      "Name": "apikey",
-      "Label": "API Key",
-      "HelpText": "API Key with appropriate access",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "bca181ad-f28b-42a3-ab2c-c79274224c11",
-      "Name": "accountname",
-      "Label": "Account Name",
-      "HelpText": "The Account Name with access to the Host name to register",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3ace411d-18d2-4349-ab8d-02823e933f6e",
-      "Name": "hostdetails",
-      "Label": "HostName/IPaddress",
-      "HelpText": "HostName or IPaddress of the Machine to register",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "517a89a1-be83-4cce-9e32-8359d0715686",
-      "Name": "role",
-      "Label": "Role Name",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "37527e4f-643a-4e06-9650-1a40d11d7b7a",
-      "Name": "machineName",
-      "Label": "Machine Name",
-      "HelpText": "Machine Name to register",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-   "LastModifiedOn": "2017-01-09T20:46:19.041+00:00",
-   "LastModifiedBy": "benjimac93",
-  "$Meta": {
-    "ExportedAt": "2021-08-23T12:40:10.975Z",
-    "OctopusVersion": "2021.1.7687",
-    "Type": "ActionTemplate"
-  },
- "Category": "Linux"
-}
diff --git a/step-templates/registry-update-configuration-variables-in-export-file.json b/step-templates/registry-update-configuration-variables-in-export-file.json
deleted file mode 100644
index d97ef3dbb..000000000
--- a/step-templates/registry-update-configuration-variables-in-export-file.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "7f9c1f6d-8305-4a37-a4c6-9b47ea4699d9",
-  "Name": "Registry - Update Configuration Variables In Export File",
-  "Description": "Replace values in a .reg file (Registry Export) automatically with octopus variables.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$regExports\r\n) \r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue   \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n# More custom functions would go here\r\n\r\n& {\r\n    param(\r\n        [string]$regExports\r\n    ) \r\n\r\n    Write-Host \"Registry Export Configuration Variables\"\r\n    Write-Host \"regExports: $regExports\"\r\n\r\n    ForEach ($regExp in $regExports.Split(';'))  {\r\n        \r\n        $regFile = $regExp.Trim()\r\n        \r\n        if( $regFile.Length -lt 1 ){ break }\r\n\r\n        $output = \"\"\r\n\r\n        $fi=Get-Item $regFile\r\n        $file=$fi.OpenText()\r\n\r\n        While(!($file.EndOfStream)){\r\n            $line=$file.ReadLine()\r\n            $outputLine = $line\r\n\r\n            if($line -match \"`\"=`\"\"){\r\n                $keyValue = $line -split \"`\"=`\"\"\r\n                $key = $keyValue[0] -replace \"^`\"\" , \"\"\r\n                $oldVal = $keyValue[1] -replace \"`\"$\" , \"\"\r\n                $newVal = $OctopusParameters[$key]\r\n                \r\n                Write-Host \"Looking for key $key in OctopusParameters hash\"\r\n\r\n                if($newVal){\r\n                    Write-Host \"Updating $key from $oldVal to $newVal\"\r\n                    $outputLine = \"`\"$key`\"=`\"$newVal`\"\"\r\n                }\r\n            }\r\n            \r\n            $output += $outputLine + \"`r`n\"\r\n        }\r\n\r\n        $output | Out-File \"c:\\temp\\output.reg\"\r\n    }\r\n\r\n } `\r\n(Get-Param 'regExports' -Required)",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "regExports",
-      "Label": "Registry Exports",
-      "HelpText": "A list of .reg files (Registry exports) separated by a ;",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-07-02T14:58:41.311+00:00",
-  "LastModifiedBy": "jbennett",
-  "$Meta": {
-    "ExportedAt": "2015-07-02T14:59:00.322+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/retention-policy.json b/step-templates/retention-policy.json
deleted file mode 100644
index d41b3507e..000000000
--- a/step-templates/retention-policy.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "Id": "46705230-c116-41c6-ba4b-b58d43f4f0e1",
-  "Name": "Retention Policy",
-  "Description": "Applies retention policy for built-in package repository by specified package id. Useful when you are using variables in PackageId parameter of deploy package step and built-in retention policy for package repository is not deleting packages.",
-  "ActionType": "Octopus.Script",
-  "Version": 15,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Get-Parameter($Name, [switch]$Required, $Default, [switch]$FailOnValidate) {\n    $result = $null\n    $errMessage = [string]::Empty\n\n    If ($OctopusParameters -ne $null) {\n        $octopusParameterName = (\"Retention.\" + $Name)\n        $result = $OctopusParameters[$octopusParameterName]\n        Write-Host \"Octopus paramter value for $octopusParameterName : $result\"\n    }\n\n    If ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    If ($result -eq $null) {\n        If ($Required) {\n            $errMessage = \"Missing parameter value $Name\"\n        } Else {\n            $result = $Default\n        }\n    } \n\n    If (-Not [string]::IsNullOrEmpty($errMessage)) {\n        If ($FailOnValidate) {\n            Throw $errMessage\n        } Else {\n            Write-Warning $errMessage\n        }\n    }\n\n    return $result\n}\n\nFunction Validate-Parameters([switch]$FailOnValidate) {\n    $errMessage = [string]::Empty\n\n    If ($retentionCriteria.ToLower() -eq \"days\") {\n        If ($retentionValue -lt 3) {\n            $errMessage = \"Retention Value not specified or must be greater than 3 days!\"\n        }\n    } ElseIf ($retentionCriteria.ToLower() -eq \"number\") {\n        If ($retentionValue -lt 10) {\n            $errMessage = \"Retention Value not specified or must be greater than 9 packages!\"\n        }\n    } Else {\n        $errMessage = \"Retention Criteria must be 'days' or 'number'!\"\n    }\n    \n    If ([string]::IsNullOrEmpty($errMessage)) {\n       return $true;\n    } Else {\n        If ($FailOnValidate) {\n            Throw $errMessage\n        } Else {\n            Write-Warning $errMessage\n            return $false;\n        }\n    }\n}\n\n& {\n    Write-Host \"Start RetentionPolicy\"\n\n    $retentionFailOnValidate = [System.Convert]::ToBoolean([string](Get-Parameter \"FailOnValidate\" $false \"False\" $false))\n    $packagesRootDirectoryPath = [string] (Get-Parameter \"PackagesRootDirectory\" $true [string]::Empty $retentionFailOnValidate)\n    $retentionCriteria = [string] (Get-Parameter \"Criteria\" $true \"days\" $retentionFailOnValidate)\n    $retentionValue = [int] (Get-Parameter \"Value\" $true 30 $retentionFailOnValidate)\n    $retentionPackageId = [string] (Get-Parameter \"PackageId\" $true [string]::Empty $retentionFailOnValidate)\n\n    If ((Validate-Parameters $retentionFailOnValidate)) {\n\n        # Filter out package folders by name if parameter specified\n        $packageDirectories = Get-ChildItem $packagesRootDirectoryPath | ?{ $_.PSIsContainer } | ?{ $_.Name -eq $retentionPackageId }\n\n        If ($packageDirectories.Length -le 0) {\n            Write-Warning \"No package directories found!\"\n        } Else {\n            ForEach ($packageDirectory in $packageDirectories) {\n                $packageFiles = Get-ChildItem $packageDirectory.FullName\n                If ($packageFiles.Length -gt 0) {\n                    Write-Host (\"Package files found in directory: \" + $packageDirectory.FullName + \" - \" + $packageFiles.Length)\n                    $packageFilesObsolete = @()\n\n                    If ($retentionCriteria -eq \"days\") {\n                        $packageFilesObsolete = $packageFiles | ?{ $_.LastWriteTime -le ((Get-Date).AddDays($retentionValue * -1)) }\n                    } ElseIf ($retentionCriteria -eq \"number\") {\n                        $filesToDelete = ($packageFiles.Length - $retentionValue)\n                        If ($filesToDelete -gt 0) {\n                            $packageFilesObsolete = $packageFiles | Sort-Object LastWriteTime | Select-Object -First $filesToDelete\n                        }\n                    }\n\n                    If ($packageFilesObsolete.Length -gt 0) {\n                        Write-Host (\"Applying retention policy for \" + $packageFilesObsolete.Length + \" obsolete files in directory: \" + $packageDirectory.FullName)\n                        ForEach ($packageVersionFileObsolete in $packageFilesObsolete) {\n                            Remove-Item -Path $packageVersionFileObsolete.FullName -Force -Recurse\n                        }\n                    } Else {\n                        Write-Host (\"No package files deleted, all files match policy rules!\")\n                    }\n                } Else {\n                    Write-Host (\"No files found, removing empty directory: \" + $packageDirectory.FullName)\n                    Remove-Item -Path $packageDirectory.FullName -Force -Recurse\n                }\n            }\n        }\n    } ElseIf ($retentionFailOnValidate -eq $true) {\n        throw \"Missing or invalid parameter values!\"\n    }\n\n    Write-Host \"End RetentionPolicy\"\n}\n\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "Retention.PackagesRootDirectory",
-      "Label": "Packages root directory",
-      "HelpText": "Packages directory path on Octopus server (e.g. D:\\Octopus\\Packages).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Retention.Criteria",
-      "Label": "Criteria",
-      "HelpText": "Criteria by which to apply retention policy - days or number of packages.",
-      "DefaultValue": "days",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "days|Days\nnumber|Number of packages"
-      }
-    },
-    {
-      "Name": "Retention.Value",
-      "Label": "Value",
-      "HelpText": "Value for selected criteria.\nMin value for days criteria - 3.\nMin value for number criteria - 10.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Retention.PackageId",
-      "Label": "Package Id",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Retention.FailOnValidate",
-      "Label": "Fail on validate",
-      "HelpText": "If true throws exception when parameter validation fails. If false just outputs warning messages to deployment log and doesn't fail whole deployment.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedBy": "sarbis",
-  "$Meta": {
-    "ExportedAt": "2016-08-27T20:53:13.764+00:00",
-    "OctopusVersion": "3.3.16",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/rotate_azure_load_balancer_pool.json b/step-templates/rotate_azure_load_balancer_pool.json
deleted file mode 100644
index aac6122fc..000000000
--- a/step-templates/rotate_azure_load_balancer_pool.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "947623c6-940d-4a54-a18b-c755a1035dce",
-  "Name": "Rotate Azure Load Balancer Pool",
-  "Description": "Updates all rules on an Azure load balancer to point to the next backend pool in a specified list. The current backend pool will be determined and the next pool in a provided list will become the target of all rules. If the current pool doesn't exist in the list, the first pool in the list will be used. This means that a specific pool can be chosen by specifying only a single pool.",
-  "ActionType": "Octopus.AzurePowerShell",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptBody": "$LoadBalancerNames = [string]$OctopusParameters['RotateAzureLoadBalancerPool.LoadBalancerName']\r\n$AvailablePools = [string]$OctopusParameters['RotateAzureLoadBalancerPool.AvailablePools']\r\n$RuleNames = [string]$OctopusParameters['RotateAzureLoadBalancerPool.RuleNames']\r\n$WhatIf = [bool]::Parse($OctopusParameters['RotateAzureLoadBalancerPool.WhatIf'])\r\n\r\nif ($null -eq $LoadBalancerNames) {\r\n    throw 'No load balancers selected. Please select at least one load balancer.'\r\n} else {\r\n    # Trim white space and blank lines and get all load balancers that match the names.\r\n    $loadBalancers = $LoadBalancerNames.Split(\"`n\").Trim().Where({ $_ }) | ForEach-Object { Get-AzLoadBalancer -Name $_ }\r\n}\r\nif ($null -eq $AvailablePools) {\r\n    throw 'No pools selected. Please select at least one pool.'\r\n} else {\r\n    $AvailablePools = $AvailablePools.Split(\"`n\").Trim().Where({ $_ }) # Trim white space and blank lines.\r\n}\r\nif ($null -eq $RuleNames) {\r\n    throw 'No rules selected. Please select at least one rule name or use an asterisk (*) to select all rules.'\r\n} else {\r\n    $RuleNames = $RuleNames.Split(\"`n\").Trim().Where({ $_ }) # Trim white space and blank lines.\r\n}\r\n\r\nforeach ($loadBalancer in $loadBalancers) {\r\n    $loadBalancerName = $loadBalancer.Name\r\n    $resourceGroupName = $loadBalancer.ResourceGroupName\r\n    $allPools = Get-AzLoadBalancerBackendAddressPool -LoadBalancerName $loadBalancerName -ResourceGroupName $resourceGroupName\r\n\r\n    Write-Host \"Updating Load Balancer '$loadBalancerName'.\"\r\n\r\n    # Start by assuming no rules match\r\n    $rules = @()\r\n\r\n    # Add each distinct rule that matches one of the rule names\r\n    foreach ($ruleName in $RuleNames) {\r\n        $rules += $LoadBalancer.LoadBalancingRules | Where-Object {\r\n            $_.Id.Split('/')[-1] -like $ruleName -and\r\n            $_.Id -notin $rules.Id\r\n        }\r\n    }\r\n\r\n    if ($rules.Count -eq 0) {\r\n        Write-Warning \"No matching rules were found on load balancer '$loadBalancerName'.\"\r\n        continue\r\n    }\r\n\r\n    # Resolve any wildcards in AvailablePools to get a list of valid pool names.\r\n    $validPoolNames = @()\r\n    foreach ($name in $AvailablePools) {\r\n        $validPoolNames += $allPools.Name | Where-Object { $_ -like $name }\r\n    }\r\n\r\n    # The same pool could match multiple wildcards so get a unique list\r\n    if ($validPoolNames) {\r\n        $validPoolNames = [array]($validPoolNames | Select-Object -Unique)\r\n    } else {\r\n        Write-Warning \"No valid pools were found on load balancer '$loadBalancerName'.\"\r\n        continue\r\n    }\r\n\r\n    # Update each rule with a new pool \r\n    foreach ($rule in $rules) {\r\n        $currentPoolName = $rule.BackendAddressPool.Id.Split('/')[-1]\r\n\r\n        # This will find the next pool in the list, cycling back to the beginning if at the end. If the current pool isn't in the list,\r\n        # its index will be -1. The next index will be zero so the first pool will be selected. \r\n        $index = $validPoolNames.IndexOf($currentPoolName)\r\n        $nextIndex = ($index + 1) % $validPoolNames.Count\r\n        $newPoolName = $validPoolNames[$nextIndex]\r\n\r\n        # Get the new pool to use\r\n        if ($newPoolName -in $allPools.Name) {\r\n            $newPool = Get-AzLoadBalancerBackendAddressPool -ResourceGroupName $resourceGroupName -LoadBalancerName $loadBalancerName -Name $newPoolName\r\n        } else {\r\n            throw \"Backend Pool '$newPoolName' does not exist on load balancer '$loadBalancerName'.\"\r\n        }\r\n\r\n        if ($currentPoolName -eq $newPoolName) {\r\n            Write-Highlight \"Rule '$($rule.Name)' is already pointing to pool '$currentPoolName' on load balancer '$loadBalancerName'.\"\r\n        } else {\r\n            Write-Highlight \"Rule '$($rule.Name)' is pointing to pool '$currentPoolName'. Updating to pool '$newPoolName' on load balancer '$loadBalancerName'.\"\r\n            $rule.BackendAddressPool.Id = $newPool.Id\r\n\r\n            foreach ($pool in $rule.BackendAddressPools) {\r\n                $pool.Id = $newPool.Id\r\n            }\r\n        }\r\n    }\r\n\r\n    if ($WhatIf) {\r\n        Write-Highlight \"WhatIf is set to true so skipping changes on Azure for load balancer '$loadBalancerName'.\"\r\n    } else {\r\n        Write-Verbose \"Writing changes to Azure for load balancer '$loadBalancerName'.\"\r\n        Set-AzLoadBalancer -LoadBalancer $loadBalancer | Out-Null\r\n    }\r\n}\r\n",
-    "Octopus.Action.Azure.AccountId": "#{RotateAzureLoadBalancerPool.Account}"
-  },
-  "Parameters": [
-    {
-      "Id": "cef3a407-e9e1-44e5-9dcf-9dcf586f4958",
-      "Name": "RotateAzureLoadBalancerPool.Account",
-      "Label": "Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "7a8c14dd-072d-432e-9071-296381dd9cc9",
-      "Name": "RotateAzureLoadBalancerPool.LoadBalancerName",
-      "Label": "Load Balancer",
-      "HelpText": "The name of the load balancer to use. Multiple load balancers can be selected if they have the same pool names. Wildcards are supported.\n\nEnter one load balancer per line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "1295c989-efbd-4605-a362-b72ea9762c4f",
-      "Name": "RotateAzureLoadBalancerPool.AvailablePools",
-      "Label": "Available Pools",
-      "HelpText": "A list of available pools to use. If multiple pools are specified, rules will be updated to use the next pool in the list. If a single pool is specified, rules will use that pool. Wildcards are supported.\n\nEnter one pool per line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "ed5fc080-37c8-44ce-a89a-76313c89f10d",
-      "Name": "RotateAzureLoadBalancerPool.RuleNames",
-      "Label": "Rule Names",
-      "HelpText": "A list of rule names to update. Wildcards are supported.\n\nEnter one rule per line.",
-      "DefaultValue": "*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "27caa59c-5f1a-42f8-a545-5075d47f3182",
-      "Name": "RotateAzureLoadBalancerPool.WhatIf",
-      "Label": "What If",
-      "HelpText": "Will just report expected changes, but not update the load balancer.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.AzurePowerShell",
-  "$Meta": {
-    "ExportedAt": "2023-11-22T03:48:35.019Z",
-    "OctopusVersion": "2023.2.13113",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "REOScotte",
-  "Category": "octopus"
-}
diff --git a/step-templates/roundhouse-database-migration.json b/step-templates/roundhouse-database-migration.json
deleted file mode 100644
index 82b6a7fcf..000000000
--- a/step-templates/roundhouse-database-migration.json
+++ /dev/null
@@ -1,288 +0,0 @@
-{
-    "Id": "6da0afee-ed55-4c75-a13b-5e8ce42ef027",
-    "Name": "RoundhousE Database Migrations",
-    "Description": "Database migrations using [RoundhousE](https://github.com/chucknorris/roundhouse).\nWith this template you can either include RoundhousE with your package or use the `Download RoundhousE?` feature to download it at deploy time.  If you're downloading, you can choose the version by specifying it in the `Version of RoundhousE`.\n\nNOTE: \n - AWS EC2 IAM Role authentication requires the AWS CLI be installed.\n - To run on Linux, the machine must have both PowerShell Core and .NET Core 3.1 installed.\n\nNote - The RoundhousE GitHub Project has been abandoned and as a result this template is now deprecated.  Version 9 will be the last release of this template.",
-    "ActionType": "Octopus.Script",
-    "Version": 9,
-    "Author": "twerthi",
-    "Packages": [
-      {
-        "Id": "249cd84b-2e41-4001-8222-f1a60f9a50ea",
-        "Name": "roundhousePackage",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "roundhousePackage"
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Configure template\n\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n\tWrite-Host \"Determining Operating System...\"\n    switch ([System.Environment]::OSVersion.Platform)\n    {\n    \t\"Win32NT\"\n        {\n        \t# Set variable\n            $IsWindows = $true\n            $IsLinux = $false\n        }\n        \"Unix\"\n        {\n        \t$IsWindows = $false\n            $IsLinux = $true\n        }\n    }\n}\n\n# Define parameters\n$roundhouseExecutable = \"\"\n$roundhouseOutputPath = [System.IO.Path]::Combine($OctopusParameters[\"Octopus.Action.Package[RoundhousEPackage].ExtractedPath\"], \"output\")\n$roundhouseSsl = [System.Convert]::ToBoolean($roundhouseSsl)\n\n# Determines latest version of github repo\nFunction Get-LatestVersionNumber\n{\n    # Define parameters\n    param ($GitHubRepository)\n        \n    # Define local variables\n    $releases = \"https://api.github.com/repos/$GitHubRepository/releases\"\n    \n    # Get latest version\n    Write-Host \"Determining latest release ($releases) ...\"\n    \n    $tags = (Invoke-WebRequest $releases -UseBasicParsing | ConvertFrom-Json)\n    \n    # Find the latest version with a downloadable asset\n    foreach ($tag in $tags)\n    {\n        if ($tag.assets.Count -gt 0)\n        {\n            #return $tag.assets.browser_download_url\n            return $tag.tag_name\n        }\n    }\n\n    # Return the version\n    return $null    \n}\n\n# Change the location to the extract path\nSet-Location -Path $OctopusParameters[\"Octopus.Action.Package[RoundhousEPackage].ExtractedPath\"]\n\n# Check to see if download is specified\nif ([System.Boolean]::Parse($roundhouseDownloadNuget))\n{\n    # Set secure protocols\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n\t# Check to see if version number specified\n    if ([string]::IsNullOrEmpty($roundhouseNugetVersion))\n    {\n    \t# Get the latest version number\n        $roundhouseNugetVersion = Get-LatestVersionNumber -GitHubRepository \"chucknorris/roundhouse\"\n    }\n\n    # Check for download folder\n    if ((Test-Path -Path \"$PSSCriptRoot\\roundhouse\") -eq $false)\n    {\n        # Create the folder\n        New-Item -ItemType Directory -Path \"$PSSCriptRoot\\roundhouse\"\n    }\n    \n    # Download nuget package\n    Write-Output \"Downloading https://github.com/chucknorris/roundhouse/releases/download/$roundhouseNugetVersion/dotnet-roundhouse.$roundhouseNugetVersion.nupkg ...\"\n    Invoke-WebRequest -Uri \"https://github.com/chucknorris/roundhouse/releases/download/$roundhouseNugetVersion/dotnet-roundhouse.$roundhouseNugetVersion.nupkg\" -OutFile \"$PSSCriptRoot\\roundhouse\\dotnet-roundhouse.$roundhouseNugetVersion.nupkg\"\n\n    # Change file extension\n    $nugetPackage = Get-ChildItem -Path \"$PSSCriptRoot\\roundhouse\\dotnet-roundhouse.$roundhouseNugetVersion.nupkg\"\n    $nugetPackage | Rename-Item -NewName $nugetPackage.Name.Replace(\".nupkg\", \".zip\")\n    \n    # Extract the package\n    Write-Output \"Extracting dotnet-roundhouse.$roundhouseNugetVersion.nupkg ...\"\n    Expand-Archive -Path \"$PSSCriptRoot\\roundhouse\\dotnet-roundhouse.$roundhouseNugetVersion.zip\" -DestinationPath \"$PSSCriptRoot\\roundhouse\"\n}\n\n# Set Executable depending on OS\nif ($IsWindows)\n{\n  # Look for older .exe\n  $roundhouseExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq \"rh.exe\"}\n}\n\nif ([string]::IsNullOrWhitespace($roundhouseExecutable))\n{\n\t# Look for just rh.dll\n    $roundhouseExecutable = Get-ChildItem -Path $PSSCriptRoot -Recurse | Where-Object {$_.Name -eq \"rh.dll\"}\n}\n\nif ([string]::IsNullOrWhitespace($roundhouseExecutable))\n{\n    # Couldn't find RoundhousE\n    Write-Error \"Couldn't find the RoundhousE executable!\"\n}\n\n# Build the arguments\n$roundhouseSwitches = @()\n\n# Update the connection string based on authentication method\nswitch ($roundhouseAuthenticationMethod)\n{\n    \"awsiam\"\n    {\n        # Region is part of the RDS endpoint, extract\n        $region = ($roundhouseServerName.Split(\".\"))[2]\n\n        Write-Host \"Generating AWS IAM token ...\"\n        $roundhouseUserPassword = (aws rds generate-db-auth-token --hostname $roundhouseServerName --region $region --port $roundhouseServerPort --username $roundhouseUserName)       \n        $roundhouseUserInfo = \"Uid=$roundhouseUserName;Pwd=$roundhouseUserPassword;\"\n\n        break\n    }\n\n    \"usernamepassword\"\n    {\n    \t# Append remaining portion of connection string\n        $roundhouseUserInfo = \"Uid=$roundhouseUserName;Pwd=$roundhouseUserPassword;\"\n\n\t\tbreak    \n\t}\n\n    \"windowsauthentication\"\n    {\n      # Append remaining portion of connection string\n\t  $roundhouseUserInfo = \"integrated security=true;\"\n      \n      # Append username (required for non\n      $roundhouseUserInfo += \"Uid=$roundhouseUserName;\"\n    }\n}\n\n\n# Configure connnection string based on technology\nswitch ($roundhouseDatabaseServerType)\n{\n    \"sqlserver\"\n    {\n        # Check to see if port has been defined\n        if (![string]::IsNullOrEmpty($roundhouseServerPort))\n        {\n            # Append to servername\n            $roundhouseServerName += \",$roundhouseServerPort\"\n\n            # Empty the port\n            $roundhouseServerPort = [string]::Empty\n        }\n    }\n    \"mariadb\"\n    {\n    \t# Use the MySQL client\n        $roundhouseDatabaseServerType = \"mysql\"\n        $roundhouseServerPort = \"Port=$roundhouseServerPort;\"\n    }\n    default\n    {\n        $roundhouseServerPort = \"Port=$roundhouseServerPort;\"\n    }\n}\n\n# Build base connection string\n$roundhouseServerConnectionString = \"--connectionstring=Server=$roundhouseServerName;$roundhouseServerPort $roundhouseUserInfo Database=$roundhouseDatabaseName;\"\n\nif ($roundhouseSsl -eq $true)\n{\n\tif (($roundhouseDatabaseServerType -eq \"mariadb\") -or ($roundhouseDatabaseServerType -eq \"mysql\") -or ($roundhouseDatabaseServerType -eq \"postgres\"))\n    {\n    \t# Add sslmode\n        $roundhouseServerConnectionString += \"SslMode=Require;Trust Server Certificate=true;\"\n    }\n    else\n    {\n    \tWrite-Warning \"Invalid Database Server Type selection for SSL, ignoring setting.\"\n    }\n}\n\n$roundhouseSwitches += $roundhouseServerConnectionString\n\n$roundhouseSwitches += \"--databasetype=$roundhouseDatabaseServerType\"\n$roundhouseSwitches += \"--silent\"\n\n\n# Check for folder definitions\nif (![string]::IsNullOrEmpty($roundhouseUpFolder))\n{\n    # Add up folder\n    $roundhouseSwitches += \"--up=$roundhouseUpFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseAlterDatabaseFolder))\n{\n    $roundhouseSwitches += \"--alterdatabasefolder=$roundhouseAlterDatabaseFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseRunBeforeUpFolder))\n{\n    $roundhouseSwitches += \"--runbeforeupfolder=$roundhouseRunBeforeUpFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseFunctionsFolder))\n{\n    $roundhouseSwitches += \"--functionsfolder=$roundhouseFunctionsFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseViewsFolder))\n{\n    $roundhouseSwitches += \"--viewsfolder=$roundhouseViewsFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseSprocsFolder))\n{\n    $roundhouseSwitches += \"--sprocsfolder=$roundhouseSprocsFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseIndexFolder))\n{\n    $roundhouseSwitches += \"--indexesfolder=$roundhouseIndexFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseRunAfterAnyTimeFolder))\n{\n    $roundhouseSwitches += \"--runAfterOtherAnyTimeScriptsFolder=$roundhouseRunAfterAnyTimeFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhousePermissionsFolder))\n{\n    $roundhouseSwitches += \"--permissionsfolder=$roundhousePermissionsFolder\"\n}\n\nif (![string]::IsNullOrEmpty($roundhouseTriggerFolder))\n{\n    $roundhouseSwitches += \"--triggersfolder=$roundhouseTriggerFolder\"\n}\n\nif ([System.Boolean]::Parse($roundhouseDryRun))\n{\n    $roundhouseSwitches += \"--dryrun\"\n}\n\nif ([System.Boolean]::Parse($roundhouseRecordOutput))\n{\n    $roundhouseSwitches += \"--outputpath=$roundhouseOutputPath\"\n}\n\n# Add transaction switch\n$roundhouseSwitches += \"--withtransaction=$($roundhouseWithTransaction.ToLower())\"\n\n# Check for version\nif (![string]::IsNullOrEmpty($roundhouseVersion))\n{\n    # Add version\n    $roundhouseSwitches += \"--version=$roundhouseVersion\"\n}\n\n# Display what's going to be run\nif (![string]::IsNullOrWhitespace($roundhouseUserPassword))\n{\n\tWrite-Host \"Executing $($roundhouseExecutable.FullName) with $($roundhouseSwitches.Replace($roundhouseUserPassword, \"****\"))\"\n}\nelse\n{\n\tWrite-Host \"Executing $($roundhouseExecutable.FullName) with $($roundhouseSwitches)\"\n}\n\n# Execute RoundhousE\nif ($roundhouseExecutable.FullName.EndsWith(\".dll\"))\n{\n\t& dotnet $roundhouseExecutable.FullName $roundhouseSwitches\n}\nelse\n{\n\t& $roundhouseExecutable.FullName $roundhouseSwitches\n}\n\n# If the output path was specified, attach artifacts\nif ([System.Boolean]::Parse($roundhouseRecordOutput))\n{    \n    # Zip up output folder content\n    Add-Type -Assembly 'System.IO.Compression.FileSystem'\n    \n    $zipFile = \"$($OctopusParameters[\"Octopus.Action.Package[RoundhousEPackage].ExtractedPath\"])/output.zip\"\n    \n\t[System.IO.Compression.ZipFile]::CreateFromDirectory($roundhouseOutputPath, $zipFile)\n    New-OctopusArtifact -Path \"$zipFile\" -Name \"output.zip\"\n}\n"
-    },
-    "Parameters": [
-      {
-        "Id": "7ab35b02-b5c7-4818-b282-4915a93d78ce",
-        "Name": "roundhousePackage",
-        "Label": "RoundhousEPackage",
-        "HelpText": "The package containing the scripts for RoundhousE to deploy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "b2bb212c-cf5a-4c48-88c7-045ae7841fcc",
-        "Name": "roundhouseServerName",
-        "Label": "Database Server Name",
-        "HelpText": "Name or IP address of the server being deployed to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7d78b1fb-e45a-484a-bcc7-e3360ab69342",
-        "Name": "roundhouseServerPort",
-        "Label": "Database Server Port",
-        "HelpText": "Port number for the database server.  Uses default server port if left blank.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "8363dfa2-4509-4c57-9784-5baf27e96397",
-        "Name": "roundhouseAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Method used to authenticate to the database server.",
-        "DefaultValue": "usernamepassword",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "awsiam|AWS EC2 IAM Role\nusernamepassword|Username\\Password\nwindowsauthentication|Windows Authentication"
-        }
-      },  
-      {
-        "Id": "a49823d8-9269-48e1-92fb-819712fb56a4",
-        "Name": "roundhouseDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "Name of the database to deploy to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c4988c69-539d-48c7-8218-51b82b6253a6",
-        "Name": "roundhouseSsl",
-        "Label": "Force SSL",
-        "HelpText": "Check this box for force connection string to use SSL.  Only applicable to MariaDB, MySQL, and PostgreSQL database types.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },      
-      {
-        "Id": "99efe391-c705-4124-9b89-b8c95481d537",
-        "Name": "roundhouseVersion",
-        "Label": "Database Version",
-        "HelpText": "Version number of your database migration.  Default value is the version of the RoundhousE package.",
-        "DefaultValue": "#{Octopus.Action.Package[RoundhousEPackage].PackageVersion}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "2e27695f-4789-456a-9158-a847b2059d32",
-        "Name": "roundhouseUsername",
-        "Label": "Database Username",
-        "HelpText": "Username of the account with sufficient permissions to execute scripts.  (Leave blank for Integrated Authentication.)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "2bf4e801-263f-49d0-af19-339310c63856",
-        "Name": "roundhouseUserPassword",
-        "Label": "Database User Password",
-        "HelpText": "Password for the Database Username account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "9ddd49a7-92a9-419a-aa07-70c569d88540",
-        "Name": "roundhouseDatabaseServerType",
-        "Label": "Database Server Type",
-        "HelpText": "The database technology being deployed to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "mariadb|MariaDB\nmysql|MySQL\noracle|Oracle\npostgres|PostgreSQL\nsqlserver|SQL Server"
-        }
-      },
-      {
-        "Id": "0d748383-fd88-4dc2-ad8e-7b6f12137e3b",
-        "Name": "roundhouseWithTransaction",
-        "Label": "Use Transaction?",
-        "HelpText": "Check this box if you want all scripts to be run within the same transaction.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "06f538af-087a-4d59-958d-90c2e4decebf",
-        "Name": "roundhouseDryRun",
-        "Label": "Dry Run?",
-        "HelpText": "Check this box if you want to perform a dry run.  Results are recorded and attached as deployment artifacts if you check Record Output.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "ec772c86-c12a-4f4f-8710-6426152faa72",
-        "Name": "roundhouseRecordOutput",
-        "Label": "Record Output?",
-        "HelpText": "Check this box to record the output of the run.  Useful for gathering what would be changed for approval purposes.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "46ee4671-67b2-4e45-b484-6773b41c2bf8",
-        "Name": "roundhouseUpFolder",
-        "Label": "Up Folder Path",
-        "HelpText": "Relative location of the Up folder.  If left blank, .\\up is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "55e0bf86-b675-4204-9e0b-d39d20b15eea",
-        "Name": "roundhouseAlterDatabaseFolder",
-        "Label": "AlterDatabase Folder Path",
-        "HelpText": "AlterDatabase folder path.  If left blank, .\\alterDatabase is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "cd473440-f9a9-4a5d-b48c-46ee63a92e7a",
-        "Name": "roundhouseRunBeforeUpFolder",
-        "Label": "RunBeforeUp Folder Path",
-        "HelpText": "RunBeforeUp folder path.  If left blank, .\\runbeforeUp is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "53fab9f0-f310-482c-985c-e6efdf206117",
-        "Name": "roundhouseFunctionsFolder",
-        "Label": "Functions Folder Path",
-        "HelpText": "Filepath for user defined functions.  If left blank, .\\functions is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "66e7ce09-798a-42a6-9e4e-f4c952789af8",
-        "Name": "roundhouseViewsFolder",
-        "Label": "Views Folder Path",
-        "HelpText": "Filepath for view scripts.  If left blank, .\\views is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5d905d17-c041-4981-9521-7a827bac3a87",
-        "Name": "roundhouseSprocsFolder",
-        "Label": "Sprocs Folder Path",
-        "HelpText": "File path for stored procedures.  If left blank, .\\sprocs is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d9994dc7-3118-45c6-b8eb-80501daf03e9",
-        "Name": "roundhouseTriggerFolder",
-        "Label": "Trigger folder path",
-        "HelpText": "File path for database triggers.  If left blank .\\triggers is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fa34cd00-3479-47cd-94d1-637263ebab71",
-        "Name": "roundhouseIndexFolder",
-        "Label": "Index Folder Path",
-        "HelpText": "File path for Index scripts.  If left blank, .\\indexes is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e97ba5b9-da0d-4395-887f-f49dcce521f3",
-        "Name": "roundhouseRunAfterAnyTimeFolder",
-        "Label": "RunAfterAnytime Folder Path",
-        "HelpText": "File path for running scripts after the Other Anytime scripts.  If left blank, .\\runAfterOtherAnyTimeScripts is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ac179614-fa54-4a5c-a736-7a0cbaa7e4bf",
-        "Name": "roundhousePermissionsFolder",
-        "Label": "Permissions Folder path",
-        "HelpText": "Folder path that holds permission scripts.  If left blank, .\\permissions is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fcf2e6c4-db73-4b44-bf36-44e7b1cdc8c1",
-        "Name": "roundhouseDownloadNuget",
-        "Label": "Download RoundhousE?",
-        "HelpText": "Check this box if you want the template to download RoundhousE and use the downloaded version for deployment.  Requires .NET Core be installed on the machine executing the deployment.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "62b65afa-1a88-4013-83ab-0b23e162d3cf",
-        "Name": "roundhouseNugetVersion",
-        "Label": "Version of RoundhousE",
-        "HelpText": "Version of RoundhousE to download (used with Download RoundhousE option), leave blank for latest.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedBy": "twerthi",
-    "$Meta": {
-      "ExportedAt": "2022-06-15T00:15:18.003Z",
-      "OctopusVersion": "2022.3.1591",
-      "Type": "ActionTemplate"
-    },
-    "Category": "roundhouse"
-  }
diff --git a/step-templates/run-entity-framework-migrations.json b/step-templates/run-entity-framework-migrations.json
deleted file mode 100644
index 5721a0829..000000000
--- a/step-templates/run-entity-framework-migrations.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "a6cd35d6-164a-4e57-a0f8-0d327129783a",
-  "Name": "Run Entity Framework migrations (Update-Database)",
-  "Description": "Runs `Update-Database` to update the database to the latest Entity Framework migrations",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# A collection of functions that can be used by script steps to determine where packages installed\r\n# by previous steps are located on the filesystem.\r\n \r\nfunction Find-InstallLocations {\r\n    $result = @()\r\n    $OctopusParameters.Keys | foreach {\r\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\r\n            $result += $OctopusParameters[$_]\r\n        }\r\n    }\r\n    return $result\r\n}\r\n \r\nfunction Find-InstallLocation($stepName) {\r\n    $result = $OctopusParameters.Keys | where {\r\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\r\n    } | select -first 1\r\n \r\n    if ($result) {\r\n        return $OctopusParameters[$result]\r\n    }\r\n \r\n    throw \"No install location found for step: $stepName\"\r\n}\r\n \r\nfunction Find-SingleInstallLocation {\r\n    $all = @(Find-InstallLocations)\r\n    if ($all.Length -eq 1) {\r\n        return $all[0]\r\n    }\r\n    if ($all.Length -eq 0) {\r\n        throw \"No package steps found\"\r\n    }\r\n    throw \"Multiple package steps have run; please specify a single step\"\r\n}\r\n\r\nfunction Test-LastExit($cmd) {\r\n    if ($LastExitCode -ne 0) {\r\n        Write-Host \"##octopus[stderr-error]\"\r\n        write-error \"$cmd failed with exit code: $LastExitCode\"\r\n    }\r\n}\r\n\r\n\r\n\r\n\r\n$stepName = $OctopusParameters['NugetPackageStepName']\r\n\r\n$stepPath = \"\"\r\nif (-not [string]::IsNullOrEmpty($stepName)) {\r\n    Write-Host \"Finding path to package step: $stepName\"\r\n    $stepPath = Find-InstallLocation $stepName\r\n} else {\r\n    $stepPath = Find-SingleInstallLocation\r\n}\r\nWrite-Host \"Package was installed to: $stepPath\"\r\n\r\n$baseDirectory = $OctopusParameters['BaseDirectory']\r\n\r\n$binPath = Join-Path $stepPath $baseDirectory\r\n\r\n#Locate Migrate.exe\r\n$efToolsFolder = $OctopusParameters['EfToolsFolder']\r\n$originalMigrateExe = Join-Path $efToolsFolder \"migrate.exe\"\r\n\r\nif (-Not(Test-Path $originalMigrateExe)){\r\n    throw (\"Unable to locate migrate.exe file. Specifed path $originalMigrateExe does not exist.\")\r\n}\r\nWrite-Host(\"Found Migrate.Exe from $originalMigrateExe\")\r\n\r\n$migrateExe = Join-Path $binPath \"migrate.exe\"\r\nif (-Not(Test-Path $migrateExe)) {\r\n    # Move migrate.exe to ASP.NET Project's bin folder as per https://msdn.microsoft.com/de-de/data/jj618307.aspx?f=255&MSPPError=-2147217396\r\n    Copy-Item $originalMigrateExe -Destination $binPath\r\n    Write-Host(\"Copied $originalMigrateExe into $binPath\")\r\n}\r\n\r\n#Locate Assembly with DbContext class\r\n$contextDllName = $OctopusParameters['AssemblyDllName']\r\n$contextDllPath = Join-Path $binPath $contextDllName\r\nif (-Not(Test-Path $contextDllPath)){\r\n    throw (\"Unable to locate assembly file with DbContext class. Specifed path $contextDllPath does not exist.\")\r\n}\r\nWrite-Host(\"Using $contextDllName from $contextDllPath\")\r\n\r\n#Locate web.config. Migrate.exe needs it for some reason, even if connection string is provided\r\n$configFile = $OctopusParameters['ConfigFileName']\r\n$configPath = Join-Path $stepPath $configFile\r\nif (-Not(Test-Path $configPath)){\r\n    throw (\"Unable to locate config file. Specifed path $webConfigPath does not exist.\")\r\n}\r\n\r\n$connectionStringName = $OctopusParameters['ConnectionStringName']\r\n\r\n$migrateCommand = \"& \"\"$migrateExe\"\" \"\"$contextDllName\"\" /connectionStringName=\"\"$connectionStringName\"\" /startupConfigurationFile=\"\"$configPath\"\" /startUpDirectory=\"\"$binPath\"\" /Verbose\"\r\n\r\nWrite-Host \"##octopus[stderr-error]\"        # Stderr is an error\r\nWrite-Host \"Executing: \" $migrateCommand\r\nWrite-Host \r\n\r\nInvoke-Expression $migrateCommand | Write-Host\r\n\r\n# Remove migrate.exe from the bin folder as it is not part of the application\r\nIf (Test-Path $migrateExe)\r\n{\r\n  Write-Host \"Deleting \" $migrateExe\r\n  Remove-Item $migrateExe\r\n}\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Name": "EfToolsFolder",
-      "Label": "Path to EF Tools folder",
-      "HelpText": "Please provide a full path to a folder where Migrate.exe (along with other EF files are contained, available from EF nuget package) on Tentacle",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BaseDirectory",
-      "Label": "Base Directory",
-      "HelpText": "Path to where your application files are located. For ASP.NET applications this would be `/bin`",
-      "DefaultValue": "/bin",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NugetPackageStepName",
-      "Label": "Site Path",
-      "HelpText": "Name of the previously-deployed package step that contains the applications files",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Name": "configFileName",
-      "Label": "Config File Name",
-      "HelpText": "Name of your applications config file. For ASP.NET applications this would be `web.config`, for Windows Service applications this would be `yourapplication.dll.config` and for console applications this would be `yourapplication.exe.config`",
-      "DefaultValue": "web.config",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AssemblyDllName",
-      "Label": "Name of Assembly file with EF-Context",
-      "HelpText": "Please provide a name of the assembly file where EF-context is stored",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ConnectionStringName",
-      "Label": "ConnectionStringName",
-      "HelpText": "Name of the key in <connectionStrings> section in Web.Config",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "rikrak",
-  "$Meta": {
-    "ExportedAt": "2019-10-18T09:11:34.909Z",
-    "OctopusVersion": "2018.10.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "entityframework"
-}
diff --git a/step-templates/run-mabl-tests.json b/step-templates/run-mabl-tests.json
deleted file mode 100644
index dd72fc85e..000000000
--- a/step-templates/run-mabl-tests.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Id": "422be361-640c-4ac1-a305-cd5d618ccf10",
-  "Name": "Run mabl tests",
-  "Description": "Trigger specific application or environment plans in mabl.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "param(\n    [string]$mablApiKey,\n    [string]$mablEnvId,\n    [string]$mablAppId,\n    [string]$mablPlanLabels,\n    [string]$mablBranch,\n    [string]$mablAwaitCompletion\n) \n\n$ErrorActionPreference = \"Stop\" \n\n# Constants\n$PollSec = 10\n$UserAgent = \"mabl-octopus-plugin/0.0.3\"\n$ApiBase = \"https://api.mabl.com\"\n$DeploymentEventsUri = \"$ApiBase/events/deployment\"\n$ExecutionResultBaseUri = \"$ApiBase/execution/result/event\"\n\nfunction Get-Param($Name, [switch]$Required, $MatchingPattern, $Explanation) {\n    $result = $null\n\n    if ($null -ne $OctopusParameters) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($null -eq $result) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($null -ne $variable) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($null -eq $result -or $result -eq \"\") {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n    }\n\n    if ($null -ne $result -and \"\" -ne $result -and $null -ne $MatchingPattern -and $result -notmatch $MatchingPattern) {\n        throw \"$Explanation\"\n    }\n\n    return $result\n}\n\nfunction Write-Result($Result) {\n    foreach ($execution in $Result.executions) {\n        $planName = $execution.plan.name\n        $planId = $execution.plan.id\n        $planStatus = $execution.plan_execution.status\n        $t = New-TimeSpan -seconds (($execution.stop_time - $execution.start_time) /  1000)\n        $planTime = Get-Date -Hour $t.Hours -Minute $t.Minutes -Second $t.Seconds -UFormat \"%T\"\n\n        Write-Host \"Plan name: ${planName}, id: ${planId}, status: ${planStatus}, run time: ${planTime}\"\n\n        $tests = $execution.journeys\n        $testExecutions = $execution.journey_executions\n\n        foreach ($test in $tests) {\n            $testId = $test.id\n            $testName = $test.name\n\n            foreach ($testExecution in $testExecutions) {\n                if ($testExecution.journey_id -eq $testId) {\n                    $t = New-TimeSpan -seconds (($testExecution.stop_time - $testExecution.start_time) / 1000)\n                    $testTime = Get-Date -Hour $t.Hours -Minute $t.Minutes -Second $t.Seconds -UFormat \"%T\"\n                    $testStatus = $testExecution.status\n                    $testBrowser = $testExecution.browser_type\n                    $testExecutionId = $testExecution.journey_execution_id\n                    Write-Host \"  Test name: ${testName}, id: ${testExecutionId}, status: ${testStatus},\" `\n                        \"browser: ${testBrowser}, run time: ${testTime}\"\n                    break\n                }\n            }\n\n        }\n    }\n}\n\n& {\n    param (\n        [string]$mablApiKey,\n        [string]$mablEnvId,\n        [string]$mablAppId,\n        [string]$mablPlanLabels,\n        [string]$mablAwaitCompletion\n    )\n\n    $kv = \"key:$($mablApiKey)\"\n    $encodedCreds = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($kv))\n    $basicAuthValue = \"Basic $encodedCreds\"\n    $headers = @{\n        Authorization = $basicAuthValue\n        accept        = \"application/json\"\n    }\n\n    # Submit Deployment Event\n    $resp = \"\"\n    $eventId = \"\"\n    try {\n        $m = @{}\n        if ($null -ne $mablEnvId -and \"\" -ne $mablEnvId) {\n            $m.add(\"environment_id\", $mablEnvId)\n        }\n        if ($null -ne $mablAppId -and \"\" -ne $mablAppId) {\n            $m.add(\"application_id\", $mablAppId)\n        }\n        if ($m.count -eq 0) {\n            Write-Host \"Either an environment ID or an application ID must be provided\"\n            exit 1\n        }\n        if ($null -ne $mablPlanLabels -and \"\" -ne $mablPlanLabels) {\n            $planLabelArray = $mablPlanLabels.Split(\",\")\n            $m.add(\"plan_labels\", $planLabelArray)\n        }\n        if ($null -ne $mablBranch -and \"\" -ne $mablBranch) {\n            $m.add(\"source_control_tag\", $mablBranch)\n        }\n        $body = ConvertTo-Json -InputObject $m\n        Write-Host \"Creating Deployment...\"\n        $resp = Invoke-RestMethod -URI $DeploymentEventsUri -Method Post `\n            -Headers $headers -ContentType 'application/json' `\n            -UserAgent $UserAgent -Body $body\n\n        $workspaceId = $resp.workspace_id\n        $eventId = $resp.id\n        Write-Host \"View output at https://app.mabl.com/workspaces/${workspaceId}/events/${eventId}\"\n    }\n    catch {\n        $statusCode = $_.Exception.Response.StatusCode.value__\n    \n        Write-Host \"Failed to invoke deployment events API, status code: \" `\n            $statusCode \" description: \" `\n            $_.Exception.Response.StatusDescription\n    \n        switch ($statusCode) {\n            400 {\n                Write-Host \"At least one of environment ID or application ID must be specified\"\n                break\n            }\n            401 { \n                Write-Host \"Invalid API key has been provided\"\n                break\n            }\n            403 {\n                Write-Host \"The provided API key is not authorized to submit deployment events\"\n                break\n            }\n            404 {\n                Write-Host \"The provided application or environment could not be found\"\n                break\n            }\n        }\n        exit 1\n    }\n\n\n    # Poll Execution Result at least once based on await completion parameter\n    $awaitCompletion = $mablAwaitCompletion -eq \"True\"\n    $totalPlans = 0\n    $passedPlans = 0\n    $failedPlans = 0\n    $totalTests = 0\n    $passedTests = 0\n    $failedTests = 0\n    $execResult = \"\"\n    try {\n        $complete = -Not $awaitCompletion\n        do {\n            Start-Sleep -s $PollSec\n            $eventId = $resp.id\n            $uri = \"$ExecutionResultBaseUri/$eventId\"\n            $execResult = Invoke-RestMethod -URI $uri -Method Get -Headers $headers\n            $totalPlans = $execResult.plan_execution_metrics.total\n            $passedPlans = $execResult.plan_execution_metrics.passed\n            $failedPlans = $execResult.plan_execution_metrics.failed\n            $totalTests = $execResult.journey_execution_metrics.total\n            $passedTests = $execResult.journey_execution_metrics.passed\n            $failedTests = $execResult.journey_execution_metrics.failed\n\n            if ($passedPlans + $failedPlans -eq $totalPlans) {\n                $complete = $TRUE\n            }\n            elseif (!$complete) {\n                Write-Host \"Plan runs\" `\n                    \"[passed: $passedTests, failed: $failedTests, total: $totalTests]\"\n            }\n        } while (!$complete)\n    } \n    catch {\n        $statusCode = $_.Exception.Response.StatusCode.value__\n\n        Write-Host \"Failed to invoke execution result API, status code:\" `\n            $statusCode \" description: `\n                \" $_.Exception.Response.StatusDescription\n    \n        switch ($statusCode) {\n            401 {\n                Write-Host \"Invalid API key has been provided\"\n                break\n            }\n            403 {\n                Write-Host \"The provided API key is not authorized to retrieve execution results\"\n                break\n            }\n            404 {\n                Write-Host \"The deployment event could not be found\"\n                break\n            }\n        }\n    \n        exit 1\n    }\n\n    if ($awaitCompletion) {\n        # Display results\n        Write-Host \"Tests complete with status\" `\n            $(If ($execResult.event_status.succeeded) { \"PASSED\" } else { \"FAILED\"})\n        Write-Result($execResult)\n\n        If ($execResult.event_status.succeeded) { exit 0 } else { exit 1 }\n    }\n\n    Write-Host \"Successfully triggered $totalPlans plan(s)\"\n    exit 0\n} `\n(Get-Param 'mablApiKey' -Required) `\n(Get-Param 'mablEnvId' '-e$' 'Environment IDs must end with -e') `\n(Get-Param 'mablAppId' '-a$' 'Application IDs must end with -a') `\n(Get-Param 'mablPlanLabels') `\n(Get-Param 'mablAwaitCompletion')\n"
-  },
-  "Parameters": [
-    {
-      "Id": "f5a9d523-f97e-49a9-b946-0c56e1018345",
-      "Name": "mablApiKey",
-      "Label": "mabl Integration Key",
-      "HelpText": "(Required) The API key of your workspace. You can find the API key on the Settings/API page.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "364c4c30-0ba3-4eee-9b01-9fb00f718ade",
-      "Name": "mablEnvId",
-      "Label": "Environment ID",
-      "HelpText": "The environment ID to run the tests in. Note that either an environment ID or an application ID must be provided.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0bf3fd34-1104-4d29-8677-0d91e78fc483",
-      "Name": "mablAppId",
-      "Label": "Application ID",
-      "HelpText": "The application ID to run tests on. Note that either an environment ID or an application ID must be provided.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "549d9ef4-2461-45d4-a8bc-44fb79758b52",
-      "Name": "mablPlanLabels",
-      "Label": "Plan Labels",
-      "HelpText": "(Optional) A comma-separated list of plan labels. Plans with any of the labels will be executed.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "db7398c4-2abc-4c56-99af-d32d054db50d",
-      "Name": "mablBranch",
-      "Label": "Test Branch",
-      "HelpText": "(Optional) The mabl branch to run test against.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "DefaultValue": "True",
-      "Name": "mablAwaitCompletion",
-      "Label": "Await Completion",
-      "HelpText": "When checked, the step will wait for all triggered tests to complete."
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-08-26T20:24:23.9520000Z",
-    "OctopusVersion": "2020.3.3",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "bertold",
-  "Category": "mabl"
-}
\ No newline at end of file
diff --git a/step-templates/run-octopus-runbook.json b/step-templates/run-octopus-runbook.json
deleted file mode 100644
index 3f472093a..000000000
--- a/step-templates/run-octopus-runbook.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-    "Id": "0444b0b3-088e-4689-b755-112d1360ffe3",
-    "Name": "Run Octopus Deploy Runbook",
-    "Description": "This step will kick off a runbook.  The runbook can exist in the same space and project, or it can exist on a different instance altogether.  \n\n**Please Note**: Prompted variable values have to be text or sensitive variables.  Variable types such as AWS or Azure accounts will not work.\n\nThis step should be called from a worker machine.  If it is called from a target and the runbook runs on the same target you run the risk of a deadlock.\n\n",
-    "ActionType": "Octopus.Script",
-    "Version": 18,
-    "Author": "bobjwalker",
-    "Packages": [],
-    "GitDependencies": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n\n# Octopus Variables\n$octopusSpaceId = $OctopusParameters[\"Octopus.Space.Id\"]\n$parentTaskId = $OctopusParameters[\"Octopus.Task.Id\"]\n$parentReleaseId = $OctopusParameters[\"Octopus.Release.Id\"]\n$parentChannelId = $OctopusParameters[\"Octopus.Release.Channel.Id\"]\n$parentEnvironmentId = $OctopusParameters[\"Octopus.Environment.Id\"]\n$parentRunbookId = $OctopusParameters[\"Octopus.Runbook.Id\"]\n$parentEnvironmentName = $OctopusParameters[\"Octopus.Environment.Name\"]\n$parentReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n\n# Step Template Parameters\n$runbookRunName = $OctopusParameters[\"Run.Runbook.Name\"]\n$runbookBaseUrl = $OctopusParameters[\"Run.Runbook.Base.Url\"]\n$runbookApiKey = $OctopusParameters[\"Run.Runbook.Api.Key\"]\n$runbookEnvironmentName = $OctopusParameters[\"Run.Runbook.Environment.Name\"]\n$runbookTenantName = $OctopusParameters[\"Run.Runbook.Tenant.Name\"]\n$runbookWaitForFinish = $OctopusParameters[\"Run.Runbook.Waitforfinish\"]\n$runbookUseGuidedFailure = $OctopusParameters[\"Run.Runbook.UseGuidedFailure\"]\n$runbookUsePublishedSnapshot = $OctopusParameters[\"Run.Runbook.UsePublishedSnapShot\"]\n$runbookPromptedVariables = $OctopusParameters[\"Run.Runbook.PromptedVariables\"]\n$runbookCancelInSeconds = $OctopusParameters[\"Run.Runbook.CancelInSeconds\"]\n$runbookProjectName = $OctopusParameters[\"Run.Runbook.Project.Name\"]\n$runbookCustomNotesToggle = $OctopusParameters[\"Run.Runbook.CustomNotes.Toggle\"]\n$runbookCustomNotes = $OctopusParameters[\"Run.Runbook.CustomNotes\"]\n$parentBranchName = $OctopusParameters[\"Run.Runbook.CaCBranchName\"]\n\n$runbookSpaceName = $OctopusParameters[\"Run.Runbook.Space.Name\"]\n$runbookFutureDeploymentDate = $OctopusParameters[\"Run.Runbook.DateTime\"]\n$runbookMachines = $OctopusParameters[\"Run.Runbook.Machines\"]\n$autoApproveRunbookRunManualInterventions = $OctopusParameters[\"Run.Runbook.AutoApproveManualInterventions\"]\n$approvalEnvironmentName = $OctopusParameters[\"Run.Runbook.ManualIntervention.EnvironmentToUse\"]\n\nfunction Write-OctopusVerbose\n{\n    param($message)\n    \n    Write-Verbose $message  \n}\n\nfunction Write-OctopusInformation\n{\n    param($message)\n    \n    Write-Host $message  \n}\n\nfunction Write-OctopusSuccess\n{\n    param($message)\n\n    try \n    {\n        Write-Highlight $message     \n    }\n    catch \n    {\n        Write-Host $message ## Using a try-catch block so we can test this locally\n    }\n    \n}\n\nfunction Write-OctopusWarning\n{\n    param($message)\n\n    Write-Warning \"$message\" \n}\n\nfunction Write-OctopusCritical\n{\n    param ($message)\n\n    Write-Error \"$message\" \n}\n\nfunction Invoke-OctopusApi\n{\n    param\n    (\n        $octopusUrl,\n        $endPoint,\n        $spaceId,\n        $apiKey,\n        $method,\n        $item    \n    )\n\n    if ([string]::IsNullOrWhiteSpace($SpaceId))\n    {\n        $url = \"$OctopusUrl/api/$EndPoint\"\n    }\n    else\n    {\n        $url = \"$OctopusUrl/api/$spaceId/$EndPoint\"    \n    }  \n\n    try\n    {\n        if ($null -eq $item)\n        {\n            Write-Verbose \"No data to post or put, calling bog standard invoke-restmethod for $url\"\n            return Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -ContentType 'application/json; charset=utf-8'\n        }        \n        \n        $body = $item | ConvertTo-Json -Depth 10\n        Write-Verbose $body\n\n        Write-OctopusInformation \"Invoking $method $url\"\n        return Invoke-RestMethod -Method $method -Uri $url -Headers @{\"X-Octopus-ApiKey\" = \"$ApiKey\" } -Body $body -ContentType 'application/json; charset=utf-8'\n    }\n    catch\n    {\n        if ($null -ne $_.Exception.Response)\n        {\n            if ($_.Exception.Response.StatusCode -eq 401)\n            {\n                Write-Error \"Unauthorized error returned from $url, please verify API key and try again\"\n            }\n            elseif ($_.Exception.Response.statusCode -eq 403)\n            {\n                Write-Error \"Forbidden error returned from $url, please verify API key and try again\"\n            }\n            else\n            {                \n                Write-Error -Message \"Error calling $url $($_.Exception.Message) StatusCode: $($_.Exception.Response.StatusCode )\"\n            }            \n        }\n        else\n        {\n            Write-Verbose $_.Exception\n        }\n    }\n\n    Throw \"There was an error calling the Octopus API please check the log for more details\"\n}\n\nfunction Test-RequiredValues\n{\n\tparam (\n    \t$variableToCheck,\n        $variableName\n    )\n\n    if ([string]::IsNullOrWhiteSpace($variableToCheck) -eq $true)\n    {\n    \tWrite-OctopusCritical \"$variableName is required.\"\n        return $false\n    }    \n    \n    return $true\n}\n\nfunction GetCheckBoxBoolean\n{\n\tparam (\n    \t[string]$Value\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($value) -eq $true)\n    {\n    \treturn $false\n    }\n    \n    return $value -eq \"True\"\n}\n\nfunction Get-FilteredOctopusItem\n{\n    param(\n        $itemList,\n        $itemName\n    )\n\n    if ($itemList.Items.Count -eq 0)\n    {\n        Write-OctopusCritical \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        Exit 1\n    }  \n\n    $item = $itemList.Items | Where-Object { $_.Name -eq $itemName}      \n\n    if ($null -eq $item)\n    {\n        Write-OctopusCritical \"Unable to find $itemName.  Exiting with an exit code of 1.\"\n        exit 1\n    }\n    \n    if ($item -is [array])\n    {\n    \tWrite-OctopusCritical \"More than one item exists with the name $itemName.  Exiting with an exit code of 1.\"\n        exit 1\n    }\n\n    return $item\n}\n\nfunction Get-OctopusItemFromListEndpoint\n{\n    param(\n        $endpoint,\n        $itemNameToFind,\n        $itemType,\n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId,\n        $defaultValue\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($itemNameToFind))\n    {\n    \treturn $defaultValue\n    }\n    \n    Write-OctopusInformation \"Attempting to find $itemType with the name of $itemNameToFind\"\n    \n    $itemList = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"$($endpoint)?partialName=$([uri]::EscapeDataString($itemNameToFind))&skip=0&take=100\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"   \n    $item = Get-FilteredOctopusItem -itemList $itemList -itemName $itemNameToFind\n\n    Write-OctopusInformation \"Successfully found $itemNameToFind with id of $($item.Id)\"\n\n    return $item\n}\n\nfunction Get-MachineIdsFromMachineNames\n{\n    param (\n        $targetMachines,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    $targetMachineList = $targetMachines -split \",\"\n    $translatedList = @()\n\n    foreach ($machineName in $targetMachineList)\n    {\n        Write-OctopusVerbose \"Translating $machineName to an Id.  First checking to see if it is already an Id.\"\n    \tif ($machineName.Trim() -like \"Machines*\")\n        {\n            Write-OctopusVerbose \"$machineName is already an Id, no need to look that up.\"\n        \t$translatedList += $machineName\n            continue\n        }\n        \n        $machineObject = Get-OctopusItemFromListEndpoint -itemNameToFind $machineName.Trim() -itemType \"Deployment Target\" -endpoint \"machines\" -defaultValue $null -spaceId $spaceId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey\n\n        $translatedList += $machineObject.Id\n    }\n\n    return $translatedList\n}\n\nfunction Get-RunbookSnapshotIdToRun\n{\n    param (\n        $runbookToRun,\n        $runbookUsePublishedSnapshot,\n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId\n    )\n\n    $runbookSnapShotIdToUse = $runbookToRun.PublishedRunbookSnapshotId\n    Write-OctopusInformation \"The last published snapshot for $runbookRunName is $runbookSnapShotIdToUse\"\n\n    if ($null -eq $runbookSnapShotIdToUse -and $runbookUsePublishedSnapshot -eq $true)\n    {\n        Write-OctopusCritical \"Use Published Snapshot was set; yet the runbook doesn't have a published snapshot.  Exiting.\"\n        Exit 1\n    }\n\n    if ($runbookUsePublishedSnapshot -eq $true)\n    {\n        Write-OctopusInformation \"Use published snapshot set to true, using the published runbook snapshot.\"\n        return $runbookSnapShotIdToUse\n    }\n\n    if ($null -eq $runbookToRun.PublishedRunbookSnapshotId)\n    {\n        Write-OctopusInformation \"There have been no published runbook snapshots, going to create a new snapshot.\"\n        return New-RunbookUnpublishedSnapshot -runbookToRun $runbookToRun -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId\n    }\n\n    $runbookSnapShotTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"runbookSnapshots/$($runbookToRun.PublishedRunbookSnapshotId)/runbookRuns/template\" -method \"Get\" -item $null\n\n    if ($runbookSnapShotTemplate.IsRunbookProcessModified -eq $false -and $runbookSnapShotTemplate.IsVariableSetModified -eq $false -and $runbookSnapShotTemplate.IsLibraryVariableSetModified -eq $false)\n    {        \n        Write-OctopusInformation \"The runbook has not been modified since the published snapshot was created.  Checking to see if any of the packages have a new version.\"    \n        $runbookSnapShot = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"runbookSnapshots/$($runbookToRun.PublishedRunbookSnapshotId)\" -method \"Get\" -item $null\n        $snapshotTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"runbooks/$($runbookToRun.Id)/runbookSnapShotTemplate\" -method \"Get\" -item $null\n\n        foreach ($package in $runbookSnapShot.SelectedPackages)\n        {\n            foreach ($templatePackage in $snapshotTemplate.Packages)\n            {\n                if ($package.StepName -eq $templatePackage.StepName -and $package.ActionName -eq $templatePackage.ActionName -and $package.PackageReferenceName -eq $templatePackage.PackageReferenceName)\n                {\n                    $packageVersion = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"feeds/$($templatePackage.FeedId)/packages/versions?packageId=$($templatePackage.PackageId)&take=1\" -method \"Get\" -item $null\n\n                    if ($packageVersion -ne $package.Version)\n                    {\n                        Write-OctopusInformation \"A newer version of a package was found, going to use that and create a new snapshot.\"\n                        return New-RunbookUnpublishedSnapshot -runbookToRun $runbookToRun -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId                    \n                    }\n                }\n            }\n        }\n\n        Write-OctopusInformation \"No new package versions have been found, using the published snapshot.\"\n        return $runbookToRun.PublishedRunbookSnapshotId\n    }\n    \n    Write-OctopusInformation \"The runbook has been modified since the snapshot was created, creating a new one.\"\n    return New-RunbookUnpublishedSnapshot -runbookToRun $runbookToRun -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId\n}\n\nfunction New-RunbookUnpublishedSnapshot\n{\n    param (\n        $runbookToRun,\n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId\n    )\n\n    $octopusProject = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"projects/$($runbookToRun.ProjectId)\" -method \"Get\" -item $null\n    $snapshotTemplate = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"runbooks/$($runbookToRun.Id)/runbookSnapShotTemplate\" -method \"Get\" -item $null\n\n    $runbookPackages = Get-RunbookPackages -snapshotTemplate $snapshotTemplate -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -usingCaC $false\n\n    $runbookSnapShotRequest = @{\n        FrozenProjectVariableSetId = \"variableset-$($runbookToRun.ProjectId)\"\n        FrozenRunbookProcessId = $($runbookToRun.RunbookProcessId)\n        LibraryVariableSetSnapshotIds = @($octopusProject.IncludedLibraryVariableSetIds)\n        Name = $($snapshotTemplate.NextNameIncrement)\n        ProjectId = $($runbookToRun.ProjectId)\n        ProjectVariableSetSnapshotId = \"variableset-$($runbookToRun.ProjectId)\"\n        RunbookId = $($runbookToRun.Id)\n        SelectedPackages = @($runbookPackages)\n    }\n\n    $newSnapShot = Invoke-OctopusApi -octopusUrl $defaultUrl -apiKey $octopusApiKey -spaceId $spaceId -endPoint \"runbookSnapshots\" -method \"POST\" -item $runbookSnapShotRequest\n\n    return $($newSnapShot.Id)\n}\n\nfunction Get-RunbookPackages\n{\n    param(\n        $snapshotTemplate,\n        $octopusUrl,\n        $apiKey,\n        $spaceId,\n        $usingCaC\n    )\n\n    $runbookPackages = @()\n    foreach ($package in $snapshotTemplate.Packages)\n    {\n        $packageVersion = Invoke-OctopusApi -octopusUrl $octopusUrl -apiKey $apiKey -spaceId $spaceId -endPoint \"feeds/$($package.FeedId)/packages/versions?packageId=$($package.PackageId)&take=1\" -method \"Get\" -item $null\n\n        if ($packageVersion.TotalResults -le 0)\n        {\n            Write-Error \"Unable to find a package version for $($package.PackageId).  This is required to create a new unpublished snapshot.  Exiting.\"\n            exit 1\n        }\n\n        $runbookPackages += @{\n            StepName = $package.StepName\n            ActionName = $package.ActionName\n            Version = $packageVersion.Items[0].Version\n            PackageReferenceName = $package.PackageReferenceName\n        }\n        \n    }\n\n    return $runbookPackages\n}\n\nfunction Get-RunbookGitReferences\n{\n    param(\n        $snapshotTemplate\n    )\n\n    $runbookReferences = @()\n    foreach ($reference in $snapshotTemplate.SelectedGitResources)\n    {        \n        $gitReference = $reference.DefaultBranch\n        if (($gitReference -contains \"refs/heads/\") -eq $false)\n        {\n            $gitReference = \"refs/heads/$gitReference\"\n        }\n\n        $runbookReferences += @{\n            StepName = $reference.ActionName\n            GitReferenceResource = @{\n                GitRef = $gitReference\n            }\n            GitResourceReferenceName = \"\"            \n        }\n    }\n\n    return $runbookReferences\n}\n\nfunction Get-ProjectSlug\n{\n    param\n    (\n        $runbookToRun,\n        $projectToUse,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    if ($null -ne $projectToUse)\n    {\n        return $projectToUse.Slug\n    }\n\n    $project = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint \"projects/$($runbookToRun.ProjectId)\" -method \"GET\" -item $null\n\n    return $project.Slug\n}\n\nfunction Get-RunbookFormValues\n{\n    param (\n        $runbookPreview,\n        $runbookPromptedVariables        \n    )\n\n    $runbookFormValues = @{}\n\n    if ([string]::IsNullOrWhiteSpace($runbookPromptedVariables) -eq $true)\n    {\n        return $runbookFormValues\n    }    \n    \n    $promptedValueList = @(($runbookPromptedVariables -Split \"`n\").Trim())\n    Write-OctopusInformation $promptedValueList.Length\n    \n    foreach($element in $runbookPreview.Form.Elements)\n    {\n    \t$nameToSearchFor = $element.Control.Name\n        $uniqueName = $element.Name\n        $isRequired = $element.Control.Required\n        \n        $promptedVariablefound = $false\n        \n        Write-OctopusInformation \"Looking for the prompted variable value for $nameToSearchFor\"\n    \tforeach ($promptedValue in $promptedValueList)\n        {\n        \t$splitValue = $promptedValue -Split \"::\"\n            Write-OctopusInformation \"Comparing $nameToSearchFor with provided prompted variable $($promptedValue[0])\"\n            if ($splitValue.Length -gt 1)\n            {\n            \tif ($nameToSearchFor -eq $splitValue[0])\n                {\n                \tWrite-OctopusInformation \"Found the prompted variable value $nameToSearchFor\"\n                \t$runbookFormValues[$uniqueName] = $splitValue[1]\n                    $promptedVariableFound = $true\n                    break\n                }\n            }\n        }\n        \n        if ($promptedVariableFound -eq $false -and $isRequired -eq $true)\n        {\n        \tWrite-OctopusCritical \"Unable to find a value for the required prompted variable $nameToSearchFor, exiting\"\n            Exit 1\n        }\n    }\n\n    return $runbookFormValues\n}\n\nfunction Invoke-OctopusDeployRunbook\n{\n    param (\n        $runbookBody,\n        $runbookWaitForFinish,\n        $runbookCancelInSeconds,\n        $projectNameForUrl,        \n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId,\n        $parentTaskApprovers,\n        $autoApproveRunbookRunManualInterventions,\n        $parentProjectName,\n        $parentReleaseNumber,\n        $approvalEnvironmentName,\n        $parentRunbookId,\n        $parentTaskId,\n        $usingCaC,\n        $cacRunbookEndpoint,\n        $runbookNameForUrl        \n    )\n\n    if ($usingCaC -eq $true)\n    {\n        $runbookResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -item $runbookBody -method \"POST\" -endPoint \"$($cacRunbookEndpoint)/$runbookNameForUrl/run/v1\"\n\n        $runbookServerTaskId = $runBookResponse.Resources[0].TaskId\n        Write-OctopusInformation \"The task id of the new task is $runbookServerTaskId\"\n\n        $runbookRunId = $runbookResponse.Resources[0].Id\n        Write-OctopusInformation \"The runbook run id is $runbookRunId\"            \n    }\n    else \n    {\n        $runbookResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -item $runbookBody -method \"POST\" -endPoint \"runbookRuns\"\n\n        $runbookServerTaskId = $runBookResponse.TaskId\n        Write-OctopusInformation \"The task id of the new task is $runbookServerTaskId\"\n\n        $runbookRunId = $runbookResponse.Id\n        Write-OctopusInformation \"The runbook run id is $runbookRunId\"        \n    }\n\n    Write-OctopusSuccess \"Runbook was successfully invoked, you can access the launched runbook [here]($defaultUrl/app#/$spaceId/tasks/$($runbookServerTaskId))\"    \n    \n    if ($runbookWaitForFinish -eq $false)\n    {\n        Write-OctopusInformation \"The wait for finish setting is set to no, exiting step\"\n        return\n    }\n    \n    if ($null -ne $runbookBody.QueueTime)\n    {\n    \tWrite-OctopusInformation \"The runbook queue time is set.  Exiting step\"\n        return\n    }\n\n    Write-OctopusSuccess \"The setting to wait for completion was set, waiting until task has finished\"\n    $startTime = Get-Date\n    $currentTime = Get-Date\n    $dateDifference = $currentTime - $startTime\n\t\n    $taskStatusUrl = \"tasks/$runbookServerTaskId\"\n    $numberOfWaits = 0    \n    \n    While ($dateDifference.TotalSeconds -lt $runbookCancelInSeconds)\n    {\n        Write-OctopusInformation \"Waiting 5 seconds to check status\"\n        Start-Sleep -Seconds 5\n        $taskStatusResponse = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $spaceId -apiKey $octopusApiKey -endPoint $taskStatusUrl -method \"GET\" -item $null\n        $taskStatusResponseState = $taskStatusResponse.State\n\n        if ($taskStatusResponseState -eq \"Success\")\n        {\n            Write-OctopusSuccess \"The task has finished with a status of Success\"\n            exit 0            \n        }\n        elseif($taskStatusResponseState -eq \"Failed\" -or $taskStatusResponseState -eq \"Canceled\")\n        {\n            Write-OctopusSuccess \"The task has finished with a status of $taskStatusResponseState status.\"\n            exit 1            \n        }\n        elseif($taskStatusResponse.HasPendingInterruptions -eq $true)\n        {\n            if ($autoApproveRunbookRunManualInterventions -eq \"Yes\")\n            {\n                Submit-RunbookRunForAutoApproval -createdRunbookRun $createdRunbookRun -parentTaskApprovers $parentTaskApprovers -defaultUrl $DefaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -parentProjectName $parentProjectName -parentReleaseNumber $parentReleaseNumber -parentEnvironmentName $approvalEnvironmentName -parentRunbookId $parentRunbookId -parentTaskId $parentTaskId\n            }\n            else\n            {\n                if ($numberOfWaits -ge 10)\n                {\n                    Write-OctopusSuccess \"The child project has pending manual intervention(s).  Unless you approve it, this task will time out.\"\n                }\n                else\n                {\n                    Write-OctopusInformation \"The child project has pending manual intervention(s).  Unless you approve it, this task will time out.\"                        \n                }\n            }\n        }\n        \n        $numberOfWaits += 1\n        if ($numberOfWaits -ge 10)\n        {\n        \tWrite-OctopusSuccess \"The task state is currently $taskStatusResponseState\"\n        \t$numberOfWaits = 0\n        }\n        else\n        {\n        \tWrite-OctopusInformation \"The task state is currently $taskStatusResponseState\"\n        }  \n        \n        $startTime = $taskStatusResponse.StartTime\n        if ($startTime -eq $null -or [string]::IsNullOrWhiteSpace($startTime) -eq $true)\n        {        \n        \tWrite-OctopusInformation \"The task is still queued, let's wait a bit longer\"\n        \t$startTime = Get-Date\n        }\n        $startTime = [DateTime]$startTime\n        \n        $currentTime = Get-Date\n        $dateDifference = $currentTime - $startTime        \n    }\n    \n    Write-OctopusSuccess \"The cancel timeout has been reached, cancelling the runbook run\"\n    $cancelResponse = Invoke-RestMethod \"$runbookBaseUrl/api/tasks/$runbookServerTaskId/cancel\" -Headers $header -Method Post\n    Write-OctopusSuccess \"Exiting with an error code of 1 because we reached the timeout\"\n    exit 1\n}\n\nfunction Get-QueueDate\n{\n\tparam ( \n    \t$futureDeploymentDate\n    )\n    \n    if ([string]::IsNullOrWhiteSpace($futureDeploymentDate) -or $futureDeploymentDate -eq \"N/A\")\n    {\n    \treturn $null\n    }\n    \n    $addOneDay = $false\n    $textToParse = $futureDeploymentDate.ToLower()\n    if ($textToParse -like \"tomorrow*\")\n    {\n    \tWrite-OctopusInformation \"The future date $futureDeploymentDate supplied contains tomorrow, will add one day to whatever the parsed result is.\"\n    \t$addOneDay = $true\n        $textToParse = $textToParse -replace \"tomorrow\", \"\"\n    }\n    \n    [datetime]$outputDate = New-Object DateTime\n    $currentDate = Get-Date\n    $currentDate = $currentDate.AddMinutes(2)\n\n    if ([datetime]::TryParse($textToParse, [ref]$outputDate) -eq $false)\n    {\n        Write-OctopusCritical \"The suppplied date $textToParse cannot be parsed by DateTime.TryParse.  Please verify format and try again.  Please [refer to Microsoft's Documentation](https://docs.microsoft.com/en-us/dotnet/api/system.datetime.tryparse) on supported formats.\"\n        exit 1\n    }\n    \n    Write-OctopusInformation \"The proposed date is $outputDate.  Checking to see if this will occur in the past.\"\n    \n    if ($addOneDay -eq $true)\n    {\n    \t$outputDate = $outputDate.AddDays(1)\n    \tWrite-OctopusInformation \"The text supplied included tomorrow, adding one day.  The new proposed date is $outputDate.\"\n    }\n    \n    if ($currentDate -gt $outputDate)\n    {\n    \tWrite-OctopusCritical \"The supplied date $futureDeploymentDate is set for the past.  All queued deployments must be in the future.\"\n        exit 1\n    }\n    \n    return $outputDate\n}\n\nfunction Get-QueueExpiryDate\n{\n\tparam (\n    \t$queueDate\n    )\n    \n    if ($null -eq $queueDate)\n    {\n    \treturn $null\n    }\n    \n    return $queueDate.AddHours(1)\n}\n\nfunction Get-RunbookSpecificMachines\n{\n    param (\n        $defaultUrl,\n        $octopusApiKey,    \n        $runbookPreview,\n        $runbookMachines,        \n        $runbookRunName        \n    )\n\n    if ($runbookMachines -eq \"N/A\")\n    {\n        return @()\n    }\n\n    if ([string]::IsNullOrWhiteSpace($runbookMachines) -eq $true)\n    {\n        return @()\n    }\n\n    $translatedList = Get-MachineIdsFromMachineNames -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId -targetMachines $runbookMachines\n\n    $filteredList = @()    \n    foreach ($runbookMachine in $translatedList)\n    {    \t\n    \t$runbookMachineId = $runbookMachine.Trim().ToLower()\n    \tWrite-OctopusVerbose \"Checking if $runbookMachineId is set to run on any of the runbook steps\"\n        \n        foreach ($step in $runbookPreview.StepsToExecute)\n        {\n            foreach ($machine in $step.Machines)\n            {\n            \tWrite-OctopusVerbose \"Checking if $runbookMachineId matches $($machine.Id) and it isn't already in the $($filteredList -join \",\")\"\n                if ($runbookMachineId -eq $machine.Id.Trim().ToLower() -and $filteredList -notcontains $machine.Id)\n                {\n                \tWrite-OctopusInformation \"Adding $($machine.Id) to the list\"\n                    $filteredList += $machine.Id\n                }\n            }\n        }\n    }\n\n    if ($filteredList.Length -le 0)\n    {\n        Write-OctopusSuccess \"The current task is targeting specific machines, but the runbook $runBookRunName does not run against any of these machines $runbookMachines. Skipping this run.\"\n        exit 0\n    }\n\n    return $filteredList\n}\n\nfunction Get-ParentTaskApprovers\n{\n    param (\n        $parentTaskId,\n        $spaceId,\n        $defaultUrl,\n        $octopusApiKey\n    )\n    \n    $approverList = @()\n    if ($null -eq $parentTaskId)\n    {\n    \tWrite-OctopusInformation \"The deployment task id to pull the approvers from is null, return an empty approver list\"\n    \treturn $approverList\n    }\n\n    Write-OctopusInformation \"Getting all the events from the parent project\"\n    $parentEvents = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"events?regardingAny=$parentTaskId&spaces=$spaceId&includeSystem=true\" -apiKey $octopusApiKey -method \"GET\"\n    \n    foreach ($parentEvent in $parentEvents.Items)\n    {\n        Write-OctopusVerbose \"Checking $($parentEvent.Message) for manual intervention\"\n        if ($parentEvent.Message -like \"Submitted interruption*\")\n        {\n            Write-OctopusVerbose \"The event $($parentEvent.Id) is a manual intervention approval event which was approved by $($parentEvent.Username).\"\n\n            $approverExists = $approverList | Where-Object {$_.Id -eq $parentEvent.UserId}        \n\n            if ($null -eq $approverExists)\n            {\n                $approverInformation = @{\n                    Id = $parentEvent.UserId;\n                    Username = $parentEvent.Username;\n                    Teams = @()\n                }\n\n                $approverInformation.Teams = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"teammembership?userId=$($approverInformation.Id)&spaces=$spaceId&includeSystem=true\" -apiKey $octopusApiKey -method \"GET\"            \n\n                Write-OctopusVerbose \"Adding $($approverInformation.Id) to the approval list\"\n                $approverList += $approverInformation\n            }        \n        }\n    }\n\n    return $approverList\n}\n\nfunction Get-ApprovalTaskIdFromDeployment\n{\n    param (\n        $parentReleaseId,\n        $approvalEnvironment,\n        $parentChannelId,    \n        $parentEnvironmentId,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey \n    )\n\n    $releaseDeploymentList = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"releases/$parentReleaseId/deployments\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId\n    \n    $lastDeploymentTime = $(Get-Date).AddYears(-50)\n    $approvalTaskId = $null\n    foreach ($deployment in $releaseDeploymentList.Items)\n    {\n        if ($deployment.EnvironmentId -ne $approvalEnvironment.Id)\n        {\n            Write-OctopusInformation \"The deployment $($deployment.Id) deployed to $($deployment.EnvironmentId) which doesn't match $($approvalEnvironment.Id).\"\n            continue\n        }\n        \n        Write-OctopusInformation \"The deployment $($deployment.Id) was deployed to the approval environment $($approvalEnvironment.Id).\"\n\n        $deploymentTask = Invoke-OctopusApi -octopusUrl $defaultUrl -spaceId $null -endPoint \"tasks/$($deployment.TaskId)\" -apiKey $octopusApiKey -Method \"Get\"\n        if ($deploymentTask.IsCompleted -eq $true -and $deploymentTask.FinishedSuccessfully -eq $false)\n        {\n            Write-Information \"The deployment $($deployment.Id) was deployed to the approval environment, but it encountered a failure, moving onto the next deployment.\"\n            continue\n        }\n\n        if ($deploymentTask.StartTime -gt $lastDeploymentTime)\n        {\n            $approvalTaskId = $deploymentTask.Id\n            $lastDeploymentTime = $deploymentTask.StartTime\n        }\n    }        \n\n    if ($null -eq $approvalTaskId)\n    {\n    \tWrite-OctopusVerbose \"Unable to find a deployment to the environment, determining if it should've happened already.\"\n        $channelInformation = Invoke-OctopusApi -octopusUrl $defaultUrl -endPoint \"channels/$parentChannelId\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId\n        $lifecycle = Get-OctopusLifeCycle -channel $channelInformation -defaultUrl $defaultUrl -spaceId $spaceId -OctopusApiKey $octopusApiKey\n        $lifecyclePhases = Get-LifecyclePhases -lifecycle $lifecycle -defaultUrl $defaultUrl -spaceId $spaceid -OctopusApiKey $octopusApiKey\n        \n        $foundDestinationFirst = $false\n        $foundApprovalFirst = $false\n        \n        foreach ($phase in $lifecyclePhases.Phases)\n        {\n        \tif ($phase.AutomaticDeploymentTargets -contains $parentEnvironmentId -or $phase.OptionalDeploymentTargets -contains $parentEnvironmentId)\n            {\n            \tif ($foundApprovalFirst -eq $false)\n                {\n                \t$foundDestinationFirst = $true\n                }\n            }\n            \n            if ($phase.AutomaticDeploymentTargets -contains $approvalEnvironment.Id -or $phase.OptionalDeploymentTargets -contains $approvalEnvironment.Id)\n            {\n            \tif ($foundDestinationFirst -eq $false)\n                {\n                \t$foundApprovalFirst = $true\n                }\n            }\n        }\n        \n        $messageToLog = \"Unable to find a deployment for the environment $approvalEnvironmentName.  Auto approvals are disabled.\"\n        if ($foundApprovalFirst -eq $true)\n        {\n        \tWrite-OctopusWarning $messageToLog\n        }\n        else\n        {\n        \tWrite-OctopusInformation $messageToLog\n        }\n        \n        return $null\n    }\n\n    return $approvalTaskId\n}\n\nfunction Get-ApprovalTaskIdFromRunbook\n{\n    param (\n        $parentRunbookId,\n        $approvalEnvironment,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey \n    )\n}\n\nfunction Get-ApprovalTaskId\n{\n\tparam (\n    \t$autoApproveRunbookRunManualInterventions,\n        $parentTaskId,\n        $parentReleaseId,\n        $parentRunbookId,\n        $parentEnvironmentName,\n        $approvalEnvironmentName,\n        $parentChannelId,    \n        $parentEnvironmentId,\n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey        \n    )\n    \n    if ($autoApproveRunbookRunManualInterventions -eq $false)\n    {\n    \tWrite-OctopusInformation \"Auto approvals are disabled, skipping pulling the approval deployment task id\"\n        return $null\n    }\n    \n    if ([string]::IsNullOrWhiteSpace($approvalEnvironmentName) -eq $true)\n    {\n    \tWrite-OctopusInformation \"Approval environment not supplied, using the current environment id for approvals.\"\n        return $parentTaskId\n    }\n    \n    if ($approvalEnvironmentName.ToLower().Trim() -eq $parentEnvironmentName.ToLower().Trim())\n    {\n        Write-OctopusInformation \"The approval environment is the same as the current environment, using the current task id $parentTaskId\"\n        return $parentTaskId\n    }\n    \n    $approvalEnvironment = Get-OctopusItemFromListEndpoint -itemNameToFind $approvalEnvironmentName -itemType \"Environment\" -defaultUrl $DefaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey -defaultValue $null -endpoint \"environments\"\n    \n    if ([string]::IsNullOrWhiteSpace($parentReleaseId) -eq $false)\n    {\n        return Get-ApprovalTaskIdFromDeployment -parentReleaseId $parentReleaseId -approvalEnvironment $approvalEnvironment -parentChannelId $parentChannelId -parentEnvironmentId $parentEnvironmentId -defaultUrl $defaultUrl -octopusApiKey $octopusApiKey -spaceId $spaceId\n    }\n\n    return Get-ApprovalTaskIdFromRunbook -parentRunbookId $parentRunbookId -approvalEnvironment $approvalEnvironment -defaultUrl $defaultUrl -spaceId $spaceId -octopusApiKey $octopusApiKey\n}\n\nfunction Get-OctopusLifecycle\n{\n    param (\n        $channel,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    Write-OctopusInformation \"Attempting to find the lifecycle information $($channel.Name)\"\n    if ($null -eq $channel.LifecycleId)\n    {\n        $lifecycleName = \"Default Lifecycle\"\n        $lifecycleList = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"lifecycles?partialName=$([uri]::EscapeDataString($lifecycleName))&skip=0&take=1\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n        $lifecycle = $lifecycleList.Items[0]\n    }\n    else\n    {\n        $lifecycle = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"lifecycles/$($channel.LifecycleId)\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n    }\n\n    Write-OctopusInformation \"Successfully found the lifecycle $($lifecycle.Name) to use for this channel.\"\n\n    return $lifecycle\n}\n\nfunction Get-LifecyclePhases\n{\n    param (\n        $lifecycle,        \n        $defaultUrl,\n        $spaceId,\n        $octopusApiKey\n    )\n\n    Write-OctopusInformation \"Attempting to find the phase in the lifecycle $($lifecycle.Name) with the environment $environmentName to find the previous phase.\"\n    if ($lifecycle.Phases.Count -eq 0)\n    {\n        Write-OctopusInformation \"The lifecycle $($lifecycle.Name) has no set phases, calling the preview endpoint.\"\n        $lifecyclePreview = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"lifecycles/$($lifecycle.Id)/preview\" -spaceId $spaceId -apiKey $octopusApiKey -method \"GET\"\n        $phases = $lifecyclePreview.Phases\n    }\n    else\n    {\n        Write-OctopusInformation \"The lifecycle $($lifecycle.Name) has set phases, using those.\"\n        $phases = $lifecycle.Phases    \n    }\n\n    Write-OctopusInformation \"Found $($phases.Length) phases in this lifecycle.\"\n    return $phases\n}\n\nfunction Submit-RunbookRunForAutoApproval\n{\n    param (\n        $createdRunbookRun,\n        $parentTaskApprovers,\n        $defaultUrl,\n        $octopusApiKey,\n        $spaceId,\n        $parentProjectName,\n        $parentReleaseNumber,\n        $parentRunbookId,\n        $parentEnvironmentName,\n        $parentTaskId        \n    )\n\n    Write-OctopusSuccess \"The task has a pending manual intervention.  Checking parent approvals.\"    \n    $manualInterventionInformation = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"interruptions?regarding=$($createdRunbookRun.TaskId)\" -method \"GET\" -apiKey $octopusApiKey -spaceId $spaceId\n    foreach ($manualIntervention in $manualInterventionInformation.Items)\n    {\n        if ($manualIntervention.IsPending -eq $false)\n        {\n            Write-OctopusInformation \"This manual intervention has already been approved.  Proceeding onto the next one.\"\n            continue\n        }\n\n        if ($manualIntervention.CanTakeResponsibility -eq $false)\n        {\n            Write-OctopusSuccess \"The user associated with the API key doesn't have permissions to take responsibility for the manual intervention.\"\n            Write-OctopusSuccess \"If you wish to leverage the auto-approval functionality give the user permissions.\"\n            continue\n        }        \n\n        $automaticApprover = $null\n        Write-OctopusVerbose \"Checking to see if one of the parent project approvers is assigned to one of the manual intervention teams $($manualIntervention.ResponsibleTeamIds)\"\n        foreach ($approver in $parentTaskApprovers)\n        {\n            foreach ($approverTeam in $approver.Teams)\n            {\n                Write-OctopusVerbose \"Checking to see if $($manualIntervention.ResponsibleTeamIds) contains $($approverTeam.TeamId)\"\n                if ($manualIntervention.ResponsibleTeamIds -contains $approverTeam.TeamId)\n                {\n                    $automaticApprover = $approver\n                    break\n                }\n            }\n\n            if ($null -ne $automaticApprover)\n            {\n                break\n            }\n        }\n\n        if ($null -ne $automaticApprover)\n        {\n        \tWrite-OctopusSuccess \"Matching approver found auto-approving.\"\n            if ($manualIntervention.HasResponsibility -eq $false)\n            {\n                Write-OctopusInformation \"Taking over responsibility for this manual intervention.\"\n                $takeResponsiblilityResponse = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"interruptions/$($manualIntervention.Id)/responsible\" -method \"PUT\" -apiKey $octopusApiKey -spaceId $spaceId\n                Write-OctopusVerbose \"Response from taking responsibility $($takeResponsiblilityResponse.Id)\"\n            }\n            \n            if ([string]::IsNullOrWhiteSpace($parentReleaseNumber) -eq $false)\n            {\n                $notes = \"Auto-approving this runbook run.  Parent project $parentProjectName release $parentReleaseNumber to $parentEnvironmentName with the task id $parentTaskId was approved by $($automaticApprover.UserName).  That user is a member of one of the teams this manual intervention requires.  You can view that deployment $defaultUrl/app#/$spaceId/tasks/$parentTaskId\"\n            }\n            else \n            {\n                $notes = \"Auto-approving this runbook run.  Parent project $parentProjectName runbook run $parentRunbookId to $parentEnvironmentName with the task id $parentTaskId was approved by $($automaticApprover.UserName).  That user is a member of one of the teams this manual intervention requires.  You can view that runbook run $defaultUrl/app#/$spaceId/tasks/$parentTaskId\"\n            }\n            if ($runbookCustomNotesToggle -eq $true){\n              $notes = $runbookCustomNotes\n            }\n            $submitApprovalBody = @{\n                Instructions = $null;\n                Notes = $notes\n                Result = \"Proceed\"\n            }\n            $submitResult = Invoke-OctopusApi -octopusUrl $DefaultUrl -endPoint \"interruptions/$($manualIntervention.Id)/submit\" -method \"POST\" -apiKey $octopusApiKey -item $submitApprovalBody -spaceId $spaceId\n            Write-OctopusSuccess \"Successfully auto approved the manual intervention $($submitResult.Id)\"\n        }\n        else\n        {\n            Write-OctopusSuccess \"Couldn't find an approver to auto-approve the child project.  Waiting until timeout or child project is approved.\"    \n        }\n    }\n}\n\nfunction Get-NonTenantedRunbookPreview\n{\n    param(\n        $octopusUrl,\n        $spaceId, \n        $apiKey,\n        $runbookSnapShotIdToUse,\n        $runbookEnvironmentId,\n        $runbookToRun,\n        $usingCaC,\n        $cacRunbookEndPoint\n    )\n\n    $runbookPreview = $null\n\n    try\n    {\n        $runbookPreviewEndpoint = \"runbookSnapshots/$($runbookSnapShotIdToUse)/runbookRuns/preview/$($runbookEnvironmentId)?includeDisabledSteps=true\"\n        if ($usingCaC -eq $true)\n        {\n            Write-OctopusInformation \"Using the CaC non-tenanted preview step\"\n    \t    $runbookPreviewEndpoint = \"$($cacRunbookEndPoint)/$($runbookToRun.Slug)/runbookRuns/preview/$($runbookEnvironmentId)?includeDisabledSteps=true\"\n        }        \n\n        $runBookPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint $runbookPreviewEndpoint -method \"GET\" -item $null\n    \t\n    }\n    catch\n    {\n    \tWrite-OctopusInformation \"The current version of Octopus Deploy doesn't support Runbook Snapshot Preview\"\n    \t$runBookPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint \"runbooks/$($runbookToRun.Id)/runbookRuns/preview/$($environmentToUse.Id)\" -method \"GET\" -item $null\n   \t}\n\n    return $runbookPreview\n}\n\nfunction Get-TenantedRunbookPreview \n{\n    param(\n        $octopusUrl,\n        $spaceId, \n        $apiKey,\n        $runbookSnapShotIdToUse,\n        $runbookEnvironmentId,\n        $runbookToRun,\n        $tenantIdToUse,\n        $usingCaC,\n        $cacRunbookEndPoint\n    )\n\n    $runbookPreview = $null\n\n    if ($usingCaC -eq $true)\n    {\n        Write-OctopusInformation \"Using the CaC tenanted preview step that requires a POST instead of GET\"        \n        $runbookPreviewBody = @{\n            DeploymentPreviews = @( \n                @{\n                    EnvironmentId = $runbookEnvironmentId;\n                    TenantId = $tenantIdToUse;\n                }\n            )\n        }                     \n                \n        $runBookGroupedPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint \"$($runbookEndPoint)/$($runbookToRun.Slug)/runbookRuns/previews\" -method \"POST\" -item $runbookPreviewBody \n        $runbookPreview = $runBookGroupedPreview[0]\n    }\n    else\n    {\n        $runBookPreview = Invoke-OctopusApi -octopusUrl $octopusUrl -spaceId $spaceId -apiKey $apiKey -endPoint \"runbooks/$($runbookToRun.Id)/runbookRuns/preview/$($runbookEnvironmentId)/$($tenantIdToUse)\" -method \"GET\"       \n    }   \n\n    return $runbookPreview\n}\nfunction Get-RunbookEndPoint\n{\n    param (        \n        $cacBranchName,\n        $projectToUse,\n        $usingCaC\n    )\n\n    if ($usingCaC -eq $true)\n    {\n        return \"projects/$($projectToUse.Id)/$([uri]::EscapeDataString($cacBranchName))/runbooks\"        \n    }\n    else\n    {\n        return \"projects/$($projectToUse.Id)/runbooks\"\n    }\n}\n\nfunction Get-IsProjectUsingCaCRunbooks\n{\n    param(\n        $projectToUse\n    )\n\n    $hasPersistenceSettings = Get-Member -InputObject $projectToUse -Name \"PersistenceSettings\" -MemberType Properties\n    if (!$hasPersistenceSettings)\n    {\n        return $false;        \n    }\n\n    Write-OctopusInformation \"The project has the PersistenceSettings object.\"\n    $hasConversionState = Get-Member -InputObject $projectToUse.PersistenceSettings -Name \"ConversionState\" -MemberType Properties        \n    if (!$hasConversionState)\n    {\n        return $false;\n    }\n\n    Write-OctopusInformation \"The project has the PersistenceSettings object.\"\n    $hasRunbooksInGit = Get-Member -InputObject $projectToUse.PersistenceSettings.ConversionState -Name \"RunbooksAreInGit\" -MemberType Properties    \n    \n    if (!$hasRunbooksInGit)\n    {\n        return $false;\n    }\n\n    $isUsingCaC = $projectToUse.PersistenceSettings.ConversionState.RunbooksAreInGit    \n    Write-OctopusInformation \"The project is using CaC: $isUsingCaC\"\n\n    return $isUsingCaC\n}\n\nfunction Get-CaCBranchName\n{\n    param(\n        $usingCac,\n        $projectToUse,\n        $providedBranchName\n    )\n\n    if ($usingCac -eq $false)\n    {\n        Write-OctopusInformation \"The project isn't using CaC, so no need to pull the branch name\"\n        return $null\n    }\n\n    if ([string]::IsNullOrWhiteSpace($providedBranchName) -eq $false)\n    {\n        if ($providedBranchName -like \"refs/heads/*\")\n        {\n            Write-OctopusInformation \"The provided branch name is $providedBranchName, using that\"\n            return $providedBranchName\n        }\n\n        Write-OctopusInformation \"The provided branch name $providedBranchName doesn't include refs/heads, adding it.\"\n        return \"refs/heads/$providedBranchName\"\n    }\n\n    $returnedBranchName = \"refs/heads/$($projectToUse.PersistenceSettings.DefaultBranch)\"\n    Write-OctopusInformation \"The branch name wasn't provided, using the default branch name $returnedBranchName\"\n    return $returnedBranchName\n}\n\n\n$runbookWaitForFinish = GetCheckboxBoolean -Value $runbookWaitForFinish\n$runbookUseGuidedFailure = GetCheckboxBoolean -Value $runbookUseGuidedFailure\n$runbookUsePublishedSnapshot = GetCheckboxBoolean -Value $runbookUsePublishedSnapshot\n$runbookCancelInSeconds = [int]$runbookCancelInSeconds\n\nWrite-OctopusInformation \"Wait for Finish Before Check: $runbookWaitForFinish\"\nWrite-OctopusInformation \"Use Guided Failure Before Check: $runbookUseGuidedFailure\"\nWrite-OctopusInformation \"Use Published Snapshot Before Check: $runbookUsePublishedSnapshot\"\nWrite-OctopusInformation \"Runbook Name $runbookRunName\"\nWrite-OctopusInformation \"Runbook Base Url: $runbookBaseUrl\"\nWrite-OctopusInformation \"Runbook Space Name: $runbookSpaceName\"\nWrite-OctopusInformation \"Runbook Environment Name: $runbookEnvironmentName\"\nWrite-OctopusInformation \"Runbook Tenant Name: $runbookTenantName\"\nWrite-OctopusInformation \"Wait for Finish: $runbookWaitForFinish\"\nWrite-OctopusInformation \"Use Guided Failure: $runbookUseGuidedFailure\"\nWrite-OctopusInformation \"Cancel run in seconds: $runbookCancelInSeconds\"\nWrite-OctopusInformation \"Use Published Snapshot: $runbookUsePublishedSnapshot\"\nWrite-OctopusInformation \"Auto Approve Runbook Run Manual Interventions: $autoApproveRunbookRunManualInterventions\"\nWrite-OctopusInformation \"Auto Approve environment name to pull approvals from: $approvalEnvironmentName\"\n\nWrite-OctopusInformation \"Octopus runbook run machines: $runbookMachines\"\nWrite-OctopusInformation \"Parent Task Id: $parentTaskId\"\nWrite-OctopusInformation \"Parent Release Id: $parentReleaseId\"\nWrite-OctopusInformation \"Parent Channel Id: $parentChannelId\"\nWrite-OctopusInformation \"Parent Environment Id: $parentEnvironmentId\"\nWrite-OctopusInformation \"Parent Runbook Id: $parentRunbookId\"\nWrite-OctopusInformation \"Parent Environment Name: $parentEnvironmentName\"\nWrite-OctopusInformation \"Parent Release Number: $parentReleaseNumber\"\nWrite-OctopusInformation \"Parent Branch Name: $parentBranchName\"\n\n$verificationPassed = @()\n$verificationPassed += Test-RequiredValues -variableToCheck $runbookRunName -variableName \"Runbook Name\"\n$verificationPassed += Test-RequiredValues -variableToCheck $runbookBaseUrl -variableName \"Base Url\"\n$verificationPassed += Test-RequiredValues -variableToCheck $runbookApiKey -variableName \"Api Key\"\n$verificationPassed += Test-RequiredValues -variableToCheck $runbookEnvironmentName -variableName \"Environment Name\"\n\n$projectVerificationPassed = Test-RequiredValues -variableToCheck $runbookProjectName -variableName \"Project Name\"\nif ($projectVerificationPassed -eq $false)\n{\n    Write-OctopusCritical \"Project Name previously wasn't required in earlier versions, but you need to include it now.  Without it, this step will find the first runbook that matches the name.  And it is required for CaC going forward.  Please add it to the step and try again.\"    \n    $verificationPassed += $projectVerificationPassed\n}\n\nif ($verificationPassed -contains $false)\n{\n\tWrite-OctopusInformation \"Required values missing\"\n\tExit 1\n}\n\n$runbookSpace = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookSpaceName -endpoint \"spaces\" -spaceId $null -octopusApiKey $runbookApiKey -defaultUrl $runbookBaseUrl -itemType \"Space\" -defaultValue $octopusSpaceId\n$runbookSpaceId = $runbookSpace.Id\n\n$projectToUse = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookProjectName -endpoint \"projects\" -spaceId $runbookSpaceId -defaultValue $null -itemType \"Project\" -octopusApiKey $runbookApiKey -defaultUrl $runbookBaseUrl\n\n$usingCaC = Get-IsProjectUsingCaCRunbooks -projectToUse $projectToUse\n$cacBranchName = Get-CaCBranchName -usingCac $usingCac -projectToUse $projectToUse -providedBranchName $parentBranchName\n$runbookEndPoint = Get-RunbookEndPoint -cacBranchName $cacBranchName -projectToUse $projectToUse -usingCaC $usingCaC\n\n$environmentToUse = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookEnvironmentName -itemType \"Environment\" -defaultUrl $runbookBaseUrl -spaceId $runbookSpaceId -octopusApiKey $runbookApiKey -defaultValue $null -endpoint \"environments\"\n\n$runbookToRun = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookRunName -itemType \"Runbook\" -defaultUrl $runbookBaseUrl -spaceId $runbookSpaceId -endpoint $runbookEndPoint -octopusApiKey $runbookApiKey -defaultValue $null\n\nif ($usingCaC -eq $false)\n{\n    $runbookSnapShotIdToUse = Get-RunbookSnapshotIdToRun -runbookToRun $runbookToRun -runbookUsePublishedSnapshot $runbookUsePublishedSnapshot -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $octopusSpaceId\n    $projectNameForUrl = Get-ProjectSlug -projectToUse $projectToUse -runbookToRun $runbookToRun -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $runbookSpaceId\n}\nelse\n{\n    $runbookSnapShotIdToUse = $null\n    $projectNameForUrl = $projectToUse.Slug\n}\n\n$tenantToUse = Get-OctopusItemFromListEndpoint -itemNameToFind $runbookTenantName -itemType \"Tenant\" -defaultValue $null -spaceId $runbookSpaceId -octopusApiKey $runbookApiKey -endpoint \"tenants\" -defaultUrl $runbookBaseUrl\nif ($null -ne $tenantToUse)\n{\t\n    $tenantIdToUse = $tenantToUse.Id\n    $runbookPreview = Get-TenantedRunbookPreview -octopusUrl $runbookBaseUrl -spaceId $runbookSpaceId -apiKey $runbookApiKey -runbookSnapShotIdToUse $runbookSnapShotIdToUse -runbookEnvironmentId $environmentToUse.Id -runbookToRun $runbookToRun -tenantIdToUse $tenantToUse.Id -usingCaC $usingCaC -cacRunbookEndPoint $runbookEndPoint         \n}\nelse\n{\n\t$runbookPreview = Get-NonTenantedRunbookPreview -octopusUrl $runbookBaseUrl -spaceId $runbookSpaceId -apiKey $runbookApiKey -runbookSnapShotIdToUse $runbookSnapShotIdToUse -runbookEnvironmentId $environmentToUse.Id -runbookToRun $runbookToRun -usingCaC $usingCaC -cacRunbookEndPoint $runbookEndPoint\n}\n\n$childRunbookRunSpecificMachines = Get-RunbookSpecificMachines -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -runbookPreview $runBookPreview -runbookMachines $runbookMachines -runbookRunName $runbookRunName\n$runbookFormValues = Get-RunbookFormValues -runbookPreview $runBookPreview -runbookPromptedVariables $runbookPromptedVariables\n\n$queueDate = Get-QueueDate -futureDeploymentDate $runbookFutureDeploymentDate\n$queueExpiryDate = Get-QueueExpiryDate -queueDate $queueDate\n\n$approvalTaskId = Get-ApprovalTaskId -autoApproveRunbookRunManualInterventions $autoApproveRunbookRunManualInterventions -parentTaskId $parentTaskId -parentReleaseId $parentReleaseId -parentRunbookId $parentRunbookId -parentEnvironmentName $parentEnvironmentName -approvalEnvironmentName $approvalEnvironmentName -parentChannelId $parentChannelId -parentEnvironmentId $parentEnvironmentId -defaultUrl $runbookBaseUrl -spaceId $runbookSpaceId -octopusApiKey $runbookApiKey\n$parentTaskApprovers = Get-ParentTaskApprovers -parentTaskId $approvalTaskId -spaceId $runbookSpaceId -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey\n\nif ($usingCaC -eq $true)\n{\n    $snapshotTemplate = Invoke-OctopusApi -octopusUrl $runbookBaseUrl -apiKey $runbookApiKey -spaceId $runbookSpaceId -endPoint \"$runbookEndPoint/$($runbookToRun.Slug)/runbookSnapShotTemplate\" -method \"Get\"\n    $selectedGitResources = @(Get-RunbookGitReferences -snapshotTemplate $snapshotTemplate)\n    $selectedPackages = @(Get-RunbookPackages -snapshotTemplate $snapshotTemplate -octopusUrl $runbookBaseUrl -apiKey $runbookApiKey -spaceId $runbookSpaceId -usingCaC $usingCaC)\n\n    $runbookBody = @{\n        SelectedGitResources = $selectedGitResources;\n        SelectedPackages = $selectedPackages;\n        Runs= @(\n            @{\n                EnvironmentId = $($environmentToUse.Id);\n                ExcludedMachineIds = @();                \n                ForcePackageDownload = $false;\n                FormValues = $runbookFormValues;\n                QueueTime = $queueDate;\n                QueueTimeExpiry = $queueExpiryDate;\n                SpecificMachineIds = @($childRunbookRunSpecificMachines);\n                SkipActions = @();\n                TenantId = $tenantIdToUse;\n                UseGuidedFailure = $runbookUseGuidedFailure;                \n            }\n        );                \n    }\n\n    Invoke-OctopusDeployRunbook -runbookBody $runbookBody -runbookWaitForFinish $runbookWaitForFinish -runbookCancelInSeconds $runbookCancelInSeconds -projectNameForUrl $projectNameForUrl -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $runbookSpaceId -parentTaskApprovers $parentTaskApprovers -autoApproveRunbookRunManualInterventions $autoApproveRunbookRunManualInterventions -parentProjectName $projectNameForUrl -parentReleaseNumber $parentReleaseNumber -approvalEnvironmentName $approvalEnvironmentName -parentRunbookId $parentRunbookId -parentTaskId $approvalTaskId -usingCaC $true -cacRunbookEndpoint $runbookEndPoint -runbookNameForUrl $runbookToRun.Slug\n}\nelse\n{\n    $runbookBody = @{\n        RunbookId = $($runbookToRun.Id);\n        RunbookSnapShotId = $runbookSnapShotIdToUse;\n        FrozenRunbookProcessId = $null;\n        EnvironmentId = $($environmentToUse.Id);\n        TenantId = $tenantIdToUse;\n        SkipActions = @();\n        QueueTime = $queueDate;\n        QueueTimeExpiry = $queueExpiryDate;\n        FormValues = $runbookFormValues;\n        ForcePackageDownload = $false;\n        ForcePackageRedeployment = $true;\n        UseGuidedFailure = $runbookUseGuidedFailure;\n        SpecificMachineIds = @($childRunbookRunSpecificMachines);\n        ExcludedMachineIds = @()\n    }\n    \n    Invoke-OctopusDeployRunbook -runbookBody $runbookBody -runbookWaitForFinish $runbookWaitForFinish -runbookCancelInSeconds $runbookCancelInSeconds -projectNameForUrl $projectNameForUrl -defaultUrl $runbookBaseUrl -octopusApiKey $runbookApiKey -spaceId $runbookSpaceId -parentTaskApprovers $parentTaskApprovers -autoApproveRunbookRunManualInterventions $autoApproveRunbookRunManualInterventions -parentProjectName $projectNameForUrl -parentReleaseNumber $parentReleaseNumber -approvalEnvironmentName $approvalEnvironmentName -parentRunbookId $parentRunbookId -parentTaskId $approvalTaskId\n}",
-      "Octopus.Action.Script.Syntax": "PowerShell"
-    },
-    "Parameters": [
-      {
-        "Id": "e9e93cff-973a-4107-afa2-8efa30947979",
-        "Name": "Run.Runbook.Name",
-        "Label": "Runbook Name",
-        "HelpText": "**Required**\n\nThe name of the runbook to run.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "d998db57-3574-4598-81f9-7dd145cab81a",
-        "Name": "Run.Runbook.Base.Url",
-        "Label": "Base Url",
-        "HelpText": "**Required**\n\nThe base URL of your instance, IE https://samples.octopus.app.  Defaults to the system variable [Octopus.Web.ServerUri](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server).",
-        "DefaultValue": "#{Octopus.Web.ServerUri}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "24884bf3-ca1d-4c17-8ee0-017339d6d87e",
-        "Name": "Run.Runbook.Api.Key",
-        "Label": "Api Key",
-        "HelpText": "**Required**\n\nThe API key of a user who has permissions to run the runbook specified",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "bc2d33fe-d05b-49bd-b02b-eb6de4737eff",
-        "Name": "Run.Runbook.Space.Name",
-        "Label": "Runbook Space",
-        "HelpText": "**Required**\n\nThe name of the space the child project is located in.  Defaults to the current space name using the variable `#{Octopus.Space.Name}`.",
-        "DefaultValue": "#{Octopus.Space.Name}",    
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a1f44858-809a-48ce-9127-e59f02be40a1",
-        "Name": "Run.Runbook.Project.Name",
-        "Label": "Project name",
-        "HelpText": "**Required**\n\nThe name of the project containing the runbook.  Previous versions of this step allowed this parameter to be optional.  With the addition of CaC, this is now a required step for everyone.",
-        "DefaultValue": "#{Octopus.Project.Name}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "07bd5b03-4151-4f32-8893-417bf22c4df2",
-        "Name": "Run.Runbook.Environment.Name",
-        "Label": "Environment Name",
-        "HelpText": "**Required**\n\nName of the environment to run the runbook on.  The default is the current environment name using the system variable `#{Octopus.Environment.Name}`.",
-        "DefaultValue": "#{Octopus.Environment.Name}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "bf4ae98a-4901-474a-8984-08b0258304ca",
-        "Name": "Run.Runbook.Tenant.Name",
-        "Label": "Tenant Name",
-        "HelpText": "**Optional**\n\nName of Tenant to run the runbook for.  If you want to run a runbook using the same tenant as the deployment or runbook run then use the system variable `#{Octopus.Deployment.Tenant.Name}`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ffc33a7a-2a8e-4f7e-969f-bf5a377a078a",
-        "Name": "Run.Runbook.CaCBranchName",
-        "Label": "Runbook CaC Branch Name",
-        "HelpText": "**Optional**\n\nThe branch name to be used when invoking a CaC enabled runbook.  \n\n**Tip:** If you call this step from a deployment, you can use `#{Octopus.Release.Git.BranchName}`.\n\n**Warning:** It will use the project's default branch if you do not provide a branch name for a CaC-enabled runbook.  ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "9c49ba5c-337b-454a-8837-282353276aea",
-        "Name": "Run.Runbook.UsePublishedSnapShot",
-        "Label": "Use Published Snapshot",
-        "HelpText": "Indicates if the run should use the most recent published snapshot.  When not set it will use the most recent snapshot, regardless if it was published or not.\n\nDefault is to use only published snapshots.\n\nIf you select to use unpublished snapshots then the runbook will:\n- If no published snapshots exist, then it will create a new unpublished snapshot on each run.\n- Create a new snapshot if anything has changed since the last published snapshot.\n- Use the existing published snapshot if nothing has changed since it was last published.\n\n**Please note:** A runbook is considered \"changed\" when any of the following are true:\n\n- Runbook process has changed.\n- Project variables have changed.\n- Library Variable Sets referenced by the project have changed.\n- A newer version of any referenced packages is found.",
-        "DefaultValue": "True",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "1a3e3ff6-456a-49e0-a0ce-83bfb30bfcaa",
-        "Name": "Run.Runbook.Waitforfinish",
-        "Label": "Wait for finish",
-        "HelpText": "Indicates if the process should be paused and wait for the runbook to finish",
-        "DefaultValue": "True",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "c36715c5-b583-43c4-b3e3-a74f44f2b2c4",
-        "Name": "Run.Runbook.UseGuidedFailure",
-        "Label": "Use Guided Failure",
-        "HelpText": "Should the runbook run use guided failure (not a good idea if you are waiting for this to finish)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "6b951d28-b027-4f16-aaa6-39e91bd906d4",
-        "Name": "Run.Runbook.CancelInSeconds",
-        "Label": "Cancel Seconds",
-        "HelpText": "**Optional**\n\nThe number of seconds to wait before canceling the runbook run.  Default is 1800 seconds (30 minutes).",
-        "DefaultValue": "1800",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c847668d-b4fa-4405-a15b-f03691147597",
-        "Name": "Run.Runbook.PromptedVariables",
-        "Label": "Prompted Variable Values",
-        "HelpText": "**Optional**\n\nValues for any prompted variables for the runbook.  Each new line represents a new variable.  This will only work with string variable types, text and sensitive values.    \n\nUse the format **Name::Value**  IE:\n\n\nPromptedVariableName::My Super Awesome Value\n\nOtherPromptedVariable::Other Super Awesome Value",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "dd65f24d-7546-4271-b78b-28101170410c",
-        "Name": "Run.Runbook.DateTime",
-        "Label": "Scheduling",
-        "HelpText": "**Optional**\n\nSchedule the runbook to run in the future.  Please note, if this is set, the `Wait for Finish` option is ignored.\n\nUses `DateTime.TryParse` and specific keywords to determine the value sent in.  Supported formats:\n\n- `7:00 PM` will deploy at 7:00 PM today\n- `21:00` will deploy at 21:00 hours or 9 PM today\n- `YYYY-MM-DD HH:mm:ss` or `2021-01-14 21:00:00` will deploy at 9 PM on the 14th of January, 2021\n- `YYYY/MM/DD HH:mm:ss` or `2021/03/20 22:00:00` will deploy at 10 PM on the 20th of March, 2021\n- `MM/DD/YYYY HH:mm:ss` or `06/25/2021 19:00:00` will deploy at 7 PM on the 25th of June, 2021\n- `DD MMM YYYY HH:mm:ss` or `01 Jan 2021 18:00:00` will deploy at 6 PM on the 1st of January, 2021\n- `Tomorrow HH:mm:ss` or `Tomorrow 18:00:00` will deploy at 6 PM tomorrow\n\nUses the Octopus Server's Timezone.  The queue expiry time will be set to 1 hour from the supplied date.\n\nDefault is `N/A` or not applicable.  ",      
-        "DefaultValue": "N/A",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "22158e31-8061-4ada-b61b-a7bdacb5dd37",
-        "Name": "Run.Runbook.Machines",
-        "Label": "Machine List",
-        "HelpText": "**Optional**\n\nA comma-separated list of Machine Ids or Machine Names to target with this runbook.  \n\n**Please Note:** The step template will remove any machines that cannot be found or are not applicable to the runbook.\n\nThe default is `N/A`.  Set to `#{Octopus.Deployment.Machines}` if you want to target the same machines as the current runbook run or deployment.",
-        "DefaultValue": "N/A",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "95788fe2-f770-460c-b012-e6a586fe04d7",
-        "Name": "Run.Runbook.AutoApproveManualInterventions",
-        "Label": "Auto approve runbook manual interventions",
-        "HelpText": "**Optional**\n\nIf the child project has manual interventions the step will look for manual interventions in the parent project or parent runbook.\n\nWhen a manual intervention in the parent project or parent runbook is found it will check that user's assigned teams.  If that user's assigned teams can approve the child project it will do so.\n\nPlease note, the user associated with the API key must be able to approve the child project manual interventions as well.  \n\nThe default is `No`, allow this to happen.  Set it to `Yes` to enable this functionality.",
-        "DefaultValue": "No",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "No|No\nYes|Yes"
-        }
-      },
-      {
-        "Id": "ea7c213e-380b-46ba-85b7-5c2c0f7b01d7",
-        "Name": "Run.Runbook.CustomNotes.Toggle",
-        "Label": "Custom Manual Intervention Notes Toggle",
-        "HelpText": "Check this box if you would like custom notes to be submitted with the automatic manual intervention approval.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "70549ad5-b451-4587-b8ed-b4afad1752f9",
-        "Name": "Run.Runbook.CustomNotes",
-        "Label": "Custom Manual Intervention Approval Notes",
-        "HelpText": "Use this field to supply custom manual intervention notes if the above toggle is checked.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b1cd0181-c5a8-4d4d-9746-f7cfe41f6794",
-        "Name": "Run.Runbook.ManualIntervention.EnvironmentToUse",
-        "Label": "Environment name to pull approvals from",
-        "HelpText": "**Optional**\n\nThe name of the environment you wish to pull the approvals from for the parent project or parent runbook.   It will look at all the deployments for the current release of the parent project and select the latest deployment to the specified environment.  If this step is being called from a runbook, it will look at the latest runbook run for the environment specified\n\nUsed when you are deploying to `Production` but want to pull the approvals from `Staging` or a `Prod Approval` environment.\n\nDefaults to the current environment name.",
-        "DefaultValue": "#{Octopus.Environment.Name}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedBy": "bobjwalker",
-    "$Meta": {
-      "ExportedAt": "2025-05-22T14:07:03.309Z",
-      "OctopusVersion": "2025.2.11677",
-      "Type": "ActionTemplate"
-    },
-    "Category": "octopus"
-  }
diff --git a/step-templates/run-windows-installer.json b/step-templates/run-windows-installer.json
deleted file mode 100644
index 374133239..000000000
--- a/step-templates/run-windows-installer.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "Id": "f56647ac-7762-4986-bc98-c3fb74bb844f",
-  "Name": "Windows - Install MSI From Filesystem",
-  "Description": "Runs the Windows Installer to non-interactively install an MSI",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$MsiFilePath,\n\t[ValidateSet(\"Install\", \"Repair\", \"Remove\", IgnoreCase=$true)]\n\t[string]$Action,\n\t[string]$ActionModifier,\n    [string]$LoggingOptions = \"*\",\n    [ValidateSet(\"False\", \"True\")]\n    [string]$LogAsArtifact,\n\t[string]$Properties,\n\t[int[]]$IgnoredErrorCodes,\n    [switch]$WhatIf\n) \n\n$ErrorActionPreference = \"Stop\"\n\n$ErrorMessages = @{\n\t\"0\" = \"Action completed successfully.\";\n\t\"13\" = \"The data is invalid.\";\n\t\"87\" = \"One of the parameters was invalid.\";\n\t\"1601\" = \"The Windows Installer service could not be accessed. Contact your support personnel to verify that the Windows Installer service is properly registered.\";\n\t\"1602\" = \"User cancel installation.\";\n\t\"1603\" = \"Fatal error during installation.\";\n\t\"1604\" = \"Installation suspended, incomplete.\";\n\t\"1605\" = \"This action is only valid for products that are currently installed.\";\n\t\"1606\" = \"Feature ID not registered.\";\n\t\"1607\" = \"Component ID not registered.\";\n\t\"1608\" = \"Unknown property.\";\n\t\"1609\" = \"Handle is in an invalid state.\";\n\t\"1610\" = \"The configuration data for this product is corrupt. Contact your support personnel.\";\n\t\"1611\" = \"Component qualifier not present.\";\n\t\"1612\" = \"The installation source for this product is not available. Verify that the source exists and that you can access it.\";\n\t\"1613\" = \"This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.\";\n\t\"1614\" = \"Product is uninstalled.\";\n\t\"1615\" = \"SQL query syntax invalid or unsupported.\";\n\t\"1616\" = \"Record field does not exist.\";\n\t\"1618\" = \"Another installation is already in progress. Complete that installation before proceeding with this install.\";\n\t\"1619\" = \"This installation package could not be opened. Verify that the package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer package.\";\n\t\"1620\" = \"This installation package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer package.\";\n\t\"1621\" = \"There was an error starting the Windows Installer service user interface. Contact your support personnel.\";\n\t\"1622\" = \"Error opening installation log file. Verify that the specified log file location exists and is writable.\";\n\t\"1623\" = \"This language of this installation package is not supported by your system.\";\n\t\"1624\" = \"Error applying transforms. Verify that the specified transform paths are valid.\";\n\t\"1625\" = \"This installation is forbidden by system policy. Contact your system administrator.\";\n\t\"1626\" = \"Function could not be executed.\";\n\t\"1627\" = \"Function failed during execution.\";\n\t\"1628\" = \"Invalid or unknown table specified.\";\n\t\"1629\" = \"Data supplied is of wrong type.\";\n\t\"1630\" = \"Data of this type is not supported.\";\n\t\"1631\" = \"The Windows Installer service failed to start. Contact your support personnel.\";\n\t\"1632\" = \"The temp folder is either full or inaccessible. Verify that the temp folder exists and that you can write to it.\";\n\t\"1633\" = \"This installation package is not supported on this platform. Contact your application vendor.\";\n\t\"1634\" = \"Component not used on this machine.\";\n\t\"1635\" = \"This patch package could not be opened. Verify that the patch package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer patch package.\";\n\t\"1636\" = \"This patch package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer patch package.\";\n\t\"1637\" = \"This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.\";\n\t\"1638\" = \"Another version of this product is already installed. Installation of this version cannot continue. To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.\";\n\t\"1639\" = \"Invalid command line argument. Consult the Windows Installer SDK for detailed command line help.\";\n\t\"1640\" = \"Installation from a Terminal Server client session not permitted for current user.\";\n\t\"1641\" = \"The installer has started a reboot.\";\n\t\"1642\" = \"The installer cannot install the upgrade patch because the program being upgraded may be missing, or the upgrade patch updates a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch.\";\n\t\"3010\" = \"A restart is required to complete the install. This does not include installs where the ForceReboot action is run. Note that this error will not be available until future version of the installer.\"\n};\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Resolve-PotentialPath($Path) {\n\t[Environment]::CurrentDirectory = $pwd\n\treturn [IO.Path]::GetFullPath($Path)\n}\n\nfunction Get-LogOptionFile($msiFile, $streamLog) {\n\t$logPath = Resolve-PotentialPath \"$msiFile.log\"\n\t\n\tif (Test-Path $logPath) {\n\t\tRemove-Item $logPath\n\t}\n\t\n\treturn $logPath\n}\n\nfunction Exec\n{\n    [CmdletBinding()]\n    param(\n        [Parameter(Position=0,Mandatory=1)][scriptblock]$cmd,\n        [string]$errorMessage = ($msgs.error_bad_command -f $cmd),\n\t\t[switch]$ReturnCode\n    )\n\n\t$lastexitcode = 0\n    & $cmd\n\t\n\tif ($ReturnCode) {\n\t\treturn $lastexitcode\n\t} else  {\n\t\tif ($lastexitcode -ne 0) {\n\t\t\tthrow (\"Exec: \" + $errorMessage)\n\t\t}\t\t\n\t}\n}\n\nfunction Wrap-Arguments($Arguments)\n{\n\treturn $Arguments | % { \n\t\t\n\t\t[string]$val = $_\n\t\t\n\t\t#calling msiexec fails when arguments are quoted\n\t\tif (($val.StartsWith(\"/\") -and $val.IndexOf(\" \") -eq -1) -or ($val.IndexOf(\"=\") -ne -1) -or ($val.IndexOf('\"') -ne -1)) {\n\t\t\treturn $val\n\t\t}\n\t\n\t\treturn '\"{0}\"' -f $val\n\t}\n}\n\nfunction Start-Process2($FilePath, $ArgumentList, [switch]$showCall, [switch]$whatIf)\n{\n\t$ArgumentListString = (Wrap-Arguments $ArgumentList) -Join \" \"\n\n\t$pinfo = New-Object System.Diagnostics.ProcessStartInfo\n\t$pinfo.FileName = $FilePath\n\t$pinfo.UseShellExecute = $false\n\t$pinfo.CreateNoWindow = $true\n\t$pinfo.RedirectStandardOutput = $true\n\t$pinfo.RedirectStandardError = $true\n\t$pinfo.Arguments = $ArgumentListString;\n\t$pinfo.WorkingDirectory = $pwd\n\n\t$exitCode = 0\n\t\n\tif (!$whatIf) {\n\t\n\t\tif ($showCall) {\n\t\t\t$x = Write-Output \"$FilePath $ArgumentListString\"\n\t\t}\n\t\t\n\t\t$p = New-Object System.Diagnostics.Process\n\t\t$p.StartInfo = $pinfo\n\t\t$started = $p.Start()\n\t\t$p.WaitForExit()\n\n\t\t$stdout = $p.StandardOutput.ReadToEnd()\n\t\t$stderr = $p.StandardError.ReadToEnd()\n\t\t$x = Write-Output $stdout\n\t\t$x = Write-Output $stderr\n\t\t\n\t\t$exitCode = $p.ExitCode\n\t} else {\n\t\tWrite-Output \"skipping: $FilePath $ArgumentListString\"\n\t}\n\t\n\treturn $exitCode\n}\n\nfunction Get-EscapedFilePath($FilePath)\n{\n    return [Management.Automation.WildcardPattern]::Escape($FilePath)\n}\n\n& {\n    param(\n        [string]$MsiFilePath,\n\t\t[string]$Action,\n\t\t[string]$ActionModifier,\n        [string]$LoggingOptions,\n        [bool]$LogAsArtifact,\n\t\t[string]$Properties,\n\t\t[int[]]$IgnoredErrorCodes\n    ) \n\n    $MsiFilePathLeaf = Split-Path -Path $MsiFilePath -Leaf\n    $EscapedMsiFilePath = Get-EscapedFilePath (Split-Path -Path $MsiFilePath)\n    \n\t$MsiFilePath = Get-EscapedFilePath (Resolve-Path \"$EscapedMsiFilePath\\$MsiFilePathLeaf\" | Select-Object -First 1).ProviderPath\n\n    Write-Output \"Installing MSI\"\n    Write-Host \" MsiFilePath: $MsiFilePath\" -f Gray\n\tWrite-Host \" Action: $Action\" -f Gray\n\tWrite-Host \" Properties: $Properties\" -f Gray\n\tWrite-Host\n\n\tif ((Get-Command msiexec) -Eq $Null) {\n\t\tthrow \"Command msiexec could not be found\"\n\t}\n\t\n\tif (!(Test-Path $MsiFilePath)) {\n\t\tthrow \"Could not find the file $MsiFilePath\"\n\t}\n\n\t$actions = @{\n\t\t\"Install\" = \"/i\";\n\t\t\"Repair\" = \"/f\";\n\t\t\"Remove\" = \"/x\";\n\t};\n\t\n\t$actionOption = $actions[$action]\n\t$actionOptionFile = $MsiFilePath\n\tif ($ActionModifier)\n\t{\n\t\t$actionOption += $ActionModifier\n\t}\n\t\n    if ($LoggingOptions) {\n\t    $logOption = \"/L$LoggingOptions\"\n\t    $logOptionFile = Get-LogOptionFile $MsiFilePath\n\t}\n\t$quiteOption = \"/qn\"\n\t$noRestartOption = \"/norestart\"\n\t\n\t$parameterOptions = $Properties -Split \"\\r\\n?|\\n\" | ? { !([string]::IsNullOrEmpty($_)) } | % { $_.Trim() }\n\t\n\t$options = @($actionOption, $actionOptionFile, $logOption, $logOptionFile, $quiteOption, $noRestartOption) + $parameterOptions\n\n\t$exePath = \"msiexec.exe\"\n\n\t$exitCode = Start-Process2 -FilePath $exePath -ArgumentList $options -whatIf:$whatIf -ShowCall\n\t\n\tWrite-Output \"Exit Code was! $exitCode\"\n\t\n\tif (Test-Path $logOptionFile) {\n\n\t\tWrite-Output \"Reading installer log\"\n\n        # always write out these (http://robmensching.com/blog/posts/2010/8/2/the-first-thing-i-do-with-an-msi-log/)\n        (Get-Content $logOptionFile) | Select-String -SimpleMatch \"value 3\" -Context 10,0 | ForEach-Object { Write-Warning $_ }\n\n        if ($LogAsArtifact) {\n            New-OctopusArtifact -Path $logOptionFile -Name \"$Action-$([IO.Path]::GetFileNameWithoutExtension($MsiFilePath)).log\"\n        } else {\n\t    \tGet-Content $logOptionFile | Write-Output\n        }\n\n\t} else {\n\t\tWrite-Output \"No logs were generated\"\n\t}\n\n\tif ($exitCode -Ne 0) {\n\t\t$errorCodeString = $exitCode.ToString()\n\t\t$errorMessage = $ErrorMessages[$errorCodeString]\n\t\t\n\t\tif ($IgnoredErrorCodes -notcontains $exitCode) {\n\n\t\t\tthrow \"Error code $exitCodeString was returned: $errorMessage\"\n\t\t}\n\t\telse {\n\t\t\tWrite-Output \"Error code [$exitCodeString] was ignored because it was in the IgnoredErrorCodes [$($IgnoredErrorCodes -join ',')] parameter. Error Message [$errorMessage]\"\n\t\t}\n\t}\n\t\n} `\n(Get-Param 'MsiFilePath' -Required) `\n(Get-Param 'Action' -Required) `\n(Get-Param 'ActionModifier') `\n(Get-Param 'LoggingOptions') `\n((Get-Param 'LogAsArtifact') -eq \"True\") `\n(Get-Param 'Properties') `\n(Get-Param 'IgnoredErrorCodes')\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "381f31f3-2cad-45fa-96ea-d99b2299667c",
-      "Name": "MsiFilePath",
-      "Label": "Msi File Path",
-      "HelpText": "This is the path of the MSI file that will be installed. If the path includes wildcards, then the first match will be used.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6e056c08-d73e-4e3e-bf45-c12e0d3d1d24",
-      "Name": "Action",
-      "Label": "Action",
-      "HelpText": "The task to perform with the MSI, options include install, repair or remove.",
-      "DefaultValue": "Install",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Install\nRepair\nRemove"
-      }
-    },
-    {
-      "Id": "7343a832-0673-472c-ae8f-1a328d65cafe",
-      "Name": "ActionModifier",
-      "Label": "Action Modifier",
-      "HelpText": "Use this to specify a different behavior for the Repair action",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "698d3bfb-2c14-4783-aa19-2a2ae2f49645",
-      "Name": "Properties",
-      "Label": "Properties",
-      "HelpText": "Properties that will be passed to the MSI separated by lines. Properties are in the format key=value, note that values with spaces in the must be quoted. \n\n    Key=Value\n    Key=\"Value\"",
-      "DefaultValue": "REBOOT=ReallySuppress",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "d78748d0-2f38-485d-b76e-c41e5dbde429",
-      "Name": "LoggingOptions",
-      "Label": "Logging Options",
-      "HelpText": "One or more of:\n\n    [i|w|e|a|r|u|c|m|o|p|v|x|+|!|*]\n\n-  i - Status messages\n-  w - Nonfatal warnings\n-  e - All error messages\n-  a - Start-up of actions\n-  r - Action-specific records\n-  u - User requests\n-  c - Initial UI parameters\n-  m - Out-of-memory or fatal exit information\n-  o - Out-of-disk-space messages\n-  p - Terminal properties\n-  v - Verbose output\n-  x - Extra debugging information\n-  \\+ - Append to existing log file\n-  ! - Flush each line to the log\n-  \\* - Log all information, except for v and x options",
-      "DefaultValue": "*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "532b5a46-9510-4558-a17c-a580153fbaff",
-      "Name": "LogAsArtifact",
-      "Label": "Log as artifact",
-      "HelpText": "If selected, then return log output as an artifact.\nIf unselected then return log output as inline content",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "dc10c5e9-d988-4136-9f3e-c0c881a103b3",
-      "Name": "IgnoredErrorCodes",
-      "Label": "Ignored Error Codes",
-      "HelpText": "Use commas to separate integer values.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2025-08-21T16:07:30.818Z",
-  "$Meta": {
-    "ExportedAt": "2025-08-21T16:07:30.818Z",
-    "OctopusVersion": "2025.2.13043",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "windows"
-}
diff --git a/step-templates/save-octopus-output-variable-with-scoping.json b/step-templates/save-octopus-output-variable-with-scoping.json
deleted file mode 100644
index 4b1f64f24..000000000
--- a/step-templates/save-octopus-output-variable-with-scoping.json
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  "Id": "75a8f263-b690-4a55-84b7-9165ac9b6196",
-  "Name": "Save Octopus Output Variable With Scoping",
-  "Description": "Saves an [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables) to the given project / library variable set with scoping",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n$StepTemplate_BaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}'].Trim('/')\nif ([string]::IsNullOrWhiteSpace($StepTemplate_ApiKey)) {\n    throw \"The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again.\"\n}\n\nfunction Invoke-OctopusApi {\n    param(\n        [Parameter(Position = 0, Mandatory)]$Uri,\n        [ValidateSet(\"Get\", \"Put\")]$Method = 'Get',\n        $Body\n    )\n    $requestParameters = @{\n        Uri = ('{0}/{1}' -f $StepTemplate_BaseUrl, $Uri.TrimStart('/'))\n        Method = $Method\n        Headers = @{ \"X-Octopus-ApiKey\" = $StepTemplate_ApiKey }\n        UseBasicParsing = $true\n    }\n    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }\n    Write-Verbose \"$($Method.ToUpperInvariant()) $($requestParameters.Uri)\"   \n    Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json | Write-Output\n}\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-OctopusApi 'api/';\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif(Test-SpacesApi) {\n\t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n    }\n\t$baseApiUrl = \"api/$spaceId\" ;\n} else {\n\t$baseApiUrl = \"api\" ;\n}\n\nfunction Check-Scope {\n\tparam(\n    \t[Parameter(Position = 0, Mandatory)]\n        [string]$ScopeName,\n        [Parameter(Position = 1, Mandatory)]\n        [AllowEmptyCollection()]\n        [array]$ScopeValues,\n        [Parameter(Position = 2)]\n        [array]$ExistingScopeValue,\n        [Parameter(Position = 3)]\n        [string]$LookingForScopeValue\n    )\n    \n    if ($LookingForScopeValue) {\n     \t\n    \tWrite-Host \"Checking $ScopeName Scope\"\n        \n        $scopes = Create-Scope $ScopeName $ScopeValues $LookingForScopeValue\n        \n        if (-not ($ExistingScopeValue -and (Compare-Object $ExistingScopeValue $scopes) -eq $null)) {\n        \tWrite-Host \"$ScopeName scope does not match\"\n        \treturn $false\n        }\n        Write-Host \"$ScopeName scope matches\"\n    } else {\n    \tif ($ExistingScopeValue) {\n        \tWrite-Host \"$ScopeName scope does not match\"\n        \treturn $false\n        }\n    }\n    \n    return $true\n}\n\nfunction Create-Scope {\n\tparam(\n    \t[Parameter(Position = 0, Mandatory)]\n        [string]$ScopeName,\n        [Parameter(Position = 1, Mandatory)]\n        [array]$ScopeValues,\n        [Parameter(Position = 2)]\n        [string]$ScopeValue\n    )\n    \n    $scopes = @()\n    \n    foreach ($scope in $ScopeValue.Split($StepTemplate_ScopeDelimiter)) {\n    \tif ($ScopeName -eq \"TenantTag\") {\n    \t\t$value = $ScopeValues | Where { $_.Id -eq $scope } | Select -First 1\n    \t}\n        else {\n    \t\t$value = $ScopeValues | Where { $_.Name -eq $scope } | Select -First 1\n    \t}\n    \t$scopes += $value.Id\n    }\n    \n    return $scopes\n}\n\n$outputVariableKey = \"Octopus.Action[${StepTemplate_DeploymentStep}].Output.${StepTemplate_VariableName}\"\nif (!$OctopusParameters.ContainsKey($outputVariableKey)) {\n    throw \"Variable '$StepTemplate_VariableName' has not been output from '$StepTemplate_DeploymentStep'\"\n}\n$isSensitive = [System.Convert]::ToBoolean($StepTemplate_IsSensitive)\n$variableType = if ($isSensitive) { \"Sensitive\" } else { \"String\" }\n\n$variableValue = $OctopusParameters[$outputVariableKey]\nWrite-Host \"Name: $StepTemplate_VariableName\"\nWrite-Host \"Type: $variableType\"\nWrite-Host \"Value: $(if ($isSensitive) { \"********\" } else { $variableValue })\"\nWrite-Host ' '\n\nWrite-Host \"Retrieving $StepTemplate_VariableSetType variable set...\"\nif ($StepTemplate_VariableSetType -eq 'project') {\n    $variableSet = Invoke-OctopusApi \"$baseApiUrl/projects/all\" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }\n}\nif ($StepTemplate_VariableSetType -eq 'library') {\n    $variableSet = Invoke-OctopusApi \"$baseApiUrl/libraryvariablesets/all?ContentType=Variables\" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }\n}\nif ($null -eq $variableSet) {\n    throw \"Unable to find $StepTemplate_VariableSetType variable set '$StepTemplate_VariableSetName'\"\n}\n\n$variableExists = $false\n\n$variableSet.Variables | ? Name -eq $StepTemplate_TargetName | % {\n\tif (-not (Check-Scope 'Environment' $variableSet.ScopeValues.Environments $_.Scope.Environment $StepTemplate_EnvironmentScope)) {\n    \treturn\n    }\n\n\tif (-not (Check-Scope 'Machine' $variableSet.ScopeValues.Machines $_.Scope.Machine $StepTemplate_MachineScope)) {\n    \treturn\n    }\n    \n    if (-not (Check-Scope 'Role' $variableSet.ScopeValues.Roles $_.Scope.Role $StepTemplate_RoleScope)) {\n    \treturn\n    }\n    \n    if (-not (Check-Scope 'Action' $variableSet.ScopeValues.Actions $_.Scope.Action $StepTemplate_ActionScope)) {\n    \treturn\n    }\n    \n    if (-not (Check-Scope 'Channel' $variableSet.ScopeValues.Channels $_.Scope.Channel $StepTemplate_ChannelScope)) {\n    \treturn\n    }\n    \n    if (-not (Check-Scope 'TenantTag' $variableSet.ScopeValues.TenantTags $_.Scope.TenantTag $StepTemplate_TenantTagScope)) {\n    \treturn\n    }\n\n    Write-Host \"Updating existing variable...\"\n    Write-Host \"Existing value:\"\n\tWrite-Host \"$(if ($isSensitive) { \"********\" } else { $_.Value })\"\n    $_.Value = $variableValue\n    $_.Type = $variableType\n    $_.IsSensitive = $isSensitive\n    $variableExists = $true\n}\n\nif (!$variableExists) {\n    Write-Host \"Creating new variable...\"\n    \n    $variable = @{\n        Name = $StepTemplate_TargetName\n        Value = $variableValue\n        Type = $variableType\n        IsSensitive = $isSensitive\n        Scope = @{}\n    }\n    \n    if ($StepTemplate_EnvironmentScope) {\n    \t$variable.Scope['Environment'] = (Create-Scope 'Environment' $variableSet.ScopeValues.Environments $StepTemplate_EnvironmentScope)\n    }\n    if ($StepTemplate_RoleScope) {\n    \t$variable.Scope['Role'] = (Create-Scope 'Role' $variableSet.ScopeValues.Roles $StepTemplate_RoleScope)\n    }\n    if ($StepTemplate_MachineScope) {\n    \t$variable.Scope['Machine'] = (Create-Scope 'Machine' $variableSet.ScopeValues.Machines $StepTemplate_MachineScope)\n    }\n    if ($StepTemplate_ActionScope) {\n    \t$variable.Scope['Action'] = (Create-Scope 'Action' $variableSet.ScopeValues.Actions $StepTemplate_ActionScope)\n    }\n    if ($StepTemplate_ChannelScope) {\n    \t$variable.Scope['Channel'] = (Create-Scope 'Channel' $variableSet.ScopeValues.Channels $StepTemplate_ChannelScope)\n    }\n    if ($StepTemplate_TenantTagScope) {\n        $variable.Scope['TenantTag'] = (Create-Scope 'TenantTag' $variableSet.ScopeValues.TenantTags $StepTemplate_TenantTagScope)\n    }\n    \n    $variableSet.Variables += $variable\n}\n\nWrite-Host \"Saving updated variable set...\"\nInvoke-OctopusApi $variableSet.Links.Self -Method Put -Body $variableSet | Out-Null\n"
-  },
-  "Parameters": [
-    {
-      "Id": "bdbd77a9-cc0f-49f0-afac-6403e8ba87e4",
-      "Name": "StepTemplate_ApiKey",
-      "Label": "API Key",
-      "HelpText": "Provide an Octopus API Key with appropriate permissions to save the variable",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "ed5cf637-06ed-4c38-8a8d-f17c523ec6ba",
-      "Name": "StepTemplate_DeploymentStep",
-      "Label": "Deployment Step",
-      "HelpText": "Select the step with the [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "3d6f35a9-99ae-481e-b393-4319b70e0ac0",
-      "Name": "StepTemplate_VariableName",
-      "Label": "Variable Name",
-      "HelpText": "Name of the [variable used when it was set](https://octopus.com/docs/deploying-applications/variables/output-variables#Outputvariables-Settingoutputvariablesusingscripts)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9265ca02-9c0f-48ad-9cb1-65d28d5a446e",
-      "Name": "StepTemplate_VariableSetType",
-      "Label": "Variable Set Type",
-      "HelpText": "If the output variable is being saved to a project or [library variable set](https://octopus.com/docs/deploying-applications/variables/library-variable-sets)",
-      "DefaultValue": "project",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "project|Project Variable\nlibrary|Library Variable Set"
-      }
-    },
-    {
-      "Id": "f511bbd7-1b75-430f-be48-d3b0787d839e",
-      "Name": "StepTemplate_VariableSetName",
-      "Label": "Variable Set Name",
-      "HelpText": "Name of the project or [library](https://octopus.com/docs/deploying-applications/variables/library-variable-sets) variable set where the output variable should be saved",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "50a10535-b36b-4972-a9a0-ff9bb42451c7",
-      "Name": "StepTemplate_TargetName",
-      "Label": "Target Variable Name",
-      "HelpText": "The name to use when saving the variable.\n\n_Note: The original variable name the default value._",
-      "DefaultValue": "#{StepTemplate_VariableName}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "204ad3d5-804a-43cd-90ad-8bb359800c78",
-      "Name": "StepTemplate_IsSensitive",
-      "Label": "Is Sensitive?",
-      "HelpText": "If the variable should be marked as [sensitive](https://octopus.com/docs/deploying-applications/variables/sensitive-variables) and the value masked from logs",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "fdbcad6b-ff48-4f4f-8cda-afc404fb7f10",
-      "Name": "StepTemplate_EnvironmentScope",
-      "Label": "Environment Scope",
-      "HelpText": "The environment scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c4df3719-1f46-4d10-a3b7-52227f78815f",
-      "Name": "StepTemplate_RoleScope",
-      "Label": "Role Scope",
-      "HelpText": "The role scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1782abd1-ed68-4cbb-85b2-efd2baaa1eae",
-      "Name": "StepTemplate_MachineScope",
-      "Label": "Target Scope",
-      "HelpText": "The target scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "85f14553-6425-4298-ba77-bdf31f852d0b",
-      "Name": "StepTemplate_ActionScope",
-      "Label": "Action Scope",
-      "HelpText": "The action scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e4152038-fc42-4ed6-8ad5-4aa94d76a5d1",
-      "Name": "StepTemplate_ChannelScope",
-      "Label": "Channel Scope",
-      "HelpText": "The channel scope to use when creating or updating the variable.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a5bcd57b-d0bb-4b1c-be1b-56314e0b9684",
-      "Name": "StepTemplate_TenantTagScope",
-      "Label": "Tenant Tag Scope",
-      "HelpText": "The tenant tag scope to use when creating or updating the variable. The value should be in the format TagSetName/TagValue.\n\n_This can be a list delimited by the Scope Delimiter (, by default)_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7de754f7-d8b6-4b6e-a7d1-6306cf8f7ab8",
-      "Name": "StepTemplate_ScopeDelimiter",
-      "Label": "Scope Delimiter",
-      "HelpText": "The delimiter used by scope lists.",
-      "DefaultValue": ",",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedAt": "2021-10-21T15:24:33.519Z",
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2021-10-21T15:24:33.519Z",
-    "OctopusVersion": "2021.2.7706",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/save-octopus-output-variable.json b/step-templates/save-octopus-output-variable.json
deleted file mode 100644
index cba18da21..000000000
--- a/step-templates/save-octopus-output-variable.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "Id": "54b22700-3217-48ac-8749-e4a31b424834",
-  "Name": "Save Octopus Output Variable",
-  "Description": "Saves an [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables) to the given project / library variable set",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\n$StepTemplate_BaseUrl = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}'].Trim('/')\nif ([string]::IsNullOrWhiteSpace($StepTemplate_ApiKey)) {\n    throw \"The step parameter 'API Key' was not found. This step requires an API Key to function, please provide one and try again.\"\n}\n\nfunction Invoke-OctopusApi {\n    param(\n        [Parameter(Position = 0, Mandatory)]$Uri,\n        [ValidateSet(\"Get\", \"Put\")]$Method = 'Get',\n        $Body\n    )\n    $requestParameters = @{\n        Uri = ('{0}/{1}' -f $StepTemplate_BaseUrl, $Uri.TrimStart('/'))\n        Method = $Method\n        Headers = @{ \"X-Octopus-ApiKey\" = $StepTemplate_ApiKey }\n        UseBasicParsing = $true\n    }\n    if ($null -ne $Body) { $requestParameters.Add('Body', ($Body | ConvertTo-Json -Depth 10)) }\n    Write-Verbose \"$($Method.ToUpperInvariant()) $($requestParameters.Uri)\"   \n    Invoke-WebRequest @requestParameters | % Content | ConvertFrom-Json | Write-Output\n}\n\nfunction Test-SpacesApi {\n\tWrite-Verbose \"Checking API compatibility\";\n\t$rootDocument = Invoke-OctopusApi 'api/';\n    if($rootDocument.Links -ne $null -and $rootDocument.Links.Spaces -ne $null) {\n    \tWrite-Verbose \"Spaces API found\"\n    \treturn $true;\n    }\n    Write-Verbose \"Pre-spaces API found\"\n    return $false;\n}\n\nif(Test-SpacesApi) {\n\t$spaceId = $OctopusParameters['Octopus.Space.Id'];\n    if([string]::IsNullOrWhiteSpace($spaceId)) {\n        throw \"This step needs to be run in a context that provides a value for the 'Octopus.Space.Id' system variable. In this case, we received a blank value, which isn't expected - please reach out to our support team at https://help.octopus.com if you encounter this error.\";\n    }\n\t$baseApiUrl = \"api/$spaceId\" ;\n} else {\n\t$baseApiUrl = \"api\" ;\n}\n\nfunction Get-OctopusSetting {\n    param([Parameter(Position = 0, Mandatory)][string]$Name, [Parameter(Position = 1, Mandatory)]$DefaultValue)\n    $formattedName = 'Octopus.Action.{0}' -f $Name\n    if ($OctopusParameters.ContainsKey($formattedName)) {\n        $value = $OctopusParameters[$formattedName]\n        if ($DefaultValue -is [bool]) { return ([System.Convert]::ToBoolean($value)) }\n        if ($DefaultValue -is [array] -or $DefaultValue -is [hashtable] -or $DefaultValue -is [pscustomobject]) { return (ConvertFrom-Json -InputObject $value) }\n        return $value\n    }\n    else { return $DefaultValue }\n}\n\n$outputVariableKey = \"Octopus.Action[${StepTemplate_DeploymentStep}].Output.${StepTemplate_VariableName}\"\nif (!$OctopusParameters.ContainsKey($outputVariableKey)) {\n    throw \"Variable '$StepTemplate_VariableName' has not been output from '$StepTemplate_DeploymentStep'\"\n}\n$isSensitive = [System.Convert]::ToBoolean($StepTemplate_IsSensitive)\n$variableType = if ($isSensitive) { \"Sensitive\" } else { \"String\" }\n\n$variableValue = $OctopusParameters[$outputVariableKey]\nWrite-Host \"Name: $StepTemplate_VariableName\"\nWrite-Host \"Type: $variableType\"\nWrite-Host \"Value: $(if ($isSensitive) { \"********\" } else { $variableValue })\"\nWrite-Host ' '\n\nWrite-Host \"Retrieving $StepTemplate_VariableSetType variable set...\"\nif ($StepTemplate_VariableSetType -eq 'project') {\n    $variableSet = Invoke-OctopusApi \"$baseApiUrl/projects/all\" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }\n}\nif ($StepTemplate_VariableSetType -eq 'library') {\n    $variableSet = Invoke-OctopusApi \"$baseApiUrl/libraryvariablesets/all?ContentType=Variables\" | ? Name -eq $StepTemplate_VariableSetName | % { Invoke-OctopusApi $_.Links.Variables }\n}\nif ($null -eq $variableSet) {\n    throw \"Unable to find $StepTemplate_VariableSetType variable set '$StepTemplate_VariableSetName'\"\n}\n\n$variableExists = $false\n$variableSet.Variables | ? Name -eq $StepTemplate_VariableName | % {\n    Write-Host \"Updating existing variable...\"\n    Write-Verbose \"Existing value: $(if ($isSensitive) { \"********\" } else { $_.Value })\"\n    $_.Value = $variableValue\n    $_.Type = $variableType\n    $_.IsSensitive = $isSensitive\n    $_.Scope = Get-OctopusSetting Scope $_.Scope\n    $variableExists = $true\n}\nif (!$variableExists) {\n    Write-Host \"Creating new variable...\"\n    $variableSet.Variables += @{\n        Name = $StepTemplate_VariableName\n        Value = $variableValue\n        Type = $variableType\n        IsSensitive = $isSensitive\n        Scope = (Get-OctopusSetting Scope @{})\n    }\n}\n\nWrite-Host \"Saving updated variable set...\"\nInvoke-OctopusApi $variableSet.Links.Self -Method Put -Body $variableSet | Out-Null",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "41e164af-94b1-42ac-8462-3e1a6ba49bbb",
-      "Name": "StepTemplate_ApiKey",
-      "Label": "API Key",
-      "HelpText": "Provide an Octopus API Key with appropriate permissions to save the variable",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ceddb0a2-621a-4cce-94e1-42ad1bf4ba72",
-      "Name": "StepTemplate_DeploymentStep",
-      "Label": "Deployment Step",
-      "HelpText": "Select the step with the [output variable](https://octopus.com/docs/deploying-applications/variables/output-variables)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "fdd47428-d7ce-4f8d-b73b-e4d513d1aea8",
-      "Name": "StepTemplate_VariableName",
-      "Label": "Variable Name",
-      "HelpText": "Name of the [variable used when it was set](https://octopus.com/docs/deploying-applications/variables/output-variables#Outputvariables-Settingoutputvariablesusingscripts)\n\n_Note: The same name will be given to the saved variable_",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7a81c569-063f-41cb-ae61-1c4ebb67293a",
-      "Name": "StepTemplate_VariableSetType",
-      "Label": "Variable Set Type",
-      "HelpText": "If the output variable is being saved to a project or [library variable set](https://octopus.com/docs/deploying-applications/variables/library-variable-sets)",
-      "DefaultValue": "project",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "project|Project Variable\nlibrary|Library Variable Set"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "09e61027-ab16-4171-80c7-c7656f68833a",
-      "Name": "StepTemplate_VariableSetName",
-      "Label": "Variable Set Name",
-      "HelpText": "Name of the project or [library](https://octopus.com/docs/deploying-applications/variables/library-variable-sets) variable set where the output variable should be saved",
-      "DefaultValue": "#{Octopus.Project.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6e3cf177-1dcc-4b7c-9d24-ec7805167cef",
-      "Name": "StepTemplate_IsSensitive",
-      "Label": "Is Sensitive?",
-      "HelpText": "If the variable should be marked as [sensitive](https://octopus.com/docs/deploying-applications/variables/sensitive-variables) and the value masked from logs",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2021-10-21T15:24:33.519Z",
-    "OctopusVersion": "2021.2.7706",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/sbom-scan.json b/step-templates/sbom-scan.json
deleted file mode 100644
index d03a409d2..000000000
--- a/step-templates/sbom-scan.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "a38bfff8-8dde-4dd6-9fd0-c90bb4709d5a",
-  "Name": "Scan for Vulnerabilities",
-  "Description": "This step extracts the Docker image, finds any bom.json files, and scans them for vulnerabilities using Trivy.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "9b495093-0020-4df8-bc44-2fd65ab13943",
-      "Name": "application",
-      "PackageId": "",
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Sbom.Package"
-      }
-    }
-  ],
-  "GitDependencies": [],
-  "Properties": {
-    "OctopusUseBundledTooling": "False",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Write-Host \"Pulling Trivy Docker Image\"\nWrite-Host \"##octopus[stdout-verbose]\"\ndocker pull ghcr.io/aquasecurity/trivy\nWrite-Host \"##octopus[stdout-default]\"\n\n$SUCCESS = 0\n\nWrite-Host \"##octopus[stdout-verbose]\"\nGet-ChildItem -Path \".\" | Out-String\nWrite-Host \"##octopus[stdout-default]\"\n\n# Find all bom.json files\n$bomFiles = Get-ChildItem -Path \".\" -Filter \"bom.json\" -Recurse -File\n\nif ($bomFiles.Count -eq 0) {\n    Write-Host \"No bom.json files found in the current directory.\"\n    exit 0\n}\n\nforeach ($file in $bomFiles) {\n    Write-Host \"Scanning $($file.FullName)\"\n\n    # Delete any existing report file\n    if (Test-Path \"$($file.FullName)/depscan-bom.json\") {\n        Remove-Item \"$($file.FullName)/depscan-bom.json\" -Force\n    }\n\n    # Generate the report, capturing the output\n    try {\n        $OUTPUT = docker run --rm -v \"$($file.FullName):/input/$($file.Name)\" ghcr.io/aquasecurity/trivy sbom -q \"/input/$($file.Name)\"\n        $exitCode = $LASTEXITCODE\n    }\n    catch {\n        $OUTPUT = $_.Exception.Message\n        $exitCode = 1\n    }\n\n    # Run again to generate the JSON output in the same directory as the bom.json file\n    docker run --rm -v \"$($file.DirectoryName):/output\" -v \"$($file.FullName):/input/$($file.Name)\" ghcr.io/aquasecurity/trivy sbom -q -f json -o /output/depscan-bom.json \"/input/$($file.Name)\"\n\n    # Parse JSON output to count vulnerabilities\n    $jsonContent = Get-Content -Path \"$($file.DirectoryName)/depscan-bom.json\" | ConvertFrom-Json\n    $CRITICAL = ($jsonContent.Results | ForEach-Object { $_.Vulnerabilities } | Where-Object { $_.Severity -eq \"CRITICAL\" }).Count\n    $HIGH = ($jsonContent.Results | ForEach-Object { $_.Vulnerabilities } | Where-Object { $_.Severity -eq \"HIGH\" }).Count\n\n    if (\"#{Octopus.Environment.Name}\" -eq \"Security\") {\n        Write-Highlight \"\uD83D\uDFE5 $CRITICAL critical vulnerabilities\"\n        Write-Highlight \"\uD83D\uDFE7 $HIGH high vulnerabilities\"\n    }\n\n    # Set success to 1 if exit code is not zero\n    if ($exitCode -ne 0) {\n        $SUCCESS = 1\n    }\n\n    # Print the output\n    $OUTPUT | ForEach-Object {\n        if ($_.Length -gt 0) {\n            Write-Host $_\n        }\n    }\n}\n\n# Find all depscan-bom.json files recursively\n$depscanFiles = Get-ChildItem -Path \".\" -Filter \"depscan-bom.json\" -Recurse -File\n\nif ($depscanFiles.Count -gt 0) {\n    $zipPath = \"$PWD/depscan-bom.zip\"\n\n    # Remove existing zip if present\n    if (Test-Path $zipPath) {\n        Remove-Item $zipPath -Force\n    }\n\n    # Create a temporary directory structure and copy files with relative paths\n    $tempDir = \"$PWD/temp_zip\"\n\n    if (Test-Path $tempDir) {\n        Remove-Item $tempDir -Recurse -Force\n    }\n\n    New-Item -ItemType Directory -Path $tempDir -Force | Out-Null\n\n    foreach ($file in $depscanFiles) {\n        $relativePath = $file.FullName.Substring($PWD.Path.Length + 1)\n        $targetPath = Join-Path $tempDir $relativePath\n        $targetDir = Split-Path $targetPath -Parent\n\n        Write-Host \"Adding $relativePath to zip\"\n\n        if (-not (Test-Path $targetDir)) {\n            New-Item -ItemType Directory -Path $targetDir -Force | Out-Null\n        }\n\n        Copy-Item $file.FullName -Destination $targetPath\n    }\n\n    # Compress with relative paths\n    Compress-Archive -Path \"$tempDir/*\" -DestinationPath $zipPath\n\n    # Cleanup temp directory\n    Remove-Item $tempDir -Recurse -Force\n\n    # Octopus Deploy artifact\n    New-OctopusArtifact $zipPath\n\n} else {\n    Write-Host \"No depscan-bom.json files found to zip.\"\n}\n\n# Cleanup\nfor ($i = 1; $i -le 10; $i++) {\n    try {\n        if (Test-Path \"bundle\") {\n            Set-ItemProperty -Path \"bundle\" -Name IsReadOnly -Value $false -Recurse -ErrorAction SilentlyContinue\n            Remove-Item -Path \"bundle\" -Recurse -Force -ErrorAction Stop\n            break\n        }\n    }\n    catch {\n        Write-Host \"Attempting to clean up files\"\n        Start-Sleep -Seconds 1\n    }\n}\n\n# Set Octopus variable\nSet-OctopusVariable -Name \"VerificationResult\" -Value $SUCCESS\n\nexit 0"
-  },
-  "Parameters": [
-    {
-      "Id": "9cea163a-a048-4ff5-9405-56fdcb9015c7",
-      "Name": "Sbom.Package",
-      "Label": "Application package containing the SBOM to scan",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-11-02T21:42:33.662Z",
-    "OctopusVersion": "2025.4.6337",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "mcasperson",
-  "Category": "sbom"
-}
diff --git a/step-templates/scheduled-task-create-from-xml.json b/step-templates/scheduled-task-create-from-xml.json
deleted file mode 100644
index 9e19f95a6..000000000
--- a/step-templates/scheduled-task-create-from-xml.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "26c779af-4cce-447e-98bb-4741c25e0b3c",
-  "Name": "Create Scheduled Tasks From XML",
-  "Description": "This will create a schedule task based on exported xml. See https://msdn.microsoft.com/en-us/library/windows/desktop/bb736357%28v=vs.85%29.aspx for instructions on how to export scheduled tasks as xml.",
-  "ActionType": "Octopus.Script",
-  "Version": 27,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\r\nparam(\r\n    [string]$xmlFileName,\r\n    [string]$userName,\r\n    [string]$password\r\n)\r\n\r\n$ErrorActionPreference = \"Stop\" \r\n\r\nfunction Get-Param($Name, [switch]$Required, $Default) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        $variable = Get-Variable $Name -EA SilentlyContinue    \r\n        if ($variable -ne $null) {\r\n            $result = $variable.Value\r\n        }\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\nFunction Create-ScheduledTask($xmlFileName, $taskName, $username, $password){\r\n\t$Command = \"schtasks.exe /create /tn $($taskName) /RU $($username) /RP $($password) /XML $($xmlFileName)\"\r\n\r\n\tWrite-Host $Command\r\n\tInvoke-Expression $Command\r\n }\r\n\r\nFunction Delete-ScheduledTask($TaskName) {   \r\n\t$Command = \"schtasks.exe /delete /tn `\"$TaskName`\" /F\"            \r\n\tInvoke-Expression $Command \r\n}\r\n\r\nFunction Stop-ScheduledTask($TaskName) {  \r\n\t$Command = \"schtasks.exe /end /tn `\"$TaskName`\"\"            \r\n\tInvoke-Expression $Command \r\n}\r\n\r\nFunction Start-ScheduledTask($TaskName) {   \r\n\t$Command = \"schtasks.exe /run /tn `\"$TaskName`\"\"            \r\n\tInvoke-Expression $Command \r\n}\r\n\r\nFunction ScheduledTask-Exists($taskName) {\r\n   $schedule = new-object -com Schedule.Service \r\n   $schedule.connect() \r\n   $tasks = $schedule.getfolder(\"\\\").gettasks(0)\r\n\r\n   foreach ($task in ($tasks | select Name)) {\r\n\t  #echo \"TASK: $($task.name)\"\r\n\t  if($task.Name -eq $taskName) {\r\n\t\t #write-output \"$task already exists\"\r\n\t\t return $true\r\n\t  }\r\n   }\r\n\r\n   return $false\r\n}\r\n\r\nFunction GetTaskNameFromXmlPath($xmlFile){\r\n    return (Split-Path -Path $xmlFile -Leaf -Resolve).Split(\".\")[0]\r\n}\r\n\r\n& {\r\n    param(\r\n        [string]$xmlFileName,\r\n        [string]$userName,\r\n        [string]$password\r\n    ) \r\n\r\n    Write-Host \"Create Schedule Task From XML\"\r\n    Write-Host \"xmlFileName: $xmlFileName\"\r\n    Write-Host \"userName: $userName\"\r\n    Write-Host \"password: <Hidden>\"\r\n\r\n    $xmlFileName.Split(\";\") | foreach{\r\n        $xmlFile = $_.Trim()\r\n        $taskName = GetTaskNameFromXmlPath($xmlFile)\r\n\r\n\r\n        if((ScheduledTask-Exists($taskName))){\r\n\t        Write-Output \"$taskName already exists, Tearing down...\"\r\n\t        Write-Output \"Stopping $taskName...\"\r\n\t        Stop-ScheduledTask($taskName)\r\n\t        Write-Output \"Successfully Stopped $taskName\"\r\n\t        Write-Output \"Deleting $taskName...\"\r\n\t        Delete-ScheduledTask($taskName)\r\n\t        Write-Output \"Successfully Deleted $taskName\"\r\n        }\r\n\r\n        Write-Output \"Create a Scheduled Task from $xmlFile called $taskName. Run as $username\" \r\n        Create-ScheduledTask \"$($xmlFile)\" $taskName $username $password\r\n    }\r\n\r\n}`\r\n(Get-Param 'xmlFileName' -Required)`\r\n(Get-Param 'userName' -Required)`\r\n(Get-Param 'password' -Required)",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "xmlFileName",
-      "Label": "Xml File List",
-      "HelpText": "A list of XML files, separated by ';', containing the scheduled tasks to create.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "username",
-      "Label": "User Name",
-      "HelpText": "The User that the task will run as",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "password",
-      "Label": "Password",
-      "HelpText": "The password of the user the task will run as",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-04-29T14:04:16.639+00:00",
-  "LastModifiedBy": "josh3ennett",
-  "$Meta": {
-    "ExportedAt": "2015-04-29T14:15:45.938+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "xml"
-}
\ No newline at end of file
diff --git a/step-templates/send-email-using-mailkit.json b/step-templates/send-email-using-mailkit.json
deleted file mode 100644
index 784881845..000000000
--- a/step-templates/send-email-using-mailkit.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-    "Id": "b163a315-24b7-4bf8-9cca-d9011f57019a",
-    "Name": "Send Email using MailKit",
-    "Description": "This step template supports sending an email using the [MailKit](https://github.com/jstedfast/MailKit) library, a cross-platform .NET library for IMAP, POP3, and SMTP.\n\n- Support for multiple TO addresses (separated by `,`).\n- Support for multiple CC addresses (separated by `,`).\n- *Optional* support for a separate `reply-to` address.\n\nThis step **does not** support running on PowerShell: Windows Desktop Edition.\n\n---\n\n**Required:** \n- The `MailKit` and `MimeKit` packages are installed on the target or worker. If the packages can't be found, the step will attempt to download them from [https://www.nuget.org](https://www.nuget.org).\n- PowerShell Core (including when running on Windows).\n\n*Notes:*\n\n- Tested on Octopus `2025.1`.\n- Tested on Windows and Linux with PowerShell Core only.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "GitDependencies": [],
-    "Properties": {
-      "Octopus.Action.PowerShell.Edition": "Core",
-      "Octopus.Action.EnabledFeatures": "Octopus.Features.SelectPowerShellEditionForWindows",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\n\nif ($PSEdition -eq \"Core\") {\n    $PSStyle.OutputRendering = \"PlainText\"\n}\n$emailSubject = $OctopusParameters[\"SendEmail.Subject\"]\n$emailSmtpServer = $OctopusParameters[\"SendEmail.SmtpServer\"]\n$emailSmtpPort = $OctopusParameters[\"SendEmail.SmtpPort\"]\n$emailCredentialsUsername = $OctopusParameters[\"SendEmail.Credentials.Username\"]\n$emailCredentialsPassword = $OctopusParameters[\"SendEmail.Credentials.Password\"]\n$emailSecureSocketOption = $OctopusParameters[\"SendEmail.SecureSocketOption\"]\n\n$validSecureSocketOptions = @(\"None\", \"Auto\", \"SslOnConnect\", \"StartTls\", \"StartTlsWhenAvailable\")\nif(-not $validSecureSocketOptions.Contains($emailSecureSocketOption)) {\n    Write-Error \"Invalid SecureSocketOption: $emailSecureSocketOption. Must be one of: $($validSecureSocketOptions -join \", \").\"\n    return\n}\n\n$emailFromAddress = $OctopusParameters[\"SendEmail.FromAddress\"]\n$emailToAddresses = $OctopusParameters[\"SendEmail.TOAddresses\"]\n$emailCcAddresses = $OctopusParameters[\"SendEmail.CCAddresses\"]\n$emailReplyToAddress = $OctopusParameters[\"SendEmail.ReplyToAddress\"]\n\n$HtmlBody = $OctopusParameters[\"SendEmail.HtmlBody\"]\n$TextBody = $OctopusParameters[\"SendEmail.TextBody\"]\n\nWrite-Verbose \"Checking for MimeKit and MailKit packages.\"\ntry {\n    \n    $MimeKitPackage = (Get-Package MimeKit -ErrorAction Stop) | Select-Object -First 1\n} \ncatch {\n    $MimeKitPackage = $null\n}\nif ($null -eq $MimeKitPackage) {\n    Write-Output \"Downloading MimeKit from nuget.org.\"\n    Install-Package -Name 'MimeKit' -Source \"https://www.nuget.org/api/v2\" -SkipDependencies -Force -Scope CurrentUser\n    $MimeKitPackage = (Get-Package MimeKit) | Select-Object -First 1\n}\n\ntry {\n    $MailKitPackage = (Get-Package MailKit -ErrorAction Stop) | Select-Object -First 1\n} \ncatch {\n    $MailKitPackage = $null\n}\nif ($null -eq $MailKitPackage) {\n    Write-Output \"Downloading MailKit from nuget.org.\"\n    Install-Package -Name 'MailKit' -Source \"https://www.nuget.org/api/v2\" -SkipDependencies -Force -Scope CurrentUser\n    $MailKitPackage = (Get-Package MailKit) | Select-Object -First 1\n}\n\n$MimeKitPath = Join-Path (Get-Item $MimeKitPackage.source).Directory.FullName \"lib/netstandard2.1/MimeKit.dll\"\n$MailKitPath = Join-Path (Get-Item $MailKitPackage.source).Directory.FullName \"lib/netstandard2.1/MailKit.dll\"\n\nAdd-Type -Path $MimeKitPath\nAdd-Type -Path $MailKitPath\n\n# Validation/Setting of Secure Socket Options needed after libraries loaded\nswitch($emailSecureSocketOption) {\n    \"Auto\" {\n        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::Auto\n    }\n    \"None\" {\n        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::None\n    }\n    \"SslOnConnect\" {\n        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::SslOnConnect\n    }\n    \"StartTls\" {\n        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::StartTls\n    }\n    \"StartTlsWhenAvailable\" {\n        $secureSocketOption = [MailKit.Security.SecureSocketOptions]::StartTlsWhenAvailable\n    }\n    default {\n        Write-Error \"Invalid SecureSocketOption: $emailSecureSocketOption. Must be one of: $($validSecureSocketOptions -join \", \").\"\n        return\n    }\n}\n\n$SMTP = New-Object MailKit.Net.Smtp.SmtpClient\n\n$Message = New-Object MimeKit.MimeMessage\n$ContentBuilder = [MimeKit.BodyBuilder]::new()\n\n$ContentBuilder.HtmlBody = $HtmlBody\n$ContentBuilder.TextBody = $TextBody\nWrite-Verbose \"Setting From address: $emailFromAddress\" \n$Message.From.Add($emailFromAddress)\n$toAddresses = $emailToAddresses -split \",\"\nWrite-Verbose \"Setting TO addresses: $emailToAddresses\"\nforeach($toAddress in $toAddresses) {\n    $Message.To.Add($toAddress)\n}\n\nif(-not [string]::IsNullOrWhitespace($emailCcAddresses)) {\n    Write-Verbose \"Setting CC addresses: $emailCcAddresses\"\n    $ccAddresses = $emailCcAddresses -split \",\"\n    foreach($ccAddress in $ccAddresses) {\n        $Message.Cc.Add($ccAddress)\n    }\n}\nif(-not [string]::IsNullOrWhitespace($emailReplyToAddress)) {\n    Write-Verbose \"Setting ReplyTo address: $emailReplyToAddress\"\n    $Message.ReplyTo.Add($emailReplyToAddress)\n}\n\nWrite-Verbose \"Setting subject to: $emailSubject\"\n$Message.Subject = $emailSubject\nWrite-Verbose \"Setting MimeMessage Body contents\"\n$Message.Body = $ContentBuilder.ToMessageBody()\nWrite-Verbose \"Connecting to SMTP server: $emailSmtpServer on port: $emailSmtpPort (using SecureSocketOption=$emailSecureSocketOption)\"\n$SMTP.Connect($emailSmtpServer, $emailSmtpPort, $secureSocketOption)\nWrite-Verbose \"Authenticating...\"\n$SMTP.Authenticate($emailCredentialsUsername, $emailCredentialsPassword)\nWrite-Output \"Sending email...\"\n$SMTP.Send($Message)\nWrite-Output \"Email sent.\"\n$SMTP.Disconnect($true)\n$SMTP.Dispose()"
-    },
-    "Parameters": [
-      {
-        "Id": "65b67843-2cd5-48a5-ac9d-611de16246a7",
-        "Name": "SendEmail.SmtpServer",
-        "Label": "SMTP Server",
-        "HelpText": "The SMTP Server address e.g. `smtp.gmail.com`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3d87558e-aa18-46af-85bb-644890d6654b",
-        "Name": "SendEmail.SmtpPort",
-        "Label": "SMTP Port",
-        "HelpText": "The SMTP Port used for connecting. Typical SMTP ports are: \n- `25`\n- `587` (STARTTLS)\n- `465` (SSL)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0c1f7ae0-8cd4-45a5-b53b-e5019ad5ecb0",
-        "Name": "SendEmail.SecureSocketOption",
-        "Label": "SSL Option",
-        "HelpText": "The [SSL Option](https://mimekit.net/docs/html/T_MailKit_Security_SecureSocketOptions.htm) to use:\n- `None`: No SSL or TLS encryption should be used\n- `Auto`: Allow the [IMailService](https://mimekit.net/docs/html/T_MailKit_IMailService.htm) to decide which SSL or TLS options to use (default). If the server does not support SSL or TLS, then the connection will continue without any encryption.\n- `SslOnConnect`: The connection should use SSL or TLS encryption immediately.\n- `StartTls`: Elevates the connection to use TLS encryption immediately after reading the greeting and capabilities of the server. If the server does not support the STARTTLS extension, then the connection will fail and a NotSupportedException will be thrown.\n- `StartTlsWhenAvailable`: Elevates the connection to use TLS encryption immediately after reading the greeting and capabilities of the server, but only if the server supports the STARTTLS extension.\n\nDefault: `Auto`.",
-        "DefaultValue": "Auto",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "None|None\nAuto|Auto\nSslOnConnect|Use SSL\nStartTls|Use STARTTLS\nStartTlsWhenAvailable|Start Tls When Available"
-        }
-      },
-      {
-        "Id": "208a3bab-b331-4fa6-a122-459593a4c98f",
-        "Name": "SendEmail.Credentials.Username",
-        "Label": "Authentication Username",
-        "HelpText": "The username to authenticate with the SMTP Server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "d42aba20-174a-4b51-af88-78d332f09a08",
-        "Name": "SendEmail.Credentials.Password",
-        "Label": "Authentication Password",
-        "HelpText": "The password to authenticate with the SMTP Server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "8eafb51b-599b-4c51-8d35-974c5843c9cb",
-        "Name": "SendEmail.Subject",
-        "Label": "Email Subject",
-        "HelpText": "The Email Subject",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "bc4d18f8-e096-4911-84ce-e35268c83934",
-        "Name": "SendEmail.FromAddress",
-        "Label": "From Address",
-        "HelpText": "The sender address of the Email",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "302fb573-5720-47b6-bbd7-7d0077ca75ba",
-        "Name": "SendEmail.TOAddresses",
-        "Label": "TO addresses",
-        "HelpText": "The recipients of the Email. Multiple addresses can be supplied, separated by a `,`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "be2267f6-36b0-4f7e-a7cf-f274e56aff2f",
-        "Name": "SendEmail.CCAddresses",
-        "Label": "(Optional) CC addresses",
-        "HelpText": "The *optional* CC (carbon-copy) recipients of the Email. Multiple addresses can be supplied, separated by a `,`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b43c49fd-3214-4310-a8cf-10489a3c858f",
-        "Name": "SendEmail.ReplyToAddress",
-        "Label": "(Optional) Reply-to address",
-        "HelpText": "The *optional* `reply-to` address.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "9e07a17f-a044-4f6f-ac0c-5d131058a270",
-        "Name": "SendEmail.HtmlBody",
-        "Label": "HTML Message Body",
-        "HelpText": "The HTML message body of the Email.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "bd111434-193d-413b-9d7e-279381061a0c",
-        "Name": "SendEmail.TextBody",
-        "Label": "Plain Text Message Body",
-        "HelpText": "The Text message body of the Email.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2025-02-26T14:52:39.564Z",
-      "OctopusVersion": "2025.2.937",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "email"
-  }
diff --git a/step-templates/send-sms-using-messagebird.json b/step-templates/send-sms-using-messagebird.json
deleted file mode 100644
index d9ae75cd2..000000000
--- a/step-templates/send-sms-using-messagebird.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"Id": "d5dba42f-ab60-4342-bdaf-b8ecd2f763c3",
-	"Name": "MessageBird Send SMS",
-	"Description": "Send an SMS using MessageBird API.",
-	"ActionType": "Octopus.Script",
-	"Version": 2,
-	"CommunityActionTemplateId": null,
-	"Packages": [],
-	"Properties": {
-		"Octopus.Action.Script.ScriptSource": "Inline",
-		"Octopus.Action.Script.Syntax": "PowerShell",
-		"Octopus.Action.Script.ScriptBody": "#-----------------------------\n#Latest Update 2021-01-21\n#Bilal Aljbour - FRISS\n#-----------------------------\n$url = \"https://rest.messagebird.com/messages?access_key=$MessageBird_Key\"\n$params = @{\nhref = 'https://rest.messagebird.com/messages'\nrecipients = \"$MessageBird_Recipients\"\noriginator = \"$MessageBird_originator\"\nbody = \"$MessageBird_body\"\n}\nInvoke-WebRequest $url -Method Post -Body $params -UseBasicParsing | Out-Null\nWrite-Host 'Message has been sent!'"
-	},
-	"Parameters": [{
-			"Id": "8fcbce8e-5d10-442c-a50d-470b2458a481",
-			"Name": "MessageBird_Key",
-			"Label": "MessageBird Key",
-			"HelpText": "API keys give you access to all our REST API methods.\nThis can be created/copied [here](https://dashboard.messagebird.com/en/developers/access)",
-			"DefaultValue": "",
-			"DisplaySettings": {
-				"Octopus.ControlType": "SingleLineText"
-			}
-		},
-		{
-			"Id": "7c06f0e6-84e8-4ed0-b804-aed47d580667",
-			"Name": "MessageBird_originator",
-			"Label": "From",
-			"HelpText": "The sender of the message. This can be a telephone number (including country code) or an alphanumeric string. In case of an alphanumeric string, the maximum length is 11 characters. ",
-			"DefaultValue": "",
-			"DisplaySettings": {
-				"Octopus.ControlType": "SingleLineText"
-			}
-		},
-		{
-			"Id": "e4b45a2d-f7ca-4329-88fc-d6f23b1249c4",
-			"Name": "MessageBird_Recipients",
-			"Label": "To",
-			"HelpText": "The number to send the message to.",
-			"DefaultValue": "",
-			"DisplaySettings": {
-				"Octopus.ControlType": "SingleLineText"
-			}
-		},
-		{
-			"Id": "e882db5e-d780-4183-956e-e51806163b60",
-			"Name": "MessageBird_body",
-			"Label": "Message",
-			"HelpText": "The content of the SMS message.\n",
-			"DefaultValue": "",
-			"DisplaySettings": {
-				"Octopus.ControlType": "MultiLineText"
-			}
-		}
-	],
-	"$Meta": {
-		"ExportedAt": "2021-01-21T13:54:53.610Z",
-		"OctopusVersion": "2020.4.6",
-		"Type": "ActionTemplate"
-	},
-	"LastModifiedBy": "bilalmajali",
-	"Category": "other"
-}
diff --git a/step-templates/seq-log-deployment.json b/step-templates/seq-log-deployment.json
deleted file mode 100644
index d66c6111c..000000000
--- a/step-templates/seq-log-deployment.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "Id": "a55a825b-8e8b-4995-8143-0f9dd7b6bcfa",
-  "Name": "Seq - Log Deployment",
-  "Description": "Post details of the deployment to a [Seq](https://getseq.net) log server. Add this as the last step in a process, and ensure it is set to run always (on success and failure).",
-  "ActionType": "Octopus.Script",
-  "Version": 22,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Open-Seq ([string] $url, [string] $apiKey, $properties = @{})\r\n{\r\n  return @{ Url = $url; ApiKey = $apiKey; Properties = $properties.Clone() }\r\n}\r\n  \r\nfunction Send-SeqEvent (\r\n    $seq,\r\n    [string] $text,\r\n    [string] $level,\r\n    $properties = @{},\r\n    [string] $exception = $null,\r\n    [switch] $template)\r\n{\r\n  if (-not $level) {\r\n    $level = 'Information'\r\n  }\r\n   \r\n  if (@('Verbose', 'Debug', 'Information', 'Warning', 'Error', 'Fatal') -notcontains $level) {\r\n    $level = 'Information'\r\n  }\r\n  \r\n  $allProperties = $seq[\"Properties\"].Clone()\r\n  $allProperties += $properties\r\n  \r\n  $messageTemplate = \"{Text}\"\r\n  \r\n  if ($template) {\r\n    $messageTemplate = $text;\r\n  } else {\r\n    $allProperties += @{ Text = $text; }\r\n  }\r\n  \r\n  $exceptionProperty = \"\"\r\n  if ($exception) {\r\n      $exceptionProperty = \"\"\"Exception\"\": $($exception | ConvertTo-Json),\"\r\n  }\r\n  \r\n  $body = \"{\"\"Events\"\": [ {\r\n    \"\"Timestamp\"\": \"\"$([System.DateTimeOffset]::Now.ToString('o'))\"\",\r\n    \"\"Level\"\": \"\"$level\"\",\r\n    $exceptionProperty\r\n    \"\"MessageTemplate\"\": $($messageTemplate | ConvertTo-Json),\r\n    \"\"Properties\"\": $($allProperties | ConvertTo-Json) }]}\"\r\n  \r\n  $target = \"$($seq[\"Url\"])/api/events/raw?apiKey=$($seq[\"ApiKey\"])\"\r\n  \r\n  Invoke-RestMethod -Uri $target -Body $body -ContentType \"application/json\" -Method POST\r\n}\r\n\r\nWrite-Output \"Logging the deployment result to Seq at $SeqServerUrl...\"\r\n\r\n$seq = Open-Seq $SeqServerUrl -apiKey $SeqApiKey\r\n\r\n$properties = @{\r\n    ProjectName = $OctopusParameters['Octopus.Project.Name'];\r\n    ReleaseNumber = $OctopusParameters['Octopus.Release.Number'];\r\n    Result = \"succeeded\";\r\n    EnvironmentName = $OctopusParameters['Octopus.Environment.Name'];\r\n    DeploymentName = $OctopusParameters['Octopus.Deployment.Name'];\r\n    Channel = $OctopusParameters['Octopus.Release.Channel.Name'];\r\n    DeploymentLink = $OctopusParameters['#{if Octopus.Web.ServerUri}Octopus.Web.ServerUri#{else}Octopus.Web.BaseUrl#{/if}'] + $OctopusParameters['Octopus.Web.DeploymentLink']\r\n}\r\n\r\n$level = \"Information\"\r\n$exception = $null\r\nif ($OctopusParameters['Octopus.Deployment.Error']) {\r\n    $level = \"Error\"\r\n    $properties[\"Result\"] = \"failed\"\r\n    $properties[\"Error\"] = $OctopusParameters['Octopus.Deployment.Error']\r\n    $exception = $OctopusParameters['Octopus.Deployment.ErrorDetail']\r\n}\r\n\r\ntry {\r\n    Send-SeqEvent $seq \"A deployment of {ProjectName} release {ReleaseNumber} {Result} in {EnvironmentName}\" -level $level -template -properties $properties -exception $exception\r\n} catch [Exception] {\r\n    [System.Console]::Error.WriteLine(\"Unable to write deployment details to Seq\")\r\n    $_.Exception | format-list -force\r\n}\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "SeqServerUrl",
-      "Label": "Seq server URL",
-      "HelpText": "The URL of the Seq server.",
-      "DefaultValue": "http://localhost:5341",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SeqApiKey",
-      "Label": "Seq API key",
-      "HelpText": "If an [API key](http://docs.getseq.net/docs/api-keys) is required for writing events, specify it here.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2023-02-16T15:38:44.043Z",
-    "OctopusVersion": "2021.1.7687",
-    "Type": "ActionTemplate"
-  },
-  "Category": "seq"
-}
diff --git a/step-templates/sharepoint-solution-deployment.json b/step-templates/sharepoint-solution-deployment.json
deleted file mode 100644
index e8a62d74a..000000000
--- a/step-templates/sharepoint-solution-deployment.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "7ac03a43-cb18-4e83-a114-b158a2bb2a52",
-  "Name": "SharePoint Solution Deployment",
-  "Description": "SharePoint Solution Deployment for 2010 & 2013.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$DeployedPath = $OctopusParameters[\"Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath\"]\r\n$ReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\r\n\r\nWrite-Host \"Deploy Path: $DeployedPath\"\r\nWrite-Host \"Release Number: $ReleaseNumber\"\r\n\r\nfunction Deploy-SPSolution($wsp) {\r\n\r\n\t$wspName = $wsp.SubString($wsp.LastIndexOf(\"\\\") + 1)\r\n\r\n\t$solution = Get-SPSolution -Identity $wspName -ErrorAction silentlycontinue\r\n\r\n\tif ($solution -ne $null) \r\n\t{ \r\n\t    Write-Output \"'$wspName' solution already installed - removing solution\"\r\n\t\t\r\n\t\t# need to take a back up of this wsp before uninstalling it.\t\t\r\n\t\tif($solution.ContainsWebApplicationResource) {\r\n\t        $solution | Uninstall-SPSolution -AllWebApplications -Confirm:$false\r\n\t    }\r\n\t    else {\r\n\t        $solution | Uninstall-SPSolution -Confirm:$false\r\n\t    }\r\n\t\t\r\n\t\twhile ($solution.JobExists) {\r\n\t\t    Start-Sleep 30\r\n\t\t}\r\n\t\t\r\n\t\tWrite-Output \"$wspName has been uninstalled successfully.\"\r\n\r\n\t    Write-Output \"Removing '$wspName' solution from farm\" \r\n\t    $solution | Remove-SPSolution -Force -Confirm:$false \r\n\t\r\n\t\t# now install \r\n\t\tWrite-Output \"Installing solution '$wspName'\" \r\n\t\tAdd-SPSolution -LiteralPath \"$wsp\" | Out-Null\r\n\t\t\r\n\t\tWrite-Output \"$wsp solution added sucessfully\"\r\n\t\tif(($solution -ne $null) -and ($solution.ContainsWebApplicationResource)) {\r\n\t\t\tInstall-SPSolution -Identity $wspName –AllwebApplications -GACDeployment -Force -Confirm:$false\r\n\t\t}\r\n\t\telse {\r\n\t\t\tInstall-SPSolution -Identity $wspName -GACDeployment -Force -Confirm:$false\r\n\t\t}\r\n\r\n\t\t<#\r\n\t\twhile ($Solution.Deployed -eq $false) {\r\n\t\t    Start-Sleep 30\r\n\t\t}\r\n\t\t#>\r\n\t}\r\n\telse {\r\n\t\tWrite-Output \"Installing solution '$wspName'\" \r\n\t\tAdd-SPSolution -LiteralPath \"$wsp\"  -ErrorAction Stop\r\n\t\tInstall-SPSolution -Identity $wspName -GACDeployment -Force -ErrorAction Stop\r\n\t}\r\n}\r\n\r\nfunction Start-AdminService() {\r\n\t$AdminServiceName = \"SPAdminV4\"\r\n\t\r\n\tif ($(Get-Service $AdminServiceName).Status -eq \"Stopped\") {\r\n\t    Start-Service $AdminServiceName\r\n\t   \tWrite-Host \"$AdminServiceName service was not running, now started.\"\r\n\t\treturn $false;\r\n\t}\r\n\t\r\n\treturn $true\r\n}\r\n\r\nfunction Stop-AdminService($IsAdminServiceWasRunning) {\r\n\t$AdminServiceName = \"SPAdminV4\"\t\r\n\tif ($IsAdminServiceWasRunning -eq $false ) { \r\n\t\tStop-Service $AdminServiceName\t\r\n\t}\r\n}\r\n\r\n#region Main\r\ntry\r\n{\r\n\t# add powershell snap in for sharepoint functions\r\n\tif ((Get-PSSnapin \"Microsoft.SharePoint.PowerShell\" -ErrorAction SilentlyContinue) -eq $null) { \r\n\t    Add-PSSnapin \"Microsoft.SharePoint.PowerShell\" -ErrorAction SilentlyContinue\r\n\t}\r\n\t\r\n\t#Admin service\r\n\t$IsAdminServiceWasRunning = $true;\r\n\t\r\n\t$IsAdminServiceWasRunning = Start-AdminService\r\n\t\r\n\t$wspFiles = @()\r\n\t\r\n\t# get all report files for deployment\r\n    Write-Host \"Getting all .wsp files\"\r\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.wsp\" | ForEach-Object { If(($wspFiles -contains $_.FullName) -eq $false) {$wspFiles += $_.FullName}}\r\n    Write-Host \"# of wsp files found: $($wspFiles.Count)\"\r\n\t\r\n\t# loop through array\r\n    foreach($wsp in $wspFiles) {\r\n\t\tDeploy-SPSolution $wsp\r\n\t}\t\r\n\t\r\n\tStop-AdminService $IsAdminServiceWasRunning\r\n\t\r\n\t#Remove SharePoint Snapin\r\n\tRemove-PsSnapin Microsoft.SharePoint.PowerShell\r\n}\r\nfinally\r\n{\r\n    \r\n}\r\n\r\n#endregion",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "NugetPackageStepName",
-      "Label": "SharePoint Solution Package Step",
-      "HelpText": "Select the step in this project which downloads the SharePoint package.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-10-09T12:33:38.798+00:00",
-  "LastModifiedBy": "jasmin-mistry",
-  "$Meta": {
-    "ExportedAt": "2015-10-09T16:20:24.330+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sharepoint"
-}
\ No newline at end of file
diff --git a/step-templates/sitecore-settings-variable-replacement.json b/step-templates/sitecore-settings-variable-replacement.json
deleted file mode 100644
index cd25410d3..000000000
--- a/step-templates/sitecore-settings-variable-replacement.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "Id": "382b9610-64c4-4c64-a31c-34d07f262ed4",
-  "Name": "Sitecore - Settings & Variable Replacement",
-  "Description": "The default [Configuration Variables](https://octopus.com/docs/deployment-process/configuration-features#Configurationfiles-ConfigurationVariables) functionality replaces **appSettings** and **connectionStrings** entries. This step template extends this functionality to the Sitecore configuration **settings** and **sc.variable** nodes within the configuration file(s) that you specify. Variables that are defined for the Octopus project will automatically replace those defined in the target Sitecore configuration file(s).",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\" \r\n$configFiles = $OctopusParameters[\"Sitecore.ReplaceConfigFiles\"]\r\n\r\nif ([string]::IsNullOrEmpty($configFiles)) {\r\n    throw [System.ArgumentNullException] \"Sitecore.ReplaceConfigFiles\"\r\n}\r\n\r\n($configFiles -split '[\\r\\n]') | ForEach-Object {\r\n    \r\n    $configPath = $_\r\n\r\n    if ([string]::IsNullOrEmpty($configPath)) { \r\n        return\r\n    }\r\n    \r\n    $configPath = $configPath.Trim()\r\n\r\n    if (-not (Test-Path -LiteralPath $configPath)) {\r\n        Write-Host \"$configPath was not found.\"\r\n        return\r\n    }\r\n\r\n    Write-Host \"Searching Sitecore config file for replacement variables:\" $configPath\r\n        \r\n    $configXml = [xml](Get-Content $configPath)\r\n    $sitecoreNode = $configXml.sitecore\r\n    \r\n    # Look for sitecore node for versions prior to 8.1\r\n    if ($sitecoreNode -eq $null) {\r\n        $sitecoreNode = $configXml.configuration.sitecore\r\n    }\r\n    \r\n    # Ensure that we have a sitecore node to work from\r\n    if ($sitecoreNode -eq $null -or $sitecoreNode.settings -eq $null) {\r\n        Write-Host \"The sitecore settings node was not found in\" $configPath \". Skipping this file...\"\r\n        return\r\n    }\r\n    \r\n    foreach ($key in $OctopusParameters.Keys) {\r\n    \r\n        # Replace Sitecore settings\r\n        $setting = $sitecoreNode.settings.setting | where { $_.name -ceq $key }\r\n        if ($setting -ne $null) {\r\n            Write-Host $setting.name \"setting will be updated from\" $setting.value \"to\" $OctopusParameters[$key] \"in\" $configPath\r\n            $setting.value = $OctopusParameters[$key]\r\n        }\r\n    \r\n        # Replace Sitecore variables\r\n        $variable = $sitecoreNode.'sc.variable' | where { $_.name -ceq $key }\r\n        if ($variable -ne $null) {\r\n            Write-Host $variable.name \"Sitecore variable will be updated from\" $settingsNode.value \"to\" $OctopusParameters[$key] \"in\" $configPath\r\n            $variable.value = $OctopusParameters[$key]\r\n        }\r\n    \r\n    }\r\n    \r\n    $configXml.Save($configPath)\r\n}",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "Sitecore.ReplaceConfigFiles",
-      "Label": "Sitecore.ReplaceConfigFiles",
-      "HelpText": "Enter the full path to your Sitecore configuration file(s) that contains the **sitecore** node, one per line. For versions of Sitecore prior to 8.1, this should point to your primary Web.config at the root of your website, and for versions 8.1+, to the Sitecore.config file within your App_Config folder. Alternatively, this value can be left empty and defined within your Octopus project's variable collection using the variable name **Sitecore.ReplaceConfigFiles**.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-06-13T17:19:09.003+00:00",
-  "LastModifiedBy": "dthunziker",
-  "$Meta": {
-    "ExportedAt": "2016-06-13T17:19:09.003+00:00",
-    "OctopusVersion": "3.3.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sitecore"
-}
\ No newline at end of file
diff --git a/step-templates/sitecore-unicorn-sync.json b/step-templates/sitecore-unicorn-sync.json
deleted file mode 100644
index ed1f0f68a..000000000
--- a/step-templates/sitecore-unicorn-sync.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "d5adc467-69a8-49ca-b4d0-4f793fad4d62",
-  "Name": "Sitecore Unicorn Sync",
-  "Description": "Syncs all the specified configurations via the Unicorn remote sync PowerShell script. Uses the newer MicroChap security layer. Please see the following post for instructions: http://www.sitecorenutsbolts.net/2016/03/14/Octopus-Deploy-Step-for-Unicorn-Sync/",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\r\n\r\nAdd-Type -Path \"${MicroChap}\\MicroCHAP.dll\"\r\n\r\nFunction Sync-Unicorn {\r\n\tParam(\r\n\t\t[Parameter(Mandatory=$True)]\r\n\t\t[string]$ControlPanelUrl,\r\n\r\n\t\t[Parameter(Mandatory=$True)]\r\n\t\t[string]$SharedSecret,\r\n\r\n\t\t[Parameter(Mandatory=$True)]\r\n\t\t[string[]]$Configurations,\r\n\r\n\t\t[string]$Verb = 'Sync'\r\n\t)\r\n\r\n\t# PARSE THE URL TO REQUEST\r\n\t$parsedConfigurations = ($Configurations) -join \"^\"\r\n\r\n\t$url = \"{0}?verb={1}&configuration={2}\" -f $ControlPanelUrl, $Verb, $parsedConfigurations\r\n\r\n\tWrite-Host \"Sync-Unicorn: Preparing authorization for $url\"\r\n\r\n\t# GET AN AUTH CHALLENGE\r\n\t$challenge = Get-Challenge -ControlPanelUrl $ControlPanelUrl\r\n\r\n\tWrite-Host \"Sync-Unicorn: Received challenge: $challenge\"\r\n\r\n\t# CREATE A SIGNATURE WITH THE SHARED SECRET AND CHALLENGE\r\n\t$signatureService = New-Object MicroCHAP.SignatureService -ArgumentList $SharedSecret\r\n\r\n\t$signature = $signatureService.CreateSignature($challenge, $url, $null)\r\n\r\n\tWrite-Host \"Sync-Unicorn: Created signature $signature, executing $Verb...\"\r\n\r\n\t# USING THE SIGNATURE, EXECUTE UNICORN\r\n\t$result = Invoke-WebRequest -Uri $url -Headers @{ \"X-MC-MAC\" = $signature; \"X-MC-Nonce\" = $challenge } -TimeoutSec 10800 -UseBasicParsing\r\n\r\n\t$result.Content\r\n}\r\n\r\nFunction Get-Challenge {\r\n\tParam(\r\n\t\t[Parameter(Mandatory=$True)]\r\n\t\t[string]$ControlPanelUrl\r\n\t)\r\n\r\n\t$url = \"$($ControlPanelUrl)?verb=Challenge\"\r\n\r\n\t$result = Invoke-WebRequest -Uri $url -TimeoutSec 360 -UseBasicParsing\r\n\r\n\t$result.Content\r\n}\r\n\r\n$configs = $Configurations.split(\"`n\")\r\nSync-Unicorn -ControlPanelUrl \"$($SiteUrl)/unicorn.aspx\" -SharedSecret $SharedSecret -Configurations $configs\r\n",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Name": "SharedSecret",
-      "Label": "Shared Secret",
-      "HelpText": "The shared secret used for the MicroChap handshake",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "SiteUrl",
-      "Label": "Site Url",
-      "HelpText": "The Url of your content authoring system. Must be able to view `/unicorn.aspx`",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "MicroChap",
-      "Label": "MicroCHAP DLL Location",
-      "HelpText": "The location of the MicroCHAP.dll file in your project",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Configurations",
-      "Label": "Configurations",
-      "HelpText": "Add a configuration per line",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-07-14T11:48:03.577+00:00",
-  "LastModifiedBy": "GuitarRich",
-  "$Meta": {
-    "ExportedAt": "2016-07-14T15:40:31.349+00:00",
-    "OctopusVersion": "3.3.4",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sitecore"
-}
\ No newline at end of file
diff --git a/step-templates/slack-detailed-notification-bash.json b/step-templates/slack-detailed-notification-bash.json
deleted file mode 100644
index 95bd6ad94..000000000
--- a/step-templates/slack-detailed-notification-bash.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-    "Id": "cd3b6172-ed9a-4c42-a588-4c78c3e3b08a",
-    "Name": "Slack - Detailed Notification - Bash",
-    "Description": "Posts deployment status to Slack optionally including additional details (release number, environment name, release notes etc.) as well as error description and link to failure log page.",
-    "ActionType": "Octopus.Script",
-    "Version": 4,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptBody": "# Get values into variables\nincludeFieldProject=$(get_octopusvariable \"IncludeFieldProject\")\nincludeFieldEnvironment=$(get_octopusvariable \"IncludeFieldEnvironment\")\nincludeFieldMachine=$(get_octopusvariable \"includeFieldMachine\")\nincludeFieldTenant=$(get_octopusvariable \"IncludeFieldTenant\")\nincludeFieldUsername=$(get_octopusvariable \"IncludeFieldUsername\")\nincludeFieldRelease=$(get_octopusvariable \"IncludeFieldRelease\")\nincludeFieldReleaseNotes=$(get_octopusvariable \"IncludeFieldReleaseNotes\")\nincludeFieldErrorMessageOnFailure=$(get_octopusvariable \"IncludeErrorMessageOnFailure\")\nincludeFieldLinkOnFailure=$(get_octopusvariable \"IncludeLinkOnFailure\")\n\nfunction convert_ToBoolean () {\n\tlocal stringValue=$1\n    local returnValue=\"\"\n\n    if [[ \"$stringValue\" == \"True\" ]]\n    then\n    \treturnValue=true\n    else\n    \treturnValue=false\n    fi\n    \n    echo \"$returnValue\"\n}\n\nfunction slack_Populate_StatusInfo (){\n    \tlocal success=$1\n    \tlocal deployment_info=$(get_octopusvariable \"DeploymentInfoText\")\n\t\tlocal jsonBody=\"{ \"\n\t\t\n        if [[ \"$success\" == true ]]\n        then\n        \tjsonBody+='\"color\": \"good\",'\n            jsonBody+='\"title\": \"Success\",'\n            jsonBody+='\"fallback\": \"Deployed successfully '\n            jsonBody+=\"$deployment_info\\\"\"\n        else\n        \tjsonBody+='\"color\": \"danger\",'\n            jsonBody+='\"title\": \"Failed\",'\n            jsonBody+='\"fallback\": \"Failed to deploy '\n            jsonBody+=\"$deployment_info\\\"\"\n        fi\n        \n        #jsonBody+=\"}\"\n        \n        echo $jsonBody\n}\n\nfunction populate_field () {\n\tlocal title=$1\n    local value=$2\n    local body=\"\"\n    \n    body+='{'\n    body+='\"short\": \"true\",'\n    body+='\"title\": '\n    body+=\"\\\"$title\\\"\"\n    body+=\",\"\n    body+='\"value\": '\n    body+=\"\\\"$value\\\"\"\n    body+='}'\n    \n    echo \"$body\"\n}\n\n\nfunction slack_Populate_Fields (){\n\tlocal status_info=$1\n    local fieldsJsonBody=\"\"\n    declare -a testArray\n    \n   if [[ \"$includeFieldProject\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Project\" \"$(get_octopusvariable \"Octopus.Project.Name\")\")\")\n   fi\n    \n   if [[ \"$includeFieldEnvironment\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Environment\" \"$(get_octopusvariable \"Octopus.Environment.Name\")\")\")\n   fi\n   \n   if [[ \"$includeFieldMachine\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Machine\" \"$(get_octopusvariable \"Octopus.Machine.Name\")\")\")\n   fi\n      \n   if [[ \"$includeFieldTenant\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Tenant\" \"$(get_octopusvariable \"Octopus.Deployment.Tenant.Name\")\")\")\n   fi\n   \n   if [[ \"$includeFieldUsername\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Username\" \"$(get_octopusvariable \"Octopus.Deployment.CreatedBy.Username\")\")\")\n   fi\n   \n   if [[ \"$includeFieldRelease\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Release\" \"$(get_octopusvariable \"Octopus.Release.Number\")\")\")\n   fi\n   \n   if [[ \"$includeFieldReleaseNotes\" == true ]]\n   then\n    testArray+=(\"$(populate_field \"Changes in this release\" \"$(get_octopusvariable \"Octopus.Release.Notes\")\")\")\n   fi\n      \n   if [[ \"$status_info\" == false ]]\n   then\n     if [[ \"$includeFieldErrorMessageOnFailure\" == true ]]\n     then\n      testArray+=(\"$(populate_field \"Error text\" \"$(get_octopusvariable \"Octopus.Deployment.Error\")\")\")\n     fi\n\n     if [[ \"$includeFieldLinkOnFailure\" == true ]]\n     then\n      baseUrl=\"$(get_octopusvariable \"Octopus.Web.ServerUri\")\"\n      testArray+=(\"$(populate_field \"See the process\" \"$baseUrl$(get_octopusvariable \"Octopus.Web.DeploymentLink\")\")\")\n     fi\n   fi\n   \n   \n   ( IFS=$','; echo \"${testArray[*]}\" )   \n   \n}\n\nfunction slack_rich_notification () {\n\tlocal success=$1\n    local jsonBody=\"{ \"\n    \n    jsonBody+='\"channel\": '\n    jsonBody+=\"\\\"$(get_octopusvariable \"Channel\")\\\",\"\n    jsonBody+='\"username\": '\n    jsonBody+=\"\\\"$(get_octopusvariable \"Username\")\\\",\"\n    jsonBody+='\"icon_url\": '\n    jsonBody+=\"\\\"$(get_octopusvariable \"IconUrl\")\\\",\"\n    jsonBody+='\"attachments\": ['\n    jsonBody+=$(slack_Populate_StatusInfo \"$success\")\n    jsonBody+=',\"fields\": '\n    jsonBody+=\"[$(slack_Populate_Fields \"$success\")]\"\n    jsonBody+=\"}]}\"\n    \n    echo \"$jsonBody\"\n}\n\n# Convert include* variables to actual boolean values\nincludeFieldProject=$(convert_ToBoolean \"$includeFieldProject\")\nincludeFieldEnvironment=$(convert_ToBoolean \"$includeFieldEnvironment\")\nincludeFieldMachine=$(convert_ToBoolean \"$includeFieldMachine\")\nincludeFieldTenant=$(convert_ToBoolean \"$includeFieldTenant\")\nincludeFieldUsername=$(convert_ToBoolean \"$includeFieldUsername\")\nincludeFieldRelease=$(convert_ToBoolean \"$includeFieldRelease\")\nincludeFieldReleaseNotes=$(convert_ToBoolean \"$includeFieldReleaseNotes\")\nincludeFieldErrorMessageOnFailure=$(convert_ToBoolean \"$includeFieldErrorMessageOnFailure\")\nincludeFieldLinkOnFailure=$(convert_ToBoolean \"$includeFieldLinkOnFailure\")\n\nsuccess=true\n\nif [[ ! -z $(get_octopusvariable \"Octopus.Deployment.Error\") ]]\nthen\n\tsuccess=false\nfi\n\n# Build json payload\njson_payload=$(slack_rich_notification $success)\n\nwebook_url=$(get_octopusvariable \"HookUrl\")\n\n# Send webhook - redirect stderr to stdout\nwget --post-data=\"$json_payload\" --secure-protocol=\"auto\" \"$webook_url\" 2>&1\n\n# Check for error\nif [[ $? -ne 0 ]]\nthen\n    fail_step \"Failed!\"\nfi\n\n",
-      "Octopus.Action.Script.Syntax": "Bash",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.RunOnServer": "false"
-    },
-    "Parameters": [
-      {
-        "Id": "d9109767-c4a0-44d4-9501-bdd82be0f935",
-        "Name": "HookUrl",
-        "Label": "Webhook URL",
-        "HelpText": "The Webhook URL provided by Slack, including token.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-      },
-      {
-        "Id": "d0a459eb-4a63-48e2-8a81-a03540eb1576",
-        "Name": "Channel",
-        "Label": "Channel handle",
-        "HelpText": "Which Slack channel to post notifications to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "706ba5da-6c0f-487f-9ac2-90c32fd04a84",
-        "Name": "IconUrl",
-        "Label": "Icon URL",
-        "HelpText": "The icon to use for this user in Slack",
-        "DefaultValue": "https://octopus.com/content/resources/favicon.png",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "53a41383-6e54-42ba-ad91-d85c28651299",
-        "Name": "Username",
-        "Label": "",
-        "HelpText": "The username shown in Slack against these notifications",
-        "DefaultValue": "Octopus Deploy",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "1f5c2164-f4a5-485b-adb0-2714eea6cff8",
-        "Name": "DeploymentInfoText",
-        "Label": "Main message",
-        "HelpText": "Long information message shown in slack. This message is prefixed with \"Deployed successfully\" or \"Failed to deploy\" depending on status.",
-        "DefaultValue": "#{Octopus.Project.Name} release #{Octopus.Release.Number} to #{Octopus.Environment.Name} (#{Octopus.Machine.Name})",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "3538eb46-3c2f-4f81-aad1-434da1e2c30b",
-        "Name": "IncludeFieldRelease",
-        "Label": "Include release number field",
-        "HelpText": "Shows short field with release number name",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "57985f0b-6bf6-4b41-aaf8-f8a6ce65547b",
-        "Name": "IncludeFieldReleaseNotes",
-        "Label": "Include release notes Field",
-        "HelpText": "Release notes are only included on successful deployment",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "97309be1-e7cb-43ab-9721-13ceab6bf7ca",
-        "Name": "IncludeFieldMachine",
-        "Label": "Include machine name field",
-        "HelpText": "Shows short field with machine name",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "b0415f67-00e5-4568-b099-0f107d5e54ae",
-        "Name": "IncludeFieldProject",
-        "Label": "Include project field",
-        "HelpText": null,
-        "DefaultValue": "True",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "29772dc0-ddd2-4406-932b-e09e87d3d1c6",
-        "Name": "IncludeFieldEnvironment",
-        "Label": "Include environment name field",
-        "HelpText": "Shows short field with environment name",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "ee313203-4485-4320-b27b-03562724352a",
-        "Name": "IncludeFieldTenant",
-        "Label": "Include tenant name field",
-        "HelpText": "Shows short field with name of tenant",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "0f113c63-9a5c-493d-8942-3db978b41240",
-        "Name": "IncludeFieldUsername",
-        "Label": "Include username field",
-        "HelpText": "Shows the username of user that initiated deployment",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "0cdec31d-400b-4615-b91a-4f2a5b640b45",
-        "Name": "IncludeLinkOnFailure",
-        "Label": "Include deployment process link on failure",
-        "HelpText": "When deployment failed a link \"Open process page\" is added to the notification pointing to deployment process page",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "51fc4209-a97a-4868-8f27-c1076350b581",
-        "Name": "IncludeErrorMessageOnFailure",
-        "Label": "Include error message text on failure",
-        "HelpText": "When deployment failed error text is shown as part of notification",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "d33e02de-a949-472f-a1f4-447425507e6b",
-        "Name": "OctopusBaseUrl",
-        "Label": "Octopus base url",
-        "HelpText": "Base URL to add to the links in the notification. If octopus server dashboard is at \"http://octopus/app\" include all before the \"app\" part (\"http://octopus\").",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedOn": "2022-07-19T08:50:00.000+00:00",
-    "LastModifiedBy": "TristanUnibuddy",
-    "$Meta": {
-      "ExportedAt": "2022-07-19T08:54:06.595Z",
-      "OctopusVersion": "2022.3.2617-hotfix.4278",
-      "Type": "ActionTemplate"
-    },
-    "Category": "Slack"
-  }
diff --git a/step-templates/slack-notify-deployment.json b/step-templates/slack-notify-deployment.json
deleted file mode 100644
index 8aa9f2f24..000000000
--- a/step-templates/slack-notify-deployment.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "Id": "21a2ae12-e721-42c1-901d-d6ed08007ca7",
-  "Name": "Slack - Notify Deployment",
-  "Description": "Notifies Slack of deployment status. Uses the Octopus Deploy system variable to determine whether a deployment was successful.",
-  "ActionType": "Octopus.Script",
-  "Version": 12,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Slack-Rich-Notification ($notification)\n{\n    $payload = @{\n        channel = $OctopusParameters['Channel']\n        username = $OctopusParameters['Username'];\n        icon_url = $OctopusParameters['IconUrl'];\n        attachments = @(\n            @{\n            fallback = $notification[\"fallback\"];\n            color = $notification[\"color\"];\n            fields = @(\n                @{\n                title = $notification[\"title\"];\n                title_link = $notification[\"title_link\"];\n                value = $notification[\"value\"];\n                });\n            };\n        );\n    }\n\n    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n        Invoke-RestMethod -Method POST -Body ($payload | ConvertTo-Json -Depth 4) -Uri $OctopusParameters['HookUrl']  -ContentType 'application/json' -UseBasicParsing\n}\n\n$OctopusBaseUri = $OctopusWebBaseUrl\n$UseServerUri = [boolean]::Parse($OctopusParameters['UseServerUri']);\nif ($UseServerUri) {\n\t$OctopusBaseUri = $OctopusWebServerUri\n}\n\n$IncludeMachineName = [boolean]::Parse($OctopusParameters['IncludeMachineName']);\nif ($IncludeMachineName) {\n    $MachineName = $OctopusParameters['Octopus.Machine.Name'];\n    if ($MachineName) {\n      $FormattedMachineName = \"($MachineName)\";\n    }\n}\n\nif ($OctopusParameters['Octopus.Deployment.Error'] -eq $null){\n    Slack-Rich-Notification @{\n        title = \"Success\";\n        title_link = \"$OctopusBaseUri$OctopusWebDeploymentLink\";\n        value = \"Deploy <$OctopusBaseUri$OctopusWebProjectLink|$OctopusProjectName> release <$OctopusBaseUri$OctopusWebReleaseLink|$OctopusReleaseNumber> to $OctopusEnvironmentName $OctopusActionTargetRoles $OctopusDeploymentTenantName $FormattedMachineName\";\n        fallback = \"Deployed $OctopusProjectName release $OctopusReleaseNumber to $OctopusEnvironmentName successfully\";\n        color = \"good\";\n    };\n} else {\n    Slack-Rich-Notification @{\n        title = \"Failed\";\n        title_link = \"$OctopusBaseUri$OctopusWebDeploymentLink\";\n        value = \"Deploy <$OctopusBaseUri$OctopusWebProjectLink|$OctopusProjectName> release <$OctopusBaseUri$OctopusWebReleaseLink|$OctopusReleaseNumber> to $OctopusEnvironmentName $OctopusActionTargetRoles $OctopusDeploymentTenantName $FormattedMachineName\";\n        fallback = \"Failed to deploy $OctopusProjectName release $OctopusReleaseNumber to $OctopusEnvironmentName\";\n        color = \"danger\";\n    };\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "Parameters": [
-    {
-      "Name": "HookUrl",
-      "Label": "Webhook URL",
-      "HelpText": "The Webhook URL provided by Slack, including token.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "Channel",
-      "Label": "Channel handle",
-      "HelpText": "Which Slack channel to post notifications to.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "IconUrl",
-      "Label": "Icon URL",
-      "HelpText": "The icon to use for this user in Slack.",
-      "DefaultValue": "https://octopus.com/content/resources/favicon.png",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": null,
-      "HelpText": "The username shown in Slack against these notifications.",
-      "DefaultValue": "Octopus Deploy",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "IncludeMachineName",
-      "Label": "Include machine name",
-      "HelpText": "Should machine name be included in notification to Slack?",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "UseServerUri",
-      "Label": "Use ServerUri",
-      "HelpText": "If checked then uses `Octopus.Web.ServerUri` instead of `#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}`.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2022-03-08T04:18:00.000+00:00",
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2022-09-08T17:58:51.938Z",
-    "OctopusVersion": "2022.2.8136",
-    "Type": "ActionTemplate"
-  },
-  "Category": "slack"
-}
diff --git a/step-templates/slack-send-simple-notification-bash.json b/step-templates/slack-send-simple-notification-bash.json
deleted file mode 100644
index f9cfb3354..000000000
--- a/step-templates/slack-send-simple-notification-bash.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "Id": "4ec2225e-9ffa-4072-9852-b986e8a98222",
-    "Name": "Slack - Send Simple Notification - Bash",
-    "Description": "Send a basic message notification to Slack.",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.Syntax": "Bash",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.ScriptBody": "# Define variables\nchannel=$(get_octopusvariable \"ssn_Channel\")\nusername=$(get_octopusvariable \"ssn_Username\")\nicon_url=$(get_octopusvariable \"ssn_IconUrl\")\nparse=\"full\"\npretext=$(get_octopusvariable \"ssn_Title\")\ntext=$(get_octopusvariable \"ssn_Message\")\ncolor=$(get_octopusvariable \"ssn_Color\")\nwebook_url=$(get_octopusvariable \"ssn_HookUrl\")\n\n# Create JSON payload\njson_payload='{\"username\": '\njson_payload+=\"\\\"$username\\\"\"\njson_payload+=', \"parse\": '\njson_payload+=\"\\\"$parse\\\"\"\njson_payload+=', \"channel\": '\njson_payload+=\"\\\"$channel\\\"\"\njson_payload+=', \"icon_url\": '\njson_payload+=\"\\\"$icon_url\\\"\"\njson_payload+=', \"attachments\" : [{\"text\": '\njson_payload+=\"\\\"$text\\\"\"\njson_payload+=', \"color\": '\njson_payload+=\"\\\"$color\\\"\"\njson_payload+=', \"pretext\": '\njson_payload+=\"\\\"$pretext\\\"\"\njson_payload+=', \"mrkdwn_in\": [\"pretext\",\"text\"]}]}'\n\n# Send webhook - redirect stderr to stdout\nwget --post-data=\"$json_payload\" --secure-protocol=\"auto\" \"$webook_url\" 2>&1\n\n# Check for error\nif [[ $? -ne 0 ]]\nthen\n    fail_step \"Failed!\"\nfi"
-    },
-    "Parameters": [
-      {
-        "Id": "0de9bf5f-302c-4b94-91eb-9e5fb0e37eb4",
-        "Name": "ssn_HookUrl",
-        "Label": "Hook URL",
-        "HelpText": "The Webhook URL provided by Slack, including token.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "d55d5c10-9b82-43b1-8278-aedb72ba165f",
-        "Name": "ssn_Channel",
-        "Label": "Channel handle",
-        "HelpText": "Which Slack channel to post notification to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e753bbfe-efc1-4d3b-a15d-036b5e8ae510",
-        "Name": "ssn_IconUrl",
-        "Label": "Icon URL",
-        "HelpText": "The icon shown in Slack against the notification.",
-        "DefaultValue": "https://octopus.com/content/resources/favicon.png",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f25b4299-cfd0-4cb0-9c8c-48a706a01f02",
-        "Name": "ssn_Username",
-        "Label": "Username",
-        "HelpText": "The username shown in Slack against the notification.",
-        "DefaultValue": "Octopus Deploy",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "811722e7-c3d2-495f-822c-eb5a974407e3",
-        "Name": "ssn_Title",
-        "Label": "Title",
-        "HelpText": "The title of the notification in Slack.\n\nSupported formatting includes: ` ```pre``` `, `_italic_`, `*bold*`, and even `~strike~`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b65a034b-d0b8-486b-a20a-2d105779a6db",
-        "Name": "ssn_Message",
-        "Label": "Message",
-        "HelpText": "The body of the notification in Slack.\n\nSupported formatting includes: ` ```pre``` `, `_italic_`, `*bold*`, and even `~strike~`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "a9be62b0-a3a8-4940-baa4-47c6cd2f2312",
-        "Name": "ssn_Color",
-        "Label": "Color",
-        "HelpText": "Like traffic signals, color-coding messages can quickly communicate intent and help separate them from the flow of other messages in the timeline.",
-        "DefaultValue": "good",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "good|Green\nwarning|Orange\ndanger|Red"
-        }
-      }
-    ],
-    "LastModifiedBy": "liam-mackie",
-    "$Meta": {
-      "ExportedAt": "2020-03-02T19:22:48.922Z",
-      "OctopusVersion": "2019.13.7",
-      "Type": "ActionTemplate"
-    },
-    "Category": "Slack"
-}
\ No newline at end of file
diff --git a/step-templates/solarwinds-manage.json b/step-templates/solarwinds-manage.json
deleted file mode 100644
index 5045a84f6..000000000
--- a/step-templates/solarwinds-manage.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Id": "4e870b0d-0715-4b98-9fa3-48500f6a42e4",
-  "Name": "Solarwinds - Manage",
-  "Description": "Start monitoring for a Solarwinds node, application or both",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true}\n\n$solarwindsHost =  $OctopusParameters['Host']\n$node =  $OctopusParameters['NodeId']\n$application =  $OctopusParameters['ApplicationId']\n$username =  $OctopusParameters['Username']\n$password =  $OctopusParameters['Password']\n\nWrite-Host \"Starting Solarwinds monitoring for node \" + $node\n\nif ($node -ne \"\")\n{\n    $success = $false\n    try\n    {\n        $body = \"[\"\"$node\"\"]\"\n        $header = @{}\n        $header.Add(\"Authorization\", \"Basic \"+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+\":\"+$password)))\n        $uri = \"https://\" + $solarwindsHost + \":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.Nodes/Remanage\"\n\n        Write-Host \"Sending request $body to $uri\"\n\n        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType \"application/json\" -UseBasicParsing\n\n        if ($response.StatusCode -eq 200)\n        {\n            $success = $true\n        }\n    }\n    catch\n    {\n        Write-Host \"Something went wrong:\"\n        Write-Host $_.Exception\n    }\n\n    if (!$success)\n    {\n        throw \"Remanaging node failed.\"\n    }\n\n    Write-Host \"Remanaged node $node.\"\n}\n\nif ($application -ne \"\")\n{\n    $success = $false\n    try\n    {\n        $body = \"[\"\"$application\"\"]\"\n        $header = @{}\n        $header.Add(\"Authorization\", \"Basic \"+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+\":\"+$password)))\n        $uri = \"https://\" + $solarwindsHost + \":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.APM.Application/Remanage\"\n\n        Write-Host \"Sending request $body to $uri\"\n\n        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType \"application/json\" -UseBasicParsing\n\n        if ($response.StatusCode -eq 200)\n        {\n            $success = $true\n        }\n    }\n    catch\n    {\n        Write-Host \"Something went wrong:\"\n        Write-Host $_.Exception\n    }\n\n    if (!$success)\n    {\n        throw \"Remanaging application failed.\"\n    }\n\n    Write-Host \"Remanaged application $application.\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Host",
-      "Label": "Host",
-      "HelpText": "IP or DNS of the Solarwinds monitoring server",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NodeId",
-      "Label": "Node ID",
-      "HelpText": "Solarwinds ID of machine to be unmonitored. Starts with 'N:'.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApplicationId",
-      "Label": "Application ID",
-      "HelpText": "Solarwinds ID of application to be unmonitored. Starts with 'AA:'.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Username for the Solarwinds console user",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Password for the Solarwinds console user",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-16T10:22:27.031+00:00",
-    "OctopusVersion": "2.4.5.46",
-    "Type": "ActionTemplate"
-  },
-  "Category": "solarwinds"
-}
\ No newline at end of file
diff --git a/step-templates/solarwinds-unmanage.json b/step-templates/solarwinds-unmanage.json
deleted file mode 100644
index c2591aab5..000000000
--- a/step-templates/solarwinds-unmanage.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "8da75dc4-f430-4c52-ac50-b37629445ff5",
-  "Name": "Solarwinds - Unmanage",
-  "Description": "Stop monitoring for a Solarwinds node, application or both",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true}\n\n$solarwindsHost =  $OctopusParameters['Host']\n$node =  $OctopusParameters['NodeId']\n$application =  $OctopusParameters['ApplicationId']\n$timeout = [int] $OctopusParameters['RemanageMinutes']\n$username =  $OctopusParameters['Username']\n$password =  $OctopusParameters['Password']\n\nif ($node -ne \"\")\n{\n    Write-Host \"Stopping Solarwinds monitoring for node $node\"\n\n    $success = $false\n    try\n    {\n        $now = (Get-Date).ToUniversalTime().AddSeconds(5);\n        $remanage = $now.AddMinutes($timeout);\n        $nowString = $now.ToString(\"yyyy-MM-ddTHH:mm:ssZ\")\n        $remanageString = $remanage.ToString(\"yyyy-MM-ddTHH:mm:ssZ\")\n        $body = \"[\"\"$node\"\", \"\"$nowString\"\", \"\"$remanageString\"\", \"\"false\"\"]\"\n        $header = @{}\n        $header.Add(\"Authorization\", \"Basic \"+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+\":\"+$password)))\n        $uri = \"https://\" + $solarwindsHost + \":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.Nodes/Unmanage\"\n\n        Write-Host \"Sending request $body to $uri\"\n\n        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType \"application/json\" -UseBasicParsing\n\n        if ($response.StatusCode -eq 200)\n        {\n            $success = $true\n        }\n    }\n    catch\n    {\n        Write-Host \"Something went wrong:\"\n        Write-Host $_.Exception\n    }\n\n    if (!$success)\n    {\n        throw \"Unmanaging node failed.\"\n    }\n\n    Write-Host \"Unmanaged node $node. Will automatically remanage at $remanage.ToString()\"\n}\n\nif ($application -ne \"\")\n{\n    Write-Host \"Stopping Solarwinds monitoring for application $application\"\n\n    $success = $false\n    try\n    {\n        $now = (Get-Date).ToUniversalTime().AddSeconds(5);\n        $remanage = $now.AddMinutes($timeout);\n        $nowString = $now.ToString(\"yyyy-MM-ddTHH:mm:ssZ\")\n        $remanageString = $remanage.ToString(\"yyyy-MM-ddTHH:mm:ssZ\")\n        $body = \"[\"\"$application\"\", \"\"$nowString\"\", \"\"$remanageString\"\", \"\"false\"\"]\"\n        $header = @{}\n        $header.Add(\"Authorization\", \"Basic \"+[System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($username+\":\"+$password)))\n        $uri = \"https://\" + $solarwindsHost + \":17778/SolarWinds/InformationService/v3/Json/Invoke/Orion.APM.Application/Unmanage\"\n\n        Write-Host \"Sending request $body to $uri\"\n\n        $response = Invoke-WebRequest -Uri $uri -Method Post -Body $body -Headers $header -ContentType \"application/json\" -UseBasicParsing\n\n        if ($response.StatusCode -eq 200)\n        {\n            $success = $true\n        }\n    }\n    catch\n    {\n        Write-Host \"Something went wrong:\"\n        Write-Host $_.Exception\n    }\n\n    if (!$success)\n    {\n        throw \"Unmanaging application failed.\"\n    }\n\n    Write-Host \"Unmanaged application $application. Will automatically remanage at $remanage.ToString()\"\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Host",
-      "Label": "Host",
-      "HelpText": "IP or DNS of the Solarwinds monitoring server",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "NodeId",
-      "Label": "Node ID",
-      "HelpText": "Solarwinds ID of machine to be unmonitored. Starts with 'N:'.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApplicationId",
-      "Label": "Application ID",
-      "HelpText": "Solarwinds ID of application to be unmonitored. Starts with 'AA:'.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RemanageMinutes",
-      "Label": "Re-manage after (minutes)",
-      "HelpText": "Automatically begins monitoring of a node after given minutes.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Username for the Solarwinds console user.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "Password for the Solarwinds console user",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-16T10:24:13.698+00:00",
-    "OctopusVersion": "2.4.5.46",
-    "Type": "ActionTemplate"
-  },
-  "Category": "solarwinds"
-}
\ No newline at end of file
diff --git a/step-templates/spark-sendnotification.json b/step-templates/spark-sendnotification.json
deleted file mode 100644
index c06ecf279..000000000
--- a/step-templates/spark-sendnotification.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "Id": "cab1e42d-6b8e-4e3e-980d-82fc8e0e2178",
-  "Name": "Notification - Spark",
-  "Description": "Send a message to Spark user or room",
-  "ActionType": "Octopus.Script",
-  "Version": 16,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "function send-sparkmessage\r\n{\r\n<#\r\n\t.SYNOPSIS\r\n\t\tSend a message to a spark user\r\n\t\r\n\t.DESCRIPTION\r\n\t\tA detailed description of the send-sparkmessagetouser function.\r\n\t\r\n\t.PARAMETER useremail\r\n\t\tuser email\r\n\t\r\n\t.PARAMETER message\r\n\t\tMessage to send to the user. Can use markdown.\r\n\t\r\n\t.PARAMETER auth_token\r\n\t\tOAuth token\r\n\t\r\n\t.PARAMETER api_uri\r\n\t\tAPI url if different from default (https://api.ciscospark.com/v1)\r\n\t\r\n\t.PARAMETER userid\r\n\t\tuser id\r\n\t\r\n\t.PARAMETER proxy\r\n\t\tproxy url\r\n\t\r\n\t.PARAMETER roomid\r\n\t\tA description of the roomid parameter.\r\n\t\r\n\t.PARAMETER room_id\r\n\t\tId for room to send message to.\r\n\t\r\n\t.NOTES\r\n\t\tAdditional information about the function.\r\n#>\r\n\t\r\n\tparam\r\n\t(\r\n\t\t[Parameter(ParameterSetName = 'toPersonEmail',\r\n\t\t\t\t   Mandatory = $true,\r\n\t\t\t\t   HelpMessage = 'User email to contact')]\r\n\t\t[string]$useremail,\r\n\t\t[Parameter(Mandatory = $true,\r\n\t\t\t\t   HelpMessage = 'Set a message to send to the user. Can use markdown.')]\r\n\t\t[string]$message,\r\n\t\t[Parameter(Mandatory = $true,\r\n\t\t\t\t   HelpMessage = 'Set OAuth token')]\r\n\t\t[string]$auth_token,\r\n\t\t[Parameter(Mandatory = $false,\r\n\t\t\t\t   HelpMessage = 'API url if different from default.')]\r\n\t\t[uri]$api_uri = \"https://api.ciscospark.com/v1\",\r\n\t\t[Parameter(ParameterSetName = 'toPersonID',\r\n\t\t\t\t   Mandatory = $true)]\r\n\t\t[string]$userid,\r\n\t\t[string]$proxy,\r\n\t\t[Parameter(ParameterSetName = 'toRoomID',\r\n\t\t\t\t   Mandatory = $true)]\r\n\t\t[string]$roomid\r\n\t)\r\n\t\r\n\t$header = @{ 'Authorization' = \" Bearer $auth_token\" }\r\n\t\r\n\tswitch ($PsCmdlet.ParameterSetName)\r\n\t{\r\n\t\t\"toPersonEmail\" {\r\n\t\t\t$body = @{\r\n\t\t\t\ttoPersonEmail = $useremail\r\n\t\t\t\tmarkdown = $message\r\n\t\t\t}\r\n\t\t}\r\n\t\t\"toPersonID\" {\r\n\t\t\t$body = @{\r\n\t\t\t\ttoPersonId = $userid\r\n\t\t\t\tmarkdown = $message\r\n\t\t\t}\r\n\t\t}\r\n\t\t\"toRoomID\"{\r\n\t\t\t$body = @{\r\n\t\t\t\troomId = $roomid\r\n\t\t\t\tmarkdown = $message\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t}\r\n\t\r\n\tif ($proxy)\r\n\t{\r\n\t\tInvoke-RestMethod -Uri \"$api_uri/messages\" -Method Post -headers $header -Body (ConvertTo-Json $body) -ContentType \"application/json\" -Proxy $proxy\r\n\t}\r\n\telse\r\n\t{\r\n\t\tInvoke-RestMethod -Uri \"$api_uri/messages\" -Method Post -headers $header -Body (ConvertTo-Json $body) -ContentType \"application/json\"\r\n\t}\r\n}\r\n\r\n\r\n$useremail = $OctopusParameters['useremail']\r\n$message = $OctopusParameters['message']\r\n$auth_token = $OctopusParameters['auth_token']\r\n$proxy = $OctopusParameters['proxy']\r\n$contactmethod = $OctopusParameters['contactmethod']\r\n$contactdetails = $OctopusParameters['contactdetails']\r\n\r\nWrite-Verbose \"contact details : $contactdetails\"\r\nWrite-Verbose \"contact method : $contactmethod\"\r\nWrite-Verbose \"message : $message\"\r\nWrite-Verbose \"proxy: $proxy\"\r\nforeach ($contactdetail in $contactdetails.Replace(\" \", \"\").Split(\",\"))\r\n{\r\n\tswitch ($contactmethod)\r\n\t{\r\n\t\t\"useremail\" {\r\n\t\t\tif ($proxy)\r\n\t\t\t{\r\n\t\t\t\tWrite-Host \"Sending Spark message via $contactmethod to $contactdetail\"\r\n\t\t\t\tsend-sparkmessage -useremail $contactdetail -message $message -auth_token $auth_token -proxy $proxy\r\n\t\t\t}\r\n\t\t\telse\r\n\t\t\t{\r\n\t\t\t\tWrite-Host \"Sending Spark message via $contactmethod to $contactdetail\"\r\n\t\t\t\tsend-sparkmessage -useremail $contactdetail -message $message -auth_token $auth_token\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t\t\r\n\t\t\"userid\" {\r\n\t\t\tif ($proxy)\r\n\t\t\t{\r\n\t\t\t\tWrite-Host \"Sending Spark message via $contactmethod to $contactdetail\"\r\n\t\t\t\tsend-sparkmessage -userid $contactdetail -message $message -auth_token $auth_token -proxy $proxy\r\n\t\t\t}\r\n\t\t\telse\r\n\t\t\t{\r\n\t\t\t\tWrite-Host \"Sending Spark message via $contactmethod to $contactdetail\"\r\n\t\t\t\tsend-sparkmessage -userid $contactdetail -message $message -auth_token $auth_token\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t\t\"roomid\"{\r\n\t\t\tif ($proxy)\r\n\t\t\t{\r\n\t\t\t\tWrite-Host \"Sending Spark message via $contactmethod to $contactdetail\"\r\n\t\t\t\tsend-sparkmessage -roomid $contactdetail -message $message -auth_token $auth_token -proxy $proxy\r\n\t\t\t}\r\n\t\t\telse\r\n\t\t\t{\r\n\t\t\t\tWrite-Host \"Sending Spark message via $contactmethod to $contactdetail\"\r\n\t\t\t\tsend-sparkmessage -roomid $contactdetail -message $message -auth_token $auth_token\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\t\r\n}\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "01f83e29-94e6-4fbb-aef5-065a08243d6f",
-      "Name": "message",
-      "Label": "Message to send",
-      "HelpText": "Can use markdown notation",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "d0a2f4f0-61dc-4e04-8d5e-b421f0fe64a3",
-      "Name": "auth_token",
-      "Label": "Authentication token",
-      "HelpText": "Bot token",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4ae608b1-d659-45d0-b377-223edea6e520",
-      "Name": "api_uri",
-      "Label": "API URL",
-      "HelpText": null,
-      "DefaultValue": "https://api.ciscospark.com/v1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "1c1ca24b-cd7e-4b77-90d0-5cd2d8ad8a74",
-      "Name": "proxy",
-      "Label": "Proxy",
-      "HelpText": "Proxy address",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b5c9688f-d899-4356-ac65-aaa098dd48a7",
-      "Name": "contactmethod",
-      "Label": "Contact Method",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "useremail|User Email\nuserid|User ID\nroomid|Room ID"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b26814c8-7a05-4a04-bcc6-073691df972b",
-      "Name": "contactdetails",
-      "Label": "Contact Details",
-      "HelpText": "Enter contact details depending on Contact Method choice. Set multiple entries with ','.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "2o1o0",
-  "$Meta": {
-    "ExportedAt": "2017-02-24T10:38:27.080Z",
-    "OctopusVersion": "3.5.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "spark"
-}
\ No newline at end of file
diff --git a/step-templates/splunk-forward-file.json b/step-templates/splunk-forward-file.json
deleted file mode 100644
index e09da4fc8..000000000
--- a/step-templates/splunk-forward-file.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "0e5d7444-1be1-47c4-a776-ec0f51cf04b3",
-  "Name": "Splunk - Forward File",
-  "Description": "Configures splunk forwarding for the specified file. (The splunk forwarder service should be installed on the target server)",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$file = $OctopusParameters['File']\n$index = $OctopusParameters['Index']\n$appName = $OctopusParameters['AppName']\n\n# Enable splunk forwarding\n\nSet-Service SplunkForwarder -startuptype Automatic\n\n# Create log file\n\nif(!(Test-Path \"$file\"))\n{\n    Write-Host \"Creating new log file\"\n    New-Item \"$file\" -type File -Force\n}\nelse\n{\n    Write-Host \"Log file already exists\"\n}\n\n# Create/prepare splunk forwarder directory\n\n$appPath = \"$env:ProgramFiles\\SplunkUniversalForwarder\\etc\\apps\\$appName\\default\"\n\nif(Test-Path \"$appPath\")\n{\n    Write-Host \"Splunk app directory already exists. Removing existing configs\"\n\t\n\t# Remove-Item recursion does not work correctly - http://technet.microsoft.com/library/hh849765.aspx (-Recurse section)\n    # Remove files first then directories (leaf -> root) so we don't get the recursion confirm popup\n    Get-ChildItem $appPath -Recurse | Where { ! $_.PSIsContainer } | Remove-Item -Force\n    Get-ChildItem $appPath -Recurse | Where { $_.PSIsContainer } | Sort @{ Expression = { $_.FullName.length } } -Descending | Remove-Item -Force\n}\nelse\n{\n    Write-Host \"Creating splunk app directory\"\n    New-Item \"$appPath\" -type Directory\n}\n\n# Create forwarder config\n\nWrite-Host \"Creating splunk forwarder config\"\n\n$str = \"[monitor://$file]`r`ndisabled = false`r`nfollowTail = 0`r`nsourcetype = $appName`r`nindex = $index\"\nNew-Item \"$appPath\\inputs.conf\" -type File -value $str\n\n# Restart forwarder service\n\nWrite-Host \"Restarting splunk forwarder\"\nRestart-Service \"SplunkForwarder\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "File",
-      "Label": "File",
-      "HelpText": "The path to the file to forward",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Index",
-      "Label": "Index",
-      "HelpText": "The Splunk index to forward to",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AppName",
-      "Label": "App name",
-      "HelpText": "The application name outputting to the file",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-16T10:27:19.192+00:00",
-    "OctopusVersion": "2.4.5.46",
-    "Type": "ActionTemplate"
-  },
-  "Category": "splunk"
-}
\ No newline at end of file
diff --git a/step-templates/splunk-log-event-collector.json b/step-templates/splunk-log-event-collector.json
deleted file mode 100644
index b19f41e55..000000000
--- a/step-templates/splunk-log-event-collector.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "Id": "eb2ef48d-d4d1-40c9-9dab-769c1bac7608",
-  "Name": "Log to a Splunk Event Collector",
-  "Description": "A step template that logs a given message to the Splunk [Event Collector](http://dev.splunk.com/view/event-collector/SP-CAAAE6M) along with related Octopus Deploy variables.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "If ([System.Net.ServicePointManager]::CertificatePolicy -ne $null)\n{\nadd-type @\" \n    using System.Net; \n    using System.Security.Cryptography.X509Certificates; \n\n    public class NoSSLCheckPolicy : ICertificatePolicy { \n        public NoSSLCheckPolicy() {} \n        public bool CheckValidationResult( \n            ServicePoint sPoint, X509Certificate cert, \n            WebRequest wRequest, int certProb) { \n            return true; \n        } \n    } \n\"@ \n[System.Net.ServicePointManager]::CertificatePolicy = new-object NoSSLCheckPolicy \n}\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType] \"Ssl3\"\n\n\n# Check the parameters.\nif (-NOT $SplunkHost) { throw \"You must enter a value for 'Splunk Host'.\" }\nif (-NOT $SplunkEventCollectorPort) { throw \"You must enter a value for 'Splunk Event Collector Port'.\" }\nif (-NOT $SplunkEventCollectorToken) { throw \"You must enter a value for 'Event Collector Token'.\" } \nif (-NOT $Message) { throw \"You must enter a value for 'Message'.\" } \n  \n$properties = @{\nMessage = $Message;\nProjectName = $OctopusParameters['Octopus.Project.Name'];\nReleaseNumber = $OctopusParameters['Octopus.Release.Number']; \nEnvironmentName = $OctopusParameters['Octopus.Environment.Name'];\nDeploymentName = $OctopusParameters['Octopus.Deployment.Name'];\nChannel = $OctopusParameters['Octopus.Release.Channel.Name']; \nReleaseUri = $OctopusParameters['Octopus.Web.ReleaseLink'];\nDeploymentUri = $OctopusParameters['Octopus.Web.DeploymentLink'];\nDeploymentCreatedBy = $OctopusParameters['Octopus.Deployment.CreatedBy.Username'];\nComments = $OctopusParameters['Octopus.Deployment.Comments'];\n}  \n\n$exception = $null\nif ($OctopusParameters['Octopus.Deployment.Error']) {  \n    $properties[\"DeploymentError\"] = $OctopusParameters['Octopus.Deployment.Error']\n    $properties[\"DeploymentDetailedError\"] = $OctopusParameters['Octopus.Deployment.ErrorDetail']\n}  \n\n$body = @{\n    event =(ConvertTo-Json $properties)\n}\n \n$uri = \"https://\" + $SplunkHost + \":\" + $SplunkEventCollectorPort + \"/services/collector\"\n$header = @{\"Authorization\"=\"Splunk \" + $SplunkEventCollectorToken}\n\nInvoke-RestMethod -Method Post -Uri $uri -Body (ConvertTo-Json $body) -Header $header\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "SplunkHost",
-      "Label": "The host endpoint of the Splunk Event Collector",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SplunkEventCollectorPort",
-      "Label": "The port of the Event Collector",
-      "HelpText": null,
-      "DefaultValue": "8088",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SplunkEventCollectorToken",
-      "Label": "The token for the Event Collector",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Message",
-      "Label": "The message to send to the event collector",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2016-05-11T06:13:32.800+00:00",
-    "OctopusVersion": "3.3.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "splunk"
-}
\ No newline at end of file
diff --git a/step-templates/sql-backup-database.json b/step-templates/sql-backup-database.json
deleted file mode 100755
index e8f9f010f..000000000
--- a/step-templates/sql-backup-database.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "Id": "34b4fa10-329f-4c50-ab7c-d6b047264b83",
-  "Name": "SQL - Backup Database",
-  "Description": "Backup a MS SQL Server database to the file system.",
-  "ActionType": "Octopus.Script",
-  "Version": 13,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\"\n$EnableVerboseOutput = $false # pester does not support -Verbose; this is a workaround\n\nfunction ConnectToDatabase() {\n  param($server, $SqlLogin, $SqlPassword, $ConnectionTimeout)\n\n  $server.ConnectionContext.StatementTimeout = $ConnectionTimeout\n\n  if ($null -ne $SqlLogin) {\n\n    if ($null -eq $SqlPassword) {\n      throw \"SQL Password must be specified when using SQL authentication.\"\n    }\n\n    $server.ConnectionContext.LoginSecure = $false\n    $server.ConnectionContext.Login = $SqlLogin\n    $server.ConnectionContext.Password = $SqlPassword\n\n    Write-Host \"Connecting to server using SQL authentication as $SqlLogin.\"\n    $server = New-Object Microsoft.SqlServer.Management.Smo.Server $server.ConnectionContext\n  }\n  else {\n    Write-Host \"Connecting to server using Windows authentication.\"\n  }\n\n  try {\n    $server.ConnectionContext.Connect()\n  }\n  catch {\n    Write-Error \"An error occurred connecting to the database server!`r`n$($_.Exception.ToString())\"\n  }\n}\n\nfunction AddPercentHandler {\n  param($smoBackupRestore, $action)\n\n  $percentEventHandler = [Microsoft.SqlServer.Management.Smo.PercentCompleteEventHandler] { Write-Host $dbName $action $_.Percent \"%\" }\n  $completedEventHandler = [Microsoft.SqlServer.Management.Common.ServerMessageEventHandler] { Write-Host $_.Error.Message }\n\n  $smoBackupRestore.add_PercentComplete($percentEventHandler)\n  $smoBackupRestore.add_Complete($completedEventHandler)\n  $smoBackupRestore.PercentCompleteNotification = 10\n}\n\nfunction CreateDevice {\n  param($smoBackupRestore, $directory, $name)\n\n  $devicePath = [System.IO.Path]::Combine($directory, $name)\n  $smoBackupRestore.Devices.AddDevice($devicePath, \"File\")\n  return $devicePath\n}\n\nfunction CreateDevices {\n  param($smoBackupRestore, $devices, $directory, $dbName, $incremental, $timestamp)\n\n  $targetPaths = New-Object System.Collections.Generic.List[System.String]\n\n  $extension = \".bak\"\n\n  if ($incremental -eq $true) {\n    $extension = \".trn\"\n  }\n\n  if ($devices -eq 1) {\n    $deviceName = $dbName + \"_\" + $timestamp + $extension\n    $targetPath = CreateDevice $smoBackupRestore $directory $deviceName\n    $targetPaths.Add($targetPath)\n  }\n  else {\n    for ($i = 1; $i -le $devices; $i++) {\n      $deviceName = $dbName + \"_\" + $timestamp + \"_\" + $i + $extension\n      $targetPath = CreateDevice $smoBackupRestore $directory $deviceName\n      $targetPaths.Add($targetPath)\n    }\n  }\n  return $targetPaths\n}\n\nfunction BackupDatabase {\n  param (\n    [Microsoft.SqlServer.Management.Smo.Server]$server,\n    [string]$dbName,\n    [string]$BackupDirectory,\n    [int]$devices,\n    [int]$compressionOption,\n    [boolean]$incremental,\n    [boolean]$copyonly,\n    [string]$timestamp,\n    [string]$timestampFormat,\n    [boolean]$RetentionPolicyEnabled,\n    [int]$RetentionPolicyCount\n  )\n\n  $smoBackup = New-Object Microsoft.SqlServer.Management.Smo.Backup\n  $targetPaths = CreateDevices $smoBackup $devices $BackupDirectory $dbName $incremental $timestamp\n\n  Write-Host \"Attempting to backup database $server.Name.$dbName to:\"\n  $targetPaths | ForEach-Object { Write-Host $_ }\n  Write-Host \"\"\n\n  if ($incremental -eq $true) {\n    $smoBackup.Action = \"Log\"\n    $smoBackup.BackupSetDescription = \"Log backup of \" + $dbName\n    $smoBackup.LogTruncation = \"Truncate\"\n  }\n  else {\n    $smoBackup.Action = \"Database\"\n    $smoBackup.BackupSetDescription = \"Full Backup of \" + $dbName\n  }\n\n  $smoBackup.BackupSetName = $dbName + \" Backup\"\n  $smoBackup.MediaDescription = \"Disk\"\n  $smoBackup.CompressionOption = $compressionOption\n  $smoBackup.CopyOnly = $copyonly\n  $smoBackup.Initialize = $true\n  $smoBackup.Database = $dbName\n\n  try {\n    AddPercentHandler $smoBackup \"backed up\"\n    $smoBackup.SqlBackup($server)\n    Write-Host \"Backup completed successfully.\"\n\n    if ($RetentionPolicyEnabled -eq $true) {\n      ApplyRetentionPolicy $BackupDirectory $dbName $RetentionPolicyCount $Incremental $Devices $timestampFormat\n    }\n  }\n  catch {\n    Write-Error \"An error occurred backing up the database!`r`n$($_.Exception.ToString())\"\n  }\n}\n\nfunction ApplyRetentionPolicy {\n  param (\n      [string]$BackupDirectory,\n      [string]$dbName,\n      [int]$RetentionPolicyCount,\n      [bool]$Incremental = $false,\n      [int]$Devices = 1,\n      [string]$timestampFormat = \"yyyy-MM-dd-HHmmss\"\n  )\n\n  # Check if RetentionPolicyCount is defined\n  if (-not $PSBoundParameters.ContainsKey('RetentionPolicyCount')) {\n      Write-Host \"Retention policy not applied as RetentionPolicyCount is undefined.\"\n      return\n  }\n\n  # Set the appropriate file extension\n  $extension = if ($Incremental) { '.trn' } else { '.bak' }\n\n  # Prepare the regex pattern for matching the files\n  $dateRegex = $timestampFormat -replace \"yyyy\", \"\\d{4}\" -replace \"MM\", \"\\d{2}\" -replace \"dd\", \"\\d{2}\" -replace \"HH\", \"\\d{2}\" -replace \"mm\", \"\\d{2}\" -replace \"ss\", \"\\d{2}\"\n  $devicePattern = if ($Devices -gt 1) { \"(_\\d+)\" } else { \"\" }\n  $regexPattern = \"^${dbName}_${dateRegex}${devicePattern}${extension}$\"\n\n  # Get all matching files in the directory\n  $allBackups = Get-ChildItem -Path $BackupDirectory -Filter \"*$extension\" | Where-Object { $_.Name -match $regexPattern }\n\n  # If there are no matching backups, exit\n  if (-not $allBackups) {\n      Write-Host \"No matching backups found.\"\n      return\n  }\n\n  # If RetentionPolicyCount is zero, don't delete or keep any backups\n  if ($RetentionPolicyCount -le 0) {\n      if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround\n        Write-Host \"Retention policy not applied as RetentionPolicyCount is set to 0.\"\n      }\n  } elseif ($Devices -gt 1) {\n      # Group by the timestamp part (ignore the device number)\n      $groupedBackups = $allBackups | Group-Object {\n          # Extract the timestamp, ignoring the device part if there are multiple devices\n          ($_.Name -replace \"${devicePattern}${extension}$\", \"\") -replace \"^${dbName}_\", \"\"\n      }\n\n      # Sort the groups by the timestamp\n      $sortedGroups = $groupedBackups | Sort-Object Name\n\n      # Get the groups to keep\n      $groupsToKeep = $sortedGroups | Select-Object -Last $RetentionPolicyCount\n      $filesToKeep = $groupsToKeep | ForEach-Object { $_.Group }\n\n      # Flatten the collection of files to keep, ensuring that FullName is accessed correctly\n      $filesToKeepFlattened = $filesToKeep | ForEach-Object { $_ | Select-Object -ExpandProperty FullName }\n      $filesToDelete = $allBackups | Where-Object { $filesToKeepFlattened -notcontains $_.FullName }\n\n      # Delete the old backups\n      $filesToDelete | ForEach-Object {\n          if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround\n            Write-Host \"Deleting old backup: $($_.FullName)\"\n          }\n          Remove-Item -Path $_.FullName -Force\n      }\n\n      # List the files to keep\n      $filesToKeepFlattened | ForEach-Object {\n          Write-Verbose \"Keeping backup: $($_)\"\n      }\n\n      Write-Host \"Retention policy applied. Kept $RetentionPolicyCount most recent backups.\"\n  } else {\n      # Single device: simply sort the backups by timestamp\n      $sortedBackups = $allBackups | Sort-Object Name\n\n      # Get the backups to keep\n      $backupsToKeep = $sortedBackups | Select-Object -Last $RetentionPolicyCount\n      $filesToDelete = $allBackups | Where-Object { $backupsToKeep -notcontains $_ }\n\n      # Delete the old backups\n      $filesToDelete | ForEach-Object {\n        if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround\n          Write-Host \"Deleting old backup: $($_.FullName)\"\n        }\n        Remove-Item -Path $_.FullName -Force\n      }\n\n      # List the files to keep\n      $backupsToKeep | ForEach-Object {\n        if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround\n          Write-Host \"Keeping backup: $($_.FullName)\"\n        }\n      }\n\n      if($EnableVerboseOutput) { # pester does not support -Verbose; this is a workaround\n        Write-Host \"Retention policy applied. Kept $RetentionPolicyCount most recent backups.\"\n      }\n  }\n}\n\nfunction Invoke-SqlBackupProcess {\n  param (\n    [hashtable]$OctopusParameters\n  )\n\n  # Extracting parameters from the hashtable\n  $ServerName = $OctopusParameters['Server']\n  $DatabaseName = $OctopusParameters['Database']\n  $BackupDirectory = $OctopusParameters['BackupDirectory']\n  $CompressionOption = [int]$OctopusParameters['Compression']\n  $Devices = [int]$OctopusParameters['Devices']\n  $Stamp = $OctopusParameters['Stamp']\n  $UseSqlServerTimeStamp = $OctopusParameters['UseSqlServerTimeStamp']\n  $SqlLogin = $OctopusParameters['SqlLogin']\n  $SqlPassword = $OctopusParameters['SqlPassword']\n  $ConnectionTimeout = $OctopusParameters['ConnectionTimeout']\n  $Incremental = [boolean]::Parse($OctopusParameters['Incremental'])\n  $CopyOnly = [boolean]::Parse($OctopusParameters['CopyOnly'])\n  $RetentionPolicyEnabled = [boolean]::Parse($OctopusParameters['RetentionPolicyEnabled'])\n  $RetentionPolicyCount = [int]$OctopusParameters['RetentionPolicyCount']\n\n  [System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | Out-Null\n  [System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SmoExtended\") | Out-Null\n  [System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.ConnectionInfo\") | Out-Null\n  [System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SmoEnum\") | Out-Null\n\n  $server = New-Object Microsoft.SqlServer.Management.Smo.Server $ServerName\n\n  ConnectToDatabase $server $SqlLogin $SqlPassword $ConnectionTimeout\n\n  $database = $server.Databases | Where-Object { $_.Name -eq $DatabaseName }\n  $timestampFormat = \"yyyy-MM-dd-HHmmss\"\n  if ($UseSqlServerTimeStamp -eq $true) {\n    $timestampFormat = \"yyyyMMdd_HHmmss\"\n  }\n  $timestamp = if (-not [string]::IsNullOrEmpty($Stamp)) { $Stamp } else { Get-Date -format $timestampFormat }\n\n  if ($null -eq $database) {\n    Write-Error \"Database $DatabaseName does not exist on $ServerName\"\n  }\n\n  if ($Incremental -eq $true) {\n    if ($database.RecoveryModel -eq 3) {\n      write-error \"$DatabaseName has Recovery Model set to Simple. Log backup cannot be run.\"\n    }\n\n    if ($database.LastBackupDate -eq \"1/1/0001 12:00 AM\") {\n      write-error \"$DatabaseName has no Full backups. Log backup cannot be run.\"\n    }\n  }\n\n  if ($RetentionPolicyEnabled -eq $true -and $RetentionPolicyCount -gt 0) {\n    if (-not [int]::TryParse($RetentionPolicyCount, [ref]$null) -or $RetentionPolicyCount -le 0) {\n      Write-Error \"RetentionPolicyCount must be an integer greater than zero.\"\n    }\n  }\n\n  BackupDatabase $server $DatabaseName $BackupDirectory $Devices $CompressionOption $Incremental $CopyOnly $timestamp $timestampFormat $RetentionPolicyEnabled $RetentionPolicyCount\n}\n\nif (Test-Path -Path \"Variable:OctopusParameters\") {\n  Invoke-SqlBackupProcess -OctopusParameters $OctopusParameters\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Server",
-      "Label": "Server",
-      "HelpText": "The name of the SQL Server instance that the database resides in.",
-      "DefaultValue": ".",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Database",
-      "Label": "Database",
-      "HelpText": "The name of the database to back up.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BackupDirectory",
-      "Label": "Backup Directory",
-      "HelpText": "The output directory to drop the database backup into.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SqlLogin",
-      "Label": "SQL login",
-      "HelpText": "The SQL auth login to connect with. If specified, the SQL Password must also be entered.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SqlPassword",
-      "Label": "SQL password",
-      "HelpText": "The password for the SQL auth login to connect with. Only used if SQL Login is specified.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "Compression",
-      "Label": "Compression Option",
-      "HelpText": "- 0  -   Use the default backup compression server configuration\n- 1  -   Enable the backup compression\n- 2  -   Disable the backup compression",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "0|Default\n1|Enabled\n2|Disabled"
-      }
-    },
-    {
-      "Name": "Devices",
-      "Label": "Devices",
-      "HelpText": "The number of backup devices to use for the backup.",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "1|1\n2|2\n3|3\n4|4"
-      }
-    },
-    {
-      "Name": "Stamp",
-      "Label": "Backup file suffix",
-      "HelpText": "Specify a suffix to add to the backup file names. If left blank the backup will use the current timestamp.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "UseSqlServerTimeStamp",
-      "Label": "Use SQL Server timestamp format",
-      "HelpText": "If no suffix is specified, use the MSSQL timestamp format.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "ConnectionTimeout",
-      "Label": "Connection Timeout",
-      "HelpText": "Specify the connection timeout settings (in seconds) for the SQL connection. If the backup takes longer than this value, the backup will fail.",
-      "DefaultValue": "36000",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Incremental",
-      "Label": "Backup Action",
-      "HelpText": "Specify the Database backup action",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "false|Full\ntrue|Log (Incremental)"
-      }
-    },
-    {
-      "Name": "CopyOnly",
-      "Label": "Copy Only",
-      "HelpText": "Specify whether the backup is Copy Only",
-      "DefaultValue": "true",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "RetentionPolicyEnabled",
-      "Label": "Retention Policy Enabled",
-      "HelpText": "Specify if a limit should be imposed on retaining older backups. Will only be applied if Retention Policy Count is set, and is greater than 0.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "RetentionPolicyCount",
-      "Label": "Retention Policy Count",
-      "HelpText": "Specify how many old copies of the DB should be retained",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2024-09-11T09:30:00.0000000-07:00",
-  "LastModifiedBy": "bcullman",
-  "$Meta": {
-    "ExportedAt": "2024-09-11T09:30:00.0000000-07:00",
-    "OctopusVersion": "2022.3.10640",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/sql-create-database-enhanced.json b/step-templates/sql-create-database-enhanced.json
deleted file mode 100644
index 1a443fd81..000000000
--- a/step-templates/sql-create-database-enhanced.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "Id": "ba43c3a7-fb77-4377-a1e2-e7918fb6df0b",
-    "Name": "SQL - Create Database If Not Exists Enhanced",
-    "Description": "Creates a database if the database does not exist without using SMO. ",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Initialize variables\n$connectionString = \"\"\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n\n# Determine authentication method\nswitch ($createAuthenticationMethod)\n{\n\t\"AzureADManaged\"\n    {\n    \tWrite-Host \"Using Azure Managed Identity authentication ...\"\n        $connectionString = \"Server=$createSqlServer;Database=master;\"\n        \n        $response = Invoke-WebRequest -Uri 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fdatabase.windows.net%2F' -Method GET -Headers @{Metadata=\"true\"} -UseBasicParsing\n        $content = $response.Content | ConvertFrom-Json\n        $AccessToken = $content.access_token\n        \n        $sqlConnection.AccessToken = $AccessToken\n        break\n    }\n    \"SqlAuthentication\"\n    {\n    \tWrite-Host \"Using Sql account authentication ...\"\n        $connectionString = \"Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n        break\n    }\n    \"WindowsIntegrated\"\n    {\n    \tWrite-Host \"Using Windows Integrated authentication ...\"\n        $connectionString = \"Server=$createSqlServer;Database=master;integrated security=true;\"\n        break\n    }\n}\n\n\n$sqlConnection.ConnectionString = $connectionString\n\n$command = $sqlConnection.CreateCommand()\n$command.CommandType = [System.Data.CommandType]'Text'\n$command.CommandTimeout = $createCommandTimeout\n\nWrite-Host \"Opening the connection to $createSqlServer\"\n$sqlConnection.Open()\n\n$escapedDatabaseName = $createDatabaseName.Replace(\"'\", \"''\")\n\nWrite-Host \"Running the if not exists then create for $createDatabaseName\"\n$command.CommandText = \"IF NOT EXISTS (select Name from sys.databases where Name = '$escapedDatabaseName')\n        create database [$createDatabaseName]\"\n        \nif (![string]::IsNullOrWhiteSpace($createAzureEdition))\n{\n\tWrite-Verbose \"Specifying Azure SqlDb Edition: $($createAzureEdition)\"\n\t$command.CommandText += (\"`r`n (EDITION = '{0}')\" -f $createAzureEdition)\n}\n\nif (![string]::IsNullOrWhiteSpace($createAzureBackupStorageRedundancy))\n{\n\tWrite-Verbose \"Specifying Azure Backup storage redundancy: $($createAzureBackupStorageRedundancy)\"\n\t$command.CommandText += (\"`r`n WITH BACKUP_STORAGE_REDUNDANCY='{0}'\" -f $createAzureBackupStorageRedundancy)\n}\n\n$command.CommandText += \";\"\n\n$command.ExecuteNonQuery()\n\nWrite-Host \"Successfully created the account $createDatabaseName\"\nWrite-Host \"Closing the connection to $createSqlServer\"\n$sqlConnection.Close()"
-    },
-    "Parameters": [
-      {
-        "Id": "4a30febf-479b-4427-a382-04a84183e1ae",
-        "Name": "createSqlServer",
-        "Label": "SQL Server",
-        "HelpText": "The SQL Server to perform the work on",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "9cfe1756-9e7d-4670-af75-1bb4a1899ce1",
-        "Name": "createAuthenticationMethod",
-        "Label": "Authentication Method",
-        "HelpText": "Select the method for authentication to the SQL Server.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "AzureADManaged|Azure Active Directory Managed Identity\nSqlAuthentication|SQL Authentication\nWindowsIntegrated|Windows Integrated"
-        }
-      },
-      {
-        "Id": "ba759a10-c230-4530-855a-2d7e210fe822",
-        "Name": "createSqlLoginUserWhoHasCreateUserRights",
-        "Label": "SQL Login",
-        "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0519fc45-e342-4982-beea-ab5123cad39b",
-        "Name": "createSqlLoginPasswordWhoHasRights",
-        "Label": "SQL Password",
-        "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "0662b998-acf3-425d-8fff-abd93a4a038d",
-        "Name": "createDatabaseName",
-        "Label": "Database to create",
-        "HelpText": "The name of the database to create",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "4617d70a-fb52-4b1b-95f1-07929e47e7c0",
-        "Name": "createCommandTimeout",
-        "Label": "Command timeout",
-        "HelpText": "Number of seconds before throwing a timeout error.",
-        "DefaultValue": "30",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7be71f0c-4df5-4f41-9b2f-3a29800a2e00",
-        "Name": "createAzureEdition",
-        "Label": "Azure database edition",
-        "HelpText": "Defines the database edition for Azure SQL Databases, leave blank if not using Azure.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "basic|Basic Edition\nstandard|Standard Edition\npremium|Premium Edition\ngeneralpurpose|General Purpose Edition\nbusinesscritical|Business Critical Edition\nhyperscale|Hyperscale Edition"
-        }
-      },
-      {
-        "Id": "85c8ad9c-2515-45d5-b521-49d3518f2a15",
-        "Name": "createAzureBackupStorageRedundancy",
-        "Label": "Azure Backup Storage Redundacy",
-        "HelpText": "Defines the Azure [database backup storage redundancy](https://learn.microsoft.com/en-us/sql/t-sql/statements/create-database-transact-sql?view=azuresqldb-current&tabs=sqlpool#backup_storage_redundancy). The default option is `GRS` when not specified. Leave blank if not using Azure.\n\nNote: `GZRS` is only available in a subset of Azure regions that have the current requirements: \n\n- Database cannot be a `Basic` edition.\n- Have a geo-paired region \n- Have multiple availability zones within both data centers (primary and secondary). ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "LOCAL|Locally redundant storage (LRS)\nZONE|Zone-redundant storage (ZRS)\nGEO|Geo-redundant storage (GRS)\nGEOZONE|Geo-Zone Redundant Storage (GZRS)"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2022-12-15T11:00:58.312Z",
-      "OctopusVersion": "2023.1.4314",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "sql"
-  }
diff --git a/step-templates/sql-create-sql-user.json b/step-templates/sql-create-sql-user.json
deleted file mode 100644
index a08fae830..000000000
--- a/step-templates/sql-create-sql-user.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Id": "d4d7d32d-0aec-4a9e-8455-7f91fcd0d6fb",
-  "Name": "SQL - Create SQL User If Not Exists",
-  "Description": "Create a SQL Login if the login doesn't already exist without using SMO.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "Function Test-AzureSQL\n{\n\t# Define parameters\n    param ($SqlConnection)\n    \n    # Define local variables\n    $azureDetected = $false\n    \n    # Create command object\n    $command = $SqlConnection.CreateCommand()\n\n    # Check state\n    if ($SqlConnection.State -ne [System.Data.ConnectionState]::Open)\n    {\n    \t# Open the connection\n        $SqlConnection.Open()\n    }\n    \n    # Set command text\n    $command.CommandType = [System.Data.CommandType]::Text\n    $command.CommandText = \"SELECT SERVERPROPERTY ('edition')\"\n    \n    # Execute statement\n    $reader = $command.ExecuteReader()\n    \n    # Read results\n    while ($reader.Read())\n    {\n    \t# Get value from field\n        $value = $reader.GetValue(0)\n        \n        # Check to see if it's Azure\n        if ($value -like \"*Azure*\")\n        {\n        \t# It's azure\n            $azureDetected = $true\n            \n            # break\n            break\n        }\n    }\n    \n    # Check to see if reader is open\n    if ($reader.IsClosed -eq $false)\n    {\n    \t# Close reader object\n        $reader.Close()\n    }\n    \n    # Not found\n    return $azureDetected\n}\n\nif ([string]::IsNullOrWhiteSpace($createSqlLoginUserWhoHasCreateUserRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\" \n    $connectionString = \"Server=$createSqlServer;Database=master;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$createSqlServer;Database=master;User ID=$createSqlLoginUserWhoHasCreateUserRights;Password=$createSqlLoginPasswordWhoHasRights;\"\n}\n\n$sqlConnection = New-Object System.Data.SqlClient.SqlConnection\n$sqlConnection.ConnectionString = $connectionString\n\n$command = $sqlConnection.CreateCommand()\n$command.CommandType = [System.Data.CommandType]'Text'\n\nWrite-Host \"Opening the connection to $createSqlServer\"\n$sqlConnection.Open()\n\n$isAzureSQL = Test-AzureSQL -SqlConnection $sqlConnection\n\n$escapedLogin = $createSqlLogin.Replace(\"'\", \"''\")\nWrite-Host \"Running the if not exists then create user command on the server for $escapedLogin\"\n\nif ([string]::IsNullOrWhiteSpace($createSqlPassword) -eq $true) {\n\tWrite-Host \"The password sent in was empty, creating account as domain login\"\n    $command.CommandText = \"IF NOT EXISTS(SELECT 1 FROM sys.server_principals WHERE name = '$escapedLogin')\n\tCREATE LOGIN [$createSqlLogin] FROM WINDOWS\"\n    \n    if ($isAzureSQL -eq $false)\n    {\n        $command.CommandText += \" with default_database=[$createSqlDefaultDatabase]\"\n    }\n    \n}\nelse {\n\tWrite-Host \"A password was sent in, creating account as SQL Login\"\n\t$escapedPassword = $createSqlPassword.Replace(\"'\", \"''\")\n\t$command.CommandText = \"IF NOT EXISTS(SELECT 1 FROM sys.sql_logins WHERE name = '$escapedLogin')\n\tCREATE LOGIN [$createSqlLogin] with Password='$escapedPassword'\"  \n\n    if ($isAzureSQL -eq $false)\n    {\n        $command.CommandText += \", default_database=[$createSqlDefaultDatabase]\"\n    }\n}\n\n\n$command.ExecuteNonQuery()\n\nWrite-Host \"Successfully created the account $createSqlLogin\"\nWrite-Host \"Closing the connection to $createSqlServer\"\n$sqlConnection.Close()"
-  },
-  "Parameters": [
-    {
-      "Id": "95996aae-c3ec-4d6f-ac24-486d33513620",
-      "Name": "createSqlServer",
-      "Label": "SQL Server",
-      "HelpText": "The SQL Server to perform the action on",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "443c9e33-4f94-4141-bae8-24eec4f133d2",
-      "Name": "createSqlLoginUserWhoHasCreateUserRights",
-      "Label": "SQL Login",
-      "HelpText": "The user who has permissions to create the user\n\nLeave blank for integrated security",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0bf48c89-31a2-4462-9be3-3f80e816f0de",
-      "Name": "createSqlLoginPasswordWhoHasRights",
-      "Label": "SQL Password",
-      "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "3f9a4254-db16-4aa5-9ab9-bb8e369ee69e",
-      "Name": "createSqlLogin",
-      "Label": "Username to create",
-      "HelpText": "The SQL Login name that will be created",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b73a9fb0-1b09-473c-956b-07198e5028cc",
-      "Name": "createSqlPassword",
-      "Label": "Password",
-      "HelpText": "The password of the user being created.  Leave this blank if you want to use windows authentication.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "f9746a86-33b5-49b2-9bb2-d528585e9759",
-      "Name": "createSqlDefaultDatabase",
-      "Label": "Default Database",
-      "HelpText": "The default database for the user",
-      "DefaultValue": "master",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-02-12T17:21:40.762Z",
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2021-02-12T17:21:40.762Z",
-    "OctopusVersion": "2020.5.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/sql-deploy-dacpac-sqlpackage.json b/step-templates/sql-deploy-dacpac-sqlpackage.json
deleted file mode 100644
index e74c50b15..000000000
--- a/step-templates/sql-deploy-dacpac-sqlpackage.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-  "Id": "c323cbcd-aab8-4229-b07c-e6c26f7e9a8a",
-  "Name": "SQL - Deploy DACPAC using SqlPackage",
-  "Description": "Calls SqlPackage commands such as:\n * [Deploy](https://learn.microsoft.com/en-us/sql/tools/sqlpackage/sqlpackage-publish?view=sql-server-ver16)\n * [Script](https://learn.microsoft.com/en-us/sql/tools/sqlpackage/sqlpackage-script?view=sql-server-ver16)\n * [DeployReport](https://learn.microsoft.com/en-us/sql/tools/sqlpackage/sqlpackage-deploy-drift-report?view=sql-server-ver16)\n\nAs SqlPackage is cross-platform, this template is both Windows and Linux* compatible.\n\nResults of `Deploy script` and `deploy report` options will upload to Octopus Deploy as an artifact. This allows you to put in place a manual intervention step if required. It is also useful for auditing purposes.\n\nSqlCmd variables are now supported.  To specify SqlCmd variables, create your Octopus variable with the following naming convention: SqlCmdVariable.<Variable name> (case insensitive) and then assign it a value.  Examples:\n* SqlCmdVariable.Variable1\n* my.sqlcmdvariable.variable2\n\nNOTE: \n - Requires version 2019.10 or above. \n - `TrustServerCertificate=true` is set by default\n - Requires PowerShell or *PowerShell Core",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "edff7d94-0feb-48a9-8185-48feb084a94f",
-      "Name": "DACPACPackage",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "DACPACPackage"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Set TLS\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\nWrite-Host \"Determining Operating System...\"\n# Check to see if $IsWindows is available\nif ($null -eq $IsWindows)\n{\n    switch ([System.Environment]::OSVersion.Platform)\n    {\n    \t\"Win32NT\"\n        {\n        \t# Set variable\n            $IsWindows = $true\n            $IsLinux = $false\n        }\n        \"Unix\"\n        {\n        \t$IsWindows = $false\n            $IsLinux = $true\n        }\n    }\n}\n\nif ($IsWindows)\n{\n\tWrite-Host \"Detected OS is Windows\"\n    $ProgressPreference = 'SilentlyContinue'\n}\nelse\n{\n\tWrite-Host \"Detected OS is Linux\"\n}\n\n<#\n .SYNOPSIS\n Finds the DAC File that you specify\n\n .DESCRIPTION\n Looks through the supplied PathList array and searches for the file you specify.  It will return the first one that it finds.\n\n .PARAMETER FileName\n Name of the file you are looking for\n\n .PARAMETER PathList\n Array of Paths to search through.\n\n .EXAMPLE\n Find-DacFile -FileName \"Microsoft.SqlServer.TransactSql.ScriptDom.dll\" -PathList @(\"${env:ProgramFiles}\\Microsoft SQL Server\", \"${env:ProgramFiles(x86)}\\Microsoft SQL Server\")\n#>\nFunction Find-DacFile {\n    Param(\n        [Parameter(Mandatory=$true)]\n        [string]$FileName,\n        [Parameter(Mandatory=$true)]\n        [string[]]$PathList\n    )\n\n    $File = $null\n\n    ForEach($Path in $PathList)\n    {\n        Write-Debug (\"Searching: {0}\" -f $Path)\n\n        If (!($File))\n        {\n            $File = (\n                Get-ChildItem $Path -ErrorAction SilentlyContinue -Filter $FileName -Recurse |\n                    Sort-Object FullName -Descending |\n                    Select-Object -First 1\n                )\n\n            If ($File)\n            {\n                Write-Debug (\"Found: {0}\" -f $File.FullName)\n            }\n        }\n    }\n\n    Return $File\n}\n\n\n<#\n .SYNOPSIS\n Generates a connection string\n\n .DESCRIPTION\n Derive a connection string from the supplied variables\n\n .PARAMETER ServerName\n Name of the server to connect to\n\n .PARAMETER Database\n Name of the database to connect to\n\n .PARAMETER UseIntegratedSecurity\n Boolean value to indicate if Integrated Security should be used or not\n\n .PARAMETER UserName\n User name to use if we are not using integrated security\n\n .PASSWORD Password\n Password to use if we are not using integrated security\n\n .PARAMETER EnableMultiSubnetFailover\n Flag as to whether we should enable multi subnet failover\n\n .EXAMPLE\n Get-ConnectionString -ServerName localhost -UseIntegratedSecurity -Database OctopusDeploy\n\n .EXAMPLE\n Get-ConnectionString -ServerName localhost -UserName sa -Password ProbablyNotSecure -Database OctopusDeploy\n#>\nFunction Get-ConnectionString {\n    Param(\n        [Parameter(Mandatory=$True)]\n        [string]$ServerName,\n        [string]$UserName,\n        [string]$Password,\n        [string]$Database,\n        [string]$AuthenticationType\n    )\n\n    $ApplicationName = \"OctopusDeploy\"\n    $connectionString = (\"Application Name={0};Server={1}\" -f $ApplicationName, $ServerName)\n\n    switch ($AuthenticationType)\n    {\n    \t\"AzureADPassword\"\n        {\n            Write-Verbose \"Using Azure Active Directory username and password\"\n            $connectionString += (\";Authentication='Active Directory Password';Uid={0};Pwd={1}\" -f $UserName, $Password)                \n            break\n        }\n        \"AzureADIntegrated\"\n        {\n            Write-Verbose \"Using Azure Active Directory integrated\"\n            $connectionString += (\";Authentication='Active Directory Integrated'\")                \n            break\n        }\n        \"AzureADManaged\"\n        {\n        \tWrite-Verbose \"Using Azure Active Directory managed identity\"\n            break\n        }\n        \"AzureADServicePrincipal\"\n        {\n             Write-Verbose \"Using Azure Active Directory username and password\"\n            $connectionString += (\";Authentication='ActiveDirectoryServicePrincipal';Uid={0};Pwd={1}\" -f $UserName, $Password)                \n            break       \t\n        }\n        \"SqlAuthentication\"\n        {\n            Write-Verbose \"Using SQL Authentication username and password\"\n            $connectionString += (\";Uid={0};Pwd={1}\" -f $UserName, $Password)                \n            break        \n        }\n        \"WindowsIntegrated\"\n        {\n            Write-Verbose \"Using integrated security\"\n            $connectionString += \";Trusted_Connection=True\"\n            break\n        }\n    }\n    \n    if ($EnableMultiSubnetFailover)\n    {\n        Write-Verbose \"Enabling multi subnet failover\"\n        $connectionString += \";MultisubnetFailover=True\"\n    }\n\n    If ($Database)\n    {\n        $connectionString += (\";Initial Catalog={0}\" -f $Database)\n    }\n\n\t$connectionString += \";TrustServerCertificate=true;\"\n\n    Return $connectionString\n}\n\n<#\n .SYNOPSIS\n Will find the full path of a given filename (For dacpac or publish profile)\n .DESCRIPTION\n Will search through an extracted package folder provided as the BasePath and hunt for any matches for the given filename.\n .PARAMETER BasePath\n String value of the root folder to begine the recursive search.\n .PARAMETER FileName\n String value of the name of the file to search for.\n .PARAMETER FileType\n String value of \"DacPac\" or \"PublishProfile\" to identify the type of file to search for.\n .EXAMPLE\n Get-DacFilePath -BasePath $ExtractPath -FileName $DACPACPackageName -FileType \"DacPac\"\n#>\nfunction Get-DacFilePath {\n    [cmdletbinding()]\n    param(\n        [parameter(Mandatory=$true)]\n        [string]$BasePath,\n\n        [parameter(Mandatory=$true)]\n        [string]$FileName,\n\n        [parameter(Mandatory=$true)]\n        [ValidateSet(\"DacPac\",\"PublishProfile\")]\n        [string]$FileType\n    )\n\n    # Add file extension for a dacpac if it's missing\n    if($FileName.Split(\".\")[-1] -ne \"dacpac\" -and $FileType -eq \"DacPac\"){\n        $FileName = \"$FileName.dacpac\"\n    }\n\n    Write-Verbose \"Looking for $FileType $FileName in $BasePath.\"\n\n    $filePath = (Get-ChildItem -Path $BasePath -Recurse -Filter $FileName).FullName\n\n    if(@($filePath).Length -gt 1){\n        Write-Warning \"Found $(@($filePath).Length) instances of $FileName. Using $($filePath[0]).\"\n        Write-Warning \"Multiple paths for $FileName`: $(@($filePath) -join \"; \")\"\n        $filePath = $filePath[0]\n    }\n    elseif(@($filePath).Length -lt 1 -or $null -eq $filePath){\n        Throw \"Could not find $FileName.\"\n    }\n\n    return $filePath\n}\n\nfunction Add-SqlCmdVariables\n{\n\t# Get all SqlCmdVariables\n    $sqlCmdVariables = $OctopusParameters.Keys -imatch \"SqlCmdVariable.*\"\n    $argumentList = @()\n        \n\t# Check to see if something is there\n\tif ($null -ne $sqlCmdVariables)\n    {\n    \tWrite-Host \"Adding SqlCmdVariables ...\"\n        \n\t\t# Loop through the variable collection\n        foreach ($sqlCmdVariable in $sqlCmdVariables)\n        {\n        \t# Add variable to the deploy options\n            $sqlCmdVariableKey = $sqlCmdVariable.Substring(($sqlCmdVariable.ToLower().IndexOf(\"sqlcmdvariable.\") + \"sqlcmdvariable.\".Length))\n            \n            Write-Host \"Adding variable: $sqlCmdVariableKey with value: $($OctopusParameters[$sqlCmdVariable])\"\n            \n            $argumentList += (\"/variables:{0}={1}\" -f $sqlCmdVariableKey, $OctopusParameters[$sqlCmdVariable])\n        }\n    }\n    \n    # return the list of variables\n    return $argumentList\n}\n\nfunction Add-AdditionalArguments\n{\n\t# Define parameters\n    param (\n    \t$AdditionalArguments\n    )\n    \n    # Define local variables\n    $argumentsToAdd = @()\n    \n    # Check for emmpty or null\n    if (![string]::IsNullOrWhitespace($AdditionalArguments))\n    {\n    \t# Split the arguments\n    \t$argumentsToAdd += $AdditionalArguments.Split(',', [System.StringSplitOptions]::RemoveEmptyEntries).Trim()\n    }\n    \n    # Return list\n    return $argumentsToAdd\n}\n\nfunction Get-SqlPackage\n{\n\t# Define local variables\n    $workFolder = $OctopusParameters['Octopus.Action.Package[DACPACPackage].ExtractedPath']\n    $downloadUrl = \"\"\n\n\t# Check to see if a folder needs to be created\n    if((Test-Path -Path \"$workFolder/sqlpackage\") -eq $false)\n    {\n        # Create new folder\n        New-Item -ItemType Directory -Path \"$workFolder/sqlpackage\"\n    }\n    \n    Write-Host \"Downloading SqlPackage ...\"\n    \n    if ($IsWindows)\n    {\n    \t# Set url\n        $downloadUrl = \"https://aka.ms/sqlpackage-windows\"\n    }\n    \n    if ($IsLinux)\n    {\n    \t# Set url\n        $downloadUrl = \"https://aka.ms/sqlpackage-linux\"\n    }\n    \n    # Download sql package\n    if ($PSVersionTable.PSVersion.Major -ge 6)\n    {\n    \t# Download\n        Invoke-WebRequest -Uri $downloadUrl -OutFile \"$workFolder/sqlpackage/sqlpackage.zip\"\n    }\n    else\n    {\n    \tInvoke-WebRequest -Uri $downloadUrl -OutFile \"$workFolder/sqlpackage/sqlpackage.zip\" -UseBasicParsing\n    }\n    \n    # Expand the archive\n    Write-Host \"Extracting .zip ...\"\n    Expand-Archive -Path \"$workFolder/sqlpackage/sqlpackage.zip\" -DestinationPath \"$workFolder/sqlpackage\"\n    \n    # Add to PATH\n    $env:PATH = \"$workFolder/sqlpackage$([IO.Path]::PathSeparator)\" + $env:PATH\n    \n    # Make it executable\n    if ($IsLinux)\n    {\n    \t& chmod a+x \"$workFolder/sqlpackage/sqlpackage\"\n    }\n}\n\nFunction Format-OctopusArgument {\n\n    Param(\n        [string]$Value\n    )\n\n    $Value = $Value.Trim()\n\n    # There must be a better way to do this\n    Switch -Wildcard ($Value){\n\n        \"True\" { Return $True }\n        \"False\" { Return $False }\n        \"#{*}\" { Return $null }\n        Default { Return $Value }\n    }\n}\n\nFunction Get-ManagedIdentityToken\n{\n\t# Get the identity token\n    Write-Host \"Getting Azure Managed Identity token ...\"\n    $token = $null\n    $tokenUrl = \"http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fdatabase.windows.net%2F\"\n    \n    if ($PSVersionTable.PSVersion.Major -ge 6)\n    {\n    \t$token = Invoke-RestMethod -Method GET -Uri $tokenUrl -Headers @{\"MetaData\" = \"true\"}\n    }\n    else\n    {\n    \t$token = Invoke-RestMethod -Method GET -Uri $tokenUrl -Headers @{\"MetaData\" = \"true\"} -UseBasicParsing\n    }\n    \n    # Return the token\n    return $token.access_token\n}\n\nfunction Invoke-SqlPackage\n{\n\t# Define parameters\n    param (\n    \t$Action,\n        $Arguments\n    )\n    \n    # Add the action\n    $Arguments += \"/Action:$Action\"\n\n    # Display what's going to be run\n    if (![string]::IsNullOrWhitespace($Password))\n    {\n        $displayArguments = $Arguments.PSObject.Copy()\n        for ($i = 0; $i -lt $displayArguments.Count; $i++)\n        {\n            if ($null -ne $displayArguments[$i])\n            {\n                if ($displayArguments[$i].Contains($Password))\n                {\n                    $DisplayArguments[$i] = $displayArguments[$i].Replace($Password, \"****\")\n                }\n            }\n        }\n\n        Write-Host \"Executing the following command: sqlpackage $displayArguments\"\n    }\n    else \n    {\n        Write-Host \"Executing the following command: sqlpackage $Arguments\"\n    }    \n    \n    & sqlpackage $Arguments\n\n\t# Check exit code\n\tif ($lastExitCode -ne 0)\n\t{\n\t\t# Fail the step\n    \tWrite-Error \"Execution failed!\"\n\t}\n}\n\nfunction Validate-Folder\n{\n\t# Define parameters\n    param (\n    \t$TestPath\n    )\n    \n    # Check for folder\n    if ((Test-Path -Path $TestPath) -eq $false)\n    {\n    \t# Create the folder\n        New-Item -Path \"$TestPath\" -ItemType \"directory\"\n    }\n}\n\nFunction Remove-InvalidFileNameChars {\n\n\tParam(\n\t\t[string]$FileName\n\t)\n\n\t[IO.Path]::GetinvalidFileNameChars() | ForEach-Object { $FileName = $FileName.Replace($_, \"_\") }\n\tReturn $FileName\n}\n\n# Get the supplied parameters\n$PublishProfile = $OctopusParameters[\"DACPACPublishProfile\"]\n$DACPACReport = Format-OctopusArgument -Value $OctopusParameters[\"DACPACReport\"]\n$DACPACScript = Format-OctopusArgument -Value $OctopusParameters[\"DACPACScript\"]\n$DACPACDeploy = Format-OctopusArgument -Value $OctopusParameters[\"DACPACDeploy\"]\n$DACPACTargetServer = $OctopusParameters[\"DACPACTargetServer\"]\n$DACPACTargetDatabase = $OctopusParameters[\"DACPACTargetDatabase\"]\n$DACPACAdditionalArguments = $OctopusParameters[\"DACPACAdditionalArguments\"]\n$DACPACExeLocation = $OctopusParameters[\"DACPACExeLocation\"]\n$DACPACDateTime = ((Get-Date).ToUniversalTime().ToString(\"yyyyMMddHHmmss\"))\n\n$Username = $OctopusParameters[\"DACPACSQLUsername\"]\n$Password = $OctopusParameters[\"DACPACSQLPassword\"]\n$PackageReferenceName = \"DACPACPackage\"\n\n$authenticationType = $OctopusParameters[\"DACPACAuthenticationType\"]\n\n$ExtractPathKey = (\"Octopus.Action.Package[{0}].ExtractedPath\" -f $PackageReferenceName)\n$ExtractPath = $OctopusParameters[$ExtractPathKey]\n\nif(!(Test-Path $ExtractPath)) {\n    Throw (\"The package extraction folder '{0}' does not exist or the Octopus Tentacle does not have permission to access it.\" -f $ExtractPath)\n}\n\n# Get the DACPAC location\n$dacpacFolderName = [System.IO.Path]::GetDirectoryName($DACPACPackageName)\n$dacpacFileName = [System.IO.Path]::GetFileName($DACPACPackageName)\n$DACPACPackagePath = Get-DacFilePath -BasePath ($ExtractPath + ([IO.Path]::DirectorySeparatorChar) + $dacpacFolderName) -FileName $dacpacFileName -FileType \"DacPac\"\n\n# Invoke the DacPac utility\ntry\n{\n\t# Declare working variables\n    $sqlPackageArguments = @()\n    \n    # Build arugment list\n    $sqlPackageArguments += \"/SourceFile:`\"$DACPACPackagePath`\"\"\n    $sqlPackageArguments += \"/TargetConnectionString:`\"$(Get-ConnectionString -ServerName $DACPACTargetServer -Database $DACPACTargetDatabase -UserName $UserName -Password $Password -AuthenticationType $AuthenticationType)`\"\"\n    \n\t# Check to see if a publish profile was designated\n\tIf ($PublishProfile){\n    \t$profileFolderName = [System.IO.Path]::GetDirectoryName($PublishProfile)\n        $profileFileName = [System.IO.Path]::GetFileName($PublishProfile)\n    \t$PublishProfilePath = Get-DacFilePath -BasePath ($ExtractPath + ([IO.Path]::DirectorySeparatorChar) + $profileFolderName) -FileName $profileFileName -FileType \"PublishProfile\"\n    \n    \t# Add to arguments\n    \t$sqlPackageArguments += \"/Profile:`\"$PublishProfilePath`\"\"\n\t}    \n    \n    # Check to see if it's using managed identity\n    if ($authenticationType -eq \"AzureADManaged\")\n    {\n    \t# Add access token\n        $Password = Get-ManagedIdentityToken\n        $sqlPackageArguments += \"/AccessToken:$Password\"\n    }\n    \n    # Add sqlcmd variables\n    $sqlPackageArguments += Add-SqlCmdVariables\n    \n\t# Add addtional arguments\n    $sqlPackageArguments += Add-AdditionalArguments -AdditionalArguments $DACPACAdditionalArguments\n    \n    # Check to see if command timeout was specified\n    if (![string]::IsNullOrWhitespace($DACPACCommandTimeout))\n    {\n    \t# Add timeout parameter\n        $sqlPackageArguments += \"/Properties:CommandTimeout=$DACPACCommandTimeout\"\n    }\n    \n    # Check to see if sqlpackage needs to be downloaded\n    if ([string]::IsNullOrWhitespace($DACPACExeLocation))\n    {\n    \t# Download and extract sqlpackage\n        Get-SqlPackage\n    }\n    else\n    {\n    \t# Add folder location to path\n        $env:PATH = \"$([IO.Path]::GetDirectoryName($DACPACExeLocation))$([IO.Path]::PathSeparator)\" + $env:PATH\n        Write-Host \"It is $($env:PATH)\"\n    }\n    \n    # Execute the actions\n    if ($DACPACReport)\n    {\n    \t$workFolder = \"$($OctopusParameters['Octopus.Action.Package[DACPACPackage].ExtractedPath'])/reports\"\n        $sqlReportArguments = @()\n        $reportArtifact = Remove-InvalidFileNameChars -FileName (\"{0}.{1}.{2}.{3}\" -f $DACPACTargetServer, $DACPACTargetDatabase, $DACPACDateTime, \"DeployReport.xml\")\n        $sqlReportArguments += \"/OutputPath:$workFolder/$reportArtifact\"\n        \n        # Validate the folder\n        Validate-Folder -TestPath $workFolder\n        \n        # Execute the action\n        Invoke-SqlPackage -Action \"DeployReport\" -Arguments ($sqlPackageArguments + $sqlReportArguments)\n        \n        # Attach artifacts\n        foreach ($item in (Get-ChildItem -Path $workFolder))\n        {\n        \t# Upload artifact\n            New-OctopusArtifact $item.FullName\n        }\n    }\n    \n    if ($DACPACScript)\n    {\n    \t$workFolder = \"$($OctopusParameters['Octopus.Action.Package[DACPACPackage].ExtractedPath'])/scripts\"\n        $sqlScriptArguments = @()\n        $scriptArtifact = Remove-InvalidFileNameChars -FileName (\"{0}.{1}.{2}.{3}\" -f $DACPACTargetServer, $DACPACTargetDatabase, $DACPACDateTime, \"DeployScript.sql\")\n        $sqlScriptArguments += \"/OutputPath:$workFolder/$scriptArtifact\"\n        \n        # Validate folder\n        Validate-Folder -TestPath $workFolder\n        \n        # Execute the action\n        Invoke-SqlPackage -Action \"Script\" -Arguments ($sqlPackageArguments + $sqlScriptArguments)\n        \n        # Attach artifacts\n        foreach ($item in (Get-ChildItem -Path $workFolder))\n        {\n        \t# Upload artifact\n            New-OctopusArtifact $item.FullName\n        }        \n    }\n    \n    if ($DACPACDeploy)\n    {\n    \t# Execute action\n        Invoke-SqlPackage -Action \"Publish\" -Arguments $sqlPackageArguments\n    }\n}\ncatch\n{\n    Write-Host $_.Exception.ToString()\n    throw;\n}\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "f2fcbf76-89ad-4fa2-9be3-cd80de2e39a1",
-      "Name": "DACPACPackageName",
-      "Label": "DACPACPackageName",
-      "HelpText": "The name of the .dacpac file that contains the SSDT model.  Include the .dacpac extensions.  To use a specific folder, use the relative location ex: dacpac/mydacpac.dacpac",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0d21c2a7-3e6e-4411-81d7-0e5866faa8fd",
-      "Name": "DACPACPublishProfile",
-      "Label": "Publish profile file name",
-      "HelpText": "Searches the package for the specified file name.  To use a specific folder, use the relative location ex: publish/publish-profile.xml",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7b302914-8d6c-4df2-b392-e45a44e0147c",
-      "Name": "DACPACReport",
-      "Label": "Report",
-      "HelpText": "Whether a deployment report should be generated and loaded into OctopusDeploy as an artifact",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "aa612324-c2ea-4e86-921a-8ad7494df752",
-      "Name": "DACPACScript",
-      "Label": "Script",
-      "HelpText": "Whether a deploy script should be generated and loaded into OctopusDeploy as an artifact",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "94c4da0b-5c55-4d3d-ab0b-e175a767694f",
-      "Name": "DACPACDeploy",
-      "Label": "Deploy",
-      "HelpText": "Whether a deployment of the dacpac should occur",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "d2265a95-ee58-4430-8db0-c7bb03826de0",
-      "Name": "DACPACTargetServer",
-      "Label": "Target Servername",
-      "HelpText": "Name of the server to target this deployment against",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "74397a3b-b007-43cf-bc26-7a1fc2690e24",
-      "Name": "DACPACTargetDatabase",
-      "Label": "Target Database",
-      "HelpText": "Name of the database to target this deployment against",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e1710f37-5f38-4d77-8a05-5fbb6d79132e",
-      "Name": "DACPACAuthenticationType",
-      "Label": "Authentication type",
-      "HelpText": "Select the method to authenticate to the SQL Server.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "SqlAuthentication|SQL Authentication\nWindowsIntegrated|Windows Integrated\nAzureADManaged|Azure Active Directory Managed Identity\nAzureADPassword|Azure Active Directory Username/Password\nAzureADIntegrated|Azure Active Directory Integrated\nAzureADServicePrincipal|Azure Active Directory Service Principal"
-      }
-    },
-    {
-      "Id": "a51747d3-514d-4110-bf6b-e5f3932d4f22",
-      "Name": "DACPACSQLUsername",
-      "Label": "Username",
-      "HelpText": "User name to use to connect to the server if we are not using Integrated Security.\n\nIf using the Azure Active Directory Service Principal Authentication Type, use the Azure Account variable here. For example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Client}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1afb7ff1-4447-425e-8625-33d76f32c321",
-      "Name": "DACPACSQLPassword",
-      "Label": "Password",
-      "HelpText": "Password to use to connect to the server if we are not using Integrated Security.\n\nIf using the Azure Active Directory Service Principal Authentication Type, use the Azure Account variable here. For example, if your Azure Account variable is called MyAccount, the value for this input would be `#{MyAccount.Password}`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "fa1d3a63-f2c0-4969-a4ac-d797df53bed1",
-      "Name": "DACPACPackage",
-      "Label": "DACPAC Package",
-      "HelpText": "The package containing the `.dacpac` file from the specified repository.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "2afcffb6-6c2c-4012-8ea8-80ce9f3f4a19",
-      "Name": "DACPACCommandTimeout",
-      "Label": "Command Timeout",
-      "HelpText": "Override the default command timeout for longer-running scripts.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "17444647-1f19-42e9-bde2-839601de5347",
-      "Name": "DACPACExeLocation",
-      "Label": "SqlPackage executable location",
-      "HelpText": "Location of the SqlPackage executable.  Leave blank to dynamically download.<br />\nExamples:<br />\nEmbedded within the package:`#{Octopus.Action.Package[DACPACPackage].ExtractedPath}/MySubFolder`<br />\nOn disk:`c:\\sqlpackage\\sqlpackage.exe` or `/etc/sqlpackage/sqlpackage`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "99d63959-edbb-4f06-a4be-15dd7cf24c35",
-      "Name": "DACPACAdditionalArguments",
-      "Label": "Additional arguments",
-      "HelpText": "A comma-delimited list of additional arguments to add to the SqlPackage command.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-06-01T22:27:25.564Z",
-    "OctopusVersion": "2023.1.10766",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "sql"
-}
diff --git a/step-templates/sql-deploylog-read.json b/step-templates/sql-deploylog-read.json
deleted file mode 100644
index a6f9fe19e..000000000
--- a/step-templates/sql-deploylog-read.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "Id": "8a446e55-6554-40fa-bbd9-70bd2a69a13e",
-  "Name": "SQL Server __DeployLog: Read",
-  "Description": "To be used with:\nSQL Server __DeployLog: Update\r\n\r\nRequires sqlserver PowerShell module on target machine.\r\n\r\nFor more information: https://octopus.com/blog/100x-faster-db-deploys",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$errorActionPreference = \"stop\"\n\n# Verifying that sqlserver module is installed\nIf (-not(Get-InstalledModule sqlserver -ErrorAction silentlycontinue)) {\n  Write-Error \"This step requires the sqlserver PowerShell module. Please install it and try again.\"\n}\nElse {\n  Write-Output \"PowerShell module sqlserver is already installed.\"\n}\n\n# Declaring variabes\n$deployed_by = ([Environment]::UserDomainName + \"\\\" + [Environment]::UserName)\n$currentPackageVersion = $OctopusParameters[\"Octopus.Action[$DLM_PackageStep].Package.PackageVersion\"]\n$deployRequired = \"False\"\n\n# Logging input variables\nWrite-Verbose \"DLM_PackageStep step is: $DLM_PackageStep\"\nWrite-Verbose \"DLM_ServerInstance instance is: $DLM_ServerInstance\"\nWrite-Verbose \"DLM_Database is: $DLM_Database\"\nWrite-Verbose \"deployed_by is: $deployed_by\"\nWrite-Verbose \"currentPackageVersion is: $currentPackageVersion\"\n\n# For invoke-sqlcmd authentication\n$auth=@{}\nif($DLM_Username){$auth=@{UserName=$DLM_Username;Password=$DLM_Password}}\n\n# Script to check whether __DeployLog exists in target database\n$CheckDeployLogExists = @'\nIF EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES\n           WHERE TABLE_NAME = N'__DeployLog')\n    BEGIN\n    SELECT 'TRUE'\n    END \nELSE\n    BEGIN\n    SELECT 'FALSE'\n    End\n'@\n\n# Verifying whether _DeployLog exists\n$DeployLogExists = Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $CheckDeployLogExists @Auth \n$DeployLogExists = $DeployLogExists[0]\nif($DeployLogExists -eq 'FALSE') {\n    Write-Warning \"Table __DeployLog does not exist in $DLM_Database on $DLM_ServerInstance pre-deployment.\"\n}\n\n# Script to read the last successful package version from __DeployLog\n$getLastPackageVersion = @'\nSELECT TOP (1) package_version \nFROM [dbo].[__DeployLog]\nWHERE  status_code='Succeeded'\nORDER BY utc_time DESC\n'@\n\n# Condition 1: If there is no __DeployLog table we don't know the prior state so we need to deploy the package\nif($DeployLogExists -eq 'FALSE') {\n    Write-Output \"There is no __DeployLog table on target database. Assuming re-deployment is required.\"\n    $deployRequired = \"True\"}\nelse{\n    # Condition 2: If the package version has changed we need to deploy the new package\n    $lastPackageVersion = Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $getLastPackageVersion @Auth\n    try{\n        $lastPackageVersion = $lastPackageVersion[0]\n    }\n    catch{\n        Write-Warning \"__DeployLog is empty\"\n        $lastPackageVersion = \"NULL\"\n    }\n    if($lastPackageVersion -ne $currentPackageVersion){\n        Write-Output \"Package version ($currentPackageVersion) differs from previous package version ($lastPackageVersion), re-deployment is required.\"\n        $deployRequired = \"True\"\n    }\n}\n\n# If neither condition 1 or 2 above are met, __DeployLog indicates that this \n# package has already been successfully deployed - so we can skip the deployment\nif($deployRequired -like \"False\"){\n    Write-Output \"Skipping the deployment because the __DeployLog table in $DLM_Database on $DLM_ServerInstance indicates that package $currentPackageVersion has already been successfully deployed.\"\n}\n\nSet-OctopusVariable -name \"Deploy:$DLM_ServerInstance-$DLM_Database\" -value $deployRequired\n"
-  },
-  "Parameters": [
-    {
-      "Id": "a2328977-2df7-42bb-9f23-263031f27fe7",
-      "Name": "DLM_PackageStep",
-      "Label": "Database package deployment step (Required)",
-      "HelpText": "The step that deploys the package containing the database source code to the target machine.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "871c40e6-9435-4cc5-8f52-a54eaf8c71ad",
-      "Name": "DLM_ServerInstance",
-      "Label": "Target SQL Server Instance (Required)",
-      "HelpText": "The name of the target SQL Server instance.\ne.g. SQLSERVER01\\myInstance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "553359a5-9ee8-43a8-b6fc-aa7e5f9d9d9e",
-      "Name": "DLM_Database",
-      "Label": "Target SQL Server Database (Required)",
-      "HelpText": "The name of the target database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "61f123b1-cb7d-423f-bf3e-da979c3aa539",
-      "Name": "DLM_Username",
-      "Label": "SQL Auth User (Optional)",
-      "HelpText": "The SQL Auth user used to authenticate against the target database. (For Windows Auth, leave blank.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b373aa81-7807-4653-928b-acf39f6a4888",
-      "Name": "DLM_Password",
-      "Label": "SQL Auth Password (Optional)",
-      "HelpText": "The SQL Auth password used to authenticate against the target database. (For Windows Auth, leave blank.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-10-02T14:36:09.349Z",
-    "OctopusVersion": "2020.4.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "Alex-Yates",
-  "Category": "dlm"
-}
diff --git a/step-templates/sql-deploylog-update.json b/step-templates/sql-deploylog-update.json
deleted file mode 100644
index 31b08a927..000000000
--- a/step-templates/sql-deploylog-update.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "Id": "a9f7644c-3e27-4e46-a591-eee7f3542032",
-  "Name": "SQL Server __DeployLog: Update",
-  "Description": "To be used with:\nSQL Server __DeployLog: Read\r\n\r\nRequires sqlserver PowerShell module on target machine.\r\n\r\nFor more information: https://octopus.com/blog/100x-faster-db-deploys",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "<#\nRequired variables:\n$DLM_PackageStep\n$DLM_DeployStep\n$DLM_ServerInstance\n$DLM_Database\n\nOptional variables (include for SQL Auth, exclude for WinAuth):\n$DLM_Username\n$DLM_Password\n#>\n\n$errorActionPreference = \"stop\"\n\n# Verifying that sqlserver module is installed\nIf (-not(Get-InstalledModule sqlserver -ErrorAction silentlycontinue)) {\n  Write-Error \"This step requires the sqlserver PowerShell module. Please install it and try again.\"\n}\nElse {\n  Write-Output \"PowerShell module sqlserver is already installed.\"\n}\n\n# Declaring variabes\n$deployed_by = ([Environment]::UserDomainName + \"\\\" + [Environment]::UserName)\n$currentPackageVersion = $OctopusParameters[\"Octopus.Action[$DLM_PackageStep].Package.PackageVersion\"]\n$octo_release_number = $OctopusParameters[\"Octopus.Release.Number\"]\n$octo_deployment_id = $OctopusParameters[\"Octopus.Deployment.Id\"]\n$octo_deployment_created_by = $OctopusParameters[\"Octopus.Deployment.CreatedBy.Username\"]\n$deployStatusCode = $OctopusParameters[\"Octopus.Step[$DLM_DeployStep].Status.Code\"]\n$deployStatusError = $OctopusParameters[\"Octopus.Step[$DLM_DeployStep].Status.Error\"]\n$deployStatusErrorDetail = $OctopusParameters[\"Octopus.Step[$DLM_DeployStep].Status.ErrorDetail\"]\n$timestamp = Get-Date\n$utcTime = [datetime]::Now.ToUniversalTime().ToString(\"yyyy-MM-dd HH:mm:ss\")\n\n# Escaping single quotes to avoid breaking T-SQL INSERT statements\n$deployStatusError = $deployStatusError -replace \"'\", \"''\"\n$deployStatusErrorDetail = $deployStatusErrorDetail -replace \"'\", \"''\"\n\n# Logging input variables\nWrite-Verbose \"DLM_PackageStep step is: $DLM_PackageStep\"\nWrite-Verbose \"DLM_DeployStep step is: $DLM_DeployStep\"\nWrite-Verbose \"DLM_ServerInstance instance is: $DLM_ServerInstance\"\nWrite-Verbose \"DLM_Database is: $DLM_Database\"\nWrite-Verbose \"DLM_Username is: $DLM_Username\"\nWrite-Verbose \"deployed_by is: $deployed_by\"\nWrite-Verbose \"currentPackageVersion is: $currentPackageVersion\"\nWrite-Verbose \"octo_release_number is: $octo_release_number\"\nWrite-Verbose \"octo_deployment_id is: $octo_deployment_id\"\nWrite-Verbose \"octo_deployment_created_by is: $octo_deployment_created_by\"\nWrite-Verbose \"deployStatusCode is: $deployStatusCode\"\nWrite-Verbose \"deployStatusError is: $deployStatusError\"\nWrite-Verbose \"deployStatusErrorDetail is: $deployStatusErrorDetail\"\nWrite-Verbose \"utcTime is: $utcTime\"\n\n# For invoke-sqlcmd authentication\n$auth=@{}\nif($DLM_Username){$auth=@{UserName=$DLM_Username;Password=$DLM_Password}}\n\n# Script to check whether __DeployLog exists in target database\n$CheckDeployLogExists = @'\nIF EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES\n           WHERE TABLE_NAME = N'__DeployLog')\n    BEGIN\n    SELECT 'TRUE'\n    END \nELSE\n    BEGIN\n    SELECT 'FALSE'\n    End\n'@\n\n# Script to create the __DeployLog table if it does not already exist\n$CreateDeployLogTbl = @'\nCREATE TABLE [dbo].[__DeployLog](\n\t[deploy_id] [int] IDENTITY(1,1) PRIMARY KEY,\n\t[package_version] [varchar](255) NOT NULL,\n \t[octo_release_number] [nvarchar](50) NOT NULL,\n   \t[octo_deployment_id] [nvarchar](50) NOT NULL,\n    [octo_deployment_created_by] [nvarchar](255) NOT NULL,\n\t[utc_time] [datetime2](7) NOT NULL,\n\t[deployed_by] [nvarchar](50) NULL,\n    [status_code] [nvarchar](50) NULL,\n    [status_error] [nvarchar](MAX) NULL,\n    [status_error_detail] [nvarchar](MAX) NULL\n    )\nGO\n'@\n\n# Checking if __DeployLog still exists following deployment \n# (it may have been dropped if it wasn't included in source code)\n$DeployLogExists = Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $CheckDeployLogExists @Auth\n$DeployLogExists = $DeployLogExists[0]\n\n# If __DeployLog has been dropped, recreate it\nif($DeployLogExists -eq \"FALSE\") {\n    Write-Warning \"Table __DeployLog does not exist in $DLM_Database on $DLM_ServerInstance post-deployment. It may have been deleted. You should either add the table to your source code or your filter to avoid data loss.\"\n    Write-Output \"Redeploying __DeployLog table\"\n    Invoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $CreateDeployLogTbl @Auth\n}\n\n# Script to update __DeployLog with info about this deployment\n$updateDeployLog = @\"\nINSERT INTO [dbo].[__DeployLog]\n           ([package_version]\n           ,[octo_release_number]\n           ,[octo_deployment_id]\n           ,[octo_deployment_created_by]\n           ,[utc_time]\n           ,[deployed_by]\n           ,[status_code]\n           ,[status_error]\n           ,[status_error_detail])\n     VALUES\n           ('$currentPackageVersion'\n           ,'$octo_release_number'\n           ,'$octo_deployment_id'\n           ,'$octo_deployment_created_by'\n           ,'$utcTime'\n           ,'$deployed_by'\n           ,'$deployStatusCode'\n           ,'$deployStatusError'\n           ,'$deployStatusErrorDetail')\nGO\n\"@\n\nWrite-Output \"Updating __DeployLog in $DLM_Database on $DLM_ServerInstance.\"\nInvoke-Sqlcmd -ServerInstance $DLM_ServerInstance -Database $DLM_Database -Query $updateDeployLog @Auth"
-  },
-  "Parameters": [
-    {
-      "Id": "a2328977-2df7-42bb-9f23-263031f27fe7",
-      "Name": "DLM_PackageStep",
-      "Label": "Database package deployment step (Required)",
-      "HelpText": "The step that deploys the package containing the database source code to the target machine.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "c4668938-09ea-4b42-9be5-61dfcee9eae6",
-      "Name": "DLM_DeployStep",
-      "Label": "Database update step (Required)",
-      "HelpText": "The step that updates the target database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "871c40e6-9435-4cc5-8f52-a54eaf8c71ad",
-      "Name": "DLM_ServerInstance",
-      "Label": "Target SQL Server Instance (Required)",
-      "HelpText": "The name of the target SQL Server instance.\ne.g. SQLSERVER01\\myInstance",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "553359a5-9ee8-43a8-b6fc-aa7e5f9d9d9e",
-      "Name": "DLM_Database",
-      "Label": "Target SQL Server Database (Required)",
-      "HelpText": "The name of the target database.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "61f123b1-cb7d-423f-bf3e-da979c3aa539",
-      "Name": "DLM_Username",
-      "Label": "SQL Auth User (Optional)",
-      "HelpText": "The SQL Auth user used to authenticate against the target database. (For Windows Auth, leave blank.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b373aa81-7807-4653-928b-acf39f6a4888",
-      "Name": "DLM_Password",
-      "Label": "SQL Auth Password (Optional)",
-      "HelpText": "The SQL Auth password used to authenticate against the target database. (For Windows Auth, leave blank.)",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-10-02T14:46:20.483Z",
-    "OctopusVersion": "2020.4.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "Alex-Yates",
-  "Category": "dlm"
-}
diff --git a/step-templates/sql-execute-script-with-authentication.json b/step-templates/sql-execute-script-with-authentication.json
deleted file mode 100644
index a495fa2ab..000000000
--- a/step-templates/sql-execute-script-with-authentication.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "Id": "3ec610a8-f75c-43da-8d82-8c9b7b334084",
-  "Name": "SQL - Execute SQL Script with SQL or Windows Authentication",
-  "Description": "Executes SQL script file(s) against the specified database using either SQL or Windows authentication. SQL Scripts can be hardcoded value or can be from an extracted NuGet package.",
-  "ActionType": "Octopus.Script",
-  "Version": 169,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Get-DBConnection\r\n{\r\n    [CmdletBinding()]\r\n    param\r\n    (\r\n        [Parameter(Position = 0)]\r\n        [string]\r\n        [ValidateNotNullorEmpty()]\r\n        $serverInstance,\r\n\r\n        [switch]\r\n        $SqlAuthentication,\r\n\r\n        [string]\r\n        $Username,\r\n\r\n        [string]\r\n        $Password\r\n    )\r\n    try\r\n    {\r\n        $connection = (New-Object Microsoft.SqlServer.Management.Smo.Server($serverInstance))\r\n\r\n        if ($SqlAuthentication)\r\n        {\r\n            $connection.ConnectionContext.LoginSecure = $false\r\n            $connection.ConnectionContext.set_Login($Username)\r\n            $securePassword = ConvertTo-SecureString $Password -AsPlainText -Force\r\n            $connection.ConnectionContext.set_SecurePassword($securePassword)\r\n        }\r\n        \r\n        $connection.Refresh()\r\n        \r\n        return $connection\r\n    }\r\n    catch\r\n    {\r\n        throw $_.Exception.ToString()\r\n    }\r\n        \r\n}\r\n\r\nfunction Invoke-ExecuteSQLScript {\r\n\r\n    [CmdletBinding()]\r\n    param\r\n    (\r\n        [parameter(Mandatory = $true, Position = 0)]\r\n        [ValidateNotNullOrEmpty()]\r\n        [string]\r\n        $serverInstance,\r\n\r\n        [parameter(Mandatory = $true, Position = 1)]\r\n        [ValidateNotNullOrEmpty()]\r\n        [string]\r\n        $dbName,\r\n\r\n        [string]\r\n        $Authentication,\r\n\r\n        [string]\r\n        $Username,\r\n\r\n        [string]\r\n        $Password,\r\n\r\n        [string]\r\n        $SQLScripts\r\n    )\r\n\r\n    [System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | out-null\r\n\r\n    if ($Authentication -eq \"SqlAuthentication\")\r\n    {\r\n        $SqlServer = Get-DBConnection -serverInstance $serverInstance -SqlAuthentication -Username $Username -Password $Password\r\n    }\r\n    else\r\n    {\r\n        $SqlServer = Get-DBConnection -serverInstance $serverInstance\r\n    }\r\n\r\n    if ($null -eq $SqlServer.Databases[$dbName])\r\n    {\r\n        throw \"Database $dbName does not exist on server $serverInstance\"\r\n    }\r\n    \r\n    if ($null -ne $SqlServer)\r\n    {\r\n        foreach ($SQLScript in $SQLScripts.Split(\"`n\"))\r\n        {\r\n            try \r\n            {\r\n                $children = $SQLScript -replace \".*\\\\\"\r\n                $replacematch = $children -replace \"\\*\",\"\\*\" -replace \"\\.\",\"\\.\"\r\n                $parent = $SQLScript -replace $replacematch\r\n\r\n                $scripts = Get-ChildItem -Path $parent -Filter $children\r\n\r\n                foreach ($script in $scripts)\r\n                {\r\n                    $sr = New-Object System.IO.StreamReader($script.FullName)\r\n                    $scriptContent = $sr.ReadToEnd()\r\n                    $SqlServer.Databases[$dbName].ExecuteNonQuery($scriptContent)\r\n                    $sr.Close()\r\n\r\n\t\t\t\t\twrite-verbose (\"Executed manual script - {0}\" -f $script.Name)\r\n                }\r\n            }\r\n            catch \r\n            {\r\n                Write-Error $_.Exception\r\n            }\r\n        }\r\n    }\r\n}\r\n\r\nif (Test-Path Variable:OctopusParameters)\r\n{\r\n\tif ($null -ne $DacpacPackageExtractStepName -and $DacpacPackageExtractStepName -ne '')\r\n    {\r\n        Write-Verbose \"Dacpac Package Extract Step Name not empty. Locating scripts located in the Dacpac Extract Step.\"\r\n        $installDirPathKey = 'Octopus.Action[{0}].Output.Package.InstallationDirectoryPath' -f $DacpacPackageExtractStepName\r\n        $installDirPath = $OctopusParameters[$installDirPathKey]\r\n        $ScriptsToExecute = Join-Path $installDirPath $SqlScripts\r\n    }\r\n    else\r\n    {   \r\n        Write-Verbose \"Locating scripts from the literal entry of Octopus Parameter SQLScripts\"\r\n        $ScriptsToExecute = $OctopusParameters[\"SQLScripts\"]\r\n    }\r\n    if ($OctopusParameters[\"Authentication\"] -eq \"SqlAuthentication\")\r\n    {\r\n        Write-Verbose \"Using Sql Authentication\"\r\n        Invoke-ExecuteSQLScript -serverInstance $OctopusParameters[\"serverInstance\"] `\r\n                                -dbName $OctopusParameters[\"dbName\"] `\r\n                                -Authentication $OctopusParameters[\"Authentication\"] `\r\n                                -Username $OctopusParameters[\"Username\"] `\r\n                                -Password $OctopusParameters[\"Password\"] `\r\n                                -SQLScripts $ScriptsToExecute\r\n    }\r\n    else\r\n    {\r\n        Write-Verbose \"Using Windows Integrated Authentication\"\r\n        Invoke-ExecuteSQLScript -serverInstance $OctopusParameters[\"serverInstance\"] `\r\n                                -dbName $OctopusParameters[\"dbName\"] `\r\n                                -SQLScripts $ScriptsToExecute\r\n    }\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "0ac8c815-697d-4212-aa73-85e265bd1a7a",
-      "Name": "serverInstance",
-      "Label": "Server Instance Name",
-      "HelpText": "The SQL Server Instance name",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "63a2671c-cd1e-4bd3-acad-59f656f9a698",
-      "Name": "dbName",
-      "Label": "Database Name",
-      "HelpText": "The database name",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "bc768cdf-3d5f-4a94-8b08-647056eb3977",
-      "Name": "Authentication",
-      "Label": "Authentication",
-      "HelpText": "The authentication method",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "SqlAuthentication\nWindowsIntegrated"
-      }
-    },
-    {
-      "Id": "e4d6eca3-5de6-4901-8f94-5253c2aea18d",
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "The username to use to connect (only applies with SqlAuthentication selected)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d00b988d-bdf3-4376-aec7-90954e3cb635",
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "The password to use to connect (only applies with SqlAuthentication selected)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "4de1507a-3824-46b0-bf11-126b953c73da",
-      "Name": "SQLScripts",
-      "Label": "SQL Scripts",
-      "HelpText": "Full path to each script name on a new line\nWildcards are accepted, eg. C:\\Scripts\\*.sql, C:\\Scripts\\Deploy*.sql",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "0fd3b146-02d1-41fc-9f5c-a830e062b239",
-      "Name": "DacpacPackageExtractStepName",
-      "Label": "DACPAC Package Extract Step Name",
-      "HelpText": "Optional: The step in which the DACPAC package was installed. Can be left as blank if SQLScripts is a hardcoded value.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-09-16T08:42:00.000+00:00",
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2021-09-16T08:42:00.000+00:00",
-    "OctopusVersion": "2021.3.2156",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/sql-execute-script.json b/step-templates/sql-execute-script.json
deleted file mode 100644
index 1bda2198c..000000000
--- a/step-templates/sql-execute-script.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "Id": "73f89638-51d1-4fbb-b68f-b71ba9e86720",
-  "Name": "SQL - Execute Script",
-  "Description": "Execute a SQL script",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Parameters\n$ConnectionString = $OctopusParameters[\"ConnectionString\"]\n$ContinueOnError = $OctopusParameters[\"ContinueOnError\"] -ieq \"True\"\n$SqlQuery = $OctopusParameters[\"SqlScript\"]\n$CommandTimeout = $OctopusParameters[\"CommandTimeout\"]\n$CaptureOutputToVariables = $OctopusParameters[\"CaptureOutputToVariables\"] -ieq \"True\"\n\n# Local Variables\n$connection = New-Object System.Data.SqlClient.SqlConnection\n$connection.ConnectionString = $ConnectionString\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n$global:outputs = @()\n\nRegister-ObjectEvent -InputObject $connection -EventName InfoMessage -Action {\n    Write-Output $event.SourceEventArgs\n} | Out-Null\n\nfunction Execute-SqlQuery($SqlQuery) {\n    $queries = [System.Text.RegularExpressions.Regex]::Split($SqlQuery, \"^s*GOs*`$\", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Multiline)\n\n    $queries | ForEach-Object {\n        $query = $_\n        if ((-not [String]::IsNullOrWhiteSpace($query)) -and ($query.Trim() -ine \"GO\")) {            \n            $command = $connection.CreateCommand()\n            $command.CommandText = $query\n            $command.CommandTimeout = $CommandTimeout\n            $command.ExecuteNonQuery() | Out-Null\n        }\n    }\n}\n\n$handler = [System.Data.SqlClient.SqlInfoMessageEventHandler] { param($sender, $event) \n    $eventMessage = $event.Message\n    Write-Verbose $eventMessage\n    if ($CaptureOutputToVariables -eq $True) {\n        $global:outputs += $eventMessage\n    }\n}\n\ntry {\n\t\n    Write-Output \"Attach InfoMessage event handler\"\n    $connection.add_InfoMessage($handler)\n    \n    Write-Output \"Connecting\"\n    $connection.Open()\n\n    Write-Output \"Executing script\"\n    Execute-SqlQuery -SqlQuery $SqlQuery\n}\ncatch {\n    if ($ContinueOnError) {\n        Write-Output \"Error: $($_.Exception.Message)\"\n    }\n    else {\n        throw\n    }\n}\nfinally {\n    if ($null -ne $connection) {\n        Write-Output \"Detach InfoMessage event handler\"\n        $connection.remove_InfoMessage($handler)\n        Write-Output \"Closing connection\"\n        $connection.Dispose()\n    }\n}\n\nif ($CaptureOutputToVariables -eq $True) {\n    Write-Output \"Capture output to variables is true\"\n    Write-Output \"Output Count: $($global:outputs.Length)\"\n    if ($global:outputs.Length -gt 0) {\n        Write-Verbose \"Setting Octopus output variables\"\n        for ($i = 0; $i -lt $global:outputs.Length; $i++) {\n            $variableName = \"SQLOutput-$($i+1)\"\n            $variableValue = $global:outputs[$i]\n            Set-OctopusVariable -Name $variableName -Value $variableValue\n            Write-Verbose \"Created output variable: ##{Octopus.Action[$StepName].Output.$variableName}\"\n        }\n    }\n    else {\n        Write-Verbose \"No Octopus output variables to set\"\n    }\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "802db0cd-f6eb-4cc6-9388-c5f6a4ae63ea",
-      "Name": "ConnectionString",
-      "Label": "Connection string",
-      "HelpText": "Connection string for the SQL connection. Example:\n\n    Server=.\\SQLExpress;Database=OctoFX;Integrated Security=True;\n\nBind to a variable to provide different values for different environments.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ec5a5223-3415-4cda-a888-3655f2b3e98c",
-      "Name": "SqlScript",
-      "Label": "SQL Script",
-      "HelpText": "Script to run. Can be bound to a variable split over multiple lines. Text output by the PRINT statement in SQL will be logged to the deployment log. Use 'GO' to separate multiple commands\n\nExample:\n\n    USE MASTER\n    go\n\n    BACKUP DATABASE [OctoFX] TO DISK = N'#{FilePath}' WITH  COPY_ONLY, NOFORMAT, NOINIT,  NAME = N'Backup created by Octopus', SKIP, NOREWIND, NOUNLOAD,  STATS = 10",
-      "DefaultValue": "PRINT 'Hello from SQL'",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "1360f453-ad5b-4cc9-bf56-c565f62e2542",
-      "Name": "ContinueOnError",
-      "Label": "Continue On Error",
-      "HelpText": "If set to true, an error with the SQL statement will simply write to the log and not cause an error in the deployment.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "d2f77e7a-a3d2-453c-a784-e3587db28e12",
-      "Name": "CommandTimeout",
-      "Label": "Command Timeout",
-      "HelpText": "The SQL Command Timeout. By default is 30 seconds.",
-      "DefaultValue": "30",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "90b930a8-39d9-43a2-991d-e2a7d374d30b",
-      "Name": "CaptureOutputToVariables",
-      "Label": "Capture SQL Output to Variable(s)",
-      "HelpText": "If set to true, output received from each command (via the `SqlInfoMessageEventHandler`) will be added to an Octopus [output variable](https://octopus.com/docs/projects/variables/output-variables) named **SQLOutput**, and will be suffixed with a number corresponding to the command that generated the output. The default is `False`.\n\nExample:\n\n1. `#{Octopus.Action[STEP NAME].Output.SQLOutput-1}`\n2. `#{Octopus.Action[STEP NAME].Output.SQLOutput-2}`",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2022-01-21T11:31:23.426Z",
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2022-01-21T11:31:23.426Z",
-    "OctopusVersion": "2021.3.12033",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
diff --git a/step-templates/sql-execute-sql-agent-job.json b/step-templates/sql-execute-sql-agent-job.json
deleted file mode 100644
index 8a49bf166..000000000
--- a/step-templates/sql-execute-sql-agent-job.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "7bf5fc6b-9174-48ab-8da5-abf0eeef297a",
-  "Name": "SQL - Execute SQL Agent Job",
-  "Description": "Execute a SQL Agent Job and wait for results.",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$connection = New-Object System.Data.SqlClient.SqlConnection\r\n$connection.ConnectionString = $OctopusParameters['ConnectionString']\r\nRegister-ObjectEvent -inputobject $connection -eventname InfoMessage -action {\r\n    write-host $event.SourceEventArgs\r\n} | Out-Null\r\n\r\nfunction Run-SqlAgentJob($jobname,$timeout,$stepid) {\r\n\t$sqlstring = @\"\r\n\t\tSET NOCOUNT ON\r\n\r\n\t\t--Declaration\r\n\t\tDECLARE @jobtorun VARCHAR(MAX) = '<JobName>'\r\n\t\tDECLARE @jobid\tVARCHAR(50) = ''\r\n\t\tDECLARE @previousid INT\r\n        DECLARE @previous_status INT \r\n\t\tdeclare @newid\tINT\r\n\t\tDECLARE @runstatus\tINT\r\n\r\n\t\tCREATE TABLE #results\r\n\t\t(\r\n\t\t\tinstance_id INT,\r\n\t\t\tjob_id\tvarchar(255),\r\n\t\t\tjob_name VARCHAR(255),\r\n\t\t\tstep_id\tINT,\r\n\t\t\tstep_name VARCHAR(255),\r\n\t\t\tsql_message_id INT,\r\n\t\t\tsql_severity INT,\r\n\t\t\tmessage VARCHAR(MAX),\r\n\t\t\trun_status INT,\r\n\t\t\trun_date INT,\r\n\t\t\trun_time INT,\r\n\t\t\trun_duration INT,\r\n\t\t\toperator_emailed VARCHAR(255),\r\n\t\t\toperator_netsent VARCHAR(255),\r\n\t\t\toperator_paged VARCHAR(255),\r\n\t\t\tretries_attempted INT,\r\n\t\t\tserver sysname\r\n\t\t)\r\n\r\n\t\t--Get Job ID\r\n\t\tSELECT @jobid = job_id FROM msdb.dbo.sysjobs where name = @jobtorun\r\n\t\tIF @jobid = ''\r\n        BEGIN \r\n        \tRAISERROR ('Job Name Not Found.', -- Message text.\r\n        \t\t\t\t16, -- Severity.\r\n        \t\t\t\t1 -- State.\r\n        \t\t\t\t);\r\n        \tRETURN\r\n        END\r\n\r\n\t\t--Store previous job history\r\n\t\tINSERT INTO #results\r\n\t\tEXEC sp_help_jobhistory @job_id = @jobid, @mode = 'full', @step_id = <StepId>\r\n        SELECT @previousid = t.instance_id, @previous_status = t.run_status FROM (SELECT TOP 1 instance_id, run_status FROM #results ORDER BY instance_id DESC) t\r\n        PRINT 'Previous job ID: ' + CAST(@previousid AS VARCHAR(5)) + '\t\tRun Status:' + CAST(@previous_status AS VARCHAR(5))\r\n\t\tSET @newid = @previousid\r\n\r\n\t\t--Start SQL Agent Job\r\n\t\tEXEC msdb.dbo.sp_start_job @jobtorun\r\n\r\n\t\t--Loop for x seconds or until jobhistory has been updated with a new record\r\n\t\tDECLARE @loopct\tINT = 1\r\n\t\tWHILE (@newid = @previousid) and (@loopct < <Timeout>)\r\n\t\tBEGIN\r\n\t\t\tTRUNCATE TABLE #results\r\n\t\t\tINSERT INTO #results\r\n\t\t\t\tEXEC sp_help_jobhistory @job_id = @jobid, @mode = 'full', @step_id = <StepId>\r\n\r\n\t\t\tSELECT @newid = instance_id, @runstatus = run_status FROM #results WHERE instance_id = (SELECT MAX(instance_id) FROM #results)\r\n\r\n\t\t\tPRINT 'Poll ' + CAST(@loopct AS VARCHAR(5)) + '\t\tTime: ' + CONVERT(VARCHAR(8), GETDATE(), 108) \r\n\r\n\t\t\tSET @loopct += 1\r\n\t\t\tWAITFOR DELAY '00:00:05'\r\n\t\tEND\r\n\r\n\t\tIF @newid = @previousid\r\n\t\t\tRAISERROR ('Job did not complete in time.', -- Message text.\r\n\t\t\t\t\t   16, -- Severity.\r\n\t\t\t\t\t   1 -- State.\r\n\t\t\t\t\t   );\r\n\t\tIF @runstatus <> 1\r\n\t\t\tRAISERROR ('Job did not complete successfully.', -- Message text.\r\n\t\t\t\t\t   16, -- Severity.\r\n\t\t\t\t\t   1 -- State.\r\n\t\t\t\t\t   );\r\n\r\n\t\tPRINT ''\r\n\t\tPRINT 'Time: ' + CONVERT(VARCHAR(8), GETDATE(), 108) + '\tNew Job ID:' + CAST(@newid AS VARCHAR(5)) + '\t\tRun Status:' + CAST(@runstatus AS VARCHAR(5))\r\n\r\n\t\t--Cleanup\r\n\t\tDROP TABLE #results\r\n\"@\r\n\r\n    $jobname = $jobname -replace \"'\", \"''\"\r\n\t$sqlstring = $sqlstring -replace \"<JobName>\", $jobname\r\n\t$sqlstring = $sqlstring -replace \"<Timeout>\", $timeout\r\n\t$sqlstring = $sqlstring -replace \"<StepId>\", $stepid\r\n\t\r\n\t#Debug Code\r\n\t#Write-Host $sqlstring\r\n\t\r\n\t$command = $connection.CreateCommand()\r\n\t$command.CommandText = $sqlstring\r\n\t$command.CommandTimeout = 0\r\n\t$command.ExecuteNonQuery() | Out-Null\r\n}\r\n\r\nWrite-Host \"Connecting\"\r\ntry {\r\n    $connection.Open()\r\n\r\n    Write-Host \"Running SQL Agent Job\"\r\n    Run-SqlAgentJob -jobname $OctopusParameters['JobName'] -timeout $OctopusParameters['Timeout'] -step $OctopusParameters['Step']\r\n}\r\nfinally {\r\n    Write-Host \"Closing connection\"\r\n    $connection.Dispose()\r\n}\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ConnectionString",
-      "Label": "Connection String",
-      "HelpText": "Connection string for the SQL connection. Example:\n\nServer=.\\SQLExpress;Database=OctoFX;Integrated Security=True;\nBind to a variable to provide different values for different environments.",
-      "DefaultValue": "Server=;Database=msdb;Integrated Security=True;",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "JobName",
-      "Label": "Job Name",
-      "HelpText": "SQL Agent job to run. Can be bound to a variable split. \nText output by the PRINT statement in SQL will be logged to the deployment log.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Timeout",
-      "Label": "Timeout Value",
-      "HelpText": "The maximum length of time in 5 second intervals to wait for job completion. \nThe default value is 600 seconds (120 intervals x 5s = 600s)",
-      "DefaultValue": "120",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Step",
-      "Label": "Last Job Step",
-      "HelpText": "The number of the last step to run for the given job. \nThe default value is 1",
-      "DefaultValue": 1,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-04-06T20:01:31.948+00:00",
-  "LastModifiedBy": "chrisgelhaus",
-  "$Meta": {
-    "ExportedAt": "2015-04-06T20:01:54.552+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
diff --git a/step-templates/sql-execute-sql-files.json b/step-templates/sql-execute-sql-files.json
deleted file mode 100644
index 1d4de12cc..000000000
--- a/step-templates/sql-execute-sql-files.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "Id": "2bd3b8ef-35b4-43e9-b6de-8e0c515f3f10",
-    "Name": "SQL - Execute SQL Script Files",
-    "Description": "Executes SQL script file(s) against the specified database using the `SQLServer` Powershell Module.  This template includes an `Authentication` selector and supports SQL Authentication, Windows Authentication, and Azure Managed Identity.\n\nNote: If the `SqlServer` PowerShell module is not present, the template will download a temporary copy to perform the task.",
-    "ActionType": "Octopus.Script",
-    "Version": 6,
-    "CommunityActionTemplateId": null,
-    "Packages": [
-      {
-        "Id": "8473acaf-aaeb-4c23-923a-91f664290f16",
-        "Name": "template.Package",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "template.Package",
-          "Purpose": ""
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptBody": "\nfunction Get-ModuleInstalled {\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {\n        # It is installed\n        return $true\n    }\n    else {\n        # Module not installed\n        return $false \n    }\n}\n\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Install-PowerShellModule {\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n    \n    # Set TLS order\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n    # Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n        # Display that we need the nuget package provider\n        Write-Output \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n}\n\n\nfunction Invoke-ExecuteSQLScript {\n\n    [CmdletBinding()]\n    param\n    (\n        [parameter(Mandatory = $true, Position = 0)]\n        [ValidateNotNullOrEmpty()]\n        [string]\n        $serverInstance,\n\n        [parameter(Mandatory = $true, Position = 1)]\n        [ValidateNotNullOrEmpty()]\n        [string]\n        $dbName,\n\n        [string]\n        $Authentication,\n\n        [string]\n        $SQLScripts,\n\n        [bool]\n        $DisplaySqlServerOutput,\n        \n        [bool]\n        $TrustServerCertificate\n    )\n    \n    # Check to see if SqlServer module is installed\n    if ((Get-ModuleInstalled -PowerShellModuleName \"SqlServer\") -ne $true) {\n        # Display message\n        Write-Output \"PowerShell module SqlServer not present, downloading temporary copy ...\"\n\n        # Download and install temporary copy\n        Install-PowerShellModule -PowerShellModuleName \"SqlServer\" -LocalModulesPath $LocalModules\n    }\n\n    # Display\n    Write-Output \"Importing module SqlServer ...\"\n\n    # Import the module\n    Import-Module -Name \"SqlServer\"\n    \n    $ExtractedPackageLocation = $($OctopusParameters['Octopus.Action.Package[template.Package].ExtractedPath'])\n\n    $matchingScripts = @()\n\n    # 1. Locate matching scripts\n    foreach ($SQLScript in $SQLScripts.Split(\"`n\", [System.StringSplitOptions]::RemoveEmptyEntries)) {\n        try {\n            \n            Write-Verbose \"Searching for scripts matching '$($SQLScript)'\"\n            $scripts = @()\n            $parent = Split-Path -Path $SQLScript -Parent\n            $leaf = Split-Path -Path $SQLScript -Leaf\n            Write-Verbose \"Parent: '$parent', Leaf: '$leaf'\"\n            if (-not [string]::IsNullOrWhiteSpace($parent)) {\n                $path = Join-Path $ExtractedPackageLocation $parent\n                if (Test-Path $path) {\n                    Write-Verbose \"Searching for items in '$path' matching '$leaf'\"\n                    $scripts += @(Get-ChildItem -Path $path -Filter $leaf)\n                }\n                else {\n                    Write-Warning \"Path '$path' not found. Please check the path exists, and is relative to the package contents.\"\n                }\n            }\n            else {\n                Write-Verbose \"Searching in root of package for '$leaf'\"\n                $scripts += @(Get-ChildItem -Path $ExtractedPackageLocation -Filter $leaf)\n            }\n    \n            Write-Output \"Found $($scripts.Count) SQL scripts matching input '$SQLScript'\"\n\n            $matchingScripts += $scripts\n        }\n        catch {\n            Write-Error $_.Exception\n        }\n    }\n    \n    # Create arguments hash table\n    $sqlcmdArguments = @{}\n\n\t# Add bound parameters\n    $sqlcmdArguments.Add(\"ServerInstance\", $serverInstance)\n    $sqlcmdArguments.Add(\"Database\", $dbName)\n    #$sqlcmdArguments.Add(\"Query\", $SQLScripts)\n    \n    if ($DisplaySqlServerOutput)\n    {\n    \tWrite-Host \"Adding Verbose to argument list to display output ...\"\n        $sqlcmdArguments.Add(\"Verbose\", $DisplaySqlServerOutput)\n    }\n    \n    if ($TrustServerCertificate)\n    {\n    \t$sqlcmdArguments.Add(\"TrustServerCertificate\", $TrustServerCertificate)\n    }\n\n    # Only execute if we have matching scripts\n    if ($matchingScripts.Count -gt 0) {\n        foreach ($script in $matchingScripts) {\n            $sr = New-Object System.IO.StreamReader($script.FullName)\n            $scriptContent = $sr.ReadToEnd()\n        \n            # Execute based on selected authentication method\n            switch ($Authentication) {\n                \"AzureADManaged\" {\n                    # Get login token\n                    Write-Verbose \"Authenticating with Azure Managed Identity ...\"\n                \n                    $response = Invoke-WebRequest -Uri 'http://169.254.169.254/metadata/identity/oauth2/token?api-version=2018-02-01&resource=https%3A%2F%2Fdatabase.windows.net%2F' -Method GET -Headers @{Metadata = \"true\" } -UseBasicParsing\n                    $content = $response.Content | ConvertFrom-Json\n                    $AccessToken = $content.access_token\n                    \n                    $sqlcmdArguments.Add(\"AccessToken\", $AccessToken)\n\n                    break\n                }\n                \"SqlAuthentication\" {\n                    Write-Verbose \"Authentication with SQL Authentication ...\"\n                    $sqlcmdArguments.Add(\"Username\", $username)\n                    $sqlcmdArguments.Add(\"Password\", $password)\n\n                    break\n                }\n                \"WindowsIntegrated\" {\n                    Write-Verbose \"Authenticating with Windows Authentication ...\"\n                    break\n                }\n            }\n            \n            $sqlcmdArguments.Add(\"Query\", $scriptContent)\n            \n            # Invoke sql cmd\n            Invoke-SqlCmd @sqlcmdArguments\n        \n            $sr.Close()\n\n            Write-Verbose (\"Executed manual script - {0}\" -f $script.Name)\n        }\n    }\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules$([System.IO.Path]::PathSeparator)$env:PSModulePath\"\n\nif (Test-Path Variable:OctopusParameters) {\n    Write-Verbose \"Locating scripts from the literal entry of Octopus Parameter SQLScripts\"\n    $ScriptsToExecute = $OctopusParameters[\"SQLScripts\"]\n    $DisplaySqlServerOutput = $OctopusParameters[\"ExecuteSQL.DisplaySQLServerOutput\"] -ieq \"True\"\n    $TemplateTrustServerCertificate = [System.Convert]::ToBoolean($OctopusParameters[\"ExecuteSQL.TrustServerCertificate\"])\n    \n    Invoke-ExecuteSQLScript -serverInstance $OctopusParameters[\"serverInstance\"] `\n        -dbName $OctopusParameters[\"dbName\"] `\n        -Authentication $OctopusParameters[\"Authentication\"] `\n        -SQLScripts $ScriptsToExecute `\n        -DisplaySqlServerOutput $DisplaySqlServerOutput `\n        -TrustServerCertificate $TemplateTrustServerCertificate\n}",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.RunOnServer": "false"
-    },
-    "Parameters": [
-      {
-        "Id": "1f2b60c9-b85c-4c23-a313-fc18e82cd500",
-        "Name": "serverInstance",
-        "Label": "Server Instance Name",
-        "HelpText": "The SQL Server Instance name",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "9884b8c1-01a0-4c6f-97b1-ff5146fa0836",
-        "Name": "dbName",
-        "Label": "Database Name",
-        "HelpText": "The database name",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "05dc20d9-f75c-4971-9efb-e9aaad82a3a9",
-        "Name": "Authentication",
-        "Label": "Authentication",
-        "HelpText": "The authentication method",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "SqlAuthentication|SQL Authentication\nWindowsIntegrated|Windows Integrated\nAzureADManaged|Azure Active Directory Managed Identity"
-        }
-      },
-      {
-        "Id": "4c2fc1b4-bdd0-4a9a-adb1-da1e818e62bc",
-        "Name": "Username",
-        "Label": "Username",
-        "HelpText": "The username to use to connect (only applies with SqlAuthentication selected)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "819f9b19-042d-42d8-9d19-5f5bf28c06b7",
-        "Name": "Password",
-        "Label": "Password",
-        "HelpText": "The password to use to connect (only applies with SqlAuthentication selected)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "dd22f955-8317-4d58-8173-fc7d44df1192",
-        "Name": "SQLScripts",
-        "Label": "SQL Scripts",
-        "HelpText": "Provide the path to search for matching scripts, each one on a new line. Wildcards for filenames only are accepted, e.g.\n- `/Scripts/*.sql`\n- `/Scripts/SQL/Deploy*.sql`\n- `src/Permissions/Pre*Permissions.sql`\n\n**Please Note:** The step looks for files relative to the extracted package location, and does *not* recursively search the folder hierarchy.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "3bfed638-6649-438f-a02b-353e36a63c87",
-        "Name": "template.Package",
-        "Label": "Package",
-        "HelpText": "Package containing the SQL scripts to be executed.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "c6b85a12-bf2f-4963-8526-ebbe8f14707d",
-        "Name": "ExecuteSQL.DisplaySQLServerOutput",
-        "Label": "Display SQL Output",
-        "HelpText": "You can display SQL Server message output, such as those that result from the SQL `PRINT` statement, by checking this parameter",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "52d8f897-696b-4f77-87b5-383d6ce559c3",
-        "Name": "ExecuteSQL.TrustServerCertificate",
-        "Label": "Trust Server Certificate",
-        "HelpText": "Force connection to trust the server certificate.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "StepPackageId": "Octopus.Script",
-    "$Meta": {
-      "ExportedAt": "2024-07-12T22:26:51.480Z",
-      "OctopusVersion": "2024.2.9303",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "sql"
-  }
diff --git a/step-templates/sql-fix-orphaned-user.json b/step-templates/sql-fix-orphaned-user.json
deleted file mode 100644
index b975cdef7..000000000
--- a/step-templates/sql-fix-orphaned-user.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "Id": "e56e9b28-1cf2-4646-af70-93e31bcdb86b",
-    "Name": "SQL - Fix Orphaned User",
-    "Description": "Will fix an orphaned user in the database by re-associating the SID.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "function Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Install-PowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n    \n    # Set TLS order\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls11 -bor [System.Net.SecurityProtocolType]::Tls12\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n\n}\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n\n# Check to see if SqlServer module is installed\nif (((Get-ModuleInstalled -PowerShellModuleName \"SqlServer\") -ne $true) -and ((Get-ModuleInstalled -PowerShellModuleName \"SQLPS\") -ne $true))\n{\n  # Display message\n  Write-Output \"PowerShell module SqlServer not present, downloading temporary copy ...\"\n\n  # Download and install temporary copy\n  Install-PowerShellModule -PowerShellModuleName \"SqlServer\" -LocalModulesPath $LocalModules\n  \n  # Display\n  Write-Output \"Importing module SqlServer ...\"\n\n  # Import the module\n  Import-Module -Name \"SqlServer\"  \n}\n\nWrite-Host \"SqlLoginWhoHasRights $autoFixSqlLoginUserWhoHasRights\"\nWrite-Host \"SqlServer $autoFixSqlServer\"\nWrite-Host \"DatabaseName $autoFixDatabaseName\"\nWrite-Host \"SqlLogin $autoFixSqlLogin\"\n\nif ([string]::IsNullOrWhiteSpace($autoFixSqlLoginUserWhoHasRights) -eq $true){\n\tWrite-Host \"No username found, using integrated security\"\n    $connectionString = \"Server=$autoFixSqlServer;Database=$autoFixDatabaseName;integrated security=true;\"\n}\nelse {\n\tWrite-Host \"Username found, using SQL Authentication\"\n    $connectionString = \"Server=$autoFixSqlServer;Database=$autoFixDatabaseName;User ID=$autoFixSqlLoginUserWhoHasRights;Password=$autoFixSqlLoginPasswordWhoHasRights;\"\n}\n\n# Build sql query\n$sqlQuery = @\"\nDECLARE @OrphanedUsers TABLE\n(\n\tUserName VARCHAR(50) null,\n\tUserSID VARBINARY(100) null\n)\n\nINSERT INTO @OrphanedUsers EXEC sp_change_users_login 'Report'\n\nIF EXISTS ( SELECT UserName FROM @OrphanedUsers WHERE UserName = '$autoFixSqlLogin' )\n\tBEGIN\n\t\tPRINT '$autoFixSqlLogin is orphaned, fixing ...'\n        EXEC sp_change_users_login 'Auto_Fix', '$autoFixSqlLogin'\n    END\nELSE\n\tPRINT '$autoFixSqlLogin is not orphaned.'\n\"@\n\n# Execute the command to find orphaned users, then fix if matching\nInvoke-SqlCmd -ConnectionString $connectionString -Query $sqlQuery -Verbose\n\n"
-    },
-    "Parameters": [
-      {
-        "Id": "083897f2-d65d-45a5-b9fb-ef760a727303",
-        "Name": "autoFixSqlServer",
-        "Label": "SQL Server",
-        "HelpText": "The SQL Server to perform the work on",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ead6a85f-71e6-4c42-b6b2-ef048edabcbd",
-        "Name": "autoFixSqlLoginUserWhoHasRights",
-        "Label": "SQL Login",
-        "HelpText": "The login of the user who has permissions to create a database.\n\nLeave blank for integrated security",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "eb648cdd-0390-4569-8af9-e4e51946585f",
-        "Name": "autoFixSqlLoginPasswordWhoHasRights",
-        "Label": "SQL Password",
-        "HelpText": "The password of the user who has permissions to create SQL Logins\n\nLeave blank for integrated security",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "835159c0-7c5a-4714-ad9e-888dd29e6cd3",
-        "Name": "autoFixDatabaseName",
-        "Label": "Database Name",
-        "HelpText": "The name of the database to create the user on",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "7be27e8c-efef-4700-8b7f-fba78a25788f",
-        "Name": "autoFixSqlLogin",
-        "Label": "SQL Login",
-        "HelpText": "The username to attach to the database if it does not exist",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-07-22T00:41:40.086Z",
-      "OctopusVersion": "2020.2.16",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "sql"
-  }
\ No newline at end of file
diff --git a/step-templates/sql-restore-database.json b/step-templates/sql-restore-database.json
deleted file mode 100644
index 73090ee22..000000000
--- a/step-templates/sql-restore-database.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "Id": "469b6d9d-761a-4f94-9745-20e9c2f93841",
-  "Name": "SQL - Restore Database",
-  "Description": "Restore a MS SQL Server database to the file system.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ServerName = $OctopusParameters['Server']\n$DatabaseName = $OctopusParameters['Database']\n$BackupDirectory = $OctopusParameters['BackupDirectory']\n$CompressionOption = [int]$OctopusParameters['Compression']\n$Devices = [int]$OctopusParameters['Devices']\n$Stamp = $OctopusParameters['Stamp']\n$SqlLogin = $OctopusParameters['SqlLogin']\n$SqlPassword = $OctopusParameters['SqlPassword']\n$DateFormat = $OctopusParameters['DateFormat']\n$Separator = $OctopusParameters['Separator']\n$ErrorActionPreference = \"Stop\"\n\nfunction ConnectToDatabase()\n{\n    param($server, $SqlLogin, $SqlPassword)\n        \n    if ($SqlLogin -ne $null) {\n\n        if ($SqlPassword -eq $null) {\n            throw \"SQL Password must be specified when using SQL authentication.\"\n        }\n    \n        $server.ConnectionContext.LoginSecure = $false\n        $server.ConnectionContext.Login = $SqlLogin\n        $server.ConnectionContext.Password = $SqlPassword\n    \n        Write-Host \"Connecting to server using SQL authentication as $SqlLogin.\"\n        $server = New-Object Microsoft.SqlServer.Management.Smo.Server $server.ConnectionContext\n    }\n    else {\n        Write-Host \"Connecting to server using Windows authentication.\"\n    }\n\n    try {\n        $server.ConnectionContext.Connect()\n    } catch {\n        Write-Error \"An error occurred connecting to the database server!`r`n$($_.Exception.ToString())\"\n    }\n}\n\nfunction AddPercentHandler {\n    param($smoBackupRestore, $action)\n\n    $percentEventHandler = [Microsoft.SqlServer.Management.Smo.PercentCompleteEventHandler] { Write-Host $dbName $action $_.Percent \"%\" }\n    $completedEventHandler = [Microsoft.SqlServer.Management.Common.ServerMessageEventHandler] { Write-Host $_.Error.Message}\n        \n    $smoBackupRestore.add_PercentComplete($percentEventHandler)\n    $smoBackupRestore.add_Complete($completedEventHandler)\n    $smoBackupRestore.PercentCompleteNotification=10\n}\n\nfunction CreateDevice {\n    param($smoBackupRestore, $directory, $name)\n\n    $devicePath = Join-Path $directory ($name)\n    $smoBackupRestore.Devices.AddDevice($devicePath, \"File\")    \n    return $devicePath\n}\n\nfunction CreateDevices {\n    param($smoBackupRestore, $devices, $directory, $dbName)\n        \n    $targetPaths = New-Object System.Collections.Generic.List[System.String]\n    \n    if ($devices -eq 1){\n        $deviceName = $dbName + $Separator + $timestamp + \".bak\"\n        $targetPath = CreateDevice $smoBackupRestore $directory $deviceName\n        $targetPaths.Add($targetPath)\n    } else {\n        for ($i=1; $i -le $devices; $i++){\n            $deviceName = $dbName + \"_\" + $timestamp + \"_\" + $i + \".bak\"\n            $targetPath = CreateDevice $smoBackupRestore $directory $deviceName\n            $targetPaths.Add($targetPath)\n        }\n    }\n    return $targetPaths\n}\n\nfunction RelocateFiles{\n    param($smoRestore)\n    \n    foreach($file in $smoRestore.ReadFileList($server))\n    {\n        $relocateFile = New-Object Microsoft.SqlServer.Management.Smo.RelocateFile\n        $relocateFile.PhysicalFileName = $server.Settings.DefaultFile + $file.LogicalName + [System.IO.Path]::GetExtension($file.PhysicalName)\n        $relocateFile.LogicalFileName = $file.LogicalName\n        $smoRestore.RelocateFiles.Add($relocateFile)\n    }\n}\n\nfunction RestoreDatabase {\n    param($dbName, $devices)\n\n    $smoRestore = New-Object Microsoft.SqlServer.Management.Smo.Restore\n    $targetPaths = CreateDevices $smoRestore $devices $BackupDirectory $dbName $timestamp\n\n    Write-Host \"Attempting to restore database $ServerName.$dbName from:\"\n    $targetPaths\n    Write-Host \"\"\n\n    foreach ($path in $targetPaths) {\n        if (-not (Test-Path $path)) {\n            Write-Host \"Cannot find backup device \"($path)\n            return          \n        }\n    }\n    \n    if ($server.Databases[$dbName] -ne $null)  \n    {  \n        $server.KillAllProcesses($dbName)\n        $server.KillDatabase($dbName)\n    }\n\n    $smoRestore.Action = \"Database\"\n    $smoRestore.NoRecovery = $false;\n    $smoRestore.ReplaceDatabase = $true;\n    $smoRestore.Database = $dbName\n\n    RelocateFiles $smoRestore\n    \n    try {\n        AddPercentHandler $smoRestore \"restored\"        \n        $smoRestore.SqlRestore($server)\n    } catch {\n        Write-Error \"An error occurred restoring the database!`r`n$($_.Exception.ToString())\"\n    }\n        \n    Write-Host \"Restore completed successfully.\"\n}\n\n[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | Out-Null\n[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SmoExtended\") | Out-Null\n[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.ConnectionInfo\") | Out-Null\n[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SmoEnum\") | Out-Null\n \n$server = New-Object Microsoft.SqlServer.Management.Smo.Server $ServerName\n\nConnectToDatabase $server $SqlLogin $SqlPassword\n\n$database = $server.Databases | Where-Object { $_.Name -eq $DatabaseName }\n$timestamp = if(-not [string]::IsNullOrEmpty($Stamp)) { $Stamp } else { Get-Date -format $DateFormat }\n\nRestoreDatabase $DatabaseName $Devices",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Server",
-      "Label": "Server",
-      "HelpText": "The name of the SQL Server instance that the database resides in.",
-      "DefaultValue": ".",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Database",
-      "Label": "Database",
-      "HelpText": "The name of the database to restore.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BackupDirectory",
-      "Label": "Backup Directory",
-      "HelpText": "The backup directory to retrieve the database backup from.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SqlLogin",
-      "Label": "SQL login",
-      "HelpText": "The SQL auth login to connect with. If specified, the SQL Password must also be entered.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SqlPassword",
-      "Label": "SQL password",
-      "HelpText": "The password for the SQL auth login to connect with. Only used if SQL Login is specified.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "Compression",
-      "Label": "Compression Option",
-      "HelpText": "- 0  -   Use the default backup compression server configuration\n- 1  -   Enable the backup compression\n- 2  -   Disable the backup compression",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "0|Default\n1|Enabled\n2|Disabled"
-      }
-    },
-    {
-      "Name": "Devices",
-      "Label": "Devices",
-      "HelpText": "The number of backup devices to use for the backup.",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "1|1\n2|2\n3|3\n4|4"
-      }
-    },
-    {
-      "Name": "Stamp",
-      "Label": "Backup file suffix",
-      "HelpText": "Specify a suffix to add to the backup file names. If left blank, the current date, in the format given by the DateFormat parameter, is used.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Name": "Separator",
-      "Label": "Separator",
-      "HelpText": "Separator used between database name and suffix.",
-      "DefaultValue": "_"
-    },
-    {
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Name": "DateFormat",
-      "Label": "Date Format",
-      "HelpText": "Date format to use if backup is suffixed with a date stamp (e.g. yyyy-MM-dd)",
-      "DefaultValue": "yyyy-MM-dd"
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2016-03-24T16:32:09.272+00:00",
-    "OctopusVersion": "3.2.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
diff --git a/step-templates/sql-smo-create-login-and-user.json b/step-templates/sql-smo-create-login-and-user.json
deleted file mode 100644
index 71b4285ef..000000000
--- a/step-templates/sql-smo-create-login-and-user.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "Id": "7ed93dfa-b137-4341-9c6c-84fa0565d865",
-  "Name": "SQL - Create Database Login and User using SMO",
-  "Description": "Requires SMO to be installed on the machine where this step will be run.",
-  "ActionType": "Octopus.Script",
-  "Version": 9,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName('Microsoft.SqlServer.SMO') | out-null\r\n\r\ntry\r\n{\r\n    $server = New-Object ('Microsoft.SqlServer.Management.Smo.Server') $SMO_SqlServer\r\n    \r\n    $server.ConnectionContext.LoginSecure = $true\r\n\r\n    if(!$server.Databases.Contains($SMO_SqlDatabase))\r\n    {\r\n        throw \"Server $SMO_SqlServer does not contain a database named $SMO_SqlDatabase\"\r\n    }\r\n\r\n    if ($server.Logins.Contains($SMO_LoginName))\r\n    {\r\n        Write-Host \"Login $SMO_LoginName already exists in the server $SMO_SqlServer\"\r\n    }\r\n    else\r\n    {\r\n        Write-Host \"Login $SMO_LoginName does not exist, creating\"\r\n        $login = New-Object -TypeName Microsoft.SqlServer.Management.Smo.Login -ArgumentList $SMO_SqlServer, $SMO_LoginName\r\n        $login.LoginType = [Microsoft.SqlServer.Management.Smo.LoginType]::WindowsUser\r\n        $login.PasswordExpirationEnabled = $false\r\n        $login.Create()\r\n        Write-Host \"Login $SMO_LoginName created successfully.\"\r\n    }\r\n\r\n    $database = $server.Databases[$SMO_SqlDatabase]\r\n\r\n    if ($database.Users[$SMO_LoginName])\r\n    {\r\n        Write-Host \"User $SMO_LoginName already exists in the database $SMO_SqlDatabase\"\r\n    }\r\n    else\r\n    {\r\n        Write-Host \"User $SMO_LoginName does not exist in the database $SMO_SqlDatabase, creating.\"\r\n        $dbUser = New-Object -TypeName Microsoft.SqlServer.Management.Smo.User -ArgumentList $database, $SMO_LoginName\r\n        $dbUser.Login = $SMO_LoginName\r\n        $dbUser.Create()\r\n        Write-Host \"User $SMO_LoginName created successfully in the database $SMO_SqlDatabase.\"\r\n    }\r\n\r\n    if($SMO_SqlRole -ne $null)\r\n    {\r\n        $SMO_SqlRoles = $SMO_SqlRole.Split(\",\")\r\n            \r\n        # Remove the user from any roles which aren't specified in the $SMO_SqlRole parameter if they are a member\r\n        $database.Users[$SMO_LoginName].EnumRoles() | ForEach {\r\n            if (!$SMO_SqlRoles.Contains($_)) {\r\n                $dbRole = $database.Roles[$_]\r\n                $dbRole.DropMember($SMO_LoginName)\r\n                $dbRole.Alter()\r\n                Write-Host \"User $SMO_LoginName removed from $_ role in the database $SMO_SqlDatabase.\"\r\n            }\r\n        }\r\n            \r\n        # Add the user to any roles which are specified in the $SMO_SqlRole parameter if they are not already a member\r\n        $SMO_SqlRoles | ForEach {\r\n            $dbRole = $database.Roles[$_]\r\n            if(!$dbRole)  { throw \"Database $SMO_SqlDatabase does not contain a role named $_\" }\r\n\r\n            if (!$dbRole.EnumMembers().Contains($SMO_LoginName))\r\n            {\r\n                $dbRole.AddMember($SMO_LoginName)\r\n                $dbRole.Alter()\r\n                Write-Host \"User $SMO_LoginName successfully added to $_ role in the database $SMO_SqlDatabase.\"\r\n            }\r\n        }\r\n    }\r\n}\r\ncatch\r\n{\r\n    $error[0] | format-list -force\r\n    Exit 1\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Id": "24633e35-94cb-4b69-befe-0ef2616c3071",
-      "Name": "SMO_SqlServer",
-      "Label": "Database Server Name",
-      "HelpText": "Name of the to create the login for.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b79baa48-af97-4ee0-bf79-822fbd529636",
-      "Name": "SMO_SqlDatabase",
-      "Label": "Database Name",
-      "HelpText": "Name of the database. The created Login and User will get the role dbowner by defaultfor this database.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d189015a-237d-46eb-839b-84c3572c40d1",
-      "Name": "SMO_LoginName",
-      "Label": "Windows Login Name",
-      "HelpText": "The login name to create a login and user in the database for. In our projects we use integrated security - you should too.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9bf187dd-bcf1-4fba-a5b0-2bcddde7ef73",
-      "Name": "SMO_SqlRole",
-      "Label": "Database Role Names",
-      "HelpText": "We default to `db_owner`, you might want to change this to suit your needs. You may specify multiple roles separated by a comma (e.g. `db_datareader,db_datawriter`)",
-      "DefaultValue": "db_owner",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2022-08-30T13:37:42.214+00:00",
-  "LastModifiedBy": "thomasdc",
-  "$Meta": {
-    "ExportedAt": "2022-08-30T13:37:42.214Z",
-    "OctopusVersion": "3.12.5",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
diff --git a/step-templates/sql-update-job.json b/step-templates/sql-update-job.json
deleted file mode 100644
index 2a376881c..000000000
--- a/step-templates/sql-update-job.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "Id": "91bbd24f-8975-4d0e-9f55-736587f945e9",
-    "Name": "SQL - Update Job",
-    "Description": "Updates a MS SQL server job with provided ID to be enabled or disabled",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "false",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "param(\n    [string]$ConnectionString,\n    [string]$JobId,\n    [string]$JobName,\n    [string]$JobStatus\n)\n\n$ErrorActionPreference = \"Stop\"\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Execute-SqlQuery($query) {\n    $queries = [System.Text.RegularExpressions.Regex]::Split($query, \"^\\s*GO\\s*$$\", [System.Text.RegularExpressions.RegexOptions]::IgnoreCase -bor [System.Text.RegularExpressions.RegexOptions]::Multiline)\n\n    $queries | ForEach-Object {\n        $q = $_\n        if (!(StringIsNullOrWhitespace($q)) -and ($q.Trim().ToLowerInvariant() -ne \"go\")) {\n            $command = $connection.CreateCommand()\n            $command.CommandText = $q\n            $command.ExecuteNonQuery() | Out-Null\n        }\n    }\n}\n\n& {\n    param(\n        [string]$ConnectionString,\n        [string]$JobId,\n        [string]$JobName,\n        [string]$JobStatus\n    )\n\n    $jobStatusText = ''\n    if ($JobStatus -eq '1') {\n        $jobStatusText = \"Enabling\"\n    } elseif ($JobStatus -eq '0') {\n        $jobStatusText = \"Disabling\"\n    }\n\n    $jobDisplayName = ''\n    if ($JobName) {\n        $jobDisplayName = $JobName\n    } else {\n    \t$jobDisplayName = $JobId\n    }\n\n    Write-Highlight \"$jobStatusText SQL Server job: [$jobDisplayName]\"\n    Write-Verbose \"SQL Server Job Id: [$JobId]\"\n\n    $query = @\"\nGO\nUSE [msdb]\nGO\nEXEC msdb.dbo.sp_update_job @job_id=N'$JobId', @enabled=$JobStatus\nGO\n\"@\n\n\t$connection = New-Object System.Data.SqlClient.SqlConnection\n    $connection.ConnectionString = $ConnectionString\n    Register-ObjectEvent -inputobject $connection -eventname InfoMessage -action {\n        write-host $event.SourceEventArgs\n    } | Out-Null\n\n    Write-Verbose \"Connecting\"\n    try {\n        $connection.Open()\n\n        Write-Verbose \"Executing script\"\n        Write-Verbose $query\n        Execute-SqlQuery -query $query\n    }\n    catch [Exception]\n    {\n        Write-Verbose $_.Exception|format-list -force\n        throw $_\n    }\n    finally {\n        Write-Verbose \"Closing connection\"\n        $connection.Dispose()\n    }\n\n  } `\n   (Get-Param 'ConnectionString' -Required) `\n   (Get-Param 'JobId' -Required) `\n   (Get-Param 'JobName') `\n   (Get-Param 'JobStatus' -Required)"
-    },
-    "Parameters": [
-      {
-        "Id": "41a33da5-012d-4871-a3e8-983fa4a5dcbe",
-        "Name": "JobId",
-        "Label": "Job Id",
-        "HelpText": "The SQL server job id which is a `GUID`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ba6bdd3b-ebfb-4c47-b214-f95044c8460e",
-        "Name": "JobName",
-        "Label": "Job name",
-        "HelpText": "Optional job name to show on the logs instead of JobId",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "a2ea4eca-77e3-4733-9714-9fa2b87929e7",
-        "Name": "JobStatus",
-        "Label": "Job Status",
-        "HelpText": "Choose `Enable` to enable the job, and `Disabled` to disable the job",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "0|Disabled\n1|Enabled"
-        }
-      },
-      {
-        "Id": "0bdc16b0-0086-4597-9dcd-970ddbdda258",
-        "Name": "ConnectionString",
-        "Label": "ConnectionString",
-        "HelpText": "The connection string to connect to the target SQL Server",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-11-20T12:26:07.817Z",
-      "OctopusVersion": "2020.4.0",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "aqovia",
-    "Category": "sql"
-  }
\ No newline at end of file
diff --git a/step-templates/sqlazure-restore-database-from-azure-storage.json b/step-templates/sqlazure-restore-database-from-azure-storage.json
deleted file mode 100644
index 4819b89a5..000000000
--- a/step-templates/sqlazure-restore-database-from-azure-storage.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "Id": "6936e720-17a2-4a17-97d6-8f19ee040b01",
-  "Name": "SQLAzure - Restore a SQL Azure database from a .bacpac located in Azure Storage",
-  "Description": "Given an existing [.bacpac](https://msdn.microsoft.com/en-us/library/azure/hh335292.aspx) in Azure Storage this template restores a SQL Azure database.\n\n**Note** - The storage account used needs to reside in the the same subscription as the SQL Azure Server.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#Check for the PowerShell cmdlets\ntry{ \n    Import-Module Azure -ErrorAction Stop\n}catch{\n    \n    $azureServiceModulePath = \"C:\\Program Files (x86)\\Microsoft SDKs\\Azure\\PowerShell\\ServiceManagement\\Azure\\Azure.psd1\"\n    Write-Output \"Unable to find the module checking $azureServiceModulePath\" \n    \n    try{\n        Import-Module $azureServiceModulePath\n        \n    }\n    catch{\n        throw \"Windows Azure PowerShell not found! Please make sure to install them from http://www.windowsazure.com/en-us/downloads/#cmd-line-tools\" \n    }\n}\n\nfunction Set-TempAzureSubscription{\n    param(   \n        [Parameter(Mandatory=$true)][string] $subscriptionId,\n        [Parameter(Mandatory=$true)][string] $subscriptionName,\n        [Parameter(Mandatory=$true)][string] $managementCertificate\n    )\n\n    #Ensure no other subscriptions or accounts    \n    Get-AzureSubscription | ForEach-Object { \n        $id = $_.SubscriptionId \n        Write-Output \"Removing Subscription $id\"\n        Remove-AzureSubscription -SubscriptionId $id -Force\n    }\n\n    #Ensure there are no other \n    Get-AzureAccount | ForEach-Object { Remove-AzureAccount $_.ID -Force }\n   \n    [byte[]]$certificateData = [System.Convert]::FromBase64String($managementCertificate)\n    $certificate = [System.Security.Cryptography.X509Certificates.X509Certificate2] $certificateData\n\n    Set-AzureSubscription -Certificate $certificate -SubscriptionId $subscriptionId -SubscriptionName $subscriptionName\n    Select-AzureSubscription $subscriptionName\n\n    Write-Output \"Azure Subscription set Id: $subscriptionId Name: $subscriptionName \"\n\n    $subscription = Get-AzureSubscription -Current\n\n    return  $subscription\n}\n\n\nfunction Restore-SqlAzureDatabase{\n    Param(    \n    [Parameter(Mandatory=$true)][string]$databaseServerName,\n    [Parameter(Mandatory=$true)][string]$databaseName,\n    [Parameter(Mandatory=$true)][string]$edition,\n    [Parameter(Mandatory=$true)][string]$serviceObjectiveName, \n    [Parameter(Mandatory=$true)][string]$storageName,\n    [Parameter(Mandatory=$true)][string]$containerName,\n    [Parameter(Mandatory=$true)][string]$sqlAdminUser,                       \n    [Parameter(Mandatory=$true)][string]$sqlAdminPassword,\n    [Parameter(Mandatory=$true)][string]$bacpacFileName,    \n    [Parameter(Mandatory=$false)][bool]$errorIfDatabaseExists=$true\n    )\n\n    $subscription = Get-AzureSubscription -Current \n         \n    $storageKey = (Get-AzureStorageKey -StorageAccountName $storageName).Primary\n    $storageCtx = New-AzureStorageContext -storageaccountname $storageName -storageaccountkey $storageKey\n    $password = $sqlAdminPassword | ConvertTo-SecureString -asPlainText -Force                                                      \n    $sqlCred = New-Object System.Management.Automation.PSCredential($sqlAdminUser,$password)\n    $sqlCtx = New-AzureSqlDatabaseServerContext -ServerName $databaseServerName -Credential $sqlCred    \n  \n    $databases = Get-AzureSqlDatabase -ServerName $databaseServerName\n\n    #Check to see there is a database on the server\n    Foreach ($d in $databases){\n        if($d.Name -eq $databaseName){\n            $database = $d\n            break\n        }    \n    }\n\n    if ($database -eq $null) {\n        Write-Output \"The SQL Azure Database: $databaseName WAS NOT found on $databaseServerName\"  \n    }\n     \n    if($database -ne $null){\n        if ($errorIfDatabaseExists -eq $true) {\n            Write-Output \"A database named $databaseName already exists. If you wish to override this database set the -errorIfDatabaseExists parameter to false.\" \n            return;\n        } else {\n            #Delete the existing database.\n            Write-Output \"The SQL Azure Database: $databaseName WAS found on $databaseServerName\"  \n            Write-Output \"WARNING! Removing SQL Azure database: $databaseName\"\n            Remove-AzureSqlDatabase -ServerName $databaseServerName -DatabaseName $databaseName -Force\n        }\n    } \n\n    Write-Output \"Starting database import...\"\n    $importRequest = Start-AzureSqlDatabaseImport -SqlConnectionContext $sqlCtx -StorageContext $storageCtx -StorageContainerName $containerName -DatabaseName $databaseName -BlobName $bacpacFileName -Edition $edition\n    \n    Write-Output \"Database import request submitted.  Request Id: $($importRequest.RequestGuid)\"  \n\n    Write-Output \"Checking import status...\"\n    $status = Get-AzureSqlDatabaseImportExportStatus -Username $sqlAdminUser -Password $sqlAdminPassword -ServerName $databaseServerName -RequestId $importRequest.RequestGuid\n    Write-Output \"Status: $($status.Status)\"\n    \n    while($status.Status.StartsWith(\"Running\") -Or $status.Status.StartsWith(\"Pending\")){\n        Start-Sleep -s 10\n        Write-Output \"Checking import status...\"  \n        $status = Get-AzureSqlDatabaseImportExportStatus -Username $sqlAdminUser -Password $sqlAdminPassword -ServerName $databaseServerName -RequestId $importRequest.RequestGuid\n        Write-Output \"Status: $($status.Status)\" \n    }\n\n    Get-AzureSqlDatabaseImportExportStatus -Username $sqlAdminUser -Password $sqlAdminPassword -ServerName $databaseServerName -RequestId $importRequest.RequestGuid   \n\n    if ($status.Status -eq \"Completed\") {\n        Write-Output \"Updating database service objective...\"\n\n        #Get the service objective.\n        $serviceObjective = Get-AzureSqlDatabaseServiceObjective -ServerName $databaseServerName -ServiceObjectiveName $serviceObjectiveName\n        Set-AzureSqlDatabase -ConnectionContext $sqlCtx -DatabaseName $databaseName -Force -ServiceObjective $serviceObjective\n        \n        Write-Output \"Updated database service objective.\" \n    }\n\n    return $importRequest\n}\n\n\n#Set the Azure Subscription\n$subscription = Set-TempAzureSubscription -managementCertificate $AzureManagementCertificate -subscriptionId $AzureSubscriptionId -subscriptionName $AzureSubscriptionName \n\nWrite-Output \"=============================================================\"\nWrite-Output \"Using SQL Azure Server $SQLAzureServerName\"\nWrite-Output \"Using Azure Storage Account: $AzureStorageAccountName\"\nWrite-Output \"Using Azure Storeage Container: $AzureStorageContainerName\"\nWrite-Output \"Using bacpac file: $BacPacFileName\"\nWrite-Output \"=============================================================\"\n\nRestore-SqlAzureDatabase -databaseServerName $SQLAzureServerName `\n    -databaseName $databaseName `\n    -edition $SQLAzureDatabaseEdition `\n    -serviceObjectiveName $SQLAzureServiceObjective `\n    -storageName $AzureStorageAccountName `\n    -containerName $AzureStorageContainerName `\n    -sqlAdminUser $SqlAzureAdminUser `\n    -sqlAdminPassword $SqlAzureAdminUserPassword `\n    -bacpacFileName $BacPacFileName `\n    -errorIfDatabaseExists $false\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "AzureManagementCertificate",
-      "Label": "The Azure management certificate associated with the subscription",
-      "HelpText": "The Azure Management Certificate that can be sourced via https://manage.windowsazure.com/publishsettings",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AzureSubscriptionId",
-      "Label": "The Azure Subscription ID",
-      "HelpText": "The Azure Subscription ID that can be sourced via the [Azure Portal](https://portal.azure.com) or https://manage.windowsazure.com/publishsettings",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AzureSubscriptionName",
-      "Label": "The Azure Subscription Name",
-      "HelpText": "The Azure Subscription Name that can be sourced via the [Azure Portal](https://portal.azure.com) or https://manage.windowsazure.com/publishsettings",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SqlAzureAdminUser",
-      "Label": "The SQL Azure Server Admin User",
-      "HelpText": "The SQL Azure Server Administrator User",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SqlAzureAdminUserPassword",
-      "Label": "The SQL Azure Admin Password",
-      "HelpText": "The SQL Azure Server Administrator Password",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "SQLAzureServerName",
-      "Label": "The SQL Azure Server",
-      "HelpText": "The name of the SQL Azure Server.  Just the server name e.g.  wyn4its2by",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "DatabaseName",
-      "Label": "The SQL Azure Database used for the  bacpac restore",
-      "HelpText": "The name of the SQL Azure Database to which you wish to restore the .bacpac file.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SQLAzureDatabaseEdition",
-      "Label": "The SQL Azure database edition to use",
-      "HelpText": "The [SQL Azure Database Edition](https://msdn.microsoft.com/en-us/library/dn546725.aspx) to use for the restore",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText",
-        "Octopus.SelectOptions": "Web|Web\nBusiness|Business"
-      }
-    },
-    {
-      "Name": "SQLAzureServiceObjective",
-      "Label": "The SQL Azure SQL Service Objective to use",
-      "HelpText": "The [SQL Azure Database Objective](https://msdn.microsoft.com/en-us/library/dn546721.aspx) for the database being restored.\n\nBasic, S0, S1, S2, P1, P2, or P3.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Basic|Basic\nS0|Standard (S0)\nS1|Standard (S1)\nS2|Standard (S2)\nS3|Standard (S3)\nP1|Premium (P1)\nP2|Premium (P2)\nP3|Premium (P3)"
-      }
-    },
-    {
-      "Name": "AzureStorageAccountName",
-      "Label": "The Azure Storage Account where the .bacpac file is located",
-      "HelpText": "The Azure Storage Account where the .bacpac file is located",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AzureStorageContainerName",
-      "Label": "The container name of the bacpac file",
-      "HelpText": "The container in Azure storage where the .bacpac file is located.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "BacPacFileName",
-      "Label": "The name of the bacpac file to restore",
-      "HelpText": "The name of the .bacpac file to restore.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2015-04-01T11:36:52.686+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/sqlserver-high-availability-group.json b/step-templates/sqlserver-high-availability-group.json
deleted file mode 100644
index 7938ef5bd..000000000
--- a/step-templates/sqlserver-high-availability-group.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Id": "735d2f76-fdbb-4232-9f36-07020cad120d",
-  "Name": "Check SQL Server in High Availability Group",
-  "Description": "Checks for SQL Node currently being serving as primary on high availability group and sets Octopus variable : SQLIsOnSecondary to true if secondary is active in High Availability Group",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "function CheckSQLServerInAOAG($SqlServer, $PrimaryNode)\r\n{\r\n    $serverConn = new-object ('Microsoft.SqlServer.Management.Common.ServerConnection') $SqlServer\r\n    \r\n    try{\r\n            $serverConn.Connect();\r\n            $server = new-object ('Microsoft.SqlServer.Management.Smo.Server') $serverConn  \r\n            if (!$server.IsHadrEnabled)\r\n            {\r\n    \t        Write-Host \"The SQL Server [$SqlServer] is not configured with High Availability Group.\"\r\n            }\r\n            else\r\n            {\r\n                # Get SQL Availability Group\r\n                $SQLAvailabilityGroup = $server.AvailabilityGroups[0]\r\n    \r\n                Write-Host \"Getting High Availability Group properties.\"\r\n                \r\n                # Get SQL Availability Groups Properties\r\n\t            $SQLAvailabilityGroupName = $SQLAvailabilityGroup.Name;\r\n\t            $SQLAvailabilityGroupID = $SQLAvailabilityGroup.Id;\r\n\t            $SQLAvailabilityGroupGuid = $SQLAvailabilityGroup.UniqueId;\r\n\t            $SQLLocalReplicaRole = $SQLAvailabilityGroup.LocalReplicaRole;\r\n\t            $SQLPrimaryReplicaServerName = $SQLAvailabilityGroup.PrimaryReplicaServerName;\r\n\t            \r\n\t            Write-Host\t\"SQLAvailabilityGroupName : $SQLAvailabilityGroupName\"\r\n                Write-Host\t\"SQLAvailabilityGroupID : $SQLAvailabilityGroupID\"\r\n                Write-Host\t\"SQLAvailabilityGroupGuid : $SQLAvailabilityGroupGuid\"\r\n                Write-Host\t\"SQLLocalReplicaRole : $SQLLocalReplicaRole\"\r\n                Write-Host\t\"SQLPrimaryReplicaServerName : $SQLPrimaryReplicaServerName\"    \r\n    \r\n                if ($SQLPrimaryReplicaServerName -eq $PrimaryNode)\r\n                {\r\n    \t            Write-Host \"Setting Octopus variable SQLIsOnSecondary false\"\r\n                    Set-OctopusVariable -name \"SQLIsOnSecondary\" -value \"false\"        \r\n                }\r\n                else \r\n                {\r\n    \t            Write-Host \"Setting Octopus variable SQLIsOnSecondary true\"\r\n    \t            Set-OctopusVariable -name \"SQLIsOnSecondary\" -value \"true\"\r\n                }\r\n            }\r\n        }\r\n        catch\r\n        {\r\n            throw \"Could not connect to server $SqlServer.  Exception is:`r`n$($_ | fl -force | out-string)\"\r\n        }\r\n        finally\r\n        {\r\n            $serverConn.Disconnect();\r\n        }\r\n}\r\n\r\n[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.SMO\") | out-null\r\n[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.ConnectionInfo\") | out-null\r\nCheckSQLServerInAOAG $HAGroupSQLServer $HAGroupPrimaryNode",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "afe518f5-5778-45b4-86c7-3715fa55b4d9",
-      "Name": "HAGroupSQLServer",
-      "Label": "Enter server name",
-      "HelpText": "SQL Server name used in connection string from website code",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "c3c49b74-9982-400d-bc8f-b292ea7b2488",
-      "Name": "HAGroupPrimaryNode",
-      "Label": "Enter primary node",
-      "HelpText": "Enter primary SQL server name which serves traffic",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "vasant-horapeti",
-  "$Meta": {
-    "ExportedAt": "2019-10-13T08:11:56.532Z",
-    "OctopusVersion": "2018.10.2",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/sqlserver-project-deployment-model-ispac-deploy.json b/step-templates/sqlserver-project-deployment-model-ispac-deploy.json
deleted file mode 100644
index 927dd9b2b..000000000
--- a/step-templates/sqlserver-project-deployment-model-ispac-deploy.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "Id": "efe39ac7-3ab8-4f99-bfdc-aba342278d1a",
-  "Name": "SQL Server - Project Deployment Model - Deploy ISPAC",
-  "Description": "This is to deploy ssis packages using 'project deployment model' (ISPAC file )",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "#################################################################################################\r\n# Change source and destination properties\r\n#################################################################################################\r\n\r\n# Source\r\n$IspacFilePath = \"#{ISPAC_FILE_PATH}\"\r\n \r\n# Destination\r\n$SsisServer =   $OctopusParameters['deploy.dts.server'] \r\n$FolderName = $OctopusParameters['SSIS_Folder']\r\n$ProjectName = $OctopusParameters['SSIS_Project']\r\n\r\n# Environment\r\n$EnvironmentName = $OctopusParameters['Environment_Name']  \r\n$EnvironmentFolderName = $OctopusParameters['SSIS_Folder']\r\n\r\n\r\n# Replace empty projectname with filename\r\nif (-not $ProjectName)\r\n{\r\n  $ProjectName = [system.io.path]::GetFileNameWithoutExtension($IspacFilePath)\r\n}\r\n# Replace empty Environment folder with project folder\r\nif (-not $EnvironmentFolderName)\r\n{\r\n  $EnvironmentFolderName = $FolderName\r\n}\r\n\r\nclear\r\nWrite-Host \"========================================================================================================================================================\"\r\nWrite-Host \"==                                                         Used parameters                                                                            ==\"\r\nWrite-Host \"========================================================================================================================================================\"\r\nWrite-Host \"Ispac File Path        : \" $IspacFilePath\r\nWrite-Host \"SSIS Server            : \" $SsisServer\r\nWrite-Host \"Project Folder Path    : \" $FolderName\r\nWrite-Host \"Project Name           : \" $ProjectName\r\nWrite-Host \"Environment Name       : \" $EnvironmentName\r\nWrite-Host \"Environment Folder Path: \" $EnvironmentFolderName\r\nWrite-Host \"========================================================================================================================================================\"\r\nWrite-Host \"\"\r\n\r\n###########################\r\n########## ISPAC ##########\r\n###########################\r\n# Check if ispac file exists\r\nif (-Not (Test-Path $IspacFilePath))\r\n{\r\n    Throw  [System.IO.FileNotFoundException] \"Ispac file $IspacFilePath doesn't exists!\"\r\n}\r\nelse\r\n{\r\n    $IspacFileName = split-path $IspacFilePath -leaf\r\n    Write-Host \"Ispac file\" $IspacFileName \"found\"\r\n}\r\n\r\n\r\n############################\r\n########## SERVER ##########\r\n############################\r\n# Load the Integration Services Assembly\r\nWrite-Host \"Connecting to server $SsisServer \"\r\n$SsisNamespace = \"Microsoft.SqlServer.Management.IntegrationServices\"\r\n[System.Reflection.Assembly]::LoadWithPartialName($SsisNamespace) | Out-Null;\r\n\r\n# Create a connection to the server\r\n$SqlConnectionstring = \"Data Source=\" + $SsisServer + \";Initial Catalog=master;Integrated Security=SSPI;\"\r\n$SqlConnection = New-Object System.Data.SqlClient.SqlConnection $SqlConnectionstring\r\n\r\n# Create the Integration Services object\r\n$IntegrationServices = New-Object $SsisNamespace\".IntegrationServices\" $SqlConnection\r\n\r\n# Check if connection succeeded\r\nif (-not $IntegrationServices)\r\n{\r\n  Throw  [System.Exception] \"Failed to connect to server $SsisServer \"\r\n}\r\nelse\r\n{\r\n   Write-Host \"Connected to server\" $SsisServer\r\n}\r\n\r\n\r\n#############################\r\n########## CATALOG ##########\r\n#############################\r\n# Create object for SSISDB Catalog\r\n$Catalog = $IntegrationServices.Catalogs[\"SSISDB\"]\r\n\r\n# Check if the SSISDB Catalog exists\r\nif (-not $Catalog)\r\n{\r\n    # Catalog doesn't exists. The user should create it manually.\r\n    # It is possible to create it, but that shouldn't be part of\r\n    # deployment of packages.\r\n    Throw  [System.Exception] \"SSISDB catalog doesn't exist. Create it manually!\"\r\n}\r\nelse\r\n{\r\n    Write-Host \"Catalog SSISDB found\"\r\n}\r\n\r\n\r\n############################\r\n########## FOLDER ##########\r\n############################\r\n# Create object to the (new) folder\r\n$Folder = $Catalog.Folders[$FolderName]\r\n\r\n# Check if folder already exists\r\nif (-not $Folder)\r\n{\r\n    # Folder doesn't exists, so create the new folder.\r\n    Write-Host \"Creating new folder\" $FolderName\r\n    $Folder = New-Object $SsisNamespace\".CatalogFolder\" ($Catalog, $FolderName, $FolderName)\r\n    $Folder.Create()\r\n}\r\nelse\r\n{\r\n    Write-Host \"Folder\" $FolderName \"found\"\r\n}\r\n\r\n\r\n#############################\r\n########## PROJECT ##########\r\n#############################\r\n# Deploying project to folder\r\nif($Folder.Projects.Contains($ProjectName)) {\r\n    Write-Host \"Deploying\" $ProjectName \"to\" $FolderName \"(REPLACE)\"\r\n}\r\nelse\r\n{\r\n    Write-Host \"Deploying\" $ProjectName \"to\" $FolderName \"(NEW)\"\r\n}\r\n# Reading ispac file as binary\r\n[byte[]] $IspacFile = [System.IO.File]::ReadAllBytes($IspacFilePath)\r\n$Folder.DeployProject($ProjectName, $IspacFile)\r\n$Project = $Folder.Projects[$ProjectName]\r\nif (-not $Project)\r\n{\r\n    # Something went wrong with the deployment\r\n    # Don't continue with the rest of the script\r\n    return \"\"\r\n}\r\n\r\n\r\n#################################\r\n########## ENVIRONMENT ##########\r\n#################################\r\n# Check if environment name is filled\r\nif (-not $EnvironmentName)\r\n{\r\n    # Kill connection to SSIS\r\n    $IntegrationServices = $null \r\n\r\n    # Stop the deployment script\r\n    Return \"Ready deploying $IspacFileName without adding environment references\"\r\n}\r\n\r\n# Create object to the (new) folder\r\n$EnvironmentFolder = $Catalog.Folders[$EnvironmentFolderName]\r\n\r\n# Check if environment folder exists\r\nif (-not $EnvironmentFolder)\r\n{\r\n  Throw  [System.Exception] \"Environment folder $EnvironmentFolderName doesn't exist\"\r\n}\r\n\r\n# Check if environment exists\r\nif(-not $EnvironmentFolder.Environments.Contains($EnvironmentName))\r\n{\r\n  Throw  [System.Exception] \"Environment $EnvironmentName doesn't exist in $EnvironmentFolderName \"\r\n}\r\nelse\r\n{\r\n    # Create object for the environment\r\n    $Environment = $Catalog.Folders[$EnvironmentFolderName].Environments[$EnvironmentName]\r\n\r\n    if ($Project.References.Contains($EnvironmentName, $EnvironmentFolderName))\r\n    {\r\n        Write-Host \"Reference to\" $EnvironmentName \"found\"\r\n    }\r\n    else\r\n    {\r\n        Write-Host \"Adding reference to\" $EnvironmentName\r\n        $Project.References.Add($EnvironmentName, $EnvironmentFolderName)\r\n        $Project.Alter() \r\n    }\r\n}\r\n\r\n\r\n########################################\r\n########## PROJECT PARAMETERS ##########\r\n########################################\r\n$ParameterCount = 0\r\n# Loop through all project parameters\r\nforeach ($Parameter in $Project.Parameters)\r\n{\r\n    # Get parameter name and check if it exists in the environment\r\n    $ParameterName = $Parameter.Name\r\n    if ($ParameterName.StartsWith(\"CM.\",\"CurrentCultureIgnoreCase\")) \r\n    { \r\n        # Ignoring connection managers \r\n    } \r\n    elseif ($ParameterName.StartsWith(\"INTERN_\",\"CurrentCultureIgnoreCase\")) \r\n    { \r\n        # Optional:\r\n        # Internal parameters are ignored (where name starts with INTERN_) \r\n        Write-Host \"Ignoring Project parameter\" $ParameterName \" (internal use only)\" \r\n    } \r\n    elseif ($Environment.Variables.Contains($Parameter.Name))\r\n    {\r\n        $ParameterCount = $ParameterCount + 1\r\n        Write-Host \"Project parameter\" $ParameterName \"connected to environment\"\r\n        $Project.Parameters[$Parameter.Name].Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, $Parameter.Name)\r\n        $Project.Alter()\r\n    }\r\n    else\r\n    {\r\n        # Variable with the name of the project parameter is not found in the environment\r\n        # Throw an exeception or remove next line to ignore parameter\r\n        Throw  [System.Exception]  \"Project parameter $ParameterName doesn't exist in environment\"\r\n    }\r\n}\r\nWrite-Host \"Number of project parameters mapped:\" $ParameterCount\r\n\r\n\r\n########################################\r\n########## PACKAGE PARAMETERS ##########\r\n########################################\r\n$ParameterCount = 0\r\n# Loop through all packages\r\nforeach ($Package in $Project.Packages)\r\n{\r\n    # Loop through all package parameters\r\n    foreach ($Parameter in $Package.Parameters)\r\n    {\r\n        # Get parameter name and check if it exists in the environment\r\n        $PackageName = $Package.Name\r\n        $ParameterName = $Parameter.Name \r\n        if ($ParameterName.StartsWith(\"CM.\",\"CurrentCultureIgnoreCase\")) \r\n        { \r\n            # Ignoring connection managers \r\n        } \r\n        elseif ($ParameterName.StartsWith(\"INTERN_\",\"CurrentCultureIgnoreCase\")) \r\n        { \r\n            # Optional:\r\n            # Internal parameters are ignored (where name starts with INTERN_) \r\n            Write-Host \"Ignoring Package parameter\" $ParameterName \" (internal use only)\" \r\n        } \r\n        elseif ($Environment.Variables.Contains($Parameter.Name))\r\n        {\r\n            $ParameterCount = $ParameterCount + 1\r\n            Write-Host \"Package parameter\" $ParameterName \"from package\" $PackageName \"connected to environment\"\r\n            $Package.Parameters[$Parameter.Name].Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, $Parameter.Name)\r\n            $Package.Alter()\r\n        }\r\n        else\r\n        {\r\n            # Variable with the name of the package parameter is not found in the environment\r\n            # Throw an exeception or remove next line to ignore parameter\r\n            Throw  [System.Exception]  \"Package parameter $ParameterName from package $PackageName doesn't exist in environment\"\r\n        }\r\n    }\r\n}\r\nWrite-Host \"Number of package parameters mapped:\" $ParameterCount\r\n\r\n\r\n###########################\r\n########## READY ##########\r\n###########################\r\n# Kill connection to SSIS\r\n$IntegrationServices = $null \r\n\r\n\r\nReturn \"Ready deploying $IspacFileName \"",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "ISPAC_FILE_PATH",
-      "Label": "Ispac file path",
-      "HelpText": "Once the SSIS project is compiled \"ispac\" file gets created, this variable must hold the path of the ispac file.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "deploy.dts.server",
-      "Label": "SSIS Server name",
-      "HelpText": "SSIS Server name where this ssis packages must be deployed.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SSIS_Folder",
-      "Label": "SSIS Folder name",
-      "HelpText": "SSIS folder name which is created under SSISDB",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SSIS_Project",
-      "Label": "Project Name",
-      "HelpText": "SSIS Project name - this is the physical folder name where the OD is referring to .",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Environment_Name",
-      "Label": "Environment Name",
-      "HelpText": "This is the environment name where variables exists.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2016-07-20T10:15:20.241+00:00",
-    "OctopusVersion": "3.3.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/ssas-deploy-from-package.json b/step-templates/ssas-deploy-from-package.json
deleted file mode 100644
index 59883a9d0..000000000
--- a/step-templates/ssas-deploy-from-package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "Id": "1409c3dd-e87d-49f1-9b4f-382af800b75d",
-  "Name": "Deploy SSAS from Package",
-  "Description": "Deploys SSAS packages using Microsoft.AnalysisServices.Deployment.exe.",
-  "ActionType": "Octopus.Script",
-  "Version": 14,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = 'Stop'\n\nfunction Confirm-Argument($name, $value) {\n    if (!$value) {\n        throw ('Missing required value for parameter ''{0}''.' -f $name)\n    }\n    return $value\n}\n\n# Returns the Microsoft.AnalysisServices.Deployment.exe path\nfunction Get-SSASexe\n{\n\t# Search for file\n    $ssasExe = Get-ChildItem -Path \"C:\\Program Files (x86)\" -Recurse | Where-Object {$_.Name -eq \"Microsoft.AnalysisServices.Deployment.exe\"}\n    \n    # Check for null\n    if ($null -eq $ssasExe)\n    {\n    \t# Display error\n        Write-Error \"Unable to find Microsoft.AnalysisServices.Deployment.exe!\"\n    }\n\n    # Check for mulitple results\n    if ($ssasExe.GetType().IsArray)\n    {\n        # Declare local variables\n        $highestVersion = $null\n        \n        # Display multiple returned\n        Write-Host \"Multiple files returned, finding highest version ...\"\n\n        # Loop through results\n        foreach ($file in $ssasExe)\n        {\n            # Check version \n            if (($null -eq $highestVersion) -or ([version]$file.VersionInfo.ProductVersion) -gt [version]$highestVersion.VersionInfo.ProductVersion)\n            {\n                # Assign it\n                $highestVersion = $file\n            }\n        }\n\n        # Overwrite original\n        $ssasExe = $highestVersion\n    }\n    \n    # Return the path\n    return $ssasExe.FullName\n}\n\n# Update Deploy xml (.deploymenttargets)\nfunction Update-Deploy {\n\t[xml]$deployContent = Get-Content $file\n\t$deployContent.DeploymentTarget.Database = $ssasDatabase \n\t$deployContent.DeploymentTarget.Server = $ssasServer\n\t$deployContent.DeploymentTarget.ConnectionString = 'DataSource=' + $ssasServer + ';Timeout=0'\n\t$deployContent.Save($file)\n}\n# Update Config xml (.configsettings)\nfunction Update-Config {\n\t[xml]$configContent = Get-Content $file\n    $configContent.ConfigurationSettings.Database.DataSources.DataSource.ConnectionString = 'Provider=SQLNCLI11.1;Data Source=' + $dbServer + ';Integrated Security=SSPI;Initial Catalog=' + $dbDatabase\n\t$configContent.Save($file)\n}\n# Update Config xml (.deploymentoptions)\nfunction Update-Option {\n\t[xml]$optionContent = Get-Content $file\n    $optionContent.DeploymentOptions.ProcessingOption = 'DoNotProcess'\n\t$optionContent.Save($file)\n}\n\n# Get arguments\n$ssasPackageStepName = Confirm-Argument 'SSAS Package Step Name' $OctopusParameters['SsasPackageStepName']\n$ssasServer = Confirm-Argument 'SSAS server name' $OctopusParameters['SsasServer']\n$ssasDatabase = Confirm-Argument 'SSAS database name' $OctopusParameters['SsasDatabase']\n$dbServer = Confirm-Argument 'SSAS source server' $OctopusParameters['SrcServer']\n$dbDatabase = Confirm-Argument 'SSAS source database' $OctopusParameters['SrcDatabase']\n\n# Set .NET CurrentDirectory to package installation path\n$installDirPathFormat = 'Octopus.Action[{0}].Output.Package.InstallationDirectoryPath' -f $ssasPackageStepName\n$installDirPath = $OctopusParameters[$installDirPathFormat]\n\nWrite-Verbose ('Setting CurrentDirectory to ''{0}''' -f $installDirPath)\n[System.Environment]::CurrentDirectory = $installDirPath\n\n# Get SSAS exe location\n$exe = Get-SSASexe\n\n$files = Get-ChildItem –Path $installDirPath\\* -Include *.deploymenttargets\nforeach ($file in $files) {\n  $name = [IO.Path]::GetFileNameWithoutExtension($file)\n\n  Write-Host 'Updating' $file\n  Update-Deploy\n  $file = $installDirPath + '\\' + $name + '.configsettings'\n  if(Test-Path $file) {\n      Write-Host 'Updating' $file\n      Update-Config\n  } else {\n    Write-Host \"Config settings doesn't exist. Skipping.\"\n  }\n  $file = $installDirPath + '\\' + $name + '.deploymentoptions'\n  Write-Host 'Updating' $file\n  Update-Option\n\n  $ssasArguments = @()\n  $ssasArguments += ('\"' + $installDirPath + '\\' + $name + '.asdatabase\"')\n  $ssasArguments += '/s:\"' + $installDirPath + '\\Log.txt\"'\n  \n  Write-Host $exe $ssasArguments\n  & $exe $ssasArguments\n  \n  # Get last exit code\n  $ssasExitCode = $LastExitcode\n  \n  # Check to make sure log file exists\n  if ((Test-Path -Path \"$installDirPath\\Log.txt\") -eq $true)\n  {\n    # Upload log as artifact\n    New-OctopusArtifact -Path \"$installDirPath\\Log.txt\" -Name \"Log.txt\"\n  }\n  else\n  {\n    # Write error\n    Write-Error \"Error: $installDirPath\\Log.txt not found!\"\n  }\n  \n  # Check the code\n  if ($ssasExitCode -ne 0)\n  {\n  \tWrite-Error \"Operation failed, see log for details.\"\n  }\n}\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "435fbf52-470d-442f-88d3-0b708dfc3657",
-      "Name": "SsasPackageStepName",
-      "Label": "",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      },
-      "Links": { }
-    },
-    {
-      "Id": "a0713297-cdeb-47cd-ac43-4bf9603c8052",
-      "Name": "SsasServer",
-      "Label": "Server",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": { }
-    },
-    {
-      "Id": "7bf5ec64-3383-40ae-935e-e78c236cdf21",
-      "Name": "SsasDatabase",
-      "Label": "Database",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": { }
-    },
-    {
-      "Id": "d7d4fcbc-d0d4-4a3b-b477-28d23fbe1f9b",
-      "Name": "SrcServer",
-      "Label": "Data Source - Server",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": { }
-    },
-    {
-      "Id": "45b60a3f-9339-4c69-bc14-df94b47be9e7",
-      "Name": "SrcDatabase",
-      "Label": "Data Source - Database",
-      "HelpText": null,
-      "DefaultValue": "Warehouse",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": { }
-    }
-  ],
-  "LastModifiedOn": "2020-09-25T23:49:43.003Z",
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2020-09-25T23:49:43.003Z",
-    "OctopusVersion": "2020.4.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/ssis-deploy-ispac-from-package-parameter.json b/step-templates/ssis-deploy-ispac-from-package-parameter.json
deleted file mode 100644
index 698a1d1af..000000000
--- a/step-templates/ssis-deploy-ispac-from-package-parameter.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-  "Id": "27567d46-b935-4ee6-8b2d-8c165edada4e",
-  "Name": "Deploy ispac SSIS project from a Package parameter",
-  "Description": "This step template will deploy SSIS ispac projects to SQL Server Integration Services Catalog.  The template uses a referenced package and is Worker compatible.\n\nThis template will install the Nuget package provider if it is not present on the machine it is running on.\n\nNOTE:  The SqlServer PowerShell module this template utilizes removed the assemblies necessary to interface with SSIS as of version 22.0.59.  Version 21.1.18256 has been pinned and will be used if the SqlServer PowerShell module is not installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 7,
-  "Author": "twerthi",
-  "Packages": [
-    {
-      "Id": "5ce9da08-a4ed-4b69-92d1-ab88c705cf08",
-      "Name": "SSIS.Template.ssisPackageId",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "SSIS.Template.ssisPackageId"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Add-TemporaryPinnedSqlServerModule\n{\n    # Define parameters\n    param(\n        $LocalModulesPath\n    )\n\n    $PowerShellModuleName = \"SqlServer\"\n    $RequiredVersion = [version]'21.1.18256'\n\n    # Check to see if the package provider has been installed\n    if ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n    {\n        # Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n\n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force -RequiredVersion $RequiredVersion -Repository \"PSGallery\"\n\n    # Display\n    Write-Output \"Saved module $PowerShellModuleName v$RequiredVersion to $LocalModulesPath\"\n\n    # Import the module\n    Import-Module -Name $PowerShellModuleName\n}\n\nFunction Remove-TemporaryPinnedSqlServerModule\n{\n    param(\n        [Parameter(Mandatory = $true)][string]$LocalModulesPath,\n        [Parameter(Mandatory = $true)][version]$PinnedVersion\n    )\n\n    try { Remove-Module SqlServer -Force -ErrorAction SilentlyContinue } catch {}\n\n    $moduleRoot = Join-Path $LocalModulesPath 'SqlServer'\n    $pinnedPath = Join-Path $moduleRoot $PinnedVersion.ToString()\n\n    if (Test-Path $pinnedPath)\n    {\n        Write-Host \"Removing temporary pinned SqlServer module folder: $pinnedPath\"\n        Remove-Item -Path $pinnedPath -Recurse -Force -ErrorAction SilentlyContinue\n    }\n\n    # Optional: remove parent if empty\n    if (Test-Path $moduleRoot)\n    {\n        $remaining = Get-ChildItem -Path $moduleRoot -Force -ErrorAction SilentlyContinue\n        if (-not $remaining)\n        {\n            Remove-Item -Path $moduleRoot -Force -ErrorAction SilentlyContinue\n        }\n    }\n}\n\nFunction Test-IntegrationServicesTypeAvailable\n{\n    # True if the IntegrationServices type resolves in this PowerShell session, else false\n    $typeName = 'Microsoft.SqlServer.Management.IntegrationServices.IntegrationServices'\n    $aqn = \"$typeName, Microsoft.SqlServer.Management.IntegrationServices\"\n\n    try\n    {\n        if ([Type]::GetType($aqn, $false)) { return $true }\n    }\n    catch {}\n\n    # Try to load assembly (strong name), may fail on some boxes\n    try { [void][Reflection.Assembly]::Load('Microsoft.SqlServer.Management.IntegrationServices') } catch {}\n\n    try\n    {\n        if ([Type]::GetType($aqn, $false)) { return $true }\n    }\n    catch {}\n\n    # Fall back to explicit GAC path load (LoadFrom) if present\n    $gacRoot = Join-Path $env:windir 'Microsoft.NET\\assembly\\GAC_MSIL\\Microsoft.SqlServer.Management.IntegrationServices'\n    if (Test-Path $gacRoot)\n    {\n        $gacDll = Get-ChildItem -Path $gacRoot -Recurse -Filter 'Microsoft.SqlServer.Management.IntegrationServices.dll' -File -ErrorAction SilentlyContinue |\n                  Sort-Object FullName -Descending |\n                  Select-Object -First 1\n\n        if ($null -eq $gacDll)\n        {\n            try\n            {\n                $asm = [Reflection.Assembly]::LoadFrom($gacDll.FullName)\n                if ($asm.GetType('Microsoft.SqlServer.Management.IntegrationServices.IntegrationServices', $false)) { return $true }\n            }\n            catch {}\n        }\n    }\n\n    try\n    {\n        if ([Type]::GetType($aqn, $false)) { return $true }\n    }\n    catch {}\n\n    return $false\n}\n\nFunction Load-SqlServerAssemblies\n{\n    # Get the folder where the SqlServer module ended up in\n    $sqlServerModulePath = [System.IO.Path]::GetDirectoryName((Get-Module SqlServer).Path)\n\n    # Loop through the assemblies\n    foreach($assemblyFile in (Get-ChildItem -Path $sqlServerModulePath -Exclude msv*.dll | Where-Object {$_.Extension -eq \".dll\"}))\n    {\n        try\n        {\n            # Only load managed .NET assemblies (native DLLs will throw)\n            [void][System.Reflection.AssemblyName]::GetAssemblyName($assemblyFile.FullName)\n\n            # Load the managed assembly\n            [Reflection.Assembly]::LoadFrom($assemblyFile.FullName) | Out-Null\n        }\n        catch [System.BadImageFormatException]\n        {\n            # Native DLL (or wrong format), skip\n        }\n    }\n}\n\nFunction Initialize-SsisDeploymentRuntime\n{\n    param(\n        [Parameter(Mandatory = $true)][string]$LocalModulesPath,\n        [Parameter(Mandatory = $true)][version]$PinnedSqlServerVersion\n    )\n\n    # Define PowerShell Modules path\n    $env:PSModulePath = \"$LocalModulesPath;$env:PSModulePath\"\n\n    $runtime = [pscustomobject]@{\n        UsedPinnedSqlServerModule = $false\n        SsisTypeAvailable         = $false\n    }\n\n    # First preference: use SSIS assemblies already available on the machine/session\n    $runtime.SsisTypeAvailable = Test-IntegrationServicesTypeAvailable\n\n    if ($runtime.SsisTypeAvailable)\n    {\n        Write-Host \"SSIS IntegrationServices type is already available.\"\n\n        # Only need a SqlServer module for cmdlets such as Invoke-Sqlcmd\n        if ($null -ne (Get-Module -ListAvailable -Name \"SqlServer\"))\n        {\n            Import-Module -Name SqlServer -ErrorAction Stop\n        }\n        else\n        {\n            Write-Output \"PowerShell module SqlServer not present, downloading temporary pinned copy for cmdlets ...\"\n            [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12\n\n            Add-TemporaryPinnedSqlServerModule -LocalModulesPath $LocalModulesPath\n\n            $manifestPath = Join-Path (Join-Path (Join-Path $LocalModulesPath 'SqlServer') $PinnedSqlServerVersion.ToString()) 'SqlServer.psd1'\n            Write-Host \"Importing pinned SqlServer module from: $manifestPath\"\n            Import-Module -Name $manifestPath -Force -DisableNameChecking -ErrorAction Stop\n\n            $runtime.UsedPinnedSqlServerModule = $true\n        }\n\n        # SSIS type already resolved, no need to bulk-load module assemblies\n        return $runtime\n    }\n\n    # Second preference: fall back to pinned SqlServer module that still contains SSIS assemblies\n    Write-Output \"SSIS IntegrationServices type not available via installed components. Downloading pinned SqlServer module $PinnedSqlServerVersion temporarily ...\"\n    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12\n\n    $manifestPath = Join-Path (Join-Path (Join-Path $LocalModulesPath 'SqlServer') $PinnedSqlServerVersion.ToString()) 'SqlServer.psd1'\n    if (-not (Test-Path $manifestPath))\n    {\n        Add-TemporaryPinnedSqlServerModule -LocalModulesPath $LocalModulesPath\n    }\n\n    Write-Host \"Importing pinned SqlServer module from: $manifestPath\"\n    Import-Module -Name $manifestPath -Force -DisableNameChecking -ErrorAction Stop\n    Load-SqlServerAssemblies\n\n    $runtime.UsedPinnedSqlServerModule = $true\n    $runtime.SsisTypeAvailable = Test-IntegrationServicesTypeAvailable\n\n    return $runtime\n}\n\nFunction Get-Catalog\n{\n    # define parameters\n    Param ($CatalogName)\n    # NOTE: using $integrationServices variable defined in main\n\n    # define working variables\n    $Catalog = $null\n    # check to see if there are any catalogs\n    if($integrationServices.Catalogs.Count -gt 0 -and $integrationServices.Catalogs[$CatalogName])\n    {\n        # get reference to catalog\n        $Catalog = $integrationServices.Catalogs[$CatalogName]\n    }\n    else\n    {\n        if((Get-CLREnabled) -eq 0)\n        {\n            if(-not $EnableCLR)\n            {\n                # throw error\n                throw \"SQL CLR is not enabled.\"\n            }\n            else\n            {\n                # display sql clr isn't enabled\n                Write-Warning \"SQL CLR is not enabled on $($sqlConnection.DataSource).  This feature must be enabled for SSIS catalogs.\"\n\n                # enabling SQLCLR\n                Write-Host \"Enabling SQL CLR ...\"\n                Enable-SQLCLR\n                Write-Host \"SQL CLR enabled\"\n            }\n        }\n\n        # Provision a new SSIS Catalog\n        Write-Host \"Creating SSIS Catalog ...\"\n\n        $Catalog = New-Object \"$ISNamespace.Catalog\" ($integrationServices, $CatalogName, $OctopusParameters['SSIS.Template.CatalogPwd'])\n        $Catalog.Create()\n    }\n\n    # return the catalog\n    return $Catalog\n}\n\nFunction Get-CLREnabled\n{\n    # define parameters\n    # Not using any parameters, but am using $sqlConnection defined in main\n\n    # define working variables\n    $Query = \"SELECT * FROM sys.configurations WHERE name = 'clr enabled'\"\n\n    # execute script\n    $CLREnabled = Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database \"master\" -Query $Query | Select value\n\n    # return value\n    return $CLREnabled.Value\n}\n\nFunction Enable-SQLCLR\n{\n    $QueryArray = \"sp_configure 'show advanced options', 1\", \"RECONFIGURE\", \"sp_configure 'clr enabled', 1\", \"RECONFIGURE \"\n    # execute script\n\n    foreach($Query in $QueryArray)\n    {\n        Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database \"master\" -Query $Query\n    }\n\n    # check that it's enabled\n    if((Get-CLREnabled) -ne 1)\n    {\n        # throw error\n        throw \"Failed to enable SQL CLR\"\n    }\n}\n\nFunction Get-Folder\n{\n    # parameters\n    Param($FolderName, $Catalog)\n\n    $Folder = $null\n    # try to get reference to folder\n\n    if(!($Catalog.Folders -eq $null))\n    {\n        $Folder = $Catalog.Folders[$FolderName]\n    }\n\n    # check to see if $Folder has a value\n    if($Folder -eq $null)\n    {\n        # display\n        Write-Host \"Folder $FolderName doesn't exist, creating folder...\"\n\n        # create the folder\n        $Folder = New-Object \"$ISNamespace.CatalogFolder\" ($Catalog, $FolderName, $FolderName)\n        $Folder.Create()\n    }\n\n    # return the folder reference\n    return $Folder\n}\n\nFunction Get-Environment\n{\n    # define parameters\n    Param($Folder, $EnvironmentName)\n\n    $Environment = $null\n    # get reference to Environment\n    if(!($Folder.Environments -eq $null) -and $Folder.Environments.Count -gt 0)\n    {\n        $Environment = $Folder.Environments[$EnvironmentName]\n    }\n\n    # check to see if it's a null reference\n    if($Environment -eq $null)\n    {\n        # display\n        Write-Host \"Environment $EnvironmentName doesn't exist, creating environment...\"\n\n        # create environment\n        $Environment = New-Object \"$ISNamespace.EnvironmentInfo\" ($Folder, $EnvironmentName, $EnvironmentName)\n        $Environment.Create()\n    }\n\n    # return the environment\n    return $Environment\n}\n\nFunction Set-EnvironmentReference\n{\n    # define parameters\n    Param($Project, $Environment, $Folder)\n\n    # get reference\n    $Reference = $null\n\n    if(!($Project.References -eq $null))\n    {\n        $Reference = $Project.References[$Environment.Name, $Folder.Name]\n    }\n\n    # check to see if it's a null reference\n    if($Reference -eq $null)\n    {\n        # display\n        Write-Host \"Project does not reference environment $($Environment.Name), creating reference...\"\n\n        # create reference\n        $Project.References.Add($Environment.Name, $Folder.Name)\n        $Project.Alter()\n    }\n}\n\nFunction Set-ProjectParametersToEnvironmentVariablesReference\n{\n    # define parameters\n    Param($Project, $Environment)\n\n    $UpsertedVariables = @()\n\n    if($Project.Parameters -eq $null)\n    {\n        Write-Host \"No project parameters exist\"\n        return\n    }\n\n    # loop through project parameters\n    foreach($Parameter in $Project.Parameters)\n    {\n        # skip if the parameter is included in custom filters\n        if ($UseCustomFilter)\n        {\n            if ($Parameter.Name -match $CustomFilter)\n            {\n                Write-Host \"- $($Parameter.Name) skipped due to CustomFilters.\"\n                continue\n            }\n        }\n\n        # Add variable to list of variable\n        $UpsertedVariables += $Parameter.Name\n\n        $Variable = $null\n        if(!($Environment.Variables -eq $null))\n        {\n            # get reference to variable\n            $Variable = $Environment.Variables[$Parameter.Name]\n        }\n\n        # check to see if variable exists\n        if($Variable -eq $null)\n        {\n            # add the environment variable\n            Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name\n\n            # get reference to the newly created variable\n            $Variable = $Environment.Variables[$Parameter.Name]\n        }\n\n        # set the environment variable value\n        Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $Parameter.Name\n    }\n\n    # alter the environment\n    $Environment.Alter()\n    $Project.Alter()\n\n    return $UpsertedVariables\n}\n\nFunction Set-PackageVariablesToEnvironmentVariablesReference\n{\n    # define parameters\n    Param($Project, $Environment)\n\n    $Variables = @()\n    $UpsertedVariables = @()\n\n    # loop through packages in project in order to store a temp collection of variables\n    foreach($Package in $Project.Packages)\n    {\n        # loop through parameters of package\n        foreach($Parameter in $Package.Parameters)\n        {\n            # add to the temporary variable collection\n            $Variables += $Parameter.Name\n        }\n    }\n\n    # loop through packages in project\n    foreach($Package in $Project.Packages)\n    {\n        # loop through parameters of package\n        foreach($Parameter in $Package.Parameters)\n        {\n            if ($UseFullyQualifiedVariableNames)\n            {\n                # Set fully qualified variable name\n                $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\")+\".\"+$Parameter.Name\n            }\n            else\n            {\n                # check if exists a variable with the same name\n                $VariableNameOccurrences = $($Variables | Where-Object { $_ -eq $Parameter.Name }).count\n                $ParameterName = $Parameter.Name\n\n                if ($VariableNameOccurrences -gt 1)\n                {\n                    $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\")+\".\"+$Parameter.Name\n                }\n            }\n\n            if ($UseCustomFilter)\n            {\n                if ($ParameterName -match $CustomFilter)\n                {\n                    Write-Host \"- $($Parameter.Name) skipped due to CustomFilters.\"\n                    continue\n                }\n            }\n\n            # get reference to variable\n            $Variable = $Environment.Variables[$ParameterName]\n\n            # Add variable to list of variable\n            $UpsertedVariables += $ParameterName\n\n            # check to see if the parameter exists\n            if(!$Variable)\n            {\n                # add the environment variable\n                Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName\n\n                # get reference to the newly created variable\n                $Variable = $Environment.Variables[$ParameterName]\n            }\n\n            # set the environment variable value\n            Set-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $ParameterName\n        }\n\n        # alter the package\n        $Package.Alter()\n    }\n\n    # alter the environment\n    $Environment.Alter()\n\n    return $UpsertedVariables\n}\n\nFunction Sync-EnvironmentVariables\n{\n    # define parameters\n    Param($Environment, $VariablesToPreserveInEnvironment)\n\n    foreach($VariableToEvaluate in $Environment.Variables)\n    {\n        if ($VariablesToPreserveInEnvironment -notcontains $VariableToEvaluate.Name)\n        {\n            Write-Host \"- Removing environment variable: $($VariableToEvaluate.Name)\"\n            $VariableToRemove = $Environment.Variables[$VariableToEvaluate.Name]\n            $Environment.Variables.Remove($VariableToRemove) | Out-Null\n        }\n    }\n\n    # alter the environment\n    $Environment.Alter()\n}\n\nFunction Add-EnvironmentVariable\n{\n    # define parameters\n    Param($Environment, $Parameter, $ParameterName)\n\n    # display\n    Write-Host \"- Adding environment variable $($ParameterName)\"\n\n    # check to see if design default value is empty or null\n    if([string]::IsNullOrEmpty($Parameter.DesignDefaultValue))\n    {\n        # give it something\n        $DefaultValue = \"\" # sensitive variables will not return anything so when trying to use the property of $Parameter.DesignDefaultValue, the Alter method will fail.\n    }\n    else\n    {\n        # take the design\n        $DefaultValue = $Parameter.DesignDefaultValue\n    }\n\n    # add variable with an initial value\n    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $DefaultValue, $Parameter.Sensitive, $Parameter.Description)\n}\n\nFunction Set-EnvironmentVariableValue\n{\n     # define parameters\n    Param($Variable, $Parameter, $ParameterName)\n\n    # check to make sure variable value is available\n    if (-not $OctopusParameters){\n        Write-Host \"[WARN] - OctopusParameters collection is empty\"\n    }\n    else\n    {\n        if($OctopusParameters.ContainsKey($ParameterName))\n        {\n            # display\n            Write-Host \"[ OK ] - $($ParameterName) updated.\"\n\n            # set the variable value\n            $Variable.Value = $OctopusParameters[\"$($ParameterName)\"]\n        }\n        else\n        {\n            # warning\n            Write-Host \"[WARN] - $($ParameterName) not in OctopusParameters collection.\"\n        }\n    }\n\n    # Set reference\n    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, \"$($ParameterName)\")\n}\n\nFunction Invoke-SsisProjectDeployment\n{\n    $LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n    $pinnedSqlServerVersion = [version]'21.1.18256'\n    $sqlConnection = $null\n    $runtime = $null\n\n    try\n    {\n        $runtime = Initialize-SsisDeploymentRuntime -LocalModulesPath $LocalModules -PinnedSqlServerVersion $pinnedSqlServerVersion\n\n        # Store the IntegrationServices Assembly namespace to avoid typing it every time\n        $ISNamespace = \"Microsoft.SqlServer.Management.IntegrationServices\"\n\n        # ensure all boolean variables are true booleans\n        $EnableCLR = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.EnableCLR'])\")\n        $UseEnvironment = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.UseEnvironment'])\")\n        $ReferenceProjectParametersToEnvironmentVairables = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.ReferenceProjectParametersToEnvironmentVairables'])\")\n\n        $ReferencePackageParametersToEnvironmentVairables = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.ReferencePackageParametersToEnvironmentVairables'])\")\n        $UseFullyQualifiedVariableNames = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.UseFullyQualifiedVariableNames'])\")\n        $SyncEnvironment = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.SyncEnvironment'])\")\n        # custom names for filtering out the excluded variables by design\n        $UseCustomFilter = [System.Convert]::ToBoolean(\"$($OctopusParameters['SSIS.Template.UseCustomFilter'])\")\n        $CustomFilter = [System.Convert]::ToString(\"$($OctopusParameters['SSIS.Template.CustomFilter'])\")\n        # list of variables names to keep in target environment\n        $VariablesToPreserveInEnvironment = @()\n        $ssisPackageId = $OctopusParameters['SSIS.Template.ssisPackageId']\n\n        # Get the extracted path\n        $DeployedPath = $OctopusParameters[\"Octopus.Action.Package[$ssisPackageId].ExtractedPath\"]\n\n        # Get all .ispac files from the deployed path\n        $IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where {$_.Extension.ToLower() -eq \".ispac\"}\n\n        # display number of files\n        Write-Host \"$($IsPacFiles.Count) .ispac file(s) found.\"\n\n        Write-Host \"Connecting to server ...\"\n\n        # Create a connection to the server\n        $sqlConnectionString = \"Data Source=$($OctopusParameters['SSIS.Template.ServerName']);Initial Catalog=SSISDB;\"\n\n        if (![string]::IsNullOrEmpty($OctopusParameters['SSIS.Template.sqlAccountUsername']) -and ![string]::IsNullOrEmpty($OctopusParameters['SSIS.Template.sqlAccountPassword']))\n        {\n            # Add username and password to connection string\n            $sqlConnectionString += \"User ID=$($OctopusParameters['SSIS.Template.sqlAccountUsername']); Password=$($OctopusParameters['SSIS.Template.sqlAccountPassword']);\"\n        }\n        else\n        {\n            # Use integrated\n            $sqlConnectionString += \"Integrated Security=SSPI;\"\n        }\n\n        # Create new connection object with connection string\n        $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString\n\n        # create integration services object\n        $integrationServices = New-Object \"$ISNamespace.IntegrationServices\" $sqlConnection\n\n        # get reference to the catalog\n        Write-Host \"Getting reference to catalog $($OctopusParameters['SSIS.Template.CataLogName'])\"\n        $Catalog = Get-Catalog -CatalogName $OctopusParameters['SSIS.Template.CataLogName']\n\n        # get folder reference\n        $Folder = Get-Folder -FolderName $OctopusParameters['SSIS.Template.FolderName'] -Catalog $Catalog\n\n        # loop through ispac files\n        foreach($IsPacFile in $IsPacFiles)\n        {\n            # read project file\n            $ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)\n            $ProjectName = $IsPacFile.Name.SubString(0, $IsPacFile.Name.LastIndexOf(\".\"))\n\n            # deploy project\n            Write-Host \"Deploying project $($IsPacFile.Name)...\"\n            $Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null\n\n            # get reference to deployed project\n            $Project = $Folder.Projects[$ProjectName]\n\n            # check to see if they want to use environments\n            if($UseEnvironment)\n            {\n                # get environment reference\n                $Environment = Get-Environment -Folder $Folder -EnvironmentName $OctopusParameters['SSIS.Template.EnvironmentName']\n\n                # set environment reference\n                Set-EnvironmentReference -Project $Project -Environment $Environment -Folder $Folder\n\n                # check to see if the user wants to convert project parameters to environment variables\n                if($ReferenceProjectParametersToEnvironmentVairables)\n                {\n                    # set environment variables\n                    Write-Host \"Referencing Project Parameters to Environment Variables...\"\n                    $VariablesToPreserveInEnvironment += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment\n                }\n\n                # check to see if the user wants to convert the package parameters to environment variables\n                if($ReferencePackageParametersToEnvironmentVairables)\n                {\n                    # set package variables\n                    Write-Host \"Referencing Package Parameters to Environment Variables...\"\n                    $VariablesToPreserveInEnvironment += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment\n                }\n\n                # Removes all unused variables from the environment\n                if ($SyncEnvironment)\n                {\n                    Write-Host \"Sync package environment variables...\"\n                    Sync-EnvironmentVariables -Environment $Environment -VariablesToPreserveInEnvironment $VariablesToPreserveInEnvironment\n                }\n            }\n        }\n    }\n\n    finally\n    {\n        # check to make sure sqlconnection isn't null\n        if($sqlConnection)\n        {\n            # check state of sqlconnection\n            if($sqlConnection.State -eq [System.Data.ConnectionState]::Open)\n            {\n                # close the connection\n                $sqlConnection.Close()\n            }\n\n            # cleanup\n            $sqlConnection.Dispose()\n        }\n\n        # cleanup temporary pinned SqlServer module only when it was actually used\n        if ($runtime -and $runtime.UsedPinnedSqlServerModule)\n        {\n            Remove-TemporaryPinnedSqlServerModule -LocalModulesPath $LocalModules -PinnedVersion $pinnedSqlServerVersion\n        }\n    }\n}\n\nInvoke-SsisProjectDeployment",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "53aa9e3e-1292-4e75-8095-3666ebd5886b",
-      "Name": "SSIS.Template.ServerName",
-      "Label": "Database server name (\\instance)",
-      "HelpText": "Name of the SQL Server you are deploying to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c0605196-f184-44f6-9b3d-c043323e017c",
-      "Name": "SSIS.Template.sqlAccountUsername",
-      "Label": "SQL Authentication Username",
-      "HelpText": "(Optional) Username of the SQL Authentication account.  Use this approach when deploying to Azure Databases with SSIS configured.  If SQL Authentication Username and Password are blank, Integrated Authentication is used.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "224b913f-657c-4d1c-a3d8-0f286203c1ec",
-      "Name": "SSIS.Template.sqlAccountPassword",
-      "Label": "SQL Authentication Password",
-      "HelpText": "(Optional) Password of the SQL Authentication account.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "0abbb06c-5f98-44d8-b20d-b811b6bf18da",
-      "Name": "SSIS.Template.EnableCLR",
-      "Label": "Enable SQL CLR",
-      "HelpText": "This will reconfigure SQL Server to enable the SQL CLR.  It is highly recommended that this be previously authorized by your Database Administrator.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "ebe9ab8b-3433-4aeb-bafb-642033a9b0a0",
-      "Name": "SSIS.Template.CatalogName",
-      "Label": "Catalog name",
-      "HelpText": "Name of the catalog to create in Integration Services Catalogs on SQL Server.  When using the GUI, this value gets hardcoded to SSISDB and cannot be changed.  It is recommended that you do not change the default value.",
-      "DefaultValue": "SSISDB",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d111401b-504f-41f4-96de-b7667fcbf990",
-      "Name": "SSIS.Template.CatalogPwd",
-      "Label": "Catalog password",
-      "HelpText": "Password to the Integration Services Catalog.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "d2fefbf6-c68f-4a66-a5d1-3beb9e51a331",
-      "Name": "SSIS.Template.FolderName",
-      "Label": "Folder name",
-      "HelpText": "Name of the folder to use within the Integration Services Catalog",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "ec3589c1-360b-44fc-a19c-f2de0f57a323",
-      "Name": "SSIS.Template.UseEnvironment",
-      "Label": "Use environment",
-      "HelpText": "This will make a project reference to the defined environment.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "718f2836-1c49-4119-a294-9b5488ead33b",
-      "Name": "SSIS.Template.EnvironmentName",
-      "Label": "Environment name",
-      "HelpText": "Name of the environment to reference the project to. If the environment doesn't exist, it will create it.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "303dd486-a389-48c2-a653-fe881c3b7d9a",
-      "Name": "SSIS.Template.ReferenceProjectParametersToEnvironmentVairables",
-      "Label": "Reference project parameters to environment variables",
-      "HelpText": "Checking this box will make Project Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects that an Octopus variable of the same name exists.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "06079e96-3c10-4137-9c99-83da2051f8be",
-      "Name": "SSIS.Template.ReferencePackageParametersToEnvironmentVairables",
-      "Label": "Reference package parameters to environment variables",
-      "HelpText": "Checking this box will make Package Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects than an Octopus variable of the same name exists.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "8c219bf1-0715-4c21-a131-f7bfb44690cd",
-      "Name": "SSIS.Template.UseFullyQualifiedVariableNames",
-      "Label": "Use Fully Qualified Variable Names",
-      "HelpText": "When true the package variables names must be represented in `dtsx_name_without_extension.variable_name`",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "6b29c969-3928-4faf-af17-0911d777d5b1",
-      "Name": "SSIS.Template.UseCustomFilter",
-      "Label": "Use Custom Filter for connection manager properties",
-      "HelpText": "Custom filter should contain the regular expression for ignoring properties when setting will occur during the auto-mapping",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "b33575e2-7246-4c04-b4fa-cd58e2b5e516",
-      "Name": "SSIS.Template.CustomFilter",
-      "Label": "Custom Filter for connection manager properties",
-      "HelpText": "Regular expression for filtering out the connection manager properties during the auto-mapping process. This string is used when `UseCustomFilter` is set to true",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "92b546d9-abf3-45e4-a61b-0315c21455df",
-      "Name": "SSIS.Template.SyncEnvironment",
-      "Label": "Clean obsolete variables from environment",
-      "HelpText": "When `true` synchronizes the environment:\n- Removes obsolete variables\n- Removes renamed variables\n- Replaces values of valid variables (also when `false`)",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "6a1fa441-9e14-4c13-b7f3-9c932d9b4e8e",
-      "Name": "SSIS.Template.ssisPackageId",
-      "Label": "Package Id",
-      "HelpText": "Id of the package to deploy, used to support deployment with Workers.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2026-03-13T09:17:00.0000000",
-    "OctopusVersion": "2025.4.10250",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "bcullman",
-  "Category": "sql"
-}
diff --git a/step-templates/ssis-deploy-ispac-from-package.json b/step-templates/ssis-deploy-ispac-from-package.json
deleted file mode 100644
index 72111d081..000000000
--- a/step-templates/ssis-deploy-ispac-from-package.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  "Id": "bf005449-60c2-4746-8e07-8ba857f93605",
-  "Name": "Deploy ispac SSIS project from a package",
-  "Description": "This step template will deploy SSIS ispac projects to SQL Server Integration Services Catalog",
-  "ActionType": "Octopus.Script",
-  "Version": 15,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "#region Functions\n\n#region Get-Catalog\nFunction Get-Catalog\n{\n     # define parameters\n    Param ($CatalogName)\n    # NOTE: using $integrationServices variable defined in main\n    \n    # define working varaibles\n    $Catalog = $null\n    # check to see if there are any catalogs\n    if($integrationServices.Catalogs.Count -gt 0 -and $integrationServices.Catalogs[$CatalogName])\n    {\n    \t# get reference to catalog\n    \t$Catalog = $integrationServices.Catalogs[$CatalogName]\n    }\n    else\n    {\n    \tif((Get-CLREnabled) -eq 0)\n    \t{\n    \t\tif(-not $EnableCLR)\n    \t\t{\n    \t\t\t# throw error\n    \t\t\tthrow \"SQL CLR is not enabled.\"\n    \t\t}\n    \t\telse\n    \t\t{\n    \t\t\t# display sql clr isn't enabled\n    \t\t\tWrite-Warning \"SQL CLR is not enabled on $($sqlConnection.DataSource).  This feature must be enabled for SSIS catalogs.\"\n    \n    \t\t\t# enablign SQLCLR\n    \t\t\tWrite-Host \"Enabling SQL CLR ...\"\n    \t\t\tEnable-SQLCLR\n    \t\t\tWrite-Host \"SQL CLR enabled\"\n    \t\t}\n    \t}\n    \n    \t# Provision a new SSIS Catalog\n    \tWrite-Host \"Creating SSIS Catalog ...\"\n    \n    \t$Catalog = New-Object \"$ISNamespace.Catalog\" ($integrationServices, $CatalogName, $CatalogPwd)\n    \t$Catalog.Create()\n    \n    \n    }\n    \n    # return the catalog\n    return $Catalog\n}\n#endregion\n\n#region Get-CLREnabled\nFunction Get-CLREnabled\n{\n    # define parameters\n    # Not using any parameters, but am using $sqlConnection defined in main\n    \n    # define working variables\n    $Query = \"SELECT * FROM sys.configurations WHERE name = 'clr enabled'\"\n    \n    # execute script\n    $CLREnabled = Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database \"master\" -Query $Query | Select value\n    \n    # return value\n    return $CLREnabled.Value\n}\n#endregion\n\n#region Enable-SQLCLR\nFunction Enable-SQLCLR\n{\n    $QueryArray = \"sp_configure 'show advanced options', 1\", \"RECONFIGURE\", \"sp_configure 'clr enabled', 1\", \"RECONFIGURE \"\n    # execute script\n    \n    foreach($Query in $QueryArray)\n    {\n    \tInvoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database \"master\" -Query $Query\n    }\n    \n    # check that it's enabled\n    if((Get-CLREnabled) -ne 1)\n    {\n    \t# throw error\n    \tthrow \"Failed to enable SQL CLR\"\n    }\n}\n#endregion\n\n#region Get-Folder\nFunction Get-Folder\n{\n # parameters\n    Param($FolderName, $Catalog)\n    \n    $Folder = $null\n    # try to get reference to folder\n    \n    if(!($Catalog.Folders -eq $null))\n    {\n    \t$Folder = $Catalog.Folders[$FolderName]\n    }\n    \n    # check to see if $Folder has a value\n    if($Folder -eq $null)\n    {\n    \t# display\n    \tWrite-Host \"Folder $FolderName doesn't exist, creating folder...\"\n    \n    \t# create the folder\n    \t$Folder = New-Object \"$ISNamespace.CatalogFolder\" ($Catalog, $FolderName, $FolderName) \n    \t$Folder.Create() \n    }\n    \n    # return the folde reference\n    return $Folder\n}\n#endregion\n\n#region Get-Environment\nFunction Get-Environment\n{\n     # define parameters\n    Param($Folder, $EnvironmentName)\n    \n    $Environment = $null\n    # get reference to Environment\n    if(!($Folder.Environments -eq $null) -and $Folder.Environments.Count -gt 0)\n    {\n    \t$Environment = $Folder.Environments[$EnvironmentName]\n    }\n    \n    # check to see if it's a null reference\n    if($Environment -eq $null)\n    {\n    \t# display\n    \tWrite-Host \"Environment $EnvironmentName doesn't exist, creating environment...\"\n    \n    \t# create environment\n    \t$Environment = New-Object \"$ISNamespace.EnvironmentInfo\" ($Folder, $EnvironmentName, $EnvironmentName)\n    \t$Environment.Create() \n    }\n    \n    # return the environment\n    return $Environment\n}\n#endregion\n\n#region Set-EnvironmentReference\nFunction Set-EnvironmentReference\n{\n     # define parameters\n    Param($Project, $Environment, $Folder)\n    \n    # get reference\n    $Reference = $null\n    \n    if(!($Project.References -eq $null))\n    {\n    \t$Reference = $Project.References[$Environment.Name, $Folder.Name]\n    \n    }\n    \n    # check to see if it's a null reference\n    if($Reference -eq $null)\n    {\n    \t# display\n    \tWrite-Host \"Project does not reference environment $($Environment.Name), creating reference...\"\n    \n    \t# create reference\n    \t$Project.References.Add($Environment.Name, $Folder.Name)\n    \t$Project.Alter() \n    }\n}\n#endregion\n\n#region Set-ProjectParametersToEnvironmentVariablesReference\nFunction Set-ProjectParametersToEnvironmentVariablesReference\n{\n     # define parameters\n    Param($Project, $Environment)\n    \n    $UpsertedVariables = @()\n\n    if($Project.Parameters -eq $null)\n    {\n        Write-Host \"No project parameters exist\"\n        return\n    }\n\n    # loop through project parameters\n    foreach($Parameter in $Project.Parameters)\n    {\n        # skip if the parameter is included in custom filters\n        if ($UseCustomFilter) \n        {\n            if ($Parameter.Name -match $CustomFilter)\n            {\n                Write-Host \"- $($Parameter.Name) skipped due to CustomFilters.\"            \n                continue\n            }\n        }\n\n        # Add variable to list of variable\n        $UpsertedVariables += $Parameter.Name\n\n        $Variable = $null\n        if(!($Environment.Variables -eq $null))\n        {\n    \t    # get reference to variable\n    \t    $Variable = $Environment.Variables[$Parameter.Name]\n        }\n    \n    \t# check to see if variable exists\n    \tif($Variable -eq $null)\n    \t{\n    \t\t# add the environment variable\n    \t\tAdd-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name\n    \n    \t\t# get reference to the newly created variable\n    \t\t$Variable = $Environment.Variables[$Parameter.Name]\n    \t}\n    \n    \t# set the environment variable value\n    \tSet-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $Parameter.Name\n    }\n    \n    # alter the environment\n    $Environment.Alter()\n    $Project.Alter()\n\n    return $UpsertedVariables\n}\n#endregion\n\nFunction Set-PackageVariablesToEnvironmentVariablesReference\n{\n    # define parameters\n    Param($Project, $Environment)\n\n    $Variables = @()\n    $UpsertedVariables = @()\n\n    # loop through packages in project in order to store a temp collection of variables\n    foreach($Package in $Project.Packages)\n    {\n    \t# loop through parameters of package\n    \tforeach($Parameter in $Package.Parameters)\n    \t{\n    \t\t# add to the temporary variable collection\n    \t\t$Variables += $Parameter.Name\n    \t}\n    }\n\n    # loop through packages in project\n    foreach($Package in $Project.Packages)\n    {\n    \t# loop through parameters of package\n    \tforeach($Parameter in $Package.Parameters)\n    \t{\n            if ($UseFullyQualifiedVariableNames)\n            {\n                # Set fully qualified variable name\n                $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\")+\".\"+$Parameter.Name\n            }\n            else\n            {\n                # check if exists a variable with the same name\n                $VariableNameOccurrences = $($Variables | Where-Object { $_ -eq $Parameter.Name }).count\n                $ParameterName = $Parameter.Name\n                \n                if ($VariableNameOccurrences -gt 1)\n                {\n                    $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\")+\".\"+$Parameter.Name\n                }\n            }\n            \n            if ($UseCustomFilter)\n            {\n                if ($ParameterName -match $CustomFilter)\n                {\n                    Write-Host \"- $($Parameter.Name) skipped due to CustomFilters.\"            \n                    continue\n                }\n            }\n\n            # get reference to variable\n    \t\t$Variable = $Environment.Variables[$ParameterName]\n\n            # Add variable to list of variable\n            $UpsertedVariables += $ParameterName\n\n            # check to see if the parameter exists\n    \t\tif(!$Variable)\n    \t\t{\n    \t\t\t# add the environment variable\n    \t\t\tAdd-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName\n    \n    \t\t\t# get reference to the newly created variable\n    \t\t\t$Variable = $Environment.Variables[$ParameterName]\n    \t\t}\n    \n    \t\t# set the environment variable value\n    \t\tSet-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $ParameterName\n    \t}\n    \n    \t# alter the package\n    \t$Package.Alter()\n    }\n    \n    # alter the environment\n    $Environment.Alter()\n\n    return $UpsertedVariables\n}\n\nFunction Sync-EnvironmentVariables\n{\n    # define parameters\n    Param($Environment, $VariablesToPreserveInEnvironment)\n\n    foreach($VariableToEvaluate in $Environment.Variables)\n    {\n        if ($VariablesToPreserveInEnvironment -notcontains $VariableToEvaluate.Name)\n        {\n            Write-Host \"- Removing environment variable: $($VariableToEvaluate.Name)\"\n            $VariableToRemove = $Environment.Variables[$VariableToEvaluate.Name]\n            $Environment.Variables.Remove($VariableToRemove) | Out-Null\n        }\n    }\n\n    # alter the environment\n    $Environment.Alter()\n}\n\n#region Add-EnvironmentVariable\nFunction Add-EnvironmentVariable\n{\n    # define parameters\n    Param($Environment, $Parameter, $ParameterName)\n    \n    # display \n    Write-Host \"- Adding environment variable $($ParameterName)\"\n    \n    # check to see if design default value is emtpy or null\n    if([string]::IsNullOrEmpty($Parameter.DesignDefaultValue))\n    {\n    \t# give it something\n    \t$DefaultValue = \"\" # sensitive variables will not return anything so when trying to use the property of $Parameter.DesignDefaultValue, the Alter method will fail.\n    }\n    else\n    {\n    \t# take the design\n    \t$DefaultValue = $Parameter.DesignDefaultValue\n    }\n    \n    # add variable with an initial value\n    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $DefaultValue, $Parameter.Sensitive, $Parameter.Description)\n}\n#endregion\n\n#region Set-EnvironmentVariableValue\nFunction Set-EnvironmentVariableValue\n{\n     # define parameters\n    Param($Variable, $Parameter, $ParameterName)\n\n    # check to make sure variable value is available\n    if($OctopusParameters -and $OctopusParameters.ContainsKey($ParameterName))\n    {\n        # display \n        Write-Host \"- Updating environment variable $($ParameterName)\"\n\n    \t# set the variable value\n    \t$Variable.Value = $OctopusParameters[\"$($ParameterName)\"]\n    }\n    else\n    {\n    \t# warning\n    \tWrite-Host \"**- OctopusParameters collection is empty or $($ParameterName) not in the collection -**\"\n    }\n    \n    # Set reference\n    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, \"$($ParameterName)\")\n}\n#endregion\n\n\n#endregion\n\n#region Dependent assemblies\n\n# Load the IntegrationServices Assembly\n[Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.Management.IntegrationServices\") | Out-Null # Out-Null supresses a message that would normally be displayed saying it loaded out of GAC\n\n# Store the IntegrationServices Assembly namespace to avoid typing it every time\n$ISNamespace = \"Microsoft.SqlServer.Management.IntegrationServices\"\n\n#endregion\n\n#region Main\ntry\n{\n\t# ensure all boolean variables are true booleans\n    $EnableCLR = [System.Convert]::ToBoolean(\"$EnableCLR\")\n    $UseEnvironment = [System.Convert]::ToBoolean(\"$UseEnvironment\")\n    $ReferenceProjectParametersToEnvironmentVairables = [System.Convert]::ToBoolean(\"$ReferenceProjectParametersToEnvironmentVairables\")\n    Write-Host \"Value is $ReferencePackageParametersToEnvironmentVairables\"\n    $ReferencePackageParametersToEnvironmentVairables = [System.Convert]::ToBoolean(\"$ReferencePackageParametersToEnvironmentVairables\")\n    $UseFullyQualifiedVariableNames = [System.Convert]::ToBoolean(\"$UseFullyQualifiedVariableNames\")\n    $SyncEnvironment = [System.Convert]::ToBoolean(\"$SyncEnvironment\")\n    # custom names for filtering out the excluded variables by design\n    $UseCustomFilter = [System.Convert]::ToBoolean(\"$UseCustomFilter\")\n    $CustomFilter = [System.Convert]::ToString(\"$CustomFilter\")\n    # list of variables names to keep in target environment\n    $VariablesToPreserveInEnvironment = @()\n        \n    # Get file path where Octopus deployed it\n    $DeployedPath = $OctopusParameters[\"Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath\"]\n\n    \n    # display the path where it's referencing\n    Write-Host \"Package deployed to $DeployedPath\"\n\n\t# Get all .ispac files from the deployed path\n\t$IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where {$_.Extension.ToLower() -eq \".ispac\"}\n\n\t# display number of files\n\tWrite-Host \"$($IsPacFiles.Count) .ispac file(s) found.\"\n\n\tWrite-Host \"Connecting to server ...\"\n\n\t# Create a connection to the server\n    $sqlConnectionString = \"Data Source=$ServerName;Initial Catalog=master;Integrated Security=SSPI;\"\n    $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString\n\n\t# create integration services object\n\t$integrationServices = New-Object \"$ISNamespace.IntegrationServices\" $sqlConnection\n\n\t# get reference to the catalog\n\tWrite-Host \"Getting reference to catalog $CataLogName\"\n\t$Catalog = Get-Catalog -CatalogName $CataLogName\n\n\t# get folder reference\n\t$Folder = Get-Folder -FolderName $FolderName -Catalog $Catalog\n\n\t# loop through ispac files\n\tforeach($IsPacFile in $IsPacFiles)\n\t{\n\t\t# read project file\n\t\t$ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)\n\n\t\t# deploy project\n\t\tWrite-Host \"Deploying project $($IsPacFile.Name)...\"\n\t\t$Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null\n\n\t\t# get reference to deployed project\n\t\t$Project = $Folder.Projects[$ProjectName]\n\n\t\t# check to see if they want to use environments\n\t\tif($UseEnvironment)\n\t\t{\n\t\t\t# get environment reference\n\t\t\t$Environment = Get-Environment -Folder $Folder -EnvironmentName $EnvironmentName\n\n\t\t\t# set environment reference\n\t\t\tSet-EnvironmentReference -Project $Project -Environment $Environment -Folder $Folder\n\n\t\t\t# check to see if the user wants to convert project parameters to environment variables\n\t\t\tif($ReferenceProjectParametersToEnvironmentVairables)\n\t\t\t{\n\t\t\t\t# set environment variables\n\t\t\t\tWrite-Host \"Referencing Project Parameters to Environment Variables...\"\n\t\t\t\t$VariablesToPreserveInEnvironment += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment\n\t\t\t}\n\n\t\t\t# check to see if the user wants to convert the package parameters to environment variables\n\t\t\tif($ReferencePackageParametersToEnvironmentVairables)\n\t\t\t{\n\t\t\t\t# set package variables\n\t\t\t\tWrite-Host \"Referencing Package Parameters to Environment Variables...\"\n\t\t\t\t$VariablesToPreserveInEnvironment += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment\n\t\t\t}\n            \n            # Removes all unused variables from the environment\n            if ($SyncEnvironment)\n            {\n                Write-Host \"Sync package environment variables...\"\n                Sync-EnvironmentVariables -Environment $Environment -VariablesToPreserveInEnvironment $VariablesToPreserveInEnvironment\n            }\n\t\t}\n\t}\n}\n\nfinally\n{\n\t# check to make sure sqlconnection isn't null\n\tif($sqlConnection)\n\t{\n\t\t# check state of sqlconnection\n\t\tif($sqlConnection.State -eq [System.Data.ConnectionState]::Open)\n\t\t{\n\t\t\t# close the connection\n\t\t\t$sqlConnection.Close()\n\t\t}\n\n\t\t# cleanup\n\t\t$sqlConnection.Dispose()\n\t}\n}\n#endregion\n",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "da92ad6a-23ac-4f24-b243-b42507737422",
-      "Name": "ServerName",
-      "Label": "Database server name (\\instance)",
-      "HelpText": "Name of the SQL Server you are deploying to.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a3e3e7e5-aa53-429c-b63b-166ddc875e45",
-      "Name": "EnableCLR",
-      "Label": "Enable SQL CLR",
-      "HelpText": "This will reconfigure SQL Server to enable the SQL CLR.  It is highly recommended that this be previously authorized by your Database Administrator.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "bb659731-de74-470b-94fe-24b61e27e176",
-      "Name": "CatalogName",
-      "Label": "Catalog name",
-      "HelpText": "Name of the catalog to create in Integration Services Catalogs on SQL Server.  When using the GUI, this value gets hardcoded to SSISDB and cannot be changed.  It is recommended that you do not change the default value.",
-      "DefaultValue": "SSISDB",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "af66e1ad-3631-4d4b-99d4-215a1b2beb9d",
-      "Name": "CatalogPwd",
-      "Label": "Catalog password",
-      "HelpText": "Password to the Integration Services Catalog.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "db080c05-a746-4c27-b964-d98b63b00a29",
-      "Name": "FolderName",
-      "Label": "Folder name",
-      "HelpText": "Name of the folder to use within the Integration Services Catalog",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c6264016-2c14-4e24-949c-d8a9d73599ac",
-      "Name": "ProjectName",
-      "Label": "Project name",
-      "HelpText": "Name of the project within the folder of the Integration Services catalog",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "f628a71c-5399-4137-926b-3c8d170ba61c",
-      "Name": "UseEnvironment",
-      "Label": "Use environment",
-      "HelpText": "This will make a project reference to the defined environment.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "66eee7ee-7f89-4675-a32a-f33dac895311",
-      "Name": "EnvironmentName",
-      "Label": "Environment name",
-      "HelpText": "Name of the environment to reference the project to. If the environment doesn't exist, it will create it.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a014a370-9b9d-4284-b6be-a603f9f97942",
-      "Name": "ReferenceProjectParametersToEnvironmentVairables",
-      "Label": "Reference project parameters to environment variables",
-      "HelpText": "Checking this box will make Project Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects that an Octopus variable of the same name exists.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "4441ed46-3cc3-42bb-9baa-5753cd4d6d5c",
-      "Name": "ReferencePackageParametersToEnvironmentVairables",
-      "Label": "Reference package parameters to environment variables",
-      "HelpText": "Checking this box will make Package Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects than an Octopus variable of the same name exists.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "3d4e78ec-fe77-4221-be40-1b3d2fbfc3c4",
-      "Name": "NugetPackageStepName",
-      "Label": "NuGet package step",
-      "HelpText": "The step that uploaded the NuGet package to the server.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "7c9d808d-60f3-4648-b8a4-e4865268740b",
-      "Name": "UseFullyQualifiedVariableNames",
-      "Label": "Use Fully Qualified Variable Names",
-      "HelpText": "When true the package variables names must be represented in `dtsx_name_without_extension.variable_name`",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "fef889a5-1f5b-48c7-bb65-2f2c3498e6cd",
-      "Name": "UseCustomFilter",
-      "Label": "Use Custom Filter for connection manager properties",
-      "HelpText": "Custom filter should contain the regular expression for ignoring properties when setting will occur during the auto-mapping",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "ebefb099-ce7a-45bf-b52a-bb8ea9915b1b",
-      "Name": "CustomFilter",
-      "Label": "Custom Filter for connection manager properties",
-      "HelpText": "Regular expression for filtering out the connection manager properties during the auto-mapping process. This string is used when `UseCustomFilter` is set to true",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "dbe29935-d3c6-4b77-b796-26347abdbf2c",
-      "Name": "SyncEnvironment",
-      "Label": "Clean obsolete variables from environment",
-      "HelpText": "When `true` synchronizes the environment:\n- Removes obsolete variables\n- Removes renamed variables\n- Replaces values of valid variables (also when `false`)",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedBy": "suxstellino",
-  "$Meta": {
-    "ExportedAt": "2019-04-18T13:43:05.493Z",
-    "OctopusVersion": "2018.10.5",
-    "Type": "ActionTemplate"
-  },  
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/ssis-deploy-ispac-from-referenced-package.json b/step-templates/ssis-deploy-ispac-from-referenced-package.json
deleted file mode 100644
index 7fc28d63b..000000000
--- a/step-templates/ssis-deploy-ispac-from-referenced-package.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-    "Id": "0c8167e9-49fe-4f2a-a007-df5ef2e63fac",
-    "Name": "Deploy ispac SSIS project from Referenced Package",
-    "Description": "This step template will deploy SSIS ispac projects to SQL Server Integration Services Catalog.  The template uses a referenced package and is Worker compatible.\n\nThis template will install the Nuget package provider if it is not present on the machine it is running on.",
-    "ActionType": "Octopus.Script",
-    "Version": 7,
-    "Author": "twerthi",
-    "Packages": [
-      {
-        "Id": "7a1f5eb6-0b6a-4319-a0e8-7b4d13ea609e",
-        "Name": "SSIS Package",
-        "PackageId": "#{ssisPackageId}",
-        "FeedId": "#{TemplatePackageFeedId}",
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True"
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "#region Functions\n\n# Define functions\nfunction Get-SqlModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Install-SqlServerPowerShellModule\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n\t# Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false)\n    {\n    \t# Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n\t# Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force -RequiredVersion \"21.1.18256\" \n\n\t# Display\n    Write-Output \"Importing module $PowerShellModuleName ...\"\n\n    # Import the module\n    Import-Module -Name $PowerShellModuleName\n}\n\nFunction Load-SqlServerAssmblies\n{\n\t# Declare parameters\n    \n\t# Get the folder where the SqlServer module ended up in\n\t$sqlServerModulePath = [System.IO.Path]::GetDirectoryName((Get-Module SqlServer).Path)\n    \n    # Loop through the assemblies\n    foreach($assemblyFile in (Get-ChildItem -Path $sqlServerModulePath -Exclude msv*.dll | Where-Object {$_.Extension -eq \".dll\"}))\n    {\n        # Load the assembly\n        [Reflection.Assembly]::LoadFile($assemblyFile.FullName) | Out-Null\n    }    \n}\n\n#region Get-Catalog\nFunction Get-Catalog\n{\n     # define parameters\n    Param ($CatalogName)\n    # NOTE: using $integrationServices variable defined in main\n    \n    # define working varaibles\n    $Catalog = $null\n    # check to see if there are any catalogs\n    if($integrationServices.Catalogs.Count -gt 0 -and $integrationServices.Catalogs[$CatalogName])\n    {\n    \t# get reference to catalog\n    \t$Catalog = $integrationServices.Catalogs[$CatalogName]\n    }\n    else\n    {\n    \tif((Get-CLREnabled) -eq 0)\n    \t{\n    \t\tif(-not $EnableCLR)\n    \t\t{\n    \t\t\t# throw error\n    \t\t\tthrow \"SQL CLR is not enabled.\"\n    \t\t}\n    \t\telse\n    \t\t{\n    \t\t\t# display sql clr isn't enabled\n    \t\t\tWrite-Warning \"SQL CLR is not enabled on $($sqlConnection.DataSource).  This feature must be enabled for SSIS catalogs.\"\n    \n    \t\t\t# enablign SQLCLR\n    \t\t\tWrite-Host \"Enabling SQL CLR ...\"\n    \t\t\tEnable-SQLCLR\n    \t\t\tWrite-Host \"SQL CLR enabled\"\n    \t\t}\n    \t}\n    \n    \t# Provision a new SSIS Catalog\n    \tWrite-Host \"Creating SSIS Catalog ...\"\n    \n    \t$Catalog = New-Object \"$ISNamespace.Catalog\" ($integrationServices, $CatalogName, $CatalogPwd)\n    \t$Catalog.Create()\n    \n    \n    }\n    \n    # return the catalog\n    return $Catalog\n}\n#endregion\n\n#region Get-CLREnabled\nFunction Get-CLREnabled\n{\n    # define parameters\n    # Not using any parameters, but am using $sqlConnection defined in main\n    \n    # define working variables\n    $Query = \"SELECT * FROM sys.configurations WHERE name = 'clr enabled'\"\n    \n    # execute script\n    $CLREnabled = Invoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database \"master\" -Query $Query | Select value\n    \n    # return value\n    return $CLREnabled.Value\n}\n#endregion\n\n#region Enable-SQLCLR\nFunction Enable-SQLCLR\n{\n    $QueryArray = \"sp_configure 'show advanced options', 1\", \"RECONFIGURE\", \"sp_configure 'clr enabled', 1\", \"RECONFIGURE \"\n    # execute script\n    \n    foreach($Query in $QueryArray)\n    {\n    \tInvoke-Sqlcmd -ServerInstance $sqlConnection.DataSource -Database \"master\" -Query $Query\n    }\n    \n    # check that it's enabled\n    if((Get-CLREnabled) -ne 1)\n    {\n    \t# throw error\n    \tthrow \"Failed to enable SQL CLR\"\n    }\n}\n#endregion\n\n#region Get-Folder\nFunction Get-Folder\n{\n # parameters\n    Param($FolderName, $Catalog)\n    \n    $Folder = $null\n    # try to get reference to folder\n    \n    if(!($Catalog.Folders -eq $null))\n    {\n    \t$Folder = $Catalog.Folders[$FolderName]\n    }\n    \n    # check to see if $Folder has a value\n    if($Folder -eq $null)\n    {\n    \t# display\n    \tWrite-Host \"Folder $FolderName doesn't exist, creating folder...\"\n    \n    \t# create the folder\n    \t$Folder = New-Object \"$ISNamespace.CatalogFolder\" ($Catalog, $FolderName, $FolderName) \n    \t$Folder.Create() \n    }\n    \n    # return the folde reference\n    return $Folder\n}\n#endregion\n\n#region Get-Environment\nFunction Get-Environment\n{\n     # define parameters\n    Param($Folder, $EnvironmentName)\n    \n    $Environment = $null\n    # get reference to Environment\n    if(!($Folder.Environments -eq $null) -and $Folder.Environments.Count -gt 0)\n    {\n    \t$Environment = $Folder.Environments[$EnvironmentName]\n    }\n    \n    # check to see if it's a null reference\n    if($Environment -eq $null)\n    {\n    \t# display\n    \tWrite-Host \"Environment $EnvironmentName doesn't exist, creating environment...\"\n    \n    \t# create environment\n    \t$Environment = New-Object \"$ISNamespace.EnvironmentInfo\" ($Folder, $EnvironmentName, $EnvironmentName)\n    \t$Environment.Create() \n    }\n    \n    # return the environment\n    return $Environment\n}\n#endregion\n\n#region Set-EnvironmentReference\nFunction Set-EnvironmentReference\n{\n     # define parameters\n    Param($Project, $Environment, $Folder)\n    \n    # get reference\n    $Reference = $null\n    \n    if(!($Project.References -eq $null))\n    {\n    \t$Reference = $Project.References[$Environment.Name, $Folder.Name]\n    \n    }\n    \n    # check to see if it's a null reference\n    if($Reference -eq $null)\n    {\n    \t# display\n    \tWrite-Host \"Project does not reference environment $($Environment.Name), creating reference...\"\n    \n    \t# create reference\n    \t$Project.References.Add($Environment.Name, $Folder.Name)\n    \t$Project.Alter() \n    }\n}\n#endregion\n\n#region Set-ProjectParametersToEnvironmentVariablesReference\nFunction Set-ProjectParametersToEnvironmentVariablesReference\n{\n     # define parameters\n    Param($Project, $Environment)\n    \n    $UpsertedVariables = @()\n\n    if($Project.Parameters -eq $null)\n    {\n        Write-Host \"No project parameters exist\"\n        return\n    }\n\n    # loop through project parameters\n    foreach($Parameter in $Project.Parameters)\n    {\n        # skip if the parameter is included in custom filters\n        if ($UseCustomFilter) \n        {\n            if ($Parameter.Name -match $CustomFilter)\n            {\n                Write-Host \"- $($Parameter.Name) skipped due to CustomFilters.\"            \n                continue\n            }\n        }\n\n        # Add variable to list of variable\n        $UpsertedVariables += $Parameter.Name\n\n        $Variable = $null\n        if(!($Environment.Variables -eq $null))\n        {\n    \t    # get reference to variable\n    \t    $Variable = $Environment.Variables[$Parameter.Name]\n        }\n    \n    \t# check to see if variable exists\n    \tif($Variable -eq $null)\n    \t{\n    \t\t# add the environment variable\n    \t\tAdd-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name\n    \n    \t\t# get reference to the newly created variable\n    \t\t$Variable = $Environment.Variables[$Parameter.Name]\n    \t}\n    \n    \t# set the environment variable value\n    \tSet-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $Parameter.Name\n    }\n    \n    # alter the environment\n    $Environment.Alter()\n    $Project.Alter()\n\n    return $UpsertedVariables\n}\n#endregion\n\nFunction Set-PackageVariablesToEnvironmentVariablesReference\n{\n    # define parameters\n    Param($Project, $Environment)\n\n    $Variables = @()\n    $UpsertedVariables = @()\n\n    # loop through packages in project in order to store a temp collection of variables\n    foreach($Package in $Project.Packages)\n    {\n    \t# loop through parameters of package\n    \tforeach($Parameter in $Package.Parameters)\n    \t{\n    \t\t# add to the temporary variable collection\n    \t\t$Variables += $Parameter.Name\n    \t}\n    }\n\n    # loop through packages in project\n    foreach($Package in $Project.Packages)\n    {\n    \t# loop through parameters of package\n    \tforeach($Parameter in $Package.Parameters)\n    \t{\n            if ($UseFullyQualifiedVariableNames)\n            {\n                # Set fully qualified variable name\n                $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\")+\".\"+$Parameter.Name\n            }\n            else\n            {\n                # check if exists a variable with the same name\n                $VariableNameOccurrences = $($Variables | Where-Object { $_ -eq $Parameter.Name }).count\n                $ParameterName = $Parameter.Name\n                \n                if ($VariableNameOccurrences -gt 1)\n                {\n                    $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\")+\".\"+$Parameter.Name\n                }\n            }\n            \n            if ($UseCustomFilter)\n            {\n                if ($ParameterName -match $CustomFilter)\n                {\n                    Write-Host \"- $($Parameter.Name) skipped due to CustomFilters.\"            \n                    continue\n                }\n            }\n\n            # get reference to variable\n    \t\t$Variable = $Environment.Variables[$ParameterName]\n\n            # Add variable to list of variable\n            $UpsertedVariables += $ParameterName\n\n            # check to see if the parameter exists\n    \t\tif(!$Variable)\n    \t\t{\n    \t\t\t# add the environment variable\n    \t\t\tAdd-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName\n    \n    \t\t\t# get reference to the newly created variable\n    \t\t\t$Variable = $Environment.Variables[$ParameterName]\n    \t\t}\n    \n    \t\t# set the environment variable value\n    \t\tSet-EnvironmentVariableValue -Variable $Variable -Parameter $Parameter -ParameterName $ParameterName\n    \t}\n    \n    \t# alter the package\n    \t$Package.Alter()\n    }\n    \n    # alter the environment\n    $Environment.Alter()\n\n    return $UpsertedVariables\n}\n\nFunction Sync-EnvironmentVariables\n{\n    # define parameters\n    Param($Environment, $VariablesToPreserveInEnvironment)\n\n    foreach($VariableToEvaluate in $Environment.Variables)\n    {\n        if ($VariablesToPreserveInEnvironment -notcontains $VariableToEvaluate.Name)\n        {\n            Write-Host \"- Removing environment variable: $($VariableToEvaluate.Name)\"\n            $VariableToRemove = $Environment.Variables[$VariableToEvaluate.Name]\n            $Environment.Variables.Remove($VariableToRemove) | Out-Null\n        }\n    }\n\n    # alter the environment\n    $Environment.Alter()\n}\n\n#region Add-EnvironmentVariable\nFunction Add-EnvironmentVariable\n{\n    # define parameters\n    Param($Environment, $Parameter, $ParameterName)\n    \n    # display \n    Write-Host \"- Adding environment variable $($ParameterName)\"\n    \n    # check to see if design default value is emtpy or null\n    if([string]::IsNullOrEmpty($Parameter.DesignDefaultValue))\n    {\n    \t# give it something\n    \t$DefaultValue = \"\" # sensitive variables will not return anything so when trying to use the property of $Parameter.DesignDefaultValue, the Alter method will fail.\n    }\n    else\n    {\n    \t# take the design\n    \t$DefaultValue = $Parameter.DesignDefaultValue\n    }\n    \n    # add variable with an initial value\n    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $DefaultValue, $Parameter.Sensitive, $Parameter.Description)\n}\n#endregion\n\n#region Set-EnvironmentVariableValue\nFunction Set-EnvironmentVariableValue\n{\n     # define parameters\n    Param($Variable, $Parameter, $ParameterName)\n\n    # check to make sure variable value is available\n    if($OctopusParameters -and $OctopusParameters.ContainsKey($ParameterName))\n    {\n        # display \n        Write-Host \"- Updating environment variable $($ParameterName)\"\n\n    \t# set the variable value\n    \t$Variable.Value = $OctopusParameters[\"$($ParameterName)\"]\n    }\n    else\n    {\n    \t# warning\n    \tWrite-Host \"**- OctopusParameters collection is empty or $($ParameterName) not in the collection -**\"\n    }\n    \n    # Set reference\n    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, \"$($ParameterName)\")\n}\n#endregion\n\n# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n\n# Check to see if SqlServer module is installed\nif ((Get-SqlModuleInstalled -PowerShellModuleName \"SqlServer\") -ne $true)\n{\n\t# Display message\n    Write-Output \"PowerShell module SqlServer not present, downloading temporary copy ...\"\n\n\t#Enable TLS 1.2 as default protocol\n\t[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12\n\n    # Download and install temporary copy\n    Install-SqlServerPowerShellModule -PowerShellModuleName \"SqlServer\" -LocalModulesPath $LocalModules\n    \n\t#region Dependent assemblies\n\tLoad-SqlServerAssmblies    \n}\nelse\n{\n\t# Load the IntegrationServices Assembly\n\t[Reflection.Assembly]::LoadWithPartialName(\"Microsoft.SqlServer.Management.IntegrationServices\") | Out-Null # Out-Null supresses a message that would normally be displayed saying it loaded out of GAC\n}\n\n#endregion\n\n# Store the IntegrationServices Assembly namespace to avoid typing it every time\n$ISNamespace = \"Microsoft.SqlServer.Management.IntegrationServices\"\n\n#endregion\n\n#region Main\ntry\n{   \n    # ensure all boolean variables are true booleans\n    $EnableCLR = [System.Convert]::ToBoolean(\"$EnableCLR\")\n    $UseEnvironment = [System.Convert]::ToBoolean(\"$UseEnvironment\")\n    $ReferenceProjectParametersToEnvironmentVairables = [System.Convert]::ToBoolean(\"$ReferenceProjectParametersToEnvironmentVairables\")\n    \n    $ReferencePackageParametersToEnvironmentVairables = [System.Convert]::ToBoolean(\"$ReferencePackageParametersToEnvironmentVairables\")\n    $UseFullyQualifiedVariableNames = [System.Convert]::ToBoolean(\"$UseFullyQualifiedVariableNames\")\n    $SyncEnvironment = [System.Convert]::ToBoolean(\"$SyncEnvironment\")\n    # custom names for filtering out the excluded variables by design\n    $UseCustomFilter = [System.Convert]::ToBoolean(\"$UseCustomFilter\")\n    $CustomFilter = [System.Convert]::ToString(\"$CustomFilter\")\n    # list of variables names to keep in target environment\n    $VariablesToPreserveInEnvironment = @()\n        \n\t# Get the extracted path\n\t$DeployedPath = $OctopusParameters[\"Octopus.Action.Package[$ssisPackageId].ExtractedPath\"]\n    \n\t# Get all .ispac files from the deployed path\n\t$IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where {$_.Extension.ToLower() -eq \".ispac\"}\n\n\t# display number of files\n\tWrite-Host \"$($IsPacFiles.Count) .ispac file(s) found.\"\n\n\tWrite-Host \"Connecting to server ...\"\n\n\t# Create a connection to the server\n    $sqlConnectionString = \"Data Source=$ServerName;Initial Catalog=SSISDB;\"\n    \n    if (![string]::IsNullOrEmpty($sqlAccountUsername) -and ![string]::IsNullOrEmpty($sqlAccountPassword))\n    {\n    \t# Add username and password to connection string\n        $sqlConnectionString += \"User ID=$sqlAccountUsername; Password=$sqlAccountPassword;\"\n    }\n    else\n    {\n    \t# Use integrated\n        $sqlConnectionString += \"Integrated Security=SSPI;\"\n    }\n    \n    \n    # Create new connection object with connection string\n    $sqlConnection = New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString\n\n\t# create integration services object\n\t$integrationServices = New-Object \"$ISNamespace.IntegrationServices\" $sqlConnection\n\n\t# get reference to the catalog\n\tWrite-Host \"Getting reference to catalog $CataLogName\"\n\t$Catalog = Get-Catalog -CatalogName $CataLogName\n\n\t# get folder reference\n\t$Folder = Get-Folder -FolderName $FolderName -Catalog $Catalog\n\n\t# loop through ispac files\n\tforeach($IsPacFile in $IsPacFiles)\n\t{\n\t\t# read project file\n\t\t$ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)\n\n\t\t# deploy project\n\t\tWrite-Host \"Deploying project $($IsPacFile.Name)...\"\n\t\t$Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null\n\n\t\t# get reference to deployed project\n\t\t$Project = $Folder.Projects[$ProjectName]\n\n\t\t# check to see if they want to use environments\n\t\tif($UseEnvironment)\n\t\t{\n\t\t\t# get environment reference\n\t\t\t$Environment = Get-Environment -Folder $Folder -EnvironmentName $EnvironmentName\n\n\t\t\t# set environment reference\n\t\t\tSet-EnvironmentReference -Project $Project -Environment $Environment -Folder $Folder\n\n\t\t\t# check to see if the user wants to convert project parameters to environment variables\n\t\t\tif($ReferenceProjectParametersToEnvironmentVairables)\n\t\t\t{\n\t\t\t\t# set environment variables\n\t\t\t\tWrite-Host \"Referencing Project Parameters to Environment Variables...\"\n\t\t\t\t$VariablesToPreserveInEnvironment += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment\n\t\t\t}\n\n\t\t\t# check to see if the user wants to convert the package parameters to environment variables\n\t\t\tif($ReferencePackageParametersToEnvironmentVairables)\n\t\t\t{\n\t\t\t\t# set package variables\n\t\t\t\tWrite-Host \"Referencing Package Parameters to Environment Variables...\"\n\t\t\t\t$VariablesToPreserveInEnvironment += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment\n\t\t\t}\n            \n            # Removes all unused variables from the environment\n            if ($SyncEnvironment)\n            {\n                Write-Host \"Sync package environment variables...\"\n                Sync-EnvironmentVariables -Environment $Environment -VariablesToPreserveInEnvironment $VariablesToPreserveInEnvironment\n            }\n\t\t}\n\t}\n}\n\nfinally\n{\n\t# check to make sure sqlconnection isn't null\n\tif($sqlConnection)\n\t{\n\t\t# check state of sqlconnection\n\t\tif($sqlConnection.State -eq [System.Data.ConnectionState]::Open)\n\t\t{\n\t\t\t# close the connection\n\t\t\t$sqlConnection.Close()\n\t\t}\n\n\t\t# cleanup\n\t\t$sqlConnection.Dispose()\n\t}\n}\n#endregion\n",
-      "Octopus.Action.Script.ScriptSource": "Inline"
-    },
-    "Parameters": [
-      {
-        "Id": "97e5d9db-fd73-4620-84f7-91d6e31e0c4b",
-        "Name": "ServerName",
-        "Label": "Database server name (\\instance)",
-        "HelpText": "Name of the SQL Server you are deploying to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b5adc9a7-2bcb-45c8-9a64-02e0dc286981",
-        "Name": "sqlAccountUsername",
-        "Label": "SQL Authentication Username",
-        "HelpText": "(Optional) Username of the SQL Authentication account.  Use this approach when deploying to Azure Databases with SSIS configured.  If SQL Authentication Username and Password are blank, Integrated Authentication is used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0646a66e-5ba5-4761-a388-8a8bc73492ec",
-        "Name": "sqlAccountPassword",
-        "Label": "SQL Authentication Password",
-        "HelpText": "(Optional) Password of the SQL Authentication account.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "46e7103c-2833-4bf0-9f98-b5d2a0bbcabf",
-        "Name": "EnableCLR",
-        "Label": "Enable SQL CLR",
-        "HelpText": "This will reconfigure SQL Server to enable the SQL CLR.  It is highly recommended that this be previously authorized by your Database Administrator.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "970702e3-e0bf-4ea7-b1ba-067128a3f8c3",
-        "Name": "CatalogName",
-        "Label": "Catalog name",
-        "HelpText": "Name of the catalog to create in Integration Services Catalogs on SQL Server.  When using the GUI, this value gets hardcoded to SSISDB and cannot be changed.  It is recommended that you do not change the default value.",
-        "DefaultValue": "SSISDB",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "ccc0a5bf-467b-4695-bcef-912043e27d49",
-        "Name": "CatalogPwd",
-        "Label": "Catalog password",
-        "HelpText": "Password to the Integration Services Catalog.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "5c02a114-b06e-4547-bb0f-b2aba1869d8e",
-        "Name": "FolderName",
-        "Label": "Folder name",
-        "HelpText": "Name of the folder to use within the Integration Services Catalog",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "88ffb943-5525-4484-9963-0a34c89a7085",
-        "Name": "ProjectName",
-        "Label": "Project name",
-        "HelpText": "Name of the project within the folder of the Integration Services catalog",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "b8c29eac-a60f-4b25-96b8-f3b2e3fd8806",
-        "Name": "UseEnvironment",
-        "Label": "Use environment",
-        "HelpText": "This will make a project reference to the defined environment.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "156a4b55-26e4-4c70-bf91-8729ca131c62",
-        "Name": "EnvironmentName",
-        "Label": "Environment name",
-        "HelpText": "Name of the environment to reference the project to. If the environment doesn't exist, it will create it.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "0339168d-9a53-4d8a-97d9-7a76605bdc55",
-        "Name": "ReferenceProjectParametersToEnvironmentVairables",
-        "Label": "Reference project parameters to environment variables",
-        "HelpText": "Checking this box will make Project Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects that an Octopus variable of the same name exists.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "5f6b7788-4957-451a-bec7-092e471291f2",
-        "Name": "ReferencePackageParametersToEnvironmentVairables",
-        "Label": "Reference package parameters to environment variables",
-        "HelpText": "Checking this box will make Package Parameters reference Environment Variables.  If the Environment Variable doesn't exist, it will create it.  This expects than an Octopus variable of the same name exists.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "cc4819a4-a6e4-4220-a581-0f2aed51f4a6",
-        "Name": "UseFullyQualifiedVariableNames",
-        "Label": "Use Fully Qualified Variable Names",
-        "HelpText": "When true the package variables names must be represented in `dtsx_name_without_extension.variable_name`",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "bb22984a-43ed-45c7-978d-72fddec96fe1",
-        "Name": "UseCustomFilter",
-        "Label": "Use Custom Filter for connection manager properties",
-        "HelpText": "Custom filter should contain the regular expression for ignoring properties when setting will occur during the auto-mapping",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "d9bba05b-d8a7-40b0-9893-4c878a264de6",
-        "Name": "CustomFilter",
-        "Label": "Custom Filter for connection manager properties",
-        "HelpText": "Regular expression for filtering out the connection manager properties during the auto-mapping process. This string is used when `UseCustomFilter` is set to true",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "77237f87-bc01-4541-b477-005f7416dce2",
-        "Name": "SyncEnvironment",
-        "Label": "Clean obsolete variables from environment",
-        "HelpText": "When `true` synchronizes the environment:\n- Removes obsolete variables\n- Removes renamed variables\n- Replaces values of valid variables (also when `false`)",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "34dcc677-6091-4e92-8b40-9ab09ed18fa3",
-        "Name": "ssisPackageId",
-        "Label": "Package Id",
-        "HelpText": "Id of the package to deploy, used to support deployment with Workers.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "8338dc00-27ab-4c60-809a-2badd22250e9",
-        "Name": "TemplatePackageFeedId",
-        "Label": "Package Feed Id",
-        "HelpText": "ID of the package feed the referenced package resides in.",
-        "DefaultValue": "feeds-builtin",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-    "LastModifiedBy": "bobjwalker",
-    "$Meta": {
-      "ExportedAt": "2020-06-15T18:38:53.170Z",
-      "OctopusVersion": "2020.2.13",
-      "Type": "ActionTemplate"
-    },
-    "Category": "sql"
-  }
diff --git a/step-templates/ssis-deploy-ispac-with-enviroment.json b/step-templates/ssis-deploy-ispac-with-enviroment.json
deleted file mode 100644
index c3891fb2c..000000000
--- a/step-templates/ssis-deploy-ispac-with-enviroment.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "Id": "b791c0c2-03ce-40ef-9446-78beb585c0b8",
-  "Name": "SSIS deploy ISPAC With Environment",
-  "Description": "A Template which will deploy any .ISPAC files from the published package step selected to the SQL Server catalog database. \n\nThe template will create a environment config and use variables that are wrapped in SSIS[<SSIS Parameter Path>] extracting the SSIS Parameter Path using that as the name and value linked the Octopus Variable and then assign parameter in the SSIS project to the name environment configuration.  \n\nWhen the SSIS Parameter Path is at the Package level then SSIS Parameter will need to have the Package Name (without .dtsx) added to front of the SSIS Parameter path.\n\nTo remove and environment config delete the variable or remove the SSIS[].\n",
-  "ActionType": "Octopus.Script",
-  "Version": 18,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Define PowerShell Modules path\n$LocalModules = (New-Item \"$PSScriptRoot\\Modules\" -ItemType Directory -Force).FullName\n$env:PSModulePath = \"$LocalModules;$env:PSModulePath\"\n\n#region Functions\n\n#region SQLPS functions \nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-SqlModuleInstalled {\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName)) {\n        # It is installed\n        return $true\n    }\n    else {\n        # Module not installed\n        return $false\n    }\n}\n\nfunction Install-SqlServerPowerShellModule {\n    # Define parameters\n    param(\n        $PowerShellModuleName,\n        $LocalModulesPath\n    )\n\n    # Check to see if the package provider has been installed\n    if ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n        # Display that we need the nuget package provider\n        Write-Host \"Nuget package provider not found, installing ...\"\n        \n        # Install Nuget package provider\n        Install-PackageProvider -Name Nuget -Force\n    }\n\n    # Save the module in the temporary location\n    Save-Module -Name $PowerShellModuleName -Path $LocalModulesPath -Force\n\n    # Display\n    Write-Output \"Importing module $PowerShellModuleName ...\"\n\n    # Import the module\n    Import-Module -Name $PowerShellModuleName\n}\n\nFunction Get-SqlServerAssmblies {\n    # Declare parameters\n    \n    # Get the folder where the SqlServer module ended up in\n    $sqlServerModulePath = [System.IO.Path]::GetDirectoryName((Get-Module -ListAvailable -Name \"SqlServer\").Path)\n    \n    # Loop through the assemblies\n    foreach ($assemblyFile in (Get-ChildItem -Path $sqlServerModulePath -Exclude msv*.dll | Where-Object { $_.Extension -eq \".dll\" })) {\n        # Load the assembly\n        [Reflection.Assembly]::LoadFile($assemblyFile.FullName) | Out-Null\n    }    \n}\n\n#endregion SQLPS functions \n\n#region SQL Server functions \nfunction Get-ConnectionObject {\n    param\n    (\n        [parameter(ParameterSetName = 'Default', HelpMessage = 'Name of the server', Mandatory = $true)]\n        [parameter(ParameterSetName = 'SQLAuth', HelpMessage = 'Name of the server', Mandatory = $true)]\n        [string]\n        $SQLServerName,\n        [parameter(ParameterSetName = 'SQLAuth')]\n        [switch] $UseSQLAuth,\n        [parameter(ParameterSetName = 'SQLAuth', HelpMessage = 'SQL Server Login', Mandatory = $true)]\n        [string] $SQLLogin,\n        [parameter(ParameterSetName = 'SQLAuth', HelpMessage = 'SQL Server Password', Mandatory = $true)]\n        [string] $Password\n          \n    ) \n    # Create a connection to the server\n    $sqlConnectionString = \"Data Source=$ServerName;Initial Catalog=SSISDB;\"\n    \n    if ($UseSQLAuth) {\n        # Add username and password to connection string\n        $sqlConnectionString += \"User ID=$SQLLogin; Password=$Password;\"\n    }\n    else {\n        # Use integrated\n        $sqlConnectionString += \"Integrated Security=SSPI;\"\n    }\n     \n    # Create new connection object with connection string\n    return (New-Object System.Data.SqlClient.SqlConnection $sqlConnectionString)\n}\n#endregion SQL Server functions \n\n#region SQL SSIS functions\nFunction Get-Catalog {\n    # define parameters\n    Param ($CatalogName)\n    \n    # define working varaibles\n    $Catalog = $null\n    # check to see if there are any catalogs\n    if ($integrationServices.Catalogs.Count -eq 0 -or -not $integrationServices.Catalogs[$CatalogName]) {\n        throw \"SSIS Catalog not found $CatalogName\"\n        # get reference to catalog\n    }\n\n    $Catalog = $integrationServices.Catalogs[$CatalogName]\n    \n    # return the catalog\n    return $Catalog\n}\n\nFunction Get-Folder {\n    # parameters\n    Param($FolderName, $Catalog)\n    \n    $Folder = $null\n    # try to get reference to folder\n    \n    if (!($null -eq $Catalog.Folders)) {\n        $Folder = $Catalog.Folders[$FolderName]\n    }\n    \n    # check to see if $Folder has a value\n    if ($null -eq $Folder) {\n        # display\n        Write-Host \"Folder $FolderName doesn't exist, creating folder...\"\n    \n        # create the folder\n        $Folder = New-Object \"$ISNamespace.CatalogFolder\" ($Catalog, $FolderName, $FolderName) \n        $Folder.Create() \n    }\n    \n    # return the folde reference\n    return $Folder\n}\n\nFunction Get-Environment {\n    # define parameters\n    Param($Folder, $EnvironmentName)\n    \n    $Environment = $null\n    # get reference to Environment\n    if (!($null -eq $Folder.Environments) -and $Folder.Environments.Count -gt 0) {\n        $Environment = $Folder.Environments[$EnvironmentName]\n    }\n    \n    # check to see if it's a null reference\n    if ($null -eq $Environment) {\n        # display\n        Write-Host \"Environment $EnvironmentName doesn't exist, creating environment...\"\n    \n        # create environment\n        $Environment = New-Object \"$ISNamespace.EnvironmentInfo\" ($Folder, $EnvironmentName, $EnvironmentName)\n        $Environment.Create() \n    }\n    \n    # return the environment\n    return $Environment\n}\nFunction Set-PojectEnvironmentReference {\n    # define parameters\n    Param($Project, $Environment, $Folder)\n    \n    # get reference\n    $Reference = $null\n    \n    if (!($null -eq $Project.References)) {\n        $Reference = $Project.References[$Environment.Name, $Folder.Name]\n    \n    }\n\n    # check to see if it's a null reference\n    if ($null -eq $Reference) {\n        # display\n        Write-Host \"Removeing old Project reference environment creating reference...\"\n        foreach ( $Reference in  $Project.References) {\n            $Project.References.Remove($Reference.Name, $Reference.EnvironmentFolderName)\n        }\n        Write-Host \"Project does not reference environment $($Environment.Name), creating reference...\"\n        # create reference\n        $Project.References.Add($Environment.Name, $Folder.Name)\n        $Project.Alter() \n    }\n}\n\nFunction Add-EnvironmentVariable {\n    # define parameters\n    Param($Environment, $Parameter, $ParameterName, $EnvironmentValue )\n    \n    # display \n    Write-Host \"- Adding environment variable $($ParameterName)\"\n        \n    # add variable with an initial value\n    $Environment.Variables.Add($ParameterName, $Parameter.DataType, $EnvironmentValue, $Parameter.Sensitive, $Parameter.Description)\n    $Parameter.Set([Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced, $ParameterName)\n}\n\nFunction Remove-ReferencedValue {\n    Param($Project\n        , $ParameterName\n    )\n  \n    if ($ParameterName -match \"\\|\") {\n        $ParameterPath = $ParameterName.Split(\"|\")\n        $Project.Packages[$ParameterPath[0]].Parameters[$ParameterPath[1]].Clear()\n        $Project.Packages[$ParameterPath[0]].Alter()\n    }\n    else {\n        $Project.Parameters[$ParameterName].Clear()  \n    }\n}\n\nFunction Sync-EnvironmentVariables {\n    # define parameters\n    Param($Environment\n        , $Project\n        , $ReferencedVariables\n        , $OctopusParameters\n        , $OctopusSSISParameterKey )\n\n    foreach ($VariableToEvaluate in $Environment.Variables) {\n        $OctopusParameterKey = $OctopusSSISParameterKey -f $VariableToEvaluate.Name\n`       if (-not $OctopusParameters.Keys.Contains($OctopusParameterKey)) {\n            Write-Host \"- Removing environment variable: $($VariableToEvaluate.Name)\"    \n            $Environment.Variables.Remove($VariableToEvaluate) | Out-Null\n            if ($ReferencedVariables.Keys.Contains($VariableToEvaluate.Name)) {\n                Remove-ReferencedValue -Project $Project -ParameterName $ReferencedVariables[$VariableToEvaluate.Name]\n                $ReferencedVariables.Remove($VariableToEvaluate.Name)\n            }\n        }\n    }\n\n    foreach ($ReferencedKeyName in $ReferencedVariables.Keys) {\n`       if (-not $Environment.Variables.Contains($ReferencedKeyName)) {\n            Write-Host \"- Removing Prodect referenace  $($ReferencedVariables[$ReferencedKeyName] -replace \"\\|\", \" \")\"\n            Remove-ReferencedValue -Project $Project -ParameterName $ReferencedVariables[$ReferencedKeyName] \n        }\n    }\n\n    $Project.Alter()\n    # alter the environment\n    $Environment.Alter()\n}\n\nFunction Set-ProjectParametersToEnvironmentVariablesReference {\n    # define parameters\n    Param($Project\n        , $Environment\n        , $OctopusParameters\n        , $OctopusSSISParameterKey\n    )\n    \n    $ReferencedVariables = @{ }\n\n    if ($null -eq $Project.Parameters) {\n        Write-Host \"No project parameters exist\"\n        return\n    }\n\n    # loop through project parameters\n    foreach ($Parameter in $Project.Parameters) {\n        $OctopusParameterKey = $OctopusSSISParameterKey -f $Parameter.Name\n        # Add variable to list of variable\n        if ($OctopusParameters.Keys.Contains($OctopusParameterKey)) {\n            Write-Host $(\"Updating Project / Environment {0} Parameter Value ...\" -f $Parameter.Name)\n            $EnvironmentValue = $OctopusParameters[$OctopusParameterKey]\n            $Variable = $null\n            if (!($null -eq $Environment.Variables)) {\n                # get reference to variable\n                $Variable = $Environment.Variables[$Parameter.Name]\n            }\n            # check to see if variable exists\n            if ($null -eq $Variable) {\n                # add the environment variable\n                Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $Parameter.Name -EnvironmentValue $EnvironmentValue            \n            }\n            else {\n                $Variable.value = $EnvironmentValue\n            }            \n        }\n        if ($Parameter.ValueType -eq [Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced) {\n            $ReferencedVariables.Add($Parameter.ReferencedVariableName, $Parameter.Name)\n        }\n    }\n    \n    # alter the environment\n    $Environment.Alter()\n    $Project.Alter()\n    return $ReferencedVariables\n}\n\nFunction Set-PackageVariablesToEnvironmentVariablesReference {\n    # define parameters\n    Param($Project\n        , $Environment        \n        , $OctopusParameters\n        , $OctopusSSISParameterKey)\n\n    $ReferencedVariables = @{ }\n\n    # loop through packages in project\n    foreach ($Package in $Project.Packages) {\n        # loop through parameters of package\n        foreach ($Parameter in $Package.Parameters) {\n            \n            $ParameterName = $Parameter.ObjectName.Replace(\".dtsx\", \"\") + \".\" + $Parameter.Name\n            $OctopusParameterKey = $OctopusSSISParameterKey -f $ParameterName\n        \n            # Add variable to list of variable\n            if ($OctopusParameters.Keys.Contains($OctopusParameterKey)) {\n                Write-Host $(\"Updating {0} Package / Environment {1} Parameter Value ...\" -f $Parameter.ObjectName, $ParameterName)\n                $EnvironmentValue = $OctopusParameters[$OctopusParameterKey]\n                $Variable = $null\n                if (!($null -eq $Environment.Variables)) {\n                    # get reference to variable\n                    $Variable = $Environment.Variables[$ParameterName]\n                }\n                # check to see if the parameter exists\n                if (!$Variable) {\n                    # add the environment variable\n                    Add-EnvironmentVariable -Environment $Environment -Parameter $Parameter -ParameterName $ParameterName -EnvironmentValue $EnvironmentValue\n                }          \n                else {\n                    $Variable.value = $EnvironmentValue\n                }            \n            }\n            if ($Parameter.ValueType -eq [Microsoft.SqlServer.Management.IntegrationServices.ParameterInfo+ParameterValueType]::Referenced) {\n                $ReferencedVariables.Add($Parameter.ReferencedVariableName, $(\"{0}|{1}\" -f $Package.Name, $Parameter.Name))\n            }  \n        }\n    \n        # alter the package\n        $Package.Alter()\n    }\n    \n    # alter the environment\n    $Environment.Alter()\n\n    return $ReferencedVariables\n}\n\n#endregion SQL SSIS functions\n\n#endregion Functions\n\n#region Script Main\n\n#region Get enviroment configured\nif ((Get-SqlModuleInstalled -PowerShellModuleName \"SqlServer\") -ne $true) {\n    # Display message\n    Write-Output \"PowerShell module SqlServer not present, downloading temporary copy ...\"\n    \n    # Download and install temporary copy\n    Install-SqlServerPowerShellModule -PowerShellModuleName \"SqlServer\" -LocalModulesPath $LocalModules\n}\n\n# Dependent assemblies\nGet-SqlServerAssmblies    \n\n\n# add snapins-- applies to sql server 2008 r2, newer version of SQL do not require this.\nAdd-PSSnapin SqlServerCmdletSnapin100 -ErrorAction SilentlyContinue\nAdd-PSSnapin SqlServerProviderSnapin100 -ErrorAction SilentlyContinue\n#endregion Get enviroment configured\n\n\n$ISNamespace = \"Microsoft.SqlServer.Management.IntegrationServices\"\n$OctopusSSISParameterKey = \"SSIS[{0}]\"\n$DeployedPath = $OctopusParameters[\"Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath\"]\n\nWrite-Host \"Connecting to server ...\"\n\nif ([string]::IsNullOrEmpty($sqlAccountUsername) -and [string]::IsNullOrEmpty($sqlAccountPassword)) {\n    # Add username and password to connection string\n    $sqlConnection = Get-ConnectionObject -SQLServerName $ServerName \n}\nelse {\n    # Use integrated\n    $sqlConnection = Get-ConnectionObject -SQLServerName $ServerName -UseSQLAuth -SQLLogin $sqlAccountUsername -Password=$sqlAccountPassword\n}\n\n$integrationServices = New-Object \"$ISNamespace.IntegrationServices\" $sqlConnection\n\n\n$IsPacFiles = Get-ChildItem -Recurse -Path $DeployedPath | Where-Object { $_.Extension.ToLower() -eq \".ispac\" }\nWrite-Host \"$($IsPacFiles.Count) .ispac file(s) found.\"\n\n# get reference to the catalog\nWrite-Host \"Getting reference to catalog $CatalogName\"\n$Catalog = Get-Catalog -CatalogName $CatalogName\n$Folder = Get-Folder -FolderName $FolderName -Catalog $Catalog\n\n$ReferencedVariables = @{ }\nforeach ($IsPacFile in $IsPacFiles) {\n    $ProjectFile = [System.IO.File]::ReadAllBytes($IsPacFile.FullName)\n    $ProjectName = $IsPacFile.Name -replace $IsPacFile.Extension , \"\"\n    $EnvironmentName = \"{0}_{1}\" -f $ProjectName , $EnvironmentTag\n    # deploy project\n    Write-Host \"Deploying project $($IsPacFile.Name)...\"\n    $Folder.DeployProject($ProjectName, $ProjectFile) | Out-Null\n\n    # get reference to deployed project\n    $Project = $Folder.Projects[$ProjectName]\n    # get environment reference\n    $Environment = Get-Environment -Folder $Folder -EnvironmentName $EnvironmentName \n    Set-PojectEnvironmentReference -Project $Project -Environment $Environment -Folder $Folder \n    Write-Host \"Referencing Project Parameters to Environment Variables...\"\n    $ReferencedVariables += Set-ProjectParametersToEnvironmentVariablesReference -Project $Project -Environment $Environment -OctopusParameters $OctopusParameters -OctopusSSISParameterKey $OctopusSSISParameterKey\n    Write-Host \"Referencing Project Parameters to Environment Variables...\"\n    $ReferencedVariables += Set-PackageVariablesToEnvironmentVariablesReference -Project $Project -Environment $Environment -OctopusParameters $OctopusParameters -OctopusSSISParameterKey $OctopusSSISParameterKey\n    Write-Host \"Sync package environment variables...\"\n    Sync-EnvironmentVariables -Environment $Environment -Project $Project -ReferencedVariables $ReferencedVariables -OctopusParameters $OctopusParameters -OctopusSSISParameterKey $OctopusSSISParameterKey\n}   "
-  },
-  "Parameters": [
-    {
-      "Id": "4d49a1f7-f7bf-40e2-b845-8c9c8e4deda9",
-      "Name": "NugetPackageStepName",
-      "Label": "NuGet package step",
-      "HelpText": "The step that uploaded the NuGet package to the server.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "6e97bd67-aeb5-4a92-b4d8-9e5b9a13ad93",
-      "Name": "ServerName",
-      "Label": "SSIS SQL Server Name",
-      "HelpText": "The name of SSIS SQL Server ",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6b0007eb-81eb-459f-b8c6-2f8c9465beb2",
-      "Name": "CatalogName",
-      "Label": "SSISDB Catlog Name",
-      "HelpText": "The name of the SSISDB Catlog",
-      "DefaultValue": "SSISDB",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "00cadc4e-17bd-41bb-b4bd-87ca01b483eb",
-      "Name": "FolderName",
-      "Label": "SSIS Folder",
-      "HelpText": "The SSIS folder to deploy to project to",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "5e88fe40-d502-4e2e-8c96-c7ed8f2d82c4",
-      "Name": "EnvironmentTag",
-      "Label": "Environment Tag",
-      "HelpText": "The text to add at the end Environment configuration name.  Currently default to append the Environment Value begin deploy to.",
-      "DefaultValue": "#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "Zogamorph",
-  "$Meta": {
-    "ExportedAt": "2019-10-29T18:58:17.799Z",
-    "OctopusVersion": "2019.10.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
diff --git a/step-templates/ssis-deploy-sqlagentjob.json b/step-templates/ssis-deploy-sqlagentjob.json
deleted file mode 100644
index d64d5e267..000000000
--- a/step-templates/ssis-deploy-sqlagentjob.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-"Id" : "f69ea863-ab61-4c58-bcbe-a133450113c9",
-  "Name": "SSIS - Deploy SQL Agent Job",
-  "Description": "Deploy a SQL Agent Job for SSIS Ispac Deployment. Requires SMO to be installed on the machine where this step will be run. ",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "Function Format-OctopusArgument\r\n{\r\n\r\n    <#\r\n    .SYNOPSIS\r\n    Converts boolean values to boolean types\r\n\r\n    .DESCRIPTION\r\n    Converts boolean values to boolean types\r\n\r\n    .PARAMETER Value\r\n    The value to convert\r\n\r\n    .EXAMPLE\r\n    Format-OctopusArgument \"true\"\r\n    #>\r\n    Param(\r\n        [string]$Value\r\n    )\r\n\r\n    $Value = $Value.Trim()\r\n\r\n    # There must be a better way to do this\r\n    Switch -Wildcard ($Value)\r\n    {\r\n\r\n        \"True\"\r\n        { Return $True\r\n        }\r\n        \"False\"\r\n        { Return $False\r\n        }\r\n        \"#{*}\"\r\n        { Return $null\r\n        }\r\n        Default\r\n        { Return $Value\r\n        }\r\n    }\r\n}\r\n\r\n\r\nFunction Get-SSISCommand\r\n{\r\n\r\n    <#\r\n    .SYNOPSIS\r\n    Format the SSIS Command that execute the package.\r\n    Only valid for now for Project Deployment ($typecommand = '/ISSERVER \"\\')\r\n\r\n    .DESCRIPTION\r\n    Return a string with the correct format to execute a Project Package Deploy (Step).\r\n    The SSIS Command can be built by paramaters (ServerName, CatalogName, ProjectName, FolderName, Package and Environment)\r\n    @TO-DO:\r\n    But most of the cases need an ending string that could be the same for most of the deployments.\r\n    I will keep this as a Octopus Parameter by now.\r\n\r\n\r\n    #>\r\n\r\n    Param($ServerName, $CatalogName, $FolderName, $ProjectName, $PackageName, $EnvironmentName)\r\n    process {\r\n        $environmentid = Get-EnvironmentId -ServerName $ServerName -EnvironmentName $EnvironmentName -PackageName $PackageName -ProjectName $ProjectName\r\n        write-host \"The Environmemnt Id found for $EnvironmentName is $environmentid\"\r\n        $slash = '\\'\r\n        $quotes = '\"'\r\n        $typecommand = '/ISSERVER \"\\'\r\n        $environmentCommand = '\\\"\" /ENVREFERENCE ' + $environmentid.ToString()\r\n        $packagep = $slash + $CatalogName + $slash + $FolderName + $slash + $ProjectName + $slash + $PackageName + '.dtsx' + $slash\r\n        $servertype = '\" /SERVER \"\\\"'\r\n        $commandoptions = ' /Par \"\\\"$ServerOption::LOGGING_LEVEL(Int16)\\\"\";1 /Par \"\\\"$ServerOption::SYNCHRONIZED(Boolean)\\\"\";True /CALLERINFO SQLAGENT /REPORTING E'\r\n    }\r\n    end {\r\n        return $typecommand + $quotes + $packagep + $quotes + $servertype + $ServerName + $environmentCommand + $commandoptions\r\n    }\r\n\r\n}\r\n\r\nFunction Get-EnvironmentId\r\n{\r\n    <#\r\n    .SYNOPSIS\r\n    Get the ID of the Environment by Name of Environment\r\n\r\n    .DESCRIPTION\r\n    ProjectDeploy Packages use Enviroments for variables previously deployed for the package.\r\n    To be able to format the SSIS Command, we will need the Environment ID\r\n\r\n    .PARAMETER ServerName\r\n    .PARAMETER CatalogName\r\n    .PARAMETER FolderName\r\n    .PARAMETER ProjectName\r\n    .PARAMETER PackageName\r\n    .PARAMETER EnvironmentName\r\n    #>\r\n\r\n    Param($ServerName, $EnvironmentName,$PackageName, $ProjectName)\r\n\r\n\r\n    $query = \"SELECT er.reference_id\r\n    FROM [SSISDB].[internal].[folders] AS f\r\n         JOIN [SSISDB].[internal].[projects] AS p\r\n              ON f.folder_id = p.folder_id\r\n              JOIN [SSISDB].[internal].[environment_references] AS er\r\n                   ON p.project_id = er.project_id\r\n                   where f.name = '$FolderName'\r\n\t\t\t\t\t\tand er.environment_name = '$EnvironmentName'\r\n\t\t\t\t\t\t and p.name = '$ProjectName'\"\r\n\r\n    $EnvironmentId = Invoke-Sqlcmd  -Query $query -ServerInstance $ServerName -Verbose\r\n\r\n    return $EnvironmentId.reference_id\r\n}\r\n\r\nFunction Add-Job\r\n{\r\n    <#\r\n    .SYNOPSIS\r\n    Add a new type of Job in SQL Agent Job\r\n\r\n    .DESCRIPTION\r\n    The function will remove an existing Job with same name (SQL SMO Job doesnt contains update function)\r\n    and it will return as GlobalVariable the JOb Object.\r\n\r\n    .PARAMETER JobName\r\n    .PARAMETER ServerName\r\n    .PARAMETER EnvironmentName\r\n    .PARAMETER JobStepName\r\n    .PARAMETER JobStepCommand\r\n    #>\r\n\r\n    param($JobName, $ServerName, $EnvironmentName, $JobsStepName, $JobStepCommand, $JobCategory )\r\n    try\r\n    {\r\n        $server = New-Object Microsoft.SqlServer.Management.Smo.Server($ServerName)\r\n        $server.exe\r\n        $server.JobServer.HostLoginName\r\n        $existingjob = $server.Jobserver.Jobs|where-object {$_.Name -like $JobName}\r\n        if ($existingjob)\r\n        {\r\n            Write-Host \"|- Dropping Job [$JobName]...\" -NoNewline\r\n            $existingjob.drop()\r\n            Write-Host \"|- Done\" -ForegroundColor Green\r\n        }\r\n\r\n        $job = New-Object Microsoft.SqlServer.Management.SMO.Agent.Job($server.JobServer, $jobName)\r\n        #$job.DropIfExists() only for sqlserver 2016\r\n        $job.Create()\r\n        $job.OwnerLoginName = \"sa\"\r\n        $job.Category = $JobCategory\r\n        $job.ApplyToTargetServer($server.Name)\r\n\r\n\r\n    }\r\n    catch\r\n    {\r\n        write-host \"####### Error Adding a job\" -ForegroundColor Red\r\n        write-host $_.Exception.Message\r\n    }\r\n    #Instead of creating a class and return a Job, lets settup a global variable. Return statament doenst return all script output\r\n    $Global:newjob = $job\r\n\r\n}\r\n\r\nFunction Add-JobStep\r\n{\r\n    <#\r\n    .SYNOPSIS\r\n    Add a job step to a Job\r\n\r\n    .DESCRIPTION\r\n    The function will remove an existing Job with same name (SQL SMO Job doesnt contains update function)\r\n    and it will return as GlobalVariable t\r\n     he JOb Object.\r\n    .PARAMETER Job\r\n    .PARAMETER JobStepName\r\n    .PARAMETER JobStepCommand\r\n    #>\r\n    param($job, $JobStepName, $CommandJob )\r\n    try\r\n    {\r\n        $jobStep = New-Object Microsoft.SqlServer.Management.Smo.Agent.JobStep($job, $JobStepName)\r\n        $jobStep.Subsystem = [Microsoft.SqlServer.Management.Smo.Agent.AgentSubSystem]::SSIS\r\n\r\n        $jobStep.Command = $CommandJob\r\n        $jobStep.Create()\r\n    }\r\n    catch\r\n    {\r\n        write-host \"#########   Error adding a job step\" -ForegroundColor Red\r\n        write-host $_.Exception.Message\r\n    }\r\n\r\n\r\n}\r\n\r\nFunction Add-JobSchedule\r\n{\r\n    # ToDO: Add more types of frequenct: Weekly, Monthly\r\n    param($job, $JobScheduleName,$JobExecutionFrequency, $FrecuencyInterval, $startHour, $startMinutes)\r\n    try\r\n    {\r\n        $name = $job.Name\r\n        $SQLJobSchedule = New-Object -TypeName Microsoft.SqlServer.Management.SMO.Agent.JobSchedule($job, $JobScheduleName)\r\n\r\n        switch ($JobExecutionFrequency) {\r\n            \"Daily\" {\r\n                     $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::Daily\r\n                     $subdayTypes =  [Microsoft.SqlServer.Management.SMO.Agent.FrequencySubDayTypes]::Hour\r\n                    }\r\n            \"OneTime\" {\r\n                 $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::OneTime\r\n                 $subdayTypes = [Microsoft.SqlServer.Management.SMO.Agent.FrequencySubDayTypes]::Once\r\n                 }\r\n            \"AutoStart\" {\r\n                    $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::AutoStart\r\n                   }\r\n            default  {\r\n                $result = [Microsoft.SqlServer.Management.SMO.Agent.FrequencyTypes]::Daily\r\n              }\r\n        }\r\n\r\n\r\n        $SQLJobSchedule.FrequencyTypes =  $result\r\n        # Setup Frequency Interval\r\n        $SQLJobSchedule.FrequencyInterval = $FrecuencyInterval\r\n\r\n\r\n\r\n        # Job Start\r\n        $timeofday = New-TimeSpan -hours $startHour -minutes $startMinutes\r\n        $SQLJobSchedule.ActiveStartTimeOfDay = $timeofday\r\n        #Activate the Job\r\n        $SQLJobSchedule.ActiveStartDate = Get-Date\r\n        $SQLJobSchedule.Create()\r\n    }\r\n    catch\r\n    {\r\n        Write-Host \"Error\" -ForegroundColor Red\r\n        write-host \"Exception Type: $($_.Exception.GetType().FullName)\" -ForegroundColor Red\r\n        write-host \"Exception Message: $($_.Exception.Message)\" -ForegroundColor Red\r\n        $error[0]|format-list -force\r\n\r\n    }\r\n\r\n}\r\n\r\nFunction Set-SQLJob\r\n{\r\n    #Get-Octopus Variables\r\n    Write-Host \"Collecting Octopus Variables\"\r\n\r\n    $ServerName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_ServerName\"]\r\n    $FolderName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_FolderName\"]\r\n    $ProjectName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_ProjectName\"]\r\n    $CatalogName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_CatalogName\"]\r\n    $EnvironmentName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_EnvironmentName\"]\r\n    $PackageName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_PackageName\"]\r\n    $JobName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobName\"]\r\n    $JobCategory =  Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobCategory\"]\r\n    $JobStepName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobStepName\"]\r\n    $JobScheduleName = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobScheduleName\"]\r\n    $JobExecutionFrequency = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobExecutionFrequency\"]\r\n    $JobFrequencyInterval = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobFrequencyInterval\"]\r\n    $JobExecutionTimeHour = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobExecutionTimeHour\"]\r\n    $JobExecutionTimeMinute = Format-OctopusArgument -Value $OctopusParameters[\"SSIS_JobExecutionTimeMinute\"]\r\n\r\n\r\n   # FrecuencyType is hardcoded\r\n\r\n    #Getting Module sqlserver if possible.\r\n    $Module = get-module -ListAvailable -name sqlserver\r\n    if ($Module.Name -eq 'sqlserver') {\r\n        write-host \"Importing Module SqlServer\"\r\n        Import-Module sqlserver -DisableNameChecking\r\n    } else {\r\n        write-host \"Importing Module sqlps\"\r\n        import-module sqlps -Verbose -DisableNameChecking\r\n    }\r\n\r\n    #First step is to generate the command execution for Job Step.\r\n    $JobStepCommand = Get-SSISCommand -ServerName $ServerName -CatalogName $CatalogName -FolderName $FolderName -ProjectName $ProjectName -PackageName $PackageName -EnvironmentName $EnvironmentName -Verbose\r\n\r\n    write-Host \"Command found to deploy Step is \"\r\n    write-Host $JobStepCommand\r\n    write-Host \"STARTING DEPLOYMENT \"\r\n    write-Host \"|- Start Adding the Job $JobName\"\r\n    Add-Job -JobName $JobName -ServerName $ServerName -EnvironmentName $EnvironmentName -JobsStepName $JobStepName -JobStepCommand $JobStepCommandmand\r\n    write-Host \"|- $JobName Added to $ServerName\"\r\n\r\n    write-Host \"|--- Start Adding the JobStep $JobStepName to Job $JobName\"\r\n    Add-JobStep -JobStepName $JobStepName -CommandJob $JobStepCommand -Job $Global:newjob\r\n    write-Host \"|--- $JobStepName added to Job $JobName\"\r\n\r\n    write-Host \"|----  Start Adding JobShedule  $JobScheduleName JobStep $JobName\"\r\n    Add-JobSchedule -job $Global:newjob  -JobScheduleName $JobScheduleName  -JobExecutionFrequency $JobExecutionFrequency -FrecuencyInterval $JobFrequencyInterval -startHour $JobExecutionTimeHour -startMinutes $JobExecutionTimeMinute\r\n    write-Host \"|---- $JobStepName added to Job $JobName\"\r\n}\r\n\r\nWrite-Host \"Starting deployment of SQL Job\"\r\n\r\n\r\nSet-SQLJob\r\n\r\n\r\nWrite-Host \"Finishing Install\"\r\n"
-  },
-  "Parameters": [
-    {
-      "Id": "44a2fa3c-3117-450b-8004-ebdbfd2362e9",
-      "Name": "SSIS_ServerName",
-      "Label": "Server Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ae040e98-f686-4f44-ad80-8939fbd902e4",
-      "Name": "SSIS_FolderName",
-      "Label": "Folder Name",
-      "HelpText": "Folder Name of the deployed package",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "3e755e91-afb5-46c3-ad61-47bf80ac88b8",
-      "Name": "SSIS_ProjectName",
-      "Label": "Project Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "21dc0b13-7db0-4c99-b512-53dbfad55893",
-      "Name": "SSIS_CatalogName",
-      "Label": "Catalog Name",
-      "HelpText": "By default SSISDB",
-      "DefaultValue": "SSISDB",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "eb197ae7-99e1-41a2-aee4-5b379fdb349c",
-      "Name": "SSIS_EnvironmentName",
-      "Label": "Environment Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "94f97e01-d04c-4696-ad0a-e170a21ecd87",
-      "Name": "SSIS_PackageName",
-      "Label": "Package Name",
-      "HelpText": "Complete name of the package to execute, without dtsx extension",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "cb138aa6-2f51-4ebd-b744-9b0d17535ea1",
-      "Name": "SSIS_JobName",
-      "Label": "Job Name",
-      "HelpText": "Name of the SQL Job",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "458225af-7d11-4f98-b984-2fe02e66996e",
-      "Name": "SSIS_JobStepName",
-      "Label": "Job Step Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "07d85895-e548-4f54-a403-25cc53fa1a88",
-      "Name": "SSIS_JobSheduleName",
-      "Label": "Job Schedule Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "023f21b1-7757-42f2-8b69-e9a95deb7bae",
-      "Name": "SSIS_JobExecutionFrequency",
-      "Label": "Job Execution Frequency",
-      "HelpText": "Frequency of execution\nOnly supported:\nOneTime\nDaily\nAutoStart",
-      "DefaultValue": "Daily",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "AutoStart\nDaily\nOneTime"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "25efa439-5490-4ed4-a70f-7b514bd18446",
-      "Name": "SSIS_JobFrequencyInterval",
-      "Label": "Job Frequency Interval",
-      "HelpText": "Depends of Job Execution Frequency.\nFor now only works with Days\nExample:\n1 -> Recurs every 1 Day\n2 -> Recurs every 2 Weeks",
-      "DefaultValue": "1",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "50b3ab13-8635-4631-a247-092792364902",
-      "Name": "SSIS_JobExecutionTimeHour",
-      "Label": "Job Execution Time Hour",
-      "HelpText": "Hour of the day to execute the job",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4d57dc4e-8717-4f05-bdad-0f16cc9b566d",
-      "Name": "SSIS_JobExecutionTimeMinute",
-      "Label": "Job Execution Time Minute",
-      "HelpText": "Minutes of the day to execute the job",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7a4c18db-51c3-48e7-ab04-b4f084dde3de",
-      "Name": "SSIS_JobCategory",
-      "Label": "Job Category",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2018-17-04T10:59:08.819Z",
-  "LastModifiedBy": "andrescolodrero",
-  "$Meta": {
-    "ExportedAt": "2018-17-04T10:59:08.819Z",
-    "OctopusVersion": "3.14.15",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
diff --git a/step-templates/ssl-disable-sslv2.json b/step-templates/ssl-disable-sslv2.json
deleted file mode 100644
index d58e68c7a..000000000
--- a/step-templates/ssl-disable-sslv2.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "ea274d21-80ca-4c1b-aa82-f0d124c6a707",
-  "Name": "SSL - Disable SSLv2",
-  "Description": "Disables SSL v2, requires restart.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Write-host \"Server : $Server\"\r\n\t$ClientEnabled = $false\r\n\t$ServerEnabled = $false\r\n    $reg = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey('LocalMachine', $Server)\r\n    $regkey = $reg.OpenSubkey(\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\SecurityProviders\\\\SCHANNEL\\\\Protocols\\\\SSL 2.0\",$true)\r\n\t$regkeyC = $reg.OpenSubkey(\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\SecurityProviders\\\\SCHANNEL\\\\Protocols\\\\SSL 2.0\\\\Client\",$true)\r\n\t$regkeyS = $reg.OpenSubkey(\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\SecurityProviders\\\\SCHANNEL\\\\Protocols\\\\SSL 2.0\\\\Server\",$true)\r\n\t\r\n\tforeach($subkeyName in $regkey.GetSubKeyNames())\r\n\t{\r\n#CLIENT\r\n\t\t# Check for Client SubKey\r\n\t\tif (!$regkeyC)\t\t\t\r\n\t\t{\r\n\t\t\t$regkey.CreateSubKey('Client')\r\n\t\t\t#reload\r\n\t\t\t$regkeyC = $reg.OpenSubkey(\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\SecurityProviders\\\\SCHANNEL\\\\Protocols\\\\SSL 2.0\\\\Client\",$true)\r\n\t\t\t$regkeyC.SetValue('DisabledByDefault','1','DWORD')\r\n\t\t}\t\t\r\n\t\tforeach($subkeyNameC in $regkeyC.GetValueNames())\r\n\t\t{\t\t\t\t\t\r\n\t\t\tif ($subkeyNameC)\r\n\t\t\t{\r\n\t\t\t\tif ($subkeyNameC -eq 'Enabled')\r\n\t\t\t\t{\r\n\t\t\t\t\t$ClientEnabled = $true\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t\t# Check to see if the Enabled Key was found\r\n\t\tif (!$ClientEnabled)\r\n\t\t{\r\n\t\t\t#Add enabled SubKey with DWORD value\r\n\t\t\t$regkeyC.SetValue('Enabled','0','DWORD')\t\t\t\t\r\n\t\t}\r\n#SERVER\r\n\t\t# Check for Server SubKey\r\n\t\tif (!$regkeyS)\r\n\t\t{\r\n\t\t\t$regkey.CreateSubKey('Server')\r\n\t\t\t#reload\r\n\t\t\t$regkeyS = $reg.OpenSubkey(\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\SecurityProviders\\\\SCHANNEL\\\\Protocols\\\\SSL 2.0\\\\Server\",$true)\r\n\t\t}\t\t\r\n\t\tforeach($subkeyNameS in $regkeyS.GetValueNames())\r\n\t\t{\r\n\t\t\tif ($subkeyNameS)\r\n\t\t\t{\r\n\t\t\t\tif ($subkeyNameS -eq 'Enabled')\r\n\t\t\t\t{\r\n\t\t\t\t\t$ServerEnabled = $true\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\t\t\r\n\t\tif (!$ServerEnabled)\r\n\t\t{\r\n\t\t\t#Add enabled SubKey with DWORD value\r\n\t\t\t$regkeyS.SetValue('Enabled','0','DWORD')\r\n\t\t}\t\t\t\r\n\t} \r\n\tWrite-host \"Server : $Server : Complete\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Server",
-      "Label": "Server name",
-      "HelpText": "Server name to disable SSL v2 on.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-30T20:48:41.172+00:00",
-    "OctopusVersion": "2.4.7.85",
-    "Type": "ActionTemplate"
-  },
-  "Category": "ssl"
-}
\ No newline at end of file
diff --git a/step-templates/ssl-write-certificate-pem-and-key.json b/step-templates/ssl-write-certificate-pem-and-key.json
deleted file mode 100644
index 8b8f6ef14..000000000
--- a/step-templates/ssl-write-certificate-pem-and-key.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "Id": "9e7f1836-c7c5-4d52-bd9e-0948114b2a0e",
-    "Name": "SSL - Write Certificate Pem and Key to the Filesystem",
-    "Description": "Export the PEM and Key from an SSL certificate to the File System. This is useful in Linux for securing websites or Docker containers",
-    "ActionType": "Octopus.Script",
-    "Version": 7,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.RunOnServer": "false",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "\n$CertName = $OctopusParameters[\"sslCertificate.Name\"] \nWrite-Host \"Writing PEM and Key files for $Certname\"\n\nNew-Item -ItemType directory $sslExportPath -Force -Verbose\n\n\"Certificate Pem:\"\n$pemPath = join-path $sslExportPath $sslPemFile\n$OctopusParameters[\"sslCertificate.CertificatePem\"] | out-file $pemPath -Force -Verbose\n\n\"-\" * 30\n\n\"Certificate Key: \"\n$keypath = join-path $sslExportPath $sslKeyFile\n$OctopusParameters[\"sslCertificate.PrivateKeyPem\"] | out-file $keyPath -Force -Verbose\n"
-    },
-    "Parameters": [
-      {
-        "Id": "c9cdd622-1a9a-4e5e-9eaa-ad738b76b356",
-        "Name": "sslExportPath",
-        "Label": "Root SSL Export Path",
-        "HelpText": "The base directory the key and pem file will be saved to",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "9211d56c-068e-47c5-9613-0f77eda72dca",
-        "Name": "sslPemFile",
-        "Label": "PEM File Name",
-        "HelpText": "The filename to write the PEM to",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "39dbe4a6-60c5-4bd2-8ad9-03a28f7148f0",
-        "Name": "sslKeyFile",
-        "Label": "Key File Name",
-        "HelpText": "The filename to write the Key to",
-        "DefaultValue": "",
-        "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-      },
-      {
-        "Id": "65d6687e-badf-4772-ac14-70bd2790cd4d",
-        "Name": "sslCertificate",
-        "Label": "SSL Certificate Variable",
-        "HelpText": "The name of the SSL certificate Variable",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Certificate"
-        }
-      }
-    ],
-    "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-    "LastModifiedBy": "bobjwalker",
-    "$Meta": {
-      "ExportedAt": "2020-08-13T07:41:35.949Z",
-      "OctopusVersion": "2020.1.18",
-      "Type": "ActionTemplate"
-    },
-    "Category": "ssl"
-  }
\ No newline at end of file
diff --git a/step-templates/ssrs-deploy-from-package-parameter.json b/step-templates/ssrs-deploy-from-package-parameter.json
deleted file mode 100644
index b7a42d950..000000000
--- a/step-templates/ssrs-deploy-from-package-parameter.json
+++ /dev/null
@@ -1,187 +0,0 @@
-{
-    "Id": "2c118ec9-4c3e-45a4-85b7-9f3c8ae99ca9",
-    "Name": "Deploy SSRS Reports from a package parameter",
-    "Description": "Uploads SSRS reports to an SSRS server from a package.\n\nThe following Datasource properties can be overidden: ConnectionString, Username, Password, and CredentialRetrieval (valid values are: Integrated, Prompt, Store, or None).  To override the property, create a Variable using the syntax of DatasourceName.PropertyName.  For example: MyDatasource.Username \n\nTo specify the Username and Password are Windows Credentials, create a variable called DatasourceName.WindowsCredentials and set the value to the string value 'true' (minus the quotes).",
-    "ActionType": "Octopus.Script",
-    "Version": 5,
-    "Author": "twerthi",
-    "Packages": [
-      {
-        "Name": "SSRSPackage",
-        "Id": "5f4c7059-081e-44d7-bfea-6b9a90c4e77c",
-        "PackageId": null,
-        "FeedId": null,
-        "AcquisitionLocation": "Server",
-        "Properties": {
-          "Extract": "True",
-          "SelectionMode": "deferred",
-          "PackageParameterName": "SSRSPackage"
-        }
-      }
-    ],
-    "Properties": {
-      "Octopus.Action.Script.ScriptBody": "$DeployedPath = $OctopusParameters[\"Octopus.Action.Package[SSRSPackage].ExtractedPath\"]\n$ReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$UseArchiveStructure = [Convert]::ToBoolean($OctopusParameters[\"UseArchiveStructure\"])\n\n#region Upload-Item\nFunction Upload-Item\n{\n    # parameters\n    param ([string] $Item, [string]$ItemType, [string] $ItemFolder)\n\n    Write-Host \"Loading data from $Item\"\n    $ItemData = [System.IO.File]::ReadAllBytes($Item)\n\n    # Create local variables\n    $Warnings = $null\n    $ItemName = $Item.SubString($Item.LastIndexOf(\"\\\") + 1)\n    #$ItemName = $ItemName.SubString(0, $ItemName.IndexOf(\".\"))\n    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf(\".\"))\n   \n\t# upload item\n    if ($IsReportService2005) {\n        if($ItemType -eq \"Report\")\n        {\n\t        [void]$ReportServerProxy.CreateReport($ItemName, $ItemFolder, $true, $ItemData, $null)\n        }\n        else\n        {\n            # error\n            Write-Error \"$ItemType is not supported in ReportService2005\"\n        }\n\t}\n\telseif ($IsReportService2010) {\n\t\t[void]$ReportServerProxy.CreateCatalogItem($ItemType, $ItemName, $ItemFolder, $true, $ItemData, $null, [ref] $Warnings);\n\t}\n\telse { Write-Warning 'Report Service Unknown in Upload-Item method. Use ReportService2005 or ReportService2010.' }\n}\n#endregion\n\n#region Get-ItemDataSourceNames()\nFunction Get-ItemDataSourceNames\n{\n    # Parameters\n    Param ($ItemFile, $DataSourceName)\n\n    # declare working variables\n    $DataSourceNames = @()\n    \n    # load the xml\n    [xml]$Xml = Get-Content $ItemFile\n\n    # retrieve the datasource nodes\n    $DataSourceReferenceNodes = $Xml.GetElementsByTagName(\"DataSource\")\n\n    # loop through returned results\n    foreach($Node in $DataSourceReferenceNodes)\n    {\n        # check to see if we're looking for a specific one\n        if($DataSourceName -ne $null)\n        {\n            # check to see if it's the current node\n            if($DataSourceName -eq $Node.Name)\n            {\n                # add\n                $DataSourceNames += $Node.DataSourceReference\n            }\n        }\n        else\n        {\n            # store the name\n            $DataSourceNames += $Node.DataSourceReference\n        }\n    }\n\n    # return the results\n    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?\n}\n#endregion\n\n#region Get-ItemDataSources()\nFunction Get-ItemDataSources\n{\n    # Parameters\n    Param ($ItemFile)\n\n    # declare working variables\n    $DataSourceNames = @()\n    \n    # load the xml\n    [xml]$Xml = Get-Content $ItemFile\n\n    # retrieve the datasource nodes\n    $DataSourceReferenceNodes = $Xml.GetElementsByTagName(\"DataSource\")\n\n    # loop through returned results\n    foreach($Node in $DataSourceReferenceNodes)\n    {\n        # store the name\n        $DataSourceNames += $Node.Name\n    }\n\n    # return the results\n    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?\n}\n#endregion\n\n#region Get-ItemDataSourceReferenceNames\nFunction Get-ItemDataSourceReferenceNames\n{\n    # Parameters\n    Param ($ItemFile)\n\n    # declare working variables\n    $DataSourceNames = @()\n    \n    # load the xml\n    [xml]$Xml = Get-Content $ItemFile\n\n    # retrieve the datasource nodes\n    $DataSourceReferenceNodes = $Xml.GetElementsByTagName(\"DataSourceReference\")\n\n    # loop through returned results\n    foreach($Node in $DataSourceReferenceNodes)\n    {\n        # get the data\n        $DataSourceNames += $Node.InnerText\n    }\n\n    # return the results\n    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?\n}\n#endregion\n\n#region Get-DataSetSharedReferenceName\nFunction Get-DataSetSharedReferenceName\n{\n    # parameters\n    param($ReportFile, $DataSetName)\n\n    # load the xml\n    [xml]$ReportXml = Get-Content $ReportFile\n\n    # Get the DataSet nodes\n    $DataSetNode = $ReportXml.GetElementsByTagName(\"DataSet\") | Where-Object {$_.Name -eq $DataSetName}\n\n    # return the name\n    $DataSetNode.SharedDataSet.SharedDataSetReference\n}\n#endregion\n\n#region Item-Exists()\nFunction Item-Exists($ItemFolderPath, $ItemName)\n{\n    # declare search condition\n    $SearchCondition = New-Object \"$ReportServerProxyNamespace.SearchCondition\";\n\n    # fill in properties\n    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.ConditionEnum\" -EnumName \"Equals\"\n    $SearchCondition.ConditionSpecified = $true\n    $SearchCondition.Name = \"Name\"\n    $SearchPath = $(if ([string]::IsNullOrWhitespace($ItemFolderPath)) { \"/\"} else { $ItemFolderPath } )\n\n\tif ($IsReportService2005) {\n\t\t$SearchCondition.Value = $ItemName\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($SearchPath, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $SearchCondition)\n\t}\n\telseif ($IsReportService2010) {\n\t\t$SearchCondition.Values = @($ItemName)\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($SearchPath, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $null, $SearchCondition)\n\t}\n\telse { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    \n\n\n    # check to see if anything was returned\n    if($items.Length -gt 0)\n    {\n        # loop through returned items\n        foreach($item in $items)\n        {\n            # check the path\n            if($item.Path -eq \"$ItemFolderPath/$ItemName\")\n            {\n                # return true\n                return $true\n            }\n            else\n            {\n                # warn\n                Write-Warning \"Unexpected path for $($item.Name); path is $($item.Path) exepected $ItemFolderPath/$ItemName\"\n            }\n        }\n\n        # items were found, but the path doesn't match\n        \n        return $false\n    }\n    else\n    {\n        return $false\n    }\n}\n#endregion\n\nFunction Get-ItemPath\n{\n    # Define parameters\n    param(\n    $ItemName,\n    $StartFolder,\n    $CompareFolderPath)\n\n    # declare search condition\n    $SearchCondition = New-Object \"$ReportServerProxyNamespace.SearchCondition\";\n\n    # fill in properties\n    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.ConditionEnum\" -EnumName \"Equals\"\n    $SearchCondition.ConditionSpecified = $true\n    $SearchCondition.Name = \"Name\"\n\n\tif ($IsReportService2005) {\n\t\t$SearchCondition.Value = $ItemName\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $SearchCondition)\n\t}\n\telseif ($IsReportService2010) {\n\t\t$SearchCondition.Values = @($ItemName)\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $null, $SearchCondition)\n\t}\n\telse { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    \n\n    # Check how many items were returned\n    if ($items.Length -eq 1)\n    {\n        return $items[0].Path\n    }\n    else\n    {\n        # Loop through returned items\n        foreach ($item in $items)\n        {\n            # compare folders\n            if ($CompareFolderPath -eq ($item.Path.SubString(0, $item.Path.LastIndexOf(\"/\"))))\n            {\n                # Display message we're guessing\n                Write-Host \"Multiple items were found with name $ItemName, assuming location is same folder as reference, $CompareFolderPath.\"\n                return $item.Path\n            }\n        }\n\n        # Display warning\n        Write-Warning \"Multiple items were returned for $ItemName, unable to determine which one to return.\"\n        return [string]::Empty\n    }    \n}\n\n#region Set-ItemDataSources()\nFunction Set-ItemDataSources\n{\n    # parameters\n    Param($ItemFile, $ItemFolder)\n\n    # declare local variables\n    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf(\"\\\") + 1)\n    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf(\".\"))\n    $AllDataSourcesFound = $true\n    \n    # get the datasources\n    $DataSources = $ReportServerProxy.GetItemDataSources([string]::Format(\"{0}/{1}\", $ItemFolder, $ItemName))\n\n    #loop through retrieved datasources\n    foreach($DataSource in $DataSources)\n    {\n        # check to see if it's a dataset\n        if([System.IO.Path]::GetExtension($ItemFile).ToLower() -eq \".rsd\")\n        {\n            # datasets can have one and only one datasource\n            # The method GetItemDataSources does not return the name of the datasource for datasets like it does for reports\n            # instead, it alaways returns DataSetDataSource.  This made the call to Get-ItemDataSourceNames necessary,\n            # otherwise it would not link correctly\n            $DataSourceName = (Get-ItemDataSourceReferenceNames -ItemFile $ItemFile)[0]\n        }\n        else\n        {\n            # get the anme from teh source itself\n            $DataSourceName = (Get-ItemDataSourceNames -ItemFile $ItemFile -DataSourceName $DataSource.Name)[0]\n        }        \n        \n        if ([string]::IsNullOrWhiteSpace($DataSourceName))\n        {\n            Write-Host \"Datasource $($DataSource.Name) is not a shared datasource, skipping.\"\n            $AllDataSourcesFound = $false\n            continue\n        }\n       \n        # Check to see if datasourcename contains the folder -- this can happen if the report was created by Report Builder\n        if((![string]::IsNullOrEmpty($ReportDataSource)) -and ($DataSourceName.ToLower().Contains($ReportDatasourceFolder.ToLower())))\n        {\n            # Remove teh path from the item name\n            $DataSourceName = $DataSourceName.ToLower().Replace(\"$($ReportDatasourceFolder.ToLower())/\",\"\")\n        }\n\n        $DatasourcePath = \"\"\n\n        if ($UseArchiveStructure -eq $true)\n        {\n            $DatasourcePath = Get-ItemPath -ItemName $DataSourceName -StartFolder $RootFolder -CompareFolderPath $ItemFolder\n            $DatasourcePath = $DatasourcePath.SubString(0, $DatasourcePath.LastIndexOf(\"/\"))\n        }\n        else\n        {\n            $DatasourcePath = $ReportDatasourceFolder\n        }\n\n        # check to make sure the datasource exists in the location specified\n        if((Item-Exists -ItemFolderPath $DatasourcePath -ItemName $DataSourceName) -eq $true)\n        {\n            # create datasource reference variable\n            $DataSourceReference = New-Object \"$ReportServerProxyNamespace.DataSourceReference\";\n\n            # assign\n            $DataSourceReference.Reference = \"$DatasourcePath/\" + $DataSourceName\n            $DataSource.Item = $DataSourceReference            \n        }\n        else\n        {\n            # display warning\n            Write-Warning \"Unable to find datasource $($DataSourceName) in $DatasourcePath\"\n\n            # update to false\n            $AllDataSourcesFound = $false\n        }        \n    }\n\n    # check to see if found all datasources\n    if($AllDataSourcesFound -eq $true)\n    {\n        Write-Host \"Linking datasources to $ItemFolder/$ItemName\"\n        \n        # save the references\n        $ReportServerProxy.SetItemDataSources(\"$ItemFolder/$ItemName\", $DataSources)\n    }\n}\n#endregion\n\n#region Set-ReportDataSets()\nFunction Set-ReportDataSets\n{\n    # parameters\n    param($ReportFile, $ReportFolderPath)\n\n    # declare local variables\n    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf(\"\\\") + 1)\n    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf(\".\"))\n    $AllDataSetsFound = $true\n    $DataSetFolder = \"\"\n\n    # get the datasources\n    $DataSets = $ReportServerProxy.GetItemReferences([string]::Format(\"{0}/{1}\", $ReportFolderPath, $ReportName), \"DataSet\")\n\n    # loop through returned values\n    foreach($DataSet in $DataSets)\n    {\n        # get the name of the shared data set reference\n        $SharedDataSetReferenceName = Get-DataSetSharedReferenceName -ReportFile $ReportFile -DataSetName $DataSet.Name\n\n        # Check to see if the SharedDataSetReferenceName contains the folder path -- this can happen if the report was built using Report Builder\n        if((![string]::IsNullOrEmpty($ReportDataSetFolder)) -and ($SharedDataSetReferenceName.ToLower().Contains($ReportDataSetFolder.ToLower())))\n        {\n            # Remove the folder path from the name, it will cause issues when trying to set\n            $SharedDataSetReferenceName = $SharedDataSetReferenceName.ToLower().Replace(\"$($ReportDataSetFolder.ToLower())/\", \"\")\n        }\n        \n        # Check to see if we're using the archive folder structure\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Set dataset folder\n            $DataSetFolder = Get-ItemPath -ItemName $SharedDataSetReferenceName -StartFolder $RootFolder -CompareFolderPath $ReportFolderPath\n            $DataSetFolder = $DataSetFolder.SubString(0, $DataSetFolder.LastIndexOf(\"/\"))\n        }\n        else\n        {\n            $DataSetFolder = $ReportDataSetFolder\n        }\n\n        # check to make sure the datasource exists in the location specified\n        if((Item-Exists -ItemFolderPath $DataSetFolder -ItemName $SharedDataSetReferenceName) -eq $true)\n        {\n            # create datasource reference variable\n            $DataSetReference = New-Object \"$ReportServerProxyNamespace.ItemReference\";\n\n            # assign\n            $DataSetReference.Reference = \"$DataSetFolder/\" + $SharedDataSetReferenceName\n            $DataSetReference.Name = $DataSet.Name\n\n            # log\n            Write-Host \"Linking Shared Data Set $($DataSet.Name) to $ReportName\"\n            \n            # update reference\n            $ReportServerProxy.SetItemReferences(\"$ReportFolderPath/$ReportName\", @($DataSetReference))\n        }\n        else\n        {\n            # get the datasource name to include in warning message -- I know there must be a way to use the property in a string literal, but I wasn't able to figure it out while trying\n            # to solve a reported bug so I took the easy way.\n            $DataSetName = $DataSet.Name\n            \n            # display warning\n            Write-Warning \"Unable to find dataset $DataSetName in $ReportDataSetFolder\"\n\n            # update to false\n            $AllDataSetsFound = $false\n        }            \n    }\n\n    # check to see if all datsets were found\n    if($AllDataSetsFound -eq $False)\n    {\n        Write-Warning \"Not all datasets found\"\n\n        # save the references\n        $ReportServerProxy.SetItemReferences(\"$ReportFolder/$ReportName\", @($DataSets))\n    }\n}\n\n#endregion\n\n#region Get-ObjectNamespace()\nFunction Get-ObjectNamespace($Object)\n{\n    # return the value\n    ($Object).GetType().ToString().SubString(0, ($Object).GetType().ToString().LastIndexOf(\".\"))\n}\n#endregion\n\n#region Get-SpecificEnumValue()\nFunction Get-SpecificEnumValue($EnumNamespace, $EnumName)\n{\n    # get the enum values\n    $EnumValues = [Enum]::GetValues($EnumNamespace)\n\n    # Loop through to find the specific value\n    foreach($EnumValue in $EnumValues)\n    {\n        # check current\n        if($EnumValue -eq $EnumName)\n        {\n            # return it\n            return $EnumValue\n        }\n    }\n\n    # nothing was found\n    return $null\n}\n#endregion\n\n#region Update-ReportParamters()\nFunction Update-ReportParameters($ReportFile, $ReportFolderPath)\n{\n    # declare local variables\n    $ReportParameters = @();\n    \n    # necessary so that when attempting to use the report execution service, it doesn't puke on you when it can't find the data source\n    $ReportData = (Remove-SharedReferences -ReportFile $ReportFile)\n\n    # get just the report name\n    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf(\"\\\") + 1)\n    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf(\".\"))\n    \n    # create warnings object\n    $ReportExecutionWarnings = $null\n\n    # set the report full path\n    $ReportPath = \"$ReportFolderPath/$ReportName\" \n\n    # load the report definition\n    $ExecutionInfo = $ReportExecutionProxy.LoadReportDefinition($ReportData, [ref] $ReportExecutionWarnings);\n\n    # loop through the report execution parameters\n    foreach($Parameter in $ExecutionInfo.Parameters)\n    {\n        # create new item parameter object\n        $ItemParameter = New-Object \"$ReportServerProxyNamespace.ItemParameter\";\n\n        # fill in the properties except valid values, that one needs special processing\n        Copy-ObjectProperties -SourceObject $Parameter -TargetObject $ItemParameter;\n\n        # fill in the valid values\n        $ItemParameter.ValidValues = Convert-ValidValues -SourceValidValues $Parameter.ValidValues;\n\n        # exclude if it's query based\n        if($Parameter.DefaultValuesQueryBased -ne $true)\n        {\n            # add to list\n            $ReportParameters += $ItemParameter;\n        }\n    }\n\n    # force the parameters to update\n    Write-Host \"Updating report parameters for $ReportFolderPath/$ReportName\"\n\tif ($IsReportService2005) {\n\t\t$ReportServerProxy.SetReportParameters(\"$ReportFolderPath/$ReportName\", $ReportParameters);\n\t}\n\telseif ($IsReportService2010) {\n\t\t$ReportServerProxy.SetItemParameters(\"$ReportFolderPath/$ReportName\", $ReportParameters);\n\t}\n\telse { Write-Warning 'Report Service Unknown in Update-ReportParameters method. Use ReportService2005 or ReportService2010.' }\n}\n#endregion\n\n#region Remove-ShareReferences()\nFunction Remove-SharedReferences($ReportFile)\n{\n    ######################################################################################################\n    #You'll notice that I've used the keyword of [void] in front of some of these method calls, this is so\n    #that the operation isn't captured as output of the function\n    ######################################################################################################\n\n    # read xml\n    [xml]$ReportXml = Get-Content $ReportFile -Encoding UTF8;\n    \n    # create new memory stream object\n    $MemoryStream = New-Object System.IO.MemoryStream\n\n    try\n    {\n\n        # declare array of nodes to remove\n        $NodesToRemove = @();\n\n        # get datasource names\n        $DataSourceNames = Get-ItemDataSources -ItemFile $ReportFile\n\n        # check to see if report has datasourcenames\n        if($DataSourceNames.Count -eq 0)\n        {\n            # Get reference to reportnode\n            $ReportNode = $ReportXml.FirstChild.NextSibling # Kind of a funky way of getting it, but the SelectSingleNode(\"//Report\") wasn't working due to Namespaces in the node\n\n            # create new DataSources node\n            $DataSourcesNode = $ReportXml.CreateNode($ReportNode.NodeType, \"DataSources\", $null)\n\n            # create new datasource node\n            $DataSourceNode = $ReportXml.CreateNode($ReportNode.NodeType, \"DataSource\", $null)\n\n            # create new datasourcereference node\n            $DataSourceReferenceNode = $ReportXml.CreateNode($ReportNode.NodeType, \"DataSourceReference\", $null)\n\n            # create new attribute\n            $DataSourceNameAttribute = $ReportXml.CreateAttribute(\"Name\")\n            $DataSourceNameAttribute.Value = \"DataSource1\"\n            $dataSourceReferenceNode.InnerText = \"DataSource1\"\n\n            # add attribute to datasource node\n            [void]$DataSourceNode.Attributes.Append($DataSourceNameAttribute)\n            [void]$DataSourceNode.AppendChild($DataSourceReferenceNode)\n\n            # add nodes\n            [void]$ReportNode.AppendChild($DataSourcesNode)\n            [void]$DataSourcesNode.AppendChild($DataSourceNode)\n\n            # add fake datasource name to array\n            $DataSourceNames += \"DataSource1\"\n        }\n\n        # get all datasource nodes\n        $DatasourceNodes = $ReportXml.GetElementsByTagName(\"DataSourceReference\");\n\n        # loop through returned nodes\n        foreach($DataSourceNode in $DatasourceNodes)\n        {\n            # create a new connection properties node\n            $ConnectionProperties = $ReportXml.CreateNode($DataSourceNode.NodeType, \"ConnectionProperties\", $null);\n\n            # create a new dataprovider node\n            $DataProvider = $ReportXml.CreateNode($DataSourceNode.NodeType, \"DataProvider\", $null);\n            $DataProvider.InnerText = \"SQL\";\n\n            # create new connection string node\n            $ConnectString = $ReportXml.CreateNode($DataSourceNode.NodeType, \"ConnectString\", $null);\n            $ConnectString.InnerText = \"Data Source=Server Name Here;Initial Catalog=database name here\";\n\n            # add new node to parent node\n            [void] $DataSourceNode.ParentNode.AppendChild($ConnectionProperties);\n\n            # append childeren\n            [void] $ConnectionProperties.AppendChild($DataProvider);\n            [void] $ConnectionProperties.AppendChild($ConnectString);\n\n            # Add to remove list \n            $NodesToRemove += $DataSourceNode;\n        }\n\n        # get all shareddataset nodes\n        $SharedDataSetNodes = $ReportXml.GetElementsByTagName(\"SharedDataSet\")\n\n        #loop through the returned nodes\n        foreach($SharedDataSetNode in $SharedDataSetNodes)\n        {\n            # create holder nodes so it won't error\n            $QueryNode = $ReportXml.CreateNode($SharedDataSetNode.NodeType, \"Query\", $null);\n            $DataSourceNameNode = $ReportXml.CreateNode($QueryNode.NodeType, \"DataSourceName\", $null);\n            $CommandTextNode = $ReportXml.CreateNode($QueryNode.NodeType, \"CommandText\", $null);\n\n            # add valid datasource name, just get the first in the list\n            $DataSourceNameNode.InnerText = $DataSourceNames[0]\n            \n            # add node to parent\n            [void] $SharedDataSetNode.ParentNode.Appendchild($QueryNode)\n            \n            # add datasourcename and commandtext to query node\n            [void]$QueryNode.AppendChild($DataSourceNameNode)\n            [void]$QueryNode.AppendChild($CommandTextNode)\n\n            # add node to removelist\n            $NodesToRemove += $SharedDataSetNode\n        }\n\n\n        # loop through nodes to remove\n        foreach($Node in $NodesToRemove)\n        {\n            # remove from parent\n            [void] $Node.ParentNode.RemoveChild($Node);\n        }\n    \n        $ReportXml.InnerXml = $ReportXml.InnerXml.Replace(\"xmlns=`\"`\"\", \"\")\n\n        # save altered xml to memory stream\n        $ReportXml.Save($MemoryStream);\n\n        # return the altered xml as byte array\n        return $MemoryStream.ToArray();\n    }\n    finally\n    {\n        # close and dispose\n        $MemoryStream.Close();\n        $MemoryStream.Dispose();\n    }\n}\n#endregion\n\n\n#region Copy-ObjectProperties()\nFunction Copy-ObjectProperties($SourceObject, $TargetObject)\n{\n    # Get source object property array\n    $SourcePropertyCollection = $SourceObject.GetType().GetProperties();\n\n    # get the destination\n    $TargetPropertyCollection = $TargetObject.GetType().GetProperties();\n\n    # loop through source property collection\n    for($i = 0; $i -lt $SourcePropertyCollection.Length; $i++)\n    {\n        # get the target property\n        $TargetProperty = $TargetPropertyCollection | Where {$_.Name -eq $SourcePropertyCollection[$i].Name}\n        \n        # check to see if it's null\n        if($TargetProperty -ne $null)\n        {\n            # check to see if it's the valid values property\n            if($TargetProperty.Name -ne \"ValidValues\")\n            {\n                 # set the value\n                $TargetProperty.SetValue($TargetObject, $SourcePropertyCollection[$i].GetValue($SourceObject));\n            }\n        }\n    }\n}\n#endregion\n\n#region ConvertValidValues()\nFunction Convert-ValidValues($SourceValidValues)\n{\n    # declare local values\n    $TargetValidValues = @();\n    \n    # loop through source values\n    foreach($SourceValidValue in $SourceValidValues)\n    {\n        # create target valid value object\n        $TargetValidValue = New-Object \"$ReportServerProxyNamespace.ValidValue\";\n\n        # copy properties\n        Copy-ObjectProperties -SourceObject $SourceValidValue -TargetObject $TargetValidValue\n\n        # add to list\n        $TargetValidValues += $TargetValidValue\n    }\n\n    # return the values\n    return ,$TargetValidValues\n}\n#endregion\n\n#region Backup-ExistingItem()\nFunction Backup-ExistingItem\n{\n    # parameters\n    Param($ItemFile, $ItemFolder)\n\n    # declare local variables\n    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf(\"\\\") + 1)\n    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf(\".\"))\n\n    # check to see if the item exists\n    if((Item-Exists -ItemFolderPath $ItemFolder -ItemName $ItemName) -eq $true)\n    {\n        # get file extension\n        $FileExtension = [System.IO.Path]::GetExtension($ItemFile)\n    \n        # check backuplocation\n        if($BackupLocation.EndsWith(\"\\\") -ne $true)\n        {\n            # append ending slash\n            $BackupLocation = $BackupLocation + \"\\\"\n        }\n\t\t\n\t\t# add the release number to the backup location\n\t\t$BackupLocation = $BackupLocation + $ReleaseNumber + \"\\\"\n\n        # ensure the backup location actually exists\n        if((Test-Path $BackupLocation) -ne $true)\n        {\n            # create it\n            New-Item -ItemType Directory -Path $BackupLocation\n        }\n\n        # download the item\n        $Item = $ReportServerProxy.GetItemDefinition(\"$ItemFolder/$ItemName\")\n\n        # form the backup path\n        $BackupPath = \"{0}{1}{2}\" -f $BackupLocation, $ItemName, $FileExtension;\n\n        # write to disk\n        [System.IO.File]::WriteAllBytes(\"$BackupPath\", $Item);\n\n        # write to screen\n        Write-Host \"Backed up $ItemFolder/$ItemName to $BackupPath\";\n    }\n}\n#endregion\n\n#region Normalize-SSRSFolder()\nfunction Normalize-SSRSFolder ([string]$Folder) {\n    if (-not $Folder.StartsWith('/')) {\n        $Folder = '/' + $Folder\n    }\n    \n    return $Folder\n}\n#endregion\n\n#region New-SSRSFolder()\nfunction New-SSRSFolder ([string] $Name) {\n    Write-Verbose \"New-SSRSFolder -Name $Name\"\n \n    $Name = Normalize-SSRSFolder -Folder $Name\n \n    if ($ReportServerProxy.GetItemType($Name) -ne 'Folder') {\n        $Parts = $Name -split '/'\n        $Leaf = $Parts[-1]\n        $Parent = $Parts[0..($Parts.Length-2)] -join '/'\n \n        if ($Parent) {\n            New-SSRSFolder -Name $Parent\n        } else {\n            $Parent = '/'\n        }\n        \n        $ReportServerProxy.CreateFolder($Leaf, $Parent, $null)\n    }\n}\n#endregion\n\n#region Clear-SSRSFolder()\nfunction Clear-SSRSFolder ([string] $Name) {\n    Write-Verbose \"Clear-SSRSFolder -Name $Name\"\n    \n    $Name = Normalize-SSRSFolder -Folder $Name\n    \n    if ($ReportServerProxy.GetItemType($Name) -eq 'Folder' -and $ClearReportFolder) {\n        Write-Host (\"Clearing the {0} folder\" -f $Name)\n        $ReportServerProxy.ListChildren($Name, $false) | ForEach-Object {\n            Write-Verbose \"Deleting item: $($_.Path)\"\n            $ReportServerProxy.DeleteItem($_.Path)\n        }\n    }\n}\n#endregion\n\n#region New-SSRSDataSource()\nfunction New-SSRSDataSource ([string]$RdsPath, [string]$Folder, [bool]$OverwriteDataSources) {\n    Write-Verbose \"New-SSRSDataSource -RdsPath $RdsPath -Folder $Folder\"\n\n    $Folder = Normalize-SSRSFolder -Folder $Folder\n    \n    [xml]$Rds = Get-Content -Path $RdsPath\n    $dsName = $Rds.RptDataSource.Name\n    $ConnProps = $Rds.RptDataSource.ConnectionProperties\n    \n\t$type = $ReportServerProxy.GetType().Namespace #Get proxy type\n\t$DSDdatatype = ($type + '.DataSourceDefinition')\n\t \n\t$Definition = new-object ($DSDdatatype)\n\tif($Definition -eq $null){\n\t Write-Error Failed to create data source definition object\n\t}\n\t\n\t$dsConnectionString = $($OctopusParameters[\"$($dsName).ConnectionString\"])\n    $dsUsername = $($OctopusParameters[\"$($dsName).Username\"])\n    $dsPassword = $($OctopusParameters[\"$($dsName).Password\"])\n    $dsCredentialRetrieval = $($OctopusParameters[\"$($dsName).CredentialRetrieval\"])\n    \n\t# replace the connection string variable that is configured in the octopus project\n\tif ($dsConnectionString) {\n\t    $Definition.ConnectString = $dsConnectionString\n\t} else {\n\t    $Definition.ConnectString = $ConnProps.ConnectString\n\t}\n\t\n    $Definition.Extension = $ConnProps.Extension \n\n\t# Check to see if the credential retrieval is overridden\n    if ($null -ne $dsCredentialRetrieval)\n    {\n    \tWrite-Host \"Forcing CredentialRetrieval property to: $dsCredentialRetrieval.\"\n        $Definition.CredentialRetrieval = $dsCredentialRetrieval\n    }\n    else\n    {\n    \t# Set the Credential Retrieval method\n    \tif ([Convert]::ToBoolean($ConnProps.IntegratedSecurity)) {\n\t\t\t$Definition.CredentialRetrieval = 'Integrated'\n\t\t}\n        elseif (![string]::IsNullOrWhitespace($dsUsername) -and ![string]::IsNullOrWhitespace($dsPassword))\n        {\n        \t$Definition.CredentialRetrieval = 'Store'\n        }\n    }\n       \n\tif ($Definition.CredentialRetrieval -eq 'Store')\n    {\t\t\n\t\tWrite-Host \"$($dsName).Username = '$dsUsername'\"\n\t\tWrite-Host \"$($dsName).Password = '$dsPassword'\"\n\t\t\n\t\t$Definition.UserName = $dsUsername;\n        $Definition.Password = $dsPassword;\n\t}\n    \n    # Check to see if this is supposed to be an Windows Authentication stored account\n    if ($OctopusParameters[\"$($dsName).WindowsCredentials\"] -eq \"true\")\n    {\n\t    # Set the definition to Windows Credentials\n    \t$Definition.WindowsCredentials = $true\n    }\n    \n\n    $DataSource = New-Object -TypeName PSObject -Property @{\n        Name = $Rds.RptDataSource.Name\n        Path =  $Folder + '/' + $Rds.RptDataSource.Name\n    }\n    \n    if ($OverwriteDataSources -or $ReportServerProxy.GetItemType($DataSource.Path) -eq 'Unknown') {\n        Write-Host \"Overwriting datasource $($DataSource.Name)\"\n        $ReportServerProxy.CreateDataSource($DataSource.Name, $Folder, $OverwriteDataSources, $Definition, $null)\n    }\n    \n    return $DataSource \n}\n#endregion\n\n#region Main\n\ntry\n{\n    # declare array for reports\n    $ReportFiles = @()\n\t$ReportDataSourceFiles = @()\n    $ReportDataSetFiles = @()\n    $ReportPartFiles = @()\n\t\n\t$IsReportService2005 = $false\n\t$IsReportService2010 = $false\n\t\n\tif ($ReportServiceUrl.ToLower().Contains('reportservice2005.asmx')) {\n\t\t$IsReportService2005 = $true\n\t\tWrite-Host \"2005 Report Service found.\"\n\t}\n\telseif ($ReportServiceUrl.ToLower().Contains('reportservice2010.asmx')) {\n\t\t$IsReportService2010 = $true\n\t\tWrite-Host \"2010 Report Service found.\"\n\t}\n\t\n\tWrite-Host \"Deploy Path: $DeployedPath\"\n\t\n    # get all report files for deployment\n    Write-Host \"Getting all .rdl files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rdl\" | ForEach-Object { If(($ReportFiles -contains $_.FullName) -eq $false) {$ReportFiles += $_.FullName}}\n    Write-Host \"# of rdl files found: $($ReportFiles.Count)\"\n\n    # get all report datasource files for deployment\n    Write-Host \"Getting all .rds files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rds\" | ForEach-Object { If(($ReportDataSourceFiles -contains $_.FullName) -eq $false) {$ReportDataSourceFiles += $_.FullName}}\n    Write-Host \"# of rds files found: $($ReportDataSourceFiles.Count)\"\n\n    # get all report datset files for deployment\n    Write-Host \"Getting all .rsd files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rsd\" | ForEach-Object { If(($ReportDataSetFiles -contains $_.FullName) -eq $false) {$ReportDataSetFiles += $_.FullName}}\n    Write-Host \"# of rsd files found: $($ReportDataSetFiles.Count)\"\n\n    # get all report part files for deployment\n    Write-Host \"Getting all .rsc files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rsc\" | ForEach-Object { If(($ReportPartFiles -contains $_.FullName) -eq $false) {$ReportPartFiles += $_.FullName}}\n    Write-Host \"# of rsc files found: $($ReportPartFiles.Count)\"\n\n    # set the report proxies\n    Write-Host \"Creating SSRS Web Service proxies\"\n\n    # check to see if credentials were supplied for the services\n    if(([string]::IsNullOrEmpty($ServiceUserDomain) -ne $true) -and ([string]::IsNullOrEmpty($ServiceUserName) -ne $true) -and ([string]::IsNullOrEmpty($ServicePassword) -ne $true))\n    {\n        # secure the password\n        $secpasswd = ConvertTo-SecureString \"$ServicePassword\" -AsPlainText -Force\n\n        # create credential object\n        $ServiceCredential = New-Object System.Management.Automation.PSCredential (\"$ServiceUserDomain\\$ServiceUserName\", $secpasswd)\n\n        # create proxies\n        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -Credential $ServiceCredential\n        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -Credential $ServiceCredential\n    }\n    else\n    {\n        # create proxies using current identity\n        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -UseDefaultCredential \n        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -UseDefaultCredential \n    }\n\n\n\n\t#Create folder information for DataSource and Report\n    if ($UseArchiveStructure -eq $false)\n    {\n\t    New-SSRSFolder -Name $ReportFolder\n\t    New-SSRSFolder -Name $ReportDatasourceFolder\n        New-SSRSFolder -Name $ReportDataSetFolder\n        New-SSRSFolder -Name $ReportPartsFolder\n    }\n    else\n    {\n        New-SSRSFolder -Name $RootFolder\n    }\n    \n    #Clear destination folder if specified\n    if([System.Convert]::ToBoolean(\"$ClearReportFolder\")) {\n        Clear-SSRSFolder -Name $ReportFolder\n    }\n\t \n\t#Create DataSource\n    foreach($RDSFile in $ReportDataSourceFiles) {\n        Write-Host \"New-SSRSDataSource $RdsFile\"\n\n        $DatasourceFolder = \"\"\n\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Adjust report folder to archive path\n            $DatasourceFolder = $(if ($RootFolder -eq \"/\") { [string]::Empty} else { $RootFolder } ) + $RDSFile.Replace($DeployedPath, '').Replace('\\', '/').Replace((Split-Path $RDSFile -Leaf), '')\n\n            # Remove final slash\n            $DatasourceFolder = $DatasourceFolder.Substring(0, $DatasourceFolder.LastIndexOf('/'))    \n            \n            # Check if folder exists\n            New-SSRSFolder -Name $DatasourceFolder                    \n        }\n        else\n        {\n            $DatasourceFolder = $ReportDatasourceFolder\n        }\n        \n\t\t$DataSource = New-SSRSDataSource -RdsPath $RdsFile -Folder $DatasourceFolder -Overwrite ([System.Convert]::ToBoolean(\"$OverwriteDataSources\"))\n\t}\n\n    # get the service proxy namespaces - this is necessary because of a bug documented here http://stackoverflow.com/questions/7921040/error-calling-reportingservice2005-finditems-specifically-concerning-the-bool and http://www.vistax64.com/powershell/273120-bug-when-using-namespace-parameter-new-webserviceproxy.html\n    $ReportServerProxyNamespace = Get-ObjectNamespace -Object $ReportServerProxy\n    $ReportExecutionProxyNamespace = Get-ObjectNamespace -Object $ReportExecutionProxy\n\n    # Create dat sets\n    foreach($DataSet in $ReportDataSetFiles)\n    {\n        $DataSetPath = \"\"\n\n        # Check to see if it's set to follow archive structure\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Adjust report folder to archive path\n            $DataSetPath = $(if ($RootFolder -eq \"/\") { [string]::Empty} else { $RootFolder } ) + $DataSet.Replace($DeployedPath, '').Replace('\\', '/').Replace((Split-Path $DataSet -Leaf), '')\n\n            # Remove final slash\n            $DataSetPath = $DataSetPath.Substring(0, $DataSetPath.LastIndexOf('/'))\n\n            # Check if folder exists\n            New-SSRSFolder -Name $DataSetPath\n        }\n        else\n        {\n            $DataSetPath = $ReportDataSetFolder\n        }\n\n        # check to see if we need to back up\n        if($BackupLocation -ne $null -and $BackupLocation -ne \"\")\n        {\n            # backup the item\n            Backup-ExistingItem -ItemFile $DataSet -ItemFolder $DataSetPath\n        }\n\n        # upload the dataset\n        Upload-Item -Item $DataSet -ItemType \"DataSet\" -ItemFolder $DataSetPath\n\n        # update the dataset datasource\n        Set-ItemDataSources -ItemFile $DataSet -ItemFolder $DataSetPath\n    }\n\n    # get the proxy auto generated name spaces\n\n    # loop through array\n    foreach($ReportFile in $ReportFiles)\n    {\n        $ReportPath = \"\"\n\n        # Check to see if it's set to follow archive structure\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Adjust report folder to archive path\n            $ReportPath = $(if ($RootFolder -eq \"/\") { [string]::Empty} else { $RootFolder } ) + $ReportFile.Replace($DeployedPath, '').Replace('\\', '/').Replace((Split-Path $ReportFile -Leaf), '')\n\n            # Remove final slash\n            $ReportPath = $ReportPath.Substring(0, $ReportPath.LastIndexOf('/'))\n\n            # Check if folder exists\n            New-SSRSFolder -Name $ReportPath\n        }\n        else\n        {\n            $ReportPath = $ReportFolder\n        }\n\n        # check to see if we need to back up\n        if($BackupLocation -ne $null -and $BackupLocation -ne \"\")\n        {\n            # backup the item\n            Backup-ExistingItem -ItemFile $ReportFile -ItemFolder $ReportPath\n        }\n        \n        \n        # upload report\n        Upload-Item -Item $ReportFile -ItemType \"Report\" -ItemFolder $ReportPath\n\n        # extract datasources\n        #Write-Host \"Extracting datasource names for $ReportFile\"\n        #$ReportDataSourceNames = Get-ReportDataSourceNames $ReportFile\n\n        # set the datasources\n        Set-ItemDataSources -ItemFile $ReportFile -ItemFolder $ReportPath\n\n        # set the datasets\n        Set-ReportDataSets -ReportFile $ReportFile -ReportFolderPath $ReportPath\n\n        # update the report parameters\n        Update-ReportParameters -ReportFile $ReportFile -ReportFolderPath $ReportPath\n    }\n    \n    # loop through rsc files\n    foreach($ReportPartFile in $ReportPartFiles)\n    {\n        # check to see if we need to back up\n        if($BackupLocation -ne $null -and $BackupLocation -ne \"\")\n        {\n            # backup the item\n            Backup-ExistingItem -ItemFile $ReportPartFile -ItemFolder $ReportPartsFolder\n        }\n\n\t\t# upload item\n        Upload-Item -Item $ReportPartFile -ItemType \"Component\" -ItemFolder $ReportPartsFolder\n    }\n    \n}\nfinally\n{\n    # check to see if the proxies are null\n    if($ReportServerProxy -ne $null)\n    {\n        # dispose\n        $ReportServerProxy.Dispose();\n    }\n\n    if($ReportExecutionProxy -ne $null)\n    {\n        # dispose\n        $ReportExecutionProxy.Dispose();\n    }\n}\n\n#endregion\n",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.RunOnServer": "false"
-    },
-    "Parameters": [
-      {
-        "Id": "e339fdfe-376f-4d6b-9226-9d5fc07c0a62",
-        "Name": "SSRSPackage",
-        "Label": "Package",
-        "HelpText": "Select the package containing the SSRS reports.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Package"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ReportServiceUrl",
-        "Label": "Url of SSRS Server service",
-        "HelpText": "The complete Url to the SSRS server.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/reportservice2010.asmx?wsdl",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ReportExecutionUrl",
-        "Label": "Report Execution Url",
-        "HelpText": "The complete Url to the Report Execution service.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/ReportExecution2005.asmx?wsdl",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ReportFolder",
-        "Label": "Report folder",
-        "HelpText": "Relative Url to the folder in which the reports will be deployed.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ReportDatasourceFolder",
-        "Label": "Report data source folder",
-        "HelpText": "Relative Url where the data sources for the reports are located, starting with '/'",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "OverwriteDataSources",
-        "Label": "Overwrite datasource(s)",
-        "HelpText": "Tick if the existing report data source file needs to e replaced.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "BackupLocation",
-        "Label": "Backup Location",
-        "HelpText": "Directory path to take a backup of existing reports (.rdl) and data source (.rds) files.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ReportDataSetFolder",
-        "Label": "DataSet folder",
-        "HelpText": "Relative Url where Shared Data Sets are stored",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ReportPartsFolder",
-        "Label": "Report Parts Folder",
-        "HelpText": "Relative folder where Report Parts are uploaded to.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ServiceUserDomain",
-        "Label": "Service Domain",
-        "HelpText": "(Optional - leave blank to use Tentacle identity) Name of the domain for the user account to execute as",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ServiceUserName",
-        "Label": "Service Username",
-        "HelpText": "(Optional - leave blank to use Tentacle identity) Username of the user account to execute as",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ServicePassword",
-        "Label": "Service Password",
-        "HelpText": "(Optional - leave blank to use Tentacle identity) Password of the user account to execute as",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "ClearReportFolder",
-        "Label": "Clear the Report Folder",
-        "HelpText": "Optional - This will delete all items in the Report Folder before adding items.",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "UseArchiveStructure",
-        "Label": "Use package folder structure",
-        "HelpText": "Tick this box to create folders matching the package folder structure and upload items into their respective folders.  Ticking this box ignores all other folder specifications except Root folder",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "",
-        "Name": "RootFolder",
-        "Label": "Root folder",
-        "HelpText": "Used only when 'Use package folder structure' is checked.  This specifies the root folder on SSRS to start in.  Value is relative so it begins with a /",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-03-11T19:29:06.452Z",
-      "OctopusVersion": "2020.6.4671",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "sql"
-  }
diff --git a/step-templates/ssrs-deploy-from-package.json b/step-templates/ssrs-deploy-from-package.json
deleted file mode 100644
index 1abc928f3..000000000
--- a/step-templates/ssrs-deploy-from-package.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "Id": "4e3a1163-e157-4675-a60c-4dc569d14348",
-  "Name": "Deploy SSRS Reports from a package",
-  "Description": "Uploads SSRS reports to an SSRS server from a package.\n\nThe following Datasource properties can be overidden: ConnectionString, Username, Password, and CredentialRetrieval (valid values are: Integrated, Prompt, Store, or None).  To override the property, create a Variable using the syntax of DatasourceName.PropertyName.  For example: MyDatasource.Username \n\nTo specify the Username and Password are Windows Credentials, create a variable called DatasourceName.WindowsCredentials and set the value to the string value 'true' (minus the quotes).",
-  "ActionType": "Octopus.Script",
-  "Version": 58,
-  "Author": "twerthi",
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$DeployedPath = $OctopusParameters[\"Octopus.Action[$NugetPackageStepName].Output.Package.InstallationDirectoryPath\"]\n$ReleaseNumber = $OctopusParameters[\"Octopus.Release.Number\"]\n$UseArchiveStructure = [Convert]::ToBoolean($OctopusParameters[\"UseArchiveStructure\"])\n\n#region Upload-Item\nFunction Upload-Item \n{\n    # parameters\n    param ([string] $Item, [string]$ItemType, [string] $ItemFolder)\n\n    Write-Host \"Loading data from $Item\"\n    $ItemData = [System.IO.File]::ReadAllBytes($Item)\n\n    # Create local variables\n    $Warnings = $null\n    $ItemName = $Item.SubString($Item.LastIndexOf(\"\\\") + 1)\n    #$ItemName = $ItemName.SubString(0, $ItemName.IndexOf(\".\"))\n    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf(\".\"))\n   \n\t# upload item\n    if ($IsReportService2005) {\n        if($ItemType -eq \"Report\")\n        {\n\t        [void]$ReportServerProxy.CreateReport($ItemName, $ItemFolder, $true, $ItemData, $null)\n        }\n        else\n        {\n            # error\n            Write-Error \"$ItemType is not supported in ReportService2005\"\n        }\n\t}\n\telseif ($IsReportService2010) {\n\t\t[void]$ReportServerProxy.CreateCatalogItem($ItemType, $ItemName, $ItemFolder, $true, $ItemData, $null, [ref] $Warnings);\n\t}\n\telse { Write-Warning 'Report Service Unknown in Upload-Item method. Use ReportService2005 or ReportService2010.' }\n}\n#endregion\n\n#region Get-ItemDataSourceNames()\nFunction Get-ItemDataSourceNames\n{\n    # Parameters\n    Param ($ItemFile, $DataSourceName)\n\n    # declare working variables\n    $DataSourceNames = @()\n    \n    # load the xml\n    [xml]$Xml = Get-Content $ItemFile\n\n    # retrieve the datasource nodes\n    $DataSourceReferenceNodes = $Xml.GetElementsByTagName(\"DataSource\")\n\n    # loop through returned results\n    foreach($Node in $DataSourceReferenceNodes)\n    {\n        # check to see if we're looking for a specific one\n        if($DataSourceName -ne $null)\n        {\n            # check to see if it's the current node\n            if($DataSourceName -eq $Node.Name)\n            {\n                # add\n                $DataSourceNames += $Node.DataSourceReference\n            }\n        }\n        else\n        {\n            # store the name\n            $DataSourceNames += $Node.DataSourceReference\n        }\n    }\n\n    # return the results\n    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?\n}\n#endregion\n\n#region Get-ItemDataSources()\nFunction Get-ItemDataSources\n{\n    # Parameters\n    Param ($ItemFile)\n\n    # declare working variables\n    $DataSourceNames = @()\n    \n    # load the xml\n    [xml]$Xml = Get-Content $ItemFile\n\n    # retrieve the datasource nodes\n    $DataSourceReferenceNodes = $Xml.GetElementsByTagName(\"DataSource\")\n\n    # loop through returned results\n    foreach($Node in $DataSourceReferenceNodes)\n    {\n        # store the name\n        $DataSourceNames += $Node.Name\n    }\n\n    # return the results\n    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?\n}\n#endregion\n\n#region Get-ItemDataSourceReferenceNames\nFunction Get-ItemDataSourceReferenceNames\n{\n    # Parameters\n    Param ($ItemFile)\n\n    # declare working variables\n    $DataSourceNames = @()\n    \n    # load the xml\n    [xml]$Xml = Get-Content $ItemFile\n\n    # retrieve the datasource nodes\n    $DataSourceReferenceNodes = $Xml.GetElementsByTagName(\"DataSourceReference\")\n\n    # loop through returned results\n    foreach($Node in $DataSourceReferenceNodes)\n    {\n        # get the data\n        $DataSourceNames += $Node.InnerText\n    }\n\n    # return the results\n    return ,$DataSourceNames # Apparently using the , in front of the variable is how you return explicit arrays in PowerShell ... could you be more obsure?\n}\n#endregion\n\n#region Get-DataSetSharedReferenceName\nFunction Get-DataSetSharedReferenceName\n{\n    # parameters\n    param($ReportFile, $DataSetName)\n\n    # load the xml\n    [xml]$ReportXml = Get-Content $ReportFile\n\n    # Get the DataSet nodes\n    $DataSetNode = $ReportXml.GetElementsByTagName(\"DataSet\") | Where-Object {$_.Name -eq $DataSetName}\n\n    # return the name\n    $DataSetNode.SharedDataSet.SharedDataSetReference\n}\n#endregion\n\n#region Item-Exists()\nFunction Item-Exists($ItemFolderPath, $ItemName)\n{\n    # declare search condition\n    $SearchCondition = New-Object \"$ReportServerProxyNamespace.SearchCondition\";\n\n    # fill in properties\n    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.ConditionEnum\" -EnumName \"Equals\"\n    $SearchCondition.ConditionSpecified = $true\n    $SearchCondition.Name = \"Name\"\n\n\tif ($IsReportService2005) {\n\t\t$SearchCondition.Value = $ItemName\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($ItemFolderPath, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $SearchCondition)\n\t}\n\telseif ($IsReportService2010) {\n\t\t$SearchCondition.Values = @($ItemName)\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($ItemFolderPath, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $null, $SearchCondition)\n\t}\n\telse { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    \n\n    # check to see if anything was returned\n    if($items.Length -gt 0)\n    {\n        # loop through returned items\n        foreach($item in $items)\n        {\n            # check the path\n            if($item.Path -eq \"$ItemFolderPath/$ItemName\")\n            {\n                # return true\n                return $true\n            }\n            else\n            {\n                # warn\n                Write-Warning \"Unexpected path for $($item.Name); path is $($item.Path) exepected $ItemFolderPath/$ItemName\"\n            }\n        }\n\n        # items were found, but the path doesn't match\n        \n        return $false\n    }\n    else\n    {\n        return $false\n    }\n}\n#endregion\n\nFunction Get-ItemPath\n{\n    # Define parameters\n    param(\n    $ItemName,\n    $StartFolder,\n    $CompareFolderPath)\n\n    # declare search condition\n    $SearchCondition = New-Object \"$ReportServerProxyNamespace.SearchCondition\";\n\n    # fill in properties\n    $SearchCondition.Condition = Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.ConditionEnum\" -EnumName \"Equals\"\n    $SearchCondition.ConditionSpecified = $true\n    $SearchCondition.Name = \"Name\"\n\n\tif ($IsReportService2005) {\n\t\t$SearchCondition.Value = $ItemName\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $SearchCondition)\n\t}\n\telseif ($IsReportService2010) {\n\t\t$SearchCondition.Values = @($ItemName)\n\t\t# search\n\t    $items = $ReportServerProxy.FindItems($StartFolder, (Get-SpecificEnumValue -EnumNamespace \"$ReportServerProxyNamespace.BooleanOperatorEnum\" -EnumName \"And\"), $null, $SearchCondition)\n\t}\n\telse { Write-Warning 'Report Service Unknown in Item-Exists method. Use ReportService2005 or ReportService2010.' }    \n\n    # Check how many items were returned\n    if ($items.Length -eq 1)\n    {\n        return $items[0].Path\n    }\n    else\n    {\n        # Loop through returned items\n        foreach ($item in $items)\n        {\n            # compare folders\n            if ($CompareFolderPath -eq ($item.Path.SubString(0, $item.Path.LastIndexOf(\"/\"))))\n            {\n                # Display message we're guessing\n                Write-Host \"Multiple items were found with name $ItemName, assuming location is same folder as reference, $CompareFolderPath.\"\n                return $item.Path\n            }\n        }\n\n        # Display warning\n        Write-Warning \"Multiple items were returned for $ItemName, unable to determine which one to return.\"\n        return [string]::Empty\n    }    \n}\n\n#region Set-ItemDataSources()\nFunction Set-ItemDataSources\n{\n    # parameters\n    Param($ItemFile, $ItemFolder)\n\n    # declare local variables\n    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf(\"\\\") + 1)\n    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf(\".\"))\n    $AllDataSourcesFound = $true\n    \n    # get the datasources\n    $DataSources = $ReportServerProxy.GetItemDataSources([string]::Format(\"{0}/{1}\", $ItemFolder, $ItemName))\n\n    #loop through retrieved datasources\n    foreach($DataSource in $DataSources)\n    {\n        # check to see if it's a dataset\n        if([System.IO.Path]::GetExtension($ItemFile).ToLower() -eq \".rsd\")\n        {\n            # datasets can have one and only one datasource\n            # The method GetItemDataSources does not return the name of the datasource for datasets like it does for reports\n            # instead, it alaways returns DataSetDataSource.  This made the call to Get-ItemDataSourceNames necessary,\n            # otherwise it would not link correctly\n            $DataSourceName = (Get-ItemDataSourceReferenceNames -ItemFile $ItemFile)[0]\n        }\n        else\n        {\n            # get the anme from teh source itself\n            $DataSourceName = (Get-ItemDataSourceNames -ItemFile $ItemFile -DataSourceName $DataSource.Name)[0]\n        }        \n\n        if ([string]::IsNullOrWhiteSpace($DataSourceName))\n        {\n            Write-Host \"Datasource $($DataSource.Name) is not a shared datasource, skipping.\"\n            $AllDataSourcesFound = $false\n            continue\n        }\n\n        # Check to see if datasourcename contains the folder -- this can happen if the report was created by Report Builder\n        if((![string]::IsNullOrEmpty($ReportDataSource)) -and ($DataSourceName.ToLower().Contains($ReportDatasourceFolder.ToLower())))\n        {\n            # Remove teh path from the item name\n            $DataSourceName = $DataSourceName.ToLower().Replace(\"$($ReportDatasourceFolder.ToLower())/\",\"\")\n        }\n\n        $DatasourcePath = \"\"\n\n        if ($UseArchiveStructure -eq $true)\n        {\n            $DatasourcePath = Get-ItemPath -ItemName $DataSourceName -StartFolder $RootFolder -CompareFolderPath $ItemFolder\n            $DatasourcePath = $DatasourcePath.SubString(0, $DatasourcePath.LastIndexOf(\"/\"))\n        }\n        else\n        {\n            $DatasourcePath = $ReportDatasourceFolder\n        }\n\n        # check to make sure the datasource exists in the location specified\n        if((Item-Exists -ItemFolderPath $DatasourcePath -ItemName $DataSourceName) -eq $true)\n        {\n            # create datasource reference variable\n            $DataSourceReference = New-Object \"$ReportServerProxyNamespace.DataSourceReference\";\n\n            # assign\n            $DataSourceReference.Reference = \"$DatasourcePath/\" + $DataSourceName\n            $DataSource.Item = $DataSourceReference            \n        }\n        else\n        {\n            # display warning\n            Write-Warning \"Unable to find datasource $($DataSourceName) in $DatasourcePath\"\n\n            # update to false\n            $AllDataSourcesFound = $false\n        }        \n    }\n\n    # check to see if found all datasources\n    if($AllDataSourcesFound -eq $true)\n    {\n        Write-Host \"Linking datasources to $ItemFolder/$ItemName\"\n        \n        # save the references\n        $ReportServerProxy.SetItemDataSources(\"$ItemFolder/$ItemName\", $DataSources)\n    }\n}\n#endregion\n\n#region Set-ReportDataSets()\nFunction Set-ReportDataSets\n{\n    # parameters\n    param($ReportFile, $ReportFolderPath)\n\n    # declare local variables\n    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf(\"\\\") + 1)\n    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf(\".\"))\n    $AllDataSetsFound = $true\n    $DataSetFolder = \"\"\n\n    # get the datasources\n    $DataSets = $ReportServerProxy.GetItemReferences([string]::Format(\"{0}/{1}\", $ReportFolderPath, $ReportName), \"DataSet\")\n\n    # loop through returned values\n    foreach($DataSet in $DataSets)\n    {\n        # get the name of the shared data set reference\n        $SharedDataSetReferenceName = Get-DataSetSharedReferenceName -ReportFile $ReportFile -DataSetName $DataSet.Name\n\n        # Check to see if the SharedDataSetReferenceName contains the folder path -- this can happen if the report was built using Report Builder\n        if((![string]::IsNullOrEmpty($ReportDataSetFolder)) -and ($SharedDataSetReferenceName.ToLower().Contains($ReportDataSetFolder.ToLower())))\n        {\n            # Remove the folder path from the name, it will cause issues when trying to set\n            $SharedDataSetReferenceName = $SharedDataSetReferenceName.ToLower().Replace(\"$($ReportDataSetFolder.ToLower())/\", \"\")\n        }\n        \n        # Check to see if we're using the archive folder structure\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Set dataset folder\n            $DataSetFolder = Get-ItemPath -ItemName $SharedDataSetReferenceName -StartFolder $RootFolder -CompareFolderPath $ReportFolderPath\n            $DataSetFolder = $DataSetFolder.SubString(0, $DataSetFolder.LastIndexOf(\"/\"))\n        }\n        else\n        {\n            $DataSetFolder = $ReportDataSetFolder\n        }\n\n        # check to make sure the datasource exists in the location specified\n        if((Item-Exists -ItemFolderPath $DataSetFolder -ItemName $SharedDataSetReferenceName) -eq $true)\n        {\n            # create datasource reference variable\n            $DataSetReference = New-Object \"$ReportServerProxyNamespace.ItemReference\";\n\n            # assign\n            $DataSetReference.Reference = \"$DataSetFolder/\" + $SharedDataSetReferenceName\n            $DataSetReference.Name = $DataSet.Name\n\n            # log\n            Write-Host \"Linking Shared Data Set $($DataSet.Name) to $ReportName\"\n            \n            # update reference\n            $ReportServerProxy.SetItemReferences(\"$ReportFolderPath/$ReportName\", @($DataSetReference))\n        }\n        else\n        {\n            # get the datasource name to include in warning message -- I know there must be a way to use the property in a string literal, but I wasn't able to figure it out while trying\n            # to solve a reported bug so I took the easy way.\n            $DataSetName = $DataSet.Name\n            \n            # display warning\n            Write-Warning \"Unable to find dataset $DataSetName in $ReportDataSetFolder\"\n\n            # update to false\n            $AllDataSetsFound = $false\n        }            \n    }\n\n    # check to see if all datsets were found\n    if($AllDataSetsFound -eq $False)\n    {\n        Write-Warning \"Not all datasets found\"\n\n        # save the references\n        $ReportServerProxy.SetItemReferences(\"$ReportFolder/$ReportName\", @($DataSets))\n    }\n}\n\n#endregion\n\n#region Get-ObjectNamespace()\nFunction Get-ObjectNamespace($Object)\n{\n    # return the value\n    ($Object).GetType().ToString().SubString(0, ($Object).GetType().ToString().LastIndexOf(\".\"))\n}\n#endregion\n\n#region Get-SpecificEnumValue()\nFunction Get-SpecificEnumValue($EnumNamespace, $EnumName)\n{\n    # get the enum values\n    $EnumValues = [Enum]::GetValues($EnumNamespace)\n\n    # Loop through to find the specific value\n    foreach($EnumValue in $EnumValues)\n    {\n        # check current\n        if($EnumValue -eq $EnumName)\n        {\n            # return it\n            return $EnumValue\n        }\n    }\n\n    # nothing was found\n    return $null\n}\n#endregion\n\n#region Update-ReportParamters()\nFunction Update-ReportParameters($ReportFile, $ReportFolderPath)\n{\n    # declare local variables\n    $ReportParameters = @();\n    \n    # necessary so that when attempting to use the report execution service, it doesn't puke on you when it can't find the data source\n    $ReportData = (Remove-SharedReferences -ReportFile $ReportFile)\n\n    # get just the report name\n    $ReportName = $ReportFile.SubString($ReportFile.LastIndexOf(\"\\\") + 1)\n    $ReportName = $ReportName.SubString(0, $ReportName.LastIndexOf(\".\"))\n    \n    # create warnings object\n    $ReportExecutionWarnings = $null\n\n    # set the report full path\n    $ReportPath = \"$ReportFolderPath/$ReportName\" \n\n    # load the report definition\n    $ExecutionInfo = $ReportExecutionProxy.LoadReportDefinition($ReportData, [ref] $ReportExecutionWarnings);\n\n    # loop through the report execution parameters\n    foreach($Parameter in $ExecutionInfo.Parameters)\n    {\n        # create new item parameter object\n        $ItemParameter = New-Object \"$ReportServerProxyNamespace.ItemParameter\";\n\n        # fill in the properties except valid values, that one needs special processing\n        Copy-ObjectProperties -SourceObject $Parameter -TargetObject $ItemParameter;\n\n        # fill in the valid values\n        $ItemParameter.ValidValues = Convert-ValidValues -SourceValidValues $Parameter.ValidValues;\n\n        # exclude if it's query based\n        if($Parameter.DefaultValuesQueryBased -ne $true)\n        {\n            # add to list\n            $ReportParameters += $ItemParameter;\n        }\n    }\n\n    # force the parameters to update\n    Write-Host \"Updating report parameters for $ReportFolderPath/$ReportName\"\n\tif ($IsReportService2005) {\n\t\t$ReportServerProxy.SetReportParameters(\"$ReportFolderPath/$ReportName\", $ReportParameters);\n\t}\n\telseif ($IsReportService2010) {\n\t\t$ReportServerProxy.SetItemParameters(\"$ReportFolderPath/$ReportName\", $ReportParameters);\n\t}\n\telse { Write-Warning 'Report Service Unknown in Update-ReportParameters method. Use ReportService2005 or ReportService2010.' }\n}\n#endregion\n\n#region Remove-ShareReferences()\nFunction Remove-SharedReferences($ReportFile)\n{\n    ######################################################################################################\n    #You'll notice that I've used the keyword of [void] in front of some of these method calls, this is so\n    #that the operation isn't captured as output of the function\n    ######################################################################################################\n\n    # read xml\n    [xml]$ReportXml = Get-Content $ReportFile -Encoding UTF8;\n    \n    # create new memory stream object\n    $MemoryStream = New-Object System.IO.MemoryStream\n\n    try\n    {\n\n        # declare array of nodes to remove\n        $NodesToRemove = @();\n\n        # get datasource names\n        $DataSourceNames = Get-ItemDataSources -ItemFile $ReportFile\n\n        # check to see if report has datasourcenames\n        if($DataSourceNames.Count -eq 0)\n        {\n            # Get reference to reportnode\n            $ReportNode = $ReportXml.FirstChild.NextSibling # Kind of a funky way of getting it, but the SelectSingleNode(\"//Report\") wasn't working due to Namespaces in the node\n\n            # create new DataSources node\n            $DataSourcesNode = $ReportXml.CreateNode($ReportNode.NodeType, \"DataSources\", $null)\n\n            # create new datasource node\n            $DataSourceNode = $ReportXml.CreateNode($ReportNode.NodeType, \"DataSource\", $null)\n\n            # create new datasourcereference node\n            $DataSourceReferenceNode = $ReportXml.CreateNode($ReportNode.NodeType, \"DataSourceReference\", $null)\n\n            # create new attribute\n            $DataSourceNameAttribute = $ReportXml.CreateAttribute(\"Name\")\n            $DataSourceNameAttribute.Value = \"DataSource1\"\n            $dataSourceReferenceNode.InnerText = \"DataSource1\"\n\n            # add attribute to datasource node\n            [void]$DataSourceNode.Attributes.Append($DataSourceNameAttribute)\n            [void]$DataSourceNode.AppendChild($DataSourceReferenceNode)\n\n            # add nodes\n            [void]$ReportNode.AppendChild($DataSourcesNode)\n            [void]$DataSourcesNode.AppendChild($DataSourceNode)\n\n            # add fake datasource name to array\n            $DataSourceNames += \"DataSource1\"\n        }\n\n        # get all datasource nodes\n        $DatasourceNodes = $ReportXml.GetElementsByTagName(\"DataSourceReference\");\n\n        # loop through returned nodes\n        foreach($DataSourceNode in $DatasourceNodes)\n        {\n            # create a new connection properties node\n            $ConnectionProperties = $ReportXml.CreateNode($DataSourceNode.NodeType, \"ConnectionProperties\", $null);\n\n            # create a new dataprovider node\n            $DataProvider = $ReportXml.CreateNode($DataSourceNode.NodeType, \"DataProvider\", $null);\n            $DataProvider.InnerText = \"SQL\";\n\n            # create new connection string node\n            $ConnectString = $ReportXml.CreateNode($DataSourceNode.NodeType, \"ConnectString\", $null);\n            $ConnectString.InnerText = \"Data Source=Server Name Here;Initial Catalog=database name here\";\n\n            # add new node to parent node\n            [void] $DataSourceNode.ParentNode.AppendChild($ConnectionProperties);\n\n            # append childeren\n            [void] $ConnectionProperties.AppendChild($DataProvider);\n            [void] $ConnectionProperties.AppendChild($ConnectString);\n\n            # Add to remove list \n            $NodesToRemove += $DataSourceNode;\n        }\n\n        # get all shareddataset nodes\n        $SharedDataSetNodes = $ReportXml.GetElementsByTagName(\"SharedDataSet\")\n\n        #loop through the returned nodes\n        foreach($SharedDataSetNode in $SharedDataSetNodes)\n        {\n            # create holder nodes so it won't error\n            $QueryNode = $ReportXml.CreateNode($SharedDataSetNode.NodeType, \"Query\", $null);\n            $DataSourceNameNode = $ReportXml.CreateNode($QueryNode.NodeType, \"DataSourceName\", $null);\n            $CommandTextNode = $ReportXml.CreateNode($QueryNode.NodeType, \"CommandText\", $null);\n\n            # add valid datasource name, just get the first in the list\n            $DataSourceNameNode.InnerText = $DataSourceNames[0]\n            \n            # add node to parent\n            [void] $SharedDataSetNode.ParentNode.Appendchild($QueryNode)\n            \n            # add datasourcename and commandtext to query node\n            [void]$QueryNode.AppendChild($DataSourceNameNode)\n            [void]$QueryNode.AppendChild($CommandTextNode)\n\n            # add node to removelist\n            $NodesToRemove += $SharedDataSetNode\n        }\n\n\n        # loop through nodes to remove\n        foreach($Node in $NodesToRemove)\n        {\n            # remove from parent\n            [void] $Node.ParentNode.RemoveChild($Node);\n        }\n    \n        $ReportXml.InnerXml = $ReportXml.InnerXml.Replace(\"xmlns=`\"`\"\", \"\")\n\n        # save altered xml to memory stream\n        $ReportXml.Save($MemoryStream);\n\n        # return the altered xml as byte array\n        return $MemoryStream.ToArray();\n    }\n    finally\n    {\n        # close and dispose\n        $MemoryStream.Close();\n        $MemoryStream.Dispose();\n    }\n}\n#endregion\n\n\n#region Copy-ObjectProperties()\nFunction Copy-ObjectProperties($SourceObject, $TargetObject)\n{\n    # Get source object property array\n    $SourcePropertyCollection = $SourceObject.GetType().GetProperties();\n\n    # get the destination\n    $TargetPropertyCollection = $TargetObject.GetType().GetProperties();\n\n    # loop through source property collection\n    for($i = 0; $i -lt $SourcePropertyCollection.Length; $i++)\n    {\n        # get the target property\n        $TargetProperty = $TargetPropertyCollection | Where {$_.Name -eq $SourcePropertyCollection[$i].Name}\n        \n        # check to see if it's null\n        if($TargetProperty -ne $null)\n        {\n            # check to see if it's the valid values property\n            if($TargetProperty.Name -ne \"ValidValues\")\n            {\n                 # set the value\n                $TargetProperty.SetValue($TargetObject, $SourcePropertyCollection[$i].GetValue($SourceObject));\n            }\n        }\n    }\n}\n#endregion\n\n#region ConvertValidValues()\nFunction Convert-ValidValues($SourceValidValues)\n{\n    # declare local values\n    $TargetValidValues = @();\n    \n    # loop through source values\n    foreach($SourceValidValue in $SourceValidValues)\n    {\n        # create target valid value object\n        $TargetValidValue = New-Object \"$ReportServerProxyNamespace.ValidValue\";\n\n        # copy properties\n        Copy-ObjectProperties -SourceObject $SourceValidValue -TargetObject $TargetValidValue\n\n        # add to list\n        $TargetValidValues += $TargetValidValue\n    }\n\n    # return the values\n    return ,$TargetValidValues\n}\n#endregion\n\n#region Backup-ExistingItem()\nFunction Backup-ExistingItem\n{\n    # parameters\n    Param($ItemFile, $ItemFolder)\n\n    # declare local variables\n    $ItemName = $ItemFile.SubString($ItemFile.LastIndexOf(\"\\\") + 1)\n    $ItemName = $ItemName.SubString(0, $ItemName.LastIndexOf(\".\"))\n\n    # check to see if the item exists\n    if((Item-Exists -ItemFolderPath $ItemFolder -ItemName $ItemName) -eq $true)\n    {\n        # get file extension\n        $FileExtension = [System.IO.Path]::GetExtension($ItemFile)\n    \n        # check backuplocation\n        if($BackupLocation.EndsWith(\"\\\") -ne $true)\n        {\n            # append ending slash\n            $BackupLocation = $BackupLocation + \"\\\"\n        }\n\t\t\n\t\t# add the release number to the backup location\n\t\t$BackupLocation = $BackupLocation + $ReleaseNumber + \"\\\"\n\n        # ensure the backup location actually exists\n        if((Test-Path $BackupLocation) -ne $true)\n        {\n            # create it\n            New-Item -ItemType Directory -Path $BackupLocation\n        }\n\n        # download the item\n        $Item = $ReportServerProxy.GetItemDefinition(\"$ItemFolder/$ItemName\")\n\n        # form the backup path\n        $BackupPath = \"{0}{1}{2}\" -f $BackupLocation, $ItemName, $FileExtension;\n\n        # write to disk\n        [System.IO.File]::WriteAllBytes(\"$BackupPath\", $Item);\n\n        # write to screen\n        Write-Host \"Backed up $ItemFolder/$ItemName to $BackupPath\";\n    }\n}\n#endregion\n\n#region Normalize-SSRSFolder()\nfunction Normalize-SSRSFolder ([string]$Folder) {\n    if (-not $Folder.StartsWith('/')) {\n        $Folder = '/' + $Folder\n    }\n    \n    return $Folder\n}\n#endregion\n\n#region New-SSRSFolder()\nfunction New-SSRSFolder ([string] $Name) {\n    Write-Verbose \"New-SSRSFolder -Name $Name\"\n \n    $Name = Normalize-SSRSFolder -Folder $Name\n \n    if ($ReportServerProxy.GetItemType($Name) -ne 'Folder') {\n        $Parts = $Name -split '/'\n        $Leaf = $Parts[-1]\n        $Parent = $Parts[0..($Parts.Length-2)] -join '/'\n \n        if ($Parent) {\n            New-SSRSFolder -Name $Parent\n        } else {\n            $Parent = '/'\n        }\n        \n        $ReportServerProxy.CreateFolder($Leaf, $Parent, $null)\n    }\n}\n#endregion\n\n#region Clear-SSRSFolder()\nfunction Clear-SSRSFolder ([string] $Name) {\n    Write-Verbose \"Clear-SSRSFolder -Name $Name\"\n    \n    $Name = Normalize-SSRSFolder -Folder $Name\n    \n    if ($ReportServerProxy.GetItemType($Name) -eq 'Folder' -and $ClearReportFolder) {\n        Write-Host (\"Clearing the {0} folder\" -f $Name)\n        $ReportServerProxy.ListChildren($Name, $false) | ForEach-Object {\n            Write-Verbose \"Deleting item: $($_.Path)\"\n            $ReportServerProxy.DeleteItem($_.Path)\n        }\n    }\n}\n#endregion\n\n#region New-SSRSDataSource()\nfunction New-SSRSDataSource ([string]$RdsPath, [string]$Folder, [bool]$OverwriteDataSources) {\n    Write-Verbose \"New-SSRSDataSource -RdsPath $RdsPath -Folder $Folder\"\n\n    $Folder = Normalize-SSRSFolder -Folder $Folder\n    \n    [xml]$Rds = Get-Content -Path $RdsPath\n    $dsName = $Rds.RptDataSource.Name\n    $ConnProps = $Rds.RptDataSource.ConnectionProperties\n    \n\t$type = $ReportServerProxy.GetType().Namespace #Get proxy type\n\t$DSDdatatype = ($type + '.DataSourceDefinition')\n\t \n\t$Definition = new-object ($DSDdatatype)\n\tif($Definition -eq $null){\n\t Write-Error Failed to create data source definition object\n\t}\n\t\n\t$dsConnectionString = $($OctopusParameters[\"$($dsName).ConnectionString\"])\n    $dsUsername = $($OctopusParameters[\"$($dsName).Username\"])\n    $dsPassword = $($OctopusParameters[\"$($dsName).Password\"])\n    $dsCredentialRetrieval = $($OctopusParameters[\"$($dsName).CredentialRetrieval\"])\n    \n\t# replace the connection string variable that is configured in the octopus project\n\tif ($dsConnectionString) {\n\t    $Definition.ConnectString = $dsConnectionString\n\t} else {\n\t    $Definition.ConnectString = $ConnProps.ConnectString\n\t}\n\t\n    $Definition.Extension = $ConnProps.Extension \n\n\t# Check to see if the credential retrieval is overridden\n    if ($null -ne $dsCredentialRetrieval)\n    {\n    \tWrite-Host \"Forcing CredentialRetrieval property to: $dsCredentialRetrieval.\"\n        $Definition.CredentialRetrieval = $dsCredentialRetrieval\n    }\n    else\n    {\n    \t# Set the Credential Retrieval method\n    \tif ([Convert]::ToBoolean($ConnProps.IntegratedSecurity)) {\n\t\t\t$Definition.CredentialRetrieval = 'Integrated'\n\t\t}\n        elseif (![string]::IsNullOrWhitespace($dsUsername) -and ![string]::IsNullOrWhitespace($dsPassword))\n        {\n        \t$Definition.CredentialRetrieval = 'Store'\n        }\n    }\n       \n\tif ($Definition.CredentialRetrieval -eq 'Store')\n    {\t\t\n\t\tWrite-Host \"$($dsName).Username = '$dsUsername'\"\n\t\tWrite-Host \"$($dsName).Password = '$dsPassword'\"\n\t\t\n\t\t$Definition.UserName = $dsUsername;\n        $Definition.Password = $dsPassword;\n\t}\n    \n    # Check to see if this is supposed to be an Windows Authentication stored account\n    if ($OctopusParameters[\"$($dsName).WindowsCredentials\"] -eq \"true\")\n    {\n\t    # Set the definition to Windows Credentials\n    \t$Definition.WindowsCredentials = $true\n    }\n    \n\n    $DataSource = New-Object -TypeName PSObject -Property @{\n        Name = $Rds.RptDataSource.Name\n        Path =  $Folder + '/' + $Rds.RptDataSource.Name\n    }\n    \n    if ($OverwriteDataSources -or $ReportServerProxy.GetItemType($DataSource.Path) -eq 'Unknown') {\n        Write-Host \"Overwriting datasource $($DataSource.Name)\"\n        $ReportServerProxy.CreateDataSource($DataSource.Name, $Folder, $OverwriteDataSources, $Definition, $null)\n    }\n    \n    return $DataSource \n}\n#endregion\n\n#region Main\n\ntry\n{\n    # declare array for reports\n    $ReportFiles = @()\n\t$ReportDataSourceFiles = @()\n    $ReportDataSetFiles = @()\n    $ReportPartFiles = @()\n\t\n\t$IsReportService2005 = $false\n\t$IsReportService2010 = $false\n\t\n\tif ($ReportServiceUrl.ToLower().Contains('reportservice2005.asmx')) {\n\t\t$IsReportService2005 = $true\n\t\tWrite-Host \"2005 Report Service found.\"\n\t}\n\telseif ($ReportServiceUrl.ToLower().Contains('reportservice2010.asmx')) {\n\t\t$IsReportService2010 = $true\n\t\tWrite-Host \"2010 Report Service found.\"\n\t}\n\t\n\tWrite-Host \"Deploy Path: $DeployedPath\"\n\t\n    # get all report files for deployment\n    Write-Host \"Getting all .rdl files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rdl\" | ForEach-Object { If(($ReportFiles -contains $_.FullName) -eq $false) {$ReportFiles += $_.FullName}}\n    Write-Host \"# of rdl files found: $($ReportFiles.Count)\"\n\n    # get all report datasource files for deployment\n    Write-Host \"Getting all .rds files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rds\" | ForEach-Object { If(($ReportDataSourceFiles -contains $_.FullName) -eq $false) {$ReportDataSourceFiles += $_.FullName}}\n    Write-Host \"# of rds files found: $($ReportDataSourceFiles.Count)\"\n\n    # get all report datset files for deployment\n    Write-Host \"Getting all .rsd files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rsd\" | ForEach-Object { If(($ReportDataSetFiles -contains $_.FullName) -eq $false) {$ReportDataSetFiles += $_.FullName}}\n    Write-Host \"# of rsd files found: $($ReportDataSetFiles.Count)\"\n\n    # get all report part files for deployment\n    Write-Host \"Getting all .rsc files\"\n    Get-ChildItem $DeployedPath -Recurse -Filter \"*.rsc\" | ForEach-Object { If(($ReportPartFiles -contains $_.FullName) -eq $false) {$ReportPartFiles += $_.FullName}}\n    Write-Host \"# of rsc files found: $($ReportPartFiles.Count)\"\n\n    # set the report proxies\n    Write-Host \"Creating SSRS Web Service proxies\"\n\n    # check to see if credentials were supplied for the services\n    if(([string]::IsNullOrEmpty($ServiceUserDomain) -ne $true) -and ([string]::IsNullOrEmpty($ServiceUserName) -ne $true) -and ([string]::IsNullOrEmpty($ServicePassword) -ne $true))\n    {\n        # secure the password\n        $secpasswd = ConvertTo-SecureString \"$ServicePassword\" -AsPlainText -Force\n\n        # create credential object\n        $ServiceCredential = New-Object System.Management.Automation.PSCredential (\"$ServiceUserDomain\\$ServiceUserName\", $secpasswd)\n\n        # create proxies\n        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -Credential $ServiceCredential\n        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -Credential $ServiceCredential\n    }\n    else\n    {\n        # create proxies using current identity\n        $ReportServerProxy = New-WebServiceProxy -Uri $ReportServiceUrl -UseDefaultCredential \n        $ReportExecutionProxy = New-WebServiceProxy -Uri $ReportExecutionUrl -UseDefaultCredential \n    }\n\n\n\n\t#Create folder information for DataSource and Report\n    if ($UseArchiveStructure -eq $false)\n    {\n\t    New-SSRSFolder -Name $ReportFolder\n\t    New-SSRSFolder -Name $ReportDatasourceFolder\n        New-SSRSFolder -Name $ReportDataSetFolder\n        New-SSRSFolder -Name $ReportPartsFolder\n    }\n    else\n    {\n        New-SSRSFolder -Name $RootFolder\n    }\n    \n    #Clear destination folder if specified\n    if([System.Convert]::ToBoolean(\"$ClearReportFolder\")) {\n        Clear-SSRSFolder -Name $ReportFolder\n    }\n\t \n\t#Create DataSource\n    foreach($RDSFile in $ReportDataSourceFiles) {\n        Write-Host \"New-SSRSDataSource $RdsFile\"\n\n        $DatasourceFolder = \"\"\n\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Adjust report folder to archive path\n            $DatasourceFolder = $(if ($RootFolder -eq \"/\") { [string]::Empty} else { $RootFolder } ) + $RDSFile.Replace($DeployedPath, '').Replace('\\', '/').Replace((Split-Path $RDSFile -Leaf), '')\n\n            # Remove final slash\n            $DatasourceFolder = $DatasourceFolder.Substring(0, $DatasourceFolder.LastIndexOf('/'))    \n            \n            # Check if folder exists\n            New-SSRSFolder -Name $DatasourceFolder                    \n        }\n        else\n        {\n            $DatasourceFolder = $ReportDatasourceFolder\n        }\n        \n\t\t$DataSource = New-SSRSDataSource -RdsPath $RdsFile -Folder $DatasourceFolder -Overwrite ([System.Convert]::ToBoolean(\"$OverwriteDataSources\"))\n\t}\n\n    # get the service proxy namespaces - this is necessary because of a bug documented here http://stackoverflow.com/questions/7921040/error-calling-reportingservice2005-finditems-specifically-concerning-the-bool and http://www.vistax64.com/powershell/273120-bug-when-using-namespace-parameter-new-webserviceproxy.html\n    $ReportServerProxyNamespace = Get-ObjectNamespace -Object $ReportServerProxy\n    $ReportExecutionProxyNamespace = Get-ObjectNamespace -Object $ReportExecutionProxy\n\n    # Create dat sets\n    foreach($DataSet in $ReportDataSetFiles)\n    {\n        $DataSetPath = \"\"\n\n        # Check to see if it's set to follow archive structure\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Adjust report folder to archive path\n            $DataSetPath = $(if ($RootFolder -eq \"/\") { [string]::Empty} else { $RootFolder } ) + $DataSet.Replace($DeployedPath, '').Replace('\\', '/').Replace((Split-Path $DataSet -Leaf), '')\n\n            # Remove final slash\n            $DataSetPath = $DataSetPath.Substring(0, $DataSetPath.LastIndexOf('/'))\n\n            # Check if folder exists\n            New-SSRSFolder -Name $DataSetPath\n        }\n        else\n        {\n            $DataSetPath = $ReportDataSetFolder\n        }\n\n        # check to see if we need to back up\n        if($BackupLocation -ne $null -and $BackupLocation -ne \"\")\n        {\n            # backup the item\n            Backup-ExistingItem -ItemFile $DataSet -ItemFolder $DataSetPath\n        }\n\n        # upload the dataset\n        Upload-Item -Item $DataSet -ItemType \"DataSet\" -ItemFolder $DataSetPath\n\n        # update the dataset datasource\n        Set-ItemDataSources -ItemFile $DataSet -ItemFolder $DataSetPath\n    }\n\n    # get the proxy auto generated name spaces\n\n    # loop through array\n    foreach($ReportFile in $ReportFiles)\n    {\n        $ReportPath = \"\"\n\n        # Check to see if it's set to follow archive structure\n        if ($UseArchiveStructure -eq $true)\n        {\n            # Adjust report folder to archive path\n            $ReportPath = $(if ($RootFolder -eq \"/\") { [string]::Empty} else { $RootFolder } ) + $ReportFile.Replace($DeployedPath, '').Replace('\\', '/').Replace((Split-Path $ReportFile -Leaf), '')\n\n            # Remove final slash\n            $ReportPath = $ReportPath.Substring(0, $ReportPath.LastIndexOf('/'))\n\n            # Check if folder exists\n            New-SSRSFolder -Name $ReportPath\n        }\n        else\n        {\n            $ReportPath = $ReportFolder\n        }\n\n        # check to see if we need to back up\n        if($BackupLocation -ne $null -and $BackupLocation -ne \"\")\n        {\n            # backup the item\n            Backup-ExistingItem -ItemFile $ReportFile -ItemFolder $ReportPath\n        }\n        \n        \n        # upload report\n        Upload-Item -Item $ReportFile -ItemType \"Report\" -ItemFolder $ReportPath\n\n        # extract datasources\n        #Write-Host \"Extracting datasource names for $ReportFile\"\n        #$ReportDataSourceNames = Get-ReportDataSourceNames $ReportFile\n\n        # set the datasources\n        Set-ItemDataSources -ItemFile $ReportFile -ItemFolder $ReportPath\n\n        # set the datasets\n        Set-ReportDataSets -ReportFile $ReportFile -ReportFolderPath $ReportPath\n\n        # update the report parameters\n        Update-ReportParameters -ReportFile $ReportFile -ReportFolderPath $ReportPath\n    }\n    \n    # loop through rsc files\n    foreach($ReportPartFile in $ReportPartFiles)\n    {\n        # check to see if we need to back up\n        if($BackupLocation -ne $null -and $BackupLocation -ne \"\")\n        {\n            # backup the item\n            Backup-ExistingItem -ItemFile $ReportPartFile -ItemFolder $ReportPartsFolder\n        }\n\n\t\t# upload item\n        Upload-Item -Item $ReportPartFile -ItemType \"Component\" -ItemFolder $ReportPartsFolder\n    }\n    \n}\nfinally\n{\n    # check to see if the proxies are null\n    if($ReportServerProxy -ne $null)\n    {\n        # dispose\n        $ReportServerProxy.Dispose();\n    }\n\n    if($ReportExecutionProxy -ne $null)\n    {\n        # dispose\n        $ReportExecutionProxy.Dispose();\n    }\n}\n\n#endregion\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "92daa94e-73f3-466e-a8db-35149646df2b",
-      "Name": "NugetPackageStepName",
-      "Label": "SSRS package step",
-      "HelpText": "Select the step in this project which downloads the SSRS package.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Id": "0bb2f003-fda9-4571-86aa-3bad13775874",
-      "Name": "ReportServiceUrl",
-      "Label": "Url of SSRS Server service",
-      "HelpText": "The complete Url to the SSRS server.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/reportservice2010.asmx?wsdl",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "feca8cfe-fe9e-4e8f-ac7e-b370b5ef3ef6",
-      "Name": "ReportExecutionUrl",
-      "Label": "Report Execution Url",
-      "HelpText": "The complete Url to the Report Execution service.\nExample: http://198.239.216.46/ReportServer_LOCALDEV/ReportExecution2005.asmx?wsdl",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "1924b3a6-d5bf-4713-8bc7-6b77422a7944",
-      "Name": "ReportFolder",
-      "Label": "Report folder",
-      "HelpText": "Relative Url to the folder in which the reports will be deployed.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "28cc63a0-5a3e-4d22-8406-574bdb332fe1",
-      "Name": "ReportDatasourceFolder",
-      "Label": "Report data source folder",
-      "HelpText": "Relative Url where the data sources for the reports are located, starting with '/'",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b1cdc16e-c2db-41eb-9ae8-8df02b05f03d",
-      "Name": "OverwriteDataSources",
-      "Label": "Overwrite datasource(s)",
-      "HelpText": "Tick if the existing report data source file needs to e replaced.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "b0e69f02-1f99-431a-852e-b0084ed23fd4",
-      "Name": "BackupLocation",
-      "Label": "Backup Location",
-      "HelpText": "Directory path to take a backup of existing reports (.rdl) and data source (.rds) files.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a736f0b8-aa27-45ae-b6a0-43a76e44d85a",
-      "Name": "ReportDataSetFolder",
-      "Label": "DataSet folder",
-      "HelpText": "Relative Url where Shared Data Sets are stored",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "c88b150a-9f70-4700-9981-ed1514dc5a2b",
-      "Name": "ReportPartsFolder",
-      "Label": "Report Parts Folder",
-      "HelpText": "Relative folder where Report Parts are uploaded to.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "47575f66-9b1b-4cbb-a062-30d811e6159d",
-      "Name": "ServiceUserDomain",
-      "Label": "Service Domain",
-      "HelpText": "(Optional - leave blank to use Tentacle identity) Name of the domain for the user account to execute as",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "98b43d45-5a5a-456a-aac7-1f4cc6fe8e55",
-      "Name": "ServiceUserName",
-      "Label": "Service Username",
-      "HelpText": "(Optional - leave blank to use Tentacle identity) Username of the user account to execute as",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fd48bde1-3874-45ea-ab99-b40c13b91d5a",
-      "Name": "ServicePassword",
-      "Label": "Service Password",
-      "HelpText": "(Optional - leave blank to use Tentacle identity) Password of the user account to execute as",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "1310ffde-1f98-4ebf-bf6a-605bb83ea54e",
-      "Name": "ClearReportFolder",
-      "Label": "Clear the Report Folder",
-      "HelpText": "Optional - This will delete all items in the Report Folder before adding items.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "9d64d192-b645-4aac-ba52-3c86aebe8d72",
-      "Name": "UseArchiveStructure",
-      "Label": "Use package folder structure",
-      "HelpText": "Tick this box to create folders matching the package folder structure and upload items into their respective folders.  Ticking this box ignores all other folder specifications except Root folder",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "ad0280e7-25a6-48cc-bc90-4e6ee3c8951b",
-      "Name": "RootFolder",
-      "Label": "Root folder",
-      "HelpText": "Used only when 'Use package folder structure' is checked.  This specifies the root folder on SSRS to start in.  Value is relative so it begins with a /",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2021-03-11T19:19:00.102Z",
-    "OctopusVersion": "2020.6.4671",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/ssrs-report-backup.json b/step-templates/ssrs-report-backup.json
deleted file mode 100644
index 2ca4b2835..000000000
--- a/step-templates/ssrs-report-backup.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "69c9eb25-9005-47c3-abb6-032e2ef909e3",
-  "Name": "SSRS Report Backup",
-  "Description": "Automatically performs a back up of all SSRS reports on an SSRS Server.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "\r\n[void][System.Reflection.Assembly]::LoadWithPartialName(\"System.Xml.XmlDocument\");\r\n[void][System.Reflection.Assembly]::LoadWithPartialName(\"System.IO\");\r\n \r\n$reportServerName = $reportServer;\r\n$ReportServiceWebServiceURL = \"http://$reportServerName/ReportServer/\"\r\n$ssrsVersion = $version;\r\n$exportFolder = $folder;\r\n\r\n\r\nif ($ssrsVersion -gt 2005) \r\n\t{\r\n\t\t# SSRS 2008/2012\r\n\t\t$reportServerUri = \"$ReportServiceWebServiceURL/ReportService2010.asmx\" -f $reportServerName\r\n\t} else {\r\n\t\t# SSRS 2005\r\n\t\t$reportServerUri = \"$ReportServiceWebServiceURL/ReportService2005.asmx\" -f $reportServerName\r\n\t}\r\n\r\n\r\n$Proxy = New-WebServiceProxy -Uri $reportServerUri -Namespace SSRS.ReportingService2005 -UseDefaultCredential ;\r\n\r\n\r\nif ($ssrsVersion -gt 2005) {\t\t \r\n\t\t$items = $Proxy.ListChildren(\"/\", $true) | `\r\n\t\t\t\t Select-Object TypeName, Path, ID, Name | `\r\n\t\t\t\t Where-Object {$_.typeName -eq \"Report\"};\r\n\t} else {\r\n\t\t$items = $Proxy.ListChildren(\"/\", $true) | `\r\n             Select-Object Type, Path, ID, Name | `\r\n             Where-Object {$_.type -eq \"Report\"};\r\n\t}\r\n\r\n\r\n$folderName = $exportFolder + \"\\\" + (Get-Date -format \"yyyy-MM-dd-hhmmtt\");\r\n\r\n \r\nforeach($item in $items)\r\n{\r\n\r\n    $subfolderName = split-path $item.Path;\r\n    $reportName = split-path $item.Path -Leaf;\r\n    $fullSubfolderName = $folderName + $fullFolderName + $subfolderName;\r\n    if(-not(Test-Path $fullSubfolderName))\r\n    {\r\n\r\n        [System.IO.Directory]::CreateDirectory($fullSubfolderName) | out-null\r\n    }\r\n \r\n    $rdlFile = New-Object System.Xml.XmlDocument;\r\n    [byte[]] $reportDefinition = $null;\r\n    \r\n    if ($ssrsVersion -gt 2005) {\r\n\t\t\t$reportDefinition = $Proxy.GetItemDefinition($item.Path);\r\n\t\t} else {\r\n\t\t\t$reportDefinition = $Proxy.GetReportDefinition($item.Path);\r\n\t\t}\r\n    \r\n    [System.IO.MemoryStream] $memStream = New-Object System.IO.MemoryStream(@(,$reportDefinition));\r\n    $rdlFile.Load($memStream);\r\n \r\n    $fullReportFileName = $fullSubfolderName + \"\\\" + $item.Name +  \".rdl\";\r\n    \r\n    Write-Output $fullReportFileName;\r\n    \r\n    $rdlFile.Save($fullReportFileName);\r\n    \r\n \r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "reportServer",
-      "Label": "SSRS URL",
-      "HelpText": "The URL of the Report Server including any ports.",
-      "DefaultValue": "localhost",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "version",
-      "Label": "SSRS Version",
-      "HelpText": "The version of your SSRS instance e.g. 2005, 2008, 2012",
-      "DefaultValue": "2008",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "folder",
-      "Label": "Export Folder",
-      "HelpText": "The folder on the Deployment machine where the reports should be Saved.",
-      "DefaultValue": "c:\\temp\\",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-02-24T11:44:03.516+00:00",
-  "LastModifiedBy": "bleep-io",
-  "$Meta": {
-    "ExportedAt": "2016-02-24T12:10:04.807+00:00",
-    "OctopusVersion": "2.6.2.845",
-    "Type": "ActionTemplate"
-  },
-  "Category": "sql"
-}
\ No newline at end of file
diff --git a/step-templates/statuspageio-update-scheduled-maintenance-incident.json b/step-templates/statuspageio-update-scheduled-maintenance-incident.json
deleted file mode 100644
index d3c242a19..000000000
--- a/step-templates/statuspageio-update-scheduled-maintenance-incident.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "Id": "7bc83a07-8927-467e-a2eb-922609212e3a",
-  "Name": "StatusPage.io - Update Scheduled Maintenance Incident",
-  "Description": "Updates an existing scheduled maintenance incident on StatusPage.io",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "## --------------------------------------------------------------------------------------\r\n## Input\r\n## --------------------------------------------------------------------------------------\r\n$pageId = $OctopusParameters['PageId']\r\n$apiKey = $OctopusParameters['ApiKey']\r\n$incidentName = $OctopusParameters['IncidentName']\r\n$incidentStatus = $OctopusParameters['IncidentStatus']\r\n$incidentMessage = $OctopusParameters['IncidentMessage']\r\n\r\nfunction Validate-Parameter($parameterValue, $parameterName) {\r\n    if(!$parameterName -contains \"Key\") {\r\n        Write-Host \"${parameterName}: ${parameterValue}\"\r\n    }\r\n\r\n    if (! $parameterValue) {\r\n        throw \"$parameterName cannot be empty, please specify a value\"\r\n    }\r\n}\r\n\r\nfunction Get-InProgressScheduledIncidentByName\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$PageId,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$ApiKey,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$Name\r\n    )\r\n\r\n    $url = \"https://api.statuspage.io/v1/pages/$PageId/incidents/unresolved.json\"\r\n    $headers = @{\"Authorization\"=\"OAuth $ApiKey\"}\r\n\r\n    $response = iwr -UseBasicParsing -Uri $url -Headers $headers -Method GET\r\n    $content = ConvertFrom-Json $response\r\n    $incident = $content | where {$_.name -eq $Name}\r\n    $incident.id\r\n}\r\n\r\nfunction Update-ScheduledIncident\r\n{\r\n    [CmdletBinding()]\r\n    Param(\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$PageId,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$ApiKey,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [string]$IncidentId,\r\n\r\n        [Parameter(Mandatory=$true)]\r\n        [ValidateSet(\"scheduled\", \"in_progress\", \"verifying\", \"completed\")]\r\n        [string]$Status,\r\n        \r\n        [Parameter(Mandatory=$false)]\r\n        [string]$Message\r\n    )\r\n\r\n    $url = \"https://api.statuspage.io/v1/pages/$PageId/incidents/$IncidentId.json\"\r\n    $headers = @{\"Authorization\"=\"OAuth $ApiKey\"}\r\n    $body = \"incident[status]=$Status\"\r\n\r\n    if($Message)\r\n    {\r\n        $body += \"&incident[message]=$Message\"\r\n    }\r\n\r\n    $response = iwr -UseBasicParsing -Uri $url -Headers $headers -Method PATCH -Body $body -ContentType application/x-www-form-urlencoded\r\n}\r\n\r\nValidate-Parameter $pageId -parameterName 'PageId'\r\nValidate-Parameter $apiKey = -parameterName 'ApiKey'\r\nValidate-Parameter $incidentName = -parameterName 'IncidentName'\r\nValidate-Parameter $incidentStatus -parameterName 'IncidentStatus'\r\n\r\n$incidentId = Get-InProgressScheduledIncidentByName -PageId $pageId -ApiKey $apiKey -Name $incidentName\r\nWrite-Verbose \"Found incident id: $incidentId\"\r\nWrite-Output \"Updating scheduled maintenance incident `\"$incidentName`\" [IncidentId: $incidentId]\"\r\nUpdate-ScheduledIncident -PageId $pageId -ApiKey $apiKey -IncidentId $incidentId -Status $incidentStatus -Message $incidentMessage \r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "b1044b12-8cdc-4b55-b429-a08711a66339",
-      "Name": "IncidentName",
-      "Label": "Scheduled Maintenance Name",
-      "HelpText": "The name of the scheduled maintenance incident.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "6d9277b0-3cab-43ea-9946-d772c9d3aebf",
-      "Name": "IncidentStatus",
-      "Label": "Status",
-      "HelpText": "The status of the incident, one of scheduled|in_progress|verifying|completed",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "scheduled|Scheduled\nin_progress|In Progress\nverifying|Verifying\ncompleted|Completed"
-      }
-    },
-    {
-      "Id": "a2121f55-09ea-4200-ae4f-0131f7db06b1",
-      "Name": "IncidentMessage",
-      "Label": "Message",
-      "HelpText": "Optional message to add to scheduled maintenance incident.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "d0504e1f-150d-46b2-8127-449a708e55c6",
-      "Name": "PageId",
-      "Label": "StatusPage.io Page Id",
-      "HelpText": "StatusPage.io Organization or \"Page ID\". Visit the [API authentication docs](http://doers.statuspage.io/api/authentication/) for details.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "48c90b4b-d9ca-419a-8c8f-98d301db2015",
-      "Name": "ApiKey",
-      "Label": "StatusPage.io API Key",
-      "HelpText": "StatusPage.io API key for the organization. Visit the [API Authentication docs](http://doers.statuspage.io/api/authentication/) for details.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedBy": "nshenoy",
-  "$Meta": {
-    "ExportedAt": "2016-10-26T18:51:37.967+00:00",
-    "OctopusVersion": "3.4.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "statusPage"
-}
\ No newline at end of file
diff --git a/step-templates/swaggerhub-post-api.json b/step-templates/swaggerhub-post-api.json
deleted file mode 100644
index d5126f85f..000000000
--- a/step-templates/swaggerhub-post-api.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "Id": "0f60f13c-bc00-4035-a0ba-5aeef6a2c1e5",
-    "Author": "waxtell",
-    "Name": "SwaggerHub Post Api",
-    "Description": "Post your Swagger/OAS to SwaggerHub",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptBody": "function Coalesce($a, $b) { \n    if ($null -ne $a) { \n        $a \n    } else { \n        $b \n    } \n}\n\nfunction Validate([string]$parameterValue, [string[]]$validInput, $parameterName) {\n    Write-Host \"${parameterName}: $parameterValue\"\n\n    if (!$parameterValue) {\n        throw \"Parameter $parameterName is required!\"\n    }\n    \n    if ($validInput) {\n        if (! $validInput -contains $parameterValue) {\n            throw \"'$input' is not a valid value for '$parameterName'\"\n        }\n    }\n}\n\n$apiKey = $OctopusParameters['shpApiKey']\n$owner = $OctopusParameters['shpOwner']\n$apiName = $OctopusParameters['shpApi']\n$definition = $OctopusParameters['shpDefinition']\n$contentType = Coalesce $OctopusParameters['shpContentType'] \"application/json\"\n$oas = Coalesce $OctopusParameters['shpOas'] \"2.0\"\n$isPrivate = (Coalesce $OctopusParameters['shpIsPrivate'] \"False\").ToLower()\n$force = (Coalesce $OctopusParameters['shpForce'] \"False\").ToLower()\n$version = $OctopusParameters['shpVersion']\n\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor [System.Net.SecurityProtocolType]::Tls12\n\nValidate $apiKey -parameterName \"Api Key\"\nValidate $owner -parameterName \"Owner\"\nValidate $apiName -parameterName \"Api Name\"\nValidate $definition -parameterName \"Definition\"\n\ntry {\n    Write-Host \"Updating $($apiName)...\"\n\n    $headers = @{ \n        'Authorization' = $apiKey \n        'Accept' = 'application/json'\n    }    \n    \n    $query = \"https://api.swaggerhub.com/apis/$($owner)/$($apiName)?isPrivate=$($isPrivate.ToLower())&oas=$($oas)&force=$($force.ToLower())\"\n\n    if($version) {\n        $query = $query+\"&version=$($version)\"\n    }\n    \n    $specification = $definition\n    \n    # If $definition contains a file path, load the content of the provided value\n    if((Test-Path $definition -ErrorAction SilentlyContinue)[0]) {\n        $specification = get-content $definition\n    }\n\n    Invoke-RestMethod $query -Headers $headers -ContentType $contentType -Method Post -Body $specification\n\n    Write-Host \"SwaggerHub post successful\"\n} catch {\n    Write-Host $_.Exception.Message\n    Write-Host \"SwaggerHub post failed!\"\n    Write-Host \"  HttpStatus: $($_.Exception.Response.StatusCode.value__)\" \n\n    exit 1\n}\n",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.RunOnServer": "false"
-    },
-    "Parameters": [
-      {
-        "Id": "c71e96a7-5e25-4624-9e57-976cc18eb348",
-        "Name": "shpApiKey",
-        "Label": "SwaggerHub API Key",
-        "HelpText": "Your SwaggerHub API key",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "7047922F-8AA3-476F-B2E6-89E9C6F0DB3F",
-        "Name": "shpOwner",
-        "Label": "Owner",
-        "HelpText": "API owner (user or organization, case-sensitive)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "BBE8AB7A-2BFE-4413-ACFF-384F6B6F953C",
-        "Name": "shpApi",
-        "Label": "Api Name",
-        "HelpText": "API name (case-sensitive)",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "409EAF93-FF98-4430-89CD-19C30E1CC792",
-        "Name": "shpIsPrivate",
-        "Label": "Is Private",
-        "HelpText": "Defines whether the API has to be private",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "3643C071-B51F-4611-900C-FAB22B4C5698",
-        "Name": "shpVersion",
-        "Label": "Version",
-        "HelpText": "API version",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "25550589-4208-476C-B581-20EF0A4F1453",
-        "Name": "shpOas",
-        "Label": "OAS Version",
-        "HelpText": "The OpenApi Specification (OAS) version.",
-        "DefaultValue": "2.0",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "2.0|2.0\n3.0.0|3.0.0\n3.0.1|3.0.1"
-        }
-      },
-      {
-        "Id": "AF1EF8F1-A829-4D40-86B1-9D18D909037E",
-        "Name": "shpDefinition",
-        "Label": "Definition",
-        "HelpText": "The Swagger definition, or the path to the file that contains the definition, of this API",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "F99E5B74-55BF-4C91-83E6-E6AC17284F4C",
-        "Name": "shpContentType",
-        "Label": "Definition Content Type",
-        "HelpText": "Definition Content Type",
-        "DefaultValue": "application/json",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "application/json|application/json\napplication/yaml|application/yaml"
-        }
-      },
-      {
-        "Id": "3790F1C7-3FA8-4908-B4C3-F96DCD02B96D",
-        "Name": "shpForce",
-        "Label": "Force",
-        "HelpText": "Force update",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedBy": "waxtell",    
-    "$Meta": {
-      "ExportedAt": "2020-01-29T17:02:59.155Z",
-      "OctopusVersion": "2019.12.0",
-      "Type": "ActionTemplate"
-    },
-    "Category": "SwaggerHub"
-  }
\ No newline at end of file
diff --git a/step-templates/teamcity-run-build.json b/step-templates/teamcity-run-build.json
deleted file mode 100644
index 39f66c666..000000000
--- a/step-templates/teamcity-run-build.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "Id": "a7fa3e51-14aa-4bb9-8686-781adc9bf93e",
-  "Name": "TeamCity - Run Build",
-  "Description": "Trigger a specific Team City build from an Octopus Deploy process and wait for the result. The step will fail if the build fails.",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Set TLS 1.2\n[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n\n$teamCityBuildConfigId = $OctopusParameters['tcrb_TeamCityBuildConfigurationId']\r\n$teamCityUrl = $OctopusParameters['tcrb_TeamCityUrl']\r\n$teamCityUsername = $OctopusParameters['tcrb_TeamCityUsername']\r\n$teamCityPassword = $OctopusParameters['tcrb_TeamCityPassword']\r\n$teamCityInterval = [int]::Parse($OctopusParameters['tcrb_TeamCityInterval'])\r\n$teamCityBuildParams = $OctopusParameters['tcrb_BuildParams']\r\n\r\nfunction Start-TeamCityBuild($Url, $Username, $Password, $BuildConfigId, $BuildParams) {\r\n    $endpoint = \"${Url}/httpAuth/app/rest/buildQueue\"\r\n    $content = \"<build><buildType id=`\"${BuildConfigId}`\" /><properties>\"\r\n    if (-not [String]::IsNullOrEmpty($BuildParams)) {\r\n        foreach ($param in (ConvertFrom-Csv -Delimiter '=' -Header Name,Value -InputObject $BuildParams)) {\r\n            $name = $param.Name.Replace('\"', '&quot;')\r\n            $value = $param.Value.Replace('\"', '&quot;')\r\n            $content += \"<property name=`\"${name}`\" value=`\"${value}`\" />\"\r\n        }\r\n    }\r\n    $content += \"</properties></build>\"    \r\n    $encodedContent = [System.Text.Encoding]::UTF8.GetBytes($content)\r\n\r\n    Write-Host \"Triggering build with Id ${BuildConfigId} in TeamCity. Server: ${Url}\"\r\n\r\n    $req = [System.Net.WebRequest]::Create($endpoint)\r\n    $req.Credentials = New-Object System.Net.NetworkCredential($Username, $Password)\r\n    $req.Method = \"POST\"\r\n    $req.ContentType = \"application/xml\"\r\n\r\n    $req.ContentLength = $encodedContent.length\r\n    $requestStream = $req.GetRequestStream()\r\n    $requestStream.Write($encodedContent, 0, $encodedContent.length)\r\n    $requestStream.Close()\r\n\r\n    $resp = $req.GetResponse()\r\n    $reader = New-Object System.IO.StreamReader($resp.GetResponseStream())\r\n    $result = [xml]$reader.ReadToEnd()\r\n    $buildUrl = $result.build.webUrl\r\n\r\n    Write-Host $buildUrl\r\n    Write-Host \"================================================================================\"\r\n\r\n    return $result\r\n}\r\n\r\nfunction Get-TeamCityBuildState($Url, $Username, $Password, $BuildInfo) {\r\n    $href = $BuildInfo.href\r\n    $buildId = $BuildInfo.id\r\n    $endpoint = \"${Url}${href}\"\r\n\r\n    Write-Host \"Getting state of build ${buildId} in TeamCity. Server: ${Url}\"\r\n\r\n    $req = [System.Net.WebRequest]::Create($endpoint)\r\n    $req.Credentials = New-Object System.Net.NetworkCredential($Username, $Password)\r\n    $req.Method = \"GET\"\r\n\r\n    $resp = $req.GetResponse()\r\n    $reader = New-Object System.IO.StreamReader($resp.GetResponseStream())\r\n    return [xml]$reader.ReadToEnd();\r\n}\r\n\r\nfunction Invoke-TeamCityBuild ($Url, $Username, $Password, $BuildConfigId, $Interval, $BuildParams) {\r\n    $build = Start-TeamCityBuild -Url $Url -Username $Username -Password $Password -BuildConfigId $BuildConfigId -BuildParams $teamCityBuildParams\r\n    $buildInfo = $build.build\r\n\r\n    while ($true) {\r\n        $buildState = Get-TeamCityBuildState -Url $teamCityUrl -Username $teamCityUsername -Password $teamCityPassword -BuildInfo $buildInfo\r\n        Write-Host $buildState.build.state\r\n        if ($buildState.build.state -eq 'finished') {\r\n            return $buildState.build\r\n        }\r\n        \r\n        Start-Sleep -Seconds $Interval\r\n    }\r\n}\r\n\r\n$buildResult = Invoke-TeamCityBuild -Url $teamCityUrl -Username $teamCityUsername -Password $teamCityPassword -BuildConfigId $teamCityBuildConfigId -Interval $teamCityInterval -BuildParams $teamCityBuildParams\r\n$message = $buildResult.statusText\r\nWrite-Host \"================================================================================\"\r\nWrite-Host $buildResult.webUrl\r\nif ($buildResult.status -eq 'FAILURE') {\r\n    Write-Host \"Build failed: ${message}\"\r\n    exit 1\r\n}\r\nelseif ($message -eq 'Canceled') {\r\n    Write-Host \"Build canceled: ${message}\"\r\n    exit 2\r\n}\r\nelse {\r\n    Write-Host \"Build successful: ${message}\"\r\n    exit 0\r\n}\r\n",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptFileName": null
-  },
-  "Parameters": [
-    {
-      "Name": "tcrb_TeamCityBuildConfigurationId",
-      "Label": "BuildConfigurationId",
-      "HelpText": "The Id of the build configuration to trigger.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "tcrb_TeamCityUrl",
-      "Label": "TeamCityUrl",
-      "HelpText": "The URL of the Team City server.\nE.g. `http://teamcity.example.com`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "tcrb_TeamCityUsername",
-      "Label": "TeamCityUsername",
-      "HelpText": "The username to use for accessing TeamCity.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "tcrb_TeamCityPassword",
-      "Label": "TeamCityPassword",
-      "HelpText": "The password for the TeamCity user.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "tcrb_TeamCityInterval",
-      "Label": "TeamCityInterval",
-      "HelpText": "Number of seconds to wait between each check of the build's state.",
-      "DefaultValue": "5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "tcrb_BuildParams",
-      "Label": "BuildParameters",
-      "HelpText": "Line-delimited list of parameters to add to the build in the form <name>=<value>\n<name> and <value> can be contained in quotes.\nE.g.\nparam1=param_value1\nenv.param2=\"env_param2\"\nsystem.param3=sys_param2",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2020-11-03T09:42:34.506Z",
-    "OctopusVersion": "2020.4.10",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "harrisonmeister",
-  "Category": "teamcity"
-}

From 44b25acb3ffcabe3d8b7927a36c9f3daa9395093 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 01:19:49 -0700
Subject: [PATCH 12/21] refactor: migrate final step template batch to src

---
 .../Wait-until-time/metadata.json             |   6 +-
 .../Wait-until-time/scriptbody.ps1            |  21 +
 .../teamcity-tag-build/metadata.json          |   4 +-
 .../teamcity-tag-build/scriptbody.ps1         |  22 +
 .../teamcity-trigger-build/metadata.json      |  58 +++
 .../teamcity-trigger-build/scriptbody.ps1     |  28 ++
 .../terraform-custom-script/metadata.json     | 119 ++++++
 .../terraform-custom-script/scriptbody.ps1    | 108 +++++
 .../test-run-nunit/metadata.json              |   8 +-
 .../test-run-nunit/scriptbody.ps1             |  25 ++
 .../testery-create-environment/metadata.json  |   4 +-
 .../testery-create-environment/scriptbody.sh  |  58 +++
 .../testery-create-test-run/metadata.json     |   4 +-
 .../testery-create-test-run/scriptbody.sh     | 106 +++++
 .../testery-delete-environment/metadata.json  |   4 +-
 .../testery-delete-environment/scriptbody.sh  |   7 +
 .../testery-report-deployment/metadata.json   |   4 +-
 .../testery-report-deployment/scriptbody.sh   |  48 +++
 .../tomcat-undeploy-application/metadata.json |   6 +-
 .../tomcat-undeploy-application/scriptbody.sh |  65 +++
 .../topshelf-install/metadata.json            |   4 +-
 .../topshelf-install/scriptbody.ps1           |  30 ++
 .../topshelf-uninstall/metadata.json          |   4 +-
 .../topshelf-uninstall/scriptbody.ps1         |  25 ++
 .../metadata.json                             |  86 ++++
 .../scriptbody.ps1                            | 118 ++++++
 .../twilio-send-sms-powershell/metadata.json  |  75 ++++
 .../twilio-send-sms-powershell/scriptbody.ps1 |  13 +
 .../metadata.json                             |  40 ++
 .../scriptbody.ps1                            |  38 ++
 .../unicorn-sync-configuration/metadata.json  |   6 +-
 .../unicorn-sync-configuration/scriptbody.ps1 |  12 +
 .../step-templates/unzip/metadata.json        |   8 +-
 src/step-templates/unzip/scriptbody.ps1       |  16 +
 .../update-hosts-file/metadata.json           |   6 +-
 .../update-hosts-file/scriptbody.ps1          |  32 ++
 .../upgrade-octopus-server/metadata.json      |  58 +++
 .../upgrade-octopus-server/scriptbody.ps1     |  95 +++++
 .../upgrade_to_latest_tentacle/metadata.json  | 104 +++++
 .../upgrade_to_latest_tentacle/scriptbody.ps1 | 104 +++++
 .../variables-find-unreplaced/metadata.json   |  74 ++++
 .../variables-find-unreplaced/scriptbody.ps1  |  92 ++++
 .../metadata.json                             |  78 ++++
 .../scriptbody.ps1                            | 183 ++++++++
 .../metadata.json                             |  30 ++
 .../scriptbody.ps1                            | 139 ++++++
 .../metadata.json                             | 165 ++++++++
 .../scriptbody.ps1                            | 150 +++++++
 .../metadata.json                             | 145 +++++++
 .../scriptbody.ps1                            | 170 ++++++++
 .../metadata.json                             | 104 +++++
 .../scriptbody.ps1                            | 132 ++++++
 .../metadata.json                             |  74 ++++
 .../scriptbody.ps1                            | 114 +++++
 .../metadata.json                             | 175 ++++++++
 .../scriptbody.ps1                            | 395 ++++++++++++++++++
 .../metadata.json                             |  73 ++++
 .../scriptbody.ps1                            |  88 ++++
 .../metadata.json                             |  43 ++
 .../scriptbody.ps1                            |  51 +++
 .../victorops-create-alert/metadata.json      |   4 +-
 .../victorops-create-alert/scriptbody.ps1     |  58 +++
 .../metadata.json                             |  48 +++
 .../scriptbody.ps1                            |  81 ++++
 .../step-templates/wait/metadata.json         |   6 +-
 src/step-templates/wait/scriptbody.ps1        |   6 +
 .../web-deploy-azure-convention/metadata.json |  66 +++
 .../scriptbody.ps1                            | 122 ++++++
 .../metadata.json                             | 103 +++++
 .../scriptbody.ps1                            | 124 ++++++
 .../metadata.json                             |   8 +-
 .../scriptbody.ps1                            |   9 +
 .../metadata.json                             |  67 +++
 .../scriptbody.ps1                            |  99 +++++
 .../metadata.json                             |  40 ++
 .../scriptbody.ps1                            | 140 +++++++
 .../metadata.json                             |  34 ++
 .../scriptbody.ps1                            |  78 ++++
 .../metadata.json                             |  40 ++
 .../scriptbody.ps1                            |  36 ++
 .../metadata.json                             |  55 +++
 .../scriptbody.ps1                            |  62 +++
 .../metadata.json                             |  45 ++
 .../scriptbody.ps1                            |  69 +++
 .../windows-create-eventsource/metadata.json  |  80 ++--
 .../windows-create-eventsource/scriptbody.ps1 |  10 +
 .../windows-create-shortcut/metadata.json     |   8 +-
 .../windows-create-shortcut/scriptbody.ps1    |  25 ++
 .../windows-disk-cleanup/metadata.json        |  42 ++
 .../windows-disk-cleanup/scriptbody.ps1       |  78 ++++
 .../metadata.json                             |  40 ++
 .../scriptbody.ps1                            |  38 ++
 .../metadata.json                             |   8 +-
 .../scriptbody.ps1                            |  16 +
 .../metadata.json                             |   8 +-
 .../scriptbody.ps1                            |  15 +
 .../windows-get-pending-reboot/metadata.json  |  31 ++
 .../windows-get-pending-reboot/scriptbody.ps1 |  72 ++++
 .../windows-get-processor-load/metadata.json  |   8 +-
 .../windows-get-processor-load/scriptbody.ps1 |  11 +
 .../windows-get-uptime/metadata.json          |   8 +-
 .../windows-get-uptime/scriptbody.ps1         |  14 +
 .../metadata.json                             |  33 ++
 .../scriptbody.ps1                            |  44 ++
 .../windows-install-msi/metadata.json         | 110 +++++
 .../windows-install-msi/scriptbody.ps1        | 288 +++++++++++++
 .../windows-local-user/metadata.json          |  58 +++
 .../windows-local-user/scriptbody.ps1         |  58 +++
 .../windows-map-network-drive/metadata.json   |   8 +-
 .../windows-map-network-drive/scriptbody.ps1  |  35 ++
 .../windows-restart-computer/metadata.json    |   8 +-
 .../windows-restart-computer/scriptbody.ps1   |   1 +
 .../windows-restart-if-required/metadata.json |  23 +
 .../scriptbody.ps1                            |  72 ++++
 .../metadata.json                             |   6 +-
 .../scriptbody.ps1                            |  20 +
 .../metadata.json                             | 163 ++++++++
 .../scriptbody.ps1                            | 264 ++++++++++++
 .../metadata.json                             |  50 +++
 .../scriptbody.ps1                            |  71 ++++
 .../metadata.json                             |   6 +-
 .../scriptbody.ps1                            |   1 +
 .../metadata.json                             |   8 +-
 .../scriptbody.ps1                            |  11 +
 .../metadata.json                             |   6 +-
 .../scriptbody.ps1                            |  40 ++
 .../windows-service-create/metadata.json      |   8 +-
 .../windows-service-create/scriptbody.ps1     |  19 +
 .../windows-service-remove/metadata.json      |   8 +-
 .../windows-service-remove/scriptbody.ps1     |  16 +
 .../windows-service-restart/metadata.json     |   8 +-
 .../windows-service-restart/scriptbody.ps1    |   6 +
 .../metadata.json                             |   6 +-
 .../scriptbody.ps1                            |  60 +++
 .../metadata.json                             |   8 +-
 .../scriptbody.ps1                            |  14 +
 .../windows-service-start/metadata.json       |   8 +-
 .../windows-service-start/scriptbody.ps1      |   1 +
 .../metadata.json                             |  44 ++
 .../scriptbody.ps1                            |  71 ++++
 .../windows-service-stop/metadata.json        |   8 +-
 .../windows-service-stop/scriptbody.ps1       |   1 +
 .../metadata.json                             |  48 +++
 .../scriptbody.ps1                            |  46 ++
 .../winsw-install/metadata.json               |   4 +-
 .../winsw-install/scriptbody.ps1              |  46 ++
 .../metadata.json                             |  49 +++
 .../scriptbody.ps1                            | 270 ++++++++++++
 .../metadata.json                             | 112 +++++
 .../scriptbody.ps1                            | 353 ++++++++++++++++
 .../xml-attribute-update/metadata.json        |   8 +-
 .../xml-attribute-update/scriptbody.ps1       |  12 +
 .../xml-transform-using-xdt/metadata.json     |  60 +++
 .../xml-transform-using-xdt/scriptbody.ps1    |  74 ++++
 .../step-templates/yams-upload/metadata.json  |   4 +-
 src/step-templates/yams-upload/scriptbody.ps1 |  12 +
 .../zabbix-node-api-maintenance/metadata.json | 110 +++++
 .../scriptbody.ps1                            | 138 ++++++
 step-templates/teamcity-trigger-build.json    |  58 ---
 step-templates/terraform-custom-script.json   | 119 ------
 .../trigger-multitenant-deployment.json       |  84 ----
 .../twilio-send-sms-powershell.json           |  75 ----
 .../umbraco-v7-folder-permissions.json        |  40 --
 step-templates/upgrade-octopus-server.json    |  58 ---
 .../upgrade_to_latest_tentacle.json           | 104 -----
 step-templates/variables-find-unreplaced.json |  74 ----
 .../variables-substitute-in-files.json        |  78 ----
 .../variables-substitute-in-json-file.json    |  30 --
 ...nafi-tpp-create-provision-certificate.json | 165 --------
 .../venafi-tpp-export-certificate.json        | 146 -------
 .../venafi-tpp-find-certificate-details.json  | 104 -----
 .../venafi-tpp-generate-oauth-token.json      |  74 ----
 ...i-tpp-import-certificate-into-octopus.json | 175 --------
 ...nafi-tpp-retrieve-certificate-details.json |  73 ----
 .../venafi-tpp-revoke-oauth-token.json        |  43 --
 ...t-for-iis-connections-to-drop-to-zero.json |  48 ---
 .../web-deploy-azure-convention.json          |  66 ---
 .../web-deploy-publish-website-msdeploy.json  | 103 -----
 .../windows-add-poll-endpoint-task.json       |  67 ---
 .../windows-add-users-to-local-groups.json    |  40 --
 .../windows-apply-windows-updates.json        |  34 --
 ...windows-certificate-grant-read-access.json |  40 --
 ...dows-check-net-core-framework-version.json |  55 ---
 .../windows-check-net-framework-version.json  |  45 --
 step-templates/windows-disk-cleanup.json      |  42 --
 .../windows-ensure-features-installed.json    |  40 --
 .../windows-get-pending-reboot.json           |  31 --
 .../windows-grant-logon-as-service.json       |  33 --
 step-templates/windows-install-msi.json       | 110 -----
 step-templates/windows-local-user.json        |  58 ---
 .../windows-restart-if-required.json          |  23 -
 .../windows-scheduled-task-create.json        | 163 --------
 .../windows-scheduled-task-disable.json       |  50 ---
 .../windows-service-stop-or-kill.json         |  44 --
 ...s-wait-for-or-force-close-application.json |  48 ---
 .../xamarin-Insights-upload-dysm.json         |  49 ---
 .../xamarin-testcloud-execute-testrun.json    | 112 -----
 step-templates/xml-transform-using-xdt.json   |  60 ---
 .../zabbix-node-api-maintenance.json          | 110 -----
 199 files changed, 8823 insertions(+), 3130 deletions(-)
 rename step-templates/Wait-until-time.json => src/step-templates/Wait-until-time/metadata.json (59%)
 create mode 100644 src/step-templates/Wait-until-time/scriptbody.ps1
 rename step-templates/teamcity-tag-build.json => src/step-templates/teamcity-tag-build/metadata.json (73%)
 create mode 100644 src/step-templates/teamcity-tag-build/scriptbody.ps1
 create mode 100644 src/step-templates/teamcity-trigger-build/metadata.json
 create mode 100644 src/step-templates/teamcity-trigger-build/scriptbody.ps1
 create mode 100644 src/step-templates/terraform-custom-script/metadata.json
 create mode 100644 src/step-templates/terraform-custom-script/scriptbody.ps1
 rename step-templates/test-run-nunit.json => src/step-templates/test-run-nunit/metadata.json (72%)
 create mode 100644 src/step-templates/test-run-nunit/scriptbody.ps1
 rename step-templates/testery-create-environment.json => src/step-templates/testery-create-environment/metadata.json (61%)
 create mode 100644 src/step-templates/testery-create-environment/scriptbody.sh
 rename step-templates/testery-create-test-run.json => src/step-templates/testery-create-test-run/metadata.json (71%)
 create mode 100644 src/step-templates/testery-create-test-run/scriptbody.sh
 rename step-templates/testery-delete-environment.json => src/step-templates/testery-delete-environment/metadata.json (80%)
 create mode 100644 src/step-templates/testery-delete-environment/scriptbody.sh
 rename step-templates/testery-report-deployment.json => src/step-templates/testery-report-deployment/metadata.json (76%)
 create mode 100644 src/step-templates/testery-report-deployment/scriptbody.sh
 rename step-templates/tomcat-undeploy-application.json => src/step-templates/tomcat-undeploy-application/metadata.json (59%)
 create mode 100644 src/step-templates/tomcat-undeploy-application/scriptbody.sh
 rename step-templates/topshelf-install.json => src/step-templates/topshelf-install/metadata.json (59%)
 create mode 100644 src/step-templates/topshelf-install/scriptbody.ps1
 rename step-templates/topshelf-uninstall.json => src/step-templates/topshelf-uninstall/metadata.json (54%)
 create mode 100644 src/step-templates/topshelf-uninstall/scriptbody.ps1
 create mode 100644 src/step-templates/trigger-multitenant-deployment/metadata.json
 create mode 100644 src/step-templates/trigger-multitenant-deployment/scriptbody.ps1
 create mode 100644 src/step-templates/twilio-send-sms-powershell/metadata.json
 create mode 100644 src/step-templates/twilio-send-sms-powershell/scriptbody.ps1
 create mode 100644 src/step-templates/umbraco-v7-folder-permissions/metadata.json
 create mode 100644 src/step-templates/umbraco-v7-folder-permissions/scriptbody.ps1
 rename step-templates/unicorn-sync-configuration.json => src/step-templates/unicorn-sync-configuration/metadata.json (72%)
 create mode 100644 src/step-templates/unicorn-sync-configuration/scriptbody.ps1
 rename step-templates/unzip.json => src/step-templates/unzip/metadata.json (58%)
 create mode 100644 src/step-templates/unzip/scriptbody.ps1
 rename step-templates/update-hosts-file.json => src/step-templates/update-hosts-file/metadata.json (54%)
 create mode 100644 src/step-templates/update-hosts-file/scriptbody.ps1
 create mode 100644 src/step-templates/upgrade-octopus-server/metadata.json
 create mode 100644 src/step-templates/upgrade-octopus-server/scriptbody.ps1
 create mode 100644 src/step-templates/upgrade_to_latest_tentacle/metadata.json
 create mode 100644 src/step-templates/upgrade_to_latest_tentacle/scriptbody.ps1
 create mode 100755 src/step-templates/variables-find-unreplaced/metadata.json
 create mode 100644 src/step-templates/variables-find-unreplaced/scriptbody.ps1
 create mode 100644 src/step-templates/variables-substitute-in-files/metadata.json
 create mode 100644 src/step-templates/variables-substitute-in-files/scriptbody.ps1
 create mode 100644 src/step-templates/variables-substitute-in-json-file/metadata.json
 create mode 100644 src/step-templates/variables-substitute-in-json-file/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-create-provision-certificate/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-create-provision-certificate/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-export-certificate/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-export-certificate/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-find-certificate-details/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-find-certificate-details/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-generate-oauth-token/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-generate-oauth-token/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-import-certificate-into-octopus/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-import-certificate-into-octopus/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-retrieve-certificate-details/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-retrieve-certificate-details/scriptbody.ps1
 create mode 100644 src/step-templates/venafi-tpp-revoke-oauth-token/metadata.json
 create mode 100644 src/step-templates/venafi-tpp-revoke-oauth-token/scriptbody.ps1
 rename step-templates/victorops-create-alert.json => src/step-templates/victorops-create-alert/metadata.json (53%)
 create mode 100644 src/step-templates/victorops-create-alert/scriptbody.ps1
 create mode 100644 src/step-templates/wait-for-iis-connections-to-drop-to-zero/metadata.json
 create mode 100644 src/step-templates/wait-for-iis-connections-to-drop-to-zero/scriptbody.ps1
 rename step-templates/wait.json => src/step-templates/wait/metadata.json (71%)
 create mode 100644 src/step-templates/wait/scriptbody.ps1
 create mode 100644 src/step-templates/web-deploy-azure-convention/metadata.json
 create mode 100644 src/step-templates/web-deploy-azure-convention/scriptbody.ps1
 create mode 100644 src/step-templates/web-deploy-publish-website-msdeploy/metadata.json
 create mode 100644 src/step-templates/web-deploy-publish-website-msdeploy/scriptbody.ps1
 rename step-templates/windows-add-back-connection-host-name.json => src/step-templates/windows-add-back-connection-host-name/metadata.json (63%)
 create mode 100644 src/step-templates/windows-add-back-connection-host-name/scriptbody.ps1
 create mode 100644 src/step-templates/windows-add-poll-endpoint-task/metadata.json
 create mode 100644 src/step-templates/windows-add-poll-endpoint-task/scriptbody.ps1
 create mode 100644 src/step-templates/windows-add-users-to-local-groups/metadata.json
 create mode 100644 src/step-templates/windows-add-users-to-local-groups/scriptbody.ps1
 create mode 100644 src/step-templates/windows-apply-windows-updates/metadata.json
 create mode 100644 src/step-templates/windows-apply-windows-updates/scriptbody.ps1
 create mode 100644 src/step-templates/windows-certificate-grant-read-access/metadata.json
 create mode 100644 src/step-templates/windows-certificate-grant-read-access/scriptbody.ps1
 create mode 100644 src/step-templates/windows-check-net-core-framework-version/metadata.json
 create mode 100644 src/step-templates/windows-check-net-core-framework-version/scriptbody.ps1
 create mode 100644 src/step-templates/windows-check-net-framework-version/metadata.json
 create mode 100644 src/step-templates/windows-check-net-framework-version/scriptbody.ps1
 rename step-templates/windows-create-eventsource.json => src/step-templates/windows-create-eventsource/metadata.json (69%)
 create mode 100644 src/step-templates/windows-create-eventsource/scriptbody.ps1
 rename step-templates/windows-create-shortcut.json => src/step-templates/windows-create-shortcut/metadata.json (64%)
 create mode 100644 src/step-templates/windows-create-shortcut/scriptbody.ps1
 create mode 100644 src/step-templates/windows-disk-cleanup/metadata.json
 create mode 100644 src/step-templates/windows-disk-cleanup/scriptbody.ps1
 create mode 100644 src/step-templates/windows-ensure-features-installed/metadata.json
 create mode 100644 src/step-templates/windows-ensure-features-installed/scriptbody.ps1
 rename step-templates/windows-ensure-hosts-file-entry-exists.json => src/step-templates/windows-ensure-hosts-file-entry-exists/metadata.json (61%)
 create mode 100644 src/step-templates/windows-ensure-hosts-file-entry-exists/scriptbody.ps1
 rename step-templates/windows-firewall-configure-rule.json => src/step-templates/windows-firewall-configure-rule/metadata.json (69%)
 create mode 100644 src/step-templates/windows-firewall-configure-rule/scriptbody.ps1
 create mode 100644 src/step-templates/windows-get-pending-reboot/metadata.json
 create mode 100644 src/step-templates/windows-get-pending-reboot/scriptbody.ps1
 rename step-templates/windows-get-processor-load.json => src/step-templates/windows-get-processor-load/metadata.json (58%)
 create mode 100644 src/step-templates/windows-get-processor-load/scriptbody.ps1
 rename step-templates/windows-get-uptime.json => src/step-templates/windows-get-uptime/metadata.json (52%)
 create mode 100644 src/step-templates/windows-get-uptime/scriptbody.ps1
 create mode 100644 src/step-templates/windows-grant-logon-as-service/metadata.json
 create mode 100644 src/step-templates/windows-grant-logon-as-service/scriptbody.ps1
 create mode 100644 src/step-templates/windows-install-msi/metadata.json
 create mode 100644 src/step-templates/windows-install-msi/scriptbody.ps1
 create mode 100644 src/step-templates/windows-local-user/metadata.json
 create mode 100644 src/step-templates/windows-local-user/scriptbody.ps1
 rename step-templates/windows-map-network-drive.json => src/step-templates/windows-map-network-drive/metadata.json (58%)
 create mode 100644 src/step-templates/windows-map-network-drive/scriptbody.ps1
 rename step-templates/windows-restart-computer.json => src/step-templates/windows-restart-computer/metadata.json (77%)
 create mode 100644 src/step-templates/windows-restart-computer/scriptbody.ps1
 create mode 100644 src/step-templates/windows-restart-if-required/metadata.json
 create mode 100644 src/step-templates/windows-restart-if-required/scriptbody.ps1
 rename step-templates/windows-scheduled-task-changepath.json => src/step-templates/windows-scheduled-task-changepath/metadata.json (66%)
 create mode 100644 src/step-templates/windows-scheduled-task-changepath/scriptbody.ps1
 create mode 100644 src/step-templates/windows-scheduled-task-create/metadata.json
 create mode 100644 src/step-templates/windows-scheduled-task-create/scriptbody.ps1
 create mode 100644 src/step-templates/windows-scheduled-task-disable/metadata.json
 create mode 100644 src/step-templates/windows-scheduled-task-disable/scriptbody.ps1
 rename step-templates/windows-scheduled-task-enable.json => src/step-templates/windows-scheduled-task-enable/metadata.json (62%)
 create mode 100644 src/step-templates/windows-scheduled-task-enable/scriptbody.ps1
 rename step-templates/windows-service-change-binary-path.json => src/step-templates/windows-service-change-binary-path/metadata.json (70%)
 create mode 100644 src/step-templates/windows-service-change-binary-path/scriptbody.ps1
 rename step-templates/windows-service-check-status.json => src/step-templates/windows-service-check-status/metadata.json (54%)
 create mode 100644 src/step-templates/windows-service-check-status/scriptbody.ps1
 rename step-templates/windows-service-create.json => src/step-templates/windows-service-create/metadata.json (73%)
 create mode 100644 src/step-templates/windows-service-create/scriptbody.ps1
 rename step-templates/windows-service-remove.json => src/step-templates/windows-service-remove/metadata.json (52%)
 create mode 100644 src/step-templates/windows-service-remove/scriptbody.ps1
 rename step-templates/windows-service-restart.json => src/step-templates/windows-service-restart/metadata.json (61%)
 create mode 100644 src/step-templates/windows-service-restart/scriptbody.ps1
 rename step-templates/windows-service-set-recovery-on-failure-actions.json => src/step-templates/windows-service-set-recovery-on-failure-actions/metadata.json (61%)
 create mode 100644 src/step-templates/windows-service-set-recovery-on-failure-actions/scriptbody.ps1
 rename step-templates/windows-service-set-startup-type.json => src/step-templates/windows-service-set-startup-type/metadata.json (64%)
 create mode 100644 src/step-templates/windows-service-set-startup-type/scriptbody.ps1
 rename step-templates/windows-service-start.json => src/step-templates/windows-service-start/metadata.json (56%)
 create mode 100644 src/step-templates/windows-service-start/scriptbody.ps1
 create mode 100644 src/step-templates/windows-service-stop-or-kill/metadata.json
 create mode 100644 src/step-templates/windows-service-stop-or-kill/scriptbody.ps1
 rename step-templates/windows-service-stop.json => src/step-templates/windows-service-stop/metadata.json (55%)
 create mode 100644 src/step-templates/windows-service-stop/scriptbody.ps1
 create mode 100644 src/step-templates/windows-wait-for-or-force-close-application/metadata.json
 create mode 100644 src/step-templates/windows-wait-for-or-force-close-application/scriptbody.ps1
 rename step-templates/winsw-install.json => src/step-templates/winsw-install/metadata.json (51%)
 create mode 100644 src/step-templates/winsw-install/scriptbody.ps1
 create mode 100644 src/step-templates/xamarin-Insights-upload-dysm/metadata.json
 create mode 100644 src/step-templates/xamarin-Insights-upload-dysm/scriptbody.ps1
 create mode 100644 src/step-templates/xamarin-testcloud-execute-testrun/metadata.json
 create mode 100644 src/step-templates/xamarin-testcloud-execute-testrun/scriptbody.ps1
 rename step-templates/xml-attribute-update.json => src/step-templates/xml-attribute-update/metadata.json (80%)
 create mode 100644 src/step-templates/xml-attribute-update/scriptbody.ps1
 create mode 100644 src/step-templates/xml-transform-using-xdt/metadata.json
 create mode 100644 src/step-templates/xml-transform-using-xdt/scriptbody.ps1
 rename step-templates/yams-upload.json => src/step-templates/yams-upload/metadata.json (74%)
 create mode 100644 src/step-templates/yams-upload/scriptbody.ps1
 create mode 100644 src/step-templates/zabbix-node-api-maintenance/metadata.json
 create mode 100644 src/step-templates/zabbix-node-api-maintenance/scriptbody.ps1
 delete mode 100644 step-templates/teamcity-trigger-build.json
 delete mode 100644 step-templates/terraform-custom-script.json
 delete mode 100644 step-templates/trigger-multitenant-deployment.json
 delete mode 100644 step-templates/twilio-send-sms-powershell.json
 delete mode 100644 step-templates/umbraco-v7-folder-permissions.json
 delete mode 100644 step-templates/upgrade-octopus-server.json
 delete mode 100644 step-templates/upgrade_to_latest_tentacle.json
 delete mode 100755 step-templates/variables-find-unreplaced.json
 delete mode 100644 step-templates/variables-substitute-in-files.json
 delete mode 100644 step-templates/variables-substitute-in-json-file.json
 delete mode 100644 step-templates/venafi-tpp-create-provision-certificate.json
 delete mode 100644 step-templates/venafi-tpp-export-certificate.json
 delete mode 100644 step-templates/venafi-tpp-find-certificate-details.json
 delete mode 100644 step-templates/venafi-tpp-generate-oauth-token.json
 delete mode 100644 step-templates/venafi-tpp-import-certificate-into-octopus.json
 delete mode 100644 step-templates/venafi-tpp-retrieve-certificate-details.json
 delete mode 100644 step-templates/venafi-tpp-revoke-oauth-token.json
 delete mode 100644 step-templates/wait-for-iis-connections-to-drop-to-zero.json
 delete mode 100644 step-templates/web-deploy-azure-convention.json
 delete mode 100644 step-templates/web-deploy-publish-website-msdeploy.json
 delete mode 100644 step-templates/windows-add-poll-endpoint-task.json
 delete mode 100644 step-templates/windows-add-users-to-local-groups.json
 delete mode 100644 step-templates/windows-apply-windows-updates.json
 delete mode 100644 step-templates/windows-certificate-grant-read-access.json
 delete mode 100644 step-templates/windows-check-net-core-framework-version.json
 delete mode 100644 step-templates/windows-check-net-framework-version.json
 delete mode 100644 step-templates/windows-disk-cleanup.json
 delete mode 100644 step-templates/windows-ensure-features-installed.json
 delete mode 100644 step-templates/windows-get-pending-reboot.json
 delete mode 100644 step-templates/windows-grant-logon-as-service.json
 delete mode 100644 step-templates/windows-install-msi.json
 delete mode 100644 step-templates/windows-local-user.json
 delete mode 100644 step-templates/windows-restart-if-required.json
 delete mode 100644 step-templates/windows-scheduled-task-create.json
 delete mode 100644 step-templates/windows-scheduled-task-disable.json
 delete mode 100644 step-templates/windows-service-stop-or-kill.json
 delete mode 100644 step-templates/windows-wait-for-or-force-close-application.json
 delete mode 100644 step-templates/xamarin-Insights-upload-dysm.json
 delete mode 100644 step-templates/xamarin-testcloud-execute-testrun.json
 delete mode 100644 step-templates/xml-transform-using-xdt.json
 delete mode 100644 step-templates/zabbix-node-api-maintenance.json

diff --git a/step-templates/Wait-until-time.json b/src/step-templates/Wait-until-time/metadata.json
similarity index 59%
rename from step-templates/Wait-until-time.json
rename to src/step-templates/Wait-until-time/metadata.json
index 12df5b79d..b3cfec24d 100644
--- a/step-templates/Wait-until-time.json
+++ b/src/step-templates/Wait-until-time/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 25,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "if(($DefaultTargetTime -eq $null-or $DefaultTargetTime -eq '') -and ($TargetTime -eq $null -or $TargetTime -eq'') ){\n    Write-Output 'Deploy will start immediately because neither TargetTime or DefaultTargetTime is set' \n}else{\n    \n    if($TargetTime -eq $null){\n        $deployTime = get-date($DefaultTargetTime)\n        Write-Output 'DeployTime is set to DefaultTargetTime since TargetTime is not configured as a variable for this build scope.'\n    }else{\n        $deployTime = get-date($TargetTime)\n    }\n    if((get-date)  -ge $deployTime){\n        $deployTime = $deployTime.AddDays(1)\n    }\n    Write-Output ('Deploy will pause until ' + $deployTime)\n\n    \n    do {\n    \tStart-Sleep 1\n    }\n    until ((get-date) -ge $deployTime)\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -22,9 +22,9 @@
   ],
   "LastModifiedBy": "PeterOsterdahl",
   "$Meta": {
-    "ExportedAt": "2016-09-15T10:46:20.183+00:00",
+    "ExportedAt": "2016-09-15T03:46:20.1830000-07:00",
     "OctopusVersion": "3.2.21",
     "Type": "ActionTemplate"
   },
   "Category": "wait"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/Wait-until-time/scriptbody.ps1 b/src/step-templates/Wait-until-time/scriptbody.ps1
new file mode 100644
index 000000000..38bcbba52
--- /dev/null
+++ b/src/step-templates/Wait-until-time/scriptbody.ps1
@@ -0,0 +1,21 @@
+if(($DefaultTargetTime -eq $null-or $DefaultTargetTime -eq '') -and ($TargetTime -eq $null -or $TargetTime -eq'') ){
+    Write-Output 'Deploy will start immediately because neither TargetTime or DefaultTargetTime is set' 
+}else{
+    
+    if($TargetTime -eq $null){
+        $deployTime = get-date($DefaultTargetTime)
+        Write-Output 'DeployTime is set to DefaultTargetTime since TargetTime is not configured as a variable for this build scope.'
+    }else{
+        $deployTime = get-date($TargetTime)
+    }
+    if((get-date)  -ge $deployTime){
+        $deployTime = $deployTime.AddDays(1)
+    }
+    Write-Output ('Deploy will pause until ' + $deployTime)
+
+    
+    do {
+    	Start-Sleep 1
+    }
+    until ((get-date) -ge $deployTime)
+}
\ No newline at end of file
diff --git a/step-templates/teamcity-tag-build.json b/src/step-templates/teamcity-tag-build/metadata.json
similarity index 73%
rename from step-templates/teamcity-tag-build.json
rename to src/step-templates/teamcity-tag-build/metadata.json
index 42df40374..e2c1f319a 100644
--- a/step-templates/teamcity-tag-build.json
+++ b/src/step-templates/teamcity-tag-build/metadata.json
@@ -7,7 +7,7 @@
   "Version": 2,
   "CommunityActionTemplateId": null,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$buildNumber = $OctopusParameters['buildNumber']\n$buildTypeId = $OctopusParameters['buildTypeId']\n\n$tcUrl = $OctopusParameters['TeamCityUrl']\n$tcUser = $OctopusParameters['TeamCityUser']\n$tcPass = $OctopusParameters['TeamCityPassword']\n$tcTags = $OctopusParameters['TeamCityTags']\n\n$credentials = [System.Text.Encoding]::UTF8.GetBytes(\"$($tcUser):$($tcPass)\")\n$headers = @{ \"Authorization\" = \"Basic $([System.Convert]::ToBase64String($credentials))\" }\n\n[string]$tagUri = $tcUrl + (\"/app/rest/builds/buildType:{0},number:{1}/tags/\" -f $buildTypeId,$buildNumber)\n\nWrite-Output \"Tagging Build with ID $($id)\"\n\ntry {\n    Invoke-RestMethod -Headers $headers -DisableKeepAlive -Method POST -Uri $tagUri -Body $tcTags -ContentType \"text/plain\"\n    Write-Output \"Build ID $($id) tagged successfully\"\n} catch {\n    Write-Output \"Build ID $($id) not tagged: $($_.Exception.Message)\"\n}\n\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
@@ -85,7 +85,7 @@
   ],
   "LastModifiedBy": "B0R1K",
   "$Meta": {
-    "ExportedAt": "2018-01-19T17:39:44.741Z",
+    "ExportedAt": "2018-01-19T17:39:44.7410000Z",
     "OctopusVersion": "3.12.0",
     "Type": "ActionTemplate"
   }
diff --git a/src/step-templates/teamcity-tag-build/scriptbody.ps1 b/src/step-templates/teamcity-tag-build/scriptbody.ps1
new file mode 100644
index 000000000..d13f3cdbf
--- /dev/null
+++ b/src/step-templates/teamcity-tag-build/scriptbody.ps1
@@ -0,0 +1,22 @@
+$buildNumber = $OctopusParameters['buildNumber']
+$buildTypeId = $OctopusParameters['buildTypeId']
+
+$tcUrl = $OctopusParameters['TeamCityUrl']
+$tcUser = $OctopusParameters['TeamCityUser']
+$tcPass = $OctopusParameters['TeamCityPassword']
+$tcTags = $OctopusParameters['TeamCityTags']
+
+$credentials = [System.Text.Encoding]::UTF8.GetBytes("$($tcUser):$($tcPass)")
+$headers = @{ "Authorization" = "Basic $([System.Convert]::ToBase64String($credentials))" }
+
+[string]$tagUri = $tcUrl + ("/app/rest/builds/buildType:{0},number:{1}/tags/" -f $buildTypeId,$buildNumber)
+
+Write-Output "Tagging Build with ID $($id)"
+
+try {
+    Invoke-RestMethod -Headers $headers -DisableKeepAlive -Method POST -Uri $tagUri -Body $tcTags -ContentType "text/plain"
+    Write-Output "Build ID $($id) tagged successfully"
+} catch {
+    Write-Output "Build ID $($id) not tagged: $($_.Exception.Message)"
+}
+
diff --git a/src/step-templates/teamcity-trigger-build/metadata.json b/src/step-templates/teamcity-trigger-build/metadata.json
new file mode 100644
index 000000000..956d4aa52
--- /dev/null
+++ b/src/step-templates/teamcity-trigger-build/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "22483ce2-1444-4c02-861c-fb9533959e16",
+  "Name": "Trigger TeamCity Build",
+  "Description": "Trigger a specific Team City build from an Octopus Deploy process.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "BuildConfigurationId",
+      "Label": null,
+      "HelpText": "The Id of the build configuration to trigger.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "TeamCityUrl",
+      "Label": null,
+      "HelpText": "The URL of the Team City server.\nE.g. `http://teamcity.example.com`.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "TeamCityUsername",
+      "Label": null,
+      "HelpText": "The username to use for accessing TeamCity.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "TeamCityPassword",
+      "Label": null,
+      "HelpText": "The password for the TeamCity user.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-03-16T03:45:58.5880000-07:00",
+  "LastModifiedBy": "bjorgvino",
+  "$Meta": {
+    "ExportedAt": "2015-03-16T03:47:31.3280000-07:00",
+    "OctopusVersion": "2.6.3.886",
+    "Type": "ActionTemplate"
+  },
+  "Category": "teamcity"
+}
diff --git a/src/step-templates/teamcity-trigger-build/scriptbody.ps1 b/src/step-templates/teamcity-trigger-build/scriptbody.ps1
new file mode 100644
index 000000000..8de44237a
--- /dev/null
+++ b/src/step-templates/teamcity-trigger-build/scriptbody.ps1
@@ -0,0 +1,28 @@
+$buildConfId = $OctopusParameters['BuildConfigurationId']
+
+$teamCityUrl = $OctopusParameters['TeamCityUrl']
+$teamCityUsername = $OctopusParameters['TeamCityUsername']
+$teamCityPassword = $OctopusParameters['TeamCityPassword']
+
+$url = $teamCityUrl + '/httpAuth/app/rest/buildQueue'
+$contentTemplate = '<build><buildType id="{0}"/></build>'
+$content = $contentTemplate -f $buildConfId
+$encodedContent = [System.Text.Encoding]::UTF8.GetBytes($content)
+
+Write-Host "================================================================================"
+Write-Host "Triggering build with Id $buildConfId in TeamCity. Server:" $teamCityUrl 
+Write-Host "================================================================================"
+
+$req = [System.Net.WebRequest]::Create($url)
+$req.Credentials = new-object System.Net.NetworkCredential($teamCityUsername, $teamCityPassword)
+$req.Method ="POST"
+$req.ContentType = "application/xml"
+
+$req.ContentLength = $encodedContent.length
+$requestStream = $req.GetRequestStream()
+$requestStream.Write($encodedContent, 0, $encodedContent.length)
+$requestStream.Close()
+
+$resp = $req.GetResponse()
+$reader = new-object System.IO.StreamReader($resp.GetResponseStream())
+$reader.ReadToEnd() | Write-Host
diff --git a/src/step-templates/terraform-custom-script/metadata.json b/src/step-templates/terraform-custom-script/metadata.json
new file mode 100644
index 000000000..f4f22d8bf
--- /dev/null
+++ b/src/step-templates/terraform-custom-script/metadata.json
@@ -0,0 +1,119 @@
+{
+  "Id": "1d2a62d0-1f12-4417-8566-4ca1b8e6a69c",
+  "Name": "Execute Custom Terraform Script with Package",
+  "Description": "Run a custom terraform script using a package and an Azure Account.\n\nE.g. run \"terraform taint some-resource\" in the context of your terraform package files and authenticated against Azure using credentials in an Octopus Azure Account variable. This step operates very similarly to the built-in Terraform Apply step but allowing you the control to call terraform commands rather than using the octopus runner. Very useful for runbooks doing terraform import.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Name": "InfrastructurePackage",
+      "Id": "582b5176-aa5d-4166-a5fa-9b760a3b2d7d",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "TerraformPackageId"
+      }
+    }
+  ],
+  "Properties": {
+    "Octopus.Action.RunOnServer": "true",
+    "Octopus.Action.EnabledFeatures": "Octopus.Features.SubstituteInFiles",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.TargetFiles": "InfrastructurePackage\\*.tf\nInfrastructurePackage\\*.tfvars"
+  },
+  "Parameters": [
+    {
+      "Id": "0170e094-b282-4924-b1ed-5103015e366f",
+      "Name": "TerraformPackageId",
+      "Label": "Package Id (Required)",
+      "HelpText": "The ID of the nupkg/zip that contains the terraform files",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "3b7abc1b-49d9-4302-86e8-a85cc6eb2a75",
+      "Name": "TerraformScript.AzureAccount",
+      "Label": "Azure Account",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "AzureAccount"
+      }
+    },
+    {
+      "Id": "53195dc5-dcc4-4a35-b3af-b63a0958ae46",
+      "Name": "TerraformScript.CliScript",
+      "Label": "Terraform Script",
+      "HelpText": "A terraform CLI script to be executed in the context of the package, such as `terraform show -no-color` or ` terraform import some-resource`",
+      "DefaultValue": "terraform plan -var-file=\"octopus.tfvars\" -no-color",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "2d907ba2-41f4-47d4-9592-1111a9ab8f93",
+      "Name": "TerraformScript.RunInitBeforeScript",
+      "Label": "Run Terraform Init?",
+      "HelpText": "If true, then script will call terraform init before executing the script",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d0d1018d-d8aa-4c34-8da9-5c893076f8fe",
+      "Name": "TerraformScript.CollectArtefacts",
+      "Label": "Collect terraform files as artefacts?",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "d379e1f0-fac5-48cb-a011-249e0bcb401e",
+      "Name": "TerraformScript.ArtefactNameLikePattern",
+      "Label": "Collect terraform files artefact pattern",
+      "HelpText": "A like pattern for files to be collected as artefacts when 'Collect Terraform Files as Artefacts' is enabled. Example: `*.tf*`",
+      "DefaultValue": "*.tf*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "7b24c582-de47-4dad-9e37-c300802d1df9",
+      "Name": "TerraformScript.Octopus.Release.Number",
+      "Label": "Release Number Override",
+      "HelpText": "When step is run in a runbook there is no release number, so you may need to provide one here. By default we will use the release number from the package and substitute it into variable Octopus.Release.Number in terraform files, but you may override the value here if required.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "23e0e330-6b6b-4f7a-bd95-e44e69d1bcf6",
+      "Name": "TerraformScript.VersionNumberSubstitutionFilesPattern",
+      "Label": "Files to substitute Release Number",
+      "HelpText": "A like pattern for files that should have #{Octopus.Release.Number} substituted. Example: `*.tf*`",
+      "DefaultValue": "*.tf*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-03-15T18:13:18.2430000Z",
+    "OctopusVersion": "2020.5.2",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "alastairtree",
+  "Category": "terraform"
+}
diff --git a/src/step-templates/terraform-custom-script/scriptbody.ps1 b/src/step-templates/terraform-custom-script/scriptbody.ps1
new file mode 100644
index 000000000..459d04cd3
--- /dev/null
+++ b/src/step-templates/terraform-custom-script/scriptbody.ps1
@@ -0,0 +1,108 @@
+$DynamicPackageName = "InfrastructurePackage" 
+$AccountVariableName = "TerraformScript.AzureAccount"
+# Version of the terrform package - used to substitute Octopus.Release.Number in tfvars file
+$packageVersion = $OctopusParameters["Octopus.Action.Package[$DynamicPackageName].PackageVersion"]
+# Override the package version with a custom version string - used to substitute Octopus.Release.Number in tfvars file
+$userOverridenVersionNumber = $OctopusParameters["TerraformScript.Octopus.Release.Number"]
+# Should we call terraform init before the script?
+$runInit = [System.Convert]::ToBoolean($OctopusParameters["TerraformScript.RunInitBeforeScript"]) 
+
+$versionNumberToSubstitute = If ($userOverridenVersionNumber) { $userOverridenVersionNumber } else { $packageVersion }
+$versionNumberSubstitutionFilesPattern = if ( $OctopusParameters["TerraformScript.versionNumberSubstitutionFilesPattern"]) {
+    $OctopusParameters["TerraformScript.VersionNumberSubstitutionFilesPattern"]
+}
+else {
+    "*.tf*"
+}
+
+# Should Octopus collect all terraform files from the package after execution as artefacts?
+$collectArtefacts = if ($OctopusParameters["TerraformScript.CollectArtefacts"]) { 
+    [System.Convert]::ToBoolean($OctopusParameters["TerraformScript.CollectArtefacts"]) 
+} 
+else { $false }
+# override pattern to match (terraform) files like *.t* when collecting artefacts
+$artefactNameLikePattern = if ($OctopusParameters["TerraformScript.ArtefactNameLikePattern"]) { 
+    $OctopusParameters["TerraformScript.ArtefactNameLikePattern"] 
+}
+else { 
+    "*.tf*"
+}
+# Detect if we have Azure Account credentials from a variable and log in to azure
+$HasAzureAccount = if ($OctopusParameters["$AccountVariableName.Client"]) { $true } else { $false }
+# The path where the package containing terraform files is extracted to disk - usually just ./InfrastructurePackage
+$terraformPackageFolder = $OctopusParameters["Octopus.Action.Package[$DynamicPackageName].ExtractedPath"];
+# Override the location of the terraform exe - otherwise assume terraform is available on PATH
+$CustomTerraformExe = $OctopusParameters["Octopus.Action.Terraform.CustomTerraformExecutable"]
+# The terraform script to be executed
+$terraformCliScriptToExecute = [Scriptblock]::Create($OctopusParameters["TerraformScript.CliScript"])
+
+# If we have service principal creds to Azure then set ENV variables so that azurerm can authenticate
+if ($HasAzureAccount) {
+    Write-host "Selecting azure subscription $($OctopusParameters["$AccountVariableName.SubscriptionNumber"]) using $AccountVariableName variable"
+  
+    $ENV:ARM_CLIENT_ID = $OctopusParameters["$AccountVariableName.Client"]
+    $ENV:ARM_CLIENT_SECRET = $OctopusParameters["$AccountVariableName.Password"]
+    $ENV:ARM_SUBSCRIPTION_ID = $OctopusParameters["$AccountVariableName.SubscriptionNumber"]
+    $ENV:ARM_TENANT_ID = $OctopusParameters["$AccountVariableName.TenantId"]
+}
+
+Function Invoke-Exec {
+    [CmdletBinding()]
+    param(
+        [Parameter(Position = 0, Mandatory = 1)][scriptblock]$cmd
+    )
+    $scriptExpanded = $ExecutionContext.InvokeCommand.ExpandString($cmd).Trim().Trim("&")
+    Write-Verbose "Executing command: $scriptExpanded"
+
+    & $cmd | Out-Default
+
+    if ($lastexitcode -ne 0) {
+        throw ("Non-zero exit code '$lastexitcode' detected from command: '$scriptExpanded'")
+    }
+}
+
+#================= Prep to run terraform ========================
+
+# List the contents of the package - useful debugging
+Write-Verbose "Using package contents:"
+Get-ChildItem $terraformPackageFolder -Verbose
+
+# Use a custom version of terraform? If so add it to the path for this sesssion. Otherwise assume terraform already on PATH
+if ($CustomTerraformExe) {
+    $terraformfolder = Split-Path $CustomTerraformExe;
+    # add custom terraform to path if required
+    if ($ENV:PATH -notcontains $terraformfolder) { 
+        $ENV:PATH += ";$terraformfolder"; 
+    }
+    Write-Verbose "PATH: $ENV:PATH"
+    Write-Host "`nUsing terraform.exe from $terraformExePath"
+}
+
+Write-Host "Running in $terraformPackageFolder"
+Set-Location $terraformPackageFolder
+
+# Substitute #{Octopus.Release.Number} in *.tf files because that variable is not availe during runbook execution
+Get-ChildItem . -file | Where-Object { $_.Name -like $versionNumberSubstitutionFilesPattern } | ForEach-Object {
+    Write-Host "Replacing #{Octopus.Release.Number} in $($_.FullName) with $versionNumberToSubstitute"
+    (Get-Content $_.FullName) -replace "#{Octopus.Release.Number}", $versionNumberToSubstitute | Set-Content $_.FullName
+}   
+
+#================= terraform init ========================
+
+# optionally initialise terraform
+if($runInit) {
+  Write-Host "`n terraform init`n"
+  terraform init -no-color
+}
+#================= Run terraform script ========================
+
+try {
+    # Execute the provided script
+    Invoke-Exec $terraformCliScriptToExecute
+}
+finally {
+    # optionally collect all terraform files as artefacts
+    if ($collectArtefacts) {
+        Get-ChildItem . -File | Where-Object { $_.name -like $artefactNameLikePattern } | New-OctopusArtifact
+    }
+}
diff --git a/step-templates/test-run-nunit.json b/src/step-templates/test-run-nunit/metadata.json
similarity index 72%
rename from step-templates/test-run-nunit.json
rename to src/step-templates/test-run-nunit/metadata.json
index f4dbb18f6..b99918964 100644
--- a/step-templates/test-run-nunit.json
+++ b/src/step-templates/test-run-nunit/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 10,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Write-Output \"Running NUnit tests...\"\n\n$exePath = '\"' + $NUnitExePath + '\"'\nif (-not $exePath) {\n    $exePath = \"nunit-console.exe\"\n}\n\n$runNUnit = \"& $exePath /out:TestStdOut.txt /err:TestStdErr.txt $NUnitAdditionalArgs\"\n\n$NUnitTestAssemblies.Split(\";\") | ForEach {\n    $asm = $_.Trim()\n    Write-Output \"Including assembly $asm\"\n    $runNUnit += \" $asm\"\n}\n\ncd $NUnitWorkingDirectoryPath\n\niex $runNUnit\n$nunitExit = $lastExitCode\n\nNew-OctopusArtifact -Path TestResult.xml\nNew-OctopusArtifact -Path TestStdOut.txt\nNew-OctopusArtifact -Path TestStdErr.txt\n\nexit $nunitExit\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -47,12 +47,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-06T04:23:41.674+00:00",
+    "ExportedAt": "2014-05-05T21:23:41.6740000-07:00",
     "OctopusVersion": "2.4.3.0",
     "Type": "ActionTemplate"
   },
   "Category": "nunit"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/test-run-nunit/scriptbody.ps1 b/src/step-templates/test-run-nunit/scriptbody.ps1
new file mode 100644
index 000000000..41f0a5c5e
--- /dev/null
+++ b/src/step-templates/test-run-nunit/scriptbody.ps1
@@ -0,0 +1,25 @@
+Write-Output "Running NUnit tests..."
+
+$exePath = '"' + $NUnitExePath + '"'
+if (-not $exePath) {
+    $exePath = "nunit-console.exe"
+}
+
+$runNUnit = "& $exePath /out:TestStdOut.txt /err:TestStdErr.txt $NUnitAdditionalArgs"
+
+$NUnitTestAssemblies.Split(";") | ForEach {
+    $asm = $_.Trim()
+    Write-Output "Including assembly $asm"
+    $runNUnit += " $asm"
+}
+
+cd $NUnitWorkingDirectoryPath
+
+iex $runNUnit
+$nunitExit = $lastExitCode
+
+New-OctopusArtifact -Path TestResult.xml
+New-OctopusArtifact -Path TestStdOut.txt
+New-OctopusArtifact -Path TestStdErr.txt
+
+exit $nunitExit
diff --git a/step-templates/testery-create-environment.json b/src/step-templates/testery-create-environment/metadata.json
similarity index 61%
rename from step-templates/testery-create-environment.json
rename to src/step-templates/testery-create-environment/metadata.json
index ff6e5eccb..93544d90a 100644
--- a/step-templates/testery-create-environment.json
+++ b/src/step-templates/testery-create-environment/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "set -e\n\nTOKEN=$(get_octopusvariable \"TesteryToken\")\nPIPELINE_STAGE=$(get_octopusvariable \"TesteryPipelineStage?\")\nVARIABLES=$(get_octopusvariable \"TesteryVariables?\")\nNAME=$(get_octopusvariable \"TesteryName\")\nKEY=$(get_octopusvariable \"TesteryKey\")\nMAX_PARALLEL=$(get_octopusvariable \"TesteryMaximumParallelTestRuns\")\nFAIL_IF_EXIST=$(get_octopusvariable \"TesteryExistsExitCode\")\nif [ \"$FAIL_IF_EXIST\" = \"True\" ] ; then\n    EXIST_EXIT=1\nelse\n    EXIST_EXIT=0\nfi\nVAR_ARGS=()\nif [[ -n \"$VARIABLES\" ]]; then\n  mapfile -t VAR_LINES <<< \"$VARIABLES\"\n  for line in \"${VAR_LINES[@]}\"; do\n    [[ -z \"$line\" ]] && continue\n    VAR_ARGS+=(\"--variable\" \"$line\")\n  done\nfi\n\nAPI_URL=\"https://api.testery.io/api/environments\"\nHTTP_RESPONSE=$(curl -s -w \"\\n%{http_code}\" \\\n    -H \"Authorization: Bearer $TOKEN\" \\\n    -H \"Content-Type: application/json\" \\\n    \"$API_URL\")\n\nHTTP_BODY=$(echo \"$HTTP_RESPONSE\" | sed '$d')\nHTTP_STATUS=$(echo \"$HTTP_RESPONSE\" | tail -n1)\n\n# Check if the request was successful\nif [ \"$HTTP_STATUS\" -ne 200 ]; then\n    echo \"Error querying API:\"\n    echo \"Status Code: $HTTP_STATUS\"\n    echo \"Response: $HTTP_BODY\"\n    exit 1\nfi\n\nexport PATH=\"$HOME/.local/bin:$PATH\"\n\n# Check if an environment with the key exists using jq\nENVIRONMENT_EXISTS=$(echo \"$HTTP_BODY\" | jq -r --arg KEY \"$KEY\" '.[] | select(.key == $KEY) | .key')\n\nif [ -n \"$ENVIRONMENT_EXISTS\" ]; then\n    echo \"Environment with key already exists.\"\n    exit $EXIST_EXIT\nelse\n  pip install --user testery --upgrade\n\n  testery create-environment --token $TOKEN \\\n    --name $NAME \\\n    --key $KEY \\\n    --maximum-parallel-test-runs $MAX_PARALLEL \\\n    ${PIPELINE_STAGE:+ --pipeline-stage \"$PIPELINE_STAGE\"} \\\n    ${VAR_ARGS:+ \"${VAR_ARGS[@]}\"}\nfi\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -86,7 +86,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2026-02-13T21:32:11.229Z",
+    "ExportedAt": "2026-02-13T21:32:11.2290000Z",
     "OctopusVersion": "2026.1.7285",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/testery-create-environment/scriptbody.sh b/src/step-templates/testery-create-environment/scriptbody.sh
new file mode 100644
index 000000000..09a2c9caf
--- /dev/null
+++ b/src/step-templates/testery-create-environment/scriptbody.sh
@@ -0,0 +1,58 @@
+set -e
+
+TOKEN=$(get_octopusvariable "TesteryToken")
+PIPELINE_STAGE=$(get_octopusvariable "TesteryPipelineStage?")
+VARIABLES=$(get_octopusvariable "TesteryVariables?")
+NAME=$(get_octopusvariable "TesteryName")
+KEY=$(get_octopusvariable "TesteryKey")
+MAX_PARALLEL=$(get_octopusvariable "TesteryMaximumParallelTestRuns")
+FAIL_IF_EXIST=$(get_octopusvariable "TesteryExistsExitCode")
+if [ "$FAIL_IF_EXIST" = "True" ] ; then
+    EXIST_EXIT=1
+else
+    EXIST_EXIT=0
+fi
+VAR_ARGS=()
+if [[ -n "$VARIABLES" ]]; then
+  mapfile -t VAR_LINES <<< "$VARIABLES"
+  for line in "${VAR_LINES[@]}"; do
+    [[ -z "$line" ]] && continue
+    VAR_ARGS+=("--variable" "$line")
+  done
+fi
+
+API_URL="https://api.testery.io/api/environments"
+HTTP_RESPONSE=$(curl -s -w "\n%{http_code}" \
+    -H "Authorization: Bearer $TOKEN" \
+    -H "Content-Type: application/json" \
+    "$API_URL")
+
+HTTP_BODY=$(echo "$HTTP_RESPONSE" | sed '$d')
+HTTP_STATUS=$(echo "$HTTP_RESPONSE" | tail -n1)
+
+# Check if the request was successful
+if [ "$HTTP_STATUS" -ne 200 ]; then
+    echo "Error querying API:"
+    echo "Status Code: $HTTP_STATUS"
+    echo "Response: $HTTP_BODY"
+    exit 1
+fi
+
+export PATH="$HOME/.local/bin:$PATH"
+
+# Check if an environment with the key exists using jq
+ENVIRONMENT_EXISTS=$(echo "$HTTP_BODY" | jq -r --arg KEY "$KEY" '.[] | select(.key == $KEY) | .key')
+
+if [ -n "$ENVIRONMENT_EXISTS" ]; then
+    echo "Environment with key already exists."
+    exit $EXIST_EXIT
+else
+  pip install --user testery --upgrade
+
+  testery create-environment --token $TOKEN \
+    --name $NAME \
+    --key $KEY \
+    --maximum-parallel-test-runs $MAX_PARALLEL \
+    ${PIPELINE_STAGE:+ --pipeline-stage "$PIPELINE_STAGE"} \
+    ${VAR_ARGS:+ "${VAR_ARGS[@]}"}
+fi
diff --git a/step-templates/testery-create-test-run.json b/src/step-templates/testery-create-test-run/metadata.json
similarity index 71%
rename from step-templates/testery-create-test-run.json
rename to src/step-templates/testery-create-test-run/metadata.json
index 249688906..f264cf06c 100644
--- a/step-templates/testery-create-test-run.json
+++ b/src/step-templates/testery-create-test-run/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "set -e\n\nTOKEN=$(get_octopusvariable \"TesteryToken\")\nPROJECT_KEY=$(get_octopusvariable \"TesteryProjectKey\")\nENVIRONMENT_KEY=$(get_octopusvariable \"TesteryEnvironmentKey\")\nGIT_REF=$(get_octopusvariable \"TesteryGitRef?\")\nGIT_BRANCH=$(get_octopusvariable \"TesteryGitBranch?\")\nTEST_NAME=$(get_octopusvariable \"TesteryTestName?\")\nWAIT_FOR_RESULTS=$(get_octopusvariable \"TesteryWaitForResults?\")\nTEST_SUITE=$(get_octopusvariable \"TesteryTestSuite?\")\nLATEST_DEPLOY=$(get_octopusvariable \"TesteryLatestDeploy?\")\nINCLUDED_TAGS=$(get_octopusvariable \"TesteryIncludedTags?\")\nEXCLUDED_TAGS=$(get_octopusvariable \"TesteryExcludedTags?\")\nCOPIES=$(get_octopusvariable \"TesteryCopies?\")\nBUILD_ID=$(get_octopusvariable \"TesteryBuildId?\")\nOUTPUT=$(get_octopusvariable \"TesteryOutput\")\nVARIABLES=$(get_octopusvariable \"TesteryVariables?\")\nINCLUDE_ALL_TAGS=$(get_octopusvariable \"TesteryIncludeAllTags?\")\nPARALLELIZATION=$(get_octopusvariable \"TesteryParallelizationType?\")\nFAIL_ON_FAILURE=$(get_octopusvariable \"TesteryFailOnFailure?\")\nRUN_TIMEOUT=$(get_octopusvariable \"TesteryRunTimeout?\")\nTEST_TIMEOUT=$(get_octopusvariable \"TesteryTestTimeout?\")\nRUNNER_COUNT=$(get_octopusvariable \"TesteryRunnerCount?\")\nTEST_FILTER=$(get_octopusvariable \"TesteryTestFilterRegex?\")\nSTATUS_NAME=$(get_octopusvariable \"TesteryStatusName?\")\nPLAYWRIGHT_PROJECT=$(get_octopusvariable \"TesteryPlaywrightProject?\")\nSKIP_VSC_UPDATE=$(get_octopusvariable \"TesterySkipVCSUpdates?\")\nDEPLOY_ID=$(get_octopusvariable \"TesteryDeployId?\")\nAPPLY_TEST_SELECT=$(get_octopusvariable \"TesteryApplyTestSelectionRules?\")\n\nif [ \"$WAIT_FOR_RESULTS\" = \"False\" ] ; then\n    WAIT_FOR_RESULTS=\nfi\n\nif [ \"$PARALLELIZATION\" = \"default\" ] ; then\n    PARALLELIZATION=\nfi\n\nif [ \"$FAIL_ON_FAILURE\" = \"False\" ] ; then\n    FAIL_ON_FAILURE=\nfi\n\nif [ \"$APPLY_TEST_SELECT\" = \"False\" ] ; then\n    APPLY_TEST_SELECT=\nfi\n\nif [ \"$SKIP_VSC_UPDATE\" = \"False\" ] ; then\n    SKIP_VSC_UPDATE=\nfi\n\nif [ \"$INCLUDE_ALL_TAGS\" = \"False\" ] ; then\n    INCLUDE_ALL_TAGS=\nfi\n\nif [ \"$LATEST_DEPLOY\" = \"False\" ] ; then\n    LATEST_DEPLOY=\nfi\n\nif [[ -n \"$INCLUDED_TAGS\" ]]; then\n  INCLUDED_TAGS=$(echo \"$INCLUDED_TAGS\" | tr '\\n' ',' | sed 's/,$//')\nfi\n\nif [[ -n \"$EXCLUDED_TAGS\" ]]; then\n  EXCLUDED_TAGS=$(echo \"$EXCLUDED_TAGS\" | tr '\\n' ',' | sed 's/,$//')\nfi\n\nVAR_ARGS=()\nif [[ -n \"$VARIABLES\" ]]; then\n  mapfile -t VAR_LINES <<< \"$VARIABLES\"\n  for line in \"${VAR_LINES[@]}\"; do\n    [[ -z \"$line\" ]] && continue\n    VAR_ARGS+=(\"--variable\" \"$line\")\n  done\nfi\n\nexport PATH=\"$HOME/.local/bin:$PATH\"\npip install --user testery --upgrade\n\n\ntestery create-test-run --token $TOKEN \\\n  --project-key $PROJECT_KEY \\\n  --environment-key $ENVIRONMENT_KEY \\\n  --output $OUTPUT \\\n  ${GIT_REF:+ --git-ref \"$GIT_REF\"} \\\n  ${GIT_BRANCH:+ --git-branch \"$GIT_BRANCH\"} \\\n  ${TEST_NAME:+ --test-name \"$TEST_NAME\"} \\\n  ${WAIT_FOR_RESULTS:+ --wait-for-results} \\\n  ${TEST_SUITE:+ --test-suite \"$TEST_SUITE\"} \\\n  ${LATEST_DEPLOY:+ --latest-deploy } \\\n  ${COPIES:+ --copies \"$COPIES\"} \\\n  ${BUILD_ID:+ --build-id \"$BUILD_ID\"} \\\n  ${FAIL_ON_FAILURE:+ --fail-on-failure} \\\n  ${INCLUDE_ALL_TAGS:+ --include-all-tags} \\\n  ${PARALLELIZATION:+ \"${PARALLELIZATION}\"} \\\n  ${RUN_TIMEOUT:+ --timeout-minutes \"$RUN_TIMEOUT\"} \\\n  ${TEST_TIMEOUT:+ --test-timeout-seconds \"$TEST_TIMEOUT\"} \\\n  ${RUNNER_COUNT:+ --runner-count \"$RUNNER_COUNT\"} \\\n  ${VAR_ARGS:+ \"${VAR_ARGS[@]}\"} \\\n  ${TEST_FILTER:+ --test-filter-regex \"$TEST_FILTER\"} \\\n  ${STATUS_NAME:+ --status-name \"$STATUS_NAME\"} \\\n  ${PLAYWRIGHT_PROJECT:+ --playwright-project \"$PLAYWRIGHT_PROJECT\"} \\\n  ${SKIP_VSC_UPDATE:+ --skip-vcs-updates} \\\n  ${DEPLOY_ID:+ --deploy-id \"$DEPLOY_ID\"} \\\n  ${APPLY_TEST_SELECT:+ --apply-test-selection-rules} \\\n  ${INCLUDED_TAGS:+ --include-tags \"$INCLUDED_TAGS\"} \\\n  ${EXCLUDED_TAGS:+ --exclude-tags \"$EXCLUDED_TAGS\"}\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -288,7 +288,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2026-02-13T21:10:21.323Z",
+    "ExportedAt": "2026-02-13T21:10:21.3230000Z",
     "OctopusVersion": "2026.1.7285",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/testery-create-test-run/scriptbody.sh b/src/step-templates/testery-create-test-run/scriptbody.sh
new file mode 100644
index 000000000..c7088b688
--- /dev/null
+++ b/src/step-templates/testery-create-test-run/scriptbody.sh
@@ -0,0 +1,106 @@
+set -e
+
+TOKEN=$(get_octopusvariable "TesteryToken")
+PROJECT_KEY=$(get_octopusvariable "TesteryProjectKey")
+ENVIRONMENT_KEY=$(get_octopusvariable "TesteryEnvironmentKey")
+GIT_REF=$(get_octopusvariable "TesteryGitRef?")
+GIT_BRANCH=$(get_octopusvariable "TesteryGitBranch?")
+TEST_NAME=$(get_octopusvariable "TesteryTestName?")
+WAIT_FOR_RESULTS=$(get_octopusvariable "TesteryWaitForResults?")
+TEST_SUITE=$(get_octopusvariable "TesteryTestSuite?")
+LATEST_DEPLOY=$(get_octopusvariable "TesteryLatestDeploy?")
+INCLUDED_TAGS=$(get_octopusvariable "TesteryIncludedTags?")
+EXCLUDED_TAGS=$(get_octopusvariable "TesteryExcludedTags?")
+COPIES=$(get_octopusvariable "TesteryCopies?")
+BUILD_ID=$(get_octopusvariable "TesteryBuildId?")
+OUTPUT=$(get_octopusvariable "TesteryOutput")
+VARIABLES=$(get_octopusvariable "TesteryVariables?")
+INCLUDE_ALL_TAGS=$(get_octopusvariable "TesteryIncludeAllTags?")
+PARALLELIZATION=$(get_octopusvariable "TesteryParallelizationType?")
+FAIL_ON_FAILURE=$(get_octopusvariable "TesteryFailOnFailure?")
+RUN_TIMEOUT=$(get_octopusvariable "TesteryRunTimeout?")
+TEST_TIMEOUT=$(get_octopusvariable "TesteryTestTimeout?")
+RUNNER_COUNT=$(get_octopusvariable "TesteryRunnerCount?")
+TEST_FILTER=$(get_octopusvariable "TesteryTestFilterRegex?")
+STATUS_NAME=$(get_octopusvariable "TesteryStatusName?")
+PLAYWRIGHT_PROJECT=$(get_octopusvariable "TesteryPlaywrightProject?")
+SKIP_VSC_UPDATE=$(get_octopusvariable "TesterySkipVCSUpdates?")
+DEPLOY_ID=$(get_octopusvariable "TesteryDeployId?")
+APPLY_TEST_SELECT=$(get_octopusvariable "TesteryApplyTestSelectionRules?")
+
+if [ "$WAIT_FOR_RESULTS" = "False" ] ; then
+    WAIT_FOR_RESULTS=
+fi
+
+if [ "$PARALLELIZATION" = "default" ] ; then
+    PARALLELIZATION=
+fi
+
+if [ "$FAIL_ON_FAILURE" = "False" ] ; then
+    FAIL_ON_FAILURE=
+fi
+
+if [ "$APPLY_TEST_SELECT" = "False" ] ; then
+    APPLY_TEST_SELECT=
+fi
+
+if [ "$SKIP_VSC_UPDATE" = "False" ] ; then
+    SKIP_VSC_UPDATE=
+fi
+
+if [ "$INCLUDE_ALL_TAGS" = "False" ] ; then
+    INCLUDE_ALL_TAGS=
+fi
+
+if [ "$LATEST_DEPLOY" = "False" ] ; then
+    LATEST_DEPLOY=
+fi
+
+if [[ -n "$INCLUDED_TAGS" ]]; then
+  INCLUDED_TAGS=$(echo "$INCLUDED_TAGS" | tr '\n' ',' | sed 's/,$//')
+fi
+
+if [[ -n "$EXCLUDED_TAGS" ]]; then
+  EXCLUDED_TAGS=$(echo "$EXCLUDED_TAGS" | tr '\n' ',' | sed 's/,$//')
+fi
+
+VAR_ARGS=()
+if [[ -n "$VARIABLES" ]]; then
+  mapfile -t VAR_LINES <<< "$VARIABLES"
+  for line in "${VAR_LINES[@]}"; do
+    [[ -z "$line" ]] && continue
+    VAR_ARGS+=("--variable" "$line")
+  done
+fi
+
+export PATH="$HOME/.local/bin:$PATH"
+pip install --user testery --upgrade
+
+
+testery create-test-run --token $TOKEN \
+  --project-key $PROJECT_KEY \
+  --environment-key $ENVIRONMENT_KEY \
+  --output $OUTPUT \
+  ${GIT_REF:+ --git-ref "$GIT_REF"} \
+  ${GIT_BRANCH:+ --git-branch "$GIT_BRANCH"} \
+  ${TEST_NAME:+ --test-name "$TEST_NAME"} \
+  ${WAIT_FOR_RESULTS:+ --wait-for-results} \
+  ${TEST_SUITE:+ --test-suite "$TEST_SUITE"} \
+  ${LATEST_DEPLOY:+ --latest-deploy } \
+  ${COPIES:+ --copies "$COPIES"} \
+  ${BUILD_ID:+ --build-id "$BUILD_ID"} \
+  ${FAIL_ON_FAILURE:+ --fail-on-failure} \
+  ${INCLUDE_ALL_TAGS:+ --include-all-tags} \
+  ${PARALLELIZATION:+ "${PARALLELIZATION}"} \
+  ${RUN_TIMEOUT:+ --timeout-minutes "$RUN_TIMEOUT"} \
+  ${TEST_TIMEOUT:+ --test-timeout-seconds "$TEST_TIMEOUT"} \
+  ${RUNNER_COUNT:+ --runner-count "$RUNNER_COUNT"} \
+  ${VAR_ARGS:+ "${VAR_ARGS[@]}"} \
+  ${TEST_FILTER:+ --test-filter-regex "$TEST_FILTER"} \
+  ${STATUS_NAME:+ --status-name "$STATUS_NAME"} \
+  ${PLAYWRIGHT_PROJECT:+ --playwright-project "$PLAYWRIGHT_PROJECT"} \
+  ${SKIP_VSC_UPDATE:+ --skip-vcs-updates} \
+  ${DEPLOY_ID:+ --deploy-id "$DEPLOY_ID"} \
+  ${APPLY_TEST_SELECT:+ --apply-test-selection-rules} \
+  ${INCLUDED_TAGS:+ --include-tags "$INCLUDED_TAGS"} \
+  ${EXCLUDED_TAGS:+ --exclude-tags "$EXCLUDED_TAGS"}
diff --git a/step-templates/testery-delete-environment.json b/src/step-templates/testery-delete-environment/metadata.json
similarity index 80%
rename from step-templates/testery-delete-environment.json
rename to src/step-templates/testery-delete-environment/metadata.json
index 494dc9da7..c0b3e6184 100644
--- a/step-templates/testery-delete-environment.json
+++ b/src/step-templates/testery-delete-environment/metadata.json
@@ -10,7 +10,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "set -e\n\nexport PATH=\"$HOME/.local/bin:$PATH\"\n\npip install --user testery --upgrade\n\ntestery delete-environment --token $(get_octopusvariable \"TesteryToken\") --key $(get_octopusvariable \"TesteryKey\")"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -36,7 +36,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2026-02-13T21:33:29.423Z",
+    "ExportedAt": "2026-02-13T21:33:29.4230000Z",
     "OctopusVersion": "2026.1.7285",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/testery-delete-environment/scriptbody.sh b/src/step-templates/testery-delete-environment/scriptbody.sh
new file mode 100644
index 000000000..7028834f3
--- /dev/null
+++ b/src/step-templates/testery-delete-environment/scriptbody.sh
@@ -0,0 +1,7 @@
+set -e
+
+export PATH="$HOME/.local/bin:$PATH"
+
+pip install --user testery --upgrade
+
+testery delete-environment --token $(get_octopusvariable "TesteryToken") --key $(get_octopusvariable "TesteryKey")
\ No newline at end of file
diff --git a/step-templates/testery-report-deployment.json b/src/step-templates/testery-report-deployment/metadata.json
similarity index 76%
rename from step-templates/testery-report-deployment.json
rename to src/step-templates/testery-report-deployment/metadata.json
index cbf109378..e5575d4cd 100644
--- a/step-templates/testery-report-deployment.json
+++ b/src/step-templates/testery-report-deployment/metadata.json
@@ -11,7 +11,7 @@
     "Octopus.Action.RunOnServer": "true",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "set -e\n\nTOKEN=$(get_octopusvariable \"TesteryToken\")\nPROJECT_KEY=$(get_octopusvariable \"TesteryProjectKey\")\nENVIRONMENT_KEY=$(get_octopusvariable \"TesteryEnvironmentKey\")\nBUILD_ID=$(get_octopusvariable \"TesteryBuildId\")\nOUTPUT=$(get_octopusvariable \"TesteryOutput\")\nGIT_REF=$(get_octopusvariable \"TesteryGitCommit?\")\nGIT_BRANCH=$(get_octopusvariable \"TesteryGitBranch?\")\nGIT_OWNER=$(get_octopusvariable \"TesteryGitOwner?\")\nGIT_PROVIDER=$(get_octopusvariable \"TesteryGitProvider?\")\nWAIT_FOR_RESULTS=$(get_octopusvariable \"TesteryWaitForResults?\")\nFAIL_ON_FAILURE=$(get_octopusvariable \"TesteryFailOnFailure?\")\nSKIP_VSC_UPDATE=$(get_octopusvariable \"TesterySkipVCSUpdates?\")\nSTATUS_NAME=$(get_octopusvariable \"TesteryStatusName?\")\n\nif [ \"$GIT_PROVIDER\" = \"None\" ] ; then\n    GIT_PROVIDER=\nfi\n\nif [ \"$WAIT_FOR_RESULTS\" = \"False\" ] ; then\n    WAIT_FOR_RESULTS=\nfi\n\nif [ \"$FAIL_ON_FAILURE\" = \"False\" ] ; then\n    FAIL_ON_FAILURE=\nfi\n\nif [ \"$SKIP_VSC_UPDATE\" = \"False\" ] ; then\n    SKIP_VSC_UPDATE=\nfi\n\nexport PATH=\"$HOME/.local/bin:$PATH\"\npip install --user testery --upgrade\n\ntestery create-deploy --token $TOKEN \\\n  --project-key $PROJECT_KEY \\\n  --environment-key $ENVIRONMENT_KEY \\\n  --build-id $BUILD_ID \\\n  --output $OUTPUT \\\n  ${GIT_REF:+ --git-ref \"$GIT_REF\"} \\\n  ${GIT_BRANCH:+ --git-branch \"$GIT_BRANCH\"} \\\n  ${GIT_OWNER:+ --git-owner \"$GIT_OWNER\"} \\\n  ${GIT_PROVIDER:+ --git-provider \"$GIT_PROVIDER\"} \\\n  ${STATUS_NAME:+ --status-name \"$STATUS_NAME\"} \\\n  ${WAIT_FOR_RESULTS:+ --wait-for-results} \\\n  ${FAIL_ON_FAILURE:+ --fail-on-failure} \\\n  ${SKIP_VSC_UPDATE:+ --skip-vcs-updates}"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -159,7 +159,7 @@
   ],
   "StepPackageId": "Octopus.Script",
   "$Meta": {
-    "ExportedAt": "2026-02-13T21:28:53.679Z",
+    "ExportedAt": "2026-02-13T21:28:53.6790000Z",
     "OctopusVersion": "2026.1.7285",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/testery-report-deployment/scriptbody.sh b/src/step-templates/testery-report-deployment/scriptbody.sh
new file mode 100644
index 000000000..3f3b016b2
--- /dev/null
+++ b/src/step-templates/testery-report-deployment/scriptbody.sh
@@ -0,0 +1,48 @@
+set -e
+
+TOKEN=$(get_octopusvariable "TesteryToken")
+PROJECT_KEY=$(get_octopusvariable "TesteryProjectKey")
+ENVIRONMENT_KEY=$(get_octopusvariable "TesteryEnvironmentKey")
+BUILD_ID=$(get_octopusvariable "TesteryBuildId")
+OUTPUT=$(get_octopusvariable "TesteryOutput")
+GIT_REF=$(get_octopusvariable "TesteryGitCommit?")
+GIT_BRANCH=$(get_octopusvariable "TesteryGitBranch?")
+GIT_OWNER=$(get_octopusvariable "TesteryGitOwner?")
+GIT_PROVIDER=$(get_octopusvariable "TesteryGitProvider?")
+WAIT_FOR_RESULTS=$(get_octopusvariable "TesteryWaitForResults?")
+FAIL_ON_FAILURE=$(get_octopusvariable "TesteryFailOnFailure?")
+SKIP_VSC_UPDATE=$(get_octopusvariable "TesterySkipVCSUpdates?")
+STATUS_NAME=$(get_octopusvariable "TesteryStatusName?")
+
+if [ "$GIT_PROVIDER" = "None" ] ; then
+    GIT_PROVIDER=
+fi
+
+if [ "$WAIT_FOR_RESULTS" = "False" ] ; then
+    WAIT_FOR_RESULTS=
+fi
+
+if [ "$FAIL_ON_FAILURE" = "False" ] ; then
+    FAIL_ON_FAILURE=
+fi
+
+if [ "$SKIP_VSC_UPDATE" = "False" ] ; then
+    SKIP_VSC_UPDATE=
+fi
+
+export PATH="$HOME/.local/bin:$PATH"
+pip install --user testery --upgrade
+
+testery create-deploy --token $TOKEN \
+  --project-key $PROJECT_KEY \
+  --environment-key $ENVIRONMENT_KEY \
+  --build-id $BUILD_ID \
+  --output $OUTPUT \
+  ${GIT_REF:+ --git-ref "$GIT_REF"} \
+  ${GIT_BRANCH:+ --git-branch "$GIT_BRANCH"} \
+  ${GIT_OWNER:+ --git-owner "$GIT_OWNER"} \
+  ${GIT_PROVIDER:+ --git-provider "$GIT_PROVIDER"} \
+  ${STATUS_NAME:+ --status-name "$STATUS_NAME"} \
+  ${WAIT_FOR_RESULTS:+ --wait-for-results} \
+  ${FAIL_ON_FAILURE:+ --fail-on-failure} \
+  ${SKIP_VSC_UPDATE:+ --skip-vcs-updates}
\ No newline at end of file
diff --git a/step-templates/tomcat-undeploy-application.json b/src/step-templates/tomcat-undeploy-application/metadata.json
similarity index 59%
rename from step-templates/tomcat-undeploy-application.json
rename to src/step-templates/tomcat-undeploy-application/metadata.json
index a09a5f7bf..da5bbd714 100644
--- a/step-templates/tomcat-undeploy-application.json
+++ b/src/step-templates/tomcat-undeploy-application/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "Bash",
-    "Octopus.Action.Script.ScriptBody": "# Get variables\ntomcatManagerUrl=$(get_octopusvariable \"Tomcat.Undeploy.ManagerUrl\")\ntomcatManagementUser=$(get_octopusvariable \"Tomcat.Undeploy.Management.User\")\ntomcatManagementPassword=$(get_octopusvariable \"Tomcat.Undeploy.Management.Password\")\ncontextPath=$(get_octopusvariable \"Tomcat.Undeploy.ContextPath\")\ndeploymentVersion=$(get_octopusvariable \"Tomcat.Undeploy.DeploymentVersion\")\napplicationFound=false\ndisplayMessage=\"$contextPath\"\n\n# Get list of applications\necho \"Checking Tomcat for $contextPath ...\"\nlistUrl=\"$tomcatManagerUrl/text/list\"\n\nresults=$(curl $listUrl --user \"$tomcatManagementUser\":\"$tomcatManagementPassword\" 2>&1)\n\n# Break results into an array\nIFS=$'\\n' resultArray=($results)\n\n# Loop through results\nfor i in \"${resultArray[@]}\"\ndo\n\t# Check for context path\n    if [[ \"$i\" == *\"$contextPath\"* ]]\n    then\n    \t# Check to see if there was a version specified\n        if [[ \"$deploymentVersion\" != \"\" ]]\n        then\n        \tdisplayMessage=\"$displayMessage $deploymentVersion\"\n        \t# Check for version\n            if [[ \"$i\" == *\"$deploymentVersion\"* ]]\n            then\n            \techo \"Found $contextPath with version $deploymentVersion ...\"\n                applicationFound=true\n                break\n            fi\n        else\n        \tif [[ \"$i\" != *\"##\"* ]]\n            then\n            \techo \"Found $contextPath ...\"\n            \tapplicationFound=true\n            \tbreak\n            fi\n        fi\n    fi\ndone\n\nif [[ \"$applicationFound\" == true ]]\nthen\n\t# Create URL\n\tundeployUrl=\"$tomcatManagerUrl/text/undeploy?path=/$contextPath\"\n    \n\t# Check to see if a version was specified\n\tif [[ \"$deploymentVersion\" != \"\" ]]\n\tthen\n\t\tundeployUrl=\"$undeployUrl&version=$deploymentVersion\"\n\tfi\n\n\t# Let user know what's going on\n\techo \"Removing $displayMessage ...\"\n\n\t# Call the undeploy for Tomcat\n\tcurl \"$undeployUrl\" --user \"$tomcatManagementUser\":\"$tomcatManagementPassword\" 2>&1\nelse\n\techo \"Unable to find $displayMessage ...\"\nfi"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.sh"
   },
   "Parameters": [
     {
@@ -64,10 +64,10 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2021-09-20T18:05:20.249Z",
+    "ExportedAt": "2021-09-20T18:05:20.2490000Z",
     "OctopusVersion": "2021.2.7462",
     "Type": "ActionTemplate"
   },
   "LastModifiedBy": "twerthi",
   "Category": "tomcat"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/tomcat-undeploy-application/scriptbody.sh b/src/step-templates/tomcat-undeploy-application/scriptbody.sh
new file mode 100644
index 000000000..00580bc73
--- /dev/null
+++ b/src/step-templates/tomcat-undeploy-application/scriptbody.sh
@@ -0,0 +1,65 @@
+# Get variables
+tomcatManagerUrl=$(get_octopusvariable "Tomcat.Undeploy.ManagerUrl")
+tomcatManagementUser=$(get_octopusvariable "Tomcat.Undeploy.Management.User")
+tomcatManagementPassword=$(get_octopusvariable "Tomcat.Undeploy.Management.Password")
+contextPath=$(get_octopusvariable "Tomcat.Undeploy.ContextPath")
+deploymentVersion=$(get_octopusvariable "Tomcat.Undeploy.DeploymentVersion")
+applicationFound=false
+displayMessage="$contextPath"
+
+# Get list of applications
+echo "Checking Tomcat for $contextPath ..."
+listUrl="$tomcatManagerUrl/text/list"
+
+results=$(curl $listUrl --user "$tomcatManagementUser":"$tomcatManagementPassword" 2>&1)
+
+# Break results into an array
+IFS=$'\n' resultArray=($results)
+
+# Loop through results
+for i in "${resultArray[@]}"
+do
+	# Check for context path
+    if [[ "$i" == *"$contextPath"* ]]
+    then
+    	# Check to see if there was a version specified
+        if [[ "$deploymentVersion" != "" ]]
+        then
+        	displayMessage="$displayMessage $deploymentVersion"
+        	# Check for version
+            if [[ "$i" == *"$deploymentVersion"* ]]
+            then
+            	echo "Found $contextPath with version $deploymentVersion ..."
+                applicationFound=true
+                break
+            fi
+        else
+        	if [[ "$i" != *"##"* ]]
+            then
+            	echo "Found $contextPath ..."
+            	applicationFound=true
+            	break
+            fi
+        fi
+    fi
+done
+
+if [[ "$applicationFound" == true ]]
+then
+	# Create URL
+	undeployUrl="$tomcatManagerUrl/text/undeploy?path=/$contextPath"
+    
+	# Check to see if a version was specified
+	if [[ "$deploymentVersion" != "" ]]
+	then
+		undeployUrl="$undeployUrl&version=$deploymentVersion"
+	fi
+
+	# Let user know what's going on
+	echo "Removing $displayMessage ..."
+
+	# Call the undeploy for Tomcat
+	curl "$undeployUrl" --user "$tomcatManagementUser":"$tomcatManagementPassword" 2>&1
+else
+	echo "Unable to find $displayMessage ..."
+fi
\ No newline at end of file
diff --git a/step-templates/topshelf-install.json b/src/step-templates/topshelf-install/metadata.json
similarity index 59%
rename from step-templates/topshelf-install.json
rename to src/step-templates/topshelf-install/metadata.json
index 99c0ad141..91611167e 100644
--- a/step-templates/topshelf-install.json
+++ b/src/step-templates/topshelf-install/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$step = $OctopusParameters['Unpackage step']\n$username = $OctopusParameters['Username'];\n$password = $OctopusParameters['Password'];\n$customExeFilename = $OctopusParameters['Exe filename'];\n\n$outputPath = $OctopusParameters[\"Octopus.Action[$step].Package.CustomInstallationDirectory\"]\nif(!$outputPath) \n{\n    $outputPath = $OctopusParameters[\"Octopus.Action[$step].Output.Package.InstallationDirectoryPath\"]\n}\n\n$defaultExeFilename = $OctopusParameters[\"Octopus.Action[$step].Package.NuGetPackageId\"] + \".exe\"\n$exeFilename = If ($customExeFilename) {$customExeFilename} Else {$defaultExeFilename}\n$path = Join-Path $outputPath $exeFilename\n\nif(-not (Test-Path $path) )\n{\n    Throw \"$path was not found\"\n}\n\nWrite-Host \"Installing from: $path\"\nif(!$username)\n{\n    Start-Process $path -ArgumentList \"install\" -NoNewWindow -Wait | Write-Host\n} \nelse \n{\n    Start-Process $path -ArgumentList @(\"install\", \"-username\", $username, \"-password\", $password) -NoNewWindow -Wait | Write-Host\n}\nStart-Process $path -ArgumentList \"start\" -NoNewWindow -Wait | Write-Host\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -59,7 +59,7 @@
   ],
   "LastModifiedBy": "sphinxy",
   "$Meta": {
-    "ExportedAt": "2018-02-22T16:54:25.613Z",
+    "ExportedAt": "2018-02-22T16:54:25.6130000Z",
     "OctopusVersion": "4.0.10",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/topshelf-install/scriptbody.ps1 b/src/step-templates/topshelf-install/scriptbody.ps1
new file mode 100644
index 000000000..2cd8a0862
--- /dev/null
+++ b/src/step-templates/topshelf-install/scriptbody.ps1
@@ -0,0 +1,30 @@
+$step = $OctopusParameters['Unpackage step']
+$username = $OctopusParameters['Username'];
+$password = $OctopusParameters['Password'];
+$customExeFilename = $OctopusParameters['Exe filename'];
+
+$outputPath = $OctopusParameters["Octopus.Action[$step].Package.CustomInstallationDirectory"]
+if(!$outputPath) 
+{
+    $outputPath = $OctopusParameters["Octopus.Action[$step].Output.Package.InstallationDirectoryPath"]
+}
+
+$defaultExeFilename = $OctopusParameters["Octopus.Action[$step].Package.NuGetPackageId"] + ".exe"
+$exeFilename = If ($customExeFilename) {$customExeFilename} Else {$defaultExeFilename}
+$path = Join-Path $outputPath $exeFilename
+
+if(-not (Test-Path $path) )
+{
+    Throw "$path was not found"
+}
+
+Write-Host "Installing from: $path"
+if(!$username)
+{
+    Start-Process $path -ArgumentList "install" -NoNewWindow -Wait | Write-Host
+} 
+else 
+{
+    Start-Process $path -ArgumentList @("install", "-username", $username, "-password", $password) -NoNewWindow -Wait | Write-Host
+}
+Start-Process $path -ArgumentList "start" -NoNewWindow -Wait | Write-Host
diff --git a/step-templates/topshelf-uninstall.json b/src/step-templates/topshelf-uninstall/metadata.json
similarity index 54%
rename from step-templates/topshelf-uninstall.json
rename to src/step-templates/topshelf-uninstall/metadata.json
index e16fe25c3..46c2dbab7 100644
--- a/step-templates/topshelf-uninstall.json
+++ b/src/step-templates/topshelf-uninstall/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$step = $OctopusParameters['Unpackage step']\n$previous = $OctopusParameters[\"Octopus.Action[$step].Package.CustomInstallationDirectory\"]\n$customExeFilename = $OctopusParameters['Exe filename'];\n\nif(!$previous -or (-not (Test-Path $previous)) )\n{\n    Write-Host \"No installation found in: $previous\"\n\t\n    $previous = $OctopusParameters[\"Octopus.Action[$step].Output.Package.InstallationDirectoryPath\"]\n    if(!$previous -or (-not (Test-Path $previous)) )\n    {\n        Write-Host \"No installation found in: $previous\"\n        Break\n    }\n}\n\n\n$defaultExeFilename = $OctopusParameters[\"Octopus.Action[$step].Package.NuGetPackageId\"] + \".exe\"\n$exeFilename = If ($customExeFilename) {$customExeFilename} Else {$defaultExeFilename}\n$path = Join-Path $previous $exeFilename\n\nWrite-Host \"Previous installation: $path\"\n\nStart-Process $path -ArgumentList \"stop\" -NoNewWindow -Wait | Write-Host\nStart-Process $path -ArgumentList \"uninstall\" -NoNewWindow -Wait | Write-Host\n"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -37,7 +37,7 @@
   ],
   "LastModifiedBy": "sphinxy",
   "$Meta": {
-    "ExportedAt": "2018-02-22T16:57:20.068Z",
+    "ExportedAt": "2018-02-22T16:57:20.0680000Z",
     "OctopusVersion": "4.0.10",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/topshelf-uninstall/scriptbody.ps1 b/src/step-templates/topshelf-uninstall/scriptbody.ps1
new file mode 100644
index 000000000..a893fa5f2
--- /dev/null
+++ b/src/step-templates/topshelf-uninstall/scriptbody.ps1
@@ -0,0 +1,25 @@
+$step = $OctopusParameters['Unpackage step']
+$previous = $OctopusParameters["Octopus.Action[$step].Package.CustomInstallationDirectory"]
+$customExeFilename = $OctopusParameters['Exe filename'];
+
+if(!$previous -or (-not (Test-Path $previous)) )
+{
+    Write-Host "No installation found in: $previous"
+	
+    $previous = $OctopusParameters["Octopus.Action[$step].Output.Package.InstallationDirectoryPath"]
+    if(!$previous -or (-not (Test-Path $previous)) )
+    {
+        Write-Host "No installation found in: $previous"
+        Break
+    }
+}
+
+
+$defaultExeFilename = $OctopusParameters["Octopus.Action[$step].Package.NuGetPackageId"] + ".exe"
+$exeFilename = If ($customExeFilename) {$customExeFilename} Else {$defaultExeFilename}
+$path = Join-Path $previous $exeFilename
+
+Write-Host "Previous installation: $path"
+
+Start-Process $path -ArgumentList "stop" -NoNewWindow -Wait | Write-Host
+Start-Process $path -ArgumentList "uninstall" -NoNewWindow -Wait | Write-Host
diff --git a/src/step-templates/trigger-multitenant-deployment/metadata.json b/src/step-templates/trigger-multitenant-deployment/metadata.json
new file mode 100644
index 000000000..d0e632ba9
--- /dev/null
+++ b/src/step-templates/trigger-multitenant-deployment/metadata.json
@@ -0,0 +1,86 @@
+{
+  "Id": "053c7adc-f31f-42e1-b7c7-671d3df55ab2",
+  "Name": "Trigger Multi-Tenant Deployment",
+  "Description": "A step template that triggers Multi-Tenant Deployment. It can be used in not-tenanted projects. The step will lookup most recent release for the specified project if a specific version is not provided. Then it will lookup all tenants that are tagged with the specified tag and create a new deployment for each of the tenants. This will result in multiple tasks scheduled in Octopus. The step is not tracking status of deployment tasks execution.\n\nHypothetical use-case: \n * A multi-tenanted system deployed (as a monoliths) with a non-tenanted Octopus Deploy process.\n * Use this step to start a smoke test for several customers from such a not-tenanted deployment. In this case tenants can be used to represent different customers. This way each customer-specific parameters (access URLs, credentials, etc.) can be configured on tenants level.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "Category": "tenants",
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.SubstituteInFiles.Enabled": "True",
+    "Octopus.Action.EnabledFeatures": "Octopus.Features.SubstituteInFiles"
+  },
+  "Parameters": [
+    {
+      "Id": "f488f5a8-eafc-4da8-97ea-66cc01dfb39e",
+      "Name": "OctopusAPIurl",
+      "Label": "Octopus API URL",
+      "HelpText": null,
+      "DefaultValue": "#{Octopus.Dashboard.BaseUrl}/api",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9a4af3e2-340e-4e2f-9529-c160a491cc41",
+      "Name": "OctopusAPIkey",
+      "Label": "Octopus API Key",
+      "HelpText": null,
+      "DefaultValue": "#{Octopus.API.key}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "dd89222e-662d-4e63-a6a6-260ec6495547",
+      "Name": "MultiTenantProjectName",
+      "Label": "Multi-Tenant Project Name",
+      "HelpText": null,
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "8447f3fc-c8ed-44e3-ab2f-932981160ea8",
+      "Name": "ReleaseNumber",
+      "Label": "Release Number",
+      "HelpText": "Release number of the Multi-tenant project. Leave empty to use most recent release of the project.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "50ece5fe-7650-491f-9e0a-e9e521b14799",
+      "Name": "EnvironmentName",
+      "Label": "Environment Name",
+      "HelpText": null,
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e1657396-4221-4fcf-84a1-9fe130263cc4",
+      "Name": "TenantsTag",
+      "Label": "Tenants Selection Tag",
+      "HelpText": "Required. Expected format: <TenantTagSetName>/<TenantTagName>",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2019-04-10T20:41:22.6200000Z",
+    "OctopusVersion": "2018.10.5",
+    "Type": "ActionTemplate"
+  }
+}
diff --git a/src/step-templates/trigger-multitenant-deployment/scriptbody.ps1 b/src/step-templates/trigger-multitenant-deployment/scriptbody.ps1
new file mode 100644
index 000000000..9b0011ba9
--- /dev/null
+++ b/src/step-templates/trigger-multitenant-deployment/scriptbody.ps1
@@ -0,0 +1,118 @@
+function TriggerMultitenantDeployment {
+		### Steps: 
+		###    1. find most recent release of the Multi-tenanted project by project name if Release Number (2) parameter is empty
+		###    2. locate all the tenants for specified tag
+		###    3. for each tenant create a new deployment for the found release with the parameters
+
+    param
+    (
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$apiUrl,
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$apiKey,
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$projectName,
+        [Parameter(Mandatory = $false)]
+        [string]$releaseNumber = '',
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$environmentName,
+        [ValidateNotNullOrEmpty()]
+        [Parameter(Mandatory = $true)]
+        [string]$tenantsTag
+    )
+			
+
+		$errors=0
+		$headers = @{"X-Octopus-ApiKey"=$apiKey}
+		
+		$initiator = "#{Octopus.Deployment.CreatedBy.Username}"
+
+		Write-Host "### TriggerMultiTenantedDeployment parameters:"
+		Write-Host "###`tAPI URL: [$($apiUrl)]"
+		if($debug) {
+			Write-Host "###`tAPI Key: [$($apiKey)]"
+		}
+		Write-Host "###`tProject Name: [$($projectName)]"
+		Write-Host "###`tRelease Number: [$($releaseNumber)]"
+		Write-Host "###`tEnvironment: [$($environmentName)]"
+		Write-Host "###`tTenants Tag Name: [$($tenantsTag)]"
+		Write-Host "###`tInitiator: [$($initiator)]"
+
+		try {
+			if (-Not ($tenantsTag -match '\w+/\w+'))
+			{
+				Write-Error "### Tenants Tag Name must be in format 'TenantTagSet/TenantTag'"
+				$errors=1
+			}
+			$projects = Invoke-RestMethod -Method GET -Uri $apiUrl/projects/all -Headers $headers 
+			$project = $projects | where Name -eq $projectName
+			if (-Not $project) {
+				Write-Error "### Could not find project with name [$($projectName)]."
+				$errors=1
+			}
+            $projectUrl="$($apiUrl)/projects/$($project.Id)/releases"
+			$releases = Invoke-RestMethod -Method GET -Uri $projectUrl -Headers $headers | select -expand Items
+			$mostRecentRelease = $releases | Sort-Object -Descending -Property { [int]($_.Version -replace "\.") } | Select -First 1
+			$release = $releases | where Version -eq $releaseNumber | Select -First 1
+			if (-Not ($release)) {
+				$release=$mostRecentRelease
+				Write-Host "### Selected most recent release [$($release.Version)]."
+			}
+			if(-Not $release) {
+				if($releaseNumber) {
+					Write-Error "### Could not find release [$($releaseNumber)]for project with name [$($projectName)]."
+				} else {
+					Write-Error "### Could not find any releases for project with name [$($projectName)]."
+				}
+				$errors=1
+			}
+			$environments = Invoke-RestMethod -Method GET -Uri $apiUrl/environments/all -Headers $headers
+			$environment =  $environments | where Name -eq $environmentName
+			if(-Not $environment){
+				Write-Error "### Could not find environment [$($environmentName)] for project with name [$($projectName)]."
+				$errors=1
+			}
+			$tenants = Invoke-RestMethod -Method GET -Uri $apiUrl/tenants/all -Headers $headers 
+			$selectedTenants = $tenants | where TenantTags -Contains $tenantsTag
+			if(-Not $selectedTenants){
+				Write-Error "### Could not find any tenants with tag [$($tenantsTag)]."
+				$errors=1
+			}
+			if($errors)
+			{
+				Fail-Step "### Encoutered an error. See log for more details. Interrupting the task."
+			}
+
+			if ($debug){
+				Write-Host "##Project##: " $project
+				Write-Host "##Project.Id##: " $projectId
+				Write-Host "##LifeCycleId##: " $lifeCycleId
+				Write-Host "##Release##: " $release
+				Write-Host "##ReleaseId##: " $release.Id
+				Write-Host "##ChannelId##: " $release.channelId
+				Write-Host "##TenantsTag##: " $tag.Id $tag.CanonicalTagName
+				Write-Host "##SelectedTenants##: " $selectedTenants.Count
+			}
+
+			foreach($tenant in $selectedTenants) {
+				$deploymentJson = "{`"ProjectId`":`"$($projectId)`",`"ReleaseId`":`"$($release.Id)`",`"EnvironmentId`":`"$($environment.Id)`",`"ChannelId`":`"$($release.channelId)`",`"TenantId`":`"$($tenant.Id)`",`"Comments`":`"Initiated by $($initiator)`"}"
+			
+				if($debug) { Write-Host "##DeploymentJson##: $($deploymentJson)" }
+				
+				$deployment = Invoke-RestMethod -Method POST -Uri $apiUrl/deployments -Headers $headers -Body $deploymentJson
+				Write-Host "### Created new deployment for $($tenant.Name): [$($deployment)]."
+				Write-Host "### Deployment for release [$($project.Name) $($release.Version)], tenant [$($tenant.Name)] in [$($environmentName)] environment was created and scheduled successfuly."
+			}
+			exit
+		} Catch {
+			Write-Error "### Failed to complete deployment for " $projectName "to" $environmentName "for" $tenantsTag
+			throw $_
+		}
+}
+
+
+	TriggerMultitenantDeployment -apiUrl $OctopusAPIurl -apiKey $OctopusAPIkey -projectName $MultiTenantProjectName -environmentName $EnvironmentName -releaseNumber $ReleaseNumber -tenantsTag $TenantsTag
diff --git a/src/step-templates/twilio-send-sms-powershell/metadata.json b/src/step-templates/twilio-send-sms-powershell/metadata.json
new file mode 100644
index 000000000..d968ff528
--- /dev/null
+++ b/src/step-templates/twilio-send-sms-powershell/metadata.json
@@ -0,0 +1,75 @@
+{
+  "Id": "3c3904a9-d08c-4f18-b86c-0304800bb541",
+  "Name": "Twilio - Send SMS (PowerShell)",
+  "Description": "Send an SMS using Twilio's API. This script step is written in PowerShell.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "392a1b09-0f79-48c2-95f8-679869383e39",
+      "Name": "Twilio_SendMessage_AccountSID",
+      "Label": "SID",
+      "HelpText": "The Twilio account SID.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "1c10d07a-f2fc-466d-ad2b-0d9800141e60",
+      "Name": "Twilio_SendMessage_AuthToken",
+      "Label": "Auth Token",
+      "HelpText": "The Twilio AuthToken.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "bdbd0b60-9544-41a5-a64d-b8544c6f1958",
+      "Name": "Twilio_SendMessage_FromNumber",
+      "Label": "From Number",
+      "HelpText": "The number to send the message from. This is usually your Twilio number.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fbb8e980-fd54-4c34-a149-848a1eebd560",
+      "Name": "Twilio_SendMessage_ToNumber",
+      "Label": "To Number",
+      "HelpText": "The number to send the message to.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "d3674581-f589-4f9e-998c-f829ee9195f6",
+      "Name": "Twilio_SendMessage_Message",
+      "Label": "Message",
+      "HelpText": "The message to send.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "Author": "ryanrousseau",
+  "LastModifiedOn": "2020-04-14T15:25:44.1390000Z",
+  "LastModifiedBy": "ryanrousseau",
+  "$Meta": {
+    "ExportedAt": "2020-04-14T15:25:44.1390000Z",
+    "OctopusVersion": "2020.1.9",
+    "Type": "ActionTemplate"
+  },
+  "Category": "twilio"
+}
diff --git a/src/step-templates/twilio-send-sms-powershell/scriptbody.ps1 b/src/step-templates/twilio-send-sms-powershell/scriptbody.ps1
new file mode 100644
index 000000000..b05e9fa6d
--- /dev/null
+++ b/src/step-templates/twilio-send-sms-powershell/scriptbody.ps1
@@ -0,0 +1,13 @@
+$url = "https://api.twilio.com/2010-04-01/Accounts/$Twilio_SendMessage_AccountSID/Messages.json"
+$params = @{
+    To = $Twilio_SendMessage_ToNumber;
+    From = $Twilio_SendMessage_FromNumber;
+    Body = $Twilio_SendMessage_Message
+}
+
+Write-Verbose "Creating Twilio credentials"
+$secureToken = $Twilio_SendMessage_AuthToken | ConvertTo-SecureString -asPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential($Twilio_SendMessage_AccountSID, $secureToken)
+
+Write-Verbose "Creating Twilio credentials"
+Invoke-WebRequest $url -Method Post -Credential $credential -Body $params -UseBasicParsing
diff --git a/src/step-templates/umbraco-v7-folder-permissions/metadata.json b/src/step-templates/umbraco-v7-folder-permissions/metadata.json
new file mode 100644
index 000000000..19696cb74
--- /dev/null
+++ b/src/step-templates/umbraco-v7-folder-permissions/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "c60a8c60-c5bc-4dac-9384-65ec4bcf6c67",
+  "Name": "Set Umbraco 7 Folder Permissions",
+  "Description": "To ensure a stable and smoothly running umbraco installation, these permissions need to be set correctly.\n\nThese permissions should be set before or during the insallation of umbraco. The user with the permissions set are the user used by the Application Pool used by the IIS website (usually Network Service or the IIS_IUSRS group). If in doubt, ask your server admin / hosting company\n\n[Umbraco Wiki Article](http://our.umbraco.org/wiki/reference/files-and-folders/permissions)\n",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "WebsiteDirectory",
+      "Label": "Website Directory",
+      "HelpText": "This is the location where the website is configured to run from in IIS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "ApplicationPoolName",
+      "Label": "Application Pool Name",
+      "HelpText": "This is the name of the application pool the website is configured to run under in IIS",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2015-01-23T04:31:26.6030000-08:00",
+    "OctopusVersion": "2.6.0.778",
+    "Type": "ActionTemplate"
+  },
+  "Category": "umbraco"
+}
diff --git a/src/step-templates/umbraco-v7-folder-permissions/scriptbody.ps1 b/src/step-templates/umbraco-v7-folder-permissions/scriptbody.ps1
new file mode 100644
index 000000000..6308be47a
--- /dev/null
+++ b/src/step-templates/umbraco-v7-folder-permissions/scriptbody.ps1
@@ -0,0 +1,38 @@
+$PhysicalPath = "$WebsiteDirectory"
+$appPoolAccount = "IIS APPPOOL\$ApplicationPoolName"
+$readExecute = $appPoolAccount,"ReadAndExecute","ContainerInherit,ObjectInherit","None","Allow"
+$read = $appPoolAccount,"Read","ContainerInherit,ObjectInherit","None","Allow"
+$modify = $appPoolAccount,"Modify","ContainerInherit,ObjectInherit","None","Allow"
+$fileModify = $appPoolAccount,"Modify","Allow"
+$objects = @{}
+$objects["App_Browsers"] = $readExecute
+$objects["App_Code"] = $modify
+$objects["App_Data"] = $modify
+$objects["App_Plugins"] = $modify
+$objects["bin"] = $modify
+$objects["Config"] = $modify
+$objects["Css"] = $modify
+$objects["MacroScripts"] = $modify
+$objects["Masterpages"] = $modify
+$objects["Media"] = $modify
+$objects["Scripts"] = $modify
+$objects["Umbraco"] = $modify
+$objects["Umbraco_Client"] = $modify
+$objects["UserControls"] = $modify
+$objects["Views"] = $modify
+$objects["Web.config"] = $fileModify
+$objects["Xslt"] = $modify
+foreach($object in $objects.Keys){
+    try {
+        $path = Join-Path $PhysicalPath $object
+        $acl = Get-ACL $path
+        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($objects[$object])
+        $acl.AddAccessRule($rule)
+        Set-Acl $path $acl
+        Get-Acl $path | Format-List
+    }
+    catch [System.Exception]
+    {
+        Write-Host "Unable to set ACL on" Join-Path $PhysicalPath $object
+    }
+}
\ No newline at end of file
diff --git a/step-templates/unicorn-sync-configuration.json b/src/step-templates/unicorn-sync-configuration/metadata.json
similarity index 72%
rename from step-templates/unicorn-sync-configuration.json
rename to src/step-templates/unicorn-sync-configuration/metadata.json
index 4d8908364..e04b3702a 100644
--- a/step-templates/unicorn-sync-configuration.json
+++ b/src/step-templates/unicorn-sync-configuration/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 8,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$url = \"$BaseUrl/unicorn.aspx?verb=Sync&configuration=$ConfigName\"\r\nWrite-Host \"Syncing configuration: $ConfigName\"\r\nWrite-Host \"Attempting to invoke: $url\"\r\n$deploymentToolAuthToken = $DeploymentAuthToken\r\n$timeout = $Timeout\r\n$basicAuthUser = $BasicAuthUsername\r\n$basicAuthPass = $BasicAuthPassword\r\n$secpasswd = ConvertTo-SecureString $basicAuthPass -AsPlainText -Force\r\n$credential = New-Object System.Management.Automation.PSCredential($basicAuthUser, $secpasswd)\r\n$result = Invoke-WebRequest -Uri $url -Headers @{ \"Authenticate\" = $deploymentToolAuthToken } -TimeoutSec $timeout -UseBasicParsing \r\n\r\nWrite-Host $result.Content",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -65,10 +65,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-09-04T05:09:05.695+00:00",
+  "LastModifiedOn": "2015-09-03T22:09:05.6950000-07:00",
   "LastModifiedBy": "elkaz",
   "$Meta": {
-    "ExportedAt": "2015-09-07T02:20:43.772+00:00",
+    "ExportedAt": "2015-09-06T19:20:43.7720000-07:00",
     "OctopusVersion": "2.6.3.886",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/unicorn-sync-configuration/scriptbody.ps1 b/src/step-templates/unicorn-sync-configuration/scriptbody.ps1
new file mode 100644
index 000000000..c8a48f9de
--- /dev/null
+++ b/src/step-templates/unicorn-sync-configuration/scriptbody.ps1
@@ -0,0 +1,12 @@
+$url = "$BaseUrl/unicorn.aspx?verb=Sync&configuration=$ConfigName"
+Write-Host "Syncing configuration: $ConfigName"
+Write-Host "Attempting to invoke: $url"
+$deploymentToolAuthToken = $DeploymentAuthToken
+$timeout = $Timeout
+$basicAuthUser = $BasicAuthUsername
+$basicAuthPass = $BasicAuthPassword
+$secpasswd = ConvertTo-SecureString $basicAuthPass -AsPlainText -Force
+$credential = New-Object System.Management.Automation.PSCredential($basicAuthUser, $secpasswd)
+$result = Invoke-WebRequest -Uri $url -Headers @{ "Authenticate" = $deploymentToolAuthToken } -TimeoutSec $timeout -UseBasicParsing 
+
+Write-Host $result.Content
\ No newline at end of file
diff --git a/step-templates/unzip.json b/src/step-templates/unzip/metadata.json
similarity index 58%
rename from step-templates/unzip.json
rename to src/step-templates/unzip/metadata.json
index 30eebd778..6221c18f9 100644
--- a/step-templates/unzip.json
+++ b/src/step-templates/unzip/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 7,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$shell_app=new-object -com shell.application\r\n\r\n$FOF_SILENT_FLAG = 4\r\n$FOF_NOCONFIRMATION_FLAG = 16\r\n\r\nif (Test-Path $filename)\r\n{\r\n   Write-Host Unzipping $filename\r\n   $zip_file = $shell_app.namespace(\"$filename\")\r\n   $destination = $shell_app.namespace(\"$dest\")\r\n   $destination.Copyhere($zip_file.items(), $FOF_SILENT_FLAG + $FOF_NOCONFIRMATION_FLAG)\r\n}\r\nelse\r\n{\r\n    Write-Host File $filename does not exist\r\n}\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -29,12 +29,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-08-03T13:45:04.765+00:00",
+  "LastModifiedOn": "2015-08-03T06:45:04.7650000-07:00",
   "LastModifiedBy": "pitrew",
   "$Meta": {
-    "ExportedAt": "2015-08-03T13:45:19.309+00:00",
+    "ExportedAt": "2015-08-03T06:45:19.3090000-07:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "unzip"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/unzip/scriptbody.ps1 b/src/step-templates/unzip/scriptbody.ps1
new file mode 100644
index 000000000..fd4b0d5c6
--- /dev/null
+++ b/src/step-templates/unzip/scriptbody.ps1
@@ -0,0 +1,16 @@
+$shell_app=new-object -com shell.application
+
+$FOF_SILENT_FLAG = 4
+$FOF_NOCONFIRMATION_FLAG = 16
+
+if (Test-Path $filename)
+{
+   Write-Host Unzipping $filename
+   $zip_file = $shell_app.namespace("$filename")
+   $destination = $shell_app.namespace("$dest")
+   $destination.Copyhere($zip_file.items(), $FOF_SILENT_FLAG + $FOF_NOCONFIRMATION_FLAG)
+}
+else
+{
+    Write-Host File $filename does not exist
+}
diff --git a/step-templates/update-hosts-file.json b/src/step-templates/update-hosts-file/metadata.json
similarity index 54%
rename from step-templates/update-hosts-file.json
rename to src/step-templates/update-hosts-file/metadata.json
index da56435e6..59566b31a 100644
--- a/step-templates/update-hosts-file.json
+++ b/src/step-templates/update-hosts-file/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$hostsPath = \"$env:windir\\system32\\drivers\\etc\\hosts\"\nWrite-Host \"Opening HOSTS file:$hostsPath\"\n\n$hostEntries = $OctopusParameters[\"uhf_Hosts\"]\nWrite-Verbose \"hostEntries:$hostEntries\"\n\n$lines = (Get-Content $hostsPath)\n\nfor ($i = 0; $i -lt $lines.Length; $i++) {\n    $line = $lines[$i]\n    if ($line -match \"^#\" -or $line -match \"^[\\s\\t]*$\") {\n        continue\n    }\n\n    $line = \"\"\n\n    $lines[$i] = $line\n}\n\nforeach ($hostEntry in $hostEntries.Split(\"`n\")) {\n    Write-Verbose $hostEntry\n    $parts = $hostEntry.Split(\",\")\n    $ip = $parts[0]\n    Write-Verbose $ip\n    $hostname = $parts[1]\n    Write-Verbose $hostname\n    $line = \"$ip`t`t`t$hostname\"\n    Write-Host \"Adding entry:$line\"\n    $lines += $line\n}\n\nOut-File -FilePath $hostsPath -Encoding ascii -InputObject $lines.Where({ $_ -ne \"\"}) -Force"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -25,9 +25,9 @@
   ],
   "LastModifiedBy": "BlueWombat",
   "$Meta": {
-    "ExportedAt": "2019-12-02T05:53:03.714Z",
+    "ExportedAt": "2019-12-02T05:53:03.7140000Z",
     "OctopusVersion": "2019.10.8",
     "Type": "ActionTemplate"
   },
   "Category": "hosts-file"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/update-hosts-file/scriptbody.ps1 b/src/step-templates/update-hosts-file/scriptbody.ps1
new file mode 100644
index 000000000..b598d5535
--- /dev/null
+++ b/src/step-templates/update-hosts-file/scriptbody.ps1
@@ -0,0 +1,32 @@
+$hostsPath = "$env:windir\system32\drivers\etc\hosts"
+Write-Host "Opening HOSTS file:$hostsPath"
+
+$hostEntries = $OctopusParameters["uhf_Hosts"]
+Write-Verbose "hostEntries:$hostEntries"
+
+$lines = (Get-Content $hostsPath)
+
+for ($i = 0; $i -lt $lines.Length; $i++) {
+    $line = $lines[$i]
+    if ($line -match "^#" -or $line -match "^[\s\t]*$") {
+        continue
+    }
+
+    $line = ""
+
+    $lines[$i] = $line
+}
+
+foreach ($hostEntry in $hostEntries.Split("`n")) {
+    Write-Verbose $hostEntry
+    $parts = $hostEntry.Split(",")
+    $ip = $parts[0]
+    Write-Verbose $ip
+    $hostname = $parts[1]
+    Write-Verbose $hostname
+    $line = "$ip`t`t`t$hostname"
+    Write-Host "Adding entry:$line"
+    $lines += $line
+}
+
+Out-File -FilePath $hostsPath -Encoding ascii -InputObject $lines.Where({ $_ -ne ""}) -Force
\ No newline at end of file
diff --git a/src/step-templates/upgrade-octopus-server/metadata.json b/src/step-templates/upgrade-octopus-server/metadata.json
new file mode 100644
index 000000000..31f5c3525
--- /dev/null
+++ b/src/step-templates/upgrade-octopus-server/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "4b3a1f09-1827-41bb-88a4-894c6317922b",
+  "Name": "Upgrade Octopus Server",
+  "Description": "This step downloads the latest version of Octopus Server and upgrades an existing instance. Run this step on a tentacle that has privileges to install software and start/stop services on the target server.\n\n**Run this after a database backup step**\n\nTo Use:\n- Install a tentacle on the Octopus Server machine with privileges to install software and start/stop services\n- Add that tentacle to an environment and with a unique role\n- Setup a project for the upgrade process\n- Add a database backup step for your Octopus Server database\n- Add this step, selecting it to run on just the role previously configured\n- Create a release\n- Deploy that release whenever an upgrade is needed\n\nNB: The deployment will show as \"Timed Out\" when the server comes back online",
+  "ActionType": "Octopus.Script",
+  "Version": 10,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "41442ee8-d56a-4a03-8c4b-af4c02245d9e",
+      "Name": "InstanceName",
+      "Label": "Instance Name",
+      "HelpText": "The name of your octopus instance. For the default instance use `OctopusServer`.",
+      "DefaultValue": "OctopusServer",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "18ede5ad-24a8-4796-a6e2-1b49a4cd7df2",
+      "Name": "InstallPath",
+      "Label": "InstallPath",
+      "HelpText": "The installation path to Octopus Deploy Server. Not the instance directory",
+      "DefaultValue": "C:\\Program Files\\Octopus Deploy\\Octopus",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "098375bf-ff27-47c3-93ce-0191aade1b21",
+      "Name": "SpecificOctopusServerVersionToInstall",
+      "Label": "Version number of Octopus Server which is going to be installed",
+      "HelpText": "Selects a specific version of Octopus Server to install. This is especially handy for a downgrade. The version number must be valid though.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "Verzada",
+  "Website": "/step-templates/4b3a1f09-1827-41bb-88a4-894c6317922b",
+  "Logo": "iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAC1QTFRFT6Tl////L5Pg8vj9Y67omsvwPJrisdfzfbzs5fL7y+T32Ov5isLucLXqvt31CJPHWwAABMJJREFUeNrs3deW4jAMAFDF3U75/89dlp0ZhiU4blJEjvQ8hYubLJsA00UCBCIQgQhEIAIRiEAEIhCBCEQgAhGIQAQiEIEIhD8kJm+t+QprfdKfB9HbYpx6CWfspj8HMi+gMgHL/AmQA8W3JTKH+ALFvzCeL0RbpyoCPE9IJeNOSQwh5Z3qd6yRGWQ2qi2cZQWxqj1WzQYSjeoJmJlAklOd4VlArOqPhQEkqBERToeMcfRJBkC0Uep8CfBpjz4JsHJ0zF3dkEWNje0kiB/sUC6eApndaIiCMyAa1PiwJ0AWhRGJHJJQHG2dC7h1rNbO1QOxSA7lNCkkKrQIpJCAB1GREILYIC1NAiwbpKFJgGWDNExcwGstfExcZBCHC6nOglshHtmhViLIig1RNBCN7qjtW8C0Z1UvJcC1Z9XmwMBzzvobmgAyEzgq91dtEEsBsQSQQAFZCSBAATEEEApHZbrVBIkkEIUPSVeB+KtALA0kXQUSrwKZBCIQBnk8Y4i5CsReBeKvkqLM+BCSDWJlrZFvGk9SRTHshkgjZCGAaArIxm3H3grhVzFlW2msfl1ca79UJ1bofYvsDHHlNdTZnlh5MghuPd5NdBDUNZHyCkfktIh03XzALGRPlBDPac7qgWjHZzWcmF5zmmkhidMQ6boKiDXcDTUEaylZqCGJ0Vjvu/fLJtHqhSANEvqb2OYqkOUqEHuVMbJcZdZCGiPhKhC4yjqiIjEE7XThMp8fAWII3mY3kUIQD+AMKQTzPiBhgQ63HlT/KSvgtoi0dq5mCPah1UIE0eh3sT0NhOByvKeAkFzi8PgQomumFhsyOxpIzZN4gLOj5plVwNpR0b2AuePWKBEHQu24pSsJA+LVCeHHQxZ1SiyDIdqok8IOhSSnTottHEQTdyt4ettAj4KkzA4dMikk2Dht2S5ptm1vswnPDxn0YyDZ5oDM3iToo2T5voWaYe+Q+vdjH80QyAzZhCgcDtLMI1Tmtz9w++XHgziHQHJJu/OZ3bs9Xn8gQ72NcP3dKqEfkp10F51xhoIi2I91R+LurXV/5q7pH+wx061CzO16oSQleMyr8fXvwMA0Pro8432DPD/ySx8XrHfSuDAM8n6UhnjQabaiXf5Bq/lREHvEeNtn1rJ08+C/uXkQZHeguxAPC3UvtcJYUogLzZX5hhZZvS6onG5lxXtzWGaygwb79vT/IXhdlNibwlKYOR6T8xjI7W8n+xV7T+GH4tMzWwR+lZhRkJYSsC0thpmCYqyngOz3rN2FLBZ2wZflBCggUHF0Vnp88JKienzIXLSEZCZqU7IKr/gQW9yx3pzV7Y9kvWZWTRRIqDmTtRUnU7b2lLcTYmoqHqnmiO1poER0SPkAeZMAZxaJx0Y3TCdAclsIqDz03ALcyxfTCZBsthoGXWmigGyVhWPLFJJfuuKQWycoEFdXbH4dJJoJxNR1eD/kshz6yn48cF8yW8sFoitflB1w6Q8n+/15Za7oA17/pYNmYgP5fmWm8L1NOHPWgK8kuFew1/JXtOA0yJCv7ah7X8ObUuT5kObU30+fDZm8+zqP+HTIpK0xQ796b5Kv2hSIQAQiEIEIRCACEYhABCIQgQhEIAIRiEAEIpBf8UeAAQAEjtYmlDTcCgAAAABJRU5ErkJggg==",
+  "$Meta": {
+    "ExportedAt": "2018-03-09T15:07:55.1810000Z",
+    "OctopusVersion": "2018.3.2",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/upgrade-octopus-server/scriptbody.ps1 b/src/step-templates/upgrade-octopus-server/scriptbody.ps1
new file mode 100644
index 000000000..e48a2efe9
--- /dev/null
+++ b/src/step-templates/upgrade-octopus-server/scriptbody.ps1
@@ -0,0 +1,95 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+Function GetLatestVersionOrSpecificVersionOfOctopusServer() 
+{
+    if([string]::IsNullOrEmpty($SpecificOctopusServerVersionToInstall))
+    {
+        Write-Host "No specific version has been selected, getting latest version from octopusdeploy.com"
+        $versions = Invoke-WebRequest https://octopusdeploy.com/download/upgrade/v3 -UseBasicParsing | ConvertFrom-Json
+        $version = $versions[-1].Version
+        return $version
+    }
+    else 
+    {
+    	Write-Host "Specific version has been selected"
+        return $SpecificOctopusServerVersionToInstall
+    }
+}
+
+Function GetCurrentlyInstalledVersionOfOctopusServer() 
+{
+    $InstalledVersion = (get-item "$InstallPath\Octopus.Server.exe").VersionInfo.fileversion
+    return $installedVersion
+}
+
+Function DownloadOctopusServer([string] $versionNumber) 
+{ 
+    Write-Host "Downloading Octopus Server version $versionNumber"
+    $tempFile = [System.IO.Path]::GetTempFileName()
+  	try
+    {
+        (New-Object System.Net.WebClient).DownloadFile("https://download.octopusdeploy.com/octopus/Octopus.$versionNumber-x64.msi", $tempFile)
+    }
+    catch
+    {
+        Write-Host "Exception occurred"
+        echo $_.Exception|format-list -force
+    }
+    Write-Host "Download completed"
+    return $tempFile
+}
+
+Function StopOctopusServer() 
+{
+    Write-Host "Stopping Server"
+    . "$InstallPath\Octopus.Server.exe" service --stop --console --instance $InstanceName
+}
+
+Function InstallOctopusServer([object] $tempFile)
+{
+    Write-Host "Installing ..."
+    msiexec /i $tempFile /quiet | Out-Null
+}
+
+Function RemoveTempFile([object] $temporaryFile)
+{   
+    Write-Host "Deleting downloaded installer"
+    Remove-Item $temporaryFile
+}
+
+Function StartOctopusServer()
+{
+    Write-Host "Starting Octopus Server"
+    . "$InstallPath\Octopus.Server.exe" service --start --console --instance $InstanceName
+}
+
+Function InstallSetVersionOnOctopusServer([string] $currentlyInstalledVersion, [string] $selectedVersionToInstall){
+
+      Write-Host "Currently installed version: $currentlyInstalledVersion"
+      Write-Host "Selected version to install: $selectedVersionToInstall" 
+
+      $tempFile = DownloadOctopusServer $selectedVersionToInstall
+      StopOctopusServer
+      InstallOctopusServer $tempFile
+      RemoveTempFile $tempFile
+      StartOctopusServer
+}
+
+Function StartInstallationOfOctopusServer () {
+
+  ## Get the current state of Octopus Server
+  $selectedVersionToInstall = GetLatestVersionOrSpecificVersionOfOctopusServer 
+  $currentlyInstalledVersion = GetCurrentlyInstalledVersionOfOctopusServer
+
+
+  if([version]$selectedVersionToInstall -eq [version]$currentlyInstalledVersion)
+  {
+      Write-host "Octopus Server has already been installed with version $currentlyInstalledVersion"   
+  }
+  else  
+  {
+    InstallSetVersionOnOctopusServer $currentlyInstalledVersion $selectedVersionToInstall
+  }
+}
+
+StartInstallationOfOctopusServer
\ No newline at end of file
diff --git a/src/step-templates/upgrade_to_latest_tentacle/metadata.json b/src/step-templates/upgrade_to_latest_tentacle/metadata.json
new file mode 100644
index 000000000..f17a120bd
--- /dev/null
+++ b/src/step-templates/upgrade_to_latest_tentacle/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "349c64f5-c9bd-4b55-bff7-cc497a1f898e",
+  "Name": "Upgrade To Latest Tentacle",
+  "Description": "Upgrades a list of machines to the latest version of Tentacle. Machines can be targeted by Environment and/or Role or Machine Name.\n\nThis needs to be run directly on a worker or the octopus server itself.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "51ea8dde-8df6-4621-8c8a-f5cacf485c5e",
+      "Name": "UpdateTentacles.OctopusUrl",
+      "Label": "Octopus Url",
+      "HelpText": "**Required**\n\nThe url of the server where the upgrades will be performed.\n\ne.g. `https://octopus.server.com`",
+      "DefaultValue": "#{Octopus.Web.ServerUri}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "b8d147e0-de55-488e-a69f-9b212fd99559",
+      "Name": "UpdateTentacles.ApiKey",
+      "Label": "API Key",
+      "HelpText": "**Required**\n\nThe api key of a user permitted to perform tentacle upgrades.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e0d7450e-01de-47b2-abd2-3b22aa12a295",
+      "Name": "UpdateTentacles.SpaceName",
+      "Label": "Space",
+      "HelpText": "The space to use when targeting machines.",
+      "DefaultValue": "#{Octopus.Space.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fb2c3110-d597-4729-9c86-d6dc5314dfb7",
+      "Name": "UpdateTentacles.EnvironmentNames",
+      "Label": "Environments",
+      "HelpText": "A list of environments to be used for targeting machines. If no environments are specified, only `Machines Names` will be targeted.\n\nMultiple environments can be specified, one per line.",
+      "DefaultValue": "#{Octopus.Environment.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "2ec7ff8e-6dd3-46a8-9ef6-5869d14b6a03",
+      "Name": "UpdateTentacles.RoleNames",
+      "Label": "Roles",
+      "HelpText": "A list of roles to filter the machines found in the specified `Environments`. Only machines that are members of a specified role will be targeted.\n\nMultiple roles can be specified, one per line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "e68ee3f0-bf4b-47ce-bba2-9a2e50c80595",
+      "Name": "UpdateTentacles.MachineNames",
+      "Label": "Machine Names",
+      "HelpText": "Additional machine names to upgrade. These will be added to the list after `Environments` and `Roles` have been processed.\n\nMultiple machines can be specified, one per line.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "9e742501-e215-4217-8e32-a6fb5ac16b6d",
+      "Name": "UpdateTentacles.WhatIf",
+      "Label": "What If",
+      "HelpText": "This can be used to test the targeting parameters. When selected, a list of target machines will be listed, but no machines will be upgraded.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "8e3f8d65-c117-40b6-b654-93f8ab65776d",
+      "Name": "UpdateTentacles.Wait",
+      "Label": "Wait",
+      "HelpText": "Wait until the upgrade is finished.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2023-11-21T00:42:08.2570000Z",
+    "OctopusVersion": "2023.2.13113",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "REOScotte",
+  "Category": "octopus"
+}
diff --git a/src/step-templates/upgrade_to_latest_tentacle/scriptbody.ps1 b/src/step-templates/upgrade_to_latest_tentacle/scriptbody.ps1
new file mode 100644
index 000000000..ff28cfb62
--- /dev/null
+++ b/src/step-templates/upgrade_to_latest_tentacle/scriptbody.ps1
@@ -0,0 +1,104 @@
+# Define working variables
+$OctopusUrl       = [string]$OctopusParameters['UpdateTentacles.OctopusUrl'].Trim()
+$ApiKey           = [string]$OctopusParameters['UpdateTentacles.ApiKey'].Trim()
+$SpaceName        = [string]$OctopusParameters['UpdateTentacles.SpaceName'].Trim()
+$EnvironmentNames = [string[]]$OctopusParameters['UpdateTentacles.EnvironmentNames']
+$RoleNames        = [string[]]$OctopusParameters['UpdateTentacles.RoleNames']
+$MachineNames     = [string[]]$OctopusParameters['UpdateTentacles.MachineNames']
+$WhatIf           = [bool]::Parse($OctopusParameters['UpdateTentacles.WhatIf'])
+$Wait             = [bool]::Parse($OctopusParameters['UpdateTentacles.Wait'])
+
+# Remove white space and blank lines.
+if ($null -ne $EnvironmentNames) {
+    $EnvironmentNames = $EnvironmentNames.Split("`n").Trim().Where({$_}) # Trim white space and blank lines.
+}
+if ($null -ne $RoleNames) {
+    $RoleNames = $RoleNames.Split("`n").Trim().Where({$_}) # Trim white space and blank lines.
+}
+if ($null -ne $MachineNames) {
+    $MachineNames = $MachineNames.Split("`n").Trim().Where({$_}) # Trim white space and blank lines.
+}
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = "Stop"
+
+$header = @{ "X-Octopus-ApiKey" = $ApiKey }
+
+if ($null -eq $SpaceName) {
+    $baseUri = "$OctopusUrl/api"
+} else {
+    $space = (Invoke-RestMethod -Method Get -Uri "$OctopusUrl/api/spaces/all" -Headers $header) | Where-Object { $_.Name -eq $SpaceName }
+
+    if ($null -eq $space) {
+        throw "Space Name $SpaceName does not exist."
+    } else {
+        Write-Verbose "Using Space $SpaceName."
+    }
+
+    $baseUri = "$OctopusUrl/api/$($space.Id)"
+}
+
+# Start with no machines
+$allMachines = @()
+
+# Add machines for each requested environment.
+foreach ($environmentName in $EnvironmentNames) {
+    $environment = (Invoke-RestMethod -Method Get -Uri "$baseUri/environments/all" -Headers $header) | Where-Object { $_.Name -eq $environmentName }
+
+    if ($null -eq $environment) {
+        throw "Environment $environmentName does not exist."
+    } else {
+        Write-Verbose "Adding machines from Environment $environmentName."
+    }
+
+    $allMachines += (Invoke-RestMethod -Method Get -Uri "$baseUri/environments/$($environment.Id)/machines?take=$([int32]::MaxValue)" -Headers $header).Items
+}
+
+# If roles are specifed, include only machines in the specicied roles. Otherwise don't filter.
+if ($null -eq $RoleNames) {
+    $roleFilteredMachines += $allMachines
+} else {
+    $roleFilteredMachines = @()
+    foreach ($roleName in $RoleNames) {
+        $roleFilteredMachines += $allMachines | Where-Object { $_.Roles -contains $roleName }
+    }
+}
+
+# Add each specific machine requested.
+$roleFilteredMachines += (Invoke-RestMethod -Method Get -Uri "$baseUri/machines/all" -Headers $header) | Where-Object { $_.Name -in $MachineNames }
+
+# Create array of unique IDs to target.
+$uniqueIDs = [array]($roleFilteredMachines.Id | Sort-Object -Unique)
+
+if (-not $uniqueIDs) {
+    Write-Highlight "No machines were targeted. Exiting..."
+    exit
+}
+
+# Build json payload, targeting unique machine IDs.
+$jsonPayload = @{
+    Arguments = @{
+        MachineIds = $uniqueIDs
+    }
+    Description = "Upgrade Tentacle version."
+    Name = "Upgrade"
+}
+
+if ($WhatIf) {
+    Write-Host "Upgrading tentacles on:"
+    Write-Host $(($roleFilteredMachines.Name | Sort-Object -Unique) -join "`r")
+} else {
+    Write-Verbose "Upgrading tentacles on:"
+    Write-Verbose $(($roleFilteredMachines.Name | Sort-Object -Unique) -join "`r")
+    $task = Invoke-RestMethod -Method Post -Uri "$baseUri/tasks" -Headers $header -Body ($jsonPayload | ConvertTo-Json -Depth 10)
+    Write-Highlight "$($task.Id) started. Progress can be monitored [here]($OctopusUrl$($task.Links.Web)?activeTab=taskLog)"
+    
+    if ($Wait) {
+        do {
+        	# Output the current state of the task every five seconds.
+            $task = Invoke-RestMethod -Method Get -Uri "$baseUri/tasks/$($task.Id)" -Headers $header
+            $task
+            Start-Sleep -Seconds 5
+        } while ($task.IsCompleted -eq $false)
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/variables-find-unreplaced/metadata.json b/src/step-templates/variables-find-unreplaced/metadata.json
new file mode 100755
index 000000000..db08d2664
--- /dev/null
+++ b/src/step-templates/variables-find-unreplaced/metadata.json
@@ -0,0 +1,74 @@
+{
+  "Id": "0b753c94-c12b-46f3-bb82-459e27bbe812",
+  "Name": "Variables - Find Unreplaced",
+  "Description": "Searches `Web.config` or `App.config` files looking for Octopus Deploy variables that have not been replaced. Alternatively, any arbitrary file can be checked.",
+  "ActionType": "Octopus.Script",
+  "Version": 26,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "7809f4f9-7388-4067-ae0f-e5d858ad9395",
+      "Name": "Path",
+      "Label": "Path",
+      "HelpText": "The folders to search for files in. Enter multiple paths on separate lines.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "f9389ec3-1602-48b1-9f03-c95af304a3c2",
+      "Name": "Files",
+      "Label": "Files",
+      "HelpText": "An array of all the files or globs to search in. Defaults to `*.config`. Multiple items can be separated with a semicolon `;`.",
+      "DefaultValue": "*.config",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "0b54fdbd-12ac-4fc8-aa26-410cd1a3bd77",
+      "Name": "Exclude",
+      "Label": "Exclude",
+      "HelpText": "Files or globs to ignore. Multiple items can be separated with a semicolon `;`.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "29f81ee9-529b-45f6-8452-8e8f464c3225",
+      "Name": "Recurse",
+      "Label": "Recurse",
+      "HelpText": "Determines whether or not the step should look through the items in `Path` recursively.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "fd64a155-abe9-483e-b954-e182fbb777b0",
+      "Name": "TreatAsError",
+      "Label": "Treat as an error?",
+      "HelpText": "Determines if the step will cause the build to fail or issue a warning. By default it will only warn of a problem.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-09-14T10:40:15.4300000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-09-14T10:40:15.4300000Z",
+    "OctopusVersion": "2021.2.7428",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/variables-find-unreplaced/scriptbody.ps1 b/src/step-templates/variables-find-unreplaced/scriptbody.ps1
new file mode 100644
index 000000000..729666ef7
--- /dev/null
+++ b/src/step-templates/variables-find-unreplaced/scriptbody.ps1
@@ -0,0 +1,92 @@
+function Find-Unreplaced {
+    <#
+    .SYNOPSIS
+        Looks for Octopus Deploy variables
+    .DESCRIPTION
+        Analyses `Web/App.Release.configs`, etc... looking for Octopus Deploy 
+        variables that have not been replaced.
+    .EXAMPLE
+        Find-Unreplaced C:\Folder *.config, *.ps1 
+    .PARAMETER Path
+        Root folder to search in
+    .PARAMETER Files
+        An array of all the files or globs to search in. Defaults to *.config
+    .PARAMETER Exclude
+        Files to ignore
+    .PARAMETER Recurse
+        Should the cmdlet look for the file types recursively
+    .PARAMETER TreatAsError
+        Will cause the script to write an Error instead of a warning if variables are found
+    #>
+    [CmdletBinding()]
+    param 
+    (
+        [Parameter(
+            Position=0,
+            Mandatory=$true,
+            ValueFromPipeline=$True)]
+        [string] $Path,
+        
+        [Parameter(
+            Position=1,
+            Mandatory=$false)]
+        [string[]] $Files = @('*.config'),
+        
+        [Parameter(Mandatory=$false)]
+        [string[]] $Exclude,
+        
+        [Parameter(Mandatory=$false)]
+        [switch] $Recurse,
+        
+        [Parameter(Mandatory=$false)]
+        [switch] $TreatAsError
+    )
+
+    process {
+        Write-Host "Searching for files in '$Path'"
+        if (-not (Test-Path $Path -PathType container)) {
+            Write-Error "The path '$Path' does not exist or is not a folder."
+            return
+        }
+        
+        if (-not $Recurse) {
+            # For some reason, a splat is required when not recursing
+            if ($Path.EndsWith("\")) { $Path += "*" } else { $Path += "\*" }
+        }
+
+        $clean = $true
+
+        $found = Get-ChildItem -Path $Path -Recurse:$Recurse -Include $Files -Exclude $Exclude -File
+        foreach ($file in $found) {
+            Write-Host "Found '$file'.`nSearching for Octopus variables..." -NoNewline
+            $matches = Select-String -Path $file -Pattern "#\{([^}]*)\}" -AllMatches
+            $clean = $clean -and ($matches.Count -eq 0)
+            if ($clean) {
+                Write-Host "clean"
+            } else {
+                Write-Host "done`n$matches"
+            }
+        }
+
+        if (-not $clean) {
+            $msg = "Unreplaced Octopus Variables were found."
+            if ($TreatAsError) {
+                Write-Error $msg
+            } else {
+                Write-Warning $msg
+            }
+        }
+    }
+}
+
+if (-not $Path) { throw "A Path must be specified" }
+if (-not $Files) { throw "At least one File must be specified" }
+
+$spPaths = $Path -split "`n" | Foreach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrEmpty($_) }
+$spFiles = $Files -split ";" | Foreach-Object { $_.Trim() } 
+$spExcludes = $Exclude -split ";" | Foreach-Object { $_.Trim() } 
+$bRecurse = $Recurse -eq 'True'
+$bTreatAsError = $TreatAsError -eq 'True'
+
+$spPaths | Find-Unreplaced -Files $spFiles -Exclude $spExcludes -Recurse:$bRecurse -TreatAsError:$bTreatAsError
+
diff --git a/src/step-templates/variables-substitute-in-files/metadata.json b/src/step-templates/variables-substitute-in-files/metadata.json
new file mode 100644
index 000000000..892c6661e
--- /dev/null
+++ b/src/step-templates/variables-substitute-in-files/metadata.json
@@ -0,0 +1,78 @@
+{
+  "Id": "a3078bc0-0615-4220-84e8-bb1f271a90f9",
+  "Name": "Variables - Substitute in Files",
+  "Description": "This step template attempts to replace Octopus variable placeholders in one or more file(s) with their values from the `$OctopusParameters` Dictionary.\n\n---\n\n### Version 18+:\n\nVersion 18 and higher pins the version of Octostache and Sprache (an Octostache dependency) to the following versions:\n- Octostache: [version 3.2.1](https://www.nuget.org/packages/Octostache/3.2.1)\n- Sprache: [version 2.3.1](https://www.nuget.org/packages/Sprache/2.3.1)\n\nThis is to resolve issues when running the step template on Windows, where the .NET 4.0 (`net40`) version is no longer present in newer versions of these libraries.\n\n**As a result, no new functionality available in Octostache, such as new commands/functions, will be present**\n\nIf you need later functionality, use the built-in Octopus [variable substitution feature](https://octopus.com/docs/projects/variables/variable-substitutions).\n\n### Breaking Change - version 15+:\n\nPrevious versions of this step template would attempt to find the Octostache library bundled with [Calamari](https://github.com/OctopusDeploy/Calamari) as part of a deployment or runbook. Due to compatibility issues running the `netstandard` version of Octostache bundled with newer versions of Calamari on Windows PowerShell, **this functionality has now been removed**.\n\nAs a result, **version 15** and higher of this step template now look for Octostache on the deployment target or worker in the NuGet cache. If it's not found, it will attempt to download two required binaries:\n\n1. Octostache from [nuget.org](https://www.nuget.org/packages/Octostache)\n1. Sprache (an Octostache dependency) from [nuget.org](https://www.nuget.org/packages/Sprache)\n\nIf access to [nuget.org](https://www.nuget.org) is restricted on your deployment target or worker, this step template may fail to execute successfully.\n\nIn that case, it's recommended to use the built-in Octopus [variable substitution feature](https://octopus.com/docs/projects/variables/variable-substitutions).\n\n---\n\n### Notes:\n\n- Tested on Windows PowerShell only running Octopus **2023.2.4954**.\n",
+  "ActionType": "Octopus.Script",
+  "Version": 19,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Name": "Path",
+      "Label": "Path",
+      "HelpText": "Specifies a path to one or more locations. Wildcards are permitted. The default location is the current directory (.).",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Filter",
+      "Label": "Filter",
+      "HelpText": "Specifies, as a string array, a filter for an item or items that are included in the operation. Wildcards are permitted.",
+      "DefaultValue": "*.config",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Include",
+      "Label": "Include",
+      "HelpText": "Specifies, as a string array, an item or items that are included in the operation. Enter a path element or pattern, such as *.txt. Wildcards are permitted. Leave this empty if you have specified a Filter.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "Exclude",
+      "Label": "Exclude",
+      "HelpText": "Specifies, as a string array, an item or items that are excluded in the operation. Enter a path element or pattern, such as *.txt. Wildcards are permitted. Leave this empty if you have specified a Filter.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "Recurse",
+      "Label": "Recurse",
+      "HelpText": "Search the specified locations and in all sub-directories of those locations.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "Variables.SubstituteInFiles.OctostacheLocation",
+      "Label": "Octostache library location",
+      "HelpText": "*Optional* - Provide the location that contains both of the required  `Octostache.dll` and `Sprache.dll` libraries. \n\n- *If this value is not provided, the libraries will be searched for on the target or worker, and if not found will be downloaded from [nuget.org](https://www.nuget.org).*\n- If more than one matching file is found, the first one will be used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2023-04-04T10:37:47.2700000Z",
+  "LastModifiedBy": "twerthi",
+  "$Meta": {
+    "ExportedAt": "2024-02-05T21:47:52.0630000Z",
+    "OctopusVersion": "2023.4.8290",
+    "Type": "ActionTemplate"
+  },
+  "Category": "octopus"
+}
diff --git a/src/step-templates/variables-substitute-in-files/scriptbody.ps1 b/src/step-templates/variables-substitute-in-files/scriptbody.ps1
new file mode 100644
index 000000000..309b3ebe5
--- /dev/null
+++ b/src/step-templates/variables-substitute-in-files/scriptbody.ps1
@@ -0,0 +1,183 @@
+$ErrorActionPreference = "Stop";
+function Get-Exceptions {
+    param ($ExceptionObject)
+    
+    if ($null -ne $ExceptionObject.InnerException) {
+        Get-Exceptions -ExceptionObject $ExceptionObject.InnerException
+    }
+    
+    Write-Warning "Exception is: $($ExceptionObject.Message)"
+}
+
+function Resolve-OctopusVariablesInTemplate {
+    <#
+.SYNOPSIS
+	Resolves Octopus variables in files with their values from a OctopusParameters
+
+.DESCRIPTION
+	Looks for files using Get-ChildItem and in each of the files replaces ${Variable} with the value from $OctopusParameters.
+	Files are written back using UTF-8.
+	Requires PowerShell 3.0 or higher.
+
+.PARAMETER Path
+	Passed to Get-ChildItem to find the files you want to process
+
+.PARAMETER Filter
+	Passed to Get-ChildItem to find the files you want to process
+
+.PARAMETER Include
+	Passed to Get-ChildItem to find the files you want to process
+
+.PARAMETER Exclude
+	Passed to Get-ChildItem to find the files you want to process
+	
+.PARAMETER Recurse
+	Passed to Get-ChildItem to find the files you want to process
+
+#>
+    Param(
+        [string]$Path,
+        [string]$Filter = "*.config",
+        [string[]]$Include,
+        [string[]]$Exclude,
+        [switch]$Recurse,
+        [string]$OctostacheLocation
+    )
+	
+    if (-not $OctopusParameters) { throw "No OctopusParameters found" }
+	
+    Write-Output "Tentacle Version: $env:TentacleVersion"
+    Write-Output "PowerShell version..."
+    Write-Output $PSVersionTable
+    Write-Output "Path = $Path"
+	
+    Write-Output "Getting target files..."
+    $TargetFiles = Get-ChildItem -File -Path $Path -Filter $Filter -Include $Include -Exclude $Exclude -Recurse:$Recurse
+    if ($TargetFiles.Count -eq 0) {
+        Write-Warning "`tDid not find any files to process!"
+        return
+    }
+    else {
+        Write-Output "`tFound $($TargetFiles.Count) file(s)"
+    }
+	
+    Import-Octostache -OctostacheLocation $OctostacheLocation
+
+    foreach ($File in $TargetFiles) {
+        Resolve-VariablesUsingOctostache $File.FullName
+    }        
+}
+
+
+function Import-Octostache {
+    Param(
+        [string]$OctostacheLocation
+    )
+    
+    $OctostachePath = $null
+    $SprachePath = $null
+    
+    Write-Output "Searching for installed version of Octostache."
+    if (-not [string]::IsNullOrWhiteSpace($OctostacheLocation)) {
+        if (-not (Test-Path $OctostacheLocation)) {
+            Write-Error "Octostache path: $OctostacheLocation doesnt exist."
+            Exit 1
+        }
+        Write-Verbose "Searching in $OctostacheLocation for Octostache.dll"
+        $OctostacheLibraryLocations = Get-ChildItem -File -Path $OctostacheLocation -Filter "OctoStache.dll" -Recurse
+        $OctostachePath = ($OctostacheLibraryLocations | Select-Object -First 1).FullName
+        Write-Verbose "Searching in $OctostacheLocation for Sprache.dll"
+        $SpracheLibraryLocations = Get-ChildItem -File -Path $OctostacheLocation -Filter "Sprache.dll" -Recurse
+        $SprachePath = ($SpracheLibraryLocations | Select-Object -First 1).FullName
+    }
+    else {
+        try {
+            $OctostachePackage = (Get-Package Octostache -ErrorAction Stop) | Select-Object -First 1
+        } 
+        catch {
+            $OctostachePackage = $null
+        }
+
+        if ($null -eq $OctostachePackage) {
+            Write-Output "Downloading Octostache (v3.2.1) from nuget.org."
+            Install-Package Octostache -MaximumVersion "3.2.1" -source https://www.nuget.org/api/v2 -Force -SkipDependencies
+            $OctostachePackage = (Get-Package Octostache) | Select-Object -First 1
+        }
+    
+        $OctostachePath = Join-Path (Get-Item $OctostachePackage.source).Directory.FullName "lib/net40/Octostache.dll"
+
+        try {
+            $SprachePackage = (Get-Package Sprache -ErrorAction Stop) | Select-Object -First 1
+        } 
+        catch {
+            $SprachePackage = $null
+        }
+
+        if ($null -eq $SprachePackage) {
+            Write-Output "Downloading Sprache (v2.3.1) from nuget.org."
+            Install-Package Sprache -MaximumVersion "2.3.1" -source https://www.nuget.org/api/v2 -Force -SkipDependencies
+            $SprachePackage = @(Get-Package Sprache) | Select-Object -First 1
+        }
+
+        $SprachePath = Join-Path (Get-Item $SprachePackage.source).Directory.FullName "lib/net40/Sprache.dll"
+    }
+
+    Write-Verbose "Octostache path: $OctostachePath"
+    Write-Verbose "Sprache path: $SprachePath"
+
+    if ([string]::IsNullOrWhiteSpace($OctostachePath) -or [string]::IsNullOrWhiteSpace($SprachePath)) {
+        Write-Error "Couldnt locate either the Octostache or Sprache library."
+        Exit 1
+    }
+
+    Write-Output "Adding type $SprachePath"
+    Add-Type -Path $SprachePath
+
+    Write-Output "Adding type $OctostachePath"
+    Add-Type -Path $OctostachePath
+}
+
+function Resolve-VariablesUsingOctostache {
+    Param(
+        [string]$TemplateFile
+    )
+		
+    Write-Output "Loading template file $TemplateFile..."
+    $TemplateContent = Get-Content -Raw $TemplateFile
+    Write-Output "`tRead $($TemplateContent.Length) bytes"
+	
+    $Dictionary = New-Object -TypeName Octostache.VariableDictionary
+	
+    # Load the hastable into the dictionary
+    Write-Output "Loading `$OctopusParameters..."
+    foreach ($Variable in $OctopusParameters.GetEnumerator()) {
+        Write-Verbose "#{$($Variable.Key)} = $($Variable.Value)"
+        $Dictionary.Set($Variable.Key, $Variable.Value)
+    }
+	
+    Write-Output "Resolving variables..."
+    
+    try {
+        $EvaluatedTemplate = $Dictionary.Evaluate($TemplateContent)
+    }
+    catch {
+        Get-Exceptions -ExceptionObject $Error.Exception
+        throw
+    }
+	
+    Write-Output "Writing the resolved template to $($TemplateFile) (UTF8 encoding)"
+    #$EvaluatedTemplate | Out-File $TemplateFile -Force	-Encoding UTF8
+    $EvaluatedTemplate -join "rn" | Set-Content $TemplateFile -NoNewLine -Encoding UTF8 -Force
+    Write-Output "Done!"
+}
+
+$FunctionParameters = @{}
+
+if ($null -ne $OctopusParameters['Path']) { $FunctionParameters.Add('Path', $OctopusParameters['Path']) }
+if ($null -ne $OctopusParameters['Filter']) { $FunctionParameters.Add('Filter', $OctopusParameters['Filter']) }
+if ($null -ne $OctopusParameters['Include']) { $FunctionParameters.Add('Include', $($OctopusParameters['Include'] -split "`n")) }
+if ($null -ne $OctopusParameters['Exclude']) { $FunctionParameters.Add('Exclude', $($OctopusParameters['Exclude'] -split "`n")) }
+if ($null -ne $OctopusParameters['Recurse']) { $FunctionParameters.Add('Recurse', [System.Convert]::ToBoolean($OctopusParameters['Recurse'])) }
+if (-not [string]::IsNullOrWhiteSpace($OctopusParameters['Variables.SubstituteInFiles.OctostacheLocation'])) { $FunctionParameters.Add('OctostacheLocation', $OctopusParameters['Variables.SubstituteInFiles.OctostacheLocation']) }
+
+Resolve-OctopusVariablesInTemplate @FunctionParameters
\ No newline at end of file
diff --git a/src/step-templates/variables-substitute-in-json-file/metadata.json b/src/step-templates/variables-substitute-in-json-file/metadata.json
new file mode 100644
index 000000000..08f9eb88f
--- /dev/null
+++ b/src/step-templates/variables-substitute-in-json-file/metadata.json
@@ -0,0 +1,30 @@
+{
+  "Id": "9E85B3EB-7C19-4F3A-9E9E-71923198EE09",
+  "Name": "Variables - Substitute in Json file",
+  "Description": "Use this step template after the Deploy API step template to substitute variables in a target json file like appsettings.json with Octopus scoped variables. Currently supported data types are string, boolean, interger, decimal and non-empty string arrays and can replace these types inside nested types as well as long as you name them like prop:subprop:subsubprop (like AppMetrics:GlobalTags:env) in octopus like we do today...this should be enough for most of the needs for files like appsettings.json",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "JsonFilePath",
+      "Label": "Path to the json file",
+      "HelpText": "For example if your appsettings.json file is in \nc:\\web\\site1\\appsettings.json then set this value to\n**c:\\web\\site1\\appsettings.json**. You can use Octopus \nvariables here like \n**#{Deployment_InstallationPath}\\\\#{Octopus.Release.Number}\\appsettings.json** as the value of this variable. A good idea is to copy the value from the Install to variable in the Deploy API step template and add \\appsettings.json if that is your target json file",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "mysterio2465",
+  "$Meta": {
+    "ExportedAt": "2017-05-29T11:51:18.3100000Z",
+    "OctopusVersion": "3.2.11",
+    "Type": "ActionTemplate"
+  },
+  "Category": "Octopus"
+}
diff --git a/src/step-templates/variables-substitute-in-json-file/scriptbody.ps1 b/src/step-templates/variables-substitute-in-json-file/scriptbody.ps1
new file mode 100644
index 000000000..08c689108
--- /dev/null
+++ b/src/step-templates/variables-substitute-in-json-file/scriptbody.ps1
@@ -0,0 +1,139 @@
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue    
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+$ErrorActionPreference = "Stop"
+
+function UpdateJsonFile ([hashtable]$variables, [string]$fullpath) {
+    Write-Host 'Starting the json file variable substitution' $variables.Count
+    if ($variables -eq $null) {
+        throw "Missing parameter value $variables"
+    }
+
+	$pathExists = Test-Path $fullpath
+	if(!$pathExists) {
+		Write-Host 'ERROR: Path '$fullpath ' does not exist'
+		Exit 1
+	}
+
+	$json = Get-Content $fullpath -Raw | ConvertFrom-Json
+    Write-Host 'Json content read from file'
+
+	foreach($variable in $variables.GetEnumerator()) {
+		$key = $variable.Key
+        Write-Host 'Processing' $key
+        $keys = $key.Split(':')
+		$sub = $json
+		$pre = $json
+		$found = $true
+		$lastKey = ''
+		foreach($k in $keys) {
+			if($sub | Get-Member -name $k -Membertype Properties){
+				$pre = $sub
+				$sub = $sub.$k
+			}
+			else
+			{
+				$found = $false
+				break
+			}
+
+			$lastKey = $k
+		}
+
+		if($found) {
+            Write-Host $key 'found in Json content'
+            if($pre.$lastKey -eq $null) {
+                Write-Host $key 'is null in the original source json...values CANNOT be null on the source json file...exiting with 1'
+                Exit 1
+            }
+
+			$typeName = $pre.$lastKey.GetType().Name
+			[bool]$b = $true
+			[int]$i = 0
+			[decimal]$d = 0.0
+			if($typeName -eq 'String'){
+				$pre.$lastKey = $variable.Value
+			}
+			elseif($typeName -eq 'Boolean' -and [bool]::TryParse($variable.Value, [ref]$b)) {
+				$pre.$lastKey = $b
+			}
+			elseif($typeName -eq 'Int32' -and [int]::TryParse($variable.Value, [ref]$i)){
+				$pre.$lastKey = $i
+			}
+			elseif($typeName -eq 'Decimal' -and [decimal]::TryParse($variable.Value, [ref]$d)){
+				$pre.$lastKey = $d
+			}
+			elseif($typeName -eq 'Object[]') {
+                if($pre.$lastKey.Length -ne 0 -and $pre.$lastKey[0].GetType().Name -eq 'String') {
+				    $pre.$lastKey = $variable.Value.TrimStart('[').TrimEnd(']').Split(',')
+                }
+                else {
+                    Write-Host 'ERROR: Cannot handle ' $key ' with type ' $typeName 
+				    'Only nonempty string arrays are supported at the moment meaning that it has to be a 
+				    string array with atleast one element in it in the original source appsettings.json 
+				    file...Skipping update and exiting with 1'
+				    Exit 1
+                }
+			}
+			else {
+				Write-Host 'ERROR: Cannot handle ' $key ' with type ' $typeName 
+				'Only string, boolean, interger, decimal and non-empty string arrays are supported at the moment
+                ...Skipping update and exiting with 1'
+				Exit 1
+			}
+
+            Write-Host $key 'updated in json content with value' $pre.$lastKey 
+
+		}
+        else {
+            Write-Host $key 'not found in Json content...skipping it'
+        }
+	}
+    
+	$json | ConvertTo-Json -depth 99 | Set-Content $fullpath
+
+    
+    Write-Host $fullpath 'file variables updated successfully...Done'
+}
+
+
+if($OctopusParameters -eq $null) {
+    Write-Host 'OctopusParameters is null...exiting with 1'
+    Exit 1    
+}
+
+function ConvertListToHashtable([object[]]$list) {
+    $h = @{}
+    foreach ($element in $list) {
+	    $h.Add($element.Key, $element.Value)
+    }
+    return $h
+}
+
+$oParams = $OctopusParameters.getenumerator() | where-object {$_.key -notlike "Octopus*" -and $_.key -notlike "env:*"}
+
+UpdateJsonFile `
+(ConvertListToHashtable $oParams) `
+(Get-Param "JsonFilePath" -Required)
diff --git a/src/step-templates/venafi-tpp-create-provision-certificate/metadata.json b/src/step-templates/venafi-tpp-create-provision-certificate/metadata.json
new file mode 100644
index 000000000..4e6de19ef
--- /dev/null
+++ b/src/step-templates/venafi-tpp-create-provision-certificate/metadata.json
@@ -0,0 +1,165 @@
+{
+  "Id": "dd4dfa66-e632-4c6a-bae6-156a7a105023",
+  "Name": "Venafi TPP - Create and Provision Certificate",
+  "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and create a new certificate as well as optionally associate and push the new certificate to specified existing application(s). This is achieved using a combination of two functions from the VenafiPS PowerShell module:\n\n1. `New-TppCertificate` which is an alias of the [New-VdcCertificate](https://venafips.readthedocs.io/en/latest/functions/New-VdcCertificate/) function.\n2. `Add-TppCertificateAssociation` which is an alias of the [Add-VdcCertificateAssociation](https://venafips.readthedocs.io/en/latest/functions/Add-VdcCertificateAssociation/) function.\n\n---\n\n**Options:**\n\n- Provide a distinguished name (DN) path for the new certificate.\n- Provide a name for the new certificate.\n- Provide a common name (CN) for the new certificate.\n- *Optional* - Provide the distinguished name (DN) path to a certificate authority template to be used for the new certificate.\n- *Optional* - Choose from the following certificate types:\n  - `Code Signing`\n  - `Device`\n  - `Server`\n  - `User`\n- *Optional* - Choose from the following certificate management types:\n  - `Enrollment`\n  - `Provisioning`\n  - `Monitoring`\n  - `Unassigned`\n- *Optional* - Provide subject alternate names for the new certificate using the following acceptable SAN types: \n  - `OtherName`\n  - `Email`\n  - `DNS`\n  - `URI`\n  - `IPAdress`\n- *Optional* - Choose if you would like the step to wait for the certificate to finishing provisioning before moving on.\n- *Optional* - Choose the maximum time in seconds that you would like the step to wait for provisioning to finish.\n- *Optional* - Provide the application(s) path to associate the new certificate to.\n- *Optional* - Choose to push the new certificate to the specified application(s).\n- *Optional* - Choose to revoke the access token used on successful completion.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.\n",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "28b7cc35-41dc-4759-afc0-3ee8ded24a4b",
+      "Name": "Venafi.TPP.CreateCert.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "*Required*: The URL of the Venafi TPP instance you want to create a certificate in.\n\nFor example : `https://mytppserver.example.com`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "58bf5279-d9a6-4129-81fc-9806a836e0a0",
+      "Name": "Venafi.TPP.CreateCert.AccessToken",
+      "Label": "Venafi TPP Access Token",
+      "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "52140bce-2c49-46df-9858-145183a76614",
+      "Name": "Venafi.TPP.CreateCert.DNPath",
+      "Label": "Venafi TPP Certificate Path",
+      "HelpText": "*Required*: The Distinguished Name (DN) of the certificate you wish to create. This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "caf96139-f59d-4d79-b076-7cba155e5da6",
+      "Name": "Venafi.TPP.CreateCert.Name",
+      "Label": "Certificate Name",
+      "HelpText": "*Required*: Name of the certificate to be created.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2dcab218-b4e3-4076-a05d-6d4b649fda80",
+      "Name": "Venafi.TPP.CreateCert.SubjectCN",
+      "Label": "Certificate Subject Common Name",
+      "HelpText": "*Required*: Subject common name (CN) of the certificate to be created. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "040d9226-c782-47d6-b085-977f43b3f0cc",
+      "Name": "Venafi.TPP.CreateCert.CertificateAuthorityDN",
+      "Label": "Venafi TPP Certificate Authority Path (Optional)",
+      "HelpText": "*Optional*: The Distinguished Name (DN) of the certificate authority you wish to use. This is the absolute path to a certificate authority template in the TPP instance, separated by `\\`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c8863e1f-0e3b-49a4-aafc-d765b103c89a",
+      "Name": "Venafi.TPP.CreateCert.Type",
+      "Label": "Venafi TPP Certificate Type (Optional)",
+      "HelpText": "*Optional*: Type of certificate to be created. Valid options are:\n\n- `Code Signing`\n- `Device`\n- `Server` (**Default**)\n- `User`",
+      "DefaultValue": "Server",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Code Signing|Code Signing\nDevice|Device\nServer|Server\nUser|User"
+      }
+    },
+    {
+      "Id": "53b52bb0-64cf-4d11-bc66-f9e22b54c2a0",
+      "Name": "Venafi.TPP.CreateCert.ManagementType",
+      "Label": "Venafi TPP Certificate Management Type (Optional)",
+      "HelpText": "*Optional*: The level of management that Trust Protection Platform applies to the certificate. Valid options are:\n\n- `Enrollment`: (**Default**) Issue a new certificate, renewed certificate, or key generation request to a CA for enrollment. Do not automatically provision the certificate. \n- `Provisioning`: Issue a new certificate, renewed certificate, or key generation request to a CA for enrollment. Automatically install or provision the certificate.\n- `Monitoring`: Allow Trust Protection Platform to monitor the certificate for expiration and renewal.\n- `Unassigned`: Certificates are neither enrolled or monitored by Trust Protection Platform.",
+      "DefaultValue": "Enrollment",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Enrollment|Enrollment\nProvisioning|Provisioning\nMonitoring|Monitoring\nUnassigned|Unassigned"
+      }
+    },
+    {
+      "Id": "a3306c46-a69d-4bdf-816b-0bac12276b6c",
+      "Name": "Venafi.TPP.CreateCert.SubjectAltNames",
+      "Label": "Venafi TPP Certificate Subject Alternate Names (Optional)",
+      "HelpText": "*Optional*: A list of Subject Alternate Names. The value must be 1 or more lines with the SAN type and value. Each SAN type needs to be separated by a `;`. Acceptable SAN types are `OtherName`, `Email`, `DNS`, `URI`, and `IPAddress`. You can provide more than 1 of the same SAN type with multiple lines.\n\n**For example**: \n```md\nDNS=octopus.local.samples;Email=octopus@email.com\nDNS=octopus.samples;IPAddress=0.0.0.0\n```",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "3014d2f1-789c-4640-91e1-ee7ddb5661e7",
+      "Name": "Venafi.TPP.CreateCert.ProvisioningWait",
+      "Label": "Wait for certificate provisioning?",
+      "HelpText": "If the new certificate has a management type of `Provisioning` should the step wait for the provisioning to complete?",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "88386d92-8536-4be4-8a8f-2f5fd8d3242b",
+      "Name": "Venafi.TPP.CreateCert.ProvisioningTimeout",
+      "Label": "Max wait time for certificate provisioning.",
+      "HelpText": "The max about of time in seconds you want the step to wait for the certificate to be provisioned.",
+      "DefaultValue": "600",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "e9e84efe-28e1-437c-9c79-845a59a7e89e",
+      "Name": "Venafi.TPP.CreateCert.ApplicationPath",
+      "Label": "Venafi TPP Application Path (Optional)",
+      "HelpText": "*Optional*: A comma separated list of application paths to associate with the new certificate. Each value in the list is the absolute path to an application in the TPP instance, separated by `\\`.\n\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3bfc02d2-4711-4a21-821d-9add5de603d7",
+      "Name": "Venafi.TPP.CreateCert.PushCertificate",
+      "Label": "Push certificate to associated application?",
+      "HelpText": "Push the newly created certificate to the applications",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "38eaa04c-6e4c-4d7d-b119-0631dfb7a490",
+      "Name": "Venafi.TPP.CreateCert.RevokeTokenOnCompletion",
+      "Label": "Revoke access token on completion?",
+      "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-23T21:42:40.3190000Z",
+    "OctopusVersion": "2021.1.7236",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "harrisonmeister",
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-create-provision-certificate/scriptbody.ps1 b/src/step-templates/venafi-tpp-create-provision-certificate/scriptbody.ps1
new file mode 100644
index 000000000..9bd29fe93
--- /dev/null
+++ b/src/step-templates/venafi-tpp-create-provision-certificate/scriptbody.ps1
@@ -0,0 +1,150 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+# Variables
+$Server = $OctopusParameters["Venafi.TPP.CreateCert.Server"]
+$Token = $OctopusParameters["Venafi.TPP.CreateCert.AccessToken"]
+$CertPath = $OctopusParameters["Venafi.TPP.CreateCert.DNPath"]
+$CertName = $OctopusParameters["Venafi.TPP.CreateCert.Name"]
+$CertCommonName = $OctopusParameters["Venafi.Tpp.CreateCert.SubjectCN"]
+# Optional
+$CertCAPath = $OctopusParameters["Venafi.Tpp.CreateCert.CertificateAuthorityDN"]
+$CertType = $OctopusParameters["Venafi.Tpp.CreateCert.Type"]
+$CertManagementType = $OctopusParameters["Venafi.Tpp.CreateCert.ManagementType"]
+$CertSubjectAltNames = $OctopusParameters["Venafi.Tpp.CreateCert.SubjectAltNames"]
+$CertProvisionWait = $OctopusParameters["Venafi.TPP.CreateCert.ProvisioningWait"]
+$CertProvisionTimeout = $OctopusParameters["Venafi.TPP.CreateCert.ProvisioningTimeout"]
+$ApplicationPath = $OctopusParameters["Venafi.TPP.CreateCert.ApplicationPath"]
+$ApplicationPush = $OctopusParameters["Venafi.TPP.CreateCert.PushCertificate"]
+$RevokeToken = $OctopusParameters["Venafi.TPP.CreateCert.RevokeTokenOnCompletion"]
+# Validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.CreateCert.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Token)) {
+    throw "Required parameter Venafi.TPP.CreateCert.AccessToken not specified"
+}
+if ([string]::IsNullOrWhiteSpace($CertPath)) {
+    throw "Required parameter Venafi.TPP.CreateCert.DNPath not specified"
+}
+if ([string]::IsNullOrWhiteSpace($CertName)) {
+    throw "Required parameter Venafi.TPP.CreateCert.Name not specified"
+}
+if ([string]::IsNullOrWhiteSpace($CertCommonName)) {
+    throw "Required parameter Venafi.TPP.CreateCert.SubjectCN not specified"
+}
+
+$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force
+[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential("token", $SecureToken)
+# Clean-up
+$Server = $Server.TrimEnd('/')
+# Required Modules
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+Write-Host "Requesting new session from $Server"
+New-VenafiSession -Server $Server -AccessToken $AccessToken
+# New certificate
+$NewCert_Params = @{
+    Path       = $CertPath;
+    Name       = $CertName;
+    CommonName = $CertCommonName
+}
+# Optional CertificateType field
+if (-not [string]::IsNullOrWhiteSpace($CertType)) {
+    $NewCert_Params.CertificateType = $CertType
+}
+# Optional CertificateAuthorityPath field
+if (-not [string]::IsNullOrWhiteSpace($CertCAPath)) {
+    $NewCert_Params.CertificateAuthorityPath = $CertCAPath
+}
+# Optional ManagementType field
+if (-not [string]::IsNullOrWhiteSpace($CertManagementType)) {
+    $NewCert_Params.ManagementType = $CertManagementType
+}
+# Optional SubjectAltName field
+if (-not [string]::IsNullOrWhiteSpace($CertSubjectAltNames)) {
+    $SubjectAltNames = @()
+    $SubjectAltNameStrings = $CertSubjectAltNames -split "`n"
+    foreach ($SubjectAltNameString in $SubjectAltNameStrings) {
+        if (-not [string]::IsNullOrWhiteSpace($SubjectAltNameString)) {
+            $ReplacedString = $SubjectAltNameString.Trim().Replace(";", "`n")
+            $StringAsHash = $ReplacedString | ConvertFrom-StringData
+            $SubjectAltNames += $StringAsHash
+        }
+    }
+    $NewCert_Params.SubjectAltName = $SubjectAltNames
+}
+# Generate New Certificate
+Write-Host "Creating certificate '$CertName' ($CertPath)..."
+$NewCertificate = New-TppCertificate @NewCert_Params -PassThru
+$count = 0
+$Continue = $True
+# Wait for certificate provisioning
+if ($CertProvisionWait -eq $true -and $CertManagementType -eq "Provisioning") {
+    $EndWait = (Get-Date).AddSeconds($CertProvisionTimeout)
+    do {
+        if ($count -gt 0) { 
+            Write-Host "Waiting 30 seconds for certificate to provision..."
+            Start-Sleep -Seconds 30
+        }
+        $count++
+        Write-Host "Checking certificate provisioning status."
+        $CertDetails = Get-VenafiCertificate -CertificateId $NewCertificate.Path
+        Write-Verbose "ProcessingDetails: $($CertDetails.ProcessingDetails)"
+        if (-not "$($CertDetails.ProcessingDetails)") {
+            $Continue = $False
+            Write-Host "Successful certificate provisioning detected."
+        }
+        elseif ($CertDetails.ProcessingDetails.InError -eq $True -or $CertDetails.ProcessingDetails.Status -eq "Failure") {
+            $Continue = $False
+            Write-Error "Certificate failed to provision at Stage: $($CertDetails.ProcessingDetails.Stage), Status: $($CertDetails.ProcessingDetails.Status)"
+        }
+    } until ($Continue -eq $False -or (Get-Date) -ge $EndWait)
+}
+# Associate Certificate with application
+if (-not [string]::IsNullOrWhiteSpace($ApplicationPath)) {
+    $ApplicationPathArray = @()
+    if ($ApplicationPath.Contains(",")) {
+        $ApplicationPathArray = $ApplicationPath.Split(",")
+    }
+    else {
+        $ApplicationPathArray += $ApplicationPath
+    }
+
+    if ($CertProvisionWait -eq $false) {
+    	Write-Warning "Associating the certificate $CertName with  application(s) at path(s) ($ApplicationPath) may be ongoing as waiting for provisioning is set to False. This could result in a failed association."
+    }
+
+    if ($ApplicationPush -eq $true) {
+        Write-Host "Associating and pushing certificate to application at $ApplicationPath"
+        Add-TppCertificateAssociation -CertificatePath $NewCertificate.Path -ApplicationPath $ApplicationPathArray -PushCertificate
+    }
+    else {
+        Write-Host "Associating certificate to application at $ApplicationPath"
+        Add-TppCertificateAssociation -CertificatePath $NewCertificate.Path -ApplicationPath $ApplicationPathArray
+    }
+}
+if ($RevokeToken -eq $true) {
+    # Revoke TPP access token
+    Write-Host "Revoking access token with $Server"
+    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force
+}
\ No newline at end of file
diff --git a/src/step-templates/venafi-tpp-export-certificate/metadata.json b/src/step-templates/venafi-tpp-export-certificate/metadata.json
new file mode 100644
index 000000000..4f23c39cb
--- /dev/null
+++ b/src/step-templates/venafi-tpp-export-certificate/metadata.json
@@ -0,0 +1,145 @@
+{
+  "Id": "2417aab5-6d84-4e0d-bc86-b2255bd4028a",
+  "Name": "Venafi TPP - Export Certificate",
+  "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and export a certificate using its Distinguished Name (DN). This is the absolute path to the certificate in the TPP instance.\n\nThis is achieved using the VenafiPS PowerShell module's [Export-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Export-VenafiCertificate/) function.\n\n---\n\n**Options:**\n\n- Provide the distinguished name (DN) path to the certificate.\n- Choose from the following export formats:\n  - `Base64`\n  - `Base64 (PKCS #8)`\n  - `DER`\n  - `JKS`\n  - `PKCS #7`\n  - `PKCS #12` \n- *Optional* - Provide a custom output path.\n- *Optional* - Provide a custom output filename. If not supplied, the filename will automatically be taken from the response.\n- *Optional* - Include the full certificate chain in the export.\n- *Optional* - Friendly name (Label or alias) to use. Permitted with `Base64` and `PKCS #12` formats. Required when format is `JKS`.\n- *Optional* - Include the private key in the export.\n- *Optional* - Provide a password to be used for the exported private key.\n- *Optional* - store the export certificate response in `JSON` format in an [Octopus sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables). This output variable can then be used in additional deployment or runbook steps.\n- *Optional* - on successful completion, you can revoke the access token used.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n- PowerShell `5` or greater.\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "56ef4967-37f5-40a0-a66e-f3fa589b6467",
+      "Name": "Venafi.TPP.ExportCert.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "*Required*: The URL of the Venafi TPP instance you want to export a certificate from.\n\nFor example: `https://mytppserver.example.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "49bcdbbb-3674-4901-8bf6-164e5e4bc395",
+      "Name": "Venafi.TPP.ExportCert.AccessToken",
+      "Label": "Venafi TPP Access Token",
+      "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e3156852-4ba9-4dc0-8d39-5a93c52b1910",
+      "Name": "Venafi.TPP.ExportCert.DNPath",
+      "Label": "Venafi TPP Certificate Path",
+      "HelpText": "*Required*: The Distinguished Name (DN) of the certificate you wish to export. This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4f9f4d4b-d686-4d00-aa93-af35b7df320b",
+      "Name": "Venafi.TPP.ExportCert.Format",
+      "Label": "Certificate Export Format",
+      "HelpText": "*Required*: The certificate export format. Valid options are:\n\n- `Base64`\n- `Base64 (PKCS #8)`\n- `DER`\n- `JKS`\n- `PKCS #7`\n- `PKCS #12` ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Base64|Base64\nBase64 (PKCS #8)|Base64 (PKCS #8)\nDER|DER\nJKS|JKS\nPKCS #7|PKCS #7\nPKCS #12|PKCS #12"
+      }
+    },
+    {
+      "Id": "7f7dc0f5-275e-4d32-a758-c942c9535bbc",
+      "Name": "Venafi.TPP.ExportCert.OutPath",
+      "Label": "Certificate output folder (Optional)",
+      "HelpText": "*Optional*: The folder path to save the certificate to. The folder must exist if this value is specified.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "48df6311-3eba-49b6-8adb-03b7d9eac8b4",
+      "Name": "Venafi.TPP.ExportCert.OutFileName",
+      "Label": "Certificate output filename (Optional)",
+      "HelpText": "*Optional*: The filename to save the exported certificate as. This value is used when the `Venafi.TPP.ExportCert.OutPath` parameter is set. \n\nIf not specified, the TPP filename will be used.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "309d30de-79b6-4461-8a54-1698aedd5822",
+      "Name": "Venafi.TPP.ExportCert.IncludeChain",
+      "Label": "Include certificate chain (Optional)",
+      "HelpText": "*Optional*: Include the certificate chain with the exported certificate. Not supported with `DER` or `JKS` format. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "71fecac3-25c4-4161-9135-94815a485f03",
+      "Name": "Venafi.TPP.ExportCert.FriendlyName",
+      "Label": "Friendly Name (Optional)",
+      "HelpText": "*Optional*: Label or alias to use. Permitted with `Base64` and `PKCS #12` formats. Required when Format is `JKS`. ",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2aaedf1d-be93-4df4-856c-c69650db452a",
+      "Name": "Venafi.TPP.ExportCert.IncludePrivateKey",
+      "Label": "Include Private Key (Optional)",
+      "HelpText": "*Optional*: Include the private key in the certificate export. If this is selected, the `Venafi.TPP.Export.PrivateKeyPassword` must also be provided. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "2d168360-bcbf-4bdc-833d-a9c182e98a47",
+      "Name": "Venafi.TPP.ExportCert.PrivateKeyPassword",
+      "Label": "Private Key password (Optional)",
+      "HelpText": "*Optional*: The password required to include the private key. Not supported with `DER` or `PKCS #7` formats.  You must adhere to the following rules: \n\n- Password is at least 12 characters. \n- Comprised of at least three of the following: \n  - Uppercase alphabetic letters \n  - Lowercase alphabetic letters \n  - Numeric characters \n  - Special characters",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "84f92dd5-064b-47e5-bb11-3dd0faacfeb4",
+      "Name": "Venafi.TPP.ExportCert.OutputVariableName",
+      "Label": "Certificate output variable name (Optional)",
+      "HelpText": "*Optional*: Create an output variable with the certificate details returned from the export call. The certificate details will be stored in `JSON` format.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "606acdfe-641a-47f2-a4ea-56559477ea0c",
+      "Name": "Venafi.TPP.ExportCert.RevokeTokenOnCompletion",
+      "Label": "Revoke access token on completion?",
+      "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedAt": "2021-08-18T15:22:55.5510000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-08-18T15:22:55.5510000Z",
+    "OctopusVersion": "2021.3.1432",
+    "Type": "ActionTemplate"
+  },
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-export-certificate/scriptbody.ps1 b/src/step-templates/venafi-tpp-export-certificate/scriptbody.ps1
new file mode 100644
index 000000000..89b0058b7
--- /dev/null
+++ b/src/step-templates/venafi-tpp-export-certificate/scriptbody.ps1
@@ -0,0 +1,170 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$Server = $OctopusParameters["Venafi.TPP.ExportCert.Server"]
+$Token = $OctopusParameters["Venafi.TPP.ExportCert.AccessToken"]
+$Path = $OctopusParameters["Venafi.TPP.ExportCert.DNPath"]
+$Format = $OctopusParameters["Venafi.TPP.ExportCert.Format"]
+$OutPath = $OctopusParameters["Venafi.TPP.ExportCert.OutPath"]
+$OutFileName = $OctopusParameters["Venafi.TPP.ExportCert.OutFileName"]
+
+# Optional
+$IncludeChain = $OctopusParameters["Venafi.TPP.ExportCert.IncludeChain"]
+$FriendlyName = $OctopusParameters["Venafi.TPP.ExportCert.FriendlyName"]
+$IncludePrivateKey = $OctopusParameters["Venafi.TPP.ExportCert.IncludePrivateKey"]
+$PrivateKeyPassword = $OctopusParameters["Venafi.TPP.ExportCert.PrivateKeyPassword"]
+$OutputVariableName = $OctopusParameters["Venafi.TPP.ExportCert.OutputVariableName"]
+$RevokeToken = $OctopusParameters["Venafi.TPP.ExportCert.RevokeTokenOnCompletion"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.ExportCert.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Token)) {
+    throw "Required parameter Venafi.TPP.ExportCert.AccessToken not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Path)) {
+    throw "Required parameter Venafi.TPP.ExportCert.DNPath not specified"
+}
+else {
+    if ($Path.Contains("\") -eq $False) {
+        throw "At least one '\' is required for the Venafi.TPP.ExportCert.DNPath value"
+    }
+}
+if ([string]::IsNullOrWhiteSpace($Format)) {
+    throw "Required parameter Venafi.TPP.ExportCert.Format not specified"
+}
+else {
+    if ($Format -eq "JKS") {
+        if ([string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {
+            throw "Export format is JKS, and parameter Venafi.TPP.ExportCert.PrivateKeyPassword required but not set!"
+        }
+    }
+}
+# Conditional validation
+if (-not [string]::IsNullOrWhiteSpace($OutPath)) {
+    if (-not (Test-Path $OutPath -PathType Container)) {
+        throw "Optional parameter Venafi.TPP.ExportCert.OutPath specified but does not exist!"
+    }
+}
+if ($IncludePrivateKey -eq $True) {
+    if ([string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {
+        throw "IncludePrivateKey set to true, but parameter Venafi.TPP.ExportCert.PrivateKeyPassword not specified"
+    }
+}
+
+$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force
+[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential("token", $SecureToken)
+
+# Clean-up
+$Server = $Server.TrimEnd('/')
+
+# Required Modules
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+Write-Verbose "Venafi.TPP.ExportCert.Server: $Server"
+Write-Verbose "Venafi.TPP.ExportCert.AccessToken: ********"
+Write-Verbose "Venafi.TPP.ExportCert.DNPath: $Path"
+Write-Verbose "Venafi.TPP.ExportCert.Format: $Format"
+Write-Verbose "Venafi.TPP.ExportCert.OutPath: $OutPath"
+Write-Verbose "Venafi.TPP.ExportCert.OutFileName: $OutFileName"
+Write-Verbose "Venafi.TPP.ExportCert.IncludeChain: $IncludeChain"
+Write-Verbose "Venafi.TPP.ExportCert.FriendlyName: $FriendlyName"
+Write-Verbose "Venafi.TPP.ExportCert.IncludePrivateKey: $IncludePrivateKey"
+Write-Verbose "Venafi.TPP.ExportCert.PrivateKeyPassword: ********"
+Write-Verbose "Venafi.TPP.ExportCert.CertDetails.OutputVariableName: $OutputVariableName"
+Write-Verbose "Venafi.TPP.ExportCert.RevokeTokenOnCompletion: $RevokeTokenOnCompletion"
+Write-Verbose "Step Name: $StepName"
+
+Write-Host "Requesting new session from $Server"
+New-VenafiSession -Server $Server -AccessToken $AccessToken
+
+# Export certificate
+$ExportCert_Params = @{
+    CertificateId = $Path;
+    Format        = $Format;
+}
+
+# Optional IncludeChain field
+if ($IncludeChain -eq $True) {
+    if ($Format -eq "JKS") {
+        Write-Warning "The IncludeChain parameter is not supported with JKS export format, ignoring."
+    }
+    else {
+        $ExportCert_Params.IncludeChain = $True
+    }
+}
+
+# Optional FriendlyName field
+if (-not [string]::IsNullOrWhiteSpace($FriendlyName)) {
+    $ExportCert_Params.FriendlyName = $FriendlyName
+}
+
+if (-not [string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {
+    $SecurePrivateKeyPassword = ConvertTo-SecureString $PrivateKeyPassword -AsPlainText -Force
+    if ($Format -eq "JKS") {
+        $ExportCert_Params.KeystorePassword = $SecurePrivateKeyPassword      
+    }
+    elseif ($IncludePrivateKey -eq $True) {
+        $ExportCert_Params.PrivateKeyPassword = $SecurePrivateKeyPassword    
+        $ExportCert_Params.IncludePrivateKey = $True
+    }
+}
+
+$ExportCertificateResponse = ((Export-VenafiCertificate @ExportCert_Params) 6> $null)
+
+if ($null -eq $ExportCertificateResponse -or $null -eq $ExportCertificateResponse.CertificateData) {
+    Write-Warning "No certificate data returned for path: $Path`nCheck the path value represents a certificate, and not a folder."
+}
+else {
+    Write-Highlight "Successfully retrieved certificate data to export for path: $Path"
+    
+    if ([string]::IsNullOrWhiteSpace($OutPath) -eq $False) {
+        $Filename = $ExportCertificateResponse.Filename
+        if ([string]::IsNullOrWhiteSpace($OutFileName) -eq $False) {
+            $Filename = $OutFileName
+        }
+        $outFile = Join-Path -Path $OutPath -ChildPath ($Filename.Trim('"'))
+        $bytes = [Convert]::FromBase64String($ExportCertificateResponse.CertificateData)
+        [IO.File]::WriteAllBytes($outFile, $bytes)
+        Write-Host ('Saved {0} with format {1}' -f $outFile, $ExportCertificateResponse.Format)
+    }
+    if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {
+        $CertificateJson = $ExportCertificateResponse | ConvertTo-Json -Compress -Depth 10 
+        Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson -Sensitive
+        Write-Highlight "Created sensitive output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}"
+    }
+}
+
+if ($RevokeToken -eq $true) {
+    # Revoke TPP access token
+    Write-Host "Revoking access token with $Server"
+    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force
+}
\ No newline at end of file
diff --git a/src/step-templates/venafi-tpp-find-certificate-details/metadata.json b/src/step-templates/venafi-tpp-find-certificate-details/metadata.json
new file mode 100644
index 000000000..69fa7a372
--- /dev/null
+++ b/src/step-templates/venafi-tpp-find-certificate-details/metadata.json
@@ -0,0 +1,104 @@
+{
+  "Id": "91ea41ae-5b12-4854-8994-90c06ba4b7f1",
+  "Name": "Venafi TPP - Find Certificate details",
+  "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and find a matching certificate based on the certificate subject common name. This is achieved using a combination of two functions from the VenafiPS PowerShell module:\n\n1. [Find-TppCertificate](https://venafips.readthedocs.io/en/latest/functions/Find-TppCertificate/) function.\n2. [Get-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Get-VenafiCertificate/) function.\n\nIf multiple certificate matches are found, additional (optional) search criteria can be provided to further filter the results:\n\n- Certificate serial number\n- Full Issuer Distinguished Name (DN)\n- Expires before\n\nAfter any filtering is complete, if multiple matches are found, only the first certificate will be returned, and a warning will be logged that multiple matches were found.\n\nYou can also store the entire certificate result in `JSON` format in an [Octopus output variable](https://octopus.com/docs/projects/variables/output-variables)\n\nThis output variable can then be used in additional deployment or runbook steps.\n\nOn successful completion, you can also *optionally* revoke the access token used.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "cf0b3c21-9249-4aa9-bf19-1fffdaa58939",
+      "Name": "Venafi.TPP.FindCert.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "*Required*: The URL of the Venafi TPP instance you want to find a certificate from.\n\nFor example: `https://mytppserver.example.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "f0d9bb77-7980-45f5-97c6-eefe6ccb3398",
+      "Name": "Venafi.TPP.FindCert.AccessToken",
+      "Label": "Venafi TPP Access Token",
+      "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "0b7565f5-1ca1-4738-b13f-4b8a4ab99cf0",
+      "Name": "Venafi.TPP.FindCert.SubjectCN",
+      "Label": "Certificate Subject Common Name",
+      "HelpText": "*Required*: Enter the certificate subject common name (CN) to search for.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "44bb491d-1249-4893-a9fb-903daf2df6b4",
+      "Name": "Venafi.TPP.FindCert.SerialNumber",
+      "Label": "Certificate serial number (Optional)",
+      "HelpText": "*Optional*: In case of multiple certificates matched on the subject common name (CN), provide the certificate serial number to filter to a single certificate match.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fcac21e8-34b6-48c6-b40f-2448c0c598a5",
+      "Name": "Venafi.TPP.FindCert.Issuer",
+      "Label": "Certificate Issuer Distinguished Name (Optional)",
+      "HelpText": "*Optional*: In case of multiple certificates matched on the subject common name (CN), provide the full Issuer distinguished name (DN) to filter to a single certificate match. \n\nFor example: `CN=Example Root CA, O=Venafi,Inc., L=Salt Lake City, S=Utah, C=US`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "c15020cd-b722-49c2-89c2-a2a2349d41eb",
+      "Name": "Venafi.TPP.FindCert.ExpireBefore",
+      "Label": "Certificate Expires Before (Optional)",
+      "HelpText": "*Optional*: In case of multiple certificates matched on the subject common name (CN), provide the expires before date in the format `yyyy-MM-dd` e.g. `2021-08-15`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "19f60dd0-887e-4379-94b3-b3227b3073be",
+      "Name": "Venafi.TPP.FindCert.CertDetails.OutputVariableName",
+      "Label": "Certificate output variable name (Optional)",
+      "HelpText": "*Optional*: Create an output variable with the certificate details found from the search. The certificate details will be stored in `JSON` format.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "74dbacbe-6192-45e6-8a10-e714966c4150",
+      "Name": "Venafi.TPP.FindCert.RevokeTokenOnCompletion",
+      "Label": "Revoke access token on completion?",
+      "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedAt": "2021-08-16T09:51:20.8000000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-08-16T09:51:20.8000000Z",
+    "OctopusVersion": "2021.2.7207",
+    "Type": "ActionTemplate"
+  },
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-find-certificate-details/scriptbody.ps1 b/src/step-templates/venafi-tpp-find-certificate-details/scriptbody.ps1
new file mode 100644
index 000000000..12b28f24a
--- /dev/null
+++ b/src/step-templates/venafi-tpp-find-certificate-details/scriptbody.ps1
@@ -0,0 +1,132 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$Server = $OctopusParameters["Venafi.TPP.FindCert.Server"]
+$Token = $OctopusParameters["Venafi.TPP.FindCert.AccessToken"]
+$SubjectCommonName = $OctopusParameters["Venafi.TPP.FindCert.SubjectCN"]
+
+# Optional 
+$CertSerialNumber = $OctopusParameters["Venafi.TPP.FindCert.SerialNumber"]
+$Issuer = $OctopusParameters["Venafi.TPP.FindCert.Issuer"]
+$ExpireBefore = $OctopusParameters["Venafi.TPP.FindCert.ExpireBefore"]
+$OutputVariableName = $OctopusParameters["Venafi.TPP.FindCert.CertDetails.OutputVariableName"]
+$RevokeTokenOnCompletion = $OctopusParameters["Venafi.TPP.FindCert.RevokeTokenOnCompletion"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.FindCert.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Token)) {
+    throw "Required parameter Venafi.TPP.FindCert.AccessToken not specified"
+}
+if ([string]::IsNullOrWhiteSpace($SubjectCommonName)) {
+    throw "Required parameter Venafi.TPP.FindCert.SubjectCN not specified"
+}
+
+$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force
+[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential("token", $SecureToken)
+
+# Clean-up
+$Server = $Server.TrimEnd('/')
+
+# Required Modules
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+Write-Verbose "Venafi.TPP.FindCert.Server: $Server"
+Write-Verbose "Venafi.TPP.FindCert.AccessToken: ********"
+Write-Verbose "Venafi.TPP.FindCert.SubjectCN: $SubjectCommonName"
+Write-Verbose "Venafi.TPP.FindCert.SerialNumber: $CertSerialNumber"
+Write-Verbose "Venafi.TPP.FindCert.Issuer: $Issuer"
+Write-Verbose "Venafi.TPP.FindCert.ExpireBefore: $ExpireBefore"
+Write-Verbose "Venafi.TPP.FindCert.CertDetails.OutputVariableName: $OutputVariableName"
+Write-Verbose "Venafi.TPP.FindCert.RevokeTokenOnCompletion: $RevokeTokenOnCompletion"
+Write-Verbose "Step Name: $StepName"
+
+Write-Host "Requesting new session from $Server"
+New-VenafiSession -Server $Server -AccessToken $AccessToken
+
+$FindCert_Params = @{
+    First      = 5;
+    CommonName = $SubjectCommonName;
+}
+
+# Optional SerialNumber field
+if ([string]::IsNullOrWhiteSpace($CertSerialNumber) -eq $False) {
+    $FindCert_Params += @{ SerialNumber = $CertSerialNumber }
+}
+# Optional Issuer field
+if ([string]::IsNullOrWhiteSpace($Issuer) -eq $False) {
+    # Issuer DN should be the complete DN enclosed in double quotes. e.g. "CN=Example Root CA, O=Venafi,Inc., L=Salt Lake City, S=Utah, C=US"
+    # If a value DN already contains double quotes, the string should be enclosed in a second set of double quotes. 
+    if ($Issuer.StartsWith("`"") -or $Issuer.EndsWith("`"")) {
+        Write-Verbose "Removing double quotes from start and end of Issuer DN."
+        $Issuer = $Issuer.Trim("`"")
+    }
+    $FindCert_Params += @{ Issuer = "`"$Issuer`"" }
+}
+# Optional ExpireBefore field
+if ([string]::IsNullOrWhiteSpace($ExpireBefore) -eq $False) {
+    $FindCert_Params += @{ ExpireBefore = $ExpireBefore }
+}
+
+Write-Host "Searching for certificates matching Subject CN: $SubjectCommonName."
+$MatchingCertificates = @(Find-TppCertificate @FindCert_Params)
+$MatchingCount = $MatchingCertificates.Length
+if ($null -eq $MatchingCertificates -or $MatchingCount -eq 0) {
+    Write-Warning "No matching certificates found for Subject CN: $SubjectCommonName. Check any additional search criteria and try again."
+}
+else {
+    $MatchingCertificate = $MatchingCertificates | Select-Object -First 1
+    if ($MatchingCount -gt 1) {
+        Write-Warning "Multiple matching certificates found ($MatchingCount) for Subject CN: $SubjectCommonName, retrieving details for first match."
+    }
+    
+    Write-Highlight "Retrieving certificate details for Subject CN: $SubjectCommonName ($($MatchingCertificate.Path))"
+    $Certificate = Get-VenafiCertificate -CertificateId $MatchingCertificate.Path
+    if ($null -eq $Certificate) {
+        Write-Warning "No certificate details returned for Subject CN: $SubjectCommonName ($($MatchingCertificate.Path))"
+    }
+    else {
+        Write-Host "Retrieved certificate details for Subject CN: $SubjectCommonName ($($MatchingCertificate.Path))"
+        $Certificate | Format-List
+
+        if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {
+            $CertificateJson = $Certificate | ConvertTo-Json -Compress -Depth 10 
+            Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson
+            Write-Highlight "Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}"
+        }
+    }
+}
+
+if ($RevokeTokenOnCompletion -eq $True) {
+    # Revoke TPP access token
+    Write-Host "Revoking access token with $Server"
+    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force
+}
\ No newline at end of file
diff --git a/src/step-templates/venafi-tpp-generate-oauth-token/metadata.json b/src/step-templates/venafi-tpp-generate-oauth-token/metadata.json
new file mode 100644
index 000000000..26ba1b792
--- /dev/null
+++ b/src/step-templates/venafi-tpp-generate-oauth-token/metadata.json
@@ -0,0 +1,74 @@
+{
+  "Id": "7e6f7f03-260a-4b52-9377-66f1c69b77d8",
+  "Name": "Venafi TPP - Generate OAuth Token",
+  "Description": "This step template will authenticate against a Venafi TPP instance and generate an OAuth token for specified scope/privileges using the VenafiPS PowerShell module's `New-TppToken` (an alias of the [VdcToken](https://venafips.readthedocs.io/en/latest/functions/New-VdcToken/) function).\n\nThe following properties from the resulting OAuth token will be created as [Octopus sensitive variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables):\n\n- `access_token` created with the name `AccessToken`\n- `Expires` created with the name `AccessTokenExpires` in the format `yyyy-MM-ddTHH:mm:ss`\n- `refresh_token` created with the name `RefreshToken`\n- `refresh_until` created with the name `RefreshTokenExpires` in the format `yyyy-MM-ddTHH:mm:ss`. *Note: This value can be empty*.\n\nThese output variables can be used in additional deployment or runbook steps.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "7ca2062d-9153-4606-bbab-441c893f9739",
+      "Name": "Venafi.TPP.OAuthToken.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "The URL of the Venafi TPP instance you are connecting to.\n\nFor example: `https://mytppserver.example.com`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "57631dfd-965b-4bfa-9f34-5e9147cdb702",
+      "Name": "Venafi.TPP.OAuthToken.ClientID",
+      "Label": "Venafi Application ClientID",
+      "HelpText": "Application Id (also known as `ClientId`) configured in Venafi for token-based authentication.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "83bfad97-50d1-49b9-9d9b-dc2ba87d9281",
+      "Name": "Venafi.TPP.OAuthToken.Username",
+      "Label": "Venafi Username",
+      "HelpText": "Username to request API token.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "05280b11-3dd6-41d7-a970-2328478a4b52",
+      "Name": "Venafi.TPP.OAuthToken.Password",
+      "Label": "Venafi Password",
+      "HelpText": "Password to request API token.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "b7edd6a4-20bb-47fe-8181-42ca5af9adb2",
+      "Name": "Venafi.TPP.OAuthToken.Scope",
+      "Label": "Access token scope",
+      "HelpText": "Scopes and privilege restrictions for the access token. Scopes can include:\n\n- `agent`\n- `certificate`\n- `code signing`\n- `configuration`\n- `restricted`\n- `security`\n- `ssh`\n- `statistics`\n\nSee the [Venafi Auth SDK](https://docs.venafi.com/Docs/21.1/TopNav/Content/SDK/AuthSDK/t-SDKa-Setup-OAuth.php) for more info.\n\nMultiple values can be supplied separated by `;`. \n\nFor a privilege restriction of none or read, just use the scope as the value. For example, to include management of certificates and include ssh with no privilege restriction, use: `certificate:manage;ssh`.\n\nIf multiple values for the same scope are provided they will be concatenated, *unless* a value of no privilege is found. If that occurs, then the \"last entry\" wins.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedAt": "2024-04-10T17:28:31.3010000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2021-07-30T10:36:31.3010000Z",
+    "OctopusVersion": "2021.2.6775",
+    "Type": "ActionTemplate"
+  },
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-generate-oauth-token/scriptbody.ps1 b/src/step-templates/venafi-tpp-generate-oauth-token/scriptbody.ps1
new file mode 100644
index 000000000..40854cb29
--- /dev/null
+++ b/src/step-templates/venafi-tpp-generate-oauth-token/scriptbody.ps1
@@ -0,0 +1,114 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$Server = $OctopusParameters["Venafi.TPP.OAuthToken.Server"]
+$ClientID = $OctopusParameters["Venafi.TPP.OAuthToken.ClientID"]
+$Username = $OctopusParameters["Venafi.TPP.OAuthToken.Username"]
+$Password = $OctopusParameters["Venafi.TPP.OAuthToken.Password"]
+$Scopes = $OctopusParameters["Venafi.TPP.OAuthToken.Scope"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.OAuthToken.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($ClientID)) {
+    throw "Required parameter Venafi.TPP.OAuthToken.ClientID not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Username)) {
+    throw "Required parameter Venafi.TPP.OAuthToken.Username not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Password)) {
+    throw "Required parameter Venafi.TPP.OAuthToken.Password not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Scopes)) {
+    throw "Required parameter Venafi.TPP.OAuthToken.Scope not specified"
+}
+
+# Clean-up
+$Server = $Server.TrimEnd('/')
+
+# Required Modules
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+
+$AccessTokenScope = @{}
+
+$Scopes -Split ";" | ForEach-Object {
+    $Scope = ($_ -Split ":")
+    $Type = $Scope[0]
+    $Privileges = $null
+    
+    if ($Scope.Length -gt 1) {
+        $Privileges = $Scope[1].TrimEnd(",")
+    }
+    
+    if ($AccessTokenScope.ContainsKey($Type)) {
+        $CurrentPrivileges = $AccessTokenScope[$Type]
+        # If no privilege, set to $null
+        if ([string]::IsNullOrWhiteSpace($Privileges)) {
+            $AccessTokenScope[$Type] = $null
+        }
+        else {
+            $AccessTokenScope[$Type] = if ([string]::IsNullOrWhiteSpace($CurrentPrivileges)) { $Privileges } else { "$($CurrentPrivileges),$Privileges" }  
+        }
+    }
+    else {
+        $AccessTokenScope.Add($Type, $Privileges)
+    }
+}
+
+if ($AccessTokenScope.Keys.Count -lt 1) {
+    throw "No scopes could be determined!"
+}
+
+$scopeString = @($AccessTokenScope.GetEnumerator() | ForEach-Object { if ($_.Value) { '{0}:{1}' -f $_.Key, $_.Value } else { $_.Key } }) -join ';'
+
+# Get TPP access token
+[PSCredential]$Credential = New-Object System.Management.Automation.PSCredential ($Username, (ConvertTo-SecureString $Password -AsPlainText -Force))
+
+Write-Host "Requesting new OAuth token from: $Server for ClientId: $ClientID with scope '$scopeString' ..."
+$tppTokenResponse = New-TppToken -AuthServer $Server -ClientId $ClientID -Scope $AccessTokenScope -Credential $Credential
+
+$AccessToken = $tppTokenResponse.AccessToken.GetNetworkCredential().Password
+$Expiry = $tppTokenResponse.Expires.ToString("s")
+$RefreshToken = $tppTokenResponse.RefreshToken.GetNetworkCredential().Password
+$RefreshExpires = $tppTokenResponse.RefreshExpires
+
+# Refresh Expiry can be $null
+if ($null -ne $RefreshExpires) {
+    $RefreshExpires = $RefreshExpires.ToString("s")
+}
+
+Set-OctopusVariable -Name "AccessToken" -Value $AccessToken -Sensitive
+Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.AccessToken}"
+Set-OctopusVariable -Name "AccessTokenExpires" -Value $Expiry -Sensitive
+Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.AccessTokenExpires}"
+Set-OctopusVariable -Name "RefreshToken" -Value $RefreshToken -Sensitive
+Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.RefreshToken}"
+Set-OctopusVariable -Name "RefreshTokenExpires" -Value $RefreshExpires -Sensitive
+Write-Host "Created output variable: ##{Octopus.Action[$StepName].Output.RefreshTokenExpires}"
\ No newline at end of file
diff --git a/src/step-templates/venafi-tpp-import-certificate-into-octopus/metadata.json b/src/step-templates/venafi-tpp-import-certificate-into-octopus/metadata.json
new file mode 100644
index 000000000..cd7fec50c
--- /dev/null
+++ b/src/step-templates/venafi-tpp-import-certificate-into-octopus/metadata.json
@@ -0,0 +1,175 @@
+{
+  "Id": "e10820c2-ae6d-4030-8a8a-b73ed60a81fc",
+  "Name": "Venafi TPP - Import Certificate into Octopus",
+  "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, export a certificate by its Distinguished Name (DN), and then import the certificate into the Octopus certificate store.\n\nThe export is achieved using the VenafiPS PowerShell module's [Export-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Export-VenafiCertificate/) function.\n\n---\n\n**Export options:**\n\n- Provide the distinguished name (DN) path to the certificate.\n- Choose from the following export formats:\n  - `Base64`\n  - `Base64 (PKCS #8)`\n  - `DER`\n  - `PKCS #12` \n- *Optional* - Include the full certificate chain in the export.\n- *Optional* - Friendly name (Label or alias) to use. Permitted with `Base64` and `PKCS #12` formats. \n- *Optional* - Include the private key in the export. Not supported with `DER` format.\n- *Optional* - Provide a password to be used for the exported private key.\n- *Optional* - Also store the export certificate response in `JSON` format in an [Octopus sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables). This output variable can then be used in additional deployment or runbook steps.\n- *Optional* - on successful completion, you can revoke the access token used.\n\n---\n\n**Octopus Import options:**\n\n- Octopus URL\n- Octopus API Key\n- Octopus Space name\n- Certificate name\n- *Optional* - replace the existing certificate if it already exists\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n- PowerShell `5` or greater.\n- Octopus API key with permission to save the certificate.\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "56ef4967-37f5-40a0-a66e-f3fa589b6467",
+      "Name": "Venafi.TPP.ImportCert.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "*Required*: The URL of the Venafi TPP instance you want to export the certificate from.\n\nFor example: `https://mytppserver.example.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "49bcdbbb-3674-4901-8bf6-164e5e4bc395",
+      "Name": "Venafi.TPP.ImportCert.AccessToken",
+      "Label": "Venafi TPP Access Token",
+      "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "e3156852-4ba9-4dc0-8d39-5a93c52b1910",
+      "Name": "Venafi.TPP.ImportCert.DNPath",
+      "Label": "Venafi TPP Certificate Path",
+      "HelpText": "*Required*: The Distinguished Name (DN) of the certificate you wish to export. This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "4f9f4d4b-d686-4d00-aa93-af35b7df320b",
+      "Name": "Venafi.TPP.ImportCert.Format",
+      "Label": "Certificate Export Format",
+      "HelpText": "*Required*: The certificate export format. Valid options are:\n\n- `Base64`\n- `Base64 (PKCS #8)`\n- `DER`\n- `PKCS #12`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Base64|Base64\nBase64 (PKCS #8)|Base64 (PKCS #8)\nDER|DER\nPKCS #12|PKCS #12"
+      }
+    },
+    {
+      "Id": "309d30de-79b6-4461-8a54-1698aedd5822",
+      "Name": "Venafi.TPP.ImportCert.IncludeChain",
+      "Label": "Include certificate chain (Optional)",
+      "HelpText": "*Optional*: Include the certificate chain with the exported certificate. Not supported with `DER` format. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "71fecac3-25c4-4161-9135-94815a485f03",
+      "Name": "Venafi.TPP.ImportCert.FriendlyName",
+      "Label": "Friendly Name (Optional)",
+      "HelpText": "*Optional*: Label or alias to use. Permitted with `Base64` and `PKCS #12` formats.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2aaedf1d-be93-4df4-856c-c69650db452a",
+      "Name": "Venafi.TPP.ImportCert.IncludePrivateKey",
+      "Label": "Include Private Key (Optional)",
+      "HelpText": "*Optional*: Include the private key in the certificate export. If this is selected, the `Venafi.TPP.Export.PrivateKeyPassword` must also be provided. Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "2d168360-bcbf-4bdc-833d-a9c182e98a47",
+      "Name": "Venafi.TPP.ImportCert.PrivateKeyPassword",
+      "Label": "Private Key password (Optional)",
+      "HelpText": "*Optional*: The password required to include the private key. Not supported with `DER` format.  You must adhere to the following rules: \n\n- Password is at least 12 characters. \n- Comprised of at least three of the following: \n  - Uppercase alphabetic letters \n  - Lowercase alphabetic letters \n  - Numeric characters \n  - Special characters",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "84f92dd5-064b-47e5-bb11-3dd0faacfeb4",
+      "Name": "Venafi.TPP.ImportCert.OutputVariableName",
+      "Label": "Certificate output variable name (Optional)",
+      "HelpText": "*Optional*: Create an output variable with the certificate details returned from the export call. The certificate details will be stored in `JSON` format.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "606acdfe-641a-47f2-a4ea-56559477ea0c",
+      "Name": "Venafi.TPP.ImportCert.RevokeTokenOnCompletion",
+      "Label": "Revoke access token on completion?",
+      "HelpText": "*Optional*: Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "7813080c-d6d6-4bd1-8c38-d6d03921f541",
+      "Name": "Venafi.TPP.ImportCert.OctopusServerUri",
+      "Label": "Octopus Server Url",
+      "HelpText": "*Required*: Provide the base URL of your Octopus Server. There are two built-in Octopus variables you can use:\n\n- `#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}`\n- `Octopus.Web.ServerUri`\n\nSee our [system variables](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server) page for further details.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "5be3cf08-43ef-44a3-bd89-3ec3b4928b01",
+      "Name": "Venafi.TPP.ImportCert.OctopusApiKey",
+      "Label": "Octopus API Key",
+      "HelpText": "*Required*: Provide an Octopus API Key with appropriate permissions to save the certificate.\n",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "d901f398-a035-4ba6-a546-553360eed283",
+      "Name": "Venafi.TPP.ImportCert.OctopusSpaceName",
+      "Label": "Octopus Space Name",
+      "HelpText": "*Required*: Provide the Space name for the certificate to be saved in. The default is the current space the step is running within: `#{Octopus.Space.Name}`.",
+      "DefaultValue": "#{Octopus.Space.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "56f8e1a8-fb6c-4b91-a216-eadc2f5cd673",
+      "Name": "Venafi.TPP.ImportCert.OctopusCertificateName",
+      "Label": "Octopus Certificate Name",
+      "HelpText": "*Required*: A short, memorable, unique name for the imported certificate.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "3a85993f-8844-49aa-951a-804471f53b23",
+      "Name": "Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate",
+      "Label": "Replace existing Octopus certificate?",
+      "HelpText": "*Optional*: If a certificate exists in Octopus with the same name as the one to be imported, should the one stored in Octopus be replaced? Default: `True`.\n\n**Note**: If multiple matches are found, the step template will not replace any, and will log a warning instead.\n\nSee [replacing certificates](https://octopus.com/docs/deployments/certificates/replace-certificate) for further information.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedAt": "2021-08-18T15:47:39.5570000Z",
+  "LastModifiedBy": "benjimac93",
+  "$Meta": {
+    "ExportedAt": "2021-08-23T12:40:10.9750000Z",
+    "OctopusVersion": "2021.1.7687",
+    "Type": "ActionTemplate"
+  },
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-import-certificate-into-octopus/scriptbody.ps1 b/src/step-templates/venafi-tpp-import-certificate-into-octopus/scriptbody.ps1
new file mode 100644
index 000000000..f519f376c
--- /dev/null
+++ b/src/step-templates/venafi-tpp-import-certificate-into-octopus/scriptbody.ps1
@@ -0,0 +1,395 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# TPP required variables
+$Server = $OctopusParameters["Venafi.TPP.ImportCert.Server"]
+$Token = $OctopusParameters["Venafi.TPP.ImportCert.AccessToken"]
+$Path = $OctopusParameters["Venafi.TPP.ImportCert.DNPath"]
+$Format = $OctopusParameters["Venafi.TPP.ImportCert.Format"]
+
+# TPP optional variables
+$IncludeChain = $OctopusParameters["Venafi.TPP.ImportCert.IncludeChain"]
+$FriendlyName = $OctopusParameters["Venafi.TPP.ImportCert.FriendlyName"]
+$IncludePrivateKey = $OctopusParameters["Venafi.TPP.ImportCert.IncludePrivateKey"]
+$PrivateKeyPassword = $OctopusParameters["Venafi.TPP.ImportCert.PrivateKeyPassword"]
+$OutputVariableName = $OctopusParameters["Venafi.TPP.ImportCert.OutputVariableName"]
+$RevokeToken = $OctopusParameters["Venafi.TPP.ImportCert.RevokeTokenOnCompletion"]
+
+# Octopus required variables
+$OctopusServerUri = $OctopusParameters["Venafi.TPP.ImportCert.OctopusServerUri"]
+$OctopusApiKey = $OctopusParameters["Venafi.TPP.ImportCert.OctopusApiKey"]
+$OctopusSpaceName = $OctopusParameters["Venafi.TPP.ImportCert.OctopusSpaceName"]
+$OctopusCertificateName = $OctopusParameters["Venafi.TPP.ImportCert.OctopusCertificateName"]
+$OctopusReplaceExistingCertificate = $OctopusParameters["Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate"]
+
+# TPP validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.ImportCert.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Token)) {
+    throw "Required parameter Venafi.TPP.ImportCert.AccessToken not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Path)) {
+    throw "Required parameter Venafi.TPP.ImportCert.DNPath not specified"
+}
+else {
+    if ($Path.Contains("\") -eq $False) {
+        throw "At least one '\' is required for the Venafi.TPP.ImportCert.DNPath value"
+    }
+}
+if ([string]::IsNullOrWhiteSpace($Format)) {
+    throw "Required parameter Venafi.TPP.ImportCert.Format not specified"
+}
+
+# TPP conditional validation
+if ($IncludePrivateKey -eq $True) {
+    if ([string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {
+        throw "IncludePrivateKey set to true, but parameter Venafi.TPP.ImportCert.PrivateKeyPassword not specified"
+    }
+}
+else {
+    $PrivateKeyPassword = $null
+}
+
+# Octopus validation
+if ([string]::IsNullOrWhiteSpace($OctopusServerUri)) {
+    throw "Required parameter Venafi.TPP.ImportCert.OctopusServerUri not specified"
+}
+if ([string]::IsNullOrWhiteSpace($OctopusApiKey)) {
+    throw "Required parameter Venafi.TPP.ImportCert.OctopusApiKey not specified"
+}
+if ([string]::IsNullOrWhiteSpace($OctopusSpaceName)) {
+    throw "Required parameter Venafi.TPP.ImportCert.OctopusSpaceName not specified"
+}
+if ([string]::IsNullOrWhiteSpace($OctopusCertificateName)) {
+    throw "Required parameter Venafi.TPP.ImportCert.OctopusCertificateName not specified"
+}
+if ([string]::IsNullOrWhiteSpace($OctopusReplaceExistingCertificate)) {
+    throw "Required parameter Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate not specified"
+}
+
+# Helper functions
+###############################################################################
+function Get-WebRequestErrorBody {
+    param (
+        $RequestError
+    )
+
+    # Powershell < 6 you can read the Exception
+    if ($PSVersionTable.PSVersion.Major -lt 6) {
+        if ($RequestError.Exception.Response) {
+            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())
+            $reader.BaseStream.Position = 0
+            $reader.DiscardBufferedData()
+            $rawResponse = $reader.ReadToEnd()
+            $response = ""
+            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }
+            return $response
+        }
+    }
+    else {
+        return $RequestError.ErrorDetails.Message
+    }
+}
+
+function Get-MatchingOctopusCertificates {
+    param (
+        [string]$ServerUri,
+        [string]$ApiKey,
+        [string]$SpaceId,
+        [string]$CertificateName
+    )
+    Write-Debug "Entering: Get-MatchingOctopusCertificates"
+
+    try {
+
+        $header = @{ "X-Octopus-ApiKey" = $ApiKey }
+
+        # Get a list of certificates that match our domain search criteria.
+        $partial_certificates = (Invoke-RestMethod -Uri "$ServerUri/api/$SpaceId/certificates?partialName=$([uri]::EscapeDataString($CertificateName))&skip=0&take=2000" -Headers $header) | Select-Object -ExpandProperty Items
+
+        # return certs that arent archived and havent been replaced.
+        return $partial_certificates | Where-Object {
+            $null -eq $_.ReplacedBy -and
+            $null -eq $_.Archived -and 
+            $CertificateName -eq $_.Name
+        }
+    }
+    catch {
+        $Detail = (Get-WebRequestErrorBody -RequestError $_)
+        Write-Error "Could not retrieve certificates from Octopus. Error: $($_.Exception.Message).`n`t$Detail"
+    }
+}
+
+function Replace-OctopusCertificate {
+    param (
+        [string]$ServerUri,
+        [string]$ApiKey,
+        [string]$SpaceId,
+        [string]$CertificateId,
+        [string]$CertificateName,
+        [string]$CertificateData,
+        [string]$CertificatePwd
+    )
+    Write-Debug "Entering: Replace-OctopusCertificate"   
+    try {
+
+        $header = @{ "X-Octopus-ApiKey" = $ApiKey }
+
+        $replacement_certificate = @{
+            CertificateData = $CertificateData
+        }
+
+        if (![string]::IsNullOrWhiteSpace($CertificatePwd)) {
+            $replacement_certificate.Password = $CertificatePwd
+        }
+        
+        # Replace the cert
+        $updated_certificate = Invoke-RestMethod -Method Post -Uri "$ServerUri/api/$SpaceId/certificates/$CertificateId/replace" -Headers $header -Body ($replacement_certificate | ConvertTo-Json -Depth 10)
+        Write-Highlight "Replaced certificate in Octopus for '$($updated_certificate.Name)' ($($updated_certificate.Id))"
+    }
+    catch {
+        $Detail = (Get-WebRequestErrorBody -RequestError $_)
+        Write-Error "Could not replace certificate in Octopus. Error: $($_.Exception.Message).`n`t$Detail"
+    }
+}
+
+function New-OctopusCertificate {
+    param (
+        [string]$ServerUri,
+        [string]$ApiKey,
+        [string]$SpaceId,
+        [string]$CertificateName,
+        [string]$CertificateData,
+        [string]$CertificatePwd
+    )
+    Write-Debug "Entering: New-OctopusCertificate"   
+    try {
+
+        $header = @{ "X-Octopus-ApiKey" = $ApiKey }
+
+        $certificate = @{
+            Name            = $CertificateName;
+            CertificateData = @{
+                NewValue = $CertificateData;
+                HasData  = $True;
+            }
+            Password        = @{
+                HasValue = $False;
+                NewValue = $null;
+            }
+        }
+
+        if (![string]::IsNullOrWhiteSpace($CertificatePwd)) {
+            $certificate.Password.NewValue = $CertificatePwd
+            $certificate.Password.HasData = $True
+        }
+        
+        # Create new certificate
+        $new_certificate = Invoke-RestMethod -Method Post -Uri "$ServerUri/api/$SpaceId/certificates" -Headers $header -Body ($certificate | ConvertTo-Json -Depth 10)
+        Write-Highlight "New certificate created in Octopus for '$($new_certificate.Name)' ($($new_certificate.Id))"
+    }
+    catch {
+        $Detail = (Get-WebRequestErrorBody -RequestError $_)
+        Write-Error "Could not create new certificate in Octopus. Error: $($_.Exception.Message).`n`t$Detail"
+    }
+}
+
+function Clean-VenafiCertificateForOctopus {
+    param (
+        [string]$CertificateData
+    )
+    Write-Debug "Entering: Clean-VenafiCertificateForOctopus"   
+    $PemHeaderFragment = "-----BEGIN *"
+    $PemFooterFragment = "-----END *"
+
+    $CertificateBytes = [Convert]::FromBase64String($CertificateData)
+    $RawCert = [System.Text.Encoding]::UTF8.GetString($CertificateBytes)
+    
+    $CleanedCertLines = @()
+    if (![string]::IsNullOrWhiteSpace($RawCert)) {
+        $RawCertLines = ($RawCert -Split "`n")
+        $currentLine = 0
+        while ($currentLine -lt $RawCertLines.Length) {
+            Write-Verbose "Working on line $currentLine"
+            $headerPosition = [Array]::FindIndex($RawCertLines, $currentLine, [Predicate[string]] { $args[0] -like $PemHeaderFragment })
+            if ($headerPosition -gt -1) {
+                $footerPosition = [Array]::FindIndex($RawCertLines, $headerPosition, [Predicate[string]] { $args[0] -like $PemFooterFragment })
+                if ($footerPosition -lt 0) {
+                    throw "Unable to find a matching '-----END' PEM fragment!"
+                }
+                else {
+                    Write-Verbose "Selecting PEM lines: $headerPosition-$footerPosition"
+                    $pemLines = $RawCertLines[$headerPosition..$footerPosition]
+                    $CleanedCertLines += $pemLines
+                    $currentLine = $footerPosition
+                }
+            }
+            else {
+                $currentLine++
+            }
+        }
+    }
+    if ($CleanedCertLines.Length -le 0) {
+        throw "Something went wrong extracting contents from file (no cleansed contents)"
+    }
+
+    $CleanedCert = $CleanedCertLines | Out-String
+    $CleanedCertData = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($CleanedCert))
+    
+    return $CleanedCertData    
+}
+###############################################################################
+# MAIN STEP TEMPLATE FLOW
+###############################################################################
+
+# TPP Access token
+$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force
+[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential("token", $SecureToken)
+
+# Clean-up
+$Server = $Server.TrimEnd('/')
+$OctopusServerUri = $OctopusServerUri.TrimEnd('/')
+$OctopusSpaceName = $OctopusSpaceName.Trim(" ")
+$OctopusCertificateName = $OctopusCertificateName.Trim(" ")
+
+# Required Venafi Module
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+$ExportFormatsIncompatibleWithOctopusCertificateStore = @("Base64", "Base64 (PKCS #8)")
+
+Write-Verbose "Venafi.TPP.ImportCert.Server: $Server"
+Write-Verbose "Venafi.TPP.ImportCert.AccessToken: ********"
+Write-Verbose "Venafi.TPP.ImportCert.DNPath: $Path"
+Write-Verbose "Venafi.TPP.ImportCert.Format: $Format"
+Write-Verbose "Venafi.TPP.ImportCert.IncludeChain: $IncludeChain"
+Write-Verbose "Venafi.TPP.ImportCert.FriendlyName: $FriendlyName"
+Write-Verbose "Venafi.TPP.ImportCert.IncludePrivateKey: $IncludePrivateKey"
+Write-Verbose "Venafi.TPP.ImportCert.PrivateKeyPassword: ********"
+Write-Verbose "Venafi.TPP.ImportCert.CertDetails.OutputVariableName: $OutputVariableName"
+Write-Verbose "Venafi.TPP.ImportCert.RevokeTokenOnCompletion: $RevokeTokenOnCompletion"
+Write-Verbose "Venafi.TPP.ImportCert.OctopusServerUri: $OctopusServerUri"
+Write-Verbose "Venafi.TPP.ImportCert.OctopusApiKey: ********"
+Write-Verbose "Venafi.TPP.ImportCert.OctopusSpaceName: $OctopusSpaceName"
+Write-Verbose "Venafi.TPP.ImportCert.OctopusCertificateName: $OctopusCertificateName"
+Write-Verbose "Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate: $OctopusReplaceExistingCertificate"
+Write-Verbose "Step Name: $StepName"
+
+Write-Host "Requesting new session from $Server"
+New-VenafiSession -Server $Server -AccessToken $AccessToken
+
+# Export certificate
+$ExportCert_Params = @{
+    CertificateId = $Path;
+    Format        = $Format;
+}
+
+# Optional IncludeChain field
+if ($IncludeChain -eq $True) {
+    $ExportCert_Params.IncludeChain = $True
+}
+
+# Optional FriendlyName field
+if (-not [string]::IsNullOrWhiteSpace($FriendlyName)) {
+    $ExportCert_Params.FriendlyName = $FriendlyName
+}
+
+# Optional Private key field
+if (-not [string]::IsNullOrWhiteSpace($PrivateKeyPassword) -and $IncludePrivateKey -eq $True) {
+    $SecurePrivateKeyPassword = ConvertTo-SecureString $PrivateKeyPassword -AsPlainText -Force
+    $ExportCert_Params.PrivateKeyPassword = $SecurePrivateKeyPassword    
+    $ExportCert_Params.IncludePrivateKey = $True
+}
+
+# Do the export
+$ExportCertificateResponse = ((Export-VenafiCertificate @ExportCert_Params) 6> $null)
+
+if ($null -eq $ExportCertificateResponse -or $null -eq $ExportCertificateResponse.CertificateData) {
+    Write-Warning "No certificate data returned for path: $Path`nCheck the path value represents a certificate, and not a folder."
+}
+else {
+    Write-Host "Successfully retrieved certificate data to export for path: $Path"
+        
+    # Get octopus space Id
+    $header = @{ "X-Octopus-ApiKey" = $OctopusApiKey }
+    $spaces = Invoke-RestMethod -Uri "$OctopusServerUri/api/spaces?partialName=$([uri]::EscapeDataString($OctopusSpaceName))&skip=0&take=500" -Headers $header 
+    $OctopusSpace = @($spaces.Items | Where-Object { $_.Name -eq $OctopusSpaceName }) | Select-Object -First 1
+
+    if ($null -eq $OctopusSpace) {
+        throw "Couldnt find Octopus space with name '$OctopusSpaceName'."
+    }
+
+    # Check for certificate based on name
+    $CertificateMatches = @(Get-MatchingOctopusCertificates -ServerUri $OctopusServerUri -ApiKey $OctopusApiKey -SpaceId $($OctopusSpace.Id) -CertificateName $OctopusCertificateName) 
+    Write-Host "Found $($CertificateMatches.Length) certificates matching '$OctopusCertificateName'"
+
+    $FirstCertificateMatch = $CertificateMatches | Select-Object -First 1
+    $CertificateData = $ExportCertificateResponse.CertificateData
+
+    if ($ExportFormatsIncompatibleWithOctopusCertificateStore -icontains $Format) {
+        Write-Host "Requested export format $Format needs to be cleaned before import to Octopus."
+        $CertificateData = Clean-VenafiCertificateForOctopus -CertificateData $CertificateData
+        if ([string]::IsNullOrWhiteSpace($CertificateData)) {
+            throw "Cleaned certificate data empty!"
+        }
+    }
+
+    switch ($CertificateMatches.Length) {
+        0 {  
+            # New cert
+            Write-Host "Creating a new certificate '$OctopusCertificateName'"
+            New-OctopusCertificate -ServerUri $OctopusServerUri -ApiKey $OctopusApiKey -SpaceId $($OctopusSpace.Id) -CertificateName $OctopusCertificateName -CertificateData $($CertificateData) -CertificatePwd $PrivateKeyPassword
+        }
+        1 {  
+            # One cert to replace
+            if ($OctopusReplaceExistingCertificate -eq $False) {
+                Write-Host "Replace existing certificate set to False, nothing to do."
+            }
+            else {
+                Write-Host "Replacing existing certificate '$OctopusCertificateName' ($($FirstCertificateMatch.Id))"
+                Replace-OctopusCertificate -ServerUri $OctopusServerUri -ApiKey $OctopusApiKey -SpaceId $($OctopusSpace.Id) -CertificateId $($FirstCertificateMatch.Id) -CertificateName $OctopusCertificateName -CertificateData $($CertificateData) -CertificatePwd $PrivateKeyPassword
+            }
+        }
+        default {
+            Write-Warning "Multiple certs matching name '$OctopusCertificateName' found, nothing to do."
+            return
+        }
+    }
+
+    if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {
+        $CertificateJson = $ExportCertificateResponse | ConvertTo-Json -Compress -Depth 10 
+        Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson -Sensitive
+        Write-Highlight "Created sensitive output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}"
+    }
+}
+
+if ($RevokeToken -eq $true) {
+    # Revoke TPP access token
+    Write-Host "Revoking access token with $Server"
+    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force
+}
\ No newline at end of file
diff --git a/src/step-templates/venafi-tpp-retrieve-certificate-details/metadata.json b/src/step-templates/venafi-tpp-retrieve-certificate-details/metadata.json
new file mode 100644
index 000000000..c2e872225
--- /dev/null
+++ b/src/step-templates/venafi-tpp-retrieve-certificate-details/metadata.json
@@ -0,0 +1,73 @@
+{
+  "Id": "b893cae4-e280-4686-a60b-38da876528ec",
+  "Name": "Venafi TPP - Retrieve Certificate Details",
+  "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and retrieve a certificate's details using its Distinguished Name (DN). This is the absolute path to the certificate in the TPP instance.\n\nThis is achieved using the VenafiPS PowerShell module's  [Get-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Get-VenafiCertificate/) function.\n\nYou can also store the entire certificate result in `JSON` format in an [Octopus output variable](https://octopus.com/docs/projects/variables/output-variables)\n\nThis output variable can then be used in additional deployment or runbook steps.\n\nOn successful completion, you can also *optionally* revoke the access token used.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "9873f05e-4a09-47aa-88c4-6bf63aad5cbc",
+      "Name": "Venafi.TPP.GetCert.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "*Required*: The URL of the Venafi TPP instance you want to find certificate details from.\n\nFor example: `https://mytppserver.example.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "81a075af-2ce7-4f0d-ae97-968dacebc15f",
+      "Name": "Venafi.TPP.GetCert.AccessToken",
+      "Label": "Venafi TPP Access Token",
+      "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Id": "ffdde857-7af9-4fc3-9b74-76789fa1dd9b",
+      "Name": "Venafi.TPP.GetCert.DNPath",
+      "Label": "Venafi TPP Certificate Path",
+      "HelpText": "*Required*: The certificate's Distinguished Name (DN). This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "9af1fa28-325c-411d-8e0e-7aa676f05da1",
+      "Name": "Venafi.TPP.GetCert.OutputVariableName",
+      "Label": "Certificate output variable name (Optional)",
+      "HelpText": "*Optional*: Create an output variable with the certificate details found from the search. The certificate details will be stored in `JSON` format.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "1d8421eb-ed22-4513-9d5e-99bba1f8296f",
+      "Name": "Venafi.TPP.GetCert.RevokeTokenOnCompletion",
+      "Label": "Revoke access token on completion?",
+      "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-16T13:51:19.6890000Z",
+    "OctopusVersion": "2021.2.7207",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mark-the-butler",
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-retrieve-certificate-details/scriptbody.ps1 b/src/step-templates/venafi-tpp-retrieve-certificate-details/scriptbody.ps1
new file mode 100644
index 000000000..4b7155159
--- /dev/null
+++ b/src/step-templates/venafi-tpp-retrieve-certificate-details/scriptbody.ps1
@@ -0,0 +1,88 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$Server = $OctopusParameters["Venafi.TPP.GetCert.Server"]
+$Token = $OctopusParameters["Venafi.TPP.GetCert.AccessToken"]
+$Path = $OctopusParameters["Venafi.TPP.GetCert.DNPath"]
+
+# Optional
+$OutputVariableName = $OctopusParameters["Venafi.TPP.GetCert.OutputVariableName"]
+$RevokeToken = $OctopusParameters["Venafi.TPP.GetCert.RevokeTokenOnCompletion"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.GetCert.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Token)) {
+    throw "Required parameter Venafi.TPP.GetCert.AccessToken not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Path)) {
+    throw "Required parameter Venafi.TPP.GetCert.DNPath not specified"
+}
+else {
+    if ($Path.Contains("\") -eq $False) {
+        throw "At least one '\' is required for the Venafi.TPP.GetCert.DNPath value"
+    }
+}
+
+$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force
+[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential("token", $SecureToken)
+
+# Clean-up
+$Server = $Server.TrimEnd('/')
+
+# Required Modules
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+
+$StepName = $OctopusParameters["Octopus.Step.Name"]
+
+# Create Venafi session
+New-VenafiSession -Server $Server -AccessToken $AccessToken
+
+# Retrieve certificate details
+$CertificateDetails = Get-VenafiCertificate -CertificateId $Path | Select-Object -First 1
+
+if ($null -eq $CertificateDetails -or $null -eq $CertificateDetails.Path) {
+    Write-Warning "No certificate details returned for path: $Path`nCheck the path value represents a certificate, and not a folder."
+}
+else {
+    Write-Highlight "Retrieved certificate details for path: $Path"
+    $CertificateDetails | Format-List
+    
+    if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {
+        $CertificateJson = $CertificateDetails | ConvertTo-Json -Compress -Depth 10 
+        Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson
+        Write-Highlight "Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}"
+    }
+}
+
+if ($RevokeToken -eq $true) {
+    # Revoke TPP access token
+    Write-Host "Revoking access token with $Server"
+    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force
+}
\ No newline at end of file
diff --git a/src/step-templates/venafi-tpp-revoke-oauth-token/metadata.json b/src/step-templates/venafi-tpp-revoke-oauth-token/metadata.json
new file mode 100644
index 000000000..729ea738f
--- /dev/null
+++ b/src/step-templates/venafi-tpp-revoke-oauth-token/metadata.json
@@ -0,0 +1,43 @@
+{
+  "Id": "d3e20a46-8119-4f4f-9d6f-52c30bcc6c59",
+  "Name": "Venafi TPP - Revoke OAuth Token",
+  "Description": "This step template will revoke an access token obtained through a Venafi TPP instance using the VenafiPS PowerShell module's [Revoke-TppToken](https://venafips.readthedocs.io/en/latest/functions/Revoke-TppToken/) function.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "7f3400a2-ae73-4299-93a4-4309d38312ff",
+      "Name": "Venafi.TPP.RevokeOAuth.Server",
+      "Label": "Venafi TPP Server",
+      "HelpText": "The URL of the Venafi TPP instance you want to revoke the access token against.\n\nFor example: `https://mytppserver.example.com`.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "27abe7fc-b82a-4d80-a591-f53d8154414c",
+      "Name": "Venafi.TPP.RevokeOAuth.AccessToken",
+      "Label": "Venafi TPP Access Token",
+      "HelpText": "The access token obtained from the TPP server you want to revoke.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2021-08-11T10:08:47.5470000Z",
+    "OctopusVersion": "2021.2.7127",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "mark-the-butler",
+  "Category": "venafi"
+}
diff --git a/src/step-templates/venafi-tpp-revoke-oauth-token/scriptbody.ps1 b/src/step-templates/venafi-tpp-revoke-oauth-token/scriptbody.ps1
new file mode 100644
index 000000000..1a345ff1c
--- /dev/null
+++ b/src/step-templates/venafi-tpp-revoke-oauth-token/scriptbody.ps1
@@ -0,0 +1,51 @@
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$ErrorActionPreference = 'Stop'
+
+# Variables
+$Server = $OctopusParameters["Venafi.TPP.RevokeOAuth.Server"]
+$Token = $OctopusParameters["Venafi.TPP.RevokeOAuth.AccessToken"]
+
+# Validation
+if ([string]::IsNullOrWhiteSpace($Server)) {
+    throw "Required parameter Venafi.TPP.RevokeOAuth.Server not specified"
+}
+if ([string]::IsNullOrWhiteSpace($Token)) {
+    throw "Required parameter Venafi.TPP.RevokeOAuth.AccessToken not specified"
+}
+
+$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force
+[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential("token", $SecureToken)
+
+# Clean-up
+$Server = $Server.TrimEnd('/')
+
+# Required Modules
+function Get-NugetPackageProviderNotInstalled {
+    # See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+# Check to see if the package provider has been installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false) {
+    Write-Host "Nuget package provider not found, installing ..."    
+    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser
+}
+
+Write-Host "Checking for required VenafiPS module ..."
+$required_venafips_version = 3.1.5
+$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }
+if (-not ($module_available)) {
+    Write-Host "Installing VenafiPS module ..."
+    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force
+}
+else {
+    $first_match = $module_available | Select-Object -First 1 
+    Write-Host "Found version: $($first_match.Version)"
+}
+
+Write-Host "Importing VenafiPS module ..."
+Import-Module VenafiPS
+
+# Revoke TPP access token
+Write-Host "Revoking access token with $Server"
+Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force
\ No newline at end of file
diff --git a/step-templates/victorops-create-alert.json b/src/step-templates/victorops-create-alert/metadata.json
similarity index 53%
rename from step-templates/victorops-create-alert.json
rename to src/step-templates/victorops-create-alert/metadata.json
index 257d2918a..842b28200 100644
--- a/step-templates/victorops-create-alert.json
+++ b/src/step-templates/victorops-create-alert/metadata.json
@@ -6,7 +6,7 @@
   "Version": 24,
   "CommunityActionTemplateId": null,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Set-StrictMode -Version Latest\n\nfunction Send-VictorOpsAlert($url, $messageType, $entityDisplayName, $stateMessage, $customFields)\n{\n  $payload = @{\n      \"message_type\" = $messageType\n      \"entity_display_name\" = $entityDisplayName\n      \"state_message\" = $stateMessage\n  }\n\n  if (-not ([string]::IsNullOrEmpty($customFields))) { \n    foreach($line in $customFields -split \"`n\") {\n      if (-not ([string]::IsNullOrEmpty($line))) { \n        if ($line -like '*|*') {\n          $kv = $line.Split('|')\n          $payload.Add($kv[0], $kv[1])\n        } else {\n          write-verbose \"The line '$line' in 'Custom fields' contained invalid data. Please ensure its a list of key value pairs, separated by '|'.\"\n        }\n      }\n    }\n  }\n\n  write-verbose \"Submitting payload`n$($payload | ConvertTo-Json)`n to $url\"\n\n  try {\n    $response = Invoke-Restmethod -Method POST -Uri $url -Body ($payload | ConvertTo-Json) -ContentType \"application/json\"\n    write-host \"Successfully submitted\"\n    write-verbose \"Response was `n$($response | ConvertTo-Json)\"\n  } catch {\n    Fail-Step \"Failed to submit VictorOps alert - $($_)\"\n  }\n\n}\n\nif (Test-Path variable:OctopusParameters) {\n  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsAlertUrl']))  {\n  \tWrite-Host \"Please provide the VictorOps Url\"\n    exit 1\n  }\n  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsMessageType']))  {\n  \tWrite-Host \"Please provide a valid Message Type\"\n    exit 1\n  }\n  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsEntityDisplayName']))  {\n  \tWrite-Host \"Please provide a valid Title\"\n    exit 1\n  }\n  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsMessage']))  {\n  \tWrite-Host \"Please provide a valid Message\"\n    exit 1\n  }\n  Send-VictorOpsAlert -url $OctopusParameters['VictorOpsAlertUrl'] `\n                      -messageType $OctopusParameters['VictorOpsMessageType'] `\n                      -entityDisplayName $OctopusParameters['VictorOpsEntityDisplayName'] `\n                      -stateMessage $OctopusParameters['VictorOpsMessage'] `\n                      -customFields $OctopusParameters['VictorOpsCustomFields']\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline"
   },
@@ -70,7 +70,7 @@
   ],
   "LastModifiedBy": "matt-richardson",
   "$Meta": {
-    "ExportedAt": "2018-05-22T04:33:31.645Z",
+    "ExportedAt": "2018-05-22T04:33:31.6450000Z",
     "OctopusVersion": "2018.5.1",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/victorops-create-alert/scriptbody.ps1 b/src/step-templates/victorops-create-alert/scriptbody.ps1
new file mode 100644
index 000000000..4d56f7508
--- /dev/null
+++ b/src/step-templates/victorops-create-alert/scriptbody.ps1
@@ -0,0 +1,58 @@
+Set-StrictMode -Version Latest
+
+function Send-VictorOpsAlert($url, $messageType, $entityDisplayName, $stateMessage, $customFields)
+{
+  $payload = @{
+      "message_type" = $messageType
+      "entity_display_name" = $entityDisplayName
+      "state_message" = $stateMessage
+  }
+
+  if (-not ([string]::IsNullOrEmpty($customFields))) { 
+    foreach($line in $customFields -split "`n") {
+      if (-not ([string]::IsNullOrEmpty($line))) { 
+        if ($line -like '*|*') {
+          $kv = $line.Split('|')
+          $payload.Add($kv[0], $kv[1])
+        } else {
+          write-verbose "The line '$line' in 'Custom fields' contained invalid data. Please ensure its a list of key value pairs, separated by '|'."
+        }
+      }
+    }
+  }
+
+  write-verbose "Submitting payload`n$($payload | ConvertTo-Json)`n to $url"
+
+  try {
+    $response = Invoke-Restmethod -Method POST -Uri $url -Body ($payload | ConvertTo-Json) -ContentType "application/json"
+    write-host "Successfully submitted"
+    write-verbose "Response was `n$($response | ConvertTo-Json)"
+  } catch {
+    Fail-Step "Failed to submit VictorOps alert - $($_)"
+  }
+
+}
+
+if (Test-Path variable:OctopusParameters) {
+  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsAlertUrl']))  {
+  	Write-Host "Please provide the VictorOps Url"
+    exit 1
+  }
+  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsMessageType']))  {
+  	Write-Host "Please provide a valid Message Type"
+    exit 1
+  }
+  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsEntityDisplayName']))  {
+  	Write-Host "Please provide a valid Title"
+    exit 1
+  }
+  if ([string]::IsNullOrEmpty($OctopusParameters['VictorOpsMessage']))  {
+  	Write-Host "Please provide a valid Message"
+    exit 1
+  }
+  Send-VictorOpsAlert -url $OctopusParameters['VictorOpsAlertUrl'] `
+                      -messageType $OctopusParameters['VictorOpsMessageType'] `
+                      -entityDisplayName $OctopusParameters['VictorOpsEntityDisplayName'] `
+                      -stateMessage $OctopusParameters['VictorOpsMessage'] `
+                      -customFields $OctopusParameters['VictorOpsCustomFields']
+}
\ No newline at end of file
diff --git a/src/step-templates/wait-for-iis-connections-to-drop-to-zero/metadata.json b/src/step-templates/wait-for-iis-connections-to-drop-to-zero/metadata.json
new file mode 100644
index 000000000..19ed409d8
--- /dev/null
+++ b/src/step-templates/wait-for-iis-connections-to-drop-to-zero/metadata.json
@@ -0,0 +1,48 @@
+{
+  "Id": "2e27acd9-5ab3-4580-b746-7d0a0de23fcc",
+  "Name": "Wait for IIS connections to drop to 0 or time expires",
+  "Description": "Wait for IIS connections to drop to 0 or time expires",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.RunOnServer": "false",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.FeedId": null,
+    "Octopus.Action.Package.PackageId": null
+  },
+  "Parameters": [
+    {
+      "Id": "af43ce76-167e-44f2-a985-eee8597f8e39",
+      "Name": "wfitdSleepSeconds",
+      "Label": "Sleep Seconds",
+      "HelpText": "Number of seconds to sleep between checking connection count.",
+      "DefaultValue": "4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "37709659-d95b-4524-a287-771c1b62d112",
+      "Name": "wfitdTotalWaitMinutes",
+      "Label": "Total Wait Minutes",
+      "HelpText": "Maximum wait time in minutes before proceeding, even if connections have not dropped to 0.",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "tbrasch",
+  "$Meta": {
+    "ExportedAt": "2017-07-28T18:51:55.5190000Z",
+    "OctopusVersion": "3.15.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "IIS"
+}
diff --git a/src/step-templates/wait-for-iis-connections-to-drop-to-zero/scriptbody.ps1 b/src/step-templates/wait-for-iis-connections-to-drop-to-zero/scriptbody.ps1
new file mode 100644
index 000000000..361079dee
--- /dev/null
+++ b/src/step-templates/wait-for-iis-connections-to-drop-to-zero/scriptbody.ps1
@@ -0,0 +1,81 @@
+Import-Module WebAdministration
+
+$websites = Get-ChildItem IIS:\Sites
+$continue = $true
+
+#Verify sleepSeconds can be converted to integer.
+$sleepSecondsString = 4
+
+If ($OctopusParameters['wfitdSleepSeconds'])
+{
+  $sleepSecondsString = $OctopusParameters['wfitdSleepSeconds']
+}
+
+[int]$sleepSeconds = 0
+[bool]$result = [int]::TryParse($sleepSecondsString, [ref]$sleepSeconds)
+
+If ($result)
+{
+  Write-Host ('Sleep Seconds: ' + $sleepSeconds)
+}
+Else
+{
+  Throw "Cannot convert Sleep Seconds: '" + $sleepSecondsString + "' to integer."
+}
+
+#Verify totalWaitMinutes can be converted to integer.
+$totalWaitMinutesString = 5
+
+If ($OctopusParameters['wfitdTotalWaitMinutes'])
+{
+  $totalWaitMinutesString = $OctopusParameters['wfitdTotalWaitMinutes']
+}
+
+[int]$totalWaitMinutes = 0
+[bool]$result = [int]::TryParse($totalWaitMinutesString, [ref]$totalWaitMinutes)
+
+If ($result)
+{
+  Write-Host ('Total Wait Minutes: ' + $totalWaitMinutes)
+}
+Else
+{
+  Throw "Cannot convert Total Wait Minutes: '" + $totalWaitMinutesString + "' to integer."
+}
+
+Write-Host '***********************************************'
+
+$stopWatch = [system.diagnostics.stopwatch]::StartNew()
+While ($continue)
+{
+  $connectionsExist = $false
+  
+  Foreach ($website in $websites)
+  {
+    $connections = (Get-Counter ('\\' + $env:COMPUTERNAME  + '\web service(' + $website.name + ')\Current Connections')).CounterSamples.CookedValue
+    Write-Host ($website.Name + ' - ' + $connections + ' connection(s).')
+    If ($connections -gt 0)
+    {
+      $connectionsExist = $true
+    }
+  }
+  
+  If ($connectionsExist)
+  {
+    Start-Sleep -Seconds $sleepSeconds
+    
+    If ($stopWatch.Elapsed.Minutes -ge $totalWaitMinutes)
+    {
+      $continue = $false
+    }
+  }
+  Else
+  {
+    $continue = $false
+  }
+  
+  Write-Host ('Elapsed seconds: ' + $stopWatch.Elapsed.TotalSeconds)
+  Write-Host '==============================================='
+}
+
+$stopWatch.Stop()
diff --git a/step-templates/wait.json b/src/step-templates/wait/metadata.json
similarity index 71%
rename from step-templates/wait.json
rename to src/step-templates/wait/metadata.json
index f43ab0a78..5bf1150f6 100644
--- a/step-templates/wait.json
+++ b/src/step-templates/wait/metadata.json
@@ -7,7 +7,7 @@
   "CommunityActionTemplateId": null,
   "Packages": [],
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[int]$Wait = $Seconds\nWrite-Output \"Waiting for $seconds seconds\"\nfor ($CountDown = $Wait; $CountDown -ge 0; $CountDown--){\nWrite-Verbose \"$CountDown seconds remaining\"\nStart-Sleep 1\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false"
@@ -24,10 +24,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2020-01-12T21:05:05.736Z",
+  "LastModifiedOn": "2020-01-12T21:05:05.7360000Z",
   "LastModifiedBy": "biohazardhpk",
   "$Meta": {
-    "ExportedAt": "2019-12-06T20:15:05.736Z",
+    "ExportedAt": "2019-12-06T20:15:05.7360000Z",
     "OctopusVersion": "2018.9.16",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/wait/scriptbody.ps1 b/src/step-templates/wait/scriptbody.ps1
new file mode 100644
index 000000000..f2ca06f73
--- /dev/null
+++ b/src/step-templates/wait/scriptbody.ps1
@@ -0,0 +1,6 @@
+[int]$Wait = $Seconds
+Write-Output "Waiting for $seconds seconds"
+for ($CountDown = $Wait; $CountDown -ge 0; $CountDown--){
+Write-Verbose "$CountDown seconds remaining"
+Start-Sleep 1
+}
\ No newline at end of file
diff --git a/src/step-templates/web-deploy-azure-convention/metadata.json b/src/step-templates/web-deploy-azure-convention/metadata.json
new file mode 100644
index 000000000..735955b1c
--- /dev/null
+++ b/src/step-templates/web-deploy-azure-convention/metadata.json
@@ -0,0 +1,66 @@
+{
+  "Id": "c3ff8c78-c1cd-43ea-aedb-f5ac7dac3352",
+  "Name": "Web Deploy to Azure by convention",
+  "Description": "Makes it super simple to deploy websites to different regions inside a single process.\n\nThis script assumes that you want to deploy websites like these to multiple regions:\n\n- playground.mydomain.com\n- status.mydomain.com\n\nWhen you deploy to staging and production to 3 regions, this means that each website requires 3 (regions) * 2 (deployment slots) = 6 scripts. If you want this deployed using ms web deploy, you will need 6 * 5 = 30 variables (for a single website).\n\nWith this convention script you only need a few variables, but it requires some convention (mostly done by Azure anyway):\n\n- [prefix]-[websitename]-[region]\n- [prefix]-[websitename]-[region]-staging\n\nSo\n\n- mydomain-playground-eu-west\n- mydomain-playground-eu-west-staging\n\nThe following variables are required:\n\n- AzurePrefix\n- AzureName\n- AzurePassword-[region]\n- AzurePassword-[region]-staging\n\nThe password is required for each region and deployment slot, the rest is fully determined by convention.",
+  "ActionType": "Octopus.Script",
+  "Version": 29,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "WebsiteName",
+      "Label": "Website Name",
+      "HelpText": "The name of the website (e.g. playground)\n\nIf you leave this empty, this field will use the _AzureName_ variable.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RegionName",
+      "Label": "Region Name",
+      "HelpText": "The name of the region (e.g. eu-west)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "IsStaging",
+      "Label": "Is Staging",
+      "HelpText": "Determines whether this is staging or not.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "Prefix",
+      "Label": "Prefix",
+      "HelpText": "The prefix. If you are smart, your websites look like this:\n\n[prefix]-[websitename]-[region]\n\nThis allows you to deploy a lot of subdomains for a complete solution to multiple regions.\n\nIf you leave this empty, this field will use the _AzurePrefix_ variable.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WebDeployPackageStepName",
+      "Label": "Package step name",
+      "HelpText": "Name of the previously-deployed package step that contains the files that you want to deploy.\n\nIf you leave this empty, this field will default to 'Extract package'",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "GeertvanHorrik",
+  "$Meta": {
+    "ExportedAt": "2015-11-02T16:25:05.5160000-08:00",
+    "OctopusVersion": "3.0.20.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "webDeploy"
+}
diff --git a/src/step-templates/web-deploy-azure-convention/scriptbody.ps1 b/src/step-templates/web-deploy-azure-convention/scriptbody.ps1
new file mode 100644
index 000000000..e062a9127
--- /dev/null
+++ b/src/step-templates/web-deploy-azure-convention/scriptbody.ps1
@@ -0,0 +1,122 @@
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.Web.Deployment")
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+ 
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+function Test-LastExit($cmd) {
+    if ($LastExitCode -ne 0) {
+        Write-Host "##octopus[stderr-error]"
+        write-error "$cmd failed with exit code: $LastExitCode"
+    }
+}
+
+# Somehow we can only check for exactly 'True'
+$isStagingText = $OctopusParameters['IsStaging'];
+$isStaging = $isStagingText -eq "True"
+
+Write-Host "Is staging text: $isStagingText"
+Write-Host "Is staging: $isStaging"
+
+$stepName = $OctopusParameters['WebDeployPackageStepName']
+if ([string]::IsNullOrEmpty($stepName)) {
+	Write-Host "Defaulting to step name Extract package"
+	$stepName = "Extract package"
+}
+
+if ($isStaging) {
+	$stepName = $stepName + " - staging"
+}
+
+$stepPath = ""
+if (-not [string]::IsNullOrEmpty($stepName)) {
+    Write-Host "Finding path to package step: $stepName"
+    $stepPath = Find-InstallLocation $stepName
+} else {
+    $stepPath = Find-SingleInstallLocation
+}
+Write-Host "Package was installed to: $stepPath"
+
+Write-Host "##octopus[stderr-progress]"
+ 
+Write-Host "Publishing Website"
+
+$prefix = $OctopusParameters['Prefix']
+if ([string]::IsNullOrEmpty($prefix)) {
+	Write-Host "Prefix is empty, reading prefix from variable set using AzurePrefix"
+	$prefix = $OctopusParameters['AzurePrefix']
+}
+
+$websiteName = $OctopusParameters['WebsiteName']
+if ([string]::IsNullOrEmpty($websiteName)) {
+	Write-Host "WebsiteName is empty, reading website name from variable set using AzureName"
+	$websiteName = $OctopusParameters['AzureName']
+}
+
+$regionName = $OctopusParameters['RegionName']
+
+$publishUrl = "$prefix-$websiteName-$regionName"
+if ($isStaging) {
+	$publishUrl = $publishUrl + "-staging"
+}
+$publishUrl = $publishUrl + ".scm.azurewebsites.net:443"
+
+$userName = '$' + "$prefix-$websiteName-$regionName"
+if ($isStaging) {
+	$userName = $userName + "__staging"
+}
+
+$passwordKey = "AzurePassword-$regionName"
+if ($isStaging) {
+	$passwordKey = $passwordKey + "-staging"
+}
+
+Write-Host "Using the following values to publish:"
+Write-Host " * Publish url: $publishUrl"
+Write-Host " * Website name: $websiteName"
+Write-Host " * User name: $userName"
+Write-Host " * Password variable: $passwordKey"
+
+$destBaseOptions = new-object Microsoft.Web.Deployment.DeploymentBaseOptions
+$destBaseOptions.UserName = $userName
+$destBaseOptions.Password =  $OctopusParameters[$passwordKey]
+$destBaseOptions.ComputerName = "https://$publishUrl/msdeploy.axd?site=$websiteName"
+$destBaseOptions.AuthenticationType = "Basic"
+
+$syncOptions = new-object Microsoft.Web.Deployment.DeploymentSyncOptions
+#$syncOptions.WhatIf = $false
+$syncOptions.UseChecksum = $true
+
+$deploymentObject = [Microsoft.Web.Deployment.DeploymentManager]::CreateObject("contentPath", $stepPath)
+$deploymentObject.SyncTo("contentPath", $websiteName, $destBaseOptions, $syncOptions)
\ No newline at end of file
diff --git a/src/step-templates/web-deploy-publish-website-msdeploy/metadata.json b/src/step-templates/web-deploy-publish-website-msdeploy/metadata.json
new file mode 100644
index 000000000..74c4f4dd6
--- /dev/null
+++ b/src/step-templates/web-deploy-publish-website-msdeploy/metadata.json
@@ -0,0 +1,103 @@
+{
+  "Id": "ba8581a6-c463-40fb-ab98-3800e761b6f4",
+  "Name": "Web Deploy - Publish Website (MSDeploy)",
+  "Description": "Ensure that Web Deploy 3.5 is installed on the system. The installer is downloaded from http://www.iis.net/downloads/microsoft/web-deploy if required.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "PublishUrl",
+      "Label": "Publish Url",
+      "HelpText": "Publish url to use when publishing the website.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AllowUntrustedCertificate",
+      "Label": "Allow Untrusted Certificate",
+      "HelpText": "Allow untrusted certificate at the publish URL.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "WebsiteName",
+      "Label": "Website Name",
+      "HelpText": "Website name to use when publishing the website.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "Username to use when authenticating with the HTTPS server.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": null,
+      "HelpText": "Password to use when authenticating with the HTTPS server. You should create a sensitive variable in your project variables, and then bind this value.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "WebDeployPackageStepName",
+      "Label": "Package Step Name",
+      "HelpText": "Name of the previously-deployed package step that contains the files that you want to deploy.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "EnableAppOfflineRule",
+      "Label": "Enable App Offline Rule",
+      "HelpText": "Enables the App Offline Rule. [See here for more details](http://www.iis.net/learn/publish/deploying-application-packages/taking-an-application-offline-before-publishing)",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "SkipSyncPaths",
+      "Label": "Skip Paths From Sync",
+      "HelpText": "Semi-colon separated, absolute reg-ex paths to skip/not-sync during deployment. Handy for folders that you don't want deleted etc. (Escape slashes)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "PreserveApp_Data",
+      "Label": "Preserve App_Data",
+      "HelpText": "The App_Data and its files will not be deleted when this option is enabled",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2015-07-25T15:00:43.2040000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "webDeploy"
+}
diff --git a/src/step-templates/web-deploy-publish-website-msdeploy/scriptbody.ps1 b/src/step-templates/web-deploy-publish-website-msdeploy/scriptbody.ps1
new file mode 100644
index 000000000..f434e58ef
--- /dev/null
+++ b/src/step-templates/web-deploy-publish-website-msdeploy/scriptbody.ps1
@@ -0,0 +1,124 @@
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.Web.Deployment")
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+ 
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+function Test-LastExit($cmd) {
+    if ($LastExitCode -ne 0) {
+        Write-Host "##octopus[stderr-error]"
+        write-error "$cmd failed with exit code: $LastExitCode"
+    }
+}
+
+$stepName = $OctopusParameters['WebDeployPackageStepName']
+
+$stepPath = ""
+if (-not [string]::IsNullOrEmpty($stepName)) {
+    Write-Host "Finding path to package step: $stepName"
+    $stepPath = Find-InstallLocation $stepName
+} else {
+    $stepPath = Find-SingleInstallLocation
+}
+Write-Host "Package was installed to: $stepPath"
+
+Write-Host "##octopus[stderr-progress]"
+ 
+$websiteName = $OctopusParameters['WebsiteName']
+$publishUrl = $OctopusParameters['PublishUrl']
+
+$destBaseOptions = new-object Microsoft.Web.Deployment.DeploymentBaseOptions
+$destBaseOptions.UserName = $OctopusParameters['Username']
+$destBaseOptions.Password = $OctopusParameters['Password']
+$destBaseOptions.ComputerName = "https://$publishUrl/msdeploy.axd?site=$websiteName"
+$destBaseOptions.AuthenticationType = "Basic"
+
+$syncOptions = new-object Microsoft.Web.Deployment.DeploymentSyncOptions
+$syncOptions.WhatIf = $false
+$syncOptions.UseChecksum = $true
+
+$enableAppOfflineRule = $OctopusParameters['EnableAppOfflineRule']
+if($enableAppOfflineRule -eq $true)
+{
+    $appOfflineRule = $null
+    $availableRules = [Microsoft.Web.Deployment.DeploymentSyncOptions]::GetAvailableRules()
+    if (!$availableRules.TryGetValue('AppOffline', [ref]$appOfflineRule))
+    {
+        throw "Failed to find AppOffline Rule"
+    }
+    else
+    {
+        $syncOptions.Rules.Add($appOfflineRule)
+        Write-Host "Enabled AppOffline Rule"
+    }
+}
+
+$preserveAppData = [boolean]::Parse($OctopusParameters['PreserveApp_Data'])
+
+if ($preserveAppData -eq $true) {
+    
+    Write-Host "Skipping delete actions on App_Data"
+    $skipAppDataFiles = new-object Microsoft.Web.Deployment.DeploymentSkipRule("appDataFiles", "Delete", "filePath", "\App_Data\.*", $null)
+    $skipAppDataDirectories = new-object Microsoft.Web.Deployment.DeploymentSkipRule("appDataDirectories", "Delete", "dirPath", "\App_Data(\.*|$)", $null)
+
+    $syncOptions.Rules.Add($skipAppDataFiles);
+    $syncOptions.Rules.Add($skipAppDataDirectories);
+}
+
+$SkipSyncPaths = $OctopusParameters['SkipSyncPaths']
+if ([string]::IsNullOrEmpty($SkipSyncPaths) -eq $false)
+{
+    $skipPaths = $SkipSyncPaths.Split(";", [System.StringSplitOptions]::RemoveEmptyEntries)
+    foreach($item in $skipPaths) {
+        $index = $skipPaths.IndexOf($item)
+        Write-Host "Skipping sync of AbsolutePath: $item."
+        $name = "SkipDirective$index"
+        $value = "absolutePath=$item"
+        $skipDirective = new-object Microsoft.Web.Deployment.DeploymentSkipDirective($name, $value)
+        $destBaseOptions.SkipDirectives.Add($skipDirective)
+    }
+}
+
+if ($OctopusParameters['AllowUntrustedCertificate'] -eq $true) {
+    [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { return $true; }
+}
+
+Write-Host "Publishing Website"
+$deploymentObject = [Microsoft.Web.Deployment.DeploymentManager]::CreateObject("contentPath", $stepPath)
+
+$changes = $deploymentObject.SyncTo("contentPath", $websiteName, $destBaseOptions, $syncOptions)
+
+#Write out all the changes.
+$changes | Select-Object -Property *
\ No newline at end of file
diff --git a/step-templates/windows-add-back-connection-host-name.json b/src/step-templates/windows-add-back-connection-host-name/metadata.json
similarity index 63%
rename from step-templates/windows-add-back-connection-host-name.json
rename to src/step-templates/windows-add-back-connection-host-name/metadata.json
index 98cc58f61..4076be665 100644
--- a/step-templates/windows-add-back-connection-host-name.json
+++ b/src/step-templates/windows-add-back-connection-host-name/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$hostName = $OctopusParameters['HostName']\r\n\r\n$key = 'HKLM:\\System\\CurrentControlSet\\Control\\Lsa\\MSV1_0\\'\r\n\r\n$hostNames = get-itemproperty $key -Name BackConnectionHostNames -ErrorAction SilentlyContinue\r\n\r\nIf ($hostNames -eq $null) { new-itemproperty $key -Name BackConnectionHostNames -Value $hostName -PropertyType MultiString }\r\n\r\nElseIf ($hostNames.BackConnectionHostNames -notcontains  $hostName) { set-itemproperty $key -Name BackConnectionHostNames -Value ($hostNames.BackConnectionHostNames + $hostName) }\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-06-30T11:18:08.029+00:00",
+    "ExportedAt": "2015-06-30T04:18:08.0290000-07:00",
     "OctopusVersion": "2.6.0.778",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-add-back-connection-host-name/scriptbody.ps1 b/src/step-templates/windows-add-back-connection-host-name/scriptbody.ps1
new file mode 100644
index 000000000..40fe92b05
--- /dev/null
+++ b/src/step-templates/windows-add-back-connection-host-name/scriptbody.ps1
@@ -0,0 +1,9 @@
+$hostName = $OctopusParameters['HostName']
+
+$key = 'HKLM:\System\CurrentControlSet\Control\Lsa\MSV1_0\'
+
+$hostNames = get-itemproperty $key -Name BackConnectionHostNames -ErrorAction SilentlyContinue
+
+If ($hostNames -eq $null) { new-itemproperty $key -Name BackConnectionHostNames -Value $hostName -PropertyType MultiString }
+
+ElseIf ($hostNames.BackConnectionHostNames -notcontains  $hostName) { set-itemproperty $key -Name BackConnectionHostNames -Value ($hostNames.BackConnectionHostNames + $hostName) }
diff --git a/src/step-templates/windows-add-poll-endpoint-task/metadata.json b/src/step-templates/windows-add-poll-endpoint-task/metadata.json
new file mode 100644
index 000000000..63b622449
--- /dev/null
+++ b/src/step-templates/windows-add-poll-endpoint-task/metadata.json
@@ -0,0 +1,67 @@
+{
+  "Id": "0ad0ad00-adad-adad-adad-000000000002",
+  "Name": "Windows - Add poll rest endpoint scheduled task",
+  "Description": "Adds a scheduled task that polls a specified endpoint at a specific interval using the provided HTTP method",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Name": "AD_PollRestEndpoint_Uri",
+      "Label": "Endpoint Uri",
+      "HelpText": "The endpoint uri to poll",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_PollRestEndpoint_Name",
+      "Label": "Task name",
+      "HelpText": "Task name without any special characters",
+      "DefaultValue": "Polling task for endpoint",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_PollRestEndpoint_HttpMethod",
+      "Label": "HTTP Method",
+      "HelpText": "The HTTP method to be used for calling the endpoint",
+      "DefaultValue": "GET",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "GET\nPOST\nPUT\nDELETE\nPATCH"
+      }
+    },
+    {
+      "Name": "AD_PollRestEndpoint_Interval",
+      "Label": "Polling interval",
+      "HelpText": "Polling interval in seconds",
+      "DefaultValue": "60",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "AD_PollRestEndpoint_Attempts",
+      "Label": "Attempts",
+      "HelpText": "Number of retry attempts in case the scheduling fails",
+      "DefaultValue": "5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "anatolie-darii",
+  "$Meta": {
+    "ExportedAt": "2018-07-17T10:18:23.0030000Z",
+    "OctopusVersion": "2018.2.8",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-add-poll-endpoint-task/scriptbody.ps1 b/src/step-templates/windows-add-poll-endpoint-task/scriptbody.ps1
new file mode 100644
index 000000000..56aaaf3dc
--- /dev/null
+++ b/src/step-templates/windows-add-poll-endpoint-task/scriptbody.ps1
@@ -0,0 +1,99 @@
+# Running outside octopus
+Param(
+    [string] $AD_PollRestEndpoint_Uri,
+    [string] $AD_PollRestEndpoint_Name = "Polling task for endpoint",
+    [string] $AD_PollRestEndpoint_HttpMethod = "GET",
+    [string] $AD_PollRestEndpoint_Interval = 60,
+    [Int16] $AD_PollRestEndpoint_Attempts = 5,
+    [switch] $WhatIf
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($null -ne $OctopusParameters) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($null -eq $result) {
+        $variable = Get-Variable $Name -EA SilentlyContinue
+        if ($null -ne $variable) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($null -eq $result) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        }
+        else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+function Execute(
+    [Parameter(Mandatory = $true)][string] $Uri,
+    [Parameter(Mandatory = $false)][string] $Name = "Polling task for endpoint",
+    [Parameter(Mandatory = $false)][string] $HttpMethod = "GET",
+    [Parameter(Mandatory = $false)][string] $Interval = 60,
+    [Parameter(Mandatory = $false)][Int16] $Attempts = 5
+) {
+    $attemptCount = 0
+    $operationIncomplete = $true
+    $maxFailures = $Attempts
+    $sleepBetweenFailures = 1
+
+    $script = '-noprofile -executionpolicy bypass -command "& { Invoke-RestMethod -Uri ' + $Uri + ' -Method ' + $HttpMethod + ' }"'
+    $repeat = (New-TimeSpan -Seconds $Interval)
+
+    $action = New-ScheduledTaskAction "powershell.exe" -Argument  "$script"
+    $duration = (New-TimeSpan -Days 9999)
+    $trigger = New-ScheduledTaskTrigger -Once -At (Get-Date).Date -RepetitionInterval $repeat -RepetitionDuration $duration
+    $settings = New-ScheduledTaskSettingsSet -StartWhenAvailable -DontStopOnIdleEnd
+
+    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {
+        $attemptCount = ($attemptCount + 1)
+        if ($attemptCount -ge 2) {
+            Write-Output "Waiting for $sleepBetweenFailures seconds before retrying..."
+            Start-Sleep -s $sleepBetweenFailures
+            Write-Output "Retrying..."
+            $sleepBetweenFailures = ($sleepBetweenFailures * 2)
+        }
+        try {
+            $task = Get-ScheduledTask -TaskName $Name -ErrorAction SilentlyContinue
+            Write-Output $task
+            $msg = "Task '$Name'"
+            if ($null -ne $task) {
+                Write-Output "$msg already exists - DELETING..."
+                if (-Not ($WhatIf)) {
+                    Unregister-ScheduledTask -TaskName $name -Confirm:$false
+                }
+                Write-Output "$msg - DELETED"
+            }
+            Write-Output "$msg - ADDING..."
+            if (-Not ($WhatIf)) {
+                Register-ScheduledTask -TaskName $Name -Action $action -Trigger $trigger -RunLevel Highest -Settings $settings -User "System"
+            }
+            Write-Output "$msg - ADDED"
+            $operationIncomplete = $false
+        }
+        catch [System.Exception] {
+            if ($attemptCount -lt ($maxFailures)) {
+                Write-Host ("Attempt $attemptCount of $maxFailures failed: " + $_.Exception.Message)
+            }
+            else {
+                throw
+            }
+        }
+    }
+}
+& Execute `
+(Get-Param 'AD_PollRestEndpoint_Uri' -Required)`
+(Get-Param 'AD_PollRestEndpoint_Name')`
+(Get-Param 'AD_PollRestEndpoint_HttpMethod')`
+(Get-Param 'AD_PollRestEndpoint_Interval')`
+(Get-Param 'AD_PollRestEndpoint_Attempts')
diff --git a/src/step-templates/windows-add-users-to-local-groups/metadata.json b/src/step-templates/windows-add-users-to-local-groups/metadata.json
new file mode 100644
index 000000000..54f9e4de8
--- /dev/null
+++ b/src/step-templates/windows-add-users-to-local-groups/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "ed204305-3399-4ffa-8566-a62da4e36641",
+  "Name": "Windows - Add Users to Local Groups",
+  "Description": "Add a list of users to a list of Local Groups",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "UserNames",
+      "Label": "User Names",
+      "HelpText": "List of user names separated by ;",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "GroupNames",
+      "Label": "Group Names",
+      "HelpText": "list of group names separated by ;",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-05-19T12:47:40.3300000-07:00",
+  "LastModifiedBy": "josh3ennett",
+  "$Meta": {
+    "ExportedAt": "2015-05-19T12:57:11.0480000-07:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-add-users-to-local-groups/scriptbody.ps1 b/src/step-templates/windows-add-users-to-local-groups/scriptbody.ps1
new file mode 100644
index 000000000..b8ad9e8ab
--- /dev/null
+++ b/src/step-templates/windows-add-users-to-local-groups/scriptbody.ps1
@@ -0,0 +1,140 @@
+# Running outside octopus
+param(
+    [string]$UserNames,
+    [string]$GroupNames
+) 
+
+$ErrorActionPreference = "Stop" 
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function IsValidUser ( $user ) {
+    
+    if($user.Guid -and ($user.SchemaClassName -eq "User")){
+        return $true
+    }
+    
+    Write-Host "ERROR - `"WinNT://$($user.Name)`" not found"
+    return $false
+}
+
+function IsValidGroup ( $group ) {
+    
+    if( $group.Guid -and ($group.SchemaClassName -eq "Group") ) {
+        Write-Host "the group $($group.Guid) was found" -ForegroundColor green
+        return $true
+    }
+
+    Write-Host "ERROR - `"WinNT://$($Env:COMPUTERNAME)/$($group.Name)`" not found" -ForegroundColor red
+    return $false
+}
+
+function IsUserInGroup($user, $groupName){
+
+    Write-Host "Checking to see if $($user.Name) is in $($group.Name)"
+
+    if(!(isValidGroup $group)){
+        throw "Could not find group $($group.Name)"
+    }
+
+    $members = @($group.psbase.Invoke("Members")) 
+    
+    Write-Host "There are $($members.Count) members in $($group.Name)"
+    
+    $isInGroup = ($members | foreach {$_.GetType().InvokeMember("Name", 'GetProperty', $null, $_, $null)}) -contains "$($user.Name)"
+        
+    if($isInGroup) {
+        Write-Host "User $($user.Name) is already a part of `"$($group.Name)`"" -ForegroundColor Yellow
+    } else {
+        Write-Host "User $($user.Name) is not a part of `"$($group.Name)`"" -ForegroundColor Green
+    }
+    
+    return $isInGroup
+}
+
+function FormatUserNameForQuery([string]$userName)
+{
+    return $userName.Trim().Replace("\", "/")
+}
+
+& {
+    param(
+        [string]$UserNames,
+        [string]$GroupNames
+    ) 
+
+    Write-Host "Windows - Add Users to Local Groups"
+    Write-Host "UserNames: $UserNames"
+    Write-Host "GroupNames: $GroupNames"
+
+    $UserNames.Split(";") | foreach {
+        
+        $userName = FormatUserNameForQuery $_
+        $user = [ADSI]"WinNT://$userName"
+        
+        $userDoesNotExist = !(IsValidUser $user)
+        
+        if( $userDoesNotExist )
+        {
+            throw "User $userName was not found"
+        }
+
+        Write-Host "Current user $userName"
+
+        $GroupNames.Split(";") | foreach {
+            
+            $groupName = $_.Trim()
+            $group = [ADSI]"WinNT://$Env:COMPUTERNAME/$groupName"
+           
+            $groupDoesNotExist = !(IsValidGroup $group)
+            
+            if($groupDoesNotExist)
+            {
+                throw "Group $groupName was not found"
+            }
+
+            Write-Host "Current group $groupName"
+
+            $isInGroup = IsUserInGroup $user $group
+
+            if( $isInGroup ) {
+                
+                Write-Host "Skipping..."
+                
+                continue
+            }
+
+            Write-Host "Adding $userName to $groupName" -ForegroundColor Cyan
+            
+            $group.psbase.Invoke("Add",$user.Path)
+
+            Write-Host "SUCCESS - added $userName to $groupName" -ForegroundColor Green
+        }
+    }
+
+ } `
+ (Get-Param 'UserNames' -Required) `
+ (Get-Param 'GroupNames' -Required)
\ No newline at end of file
diff --git a/src/step-templates/windows-apply-windows-updates/metadata.json b/src/step-templates/windows-apply-windows-updates/metadata.json
new file mode 100644
index 000000000..0d9aaccf5
--- /dev/null
+++ b/src/step-templates/windows-apply-windows-updates/metadata.json
@@ -0,0 +1,34 @@
+{
+  "Id": "3472f207-3934-44db-a4ac-1390167cf7ed",
+  "Name": "Windows - Apply Windows Updates",
+  "Description": "Step template to check for and apply Windows Updates with optional automatic reboot.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Author": "twerthi",
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.EnabledFeatures": ""
+  },
+  "Parameters": [
+    {
+      "Id": "004de404-ec52-47d3-ad49-ea96224182c6",
+      "Name": "windowsUpdateAutoReboot",
+      "Label": "Auto reboot",
+      "HelpText": "Check the box to allow an automatic reboot. **Warning**: using this option will cause the machine to reboot after installing the first update that requires a reboot.  If there are multiple updates that require a reboot, the rest of the updates will not be installed.",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2020-07-22T23:47:53.8590000Z",
+    "OctopusVersion": "2020.3.1",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-apply-windows-updates/scriptbody.ps1 b/src/step-templates/windows-apply-windows-updates/scriptbody.ps1
new file mode 100644
index 000000000..7d3761fe3
--- /dev/null
+++ b/src/step-templates/windows-apply-windows-updates/scriptbody.ps1
@@ -0,0 +1,78 @@
+function Get-NugetPackageProviderNotInstalled
+{
+	# See if the nuget package provider has been installed
+    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))
+}
+
+function Get-ModuleInstalled
+{
+    # Define parameters
+    param(
+        $PowerShellModuleName
+    )
+
+    # Check to see if the module is installed
+    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))
+    {
+        # It is installed
+        return $true
+    }
+    else
+    {
+        # Module not installed
+        return $false
+    }
+}
+
+
+# Force use of TLS 1.2
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$autoReboot = [System.Convert]::ToBoolean("$windowsUpdateAutoReboot")
+
+# Check to see if the NuGet package provider is installed
+if ((Get-NugetPackageProviderNotInstalled) -ne $false)
+{
+  # Display that we need the nuget package provider
+  Write-Host "Nuget package provider not found, installing ..."
+
+  # Install Nuget package provider
+  Install-PackageProvider -Name Nuget -Force
+
+  Write-Output "Nuget package provider succesfully installed ..."
+}
+
+
+Write-Output "Checking for PowerShell module PSWindowsUpdate ..."
+
+if ((Get-ModuleInstalled -PowerShellModuleName "PSWindowsUpdate") -ne $true)
+{
+	Write-Output "PSWindowsUpdate not found, installing ..."
+    
+    # Install PSWindowsUpdate
+    Install-Module PSWindowsUpdate -Force
+    
+    Write-Output "Installation of PSWindowsUpdate complete ..."
+}
+
+Write-Output "Checking for updates ..."
+
+$windowsUpdates = Get-WindowsUpdate 
+
+# Check to see if there's anything to install
+if ($windowsUpdates.Count -gt 0)
+{
+	Write-Output "Installing updates ..."
+    if ($autoReboot)
+    {
+		Install-WindowsUpdate -AcceptAll -AutoReboot
+    }
+    else
+    {
+    	Install-WindowsUpdate -AcceptAll
+    }
+}
+else
+{
+	Write-Output "There are no updates available."
+}
\ No newline at end of file
diff --git a/src/step-templates/windows-certificate-grant-read-access/metadata.json b/src/step-templates/windows-certificate-grant-read-access/metadata.json
new file mode 100644
index 000000000..73874266d
--- /dev/null
+++ b/src/step-templates/windows-certificate-grant-read-access/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "cf6f35bf-b3e0-4285-98be-dcb509ab2ef9",
+  "Name": "Windows  - Certificate Grant Read Access",
+  "Description": "Grant read access to certificate for a specific user",
+  "ActionType": "Octopus.Script",
+  "Version": 12,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "certCN",
+      "Label": "Certificate Name",
+      "HelpText": "The CN of the Certificate",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "userName",
+      "Label": "User name",
+      "HelpText": "The Windows user",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-01-30T06:37:16.9270000-08:00",
+  "LastModifiedBy": "ARBNIK@skandianet.org",
+  "$Meta": {
+    "ExportedAt": "2015-01-30T06:39:14.2120000-08:00",
+    "OctopusVersion": "2.6.0.778",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-certificate-grant-read-access/scriptbody.ps1 b/src/step-templates/windows-certificate-grant-read-access/scriptbody.ps1
new file mode 100644
index 000000000..6d40febbe
--- /dev/null
+++ b/src/step-templates/windows-certificate-grant-read-access/scriptbody.ps1
@@ -0,0 +1,36 @@
+# $certCN is the identifiying CN for the certificate you wish to work with
+# The selection also sorts on Expiration date, just in case there are old expired certs still in the certificate store.
+# Make sure we work with the most recent cert
+    
+    Try
+    {
+        $WorkingCert = Get-ChildItem CERT:\LocalMachine\My |where {$_.Subject -match $certCN} | sort $_.NotAfter -Descending | select -first 1 -erroraction STOP
+        $TPrint = $WorkingCert.Thumbprint
+        $rsaFile = $WorkingCert.PrivateKey.CspKeyContainerInfo.UniqueKeyContainerName
+        if($TPrint){
+            Write-Host "Found certificate named $certCN with thumbprint $TPrint"
+        }
+        else{
+            throw "Error: unable to locate certificate for $($CertCN)"
+        }
+    }
+    Catch
+    {
+      throw "Error: unable to locate certificate for $($CertCN)"
+    }
+    $keyPath = "$env:SystemDrive\ProgramData\Microsoft\Crypto\RSA\MachineKeys\"
+    $fullPath=$keyPath+$rsaFile
+    $acl=Get-Acl -Path $fullPath
+    $permission=$userName,"Read","Allow"
+    $accessRule=new-object System.Security.AccessControl.FileSystemAccessRule $permission
+    $acl.AddAccessRule($accessRule)
+    Try 
+    {
+        Write-Host "Granting read access for user $userName on $certCN"
+     Set-Acl $fullPath $acl
+      Write-Host "Success: ACL set on certificate"
+    }
+    Catch
+    {
+      throw "Error: unable to set ACL on certificate"
+    }
\ No newline at end of file
diff --git a/src/step-templates/windows-check-net-core-framework-version/metadata.json b/src/step-templates/windows-check-net-core-framework-version/metadata.json
new file mode 100644
index 000000000..d6d3db8ac
--- /dev/null
+++ b/src/step-templates/windows-check-net-core-framework-version/metadata.json
@@ -0,0 +1,55 @@
+{
+  "Id": "929ff903-29de-4217-b6a9-83fbfd477e11",
+  "Name": ".NET Core - Check .NET Core Framework Version",
+  "Description": "Check if given .NET Core framework version (or greater) is installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "f386deb4-36fb-4116-ad4a-5bceed89fa5b",
+      "Name": "TargetVersion",
+      "Label": "Target .NET Core framework version",
+      "HelpText": "The target .NET Core framework version you expect to be installed in the machine. For example, 2.0.5.",
+      "DefaultValue": "2.0.5",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "7312dd89-2174-47d7-bdfd-2745fb812f58",
+      "Name": "Exact",
+      "Label": "Exact",
+      "HelpText": "If you check \"Exact\", it means the installed .NET Core framework version MUST match target version.\n\nOtherwise, as long as the installed .NET Coreframework version is greater than or equal to target version, the check will pass.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "4f0b738b-8f06-4c93-a27f-49b3cd06ea9a",
+      "Name": "CheckASPdotNETCore",
+      "Label": "Check ASP.NET Core Module",
+      "HelpText": "If you check \"Check ASP.NET Core Module\", it means this step will check if ASP.NET Core module is installed in the host or not.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2018-06-13T08:43:39.3650000Z",
+    "OctopusVersion": "2018.4.1",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "FinnianDempsey",
+  "Category": "dotnetcore"
+}
diff --git a/src/step-templates/windows-check-net-core-framework-version/scriptbody.ps1 b/src/step-templates/windows-check-net-core-framework-version/scriptbody.ps1
new file mode 100644
index 000000000..c91294f1d
--- /dev/null
+++ b/src/step-templates/windows-check-net-core-framework-version/scriptbody.ps1
@@ -0,0 +1,62 @@
+$ErrorActionPreference = "Stop" 
+function Get-Parameter($Name, $Default, [switch]$Required) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Get-DotNetCoreFrameworkVersions() {
+    $dotNetCoreVersions = @()
+    if(Test-Path "$env:programfiles/dotnet/shared/Microsoft.NETCore.App") {
+        $dotNetCoreVersions = (ls "$env:programfiles/dotnet/shared/Microsoft.NETCore.App").Name
+    }
+    return $dotNetCoreVersions
+}
+
+function Get-AspDotNetCoreRuntimeVersions() {
+    $aspDotNetCoreRuntimeVersions = @()
+    $DotNETCoreUpdatesPath = "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Updates\.NET Core"
+    $DotNETUpdatesPath = "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Updates\.NET"
+
+    if (Test-Path "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Updates\.NET Core") {
+	    $DotNetCoreItems = (Get-Item -Path $DotNETCoreUpdatesPath).GetSubKeyNames()
+    }
+    if (Test-Path "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Updates\.NET") {
+        $DotNetItems = (Get-Item -Path $DotNETUpdatesPath).GetSubKeyNames()
+    }
+	$aspDotNetCoreRuntimeVersions = $DotNetCoreItems + $DotNetItems | where { $_ -match "^Microsoft (ASP)?\.NET Core (?<version>[\d\.]+(.*?)?) "} | foreach { $Matches['version'] }
+
+    return $aspDotNetCoreRuntimeVersions
+}
+
+$targetVersion = (Get-Parameter "TargetVersion" -Required).Trim()
+$exact = [boolean]::Parse((Get-Parameter "Exact" -Required))
+$CheckASPdotNETCore = [boolean]::Parse((Get-Parameter "CheckASPdotNETCore" -Required))
+
+$matchedVersions = Get-DotNetCoreFrameworkVersions | Where-Object { if ($exact) { $_ -eq $targetVersion } else { $_ -ge $targetVersion }  }
+if (!$matchedVersions) { 
+    throw "Can't find .NET Core Runtime $targetVersion installed in the machine."
+}
+
+$matchedVersions | foreach { Write-Host "Found .NET Core Runtime $_ installed in the machine." }
+
+if ($CheckASPdotNETCore) {
+    $matchedAspVersions = Get-AspDotNetCoreRuntimeVersions
+    if (!$matchedAspVersions) {
+        throw "Can't find ASP.NET Core Runtime installed in the machine."
+    }
+
+    $matchedAspVersions | foreach { Write-Host "Found ASP.NET Core Runtime $_ installed in the machine." }
+}
\ No newline at end of file
diff --git a/src/step-templates/windows-check-net-framework-version/metadata.json b/src/step-templates/windows-check-net-framework-version/metadata.json
new file mode 100644
index 000000000..d37d2309b
--- /dev/null
+++ b/src/step-templates/windows-check-net-framework-version/metadata.json
@@ -0,0 +1,45 @@
+{
+  "Id": "b15c6b3d-20a1-4059-b0e4-75bef1ff41d5",
+  "Name": ".NET - Check .NET Framework Version",
+  "Description": "Check if given .NET framework version (or greater) is installed.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "CommunityActionTemplateId": "CommunityActionTemplates-561",
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.RunOnServer": "false"
+  },
+  "Parameters": [
+    {
+      "Id": "e902b08b-2fc3-4f62-aec0-5225533cace8",
+      "Name": "TargetVersion",
+      "Label": "Target .NET framework version",
+      "HelpText": "The target .NET framework version you expect to be installed in the machine. For example, 4.5.2.",
+      "DefaultValue": "4.5.2",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "205e297b-c72c-4d9b-a6fe-9a20ab62d5b0",
+      "Name": "Exact",
+      "Label": "Exact",
+      "HelpText": "If you check \"Exact\", it means the installed .NET framework version MUST match target version.\n\nOtherwise, as long as the installed .NET framework version is greater than or equal to target version, the check will pass.",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "$Meta": {
+    "ExportedAt": "2019-06-06T07:39:33.4090000Z",
+    "OctopusVersion": "2018.4.1",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "JeremyCamplin",
+  "Category": "aspnet"
+}
diff --git a/src/step-templates/windows-check-net-framework-version/scriptbody.ps1 b/src/step-templates/windows-check-net-framework-version/scriptbody.ps1
new file mode 100644
index 000000000..3a4904b81
--- /dev/null
+++ b/src/step-templates/windows-check-net-framework-version/scriptbody.ps1
@@ -0,0 +1,69 @@
+# This script is based on MSDN: https://msdn.microsoft.com/en-us/library/hh925568
+
+$releaseVersionMapping = @{
+    378389 = '4.5'     # 4.5
+    378675 = '4.5.1'   # 4.5.1 installed with Windows 8.1
+    378758 = '4.5.1'   # 4.5.1 installed on Windows 8, Windows 7 SP1, or Windows Vista SP2
+    379893 = '4.5.2'   # 4.5.2
+    393295 = '4.6'     # 4.6 installed with Windows 10
+    393297 = '4.6'     # 4.6 installed on all other Windows OS versions
+    394254 = '4.6.1'   # 4.6.1 installed on Windows 10
+    394271 = '4.6.1'   # 4.6.1 installed on all other Windows OS versions
+    394802 = '4.6.2'   # 4.6.2 installed on Windows 10
+    394806 = '4.6.2'   # 4.6.2 installed on all other Windows OS versions
+    460798 = '4.7'     # 4.7 installed on Windows 10
+    460805 = '4.7'     # 4.7 installed on all other Windows OS versions
+    461308 = '4.7.1'   # 4.7.1 installed on Windows 10
+    461310 = '4.7.1'   # 4.7.1 installed on all other Windows OS versions
+    461808 = '4.7.2'   # 4.7.2 installed on Windows 10
+    461814 = '4.7.2'   # 4.7.2 installed on all other Windows OS versions
+    528040 = '4.8'     # 4.8 installed on Windows 10
+    528049 = '4.8'     # 4.8 installed on all other Windows OS versions1
+    528372 = '4.8'     # 4.8 Windows 10 May 2020 Update
+    528449 = '4.8'     # 4.8 Windows 11 and Windows Server 2022
+    533320 = '4.8.1'   # 4.8 Windows 11 September 2022 Release and Windows 11 October 2023 Release
+    533325 = '4.8.1'   # 4.8 all other OS versions
+}
+
+function Get-DotNetFrameworkVersions() {
+    $dotNetVersions = @()
+    if ($baseKey = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey('LocalMachine', '')) {
+        # To find .NET Framework versions (.NET Framework 1-4)$dotNetVersions
+        if ($ndpKey = $baseKey.OpenSubKey('SOFTWARE\Microsoft\NET Framework Setup\NDP')) {
+            foreach ($versionKeyName in $ndpKey.GetSubKeyNames()) {
+                if ($versionKeyName -match 'v[2|3]') {
+                    $versionKey = $ndpKey.OpenSubKey($versionKeyName)
+                    if ($versionKey.GetValue('Version', '') -ne '') {
+                        $version = [version] ($versionKey.GetValue('Version'))
+                        $dotNetVersions += "$($version.Major).$($version.Minor)"
+                    }
+                }
+            }
+        
+            # for .NET 4.0
+            if ($ndp40Key = $ndpKey.OpenSubKey("v4.0")) {
+                foreach ($subKeyName in $ndp40Key.GetSubKeyNames()) {
+                    $versionKey = $ndp40Key.OpenSubKey($subKeyName)
+                    $version = [version]($versionKey.GetValue('Version', ''))
+                    $dotNetVersions += "$($version.Major).$($version.Minor)"
+                }
+            }
+        }
+
+        # To find .NET Framework versions (.NET Framework 4.5 and later)
+        if ($ndp4Key = $baseKey.OpenSubKey('SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full')) {
+            $releaseKey = $ndp4Key.GetValue('Release')
+            $dotNetVersions += $releaseVersionMapping[$releaseKey]
+        }
+    }
+    return $dotNetVersions
+}
+
+$targetVersion = $OctopusParameters['TargetVersion'].Trim()
+$exact = [boolean]::Parse($OctopusParameters['Exact'])
+
+$matchedVersions = Get-DotNetFrameworkVersions | Where-Object { if ($exact) { $_ -eq $targetVersion } else { $_ -ge $targetVersion } }
+if (!$matchedVersions) { 
+    throw "Can't find .NET $targetVersion installed in the machine."
+}
+$matchedVersions | foreach { Write-Host "Found .NET $_ installed in the machine." }
\ No newline at end of file
diff --git a/step-templates/windows-create-eventsource.json b/src/step-templates/windows-create-eventsource/metadata.json
similarity index 69%
rename from step-templates/windows-create-eventsource.json
rename to src/step-templates/windows-create-eventsource/metadata.json
index b9cc816e5..be36e7ecb 100644
--- a/step-templates/windows-create-eventsource.json
+++ b/src/step-templates/windows-create-eventsource/metadata.json
@@ -1,40 +1,40 @@
-{
-  "Id": "6047c2b5-95f7-46db-85b4-d970c1586f94",
-  "Name": "Windows - Create Event Source",
-  "Description": "Establishes the specified source name as a valid event source for writing entries to a log on the local computer. \n\nThis method can also create a new custom log on the local computer.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$sourceName = $OctopusParameters[\"EventSourceName\"]\r\n$logName = $OctopusParameters[\"EventLogName\"]\r\n\r\n$sourceExists = [System.Diagnostics.EventLog]::SourceExists($sourceName)\r\nif($sourceExists) {\r\n\tWrite-Output \"Event source $sourceName already exist.\"\r\n\treturn\r\n}\r\n\r\n[System.Diagnostics.EventLog]::CreateEventSource($sourceName, $logName)",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "EventSourceName",
-      "Label": "Source name",
-      "HelpText": "The source name by which the application is registered on the local computer.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "EventLogName",
-      "Label": "Log name",
-      "HelpText": "The name of the log the source's entries are written to. Possible values include Application, System, or a custom event log.",
-      "DefaultValue": "Application",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2017-01-20T08:46:45.849+01:00",
-  "LastModifiedBy": "HumanPrinter",
-  "$Meta": {
-    "ExportedAt": "2015-06-20T10:04:09.578+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
+{
+  "Id": "6047c2b5-95f7-46db-85b4-d970c1586f94",
+  "Name": "Windows - Create Event Source",
+  "Description": "Establishes the specified source name as a valid event source for writing entries to a log on the local computer. \n\nThis method can also create a new custom log on the local computer.",
+  "ActionType": "Octopus.Script",
+  "Version": 5,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "EventSourceName",
+      "Label": "Source name",
+      "HelpText": "The source name by which the application is registered on the local computer.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "EventLogName",
+      "Label": "Log name",
+      "HelpText": "The name of the log the source's entries are written to. Possible values include Application, System, or a custom event log.",
+      "DefaultValue": "Application",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2017-01-19T23:46:45.8490000-08:00",
+  "LastModifiedBy": "HumanPrinter",
+  "$Meta": {
+    "ExportedAt": "2015-06-20T03:04:09.5780000-07:00",
+    "OctopusVersion": "2.6.5.1010",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-create-eventsource/scriptbody.ps1 b/src/step-templates/windows-create-eventsource/scriptbody.ps1
new file mode 100644
index 000000000..3e46757a2
--- /dev/null
+++ b/src/step-templates/windows-create-eventsource/scriptbody.ps1
@@ -0,0 +1,10 @@
+$sourceName = $OctopusParameters["EventSourceName"]
+$logName = $OctopusParameters["EventLogName"]
+
+$sourceExists = [System.Diagnostics.EventLog]::SourceExists($sourceName)
+if($sourceExists) {
+	Write-Output "Event source $sourceName already exist."
+	return
+}
+
+[System.Diagnostics.EventLog]::CreateEventSource($sourceName, $logName)
\ No newline at end of file
diff --git a/step-templates/windows-create-shortcut.json b/src/step-templates/windows-create-shortcut/metadata.json
similarity index 64%
rename from step-templates/windows-create-shortcut.json
rename to src/step-templates/windows-create-shortcut/metadata.json
index 35b9001f2..6c24a7bd4 100644
--- a/step-templates/windows-create-shortcut.json
+++ b/src/step-templates/windows-create-shortcut/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 7,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$destination = $OctopusParameters['ShortcutDestination']\n$targetFilePath = $OctopusParameters['TargetFilePath']\n$shortcutName = $OctopusParameters['Shortcutname']\n\n#Use Custom or predefined path\n$shortcutDestination = \n    if($destination -eq \"PublicDesktop\") { \"$env:PUBLIC\\Desktop\" }\n    elseif($destination -eq \"Custom\") { $OctopusParameters['ShortcutPath'] }\n    else {Write-Error \"Shortcut destination is not set\"}\n\n\n#Create shortcut filename\n$shortcut = \"$shortcutDestination\\$shortcutName.lnk\"\n\nWrite-Output \"Shortcut: $shortcut\"\nWrite-Output \"Target: $targetFilePath\"\n\nif(!(Test-Path $destination)){\n    New-Item -ItemType Directory -Path $destination\n}\n\n$WshShell = New-Object -comObject WScript.Shell\n$Shortcut = $WshShell.CreateShortcut(\"$shortcut\")\n$Shortcut.TargetPath = $targetFilePath\n$Shortcut.Save()",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -48,12 +48,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-12-23T09:41:47.577+00:00",
+    "ExportedAt": "2015-12-23T01:41:47.5770000-08:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-create-shortcut/scriptbody.ps1 b/src/step-templates/windows-create-shortcut/scriptbody.ps1
new file mode 100644
index 000000000..c539ce70d
--- /dev/null
+++ b/src/step-templates/windows-create-shortcut/scriptbody.ps1
@@ -0,0 +1,25 @@
+$destination = $OctopusParameters['ShortcutDestination']
+$targetFilePath = $OctopusParameters['TargetFilePath']
+$shortcutName = $OctopusParameters['Shortcutname']
+
+#Use Custom or predefined path
+$shortcutDestination = 
+    if($destination -eq "PublicDesktop") { "$env:PUBLIC\Desktop" }
+    elseif($destination -eq "Custom") { $OctopusParameters['ShortcutPath'] }
+    else {Write-Error "Shortcut destination is not set"}
+
+
+#Create shortcut filename
+$shortcut = "$shortcutDestination\$shortcutName.lnk"
+
+Write-Output "Shortcut: $shortcut"
+Write-Output "Target: $targetFilePath"
+
+if(!(Test-Path $destination)){
+    New-Item -ItemType Directory -Path $destination
+}
+
+$WshShell = New-Object -comObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut("$shortcut")
+$Shortcut.TargetPath = $targetFilePath
+$Shortcut.Save()
\ No newline at end of file
diff --git a/src/step-templates/windows-disk-cleanup/metadata.json b/src/step-templates/windows-disk-cleanup/metadata.json
new file mode 100644
index 000000000..6aaf3ec4b
--- /dev/null
+++ b/src/step-templates/windows-disk-cleanup/metadata.json
@@ -0,0 +1,42 @@
+{
+  "Id": "0147e912-ff8d-46d9-965a-dee0789ef32b",
+  "Name": "Windows Disk Cleanup Manager",
+  "Description": "Installs Windows Disk Cleanup manager on Windows 2008, 2008-R2 and 2012 Server.  Should work on Windows 7 and 8",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "driveLetter",
+      "Label": "Drive Letter",
+      "HelpText": "The driver letter in which to run the clean up manager on, by default C.",
+      "DefaultValue": "C",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "C\nD\nE\nF\nG\nH\nI\nJ\nK\nL\nM\nN\nO\nP\nQ\nR\nS\nT\nU\nV\nW\nX\nY\nZ"
+      }
+    },
+    {
+      "Name": "cleanupSwitch",
+      "Label": "Clean up Level",
+      "HelpText": "2 options are LOWDISK or VERYLOWDISK, varies the level of cleanup that is done.  VERYLOWDISK is the most complete, most cleaned up.",
+      "DefaultValue": "VERYLOWDISK",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "VERYLOWDISK| Very Low Disk\nLOWDISK\\Low Disk"
+      }
+    }
+  ],
+  "LastModifiedOn": "2015-10-12T11:46:26.0670000-07:00",
+  "LastModifiedBy": "dbloch",
+  "$Meta": {
+    "ExportedAt": "2015-10-12T12:07:41.6760000-07:00",
+    "OctopusVersion": "3.0.21.0",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-disk-cleanup/scriptbody.ps1 b/src/step-templates/windows-disk-cleanup/scriptbody.ps1
new file mode 100644
index 000000000..2b22bb543
--- /dev/null
+++ b/src/step-templates/windows-disk-cleanup/scriptbody.ps1
@@ -0,0 +1,78 @@
+$driveLetter = $OctopusParameters["driveLetter"]
+$cleanupSwitch = $OctopusParameters["cleanupSwitch"]
+
+#REM  ORIGINAL AUTHOR JAMES FOX 
+#REM SOURCE http://technet.microsoft.com/en-us/library/ff630161(WS.10).aspx
+
+#  DECLARATIONS
+$SOURCEEXE = ""
+$SOURCEMUI = ""
+# END DECLARATIONS 
+
+# SETUP TEMPORARY ENVIROMENT VARIABLES FOR COPY PROCESS
+$DCLEANMGR = "$env:systemroot\System32"
+$DCLEANMGRMUI = "$env:systemroot\System32\en-US"
+
+# $PATH TO MUI FILE          WINDOWS 2008 R2 64bit oR 2012
+if (Test-Path $env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.1.7600.16385_en-us_b9cb6194b257cc63\cleanmgr.exe.mui)
+{
+$SOURCEMUI = "$env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.1.7600.16385_en-us_b9cb6194b257cc63\cleanmgr.exe.mui"
+}
+
+# $PATH TO EXE FILE          WINDOWS 2008 R2 64bit oR 2012
+if (Test-Path $env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.1.7600.16385_none_c9392808773cd7da\cleanmgr.exe)
+{
+  $SOURCEEXE = "$env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.1.7600.16385_none_c9392808773cd7da\cleanmgr.exe"
+}
+
+
+# $PATH TO MUI FILE       WINDOWS 2008 64bit
+if (Test-Path $env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_b9f50b71510436f2\cleanmgr.exe.mui)
+{
+	$SOURCEMUI = "$env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_b9f50b71510436f2\cleanmgr.exe.mui"
+}
+# $PATH TO EXE FILE       WINDOWS 2008 64bit
+if (Test-Path $env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_c962d1e515e94269\cleanmgr.exe)
+{
+	$SOURCEEXE = "$env:systemroot\winsxs\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_c962d1e515e94269\cleanmgr.exe"
+}
+
+# $PATH TO MUI FILE   WINDOWS 2008 32bit
+if (Test-Path $env:systemroot\winsxs\x86_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_5dd66fed98a6c5bc\cleanmgr.exe.mui)
+{
+	$SOURCEMUI = "$env:systemroot\winsxs\x86_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_5dd66fed98a6c5bc\cleanmgr.exe.mui"
+}
+# $PATH TO EXE FILE   WINDOWS 2008 32bit
+if (Test-Path $env:systemroot\winsxs\x86_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_6d4436615d8bd133\cleanmgr.exe)
+{
+	$SOURCEEXE = "$env:systemroot\winsxs\x86_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_6d4436615d8bd133\cleanmgr.exe"
+}
+
+# COPY PROCESS 
+# THIS SECTION SHOULD NEVER HAPPEN ON WINDOWS 2003 SERVER BECAUSE CLEANMGR.EXE IS ALWAYS INSTALLED
+# TEST AND COPY IF CLEANMGR.EXE DOES NOT EXIST IN EXPECTED LOCATION COPY FROM SOURCE EXE AND MUI
+if (!(Test-Path $env:systemroot\SYSTEM32\cleanmgr.exe))
+{
+  xcopy $SOURCEMUI $DCLEANMGRMUI /y
+}
+if (!(Test-Path $env:systemroot\SYSTEM32\cleanmgr.exe))
+{
+  xcopy $SOURCEEXE $DCLEANMGR /y
+}
+
+# RUN EXE AND CLEAN DRIVE MAX CLEANUP
+$pinfo = New-Object System.Diagnostics.ProcessStartInfo
+$pinfo.FileName = "$env:systemroot\SYSTEM32\CLEANMGR.EXE"
+$pinfo.RedirectStandardError = $true
+$pinfo.RedirectStandardOutput = $true
+$pinfo.UseShellExecute = $false
+$pinfo.Arguments = "/d$driveLetter /$cleanupSwitch"
+$p = New-Object System.Diagnostics.Process
+$p.StartInfo = $pinfo
+$p.Start() | Out-Null
+$p.WaitForExit()
+$stdout = $p.StandardOutput.ReadToEnd()
+$stderr = $p.StandardError.ReadToEnd()
+Write-Host "stdout: $stdout"
+Write-Host "stderr: $stderr"
+Write-Host "Exit Code: " + $p.ExitCode
diff --git a/src/step-templates/windows-ensure-features-installed/metadata.json b/src/step-templates/windows-ensure-features-installed/metadata.json
new file mode 100644
index 000000000..bd0e1788d
--- /dev/null
+++ b/src/step-templates/windows-ensure-features-installed/metadata.json
@@ -0,0 +1,40 @@
+{
+  "Id": "ed837372-165f-4e0e-b755-1df9633d9eb1",
+  "Name": "Windows - Ensure Features Installed",
+  "Description": "Ensures that a set of Windows Features are installed on the system.",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "WindowsFeatures",
+      "Label": "Windows features",
+      "HelpText": "The set of Windows Features that should be installed on the system. This can be either a single Windows Feature or a comma separated list of Windows Features to check.\n\nExample 1: IIS-WebServer\n\nExample 2: IIS-WebServer, IIS-WindowsAuthentication",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Name": "SuppressReboot",
+      "Label": "Suppress Reboot",
+      "HelpText": "Suppresses reboot. If a reboot is not necessary, then this option does nothing. This option will keep DISM.exe from prompting for a restart, or from restarting automatically).",
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    }
+  ],
+  "LastModifiedOn": "2017-10-03T21:58:18.8390000Z",
+  "LastModifiedBy": "WesleySSmith",
+  "$Meta": {
+    "ExportedAt": "2017-10-03T21:58:18.8390000Z",
+    "OctopusVersion": "3.17.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-ensure-features-installed/scriptbody.ps1 b/src/step-templates/windows-ensure-features-installed/scriptbody.ps1
new file mode 100644
index 000000000..80085148a
--- /dev/null
+++ b/src/step-templates/windows-ensure-features-installed/scriptbody.ps1
@@ -0,0 +1,38 @@
+$requiredFeatures = $OctopusParameters['WindowsFeatures'].split(",") | foreach { $_.trim() }
+if(! $requiredFeatures) {
+    Write-Output "No required Windows Features specified..."
+    exit
+}
+$requiredFeatures | foreach { $feature = DISM.exe /ONLINE /Get-FeatureInfo /FeatureName:$_; if($feature -like "*Feature name $_ is unknown*") { throw $feature } }
+
+Write-Output "Retrieving all Windows Features..."
+$allFeatures = DISM.exe /ONLINE /Get-Features /FORMAT:List | Where-Object { $_.StartsWith("Feature Name") -OR $_.StartsWith("State") } 
+$features = new-object System.Collections.ArrayList
+for($i = 0; $i -lt $allFeatures.length; $i=$i+2) {
+    $feature = $allFeatures[$i]
+    $state = $allFeatures[$i+1]
+    $features.add(@{feature=$feature.split(":")[1].trim();state=$state.split(":")[1].trim()}) | OUT-NULL
+}
+
+Write-Output "Checking for missing Windows Features..."
+$missingFeatures = new-object System.Collections.ArrayList
+$features | foreach { if( $requiredFeatures -contains $_.feature -and $_.state.StartsWith("Disabled")) { $missingFeatures.add($_.feature) | OUT-NULL } }
+if(! $missingFeatures) {
+    Write-Output "All required Windows Features are installed"
+    exit
+}
+Write-Output "Installing missing Windows Features..."
+$featureNameArgs = ""
+$missingFeatures | foreach { $featureNameArgs = $featureNameArgs + " /FeatureName:" + $_ }
+$dism = "DISM.exe"
+IF ($SuppressReboot)
+{
+    $arguments = "/NoRestart "
+}
+ELSE
+{
+    $arguments = ""
+}
+$arguments = $arguments + "/ONLINE /Enable-Feature /All $featureNameArgs"
+Write-Output "Calling DISM with arguments: $arguments"
+start-process -NoNewWindow $dism $arguments
\ No newline at end of file
diff --git a/step-templates/windows-ensure-hosts-file-entry-exists.json b/src/step-templates/windows-ensure-hosts-file-entry-exists/metadata.json
similarity index 61%
rename from step-templates/windows-ensure-hosts-file-entry-exists.json
rename to src/step-templates/windows-ensure-hosts-file-entry-exists/metadata.json
index 54ed295ea..ad842e2d3 100644
--- a/step-templates/windows-ensure-hosts-file-entry-exists.json
+++ b/src/step-templates/windows-ensure-hosts-file-entry-exists/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 6,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ip = $OctopusParameters['IP']\r\n$hostName = $OctopusParameters['HostName']\r\n\r\n$hostsPath = \"$env:windir\\System32\\drivers\\etc\\hosts\"\r\n\r\n$hosts = Get-Content $hostsPath\r\n\r\n$match = $hosts -match (\"^\\s*$ip\\s+$hostName\" -replace '\\.', '\\.')\r\n\r\nIf ($match) { Exit }\r\n\r\n$hostsEntry = \"$ip`t$hostName\"\r\n\r\nIf ([IO.File]::ReadAllText($hostsPath) -notmatch \"\\r\\n\\z\") { $hostsEntry = [environment]::newline + $hostsEntry }\r\n\r\nAdd-Content $hostsPath $hostsEntry\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -29,12 +29,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2015-07-15T15:02:15.749+00:00",
+    "ExportedAt": "2015-07-15T08:02:15.7490000-07:00",
     "OctopusVersion": "2.6.0.778",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-ensure-hosts-file-entry-exists/scriptbody.ps1 b/src/step-templates/windows-ensure-hosts-file-entry-exists/scriptbody.ps1
new file mode 100644
index 000000000..e6602f91b
--- /dev/null
+++ b/src/step-templates/windows-ensure-hosts-file-entry-exists/scriptbody.ps1
@@ -0,0 +1,16 @@
+$ip = $OctopusParameters['IP']
+$hostName = $OctopusParameters['HostName']
+
+$hostsPath = "$env:windir\System32\drivers\etc\hosts"
+
+$hosts = Get-Content $hostsPath
+
+$match = $hosts -match ("^\s*$ip\s+$hostName" -replace '\.', '\.')
+
+If ($match) { Exit }
+
+$hostsEntry = "$ip`t$hostName"
+
+If ([IO.File]::ReadAllText($hostsPath) -notmatch "\r\n\z") { $hostsEntry = [environment]::newline + $hostsEntry }
+
+Add-Content $hostsPath $hostsEntry
diff --git a/step-templates/windows-firewall-configure-rule.json b/src/step-templates/windows-firewall-configure-rule/metadata.json
similarity index 69%
rename from step-templates/windows-firewall-configure-rule.json
rename to src/step-templates/windows-firewall-configure-rule/metadata.json
index 9b365490b..2366926a8 100644
--- a/step-templates/windows-firewall-configure-rule.json
+++ b/src/step-templates/windows-firewall-configure-rule/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 4,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ruleName = $OctopusParameters['RuleName']\n$localPort = $OctopusParameters['LocalPort']\n$remotePort = $OctopusParameters['RemotePort']\n$protocol = $OctopusParameters['Protocol']\n$direction = $OctopusParameters['Direction']\n\n# Remove any existing rule\n\nWrite-Host \"Removing existing rule\"\nnetsh advfirewall firewall delete rule name=\"$ruleName\" dir=$direction\n\n# Add new rule\n\nWrite-Host \"Adding new rule\"\nnetsh advfirewall firewall add rule name=\"$ruleName\" dir=$direction action=allow protocol=$protocol localport=$localPort remoteport=$remotePort",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -56,12 +56,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-16T10:13:17.207+00:00",
+    "ExportedAt": "2014-05-16T03:13:17.2070000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-firewall-configure-rule/scriptbody.ps1 b/src/step-templates/windows-firewall-configure-rule/scriptbody.ps1
new file mode 100644
index 000000000..7e4e24fff
--- /dev/null
+++ b/src/step-templates/windows-firewall-configure-rule/scriptbody.ps1
@@ -0,0 +1,15 @@
+$ruleName = $OctopusParameters['RuleName']
+$localPort = $OctopusParameters['LocalPort']
+$remotePort = $OctopusParameters['RemotePort']
+$protocol = $OctopusParameters['Protocol']
+$direction = $OctopusParameters['Direction']
+
+# Remove any existing rule
+
+Write-Host "Removing existing rule"
+netsh advfirewall firewall delete rule name="$ruleName" dir=$direction
+
+# Add new rule
+
+Write-Host "Adding new rule"
+netsh advfirewall firewall add rule name="$ruleName" dir=$direction action=allow protocol=$protocol localport=$localPort remoteport=$remotePort
\ No newline at end of file
diff --git a/src/step-templates/windows-get-pending-reboot/metadata.json b/src/step-templates/windows-get-pending-reboot/metadata.json
new file mode 100644
index 000000000..2caf3d7ee
--- /dev/null
+++ b/src/step-templates/windows-get-pending-reboot/metadata.json
@@ -0,0 +1,31 @@
+{
+  "Id": "814c4265-62ec-44d3-9d42-800aef8f7380",
+  "Name": "Windows - Get Pending Reboot",
+  "Description": "Get pending reboot status from computer.",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "ComputerName",
+      "Label": "Computer name",
+      "HelpText": "Computer Name to get pending reboot status from.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-30T13:34:01.9200000-07:00",
+    "OctopusVersion": "2.4.7.85",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-get-pending-reboot/scriptbody.ps1 b/src/step-templates/windows-get-pending-reboot/scriptbody.ps1
new file mode 100644
index 000000000..3d979255c
--- /dev/null
+++ b/src/step-templates/windows-get-pending-reboot/scriptbody.ps1
@@ -0,0 +1,72 @@
+$TempErrAct = $ErrorActionPreference 
+    $ErrorActionPreference = "Stop"   
+    Foreach ($Computer in $ComputerName) 
+      { 
+        Try 
+          { 
+            # Setting pending values to false to cut down on the number of else statements 
+            $PendFileRename,$Pending,$SCCM = $false,$false,$false 
+			
+            # Setting CBSRebootPend to null since not all versions of Windows has this value 
+            $CBSRebootPend = $null 
+			
+            # Querying WMI for build version 
+            $WMI_OS = Get-WmiObject -Class Win32_OperatingSystem -Property BuildNumber, CSName -ComputerName $Computer 
+			
+            # Making registry connection to the local/remote computer 
+            $RegCon = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey([Microsoft.Win32.RegistryHive]"LocalMachine",$Computer) 
+			
+            # If Vista/2008 & Above query the CBS Reg Key 
+            If ($WMI_OS.BuildNumber -ge 6001) 
+              { 
+                $RegSubKeysCBS = $RegCon.OpenSubKey("SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\").GetSubKeyNames() 
+                $CBSRebootPend = $RegSubKeysCBS -contains "RebootPending" 
+              }#End If ($WMI_OS.BuildNumber -ge 6001) 
+			  
+            # Query WUAU from the registry 
+            $RegWUAU = $RegCon.OpenSubKey("SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\") 
+            $RegWUAURebootReq = $RegWUAU.GetSubKeyNames() 
+            $WUAURebootReq = $RegWUAURebootReq -contains "RebootRequired" 
+			
+            # Query PendingFileRenameOperations from the registry 
+            $RegSubKeySM = $RegCon.OpenSubKey("SYSTEM\CurrentControlSet\Control\Session Manager\") 
+            $RegValuePFRO = $RegSubKeySM.GetValue("PendingFileRenameOperations",$null) 
+			
+            # Closing registry connection 
+            $RegCon.Close() 
+			
+            # If PendingFileRenameOperations has a value set $RegValuePFRO variable to $true 
+            If ($RegValuePFRO) 
+              { 
+                $PendFileRename = $true 
+              }#End If ($RegValuePFRO) 
+           
+            # If any of the variables are true, set $Pending variable to $true 
+            If ($CBSRebootPend -or $WUAURebootReq -or $PendFileRename) 
+              { 
+                $Pending = $true 
+              }#End If ($CBS -or $WUAU -or $PendFileRename) 
+            # Creating Custom PSObject and Select-Object Splat 
+			$SelectSplat = @{ 
+			    Property=('Computer','CBServicing','WindowsUpdate','PendFileRename','PendFileRenVal','RebootPending') 
+			    } 
+            New-Object -TypeName PSObject -Property @{ 
+                Computer=$WMI_OS.CSName 
+                CBServicing=$CBSRebootPend 
+                WindowsUpdate=$WUAURebootReq 
+                PendFileRename=$PendFileRename 
+                PendFileRenVal=$RegValuePFRO 
+                RebootPending=$Pending 
+                } | Select-Object @SelectSplat 
+          }#End Try 
+        Catch 
+          { 
+            Write-Warning "$Computer`: $_" 
+            # If $ErrorLog, log the file to a user specified location/path 
+            If ($ErrorLog) 
+              { 
+                Out-File -InputObject "$Computer`,$_" -FilePath $ErrorLog -Append 
+              }#End If ($ErrorLog) 
+          }#End Catch 
+      }#End Foreach ($Computer in $ComputerName) 
+	  $ErrorActionPreference = $TempErrAct 
\ No newline at end of file
diff --git a/step-templates/windows-get-processor-load.json b/src/step-templates/windows-get-processor-load/metadata.json
similarity index 58%
rename from step-templates/windows-get-processor-load.json
rename to src/step-templates/windows-get-processor-load/metadata.json
index 3b786a623..6700b9b19 100644
--- a/step-templates/windows-get-processor-load.json
+++ b/src/step-templates/windows-get-processor-load/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 1,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$prcInfo = gwmi win32_processor -computer $ComputerName -ErrorAction STOP\nTry{\n    $Name = \"Proc type: $($prcInfo.Name)\"\n    $Load = \"Proc load: $($prcInfo.LoadPercentage) %\"\n    $Freq = \"Proc frequency: $($prcInfo.CurrentClockSpeed) MHz\"\n    \"$Name `n$Load `n$Freq\"\n}\nCatch\n{\n    Write-Host \"Error getting processor load information.\"\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-30T20:58:55.916+00:00",
+    "ExportedAt": "2014-05-30T13:58:55.9160000-07:00",
     "OctopusVersion": "2.4.7.85",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-get-processor-load/scriptbody.ps1 b/src/step-templates/windows-get-processor-load/scriptbody.ps1
new file mode 100644
index 000000000..bb6c4306e
--- /dev/null
+++ b/src/step-templates/windows-get-processor-load/scriptbody.ps1
@@ -0,0 +1,11 @@
+$prcInfo = gwmi win32_processor -computer $ComputerName -ErrorAction STOP
+Try{
+    $Name = "Proc type: $($prcInfo.Name)"
+    $Load = "Proc load: $($prcInfo.LoadPercentage) %"
+    $Freq = "Proc frequency: $($prcInfo.CurrentClockSpeed) MHz"
+    "$Name `n$Load `n$Freq"
+}
+Catch
+{
+    Write-Host "Error getting processor load information."
+}
\ No newline at end of file
diff --git a/step-templates/windows-get-uptime.json b/src/step-templates/windows-get-uptime/metadata.json
similarity index 52%
rename from step-templates/windows-get-uptime.json
rename to src/step-templates/windows-get-uptime/metadata.json
index 004398a8d..9c07488d0 100644
--- a/step-templates/windows-get-uptime.json
+++ b/src/step-templates/windows-get-uptime/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 1,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$pc = $computer\n$info = Get-WmiObject -Class Win32_OperatingSystem -ComputerName $computer\n$diff = ($info.ConvertToDateTime($info.LocalDateTime) - $info.ConvertToDateTime($info.LastBootUpTime))\n \n$properties=[ordered]@{\n 'ComputerName'=$pc;\n 'UptimeDays'=$diff.Days;\n 'UptimeHours'=$diff.Hours;\n 'UptimeMinutes'=$diff.Minutes\n 'UptimeSeconds'=$diff.Seconds\n }\n $obj = New-Object -TypeName PSObject -Property $properties\n \nWrite-Output $obj",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-30T18:33:20.536+00:00",
+    "ExportedAt": "2014-05-30T11:33:20.5360000-07:00",
     "OctopusVersion": "2.4.7.85",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-get-uptime/scriptbody.ps1 b/src/step-templates/windows-get-uptime/scriptbody.ps1
new file mode 100644
index 000000000..1f2eef8e1
--- /dev/null
+++ b/src/step-templates/windows-get-uptime/scriptbody.ps1
@@ -0,0 +1,14 @@
+$pc = $computer
+$info = Get-WmiObject -Class Win32_OperatingSystem -ComputerName $computer
+$diff = ($info.ConvertToDateTime($info.LocalDateTime) - $info.ConvertToDateTime($info.LastBootUpTime))
+ 
+$properties=[ordered]@{
+ 'ComputerName'=$pc;
+ 'UptimeDays'=$diff.Days;
+ 'UptimeHours'=$diff.Hours;
+ 'UptimeMinutes'=$diff.Minutes
+ 'UptimeSeconds'=$diff.Seconds
+ }
+ $obj = New-Object -TypeName PSObject -Property $properties
+ 
+Write-Output $obj
\ No newline at end of file
diff --git a/src/step-templates/windows-grant-logon-as-service/metadata.json b/src/step-templates/windows-grant-logon-as-service/metadata.json
new file mode 100644
index 000000000..f62bbd1ae
--- /dev/null
+++ b/src/step-templates/windows-grant-logon-as-service/metadata.json
@@ -0,0 +1,33 @@
+{
+  "Id": "0e295d12-cc29-4f61-9eb1-dac387697d5c",
+  "Name": "Grant SeServiceLogonRight To Account",
+  "Description": "Grants `SeServiceLogonRight` to Windows account",
+  "ActionType": "Octopus.Script",
+  "Version": 4,
+  "CommunityActionTemplateId": null,
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "456ad1ed-286d-4bbf-a096-026d3928e3ef",
+      "Name": "GrantLogonAsServiceAccountName",
+      "Label": "Account Name",
+      "HelpText": "Domain account name to grant `SeServiceLogonRight`. Example: `US\\testAccount`",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "nshenoy",
+  "$Meta": {
+    "ExportedAt": "2017-11-30T20:48:26.8230000Z",
+    "OctopusVersion": "4.0.10",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-grant-logon-as-service/scriptbody.ps1 b/src/step-templates/windows-grant-logon-as-service/scriptbody.ps1
new file mode 100644
index 000000000..3e8976ed8
--- /dev/null
+++ b/src/step-templates/windows-grant-logon-as-service/scriptbody.ps1
@@ -0,0 +1,44 @@
+# Code based on Stack Overflow solution https://stackoverflow.com/a/21235462/201382 from @grenade (https://stackoverflow.com/users/68115/grenade)
+
+$grantLogonAsServiceAccountName = $OctopusParameters['GrantLogonAsServiceAccountName']
+
+$tempPath = [System.IO.Path]::GetTempPath()
+$import = Join-Path -Path $tempPath -ChildPath "import.inf"
+if (Test-Path $import) { 
+    Remove-Item -Path $import -Force 
+}
+
+$export = Join-Path -Path $tempPath -ChildPath "export.inf"
+if (Test-Path $export) { 
+    Remove-Item -Path $export -Force 
+}
+
+$secedt = Join-Path -Path $tempPath -ChildPath "secedt.sdb"
+if (Test-Path $secedt) { 
+    Remove-Item -Path $secedt -Force 
+}
+
+try {
+    Write-Output ("Granting SeServiceLogonRight to user account: $grantLogonAsServiceAccountName.") 
+    $sid = ((New-Object System.Security.Principal.NTAccount($grantLogonAsServiceAccountName)).Translate([System.Security.Principal.SecurityIdentifier])).Value
+    secedit /export /cfg $export
+    $sids = (select-string $export -pattern "SeServiceLogonRight").line.Split("=").Trim()[1]
+    foreach ($line in @("[Unicode]", "Unicode=yes", "[System Access]", "[Event Audit]", "[Registry Values]", "[Version]", "signature=`"`$CHICAGO$`"", "Revision=1", "[Profile Description]", "Description=GrantLogOnAsAService security template", "[Privilege Rights]", "SeServiceLogonRight = $sids,*$sid")) {
+        Add-Content $import $line
+    }
+    
+    Write-Verbose "Calling secedit..."
+    secedit /import /db $secedt /cfg $import
+    secedit /configure /db $secedt
+    Write-Verbose "Calling gpupdate..."
+    gpupdate /force
+    Write-Verbose "Cleaning up temp files..."
+    Remove-Item -Path $import -Force
+    Remove-Item -Path $export -Force
+    Remove-Item -Path $secedt -Force
+    Write-Output("SeServiceLogonRight successfully granted to $grantLogonAsServiceAccountName")
+}
+catch {
+    Write-Error "Failed to grant SeServiceLogonRight to user account: $grantLogonAsServiceAccountName."
+    $error[0]
+}
diff --git a/src/step-templates/windows-install-msi/metadata.json b/src/step-templates/windows-install-msi/metadata.json
new file mode 100644
index 000000000..d95ee4260
--- /dev/null
+++ b/src/step-templates/windows-install-msi/metadata.json
@@ -0,0 +1,110 @@
+{
+  "Id": "73994d6a-4cff-4bde-81c4-c4da362adaba",
+  "Name": "Windows - Install MSI From Package",
+  "Description": "Runs the Windows Installer to non-interactively install an MSI",
+  "ActionType": "Octopus.Script",
+  "Version": 1,
+  "CommunityActionTemplateId": null,
+  "Packages": [
+    {
+      "Id": "910a6653-0534-492a-98d8-f02196931773",
+      "Name": "Template.Package",
+      "PackageId": null,
+      "FeedId": null,
+      "AcquisitionLocation": "Server",
+      "Properties": {
+        "Extract": "True",
+        "SelectionMode": "deferred",
+        "PackageParameterName": "Template.Package",
+        "Purpose": ""
+      }
+    }
+  ],
+  "GitDependencies": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "b2195039-8e80-4216-b4f2-10a205e6837f",
+      "Name": "Template.Package",
+      "Label": "MSI Package",
+      "HelpText": "The package that contains the .Msi file to execute.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Package"
+      }
+    },
+    {
+      "Id": "f644f7aa-9051-4404-8665-a9eaebafdbc0",
+      "Name": "Action",
+      "Label": "Action",
+      "HelpText": "The task to perform with the MSI, options include install, repair or remove.",
+      "DefaultValue": "Install",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "Install\nRepair\nRemove"
+      }
+    },
+    {
+      "Id": "7a43723d-6242-4bb5-9acd-198933517d13",
+      "Name": "ActionModifier",
+      "Label": "Action Modifier",
+      "HelpText": "Use this to specify a different behavior for the Repair action",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "fc9f6977-f2fc-4fa3-9f38-171c9b2ace95",
+      "Name": "Properties",
+      "Label": "Properties",
+      "HelpText": "Properties that will be passed to the MSI separated by lines. Properties are in the format key=value, note that values with spaces in the must be quoted. \n\n    Key=Value\n    Key=\"Value\"",
+      "DefaultValue": "REBOOT=ReallySuppress",
+      "DisplaySettings": {
+        "Octopus.ControlType": "MultiLineText"
+      }
+    },
+    {
+      "Id": "5e38bac3-31fb-4c7d-bbb8-331be0eb6283",
+      "Name": "LoggingOptions",
+      "Label": "Logging Options",
+      "HelpText": "One or more of:\n\n    [i|w|e|a|r|u|c|m|o|p|v|x|+|!|*]\n\n-  i - Status messages\n-  w - Nonfatal warnings\n-  e - All error messages\n-  a - Start-up of actions\n-  r - Action-specific records\n-  u - User requests\n-  c - Initial UI parameters\n-  m - Out-of-memory or fatal exit information\n-  o - Out-of-disk-space messages\n-  p - Terminal properties\n-  v - Verbose output\n-  x - Extra debugging information\n-  \\+ - Append to existing log file\n-  ! - Flush each line to the log\n-  \\* - Log all information, except for v and x options",
+      "DefaultValue": "*",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "a7fcf5b5-e416-4706-b9fd-c3d418f60007",
+      "Name": "LogAsArtifact",
+      "Label": "Log as artifact",
+      "HelpText": "If selected, then return log output as an artifact.\nIf unselected then return log output as inline content",
+      "DefaultValue": "false",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Id": "53e9621e-0967-4b10-9635-2070ae7f808c",
+      "Name": "IgnoredErrorCodes",
+      "Label": "Ignored Error Codes",
+      "HelpText": "Use commas to separate integer values.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "StepPackageId": "Octopus.Script",
+  "$Meta": {
+    "ExportedAt": "2025-08-21T16:07:30.8180000Z",
+    "OctopusVersion": "2025.2.13043",
+    "Type": "ActionTemplate"
+  },
+  "LastModifiedBy": "twerthi",
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-install-msi/scriptbody.ps1 b/src/step-templates/windows-install-msi/scriptbody.ps1
new file mode 100644
index 000000000..1ddea5078
--- /dev/null
+++ b/src/step-templates/windows-install-msi/scriptbody.ps1
@@ -0,0 +1,288 @@
+# Running outside octopus
+param(
+    [string]$MsiFilePath,
+	[ValidateSet("Install", "Repair", "Remove", IgnoreCase=$true)]
+	[string]$Action,
+	[string]$ActionModifier,
+    [string]$LoggingOptions = "*",
+    [ValidateSet("False", "True")]
+    [string]$LogAsArtifact,
+	[string]$Properties,
+	[int[]]$IgnoredErrorCodes,
+    [switch]$WhatIf
+) 
+
+$ErrorActionPreference = "Stop"
+
+$ErrorMessages = @{
+	"0" = "Action completed successfully.";
+	"13" = "The data is invalid.";
+	"87" = "One of the parameters was invalid.";
+	"1601" = "The Windows Installer service could not be accessed. Contact your support personnel to verify that the Windows Installer service is properly registered.";
+	"1602" = "User cancel installation.";
+	"1603" = "Fatal error during installation.";
+	"1604" = "Installation suspended, incomplete.";
+	"1605" = "This action is only valid for products that are currently installed.";
+	"1606" = "Feature ID not registered.";
+	"1607" = "Component ID not registered.";
+	"1608" = "Unknown property.";
+	"1609" = "Handle is in an invalid state.";
+	"1610" = "The configuration data for this product is corrupt. Contact your support personnel.";
+	"1611" = "Component qualifier not present.";
+	"1612" = "The installation source for this product is not available. Verify that the source exists and that you can access it.";
+	"1613" = "This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.";
+	"1614" = "Product is uninstalled.";
+	"1615" = "SQL query syntax invalid or unsupported.";
+	"1616" = "Record field does not exist.";
+	"1618" = "Another installation is already in progress. Complete that installation before proceeding with this install.";
+	"1619" = "This installation package could not be opened. Verify that the package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer package.";
+	"1620" = "This installation package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer package.";
+	"1621" = "There was an error starting the Windows Installer service user interface. Contact your support personnel.";
+	"1622" = "Error opening installation log file. Verify that the specified log file location exists and is writable.";
+	"1623" = "This language of this installation package is not supported by your system.";
+	"1624" = "Error applying transforms. Verify that the specified transform paths are valid.";
+	"1625" = "This installation is forbidden by system policy. Contact your system administrator.";
+	"1626" = "Function could not be executed.";
+	"1627" = "Function failed during execution.";
+	"1628" = "Invalid or unknown table specified.";
+	"1629" = "Data supplied is of wrong type.";
+	"1630" = "Data of this type is not supported.";
+	"1631" = "The Windows Installer service failed to start. Contact your support personnel.";
+	"1632" = "The temp folder is either full or inaccessible. Verify that the temp folder exists and that you can write to it.";
+	"1633" = "This installation package is not supported on this platform. Contact your application vendor.";
+	"1634" = "Component not used on this machine.";
+	"1635" = "This patch package could not be opened. Verify that the patch package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer patch package.";
+	"1636" = "This patch package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer patch package.";
+	"1637" = "This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.";
+	"1638" = "Another version of this product is already installed. Installation of this version cannot continue. To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.";
+	"1639" = "Invalid command line argument. Consult the Windows Installer SDK for detailed command line help.";
+	"1640" = "Installation from a Terminal Server client session not permitted for current user.";
+	"1641" = "The installer has started a reboot.";
+	"1642" = "The installer cannot install the upgrade patch because the program being upgraded may be missing, or the upgrade patch updates a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch.";
+	"3010" = "A restart is required to complete the install. This does not include installs where the ForceReboot action is run. Note that this error will not be available until future version of the installer."
+};
+
+function Get-Param($Name, [switch]$Required, $Default) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        $variable = Get-Variable $Name -EA SilentlyContinue   
+        if ($variable -ne $null) {
+            $result = $variable.Value
+        }
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+function Resolve-PotentialPath($Path) {
+	[Environment]::CurrentDirectory = $pwd
+	return [IO.Path]::GetFullPath($Path)
+}
+
+function Get-LogOptionFile($msiFile, $streamLog) {
+	$logPath = Resolve-PotentialPath "$msiFile.log"
+	
+	if (Test-Path $logPath) {
+		Remove-Item $logPath
+	}
+	
+	return $logPath
+}
+
+function Exec
+{
+    [CmdletBinding()]
+    param(
+        [Parameter(Position=0,Mandatory=1)][scriptblock]$cmd,
+        [string]$errorMessage = ($msgs.error_bad_command -f $cmd),
+		[switch]$ReturnCode
+    )
+
+	$lastexitcode = 0
+    & $cmd
+	
+	if ($ReturnCode) {
+		return $lastexitcode
+	} else  {
+		if ($lastexitcode -ne 0) {
+			throw ("Exec: " + $errorMessage)
+		}		
+	}
+}
+
+function Wrap-Arguments($Arguments)
+{
+	return $Arguments | % { 
+		
+		[string]$val = $_
+		
+		#calling msiexec fails when arguments are quoted
+		if (($val.StartsWith("/") -and $val.IndexOf(" ") -eq -1) -or ($val.IndexOf("=") -ne -1) -or ($val.IndexOf('"') -ne -1)) {
+			return $val
+		}
+	
+		return '"{0}"' -f $val
+	}
+}
+
+function Start-Process2($FilePath, $ArgumentList, [switch]$showCall, [switch]$whatIf)
+{
+	$ArgumentListString = (Wrap-Arguments $ArgumentList) -Join " "
+
+	$pinfo = New-Object System.Diagnostics.ProcessStartInfo
+	$pinfo.FileName = $FilePath
+	$pinfo.UseShellExecute = $false
+	$pinfo.CreateNoWindow = $true
+	$pinfo.RedirectStandardOutput = $true
+	$pinfo.RedirectStandardError = $true
+	$pinfo.Arguments = $ArgumentListString;
+	$pinfo.WorkingDirectory = $pwd
+
+	$exitCode = 0
+	
+	if (!$whatIf) {
+	
+		if ($showCall) {
+			$x = Write-Output "$FilePath $ArgumentListString"
+		}
+		
+		$p = New-Object System.Diagnostics.Process
+		$p.StartInfo = $pinfo
+		$started = $p.Start()
+		$p.WaitForExit()
+
+		$stdout = $p.StandardOutput.ReadToEnd()
+		$stderr = $p.StandardError.ReadToEnd()
+		$x = Write-Output $stdout
+		$x = Write-Output $stderr
+		
+		$exitCode = $p.ExitCode
+	} else {
+		Write-Output "skipping: $FilePath $ArgumentListString"
+	}
+	
+	return $exitCode
+}
+
+function Get-EscapedFilePath($FilePath)
+{
+    return [Management.Automation.WildcardPattern]::Escape($FilePath)
+}
+
+function Get-MsiPathFromExtractedPath
+{
+  $fileReference = (Get-ChildItem -Path $OctopusParameters["Octopus.Action.Package[Template.Package].ExtractedPath"] -Recurse | Where-Object { $_.Extension -eq ".msi" })
+  return $fileReference.FullName
+}
+
+& {
+    param(
+        [string]$MsiFilePath,
+		[string]$Action,
+		[string]$ActionModifier,
+        [string]$LoggingOptions,
+        [bool]$LogAsArtifact,
+		[string]$Properties,
+		[int[]]$IgnoredErrorCodes
+    ) 
+
+    $MsiFilePathLeaf = Split-Path -Path $MsiFilePath -Leaf
+    $EscapedMsiFilePath = Get-EscapedFilePath (Split-Path -Path $MsiFilePath)
+    
+	$MsiFilePath = Get-EscapedFilePath (Resolve-Path "$EscapedMsiFilePath\$MsiFilePathLeaf" | Select-Object -First 1).ProviderPath
+
+    Write-Output "Installing MSI"
+    Write-Host " MsiFilePath: $MsiFilePath" -f Gray
+	Write-Host " Action: $Action" -f Gray
+	Write-Host " Properties: $Properties" -f Gray
+	Write-Host
+
+	if ((Get-Command msiexec) -Eq $Null) {
+		throw "Command msiexec could not be found"
+	}
+	
+	if (!(Test-Path $MsiFilePath)) {
+		throw "Could not find the file $MsiFilePath"
+	}
+
+	$actions = @{
+		"Install" = "/i";
+		"Repair" = "/f";
+		"Remove" = "/x";
+	};
+	
+	$actionOption = $actions[$action]
+	$actionOptionFile = $MsiFilePath
+	if ($ActionModifier)
+	{
+		$actionOption += $ActionModifier
+	}
+	
+    if ($LoggingOptions) {
+	    $logOption = "/L$LoggingOptions"
+	    $logOptionFile = Get-LogOptionFile $MsiFilePath
+	}
+	$quiteOption = "/qn"
+	$noRestartOption = "/norestart"
+	
+	$parameterOptions = $Properties -Split "\r\n?|\n" | ? { !([string]::IsNullOrEmpty($_)) } | % { $_.Trim() }
+	
+	$options = @($actionOption, $actionOptionFile, $logOption, $logOptionFile, $quiteOption, $noRestartOption) + $parameterOptions
+
+	$exePath = "msiexec.exe"
+
+	$exitCode = Start-Process2 -FilePath $exePath -ArgumentList $options -whatIf:$whatIf -ShowCall
+	
+	Write-Output "Exit Code was! $exitCode"
+	
+	if (Test-Path $logOptionFile) {
+
+		Write-Output "Reading installer log"
+
+        # always write out these (http://robmensching.com/blog/posts/2010/8/2/the-first-thing-i-do-with-an-msi-log/)
+        (Get-Content $logOptionFile) | Select-String -SimpleMatch "value 3" -Context 10,0 | ForEach-Object { Write-Warning $_ }
+
+        if ($LogAsArtifact) {
+            New-OctopusArtifact -Path $logOptionFile -Name "$Action-$([IO.Path]::GetFileNameWithoutExtension($MsiFilePath)).log"
+        } else {
+	    	Get-Content $logOptionFile | Write-Output
+        }
+
+	} else {
+		Write-Output "No logs were generated"
+	}
+
+	if ($exitCode -Ne 0) {
+		$errorCodeString = $exitCode.ToString()
+		$errorMessage = $ErrorMessages[$errorCodeString]
+		
+		if ($IgnoredErrorCodes -notcontains $exitCode) {
+
+			throw "Error code $exitCodeString was returned: $errorMessage"
+		}
+		else {
+			Write-Output "Error code [$exitCodeString] was ignored because it was in the IgnoredErrorCodes [$($IgnoredErrorCodes -join ',')] parameter. Error Message [$errorMessage]"
+		}
+	}
+	
+} `
+(Get-MsiPathFromExtractedPath) `
+(Get-Param 'Action' -Required) `
+(Get-Param 'ActionModifier') `
+(Get-Param 'LoggingOptions') `
+((Get-Param 'LogAsArtifact') -eq "True") `
+(Get-Param 'Properties') `
+(Get-Param 'IgnoredErrorCodes')
diff --git a/src/step-templates/windows-local-user/metadata.json b/src/step-templates/windows-local-user/metadata.json
new file mode 100644
index 000000000..1623f6395
--- /dev/null
+++ b/src/step-templates/windows-local-user/metadata.json
@@ -0,0 +1,58 @@
+{
+  "Id": "6dbe826d-f973-46fe-a897-a0a2cdfd01f4",
+  "Name": "Windows - Local User",
+  "Description": "Configures a local user. (If assigning user rights the ntrights.exe file should be installed on the target server and added to the system path variable)",
+  "ActionType": "Octopus.Script",
+  "Version": 3,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Username",
+      "Label": "Username",
+      "HelpText": "The username",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Password",
+      "Label": "Password",
+      "HelpText": "The password",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "MemberOf",
+      "Label": "Group memberships",
+      "HelpText": "A comma separated list of group memberships",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "UserRights",
+      "Label": "User rights",
+      "HelpText": "A comma separated list of user rights to assign (e.g. SeServiceLogonRight). See http://support.microsoft.com/kb/315276 for full list of rights",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2014-05-16T03:30:58.0520000-07:00",
+    "OctopusVersion": "2.4.5.46",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-local-user/scriptbody.ps1 b/src/step-templates/windows-local-user/scriptbody.ps1
new file mode 100644
index 000000000..c5d7dda5c
--- /dev/null
+++ b/src/step-templates/windows-local-user/scriptbody.ps1
@@ -0,0 +1,58 @@
+$username = $OctopusParameters['Username']
+$password = $OctopusParameters['Password']
+$memberOf = $OctopusParameters['MemberOf']
+$userRights = $OctopusParameters['UserRights']
+
+# Add/Update User
+
+$user = Get-WmiObject Win32_UserAccount -filter "LocalAccount=True AND Name='$username'"
+if($user -eq $null)
+{
+    Write-Host "Adding user"
+    net user "$username" "$password" /add /expires:never /passwordchg:no /yes
+}
+else
+{
+    Write-Host "User already exists, updating password"
+    net user "$username" "$password" /expires:never /passwordchg:no
+}
+
+# Ensure password never expires
+
+write "Ensuring password never expires"
+$user = Get-WmiObject Win32_UserAccount -filter "LocalAccount=True AND Name='$username'"
+$user.PasswordExpires = $false; 
+$user.Put();
+
+# Add/Update group membership
+
+if($memberOf)
+{
+    $groups = $memberOf.Split(",")
+    foreach($group in $groups)
+    {
+        $ntGroup = [ADSI]("WinNT://./$group")
+        $members = $ntGroup.psbase.Invoke("Members") | %{$_.GetType().InvokeMember("Name", 'GetProperty', $null, $_, $null)}
+        if($members -contains "$username")
+        {
+            Write-Host "User already a member of the $group group" 
+        }
+        else
+        {
+            Write-Host "Adding to the $group group"
+            net localgroup "$group" "$username" /add
+        }
+    }
+}
+
+# Add/Update user rights assignment
+
+if($userRights)
+{
+    $userRightsArr = $userRights.Split(",")
+    foreach($userRight in $userRightsArr)
+    {
+        Write-Host "Granting $userRight right"
+        & "ntrights" +r $userRight -u "$username"
+    }
+}
diff --git a/step-templates/windows-map-network-drive.json b/src/step-templates/windows-map-network-drive/metadata.json
similarity index 58%
rename from step-templates/windows-map-network-drive.json
rename to src/step-templates/windows-map-network-drive/metadata.json
index e9d0fc7bd..467bdcf97 100644
--- a/step-templates/windows-map-network-drive.json
+++ b/src/step-templates/windows-map-network-drive/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 3,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#http://gallery.technet.microsoft.com/scriptcenter/Powershell-Map-utility-to-444c1c95\nfunction Map ($computer){ \n \nfunction GetDriveType($DriveCode) { \n    switch ($DriveCode) \n        { 0 {\"Unknown\"}  \n        1 {\"No root directory\"}  \n        2 {\"Removable Disk\"}  \n        3 {\"Local Disk\"}  \n        4 {\"Network Drive\"}  \n        5 {\"Compact Disk\"}  \n        6 {\"RAM Disk\"}  \n        } # end switch \n    } # end function GetDriveType \n \nif ($computer -eq $null) {$computer='localhost'} \nGet-WmiObject -Class win32_logicaldisk -ComputerName $computer | select DeviceID, VolumeName, ` \n    @{n='DriveType'; e={GetDriveType($_.driveType)}}, ` \n    @{n='Size';e={\"{0:F2} GB\" -f ($_.Size / 1gb)}}, `     \n    @{n='FreeSpace';e={\"{0:F2} GB\" -f ($_.FreeSpace / 1gb)}} | Format-Table \n \n} \n\n$map = new-object -ComObject WScript.Network\nif (!(Test-Path $DriveLetter))\n{\n\t$map.MapNetworkDrive($DriveLetter, $MapPath, $MapPersist, $MapUser, $MapPass)\n\tWrite-Host \"Drive $DriveLetter mapped to $MapPath as user $MapUser.\"\n}\nelse\n{\n    Write-Host \"Drive $DriveLetter already in use.\"\n}\n\nMap .",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -56,12 +56,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-19T20:21:10.373+00:00",
+    "ExportedAt": "2014-05-19T13:21:10.3730000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-map-network-drive/scriptbody.ps1 b/src/step-templates/windows-map-network-drive/scriptbody.ps1
new file mode 100644
index 000000000..99776d3e4
--- /dev/null
+++ b/src/step-templates/windows-map-network-drive/scriptbody.ps1
@@ -0,0 +1,35 @@
+#http://gallery.technet.microsoft.com/scriptcenter/Powershell-Map-utility-to-444c1c95
+function Map ($computer){ 
+ 
+function GetDriveType($DriveCode) { 
+    switch ($DriveCode) 
+        { 0 {"Unknown"}  
+        1 {"No root directory"}  
+        2 {"Removable Disk"}  
+        3 {"Local Disk"}  
+        4 {"Network Drive"}  
+        5 {"Compact Disk"}  
+        6 {"RAM Disk"}  
+        } # end switch 
+    } # end function GetDriveType 
+ 
+if ($computer -eq $null) {$computer='localhost'} 
+Get-WmiObject -Class win32_logicaldisk -ComputerName $computer | select DeviceID, VolumeName, ` 
+    @{n='DriveType'; e={GetDriveType($_.driveType)}}, ` 
+    @{n='Size';e={"{0:F2} GB" -f ($_.Size / 1gb)}}, `     
+    @{n='FreeSpace';e={"{0:F2} GB" -f ($_.FreeSpace / 1gb)}} | Format-Table 
+ 
+} 
+
+$map = new-object -ComObject WScript.Network
+if (!(Test-Path $DriveLetter))
+{
+	$map.MapNetworkDrive($DriveLetter, $MapPath, $MapPersist, $MapUser, $MapPass)
+	Write-Host "Drive $DriveLetter mapped to $MapPath as user $MapUser."
+}
+else
+{
+    Write-Host "Drive $DriveLetter already in use."
+}
+
+Map .
\ No newline at end of file
diff --git a/step-templates/windows-restart-computer.json b/src/step-templates/windows-restart-computer/metadata.json
similarity index 77%
rename from step-templates/windows-restart-computer.json
rename to src/step-templates/windows-restart-computer/metadata.json
index 24646f28e..312d9c477 100644
--- a/step-templates/windows-restart-computer.json
+++ b/src/step-templates/windows-restart-computer/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 0,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "Restart-Computer -ComputerName $ComputerName -force",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-30T20:40:30.083+00:00",
+    "ExportedAt": "2014-05-30T13:40:30.0830000-07:00",
     "OctopusVersion": "2.4.7.85",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-restart-computer/scriptbody.ps1 b/src/step-templates/windows-restart-computer/scriptbody.ps1
new file mode 100644
index 000000000..5dcb8fe15
--- /dev/null
+++ b/src/step-templates/windows-restart-computer/scriptbody.ps1
@@ -0,0 +1 @@
+Restart-Computer -ComputerName $ComputerName -force
\ No newline at end of file
diff --git a/src/step-templates/windows-restart-if-required/metadata.json b/src/step-templates/windows-restart-if-required/metadata.json
new file mode 100644
index 000000000..26c4b023b
--- /dev/null
+++ b/src/step-templates/windows-restart-if-required/metadata.json
@@ -0,0 +1,23 @@
+{
+  "Id": "cb0ca23c-524d-44a9-86e0-2ae05989d6a0",
+  "Name": "Check for Pending Restart and Restart if required",
+  "Description": "Checks if Server is pending a reboot, and reboots if it needs it.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [],
+  "LastModifiedOn": "2020-01-14T12:40:28.4300000-08:00",
+  "LastModifiedBy": "DevOpsDerek",
+  "$Meta": {
+    "ExportedAt": "2020-01-14T08:41:32.5080000Z",
+    "OctopusVersion": "2019.11.1",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-restart-if-required/scriptbody.ps1 b/src/step-templates/windows-restart-if-required/scriptbody.ps1
new file mode 100644
index 000000000..b5417df88
--- /dev/null
+++ b/src/step-templates/windows-restart-if-required/scriptbody.ps1
@@ -0,0 +1,72 @@
+# Sourced from https://github.com/adbertram/Random-PowerShell-Work/blob/master/Random%20Stuff/Test-PendingReboot.ps1
+# Script will run only on the server with the Tentacle installed
+
+function Test-RegistryKey($Key) {
+    if (Get-Item -Path $Key -ErrorAction Ignore) {
+        return $true
+    }
+    return $false
+}
+
+function Test-RegistryValue($Key, $Value) {
+    if (Get-ItemProperty -Path $Key -Name $Value -ErrorAction Ignore) {
+        return $true
+    }
+    return $false
+}
+
+function Test-RegistryValueNotNull($Key, $Value) {
+    if (($regVal = Get-ItemProperty -Path $Key -Name $Value -ErrorAction Ignore) -and $regVal.($Value)) {
+        return $true
+    }
+    return $false
+}
+
+$IsPendingReboot = $false
+
+# Testing Registry keys for Restarts
+# an exception is thrown when Get-ItemProperty or Get-ChildItem are passed a nonexistant key path
+$tests = @(
+    { Test-RegistryKey -Key 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending' }
+    { Test-RegistryKey -Key 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootInProgress' }
+    { Test-RegistryKey -Key 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' }
+    { Test-RegistryKey -Key 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\PackagesPending' }
+    { Test-RegistryKey -Key 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\PostRebootReporting' }
+    { Test-RegistryValueNotNull -Key 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager' -Value 'PendingFileRenameOperations' }
+    { Test-RegistryValueNotNull -Key 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager' -Value 'PendingFileRenameOperations2' }
+    { 
+		(Test-RegistryKey -Key 'HKLM:\SOFTWARE\Microsoft\Updates') -and
+		(Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Updates' -Name 'UpdateExeVolatile' | Select-Object -ExpandProperty UpdateExeVolatile) -ne 0 
+	}
+    { Test-RegistryValue -Key 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce' -Value 'DVDRebootSignal' }
+    { Test-RegistryKey -Key 'HKLM:\SOFTWARE\Microsoft\ServerManager\CurrentRebootAttemps' }
+    { Test-RegistryValue -Key 'HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon' -Value 'JoinDomain' }
+    { Test-RegistryValue -Key 'HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon' -Value 'AvoidSpnSet' }
+    {
+        (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\ComputerName\ActiveComputerName').ComputerName -ne
+        (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName').ComputerName
+    }
+    {
+        if (Get-ChildItem -Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Services\Pending') {
+            $true
+        }
+    }
+)
+
+Write-Debug "Running tests to checking for reboot pending"
+foreach ($test in $tests) {
+    if (& $test) {
+        Write-Debug "Test found reboot pending: $test"
+        $IsPendingReboot = $true
+        break
+    }
+}
+    
+
+if($IsPendingReboot -eq $true) {
+    Write-Host "Restarting"
+    Restart-Computer -Force
+}
+if($IsPendingReboot -eq $false) {
+    Write-Host "No Restart required"
+}
diff --git a/step-templates/windows-scheduled-task-changepath.json b/src/step-templates/windows-scheduled-task-changepath/metadata.json
similarity index 66%
rename from step-templates/windows-scheduled-task-changepath.json
rename to src/step-templates/windows-scheduled-task-changepath/metadata.json
index e314c9b94..95b737ce0 100644
--- a/step-templates/windows-scheduled-task-changepath.json
+++ b/src/step-templates/windows-scheduled-task-changepath/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 4,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$taskName   = $OctopusParameters['TaskName']\n$taskFolder = $OctopusParameters['TaskFolder']\n$taskExe    = $OctopusParameters['TaskExe']\n$userName   = $OctopusParameters['TaskUserName']\n$password   = $OctopusParameters['TaskPassword']\n\n$taskPath = Join-Path $taskFolder $taskExe\nWrite-Output \"Changing execution path of $taskName to $taskPath\"\n\n#Check if 2008 Server\nif ((Get-WmiObject Win32_OperatingSystem).Name.Contains(\"2008\"))\n{\n    $userName = \"`\"$userName`\"\"\n    schtasks /Change /RU $userName /RP $password /TR $taskPath /TN $taskName\n}\nelse\n{\n    $action = New-ScheduledTaskAction -Execute $taskPath\n    Set-ScheduledTask -TaskName $taskName -Action $action -User $userName -Password $password;\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -56,10 +56,10 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-12-10T18:00:42.218+00:00",
+    "ExportedAt": "2014-12-10T10:00:42.2180000-08:00",
     "OctopusVersion": "2.5.12.666",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/windows-scheduled-task-changepath/scriptbody.ps1 b/src/step-templates/windows-scheduled-task-changepath/scriptbody.ps1
new file mode 100644
index 000000000..64d783caa
--- /dev/null
+++ b/src/step-templates/windows-scheduled-task-changepath/scriptbody.ps1
@@ -0,0 +1,20 @@
+$taskName   = $OctopusParameters['TaskName']
+$taskFolder = $OctopusParameters['TaskFolder']
+$taskExe    = $OctopusParameters['TaskExe']
+$userName   = $OctopusParameters['TaskUserName']
+$password   = $OctopusParameters['TaskPassword']
+
+$taskPath = Join-Path $taskFolder $taskExe
+Write-Output "Changing execution path of $taskName to $taskPath"
+
+#Check if 2008 Server
+if ((Get-WmiObject Win32_OperatingSystem).Name.Contains("2008"))
+{
+    $userName = "`"$userName`""
+    schtasks /Change /RU $userName /RP $password /TR $taskPath /TN $taskName
+}
+else
+{
+    $action = New-ScheduledTaskAction -Execute $taskPath
+    Set-ScheduledTask -TaskName $taskName -Action $action -User $userName -Password $password;
+}
\ No newline at end of file
diff --git a/src/step-templates/windows-scheduled-task-create/metadata.json b/src/step-templates/windows-scheduled-task-create/metadata.json
new file mode 100644
index 000000000..745fd98e6
--- /dev/null
+++ b/src/step-templates/windows-scheduled-task-create/metadata.json
@@ -0,0 +1,163 @@
+{
+  "Id": "17bc51d1-8b88-4aad-b188-24a0904d0bf2",
+  "Name": "Windows Scheduled Task - Create",
+  "Description": "Create Windows scheduled task. If the task exists it will be torn down and re-added to ensure consistency",
+  "ActionType": "Octopus.Script",
+  "Version": 22,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Name": "TaskName",
+      "Label": "Name",
+      "HelpText": "The name of the Scheduled Task",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RunAsUser",
+      "Label": "User",
+      "HelpText": "The User that the task will run as",
+      "DefaultValue": "System",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RunAsPassword",
+      "Label": "Password",
+      "HelpText": "Specifying a password allows the task to run when the user is not logged on to the server.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "Command",
+      "Label": "Action",
+      "HelpText": "The Action that the task executes. Usually a path to the executable",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Arguments",
+      "Label": "Arguments",
+      "HelpText": "A value that specifies any arguments to be passed to run the task.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Schedule",
+      "Label": "Schedule",
+      "HelpText": "When the Task is triggered",
+      "DefaultValue": "DAILY",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "MINUTE|Every Minute\nHOURLY|Hourly\nDAILY|Daily\nWEEKLY|Weekly\nWEEKDAYS|Weekdays\nONCE|One off\nONSTART|On Start\nONLOGON|On Logon\nONIDLE|On Idle\nMONTHLY|Monthly"
+      }
+    },
+    {
+      "Name": "StartTime",
+      "Label": "Start Time",
+      "HelpText": "The Time the task will run. Use the format HH:mm:ss",
+      "DefaultValue": "12:00",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "StartDate",
+      "Label": "Start Date",
+      "HelpText": "The date the task will start running. use the format MM/dd/yyyy",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Modifier",
+      "Label": "Modifier",
+      "HelpText": "A value that specifies how often the task runs within its schedule type. For ONCE, ONSTART, ONLOGON and ONIDLE any value can be used since it will be ignored (They do not use modifiers with MO).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Interval",
+      "Label": "Interval",
+      "HelpText": "A value that specifies the repetition interval in minutes.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Duration",
+      "Label": "Duration",
+      "HelpText": "A value that specifies the duration to run the task. The time format is HH:mm (24-hour time).",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "RunWithElevatedPermissions",
+      "Label": "RunWithElevatedPermissions",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "Days",
+      "Label": "Days",
+      "HelpText": "A value that specifies the day of the week to run the task. Valid values are: MON, TUE, WED, THU, FRI, SAT, SUN and for MONTHLY schedules 1 - 31 (days of the month). The wildcard character (*) specifies all days.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText",
+        "Octopus.SelectOptions": ""
+      }
+    },
+    {
+      "Name": "StartNewTaskNow",
+      "Label": "StartNewTaskNow",
+      "HelpText": null,
+      "DefaultValue": "False",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "TaskStatus",
+      "Label": "TaskStatus",
+      "HelpText": "Whether the task is enabled, disabled, or left as-is when this step completes",
+      "DefaultValue": "ENABLE",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "ENABLE|Enable\nDISABLE|Disable\nLEAVE|Leave Unchanged"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2022-03-29T11:49:45.3840000Z",
+  "LastModifiedBy": "harrisonmeister",
+  "$Meta": {
+    "ExportedAt": "2022-03-29T11:49:45.3840000Z",
+    "OctopusVersion": "2022.1.2152",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-scheduled-task-create/scriptbody.ps1 b/src/step-templates/windows-scheduled-task-create/scriptbody.ps1
new file mode 100644
index 000000000..16537bf83
--- /dev/null
+++ b/src/step-templates/windows-scheduled-task-create/scriptbody.ps1
@@ -0,0 +1,264 @@
+$ErrorActionPreference = "Stop";
+Set-StrictMode -Version "Latest";
+
+# use http://msdn.microsoft.com/en-us/library/windows/desktop/bb736357(v=vs.85).aspx for API reference
+
+Function Create-ScheduledTask($TaskName,$RunAsUser,$RunAsPassword,$TaskRun,$Arguments,$Schedule,$StartTime,$StartDate,$RunWithElevatedPermissions,$Days,$Interval,$Duration, $Modifier)
+{
+
+    # SCHTASKS /Create [/S system [/U username [/P [password]]]]
+    #     [/RU username [/RP password]] /SC schedule [/MO modifier] [/D day]
+    #     [/M months] [/I idletime] /TN taskname /TR taskrun [/ST starttime]
+    #     [/RI interval] [ {/ET endtime | /DU duration} [/K] [/XML xmlfile] [/V1]]
+    #     [/SD startdate] [/ED enddate] [/IT | /NP] [/Z] [/F] [/HRESULT] [/?]
+
+    # note - /RL and /DELAY appear in the "Parameter list" for "SCHTASKS /Create /?" but not in the syntax above
+
+    $argumentList = @();
+    $argumentList += @( "/Create" );
+
+    $argumentList += @( "/RU", "`"$RunAsUser`"" );
+    
+    if( -not (StringIsNullOrWhiteSpace($RunAsPassword)))
+    {
+    	$RAP = $RunAsPassword -Replace "`"","\`""
+        $argumentList += @( "/RP `"$RAP`""  );
+    }
+
+    $argumentList += @( "/SC", $Schedule );
+
+    if( -not (StringIsNullOrWhiteSpace($Interval)) )
+    {
+        $argumentList += @( "/RI", $Interval );
+    }
+
+    if( -not (StringIsNullOrWhiteSpace($Modifier)))
+    {
+        switch -Regex ($Schedule)
+        {
+            "MINUTE|HOURLY|DAILY|WEEKLY|MONTHLY|ONEVENT" {
+                $argumentList += @( "/MO", $Modifier );
+            }
+            "ONCE|ONSTART|ONLOGON|ONIDLE" {
+                $argumentList += @( "/MO" );
+        }
+    }
+    }
+
+    if( -not (StringIsNullOrWhiteSpace($Days)))
+    {
+        if($Schedule -ne "WEEKDAYS") {
+            $argumentList += @( "/D", $Days );
+        } else {
+            $argumentList += @( "/D", "MON,TUE,WED,THU,FRI" );
+        }
+    }
+
+    $argumentList += @( "/TN", "`"$TaskName`"" );
+
+    if( $Arguments )
+    {
+        $argumentList += @( "/TR", "`"'$TaskRun' $Arguments`"" );
+    }
+    else
+    {
+        $argumentList += @( "/TR", "`"'$TaskRun'`"" );
+    }
+
+    if( -not (StringIsNullOrWhiteSpace($StartTime)) )
+    {
+        $argumentList += @( "/ST", $StartTime );
+    }
+
+    if( -not (StringIsNullOrWhiteSpace($Duration)) )
+    {
+        $argumentList += @( "/DU", $Duration );
+    }
+
+    if( -not (StringIsNullOrWhiteSpace($StartDate)) )
+    {
+        $argumentList += @( "/SD", $StartDate );
+    }
+
+    $argumentList += @( "/F" );
+
+    if( $RunWithElevatedPermissions )
+    {
+        $argumentList += @( "/RL", "HIGHEST" );
+    }
+
+    Invoke-CommandLine -FilePath     "$($env:SystemRoot)\System32\schtasks.exe" `
+                       -ArgumentList $argumentList;
+
+}
+
+Function Delete-ScheduledTask($TaskName) {
+    # SCHTASKS /Delete [/S system [/U username [/P [password]]]]
+    #          /TN taskname [/F] [/HRESULT] [/?]
+    Invoke-CommandLine -FilePath     "$($env:SystemRoot)\System32\schtasks.exe" `
+                       -ArgumentList @( "/Delete", "/S", "localhost", "/TN", "`"$TaskName`"", "/F" );
+}
+
+Function Stop-ScheduledTask($TaskName) {
+    # SCHTASKS /End [/S system [/U username [/P [password]]]]
+    #          /TN taskname [/HRESULT] [/?]
+    Invoke-CommandLine -FilePath     "$($env:SystemRoot)\System32\schtasks.exe" `
+                       -ArgumentList @( "/End", "/S", "localhost", "/TN", "`"$TaskName`"" );
+}
+
+Function Start-ScheduledTask($TaskName) {
+    # SCHTASKS /Run [/S system [/U username [/P [password]]]] [/I]
+    #          /TN taskname [/HRESULT] [/?]
+    Invoke-CommandLine -FilePath     "$($env:SystemRoot)\System32\schtasks.exe" `
+                       -ArgumentList @( "/Run", "/S", "localhost", "/TN", "`"$TaskName`"" );
+}
+
+Function Enable-ScheduledTask($TaskName) {
+    # SCHTASKS /Change [/S system [/U username [/P [password]]]] /TN taskname
+    #      { [/RU runasuser] [/RP runaspassword] [/TR taskrun] [/ST starttime]
+    #        [/RI interval] [ {/ET endtime | /DU duration} [/K] ]
+    #        [/SD startdate] [/ED enddate] [/ENABLE | /DISABLE] [/IT] [/Z] }
+    #        [/HRESULT] [/?]
+    Invoke-CommandLine -FilePath     "$($env:SystemRoot)\System32\schtasks.exe" `
+                       -ArgumentList @( "/Change", "/S", "localhost", "/TN", "`"$TaskName`"", "/ENABLE" );
+}
+
+Function Disable-ScheduledTask($TaskName) {
+    # SCHTASKS /Change [/S system [/U username [/P [password]]]] /TN taskname
+    #      { [/RU runasuser] [/RP runaspassword] [/TR taskrun] [/ST starttime]
+    #        [/RI interval] [ {/ET endtime | /DU duration} [/K] ]
+    #        [/SD startdate] [/ED enddate] [/ENABLE | /DISABLE] [/IT] [/Z] }
+    #        [/HRESULT] [/?]
+    Invoke-CommandLine -FilePath     "$($env:SystemRoot)\System32\schtasks.exe" `
+                       -ArgumentList @( "/Change", "/S", "localhost", "/TN", "`"$TaskName`"", "/DISABLE" );
+}
+
+Function ScheduledTask-Exists($taskName) {
+   $schedule = new-object -com Schedule.Service
+   $schedule.connect()
+   $tasks = $schedule.getfolder("\").gettasks(0)
+   foreach ($task in ($tasks | select Name)) {
+      #echo "TASK: $($task.name)"
+      if($task.Name -eq $taskName) {
+         #write-output "$task already exists"
+         return $true
+      }
+   }
+   return $false
+}
+
+Function StringIsNullOrWhitespace([string] $string)
+{
+    if ($string -ne $null) { $string = $string.Trim() }
+    return [string]::IsNullOrEmpty($string)
+}
+
+function Invoke-CommandLine
+{
+    param
+    (
+        [Parameter(Mandatory=$true)]
+        [string] $FilePath,
+        [Parameter(Mandatory=$false)]
+        [string[]] $ArgumentList = @( ),
+        [Parameter(Mandatory=$false)]
+        [string[]] $SuccessCodes = @( 0 )
+    )
+    $SanitizedArgList = $ArgumentList | ForEach-Object { if($_.StartsWith("/RP")) { "/RP ********" } else { $_ } }
+    Write-Host ($FilePath + " " + ($SanitizedArgList -Join " "));
+    
+    $process = Start-Process -FilePath $FilePath -ArgumentList $ArgumentList -Wait -NoNewWindow -PassThru;
+    if( $SuccessCodes -notcontains $process.ExitCode )
+    {
+        throw new-object System.InvalidOperationException("process terminated with exit code '$($process.ExitCode)'.");
+    }
+}
+
+function Invoke-OctopusStep
+{
+    param
+    (
+        [Parameter(Mandatory=$true)]
+        [hashtable] $OctopusParameters
+    )
+
+    $taskName = $OctopusParameters['TaskName']
+    $runAsUser = $OctopusParameters['RunAsUser']
+    $runAsPassword = $OctopusParameters['RunAsPassword']
+    $command = $OctopusParameters['Command']
+    $arguments = $OctopusParameters['Arguments']
+    $schedule = $OctopusParameters['Schedule']
+    $startTime = $OctopusParameters['StartTime']
+    $startDate = $OctopusParameters['StartDate']
+
+    if( $OctopusParameters.ContainsKey("RunWithElevatedPermissions") )
+    {
+        $runWithElevatedPermissions = [boolean]::Parse($OctopusParameters['RunWithElevatedPermissions'])
+    }
+    else
+    {
+        $runWithElevatedPermissions = $false;
+    }
+
+    $days = $OctopusParameters['Days']
+    $interval = $OctopusParameters['Interval']
+    $duration = $OctopusParameters['Duration']
+    $Modifier = $OctopusParameters['Modifier']
+
+    if((ScheduledTask-Exists($taskName))){
+        Write-Output "$taskName already exists, Tearing down..."
+        Write-Output "Stopping $taskName..."
+        Stop-ScheduledTask($taskName)
+        Write-Output "Successfully Stopped $taskName"
+        Write-Output "Deleting $taskName..."
+        Delete-ScheduledTask($taskName)
+        Write-Output "Successfully Deleted $taskName"
+    }
+    Write-Output "Creating Scheduled Task - $taskName"
+
+    Create-ScheduledTask $taskName $runAsUser $runAsPassword $command $arguments $schedule $startTime $startDate $runWithElevatedPermissions $days $interval $duration $Modifier
+    Write-Output "Successfully Created $taskName"
+
+    if( $OctopusParameters.ContainsKey('TaskStatus') )
+    {
+        $taskStatus = $OctopusParameters['TaskStatus']
+        if( -not (StringIsNullOrWhiteSpace($taskStatus)) )
+        {
+            if ( $taskStatus -eq "ENABLE" )
+            {
+                Enable-ScheduledTask($taskName)
+                Write-Output "$taskName enabled"
+            }
+            elseif ( $taskStatus -eq "DISABLE" )
+            {
+                Disable-ScheduledTask($taskName)
+                Write-Output "$taskName disabled"
+            }
+            else
+            {
+                Write-Output "$taskName status unchanged (on create, will be enabled)"
+            }
+        }
+    }
+
+    if( $OctopusParameters.ContainsKey("StartNewTaskNow") )
+    {
+        $startNewTaskNow = [boolean]::Parse($OctopusParameters['StartNewTaskNow'])
+    }
+    else
+    {
+        $startNewTaskNow = $false;
+    }
+
+    if( $startNewTaskNow ) {
+      Start-ScheduledTask($taskName)
+    }
+}
+
+
+# only execute the step if it's called from octopus deploy,
+# and skip it if we're runnning inside a Pester test
+if( Test-Path -Path "Variable:OctopusParameters" )
+{
+    Invoke-OctopusStep -OctopusParameters $OctopusParameters;
+}
diff --git a/src/step-templates/windows-scheduled-task-disable/metadata.json b/src/step-templates/windows-scheduled-task-disable/metadata.json
new file mode 100644
index 000000000..853a8f9c5
--- /dev/null
+++ b/src/step-templates/windows-scheduled-task-disable/metadata.json
@@ -0,0 +1,50 @@
+{
+  "Id": "1be30b21-ba58-4667-bff4-2d0ef9a806af",
+  "Name": "Windows Scheduled Task - Disable",
+  "Description": "Disables a Windows Scheduled Task for both 2008 and 2012.",
+  "ActionType": "Octopus.Script",
+  "Version": 6,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "TaskName",
+      "Label": "Task Name",
+      "HelpText": "Name of the Windows Scheduled Task.",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "DefaultValue": null
+    },
+    {
+      "Name": "MaximumWaitTime",
+      "Label": "Maximum Wait Time",
+      "HelpText": "Maximum time the script must wait before aborting. Use '0' to wait indefinitely.",
+      "DefaultValue": 0,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "SucceedOnTaskNotFound",
+      "Label": "Succeed On Task Not Found",
+      "HelpText": "This setting prevents the script from throwing an error if the task is not found.",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
+  "LastModifiedBy": "bobjwalker",
+  "$Meta": {
+    "ExportedAt": "2017-03-13T19:50:10.7280000Z",
+    "OctopusVersion": "2.4.5.46",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-scheduled-task-disable/scriptbody.ps1 b/src/step-templates/windows-scheduled-task-disable/scriptbody.ps1
new file mode 100644
index 000000000..4ef000a14
--- /dev/null
+++ b/src/step-templates/windows-scheduled-task-disable/scriptbody.ps1
@@ -0,0 +1,71 @@
+$taskName = $OctopusParameters['TaskName']
+$maximumWaitTime = $OctopusParameters['MaximumWaitTime']
+$succeedOnTaskNotFound = $OctopusParameters['SucceedOnTaskNotFound']
+
+#Check if the PowerShell cmdlets are available
+$cmdletSupported = [bool](Get-Command -Name Get-ScheduledTask -ErrorAction SilentlyContinue)
+
+try {
+	if($cmdletSupported) {
+		$taskExists = Get-ScheduledTask | Where-Object { $_.TaskName -eq $taskName }
+	}
+	else {
+		$taskService = New-Object -ComObject "Schedule.Service"
+		$taskService.Connect()
+		$taskFolder = $taskService.GetFolder('\')
+		$taskExists = $taskFolder.GetTasks(0) | Select-Object Name, State | Where-Object { $_.Name -eq $taskName }
+	}
+
+	if(-not $taskExists) {
+        if( $succeedOnTaskNotFound){
+            Write-Output "Scheduled task '$taskName' does not exist"
+            }
+        else {
+		    throw "Scheduled task '$taskName' does not exist"
+        }
+		return
+	}
+
+	Write-Output "Disabling $taskName..."
+	$waited = 0
+	if($cmdletSupported) {
+		$task = Disable-ScheduledTask $taskName
+		Write-Output "Waiting until $taskName is disabled..."
+		while(($task.State -ne [Microsoft.PowerShell.Cmdletization.GeneratedTypes.ScheduledTask.StateEnum]::Disabled) -and (($maximumWaitTime -eq 0) -or ($waited -lt $maximumWaitTime))) 
+		{
+			Start-Sleep -Milliseconds 200
+			$waited += 200
+			$task = Get-ScheduledTask $taskName
+		}
+		
+		if($task.State -ne [Microsoft.PowerShell.Cmdletization.GeneratedTypes.ScheduledTask.StateEnum]::Disabled) {
+			throw "The scheduled task $taskName could not be disabled within the specified wait time"
+		}
+	}
+	else {
+		schtasks /Change /Disable /TN "$taskName"
+		#The State property can hold the following values:
+		# 0: Unknown
+		# 1: Disabled
+		# 2: Queued
+		# 3: Ready
+		# 4: Running
+		while(($taskFolder.GetTask($taskName).State -ne 1) -and (($maximumWaitTime -eq 0) -or ($waited -lt $maximumWaitTime))) {
+			Start-Sleep -Milliseconds 200
+			$waited += 200
+		}
+		
+		if($taskFolder.GetTask($taskName).State -ne 1) {
+		    throw "The scheduled task '$taskName' could not be disabled within the specified wait time"
+		}
+	}
+}
+finally {
+    if($taskFolder -ne $NULL) {
+	    [System.Runtime.Interopservices.Marshal]::ReleaseComObject($taskFolder)   
+	}
+	
+	if($taskService -ne $NULL) {
+	    [System.Runtime.Interopservices.Marshal]::ReleaseComObject($taskService)   
+	}
+}
\ No newline at end of file
diff --git a/step-templates/windows-scheduled-task-enable.json b/src/step-templates/windows-scheduled-task-enable/metadata.json
similarity index 62%
rename from step-templates/windows-scheduled-task-enable.json
rename to src/step-templates/windows-scheduled-task-enable/metadata.json
index f3b149eb2..899b3b0b1 100644
--- a/step-templates/windows-scheduled-task-enable.json
+++ b/src/step-templates/windows-scheduled-task-enable/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$taskName = $OctopusParameters['TaskName']\r\rWrite-Output \"Enabling $taskName...\"\r\r#Check if 2008 Server\rif ((Get-WmiObject Win32_OperatingSystem).Name.Contains(\"2008\"))\r{\r    schtasks /Change /Enable /TN $taskName\r}\relse\r{\r    Enable-ScheduledTask $taskName;\r}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,10 +20,10 @@
       "DefaultValue": null
     }
   ],
-  "LastModifiedOn": "2014-05-14T19:45:23.842+00:00",
+  "LastModifiedOn": "2014-05-14T12:45:23.8420000-07:00",
   "LastModifiedBy": "maohde",
   "$Meta": {
-    "ExportedAt": "2014-05-14T19:46:43.760+00:00",
+    "ExportedAt": "2014-05-14T12:46:43.7600000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/windows-scheduled-task-enable/scriptbody.ps1 b/src/step-templates/windows-scheduled-task-enable/scriptbody.ps1
new file mode 100644
index 000000000..94c07b515
--- /dev/null
+++ b/src/step-templates/windows-scheduled-task-enable/scriptbody.ps1
@@ -0,0 +1 @@
+$taskName = $OctopusParameters['TaskName']

Write-Output "Enabling $taskName..."

#Check if 2008 Server
if ((Get-WmiObject Win32_OperatingSystem).Name.Contains("2008"))
{
    schtasks /Change /Enable /TN $taskName
}
else
{
    Enable-ScheduledTask $taskName;
}
\ No newline at end of file
diff --git a/step-templates/windows-service-change-binary-path.json b/src/step-templates/windows-service-change-binary-path/metadata.json
similarity index 70%
rename from step-templates/windows-service-change-binary-path.json
rename to src/step-templates/windows-service-change-binary-path/metadata.json
index 138ad88b2..808b1aa39 100644
--- a/step-templates/windows-service-change-binary-path.json
+++ b/src/step-templates/windows-service-change-binary-path/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$TheService = Get-Service $ServiceName -ErrorAction SilentlyContinue\nif ($TheService)\n{\n    Write-Host \"Windows Service \"\"$ServiceName\"\" found, changing path.\"\n    sc.exe config $TheService binPath= $BinaryPath\n    Write-Host \"Service \"\"$ServiceName\"\" path changed to \"\"$BinaryPath\"\", restart service to use new path.\"\n}\nelse\n{\n    Write-Host \"Windows Service \"\"$ServiceName\"\" not found.\"\n}\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Package.DownloadOnTentacle": "False"
   },
   "Parameters": [
@@ -35,12 +35,12 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2018-05-04T08:38:54.450Z",
+  "LastModifiedOn": "2018-05-04T08:38:54.4500000Z",
   "LastModifiedBy": "sphinxy",
   "$Meta": {
-    "ExportedAt": "2018-05-04T08:38:54.450Z",
+    "ExportedAt": "2018-05-04T08:38:54.4500000Z",
     "OctopusVersion": "4.0.10",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-change-binary-path/scriptbody.ps1 b/src/step-templates/windows-service-change-binary-path/scriptbody.ps1
new file mode 100644
index 000000000..b97122a8d
--- /dev/null
+++ b/src/step-templates/windows-service-change-binary-path/scriptbody.ps1
@@ -0,0 +1,11 @@
+$TheService = Get-Service $ServiceName -ErrorAction SilentlyContinue
+if ($TheService)
+{
+    Write-Host "Windows Service ""$ServiceName"" found, changing path."
+    sc.exe config $TheService binPath= $BinaryPath
+    Write-Host "Service ""$ServiceName"" path changed to ""$BinaryPath"", restart service to use new path."
+}
+else
+{
+    Write-Host "Windows Service ""$ServiceName"" not found."
+}
diff --git a/step-templates/windows-service-check-status.json b/src/step-templates/windows-service-check-status/metadata.json
similarity index 54%
rename from step-templates/windows-service-check-status.json
rename to src/step-templates/windows-service-check-status/metadata.json
index bd23e4a8a..6cf23a1d1 100644
--- a/step-templates/windows-service-check-status.json
+++ b/src/step-templates/windows-service-check-status/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "###----------------------------###\n###                            ###\n###check Windows service status###\n###                            ###\n###----------------------------###\n\n$servicename=$OctopusParameters['servicenamewin']\n$desiredstate=$OctopusParameters['servicewinstatus']\n$hostslist=$OctopusParameters['winhostlist']\n\n###hosts list comma-separated or single host\n$hostl=$hostslist.Split(\",\")\n$hostl\n\nforeach($h in $hostl){\n    Write-Output \"Running on $h\"\n    #check the status of the service on remote host\n    $remotestatus=invoke-command -computername $h {(Get-Service -Name $servicename).Status}\n    $status=$remotestatus.Value\n    if($status){\n        try{\n            if($status -like $desiredstate){\n                Write-Output \"The service $servicename is correctly $desiredstate on $h\"\n            }\n            else{\n                Write-Error \"The service $servicename is NOT $desiredstate. Currently state is $status\"\n            \n            }\n        }\n        catch{\n            Write-Error \"Is not possible to determinate the status for service $servicename\"\n        }\n\n    }\n    else{\n        Write-Error \"Error on retrieving the status. Invalid service name or host $h\"\n    }\n}\n\n###@author:fedele_mattia"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -45,9 +45,9 @@
   ],
   "LastModifiedBy": "fedelemattia",
   "$Meta": {
-    "ExportedAt": "2018-09-27T08:29:15.090Z",
+    "ExportedAt": "2018-09-27T08:29:15.0900000Z",
     "OctopusVersion": "2018.6.10",
     "Type": "ActionTemplate"
   },
   "Category": "Windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-check-status/scriptbody.ps1 b/src/step-templates/windows-service-check-status/scriptbody.ps1
new file mode 100644
index 000000000..a3001e85c
--- /dev/null
+++ b/src/step-templates/windows-service-check-status/scriptbody.ps1
@@ -0,0 +1,40 @@
+###----------------------------###
+###                            ###
+###check Windows service status###
+###                            ###
+###----------------------------###
+
+$servicename=$OctopusParameters['servicenamewin']
+$desiredstate=$OctopusParameters['servicewinstatus']
+$hostslist=$OctopusParameters['winhostlist']
+
+###hosts list comma-separated or single host
+$hostl=$hostslist.Split(",")
+$hostl
+
+foreach($h in $hostl){
+    Write-Output "Running on $h"
+    #check the status of the service on remote host
+    $remotestatus=invoke-command -computername $h {(Get-Service -Name $servicename).Status}
+    $status=$remotestatus.Value
+    if($status){
+        try{
+            if($status -like $desiredstate){
+                Write-Output "The service $servicename is correctly $desiredstate on $h"
+            }
+            else{
+                Write-Error "The service $servicename is NOT $desiredstate. Currently state is $status"
+            
+            }
+        }
+        catch{
+            Write-Error "Is not possible to determinate the status for service $servicename"
+        }
+
+    }
+    else{
+        Write-Error "Error on retrieving the status. Invalid service name or host $h"
+    }
+}
+
+###@author:fedele_mattia
\ No newline at end of file
diff --git a/step-templates/windows-service-create.json b/src/step-templates/windows-service-create/metadata.json
similarity index 73%
rename from step-templates/windows-service-create.json
rename to src/step-templates/windows-service-create/metadata.json
index bb7202f19..16b56d942 100644
--- a/step-templates/windows-service-create.json
+++ b/src/step-templates/windows-service-create/metadata.json
@@ -9,7 +9,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$serviceName = $OctopusParameters['ServiceName']\r\n$binaryPath = $OctopusParameters['BinaryPath']\r\n$dependsOn = $OctopusParameters['DependsOn']\r\n$displayName = $OctopusParameters['DisplayName']\r\n$startupType = $OctopusParameters['StartupType']\r\n$description = $OctopusParameters['Description']\r\n\r\nWrite-Output \"Creating $serviceName...\"\r\n\r\n$serviceInstance = Get-Service $serviceName -ErrorAction SilentlyContinue\r\nif ($serviceInstance -eq $null)\r\n{\r\n    New-Service -Name $serviceName -BinaryPathName $binaryPath -DependsOn $dependsOn -DisplayName $displayName -StartupType $startupType -Description $description\r\n    Write-Output \"Service $serviceName created.\"\r\n}\r\nelse\r\n{\r\n    Write-Output \"The $serviceName already exist.\"\r\n}\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -82,12 +82,12 @@
       "Links": {}
     }
   ],
-  "LastModifiedOn": "2016-12-09T13:30:58.513Z",
+  "LastModifiedOn": "2016-12-09T13:30:58.5130000Z",
   "LastModifiedBy": "marekgd",
   "$Meta": {
-    "ExportedAt": "2016-12-09T13:30:58.513Z",
+    "ExportedAt": "2016-12-09T13:30:58.5130000Z",
     "OctopusVersion": "3.7.4",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-create/scriptbody.ps1 b/src/step-templates/windows-service-create/scriptbody.ps1
new file mode 100644
index 000000000..167ea8a7f
--- /dev/null
+++ b/src/step-templates/windows-service-create/scriptbody.ps1
@@ -0,0 +1,19 @@
+$serviceName = $OctopusParameters['ServiceName']
+$binaryPath = $OctopusParameters['BinaryPath']
+$dependsOn = $OctopusParameters['DependsOn']
+$displayName = $OctopusParameters['DisplayName']
+$startupType = $OctopusParameters['StartupType']
+$description = $OctopusParameters['Description']
+
+Write-Output "Creating $serviceName..."
+
+$serviceInstance = Get-Service $serviceName -ErrorAction SilentlyContinue
+if ($serviceInstance -eq $null)
+{
+    New-Service -Name $serviceName -BinaryPathName $binaryPath -DependsOn $dependsOn -DisplayName $displayName -StartupType $startupType -Description $description
+    Write-Output "Service $serviceName created."
+}
+else
+{
+    Write-Output "The $serviceName already exist."
+}
diff --git a/step-templates/windows-service-remove.json b/src/step-templates/windows-service-remove/metadata.json
similarity index 52%
rename from step-templates/windows-service-remove.json
rename to src/step-templates/windows-service-remove/metadata.json
index 040fd7636..b23a7e77c 100644
--- a/step-templates/windows-service-remove.json
+++ b/src/step-templates/windows-service-remove/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 1,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$TheService = Get-Service $ServiceName -ErrorAction SilentlyContinue\r\nif ($TheService)\r\n{\r\n    Write-Host \"Windows Service \"\"$ServiceName\"\" found, removing service.\"\r\n    if ($TheService.Status -eq \"Running\")\r\n    {\r\n        Write-Host \"Stopping $ServiceName ...\"\r\n        $TheService.Stop()\r\n    }\r\n    sc.exe delete $TheService\r\n    Write-Host \"Service \"\"$ServiceName\"\" removed.\"\r\n}\r\nelse\r\n{\r\n    Write-Host \"Windows Service \"\"$ServiceName\"\" not found.\"\r\n}\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-19T21:05:57.107+00:00",
+    "ExportedAt": "2014-05-19T14:05:57.1070000-07:00",
     "OctopusVersion": "2.4.5.46",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-remove/scriptbody.ps1 b/src/step-templates/windows-service-remove/scriptbody.ps1
new file mode 100644
index 000000000..372bb58bd
--- /dev/null
+++ b/src/step-templates/windows-service-remove/scriptbody.ps1
@@ -0,0 +1,16 @@
+$TheService = Get-Service $ServiceName -ErrorAction SilentlyContinue
+if ($TheService)
+{
+    Write-Host "Windows Service ""$ServiceName"" found, removing service."
+    if ($TheService.Status -eq "Running")
+    {
+        Write-Host "Stopping $ServiceName ..."
+        $TheService.Stop()
+    }
+    sc.exe delete $TheService
+    Write-Host "Service ""$ServiceName"" removed."
+}
+else
+{
+    Write-Host "Windows Service ""$ServiceName"" not found."
+}
diff --git a/step-templates/windows-service-restart.json b/src/step-templates/windows-service-restart/metadata.json
similarity index 61%
rename from step-templates/windows-service-restart.json
rename to src/step-templates/windows-service-restart/metadata.json
index a5f389e59..1410a1987 100644
--- a/step-templates/windows-service-restart.json
+++ b/src/step-templates/windows-service-restart/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 3,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$serviceName = $OctopusParameters['ServiceName']\nWrite-Output \"Restarting $serviceName, stopping...\"\n$serviceInstance = Get-Service $serviceName\nrestart-service -InputObject $serviceName -Force\n$serviceInstance.WaitForStatus('Running','00:01:00')\nWrite-Output \"Service $serviceName started.\"\r",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-05T04:30:44.943+00:00",
+    "ExportedAt": "2014-05-04T21:30:44.9430000-07:00",
     "OctopusVersion": "2.4.2.1412",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-restart/scriptbody.ps1 b/src/step-templates/windows-service-restart/scriptbody.ps1
new file mode 100644
index 000000000..7d7d70d0e
--- /dev/null
+++ b/src/step-templates/windows-service-restart/scriptbody.ps1
@@ -0,0 +1,6 @@
+$serviceName = $OctopusParameters['ServiceName']
+Write-Output "Restarting $serviceName, stopping..."
+$serviceInstance = Get-Service $serviceName
+restart-service -InputObject $serviceName -Force
+$serviceInstance.WaitForStatus('Running','00:01:00')
+Write-Output "Service $serviceName started."
\ No newline at end of file
diff --git a/step-templates/windows-service-set-recovery-on-failure-actions.json b/src/step-templates/windows-service-set-recovery-on-failure-actions/metadata.json
similarity index 61%
rename from step-templates/windows-service-set-recovery-on-failure-actions.json
rename to src/step-templates/windows-service-set-recovery-on-failure-actions/metadata.json
index d4dc8f9e7..fabff992b 100644
--- a/step-templates/windows-service-set-recovery-on-failure-actions.json
+++ b/src/step-templates/windows-service-set-recovery-on-failure-actions/metadata.json
@@ -8,7 +8,7 @@
   "Properties": {
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "cls\n#ignore above\n\nfunction main\n{\n    $serviceName = Get-OctoParameter -parameterName \"ServiceName\" -parameterDescription \"Service Name\"\n    $firstFailureAction = Get-OctoParameter -parameterName \"FirstFailureAction\" -parameterDescription \"First Failure Action\" -default \"restart\"\n    $secondFailureAction = Get-OctoParameter -parameterName \"SecondFailureAction\" -parameterDescription \"Second Failure Action\" -default \"restart\"\n    $thirdFailureAction = Get-OctoParameter -parameterName \"ThirdFailureAction\" -parameterDescription \"Third Failure Action\" -default \"restart\"\n    $firstFailureDelay = Get-OctoParameter -parameterName \"FirstFailureDelay\" -parameterDescription \"First Failure Delay\" -default 180000\n    $secondFailureDelay = Get-OctoParameter -parameterName \"SecondFailureDelay\" -parameterDescription \"Second Failure Delay\" -default 180000\n    $thirdFailureDelay = Get-OctoParameter -parameterName \"ThirdFailureDelay\" -parameterDescription \"Third Failure Delay\" -default 180000\n    $reset = Get-OctoParameter -parameterName \"Reset\" -parameterDescription \"Reset\" -default 86400\n\n    $service = Get-Service $serviceName -ErrorAction SilentlyContinue\n\n    if (!$service)\n    {\n        Write-Host \"Windows Service '$serviceName' not found, skipping.\"\n        return\n    }\n\n    echo \"Updating the '$serviceName' service with recovery options...\"\n    echo \"    On first failure '$firstFailureAction' after '$firstFailureDelay' milliseconds.\"\n    echo \"    On second failure '$secondFailureAction' after '$secondFailureDelay' milliseconds.\"\n    echo \"    On third failure '$thirdFailureAction' after '$thirdFailureDelay' milliseconds.\"\n    echo \"    Reset after '$reset' minutes.\"\n\n    sc.exe failure $service.Name actions= $firstFailureAction/$firstFailureDelay/$secondFailureAction/$secondFailureDelay/$thirdFailureAction/$thirdFailureDelay reset= $reset\n\n    echo \"Done\"\n}\n\nfunction Get-OctoParameter() \n{\n    Param\n    (\n        [Parameter(Mandatory=$true)]$parameterName,\n        [Parameter(Mandatory=$true)]$parameterDescription,\n        [Parameter(Mandatory=$false)]$default\n    )\n\n    $ErrorActionPreference = \"SilentlyContinue\" \n    $value = $OctopusParameters[$parameterName] \n    $ErrorActionPreference = \"Stop\" \n    \n    if (! $value) \n    {\n        if(! $default) \n        {\n            throw \"'$parameterDescription' cannot be empty, please specify a value.\"\n        }\n\n        return $default\n    }\n    \n    return $value\n}\n\nmain"
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
   },
   "Parameters": [
     {
@@ -113,9 +113,9 @@
   ],
   "LastModifiedBy": "samcook",
   "$Meta": {
-    "ExportedAt": "2017-04-11T16:38:17.527Z",
+    "ExportedAt": "2017-04-11T16:38:17.5270000Z",
     "OctopusVersion": "3.12.4",
     "Type": "ActionTemplate"
   },
   "Category": "Windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-set-recovery-on-failure-actions/scriptbody.ps1 b/src/step-templates/windows-service-set-recovery-on-failure-actions/scriptbody.ps1
new file mode 100644
index 000000000..0174da909
--- /dev/null
+++ b/src/step-templates/windows-service-set-recovery-on-failure-actions/scriptbody.ps1
@@ -0,0 +1,60 @@
+cls
+#ignore above
+
+function main
+{
+    $serviceName = Get-OctoParameter -parameterName "ServiceName" -parameterDescription "Service Name"
+    $firstFailureAction = Get-OctoParameter -parameterName "FirstFailureAction" -parameterDescription "First Failure Action" -default "restart"
+    $secondFailureAction = Get-OctoParameter -parameterName "SecondFailureAction" -parameterDescription "Second Failure Action" -default "restart"
+    $thirdFailureAction = Get-OctoParameter -parameterName "ThirdFailureAction" -parameterDescription "Third Failure Action" -default "restart"
+    $firstFailureDelay = Get-OctoParameter -parameterName "FirstFailureDelay" -parameterDescription "First Failure Delay" -default 180000
+    $secondFailureDelay = Get-OctoParameter -parameterName "SecondFailureDelay" -parameterDescription "Second Failure Delay" -default 180000
+    $thirdFailureDelay = Get-OctoParameter -parameterName "ThirdFailureDelay" -parameterDescription "Third Failure Delay" -default 180000
+    $reset = Get-OctoParameter -parameterName "Reset" -parameterDescription "Reset" -default 86400
+
+    $service = Get-Service $serviceName -ErrorAction SilentlyContinue
+
+    if (!$service)
+    {
+        Write-Host "Windows Service '$serviceName' not found, skipping."
+        return
+    }
+
+    echo "Updating the '$serviceName' service with recovery options..."
+    echo "    On first failure '$firstFailureAction' after '$firstFailureDelay' milliseconds."
+    echo "    On second failure '$secondFailureAction' after '$secondFailureDelay' milliseconds."
+    echo "    On third failure '$thirdFailureAction' after '$thirdFailureDelay' milliseconds."
+    echo "    Reset after '$reset' minutes."
+
+    sc.exe failure $service.Name actions= $firstFailureAction/$firstFailureDelay/$secondFailureAction/$secondFailureDelay/$thirdFailureAction/$thirdFailureDelay reset= $reset
+
+    echo "Done"
+}
+
+function Get-OctoParameter() 
+{
+    Param
+    (
+        [Parameter(Mandatory=$true)]$parameterName,
+        [Parameter(Mandatory=$true)]$parameterDescription,
+        [Parameter(Mandatory=$false)]$default
+    )
+
+    $ErrorActionPreference = "SilentlyContinue" 
+    $value = $OctopusParameters[$parameterName] 
+    $ErrorActionPreference = "Stop" 
+    
+    if (! $value) 
+    {
+        if(! $default) 
+        {
+            throw "'$parameterDescription' cannot be empty, please specify a value."
+        }
+
+        return $default
+    }
+    
+    return $value
+}
+
+main
\ No newline at end of file
diff --git a/step-templates/windows-service-set-startup-type.json b/src/step-templates/windows-service-set-startup-type/metadata.json
similarity index 64%
rename from step-templates/windows-service-set-startup-type.json
rename to src/step-templates/windows-service-set-startup-type/metadata.json
index 2709385bd..c948fb863 100644
--- a/step-templates/windows-service-set-startup-type.json
+++ b/src/step-templates/windows-service-set-startup-type/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 1,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$serviceName = $OctopusParameters['ServiceName']\r\n$startupType = $OctopusParameters['StartupType']\r\n\r\nif (!$serviceName)\r\n{\r\n    Write-Error \"No service name was specified. Please specify the name of the service to set the 'Startup Type'.\"\r\n    exit -2\r\n}\r\n\r\nWrite-Output \"Setting Startup Type for $serviceName...\"\r\n\r\nsc.exe config $serviceName start= $startupType\r\n\r\nWrite-Output \"Startup Type for $serviceName set to $startupType.\"\r\n",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -30,12 +30,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2014-09-16T00:08:51.570+00:00",
+  "LastModifiedOn": "2014-09-15T17:08:51.5700000-07:00",
   "LastModifiedBy": "caioproiete",
   "$Meta": {
-    "ExportedAt": "2014-09-16T00:19:29.865+00:00",
+    "ExportedAt": "2014-09-15T17:19:29.8650000-07:00",
     "OctopusVersion": "2.5.8.447",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-set-startup-type/scriptbody.ps1 b/src/step-templates/windows-service-set-startup-type/scriptbody.ps1
new file mode 100644
index 000000000..2cae7a446
--- /dev/null
+++ b/src/step-templates/windows-service-set-startup-type/scriptbody.ps1
@@ -0,0 +1,14 @@
+$serviceName = $OctopusParameters['ServiceName']
+$startupType = $OctopusParameters['StartupType']
+
+if (!$serviceName)
+{
+    Write-Error "No service name was specified. Please specify the name of the service to set the 'Startup Type'."
+    exit -2
+}
+
+Write-Output "Setting Startup Type for $serviceName..."
+
+sc.exe config $serviceName start= $startupType
+
+Write-Output "Startup Type for $serviceName set to $startupType."
diff --git a/step-templates/windows-service-start.json b/src/step-templates/windows-service-start/metadata.json
similarity index 56%
rename from step-templates/windows-service-start.json
rename to src/step-templates/windows-service-start/metadata.json
index 5aff30de9..a8f250a43 100644
--- a/step-templates/windows-service-start.json
+++ b/src/step-templates/windows-service-start/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 6,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$serviceName = $OctopusParameters['ServiceName']\r\rWrite-Output \"Starting $serviceName...\"\r\r$serviceInstance = Get-Service $serviceName\rif ($serviceInstance.Status -eq \"Running\") {\r    Write-Output \"The $serviceName service is already running.\"\r} else {\r    start-service $serviceName\r    $serviceInstance.WaitForStatus('Running', '00:01:00')\r    Write-Output \"Started $serviceName\"\r}\r",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-05T04:11:22.101+00:00",
+    "ExportedAt": "2014-05-04T21:11:22.1010000-07:00",
     "OctopusVersion": "2.4.2.1412",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-start/scriptbody.ps1 b/src/step-templates/windows-service-start/scriptbody.ps1
new file mode 100644
index 000000000..f898c8e72
--- /dev/null
+++ b/src/step-templates/windows-service-start/scriptbody.ps1
@@ -0,0 +1 @@
+$serviceName = $OctopusParameters['ServiceName']

Write-Output "Starting $serviceName..."

$serviceInstance = Get-Service $serviceName
if ($serviceInstance.Status -eq "Running") {
    Write-Output "The $serviceName service is already running."
} else {
    start-service $serviceName
    $serviceInstance.WaitForStatus('Running', '00:01:00')
    Write-Output "Started $serviceName"
}
\ No newline at end of file
diff --git a/src/step-templates/windows-service-stop-or-kill/metadata.json b/src/step-templates/windows-service-stop-or-kill/metadata.json
new file mode 100644
index 000000000..08c561564
--- /dev/null
+++ b/src/step-templates/windows-service-stop-or-kill/metadata.json
@@ -0,0 +1,44 @@
+{
+  "Id": "6fa0fab6-4799-4d81-944d-3c7b54530870",
+  "Name": "Stop Service With Kill",
+  "Description": "This steps stops the specified service and in case it does not respond or times out, the service will be killed.",
+  "ActionType": "Octopus.Script",
+  "Version": 9,
+  "CommunityActionTemplateId": null,
+  "Packages": [],
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline"
+  },
+  "Parameters": [
+    {
+      "Id": "7ad7cec6-c5c8-40a9-8657-793f88ea1c0f",
+      "Name": "ServiceName",
+      "Label": "Service Name",
+      "HelpText": "Name of the service to stop",
+      "DefaultValue": "",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Id": "2ece0f23-76b7-490d-808f-64e5612ac0eb",
+      "Name": "ServiceStopTimeout",
+      "Label": "Service Stop Timeout",
+      "HelpText": "Amount of time in seconds to wait before killing the Process",
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2025-02-20T16:15:00.0000000Z",
+  "LastModifiedBy": "Bjoern-Hennings",
+  "$Meta": {
+    "ExportedAt": "2018-11-05T03:59:57.0280000Z",
+    "OctopusVersion": "2018.8.12",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-service-stop-or-kill/scriptbody.ps1 b/src/step-templates/windows-service-stop-or-kill/scriptbody.ps1
new file mode 100644
index 000000000..fc6e51df0
--- /dev/null
+++ b/src/step-templates/windows-service-stop-or-kill/scriptbody.ps1
@@ -0,0 +1,71 @@
+$svcName = $OctopusParameters['ServiceName']
+$svcTimeout = $OctopusParameters['ServiceStopTimeout']
+
+function Stop-ServiceWithTimeout ([string] $name, [int] $timeoutSeconds) {
+    $timespan = New-Object -TypeName System.Timespan -ArgumentList 0,0,$timeoutSeconds
+
+    If ($svc = Get-Service $svcName -ErrorAction SilentlyContinue) {
+        if ($null -eq $svc) { return $true }
+        if ($svc.Status -eq [ServiceProcess.ServiceControllerStatus]::Stopped) { return $true }
+        try {
+            Write-Host "Stopping Service with Timeout" $svcTimeout "seconds"
+            $svc.Stop()
+            $svc.WaitForStatus([ServiceProcess.ServiceControllerStatus]::Stopped, $timespan)
+        }
+        catch [ServiceProcess.TimeoutException] {
+            Write-Host "Timeout stopping service $($svc.Name)"
+            return $false
+        }
+        catch {
+            Write-Warning "Service $svcName could not be stopped: $_"
+        }
+        Write-Host "Service Sucessfully stopped"
+
+    } Else {
+        Write-Host "Service does not exist, this is acceptable. Probably the first time deploying to this target"
+        Exit
+    }
+}
+
+Write-Host "Checking service $svcName"
+try {
+    $svc = Get-Service $svcName
+}
+catch {
+    if ($null -eq $svc) { Write-Warning "Service $svcName not found." }
+    exit 1
+}
+
+$svcpid1 = (get-wmiobject Win32_Service | Where-Object{$_.Name -eq $svcName}).ProcessId
+if($svcpid1 -ne 0) {
+    Write-Host "Found PID $svcpid1 - stopping service now..."
+    Stop-ServiceWithTimeout -name $svcName -timeoutSeconds $svcTimeout
+}
+else {
+    Write-Host "No PID found for $svcName - service is already stopped."
+    exit 0
+}
+
+Write-Host "Rechecking service"
+$svcpid2 = (get-wmiobject Win32_Service | Where-Object{$_.Name -eq $svcName}).ProcessId
+if($svcpid2 -eq 0) {
+    Write-Host "no PID found for $svcName"
+}
+else {
+    Write-Warning "PID $svcpid2 found for $svcName - service not stopped. Trying to Kill the process."
+}
+
+$service = Get-Service -name $svcName | Select-Object -Property Status
+if($service.Status -ne "Stopped"){
+    Start-Sleep -seconds 5
+    $p = get-process -id $svcpid2 -ErrorAction SilentlyContinue
+    if($p){
+        Write-Host "Killing PID" $p.id "(" $p.Name ")"
+        try {
+            Stop-Process $p.Id -force
+        }
+        catch {
+            Write-Warning "process" $p.id "could not be stopped:" $_
+        }
+    }
+}
diff --git a/step-templates/windows-service-stop.json b/src/step-templates/windows-service-stop/metadata.json
similarity index 55%
rename from step-templates/windows-service-stop.json
rename to src/step-templates/windows-service-stop/metadata.json
index ba434d308..4ea40e909 100644
--- a/step-templates/windows-service-stop.json
+++ b/src/step-templates/windows-service-stop/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 2,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$serviceName = $OctopusParameters['ServiceName']\r\rWrite-Output \"Stopping $serviceName...\"\r\r$serviceInstance = Get-Service $serviceName -ErrorAction SilentlyContinue\rif ($serviceInstance -ne $null) {\r    Stop-Service $serviceName -Force\r    $serviceInstance.WaitForStatus('Stopped', '00:01:00')\r    Write-Output \"Service $serviceName stopped.\"\r} else {\r    Write-Output \"The $serviceName service could not be located.\"\r}\r",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -20,12 +20,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
+  "LastModifiedOn": "2021-07-26T09:50:00.0000000-07:00",
   "LastModifiedBy": "bobjwalker",
   "$Meta": {
-    "ExportedAt": "2014-05-05T04:13:42.618+00:00",
+    "ExportedAt": "2014-05-04T21:13:42.6180000-07:00",
     "OctopusVersion": "2.4.2.1412",
     "Type": "ActionTemplate"
   },
   "Category": "windows"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/windows-service-stop/scriptbody.ps1 b/src/step-templates/windows-service-stop/scriptbody.ps1
new file mode 100644
index 000000000..201069393
--- /dev/null
+++ b/src/step-templates/windows-service-stop/scriptbody.ps1
@@ -0,0 +1 @@
+$serviceName = $OctopusParameters['ServiceName']

Write-Output "Stopping $serviceName..."

$serviceInstance = Get-Service $serviceName -ErrorAction SilentlyContinue
if ($serviceInstance -ne $null) {
    Stop-Service $serviceName -Force
    $serviceInstance.WaitForStatus('Stopped', '00:01:00')
    Write-Output "Service $serviceName stopped."
} else {
    Write-Output "The $serviceName service could not be located."
}
\ No newline at end of file
diff --git a/src/step-templates/windows-wait-for-or-force-close-application/metadata.json b/src/step-templates/windows-wait-for-or-force-close-application/metadata.json
new file mode 100644
index 000000000..79721fded
--- /dev/null
+++ b/src/step-templates/windows-wait-for-or-force-close-application/metadata.json
@@ -0,0 +1,48 @@
+{
+  "Id": "2d59d5b6-1dc3-424e-9279-676393933efd",
+  "Name": "Process - Wait for or Force close",
+  "Description": "Waits a set amount of time for a process to close and optionally force closes the process after the timeout expires.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "Seconds",
+      "Label": "Seconds",
+      "HelpText": "The number of seconds to wait before forcefully killing the application",
+      "DefaultValue": "10",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "Force",
+      "Label": "Force Kill",
+      "HelpText": "Whether or not the application should be forcefully killed after the timeout has expired.",
+      "DefaultValue": "True",
+      "DisplaySettings": {
+        "Octopus.ControlType": "Checkbox"
+      }
+    },
+    {
+      "Name": "ProcessName",
+      "Label": "Process Name",
+      "HelpText": "The name of the process to wait for",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "svenkle",
+  "$Meta": {
+    "ExportedAt": "2015-11-20T17:21:41.9510000-08:00",
+    "OctopusVersion": "3.2.3",
+    "Type": "ActionTemplate"
+  },
+  "Category": "windows"
+}
diff --git a/src/step-templates/windows-wait-for-or-force-close-application/scriptbody.ps1 b/src/step-templates/windows-wait-for-or-force-close-application/scriptbody.ps1
new file mode 100644
index 000000000..36c8205ea
--- /dev/null
+++ b/src/step-templates/windows-wait-for-or-force-close-application/scriptbody.ps1
@@ -0,0 +1,46 @@
+$seconds = $OctopusParameters['Seconds']
+$forceCloseOnTimeout = $OctopusParameters['Force']
+$processName = $OctopusParameters['ProcessName']
+$timeout = new-timespan -Seconds $seconds
+$stopwatch = [diagnostics.stopwatch]::StartNew()
+
+# Check if the process is even running
+if (Get-Process $processName -ErrorAction silentlycontinue)
+{
+    Write-Host "Waiting $seconds seconds for process '$processName' to terminate"
+} 
+else 
+{
+    Write-Host "Process '$processName' is not running"
+    return
+}
+
+# Count down waiting for the process to stop gracefully
+while ($stopwatch.elapsed -lt $timeout)
+{
+    # Check process is running
+    if (Get-Process $processName -ErrorAction silentlycontinue) 
+    {
+        Write-Host "Waiting..."
+    }
+    else 
+    {
+        Write-Host "Process '$processName' is no longer running"
+        return
+    }
+
+    # Wait for a while
+    Start-Sleep -seconds 1
+}
+
+# Force close the process if set
+if($forceCloseOnTimeout –eq $TRUE)
+{
+    Write-Host "Force closing process $processName"
+    Stop-Process -processname $processName -Force
+    Write-Host "Process '$processName' is no longer running"
+    return
+}
+
+Write-Host "Process $processName didn't close within the allocated time"
+Write-Host "Continuing anyway"
\ No newline at end of file
diff --git a/step-templates/winsw-install.json b/src/step-templates/winsw-install/metadata.json
similarity index 51%
rename from step-templates/winsw-install.json
rename to src/step-templates/winsw-install/metadata.json
index 48ce9f63f..b44b57be9 100644
--- a/step-templates/winsw-install.json
+++ b/src/step-templates/winsw-install/metadata.json
@@ -9,7 +9,7 @@
   "Properties": {
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$winswPath = $OctopusParameters[\"winsw-path\"]\n$winswFilename = $OctopusParameters[\"winsw-filename\"]\n$winswFullPath = \"$winswPath\\$winswFilename\"\n$winswUrl = $OctopusParameters[\"winsw-url\"]\n$winswAutoInstall = $OctopusParameters[\"winsw-auto-install\"]\n\nWrite-Host \"Checking to ensure WinSW is installed.\"\nWrite-Host \"For more information on WinSW check out https://github.com/winsw/winsw\"\n\nWrite-Host \"WinSW should be installed at $winswFullPath\"\nWrite-Host \"Checking to ensure base path is located at $winswPath\"\n\nif (-not (Test-Path -LiteralPath \"$winswPath\" -PathType Container)) {\n\tWrite-Host \"Path was not found. Creating the directory now.\"\n    \n    New-Item -Path \"$winswPath\" -ItemType Directory\n    \n    Write-Host \"Directory created.\"\n}\n\n\nif (-not (Test-Path -LiteralPath \"$winswFullPath\" -PathType Leaf)) {\n\n\tWrite-Host \"WinSW was not found at '$winswFullPath'. Check to see if auto install flag is true.\"\n    \n    if ($winswAutoInstall -eq $true) {\n    \t\n        Write-Host \"Flag is true, installing WinSW from $winswUrl to $winswFullPath\"\n        \n        if ($winswUrl -eq $false) {\n        \t\n            Write-Error \"WinSW download URL is not set.\"\n            \n        } else {\n        \t\n            Invoke-WebRequest -Uri $OctopusParameters[\"winsw-url\"] -OutFile \"$winswFullPath\"\n        \n        \tWrite-Host \"WinSW installed at $winswPath.\"\n        }\n        \n    } else {\n    \t\n        Write-Error \"Flag is false, you will need to install WinSW to $winswFullPath.\"\n        \n    }\n}",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.EnabledFeatures": ""
   },
   "Parameters": [
@@ -55,7 +55,7 @@
     }
   ],
   "$Meta": {
-    "ExportedAt": "2020-08-03T13:53:12.815Z",
+    "ExportedAt": "2020-08-03T13:53:12.8150000Z",
     "OctopusVersion": "2020.3.2",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/winsw-install/scriptbody.ps1 b/src/step-templates/winsw-install/scriptbody.ps1
new file mode 100644
index 000000000..0ecb52ec5
--- /dev/null
+++ b/src/step-templates/winsw-install/scriptbody.ps1
@@ -0,0 +1,46 @@
+$winswPath = $OctopusParameters["winsw-path"]
+$winswFilename = $OctopusParameters["winsw-filename"]
+$winswFullPath = "$winswPath\$winswFilename"
+$winswUrl = $OctopusParameters["winsw-url"]
+$winswAutoInstall = $OctopusParameters["winsw-auto-install"]
+
+Write-Host "Checking to ensure WinSW is installed."
+Write-Host "For more information on WinSW check out https://github.com/winsw/winsw"
+
+Write-Host "WinSW should be installed at $winswFullPath"
+Write-Host "Checking to ensure base path is located at $winswPath"
+
+if (-not (Test-Path -LiteralPath "$winswPath" -PathType Container)) {
+	Write-Host "Path was not found. Creating the directory now."
+    
+    New-Item -Path "$winswPath" -ItemType Directory
+    
+    Write-Host "Directory created."
+}
+
+
+if (-not (Test-Path -LiteralPath "$winswFullPath" -PathType Leaf)) {
+
+	Write-Host "WinSW was not found at '$winswFullPath'. Check to see if auto install flag is true."
+    
+    if ($winswAutoInstall -eq $true) {
+    	
+        Write-Host "Flag is true, installing WinSW from $winswUrl to $winswFullPath"
+        
+        if ($winswUrl -eq $false) {
+        	
+            Write-Error "WinSW download URL is not set."
+            
+        } else {
+        	
+            Invoke-WebRequest -Uri $OctopusParameters["winsw-url"] -OutFile "$winswFullPath"
+        
+        	Write-Host "WinSW installed at $winswPath."
+        }
+        
+    } else {
+    	
+        Write-Error "Flag is false, you will need to install WinSW to $winswFullPath."
+        
+    }
+}
\ No newline at end of file
diff --git a/src/step-templates/xamarin-Insights-upload-dysm/metadata.json b/src/step-templates/xamarin-Insights-upload-dysm/metadata.json
new file mode 100644
index 000000000..f985c7c84
--- /dev/null
+++ b/src/step-templates/xamarin-Insights-upload-dysm/metadata.json
@@ -0,0 +1,49 @@
+{
+  "Id": "a1c51946-abd0-434c-99f3-b7a1b5af74c5",
+  "Name": "Xamarin Insights dSYM Upload",
+  "Description": "Uploads a dSYM symbols file to Xamarin Insights, for more readable exceptions.",
+  "ActionType": "Octopus.Script",
+  "Version": 0,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "InsightsAppSpecificApiToken",
+      "Label": "Insights Api Token",
+      "HelpText": "Your Xamarin API Key for the specific application you are uploading the symbol files to.\n\nVisit:\nhttps://insights.xamarin.com\n\nLog in, browse your application, and click Settings. Your application specific API Token should be visible under \"API Key\".",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "PackageStepName",
+      "Label": "Package Step Name",
+      "HelpText": "Name of the previously-deployed package step that contains the dSYM symbol file that you want to deploy.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "NugetSearchPath",
+      "Label": "Nuget Search Path (Optional)",
+      "HelpText": "This fully optional search path allows you to look in a specific folder path in your nuget file, such as \"bin\\release\". This may be needed in cases when the nuget file has multiple dSYM files in different locations.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-01-12T13:54:21.4960000-08:00",
+  "LastModifiedBy": "Colin.Dabritz@Viewpoint.com",
+  "$Meta": {
+    "ExportedAt": "2016-01-12T15:40:54.6350000-08:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "xamarin"
+}
diff --git a/src/step-templates/xamarin-Insights-upload-dysm/scriptbody.ps1 b/src/step-templates/xamarin-Insights-upload-dysm/scriptbody.ps1
new file mode 100644
index 000000000..5a705c266
--- /dev/null
+++ b/src/step-templates/xamarin-Insights-upload-dysm/scriptbody.ps1
@@ -0,0 +1,270 @@
+#####################################
+# Xamarin Insights dSYM Upload script
+#
+# Uploads a dSYM sybmols file to Xamarin insights from a Nuget file
+#  extracted in a previous Octopus Deploy step. Allows a variety of parameters.
+#
+# Uploads to configured application, by API Key.
+#
+# API Documentation is available at: https://developer.xamarin.com/guides/insights/user-interface/settings/#Uploading_a_dSYM_File
+#
+# The API key involved is provided in the "Settings" for the particular app on the Xamarin Insights portal.
+# https://insights.xamarin.com/
+# Log in, open the application, and click settings. The general "settings" tab has the API Key field.
+#
+# Example curl request:
+# curl -F "dsym=@YOUR-APPS-DSYM.zip;type=application/zip" https://xaapi.xamarin.com/api/dsym?apikey=13dd6c82159361ea13ad25a0d9100eb6e228bb17
+#
+# v0.1 - Initial version, uploads one dSYM file.
+# 
+# The nuget package must contain the *.app.dSYM.zip file.  
+#
+# The following *.nuspec example will package a release IPA and associated *.app.dSYM.zip file.
+#
+# The upload script requires a search path (default package root) with exactly one *.app.dSYM.zip file.
+# 
+# Specify package path relative to the nuspec file location
+#
+# https://docs.nuget.org/create/nuspec-reference#file-element-examples
+#
+# In some cases the ID, Version, and Description may need manually specified.
+#
+
+<#
+
+    <?xml version="1.0"?>
+    <package>
+      <metadata>
+        <id>$id$</id>
+        <title>$id$</title>
+        <version>$version$</version>
+        <description>Mobile project packaged for Octopus deploy. $description$</description>
+      </metadata>
+      <files>
+        <!-- Matches mobile package files. Note this will only include the platform being built,
+	         and should match only a single file. -->
+        
+        <!-- iOS -->
+        <file src="**/Release/**/*.ipa" target="" />
+
+        <!-- Include release dSYM symbols file -->
+        <file src="**/Release/*.app.dSYM.zip" target="" />
+
+      </files>
+    </package>
+
+#>
+
+#############################
+# Debug Parameter Overrides #
+#############################
+
+# These values are set explicitly durring debugging so that the script can
+#   be run in the editor.
+# For local debugging, uncomment these values and fill in appropriately.
+
+<#
+
+# debug folder with app files
+$stepPath = "C:\Temp\powershellscript\"
+
+$OctopusParameters = @{
+"InsightsAppSpecificApiToken" = "YourApiKeyhere";
+# "NugetSearchPath" = "bin\iPhone"; # Additional path information, reatlive to the nuget file root, e.g. release
+}
+
+# #>
+
+###################################
+# Octopus Deploy common functions #
+###################################
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+#####################
+# Utility functions #
+#####################
+
+function Get-ExactlyOneDsymFileInfo($searchPath)
+{
+    $symbolFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.app.dSYM.zip
+    
+    $fileCount = $symbolFiles.count
+
+    if($fileCount -ne 1)
+    {
+        throw "Did not find exactly one (1) symbols file. Found $fileCount dSYM file(s). Searched under path: $searchPath"
+    }
+
+    return $symbolFiles
+}
+
+####################
+# Basic Parameters #
+####################
+
+$apiToken = $OctopusParameters['InsightsAppSpecificApiToken']
+
+$octopusFilePathOverride = $OctopusParameters['NugetSearchPath']
+
+$stepName = $OctopusParameters['MobileAppPackageStepName']
+
+# set step path, if not already set
+If([string]::IsNullOrEmpty($stepPath))
+{
+    if (![string]::IsNullOrEmpty($stepName)) {
+        Write-Host "Finding path to package step: $stepName"
+        $stepPath = Find-InstallLocation $stepName
+    } else {
+        $stepPath = Find-SingleInstallLocation
+    }
+}
+
+Write-Host "##octopus[stderr-progress]"
+
+# if we were not provided a file name, search for a single package file
+if([string]::IsNullOrWhiteSpace($octopusFilePathOverride))
+{
+    $appFileInfo = Get-ExactlyOneDsymFileInfo $stepPath
+    $appFullFilePath = $appFileInfo.FullName
+}
+else
+{
+    $searchPathOverride = Join-Path $stepPath $octopusFilePathOverride
+    $appFileInfo = Get-ExactlyOneDsymFileInfo $searchPathOverride
+    $appFullFilePath = $appFileInfo.FullName
+}
+
+$fileName = [System.IO.Path]::GetFileName($appFullFilePath)
+
+$apiUploadUri = "https://xaapi.xamarin.com/api/dsym?apikey=$apiToken"
+
+# Request token details
+$uniqueBoundaryToken = [Guid]::NewGuid().ToString()
+
+$contentType = "multipart/form-data; boundary=$uniqueBoundaryToken"
+
+
+Write-Host "File Location: $appFullFilePath"
+
+################################
+# Set up Hockey App parameters #
+################################
+
+$formSectionSeparator = @"
+
+--$uniqueBoundaryToken
+
+"@
+
+############################
+# Prepare request wrappers #
+############################
+
+# Standard for multipart form data
+# http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4
+
+$stringEncoding = [System.Text.Encoding]::ASCII
+
+# Note the hard-coded "ipa" name here is per HockeyApp API documentation
+#  and it applies to ALL platform application files.
+
+$preFileBytes = $stringEncoding.GetBytes(
+$formSectionSeparator +
+@"
+Content-Disposition: form-data; name="dsym"; filename="$fileName"
+Content-Type: application/zip
+
+
+"@)
+
+# file bytes will go in between
+
+$postFileBytes = $stringEncoding.GetBytes(@"
+
+--$uniqueBoundaryToken--
+"@)
+
+######################
+# Invoke the request #
+######################
+
+# Note, previous approach was Invoke-RestMethod based. It worked, but was NOT memory
+# efficient, leading to high memory usage and "out of memory" errors.
+
+# Based on examples from
+# http://stackoverflow.com/questions/566462/upload-files-with-httpwebrequest-multipart-form-data
+# and 
+# https://gist.github.com/nolim1t/271018
+
+# Uses a dot net WebRequest and streaming to limit memory usage
+
+$WebRequest = [System.Net.WebRequest]::Create("$apiUploadUri")
+
+$WebRequest.ContentType = $contentType
+$WebRequest.Method = "POST"
+$WebRequest.KeepAlive = $true;
+
+$RequestStream = $WebRequest.GetRequestStream()
+
+# before file bytes
+$RequestStream.Write($preFileBytes, 0, $preFileBytes.Length);
+
+#files bytes
+
+$fileMode = [System.IO.FileMode]::Open
+$fileAccess = [System.IO.FileAccess]::Read
+
+$fileStream = New-Object IO.FileStream $appFullFilePath,$fileMode,$fileAccess
+$bufferSize = 4096 # 4k at a time
+$byteBuffer = New-Object Byte[] ($bufferSize)
+
+# read bytes. While bytes are read...
+while(($bytesRead = $fileStream.Read($byteBuffer,0,$byteBuffer.Length)) -ne 0)
+{
+    # write those byes to the request stream
+    $RequestStream.Write($byteBuffer, 0, $bytesRead)
+}
+
+$fileStream.Close()
+
+# after file bytes
+$RequestStream.Write($postFileBytes, 0, $postFileBytes.Length);
+
+$RequestStream.Close()
+
+$response = $WebRequest.GetResponse();
diff --git a/src/step-templates/xamarin-testcloud-execute-testrun/metadata.json b/src/step-templates/xamarin-testcloud-execute-testrun/metadata.json
new file mode 100644
index 000000000..54b3f73f5
--- /dev/null
+++ b/src/step-templates/xamarin-testcloud-execute-testrun/metadata.json
@@ -0,0 +1,112 @@
+{
+  "Id": "fd79c2f6-8983-4f91-a36d-aa622f44f16f",
+  "Name": "Xamarin TestCloud execute test run",
+  "Description": "Executes a Xamarin TestCloud test run for an app contained in a nuget file.",
+  "ActionType": "Octopus.Script",
+  "Version": 2,
+  "Properties": {
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.Syntax": "PowerShell"
+  },
+  "SensitiveProperties": {},
+  "Parameters": [
+    {
+      "Name": "apiKey",
+      "Label": "Api Key",
+      "HelpText": "The app specific API key for your test run. This may be found in the testcloud interface for your application:\n\n1. Visit the testcloud interface: https://testcloud.xamarin.com/\n2. Choose \"New Test Run\" and configure as desired.\n3. In the last step, copy the large hash (app specific API Key), devices parameter code, and username",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      }
+    },
+    {
+      "Name": "devicesCode",
+      "Label": "Devices Code",
+      "HelpText": "The code identifying the devices to test against.\n\nThis may be found in the testcloud interface for your application:\n\n1. Visit the testcloud interface: https://testcloud.xamarin.com/\n2. Choose \"New Test Run\" and configure as desired.\n3. In the last step, copy the large hash (app specific API Key), devices parameter code, and username",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "testCloudUserName",
+      "Label": "TestCloud user name",
+      "HelpText": "The TestCloud user name (e.g. email) that should own the test run. This user must have appropriate permissions for test runs for the configured application.\n\n(Note that this user name will automatically be converted to lower case at this time, to work around an issue with the TestCloud API)",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "PackageStepName",
+      "Label": "Package Step Name",
+      "HelpText": "The name of the previously-deployed package step that contains the app files that you want to test.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "StepName"
+      }
+    },
+    {
+      "Name": "series",
+      "Label": "Series",
+      "HelpText": "You may specify a test series to run, or use the default of \"master\".",
+      "DefaultValue": "master",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "locale",
+      "Label": "Locale",
+      "HelpText": "You may specify a locate to run the tests under, or use the default of \"en_US\".",
+      "DefaultValue": "en_US",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "appPathOverride",
+      "Label": "App path override (optional)",
+      "HelpText": "This fully optional search path allows you to look for app files in a specific folder path in your nuget file, such as \"bin\\iPhone\". This may be needed in cases when the nuget file has multiple app files in different locations. This path override is a path relative to the root of the nuget file.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "dllPathOverride",
+      "Label": "UITest DLL path override (optional)",
+      "HelpText": "This fully optional search path allows you to look for the UITest DLL library files in a specific folder path in your nuget file, such as \"bin\\UITest\\Release\". This may be needed in cases when the nuget file has multiple UITest libraries in different locations. This path override is a path relative to the root of the nuget file.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "symbolPathOverride",
+      "Label": "Symbol Path Override (optional)",
+      "HelpText": "!!IMPORTANT!!\nA symbols file is NOT REQUIRED for TestCloud. It only provides more information for crashes.\n\nThis optional search path allows you to look in a specific folder path in your nuget file, such as \"bin\\iPhone\", for a *.dSYM.zip symbols file. This path override is a path relative to the root of the nuget file.\n\nIf an override is specified and a .zip file is not found, the script will search for a *.dSYM folder to use instead. This means if you have a dSYM folder and not a zip file, you can specify \".\" as an override to search the entire nuget package for the folder, or specify a more specific search path.\n\nThis may be needed in cases when the nuget file has multiple symbol files in different locations, or when you only have a dSYM folder, not a .zip file available.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "testCloudExePathOverride",
+      "Label": "test-cloud.exe path override (optional)",
+      "HelpText": "This fully optional search path allows you to look for the test-cloud.exe utility file in a specific folder path in your nuget file, such as \"tools\". This may be needed in cases when the nuget file has multiple instances of the test-cloud.exe utility in different locations. This path override is a path relative to the root of the nuget file.",
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedOn": "2016-01-18T13:50:44.5300000-08:00",
+  "LastModifiedBy": "colin.dabritz@viewpoint.com",
+  "$Meta": {
+    "ExportedAt": "2016-01-19T15:14:49.3540000-08:00",
+    "OctopusVersion": "2.6.4.951",
+    "Type": "ActionTemplate"
+  },
+  "Category": "xamarin"
+}
diff --git a/src/step-templates/xamarin-testcloud-execute-testrun/scriptbody.ps1 b/src/step-templates/xamarin-testcloud-execute-testrun/scriptbody.ps1
new file mode 100644
index 000000000..1b22fcd3a
--- /dev/null
+++ b/src/step-templates/xamarin-testcloud-execute-testrun/scriptbody.ps1
@@ -0,0 +1,353 @@
+#####################################
+# Xamarin TestCloud Start Test Run script
+# 
+# Kicks off a new test run for an app.
+# This script uses the test-cloud.exe helper utility included with the Xamarin UITest nuget package. 
+# https://www.nuget.org/packages/Xamarin.UITest
+# 
+# For use with Xamarin UITests
+# https://developer.xamarin.com/guides/testcloud/uitest/
+# being run in Xamarin TestCloud on physical devices
+# https://developer.xamarin.com/guides/testcloud/introduction-to-test-cloud/
+#
+# v0.1 - kicks off configured test run, tested against iOS app only
+#
+# The nuget package must contain the *.iap or *.apk file, compiled with calabash included
+# The nuget package must contain the DLLs from the UITest project
+# The nuget package may optionally contain a symbols file, *.app.dSYM.zip
+# The nuget package must contain the test-cloud.exe support utility
+#
+# The following *.nuspec example will package:
+# * a release ipa
+# * UITest DLLs
+# * associated *.app.dSYM.zip file
+# * The test-cloud.exe support utility
+#
+# all search paths default to the root of the nuget package,
+# and may be further qualified relative to the root of the nuget package
+# The upload script uses default or optionally qualified search paths for the following:
+# * The .ipa or .apk location
+# * The UITest project DLLs
+# * The *.app.dSYM.zip symbols file
+# * The test-cloud.exe utility
+#
+# It also requires the API Key from the application, and the code for the devices desired,
+# and a valid user accout to run as.
+#
+# 1. Visit the testcloud interface: https://testcloud.xamarin.com/
+# 2. Choose "New Test Run" and configure as desired.
+# 3. In the last step, copy the large hash (app specific API Key), devices parameter code, and username
+#
+# The nugetFile below is an example that retrieves the appropriate files from a typical iOS build
+#
+# https://docs.nuget.org/create/nuspec-reference#file-element-examples
+#
+# In some cases the ID, Version, and Description may need manually specified.
+#
+
+<#
+
+    <?xml version="1.0"?>
+    <package>
+      <metadata>
+        <id>$id$</id>
+        <title>$id$</title>
+        <version>$version$</version>
+        <description>Mobile project packaged for Octopus deploy. $description$</description>
+      </metadata>
+      <files>
+        <!-- Matches mobile package files. Note this will only include the platform being built,
+	         and should match only a single file. -->
+        
+        <!-- iOS -->
+        <file src="**/Release/**/*.ipa" target="" />
+
+        <!-- Include release dSYM symbols file -->
+        <file src="**/Release/*.app.dSYM.zip" target="" />
+
+        <!-- UITest DLLs -->
+        <file src="..\*Test*\bin\Release\*.dll" target="bin/UITest/Release" />
+
+        <!-- Utility EXE for TestCloud submission scripts -->
+        <!-- Note: The first slash after the parent directory .. MUST be backslash or the package step fails -->
+        <file src="..\packages/Xamarin.UITest.*/tools/test-cloud.exe" target="tools" />
+
+      </files>
+    </package>
+
+#>
+
+#############################
+# Debug Parameter Overrides #
+#############################
+
+# These values are set explicitly durring debugging so that the script can
+#   be run in the editor.
+# For local debugging, uncomment these values and fill in appropriately.
+
+<#
+
+$OctopusParameters = @{
+"appPathOverride" = "" # "bin\iPhone"
+"dllPathOverride" = "" # "bin\UITest\Release"
+"testCloudUserName" = "your.user@name.com"
+"symbolPathOverride" = ""; # "bin\iPhone"
+"apiKey" = "YOUR-KEY-HERE";
+"devicesCode" = "ae978982"; # devices code here (example ae978982 is 2 devices)
+"series" = "master"; # default is master
+"locale" = "en_US"; # default locale is en_US
+"testCloudExePathOverride" = "" # "tools"
+}
+
+# debug folder with app files
+$stepPath = "C:\Temp\powershellscript\"
+
+# #>
+
+###################################
+# Octopus Deploy common functions #
+###################################
+
+# A collection of functions that can be used by script steps to determine where packages installed
+# by previous steps are located on the filesystem.
+ 
+function Find-InstallLocations {
+    $result = @()
+    $OctopusParameters.Keys | foreach {
+        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {
+            $result += $OctopusParameters[$_]
+        }
+    }
+    return $result
+}
+ 
+function Find-InstallLocation($stepName) {
+    $result = $OctopusParameters.Keys | where {
+        $_.Equals("Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath",  [System.StringComparison]::OrdinalIgnoreCase)
+    } | select -first 1
+ 
+    if ($result) {
+        return $OctopusParameters[$result]
+    }
+ 
+    throw "No install location found for step: $stepName"
+}
+
+function Find-SingleInstallLocation {
+    $all = @(Find-InstallLocations)
+    if ($all.Length -eq 1) {
+        return $all[0]
+    }
+    if ($all.Length -eq 0) {
+        throw "No package steps found"
+    }
+    throw "Multiple package steps have run; please specify a single step"
+}
+
+#####################
+# Utility functions #
+#####################
+
+function Get-ExactlyOneMobilePackageFileInfo($searchPath)
+{
+    $apkFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.apk #Android
+    $ipaFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.ipa #iOS
+    $appxFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.appx # windows
+
+    $apkCount = $apkFiles.count
+
+    $ipaCount = $ipaFiles.count
+
+    $appxCount = $appxFiles.count
+
+    $totalCount = $apkCount + $ipaCount + $appxCount
+
+    if($totalCount -ne 1)
+    {
+        throw "Did not find exactly one (1) mobile application package. Found $apkCount APK file(s), $ipaCount IPA file(s), and $appxCount Appx file(s). Searched under path: $searchPath"
+    }
+
+    if($apkCount -eq 1)
+    {
+        return $apkFiles
+    }
+
+    if($ipaCount -eq 1)
+    {
+        return $ipaFiles
+    }
+
+    if($appxCount -eq 1)
+    {
+        return $appxFiles
+    }
+
+    throw "Unable to find mobile application packages (fallback error - not expected)"
+}
+
+function Get-OneDsymFileInfoOrNull($searchPath)
+{
+    $symbolFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.app.dSYM.zip
+    
+    $fileCount = $symbolFiles.count
+
+    if($fileCount -eq 0)
+    { 
+        return $null
+    }   
+
+    if($fileCount -gt 1)
+    {
+        throw "Found more than one symbols file. Found $fileCount dSYM file(s). Searched under path: $searchPath"
+    }
+
+    return $symbolFiles
+}
+
+function Get-ExactlyOneUploadExeFileInfo($searchPath)
+{
+    $testcloudexefiles = Get-ChildItem -Path $searchPath -Recurse -Filter test-cloud.exe
+    
+    $fileCount = $testcloudexefiles.count
+
+    if($fileCount -ne 1)
+    {
+        throw "Did not find exactly one (1) test-cloud.exe. Found $fileCount exe file(s). Searched under path: $searchPath"
+    }
+
+    return $testcloudexefiles
+}
+
+function Get-ExactlyOneUITestDllPath($searchPath)
+{
+    $XamarinUITestdlls = Get-ChildItem -Path $searchPath -Recurse -Filter Xamarin.UITest.dll
+    
+    $fileCount = $XamarinUITestdlls.count
+
+    if($fileCount -ne 1)
+    {
+        throw "Did not find exactly one (1) Test DLL location. Found $fileCount DLL location(s), based on finding 'Xamarin.UITest.dll' files. Searched under path: $searchPath"
+    }
+    
+    $singleXamarinUITestDllFullPath = $XamarinUITestdlls.FullName
+    $UITestDllPath = Split-Path -parent $singleXamarinUITestDllFullPath
+    return $UITestDllPath
+}
+
+####################
+# Basic Parameters #
+####################
+
+# required
+$apiKey = $OctopusParameters['apiKey']
+$devicesCode = $OctopusParameters['devicesCode']
+$testCloudUserName = $OctopusParameters['testCloudUserName']
+
+# optional
+$series = $OctopusParameters['series'] # default "master"
+$locale = $OctopusParameters['locale'] # default "en_US"
+
+# optional additional path overrides
+$appPathOverride = $OctopusParameters['appPathOverride']
+$dllPathOverride = $OctopusParameters['dllPathOverride']
+$symbolPathOverride = $OctopusParameters['symbolPathOverride']
+$testCloudExePathOverride = $OctopusParameters['testCloudExePathOverride']
+
+# test cloud user names must be lower case to work around API/Utility issue (until issue is fixed)
+$testCloudUserName = $testCloudUserName.ToLower()
+
+$stepName = $OctopusParameters['MobileAppPackageStepName']
+
+# set step path, if not already set
+If([string]::IsNullOrEmpty($stepPath))
+{
+    if (![string]::IsNullOrEmpty($stepName)) {
+        Write-Host "Finding path to package step: $stepName"
+        $stepPath = Find-InstallLocation $stepName
+    } else {
+        $stepPath = Find-SingleInstallLocation
+    }
+}
+
+Write-Host "Nuget Package base path    : $stepPath"
+# Write-Host "##octopus[stderr-progress]"
+
+# find app
+
+# complete search paths, overrides may be blank
+$appSearchPath = Join-Path $stepPath $appPathOverride
+$symbolSearchPath = Join-Path $stepPath $symbolPathOverride
+$dllSearchPath = Join-Path $stepPath $dllPathOverride
+$testCouldExeSearchPath = Join-Path $stepPath $testCloudExePathOverride
+
+$appFileFullPath = (Get-ExactlyOneMobilePackageFileInfo $appSearchPath).FullName
+$symbolFileFullPath = (Get-OneDsymFileInfoOrNull $symbolSearchPath).FullName
+$dllDirectoryFullPath = Get-ExactlyOneUITestDllPath $dllSearchPath
+
+$testCloudExeFullPath = (Get-ExactlyOneUploadExeFileInfo $testCouldExeSearchPath).FullName
+
+# It turns out that the utility exe expects a dsym folder, convert to folder
+
+# DIRTY HACKS - the API should accept a *.dSYM.zip like insights does, see
+# https://testcloud.ideas.aha.io/ideas/XTA-I-50
+
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+
+function Unzip
+{
+    param([string]$zipfile, [string]$outpath)
+
+    [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)
+}
+
+$symbolFileDirectoryPath = ""
+if($symbolFileFullPath) # has a full zip path
+{
+    $parentPath = Split-Path -parent $symbolFileFullPath
+    Unzip $symbolFileFullPath $parentPath
+
+    # get unzipped folder name ending in dSYM
+    $symbolFileDirectoryPath = (Get-ChildItem -Path $parentPath -Recurse -Filter *.dSYM).FullName
+}
+elseif ($symbolPathOverride) # no zip, try to find folder
+{
+    # search for dSYM folder instead
+
+    $symbolFileDirectorySearchResults = Get-ChildItem -Path $searchPath -Recurse -Filter *.dSYM
+    
+    # if exactly one result
+    if($symbolFileDirectorySearchResults.Count -eq 1)
+    {
+        $symbolFileDirectoryPath = $symbolFileDirectorySearchResults.FullName
+    }
+}
+
+######################
+# Invoke the request #
+######################
+ 
+Write-Host "App path                   : " $appFileFullPath
+Write-Host "Symbol File path (optional): " $symbolFileFullPath
+Write-Host "Test DLL full path         : " $dllDirectoryFullPath
+Write-Host "TestCloud exe path         : " $testCloudExeFullPath
+Write-Host
+
+# run command with optional argument
+
+if($symbolFileDirectoryPath) # symbols file present
+{
+    Write-Host "Running command: " 
+    Write-Host """$testCloudExeFullPath"" submit ""$appFileFullPath"" $apiKey --user $testCloudUserName --devices $devicesCode --series ""$series"" --locale ""$locale"" --assembly-dir ""$dllDirectoryFullPath"" --dsym ""$symbolFileDirectoryPath"""
+    Write-Host 
+    cmd /c "$testCloudExeFullPath" submit "$appFileFullPath" $apiKey --user $testCloudUserName --devices $devicesCode --series "$series" --locale "$locale" --assembly-dir "$dllDirectoryFullPath" --dsym "$symbolFileDirectoryPath"
+}
+else # no symbols file
+{
+    Write-Host "Running command: " 
+    Write-Host """$testCloudExeFullPath"" submit ""$appFileFullPath"" $apiKey --user $testCloudUserName --devices $devicesCode --series ""$series"" --locale ""$locale"" --assembly-dir ""$dllDirectoryFullPath"""
+    Write-Host
+    cmd /c "$testCloudExeFullPath" submit "$appFileFullPath" $apiKey --user $testCloudUserName --devices $devicesCode --series "$series" --locale "$locale" --assembly-dir "$dllDirectoryFullPath"
+}
+
+Write-Host
+Write-Host "TestCloud upload command complete."
\ No newline at end of file
diff --git a/step-templates/xml-attribute-update.json b/src/step-templates/xml-attribute-update/metadata.json
similarity index 80%
rename from step-templates/xml-attribute-update.json
rename to src/step-templates/xml-attribute-update/metadata.json
index 40b8b43cd..9126edfd2 100644
--- a/step-templates/xml-attribute-update.json
+++ b/src/step-templates/xml-attribute-update/metadata.json
@@ -5,7 +5,7 @@
   "ActionType": "Octopus.Script",
   "Version": 0,
   "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[xml]$xml = Get-Content $path \r\n$ns = new-object Xml.XmlNamespaceManager $xml.NameTable\r\n$ns.AddNamespace($nsKey, $nsValue)\r\n\r\n$xml.SelectNodes($xmlPath, $ns) | % {\r\n\tif ($_.key -eq $key)\r\n\t{\r\n\t\t$_.value = $value\r\n\t}\r\n}\r\n\r\n$xml.Save($path)",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.Syntax": "PowerShell"
   },
   "SensitiveProperties": {},
@@ -65,12 +65,12 @@
       }
     }
   ],
-  "LastModifiedOn": "2015-08-03T13:33:12.919+00:00",
+  "LastModifiedOn": "2015-08-03T06:33:12.9190000-07:00",
   "LastModifiedBy": "pitrew",
   "$Meta": {
-    "ExportedAt": "2015-08-03T13:50:55.041+00:00",
+    "ExportedAt": "2015-08-03T06:50:55.0410000-07:00",
     "OctopusVersion": "2.6.5.1010",
     "Type": "ActionTemplate"
   },
   "Category": "xml"
-}
\ No newline at end of file
+}
diff --git a/src/step-templates/xml-attribute-update/scriptbody.ps1 b/src/step-templates/xml-attribute-update/scriptbody.ps1
new file mode 100644
index 000000000..148499df3
--- /dev/null
+++ b/src/step-templates/xml-attribute-update/scriptbody.ps1
@@ -0,0 +1,12 @@
+[xml]$xml = Get-Content $path 
+$ns = new-object Xml.XmlNamespaceManager $xml.NameTable
+$ns.AddNamespace($nsKey, $nsValue)
+
+$xml.SelectNodes($xmlPath, $ns) | % {
+	if ($_.key -eq $key)
+	{
+		$_.value = $value
+	}
+}
+
+$xml.Save($path)
\ No newline at end of file
diff --git a/src/step-templates/xml-transform-using-xdt/metadata.json b/src/step-templates/xml-transform-using-xdt/metadata.json
new file mode 100644
index 000000000..9accbba8e
--- /dev/null
+++ b/src/step-templates/xml-transform-using-xdt/metadata.json
@@ -0,0 +1,60 @@
+{
+  "Id": "569a5f1b-bb57-491a-9c4e-a6d6e44e6b26",
+  "Name": "XML Transform using XDT",
+  "Description": "You can use this script to easily transform any XML file using XDT.\nThe script will download its dependencies automatically.",
+  "ActionType": "Octopus.Script",
+  "Version": 8,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
+    "Octopus.Action.Script.ScriptFileName": null,
+    "Octopus.Action.Package.NuGetFeedId": null,
+    "Octopus.Action.Package.NuGetPackageId": null
+  },
+  "Parameters": [
+    {
+      "Name": "sourceFile",
+      "Label": "Source file path",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "transformFile",
+      "Label": "Transform file path",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "destFile",
+      "Label": "Destination file path",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    },
+    {
+      "Name": "toolsDir",
+      "Label": "Directory to download tools programs",
+      "HelpText": null,
+      "DefaultValue": "C:\\tools",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      }
+    }
+  ],
+  "LastModifiedBy": "lijunkang",
+  "$Meta": {
+    "ExportedAt": "2016-08-24T00:11:46.7260000-07:00",
+    "OctopusVersion": "3.3.17",
+    "Type": "ActionTemplate"
+  },
+  "Category": "xml"
+}
diff --git a/src/step-templates/xml-transform-using-xdt/scriptbody.ps1 b/src/step-templates/xml-transform-using-xdt/scriptbody.ps1
new file mode 100644
index 000000000..b1b71587e
--- /dev/null
+++ b/src/step-templates/xml-transform-using-xdt/scriptbody.ps1
@@ -0,0 +1,74 @@
+function Get-Parameter($Name, $Default, [switch]$Required) {
+    $result = $null
+
+    if ($OctopusParameters -ne $null) {
+        $result = $OctopusParameters[$Name]
+    }
+
+    if ($result -eq $null) {
+        if ($Required) {
+            throw "Missing parameter value $Name"
+        } else {
+            $result = $Default
+        }
+    }
+
+    return $result
+}
+
+$toolsDir = Get-Parameter "toolsDir" -Required
+$sourceFile = Get-Parameter "sourceFile" -Required
+$transformFile = Get-Parameter "transformFile" -Required
+$destFile = Get-Parameter "destFile" -Required
+
+if(!(Test-Path $toolsDir)){
+    New-Item -Path $toolsDir -ItemType Directory
+}
+$nugetDestPath = Join-Path -Path $toolsDir -ChildPath nuget.exe
+if(!(Test-Path $nugetDestPath)){
+    Write-Output 'Downloading nuget.exe'
+	# download nuget
+    Invoke-WebRequest 'http://nuget.org/nuget.exe' -OutFile $nugetDestPath
+    # double check that it was written to disk
+    if(!(Test-Path $nugetDestPath)){
+        throw 'unable to download nuget'
+    }
+}
+
+$xdtExe = (Get-ChildItem -Path $toolsDir -Include 'SlowCheetah.Xdt.exe' -Recurse) | Select-Object -First 1
+
+if(!$xdtExe){
+    Write-Output 'Downloading xdt since it was not found in the tools folder'
+     # nuget install SlowCheetah.Xdt -Prerelease -OutputDirectory toolsDir\
+    $nugetInstallCmdArgs = @('install','SlowCheetah.Xdt','-Prerelease','-OutputDirectory',(Resolve-Path $toolsDir).ToString())
+
+    Write-Output ('Calling nuget.exe to download SlowCheetah.Xdt with the following args: [{0} {1}]' -f $nugetDestPath, ($nugetInstallCmdArgs -join ' '))
+    &($nugetDestPath) $nugetInstallCmdArgs
+
+    $xdtExe = (Get-ChildItem -Path $toolsDir -Include 'SlowCheetah.Xdt.exe' -Recurse) | Select-Object -First 1
+
+    if(!$xdtExe){
+        throw ('SlowCheetah.Xdt not found')
+    }
+
+    # copy the xdt assemlby if the xdt directory is missing it
+    $xdtDllExpectedPath = (Join-Path $xdtExe.Directory.FullName 'Microsoft.Web.XmlTransform.dll')
+
+    if(!(Test-Path $xdtDllExpectedPath)){
+        # copy the xdt.dll next to the slowcheetah .exe
+        $xdtDll = (Get-ChildItem -Path $toolsDir -Include 'Microsoft.Web.XmlTransform.dll' -Recurse) | Select-Object -First 1
+
+        if(!$xdtDll){
+		    throw 'Microsoft.Web.XmlTransform.dll not found'
+		}
+
+        Copy-Item -Path $xdtDll.Fullname -Destination $xdtDllExpectedPath
+    }
+}
+
+$cmdArgs = @((Resolve-Path $sourceFile).ToString(),
+            (Resolve-Path $transformFile).ToString(),
+            (Resolve-Path $destFile).ToString())
+
+Write-Output ('Calling slowcheetah.xdt.exe with the args: [{0} {1}]' -f $xdtExe, ($cmdArgs -join ' '))
+&($xdtExe) $cmdArgs
diff --git a/step-templates/yams-upload.json b/src/step-templates/yams-upload/metadata.json
similarity index 74%
rename from step-templates/yams-upload.json
rename to src/step-templates/yams-upload/metadata.json
index c3175d94d..9d7a97b27 100644
--- a/step-templates/yams-upload.json
+++ b/src/step-templates/yams-upload/metadata.json
@@ -8,7 +8,7 @@
     "Octopus.Action.Script.Syntax": "PowerShell",
     "Octopus.Action.Script.ScriptSource": "Inline",
     "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "$yamsUploaderInstallationParameter = \"Octopus.Action[$YamsUploaderStep].Output.Package.InstallationDirectoryPath\"\nWrite-Host \"Yams Uploader installation path parameter: $yamsUploaderInstallationParameter\" \n$applicationInstallationParameter = \"Octopus.Action[$PackageStep].Output.Package.InstallationDirectoryPath\"\nWrite-Host \"Application Package installation path parameter: $applicationInstallationParameter\" \n\n$yamsUploader = $OctopusParameters[$yamsUploaderInstallationParameter] + \"\\content\\YamsUploader.exe\"\nWrite-Host \"Running Yams Uploader: $yamsUploader\" \n\n$binaries = $OctopusParameters[$applicationInstallationParameter]\nWrite-Host \"Uploading application: $binaries\"\n\n& \"$yamsUploader\" -YamsStorage \"$Storage\" -ClusterId \"$ClusterId\" -BinariesPath \"$binaries\" -AppVersion \"$AppVersion\" -AppId \"$AppId\"",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1",
     "Octopus.Action.Script.ScriptFileName": null,
     "Octopus.Action.Package.FeedId": null,
     "Octopus.Action.Package.PackageId": null
@@ -83,7 +83,7 @@
   ],
   "LastModifiedBy": "jkonecki",
   "$Meta": {
-    "ExportedAt": "2016-11-24T18:45:19.864Z",
+    "ExportedAt": "2016-11-24T18:45:19.8640000Z",
     "OctopusVersion": "3.5.1",
     "Type": "ActionTemplate"
   },
diff --git a/src/step-templates/yams-upload/scriptbody.ps1 b/src/step-templates/yams-upload/scriptbody.ps1
new file mode 100644
index 000000000..49343c64e
--- /dev/null
+++ b/src/step-templates/yams-upload/scriptbody.ps1
@@ -0,0 +1,12 @@
+$yamsUploaderInstallationParameter = "Octopus.Action[$YamsUploaderStep].Output.Package.InstallationDirectoryPath"
+Write-Host "Yams Uploader installation path parameter: $yamsUploaderInstallationParameter" 
+$applicationInstallationParameter = "Octopus.Action[$PackageStep].Output.Package.InstallationDirectoryPath"
+Write-Host "Application Package installation path parameter: $applicationInstallationParameter" 
+
+$yamsUploader = $OctopusParameters[$yamsUploaderInstallationParameter] + "\content\YamsUploader.exe"
+Write-Host "Running Yams Uploader: $yamsUploader" 
+
+$binaries = $OctopusParameters[$applicationInstallationParameter]
+Write-Host "Uploading application: $binaries"
+
+& "$yamsUploader" -YamsStorage "$Storage" -ClusterId "$ClusterId" -BinariesPath "$binaries" -AppVersion "$AppVersion" -AppId "$AppId"
\ No newline at end of file
diff --git a/src/step-templates/zabbix-node-api-maintenance/metadata.json b/src/step-templates/zabbix-node-api-maintenance/metadata.json
new file mode 100644
index 000000000..cac99a236
--- /dev/null
+++ b/src/step-templates/zabbix-node-api-maintenance/metadata.json
@@ -0,0 +1,110 @@
+{
+  "Id": "2fdc47cd-d120-4919-b0d5-2ed22ca8ff62",
+  "Name": "Zabbix API maintenance",
+  "Description": "This step template adds single host on Zabbix maintenance.",
+  "ActionType": "Octopus.Script",
+  "Version": 12,
+  "Properties": {
+    "Octopus.Action.Script.Syntax": "PowerShell",
+    "Octopus.Action.Script.ScriptSource": "Inline",
+    "Octopus.Action.Script.ScriptBody": "__SOURCE_FILE__:scriptbody.ps1"
+  },
+  "Parameters": [
+    {
+      "Id": "2d679eba-f403-4548-a57d-dacacfb5b299",
+      "Name": "zserver",
+      "Label": "Zabbix Server",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "898bbce8-28d3-43d1-9d19-a659ffce3865",
+      "Name": "zuser",
+      "Label": "Zabbix Username",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "86e4c608-e37f-4a0a-a432-e1c07b8f2b6b",
+      "Name": "zpass",
+      "Label": "Zabbix Password",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Sensitive"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "1f51ac2a-852a-4f88-be40-a1304eb11cb2",
+      "Name": "zhost",
+      "Label": "Host",
+      "HelpText": "host in maintenance - single host",
+      "DefaultValue": "#{Octopus.Machine.Name}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "50e5fbdd-949e-4ce8-8a10-94a403c3fb2d",
+      "Name": "action",
+      "Label": "",
+      "HelpText": null,
+      "DefaultValue": null,
+      "DisplaySettings": {
+        "Octopus.ControlType": "Select",
+        "Octopus.SelectOptions": "create|Create maintenance\nremove|Remove maintenance"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "b1ef0d32-ec8e-44f3-a7f4-a34af6cd252c",
+      "Name": "gmt",
+      "Label": "GMT",
+      "HelpText": "This option depends on Zabbix server configuration.\nIf it is not necessary, set GMT=0 (UTC).\nIf UTC+2, insert 2. If UTC-4, insert -4.",
+      "DefaultValue": "0",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "6fa1f56d-b9ee-4830-9e88-a434c6b82774",
+      "Name": "hours",
+      "Label": "Maintenance Period",
+      "HelpText": "in hours",
+      "DefaultValue": "4",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    },
+    {
+      "Id": "ca825d16-f0ff-4bcc-b0e7-abcde1f2188e",
+      "Name": "number",
+      "Label": "ID for maintenance name",
+      "HelpText": "maintenance name: Octo-[number]-[host]",
+      "DefaultValue": "#{Octopus.Release.Number}",
+      "DisplaySettings": {
+        "Octopus.ControlType": "SingleLineText"
+      },
+      "Links": {}
+    }
+  ],
+  "LastModifiedBy": "dpijl10",
+  "$Meta": {
+    "ExportedAt": "2018-04-11T11:33:40.3300000Z",
+    "OctopusVersion": "2018.2.7",
+    "Type": "ActionTemplate"
+  },
+  "Category": "zabbix"
+}
diff --git a/src/step-templates/zabbix-node-api-maintenance/scriptbody.ps1 b/src/step-templates/zabbix-node-api-maintenance/scriptbody.ps1
new file mode 100644
index 000000000..fb2a94617
--- /dev/null
+++ b/src/step-templates/zabbix-node-api-maintenance/scriptbody.ps1
@@ -0,0 +1,138 @@
+$Zserver="#{zserver}"
+$Zuser="#{zuser}"
+$Zpassword="#{zpass}"
+$Zhost="#{zhost}"
+$setgmt=#{gmt}
+$hours=#{hours}
+$action="#{action}"
+$number="#{number}"
+
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
+
+function Get-Auth{
+    param(
+        $server,
+        $user,
+        $pass,
+        $url
+    )
+    $body='{"jsonrpc": "2.0", "method": "user.login", "params": {"user": "'+"$user"+'", "password": "'+"$pass"+'"}, "id": 1, "auth": null}'
+    try {
+        $key=Invoke-WebRequest -Uri "$url" -ContentType application/json-rpc -Body $body -Method Put -UseBasicParsing
+        } catch [Exception] {
+            Write-Error "Error: cannot connect to zabbix server ($($_.Exception.Message)), check hostname/url! Frequently zabbix is installed on a virtual folder like {hostname}/zabbix, please include the folder into the hostname variable.`r`n" -ErrorAction Stop
+        }
+    $token=($key.Content | ConvertFrom-Json).result
+    return $token
+}
+
+function Remove-Maintenance{
+    param(
+        $srvr,
+        $usr,
+        $pswd,
+        $uri,
+        $mname
+    )
+    $remove='{"jsonrpc": "2.0", "method": "maintenance.get", "params": {"output": "extend", "selectHosts": "extend", "selectTimeperiods": "extend"},"auth": "'+"$auth"+'","id": 1}'
+
+    $maintenace=Invoke-WebRequest -Uri "$uri" -ContentType application/json-rpc -Body $remove -Method Put -UseBasicParsing
+    $select= ($maintenace.Content | ConvertFrom-Json).result | where{$_.name -like "$mname"}
+    $id=$select.maintenanceid
+    if($id){
+        Write-Output "Remove maintenance ID: $id"
+        $rmv='{"jsonrpc": "2.0", "method": "maintenance.delete", "params": ["'+"$id"+'"], "auth": "'+"$auth"+'","id": 1}'
+        $actionremove=Invoke-WebRequest -Uri "$uri" -ContentType application/json-rpc -Body $rmv -Method Put -UseBasicParsing
+        $check=(($actionremove.Content | ConvertFrom-Json).result).maintenanceids
+        if($check -like $id){
+            Write-Output "Maintenance $id removed"
+        }
+        else{
+            Write-Error "Something wrong. Please contact your system administrator"
+        }
+    }
+    else{
+        Write-Error "NO Maintenance ID - contact your system administrator"
+    }
+}
+
+###GLOBAL VARIABLES###
+if (!$Zserver.StartsWith("http")) { $Zserver="http://$Zserver" } 
+$Zurl="$Zserver/api_jsonrpc.php"
+$maintenancename="Octo-$number-$Zhost"
+
+###GET AUTH FROM ZABBIX SERVER###
+$auth=Get-Auth -server $Zserver -user $Zuser -pass $Zpassword -url $Zurl
+if ($auth -eq $null) { 
+    Write-Error "Authentication failure for user $Zuser on server $Zserver!" -ErrorAction Stop 
+    exit
+}
+
+###GET HOST ID###
+$content='{"jsonrpc": "2.0", "method": "host.get", "params": {"output": "extend", "filter": {"host": "'+"$Zhost"+'"}},"auth": "'+"$auth"+'","id": 1}'
+$zabbixhost=Invoke-WebRequest -Uri "$Zurl" -ContentType application/json-rpc -Body $content -Method Put -UseBasicParsing
+$nameserver=$zabbixhost.Content | ConvertFrom-Json
+$hostid=$nameserver.result.hostid
+if($hostid){
+    Write-Output "Host $Zhost found with ID: $hostid"
+}
+else{
+    Write-Error "Host $Zhost not found, or user not authorized for this host - please contact your system administrator!"
+    exit
+}
+
+###ADD NEW MAINTENANCE###
+if ($action -eq "create"){
+    ###REMOVE MAINTENANCE IF ALREADY EXISTS WITH THE SAME NAME###
+    $remove='{"jsonrpc": "2.0", "method": "maintenance.get", "params": {"output": "extend", "selectHosts": "extend", "selectTimeperiods": "extend"},"auth": "'+"$auth"+'","id": 1}'
+    $maintenace=Invoke-WebRequest -Uri "$Zurl" -ContentType application/json-rpc -Body $remove -Method Put -UseBasicParsing
+
+    $select= ($maintenace.Content | ConvertFrom-Json).result | where{$_.name -like "$maintenancename"}
+    if(!$select){
+        Write-Output "No maintenance with the same name is already registered"
+    }
+    else{
+        Remove-Maintenance -srvr $Zserver -usr $Zuser -pswd $Zpassword -uri $Zurl -mname $maintenancename
+    }
+
+    ###START TO CREATE NEW MAINTENANCE###
+    $since=[int][double]::Parse((get-date -UFormat %s))
+    $till=0
+
+    ###ATTENTION ON GMT - THIS WORK FOR ITALIAN ZONE AND TAKES DAYLIGHT SAVINGSTIME FROM###
+    ###start check your ZABBIX configuration###
+    $workdate=(Get-Date)
+    if (![int32]::TryParse($setgmt, [ref] $gmt)) { $gmt=([TimeZoneInfo]::Local.BaseUtcOffset).Hours }
+    if ($workdate.IsDaylightSavingTime()) { $gmt+=1 }
+
+    $min=$workdate.AddHours(-$gmt).Minute
+    $h=$workdate.AddHours(-$gmt).Hour
+    $minutetoseconds=$min*=60
+    $hourstoseconds=$h*=3600
+    $starttime=$minutetoseconds+=$hourstoseconds
+    $seconds=$hours*=3600
+
+    $sincesum=$since
+    $till=$sincesum+=$seconds
+    $since=$since-=(60*60*$gmt)
+    $till=$till-=(60*60*$gmt)
+
+    ###stop check your ZABBIX configuration###
+    $add='{"jsonrpc": "2.0", "method": "maintenance.create", "params": {"name": "'+"$maintenancename"+'", "active_since": "'+"$since"+'", "active_till": '+"$till"+', "hostids": ["'+$hostid+'"], "timeperiods": [{"timeperiod_type": 0, "start_time": '+$starttime+', "period": '+$seconds+'}]}, "auth": "'+$auth+'", "id": 1}'
+    $maintenance=Invoke-WebRequest -Uri "$Zurl" -ContentType application/json-rpc -Body $add -Method Put -UseBasicParsing
+    $check=(($maintenance.Content | ConvertFrom-Json).result).maintenanceids
+    if($check){
+        Write-Output "Maintenance $check created"
+    }
+    else{
+        Write-Error "Something wrong. Please contact your system administrator"
+    }
+}
+else{
+    if($action -eq "remove"){
+        Remove-Maintenance -srvr $Zserver -usr $Zuser -pswd $Zpassword -uri $Zurl -mname $maintenancename        
+    }
+    else{
+        Write-Error "Action $action not possible"
+    }
+}
\ No newline at end of file
diff --git a/step-templates/teamcity-trigger-build.json b/step-templates/teamcity-trigger-build.json
deleted file mode 100644
index 5f6ec3fd3..000000000
--- a/step-templates/teamcity-trigger-build.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "22483ce2-1444-4c02-861c-fb9533959e16",
-  "Name": "Trigger TeamCity Build",
-  "Description": "Trigger a specific Team City build from an Octopus Deploy process.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$buildConfId = $OctopusParameters['BuildConfigurationId']\r\n\r\n$teamCityUrl = $OctopusParameters['TeamCityUrl']\r\n$teamCityUsername = $OctopusParameters['TeamCityUsername']\r\n$teamCityPassword = $OctopusParameters['TeamCityPassword']\r\n\r\n$url = $teamCityUrl + '/httpAuth/app/rest/buildQueue'\r\n$contentTemplate = '<build><buildType id=\"{0}\"/></build>'\r\n$content = $contentTemplate -f $buildConfId\r\n$encodedContent = [System.Text.Encoding]::UTF8.GetBytes($content)\r\n\r\nWrite-Host \"================================================================================\"\r\nWrite-Host \"Triggering build with Id $buildConfId in TeamCity. Server:\" $teamCityUrl \r\nWrite-Host \"================================================================================\"\r\n\r\n$req = [System.Net.WebRequest]::Create($url)\r\n$req.Credentials = new-object System.Net.NetworkCredential($teamCityUsername, $teamCityPassword)\r\n$req.Method =\"POST\"\r\n$req.ContentType = \"application/xml\"\r\n\r\n$req.ContentLength = $encodedContent.length\r\n$requestStream = $req.GetRequestStream()\r\n$requestStream.Write($encodedContent, 0, $encodedContent.length)\r\n$requestStream.Close()\r\n\r\n$resp = $req.GetResponse()\r\n$reader = new-object System.IO.StreamReader($resp.GetResponseStream())\r\n$reader.ReadToEnd() | Write-Host\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "BuildConfigurationId",
-      "Label": null,
-      "HelpText": "The Id of the build configuration to trigger.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "TeamCityUrl",
-      "Label": null,
-      "HelpText": "The URL of the Team City server.\nE.g. `http://teamcity.example.com`.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "TeamCityUsername",
-      "Label": null,
-      "HelpText": "The username to use for accessing TeamCity.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "TeamCityPassword",
-      "Label": null,
-      "HelpText": "The password for the TeamCity user.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-03-16T10:45:58.588+00:00",
-  "LastModifiedBy": "bjorgvino",
-  "$Meta": {
-    "ExportedAt": "2015-03-16T10:47:31.328+00:00",
-    "OctopusVersion": "2.6.3.886",
-    "Type": "ActionTemplate"
-  },
-  "Category": "teamcity"
-}
\ No newline at end of file
diff --git a/step-templates/terraform-custom-script.json b/step-templates/terraform-custom-script.json
deleted file mode 100644
index f824775e4..000000000
--- a/step-templates/terraform-custom-script.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "Id": "1d2a62d0-1f12-4417-8566-4ca1b8e6a69c",
-  "Name": "Execute Custom Terraform Script with Package",
-  "Description": "Run a custom terraform script using a package and an Azure Account.\n\nE.g. run \"terraform taint some-resource\" in the context of your terraform package files and authenticated against Azure using credentials in an Octopus Azure Account variable. This step operates very similarly to the built-in Terraform Apply step but allowing you the control to call terraform commands rather than using the octopus runner. Very useful for runbooks doing terraform import.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Name": "InfrastructurePackage",
-      "Id": "582b5176-aa5d-4166-a5fa-9b760a3b2d7d",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "TerraformPackageId"
-      }
-    }
-  ],
-  "Properties": {
-    "Octopus.Action.RunOnServer": "true",
-    "Octopus.Action.EnabledFeatures": "Octopus.Features.SubstituteInFiles",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$DynamicPackageName = \"InfrastructurePackage\" \n$AccountVariableName = \"TerraformScript.AzureAccount\"\n# Version of the terrform package - used to substitute Octopus.Release.Number in tfvars file\n$packageVersion = $OctopusParameters[\"Octopus.Action.Package[$DynamicPackageName].PackageVersion\"]\n# Override the package version with a custom version string - used to substitute Octopus.Release.Number in tfvars file\n$userOverridenVersionNumber = $OctopusParameters[\"TerraformScript.Octopus.Release.Number\"]\n# Should we call terraform init before the script?\n$runInit = [System.Convert]::ToBoolean($OctopusParameters[\"TerraformScript.RunInitBeforeScript\"]) \n\n$versionNumberToSubstitute = If ($userOverridenVersionNumber) { $userOverridenVersionNumber } else { $packageVersion }\n$versionNumberSubstitutionFilesPattern = if ( $OctopusParameters[\"TerraformScript.versionNumberSubstitutionFilesPattern\"]) {\n    $OctopusParameters[\"TerraformScript.VersionNumberSubstitutionFilesPattern\"]\n}\nelse {\n    \"*.tf*\"\n}\n\n# Should Octopus collect all terraform files from the package after execution as artefacts?\n$collectArtefacts = if ($OctopusParameters[\"TerraformScript.CollectArtefacts\"]) { \n    [System.Convert]::ToBoolean($OctopusParameters[\"TerraformScript.CollectArtefacts\"]) \n} \nelse { $false }\n# override pattern to match (terraform) files like *.t* when collecting artefacts\n$artefactNameLikePattern = if ($OctopusParameters[\"TerraformScript.ArtefactNameLikePattern\"]) { \n    $OctopusParameters[\"TerraformScript.ArtefactNameLikePattern\"] \n}\nelse { \n    \"*.tf*\"\n}\n# Detect if we have Azure Account credentials from a variable and log in to azure\n$HasAzureAccount = if ($OctopusParameters[\"$AccountVariableName.Client\"]) { $true } else { $false }\n# The path where the package containing terraform files is extracted to disk - usually just ./InfrastructurePackage\n$terraformPackageFolder = $OctopusParameters[\"Octopus.Action.Package[$DynamicPackageName].ExtractedPath\"];\n# Override the location of the terraform exe - otherwise assume terraform is available on PATH\n$CustomTerraformExe = $OctopusParameters[\"Octopus.Action.Terraform.CustomTerraformExecutable\"]\n# The terraform script to be executed\n$terraformCliScriptToExecute = [Scriptblock]::Create($OctopusParameters[\"TerraformScript.CliScript\"])\n\n# If we have service principal creds to Azure then set ENV variables so that azurerm can authenticate\nif ($HasAzureAccount) {\n    Write-host \"Selecting azure subscription $($OctopusParameters[\"$AccountVariableName.SubscriptionNumber\"]) using $AccountVariableName variable\"\n  \n    $ENV:ARM_CLIENT_ID = $OctopusParameters[\"$AccountVariableName.Client\"]\n    $ENV:ARM_CLIENT_SECRET = $OctopusParameters[\"$AccountVariableName.Password\"]\n    $ENV:ARM_SUBSCRIPTION_ID = $OctopusParameters[\"$AccountVariableName.SubscriptionNumber\"]\n    $ENV:ARM_TENANT_ID = $OctopusParameters[\"$AccountVariableName.TenantId\"]\n}\n\nFunction Invoke-Exec {\n    [CmdletBinding()]\n    param(\n        [Parameter(Position = 0, Mandatory = 1)][scriptblock]$cmd\n    )\n    $scriptExpanded = $ExecutionContext.InvokeCommand.ExpandString($cmd).Trim().Trim(\"&\")\n    Write-Verbose \"Executing command: $scriptExpanded\"\n\n    & $cmd | Out-Default\n\n    if ($lastexitcode -ne 0) {\n        throw (\"Non-zero exit code '$lastexitcode' detected from command: '$scriptExpanded'\")\n    }\n}\n\n#================= Prep to run terraform ========================\n\n# List the contents of the package - useful debugging\nWrite-Verbose \"Using package contents:\"\nGet-ChildItem $terraformPackageFolder -Verbose\n\n# Use a custom version of terraform? If so add it to the path for this sesssion. Otherwise assume terraform already on PATH\nif ($CustomTerraformExe) {\n    $terraformfolder = Split-Path $CustomTerraformExe;\n    # add custom terraform to path if required\n    if ($ENV:PATH -notcontains $terraformfolder) { \n        $ENV:PATH += \";$terraformfolder\"; \n    }\n    Write-Verbose \"PATH: $ENV:PATH\"\n    Write-Host \"`nUsing terraform.exe from $terraformExePath\"\n}\n\nWrite-Host \"Running in $terraformPackageFolder\"\nSet-Location $terraformPackageFolder\n\n# Substitute #{Octopus.Release.Number} in *.tf files because that variable is not availe during runbook execution\nGet-ChildItem . -file | Where-Object { $_.Name -like $versionNumberSubstitutionFilesPattern } | ForEach-Object {\n    Write-Host \"Replacing #{Octopus.Release.Number} in $($_.FullName) with $versionNumberToSubstitute\"\n    (Get-Content $_.FullName) -replace \"#{Octopus.Release.Number}\", $versionNumberToSubstitute | Set-Content $_.FullName\n}   \n\n#================= terraform init ========================\n\n# optionally initialise terraform\nif($runInit) {\n  Write-Host \"`n terraform init`n\"\n  terraform init -no-color\n}\n#================= Run terraform script ========================\n\ntry {\n    # Execute the provided script\n    Invoke-Exec $terraformCliScriptToExecute\n}\nfinally {\n    # optionally collect all terraform files as artefacts\n    if ($collectArtefacts) {\n        Get-ChildItem . -File | Where-Object { $_.name -like $artefactNameLikePattern } | New-OctopusArtifact\n    }\n}\n",
-    "Octopus.Action.SubstituteInFiles.TargetFiles": "InfrastructurePackage\\*.tf\nInfrastructurePackage\\*.tfvars"
-  },
-  "Parameters": [
-    {
-      "Id": "0170e094-b282-4924-b1ed-5103015e366f",
-      "Name": "TerraformPackageId",
-      "Label": "Package Id (Required)",
-      "HelpText": "The ID of the nupkg/zip that contains the terraform files",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "3b7abc1b-49d9-4302-86e8-a85cc6eb2a75",
-      "Name": "TerraformScript.AzureAccount",
-      "Label": "Azure Account",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "AzureAccount"
-      }
-    },
-    {
-      "Id": "53195dc5-dcc4-4a35-b3af-b63a0958ae46",
-      "Name": "TerraformScript.CliScript",
-      "Label": "Terraform Script",
-      "HelpText": "A terraform CLI script to be executed in the context of the package, such as `terraform show -no-color` or ` terraform import some-resource`",
-      "DefaultValue": "terraform plan -var-file=\"octopus.tfvars\" -no-color",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "2d907ba2-41f4-47d4-9592-1111a9ab8f93",
-      "Name": "TerraformScript.RunInitBeforeScript",
-      "Label": "Run Terraform Init?",
-      "HelpText": "If true, then script will call terraform init before executing the script",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "d0d1018d-d8aa-4c34-8da9-5c893076f8fe",
-      "Name": "TerraformScript.CollectArtefacts",
-      "Label": "Collect terraform files as artefacts?",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "d379e1f0-fac5-48cb-a011-249e0bcb401e",
-      "Name": "TerraformScript.ArtefactNameLikePattern",
-      "Label": "Collect terraform files artefact pattern",
-      "HelpText": "A like pattern for files to be collected as artefacts when 'Collect Terraform Files as Artefacts' is enabled. Example: `*.tf*`",
-      "DefaultValue": "*.tf*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "7b24c582-de47-4dad-9e37-c300802d1df9",
-      "Name": "TerraformScript.Octopus.Release.Number",
-      "Label": "Release Number Override",
-      "HelpText": "When step is run in a runbook there is no release number, so you may need to provide one here. By default we will use the release number from the package and substitute it into variable Octopus.Release.Number in terraform files, but you may override the value here if required.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "23e0e330-6b6b-4f7a-bd95-e44e69d1bcf6",
-      "Name": "TerraformScript.VersionNumberSubstitutionFilesPattern",
-      "Label": "Files to substitute Release Number",
-      "HelpText": "A like pattern for files that should have #{Octopus.Release.Number} substituted. Example: `*.tf*`",
-      "DefaultValue": "*.tf*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2021-03-15T18:13:18.243Z",
-    "OctopusVersion": "2020.5.2",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "alastairtree",
-  "Category": "terraform"
-}
diff --git a/step-templates/trigger-multitenant-deployment.json b/step-templates/trigger-multitenant-deployment.json
deleted file mode 100644
index 0ef5deab1..000000000
--- a/step-templates/trigger-multitenant-deployment.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "Id": "053c7adc-f31f-42e1-b7c7-671d3df55ab2",
-  "Name": "Trigger Multi-Tenant Deployment",
-  "Description": "A step template that triggers Multi-Tenant Deployment. It can be used in not-tenanted projects. The step will lookup most recent release for the specified project if a specific version is not provided. Then it will lookup all tenants that are tagged with the specified tag and create a new deployment for each of the tenants. This will result in multiple tasks scheduled in Octopus. The step is not tracking status of deployment tasks execution.\n\nHypothetical use-case: \n * A multi-tenanted system deployed (as a monoliths) with a non-tenanted Octopus Deploy process.\n * Use this step to start a smoke test for several customers from such a not-tenanted deployment. In this case tenants can be used to represent different customers. This way each customer-specific parameters (access URLs, credentials, etc.) can be configured on tenants level.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "Category": "tenants",
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function TriggerMultitenantDeployment {\n\t\t### Steps: \n\t\t###    1. find most recent release of the Multi-tenanted project by project name if Release Number (2) parameter is empty\n\t\t###    2. locate all the tenants for specified tag\n\t\t###    3. for each tenant create a new deployment for the found release with the parameters\n\n    param\n    (\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$apiUrl,\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$apiKey,\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$projectName,\n        [Parameter(Mandatory = $false)]\n        [string]$releaseNumber = '',\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$environmentName,\n        [ValidateNotNullOrEmpty()]\n        [Parameter(Mandatory = $true)]\n        [string]$tenantsTag\n    )\n\t\t\t\n\n\t\t$errors=0\n\t\t$headers = @{\"X-Octopus-ApiKey\"=$apiKey}\n\t\t\n\t\t$initiator = \"#{Octopus.Deployment.CreatedBy.Username}\"\n\n\t\tWrite-Host \"### TriggerMultiTenantedDeployment parameters:\"\n\t\tWrite-Host \"###`tAPI URL: [$($apiUrl)]\"\n\t\tif($debug) {\n\t\t\tWrite-Host \"###`tAPI Key: [$($apiKey)]\"\n\t\t}\n\t\tWrite-Host \"###`tProject Name: [$($projectName)]\"\n\t\tWrite-Host \"###`tRelease Number: [$($releaseNumber)]\"\n\t\tWrite-Host \"###`tEnvironment: [$($environmentName)]\"\n\t\tWrite-Host \"###`tTenants Tag Name: [$($tenantsTag)]\"\n\t\tWrite-Host \"###`tInitiator: [$($initiator)]\"\n\n\t\ttry {\n\t\t\tif (-Not ($tenantsTag -match '\\w+/\\w+'))\n\t\t\t{\n\t\t\t\tWrite-Error \"### Tenants Tag Name must be in format 'TenantTagSet/TenantTag'\"\n\t\t\t\t$errors=1\n\t\t\t}\n\t\t\t$projects = Invoke-RestMethod -Method GET -Uri $apiUrl/projects/all -Headers $headers \n\t\t\t$project = $projects | where Name -eq $projectName\n\t\t\tif (-Not $project) {\n\t\t\t\tWrite-Error \"### Could not find project with name [$($projectName)].\"\n\t\t\t\t$errors=1\n\t\t\t}\n            $projectUrl=\"$($apiUrl)/projects/$($project.Id)/releases\"\n\t\t\t$releases = Invoke-RestMethod -Method GET -Uri $projectUrl -Headers $headers | select -expand Items\n\t\t\t$mostRecentRelease = $releases | Sort-Object -Descending -Property { [int]($_.Version -replace \"\\.\") } | Select -First 1\n\t\t\t$release = $releases | where Version -eq $releaseNumber | Select -First 1\n\t\t\tif (-Not ($release)) {\n\t\t\t\t$release=$mostRecentRelease\n\t\t\t\tWrite-Host \"### Selected most recent release [$($release.Version)].\"\n\t\t\t}\n\t\t\tif(-Not $release) {\n\t\t\t\tif($releaseNumber) {\n\t\t\t\t\tWrite-Error \"### Could not find release [$($releaseNumber)]for project with name [$($projectName)].\"\n\t\t\t\t} else {\n\t\t\t\t\tWrite-Error \"### Could not find any releases for project with name [$($projectName)].\"\n\t\t\t\t}\n\t\t\t\t$errors=1\n\t\t\t}\n\t\t\t$environments = Invoke-RestMethod -Method GET -Uri $apiUrl/environments/all -Headers $headers\n\t\t\t$environment =  $environments | where Name -eq $environmentName\n\t\t\tif(-Not $environment){\n\t\t\t\tWrite-Error \"### Could not find environment [$($environmentName)] for project with name [$($projectName)].\"\n\t\t\t\t$errors=1\n\t\t\t}\n\t\t\t$tenants = Invoke-RestMethod -Method GET -Uri $apiUrl/tenants/all -Headers $headers \n\t\t\t$selectedTenants = $tenants | where TenantTags -Contains $tenantsTag\n\t\t\tif(-Not $selectedTenants){\n\t\t\t\tWrite-Error \"### Could not find any tenants with tag [$($tenantsTag)].\"\n\t\t\t\t$errors=1\n\t\t\t}\n\t\t\tif($errors)\n\t\t\t{\n\t\t\t\tFail-Step \"### Encoutered an error. See log for more details. Interrupting the task.\"\n\t\t\t}\n\n\t\t\tif ($debug){\n\t\t\t\tWrite-Host \"##Project##: \" $project\n\t\t\t\tWrite-Host \"##Project.Id##: \" $projectId\n\t\t\t\tWrite-Host \"##LifeCycleId##: \" $lifeCycleId\n\t\t\t\tWrite-Host \"##Release##: \" $release\n\t\t\t\tWrite-Host \"##ReleaseId##: \" $release.Id\n\t\t\t\tWrite-Host \"##ChannelId##: \" $release.channelId\n\t\t\t\tWrite-Host \"##TenantsTag##: \" $tag.Id $tag.CanonicalTagName\n\t\t\t\tWrite-Host \"##SelectedTenants##: \" $selectedTenants.Count\n\t\t\t}\n\n\t\t\tforeach($tenant in $selectedTenants) {\n\t\t\t\t$deploymentJson = \"{`\"ProjectId`\":`\"$($projectId)`\",`\"ReleaseId`\":`\"$($release.Id)`\",`\"EnvironmentId`\":`\"$($environment.Id)`\",`\"ChannelId`\":`\"$($release.channelId)`\",`\"TenantId`\":`\"$($tenant.Id)`\",`\"Comments`\":`\"Initiated by $($initiator)`\"}\"\n\t\t\t\n\t\t\t\tif($debug) { Write-Host \"##DeploymentJson##: $($deploymentJson)\" }\n\t\t\t\t\n\t\t\t\t$deployment = Invoke-RestMethod -Method POST -Uri $apiUrl/deployments -Headers $headers -Body $deploymentJson\n\t\t\t\tWrite-Host \"### Created new deployment for $($tenant.Name): [$($deployment)].\"\n\t\t\t\tWrite-Host \"### Deployment for release [$($project.Name) $($release.Version)], tenant [$($tenant.Name)] in [$($environmentName)] environment was created and scheduled successfuly.\"\n\t\t\t}\n\t\t\texit\n\t\t} Catch {\n\t\t\tWrite-Error \"### Failed to complete deployment for \" $projectName \"to\" $environmentName \"for\" $tenantsTag\n\t\t\tthrow $_\n\t\t}\n}\n\n\n\tTriggerMultitenantDeployment -apiUrl $OctopusAPIurl -apiKey $OctopusAPIkey -projectName $MultiTenantProjectName -environmentName $EnvironmentName -releaseNumber $ReleaseNumber -tenantsTag $TenantsTag\n",
-    "Octopus.Action.SubstituteInFiles.Enabled": "True",
-    "Octopus.Action.EnabledFeatures": "Octopus.Features.SubstituteInFiles"
-  },
-  "Parameters": [
-    {
-      "Id": "f488f5a8-eafc-4da8-97ea-66cc01dfb39e",
-      "Name": "OctopusAPIurl",
-      "Label": "Octopus API URL",
-      "HelpText": null,
-      "DefaultValue": "#{Octopus.Dashboard.BaseUrl}/api",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "9a4af3e2-340e-4e2f-9529-c160a491cc41",
-      "Name": "OctopusAPIkey",
-      "Label": "Octopus API Key",
-      "HelpText": null,
-      "DefaultValue": "#{Octopus.API.key}",
-      "DisplaySettings": {"Octopus.ControlType": "Sensitive"}
-    },
-    {
-      "Id": "dd89222e-662d-4e63-a6a6-260ec6495547",
-      "Name": "MultiTenantProjectName",
-      "Label": "Multi-Tenant Project Name",
-      "HelpText": null,
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "8447f3fc-c8ed-44e3-ab2f-932981160ea8",
-      "Name": "ReleaseNumber",
-      "Label": "Release Number",
-      "HelpText": "Release number of the Multi-tenant project. Leave empty to use most recent release of the project.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "50ece5fe-7650-491f-9e0a-e9e521b14799",
-      "Name": "EnvironmentName",
-      "Label": "Environment Name",
-      "HelpText": null,
-      "DefaultValue": "#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "e1657396-4221-4fcf-84a1-9fe130263cc4",
-      "Name": "TenantsTag",
-      "Label": "Tenants Selection Tag",
-      "HelpText": "Required. Expected format: <TenantTagSetName>/<TenantTagName>",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2019-04-10T20:41:22.620Z",
-    "OctopusVersion": "2018.10.5",
-    "Type": "ActionTemplate"
-  }
-}
diff --git a/step-templates/twilio-send-sms-powershell.json b/step-templates/twilio-send-sms-powershell.json
deleted file mode 100644
index 82597413b..000000000
--- a/step-templates/twilio-send-sms-powershell.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "Id": "3c3904a9-d08c-4f18-b86c-0304800bb541",
-    "Name": "Twilio - Send SMS (PowerShell)",
-    "Description": "Send an SMS using Twilio's API. This script step is written in PowerShell.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-        "Octopus.Action.Script.ScriptSource": "Inline",
-        "Octopus.Action.Script.Syntax": "PowerShell",
-        "Octopus.Action.Script.ScriptBody": "$url = \"https://api.twilio.com/2010-04-01/Accounts/$Twilio_SendMessage_AccountSID/Messages.json\"\n$params = @{\n    To = $Twilio_SendMessage_ToNumber;\n    From = $Twilio_SendMessage_FromNumber;\n    Body = $Twilio_SendMessage_Message\n}\n\nWrite-Verbose \"Creating Twilio credentials\"\n$secureToken = $Twilio_SendMessage_AuthToken | ConvertTo-SecureString -asPlainText -Force\n$credential = New-Object System.Management.Automation.PSCredential($Twilio_SendMessage_AccountSID, $secureToken)\n\nWrite-Verbose \"Creating Twilio credentials\"\nInvoke-WebRequest $url -Method Post -Credential $credential -Body $params -UseBasicParsing\n"
-    },
-    "Parameters": [
-        {
-            "Id": "392a1b09-0f79-48c2-95f8-679869383e39",
-            "Name": "Twilio_SendMessage_AccountSID",
-            "Label": "SID",
-            "HelpText": "The Twilio account SID.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "1c10d07a-f2fc-466d-ad2b-0d9800141e60",
-            "Name": "Twilio_SendMessage_AuthToken",
-            "Label": "Auth Token",
-            "HelpText": "The Twilio AuthToken.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "Sensitive"
-            }
-        },
-        {
-            "Id": "bdbd0b60-9544-41a5-a64d-b8544c6f1958",
-            "Name": "Twilio_SendMessage_FromNumber",
-            "Label": "From Number",
-            "HelpText": "The number to send the message from. This is usually your Twilio number.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "fbb8e980-fd54-4c34-a149-848a1eebd560",
-            "Name": "Twilio_SendMessage_ToNumber",
-            "Label": "To Number",
-            "HelpText": "The number to send the message to.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "SingleLineText"
-            }
-        },
-        {
-            "Id": "d3674581-f589-4f9e-998c-f829ee9195f6",
-            "Name": "Twilio_SendMessage_Message",
-            "Label": "Message",
-            "HelpText": "The message to send.",
-            "DefaultValue": "",
-            "DisplaySettings": {
-                "Octopus.ControlType": "MultiLineText"
-            }
-        }
-    ],
-    "Author": "ryanrousseau",
-    "LastModifiedOn": "2020-04-14T15:25:44.139Z",
-    "LastModifiedBy": "ryanrousseau",
-    "$Meta": {
-        "ExportedAt": "2020-04-14T15:25:44.139Z",
-        "OctopusVersion": "2020.1.9",
-        "Type": "ActionTemplate"
-    },
-    "Category": "twilio"
-}
diff --git a/step-templates/umbraco-v7-folder-permissions.json b/step-templates/umbraco-v7-folder-permissions.json
deleted file mode 100644
index 9f35ba78b..000000000
--- a/step-templates/umbraco-v7-folder-permissions.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "c60a8c60-c5bc-4dac-9384-65ec4bcf6c67",
-  "Name": "Set Umbraco 7 Folder Permissions",
-  "Description": "To ensure a stable and smoothly running umbraco installation, these permissions need to be set correctly.\n\nThese permissions should be set before or during the insallation of umbraco. The user with the permissions set are the user used by the Application Pool used by the IIS website (usually Network Service or the IIS_IUSRS group). If in doubt, ask your server admin / hosting company\n\n[Umbraco Wiki Article](http://our.umbraco.org/wiki/reference/files-and-folders/permissions)\n",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$PhysicalPath = \"$WebsiteDirectory\"\r\n$appPoolAccount = \"IIS APPPOOL\\$ApplicationPoolName\"\r\n$readExecute = $appPoolAccount,\"ReadAndExecute\",\"ContainerInherit,ObjectInherit\",\"None\",\"Allow\"\r\n$read = $appPoolAccount,\"Read\",\"ContainerInherit,ObjectInherit\",\"None\",\"Allow\"\r\n$modify = $appPoolAccount,\"Modify\",\"ContainerInherit,ObjectInherit\",\"None\",\"Allow\"\r\n$fileModify = $appPoolAccount,\"Modify\",\"Allow\"\r\n$objects = @{}\r\n$objects[\"App_Browsers\"] = $readExecute\r\n$objects[\"App_Code\"] = $modify\r\n$objects[\"App_Data\"] = $modify\r\n$objects[\"App_Plugins\"] = $modify\r\n$objects[\"bin\"] = $modify\r\n$objects[\"Config\"] = $modify\r\n$objects[\"Css\"] = $modify\r\n$objects[\"MacroScripts\"] = $modify\r\n$objects[\"Masterpages\"] = $modify\r\n$objects[\"Media\"] = $modify\r\n$objects[\"Scripts\"] = $modify\r\n$objects[\"Umbraco\"] = $modify\r\n$objects[\"Umbraco_Client\"] = $modify\r\n$objects[\"UserControls\"] = $modify\r\n$objects[\"Views\"] = $modify\r\n$objects[\"Web.config\"] = $fileModify\r\n$objects[\"Xslt\"] = $modify\r\nforeach($object in $objects.Keys){\r\n    try {\r\n        $path = Join-Path $PhysicalPath $object\r\n        $acl = Get-ACL $path\r\n        $rule = New-Object System.Security.AccessControl.FileSystemAccessRule($objects[$object])\r\n        $acl.AddAccessRule($rule)\r\n        Set-Acl $path $acl\r\n        Get-Acl $path | Format-List\r\n    }\r\n    catch [System.Exception]\r\n    {\r\n        Write-Host \"Unable to set ACL on\" Join-Path $PhysicalPath $object\r\n    }\r\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "WebsiteDirectory",
-      "Label": "Website Directory",
-      "HelpText": "This is the location where the website is configured to run from in IIS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "ApplicationPoolName",
-      "Label": "Application Pool Name",
-      "HelpText": "This is the name of the application pool the website is configured to run under in IIS",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2015-01-23T12:31:26.603+00:00",
-    "OctopusVersion": "2.6.0.778",
-    "Type": "ActionTemplate"
-  },
-  "Category": "umbraco"
-}
\ No newline at end of file
diff --git a/step-templates/upgrade-octopus-server.json b/step-templates/upgrade-octopus-server.json
deleted file mode 100644
index 728393e77..000000000
--- a/step-templates/upgrade-octopus-server.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "4b3a1f09-1827-41bb-88a4-894c6317922b",
-  "Name": "Upgrade Octopus Server",
-  "Description": "This step downloads the latest version of Octopus Server and upgrades an existing instance. Run this step on a tentacle that has privileges to install software and start/stop services on the target server.\n\n**Run this after a database backup step**\n\nTo Use:\n- Install a tentacle on the Octopus Server machine with privileges to install software and start/stop services\n- Add that tentacle to an environment and with a unique role\n- Setup a project for the upgrade process\n- Add a database backup step for your Octopus Server database\n- Add this step, selecting it to run on just the role previously configured\n- Create a release\n- Deploy that release whenever an upgrade is needed\n\nNB: The deployment will show as \"Timed Out\" when the server comes back online",
-  "ActionType": "Octopus.Script",
-  "Version": 10,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\nFunction GetLatestVersionOrSpecificVersionOfOctopusServer() \n{\n    if([string]::IsNullOrEmpty($SpecificOctopusServerVersionToInstall))\n    {\n        Write-Host \"No specific version has been selected, getting latest version from octopusdeploy.com\"\n        $versions = Invoke-WebRequest https://octopusdeploy.com/download/upgrade/v3 -UseBasicParsing | ConvertFrom-Json\n        $version = $versions[-1].Version\n        return $version\n    }\n    else \n    {\n    \tWrite-Host \"Specific version has been selected\"\n        return $SpecificOctopusServerVersionToInstall\n    }\n}\n\nFunction GetCurrentlyInstalledVersionOfOctopusServer() \n{\n    $InstalledVersion = (get-item \"$InstallPath\\Octopus.Server.exe\").VersionInfo.fileversion\n    return $installedVersion\n}\n\nFunction DownloadOctopusServer([string] $versionNumber) \n{ \n    Write-Host \"Downloading Octopus Server version $versionNumber\"\n    $tempFile = [System.IO.Path]::GetTempFileName()\n  \ttry\n    {\n        (New-Object System.Net.WebClient).DownloadFile(\"https://download.octopusdeploy.com/octopus/Octopus.$versionNumber-x64.msi\", $tempFile)\n    }\n    catch\n    {\n        Write-Host \"Exception occurred\"\n        echo $_.Exception|format-list -force\n    }\n    Write-Host \"Download completed\"\n    return $tempFile\n}\n\nFunction StopOctopusServer() \n{\n    Write-Host \"Stopping Server\"\n    . \"$InstallPath\\Octopus.Server.exe\" service --stop --console --instance $InstanceName\n}\n\nFunction InstallOctopusServer([object] $tempFile)\n{\n    Write-Host \"Installing ...\"\n    msiexec /i $tempFile /quiet | Out-Null\n}\n\nFunction RemoveTempFile([object] $temporaryFile)\n{   \n    Write-Host \"Deleting downloaded installer\"\n    Remove-Item $temporaryFile\n}\n\nFunction StartOctopusServer()\n{\n    Write-Host \"Starting Octopus Server\"\n    . \"$InstallPath\\Octopus.Server.exe\" service --start --console --instance $InstanceName\n}\n\nFunction InstallSetVersionOnOctopusServer([string] $currentlyInstalledVersion, [string] $selectedVersionToInstall){\n\n      Write-Host \"Currently installed version: $currentlyInstalledVersion\"\n      Write-Host \"Selected version to install: $selectedVersionToInstall\" \n\n      $tempFile = DownloadOctopusServer $selectedVersionToInstall\n      StopOctopusServer\n      InstallOctopusServer $tempFile\n      RemoveTempFile $tempFile\n      StartOctopusServer\n}\n\nFunction StartInstallationOfOctopusServer () {\n\n  ## Get the current state of Octopus Server\n  $selectedVersionToInstall = GetLatestVersionOrSpecificVersionOfOctopusServer \n  $currentlyInstalledVersion = GetCurrentlyInstalledVersionOfOctopusServer\n\n\n  if([version]$selectedVersionToInstall -eq [version]$currentlyInstalledVersion)\n  {\n      Write-host \"Octopus Server has already been installed with version $currentlyInstalledVersion\"   \n  }\n  else  \n  {\n    InstallSetVersionOnOctopusServer $currentlyInstalledVersion $selectedVersionToInstall\n  }\n}\n\nStartInstallationOfOctopusServer"
-  },
-  "Parameters": [
-   {
-      "Id": "41442ee8-d56a-4a03-8c4b-af4c02245d9e",
-      "Name": "InstanceName",
-      "Label": "Instance Name",
-      "HelpText": "The name of your octopus instance. For the default instance use `OctopusServer`.",
-      "DefaultValue": "OctopusServer",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "18ede5ad-24a8-4796-a6e2-1b49a4cd7df2",
-      "Name": "InstallPath",
-      "Label": "InstallPath",
-      "HelpText": "The installation path to Octopus Deploy Server. Not the instance directory",
-      "DefaultValue": "C:\\Program Files\\Octopus Deploy\\Octopus",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "098375bf-ff27-47c3-93ce-0191aade1b21",
-      "Name": "SpecificOctopusServerVersionToInstall",
-      "Label": "Version number of Octopus Server which is going to be installed",
-      "HelpText": "Selects a specific version of Octopus Server to install. This is especially handy for a downgrade. The version number must be valid though.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-	"LastModifiedBy": "Verzada",
-	"Website": "/step-templates/4b3a1f09-1827-41bb-88a4-894c6317922b",
-	"Logo": "iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAC1QTFRFT6Tl////L5Pg8vj9Y67omsvwPJrisdfzfbzs5fL7y+T32Ov5isLucLXqvt31CJPHWwAABMJJREFUeNrs3deW4jAMAFDF3U75/89dlp0ZhiU4blJEjvQ8hYubLJsA00UCBCIQgQhEIAIRiEAEIhCBCEQgAhGIQAQiEIEIhD8kJm+t+QprfdKfB9HbYpx6CWfspj8HMi+gMgHL/AmQA8W3JTKH+ALFvzCeL0RbpyoCPE9IJeNOSQwh5Z3qd6yRGWQ2qi2cZQWxqj1WzQYSjeoJmJlAklOd4VlArOqPhQEkqBERToeMcfRJBkC0Uep8CfBpjz4JsHJ0zF3dkEWNje0kiB/sUC6eApndaIiCMyAa1PiwJ0AWhRGJHJJQHG2dC7h1rNbO1QOxSA7lNCkkKrQIpJCAB1GREILYIC1NAiwbpKFJgGWDNExcwGstfExcZBCHC6nOglshHtmhViLIig1RNBCN7qjtW8C0Z1UvJcC1Z9XmwMBzzvobmgAyEzgq91dtEEsBsQSQQAFZCSBAATEEEApHZbrVBIkkEIUPSVeB+KtALA0kXQUSrwKZBCIQBnk8Y4i5CsReBeKvkqLM+BCSDWJlrZFvGk9SRTHshkgjZCGAaArIxm3H3grhVzFlW2msfl1ca79UJ1bofYvsDHHlNdTZnlh5MghuPd5NdBDUNZHyCkfktIh03XzALGRPlBDPac7qgWjHZzWcmF5zmmkhidMQ6boKiDXcDTUEaylZqCGJ0Vjvu/fLJtHqhSANEvqb2OYqkOUqEHuVMbJcZdZCGiPhKhC4yjqiIjEE7XThMp8fAWII3mY3kUIQD+AMKQTzPiBhgQ63HlT/KSvgtoi0dq5mCPah1UIE0eh3sT0NhOByvKeAkFzi8PgQomumFhsyOxpIzZN4gLOj5plVwNpR0b2AuePWKBEHQu24pSsJA+LVCeHHQxZ1SiyDIdqok8IOhSSnTottHEQTdyt4ettAj4KkzA4dMikk2Dht2S5ptm1vswnPDxn0YyDZ5oDM3iToo2T5voWaYe+Q+vdjH80QyAzZhCgcDtLMI1Tmtz9w++XHgziHQHJJu/OZ3bs9Xn8gQ72NcP3dKqEfkp10F51xhoIi2I91R+LurXV/5q7pH+wx061CzO16oSQleMyr8fXvwMA0Pro8432DPD/ySx8XrHfSuDAM8n6UhnjQabaiXf5Bq/lREHvEeNtn1rJ08+C/uXkQZHeguxAPC3UvtcJYUogLzZX5hhZZvS6onG5lxXtzWGaygwb79vT/IXhdlNibwlKYOR6T8xjI7W8n+xV7T+GH4tMzWwR+lZhRkJYSsC0thpmCYqyngOz3rN2FLBZ2wZflBCggUHF0Vnp88JKienzIXLSEZCZqU7IKr/gQW9yx3pzV7Y9kvWZWTRRIqDmTtRUnU7b2lLcTYmoqHqnmiO1poER0SPkAeZMAZxaJx0Y3TCdAclsIqDz03ALcyxfTCZBsthoGXWmigGyVhWPLFJJfuuKQWycoEFdXbH4dJJoJxNR1eD/kshz6yn48cF8yW8sFoitflB1w6Q8n+/15Za7oA17/pYNmYgP5fmWm8L1NOHPWgK8kuFew1/JXtOA0yJCv7ah7X8ObUuT5kObU30+fDZm8+zqP+HTIpK0xQ796b5Kv2hSIQAQiEIEIRCACEYhABCIQgQhEIAIRiEAEIpBf8UeAAQAEjtYmlDTcCgAAAABJRU5ErkJggg==",
-	"$Meta": {
-		"ExportedAt": "2018-03-09T15:07:55.181Z",
-		"OctopusVersion": "2018.3.2",
-		"Type": "ActionTemplate"
-	},
-	"Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/upgrade_to_latest_tentacle.json b/step-templates/upgrade_to_latest_tentacle.json
deleted file mode 100644
index 0ffb6c1a2..000000000
--- a/step-templates/upgrade_to_latest_tentacle.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "Id": "349c64f5-c9bd-4b55-bff7-cc497a1f898e",
-  "Name": "Upgrade To Latest Tentacle",
-  "Description": "Upgrades a list of machines to the latest version of Tentacle. Machines can be targeted by Environment and/or Role or Machine Name.\n\nThis needs to be run directly on a worker or the octopus server itself.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Define working variables\n$OctopusUrl       = [string]$OctopusParameters['UpdateTentacles.OctopusUrl'].Trim()\n$ApiKey           = [string]$OctopusParameters['UpdateTentacles.ApiKey'].Trim()\n$SpaceName        = [string]$OctopusParameters['UpdateTentacles.SpaceName'].Trim()\n$EnvironmentNames = [string[]]$OctopusParameters['UpdateTentacles.EnvironmentNames']\n$RoleNames        = [string[]]$OctopusParameters['UpdateTentacles.RoleNames']\n$MachineNames     = [string[]]$OctopusParameters['UpdateTentacles.MachineNames']\n$WhatIf           = [bool]::Parse($OctopusParameters['UpdateTentacles.WhatIf'])\n$Wait             = [bool]::Parse($OctopusParameters['UpdateTentacles.Wait'])\n\n# Remove white space and blank lines.\nif ($null -ne $EnvironmentNames) {\n    $EnvironmentNames = $EnvironmentNames.Split(\"`n\").Trim().Where({$_}) # Trim white space and blank lines.\n}\nif ($null -ne $RoleNames) {\n    $RoleNames = $RoleNames.Split(\"`n\").Trim().Where({$_}) # Trim white space and blank lines.\n}\nif ($null -ne $MachineNames) {\n    $MachineNames = $MachineNames.Split(\"`n\").Trim().Where({$_}) # Trim white space and blank lines.\n}\n\n[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = \"Stop\"\n\n$header = @{ \"X-Octopus-ApiKey\" = $ApiKey }\n\nif ($null -eq $SpaceName) {\n    $baseUri = \"$OctopusUrl/api\"\n} else {\n    $space = (Invoke-RestMethod -Method Get -Uri \"$OctopusUrl/api/spaces/all\" -Headers $header) | Where-Object { $_.Name -eq $SpaceName }\n\n    if ($null -eq $space) {\n        throw \"Space Name $SpaceName does not exist.\"\n    } else {\n        Write-Verbose \"Using Space $SpaceName.\"\n    }\n\n    $baseUri = \"$OctopusUrl/api/$($space.Id)\"\n}\n\n# Start with no machines\n$allMachines = @()\n\n# Add machines for each requested environment.\nforeach ($environmentName in $EnvironmentNames) {\n    $environment = (Invoke-RestMethod -Method Get -Uri \"$baseUri/environments/all\" -Headers $header) | Where-Object { $_.Name -eq $environmentName }\n\n    if ($null -eq $environment) {\n        throw \"Environment $environmentName does not exist.\"\n    } else {\n        Write-Verbose \"Adding machines from Environment $environmentName.\"\n    }\n\n    $allMachines += (Invoke-RestMethod -Method Get -Uri \"$baseUri/environments/$($environment.Id)/machines?take=$([int32]::MaxValue)\" -Headers $header).Items\n}\n\n# If roles are specifed, include only machines in the specicied roles. Otherwise don't filter.\nif ($null -eq $RoleNames) {\n    $roleFilteredMachines += $allMachines\n} else {\n    $roleFilteredMachines = @()\n    foreach ($roleName in $RoleNames) {\n        $roleFilteredMachines += $allMachines | Where-Object { $_.Roles -contains $roleName }\n    }\n}\n\n# Add each specific machine requested.\n$roleFilteredMachines += (Invoke-RestMethod -Method Get -Uri \"$baseUri/machines/all\" -Headers $header) | Where-Object { $_.Name -in $MachineNames }\n\n# Create array of unique IDs to target.\n$uniqueIDs = [array]($roleFilteredMachines.Id | Sort-Object -Unique)\n\nif (-not $uniqueIDs) {\n    Write-Highlight \"No machines were targeted. Exiting...\"\n    exit\n}\n\n# Build json payload, targeting unique machine IDs.\n$jsonPayload = @{\n    Arguments = @{\n        MachineIds = $uniqueIDs\n    }\n    Description = \"Upgrade Tentacle version.\"\n    Name = \"Upgrade\"\n}\n\nif ($WhatIf) {\n    Write-Host \"Upgrading tentacles on:\"\n    Write-Host $(($roleFilteredMachines.Name | Sort-Object -Unique) -join \"`r\")\n} else {\n    Write-Verbose \"Upgrading tentacles on:\"\n    Write-Verbose $(($roleFilteredMachines.Name | Sort-Object -Unique) -join \"`r\")\n    $task = Invoke-RestMethod -Method Post -Uri \"$baseUri/tasks\" -Headers $header -Body ($jsonPayload | ConvertTo-Json -Depth 10)\n    Write-Highlight \"$($task.Id) started. Progress can be monitored [here]($OctopusUrl$($task.Links.Web)?activeTab=taskLog)\"\n    \n    if ($Wait) {\n        do {\n        \t# Output the current state of the task every five seconds.\n            $task = Invoke-RestMethod -Method Get -Uri \"$baseUri/tasks/$($task.Id)\" -Headers $header\n            $task\n            Start-Sleep -Seconds 5\n        } while ($task.IsCompleted -eq $false)\n    }\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "51ea8dde-8df6-4621-8c8a-f5cacf485c5e",
-      "Name": "UpdateTentacles.OctopusUrl",
-      "Label": "Octopus Url",
-      "HelpText": "**Required**\n\nThe url of the server where the upgrades will be performed.\n\ne.g. `https://octopus.server.com`",
-      "DefaultValue": "#{Octopus.Web.ServerUri}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "b8d147e0-de55-488e-a69f-9b212fd99559",
-      "Name": "UpdateTentacles.ApiKey",
-      "Label": "API Key",
-      "HelpText": "**Required**\n\nThe api key of a user permitted to perform tentacle upgrades.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Id": "e0d7450e-01de-47b2-abd2-3b22aa12a295",
-      "Name": "UpdateTentacles.SpaceName",
-      "Label": "Space",
-      "HelpText": "The space to use when targeting machines.",
-      "DefaultValue": "#{Octopus.Space.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fb2c3110-d597-4729-9c86-d6dc5314dfb7",
-      "Name": "UpdateTentacles.EnvironmentNames",
-      "Label": "Environments",
-      "HelpText": "A list of environments to be used for targeting machines. If no environments are specified, only `Machines Names` will be targeted.\n\nMultiple environments can be specified, one per line.",
-      "DefaultValue": "#{Octopus.Environment.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "2ec7ff8e-6dd3-46a8-9ef6-5869d14b6a03",
-      "Name": "UpdateTentacles.RoleNames",
-      "Label": "Roles",
-      "HelpText": "A list of roles to filter the machines found in the specified `Environments`. Only machines that are members of a specified role will be targeted.\n\nMultiple roles can be specified, one per line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "e68ee3f0-bf4b-47ce-bba2-9a2e50c80595",
-      "Name": "UpdateTentacles.MachineNames",
-      "Label": "Machine Names",
-      "HelpText": "Additional machine names to upgrade. These will be added to the list after `Environments` and `Roles` have been processed.\n\nMultiple machines can be specified, one per line.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "9e742501-e215-4217-8e32-a6fb5ac16b6d",
-      "Name": "UpdateTentacles.WhatIf",
-      "Label": "What If",
-      "HelpText": "This can be used to test the targeting parameters. When selected, a list of target machines will be listed, but no machines will be upgraded.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "8e3f8d65-c117-40b6-b654-93f8ab65776d",
-      "Name": "UpdateTentacles.Wait",
-      "Label": "Wait",
-      "HelpText": "Wait until the upgrade is finished.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2023-11-21T00:42:08.257Z",
-    "OctopusVersion": "2023.2.13113",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "REOScotte",
-  "Category": "octopus"
-}
diff --git a/step-templates/variables-find-unreplaced.json b/step-templates/variables-find-unreplaced.json
deleted file mode 100755
index cb3f31c8a..000000000
--- a/step-templates/variables-find-unreplaced.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "Id": "0b753c94-c12b-46f3-bb82-459e27bbe812",
-  "Name": "Variables - Find Unreplaced",
-  "Description": "Searches `Web.config` or `App.config` files looking for Octopus Deploy variables that have not been replaced. Alternatively, any arbitrary file can be checked.",
-  "ActionType": "Octopus.Script",
-  "Version": 26,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "function Find-Unreplaced {\n    <#\n    .SYNOPSIS\n        Looks for Octopus Deploy variables\n    .DESCRIPTION\n        Analyses `Web/App.Release.configs`, etc... looking for Octopus Deploy \n        variables that have not been replaced.\n    .EXAMPLE\n        Find-Unreplaced C:\\Folder *.config, *.ps1 \n    .PARAMETER Path\n        Root folder to search in\n    .PARAMETER Files\n        An array of all the files or globs to search in. Defaults to *.config\n    .PARAMETER Exclude\n        Files to ignore\n    .PARAMETER Recurse\n        Should the cmdlet look for the file types recursively\n    .PARAMETER TreatAsError\n        Will cause the script to write an Error instead of a warning if variables are found\n    #>\n    [CmdletBinding()]\n    param \n    (\n        [Parameter(\n            Position=0,\n            Mandatory=$true,\n            ValueFromPipeline=$True)]\n        [string] $Path,\n        \n        [Parameter(\n            Position=1,\n            Mandatory=$false)]\n        [string[]] $Files = @('*.config'),\n        \n        [Parameter(Mandatory=$false)]\n        [string[]] $Exclude,\n        \n        [Parameter(Mandatory=$false)]\n        [switch] $Recurse,\n        \n        [Parameter(Mandatory=$false)]\n        [switch] $TreatAsError\n    )\n\n    process {\n        Write-Host \"Searching for files in '$Path'\"\n        if (-not (Test-Path $Path -PathType container)) {\n            Write-Error \"The path '$Path' does not exist or is not a folder.\"\n            return\n        }\n        \n        if (-not $Recurse) {\n            # For some reason, a splat is required when not recursing\n            if ($Path.EndsWith(\"\\\")) { $Path += \"*\" } else { $Path += \"\\*\" }\n        }\n\n        $clean = $true\n\n        $found = Get-ChildItem -Path $Path -Recurse:$Recurse -Include $Files -Exclude $Exclude -File\n        foreach ($file in $found) {\n            Write-Host \"Found '$file'.`nSearching for Octopus variables...\" -NoNewline\n            $matches = Select-String -Path $file -Pattern \"#\\{([^}]*)\\}\" -AllMatches\n            $clean = $clean -and ($matches.Count -eq 0)\n            if ($clean) {\n                Write-Host \"clean\"\n            } else {\n                Write-Host \"done`n$matches\"\n            }\n        }\n\n        if (-not $clean) {\n            $msg = \"Unreplaced Octopus Variables were found.\"\n            if ($TreatAsError) {\n                Write-Error $msg\n            } else {\n                Write-Warning $msg\n            }\n        }\n    }\n}\n\nif (-not $Path) { throw \"A Path must be specified\" }\nif (-not $Files) { throw \"At least one File must be specified\" }\n\n$spPaths = $Path -split \"`n\" | Foreach-Object { $_.Trim() } | Where-Object { -not [string]::IsNullOrEmpty($_) }\n$spFiles = $Files -split \";\" | Foreach-Object { $_.Trim() } \n$spExcludes = $Exclude -split \";\" | Foreach-Object { $_.Trim() } \n$bRecurse = $Recurse -eq 'True'\n$bTreatAsError = $TreatAsError -eq 'True'\n\n$spPaths | Find-Unreplaced -Files $spFiles -Exclude $spExcludes -Recurse:$bRecurse -TreatAsError:$bTreatAsError\n\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "7809f4f9-7388-4067-ae0f-e5d858ad9395",
-      "Name": "Path",
-      "Label": "Path",
-      "HelpText": "The folders to search for files in. Enter multiple paths on separate lines.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "f9389ec3-1602-48b1-9f03-c95af304a3c2",  
-      "Name": "Files",
-      "Label": "Files",
-      "HelpText": "An array of all the files or globs to search in. Defaults to `*.config`. Multiple items can be separated with a semicolon `;`.",
-      "DefaultValue": "*.config",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "0b54fdbd-12ac-4fc8-aa26-410cd1a3bd77",  
-      "Name": "Exclude",
-      "Label": "Exclude",
-      "HelpText": "Files or globs to ignore. Multiple items can be separated with a semicolon `;`.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "29f81ee9-529b-45f6-8452-8e8f464c3225",  
-      "Name": "Recurse",
-      "Label": "Recurse",
-      "HelpText": "Determines whether or not the step should look through the items in `Path` recursively.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "fd64a155-abe9-483e-b954-e182fbb777b0",  
-      "Name": "TreatAsError",
-      "Label": "Treat as an error?",
-      "HelpText": "Determines if the step will cause the build to fail or issue a warning. By default it will only warn of a problem.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-09-14T10:40:15.430Z",
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2021-09-14T10:40:15.430Z",
-    "OctopusVersion": "2021.2.7428",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
\ No newline at end of file
diff --git a/step-templates/variables-substitute-in-files.json b/step-templates/variables-substitute-in-files.json
deleted file mode 100644
index ada3ac09e..000000000
--- a/step-templates/variables-substitute-in-files.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "Id": "a3078bc0-0615-4220-84e8-bb1f271a90f9",
-  "Name": "Variables - Substitute in Files",
-  "Description": "This step template attempts to replace Octopus variable placeholders in one or more file(s) with their values from the `$OctopusParameters` Dictionary.\n\n---\n\n### Version 18+:\n\nVersion 18 and higher pins the version of Octostache and Sprache (an Octostache dependency) to the following versions:\n- Octostache: [version 3.2.1](https://www.nuget.org/packages/Octostache/3.2.1)\n- Sprache: [version 2.3.1](https://www.nuget.org/packages/Sprache/2.3.1)\n\nThis is to resolve issues when running the step template on Windows, where the .NET 4.0 (`net40`) version is no longer present in newer versions of these libraries.\n\n**As a result, no new functionality available in Octostache, such as new commands/functions, will be present**\n\nIf you need later functionality, use the built-in Octopus [variable substitution feature](https://octopus.com/docs/projects/variables/variable-substitutions).\n\n### Breaking Change - version 15+:\n\nPrevious versions of this step template would attempt to find the Octostache library bundled with [Calamari](https://github.com/OctopusDeploy/Calamari) as part of a deployment or runbook. Due to compatibility issues running the `netstandard` version of Octostache bundled with newer versions of Calamari on Windows PowerShell, **this functionality has now been removed**.\n\nAs a result, **version 15** and higher of this step template now look for Octostache on the deployment target or worker in the NuGet cache. If it's not found, it will attempt to download two required binaries:\n\n1. Octostache from [nuget.org](https://www.nuget.org/packages/Octostache)\n1. Sprache (an Octostache dependency) from [nuget.org](https://www.nuget.org/packages/Sprache)\n\nIf access to [nuget.org](https://www.nuget.org) is restricted on your deployment target or worker, this step template may fail to execute successfully.\n\nIn that case, it's recommended to use the built-in Octopus [variable substitution feature](https://octopus.com/docs/projects/variables/variable-substitutions).\n\n---\n\n### Notes:\n\n- Tested on Windows PowerShell only running Octopus **2023.2.4954**.\n",
-  "ActionType": "Octopus.Script",
-  "Version": 19,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\nfunction Get-Exceptions {\n    param ($ExceptionObject)\n    \n    if ($null -ne $ExceptionObject.InnerException) {\n        Get-Exceptions -ExceptionObject $ExceptionObject.InnerException\n    }\n    \n    Write-Warning \"Exception is: $($ExceptionObject.Message)\"\n}\n\nfunction Resolve-OctopusVariablesInTemplate {\n    <#\n.SYNOPSIS\n\tResolves Octopus variables in files with their values from a OctopusParameters\n\n.DESCRIPTION\n\tLooks for files using Get-ChildItem and in each of the files replaces ${Variable} with the value from $OctopusParameters.\n\tFiles are written back using UTF-8.\n\tRequires PowerShell 3.0 or higher.\n\n.PARAMETER Path\n\tPassed to Get-ChildItem to find the files you want to process\n\n.PARAMETER Filter\n\tPassed to Get-ChildItem to find the files you want to process\n\n.PARAMETER Include\n\tPassed to Get-ChildItem to find the files you want to process\n\n.PARAMETER Exclude\n\tPassed to Get-ChildItem to find the files you want to process\n\t\n.PARAMETER Recurse\n\tPassed to Get-ChildItem to find the files you want to process\n\n#>\n    Param(\n        [string]$Path,\n        [string]$Filter = \"*.config\",\n        [string[]]$Include,\n        [string[]]$Exclude,\n        [switch]$Recurse,\n        [string]$OctostacheLocation\n    )\n\t\n    if (-not $OctopusParameters) { throw \"No OctopusParameters found\" }\n\t\n    Write-Output \"Tentacle Version: $env:TentacleVersion\"\n    Write-Output \"PowerShell version...\"\n    Write-Output $PSVersionTable\n    Write-Output \"Path = $Path\"\n\t\n    Write-Output \"Getting target files...\"\n    $TargetFiles = Get-ChildItem -File -Path $Path -Filter $Filter -Include $Include -Exclude $Exclude -Recurse:$Recurse\n    if ($TargetFiles.Count -eq 0) {\n        Write-Warning \"`tDid not find any files to process!\"\n        return\n    }\n    else {\n        Write-Output \"`tFound $($TargetFiles.Count) file(s)\"\n    }\n\t\n    Import-Octostache -OctostacheLocation $OctostacheLocation\n\n    foreach ($File in $TargetFiles) {\n        Resolve-VariablesUsingOctostache $File.FullName\n    }        \n}\n\n\nfunction Import-Octostache {\n    Param(\n        [string]$OctostacheLocation\n    )\n    \n    $OctostachePath = $null\n    $SprachePath = $null\n    \n    Write-Output \"Searching for installed version of Octostache.\"\n    if (-not [string]::IsNullOrWhiteSpace($OctostacheLocation)) {\n        if (-not (Test-Path $OctostacheLocation)) {\n            Write-Error \"Octostache path: $OctostacheLocation doesnt exist.\"\n            Exit 1\n        }\n        Write-Verbose \"Searching in $OctostacheLocation for Octostache.dll\"\n        $OctostacheLibraryLocations = Get-ChildItem -File -Path $OctostacheLocation -Filter \"OctoStache.dll\" -Recurse\n        $OctostachePath = ($OctostacheLibraryLocations | Select-Object -First 1).FullName\n        Write-Verbose \"Searching in $OctostacheLocation for Sprache.dll\"\n        $SpracheLibraryLocations = Get-ChildItem -File -Path $OctostacheLocation -Filter \"Sprache.dll\" -Recurse\n        $SprachePath = ($SpracheLibraryLocations | Select-Object -First 1).FullName\n    }\n    else {\n        try {\n            $OctostachePackage = (Get-Package Octostache -ErrorAction Stop) | Select-Object -First 1\n        } \n        catch {\n            $OctostachePackage = $null\n        }\n\n        if ($null -eq $OctostachePackage) {\n            Write-Output \"Downloading Octostache (v3.2.1) from nuget.org.\"\n            Install-Package Octostache -MaximumVersion \"3.2.1\" -source https://www.nuget.org/api/v2 -Force -SkipDependencies\n            $OctostachePackage = (Get-Package Octostache) | Select-Object -First 1\n        }\n    \n        $OctostachePath = Join-Path (Get-Item $OctostachePackage.source).Directory.FullName \"lib/net40/Octostache.dll\"\n\n        try {\n            $SprachePackage = (Get-Package Sprache -ErrorAction Stop) | Select-Object -First 1\n        } \n        catch {\n            $SprachePackage = $null\n        }\n\n        if ($null -eq $SprachePackage) {\n            Write-Output \"Downloading Sprache (v2.3.1) from nuget.org.\"\n            Install-Package Sprache -MaximumVersion \"2.3.1\" -source https://www.nuget.org/api/v2 -Force -SkipDependencies\n            $SprachePackage = @(Get-Package Sprache) | Select-Object -First 1\n        }\n\n        $SprachePath = Join-Path (Get-Item $SprachePackage.source).Directory.FullName \"lib/net40/Sprache.dll\"\n    }\n\n    Write-Verbose \"Octostache path: $OctostachePath\"\n    Write-Verbose \"Sprache path: $SprachePath\"\n\n    if ([string]::IsNullOrWhiteSpace($OctostachePath) -or [string]::IsNullOrWhiteSpace($SprachePath)) {\n        Write-Error \"Couldnt locate either the Octostache or Sprache library.\"\n        Exit 1\n    }\n\n    Write-Output \"Adding type $SprachePath\"\n    Add-Type -Path $SprachePath\n\n    Write-Output \"Adding type $OctostachePath\"\n    Add-Type -Path $OctostachePath\n}\n\nfunction Resolve-VariablesUsingOctostache {\n    Param(\n        [string]$TemplateFile\n    )\n\t\t\n    Write-Output \"Loading template file $TemplateFile...\"\n    $TemplateContent = Get-Content -Raw $TemplateFile\n    Write-Output \"`tRead $($TemplateContent.Length) bytes\"\n\t\n    $Dictionary = New-Object -TypeName Octostache.VariableDictionary\n\t\n    # Load the hastable into the dictionary\n    Write-Output \"Loading `$OctopusParameters...\"\n    foreach ($Variable in $OctopusParameters.GetEnumerator()) {\n        Write-Verbose \"#{$($Variable.Key)} = $($Variable.Value)\"\n        $Dictionary.Set($Variable.Key, $Variable.Value)\n    }\n\t\n    Write-Output \"Resolving variables...\"\n    \n    try {\n        $EvaluatedTemplate = $Dictionary.Evaluate($TemplateContent)\n    }\n    catch {\n        Get-Exceptions -ExceptionObject $Error.Exception\n        throw\n    }\n\t\n    Write-Output \"Writing the resolved template to $($TemplateFile) (UTF8 encoding)\"\n    #$EvaluatedTemplate | Out-File $TemplateFile -Force\t-Encoding UTF8\n    $EvaluatedTemplate -join \"rn\" | Set-Content $TemplateFile -NoNewLine -Encoding UTF8 -Force\n    Write-Output \"Done!\"\n}\n\n$FunctionParameters = @{}\n\nif ($null -ne $OctopusParameters['Path']) { $FunctionParameters.Add('Path', $OctopusParameters['Path']) }\nif ($null -ne $OctopusParameters['Filter']) { $FunctionParameters.Add('Filter', $OctopusParameters['Filter']) }\nif ($null -ne $OctopusParameters['Include']) { $FunctionParameters.Add('Include', $($OctopusParameters['Include'] -split \"`n\")) }\nif ($null -ne $OctopusParameters['Exclude']) { $FunctionParameters.Add('Exclude', $($OctopusParameters['Exclude'] -split \"`n\")) }\nif ($null -ne $OctopusParameters['Recurse']) { $FunctionParameters.Add('Recurse', [System.Convert]::ToBoolean($OctopusParameters['Recurse'])) }\nif (-not [string]::IsNullOrWhiteSpace($OctopusParameters['Variables.SubstituteInFiles.OctostacheLocation'])) { $FunctionParameters.Add('OctostacheLocation', $OctopusParameters['Variables.SubstituteInFiles.OctostacheLocation']) }\n\nResolve-OctopusVariablesInTemplate @FunctionParameters",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Name": "Path",
-      "Label": "Path",
-      "HelpText": "Specifies a path to one or more locations. Wildcards are permitted. The default location is the current directory (.).",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Filter",
-      "Label": "Filter",
-      "HelpText": "Specifies, as a string array, a filter for an item or items that are included in the operation. Wildcards are permitted.",
-      "DefaultValue": "*.config",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Include",
-      "Label": "Include",
-      "HelpText": "Specifies, as a string array, an item or items that are included in the operation. Enter a path element or pattern, such as *.txt. Wildcards are permitted. Leave this empty if you have specified a Filter.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "Exclude",
-      "Label": "Exclude",
-      "HelpText": "Specifies, as a string array, an item or items that are excluded in the operation. Enter a path element or pattern, such as *.txt. Wildcards are permitted. Leave this empty if you have specified a Filter.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "Recurse",
-      "Label": "Recurse",
-      "HelpText": "Search the specified locations and in all sub-directories of those locations.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "Variables.SubstituteInFiles.OctostacheLocation",
-      "Label": "Octostache library location",
-      "HelpText": "*Optional* - Provide the location that contains both of the required  `Octostache.dll` and `Sprache.dll` libraries. \n\n- *If this value is not provided, the libraries will be searched for on the target or worker, and if not found will be downloaded from [nuget.org](https://www.nuget.org).*\n- If more than one matching file is found, the first one will be used.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedAt": "2023-04-04T10:37:47.270Z",
-  "LastModifiedBy": "twerthi",
-  "$Meta": {
-    "ExportedAt": "2024-02-05T21:47:52.063Z",
-    "OctopusVersion": "2023.4.8290",
-    "Type": "ActionTemplate"
-  },
-  "Category": "octopus"
-}
diff --git a/step-templates/variables-substitute-in-json-file.json b/step-templates/variables-substitute-in-json-file.json
deleted file mode 100644
index 5595a1cb4..000000000
--- a/step-templates/variables-substitute-in-json-file.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "Id": "9E85B3EB-7C19-4F3A-9E9E-71923198EE09",
-  "Name": "Variables - Substitute in Json file",
-  "Description": "Use this step template after the Deploy API step template to substitute variables in a target json file like appsettings.json with Octopus scoped variables. Currently supported data types are string, boolean, interger, decimal and non-empty string arrays and can replace these types inside nested types as well as long as you name them like prop:subprop:subsubprop (like AppMetrics:GlobalTags:env) in octopus like we do today...this should be enough for most of the needs for files like appsettings.json",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "function Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue    \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\n$ErrorActionPreference = \"Stop\"\n\nfunction UpdateJsonFile ([hashtable]$variables, [string]$fullpath) {\n    Write-Host 'Starting the json file variable substitution' $variables.Count\n    if ($variables -eq $null) {\n        throw \"Missing parameter value $variables\"\n    }\n\n\t$pathExists = Test-Path $fullpath\n\tif(!$pathExists) {\n\t\tWrite-Host 'ERROR: Path '$fullpath ' does not exist'\n\t\tExit 1\n\t}\n\n\t$json = Get-Content $fullpath -Raw | ConvertFrom-Json\n    Write-Host 'Json content read from file'\n\n\tforeach($variable in $variables.GetEnumerator()) {\n\t\t$key = $variable.Key\n        Write-Host 'Processing' $key\n        $keys = $key.Split(':')\n\t\t$sub = $json\n\t\t$pre = $json\n\t\t$found = $true\n\t\t$lastKey = ''\n\t\tforeach($k in $keys) {\n\t\t\tif($sub | Get-Member -name $k -Membertype Properties){\n\t\t\t\t$pre = $sub\n\t\t\t\t$sub = $sub.$k\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t\t$found = $false\n\t\t\t\tbreak\n\t\t\t}\n\n\t\t\t$lastKey = $k\n\t\t}\n\n\t\tif($found) {\n            Write-Host $key 'found in Json content'\n            if($pre.$lastKey -eq $null) {\n                Write-Host $key 'is null in the original source json...values CANNOT be null on the source json file...exiting with 1'\n                Exit 1\n            }\n\n\t\t\t$typeName = $pre.$lastKey.GetType().Name\n\t\t\t[bool]$b = $true\n\t\t\t[int]$i = 0\n\t\t\t[decimal]$d = 0.0\n\t\t\tif($typeName -eq 'String'){\n\t\t\t\t$pre.$lastKey = $variable.Value\n\t\t\t}\n\t\t\telseif($typeName -eq 'Boolean' -and [bool]::TryParse($variable.Value, [ref]$b)) {\n\t\t\t\t$pre.$lastKey = $b\n\t\t\t}\n\t\t\telseif($typeName -eq 'Int32' -and [int]::TryParse($variable.Value, [ref]$i)){\n\t\t\t\t$pre.$lastKey = $i\n\t\t\t}\n\t\t\telseif($typeName -eq 'Decimal' -and [decimal]::TryParse($variable.Value, [ref]$d)){\n\t\t\t\t$pre.$lastKey = $d\n\t\t\t}\n\t\t\telseif($typeName -eq 'Object[]') {\n                if($pre.$lastKey.Length -ne 0 -and $pre.$lastKey[0].GetType().Name -eq 'String') {\n\t\t\t\t    $pre.$lastKey = $variable.Value.TrimStart('[').TrimEnd(']').Split(',')\n                }\n                else {\n                    Write-Host 'ERROR: Cannot handle ' $key ' with type ' $typeName \n\t\t\t\t    'Only nonempty string arrays are supported at the moment meaning that it has to be a \n\t\t\t\t    string array with atleast one element in it in the original source appsettings.json \n\t\t\t\t    file...Skipping update and exiting with 1'\n\t\t\t\t    Exit 1\n                }\n\t\t\t}\n\t\t\telse {\n\t\t\t\tWrite-Host 'ERROR: Cannot handle ' $key ' with type ' $typeName \n\t\t\t\t'Only string, boolean, interger, decimal and non-empty string arrays are supported at the moment\n                ...Skipping update and exiting with 1'\n\t\t\t\tExit 1\n\t\t\t}\n\n            Write-Host $key 'updated in json content with value' $pre.$lastKey \n\n\t\t}\n        else {\n            Write-Host $key 'not found in Json content...skipping it'\n        }\n\t}\n    \n\t$json | ConvertTo-Json -depth 99 | Set-Content $fullpath\n\n    \n    Write-Host $fullpath 'file variables updated successfully...Done'\n}\n\n\nif($OctopusParameters -eq $null) {\n    Write-Host 'OctopusParameters is null...exiting with 1'\n    Exit 1    \n}\n\nfunction ConvertListToHashtable([object[]]$list) {\n    $h = @{}\n    foreach ($element in $list) {\n\t    $h.Add($element.Key, $element.Value)\n    }\n    return $h\n}\n\n$oParams = $OctopusParameters.getenumerator() | where-object {$_.key -notlike \"Octopus*\" -and $_.key -notlike \"env:*\"}\n\nUpdateJsonFile `\n(ConvertListToHashtable $oParams) `\n(Get-Param \"JsonFilePath\" -Required)\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "JsonFilePath",
-      "Label": "Path to the json file",
-      "HelpText": "For example if your appsettings.json file is in \nc:\\web\\site1\\appsettings.json then set this value to\n**c:\\web\\site1\\appsettings.json**. You can use Octopus \nvariables here like \n**#{Deployment_InstallationPath}\\\\#{Octopus.Release.Number}\\appsettings.json** as the value of this variable. A good idea is to copy the value from the Install to variable in the Deploy API step template and add \\appsettings.json if that is your target json file",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "mysterio2465",
-  "$Meta": {
-    "ExportedAt": "2017-05-29T11:51:18.310Z",
-    "OctopusVersion": "3.2.11",
-    "Type": "ActionTemplate"
-  },
-  "Category": "Octopus"
-}
diff --git a/step-templates/venafi-tpp-create-provision-certificate.json b/step-templates/venafi-tpp-create-provision-certificate.json
deleted file mode 100644
index e60db925d..000000000
--- a/step-templates/venafi-tpp-create-provision-certificate.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-    "Id": "dd4dfa66-e632-4c6a-bae6-156a7a105023",
-    "Name": "Venafi TPP - Create and Provision Certificate",
-    "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and create a new certificate as well as optionally associate and push the new certificate to specified existing application(s). This is achieved using a combination of two functions from the VenafiPS PowerShell module:\n\n1. `New-TppCertificate` which is an alias of the [New-VdcCertificate](https://venafips.readthedocs.io/en/latest/functions/New-VdcCertificate/) function.\n2. `Add-TppCertificateAssociation` which is an alias of the [Add-VdcCertificateAssociation](https://venafips.readthedocs.io/en/latest/functions/Add-VdcCertificateAssociation/) function.\n\n---\n\n**Options:**\n\n- Provide a distinguished name (DN) path for the new certificate.\n- Provide a name for the new certificate.\n- Provide a common name (CN) for the new certificate.\n- *Optional* - Provide the distinguished name (DN) path to a certificate authority template to be used for the new certificate.\n- *Optional* - Choose from the following certificate types:\n  - `Code Signing`\n  - `Device`\n  - `Server`\n  - `User`\n- *Optional* - Choose from the following certificate management types:\n  - `Enrollment`\n  - `Provisioning`\n  - `Monitoring`\n  - `Unassigned`\n- *Optional* - Provide subject alternate names for the new certificate using the following acceptable SAN types: \n  - `OtherName`\n  - `Email`\n  - `DNS`\n  - `URI`\n  - `IPAdress`\n- *Optional* - Choose if you would like the step to wait for the certificate to finishing provisioning before moving on.\n- *Optional* - Choose the maximum time in seconds that you would like the step to wait for provisioning to finish.\n- *Optional* - Provide the application(s) path to associate the new certificate to.\n- *Optional* - Choose to push the new certificate to the specified application(s).\n- *Optional* - Choose to revoke the access token used on successful completion.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.\n",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n# Variables\n$Server = $OctopusParameters[\"Venafi.TPP.CreateCert.Server\"]\n$Token = $OctopusParameters[\"Venafi.TPP.CreateCert.AccessToken\"]\n$CertPath = $OctopusParameters[\"Venafi.TPP.CreateCert.DNPath\"]\n$CertName = $OctopusParameters[\"Venafi.TPP.CreateCert.Name\"]\n$CertCommonName = $OctopusParameters[\"Venafi.Tpp.CreateCert.SubjectCN\"]\n# Optional\n$CertCAPath = $OctopusParameters[\"Venafi.Tpp.CreateCert.CertificateAuthorityDN\"]\n$CertType = $OctopusParameters[\"Venafi.Tpp.CreateCert.Type\"]\n$CertManagementType = $OctopusParameters[\"Venafi.Tpp.CreateCert.ManagementType\"]\n$CertSubjectAltNames = $OctopusParameters[\"Venafi.Tpp.CreateCert.SubjectAltNames\"]\n$CertProvisionWait = $OctopusParameters[\"Venafi.TPP.CreateCert.ProvisioningWait\"]\n$CertProvisionTimeout = $OctopusParameters[\"Venafi.TPP.CreateCert.ProvisioningTimeout\"]\n$ApplicationPath = $OctopusParameters[\"Venafi.TPP.CreateCert.ApplicationPath\"]\n$ApplicationPush = $OctopusParameters[\"Venafi.TPP.CreateCert.PushCertificate\"]\n$RevokeToken = $OctopusParameters[\"Venafi.TPP.CreateCert.RevokeTokenOnCompletion\"]\n# Validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.CreateCert.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Token)) {\n    throw \"Required parameter Venafi.TPP.CreateCert.AccessToken not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($CertPath)) {\n    throw \"Required parameter Venafi.TPP.CreateCert.DNPath not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($CertName)) {\n    throw \"Required parameter Venafi.TPP.CreateCert.Name not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($CertCommonName)) {\n    throw \"Required parameter Venafi.TPP.CreateCert.SubjectCN not specified\"\n}\n\n$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force\n[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential(\"token\", $SecureToken)\n# Clean-up\n$Server = $Server.TrimEnd('/')\n# Required Modules\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\nWrite-Host \"Requesting new session from $Server\"\nNew-VenafiSession -Server $Server -AccessToken $AccessToken\n# New certificate\n$NewCert_Params = @{\n    Path       = $CertPath;\n    Name       = $CertName;\n    CommonName = $CertCommonName\n}\n# Optional CertificateType field\nif (-not [string]::IsNullOrWhiteSpace($CertType)) {\n    $NewCert_Params.CertificateType = $CertType\n}\n# Optional CertificateAuthorityPath field\nif (-not [string]::IsNullOrWhiteSpace($CertCAPath)) {\n    $NewCert_Params.CertificateAuthorityPath = $CertCAPath\n}\n# Optional ManagementType field\nif (-not [string]::IsNullOrWhiteSpace($CertManagementType)) {\n    $NewCert_Params.ManagementType = $CertManagementType\n}\n# Optional SubjectAltName field\nif (-not [string]::IsNullOrWhiteSpace($CertSubjectAltNames)) {\n    $SubjectAltNames = @()\n    $SubjectAltNameStrings = $CertSubjectAltNames -split \"`n\"\n    foreach ($SubjectAltNameString in $SubjectAltNameStrings) {\n        if (-not [string]::IsNullOrWhiteSpace($SubjectAltNameString)) {\n            $ReplacedString = $SubjectAltNameString.Trim().Replace(\";\", \"`n\")\n            $StringAsHash = $ReplacedString | ConvertFrom-StringData\n            $SubjectAltNames += $StringAsHash\n        }\n    }\n    $NewCert_Params.SubjectAltName = $SubjectAltNames\n}\n# Generate New Certificate\nWrite-Host \"Creating certificate '$CertName' ($CertPath)...\"\n$NewCertificate = New-TppCertificate @NewCert_Params -PassThru\n$count = 0\n$Continue = $True\n# Wait for certificate provisioning\nif ($CertProvisionWait -eq $true -and $CertManagementType -eq \"Provisioning\") {\n    $EndWait = (Get-Date).AddSeconds($CertProvisionTimeout)\n    do {\n        if ($count -gt 0) { \n            Write-Host \"Waiting 30 seconds for certificate to provision...\"\n            Start-Sleep -Seconds 30\n        }\n        $count++\n        Write-Host \"Checking certificate provisioning status.\"\n        $CertDetails = Get-VenafiCertificate -CertificateId $NewCertificate.Path\n        Write-Verbose \"ProcessingDetails: $($CertDetails.ProcessingDetails)\"\n        if (-not \"$($CertDetails.ProcessingDetails)\") {\n            $Continue = $False\n            Write-Host \"Successful certificate provisioning detected.\"\n        }\n        elseif ($CertDetails.ProcessingDetails.InError -eq $True -or $CertDetails.ProcessingDetails.Status -eq \"Failure\") {\n            $Continue = $False\n            Write-Error \"Certificate failed to provision at Stage: $($CertDetails.ProcessingDetails.Stage), Status: $($CertDetails.ProcessingDetails.Status)\"\n        }\n    } until ($Continue -eq $False -or (Get-Date) -ge $EndWait)\n}\n# Associate Certificate with application\nif (-not [string]::IsNullOrWhiteSpace($ApplicationPath)) {\n    $ApplicationPathArray = @()\n    if ($ApplicationPath.Contains(\",\")) {\n        $ApplicationPathArray = $ApplicationPath.Split(\",\")\n    }\n    else {\n        $ApplicationPathArray += $ApplicationPath\n    }\n\n    if ($CertProvisionWait -eq $false) {\n    \tWrite-Warning \"Associating the certificate $CertName with  application(s) at path(s) ($ApplicationPath) may be ongoing as waiting for provisioning is set to False. This could result in a failed association.\"\n    }\n\n    if ($ApplicationPush -eq $true) {\n        Write-Host \"Associating and pushing certificate to application at $ApplicationPath\"\n        Add-TppCertificateAssociation -CertificatePath $NewCertificate.Path -ApplicationPath $ApplicationPathArray -PushCertificate\n    }\n    else {\n        Write-Host \"Associating certificate to application at $ApplicationPath\"\n        Add-TppCertificateAssociation -CertificatePath $NewCertificate.Path -ApplicationPath $ApplicationPathArray\n    }\n}\nif ($RevokeToken -eq $true) {\n    # Revoke TPP access token\n    Write-Host \"Revoking access token with $Server\"\n    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "28b7cc35-41dc-4759-afc0-3ee8ded24a4b",
-        "Name": "Venafi.TPP.CreateCert.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "*Required*: The URL of the Venafi TPP instance you want to create a certificate in.\n\nFor example : `https://mytppserver.example.com`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "58bf5279-d9a6-4129-81fc-9806a836e0a0",
-        "Name": "Venafi.TPP.CreateCert.AccessToken",
-        "Label": "Venafi TPP Access Token",
-        "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "52140bce-2c49-46df-9858-145183a76614",
-        "Name": "Venafi.TPP.CreateCert.DNPath",
-        "Label": "Venafi TPP Certificate Path",
-        "HelpText": "*Required*: The Distinguished Name (DN) of the certificate you wish to create. This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "caf96139-f59d-4d79-b076-7cba155e5da6",
-        "Name": "Venafi.TPP.CreateCert.Name",
-        "Label": "Certificate Name",
-        "HelpText": "*Required*: Name of the certificate to be created.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "2dcab218-b4e3-4076-a05d-6d4b649fda80",
-        "Name": "Venafi.TPP.CreateCert.SubjectCN",
-        "Label": "Certificate Subject Common Name",
-        "HelpText": "*Required*: Subject common name (CN) of the certificate to be created. ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "040d9226-c782-47d6-b085-977f43b3f0cc",
-        "Name": "Venafi.TPP.CreateCert.CertificateAuthorityDN",
-        "Label": "Venafi TPP Certificate Authority Path (Optional)",
-        "HelpText": "*Optional*: The Distinguished Name (DN) of the certificate authority you wish to use. This is the absolute path to a certificate authority template in the TPP instance, separated by `\\`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c8863e1f-0e3b-49a4-aafc-d765b103c89a",
-        "Name": "Venafi.TPP.CreateCert.Type",
-        "Label": "Venafi TPP Certificate Type (Optional)",
-        "HelpText": "*Optional*: Type of certificate to be created. Valid options are:\n\n- `Code Signing`\n- `Device`\n- `Server` (**Default**)\n- `User`",
-        "DefaultValue": "Server",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Code Signing|Code Signing\nDevice|Device\nServer|Server\nUser|User"
-        }
-      },
-      {
-        "Id": "53b52bb0-64cf-4d11-bc66-f9e22b54c2a0",
-        "Name": "Venafi.TPP.CreateCert.ManagementType",
-        "Label": "Venafi TPP Certificate Management Type (Optional)",
-        "HelpText": "*Optional*: The level of management that Trust Protection Platform applies to the certificate. Valid options are:\n\n- `Enrollment`: (**Default**) Issue a new certificate, renewed certificate, or key generation request to a CA for enrollment. Do not automatically provision the certificate. \n- `Provisioning`: Issue a new certificate, renewed certificate, or key generation request to a CA for enrollment. Automatically install or provision the certificate.\n- `Monitoring`: Allow Trust Protection Platform to monitor the certificate for expiration and renewal.\n- `Unassigned`: Certificates are neither enrolled or monitored by Trust Protection Platform.",
-        "DefaultValue": "Enrollment",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Enrollment|Enrollment\nProvisioning|Provisioning\nMonitoring|Monitoring\nUnassigned|Unassigned"
-        }
-      },
-      {
-        "Id": "a3306c46-a69d-4bdf-816b-0bac12276b6c",
-        "Name": "Venafi.TPP.CreateCert.SubjectAltNames",
-        "Label": "Venafi TPP Certificate Subject Alternate Names (Optional)",
-        "HelpText": "*Optional*: A list of Subject Alternate Names. The value must be 1 or more lines with the SAN type and value. Each SAN type needs to be separated by a `;`. Acceptable SAN types are `OtherName`, `Email`, `DNS`, `URI`, and `IPAddress`. You can provide more than 1 of the same SAN type with multiple lines.\n\n**For example**: \n```md\nDNS=octopus.local.samples;Email=octopus@email.com\nDNS=octopus.samples;IPAddress=0.0.0.0\n```",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "MultiLineText"
-        }
-      },
-      {
-        "Id": "3014d2f1-789c-4640-91e1-ee7ddb5661e7",
-        "Name": "Venafi.TPP.CreateCert.ProvisioningWait",
-        "Label": "Wait for certificate provisioning?",
-        "HelpText": "If the new certificate has a management type of `Provisioning` should the step wait for the provisioning to complete?",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "88386d92-8536-4be4-8a8f-2f5fd8d3242b",
-        "Name": "Venafi.TPP.CreateCert.ProvisioningTimeout",
-        "Label": "Max wait time for certificate provisioning.",
-        "HelpText": "The max about of time in seconds you want the step to wait for the certificate to be provisioned.",
-        "DefaultValue": "600",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "e9e84efe-28e1-437c-9c79-845a59a7e89e",
-        "Name": "Venafi.TPP.CreateCert.ApplicationPath",
-        "Label": "Venafi TPP Application Path (Optional)",
-        "HelpText": "*Optional*: A comma separated list of application paths to associate with the new certificate. Each value in the list is the absolute path to an application in the TPP instance, separated by `\\`.\n\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3bfc02d2-4711-4a21-821d-9add5de603d7",
-        "Name": "Venafi.TPP.CreateCert.PushCertificate",
-        "Label": "Push certificate to associated application?",
-        "HelpText": "Push the newly created certificate to the applications",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "38eaa04c-6e4c-4d7d-b119-0631dfb7a490",
-        "Name": "Venafi.TPP.CreateCert.RevokeTokenOnCompletion",
-        "Label": "Revoke access token on completion?",
-        "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
-        "DefaultValue": "false",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-08-23T21:42:40.319Z",
-      "OctopusVersion": "2021.1.7236",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "harrisonmeister",
-    "Category": "venafi"
-  }
diff --git a/step-templates/venafi-tpp-export-certificate.json b/step-templates/venafi-tpp-export-certificate.json
deleted file mode 100644
index be67c8fc0..000000000
--- a/step-templates/venafi-tpp-export-certificate.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-    "Id": "2417aab5-6d84-4e0d-bc86-b2255bd4028a",
-    "Name": "Venafi TPP - Export Certificate",
-    "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and export a certificate using its Distinguished Name (DN). This is the absolute path to the certificate in the TPP instance.\n\nThis is achieved using the VenafiPS PowerShell module's [Export-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Export-VenafiCertificate/) function.\n\n---\n\n**Options:**\n\n- Provide the distinguished name (DN) path to the certificate.\n- Choose from the following export formats:\n  - `Base64`\n  - `Base64 (PKCS #8)`\n  - `DER`\n  - `JKS`\n  - `PKCS #7`\n  - `PKCS #12` \n- *Optional* - Provide a custom output path.\n- *Optional* - Provide a custom output filename. If not supplied, the filename will automatically be taken from the response.\n- *Optional* - Include the full certificate chain in the export.\n- *Optional* - Friendly name (Label or alias) to use. Permitted with `Base64` and `PKCS #12` formats. Required when format is `JKS`.\n- *Optional* - Include the private key in the export.\n- *Optional* - Provide a password to be used for the exported private key.\n- *Optional* - store the export certificate response in `JSON` format in an [Octopus sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables). This output variable can then be used in additional deployment or runbook steps.\n- *Optional* - on successful completion, you can revoke the access token used.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n- PowerShell `5` or greater.\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$Server = $OctopusParameters[\"Venafi.TPP.ExportCert.Server\"]\n$Token = $OctopusParameters[\"Venafi.TPP.ExportCert.AccessToken\"]\n$Path = $OctopusParameters[\"Venafi.TPP.ExportCert.DNPath\"]\n$Format = $OctopusParameters[\"Venafi.TPP.ExportCert.Format\"]\n$OutPath = $OctopusParameters[\"Venafi.TPP.ExportCert.OutPath\"]\n$OutFileName = $OctopusParameters[\"Venafi.TPP.ExportCert.OutFileName\"]\n\n# Optional\n$IncludeChain = $OctopusParameters[\"Venafi.TPP.ExportCert.IncludeChain\"]\n$FriendlyName = $OctopusParameters[\"Venafi.TPP.ExportCert.FriendlyName\"]\n$IncludePrivateKey = $OctopusParameters[\"Venafi.TPP.ExportCert.IncludePrivateKey\"]\n$PrivateKeyPassword = $OctopusParameters[\"Venafi.TPP.ExportCert.PrivateKeyPassword\"]\n$OutputVariableName = $OctopusParameters[\"Venafi.TPP.ExportCert.OutputVariableName\"]\n$RevokeToken = $OctopusParameters[\"Venafi.TPP.ExportCert.RevokeTokenOnCompletion\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.ExportCert.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Token)) {\n    throw \"Required parameter Venafi.TPP.ExportCert.AccessToken not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Path)) {\n    throw \"Required parameter Venafi.TPP.ExportCert.DNPath not specified\"\n}\nelse {\n    if ($Path.Contains(\"\\\") -eq $False) {\n        throw \"At least one '\\' is required for the Venafi.TPP.ExportCert.DNPath value\"\n    }\n}\nif ([string]::IsNullOrWhiteSpace($Format)) {\n    throw \"Required parameter Venafi.TPP.ExportCert.Format not specified\"\n}\nelse {\n    if ($Format -eq \"JKS\") {\n        if ([string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {\n            throw \"Export format is JKS, and parameter Venafi.TPP.ExportCert.PrivateKeyPassword required but not set!\"\n        }\n    }\n}\n# Conditional validation\nif (-not [string]::IsNullOrWhiteSpace($OutPath)) {\n    if (-not (Test-Path $OutPath -PathType Container)) {\n        throw \"Optional parameter Venafi.TPP.ExportCert.OutPath specified but does not exist!\"\n    }\n}\nif ($IncludePrivateKey -eq $True) {\n    if ([string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {\n        throw \"IncludePrivateKey set to true, but parameter Venafi.TPP.ExportCert.PrivateKeyPassword not specified\"\n    }\n}\n\n$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force\n[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential(\"token\", $SecureToken)\n\n# Clean-up\n$Server = $Server.TrimEnd('/')\n\n# Required Modules\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\n\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\n\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\n\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\nWrite-Verbose \"Venafi.TPP.ExportCert.Server: $Server\"\nWrite-Verbose \"Venafi.TPP.ExportCert.AccessToken: ********\"\nWrite-Verbose \"Venafi.TPP.ExportCert.DNPath: $Path\"\nWrite-Verbose \"Venafi.TPP.ExportCert.Format: $Format\"\nWrite-Verbose \"Venafi.TPP.ExportCert.OutPath: $OutPath\"\nWrite-Verbose \"Venafi.TPP.ExportCert.OutFileName: $OutFileName\"\nWrite-Verbose \"Venafi.TPP.ExportCert.IncludeChain: $IncludeChain\"\nWrite-Verbose \"Venafi.TPP.ExportCert.FriendlyName: $FriendlyName\"\nWrite-Verbose \"Venafi.TPP.ExportCert.IncludePrivateKey: $IncludePrivateKey\"\nWrite-Verbose \"Venafi.TPP.ExportCert.PrivateKeyPassword: ********\"\nWrite-Verbose \"Venafi.TPP.ExportCert.CertDetails.OutputVariableName: $OutputVariableName\"\nWrite-Verbose \"Venafi.TPP.ExportCert.RevokeTokenOnCompletion: $RevokeTokenOnCompletion\"\nWrite-Verbose \"Step Name: $StepName\"\n\nWrite-Host \"Requesting new session from $Server\"\nNew-VenafiSession -Server $Server -AccessToken $AccessToken\n\n# Export certificate\n$ExportCert_Params = @{\n    CertificateId = $Path;\n    Format        = $Format;\n}\n\n# Optional IncludeChain field\nif ($IncludeChain -eq $True) {\n    if ($Format -eq \"JKS\") {\n        Write-Warning \"The IncludeChain parameter is not supported with JKS export format, ignoring.\"\n    }\n    else {\n        $ExportCert_Params.IncludeChain = $True\n    }\n}\n\n# Optional FriendlyName field\nif (-not [string]::IsNullOrWhiteSpace($FriendlyName)) {\n    $ExportCert_Params.FriendlyName = $FriendlyName\n}\n\nif (-not [string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {\n    $SecurePrivateKeyPassword = ConvertTo-SecureString $PrivateKeyPassword -AsPlainText -Force\n    if ($Format -eq \"JKS\") {\n        $ExportCert_Params.KeystorePassword = $SecurePrivateKeyPassword      \n    }\n    elseif ($IncludePrivateKey -eq $True) {\n        $ExportCert_Params.PrivateKeyPassword = $SecurePrivateKeyPassword    \n        $ExportCert_Params.IncludePrivateKey = $True\n    }\n}\n\n$ExportCertificateResponse = ((Export-VenafiCertificate @ExportCert_Params) 6> $null)\n\nif ($null -eq $ExportCertificateResponse -or $null -eq $ExportCertificateResponse.CertificateData) {\n    Write-Warning \"No certificate data returned for path: $Path`nCheck the path value represents a certificate, and not a folder.\"\n}\nelse {\n    Write-Highlight \"Successfully retrieved certificate data to export for path: $Path\"\n    \n    if ([string]::IsNullOrWhiteSpace($OutPath) -eq $False) {\n        $Filename = $ExportCertificateResponse.Filename\n        if ([string]::IsNullOrWhiteSpace($OutFileName) -eq $False) {\n            $Filename = $OutFileName\n        }\n        $outFile = Join-Path -Path $OutPath -ChildPath ($Filename.Trim('\"'))\n        $bytes = [Convert]::FromBase64String($ExportCertificateResponse.CertificateData)\n        [IO.File]::WriteAllBytes($outFile, $bytes)\n        Write-Host ('Saved {0} with format {1}' -f $outFile, $ExportCertificateResponse.Format)\n    }\n    if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {\n        $CertificateJson = $ExportCertificateResponse | ConvertTo-Json -Compress -Depth 10 \n        Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson -Sensitive\n        Write-Highlight \"Created sensitive output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}\"\n    }\n}\n\nif ($RevokeToken -eq $true) {\n    # Revoke TPP access token\n    Write-Host \"Revoking access token with $Server\"\n    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "56ef4967-37f5-40a0-a66e-f3fa589b6467",
-        "Name": "Venafi.TPP.ExportCert.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "*Required*: The URL of the Venafi TPP instance you want to export a certificate from.\n\nFor example: `https://mytppserver.example.com`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "49bcdbbb-3674-4901-8bf6-164e5e4bc395",
-        "Name": "Venafi.TPP.ExportCert.AccessToken",
-        "Label": "Venafi TPP Access Token",
-        "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "e3156852-4ba9-4dc0-8d39-5a93c52b1910",
-        "Name": "Venafi.TPP.ExportCert.DNPath",
-        "Label": "Venafi TPP Certificate Path",
-        "HelpText": "*Required*: The Distinguished Name (DN) of the certificate you wish to export. This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "4f9f4d4b-d686-4d00-aa93-af35b7df320b",
-        "Name": "Venafi.TPP.ExportCert.Format",
-        "Label": "Certificate Export Format",
-        "HelpText": "*Required*: The certificate export format. Valid options are:\n\n- `Base64`\n- `Base64 (PKCS #8)`\n- `DER`\n- `JKS`\n- `PKCS #7`\n- `PKCS #12` ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Base64|Base64\nBase64 (PKCS #8)|Base64 (PKCS #8)\nDER|DER\nJKS|JKS\nPKCS #7|PKCS #7\nPKCS #12|PKCS #12"
-        }
-      },
-      {
-        "Id": "7f7dc0f5-275e-4d32-a758-c942c9535bbc",
-        "Name": "Venafi.TPP.ExportCert.OutPath",
-        "Label": "Certificate output folder (Optional)",
-        "HelpText": "*Optional*: The folder path to save the certificate to. The folder must exist if this value is specified.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "48df6311-3eba-49b6-8adb-03b7d9eac8b4",
-        "Name": "Venafi.TPP.ExportCert.OutFileName",
-        "Label": "Certificate output filename (Optional)",
-        "HelpText": "*Optional*: The filename to save the exported certificate as. This value is used when the `Venafi.TPP.ExportCert.OutPath` parameter is set. \n\nIf not specified, the TPP filename will be used.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "309d30de-79b6-4461-8a54-1698aedd5822",
-        "Name": "Venafi.TPP.ExportCert.IncludeChain",
-        "Label": "Include certificate chain (Optional)",
-        "HelpText": "*Optional*: Include the certificate chain with the exported certificate. Not supported with `DER` or `JKS` format. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "71fecac3-25c4-4161-9135-94815a485f03",
-        "Name": "Venafi.TPP.ExportCert.FriendlyName",
-        "Label": "Friendly Name (Optional)",
-        "HelpText": "*Optional*: Label or alias to use. Permitted with `Base64` and `PKCS #12` formats. Required when Format is `JKS`. ",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "2aaedf1d-be93-4df4-856c-c69650db452a",
-        "Name": "Venafi.TPP.ExportCert.IncludePrivateKey",
-        "Label": "Include Private Key (Optional)",
-        "HelpText": "*Optional*: Include the private key in the certificate export. If this is selected, the `Venafi.TPP.Export.PrivateKeyPassword` must also be provided. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "2d168360-bcbf-4bdc-833d-a9c182e98a47",
-        "Name": "Venafi.TPP.ExportCert.PrivateKeyPassword",
-        "Label": "Private Key password (Optional)",
-        "HelpText": "*Optional*: The password required to include the private key. Not supported with `DER` or `PKCS #7` formats.  You must adhere to the following rules: \n\n- Password is at least 12 characters. \n- Comprised of at least three of the following: \n  - Uppercase alphabetic letters \n  - Lowercase alphabetic letters \n  - Numeric characters \n  - Special characters",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "84f92dd5-064b-47e5-bb11-3dd0faacfeb4",
-        "Name": "Venafi.TPP.ExportCert.OutputVariableName",
-        "Label": "Certificate output variable name (Optional)",
-        "HelpText": "*Optional*: Create an output variable with the certificate details returned from the export call. The certificate details will be stored in `JSON` format.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "606acdfe-641a-47f2-a4ea-56559477ea0c",
-        "Name": "Venafi.TPP.ExportCert.RevokeTokenOnCompletion",
-        "Label": "Revoke access token on completion?",
-        "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedAt": "2021-08-18T15:22:55.551Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2021-08-18T15:22:55.551Z",
-      "OctopusVersion": "2021.3.1432",
-      "Type": "ActionTemplate"
-    },
-    
-    "Category": "venafi"
-}
\ No newline at end of file
diff --git a/step-templates/venafi-tpp-find-certificate-details.json b/step-templates/venafi-tpp-find-certificate-details.json
deleted file mode 100644
index 41a949e08..000000000
--- a/step-templates/venafi-tpp-find-certificate-details.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "Id": "91ea41ae-5b12-4854-8994-90c06ba4b7f1",
-    "Name": "Venafi TPP - Find Certificate details",
-    "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and find a matching certificate based on the certificate subject common name. This is achieved using a combination of two functions from the VenafiPS PowerShell module:\n\n1. [Find-TppCertificate](https://venafips.readthedocs.io/en/latest/functions/Find-TppCertificate/) function.\n2. [Get-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Get-VenafiCertificate/) function.\n\nIf multiple certificate matches are found, additional (optional) search criteria can be provided to further filter the results:\n\n- Certificate serial number\n- Full Issuer Distinguished Name (DN)\n- Expires before\n\nAfter any filtering is complete, if multiple matches are found, only the first certificate will be returned, and a warning will be logged that multiple matches were found.\n\nYou can also store the entire certificate result in `JSON` format in an [Octopus output variable](https://octopus.com/docs/projects/variables/output-variables)\n\nThis output variable can then be used in additional deployment or runbook steps.\n\nOn successful completion, you can also *optionally* revoke the access token used.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$Server = $OctopusParameters[\"Venafi.TPP.FindCert.Server\"]\n$Token = $OctopusParameters[\"Venafi.TPP.FindCert.AccessToken\"]\n$SubjectCommonName = $OctopusParameters[\"Venafi.TPP.FindCert.SubjectCN\"]\n\n# Optional \n$CertSerialNumber = $OctopusParameters[\"Venafi.TPP.FindCert.SerialNumber\"]\n$Issuer = $OctopusParameters[\"Venafi.TPP.FindCert.Issuer\"]\n$ExpireBefore = $OctopusParameters[\"Venafi.TPP.FindCert.ExpireBefore\"]\n$OutputVariableName = $OctopusParameters[\"Venafi.TPP.FindCert.CertDetails.OutputVariableName\"]\n$RevokeTokenOnCompletion = $OctopusParameters[\"Venafi.TPP.FindCert.RevokeTokenOnCompletion\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.FindCert.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Token)) {\n    throw \"Required parameter Venafi.TPP.FindCert.AccessToken not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($SubjectCommonName)) {\n    throw \"Required parameter Venafi.TPP.FindCert.SubjectCN not specified\"\n}\n\n$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force\n[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential(\"token\", $SecureToken)\n\n# Clean-up\n$Server = $Server.TrimEnd('/')\n\n# Required Modules\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\n\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\n\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\n\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\nWrite-Verbose \"Venafi.TPP.FindCert.Server: $Server\"\nWrite-Verbose \"Venafi.TPP.FindCert.AccessToken: ********\"\nWrite-Verbose \"Venafi.TPP.FindCert.SubjectCN: $SubjectCommonName\"\nWrite-Verbose \"Venafi.TPP.FindCert.SerialNumber: $CertSerialNumber\"\nWrite-Verbose \"Venafi.TPP.FindCert.Issuer: $Issuer\"\nWrite-Verbose \"Venafi.TPP.FindCert.ExpireBefore: $ExpireBefore\"\nWrite-Verbose \"Venafi.TPP.FindCert.CertDetails.OutputVariableName: $OutputVariableName\"\nWrite-Verbose \"Venafi.TPP.FindCert.RevokeTokenOnCompletion: $RevokeTokenOnCompletion\"\nWrite-Verbose \"Step Name: $StepName\"\n\nWrite-Host \"Requesting new session from $Server\"\nNew-VenafiSession -Server $Server -AccessToken $AccessToken\n\n$FindCert_Params = @{\n    First      = 5;\n    CommonName = $SubjectCommonName;\n}\n\n# Optional SerialNumber field\nif ([string]::IsNullOrWhiteSpace($CertSerialNumber) -eq $False) {\n    $FindCert_Params += @{ SerialNumber = $CertSerialNumber }\n}\n# Optional Issuer field\nif ([string]::IsNullOrWhiteSpace($Issuer) -eq $False) {\n    # Issuer DN should be the complete DN enclosed in double quotes. e.g. \"CN=Example Root CA, O=Venafi,Inc., L=Salt Lake City, S=Utah, C=US\"\n    # If a value DN already contains double quotes, the string should be enclosed in a second set of double quotes. \n    if ($Issuer.StartsWith(\"`\"\") -or $Issuer.EndsWith(\"`\"\")) {\n        Write-Verbose \"Removing double quotes from start and end of Issuer DN.\"\n        $Issuer = $Issuer.Trim(\"`\"\")\n    }\n    $FindCert_Params += @{ Issuer = \"`\"$Issuer`\"\" }\n}\n# Optional ExpireBefore field\nif ([string]::IsNullOrWhiteSpace($ExpireBefore) -eq $False) {\n    $FindCert_Params += @{ ExpireBefore = $ExpireBefore }\n}\n\nWrite-Host \"Searching for certificates matching Subject CN: $SubjectCommonName.\"\n$MatchingCertificates = @(Find-TppCertificate @FindCert_Params)\n$MatchingCount = $MatchingCertificates.Length\nif ($null -eq $MatchingCertificates -or $MatchingCount -eq 0) {\n    Write-Warning \"No matching certificates found for Subject CN: $SubjectCommonName. Check any additional search criteria and try again.\"\n}\nelse {\n    $MatchingCertificate = $MatchingCertificates | Select-Object -First 1\n    if ($MatchingCount -gt 1) {\n        Write-Warning \"Multiple matching certificates found ($MatchingCount) for Subject CN: $SubjectCommonName, retrieving details for first match.\"\n    }\n    \n    Write-Highlight \"Retrieving certificate details for Subject CN: $SubjectCommonName ($($MatchingCertificate.Path))\"\n    $Certificate = Get-VenafiCertificate -CertificateId $MatchingCertificate.Path\n    if ($null -eq $Certificate) {\n        Write-Warning \"No certificate details returned for Subject CN: $SubjectCommonName ($($MatchingCertificate.Path))\"\n    }\n    else {\n        Write-Host \"Retrieved certificate details for Subject CN: $SubjectCommonName ($($MatchingCertificate.Path))\"\n        $Certificate | Format-List\n\n        if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {\n            $CertificateJson = $Certificate | ConvertTo-Json -Compress -Depth 10 \n            Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson\n            Write-Highlight \"Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}\"\n        }\n    }\n}\n\nif ($RevokeTokenOnCompletion -eq $True) {\n    # Revoke TPP access token\n    Write-Host \"Revoking access token with $Server\"\n    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "cf0b3c21-9249-4aa9-bf19-1fffdaa58939",
-        "Name": "Venafi.TPP.FindCert.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "*Required*: The URL of the Venafi TPP instance you want to find a certificate from.\n\nFor example: `https://mytppserver.example.com`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "f0d9bb77-7980-45f5-97c6-eefe6ccb3398",
-        "Name": "Venafi.TPP.FindCert.AccessToken",
-        "Label": "Venafi TPP Access Token",
-        "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "0b7565f5-1ca1-4738-b13f-4b8a4ab99cf0",
-        "Name": "Venafi.TPP.FindCert.SubjectCN",
-        "Label": "Certificate Subject Common Name",
-        "HelpText": "*Required*: Enter the certificate subject common name (CN) to search for.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "44bb491d-1249-4893-a9fb-903daf2df6b4",
-        "Name": "Venafi.TPP.FindCert.SerialNumber",
-        "Label": "Certificate serial number (Optional)",
-        "HelpText": "*Optional*: In case of multiple certificates matched on the subject common name (CN), provide the certificate serial number to filter to a single certificate match.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "fcac21e8-34b6-48c6-b40f-2448c0c598a5",
-        "Name": "Venafi.TPP.FindCert.Issuer",
-        "Label": "Certificate Issuer Distinguished Name (Optional)",
-        "HelpText": "*Optional*: In case of multiple certificates matched on the subject common name (CN), provide the full Issuer distinguished name (DN) to filter to a single certificate match. \n\nFor example: `CN=Example Root CA, O=Venafi,Inc., L=Salt Lake City, S=Utah, C=US`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "c15020cd-b722-49c2-89c2-a2a2349d41eb",
-        "Name": "Venafi.TPP.FindCert.ExpireBefore",
-        "Label": "Certificate Expires Before (Optional)",
-        "HelpText": "*Optional*: In case of multiple certificates matched on the subject common name (CN), provide the expires before date in the format `yyyy-MM-dd` e.g. `2021-08-15`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "19f60dd0-887e-4379-94b3-b3227b3073be",
-        "Name": "Venafi.TPP.FindCert.CertDetails.OutputVariableName",
-        "Label": "Certificate output variable name (Optional)",
-        "HelpText": "*Optional*: Create an output variable with the certificate details found from the search. The certificate details will be stored in `JSON` format.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "74dbacbe-6192-45e6-8a10-e714966c4150",
-        "Name": "Venafi.TPP.FindCert.RevokeTokenOnCompletion",
-        "Label": "Revoke access token on completion?",
-        "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedAt": "2021-08-16T09:51:20.800Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2021-08-16T09:51:20.800Z",
-      "OctopusVersion": "2021.2.7207",
-      "Type": "ActionTemplate"
-    },
-    "Category": "venafi"
-  }
\ No newline at end of file
diff --git a/step-templates/venafi-tpp-generate-oauth-token.json b/step-templates/venafi-tpp-generate-oauth-token.json
deleted file mode 100644
index ad3b96d1e..000000000
--- a/step-templates/venafi-tpp-generate-oauth-token.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "Id": "7e6f7f03-260a-4b52-9377-66f1c69b77d8",
-    "Name": "Venafi TPP - Generate OAuth Token",
-    "Description": "This step template will authenticate against a Venafi TPP instance and generate an OAuth token for specified scope/privileges using the VenafiPS PowerShell module's `New-TppToken` (an alias of the [VdcToken](https://venafips.readthedocs.io/en/latest/functions/New-VdcToken/) function).\n\nThe following properties from the resulting OAuth token will be created as [Octopus sensitive variables](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables):\n\n- `access_token` created with the name `AccessToken`\n- `Expires` created with the name `AccessTokenExpires` in the format `yyyy-MM-ddTHH:mm:ss`\n- `refresh_token` created with the name `RefreshToken`\n- `refresh_until` created with the name `RefreshTokenExpires` in the format `yyyy-MM-ddTHH:mm:ss`. *Note: This value can be empty*.\n\nThese output variables can be used in additional deployment or runbook steps.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 3,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$Server = $OctopusParameters[\"Venafi.TPP.OAuthToken.Server\"]\n$ClientID = $OctopusParameters[\"Venafi.TPP.OAuthToken.ClientID\"]\n$Username = $OctopusParameters[\"Venafi.TPP.OAuthToken.Username\"]\n$Password = $OctopusParameters[\"Venafi.TPP.OAuthToken.Password\"]\n$Scopes = $OctopusParameters[\"Venafi.TPP.OAuthToken.Scope\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.OAuthToken.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($ClientID)) {\n    throw \"Required parameter Venafi.TPP.OAuthToken.ClientID not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Username)) {\n    throw \"Required parameter Venafi.TPP.OAuthToken.Username not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Password)) {\n    throw \"Required parameter Venafi.TPP.OAuthToken.Password not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Scopes)) {\n    throw \"Required parameter Venafi.TPP.OAuthToken.Scope not specified\"\n}\n\n# Clean-up\n$Server = $Server.TrimEnd('/')\n\n# Required Modules\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\n\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\n\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\n\n$AccessTokenScope = @{}\n\n$Scopes -Split \";\" | ForEach-Object {\n    $Scope = ($_ -Split \":\")\n    $Type = $Scope[0]\n    $Privileges = $null\n    \n    if ($Scope.Length -gt 1) {\n        $Privileges = $Scope[1].TrimEnd(\",\")\n    }\n    \n    if ($AccessTokenScope.ContainsKey($Type)) {\n        $CurrentPrivileges = $AccessTokenScope[$Type]\n        # If no privilege, set to $null\n        if ([string]::IsNullOrWhiteSpace($Privileges)) {\n            $AccessTokenScope[$Type] = $null\n        }\n        else {\n            $AccessTokenScope[$Type] = if ([string]::IsNullOrWhiteSpace($CurrentPrivileges)) { $Privileges } else { \"$($CurrentPrivileges),$Privileges\" }  \n        }\n    }\n    else {\n        $AccessTokenScope.Add($Type, $Privileges)\n    }\n}\n\nif ($AccessTokenScope.Keys.Count -lt 1) {\n    throw \"No scopes could be determined!\"\n}\n\n$scopeString = @($AccessTokenScope.GetEnumerator() | ForEach-Object { if ($_.Value) { '{0}:{1}' -f $_.Key, $_.Value } else { $_.Key } }) -join ';'\n\n# Get TPP access token\n[PSCredential]$Credential = New-Object System.Management.Automation.PSCredential ($Username, (ConvertTo-SecureString $Password -AsPlainText -Force))\n\nWrite-Host \"Requesting new OAuth token from: $Server for ClientId: $ClientID with scope '$scopeString' ...\"\n$tppTokenResponse = New-TppToken -AuthServer $Server -ClientId $ClientID -Scope $AccessTokenScope -Credential $Credential\n\n$AccessToken = $tppTokenResponse.AccessToken.GetNetworkCredential().Password\n$Expiry = $tppTokenResponse.Expires.ToString(\"s\")\n$RefreshToken = $tppTokenResponse.RefreshToken.GetNetworkCredential().Password\n$RefreshExpires = $tppTokenResponse.RefreshExpires\n\n# Refresh Expiry can be $null\nif ($null -ne $RefreshExpires) {\n    $RefreshExpires = $RefreshExpires.ToString(\"s\")\n}\n\nSet-OctopusVariable -Name \"AccessToken\" -Value $AccessToken -Sensitive\nWrite-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.AccessToken}\"\nSet-OctopusVariable -Name \"AccessTokenExpires\" -Value $Expiry -Sensitive\nWrite-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.AccessTokenExpires}\"\nSet-OctopusVariable -Name \"RefreshToken\" -Value $RefreshToken -Sensitive\nWrite-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.RefreshToken}\"\nSet-OctopusVariable -Name \"RefreshTokenExpires\" -Value $RefreshExpires -Sensitive\nWrite-Host \"Created output variable: ##{Octopus.Action[$StepName].Output.RefreshTokenExpires}\""
-    },
-    "Parameters": [
-      {
-        "Id": "7ca2062d-9153-4606-bbab-441c893f9739",
-        "Name": "Venafi.TPP.OAuthToken.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "The URL of the Venafi TPP instance you are connecting to.\n\nFor example: `https://mytppserver.example.com`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "57631dfd-965b-4bfa-9f34-5e9147cdb702",
-        "Name": "Venafi.TPP.OAuthToken.ClientID",
-        "Label": "Venafi Application ClientID",
-        "HelpText": "Application Id (also known as `ClientId`) configured in Venafi for token-based authentication.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "83bfad97-50d1-49b9-9d9b-dc2ba87d9281",
-        "Name": "Venafi.TPP.OAuthToken.Username",
-        "Label": "Venafi Username",
-        "HelpText": "Username to request API token.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "05280b11-3dd6-41d7-a970-2328478a4b52",
-        "Name": "Venafi.TPP.OAuthToken.Password",
-        "Label": "Venafi Password",
-        "HelpText": "Password to request API token.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "b7edd6a4-20bb-47fe-8181-42ca5af9adb2",
-        "Name": "Venafi.TPP.OAuthToken.Scope",
-        "Label": "Access token scope",
-        "HelpText": "Scopes and privilege restrictions for the access token. Scopes can include:\n\n- `agent`\n- `certificate`\n- `code signing`\n- `configuration`\n- `restricted`\n- `security`\n- `ssh`\n- `statistics`\n\nSee the [Venafi Auth SDK](https://docs.venafi.com/Docs/21.1/TopNav/Content/SDK/AuthSDK/t-SDKa-Setup-OAuth.php) for more info.\n\nMultiple values can be supplied separated by `;`. \n\nFor a privilege restriction of none or read, just use the scope as the value. For example, to include management of certificates and include ssh with no privilege restriction, use: `certificate:manage;ssh`.\n\nIf multiple values for the same scope are provided they will be concatenated, *unless* a value of no privilege is found. If that occurs, then the \"last entry\" wins.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      }
-    ],
-    "LastModifiedAt": "2024-04-10T17:28:31.301Z",
-    "LastModifiedBy": "harrisonmeister",
-    "$Meta": {
-      "ExportedAt": "2021-07-30T10:36:31.301Z",
-      "OctopusVersion": "2021.2.6775",
-      "Type": "ActionTemplate"
-    },
-    "Category": "venafi"
-  }
diff --git a/step-templates/venafi-tpp-import-certificate-into-octopus.json b/step-templates/venafi-tpp-import-certificate-into-octopus.json
deleted file mode 100644
index e426222fa..000000000
--- a/step-templates/venafi-tpp-import-certificate-into-octopus.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-    "Id": "e10820c2-ae6d-4030-8a8a-b73ed60a81fc",
-    "Name": "Venafi TPP - Import Certificate into Octopus",
-    "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, export a certificate by its Distinguished Name (DN), and then import the certificate into the Octopus certificate store.\n\nThe export is achieved using the VenafiPS PowerShell module's [Export-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Export-VenafiCertificate/) function.\n\n---\n\n**Export options:**\n\n- Provide the distinguished name (DN) path to the certificate.\n- Choose from the following export formats:\n  - `Base64`\n  - `Base64 (PKCS #8)`\n  - `DER`\n  - `PKCS #12` \n- *Optional* - Include the full certificate chain in the export.\n- *Optional* - Friendly name (Label or alias) to use. Permitted with `Base64` and `PKCS #12` formats. \n- *Optional* - Include the private key in the export. Not supported with `DER` format.\n- *Optional* - Provide a password to be used for the exported private key.\n- *Optional* - Also store the export certificate response in `JSON` format in an [Octopus sensitive output variable](https://octopus.com/docs/projects/variables/output-variables#sensitive-output-variables). This output variable can then be used in additional deployment or runbook steps.\n- *Optional* - on successful completion, you can revoke the access token used.\n\n---\n\n**Octopus Import options:**\n\n- Octopus URL\n- Octopus API Key\n- Octopus Space name\n- Certificate name\n- *Optional* - replace the existing certificate if it already exists\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n- PowerShell `5` or greater.\n- Octopus API key with permission to save the certificate.\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 2,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# TPP required variables\n$Server = $OctopusParameters[\"Venafi.TPP.ImportCert.Server\"]\n$Token = $OctopusParameters[\"Venafi.TPP.ImportCert.AccessToken\"]\n$Path = $OctopusParameters[\"Venafi.TPP.ImportCert.DNPath\"]\n$Format = $OctopusParameters[\"Venafi.TPP.ImportCert.Format\"]\n\n# TPP optional variables\n$IncludeChain = $OctopusParameters[\"Venafi.TPP.ImportCert.IncludeChain\"]\n$FriendlyName = $OctopusParameters[\"Venafi.TPP.ImportCert.FriendlyName\"]\n$IncludePrivateKey = $OctopusParameters[\"Venafi.TPP.ImportCert.IncludePrivateKey\"]\n$PrivateKeyPassword = $OctopusParameters[\"Venafi.TPP.ImportCert.PrivateKeyPassword\"]\n$OutputVariableName = $OctopusParameters[\"Venafi.TPP.ImportCert.OutputVariableName\"]\n$RevokeToken = $OctopusParameters[\"Venafi.TPP.ImportCert.RevokeTokenOnCompletion\"]\n\n# Octopus required variables\n$OctopusServerUri = $OctopusParameters[\"Venafi.TPP.ImportCert.OctopusServerUri\"]\n$OctopusApiKey = $OctopusParameters[\"Venafi.TPP.ImportCert.OctopusApiKey\"]\n$OctopusSpaceName = $OctopusParameters[\"Venafi.TPP.ImportCert.OctopusSpaceName\"]\n$OctopusCertificateName = $OctopusParameters[\"Venafi.TPP.ImportCert.OctopusCertificateName\"]\n$OctopusReplaceExistingCertificate = $OctopusParameters[\"Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate\"]\n\n# TPP validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Token)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.AccessToken not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Path)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.DNPath not specified\"\n}\nelse {\n    if ($Path.Contains(\"\\\") -eq $False) {\n        throw \"At least one '\\' is required for the Venafi.TPP.ImportCert.DNPath value\"\n    }\n}\nif ([string]::IsNullOrWhiteSpace($Format)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.Format not specified\"\n}\n\n# TPP conditional validation\nif ($IncludePrivateKey -eq $True) {\n    if ([string]::IsNullOrWhiteSpace($PrivateKeyPassword)) {\n        throw \"IncludePrivateKey set to true, but parameter Venafi.TPP.ImportCert.PrivateKeyPassword not specified\"\n    }\n}\nelse {\n    $PrivateKeyPassword = $null\n}\n\n# Octopus validation\nif ([string]::IsNullOrWhiteSpace($OctopusServerUri)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.OctopusServerUri not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($OctopusApiKey)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.OctopusApiKey not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($OctopusSpaceName)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.OctopusSpaceName not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($OctopusCertificateName)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.OctopusCertificateName not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($OctopusReplaceExistingCertificate)) {\n    throw \"Required parameter Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate not specified\"\n}\n\n# Helper functions\n###############################################################################\nfunction Get-WebRequestErrorBody {\n    param (\n        $RequestError\n    )\n\n    # Powershell < 6 you can read the Exception\n    if ($PSVersionTable.PSVersion.Major -lt 6) {\n        if ($RequestError.Exception.Response) {\n            $reader = New-Object System.IO.StreamReader($RequestError.Exception.Response.GetResponseStream())\n            $reader.BaseStream.Position = 0\n            $reader.DiscardBufferedData()\n            $rawResponse = $reader.ReadToEnd()\n            $response = \"\"\n            try { $response = $rawResponse | ConvertFrom-Json } catch { $response = $rawResponse }\n            return $response\n        }\n    }\n    else {\n        return $RequestError.ErrorDetails.Message\n    }\n}\n\nfunction Get-MatchingOctopusCertificates {\n    param (\n        [string]$ServerUri,\n        [string]$ApiKey,\n        [string]$SpaceId,\n        [string]$CertificateName\n    )\n    Write-Debug \"Entering: Get-MatchingOctopusCertificates\"\n\n    try {\n\n        $header = @{ \"X-Octopus-ApiKey\" = $ApiKey }\n\n        # Get a list of certificates that match our domain search criteria.\n        $partial_certificates = (Invoke-RestMethod -Uri \"$ServerUri/api/$SpaceId/certificates?partialName=$([uri]::EscapeDataString($CertificateName))&skip=0&take=2000\" -Headers $header) | Select-Object -ExpandProperty Items\n\n        # return certs that arent archived and havent been replaced.\n        return $partial_certificates | Where-Object {\n            $null -eq $_.ReplacedBy -and\n            $null -eq $_.Archived -and \n            $CertificateName -eq $_.Name\n        }\n    }\n    catch {\n        $Detail = (Get-WebRequestErrorBody -RequestError $_)\n        Write-Error \"Could not retrieve certificates from Octopus. Error: $($_.Exception.Message).`n`t$Detail\"\n    }\n}\n\nfunction Replace-OctopusCertificate {\n    param (\n        [string]$ServerUri,\n        [string]$ApiKey,\n        [string]$SpaceId,\n        [string]$CertificateId,\n        [string]$CertificateName,\n        [string]$CertificateData,\n        [string]$CertificatePwd\n    )\n    Write-Debug \"Entering: Replace-OctopusCertificate\"   \n    try {\n\n        $header = @{ \"X-Octopus-ApiKey\" = $ApiKey }\n\n        $replacement_certificate = @{\n            CertificateData = $CertificateData\n        }\n\n        if (![string]::IsNullOrWhiteSpace($CertificatePwd)) {\n            $replacement_certificate.Password = $CertificatePwd\n        }\n        \n        # Replace the cert\n        $updated_certificate = Invoke-RestMethod -Method Post -Uri \"$ServerUri/api/$SpaceId/certificates/$CertificateId/replace\" -Headers $header -Body ($replacement_certificate | ConvertTo-Json -Depth 10)\n        Write-Highlight \"Replaced certificate in Octopus for '$($updated_certificate.Name)' ($($updated_certificate.Id))\"\n    }\n    catch {\n        $Detail = (Get-WebRequestErrorBody -RequestError $_)\n        Write-Error \"Could not replace certificate in Octopus. Error: $($_.Exception.Message).`n`t$Detail\"\n    }\n}\n\nfunction New-OctopusCertificate {\n    param (\n        [string]$ServerUri,\n        [string]$ApiKey,\n        [string]$SpaceId,\n        [string]$CertificateName,\n        [string]$CertificateData,\n        [string]$CertificatePwd\n    )\n    Write-Debug \"Entering: New-OctopusCertificate\"   \n    try {\n\n        $header = @{ \"X-Octopus-ApiKey\" = $ApiKey }\n\n        $certificate = @{\n            Name            = $CertificateName;\n            CertificateData = @{\n                NewValue = $CertificateData;\n                HasData  = $True;\n            }\n            Password        = @{\n                HasValue = $False;\n                NewValue = $null;\n            }\n        }\n\n        if (![string]::IsNullOrWhiteSpace($CertificatePwd)) {\n            $certificate.Password.NewValue = $CertificatePwd\n            $certificate.Password.HasData = $True\n        }\n        \n        # Create new certificate\n        $new_certificate = Invoke-RestMethod -Method Post -Uri \"$ServerUri/api/$SpaceId/certificates\" -Headers $header -Body ($certificate | ConvertTo-Json -Depth 10)\n        Write-Highlight \"New certificate created in Octopus for '$($new_certificate.Name)' ($($new_certificate.Id))\"\n    }\n    catch {\n        $Detail = (Get-WebRequestErrorBody -RequestError $_)\n        Write-Error \"Could not create new certificate in Octopus. Error: $($_.Exception.Message).`n`t$Detail\"\n    }\n}\n\nfunction Clean-VenafiCertificateForOctopus {\n    param (\n        [string]$CertificateData\n    )\n    Write-Debug \"Entering: Clean-VenafiCertificateForOctopus\"   \n    $PemHeaderFragment = \"-----BEGIN *\"\n    $PemFooterFragment = \"-----END *\"\n\n    $CertificateBytes = [Convert]::FromBase64String($CertificateData)\n    $RawCert = [System.Text.Encoding]::UTF8.GetString($CertificateBytes)\n    \n    $CleanedCertLines = @()\n    if (![string]::IsNullOrWhiteSpace($RawCert)) {\n        $RawCertLines = ($RawCert -Split \"`n\")\n        $currentLine = 0\n        while ($currentLine -lt $RawCertLines.Length) {\n            Write-Verbose \"Working on line $currentLine\"\n            $headerPosition = [Array]::FindIndex($RawCertLines, $currentLine, [Predicate[string]] { $args[0] -like $PemHeaderFragment })\n            if ($headerPosition -gt -1) {\n                $footerPosition = [Array]::FindIndex($RawCertLines, $headerPosition, [Predicate[string]] { $args[0] -like $PemFooterFragment })\n                if ($footerPosition -lt 0) {\n                    throw \"Unable to find a matching '-----END' PEM fragment!\"\n                }\n                else {\n                    Write-Verbose \"Selecting PEM lines: $headerPosition-$footerPosition\"\n                    $pemLines = $RawCertLines[$headerPosition..$footerPosition]\n                    $CleanedCertLines += $pemLines\n                    $currentLine = $footerPosition\n                }\n            }\n            else {\n                $currentLine++\n            }\n        }\n    }\n    if ($CleanedCertLines.Length -le 0) {\n        throw \"Something went wrong extracting contents from file (no cleansed contents)\"\n    }\n\n    $CleanedCert = $CleanedCertLines | Out-String\n    $CleanedCertData = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($CleanedCert))\n    \n    return $CleanedCertData    \n}\n###############################################################################\n# MAIN STEP TEMPLATE FLOW\n###############################################################################\n\n# TPP Access token\n$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force\n[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential(\"token\", $SecureToken)\n\n# Clean-up\n$Server = $Server.TrimEnd('/')\n$OctopusServerUri = $OctopusServerUri.TrimEnd('/')\n$OctopusSpaceName = $OctopusSpaceName.Trim(\" \")\n$OctopusCertificateName = $OctopusCertificateName.Trim(\" \")\n\n# Required Venafi Module\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\n\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\n\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\n\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n$ExportFormatsIncompatibleWithOctopusCertificateStore = @(\"Base64\", \"Base64 (PKCS #8)\")\n\nWrite-Verbose \"Venafi.TPP.ImportCert.Server: $Server\"\nWrite-Verbose \"Venafi.TPP.ImportCert.AccessToken: ********\"\nWrite-Verbose \"Venafi.TPP.ImportCert.DNPath: $Path\"\nWrite-Verbose \"Venafi.TPP.ImportCert.Format: $Format\"\nWrite-Verbose \"Venafi.TPP.ImportCert.IncludeChain: $IncludeChain\"\nWrite-Verbose \"Venafi.TPP.ImportCert.FriendlyName: $FriendlyName\"\nWrite-Verbose \"Venafi.TPP.ImportCert.IncludePrivateKey: $IncludePrivateKey\"\nWrite-Verbose \"Venafi.TPP.ImportCert.PrivateKeyPassword: ********\"\nWrite-Verbose \"Venafi.TPP.ImportCert.CertDetails.OutputVariableName: $OutputVariableName\"\nWrite-Verbose \"Venafi.TPP.ImportCert.RevokeTokenOnCompletion: $RevokeTokenOnCompletion\"\nWrite-Verbose \"Venafi.TPP.ImportCert.OctopusServerUri: $OctopusServerUri\"\nWrite-Verbose \"Venafi.TPP.ImportCert.OctopusApiKey: ********\"\nWrite-Verbose \"Venafi.TPP.ImportCert.OctopusSpaceName: $OctopusSpaceName\"\nWrite-Verbose \"Venafi.TPP.ImportCert.OctopusCertificateName: $OctopusCertificateName\"\nWrite-Verbose \"Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate: $OctopusReplaceExistingCertificate\"\nWrite-Verbose \"Step Name: $StepName\"\n\nWrite-Host \"Requesting new session from $Server\"\nNew-VenafiSession -Server $Server -AccessToken $AccessToken\n\n# Export certificate\n$ExportCert_Params = @{\n    CertificateId = $Path;\n    Format        = $Format;\n}\n\n# Optional IncludeChain field\nif ($IncludeChain -eq $True) {\n    $ExportCert_Params.IncludeChain = $True\n}\n\n# Optional FriendlyName field\nif (-not [string]::IsNullOrWhiteSpace($FriendlyName)) {\n    $ExportCert_Params.FriendlyName = $FriendlyName\n}\n\n# Optional Private key field\nif (-not [string]::IsNullOrWhiteSpace($PrivateKeyPassword) -and $IncludePrivateKey -eq $True) {\n    $SecurePrivateKeyPassword = ConvertTo-SecureString $PrivateKeyPassword -AsPlainText -Force\n    $ExportCert_Params.PrivateKeyPassword = $SecurePrivateKeyPassword    \n    $ExportCert_Params.IncludePrivateKey = $True\n}\n\n# Do the export\n$ExportCertificateResponse = ((Export-VenafiCertificate @ExportCert_Params) 6> $null)\n\nif ($null -eq $ExportCertificateResponse -or $null -eq $ExportCertificateResponse.CertificateData) {\n    Write-Warning \"No certificate data returned for path: $Path`nCheck the path value represents a certificate, and not a folder.\"\n}\nelse {\n    Write-Host \"Successfully retrieved certificate data to export for path: $Path\"\n        \n    # Get octopus space Id\n    $header = @{ \"X-Octopus-ApiKey\" = $OctopusApiKey }\n    $spaces = Invoke-RestMethod -Uri \"$OctopusServerUri/api/spaces?partialName=$([uri]::EscapeDataString($OctopusSpaceName))&skip=0&take=500\" -Headers $header \n    $OctopusSpace = @($spaces.Items | Where-Object { $_.Name -eq $OctopusSpaceName }) | Select-Object -First 1\n\n    if ($null -eq $OctopusSpace) {\n        throw \"Couldnt find Octopus space with name '$OctopusSpaceName'.\"\n    }\n\n    # Check for certificate based on name\n    $CertificateMatches = @(Get-MatchingOctopusCertificates -ServerUri $OctopusServerUri -ApiKey $OctopusApiKey -SpaceId $($OctopusSpace.Id) -CertificateName $OctopusCertificateName) \n    Write-Host \"Found $($CertificateMatches.Length) certificates matching '$OctopusCertificateName'\"\n\n    $FirstCertificateMatch = $CertificateMatches | Select-Object -First 1\n    $CertificateData = $ExportCertificateResponse.CertificateData\n\n    if ($ExportFormatsIncompatibleWithOctopusCertificateStore -icontains $Format) {\n        Write-Host \"Requested export format $Format needs to be cleaned before import to Octopus.\"\n        $CertificateData = Clean-VenafiCertificateForOctopus -CertificateData $CertificateData\n        if ([string]::IsNullOrWhiteSpace($CertificateData)) {\n            throw \"Cleaned certificate data empty!\"\n        }\n    }\n\n    switch ($CertificateMatches.Length) {\n        0 {  \n            # New cert\n            Write-Host \"Creating a new certificate '$OctopusCertificateName'\"\n            New-OctopusCertificate -ServerUri $OctopusServerUri -ApiKey $OctopusApiKey -SpaceId $($OctopusSpace.Id) -CertificateName $OctopusCertificateName -CertificateData $($CertificateData) -CertificatePwd $PrivateKeyPassword\n        }\n        1 {  \n            # One cert to replace\n            if ($OctopusReplaceExistingCertificate -eq $False) {\n                Write-Host \"Replace existing certificate set to False, nothing to do.\"\n            }\n            else {\n                Write-Host \"Replacing existing certificate '$OctopusCertificateName' ($($FirstCertificateMatch.Id))\"\n                Replace-OctopusCertificate -ServerUri $OctopusServerUri -ApiKey $OctopusApiKey -SpaceId $($OctopusSpace.Id) -CertificateId $($FirstCertificateMatch.Id) -CertificateName $OctopusCertificateName -CertificateData $($CertificateData) -CertificatePwd $PrivateKeyPassword\n            }\n        }\n        default {\n            Write-Warning \"Multiple certs matching name '$OctopusCertificateName' found, nothing to do.\"\n            return\n        }\n    }\n\n    if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {\n        $CertificateJson = $ExportCertificateResponse | ConvertTo-Json -Compress -Depth 10 \n        Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson -Sensitive\n        Write-Highlight \"Created sensitive output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}\"\n    }\n}\n\nif ($RevokeToken -eq $true) {\n    # Revoke TPP access token\n    Write-Host \"Revoking access token with $Server\"\n    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "56ef4967-37f5-40a0-a66e-f3fa589b6467",
-        "Name": "Venafi.TPP.ImportCert.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "*Required*: The URL of the Venafi TPP instance you want to export the certificate from.\n\nFor example: `https://mytppserver.example.com`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "49bcdbbb-3674-4901-8bf6-164e5e4bc395",
-        "Name": "Venafi.TPP.ImportCert.AccessToken",
-        "Label": "Venafi TPP Access Token",
-        "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "e3156852-4ba9-4dc0-8d39-5a93c52b1910",
-        "Name": "Venafi.TPP.ImportCert.DNPath",
-        "Label": "Venafi TPP Certificate Path",
-        "HelpText": "*Required*: The Distinguished Name (DN) of the certificate you wish to export. This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "4f9f4d4b-d686-4d00-aa93-af35b7df320b",
-        "Name": "Venafi.TPP.ImportCert.Format",
-        "Label": "Certificate Export Format",
-        "HelpText": "*Required*: The certificate export format. Valid options are:\n\n- `Base64`\n- `Base64 (PKCS #8)`\n- `DER`\n- `PKCS #12`",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Select",
-          "Octopus.SelectOptions": "Base64|Base64\nBase64 (PKCS #8)|Base64 (PKCS #8)\nDER|DER\nPKCS #12|PKCS #12"
-        }
-      },
-      {
-        "Id": "309d30de-79b6-4461-8a54-1698aedd5822",
-        "Name": "Venafi.TPP.ImportCert.IncludeChain",
-        "Label": "Include certificate chain (Optional)",
-        "HelpText": "*Optional*: Include the certificate chain with the exported certificate. Not supported with `DER` format. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "71fecac3-25c4-4161-9135-94815a485f03",
-        "Name": "Venafi.TPP.ImportCert.FriendlyName",
-        "Label": "Friendly Name (Optional)",
-        "HelpText": "*Optional*: Label or alias to use. Permitted with `Base64` and `PKCS #12` formats.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "2aaedf1d-be93-4df4-856c-c69650db452a",
-        "Name": "Venafi.TPP.ImportCert.IncludePrivateKey",
-        "Label": "Include Private Key (Optional)",
-        "HelpText": "*Optional*: Include the private key in the certificate export. If this is selected, the `Venafi.TPP.Export.PrivateKeyPassword` must also be provided. Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "2d168360-bcbf-4bdc-833d-a9c182e98a47",
-        "Name": "Venafi.TPP.ImportCert.PrivateKeyPassword",
-        "Label": "Private Key password (Optional)",
-        "HelpText": "*Optional*: The password required to include the private key. Not supported with `DER` format.  You must adhere to the following rules: \n\n- Password is at least 12 characters. \n- Comprised of at least three of the following: \n  - Uppercase alphabetic letters \n  - Lowercase alphabetic letters \n  - Numeric characters \n  - Special characters",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "84f92dd5-064b-47e5-bb11-3dd0faacfeb4",
-        "Name": "Venafi.TPP.ImportCert.OutputVariableName",
-        "Label": "Certificate output variable name (Optional)",
-        "HelpText": "*Optional*: Create an output variable with the certificate details returned from the export call. The certificate details will be stored in `JSON` format.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "606acdfe-641a-47f2-a4ea-56559477ea0c",
-        "Name": "Venafi.TPP.ImportCert.RevokeTokenOnCompletion",
-        "Label": "Revoke access token on completion?",
-        "HelpText": "*Optional*: Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      },
-      {
-        "Id": "7813080c-d6d6-4bd1-8c38-d6d03921f541",
-        "Name": "Venafi.TPP.ImportCert.OctopusServerUri",
-        "Label": "Octopus Server Url",
-        "HelpText": "*Required*: Provide the base URL of your Octopus Server. There are two built-in Octopus variables you can use:\n\n- `#{if Octopus.Web.ServerUri}#{Octopus.Web.ServerUri}#{else}#{Octopus.Web.BaseUrl}#{/if}`\n- `Octopus.Web.ServerUri`\n\nSee our [system variables](https://octopus.com/docs/projects/variables/system-variables#Systemvariables-Server) page for further details.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "5be3cf08-43ef-44a3-bd89-3ec3b4928b01",
-        "Name": "Venafi.TPP.ImportCert.OctopusApiKey",
-        "Label": "Octopus API Key",
-        "HelpText": "*Required*: Provide an Octopus API Key with appropriate permissions to save the certificate.\n",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "d901f398-a035-4ba6-a546-553360eed283",
-        "Name": "Venafi.TPP.ImportCert.OctopusSpaceName",
-        "Label": "Octopus Space Name",
-        "HelpText": "*Required*: Provide the Space name for the certificate to be saved in. The default is the current space the step is running within: `#{Octopus.Space.Name}`.",
-        "DefaultValue": "#{Octopus.Space.Name}",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "56f8e1a8-fb6c-4b91-a216-eadc2f5cd673",
-        "Name": "Venafi.TPP.ImportCert.OctopusCertificateName",
-        "Label": "Octopus Certificate Name",
-        "HelpText": "*Required*: A short, memorable, unique name for the imported certificate.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "3a85993f-8844-49aa-951a-804471f53b23",
-        "Name": "Venafi.TPP.ImportCert.OctopusReplaceExistingCertificate",
-        "Label": "Replace existing Octopus certificate?",
-        "HelpText": "*Optional*: If a certificate exists in Octopus with the same name as the one to be imported, should the one stored in Octopus be replaced? Default: `True`.\n\n**Note**: If multiple matches are found, the step template will not replace any, and will log a warning instead.\n\nSee [replacing certificates](https://octopus.com/docs/deployments/certificates/replace-certificate) for further information.",
-        "DefaultValue": "True",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "LastModifiedAt": "2021-08-18T15:47:39.557Z",
-    "LastModifiedBy": "benjimac93",
-    "$Meta": {
-      "ExportedAt": "2021-08-23T12:40:10.975Z",
-      "OctopusVersion": "2021.1.7687",
-      "Type": "ActionTemplate"
-    },
-    "Category": "venafi"
-  }
\ No newline at end of file
diff --git a/step-templates/venafi-tpp-retrieve-certificate-details.json b/step-templates/venafi-tpp-retrieve-certificate-details.json
deleted file mode 100644
index 1055c323b..000000000
--- a/step-templates/venafi-tpp-retrieve-certificate-details.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "Id": "b893cae4-e280-4686-a60b-38da876528ec",
-    "Name": "Venafi TPP - Retrieve Certificate Details",
-    "Description": "This step template will authenticate against a Venafi TPP instance using an existing OAuth access token, and retrieve a certificate's details using its Distinguished Name (DN). This is the absolute path to the certificate in the TPP instance.\n\nThis is achieved using the VenafiPS PowerShell module's  [Get-VenafiCertificate](https://venafips.readthedocs.io/en/latest/functions/Get-VenafiCertificate/) function.\n\nYou can also store the entire certificate result in `JSON` format in an [Octopus output variable](https://octopus.com/docs/projects/variables/output-variables)\n\nThis output variable can then be used in additional deployment or runbook steps.\n\nOn successful completion, you can also *optionally* revoke the access token used.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$Server = $OctopusParameters[\"Venafi.TPP.GetCert.Server\"]\n$Token = $OctopusParameters[\"Venafi.TPP.GetCert.AccessToken\"]\n$Path = $OctopusParameters[\"Venafi.TPP.GetCert.DNPath\"]\n\n# Optional\n$OutputVariableName = $OctopusParameters[\"Venafi.TPP.GetCert.OutputVariableName\"]\n$RevokeToken = $OctopusParameters[\"Venafi.TPP.GetCert.RevokeTokenOnCompletion\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.GetCert.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Token)) {\n    throw \"Required parameter Venafi.TPP.GetCert.AccessToken not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Path)) {\n    throw \"Required parameter Venafi.TPP.GetCert.DNPath not specified\"\n}\nelse {\n    if ($Path.Contains(\"\\\") -eq $False) {\n        throw \"At least one '\\' is required for the Venafi.TPP.GetCert.DNPath value\"\n    }\n}\n\n$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force\n[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential(\"token\", $SecureToken)\n\n# Clean-up\n$Server = $Server.TrimEnd('/')\n\n# Required Modules\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\n\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\n\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\n\n$StepName = $OctopusParameters[\"Octopus.Step.Name\"]\n\n# Create Venafi session\nNew-VenafiSession -Server $Server -AccessToken $AccessToken\n\n# Retrieve certificate details\n$CertificateDetails = Get-VenafiCertificate -CertificateId $Path | Select-Object -First 1\n\nif ($null -eq $CertificateDetails -or $null -eq $CertificateDetails.Path) {\n    Write-Warning \"No certificate details returned for path: $Path`nCheck the path value represents a certificate, and not a folder.\"\n}\nelse {\n    Write-Highlight \"Retrieved certificate details for path: $Path\"\n    $CertificateDetails | Format-List\n    \n    if ([string]::IsNullOrWhiteSpace($OutputVariableName) -eq $False) {\n        $CertificateJson = $CertificateDetails | ConvertTo-Json -Compress -Depth 10 \n        Set-OctopusVariable -Name $OutputVariableName -Value $CertificateJson\n        Write-Highlight \"Created output variable: ##{Octopus.Action[$StepName].Output.$OutputVariableName}\"\n    }\n}\n\nif ($RevokeToken -eq $true) {\n    # Revoke TPP access token\n    Write-Host \"Revoking access token with $Server\"\n    Revoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force\n}"
-    },
-    "Parameters": [
-      {
-        "Id": "9873f05e-4a09-47aa-88c4-6bf63aad5cbc",
-        "Name": "Venafi.TPP.GetCert.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "*Required*: The URL of the Venafi TPP instance you want to find certificate details from.\n\nFor example: `https://mytppserver.example.com`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "81a075af-2ce7-4f0d-ae97-968dacebc15f",
-        "Name": "Venafi.TPP.GetCert.AccessToken",
-        "Label": "Venafi TPP Access Token",
-        "HelpText": "*Required*: The access token to authenticate against the TPP instance.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      },
-      {
-        "Id": "ffdde857-7af9-4fc3-9b74-76789fa1dd9b",
-        "Name": "Venafi.TPP.GetCert.DNPath",
-        "Label": "Venafi TPP Certificate Path",
-        "HelpText": "*Required*: The certificate's Distinguished Name (DN). This is the absolute path to the certificate in the TPP instance, separated by `\\`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "9af1fa28-325c-411d-8e0e-7aa676f05da1",
-        "Name": "Venafi.TPP.GetCert.OutputVariableName",
-        "Label": "Certificate output variable name (Optional)",
-        "HelpText": "*Optional*: Create an output variable with the certificate details found from the search. The certificate details will be stored in `JSON` format.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "1d8421eb-ed22-4513-9d5e-99bba1f8296f",
-        "Name": "Venafi.TPP.GetCert.RevokeTokenOnCompletion",
-        "Label": "Revoke access token on completion?",
-        "HelpText": "Should the access token used be revoked once the step has been completed successfully? Default: `False`.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-08-16T13:51:19.689Z",
-      "OctopusVersion": "2021.2.7207",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "mark-the-butler",
-    "Category": "venafi"
-  }
\ No newline at end of file
diff --git a/step-templates/venafi-tpp-revoke-oauth-token.json b/step-templates/venafi-tpp-revoke-oauth-token.json
deleted file mode 100644
index 71e959596..000000000
--- a/step-templates/venafi-tpp-revoke-oauth-token.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "Id": "d3e20a46-8119-4f4f-9d6f-52c30bcc6c59",
-    "Name": "Venafi TPP - Revoke OAuth Token",
-    "Description": "This step template will revoke an access token obtained through a Venafi TPP instance using the VenafiPS PowerShell module's [Revoke-TppToken](https://venafips.readthedocs.io/en/latest/functions/Revoke-TppToken/) function.\n\n---\n\n**Required:** \n- The `VenafiPS` PowerShell module installed on the deployment target or worker. If the module can't be found, the step will attempt to download a version from the [PowerShell gallery](https://www.powershellgallery.com/packages/VenafiPS).\n\nNotes:\n\n- Tested on Octopus `2021.2`.\n- Tested with VenafiPS `3.1.5`.\n- Tested with both Windows PowerShell and PowerShell Core on Linux.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n$ErrorActionPreference = 'Stop'\n\n# Variables\n$Server = $OctopusParameters[\"Venafi.TPP.RevokeOAuth.Server\"]\n$Token = $OctopusParameters[\"Venafi.TPP.RevokeOAuth.AccessToken\"]\n\n# Validation\nif ([string]::IsNullOrWhiteSpace($Server)) {\n    throw \"Required parameter Venafi.TPP.RevokeOAuth.Server not specified\"\n}\nif ([string]::IsNullOrWhiteSpace($Token)) {\n    throw \"Required parameter Venafi.TPP.RevokeOAuth.AccessToken not specified\"\n}\n\n$SecureToken = ConvertTo-SecureString $Token -AsPlainText -Force\n[PSCredential]$AccessToken = New-Object System.Management.Automation.PsCredential(\"token\", $SecureToken)\n\n# Clean-up\n$Server = $Server.TrimEnd('/')\n\n# Required Modules\nfunction Get-NugetPackageProviderNotInstalled {\n    # See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\n# Check to see if the package provider has been installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false) {\n    Write-Host \"Nuget package provider not found, installing ...\"    \n    Install-PackageProvider -Name Nuget -Force -Scope CurrentUser\n}\n\nWrite-Host \"Checking for required VenafiPS module ...\"\n$required_venafips_version = 3.1.5\n$module_available = Get-Module -ListAvailable -Name VenafiPS | Where-Object { $_.Version -ge $required_venafips_version }\nif (-not ($module_available)) {\n    Write-Host \"Installing VenafiPS module ...\"\n    Install-Module -Name VenafiPS -MinimumVersion 3.1.5 -Scope CurrentUser -Force\n}\nelse {\n    $first_match = $module_available | Select-Object -First 1 \n    Write-Host \"Found version: $($first_match.Version)\"\n}\n\nWrite-Host \"Importing VenafiPS module ...\"\nImport-Module VenafiPS\n\n# Revoke TPP access token\nWrite-Host \"Revoking access token with $Server\"\nRevoke-TppToken -AuthServer $Server -AccessToken $AccessToken -Force"
-    },
-    "Parameters": [
-      {
-        "Id": "7f3400a2-ae73-4299-93a4-4309d38312ff",
-        "Name": "Venafi.TPP.RevokeOAuth.Server",
-        "Label": "Venafi TPP Server",
-        "HelpText": "The URL of the Venafi TPP instance you want to revoke the access token against.\n\nFor example: `https://mytppserver.example.com`.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "SingleLineText"
-        }
-      },
-      {
-        "Id": "27abe7fc-b82a-4d80-a591-f53d8154414c",
-        "Name": "Venafi.TPP.RevokeOAuth.AccessToken",
-        "Label": "Venafi TPP Access Token",
-        "HelpText": "The access token obtained from the TPP server you want to revoke.",
-        "DefaultValue": "",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Sensitive"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2021-08-11T10:08:47.547Z",
-      "OctopusVersion": "2021.2.7127",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "mark-the-butler",
-    "Category": "venafi"
-  }
\ No newline at end of file
diff --git a/step-templates/wait-for-iis-connections-to-drop-to-zero.json b/step-templates/wait-for-iis-connections-to-drop-to-zero.json
deleted file mode 100644
index 0e1a227da..000000000
--- a/step-templates/wait-for-iis-connections-to-drop-to-zero.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Id": "2e27acd9-5ab3-4580-b746-7d0a0de23fcc",
-  "Name": "Wait for IIS connections to drop to 0 or time expires",
-  "Description": "Wait for IIS connections to drop to 0 or time expires",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.RunOnServer": "false",
-    "Octopus.Action.Script.ScriptBody": "Import-Module WebAdministration\r\n\r\n$websites = Get-ChildItem IIS:\\Sites\r\n$continue = $true\r\n\r\n#Verify sleepSeconds can be converted to integer.\r\n$sleepSecondsString = 4\r\n\r\nIf ($OctopusParameters['wfitdSleepSeconds'])\r\n{\r\n  $sleepSecondsString = $OctopusParameters['wfitdSleepSeconds']\r\n}\r\n\r\n[int]$sleepSeconds = 0\r\n[bool]$result = [int]::TryParse($sleepSecondsString, [ref]$sleepSeconds)\r\n\r\nIf ($result)\r\n{\r\n  Write-Host ('Sleep Seconds: ' + $sleepSeconds)\r\n}\r\nElse\r\n{\r\n  Throw \"Cannot convert Sleep Seconds: '\" + $sleepSecondsString + \"' to integer.\"\r\n}\r\n\r\n#Verify totalWaitMinutes can be converted to integer.\r\n$totalWaitMinutesString = 5\r\n\r\nIf ($OctopusParameters['wfitdTotalWaitMinutes'])\r\n{\r\n  $totalWaitMinutesString = $OctopusParameters['wfitdTotalWaitMinutes']\r\n}\r\n\r\n[int]$totalWaitMinutes = 0\r\n[bool]$result = [int]::TryParse($totalWaitMinutesString, [ref]$totalWaitMinutes)\r\n\r\nIf ($result)\r\n{\r\n  Write-Host ('Total Wait Minutes: ' + $totalWaitMinutes)\r\n}\r\nElse\r\n{\r\n  Throw \"Cannot convert Total Wait Minutes: '\" + $totalWaitMinutesString + \"' to integer.\"\r\n}\r\n\r\nWrite-Host '***********************************************'\r\n\r\n$stopWatch = [system.diagnostics.stopwatch]::StartNew()\r\nWhile ($continue)\r\n{\r\n  $connectionsExist = $false\r\n  \r\n  Foreach ($website in $websites)\r\n  {\r\n    $connections = (Get-Counter ('\\\\' + $env:COMPUTERNAME  + '\\web service(' + $website.name + ')\\Current Connections')).CounterSamples.CookedValue\r\n    Write-Host ($website.Name + ' - ' + $connections + ' connection(s).')\r\n    If ($connections -gt 0)\r\n    {\r\n      $connectionsExist = $true\r\n    }\r\n  }\r\n  \r\n  If ($connectionsExist)\r\n  {\r\n    Start-Sleep -Seconds $sleepSeconds\r\n    \r\n    If ($stopWatch.Elapsed.Minutes -ge $totalWaitMinutes)\r\n    {\r\n      $continue = $false\r\n    }\r\n  }\r\n  Else\r\n  {\r\n    $continue = $false\r\n  }\r\n  \r\n  Write-Host ('Elapsed seconds: ' + $stopWatch.Elapsed.TotalSeconds)\r\n  Write-Host '==============================================='\r\n}\r\n\r\n$stopWatch.Stop()\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.FeedId": null,
-    "Octopus.Action.Package.PackageId": null
-  },
-  "Parameters": [
-    {
-      "Id": "af43ce76-167e-44f2-a985-eee8597f8e39",
-      "Name": "wfitdSleepSeconds",
-      "Label": "Sleep Seconds",
-      "HelpText": "Number of seconds to sleep between checking connection count.",
-      "DefaultValue": "4",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "37709659-d95b-4524-a287-771c1b62d112",
-      "Name": "wfitdTotalWaitMinutes",
-      "Label": "Total Wait Minutes",
-      "HelpText": "Maximum wait time in minutes before proceeding, even if connections have not dropped to 0.",
-      "DefaultValue": "5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
- "LastModifiedBy": "tbrasch",
- "$Meta": {
-    "ExportedAt": "2017-07-28T18:51:55.519Z",
-    "OctopusVersion": "3.15.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "IIS"
-}
\ No newline at end of file
diff --git a/step-templates/web-deploy-azure-convention.json b/step-templates/web-deploy-azure-convention.json
deleted file mode 100644
index 3e51ec0eb..000000000
--- a/step-templates/web-deploy-azure-convention.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "Id": "c3ff8c78-c1cd-43ea-aedb-f5ac7dac3352",
-  "Name": "Web Deploy to Azure by convention",
-  "Description": "Makes it super simple to deploy websites to different regions inside a single process.\n\nThis script assumes that you want to deploy websites like these to multiple regions:\n\n- playground.mydomain.com\n- status.mydomain.com\n\nWhen you deploy to staging and production to 3 regions, this means that each website requires 3 (regions) * 2 (deployment slots) = 6 scripts. If you want this deployed using ms web deploy, you will need 6 * 5 = 30 variables (for a single website).\n\nWith this convention script you only need a few variables, but it requires some convention (mostly done by Azure anyway):\n\n- [prefix]-[websitename]-[region]\n- [prefix]-[websitename]-[region]-staging\n\nSo\n\n- mydomain-playground-eu-west\n- mydomain-playground-eu-west-staging\n\nThe following variables are required:\n\n- AzurePrefix\n- AzureName\n- AzurePassword-[region]\n- AzurePassword-[region]-staging\n\nThe password is required for each region and deployment slot, the rest is fully determined by convention.",
-  "ActionType": "Octopus.Script",
-  "Version": 29,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.Web.Deployment\")\r\n# A collection of functions that can be used by script steps to determine where packages installed\r\n# by previous steps are located on the filesystem.\r\n \r\nfunction Find-InstallLocations {\r\n    $result = @()\r\n    $OctopusParameters.Keys | foreach {\r\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\r\n            $result += $OctopusParameters[$_]\r\n        }\r\n    }\r\n    return $result\r\n}\r\n \r\nfunction Find-InstallLocation($stepName) {\r\n    $result = $OctopusParameters.Keys | where {\r\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\r\n    } | select -first 1\r\n \r\n    if ($result) {\r\n        return $OctopusParameters[$result]\r\n    }\r\n \r\n    throw \"No install location found for step: $stepName\"\r\n}\r\n \r\nfunction Find-SingleInstallLocation {\r\n    $all = @(Find-InstallLocations)\r\n    if ($all.Length -eq 1) {\r\n        return $all[0]\r\n    }\r\n    if ($all.Length -eq 0) {\r\n        throw \"No package steps found\"\r\n    }\r\n    throw \"Multiple package steps have run; please specify a single step\"\r\n}\r\n\r\nfunction Test-LastExit($cmd) {\r\n    if ($LastExitCode -ne 0) {\r\n        Write-Host \"##octopus[stderr-error]\"\r\n        write-error \"$cmd failed with exit code: $LastExitCode\"\r\n    }\r\n}\r\n\r\n# Somehow we can only check for exactly 'True'\r\n$isStagingText = $OctopusParameters['IsStaging'];\r\n$isStaging = $isStagingText -eq \"True\"\r\n\r\nWrite-Host \"Is staging text: $isStagingText\"\r\nWrite-Host \"Is staging: $isStaging\"\r\n\r\n$stepName = $OctopusParameters['WebDeployPackageStepName']\r\nif ([string]::IsNullOrEmpty($stepName)) {\r\n\tWrite-Host \"Defaulting to step name Extract package\"\r\n\t$stepName = \"Extract package\"\r\n}\r\n\r\nif ($isStaging) {\r\n\t$stepName = $stepName + \" - staging\"\r\n}\r\n\r\n$stepPath = \"\"\r\nif (-not [string]::IsNullOrEmpty($stepName)) {\r\n    Write-Host \"Finding path to package step: $stepName\"\r\n    $stepPath = Find-InstallLocation $stepName\r\n} else {\r\n    $stepPath = Find-SingleInstallLocation\r\n}\r\nWrite-Host \"Package was installed to: $stepPath\"\r\n\r\nWrite-Host \"##octopus[stderr-progress]\"\r\n \r\nWrite-Host \"Publishing Website\"\r\n\r\n$prefix = $OctopusParameters['Prefix']\r\nif ([string]::IsNullOrEmpty($prefix)) {\r\n\tWrite-Host \"Prefix is empty, reading prefix from variable set using AzurePrefix\"\r\n\t$prefix = $OctopusParameters['AzurePrefix']\r\n}\r\n\r\n$websiteName = $OctopusParameters['WebsiteName']\r\nif ([string]::IsNullOrEmpty($websiteName)) {\r\n\tWrite-Host \"WebsiteName is empty, reading website name from variable set using AzureName\"\r\n\t$websiteName = $OctopusParameters['AzureName']\r\n}\r\n\r\n$regionName = $OctopusParameters['RegionName']\r\n\r\n$publishUrl = \"$prefix-$websiteName-$regionName\"\r\nif ($isStaging) {\r\n\t$publishUrl = $publishUrl + \"-staging\"\r\n}\r\n$publishUrl = $publishUrl + \".scm.azurewebsites.net:443\"\r\n\r\n$userName = '$' + \"$prefix-$websiteName-$regionName\"\r\nif ($isStaging) {\r\n\t$userName = $userName + \"__staging\"\r\n}\r\n\r\n$passwordKey = \"AzurePassword-$regionName\"\r\nif ($isStaging) {\r\n\t$passwordKey = $passwordKey + \"-staging\"\r\n}\r\n\r\nWrite-Host \"Using the following values to publish:\"\r\nWrite-Host \" * Publish url: $publishUrl\"\r\nWrite-Host \" * Website name: $websiteName\"\r\nWrite-Host \" * User name: $userName\"\r\nWrite-Host \" * Password variable: $passwordKey\"\r\n\r\n$destBaseOptions = new-object Microsoft.Web.Deployment.DeploymentBaseOptions\r\n$destBaseOptions.UserName = $userName\r\n$destBaseOptions.Password =  $OctopusParameters[$passwordKey]\r\n$destBaseOptions.ComputerName = \"https://$publishUrl/msdeploy.axd?site=$websiteName\"\r\n$destBaseOptions.AuthenticationType = \"Basic\"\r\n\r\n$syncOptions = new-object Microsoft.Web.Deployment.DeploymentSyncOptions\r\n#$syncOptions.WhatIf = $false\r\n$syncOptions.UseChecksum = $true\r\n\r\n$deploymentObject = [Microsoft.Web.Deployment.DeploymentManager]::CreateObject(\"contentPath\", $stepPath)\r\n$deploymentObject.SyncTo(\"contentPath\", $websiteName, $destBaseOptions, $syncOptions)"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "WebsiteName",
-      "Label": "Website Name",
-      "HelpText": "The name of the website (e.g. playground)\n\nIf you leave this empty, this field will use the _AzureName_ variable.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RegionName",
-      "Label": "Region Name",
-      "HelpText": "The name of the region (e.g. eu-west)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "IsStaging",
-      "Label": "Is Staging",
-      "HelpText": "Determines whether this is staging or not.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "Prefix",
-      "Label": "Prefix",
-      "HelpText": "The prefix. If you are smart, your websites look like this:\n\n[prefix]-[websitename]-[region]\n\nThis allows you to deploy a lot of subdomains for a complete solution to multiple regions.\n\nIf you leave this empty, this field will use the _AzurePrefix_ variable.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WebDeployPackageStepName",
-      "Label": "Package step name",
-      "HelpText": "Name of the previously-deployed package step that contains the files that you want to deploy.\n\nIf you leave this empty, this field will default to 'Extract package'",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "GeertvanHorrik",
-  "$Meta": {
-    "ExportedAt": "2015-11-03T00:25:05.516+00:00",
-    "OctopusVersion": "3.0.20.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "webDeploy"
-}
\ No newline at end of file
diff --git a/step-templates/web-deploy-publish-website-msdeploy.json b/step-templates/web-deploy-publish-website-msdeploy.json
deleted file mode 100644
index 5fdc20eff..000000000
--- a/step-templates/web-deploy-publish-website-msdeploy.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "Id": "ba8581a6-c463-40fb-ab98-3800e761b6f4",
-  "Name": "Web Deploy - Publish Website (MSDeploy)",
-  "Description": "Ensure that Web Deploy 3.5 is installed on the system. The installer is downloaded from http://www.iis.net/downloads/microsoft/web-deploy if required.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "[System.Reflection.Assembly]::LoadWithPartialName(\"Microsoft.Web.Deployment\")\r\n\r\n# A collection of functions that can be used by script steps to determine where packages installed\r\n# by previous steps are located on the filesystem.\r\n \r\nfunction Find-InstallLocations {\r\n    $result = @()\r\n    $OctopusParameters.Keys | foreach {\r\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\r\n            $result += $OctopusParameters[$_]\r\n        }\r\n    }\r\n    return $result\r\n}\r\n \r\nfunction Find-InstallLocation($stepName) {\r\n    $result = $OctopusParameters.Keys | where {\r\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\r\n    } | select -first 1\r\n \r\n    if ($result) {\r\n        return $OctopusParameters[$result]\r\n    }\r\n \r\n    throw \"No install location found for step: $stepName\"\r\n}\r\n \r\nfunction Find-SingleInstallLocation {\r\n    $all = @(Find-InstallLocations)\r\n    if ($all.Length -eq 1) {\r\n        return $all[0]\r\n    }\r\n    if ($all.Length -eq 0) {\r\n        throw \"No package steps found\"\r\n    }\r\n    throw \"Multiple package steps have run; please specify a single step\"\r\n}\r\n\r\nfunction Test-LastExit($cmd) {\r\n    if ($LastExitCode -ne 0) {\r\n        Write-Host \"##octopus[stderr-error]\"\r\n        write-error \"$cmd failed with exit code: $LastExitCode\"\r\n    }\r\n}\r\n\r\n$stepName = $OctopusParameters['WebDeployPackageStepName']\r\n\r\n$stepPath = \"\"\r\nif (-not [string]::IsNullOrEmpty($stepName)) {\r\n    Write-Host \"Finding path to package step: $stepName\"\r\n    $stepPath = Find-InstallLocation $stepName\r\n} else {\r\n    $stepPath = Find-SingleInstallLocation\r\n}\r\nWrite-Host \"Package was installed to: $stepPath\"\r\n\r\nWrite-Host \"##octopus[stderr-progress]\"\r\n \r\n$websiteName = $OctopusParameters['WebsiteName']\r\n$publishUrl = $OctopusParameters['PublishUrl']\r\n\r\n$destBaseOptions = new-object Microsoft.Web.Deployment.DeploymentBaseOptions\r\n$destBaseOptions.UserName = $OctopusParameters['Username']\r\n$destBaseOptions.Password = $OctopusParameters['Password']\r\n$destBaseOptions.ComputerName = \"https://$publishUrl/msdeploy.axd?site=$websiteName\"\r\n$destBaseOptions.AuthenticationType = \"Basic\"\r\n\r\n$syncOptions = new-object Microsoft.Web.Deployment.DeploymentSyncOptions\r\n$syncOptions.WhatIf = $false\r\n$syncOptions.UseChecksum = $true\r\n\r\n$enableAppOfflineRule = $OctopusParameters['EnableAppOfflineRule']\r\nif($enableAppOfflineRule -eq $true)\r\n{\r\n    $appOfflineRule = $null\r\n    $availableRules = [Microsoft.Web.Deployment.DeploymentSyncOptions]::GetAvailableRules()\r\n    if (!$availableRules.TryGetValue('AppOffline', [ref]$appOfflineRule))\r\n    {\r\n        throw \"Failed to find AppOffline Rule\"\r\n    }\r\n    else\r\n    {\r\n        $syncOptions.Rules.Add($appOfflineRule)\r\n        Write-Host \"Enabled AppOffline Rule\"\r\n    }\r\n}\r\n\r\n$preserveAppData = [boolean]::Parse($OctopusParameters['PreserveApp_Data'])\r\n\r\nif ($preserveAppData -eq $true) {\r\n    \r\n    Write-Host \"Skipping delete actions on App_Data\"\r\n    $skipAppDataFiles = new-object Microsoft.Web.Deployment.DeploymentSkipRule(\"appDataFiles\", \"Delete\", \"filePath\", \"\\App_Data\\.*\", $null)\r\n    $skipAppDataDirectories = new-object Microsoft.Web.Deployment.DeploymentSkipRule(\"appDataDirectories\", \"Delete\", \"dirPath\", \"\\App_Data(\\.*|$)\", $null)\r\n\r\n    $syncOptions.Rules.Add($skipAppDataFiles);\r\n    $syncOptions.Rules.Add($skipAppDataDirectories);\r\n}\r\n\r\n$SkipSyncPaths = $OctopusParameters['SkipSyncPaths']\r\nif ([string]::IsNullOrEmpty($SkipSyncPaths) -eq $false)\r\n{\r\n    $skipPaths = $SkipSyncPaths.Split(\";\", [System.StringSplitOptions]::RemoveEmptyEntries)\r\n    foreach($item in $skipPaths) {\r\n        $index = $skipPaths.IndexOf($item)\r\n        Write-Host \"Skipping sync of AbsolutePath: $item.\"\r\n        $name = \"SkipDirective$index\"\r\n        $value = \"absolutePath=$item\"\r\n        $skipDirective = new-object Microsoft.Web.Deployment.DeploymentSkipDirective($name, $value)\r\n        $destBaseOptions.SkipDirectives.Add($skipDirective)\r\n    }\r\n}\r\n\r\nif ($OctopusParameters['AllowUntrustedCertificate'] -eq $true) {\r\n    [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { return $true; }\r\n}\r\n\r\nWrite-Host \"Publishing Website\"\r\n$deploymentObject = [Microsoft.Web.Deployment.DeploymentManager]::CreateObject(\"contentPath\", $stepPath)\r\n\r\n$changes = $deploymentObject.SyncTo(\"contentPath\", $websiteName, $destBaseOptions, $syncOptions)\r\n\r\n#Write out all the changes.\r\n$changes | Select-Object -Property *",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "PublishUrl",
-      "Label": "Publish Url",
-      "HelpText": "Publish url to use when publishing the website.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AllowUntrustedCertificate",
-      "Label": "Allow Untrusted Certificate",
-      "HelpText": "Allow untrusted certificate at the publish URL.",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "WebsiteName",
-      "Label": "Website Name",
-      "HelpText": "Website name to use when publishing the website.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "Username to use when authenticating with the HTTPS server.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": null,
-      "HelpText": "Password to use when authenticating with the HTTPS server. You should create a sensitive variable in your project variables, and then bind this value.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "WebDeployPackageStepName",
-      "Label": "Package Step Name",
-      "HelpText": "Name of the previously-deployed package step that contains the files that you want to deploy.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "EnableAppOfflineRule",
-      "Label": "Enable App Offline Rule",
-      "HelpText": "Enables the App Offline Rule. [See here for more details](http://www.iis.net/learn/publish/deploying-application-packages/taking-an-application-offline-before-publishing)",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "SkipSyncPaths",
-      "Label": "Skip Paths From Sync",
-      "HelpText": "Semi-colon separated, absolute reg-ex paths to skip/not-sync during deployment. Handy for folders that you don't want deleted etc. (Escape slashes)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "PreserveApp_Data",
-      "Label": "Preserve App_Data",
-      "HelpText": "The App_Data and its files will not be deleted when this option is enabled",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2015-07-25T22:00:43.204+00:00",
-    "OctopusVersion": "2.6.5.1010",
-    "Type": "ActionTemplate"
-  },
-  "Category": "webDeploy"
-}
\ No newline at end of file
diff --git a/step-templates/windows-add-poll-endpoint-task.json b/step-templates/windows-add-poll-endpoint-task.json
deleted file mode 100644
index 1f4d7f143..000000000
--- a/step-templates/windows-add-poll-endpoint-task.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Id": "0ad0ad00-adad-adad-adad-000000000002",
-  "Name": "Windows - Add poll rest endpoint scheduled task",
-  "Description": "Adds a scheduled task that polls a specified endpoint at a specific interval using the provided HTTP method",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nParam(\n    [string] $AD_PollRestEndpoint_Uri,\n    [string] $AD_PollRestEndpoint_Name = \"Polling task for endpoint\",\n    [string] $AD_PollRestEndpoint_HttpMethod = \"GET\",\n    [string] $AD_PollRestEndpoint_Interval = 60,\n    [Int16] $AD_PollRestEndpoint_Attempts = 5,\n    [switch] $WhatIf\n)\n\n$ErrorActionPreference = \"Stop\"\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($null -ne $OctopusParameters) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($null -eq $result) {\n        $variable = Get-Variable $Name -EA SilentlyContinue\n        if ($null -ne $variable) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($null -eq $result) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        }\n        else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\nfunction Execute(\n    [Parameter(Mandatory = $true)][string] $Uri,\n    [Parameter(Mandatory = $false)][string] $Name = \"Polling task for endpoint\",\n    [Parameter(Mandatory = $false)][string] $HttpMethod = \"GET\",\n    [Parameter(Mandatory = $false)][string] $Interval = 60,\n    [Parameter(Mandatory = $false)][Int16] $Attempts = 5\n) {\n    $attemptCount = 0\n    $operationIncomplete = $true\n    $maxFailures = $Attempts\n    $sleepBetweenFailures = 1\n\n    $script = '-noprofile -executionpolicy bypass -command \"& { Invoke-RestMethod -Uri ' + $Uri + ' -Method ' + $HttpMethod + ' }\"'\n    $repeat = (New-TimeSpan -Seconds $Interval)\n\n    $action = New-ScheduledTaskAction \"powershell.exe\" -Argument  \"$script\"\n    $duration = (New-TimeSpan -Days 9999)\n    $trigger = New-ScheduledTaskTrigger -Once -At (Get-Date).Date -RepetitionInterval $repeat -RepetitionDuration $duration\n    $settings = New-ScheduledTaskSettingsSet -StartWhenAvailable -DontStopOnIdleEnd\n\n    while ($operationIncomplete -and $attemptCount -lt $maxFailures) {\n        $attemptCount = ($attemptCount + 1)\n        if ($attemptCount -ge 2) {\n            Write-Output \"Waiting for $sleepBetweenFailures seconds before retrying...\"\n            Start-Sleep -s $sleepBetweenFailures\n            Write-Output \"Retrying...\"\n            $sleepBetweenFailures = ($sleepBetweenFailures * 2)\n        }\n        try {\n            $task = Get-ScheduledTask -TaskName $Name -ErrorAction SilentlyContinue\n            Write-Output $task\n            $msg = \"Task '$Name'\"\n            if ($null -ne $task) {\n                Write-Output \"$msg already exists - DELETING...\"\n                if (-Not ($WhatIf)) {\n                    Unregister-ScheduledTask -TaskName $name -Confirm:$false\n                }\n                Write-Output \"$msg - DELETED\"\n            }\n            Write-Output \"$msg - ADDING...\"\n            if (-Not ($WhatIf)) {\n                Register-ScheduledTask -TaskName $Name -Action $action -Trigger $trigger -RunLevel Highest -Settings $settings -User \"System\"\n            }\n            Write-Output \"$msg - ADDED\"\n            $operationIncomplete = $false\n        }\n        catch [System.Exception] {\n            if ($attemptCount -lt ($maxFailures)) {\n                Write-Host (\"Attempt $attemptCount of $maxFailures failed: \" + $_.Exception.Message)\n            }\n            else {\n                throw\n            }\n        }\n    }\n}\n& Execute `\n(Get-Param 'AD_PollRestEndpoint_Uri' -Required)`\n(Get-Param 'AD_PollRestEndpoint_Name')`\n(Get-Param 'AD_PollRestEndpoint_HttpMethod')`\n(Get-Param 'AD_PollRestEndpoint_Interval')`\n(Get-Param 'AD_PollRestEndpoint_Attempts')\n"
-  },
-  "Parameters": [
-    {
-      "Name": "AD_PollRestEndpoint_Uri",
-      "Label": "Endpoint Uri",
-      "HelpText": "The endpoint uri to poll",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_PollRestEndpoint_Name",
-      "Label": "Task name",
-      "HelpText": "Task name without any special characters",
-      "DefaultValue": "Polling task for endpoint",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_PollRestEndpoint_HttpMethod",
-      "Label": "HTTP Method",
-      "HelpText": "The HTTP method to be used for calling the endpoint",
-      "DefaultValue": "GET",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "GET\nPOST\nPUT\nDELETE\nPATCH"
-      }
-    },
-    {
-      "Name": "AD_PollRestEndpoint_Interval",
-      "Label": "Polling interval",
-      "HelpText": "Polling interval in seconds",
-      "DefaultValue": "60",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "AD_PollRestEndpoint_Attempts",
-      "Label": "Attempts",
-      "HelpText": "Number of retry attempts in case the scheduling fails",
-      "DefaultValue": "5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "anatolie-darii",
-  "$Meta": {
-    "ExportedAt": "2018-07-17T10:18:23.003Z",
-    "OctopusVersion": "2018.2.8",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
diff --git a/step-templates/windows-add-users-to-local-groups.json b/step-templates/windows-add-users-to-local-groups.json
deleted file mode 100644
index 818a3e44f..000000000
--- a/step-templates/windows-add-users-to-local-groups.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "ed204305-3399-4ffa-8566-a62da4e36641",
-  "Name": "Windows - Add Users to Local Groups",
-  "Description": "Add a list of users to a list of Local Groups",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$UserNames,\n    [string]$GroupNames\n) \n\n$ErrorActionPreference = \"Stop\" \n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction IsValidUser ( $user ) {\n    \n    if($user.Guid -and ($user.SchemaClassName -eq \"User\")){\n        return $true\n    }\n    \n    Write-Host \"ERROR - `\"WinNT://$($user.Name)`\" not found\"\n    return $false\n}\n\nfunction IsValidGroup ( $group ) {\n    \n    if( $group.Guid -and ($group.SchemaClassName -eq \"Group\") ) {\n        Write-Host \"the group $($group.Guid) was found\" -ForegroundColor green\n        return $true\n    }\n\n    Write-Host \"ERROR - `\"WinNT://$($Env:COMPUTERNAME)/$($group.Name)`\" not found\" -ForegroundColor red\n    return $false\n}\n\nfunction IsUserInGroup($user, $groupName){\n\n    Write-Host \"Checking to see if $($user.Name) is in $($group.Name)\"\n\n    if(!(isValidGroup $group)){\n        throw \"Could not find group $($group.Name)\"\n    }\n\n    $members = @($group.psbase.Invoke(\"Members\")) \n    \n    Write-Host \"There are $($members.Count) members in $($group.Name)\"\n    \n    $isInGroup = ($members | foreach {$_.GetType().InvokeMember(\"Name\", 'GetProperty', $null, $_, $null)}) -contains \"$($user.Name)\"\n        \n    if($isInGroup) {\n        Write-Host \"User $($user.Name) is already a part of `\"$($group.Name)`\"\" -ForegroundColor Yellow\n    } else {\n        Write-Host \"User $($user.Name) is not a part of `\"$($group.Name)`\"\" -ForegroundColor Green\n    }\n    \n    return $isInGroup\n}\n\nfunction FormatUserNameForQuery([string]$userName)\n{\n    return $userName.Trim().Replace(\"\\\", \"/\")\n}\n\n& {\n    param(\n        [string]$UserNames,\n        [string]$GroupNames\n    ) \n\n    Write-Host \"Windows - Add Users to Local Groups\"\n    Write-Host \"UserNames: $UserNames\"\n    Write-Host \"GroupNames: $GroupNames\"\n\n    $UserNames.Split(\";\") | foreach {\n        \n        $userName = FormatUserNameForQuery $_\n        $user = [ADSI]\"WinNT://$userName\"\n        \n        $userDoesNotExist = !(IsValidUser $user)\n        \n        if( $userDoesNotExist )\n        {\n            throw \"User $userName was not found\"\n        }\n\n        Write-Host \"Current user $userName\"\n\n        $GroupNames.Split(\";\") | foreach {\n            \n            $groupName = $_.Trim()\n            $group = [ADSI]\"WinNT://$Env:COMPUTERNAME/$groupName\"\n           \n            $groupDoesNotExist = !(IsValidGroup $group)\n            \n            if($groupDoesNotExist)\n            {\n                throw \"Group $groupName was not found\"\n            }\n\n            Write-Host \"Current group $groupName\"\n\n            $isInGroup = IsUserInGroup $user $group\n\n            if( $isInGroup ) {\n                \n                Write-Host \"Skipping...\"\n                \n                continue\n            }\n\n            Write-Host \"Adding $userName to $groupName\" -ForegroundColor Cyan\n            \n            $group.psbase.Invoke(\"Add\",$user.Path)\n\n            Write-Host \"SUCCESS - added $userName to $groupName\" -ForegroundColor Green\n        }\n    }\n\n } `\n (Get-Param 'UserNames' -Required) `\n (Get-Param 'GroupNames' -Required)",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "UserNames",
-      "Label": "User Names",
-      "HelpText": "List of user names separated by ;",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "GroupNames",
-      "Label": "Group Names",
-      "HelpText": "list of group names separated by ;",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-05-19T19:47:40.330+00:00",
-  "LastModifiedBy": "josh3ennett",
-  "$Meta": {
-    "ExportedAt": "2015-05-19T19:57:11.048+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/windows-apply-windows-updates.json b/step-templates/windows-apply-windows-updates.json
deleted file mode 100644
index 59b7e1a49..000000000
--- a/step-templates/windows-apply-windows-updates.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "Id": "3472f207-3934-44db-a4ac-1390167cf7ed",
-    "Name": "Windows - Apply Windows Updates",
-    "Description": "Step template to check for and apply Windows Updates with optional automatic reboot.",
-    "ActionType": "Octopus.Script",
-    "Version": 1,
-    "Author": "twerthi",
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "function Get-NugetPackageProviderNotInstalled\n{\n\t# See if the nuget package provider has been installed\n    return ($null -eq (Get-PackageProvider -ListAvailable -Name Nuget -ErrorAction SilentlyContinue))\n}\n\nfunction Get-ModuleInstalled\n{\n    # Define parameters\n    param(\n        $PowerShellModuleName\n    )\n\n    # Check to see if the module is installed\n    if ($null -ne (Get-Module -ListAvailable -Name $PowerShellModuleName))\n    {\n        # It is installed\n        return $true\n    }\n    else\n    {\n        # Module not installed\n        return $false\n    }\n}\n\n\n# Force use of TLS 1.2\n[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12\n\n$autoReboot = [System.Convert]::ToBoolean(\"$windowsUpdateAutoReboot\")\n\n# Check to see if the NuGet package provider is installed\nif ((Get-NugetPackageProviderNotInstalled) -ne $false)\n{\n  # Display that we need the nuget package provider\n  Write-Host \"Nuget package provider not found, installing ...\"\n\n  # Install Nuget package provider\n  Install-PackageProvider -Name Nuget -Force\n\n  Write-Output \"Nuget package provider succesfully installed ...\"\n}\n\n\nWrite-Output \"Checking for PowerShell module PSWindowsUpdate ...\"\n\nif ((Get-ModuleInstalled -PowerShellModuleName \"PSWindowsUpdate\") -ne $true)\n{\n\tWrite-Output \"PSWindowsUpdate not found, installing ...\"\n    \n    # Install PSWindowsUpdate\n    Install-Module PSWindowsUpdate -Force\n    \n    Write-Output \"Installation of PSWindowsUpdate complete ...\"\n}\n\nWrite-Output \"Checking for updates ...\"\n\n$windowsUpdates = Get-WindowsUpdate \n\n# Check to see if there's anything to install\nif ($windowsUpdates.Count -gt 0)\n{\n\tWrite-Output \"Installing updates ...\"\n    if ($autoReboot)\n    {\n\t\tInstall-WindowsUpdate -AcceptAll -AutoReboot\n    }\n    else\n    {\n    \tInstall-WindowsUpdate -AcceptAll\n    }\n}\nelse\n{\n\tWrite-Output \"There are no updates available.\"\n}",
-      "Octopus.Action.EnabledFeatures": ""
-    },
-    "Parameters": [
-      {
-        "Id": "004de404-ec52-47d3-ad49-ea96224182c6",
-        "Name": "windowsUpdateAutoReboot",
-        "Label": "Auto reboot",
-        "HelpText": "Check the box to allow an automatic reboot. **Warning**: using this option will cause the machine to reboot after installing the first update that requires a reboot.  If there are multiple updates that require a reboot, the rest of the updates will not be installed.",
-        "DefaultValue": "False",
-        "DisplaySettings": {
-          "Octopus.ControlType": "Checkbox"
-        }
-      }
-    ],
-    "$Meta": {
-      "ExportedAt": "2020-07-22T23:47:53.859Z",
-      "OctopusVersion": "2020.3.1",
-      "Type": "ActionTemplate"
-    },
-    "LastModifiedBy": "twerthi",
-    "Category": "windows"
-  }
\ No newline at end of file
diff --git a/step-templates/windows-certificate-grant-read-access.json b/step-templates/windows-certificate-grant-read-access.json
deleted file mode 100644
index 0993bc093..000000000
--- a/step-templates/windows-certificate-grant-read-access.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "cf6f35bf-b3e0-4285-98be-dcb509ab2ef9",
-  "Name": "Windows  - Certificate Grant Read Access",
-  "Description": "Grant read access to certificate for a specific user",
-  "ActionType": "Octopus.Script",
-  "Version": 12,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# $certCN is the identifiying CN for the certificate you wish to work with\r\n# The selection also sorts on Expiration date, just in case there are old expired certs still in the certificate store.\r\n# Make sure we work with the most recent cert\r\n    \r\n    Try\r\n    {\r\n        $WorkingCert = Get-ChildItem CERT:\\LocalMachine\\My |where {$_.Subject -match $certCN} | sort $_.NotAfter -Descending | select -first 1 -erroraction STOP\r\n        $TPrint = $WorkingCert.Thumbprint\r\n        $rsaFile = $WorkingCert.PrivateKey.CspKeyContainerInfo.UniqueKeyContainerName\r\n        if($TPrint){\r\n            Write-Host \"Found certificate named $certCN with thumbprint $TPrint\"\r\n        }\r\n        else{\r\n            throw \"Error: unable to locate certificate for $($CertCN)\"\r\n        }\r\n    }\r\n    Catch\r\n    {\r\n      throw \"Error: unable to locate certificate for $($CertCN)\"\r\n    }\r\n    $keyPath = \"$env:SystemDrive\\ProgramData\\Microsoft\\Crypto\\RSA\\MachineKeys\\\"\r\n    $fullPath=$keyPath+$rsaFile\r\n    $acl=Get-Acl -Path $fullPath\r\n    $permission=$userName,\"Read\",\"Allow\"\r\n    $accessRule=new-object System.Security.AccessControl.FileSystemAccessRule $permission\r\n    $acl.AddAccessRule($accessRule)\r\n    Try \r\n    {\r\n        Write-Host \"Granting read access for user $userName on $certCN\"\r\n     Set-Acl $fullPath $acl\r\n      Write-Host \"Success: ACL set on certificate\"\r\n    }\r\n    Catch\r\n    {\r\n      throw \"Error: unable to set ACL on certificate\"\r\n    }",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "certCN",
-      "Label": "Certificate Name",
-      "HelpText": "The CN of the Certificate",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "userName",
-      "Label": "User name",
-      "HelpText": "The Windows user",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-01-30T14:37:16.927+00:00",
-  "LastModifiedBy": "ARBNIK@skandianet.org",
-  "$Meta": {
-    "ExportedAt": "2015-01-30T14:39:14.212+00:00",
-    "OctopusVersion": "2.6.0.778",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/windows-check-net-core-framework-version.json b/step-templates/windows-check-net-core-framework-version.json
deleted file mode 100644
index 0a2598397..000000000
--- a/step-templates/windows-check-net-core-framework-version.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Id": "929ff903-29de-4217-b6a9-83fbfd477e11",
-  "Name": ".NET Core - Check .NET Core Framework Version",
-  "Description": "Check if given .NET Core framework version (or greater) is installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 5,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\" \nfunction Get-Parameter($Name, $Default, [switch]$Required) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Get-DotNetCoreFrameworkVersions() {\n    $dotNetCoreVersions = @()\n    if(Test-Path \"$env:programfiles/dotnet/shared/Microsoft.NETCore.App\") {\n        $dotNetCoreVersions = (ls \"$env:programfiles/dotnet/shared/Microsoft.NETCore.App\").Name\n    }\n    return $dotNetCoreVersions\n}\n\nfunction Get-AspDotNetCoreRuntimeVersions() {\n    $aspDotNetCoreRuntimeVersions = @()\n    $DotNETCoreUpdatesPath = \"Registry::HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Updates\\.NET Core\"\n    $DotNETUpdatesPath = \"Registry::HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Updates\\.NET\"\n\n    if (Test-Path \"HKLM:\\SOFTWARE\\Wow6432Node\\Microsoft\\Updates\\.NET Core\") {\n\t    $DotNetCoreItems = (Get-Item -Path $DotNETCoreUpdatesPath).GetSubKeyNames()\n    }\n    if (Test-Path \"HKLM:\\SOFTWARE\\Wow6432Node\\Microsoft\\Updates\\.NET\") {\n        $DotNetItems = (Get-Item -Path $DotNETUpdatesPath).GetSubKeyNames()\n    }\n\t$aspDotNetCoreRuntimeVersions = $DotNetCoreItems + $DotNetItems | where { $_ -match \"^Microsoft (ASP)?\\.NET Core (?<version>[\\d\\.]+(.*?)?) \"} | foreach { $Matches['version'] }\n\n    return $aspDotNetCoreRuntimeVersions\n}\n\n$targetVersion = (Get-Parameter \"TargetVersion\" -Required).Trim()\n$exact = [boolean]::Parse((Get-Parameter \"Exact\" -Required))\n$CheckASPdotNETCore = [boolean]::Parse((Get-Parameter \"CheckASPdotNETCore\" -Required))\n\n$matchedVersions = Get-DotNetCoreFrameworkVersions | Where-Object { if ($exact) { $_ -eq $targetVersion } else { $_ -ge $targetVersion }  }\nif (!$matchedVersions) { \n    throw \"Can't find .NET Core Runtime $targetVersion installed in the machine.\"\n}\n\n$matchedVersions | foreach { Write-Host \"Found .NET Core Runtime $_ installed in the machine.\" }\n\nif ($CheckASPdotNETCore) {\n    $matchedAspVersions = Get-AspDotNetCoreRuntimeVersions\n    if (!$matchedAspVersions) {\n        throw \"Can't find ASP.NET Core Runtime installed in the machine.\"\n    }\n\n    $matchedAspVersions | foreach { Write-Host \"Found ASP.NET Core Runtime $_ installed in the machine.\" }\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "f386deb4-36fb-4116-ad4a-5bceed89fa5b",
-      "Name": "TargetVersion",
-      "Label": "Target .NET Core framework version",
-      "HelpText": "The target .NET Core framework version you expect to be installed in the machine. For example, 2.0.5.",
-      "DefaultValue": "2.0.5",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "7312dd89-2174-47d7-bdfd-2745fb812f58",
-      "Name": "Exact",
-      "Label": "Exact",
-      "HelpText": "If you check \"Exact\", it means the installed .NET Core framework version MUST match target version.\n\nOtherwise, as long as the installed .NET Coreframework version is greater than or equal to target version, the check will pass.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "4f0b738b-8f06-4c93-a27f-49b3cd06ea9a",
-      "Name": "CheckASPdotNETCore",
-      "Label": "Check ASP.NET Core Module",
-      "HelpText": "If you check \"Check ASP.NET Core Module\", it means this step will check if ASP.NET Core module is installed in the host or not.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2018-06-13T08:43:39.365Z",
-    "OctopusVersion": "2018.4.1",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "FinnianDempsey",
-  "Category": "dotnetcore"
-}
diff --git a/step-templates/windows-check-net-framework-version.json b/step-templates/windows-check-net-framework-version.json
deleted file mode 100644
index 811920994..000000000
--- a/step-templates/windows-check-net-framework-version.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "Id": "b15c6b3d-20a1-4059-b0e4-75bef1ff41d5",
-  "Name": ".NET - Check .NET Framework Version",
-  "Description": "Check if given .NET framework version (or greater) is installed.",
-  "ActionType": "Octopus.Script",
-  "Version": 9,
-  "CommunityActionTemplateId": "CommunityActionTemplates-561",
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "# This script is based on MSDN: https://msdn.microsoft.com/en-us/library/hh925568\n\n$releaseVersionMapping = @{\n    378389 = '4.5'     # 4.5\n    378675 = '4.5.1'   # 4.5.1 installed with Windows 8.1\n    378758 = '4.5.1'   # 4.5.1 installed on Windows 8, Windows 7 SP1, or Windows Vista SP2\n    379893 = '4.5.2'   # 4.5.2\n    393295 = '4.6'     # 4.6 installed with Windows 10\n    393297 = '4.6'     # 4.6 installed on all other Windows OS versions\n    394254 = '4.6.1'   # 4.6.1 installed on Windows 10\n    394271 = '4.6.1'   # 4.6.1 installed on all other Windows OS versions\n    394802 = '4.6.2'   # 4.6.2 installed on Windows 10\n    394806 = '4.6.2'   # 4.6.2 installed on all other Windows OS versions\n    460798 = '4.7'     # 4.7 installed on Windows 10\n    460805 = '4.7'     # 4.7 installed on all other Windows OS versions\n    461308 = '4.7.1'   # 4.7.1 installed on Windows 10\n    461310 = '4.7.1'   # 4.7.1 installed on all other Windows OS versions\n    461808 = '4.7.2'   # 4.7.2 installed on Windows 10\n    461814 = '4.7.2'   # 4.7.2 installed on all other Windows OS versions\n    528040 = '4.8'     # 4.8 installed on Windows 10\n    528049 = '4.8'     # 4.8 installed on all other Windows OS versions1\n    528372 = '4.8'     # 4.8 Windows 10 May 2020 Update\n    528449 = '4.8'     # 4.8 Windows 11 and Windows Server 2022\n    533320 = '4.8.1'   # 4.8 Windows 11 September 2022 Release and Windows 11 October 2023 Release\n    533325 = '4.8.1'   # 4.8 all other OS versions\n}\n\nfunction Get-DotNetFrameworkVersions() {\n    $dotNetVersions = @()\n    if ($baseKey = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey('LocalMachine', '')) {\n        # To find .NET Framework versions (.NET Framework 1-4)$dotNetVersions\n        if ($ndpKey = $baseKey.OpenSubKey('SOFTWARE\\Microsoft\\NET Framework Setup\\NDP')) {\n            foreach ($versionKeyName in $ndpKey.GetSubKeyNames()) {\n                if ($versionKeyName -match 'v[2|3]') {\n                    $versionKey = $ndpKey.OpenSubKey($versionKeyName)\n                    if ($versionKey.GetValue('Version', '') -ne '') {\n                        $version = [version] ($versionKey.GetValue('Version'))\n                        $dotNetVersions += \"$($version.Major).$($version.Minor)\"\n                    }\n                }\n            }\n        \n            # for .NET 4.0\n            if ($ndp40Key = $ndpKey.OpenSubKey(\"v4.0\")) {\n                foreach ($subKeyName in $ndp40Key.GetSubKeyNames()) {\n                    $versionKey = $ndp40Key.OpenSubKey($subKeyName)\n                    $version = [version]($versionKey.GetValue('Version', ''))\n                    $dotNetVersions += \"$($version.Major).$($version.Minor)\"\n                }\n            }\n        }\n\n        # To find .NET Framework versions (.NET Framework 4.5 and later)\n        if ($ndp4Key = $baseKey.OpenSubKey('SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full')) {\n            $releaseKey = $ndp4Key.GetValue('Release')\n            $dotNetVersions += $releaseVersionMapping[$releaseKey]\n        }\n    }\n    return $dotNetVersions\n}\n\n$targetVersion = $OctopusParameters['TargetVersion'].Trim()\n$exact = [boolean]::Parse($OctopusParameters['Exact'])\n\n$matchedVersions = Get-DotNetFrameworkVersions | Where-Object { if ($exact) { $_ -eq $targetVersion } else { $_ -ge $targetVersion } }\nif (!$matchedVersions) { \n    throw \"Can't find .NET $targetVersion installed in the machine.\"\n}\n$matchedVersions | foreach { Write-Host \"Found .NET $_ installed in the machine.\" }",
-    "Octopus.Action.RunOnServer": "false"
-  },
-  "Parameters": [
-    {
-      "Id": "e902b08b-2fc3-4f62-aec0-5225533cace8",
-      "Name": "TargetVersion",
-      "Label": "Target .NET framework version",
-      "HelpText": "The target .NET framework version you expect to be installed in the machine. For example, 4.5.2.",
-      "DefaultValue": "4.5.2",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "205e297b-c72c-4d9b-a6fe-9a20ab62d5b0",
-      "Name": "Exact",
-      "Label": "Exact",
-      "HelpText": "If you check \"Exact\", it means the installed .NET framework version MUST match target version.\n\nOtherwise, as long as the installed .NET framework version is greater than or equal to target version, the check will pass.",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "$Meta": {
-    "ExportedAt": "2019-06-06T07:39:33.409Z",
-    "OctopusVersion": "2018.4.1",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "JeremyCamplin",
-  "Category": "aspnet"
-}
diff --git a/step-templates/windows-disk-cleanup.json b/step-templates/windows-disk-cleanup.json
deleted file mode 100644
index ac2a2ea6f..000000000
--- a/step-templates/windows-disk-cleanup.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "Id": "0147e912-ff8d-46d9-965a-dee0789ef32b",
-  "Name": "Windows Disk Cleanup Manager",
-  "Description": "Installs Windows Disk Cleanup manager on Windows 2008, 2008-R2 and 2012 Server.  Should work on Windows 7 and 8",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$driveLetter = $OctopusParameters[\"driveLetter\"]\r\n$cleanupSwitch = $OctopusParameters[\"cleanupSwitch\"]\r\n\r\n#REM  ORIGINAL AUTHOR JAMES FOX \r\n#REM SOURCE http://technet.microsoft.com/en-us/library/ff630161(WS.10).aspx\r\n\r\n#  DECLARATIONS\r\n$SOURCEEXE = \"\"\r\n$SOURCEMUI = \"\"\r\n# END DECLARATIONS \r\n\r\n# SETUP TEMPORARY ENVIROMENT VARIABLES FOR COPY PROCESS\r\n$DCLEANMGR = \"$env:systemroot\\System32\"\r\n$DCLEANMGRMUI = \"$env:systemroot\\System32\\en-US\"\r\n\r\n# $PATH TO MUI FILE          WINDOWS 2008 R2 64bit oR 2012\r\nif (Test-Path $env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.1.7600.16385_en-us_b9cb6194b257cc63\\cleanmgr.exe.mui)\r\n{\r\n$SOURCEMUI = \"$env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.1.7600.16385_en-us_b9cb6194b257cc63\\cleanmgr.exe.mui\"\r\n}\r\n\r\n# $PATH TO EXE FILE          WINDOWS 2008 R2 64bit oR 2012\r\nif (Test-Path $env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.1.7600.16385_none_c9392808773cd7da\\cleanmgr.exe)\r\n{\r\n  $SOURCEEXE = \"$env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.1.7600.16385_none_c9392808773cd7da\\cleanmgr.exe\"\r\n}\r\n\r\n\r\n# $PATH TO MUI FILE       WINDOWS 2008 64bit\r\nif (Test-Path $env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_b9f50b71510436f2\\cleanmgr.exe.mui)\r\n{\r\n\t$SOURCEMUI = \"$env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_b9f50b71510436f2\\cleanmgr.exe.mui\"\r\n}\r\n# $PATH TO EXE FILE       WINDOWS 2008 64bit\r\nif (Test-Path $env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_c962d1e515e94269\\cleanmgr.exe)\r\n{\r\n\t$SOURCEEXE = \"$env:systemroot\\winsxs\\amd64_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_c962d1e515e94269\\cleanmgr.exe\"\r\n}\r\n\r\n# $PATH TO MUI FILE   WINDOWS 2008 32bit\r\nif (Test-Path $env:systemroot\\winsxs\\x86_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_5dd66fed98a6c5bc\\cleanmgr.exe.mui)\r\n{\r\n\t$SOURCEMUI = \"$env:systemroot\\winsxs\\x86_microsoft-windows-cleanmgr.resources_31bf3856ad364e35_6.0.6001.18000_en-us_5dd66fed98a6c5bc\\cleanmgr.exe.mui\"\r\n}\r\n# $PATH TO EXE FILE   WINDOWS 2008 32bit\r\nif (Test-Path $env:systemroot\\winsxs\\x86_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_6d4436615d8bd133\\cleanmgr.exe)\r\n{\r\n\t$SOURCEEXE = \"$env:systemroot\\winsxs\\x86_microsoft-windows-cleanmgr_31bf3856ad364e35_6.0.6001.18000_none_6d4436615d8bd133\\cleanmgr.exe\"\r\n}\r\n\r\n# COPY PROCESS \r\n# THIS SECTION SHOULD NEVER HAPPEN ON WINDOWS 2003 SERVER BECAUSE CLEANMGR.EXE IS ALWAYS INSTALLED\r\n# TEST AND COPY IF CLEANMGR.EXE DOES NOT EXIST IN EXPECTED LOCATION COPY FROM SOURCE EXE AND MUI\r\nif (!(Test-Path $env:systemroot\\SYSTEM32\\cleanmgr.exe))\r\n{\r\n  xcopy $SOURCEMUI $DCLEANMGRMUI /y\r\n}\r\nif (!(Test-Path $env:systemroot\\SYSTEM32\\cleanmgr.exe))\r\n{\r\n  xcopy $SOURCEEXE $DCLEANMGR /y\r\n}\r\n\r\n# RUN EXE AND CLEAN DRIVE MAX CLEANUP\r\n$pinfo = New-Object System.Diagnostics.ProcessStartInfo\r\n$pinfo.FileName = \"$env:systemroot\\SYSTEM32\\CLEANMGR.EXE\"\r\n$pinfo.RedirectStandardError = $true\r\n$pinfo.RedirectStandardOutput = $true\r\n$pinfo.UseShellExecute = $false\r\n$pinfo.Arguments = \"/d$driveLetter /$cleanupSwitch\"\r\n$p = New-Object System.Diagnostics.Process\r\n$p.StartInfo = $pinfo\r\n$p.Start() | Out-Null\r\n$p.WaitForExit()\r\n$stdout = $p.StandardOutput.ReadToEnd()\r\n$stderr = $p.StandardError.ReadToEnd()\r\nWrite-Host \"stdout: $stdout\"\r\nWrite-Host \"stderr: $stderr\"\r\nWrite-Host \"Exit Code: \" + $p.ExitCode\r\n"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "driveLetter",
-      "Label": "Drive Letter",
-      "HelpText": "The driver letter in which to run the clean up manager on, by default C.",
-      "DefaultValue": "C",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "C\nD\nE\nF\nG\nH\nI\nJ\nK\nL\nM\nN\nO\nP\nQ\nR\nS\nT\nU\nV\nW\nX\nY\nZ"
-      }
-    },
-    {
-      "Name": "cleanupSwitch",
-      "Label": "Clean up Level",
-      "HelpText": "2 options are LOWDISK or VERYLOWDISK, varies the level of cleanup that is done.  VERYLOWDISK is the most complete, most cleaned up.",
-      "DefaultValue": "VERYLOWDISK",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "VERYLOWDISK| Very Low Disk\nLOWDISK\\Low Disk"
-      }
-    }
-  ],
-  "LastModifiedOn": "2015-10-12T18:46:26.067+00:00",
-  "LastModifiedBy": "dbloch",
-  "$Meta": {
-    "ExportedAt": "2015-10-12T19:07:41.676+00:00",
-    "OctopusVersion": "3.0.21.0",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/windows-ensure-features-installed.json b/step-templates/windows-ensure-features-installed.json
deleted file mode 100644
index 52e4123c3..000000000
--- a/step-templates/windows-ensure-features-installed.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "Id": "ed837372-165f-4e0e-b755-1df9633d9eb1",
-  "Name": "Windows - Ensure Features Installed",
-  "Description": "Ensures that a set of Windows Features are installed on the system.",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$requiredFeatures = $OctopusParameters['WindowsFeatures'].split(\",\") | foreach { $_.trim() }\nif(! $requiredFeatures) {\n    Write-Output \"No required Windows Features specified...\"\n    exit\n}\n$requiredFeatures | foreach { $feature = DISM.exe /ONLINE /Get-FeatureInfo /FeatureName:$_; if($feature -like \"*Feature name $_ is unknown*\") { throw $feature } }\n\nWrite-Output \"Retrieving all Windows Features...\"\n$allFeatures = DISM.exe /ONLINE /Get-Features /FORMAT:List | Where-Object { $_.StartsWith(\"Feature Name\") -OR $_.StartsWith(\"State\") } \n$features = new-object System.Collections.ArrayList\nfor($i = 0; $i -lt $allFeatures.length; $i=$i+2) {\n    $feature = $allFeatures[$i]\n    $state = $allFeatures[$i+1]\n    $features.add(@{feature=$feature.split(\":\")[1].trim();state=$state.split(\":\")[1].trim()}) | OUT-NULL\n}\n\nWrite-Output \"Checking for missing Windows Features...\"\n$missingFeatures = new-object System.Collections.ArrayList\n$features | foreach { if( $requiredFeatures -contains $_.feature -and $_.state.StartsWith(\"Disabled\")) { $missingFeatures.add($_.feature) | OUT-NULL } }\nif(! $missingFeatures) {\n    Write-Output \"All required Windows Features are installed\"\n    exit\n}\nWrite-Output \"Installing missing Windows Features...\"\n$featureNameArgs = \"\"\n$missingFeatures | foreach { $featureNameArgs = $featureNameArgs + \" /FeatureName:\" + $_ }\n$dism = \"DISM.exe\"\nIF ($SuppressReboot)\n{\n    $arguments = \"/NoRestart \"\n}\nELSE\n{\n    $arguments = \"\"\n}\n$arguments = $arguments + \"/ONLINE /Enable-Feature /All $featureNameArgs\"\nWrite-Output \"Calling DISM with arguments: $arguments\"\nstart-process -NoNewWindow $dism $arguments",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "WindowsFeatures",
-      "Label": "Windows features",
-      "HelpText": "The set of Windows Features that should be installed on the system. This can be either a single Windows Feature or a comma separated list of Windows Features to check.\n\nExample 1: IIS-WebServer\n\nExample 2: IIS-WebServer, IIS-WindowsAuthentication",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Name": "SuppressReboot",
-      "Label": "Suppress Reboot",
-      "HelpText": "Suppresses reboot. If a reboot is not necessary, then this option does nothing. This option will keep DISM.exe from prompting for a restart, or from restarting automatically).",
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    }
-  ],
-  "LastModifiedOn": "2017-10-03T21:58:18.839Z",
-  "LastModifiedBy": "WesleySSmith",
-  "$Meta": {
-    "ExportedAt": "2017-10-03T21:58:18.839Z",
-    "OctopusVersion": "3.17.1",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
diff --git a/step-templates/windows-get-pending-reboot.json b/step-templates/windows-get-pending-reboot.json
deleted file mode 100644
index 911f06779..000000000
--- a/step-templates/windows-get-pending-reboot.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "Id": "814c4265-62ec-44d3-9d42-800aef8f7380",
-  "Name": "Windows - Get Pending Reboot",
-  "Description": "Get pending reboot status from computer.",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$TempErrAct = $ErrorActionPreference \n    $ErrorActionPreference = \"Stop\"   \n    Foreach ($Computer in $ComputerName) \n      { \n        Try \n          { \n            # Setting pending values to false to cut down on the number of else statements \n            $PendFileRename,$Pending,$SCCM = $false,$false,$false \n\t\t\t\n            # Setting CBSRebootPend to null since not all versions of Windows has this value \n            $CBSRebootPend = $null \n\t\t\t\n            # Querying WMI for build version \n            $WMI_OS = Get-WmiObject -Class Win32_OperatingSystem -Property BuildNumber, CSName -ComputerName $Computer \n\t\t\t\n            # Making registry connection to the local/remote computer \n            $RegCon = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey([Microsoft.Win32.RegistryHive]\"LocalMachine\",$Computer) \n\t\t\t\n            # If Vista/2008 & Above query the CBS Reg Key \n            If ($WMI_OS.BuildNumber -ge 6001) \n              { \n                $RegSubKeysCBS = $RegCon.OpenSubKey(\"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Component Based Servicing\\\").GetSubKeyNames() \n                $CBSRebootPend = $RegSubKeysCBS -contains \"RebootPending\" \n              }#End If ($WMI_OS.BuildNumber -ge 6001) \n\t\t\t  \n            # Query WUAU from the registry \n            $RegWUAU = $RegCon.OpenSubKey(\"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsUpdate\\Auto Update\\\") \n            $RegWUAURebootReq = $RegWUAU.GetSubKeyNames() \n            $WUAURebootReq = $RegWUAURebootReq -contains \"RebootRequired\" \n\t\t\t\n            # Query PendingFileRenameOperations from the registry \n            $RegSubKeySM = $RegCon.OpenSubKey(\"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\\") \n            $RegValuePFRO = $RegSubKeySM.GetValue(\"PendingFileRenameOperations\",$null) \n\t\t\t\n            # Closing registry connection \n            $RegCon.Close() \n\t\t\t\n            # If PendingFileRenameOperations has a value set $RegValuePFRO variable to $true \n            If ($RegValuePFRO) \n              { \n                $PendFileRename = $true \n              }#End If ($RegValuePFRO) \n           \n            # If any of the variables are true, set $Pending variable to $true \n            If ($CBSRebootPend -or $WUAURebootReq -or $PendFileRename) \n              { \n                $Pending = $true \n              }#End If ($CBS -or $WUAU -or $PendFileRename) \n            # Creating Custom PSObject and Select-Object Splat \n\t\t\t$SelectSplat = @{ \n\t\t\t    Property=('Computer','CBServicing','WindowsUpdate','PendFileRename','PendFileRenVal','RebootPending') \n\t\t\t    } \n            New-Object -TypeName PSObject -Property @{ \n                Computer=$WMI_OS.CSName \n                CBServicing=$CBSRebootPend \n                WindowsUpdate=$WUAURebootReq \n                PendFileRename=$PendFileRename \n                PendFileRenVal=$RegValuePFRO \n                RebootPending=$Pending \n                } | Select-Object @SelectSplat \n          }#End Try \n        Catch \n          { \n            Write-Warning \"$Computer`: $_\" \n            # If $ErrorLog, log the file to a user specified location/path \n            If ($ErrorLog) \n              { \n                Out-File -InputObject \"$Computer`,$_\" -FilePath $ErrorLog -Append \n              }#End If ($ErrorLog) \n          }#End Catch \n      }#End Foreach ($Computer in $ComputerName) \n\t  $ErrorActionPreference = $TempErrAct ",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "ComputerName",
-      "Label": "Computer name",
-      "HelpText": "Computer Name to get pending reboot status from.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-30T20:34:01.920+00:00",
-    "OctopusVersion": "2.4.7.85",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/windows-grant-logon-as-service.json b/step-templates/windows-grant-logon-as-service.json
deleted file mode 100644
index 765bbf190..000000000
--- a/step-templates/windows-grant-logon-as-service.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "Id": "0e295d12-cc29-4f61-9eb1-dac387697d5c",
-  "Name": "Grant SeServiceLogonRight To Account",
-  "Description": "Grants `SeServiceLogonRight` to Windows account",
-  "ActionType": "Octopus.Script",
-  "Version": 4,
-  "CommunityActionTemplateId": null,
-  "Properties": {
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "# Code based on Stack Overflow solution https://stackoverflow.com/a/21235462/201382 from @grenade (https://stackoverflow.com/users/68115/grenade)\n\n$grantLogonAsServiceAccountName = $OctopusParameters['GrantLogonAsServiceAccountName']\n\n$tempPath = [System.IO.Path]::GetTempPath()\n$import = Join-Path -Path $tempPath -ChildPath \"import.inf\"\nif (Test-Path $import) { \n    Remove-Item -Path $import -Force \n}\n\n$export = Join-Path -Path $tempPath -ChildPath \"export.inf\"\nif (Test-Path $export) { \n    Remove-Item -Path $export -Force \n}\n\n$secedt = Join-Path -Path $tempPath -ChildPath \"secedt.sdb\"\nif (Test-Path $secedt) { \n    Remove-Item -Path $secedt -Force \n}\n\ntry {\n    Write-Output (\"Granting SeServiceLogonRight to user account: $grantLogonAsServiceAccountName.\") \n    $sid = ((New-Object System.Security.Principal.NTAccount($grantLogonAsServiceAccountName)).Translate([System.Security.Principal.SecurityIdentifier])).Value\n    secedit /export /cfg $export\n    $sids = (select-string $export -pattern \"SeServiceLogonRight\").line.Split(\"=\").Trim()[1]\n    foreach ($line in @(\"[Unicode]\", \"Unicode=yes\", \"[System Access]\", \"[Event Audit]\", \"[Registry Values]\", \"[Version]\", \"signature=`\"`$CHICAGO$`\"\", \"Revision=1\", \"[Profile Description]\", \"Description=GrantLogOnAsAService security template\", \"[Privilege Rights]\", \"SeServiceLogonRight = $sids,*$sid\")) {\n        Add-Content $import $line\n    }\n    \n    Write-Verbose \"Calling secedit...\"\n    secedit /import /db $secedt /cfg $import\n    secedit /configure /db $secedt\n    Write-Verbose \"Calling gpupdate...\"\n    gpupdate /force\n    Write-Verbose \"Cleaning up temp files...\"\n    Remove-Item -Path $import -Force\n    Remove-Item -Path $export -Force\n    Remove-Item -Path $secedt -Force\n    Write-Output(\"SeServiceLogonRight successfully granted to $grantLogonAsServiceAccountName\")\n}\ncatch {\n    Write-Error \"Failed to grant SeServiceLogonRight to user account: $grantLogonAsServiceAccountName.\"\n    $error[0]\n}\n"
-  },
-  "Parameters": [
-    {
-      "Id": "456ad1ed-286d-4bbf-a096-026d3928e3ef",
-      "Name": "GrantLogonAsServiceAccountName",
-      "Label": "Account Name",
-      "HelpText": "Domain account name to grant `SeServiceLogonRight`. Example: `US\\testAccount`",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "nshenoy",
-  "$Meta": {
-    "ExportedAt": "2017-11-30T20:48:26.823Z",
-    "OctopusVersion": "4.0.10",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/windows-install-msi.json b/step-templates/windows-install-msi.json
deleted file mode 100644
index aa53bc13a..000000000
--- a/step-templates/windows-install-msi.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "Id": "73994d6a-4cff-4bde-81c4-c4da362adaba",
-  "Name": "Windows - Install MSI From Package",
-  "Description": "Runs the Windows Installer to non-interactively install an MSI",
-  "ActionType": "Octopus.Script",
-  "Version": 1,
-  "CommunityActionTemplateId": null,
-  "Packages": [
-    {
-      "Id": "910a6653-0534-492a-98d8-f02196931773",
-      "Name": "Template.Package",
-      "PackageId": null,
-      "FeedId": null,
-      "AcquisitionLocation": "Server",
-      "Properties": {
-        "Extract": "True",
-        "SelectionMode": "deferred",
-        "PackageParameterName": "Template.Package",
-        "Purpose": ""
-      }
-    }
-  ],
-  "GitDependencies": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "# Running outside octopus\nparam(\n    [string]$MsiFilePath,\n\t[ValidateSet(\"Install\", \"Repair\", \"Remove\", IgnoreCase=$true)]\n\t[string]$Action,\n\t[string]$ActionModifier,\n    [string]$LoggingOptions = \"*\",\n    [ValidateSet(\"False\", \"True\")]\n    [string]$LogAsArtifact,\n\t[string]$Properties,\n\t[int[]]$IgnoredErrorCodes,\n    [switch]$WhatIf\n) \n\n$ErrorActionPreference = \"Stop\"\n\n$ErrorMessages = @{\n\t\"0\" = \"Action completed successfully.\";\n\t\"13\" = \"The data is invalid.\";\n\t\"87\" = \"One of the parameters was invalid.\";\n\t\"1601\" = \"The Windows Installer service could not be accessed. Contact your support personnel to verify that the Windows Installer service is properly registered.\";\n\t\"1602\" = \"User cancel installation.\";\n\t\"1603\" = \"Fatal error during installation.\";\n\t\"1604\" = \"Installation suspended, incomplete.\";\n\t\"1605\" = \"This action is only valid for products that are currently installed.\";\n\t\"1606\" = \"Feature ID not registered.\";\n\t\"1607\" = \"Component ID not registered.\";\n\t\"1608\" = \"Unknown property.\";\n\t\"1609\" = \"Handle is in an invalid state.\";\n\t\"1610\" = \"The configuration data for this product is corrupt. Contact your support personnel.\";\n\t\"1611\" = \"Component qualifier not present.\";\n\t\"1612\" = \"The installation source for this product is not available. Verify that the source exists and that you can access it.\";\n\t\"1613\" = \"This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.\";\n\t\"1614\" = \"Product is uninstalled.\";\n\t\"1615\" = \"SQL query syntax invalid or unsupported.\";\n\t\"1616\" = \"Record field does not exist.\";\n\t\"1618\" = \"Another installation is already in progress. Complete that installation before proceeding with this install.\";\n\t\"1619\" = \"This installation package could not be opened. Verify that the package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer package.\";\n\t\"1620\" = \"This installation package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer package.\";\n\t\"1621\" = \"There was an error starting the Windows Installer service user interface. Contact your support personnel.\";\n\t\"1622\" = \"Error opening installation log file. Verify that the specified log file location exists and is writable.\";\n\t\"1623\" = \"This language of this installation package is not supported by your system.\";\n\t\"1624\" = \"Error applying transforms. Verify that the specified transform paths are valid.\";\n\t\"1625\" = \"This installation is forbidden by system policy. Contact your system administrator.\";\n\t\"1626\" = \"Function could not be executed.\";\n\t\"1627\" = \"Function failed during execution.\";\n\t\"1628\" = \"Invalid or unknown table specified.\";\n\t\"1629\" = \"Data supplied is of wrong type.\";\n\t\"1630\" = \"Data of this type is not supported.\";\n\t\"1631\" = \"The Windows Installer service failed to start. Contact your support personnel.\";\n\t\"1632\" = \"The temp folder is either full or inaccessible. Verify that the temp folder exists and that you can write to it.\";\n\t\"1633\" = \"This installation package is not supported on this platform. Contact your application vendor.\";\n\t\"1634\" = \"Component not used on this machine.\";\n\t\"1635\" = \"This patch package could not be opened. Verify that the patch package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer patch package.\";\n\t\"1636\" = \"This patch package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer patch package.\";\n\t\"1637\" = \"This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.\";\n\t\"1638\" = \"Another version of this product is already installed. Installation of this version cannot continue. To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.\";\n\t\"1639\" = \"Invalid command line argument. Consult the Windows Installer SDK for detailed command line help.\";\n\t\"1640\" = \"Installation from a Terminal Server client session not permitted for current user.\";\n\t\"1641\" = \"The installer has started a reboot.\";\n\t\"1642\" = \"The installer cannot install the upgrade patch because the program being upgraded may be missing, or the upgrade patch updates a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch.\";\n\t\"3010\" = \"A restart is required to complete the install. This does not include installs where the ForceReboot action is run. Note that this error will not be available until future version of the installer.\"\n};\n\nfunction Get-Param($Name, [switch]$Required, $Default) {\n    $result = $null\n\n    if ($OctopusParameters -ne $null) {\n        $result = $OctopusParameters[$Name]\n    }\n\n    if ($result -eq $null) {\n        $variable = Get-Variable $Name -EA SilentlyContinue   \n        if ($variable -ne $null) {\n            $result = $variable.Value\n        }\n    }\n\n    if ($result -eq $null) {\n        if ($Required) {\n            throw \"Missing parameter value $Name\"\n        } else {\n            $result = $Default\n        }\n    }\n\n    return $result\n}\n\nfunction Resolve-PotentialPath($Path) {\n\t[Environment]::CurrentDirectory = $pwd\n\treturn [IO.Path]::GetFullPath($Path)\n}\n\nfunction Get-LogOptionFile($msiFile, $streamLog) {\n\t$logPath = Resolve-PotentialPath \"$msiFile.log\"\n\t\n\tif (Test-Path $logPath) {\n\t\tRemove-Item $logPath\n\t}\n\t\n\treturn $logPath\n}\n\nfunction Exec\n{\n    [CmdletBinding()]\n    param(\n        [Parameter(Position=0,Mandatory=1)][scriptblock]$cmd,\n        [string]$errorMessage = ($msgs.error_bad_command -f $cmd),\n\t\t[switch]$ReturnCode\n    )\n\n\t$lastexitcode = 0\n    & $cmd\n\t\n\tif ($ReturnCode) {\n\t\treturn $lastexitcode\n\t} else  {\n\t\tif ($lastexitcode -ne 0) {\n\t\t\tthrow (\"Exec: \" + $errorMessage)\n\t\t}\t\t\n\t}\n}\n\nfunction Wrap-Arguments($Arguments)\n{\n\treturn $Arguments | % { \n\t\t\n\t\t[string]$val = $_\n\t\t\n\t\t#calling msiexec fails when arguments are quoted\n\t\tif (($val.StartsWith(\"/\") -and $val.IndexOf(\" \") -eq -1) -or ($val.IndexOf(\"=\") -ne -1) -or ($val.IndexOf('\"') -ne -1)) {\n\t\t\treturn $val\n\t\t}\n\t\n\t\treturn '\"{0}\"' -f $val\n\t}\n}\n\nfunction Start-Process2($FilePath, $ArgumentList, [switch]$showCall, [switch]$whatIf)\n{\n\t$ArgumentListString = (Wrap-Arguments $ArgumentList) -Join \" \"\n\n\t$pinfo = New-Object System.Diagnostics.ProcessStartInfo\n\t$pinfo.FileName = $FilePath\n\t$pinfo.UseShellExecute = $false\n\t$pinfo.CreateNoWindow = $true\n\t$pinfo.RedirectStandardOutput = $true\n\t$pinfo.RedirectStandardError = $true\n\t$pinfo.Arguments = $ArgumentListString;\n\t$pinfo.WorkingDirectory = $pwd\n\n\t$exitCode = 0\n\t\n\tif (!$whatIf) {\n\t\n\t\tif ($showCall) {\n\t\t\t$x = Write-Output \"$FilePath $ArgumentListString\"\n\t\t}\n\t\t\n\t\t$p = New-Object System.Diagnostics.Process\n\t\t$p.StartInfo = $pinfo\n\t\t$started = $p.Start()\n\t\t$p.WaitForExit()\n\n\t\t$stdout = $p.StandardOutput.ReadToEnd()\n\t\t$stderr = $p.StandardError.ReadToEnd()\n\t\t$x = Write-Output $stdout\n\t\t$x = Write-Output $stderr\n\t\t\n\t\t$exitCode = $p.ExitCode\n\t} else {\n\t\tWrite-Output \"skipping: $FilePath $ArgumentListString\"\n\t}\n\t\n\treturn $exitCode\n}\n\nfunction Get-EscapedFilePath($FilePath)\n{\n    return [Management.Automation.WildcardPattern]::Escape($FilePath)\n}\n\nfunction Get-MsiPathFromExtractedPath\n{\n  $fileReference = (Get-ChildItem -Path $OctopusParameters[\"Octopus.Action.Package[Template.Package].ExtractedPath\"] -Recurse | Where-Object { $_.Extension -eq \".msi\" })\n  return $fileReference.FullName\n}\n\n& {\n    param(\n        [string]$MsiFilePath,\n\t\t[string]$Action,\n\t\t[string]$ActionModifier,\n        [string]$LoggingOptions,\n        [bool]$LogAsArtifact,\n\t\t[string]$Properties,\n\t\t[int[]]$IgnoredErrorCodes\n    ) \n\n    $MsiFilePathLeaf = Split-Path -Path $MsiFilePath -Leaf\n    $EscapedMsiFilePath = Get-EscapedFilePath (Split-Path -Path $MsiFilePath)\n    \n\t$MsiFilePath = Get-EscapedFilePath (Resolve-Path \"$EscapedMsiFilePath\\$MsiFilePathLeaf\" | Select-Object -First 1).ProviderPath\n\n    Write-Output \"Installing MSI\"\n    Write-Host \" MsiFilePath: $MsiFilePath\" -f Gray\n\tWrite-Host \" Action: $Action\" -f Gray\n\tWrite-Host \" Properties: $Properties\" -f Gray\n\tWrite-Host\n\n\tif ((Get-Command msiexec) -Eq $Null) {\n\t\tthrow \"Command msiexec could not be found\"\n\t}\n\t\n\tif (!(Test-Path $MsiFilePath)) {\n\t\tthrow \"Could not find the file $MsiFilePath\"\n\t}\n\n\t$actions = @{\n\t\t\"Install\" = \"/i\";\n\t\t\"Repair\" = \"/f\";\n\t\t\"Remove\" = \"/x\";\n\t};\n\t\n\t$actionOption = $actions[$action]\n\t$actionOptionFile = $MsiFilePath\n\tif ($ActionModifier)\n\t{\n\t\t$actionOption += $ActionModifier\n\t}\n\t\n    if ($LoggingOptions) {\n\t    $logOption = \"/L$LoggingOptions\"\n\t    $logOptionFile = Get-LogOptionFile $MsiFilePath\n\t}\n\t$quiteOption = \"/qn\"\n\t$noRestartOption = \"/norestart\"\n\t\n\t$parameterOptions = $Properties -Split \"\\r\\n?|\\n\" | ? { !([string]::IsNullOrEmpty($_)) } | % { $_.Trim() }\n\t\n\t$options = @($actionOption, $actionOptionFile, $logOption, $logOptionFile, $quiteOption, $noRestartOption) + $parameterOptions\n\n\t$exePath = \"msiexec.exe\"\n\n\t$exitCode = Start-Process2 -FilePath $exePath -ArgumentList $options -whatIf:$whatIf -ShowCall\n\t\n\tWrite-Output \"Exit Code was! $exitCode\"\n\t\n\tif (Test-Path $logOptionFile) {\n\n\t\tWrite-Output \"Reading installer log\"\n\n        # always write out these (http://robmensching.com/blog/posts/2010/8/2/the-first-thing-i-do-with-an-msi-log/)\n        (Get-Content $logOptionFile) | Select-String -SimpleMatch \"value 3\" -Context 10,0 | ForEach-Object { Write-Warning $_ }\n\n        if ($LogAsArtifact) {\n            New-OctopusArtifact -Path $logOptionFile -Name \"$Action-$([IO.Path]::GetFileNameWithoutExtension($MsiFilePath)).log\"\n        } else {\n\t    \tGet-Content $logOptionFile | Write-Output\n        }\n\n\t} else {\n\t\tWrite-Output \"No logs were generated\"\n\t}\n\n\tif ($exitCode -Ne 0) {\n\t\t$errorCodeString = $exitCode.ToString()\n\t\t$errorMessage = $ErrorMessages[$errorCodeString]\n\t\t\n\t\tif ($IgnoredErrorCodes -notcontains $exitCode) {\n\n\t\t\tthrow \"Error code $exitCodeString was returned: $errorMessage\"\n\t\t}\n\t\telse {\n\t\t\tWrite-Output \"Error code [$exitCodeString] was ignored because it was in the IgnoredErrorCodes [$($IgnoredErrorCodes -join ',')] parameter. Error Message [$errorMessage]\"\n\t\t}\n\t}\n\t\n} `\n(Get-MsiPathFromExtractedPath) `\n(Get-Param 'Action' -Required) `\n(Get-Param 'ActionModifier') `\n(Get-Param 'LoggingOptions') `\n((Get-Param 'LogAsArtifact') -eq \"True\") `\n(Get-Param 'Properties') `\n(Get-Param 'IgnoredErrorCodes')\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "b2195039-8e80-4216-b4f2-10a205e6837f",
-      "Name": "Template.Package",
-      "Label": "MSI Package",
-      "HelpText": "The package that contains the .Msi file to execute.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Package"
-      }
-    },
-    {
-      "Id": "f644f7aa-9051-4404-8665-a9eaebafdbc0",
-      "Name": "Action",
-      "Label": "Action",
-      "HelpText": "The task to perform with the MSI, options include install, repair or remove.",
-      "DefaultValue": "Install",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "Install\nRepair\nRemove"
-      }
-    },
-    {
-      "Id": "7a43723d-6242-4bb5-9acd-198933517d13",
-      "Name": "ActionModifier",
-      "Label": "Action Modifier",
-      "HelpText": "Use this to specify a different behavior for the Repair action",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "fc9f6977-f2fc-4fa3-9f38-171c9b2ace95",
-      "Name": "Properties",
-      "Label": "Properties",
-      "HelpText": "Properties that will be passed to the MSI separated by lines. Properties are in the format key=value, note that values with spaces in the must be quoted. \n\n    Key=Value\n    Key=\"Value\"",
-      "DefaultValue": "REBOOT=ReallySuppress",
-      "DisplaySettings": {
-        "Octopus.ControlType": "MultiLineText"
-      }
-    },
-    {
-      "Id": "5e38bac3-31fb-4c7d-bbb8-331be0eb6283",
-      "Name": "LoggingOptions",
-      "Label": "Logging Options",
-      "HelpText": "One or more of:\n\n    [i|w|e|a|r|u|c|m|o|p|v|x|+|!|*]\n\n-  i - Status messages\n-  w - Nonfatal warnings\n-  e - All error messages\n-  a - Start-up of actions\n-  r - Action-specific records\n-  u - User requests\n-  c - Initial UI parameters\n-  m - Out-of-memory or fatal exit information\n-  o - Out-of-disk-space messages\n-  p - Terminal properties\n-  v - Verbose output\n-  x - Extra debugging information\n-  \\+ - Append to existing log file\n-  ! - Flush each line to the log\n-  \\* - Log all information, except for v and x options",
-      "DefaultValue": "*",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "a7fcf5b5-e416-4706-b9fd-c3d418f60007",
-      "Name": "LogAsArtifact",
-      "Label": "Log as artifact",
-      "HelpText": "If selected, then return log output as an artifact.\nIf unselected then return log output as inline content",
-      "DefaultValue": "false",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Id": "53e9621e-0967-4b10-9635-2070ae7f808c",
-      "Name": "IgnoredErrorCodes",
-      "Label": "Ignored Error Codes",
-      "HelpText": "Use commas to separate integer values.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "StepPackageId": "Octopus.Script",
-  "$Meta": {
-    "ExportedAt": "2025-08-21T16:07:30.818Z",
-    "OctopusVersion": "2025.2.13043",
-    "Type": "ActionTemplate"
-  },
-  "LastModifiedBy": "twerthi",
-  "Category": "windows"
-}
diff --git a/step-templates/windows-local-user.json b/step-templates/windows-local-user.json
deleted file mode 100644
index 8bf0f04dc..000000000
--- a/step-templates/windows-local-user.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "Id": "6dbe826d-f973-46fe-a897-a0a2cdfd01f4",
-  "Name": "Windows - Local User",
-  "Description": "Configures a local user. (If assigning user rights the ntrights.exe file should be installed on the target server and added to the system path variable)",
-  "ActionType": "Octopus.Script",
-  "Version": 3,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$username = $OctopusParameters['Username']\n$password = $OctopusParameters['Password']\n$memberOf = $OctopusParameters['MemberOf']\n$userRights = $OctopusParameters['UserRights']\n\n# Add/Update User\n\n$user = Get-WmiObject Win32_UserAccount -filter \"LocalAccount=True AND Name='$username'\"\nif($user -eq $null)\n{\n    Write-Host \"Adding user\"\n    net user \"$username\" \"$password\" /add /expires:never /passwordchg:no /yes\n}\nelse\n{\n    Write-Host \"User already exists, updating password\"\n    net user \"$username\" \"$password\" /expires:never /passwordchg:no\n}\n\n# Ensure password never expires\n\nwrite \"Ensuring password never expires\"\n$user = Get-WmiObject Win32_UserAccount -filter \"LocalAccount=True AND Name='$username'\"\n$user.PasswordExpires = $false; \n$user.Put();\n\n# Add/Update group membership\n\nif($memberOf)\n{\n    $groups = $memberOf.Split(\",\")\n    foreach($group in $groups)\n    {\n        $ntGroup = [ADSI](\"WinNT://./$group\")\n        $members = $ntGroup.psbase.Invoke(\"Members\") | %{$_.GetType().InvokeMember(\"Name\", 'GetProperty', $null, $_, $null)}\n        if($members -contains \"$username\")\n        {\n            Write-Host \"User already a member of the $group group\" \n        }\n        else\n        {\n            Write-Host \"Adding to the $group group\"\n            net localgroup \"$group\" \"$username\" /add\n        }\n    }\n}\n\n# Add/Update user rights assignment\n\nif($userRights)\n{\n    $userRightsArr = $userRights.Split(\",\")\n    foreach($userRight in $userRightsArr)\n    {\n        Write-Host \"Granting $userRight right\"\n        & \"ntrights\" +r $userRight -u \"$username\"\n    }\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Username",
-      "Label": "Username",
-      "HelpText": "The username",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Password",
-      "Label": "Password",
-      "HelpText": "The password",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "MemberOf",
-      "Label": "Group memberships",
-      "HelpText": "A comma separated list of group memberships",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "UserRights",
-      "Label": "User rights",
-      "HelpText": "A comma separated list of user rights to assign (e.g. SeServiceLogonRight). See http://support.microsoft.com/kb/315276 for full list of rights",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2014-05-16T10:30:58.052+00:00",
-    "OctopusVersion": "2.4.5.46",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/windows-restart-if-required.json b/step-templates/windows-restart-if-required.json
deleted file mode 100644
index ab1068d01..000000000
--- a/step-templates/windows-restart-if-required.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "Id": "cb0ca23c-524d-44a9-86e0-2ae05989d6a0",
-    "Name": "Check for Pending Restart and Restart if required",
-    "Description": "Checks if Server is pending a reboot, and reboots if it needs it.",
-    "ActionType": "Octopus.Script",
-    "Version": 0,
-    "CommunityActionTemplateId": null,
-    "Packages": [],
-    "Properties": {
-      "Octopus.Action.Script.ScriptSource": "Inline",
-      "Octopus.Action.Script.Syntax": "PowerShell",
-      "Octopus.Action.Script.ScriptBody": "# Sourced from https://github.com/adbertram/Random-PowerShell-Work/blob/master/Random%20Stuff/Test-PendingReboot.ps1\n# Script will run only on the server with the Tentacle installed\n\nfunction Test-RegistryKey($Key) {\n    if (Get-Item -Path $Key -ErrorAction Ignore) {\n        return $true\n    }\n    return $false\n}\n\nfunction Test-RegistryValue($Key, $Value) {\n    if (Get-ItemProperty -Path $Key -Name $Value -ErrorAction Ignore) {\n        return $true\n    }\n    return $false\n}\n\nfunction Test-RegistryValueNotNull($Key, $Value) {\n    if (($regVal = Get-ItemProperty -Path $Key -Name $Value -ErrorAction Ignore) -and $regVal.($Value)) {\n        return $true\n    }\n    return $false\n}\n\n$IsPendingReboot = $false\n\n# Testing Registry keys for Restarts\n# an exception is thrown when Get-ItemProperty or Get-ChildItem are passed a nonexistant key path\n$tests = @(\n    { Test-RegistryKey -Key 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Component Based Servicing\\RebootPending' }\n    { Test-RegistryKey -Key 'HKLM:\\Software\\Microsoft\\Windows\\CurrentVersion\\Component Based Servicing\\RebootInProgress' }\n    { Test-RegistryKey -Key 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsUpdate\\Auto Update\\RebootRequired' }\n    { Test-RegistryKey -Key 'HKLM:\\Software\\Microsoft\\Windows\\CurrentVersion\\Component Based Servicing\\PackagesPending' }\n    { Test-RegistryKey -Key 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsUpdate\\Auto Update\\PostRebootReporting' }\n    { Test-RegistryValueNotNull -Key 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager' -Value 'PendingFileRenameOperations' }\n    { Test-RegistryValueNotNull -Key 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager' -Value 'PendingFileRenameOperations2' }\n    { \n\t\t(Test-RegistryKey -Key 'HKLM:\\SOFTWARE\\Microsoft\\Updates') -and\n\t\t(Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Updates' -Name 'UpdateExeVolatile' | Select-Object -ExpandProperty UpdateExeVolatile) -ne 0 \n\t}\n    { Test-RegistryValue -Key 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce' -Value 'DVDRebootSignal' }\n    { Test-RegistryKey -Key 'HKLM:\\SOFTWARE\\Microsoft\\ServerManager\\CurrentRebootAttemps' }\n    { Test-RegistryValue -Key 'HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Netlogon' -Value 'JoinDomain' }\n    { Test-RegistryValue -Key 'HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Netlogon' -Value 'AvoidSpnSet' }\n    {\n        (Get-ItemProperty -Path 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\ComputerName\\ActiveComputerName').ComputerName -ne\n        (Get-ItemProperty -Path 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\ComputerName\\ComputerName').ComputerName\n    }\n    {\n        if (Get-ChildItem -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsUpdate\\Services\\Pending') {\n            $true\n        }\n    }\n)\n\nWrite-Debug \"Running tests to checking for reboot pending\"\nforeach ($test in $tests) {\n    if (& $test) {\n        Write-Debug \"Test found reboot pending: $test\"\n        $IsPendingReboot = $true\n        break\n    }\n}\n    \n\nif($IsPendingReboot -eq $true) {\n    Write-Host \"Restarting\"\n    Restart-Computer -Force\n}\nif($IsPendingReboot -eq $false) {\n    Write-Host \"No Restart required\"\n}\n"
-    },
-    "Parameters": [],
-    "LastModifiedOn": "2020-01-14T20:40:28.430+00:00",
-    "LastModifiedBy": "DevOpsDerek",
-    "$Meta": {
-      "ExportedAt": "2020-01-14T08:41:32.508Z",
-      "OctopusVersion": "2019.11.1",
-      "Type": "ActionTemplate"
-    },
-    "Category": "windows"
-  }
\ No newline at end of file
diff --git a/step-templates/windows-scheduled-task-create.json b/step-templates/windows-scheduled-task-create.json
deleted file mode 100644
index 3a9e6a64e..000000000
--- a/step-templates/windows-scheduled-task-create.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "Id": "17bc51d1-8b88-4aad-b188-24a0904d0bf2",
-  "Name": "Windows Scheduled Task - Create",
-  "Description": "Create Windows scheduled task. If the task exists it will be torn down and re-added to ensure consistency",
-  "ActionType": "Octopus.Script",
-  "Version": 22,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$ErrorActionPreference = \"Stop\";\nSet-StrictMode -Version \"Latest\";\n\n# use http://msdn.microsoft.com/en-us/library/windows/desktop/bb736357(v=vs.85).aspx for API reference\n\nFunction Create-ScheduledTask($TaskName,$RunAsUser,$RunAsPassword,$TaskRun,$Arguments,$Schedule,$StartTime,$StartDate,$RunWithElevatedPermissions,$Days,$Interval,$Duration, $Modifier)\n{\n\n    # SCHTASKS /Create [/S system [/U username [/P [password]]]]\n    #     [/RU username [/RP password]] /SC schedule [/MO modifier] [/D day]\n    #     [/M months] [/I idletime] /TN taskname /TR taskrun [/ST starttime]\n    #     [/RI interval] [ {/ET endtime | /DU duration} [/K] [/XML xmlfile] [/V1]]\n    #     [/SD startdate] [/ED enddate] [/IT | /NP] [/Z] [/F] [/HRESULT] [/?]\n\n    # note - /RL and /DELAY appear in the \"Parameter list\" for \"SCHTASKS /Create /?\" but not in the syntax above\n\n    $argumentList = @();\n    $argumentList += @( \"/Create\" );\n\n    $argumentList += @( \"/RU\", \"`\"$RunAsUser`\"\" );\n    \n    if( -not (StringIsNullOrWhiteSpace($RunAsPassword)))\n    {\n    \t$RAP = $RunAsPassword -Replace \"`\"\",\"\\`\"\"\n        $argumentList += @( \"/RP `\"$RAP`\"\"  );\n    }\n\n    $argumentList += @( \"/SC\", $Schedule );\n\n    if( -not (StringIsNullOrWhiteSpace($Interval)) )\n    {\n        $argumentList += @( \"/RI\", $Interval );\n    }\n\n    if( -not (StringIsNullOrWhiteSpace($Modifier)))\n    {\n        switch -Regex ($Schedule)\n        {\n            \"MINUTE|HOURLY|DAILY|WEEKLY|MONTHLY|ONEVENT\" {\n                $argumentList += @( \"/MO\", $Modifier );\n            }\n            \"ONCE|ONSTART|ONLOGON|ONIDLE\" {\n                $argumentList += @( \"/MO\" );\n        }\n    }\n    }\n\n    if( -not (StringIsNullOrWhiteSpace($Days)))\n    {\n        if($Schedule -ne \"WEEKDAYS\") {\n            $argumentList += @( \"/D\", $Days );\n        } else {\n            $argumentList += @( \"/D\", \"MON,TUE,WED,THU,FRI\" );\n        }\n    }\n\n    $argumentList += @( \"/TN\", \"`\"$TaskName`\"\" );\n\n    if( $Arguments )\n    {\n        $argumentList += @( \"/TR\", \"`\"'$TaskRun' $Arguments`\"\" );\n    }\n    else\n    {\n        $argumentList += @( \"/TR\", \"`\"'$TaskRun'`\"\" );\n    }\n\n    if( -not (StringIsNullOrWhiteSpace($StartTime)) )\n    {\n        $argumentList += @( \"/ST\", $StartTime );\n    }\n\n    if( -not (StringIsNullOrWhiteSpace($Duration)) )\n    {\n        $argumentList += @( \"/DU\", $Duration );\n    }\n\n    if( -not (StringIsNullOrWhiteSpace($StartDate)) )\n    {\n        $argumentList += @( \"/SD\", $StartDate );\n    }\n\n    $argumentList += @( \"/F\" );\n\n    if( $RunWithElevatedPermissions )\n    {\n        $argumentList += @( \"/RL\", \"HIGHEST\" );\n    }\n\n    Invoke-CommandLine -FilePath     \"$($env:SystemRoot)\\System32\\schtasks.exe\" `\n                       -ArgumentList $argumentList;\n\n}\n\nFunction Delete-ScheduledTask($TaskName) {\n    # SCHTASKS /Delete [/S system [/U username [/P [password]]]]\n    #          /TN taskname [/F] [/HRESULT] [/?]\n    Invoke-CommandLine -FilePath     \"$($env:SystemRoot)\\System32\\schtasks.exe\" `\n                       -ArgumentList @( \"/Delete\", \"/S\", \"localhost\", \"/TN\", \"`\"$TaskName`\"\", \"/F\" );\n}\n\nFunction Stop-ScheduledTask($TaskName) {\n    # SCHTASKS /End [/S system [/U username [/P [password]]]]\n    #          /TN taskname [/HRESULT] [/?]\n    Invoke-CommandLine -FilePath     \"$($env:SystemRoot)\\System32\\schtasks.exe\" `\n                       -ArgumentList @( \"/End\", \"/S\", \"localhost\", \"/TN\", \"`\"$TaskName`\"\" );\n}\n\nFunction Start-ScheduledTask($TaskName) {\n    # SCHTASKS /Run [/S system [/U username [/P [password]]]] [/I]\n    #          /TN taskname [/HRESULT] [/?]\n    Invoke-CommandLine -FilePath     \"$($env:SystemRoot)\\System32\\schtasks.exe\" `\n                       -ArgumentList @( \"/Run\", \"/S\", \"localhost\", \"/TN\", \"`\"$TaskName`\"\" );\n}\n\nFunction Enable-ScheduledTask($TaskName) {\n    # SCHTASKS /Change [/S system [/U username [/P [password]]]] /TN taskname\n    #      { [/RU runasuser] [/RP runaspassword] [/TR taskrun] [/ST starttime]\n    #        [/RI interval] [ {/ET endtime | /DU duration} [/K] ]\n    #        [/SD startdate] [/ED enddate] [/ENABLE | /DISABLE] [/IT] [/Z] }\n    #        [/HRESULT] [/?]\n    Invoke-CommandLine -FilePath     \"$($env:SystemRoot)\\System32\\schtasks.exe\" `\n                       -ArgumentList @( \"/Change\", \"/S\", \"localhost\", \"/TN\", \"`\"$TaskName`\"\", \"/ENABLE\" );\n}\n\nFunction Disable-ScheduledTask($TaskName) {\n    # SCHTASKS /Change [/S system [/U username [/P [password]]]] /TN taskname\n    #      { [/RU runasuser] [/RP runaspassword] [/TR taskrun] [/ST starttime]\n    #        [/RI interval] [ {/ET endtime | /DU duration} [/K] ]\n    #        [/SD startdate] [/ED enddate] [/ENABLE | /DISABLE] [/IT] [/Z] }\n    #        [/HRESULT] [/?]\n    Invoke-CommandLine -FilePath     \"$($env:SystemRoot)\\System32\\schtasks.exe\" `\n                       -ArgumentList @( \"/Change\", \"/S\", \"localhost\", \"/TN\", \"`\"$TaskName`\"\", \"/DISABLE\" );\n}\n\nFunction ScheduledTask-Exists($taskName) {\n   $schedule = new-object -com Schedule.Service\n   $schedule.connect()\n   $tasks = $schedule.getfolder(\"\\\").gettasks(0)\n   foreach ($task in ($tasks | select Name)) {\n      #echo \"TASK: $($task.name)\"\n      if($task.Name -eq $taskName) {\n         #write-output \"$task already exists\"\n         return $true\n      }\n   }\n   return $false\n}\n\nFunction StringIsNullOrWhitespace([string] $string)\n{\n    if ($string -ne $null) { $string = $string.Trim() }\n    return [string]::IsNullOrEmpty($string)\n}\n\nfunction Invoke-CommandLine\n{\n    param\n    (\n        [Parameter(Mandatory=$true)]\n        [string] $FilePath,\n        [Parameter(Mandatory=$false)]\n        [string[]] $ArgumentList = @( ),\n        [Parameter(Mandatory=$false)]\n        [string[]] $SuccessCodes = @( 0 )\n    )\n    $SanitizedArgList = $ArgumentList | ForEach-Object { if($_.StartsWith(\"/RP\")) { \"/RP ********\" } else { $_ } }\n    Write-Host ($FilePath + \" \" + ($SanitizedArgList -Join \" \"));\n    \n    $process = Start-Process -FilePath $FilePath -ArgumentList $ArgumentList -Wait -NoNewWindow -PassThru;\n    if( $SuccessCodes -notcontains $process.ExitCode )\n    {\n        throw new-object System.InvalidOperationException(\"process terminated with exit code '$($process.ExitCode)'.\");\n    }\n}\n\nfunction Invoke-OctopusStep\n{\n    param\n    (\n        [Parameter(Mandatory=$true)]\n        [hashtable] $OctopusParameters\n    )\n\n    $taskName = $OctopusParameters['TaskName']\n    $runAsUser = $OctopusParameters['RunAsUser']\n    $runAsPassword = $OctopusParameters['RunAsPassword']\n    $command = $OctopusParameters['Command']\n    $arguments = $OctopusParameters['Arguments']\n    $schedule = $OctopusParameters['Schedule']\n    $startTime = $OctopusParameters['StartTime']\n    $startDate = $OctopusParameters['StartDate']\n\n    if( $OctopusParameters.ContainsKey(\"RunWithElevatedPermissions\") )\n    {\n        $runWithElevatedPermissions = [boolean]::Parse($OctopusParameters['RunWithElevatedPermissions'])\n    }\n    else\n    {\n        $runWithElevatedPermissions = $false;\n    }\n\n    $days = $OctopusParameters['Days']\n    $interval = $OctopusParameters['Interval']\n    $duration = $OctopusParameters['Duration']\n    $Modifier = $OctopusParameters['Modifier']\n\n    if((ScheduledTask-Exists($taskName))){\n        Write-Output \"$taskName already exists, Tearing down...\"\n        Write-Output \"Stopping $taskName...\"\n        Stop-ScheduledTask($taskName)\n        Write-Output \"Successfully Stopped $taskName\"\n        Write-Output \"Deleting $taskName...\"\n        Delete-ScheduledTask($taskName)\n        Write-Output \"Successfully Deleted $taskName\"\n    }\n    Write-Output \"Creating Scheduled Task - $taskName\"\n\n    Create-ScheduledTask $taskName $runAsUser $runAsPassword $command $arguments $schedule $startTime $startDate $runWithElevatedPermissions $days $interval $duration $Modifier\n    Write-Output \"Successfully Created $taskName\"\n\n    if( $OctopusParameters.ContainsKey('TaskStatus') )\n    {\n        $taskStatus = $OctopusParameters['TaskStatus']\n        if( -not (StringIsNullOrWhiteSpace($taskStatus)) )\n        {\n            if ( $taskStatus -eq \"ENABLE\" )\n            {\n                Enable-ScheduledTask($taskName)\n                Write-Output \"$taskName enabled\"\n            }\n            elseif ( $taskStatus -eq \"DISABLE\" )\n            {\n                Disable-ScheduledTask($taskName)\n                Write-Output \"$taskName disabled\"\n            }\n            else\n            {\n                Write-Output \"$taskName status unchanged (on create, will be enabled)\"\n            }\n        }\n    }\n\n    if( $OctopusParameters.ContainsKey(\"StartNewTaskNow\") )\n    {\n        $startNewTaskNow = [boolean]::Parse($OctopusParameters['StartNewTaskNow'])\n    }\n    else\n    {\n        $startNewTaskNow = $false;\n    }\n\n    if( $startNewTaskNow ) {\n      Start-ScheduledTask($taskName)\n    }\n}\n\n\n# only execute the step if it's called from octopus deploy,\n# and skip it if we're runnning inside a Pester test\nif( Test-Path -Path \"Variable:OctopusParameters\" )\n{\n    Invoke-OctopusStep -OctopusParameters $OctopusParameters;\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Name": "TaskName",
-      "Label": "Name",
-      "HelpText": "The name of the Scheduled Task",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RunAsUser",
-      "Label": "User",
-      "HelpText": "The User that the task will run as",
-      "DefaultValue": "System",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RunAsPassword",
-      "Label": "Password",
-      "HelpText": "Specifying a password allows the task to run when the user is not logged on to the server.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "Command",
-      "Label": "Action",
-      "HelpText": "The Action that the task executes. Usually a path to the executable",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Arguments",
-      "Label": "Arguments",
-      "HelpText": "A value that specifies any arguments to be passed to run the task.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Schedule",
-      "Label": "Schedule",
-      "HelpText": "When the Task is triggered",
-      "DefaultValue": "DAILY",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "MINUTE|Every Minute\nHOURLY|Hourly\nDAILY|Daily\nWEEKLY|Weekly\nWEEKDAYS|Weekdays\nONCE|One off\nONSTART|On Start\nONLOGON|On Logon\nONIDLE|On Idle\nMONTHLY|Monthly"
-      }
-    },
-    {
-      "Name": "StartTime",
-      "Label": "Start Time",
-      "HelpText": "The Time the task will run. Use the format HH:mm:ss",
-      "DefaultValue": "12:00",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "StartDate",
-      "Label": "Start Date",
-      "HelpText": "The date the task will start running. use the format MM/dd/yyyy",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Modifier",
-      "Label": "Modifier",
-      "HelpText": "A value that specifies how often the task runs within its schedule type. For ONCE, ONSTART, ONLOGON and ONIDLE any value can be used since it will be ignored (They do not use modifiers with MO).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Interval",
-      "Label": "Interval",
-      "HelpText": "A value that specifies the repetition interval in minutes.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Duration",
-      "Label": "Duration",
-      "HelpText": "A value that specifies the duration to run the task. The time format is HH:mm (24-hour time).",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "RunWithElevatedPermissions",
-      "Label": "RunWithElevatedPermissions",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "Days",
-      "Label": "Days",
-      "HelpText": "A value that specifies the day of the week to run the task. Valid values are: MON, TUE, WED, THU, FRI, SAT, SUN and for MONTHLY schedules 1 - 31 (days of the month). The wildcard character (*) specifies all days.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText",
-        "Octopus.SelectOptions": ""
-      }
-    },
-    {
-      "Name": "StartNewTaskNow",
-      "Label": "StartNewTaskNow",
-      "HelpText": null,
-      "DefaultValue": "False",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "TaskStatus",
-      "Label": "TaskStatus",
-      "HelpText": "Whether the task is enabled, disabled, or left as-is when this step completes",
-      "DefaultValue": "ENABLE",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "ENABLE|Enable\nDISABLE|Disable\nLEAVE|Leave Unchanged"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2022-03-29T11:49:45.384Z",
-  "LastModifiedBy": "harrisonmeister",
-  "$Meta": {
-    "ExportedAt": "2022-03-29T11:49:45.384Z",
-    "OctopusVersion": "2022.1.2152",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
diff --git a/step-templates/windows-scheduled-task-disable.json b/step-templates/windows-scheduled-task-disable.json
deleted file mode 100644
index 204eb681e..000000000
--- a/step-templates/windows-scheduled-task-disable.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "Id": "1be30b21-ba58-4667-bff4-2d0ef9a806af",
-  "Name": "Windows Scheduled Task - Disable",
-  "Description": "Disables a Windows Scheduled Task for both 2008 and 2012.",
-  "ActionType": "Octopus.Script",
-  "Version": 6,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$taskName = $OctopusParameters['TaskName']\n$maximumWaitTime = $OctopusParameters['MaximumWaitTime']\n$succeedOnTaskNotFound = $OctopusParameters['SucceedOnTaskNotFound']\n\n#Check if the PowerShell cmdlets are available\n$cmdletSupported = [bool](Get-Command -Name Get-ScheduledTask -ErrorAction SilentlyContinue)\n\ntry {\n\tif($cmdletSupported) {\n\t\t$taskExists = Get-ScheduledTask | Where-Object { $_.TaskName -eq $taskName }\n\t}\n\telse {\n\t\t$taskService = New-Object -ComObject \"Schedule.Service\"\n\t\t$taskService.Connect()\n\t\t$taskFolder = $taskService.GetFolder('\\')\n\t\t$taskExists = $taskFolder.GetTasks(0) | Select-Object Name, State | Where-Object { $_.Name -eq $taskName }\n\t}\n\n\tif(-not $taskExists) {\n        if( $succeedOnTaskNotFound){\n            Write-Output \"Scheduled task '$taskName' does not exist\"\n            }\n        else {\n\t\t    throw \"Scheduled task '$taskName' does not exist\"\n        }\n\t\treturn\n\t}\n\n\tWrite-Output \"Disabling $taskName...\"\n\t$waited = 0\n\tif($cmdletSupported) {\n\t\t$task = Disable-ScheduledTask $taskName\n\t\tWrite-Output \"Waiting until $taskName is disabled...\"\n\t\twhile(($task.State -ne [Microsoft.PowerShell.Cmdletization.GeneratedTypes.ScheduledTask.StateEnum]::Disabled) -and (($maximumWaitTime -eq 0) -or ($waited -lt $maximumWaitTime))) \n\t\t{\n\t\t\tStart-Sleep -Milliseconds 200\n\t\t\t$waited += 200\n\t\t\t$task = Get-ScheduledTask $taskName\n\t\t}\n\t\t\n\t\tif($task.State -ne [Microsoft.PowerShell.Cmdletization.GeneratedTypes.ScheduledTask.StateEnum]::Disabled) {\n\t\t\tthrow \"The scheduled task $taskName could not be disabled within the specified wait time\"\n\t\t}\n\t}\n\telse {\n\t\tschtasks /Change /Disable /TN \"$taskName\"\n\t\t#The State property can hold the following values:\n\t\t# 0: Unknown\n\t\t# 1: Disabled\n\t\t# 2: Queued\n\t\t# 3: Ready\n\t\t# 4: Running\n\t\twhile(($taskFolder.GetTask($taskName).State -ne 1) -and (($maximumWaitTime -eq 0) -or ($waited -lt $maximumWaitTime))) {\n\t\t\tStart-Sleep -Milliseconds 200\n\t\t\t$waited += 200\n\t\t}\n\t\t\n\t\tif($taskFolder.GetTask($taskName).State -ne 1) {\n\t\t    throw \"The scheduled task '$taskName' could not be disabled within the specified wait time\"\n\t\t}\n\t}\n}\nfinally {\n    if($taskFolder -ne $NULL) {\n\t    [System.Runtime.Interopservices.Marshal]::ReleaseComObject($taskFolder)   \n\t}\n\t\n\tif($taskService -ne $NULL) {\n\t    [System.Runtime.Interopservices.Marshal]::ReleaseComObject($taskService)   \n\t}\n}",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "TaskName",
-      "Label": "Task Name",
-      "HelpText": "Name of the Windows Scheduled Task.",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "DefaultValue": null
-    },
-    {
-      "Name": "MaximumWaitTime",
-      "Label": "Maximum Wait Time",
-      "HelpText": "Maximum time the script must wait before aborting. Use '0' to wait indefinitely.",
-      "DefaultValue": 0,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "SucceedOnTaskNotFound",
-      "Label": "Succeed On Task Not Found",
-      "HelpText": "This setting prevents the script from throwing an error if the task is not found.",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedOn": "2021-07-26T16:50:00.000+00:00",
-  "LastModifiedBy": "bobjwalker",
-  "$Meta": {
-    "ExportedAt": "2017-03-13T19:50:10.728Z",
-    "OctopusVersion": "2.4.5.46",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
diff --git a/step-templates/windows-service-stop-or-kill.json b/step-templates/windows-service-stop-or-kill.json
deleted file mode 100644
index acb4eedae..000000000
--- a/step-templates/windows-service-stop-or-kill.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "Id": "6fa0fab6-4799-4d81-944d-3c7b54530870",
-  "Name": "Stop Service With Kill",
-  "Description": "This steps stops the specified service and in case it does not respond or times out, the service will be killed.",
-  "ActionType": "Octopus.Script",
-  "Version": 9,
-  "CommunityActionTemplateId": null,
-  "Packages": [],
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "$svcName = $OctopusParameters['ServiceName']\n$svcTimeout = $OctopusParameters['ServiceStopTimeout']\n\nfunction Stop-ServiceWithTimeout ([string] $name, [int] $timeoutSeconds) {\n    $timespan = New-Object -TypeName System.Timespan -ArgumentList 0,0,$timeoutSeconds\n\n    If ($svc = Get-Service $svcName -ErrorAction SilentlyContinue) {\n        if ($null -eq $svc) { return $true }\n        if ($svc.Status -eq [ServiceProcess.ServiceControllerStatus]::Stopped) { return $true }\n        try {\n            Write-Host \"Stopping Service with Timeout\" $svcTimeout \"seconds\"\n            $svc.Stop()\n            $svc.WaitForStatus([ServiceProcess.ServiceControllerStatus]::Stopped, $timespan)\n        }\n        catch [ServiceProcess.TimeoutException] {\n            Write-Host \"Timeout stopping service $($svc.Name)\"\n            return $false\n        }\n        catch {\n            Write-Warning \"Service $svcName could not be stopped: $_\"\n        }\n        Write-Host \"Service Sucessfully stopped\"\n\n    } Else {\n        Write-Host \"Service does not exist, this is acceptable. Probably the first time deploying to this target\"\n        Exit\n    }\n}\n\nWrite-Host \"Checking service $svcName\"\ntry {\n    $svc = Get-Service $svcName\n}\ncatch {\n    if ($null -eq $svc) { Write-Warning \"Service $svcName not found.\" }\n    exit 1\n}\n\n$svcpid1 = (get-wmiobject Win32_Service | Where-Object{$_.Name -eq $svcName}).ProcessId\nif($svcpid1 -ne 0) {\n    Write-Host \"Found PID $svcpid1 - stopping service now...\"\n    Stop-ServiceWithTimeout -name $svcName -timeoutSeconds $svcTimeout\n}\nelse {\n    Write-Host \"No PID found for $svcName - service is already stopped.\"\n    exit 0\n}\n\nWrite-Host \"Rechecking service\"\n$svcpid2 = (get-wmiobject Win32_Service | Where-Object{$_.Name -eq $svcName}).ProcessId\nif($svcpid2 -eq 0) {\n    Write-Host \"no PID found for $svcName\"\n}\nelse {\n    Write-Warning \"PID $svcpid2 found for $svcName - service not stopped. Trying to Kill the process.\"\n}\n\n$service = Get-Service -name $svcName | Select-Object -Property Status\nif($service.Status -ne \"Stopped\"){\n    Start-Sleep -seconds 5\n    $p = get-process -id $svcpid2 -ErrorAction SilentlyContinue\n    if($p){\n        Write-Host \"Killing PID\" $p.id \"(\" $p.Name \")\"\n        try {\n            Stop-Process $p.Id -force\n        }\n        catch {\n            Write-Warning \"process\" $p.id \"could not be stopped:\" $_\n        }\n    }\n}\n",
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline"
-  },
-  "Parameters": [
-    {
-      "Id": "7ad7cec6-c5c8-40a9-8657-793f88ea1c0f",
-      "Name": "ServiceName",
-      "Label": "Service Name",
-      "HelpText": "Name of the service to stop",
-      "DefaultValue": "",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Id": "2ece0f23-76b7-490d-808f-64e5612ac0eb",
-      "Name": "ServiceStopTimeout",
-      "Label": "Service Stop Timeout",
-      "HelpText": "Amount of time in seconds to wait before killing the Process",
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2025-02-20T16:15:00Z",
-  "LastModifiedBy": "Bjoern-Hennings",
-  "$Meta": {
-    "ExportedAt": "2018-11-05T03:59:57.0280000Z",
-    "OctopusVersion": "2018.8.12",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
diff --git a/step-templates/windows-wait-for-or-force-close-application.json b/step-templates/windows-wait-for-or-force-close-application.json
deleted file mode 100644
index aecd64513..000000000
--- a/step-templates/windows-wait-for-or-force-close-application.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "Id": "2d59d5b6-1dc3-424e-9279-676393933efd",
-  "Name": "Process - Wait for or Force close",
-  "Description": "Waits a set amount of time for a process to close and optionally force closes the process after the timeout expires.",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptBody": "$seconds = $OctopusParameters['Seconds']\r\n$forceCloseOnTimeout = $OctopusParameters['Force']\r\n$processName = $OctopusParameters['ProcessName']\r\n$timeout = new-timespan -Seconds $seconds\r\n$stopwatch = [diagnostics.stopwatch]::StartNew()\r\n\r\n# Check if the process is even running\r\nif (Get-Process $processName -ErrorAction silentlycontinue)\r\n{\r\n    Write-Host \"Waiting $seconds seconds for process '$processName' to terminate\"\r\n} \r\nelse \r\n{\r\n    Write-Host \"Process '$processName' is not running\"\r\n    return\r\n}\r\n\r\n# Count down waiting for the process to stop gracefully\r\nwhile ($stopwatch.elapsed -lt $timeout)\r\n{\r\n    # Check process is running\r\n    if (Get-Process $processName -ErrorAction silentlycontinue) \r\n    {\r\n        Write-Host \"Waiting...\"\r\n    }\r\n    else \r\n    {\r\n        Write-Host \"Process '$processName' is no longer running\"\r\n        return\r\n    }\r\n\r\n    # Wait for a while\r\n    Start-Sleep -seconds 1\r\n}\r\n\r\n# Force close the process if set\r\nif($forceCloseOnTimeout –eq $TRUE)\r\n{\r\n    Write-Host \"Force closing process $processName\"\r\n    Stop-Process -processname $processName -Force\r\n    Write-Host \"Process '$processName' is no longer running\"\r\n    return\r\n}\r\n\r\nWrite-Host \"Process $processName didn't close within the allocated time\"\r\nWrite-Host \"Continuing anyway\""
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "Seconds",
-      "Label": "Seconds",
-      "HelpText": "The number of seconds to wait before forcefully killing the application",
-      "DefaultValue": "10",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "Force",
-      "Label": "Force Kill",
-      "HelpText": "Whether or not the application should be forcefully killed after the timeout has expired.",
-      "DefaultValue": "True",
-      "DisplaySettings": {
-        "Octopus.ControlType": "Checkbox"
-      }
-    },
-    {
-      "Name": "ProcessName",
-      "Label": "Process Name",
-      "HelpText": "The name of the process to wait for",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "svenkle",
-  "$Meta": {
-    "ExportedAt": "2015-11-21T01:21:41.951+00:00",
-    "OctopusVersion": "3.2.3",
-    "Type": "ActionTemplate"
-  },
-  "Category": "windows"
-}
\ No newline at end of file
diff --git a/step-templates/xamarin-Insights-upload-dysm.json b/step-templates/xamarin-Insights-upload-dysm.json
deleted file mode 100644
index bf739c1af..000000000
--- a/step-templates/xamarin-Insights-upload-dysm.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "Id": "a1c51946-abd0-434c-99f3-b7a1b5af74c5",
-  "Name": "Xamarin Insights dSYM Upload",
-  "Description": "Uploads a dSYM symbols file to Xamarin Insights, for more readable exceptions.",
-  "ActionType": "Octopus.Script",
-  "Version": 0,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#####################################\r\n# Xamarin Insights dSYM Upload script\r\n#\r\n# Uploads a dSYM sybmols file to Xamarin insights from a Nuget file\r\n#  extracted in a previous Octopus Deploy step. Allows a variety of parameters.\r\n#\r\n# Uploads to configured application, by API Key.\r\n#\r\n# API Documentation is available at: https://developer.xamarin.com/guides/insights/user-interface/settings/#Uploading_a_dSYM_File\r\n#\r\n# The API key involved is provided in the \"Settings\" for the particular app on the Xamarin Insights portal.\r\n# https://insights.xamarin.com/\r\n# Log in, open the application, and click settings. The general \"settings\" tab has the API Key field.\r\n#\r\n# Example curl request:\r\n# curl -F \"dsym=@YOUR-APPS-DSYM.zip;type=application/zip\" https://xaapi.xamarin.com/api/dsym?apikey=13dd6c82159361ea13ad25a0d9100eb6e228bb17\r\n#\r\n# v0.1 - Initial version, uploads one dSYM file.\r\n# \r\n# The nuget package must contain the *.app.dSYM.zip file.  \r\n#\r\n# The following *.nuspec example will package a release IPA and associated *.app.dSYM.zip file.\r\n#\r\n# The upload script requires a search path (default package root) with exactly one *.app.dSYM.zip file.\r\n# \r\n# Specify package path relative to the nuspec file location\r\n#\r\n# https://docs.nuget.org/create/nuspec-reference#file-element-examples\r\n#\r\n# In some cases the ID, Version, and Description may need manually specified.\r\n#\r\n\r\n<#\r\n\r\n    <?xml version=\"1.0\"?>\r\n    <package>\r\n      <metadata>\r\n        <id>$id$</id>\r\n        <title>$id$</title>\r\n        <version>$version$</version>\r\n        <description>Mobile project packaged for Octopus deploy. $description$</description>\r\n      </metadata>\r\n      <files>\r\n        <!-- Matches mobile package files. Note this will only include the platform being built,\r\n\t         and should match only a single file. -->\r\n        \r\n        <!-- iOS -->\r\n        <file src=\"**/Release/**/*.ipa\" target=\"\" />\r\n\r\n        <!-- Include release dSYM symbols file -->\r\n        <file src=\"**/Release/*.app.dSYM.zip\" target=\"\" />\r\n\r\n      </files>\r\n    </package>\r\n\r\n#>\r\n\r\n#############################\r\n# Debug Parameter Overrides #\r\n#############################\r\n\r\n# These values are set explicitly durring debugging so that the script can\r\n#   be run in the editor.\r\n# For local debugging, uncomment these values and fill in appropriately.\r\n\r\n<#\r\n\r\n# debug folder with app files\r\n$stepPath = \"C:\\Temp\\powershellscript\\\"\r\n\r\n$OctopusParameters = @{\r\n\"InsightsAppSpecificApiToken\" = \"YourApiKeyhere\";\r\n# \"NugetSearchPath\" = \"bin\\iPhone\"; # Additional path information, reatlive to the nuget file root, e.g. release\r\n}\r\n\r\n# #>\r\n\r\n###################################\r\n# Octopus Deploy common functions #\r\n###################################\r\n\r\n# A collection of functions that can be used by script steps to determine where packages installed\r\n# by previous steps are located on the filesystem.\r\n \r\nfunction Find-InstallLocations {\r\n    $result = @()\r\n    $OctopusParameters.Keys | foreach {\r\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\r\n            $result += $OctopusParameters[$_]\r\n        }\r\n    }\r\n    return $result\r\n}\r\n \r\nfunction Find-InstallLocation($stepName) {\r\n    $result = $OctopusParameters.Keys | where {\r\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\r\n    } | select -first 1\r\n \r\n    if ($result) {\r\n        return $OctopusParameters[$result]\r\n    }\r\n \r\n    throw \"No install location found for step: $stepName\"\r\n}\r\n\r\nfunction Find-SingleInstallLocation {\r\n    $all = @(Find-InstallLocations)\r\n    if ($all.Length -eq 1) {\r\n        return $all[0]\r\n    }\r\n    if ($all.Length -eq 0) {\r\n        throw \"No package steps found\"\r\n    }\r\n    throw \"Multiple package steps have run; please specify a single step\"\r\n}\r\n\r\n#####################\r\n# Utility functions #\r\n#####################\r\n\r\nfunction Get-ExactlyOneDsymFileInfo($searchPath)\r\n{\r\n    $symbolFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.app.dSYM.zip\r\n    \r\n    $fileCount = $symbolFiles.count\r\n\r\n    if($fileCount -ne 1)\r\n    {\r\n        throw \"Did not find exactly one (1) symbols file. Found $fileCount dSYM file(s). Searched under path: $searchPath\"\r\n    }\r\n\r\n    return $symbolFiles\r\n}\r\n\r\n####################\r\n# Basic Parameters #\r\n####################\r\n\r\n$apiToken = $OctopusParameters['InsightsAppSpecificApiToken']\r\n\r\n$octopusFilePathOverride = $OctopusParameters['NugetSearchPath']\r\n\r\n$stepName = $OctopusParameters['MobileAppPackageStepName']\r\n\r\n# set step path, if not already set\r\nIf([string]::IsNullOrEmpty($stepPath))\r\n{\r\n    if (![string]::IsNullOrEmpty($stepName)) {\r\n        Write-Host \"Finding path to package step: $stepName\"\r\n        $stepPath = Find-InstallLocation $stepName\r\n    } else {\r\n        $stepPath = Find-SingleInstallLocation\r\n    }\r\n}\r\n\r\nWrite-Host \"##octopus[stderr-progress]\"\r\n\r\n# if we were not provided a file name, search for a single package file\r\nif([string]::IsNullOrWhiteSpace($octopusFilePathOverride))\r\n{\r\n    $appFileInfo = Get-ExactlyOneDsymFileInfo $stepPath\r\n    $appFullFilePath = $appFileInfo.FullName\r\n}\r\nelse\r\n{\r\n    $searchPathOverride = Join-Path $stepPath $octopusFilePathOverride\r\n    $appFileInfo = Get-ExactlyOneDsymFileInfo $searchPathOverride\r\n    $appFullFilePath = $appFileInfo.FullName\r\n}\r\n\r\n$fileName = [System.IO.Path]::GetFileName($appFullFilePath)\r\n\r\n$apiUploadUri = \"https://xaapi.xamarin.com/api/dsym?apikey=$apiToken\"\r\n\r\n# Request token details\r\n$uniqueBoundaryToken = [Guid]::NewGuid().ToString()\r\n\r\n$contentType = \"multipart/form-data; boundary=$uniqueBoundaryToken\"\r\n\r\n\r\nWrite-Host \"File Location: $appFullFilePath\"\r\n\r\n################################\r\n# Set up Hockey App parameters #\r\n################################\r\n\r\n$formSectionSeparator = @\"\r\n\r\n--$uniqueBoundaryToken\r\n\r\n\"@\r\n\r\n############################\r\n# Prepare request wrappers #\r\n############################\r\n\r\n# Standard for multipart form data\r\n# http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4\r\n\r\n$stringEncoding = [System.Text.Encoding]::ASCII\r\n\r\n# Note the hard-coded \"ipa\" name here is per HockeyApp API documentation\r\n#  and it applies to ALL platform application files.\r\n\r\n$preFileBytes = $stringEncoding.GetBytes(\r\n$formSectionSeparator +\r\n@\"\r\nContent-Disposition: form-data; name=\"dsym\"; filename=\"$fileName\"\r\nContent-Type: application/zip\r\n\r\n\r\n\"@)\r\n\r\n# file bytes will go in between\r\n\r\n$postFileBytes = $stringEncoding.GetBytes(@\"\r\n\r\n--$uniqueBoundaryToken--\r\n\"@)\r\n\r\n######################\r\n# Invoke the request #\r\n######################\r\n\r\n# Note, previous approach was Invoke-RestMethod based. It worked, but was NOT memory\r\n# efficient, leading to high memory usage and \"out of memory\" errors.\r\n\r\n# Based on examples from\r\n# http://stackoverflow.com/questions/566462/upload-files-with-httpwebrequest-multipart-form-data\r\n# and \r\n# https://gist.github.com/nolim1t/271018\r\n\r\n# Uses a dot net WebRequest and streaming to limit memory usage\r\n\r\n$WebRequest = [System.Net.WebRequest]::Create(\"$apiUploadUri\")\r\n\r\n$WebRequest.ContentType = $contentType\r\n$WebRequest.Method = \"POST\"\r\n$WebRequest.KeepAlive = $true;\r\n\r\n$RequestStream = $WebRequest.GetRequestStream()\r\n\r\n# before file bytes\r\n$RequestStream.Write($preFileBytes, 0, $preFileBytes.Length);\r\n\r\n#files bytes\r\n\r\n$fileMode = [System.IO.FileMode]::Open\r\n$fileAccess = [System.IO.FileAccess]::Read\r\n\r\n$fileStream = New-Object IO.FileStream $appFullFilePath,$fileMode,$fileAccess\r\n$bufferSize = 4096 # 4k at a time\r\n$byteBuffer = New-Object Byte[] ($bufferSize)\r\n\r\n# read bytes. While bytes are read...\r\nwhile(($bytesRead = $fileStream.Read($byteBuffer,0,$byteBuffer.Length)) -ne 0)\r\n{\r\n    # write those byes to the request stream\r\n    $RequestStream.Write($byteBuffer, 0, $bytesRead)\r\n}\r\n\r\n$fileStream.Close()\r\n\r\n# after file bytes\r\n$RequestStream.Write($postFileBytes, 0, $postFileBytes.Length);\r\n\r\n$RequestStream.Close()\r\n\r\n$response = $WebRequest.GetResponse();\r\n",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "InsightsAppSpecificApiToken",
-      "Label": "Insights Api Token",
-      "HelpText": "Your Xamarin API Key for the specific application you are uploading the symbol files to.\n\nVisit:\nhttps://insights.xamarin.com\n\nLog in, browse your application, and click Settings. Your application specific API Token should be visible under \"API Key\".",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "PackageStepName",
-      "Label": "Package Step Name",
-      "HelpText": "Name of the previously-deployed package step that contains the dSYM symbol file that you want to deploy.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Name": "NugetSearchPath",
-      "Label": "Nuget Search Path (Optional)",
-      "HelpText": "This fully optional search path allows you to look in a specific folder path in your nuget file, such as \"bin\\release\". This may be needed in cases when the nuget file has multiple dSYM files in different locations.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-01-12T21:54:21.496+00:00",
-  "LastModifiedBy": "Colin.Dabritz@Viewpoint.com",
-  "$Meta": {
-    "ExportedAt": "2016-01-12T23:40:54.635+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "xamarin"
-}
\ No newline at end of file
diff --git a/step-templates/xamarin-testcloud-execute-testrun.json b/step-templates/xamarin-testcloud-execute-testrun.json
deleted file mode 100644
index af62cc098..000000000
--- a/step-templates/xamarin-testcloud-execute-testrun.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "Id": "fd79c2f6-8983-4f91-a36d-aa622f44f16f",
-  "Name": "Xamarin TestCloud execute test run",
-  "Description": "Executes a Xamarin TestCloud test run for an app contained in a nuget file.",
-  "ActionType": "Octopus.Script",
-  "Version": 2,
-  "Properties": {
-    "Octopus.Action.Script.ScriptBody": "#####################################\r\n# Xamarin TestCloud Start Test Run script\r\n# \r\n# Kicks off a new test run for an app.\r\n# This script uses the test-cloud.exe helper utility included with the Xamarin UITest nuget package. \r\n# https://www.nuget.org/packages/Xamarin.UITest\r\n# \r\n# For use with Xamarin UITests\r\n# https://developer.xamarin.com/guides/testcloud/uitest/\r\n# being run in Xamarin TestCloud on physical devices\r\n# https://developer.xamarin.com/guides/testcloud/introduction-to-test-cloud/\r\n#\r\n# v0.1 - kicks off configured test run, tested against iOS app only\r\n#\r\n# The nuget package must contain the *.iap or *.apk file, compiled with calabash included\r\n# The nuget package must contain the DLLs from the UITest project\r\n# The nuget package may optionally contain a symbols file, *.app.dSYM.zip\r\n# The nuget package must contain the test-cloud.exe support utility\r\n#\r\n# The following *.nuspec example will package:\r\n# * a release ipa\r\n# * UITest DLLs\r\n# * associated *.app.dSYM.zip file\r\n# * The test-cloud.exe support utility\r\n#\r\n# all search paths default to the root of the nuget package,\r\n# and may be further qualified relative to the root of the nuget package\r\n# The upload script uses default or optionally qualified search paths for the following:\r\n# * The .ipa or .apk location\r\n# * The UITest project DLLs\r\n# * The *.app.dSYM.zip symbols file\r\n# * The test-cloud.exe utility\r\n#\r\n# It also requires the API Key from the application, and the code for the devices desired,\r\n# and a valid user accout to run as.\r\n#\r\n# 1. Visit the testcloud interface: https://testcloud.xamarin.com/\r\n# 2. Choose \"New Test Run\" and configure as desired.\r\n# 3. In the last step, copy the large hash (app specific API Key), devices parameter code, and username\r\n#\r\n# The nugetFile below is an example that retrieves the appropriate files from a typical iOS build\r\n#\r\n# https://docs.nuget.org/create/nuspec-reference#file-element-examples\r\n#\r\n# In some cases the ID, Version, and Description may need manually specified.\r\n#\r\n\r\n<#\r\n\r\n    <?xml version=\"1.0\"?>\r\n    <package>\r\n      <metadata>\r\n        <id>$id$</id>\r\n        <title>$id$</title>\r\n        <version>$version$</version>\r\n        <description>Mobile project packaged for Octopus deploy. $description$</description>\r\n      </metadata>\r\n      <files>\r\n        <!-- Matches mobile package files. Note this will only include the platform being built,\r\n\t         and should match only a single file. -->\r\n        \r\n        <!-- iOS -->\r\n        <file src=\"**/Release/**/*.ipa\" target=\"\" />\r\n\r\n        <!-- Include release dSYM symbols file -->\r\n        <file src=\"**/Release/*.app.dSYM.zip\" target=\"\" />\r\n\r\n        <!-- UITest DLLs -->\r\n        <file src=\"..\\*Test*\\bin\\Release\\*.dll\" target=\"bin/UITest/Release\" />\r\n\r\n        <!-- Utility EXE for TestCloud submission scripts -->\r\n        <!-- Note: The first slash after the parent directory .. MUST be backslash or the package step fails -->\r\n        <file src=\"..\\packages/Xamarin.UITest.*/tools/test-cloud.exe\" target=\"tools\" />\r\n\r\n      </files>\r\n    </package>\r\n\r\n#>\r\n\r\n#############################\r\n# Debug Parameter Overrides #\r\n#############################\r\n\r\n# These values are set explicitly durring debugging so that the script can\r\n#   be run in the editor.\r\n# For local debugging, uncomment these values and fill in appropriately.\r\n\r\n<#\r\n\r\n$OctopusParameters = @{\r\n\"appPathOverride\" = \"\" # \"bin\\iPhone\"\r\n\"dllPathOverride\" = \"\" # \"bin\\UITest\\Release\"\r\n\"testCloudUserName\" = \"your.user@name.com\"\r\n\"symbolPathOverride\" = \"\"; # \"bin\\iPhone\"\r\n\"apiKey\" = \"YOUR-KEY-HERE\";\r\n\"devicesCode\" = \"ae978982\"; # devices code here (example ae978982 is 2 devices)\r\n\"series\" = \"master\"; # default is master\r\n\"locale\" = \"en_US\"; # default locale is en_US\r\n\"testCloudExePathOverride\" = \"\" # \"tools\"\r\n}\r\n\r\n# debug folder with app files\r\n$stepPath = \"C:\\Temp\\powershellscript\\\"\r\n\r\n# #>\r\n\r\n###################################\r\n# Octopus Deploy common functions #\r\n###################################\r\n\r\n# A collection of functions that can be used by script steps to determine where packages installed\r\n# by previous steps are located on the filesystem.\r\n \r\nfunction Find-InstallLocations {\r\n    $result = @()\r\n    $OctopusParameters.Keys | foreach {\r\n        if ($_.EndsWith('].Output.Package.InstallationDirectoryPath')) {\r\n            $result += $OctopusParameters[$_]\r\n        }\r\n    }\r\n    return $result\r\n}\r\n \r\nfunction Find-InstallLocation($stepName) {\r\n    $result = $OctopusParameters.Keys | where {\r\n        $_.Equals(\"Octopus.Action[$stepName].Output.Package.InstallationDirectoryPath\",  [System.StringComparison]::OrdinalIgnoreCase)\r\n    } | select -first 1\r\n \r\n    if ($result) {\r\n        return $OctopusParameters[$result]\r\n    }\r\n \r\n    throw \"No install location found for step: $stepName\"\r\n}\r\n\r\nfunction Find-SingleInstallLocation {\r\n    $all = @(Find-InstallLocations)\r\n    if ($all.Length -eq 1) {\r\n        return $all[0]\r\n    }\r\n    if ($all.Length -eq 0) {\r\n        throw \"No package steps found\"\r\n    }\r\n    throw \"Multiple package steps have run; please specify a single step\"\r\n}\r\n\r\n#####################\r\n# Utility functions #\r\n#####################\r\n\r\nfunction Get-ExactlyOneMobilePackageFileInfo($searchPath)\r\n{\r\n    $apkFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.apk #Android\r\n    $ipaFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.ipa #iOS\r\n    $appxFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.appx # windows\r\n\r\n    $apkCount = $apkFiles.count\r\n\r\n    $ipaCount = $ipaFiles.count\r\n\r\n    $appxCount = $appxFiles.count\r\n\r\n    $totalCount = $apkCount + $ipaCount + $appxCount\r\n\r\n    if($totalCount -ne 1)\r\n    {\r\n        throw \"Did not find exactly one (1) mobile application package. Found $apkCount APK file(s), $ipaCount IPA file(s), and $appxCount Appx file(s). Searched under path: $searchPath\"\r\n    }\r\n\r\n    if($apkCount -eq 1)\r\n    {\r\n        return $apkFiles\r\n    }\r\n\r\n    if($ipaCount -eq 1)\r\n    {\r\n        return $ipaFiles\r\n    }\r\n\r\n    if($appxCount -eq 1)\r\n    {\r\n        return $appxFiles\r\n    }\r\n\r\n    throw \"Unable to find mobile application packages (fallback error - not expected)\"\r\n}\r\n\r\nfunction Get-OneDsymFileInfoOrNull($searchPath)\r\n{\r\n    $symbolFiles = Get-ChildItem -Path $searchPath -Recurse -Filter *.app.dSYM.zip\r\n    \r\n    $fileCount = $symbolFiles.count\r\n\r\n    if($fileCount -eq 0)\r\n    { \r\n        return $null\r\n    }   \r\n\r\n    if($fileCount -gt 1)\r\n    {\r\n        throw \"Found more than one symbols file. Found $fileCount dSYM file(s). Searched under path: $searchPath\"\r\n    }\r\n\r\n    return $symbolFiles\r\n}\r\n\r\nfunction Get-ExactlyOneUploadExeFileInfo($searchPath)\r\n{\r\n    $testcloudexefiles = Get-ChildItem -Path $searchPath -Recurse -Filter test-cloud.exe\r\n    \r\n    $fileCount = $testcloudexefiles.count\r\n\r\n    if($fileCount -ne 1)\r\n    {\r\n        throw \"Did not find exactly one (1) test-cloud.exe. Found $fileCount exe file(s). Searched under path: $searchPath\"\r\n    }\r\n\r\n    return $testcloudexefiles\r\n}\r\n\r\nfunction Get-ExactlyOneUITestDllPath($searchPath)\r\n{\r\n    $XamarinUITestdlls = Get-ChildItem -Path $searchPath -Recurse -Filter Xamarin.UITest.dll\r\n    \r\n    $fileCount = $XamarinUITestdlls.count\r\n\r\n    if($fileCount -ne 1)\r\n    {\r\n        throw \"Did not find exactly one (1) Test DLL location. Found $fileCount DLL location(s), based on finding 'Xamarin.UITest.dll' files. Searched under path: $searchPath\"\r\n    }\r\n    \r\n    $singleXamarinUITestDllFullPath = $XamarinUITestdlls.FullName\r\n    $UITestDllPath = Split-Path -parent $singleXamarinUITestDllFullPath\r\n    return $UITestDllPath\r\n}\r\n\r\n####################\r\n# Basic Parameters #\r\n####################\r\n\r\n# required\r\n$apiKey = $OctopusParameters['apiKey']\r\n$devicesCode = $OctopusParameters['devicesCode']\r\n$testCloudUserName = $OctopusParameters['testCloudUserName']\r\n\r\n# optional\r\n$series = $OctopusParameters['series'] # default \"master\"\r\n$locale = $OctopusParameters['locale'] # default \"en_US\"\r\n\r\n# optional additional path overrides\r\n$appPathOverride = $OctopusParameters['appPathOverride']\r\n$dllPathOverride = $OctopusParameters['dllPathOverride']\r\n$symbolPathOverride = $OctopusParameters['symbolPathOverride']\r\n$testCloudExePathOverride = $OctopusParameters['testCloudExePathOverride']\r\n\r\n# test cloud user names must be lower case to work around API/Utility issue (until issue is fixed)\r\n$testCloudUserName = $testCloudUserName.ToLower()\r\n\r\n$stepName = $OctopusParameters['MobileAppPackageStepName']\r\n\r\n# set step path, if not already set\r\nIf([string]::IsNullOrEmpty($stepPath))\r\n{\r\n    if (![string]::IsNullOrEmpty($stepName)) {\r\n        Write-Host \"Finding path to package step: $stepName\"\r\n        $stepPath = Find-InstallLocation $stepName\r\n    } else {\r\n        $stepPath = Find-SingleInstallLocation\r\n    }\r\n}\r\n\r\nWrite-Host \"Nuget Package base path    : $stepPath\"\r\n# Write-Host \"##octopus[stderr-progress]\"\r\n\r\n# find app\r\n\r\n# complete search paths, overrides may be blank\r\n$appSearchPath = Join-Path $stepPath $appPathOverride\r\n$symbolSearchPath = Join-Path $stepPath $symbolPathOverride\r\n$dllSearchPath = Join-Path $stepPath $dllPathOverride\r\n$testCouldExeSearchPath = Join-Path $stepPath $testCloudExePathOverride\r\n\r\n$appFileFullPath = (Get-ExactlyOneMobilePackageFileInfo $appSearchPath).FullName\r\n$symbolFileFullPath = (Get-OneDsymFileInfoOrNull $symbolSearchPath).FullName\r\n$dllDirectoryFullPath = Get-ExactlyOneUITestDllPath $dllSearchPath\r\n\r\n$testCloudExeFullPath = (Get-ExactlyOneUploadExeFileInfo $testCouldExeSearchPath).FullName\r\n\r\n# It turns out that the utility exe expects a dsym folder, convert to folder\r\n\r\n# DIRTY HACKS - the API should accept a *.dSYM.zip like insights does, see\r\n# https://testcloud.ideas.aha.io/ideas/XTA-I-50\r\n\r\nAdd-Type -AssemblyName System.IO.Compression.FileSystem\r\n\r\nfunction Unzip\r\n{\r\n    param([string]$zipfile, [string]$outpath)\r\n\r\n    [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)\r\n}\r\n\r\n$symbolFileDirectoryPath = \"\"\r\nif($symbolFileFullPath) # has a full zip path\r\n{\r\n    $parentPath = Split-Path -parent $symbolFileFullPath\r\n    Unzip $symbolFileFullPath $parentPath\r\n\r\n    # get unzipped folder name ending in dSYM\r\n    $symbolFileDirectoryPath = (Get-ChildItem -Path $parentPath -Recurse -Filter *.dSYM).FullName\r\n}\r\nelseif ($symbolPathOverride) # no zip, try to find folder\r\n{\r\n    # search for dSYM folder instead\r\n\r\n    $symbolFileDirectorySearchResults = Get-ChildItem -Path $searchPath -Recurse -Filter *.dSYM\r\n    \r\n    # if exactly one result\r\n    if($symbolFileDirectorySearchResults.Count -eq 1)\r\n    {\r\n        $symbolFileDirectoryPath = $symbolFileDirectorySearchResults.FullName\r\n    }\r\n}\r\n\r\n######################\r\n# Invoke the request #\r\n######################\r\n \r\nWrite-Host \"App path                   : \" $appFileFullPath\r\nWrite-Host \"Symbol File path (optional): \" $symbolFileFullPath\r\nWrite-Host \"Test DLL full path         : \" $dllDirectoryFullPath\r\nWrite-Host \"TestCloud exe path         : \" $testCloudExeFullPath\r\nWrite-Host\r\n\r\n# run command with optional argument\r\n\r\nif($symbolFileDirectoryPath) # symbols file present\r\n{\r\n    Write-Host \"Running command: \" \r\n    Write-Host \"\"\"$testCloudExeFullPath\"\" submit \"\"$appFileFullPath\"\" $apiKey --user $testCloudUserName --devices $devicesCode --series \"\"$series\"\" --locale \"\"$locale\"\" --assembly-dir \"\"$dllDirectoryFullPath\"\" --dsym \"\"$symbolFileDirectoryPath\"\"\"\r\n    Write-Host \r\n    cmd /c \"$testCloudExeFullPath\" submit \"$appFileFullPath\" $apiKey --user $testCloudUserName --devices $devicesCode --series \"$series\" --locale \"$locale\" --assembly-dir \"$dllDirectoryFullPath\" --dsym \"$symbolFileDirectoryPath\"\r\n}\r\nelse # no symbols file\r\n{\r\n    Write-Host \"Running command: \" \r\n    Write-Host \"\"\"$testCloudExeFullPath\"\" submit \"\"$appFileFullPath\"\" $apiKey --user $testCloudUserName --devices $devicesCode --series \"\"$series\"\" --locale \"\"$locale\"\" --assembly-dir \"\"$dllDirectoryFullPath\"\"\"\r\n    Write-Host\r\n    cmd /c \"$testCloudExeFullPath\" submit \"$appFileFullPath\" $apiKey --user $testCloudUserName --devices $devicesCode --series \"$series\" --locale \"$locale\" --assembly-dir \"$dllDirectoryFullPath\"\r\n}\r\n\r\nWrite-Host\r\nWrite-Host \"TestCloud upload command complete.\"",
-    "Octopus.Action.Script.Syntax": "PowerShell"
-  },
-  "SensitiveProperties": {},
-  "Parameters": [
-    {
-      "Name": "apiKey",
-      "Label": "Api Key",
-      "HelpText": "The app specific API key for your test run. This may be found in the testcloud interface for your application:\n\n1. Visit the testcloud interface: https://testcloud.xamarin.com/\n2. Choose \"New Test Run\" and configure as desired.\n3. In the last step, copy the large hash (app specific API Key), devices parameter code, and username",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      }
-    },
-    {
-      "Name": "devicesCode",
-      "Label": "Devices Code",
-      "HelpText": "The code identifying the devices to test against.\n\nThis may be found in the testcloud interface for your application:\n\n1. Visit the testcloud interface: https://testcloud.xamarin.com/\n2. Choose \"New Test Run\" and configure as desired.\n3. In the last step, copy the large hash (app specific API Key), devices parameter code, and username",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "testCloudUserName",
-      "Label": "TestCloud user name",
-      "HelpText": "The TestCloud user name (e.g. email) that should own the test run. This user must have appropriate permissions for test runs for the configured application.\n\n(Note that this user name will automatically be converted to lower case at this time, to work around an issue with the TestCloud API)",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "PackageStepName",
-      "Label": "Package Step Name",
-      "HelpText": "The name of the previously-deployed package step that contains the app files that you want to test.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "StepName"
-      }
-    },
-    {
-      "Name": "series",
-      "Label": "Series",
-      "HelpText": "You may specify a test series to run, or use the default of \"master\".",
-      "DefaultValue": "master",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "locale",
-      "Label": "Locale",
-      "HelpText": "You may specify a locate to run the tests under, or use the default of \"en_US\".",
-      "DefaultValue": "en_US",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "appPathOverride",
-      "Label": "App path override (optional)",
-      "HelpText": "This fully optional search path allows you to look for app files in a specific folder path in your nuget file, such as \"bin\\iPhone\". This may be needed in cases when the nuget file has multiple app files in different locations. This path override is a path relative to the root of the nuget file.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "dllPathOverride",
-      "Label": "UITest DLL path override (optional)",
-      "HelpText": "This fully optional search path allows you to look for the UITest DLL library files in a specific folder path in your nuget file, such as \"bin\\UITest\\Release\". This may be needed in cases when the nuget file has multiple UITest libraries in different locations. This path override is a path relative to the root of the nuget file.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "symbolPathOverride",
-      "Label": "Symbol Path Override (optional)",
-      "HelpText": "!!IMPORTANT!!\nA symbols file is NOT REQUIRED for TestCloud. It only provides more information for crashes.\n\nThis optional search path allows you to look in a specific folder path in your nuget file, such as \"bin\\iPhone\", for a *.dSYM.zip symbols file. This path override is a path relative to the root of the nuget file.\n\nIf an override is specified and a .zip file is not found, the script will search for a *.dSYM folder to use instead. This means if you have a dSYM folder and not a zip file, you can specify \".\" as an override to search the entire nuget package for the folder, or specify a more specific search path.\n\nThis may be needed in cases when the nuget file has multiple symbol files in different locations, or when you only have a dSYM folder, not a .zip file available.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "testCloudExePathOverride",
-      "Label": "test-cloud.exe path override (optional)",
-      "HelpText": "This fully optional search path allows you to look for the test-cloud.exe utility file in a specific folder path in your nuget file, such as \"tools\". This may be needed in cases when the nuget file has multiple instances of the test-cloud.exe utility in different locations. This path override is a path relative to the root of the nuget file.",
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedOn": "2016-01-18T21:50:44.530+00:00",
-  "LastModifiedBy": "colin.dabritz@viewpoint.com",
-  "$Meta": {
-    "ExportedAt": "2016-01-19T23:14:49.354+00:00",
-    "OctopusVersion": "2.6.4.951",
-    "Type": "ActionTemplate"
-  },
-  "Category": "xamarin"
-}
\ No newline at end of file
diff --git a/step-templates/xml-transform-using-xdt.json b/step-templates/xml-transform-using-xdt.json
deleted file mode 100644
index 93dc46956..000000000
--- a/step-templates/xml-transform-using-xdt.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "Id": "569a5f1b-bb57-491a-9c4e-a6d6e44e6b26",
-  "Name": "XML Transform using XDT",
-  "Description": "You can use this script to easily transform any XML file using XDT.\nThe script will download its dependencies automatically.",
-  "ActionType": "Octopus.Script",
-  "Version": 8,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "function Get-Parameter($Name, $Default, [switch]$Required) {\r\n    $result = $null\r\n\r\n    if ($OctopusParameters -ne $null) {\r\n        $result = $OctopusParameters[$Name]\r\n    }\r\n\r\n    if ($result -eq $null) {\r\n        if ($Required) {\r\n            throw \"Missing parameter value $Name\"\r\n        } else {\r\n            $result = $Default\r\n        }\r\n    }\r\n\r\n    return $result\r\n}\r\n\r\n$toolsDir = Get-Parameter \"toolsDir\" -Required\r\n$sourceFile = Get-Parameter \"sourceFile\" -Required\r\n$transformFile = Get-Parameter \"transformFile\" -Required\r\n$destFile = Get-Parameter \"destFile\" -Required\r\n\r\nif(!(Test-Path $toolsDir)){\r\n    New-Item -Path $toolsDir -ItemType Directory\r\n}\r\n$nugetDestPath = Join-Path -Path $toolsDir -ChildPath nuget.exe\r\nif(!(Test-Path $nugetDestPath)){\r\n    Write-Output 'Downloading nuget.exe'\r\n\t# download nuget\r\n    Invoke-WebRequest 'http://nuget.org/nuget.exe' -OutFile $nugetDestPath\r\n    # double check that it was written to disk\r\n    if(!(Test-Path $nugetDestPath)){\r\n        throw 'unable to download nuget'\r\n    }\r\n}\r\n\r\n$xdtExe = (Get-ChildItem -Path $toolsDir -Include 'SlowCheetah.Xdt.exe' -Recurse) | Select-Object -First 1\r\n\r\nif(!$xdtExe){\r\n    Write-Output 'Downloading xdt since it was not found in the tools folder'\r\n     # nuget install SlowCheetah.Xdt -Prerelease -OutputDirectory toolsDir\\\r\n    $nugetInstallCmdArgs = @('install','SlowCheetah.Xdt','-Prerelease','-OutputDirectory',(Resolve-Path $toolsDir).ToString())\r\n\r\n    Write-Output ('Calling nuget.exe to download SlowCheetah.Xdt with the following args: [{0} {1}]' -f $nugetDestPath, ($nugetInstallCmdArgs -join ' '))\r\n    &($nugetDestPath) $nugetInstallCmdArgs\r\n\r\n    $xdtExe = (Get-ChildItem -Path $toolsDir -Include 'SlowCheetah.Xdt.exe' -Recurse) | Select-Object -First 1\r\n\r\n    if(!$xdtExe){\r\n        throw ('SlowCheetah.Xdt not found')\r\n    }\r\n\r\n    # copy the xdt assemlby if the xdt directory is missing it\r\n    $xdtDllExpectedPath = (Join-Path $xdtExe.Directory.FullName 'Microsoft.Web.XmlTransform.dll')\r\n\r\n    if(!(Test-Path $xdtDllExpectedPath)){\r\n        # copy the xdt.dll next to the slowcheetah .exe\r\n        $xdtDll = (Get-ChildItem -Path $toolsDir -Include 'Microsoft.Web.XmlTransform.dll' -Recurse) | Select-Object -First 1\r\n\r\n        if(!$xdtDll){\r\n\t\t    throw 'Microsoft.Web.XmlTransform.dll not found'\r\n\t\t}\r\n\r\n        Copy-Item -Path $xdtDll.Fullname -Destination $xdtDllExpectedPath\r\n    }\r\n}\r\n\r\n$cmdArgs = @((Resolve-Path $sourceFile).ToString(),\r\n            (Resolve-Path $transformFile).ToString(),\r\n            (Resolve-Path $destFile).ToString())\r\n\r\nWrite-Output ('Calling slowcheetah.xdt.exe with the args: [{0} {1}]' -f $xdtExe, ($cmdArgs -join ' '))\r\n&($xdtExe) $cmdArgs\r\n",
-    "Octopus.Action.Script.ScriptFileName": null,
-    "Octopus.Action.Package.NuGetFeedId": null,
-    "Octopus.Action.Package.NuGetPackageId": null
-  },
-  "Parameters": [
-    {
-      "Name": "sourceFile",
-      "Label": "Source file path",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "transformFile",
-      "Label": "Transform file path",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "destFile",
-      "Label": "Destination file path",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    },
-    {
-      "Name": "toolsDir",
-      "Label": "Directory to download tools programs",
-      "HelpText": null,
-      "DefaultValue": "C:\\tools",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      }
-    }
-  ],
-  "LastModifiedBy": "lijunkang",
-  "$Meta": {
-    "ExportedAt": "2016-08-24T07:11:46.726+00:00",
-    "OctopusVersion": "3.3.17",
-    "Type": "ActionTemplate"
-  },
-  "Category": "xml"
-}
\ No newline at end of file
diff --git a/step-templates/zabbix-node-api-maintenance.json b/step-templates/zabbix-node-api-maintenance.json
deleted file mode 100644
index 05ea85261..000000000
--- a/step-templates/zabbix-node-api-maintenance.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "Id": "2fdc47cd-d120-4919-b0d5-2ed22ca8ff62",
-  "Name": "Zabbix API maintenance",
-  "Description": "This step template adds single host on Zabbix maintenance.",
-  "ActionType": "Octopus.Script",
-  "Version": 12,
-  "Properties": {
-    "Octopus.Action.Script.Syntax": "PowerShell",
-    "Octopus.Action.Script.ScriptSource": "Inline",
-    "Octopus.Action.Script.ScriptBody": "$Zserver=\"#{zserver}\"\n$Zuser=\"#{zuser}\"\n$Zpassword=\"#{zpass}\"\n$Zhost=\"#{zhost}\"\n$setgmt=#{gmt}\n$hours=#{hours}\n$action=\"#{action}\"\n$number=\"#{number}\"\n\n[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;\n\nfunction Get-Auth{\n    param(\n        $server,\n        $user,\n        $pass,\n        $url\n    )\n    $body='{\"jsonrpc\": \"2.0\", \"method\": \"user.login\", \"params\": {\"user\": \"'+\"$user\"+'\", \"password\": \"'+\"$pass\"+'\"}, \"id\": 1, \"auth\": null}'\n    try {\n        $key=Invoke-WebRequest -Uri \"$url\" -ContentType application/json-rpc -Body $body -Method Put -UseBasicParsing\n        } catch [Exception] {\n            Write-Error \"Error: cannot connect to zabbix server ($($_.Exception.Message)), check hostname/url! Frequently zabbix is installed on a virtual folder like {hostname}/zabbix, please include the folder into the hostname variable.`r`n\" -ErrorAction Stop\n        }\n    $token=($key.Content | ConvertFrom-Json).result\n    return $token\n}\n\nfunction Remove-Maintenance{\n    param(\n        $srvr,\n        $usr,\n        $pswd,\n        $uri,\n        $mname\n    )\n    $remove='{\"jsonrpc\": \"2.0\", \"method\": \"maintenance.get\", \"params\": {\"output\": \"extend\", \"selectHosts\": \"extend\", \"selectTimeperiods\": \"extend\"},\"auth\": \"'+\"$auth\"+'\",\"id\": 1}'\n\n    $maintenace=Invoke-WebRequest -Uri \"$uri\" -ContentType application/json-rpc -Body $remove -Method Put -UseBasicParsing\n    $select= ($maintenace.Content | ConvertFrom-Json).result | where{$_.name -like \"$mname\"}\n    $id=$select.maintenanceid\n    if($id){\n        Write-Output \"Remove maintenance ID: $id\"\n        $rmv='{\"jsonrpc\": \"2.0\", \"method\": \"maintenance.delete\", \"params\": [\"'+\"$id\"+'\"], \"auth\": \"'+\"$auth\"+'\",\"id\": 1}'\n        $actionremove=Invoke-WebRequest -Uri \"$uri\" -ContentType application/json-rpc -Body $rmv -Method Put -UseBasicParsing\n        $check=(($actionremove.Content | ConvertFrom-Json).result).maintenanceids\n        if($check -like $id){\n            Write-Output \"Maintenance $id removed\"\n        }\n        else{\n            Write-Error \"Something wrong. Please contact your system administrator\"\n        }\n    }\n    else{\n        Write-Error \"NO Maintenance ID - contact your system administrator\"\n    }\n}\n\n###GLOBAL VARIABLES###\nif (!$Zserver.StartsWith(\"http\")) { $Zserver=\"http://$Zserver\" } \n$Zurl=\"$Zserver/api_jsonrpc.php\"\n$maintenancename=\"Octo-$number-$Zhost\"\n\n###GET AUTH FROM ZABBIX SERVER###\n$auth=Get-Auth -server $Zserver -user $Zuser -pass $Zpassword -url $Zurl\nif ($auth -eq $null) { \n    Write-Error \"Authentication failure for user $Zuser on server $Zserver!\" -ErrorAction Stop \n    exit\n}\n\n###GET HOST ID###\n$content='{\"jsonrpc\": \"2.0\", \"method\": \"host.get\", \"params\": {\"output\": \"extend\", \"filter\": {\"host\": \"'+\"$Zhost\"+'\"}},\"auth\": \"'+\"$auth\"+'\",\"id\": 1}'\n$zabbixhost=Invoke-WebRequest -Uri \"$Zurl\" -ContentType application/json-rpc -Body $content -Method Put -UseBasicParsing\n$nameserver=$zabbixhost.Content | ConvertFrom-Json\n$hostid=$nameserver.result.hostid\nif($hostid){\n    Write-Output \"Host $Zhost found with ID: $hostid\"\n}\nelse{\n    Write-Error \"Host $Zhost not found, or user not authorized for this host - please contact your system administrator!\"\n    exit\n}\n\n###ADD NEW MAINTENANCE###\nif ($action -eq \"create\"){\n    ###REMOVE MAINTENANCE IF ALREADY EXISTS WITH THE SAME NAME###\n    $remove='{\"jsonrpc\": \"2.0\", \"method\": \"maintenance.get\", \"params\": {\"output\": \"extend\", \"selectHosts\": \"extend\", \"selectTimeperiods\": \"extend\"},\"auth\": \"'+\"$auth\"+'\",\"id\": 1}'\n    $maintenace=Invoke-WebRequest -Uri \"$Zurl\" -ContentType application/json-rpc -Body $remove -Method Put -UseBasicParsing\n\n    $select= ($maintenace.Content | ConvertFrom-Json).result | where{$_.name -like \"$maintenancename\"}\n    if(!$select){\n        Write-Output \"No maintenance with the same name is already registered\"\n    }\n    else{\n        Remove-Maintenance -srvr $Zserver -usr $Zuser -pswd $Zpassword -uri $Zurl -mname $maintenancename\n    }\n\n    ###START TO CREATE NEW MAINTENANCE###\n    $since=[int][double]::Parse((get-date -UFormat %s))\n    $till=0\n\n    ###ATTENTION ON GMT - THIS WORK FOR ITALIAN ZONE AND TAKES DAYLIGHT SAVINGSTIME FROM###\n    ###start check your ZABBIX configuration###\n    $workdate=(Get-Date)\n    if (![int32]::TryParse($setgmt, [ref] $gmt)) { $gmt=([TimeZoneInfo]::Local.BaseUtcOffset).Hours }\n    if ($workdate.IsDaylightSavingTime()) { $gmt+=1 }\n\n    $min=$workdate.AddHours(-$gmt).Minute\n    $h=$workdate.AddHours(-$gmt).Hour\n    $minutetoseconds=$min*=60\n    $hourstoseconds=$h*=3600\n    $starttime=$minutetoseconds+=$hourstoseconds\n    $seconds=$hours*=3600\n\n    $sincesum=$since\n    $till=$sincesum+=$seconds\n    $since=$since-=(60*60*$gmt)\n    $till=$till-=(60*60*$gmt)\n\n    ###stop check your ZABBIX configuration###\n    $add='{\"jsonrpc\": \"2.0\", \"method\": \"maintenance.create\", \"params\": {\"name\": \"'+\"$maintenancename\"+'\", \"active_since\": \"'+\"$since\"+'\", \"active_till\": '+\"$till\"+', \"hostids\": [\"'+$hostid+'\"], \"timeperiods\": [{\"timeperiod_type\": 0, \"start_time\": '+$starttime+', \"period\": '+$seconds+'}]}, \"auth\": \"'+$auth+'\", \"id\": 1}'\n    $maintenance=Invoke-WebRequest -Uri \"$Zurl\" -ContentType application/json-rpc -Body $add -Method Put -UseBasicParsing\n    $check=(($maintenance.Content | ConvertFrom-Json).result).maintenanceids\n    if($check){\n        Write-Output \"Maintenance $check created\"\n    }\n    else{\n        Write-Error \"Something wrong. Please contact your system administrator\"\n    }\n}\nelse{\n    if($action -eq \"remove\"){\n        Remove-Maintenance -srvr $Zserver -usr $Zuser -pswd $Zpassword -uri $Zurl -mname $maintenancename        \n    }\n    else{\n        Write-Error \"Action $action not possible\"\n    }\n}"
-  },
-  "Parameters": [
-    {
-      "Id": "2d679eba-f403-4548-a57d-dacacfb5b299",
-      "Name": "zserver",
-      "Label": "Zabbix Server",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "898bbce8-28d3-43d1-9d19-a659ffce3865",
-      "Name": "zuser",
-      "Label": "Zabbix Username",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "86e4c608-e37f-4a0a-a432-e1c07b8f2b6b",
-      "Name": "zpass",
-      "Label": "Zabbix Password",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Sensitive"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "1f51ac2a-852a-4f88-be40-a1304eb11cb2",
-      "Name": "zhost",
-      "Label": "Host",
-      "HelpText": "host in maintenance - single host",
-      "DefaultValue": "#{Octopus.Machine.Name}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "50e5fbdd-949e-4ce8-8a10-94a403c3fb2d",
-      "Name": "action",
-      "Label": "",
-      "HelpText": null,
-      "DefaultValue": null,
-      "DisplaySettings": {
-        "Octopus.ControlType": "Select",
-        "Octopus.SelectOptions": "create|Create maintenance\nremove|Remove maintenance"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "b1ef0d32-ec8e-44f3-a7f4-a34af6cd252c",
-      "Name": "gmt",
-      "Label": "GMT",
-      "HelpText": "This option depends on Zabbix server configuration.\nIf it is not necessary, set GMT=0 (UTC).\nIf UTC+2, insert 2. If UTC-4, insert -4.",
-      "DefaultValue": "0",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "6fa1f56d-b9ee-4830-9e88-a434c6b82774",
-      "Name": "hours",
-      "Label": "Maintenance Period",
-      "HelpText": "in hours",
-      "DefaultValue": "4",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    },
-    {
-      "Id": "ca825d16-f0ff-4bcc-b0e7-abcde1f2188e",
-      "Name": "number",
-      "Label": "ID for maintenance name",
-      "HelpText": "maintenance name: Octo-[number]-[host]",
-      "DefaultValue": "#{Octopus.Release.Number}",
-      "DisplaySettings": {
-        "Octopus.ControlType": "SingleLineText"
-      },
-      "Links": {}
-    }
-  ],
-  "LastModifiedBy": "dpijl10",
-  "$Meta": {
-    "ExportedAt": "2018-04-11T11:33:40.330Z",
-    "OctopusVersion": "2018.2.7",
-    "Type": "ActionTemplate"
-  },
-  "Category": "zabbix"
-}

From 16b44670d7bfc30c2e1eb5a3084541aaa67cc126 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 01:27:15 -0700
Subject: [PATCH 13/21] chore: finalize source-first step template workflow

---
 .gitignore                               |  3 +-
 README.md                                |  5 +-
 package.json                             |  4 +-
 tools/README.md                          | 28 +++-----
 tools/_diff.ps1                          | 91 ------------------------
 tools/migration-prepare-step-template.js | 65 -----------------
 tools/migration-verify-step-template.js  | 34 ---------
 7 files changed, 12 insertions(+), 218 deletions(-)
 delete mode 100644 tools/_diff.ps1
 delete mode 100644 tools/migration-prepare-step-template.js
 delete mode 100644 tools/migration-verify-step-template.js

diff --git a/.gitignore b/.gitignore
index bb22e23d6..3448812dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,7 @@ step-templates/*.ps1
 step-templates/*.sh
 step-templates/*.py
 step-templates/*.json.orig
-# Final cutover:
-# step-templates/*.json
+step-templates/*.json
 diff-output/
 .tmp*/
 /.vs
diff --git a/README.md b/README.md
index 55db8d729..0144da7f4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Organization
 * *Step templates* are authored under `/src/step-templates`
 * Generated compatibility JSON for the website and Octopus imports is written to `/step-templates`
 * The *library website* is largely under `/app`, with build artifacts at the root of the repository
-* The `/tools` folder contains the existing pack/unpack scripts plus migration and generation helpers
+* The `/tools` folder contains the existing pack/unpack scripts plus the source-first generation helpers
 
 Source Layout
 -------------
@@ -38,8 +38,6 @@ Reviewing PRs
 
 For migrated templates, review the files under `/src/step-templates/<template>/` directly. Script changes now appear as normal file diffs instead of escaped JSON string blobs.
 
-During the migration period, some templates may still exist only in legacy packed form under `/step-templates`. Dev/build tooling supports this mixed state, but all new authoring should move toward the source layout in `/src/step-templates`.
-
 ### Checklist
 
 When reviewing a PR, keep the following things in mind:
@@ -48,6 +46,7 @@ When reviewing a PR, keep the following things in mind:
 * Parameter names should not start with `$`
 * The `DefaultValue`s of `Parameter`s should be either a string or null.
 * `LastModifiedBy` field must be present, and (_optionally_) updated with the correct author
+* Generated JSON under `/step-templates` should not be hand-edited or committed
 * If a new `Category` has been created:
    * An image with the name `{categoryname}.png` must be present under the `src/step-templates/logos` folder
    * The `switch` in the `humanize` function in [`gulpfile.babel.js`](https://github.com/OctopusDeploy/Library/blob/master/gulpfile.babel.js#L92) must have a `case` statement corresponding to it
diff --git a/package.json b/package.json
index a954c6098..5f125a5fa 100644
--- a/package.json
+++ b/package.json
@@ -88,9 +88,7 @@
     "start": "gulp watch",
     "lint": "eslint './**/*.{js,jsx}'",
     "lint:fix": "npm run lint -- --fix",
-    "step-templates:generate": "node tools/generate-step-templates.js all",
-    "step-templates:prepare": "node tools/migration-prepare-step-template.js",
-    "step-templates:verify": "node tools/migration-verify-step-template.js"
+    "step-templates:generate": "node tools/generate-step-templates.js all"
   },
   "author": "The Octopus Deploy team and contributors",
   "license": "Apache-2.0",
diff --git a/tools/README.md b/tools/README.md
index 0c99919f1..3ecbdf71e 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -2,7 +2,7 @@ Tools
 =====
 
 This folder contains both the legacy step-template pack/unpack scripts and the
-new helper scripts used during the source-first migration.
+helper scripts used by the source-first workflow.
 
 Legacy scripts that must remain behaviorally unchanged
 ------------------------------------------------------
@@ -29,24 +29,12 @@ They read authored content from `/src/step-templates`, materialize the
 temporary legacy sidecar layout expected by the unchanged packer, invoke the
 legacy pack flow, and then clean up the temporary sidecars.
 
-Migration-only helper scripts
------------------------------
+Retained legacy utilities
+-------------------------
 
-These exist only to support the repository migration and should be removable
-after the migration is complete:
+These remain for compatibility and round-trip fidelity:
 
-* `migration-prepare-step-template.js`
-* `migration-verify-step-template.js`
-
-They handle `.json.orig` creation, `git mv` preparation, placeholder updates,
-and byte-for-byte validation of regenerated output.
-
-Helpers to evaluate for removal later
--------------------------------------
-
-These are retained for now but should be reviewed once the migration is proven:
-
-* `_diff.ps1`
-
-After templates are authored as normal files under `/src/step-templates`, GitHub
-diffs should make `_diff.ps1` unnecessary for most review workflows.
+* `_pack.ps1`
+* `_unpack.ps1`
+* `Converter.ps1`
+* `StepTemplatePacker/`
diff --git a/tools/_diff.ps1 b/tools/_diff.ps1
deleted file mode 100644
index 8e66e9939..000000000
--- a/tools/_diff.ps1
+++ /dev/null
@@ -1,91 +0,0 @@
-param
-(
-    [Parameter(Mandatory=$true)]
-    [string] $SearchPattern,
-
-    [Parameter(Mandatory=$false)]
-    [string] $CompareWith = "HEAD~1",
-
-    [Parameter(Mandatory=$false)]
-    [string] $OutputFolder = "diff-output"
-)
-
-$ErrorActionPreference = "Stop";
-Set-StrictMode -Version "Latest";
-
-$thisScript  = $MyInvocation.MyCommand.Path;
-$thisFolder  = [System.IO.Path]::GetDirectoryName($thisScript);
-$repoRoot    = [System.IO.Path]::GetDirectoryName($thisFolder);
-
-$stepTemplateFolder = [System.IO.Path]::Combine($repoRoot, "step-templates");
-$stepTemplates = [System.IO.Directory]::GetFiles($stepTemplateFolder, "$SearchPattern.json");
-
-if ($stepTemplates.Length -eq 0)
-{
-    Write-Error "No step templates found matching '$SearchPattern'";
-    return;
-}
-
-Import-Module -Name ([System.IO.Path]::Combine($thisFolder, "StepTemplatePacker")) -ErrorAction "Stop";
-
-$outputPath = [System.IO.Path]::Combine($repoRoot, $OutputFolder);
-if (-not (Test-Path $outputPath))
-{
-    New-Item -ItemType Directory -Path $outputPath | Out-Null;
-}
-
-$scriptProperties = @(
-    @{ Name = "ScriptBody"; Property = "Octopus.Action.Script.ScriptBody" },
-    @{ Name = "PreDeploy";  Property = "Octopus.Action.CustomScripts.PreDeploy.ps1" },
-    @{ Name = "Deploy";     Property = "Octopus.Action.CustomScripts.Deploy.ps1" },
-    @{ Name = "PostDeploy"; Property = "Octopus.Action.CustomScripts.PostDeploy.ps1" }
-)
-
-foreach ($stepTemplate in $stepTemplates)
-{
-    $relativePath = "step-templates/$([System.IO.Path]::GetFileName($stepTemplate))";
-    $templateName = [System.IO.Path]::GetFileNameWithoutExtension($stepTemplate);
-
-    $oldJson = $null;
-    try
-    {
-        $oldText = git show "${CompareWith}:${relativePath}" 2>$null;
-        if ($LASTEXITCODE -eq 0 -and $oldText)
-        {
-            $oldJson = ConvertFrom-Json -InputObject ($oldText -join "`n");
-        }
-    }
-    catch
-    {
-        Write-Host "No previous version found for '$templateName' at $CompareWith" -ForegroundColor Yellow;
-        continue;
-    }
-
-    $newText = Get-Content -Path $stepTemplate -Raw;
-    $newJson = ConvertFrom-Json -InputObject $newText;
-
-    # Get file extension from syntax
-    $syntax = Get-OctopusStepTemplateProperty -StepJson $newJson -PropertyName "Octopus.Action.Script.Syntax" -DefaultValue "PowerShell";
-    $fileType = Get-OctopusStepTemplateFileType -Syntax $syntax;
-
-    foreach ($prop in $scriptProperties)
-    {
-        $oldValue = Get-OctopusStepTemplateProperty -StepJson $oldJson -PropertyName $prop.Property;
-        $newValue = Get-OctopusStepTemplateProperty -StepJson $newJson -PropertyName $prop.Property;
-
-        if ([string]::IsNullOrEmpty($oldValue) -and [string]::IsNullOrEmpty($newValue)) { continue; }
-
-        $oldFile = [System.IO.Path]::Combine($outputPath, "$templateName.$($prop.Name).old$fileType");
-        $newFile = [System.IO.Path]::Combine($outputPath, "$templateName.$($prop.Name).new$fileType");
-
-        Set-Content -Path $oldFile -Value $oldValue -NoNewline;
-        Set-Content -Path $newFile -Value $newValue -NoNewline;
-
-        Write-Host "Created: $($prop.Name)" -ForegroundColor Cyan;
-        Write-Host "  Old: $oldFile";
-        Write-Host "  New: $newFile";
-    }
-}
-
-Write-Host "";
-Write-Host "Files written to: $outputPath" -ForegroundColor Green;
diff --git a/tools/migration-prepare-step-template.js b/tools/migration-prepare-step-template.js
deleted file mode 100644
index 4933cc658..000000000
--- a/tools/migration-prepare-step-template.js
+++ /dev/null
@@ -1,65 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-const path = require("path");
-const { execFileSync } = require("child_process");
-const {
-  ensureDirectory,
-  getLegacyJsonPath,
-  getLegacyOrigPath,
-  getSourceTemplateDirectory,
-  moveExtractedSidecarsIntoSource,
-  normalizeTemplateName,
-  repoRoot,
-  runPack,
-  runUnpack,
-  updateMetadataWithPlaceholders,
-} = require("./source-step-template-lib");
-
-function gitMove(fromPath, toPath) {
-  execFileSync("git", ["mv", fromPath, toPath], {
-    cwd: repoRoot,
-    stdio: "inherit",
-  });
-}
-
-function prepareTemplate(templateName) {
-  const normalizedName = normalizeTemplateName(templateName);
-  const legacyJsonPath = getLegacyJsonPath(normalizedName);
-  const legacyOrigPath = getLegacyOrigPath(normalizedName);
-  const sourceDirectory = getSourceTemplateDirectory(normalizedName);
-  const metadataPath = path.join(sourceDirectory, "metadata.json");
-
-  if (!fs.existsSync(legacyJsonPath)) {
-    throw new Error(`Legacy template '${normalizedName}.json' was not found.`);
-  }
-
-  ensureDirectory(sourceDirectory);
-
-  runUnpack(normalizedName);
-  runPack(normalizedName);
-
-  if (!fs.existsSync(legacyOrigPath)) {
-    fs.copyFileSync(legacyJsonPath, legacyOrigPath);
-  }
-
-  if (!fs.existsSync(metadataPath)) {
-    gitMove(path.relative(repoRoot, legacyJsonPath), path.relative(repoRoot, metadataPath));
-  }
-
-  moveExtractedSidecarsIntoSource(normalizedName);
-  updateMetadataWithPlaceholders(normalizedName);
-}
-
-function main() {
-  const templateNames = process.argv.slice(2);
-  if (templateNames.length === 0) {
-    throw new Error("At least one template name is required.");
-  }
-
-  for (const templateName of templateNames) {
-    prepareTemplate(templateName);
-  }
-}
-
-main();
diff --git a/tools/migration-verify-step-template.js b/tools/migration-verify-step-template.js
deleted file mode 100644
index 55ab1cd40..000000000
--- a/tools/migration-verify-step-template.js
+++ /dev/null
@@ -1,34 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-const {
-  compareGeneratedToOrig,
-  generateTemplate,
-  getLegacyOrigPath,
-  normalizeTemplateName,
-} = require("./source-step-template-lib");
-
-function main() {
-  const args = process.argv.slice(2);
-  const cleanup = args.includes("--cleanup");
-  const templateNames = args.filter((arg) => arg !== "--cleanup");
-
-  if (templateNames.length === 0) {
-    throw new Error("At least one template name is required.");
-  }
-
-  for (const templateName of templateNames) {
-    const normalizedName = normalizeTemplateName(templateName);
-    generateTemplate(normalizedName);
-
-    if (!compareGeneratedToOrig(normalizedName)) {
-      throw new Error(`Packed output for '${normalizedName}' does not match '${normalizedName}.json.orig'.`);
-    }
-
-    if (cleanup) {
-      fs.rmSync(getLegacyOrigPath(normalizedName), { force: true });
-    }
-  }
-}
-
-main();

From 997838e3ee3527dc155c0203c02d55bf62432032 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 13:01:38 -0700
Subject: [PATCH 14/21] chore: finalize source-first documentation and cleanup

---
 .github/CONTRIBUTING.md                     |  25 +--
 .github/pull_request_template.md            |   6 +-
 README.md                                   |  27 ++-
 gulpfile.babel.js                           |   7 +-
 package.json                                |   2 +-
 plan.md                                     | 215 --------------------
 progress-src-step-templates-legacy-clean.md |  81 --------
 spec/step-template-validation-tests.js      |   3 +-
 tools/README.md                             |   1 +
 tools/_diff.ps1                             |  91 +++++++++
 tools/source-step-template-lib.js           |  79 -------
 11 files changed, 138 insertions(+), 399 deletions(-)
 delete mode 100644 plan.md
 delete mode 100644 progress-src-step-templates-legacy-clean.md
 create mode 100644 tools/_diff.ps1

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 546784b13..ebdb78436 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,24 +5,19 @@ Have a great custom step that other Octopus users will love? Here's how to get i
 
 1. [Fork](https://github.com/OctopusDeploy/Library/fork) the Library repository
 2. Clone your fork into a directory on your own machine
-3. _Export_ your template from the Octopus server
-4. Save the exported JSON to a file under `/step-templates`
+3. If you're adding a new template, create a new folder under `/src/step-templates/<template>/`
+4. Add or update `metadata.json` and any sibling script files such as `scriptbody.ps1`, `scriptbody.sh`, `scriptbody.py`, `predeploy.ps1`, `deploy.ps1`, or `postdeploy.ps1`
 5. Check that the `LastModifiedBy` username is one you're happy to use on the site (ideally your plain GitHub username)
 6. Add Id property and set it to a GUID using the following format `abcdef00-ab00-cd00-ef00-000000abcdef`, you can use [this site](https://www.guidgen.com/) to generate one automatically
 7. Optional: Assign your template to an existing category. Have a look at existing templates to find the category that matches your template. If you don't specify it your template will be assigned to 'other' category.
-   - If you add a new category, make sure that you add an icon in `.png` format with a size of 200x200px to the `logos` folder with the same name as your category. Also, the `switch` in the `humanize` function in [`gulpfile.babel.js`](https://github.com/OctopusDeploy/Library/blob/master/gulpfile.babel.js#L92) must have a `case` statement corresponding to it.
+   - If you add a new category, make sure that you add an icon in `.png` format with a size of 200x200px to the `src/step-templates/logos` folder with the same name as your category. Also, the `switch` in the `humanize` function in [`gulpfile.babel.js`](https://github.com/OctopusDeploy/Library/blob/master/gulpfile.babel.js#L92) must have a `case` statement corresponding to it.
 8. If you're updating an existing step template, make sure the `Version` property is incremented (e.g. by 1). If the `Version` doesn't change then the [Community Library Integration](http://docs.octopusdeploy.com/display/OD/Step+Templates#StepTemplates-TheCommunityLibrary) in Octopus won't see your changes.
-9. Commit and push your changes to your fork
-10. View your fork in GitHub to create a _pull request_
+9. Run `npm run build` to regenerate the packed compatibility JSON and validate the result
+10. Commit and push your changes to your fork
+11. View your fork in GitHub to create a _pull request_
 
 Someone from the Octopus team will review your request and help to make the step consistent with the others in the library. Once it's ready we'll merge it into the main repository and publish it to [the library site](http://library.octopusdeploy.com).
 
-**Note**: If you're editing an existing template we've got a tool you can use to help with packing and unpacking the scripts stored in the step template `*.json` file.
-
-* To unpack the step template scripts into separate files alongside the main step template file, run `powershell .\tools\_unpack.ps1`.
-* You can then edit the `*.ps1` files in the `.\step-templates` folder using your favourite PowerShell editor.
-* To pack the step template script files back into the main step template, run `powershell .\tools\_pack.ps1`. 
-
 Here's a **checklist** to consider:
 
 * Is the template a minor variation on an existing one? If so, please consider improving the existing template if possible.
@@ -30,7 +25,7 @@ Here's a **checklist** to consider:
 * Are all parameters in the template consistent with the examples here, including help text documented with Markdown?
 * **To minimize the risk of step template parameters clashing with other variables in a project that uses the step template, ensure that you prefix your parameter names (e.g. an abbreviated name for the step template or the category of the step template**
 * Is the description of the template complete, correct Markdown?
-* Is the `.json` filename consistent with the name of the template?
+* Is the template folder name under `/src/step-templates` consistent with the name of the template?
 * Do scripts in the template validate required arguments and fail by returning a non-zero exit code when things go wrong?
 * Do scripts in the template produce worthwhile status messages as they execute?
 * Are you happy to contribute your template under the terms of the [license](https://github.com/OctopusDeploy/Library/blob/master/LICENSE.txt)? If you produced the template while working for your employer please obtain written permission from them before submitting it here.
@@ -63,7 +58,7 @@ We also accept contributions to improve the [library.octopusdeploy.com](http://l
 
 To build the library site you need to have `nodejs` installed on your system.
 
-Run the setup job to install `gulp` globally and install the npm dependencies:
+Run the setup job to install the npm dependencies:
 
 ```
 npm run setup
@@ -76,7 +71,7 @@ Congratulations, you are now ready to build and test the site locally.
 From the root of the repository, run the following command: 
 
 ```
-gulp build
+npm run build
 ```
 
 This will build a debuggable version of the library site and output it to `./build/`. To test the site, run the following command:
@@ -91,7 +86,7 @@ This will start the `express` server and you can browse the site at the followin
 While developing you can run the site in development mode so that as you make changes to the code your browser will refresh to reflect the changes you just made. To run the site in development mode, run the following command:
 
 ```
-gulp watch
+npm run dev
 ```
 
 This will start a `LiveServer` that is used as a proxy for the `express` server running on `http://localhost:9000` and `gulp` will watch for changes and when detected, refresh your browser window.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9f007c1d4..92d70cd8a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,7 +4,7 @@
 * Is the name of the template consistent with the examples already in the library, in style ("Noun - Verb"), layout and casing?
 * Are all parameters in the template consistent with the examples here, including help text documented with Markdown?
 * Is the description of the template complete, with correct Markdown?
-* Is the `.json` filename consistent with the name of the template?
+* Is the template folder under `/src/step-templates` consistent with the name of the template?
 * Do scripts in the template validate required arguments and fail by returning a non-zero exit code when things go wrong?
 * Do scripts in the template produce worthwhile status messages as they execute?
 * Are you happy to contribute your template under the terms of the [license](https://github.com/OctopusDeploy/Library/blob/master/LICENSE.txt)? If you produced the template while working for your employer please obtain written permission from them before submitting it here.
@@ -37,11 +37,11 @@ _Before submitting your PR, please delete everything above the line below._
   - **NOTE** If you are modifying an existing step template, please make sure that you **do not** modify the `Id` property *(updating the `Id` will break the Library sync functionality in Octopus)*. 
 - [ ] `Version` should be incremented, otherwise the integration with Octopus won't update the step template correctly
 - [ ] Parameter names should not start with `$`
-- [ ] **Step template parameter names (the ones declared in the JSON, not the script body) should be prefixed with a namespace so that they are less likely to clash with other user-defined variables in Octopus** (see [this issue](https://github.com/OctopusDeploy/Issues/issues/2126)). For example, use an abbreviated name of the step template or the category of the step template).
+- [ ] **Step template parameter names (the ones declared in `metadata.json`, not the script body) should be prefixed with a namespace so that they are less likely to clash with other user-defined variables in Octopus** (see [this issue](https://github.com/OctopusDeploy/Issues/issues/2126)). For example, use an abbreviated name of the step template or the category of the step template).
 - [ ] `LastModifiedBy` field must be present, and (_optionally_) updated with the correct author
 - [ ] The best practices documented [here](https://github.com/OctopusDeploy/Library/wiki/Best-Practices) have been applied
 - [ ] If a new `Category` has been created:
-   - [ ] An image with the name `{categoryname}.png` must be present under the `step-templates/logos` folder
+   - [ ] An image with the name `{categoryname}.png` must be present under the `src/step-templates/logos` folder
    - [ ] The `switch` in the `humanize` function in [`gulpfile.babel.js`](https://github.com/OctopusDeploy/Library/blob/master/gulpfile.babel.js#L92) must have a `case` statement corresponding to it
 
 Fixes # . _If there is an open issue that this PR fixes add it here, otherwise just remove this line_
diff --git a/README.md b/README.md
index 0144da7f4..47db76449 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,17 @@ Organization
 Source Layout
 -------------
 
+> [!IMPORTANT]
+> With `PRXXX`, how step templates are handled in this repository changed.
+>
+> Previously, step templates lived under `/step-templates` as `.json` files with packed source scripts embedded in them. That packed format is the format Octopus Deploy needs to consume step templates, but it made PR review difficult. Helper scripts for pack, unpack, and diff were added to assist with review, but Git history and blame still made it hard to understand how a template had changed over time.
+>
+> Starting with `PRXXX`, step templates are stored as source files under `/src/step-templates`. Each step template is now a collection of:
+> - `metadata.json`, which was `git mv`'d from `/step-templates` to retain Git history
+> - one or more unrolled script files such as `scriptbody.ps1`, `scriptbody.sh`, `scriptbody.py`, `predeploy.ps1`, `deploy.ps1`, or `postdeploy.ps1`
+>
+> A build step generates the `/step-templates/*.json` files so they remain available for compatibility with the website and Octopus consumers.
+
 The source-of-truth format for templates lives under `/src/step-templates`:
 
 * `/src/step-templates/<template>/metadata.json`
@@ -26,6 +37,20 @@ The source-of-truth format for templates lives under `/src/step-templates`:
 
 `metadata.json` keeps the exported template metadata and uses placeholders for script-backed properties. The real script text lives in sibling files so normal GitHub diffs stay readable.
 
+Creating or updating a template
+-------------------------------
+
+To update an existing template, edit the files in `/src/step-templates/<template>/`.
+
+To add a new template:
+
+1. Create a new folder under `/src/step-templates/<template>/`
+2. Add a `metadata.json` file
+3. Add `scriptbody.ps1|sh|py` and any optional staged script files that the template needs
+4. Add a category logo to `/src/step-templates/logos` if you introduce a new category
+
+Generated files under `/step-templates` are compatibility output for the website and Octopus consumers. They should not be hand-edited or committed.
+
 Contributing step templates or to the website
 ---------------------------------------------
 
@@ -36,7 +61,7 @@ Reviewing PRs
 
 ### Reviewing script changes
 
-For migrated templates, review the files under `/src/step-templates/<template>/` directly. Script changes now appear as normal file diffs instead of escaped JSON string blobs.
+Review the files under `/src/step-templates/<template>/` directly.
 
 ### Checklist
 
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 8643fcd08..d19d193f5 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -316,9 +316,12 @@ function provideMissingData() {
     var template = JSON.parse(fileContent);
     var pathParts = file.path.split("\\");
     var fileName = pathParts[pathParts.length - 1];
+    var templateName = fileName.replace(/\.json$/i, "");
+    var expectedHistoryUrl = "https://github.com/OctopusDeploy/Library/commits/master/src/step-templates/" + templateName;
+    var hasBrokenGeneratedHistoryUrl = template.HistoryUrl && (template.HistoryUrl.indexOf("/step-templates/") !== -1 || template.HistoryUrl.indexOf("/opt/") !== -1);
 
-    if (!template.HistoryUrl) {
-      template.HistoryUrl = "https://github.com/OctopusDeploy/Library/commits/master/step-templates/" + fileName;
+    if (!template.HistoryUrl || hasBrokenGeneratedHistoryUrl) {
+      template.HistoryUrl = expectedHistoryUrl;
     }
 
     if (!template.Website) {
diff --git a/package.json b/package.json
index 5f125a5fa..d473629f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "octopus-library",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "The site that powers library.octopus.com",
   "main": "server/server.js",
   "babel": {
diff --git a/plan.md b/plan.md
deleted file mode 100644
index a5b3b5eb7..000000000
--- a/plan.md
+++ /dev/null
@@ -1,215 +0,0 @@
-# Numbered Migration Plan For Source-First Step Templates
-
-## Summary
-
-This plan moves authored step templates and related authoring assets out of `step-templates/` and into `src/`, keeps `step-templates/*.json` as generated compatibility output, and updates `npm run dev` plus watch mode to regenerate packed JSON from source.
-
-The work lands as one PR, but execution is organized into a proof batch followed by migration batches of 100 templates each. Validation is strict: each migrated template must repack to a byte-identical match against its saved `.json.orig`.
-
-The existing pack and unpack scripts must not be altered. They remain the canonical mechanism for producing identical packed output. Any additional behavior needed for migration or the new source-first workflow should be implemented in separate helper scripts. Scripts that are temporary migration scaffolding should be clearly named with a `migration-` prefix.
-
-A key requirement during migration is that the dev workflow remains usable at every intermediate point. After the proof batch, after batch 100, and after any later batch, `npm run dev`, tests, and watch mode must continue to work by combining authored templates already moved into `src/` with any templates not yet migrated.
-
-## Numbered Steps
-
-1. Write this plan into `plan.md`.
-
-2. Define and document the new source contract under `src/`:
-   - `src/step-templates/<template>/metadata.json`
-   - `src/step-templates/<template>/scriptbody.<ext>`
-   - optional `predeploy.ps1`, `deploy.ps1`, `postdeploy.ps1`
-   - placeholder values in `metadata.json` for script-backed properties
-   - move shared authoring assets from `step-templates/logos` to `src/step-templates/logos`
-   - move template tests from `step-templates/tests` to `src/step-templates/tests`
-
-3. Preserve the existing packing and unpacking behavior unchanged:
-   - do not modify `tools/_pack.ps1`
-   - do not modify `tools/_unpack.ps1`
-   - do not modify the existing `StepTemplatePacker` import/export logic
-   - treat those scripts as the source of truth for byte-identical repacking and diff validation
-
-4. Inventory existing helper scripts and classify them:
-   - keep scripts still needed after migration
-   - mark temporary migration-only scripts with `migration-` prefixes
-   - identify scripts that become obsolete once source files are first-class
-   - explicitly evaluate `_diff.ps1` and any related review/extraction helpers for removal
-   - plan README/docs updates around the retained and removed scripts
-
-5. Update `.gitignore` so `step-templates/` is treated as generated output only when the migration is complete:
-   - prepare ignore rules for generated `step-templates/*.json`
-   - ignore temporary `step-templates/*.json.orig`
-   - ensure no newly generated files under `step-templates/` are accidentally checked in once cutover is complete
-   - keep migration-safe behavior while legacy tracked JSON still exists during intermediate batches inside the PR
-
-6. Create helper scripts for the new workflow without changing the old ones:
-   - create permanent source-to-generated helper scripts for dev and watch flows
-   - create temporary `migration-*` scripts for prepare, verify, batch migration, and cleanup work
-   - keep permanent and migration-only responsibilities clearly separated
-
-7. Implement permanent helper tooling that supports mixed migration state while still using the existing packer:
-   - treat `src/step-templates/*` as authoritative for migrated templates
-   - treat legacy `step-templates/*.json` as the source for templates not yet migrated
-   - generate or refresh packed `step-templates/*.json` only for templates that already exist in `src/`
-   - leave untouched legacy packed JSON in place for templates not yet migrated
-   - stage source template material into the temporary legacy layout expected by the unchanged packer
-   - stage logos and test assets into the generated layout as needed for existing validation/build logic
-   - support generating all migrated templates for dev startup
-   - support generating a single migrated template for watch mode
-
-8. Implement migration-only prepare tooling in `migration-*` scripts for a single template:
-   - copy `step-templates/<template>.json` to `step-templates/<template>.json.orig`
-   - `git mv` `step-templates/<template>.json` to `src/step-templates/<template>/metadata.json`
-   - use the existing unpack behavior to extract scripts without changing its implementation
-   - move or normalize unpacked outputs into the final source folder layout
-   - replace embedded script values in `metadata.json` with placeholders
-
-9. Implement migration-only validation tooling in `migration-*` scripts for a single template:
-   - reconstruct the temporary legacy layout needed by the unchanged packer
-   - invoke the existing pack behavior to regenerate `step-templates/<template>.json`
-   - diff regenerated `step-templates/<template>.json` against `step-templates/<template>.json.orig`
-   - fail unless they are identical apart from the accepted normalization differences:
-     - `"$Meta.ExportedAt"` may be reformatted by the unchanged packer
-     - a single trailing newline at end of file may be added or removed
-   - remove `.json.orig` only after validation succeeds
-
-10. Update dev/build behavior so `npm run dev` works throughout migration:
-   - on startup, regenerate packed JSON for all templates currently authored under `src/step-templates/*`
-   - keep unmigrated legacy JSON files available in `step-templates/`
-   - then run the existing build pipeline against the complete effective packed set
-   - ensure this works after the proof batch, after batch 100, and at every later partial-migration checkpoint
-
-11. Update watch behavior so hot reloading works throughout migration:
-   - changes under `src/step-templates/**/*` regenerate only the corresponding migrated packed template, then rerun downstream aggregate/site generation
-   - changes to unmigrated legacy `step-templates/*.json` continue to work until those templates are migrated
-   - shared asset changes such as logos or test helpers trigger the smallest safe regeneration scope
-   - the site reload behavior should remain functional regardless of how many templates have already moved to `src/`
-
-12. Update validation/tests to align with the migration-safe source-first model:
-   - validations continue to run against the effective packed `step-templates/*.json` set
-   - any test paths that currently point at `step-templates/tests` are updated to use `src/step-templates/tests` as the authored location
-   - generated validation inputs are reconstructed as needed for unchanged pack/unpack compatibility
-   - test and dev commands must pass in mixed-state migration checkpoints, not only after final cutover
-
-13. Scan the repo and select the initial proof batch to cover migration edge cases:
-   - template with no `ScriptBody`
-   - template with non-PowerShell `ScriptBody`
-   - template with `ScriptBody` plus custom staged scripts
-   - template with only staged scripts if one exists
-   - template with unusual or metadata-heavy structure if one exists
-
-14. Migrate the proof batch using the full prepare, pack, diff, and cleanup workflow until every proof template passes strict `.json.orig` validation.
-
-15. Verify the migration-safe developer workflow immediately after the proof batch:
-   - run dev startup with only the proof templates in `src/`
-   - confirm generated packed JSON is created for proof templates
-   - confirm unmigrated legacy templates still participate in the site build
-   - confirm tests still pass
-   - confirm watch mode and hot reload still work
-
-16. Review the proof batch results and lock any required naming, placeholder, helper-script, or workflow adjustments before bulk migration begins.
-
-17. Migrate the remaining templates in batches of 100:
-   - for each batch, prepare every template with `.json.orig`
-   - `git mv` into `src/step-templates/<template>/metadata.json`
-   - unpack script files and replace metadata script values with placeholders
-   - regenerate packed JSON through helper scripts that rely on the unchanged packer
-   - diff each regenerated packed file against its `.json.orig`
-   - verify dev startup, tests, and hot reload still work with the repo in its new mixed-state checkpoint
-   - do not proceed to the next batch until the full current batch validates cleanly
-
-18. Migrate shared non-template authoring assets:
-   - move `step-templates/logos` to `src/step-templates/logos`
-   - move `step-templates/tests` to `src/step-templates/tests`
-   - update any build, validation, or helper script references to the new authored locations
-   - ensure generated layout still provides whatever the unchanged validation/build path expects
-
-19. Update README and contributor docs to reflect both the migration period and the final workflow:
-   - explain that migrated templates live in `src/step-templates/*`
-   - explain that unmigrated templates may temporarily still exist in legacy form during the migration
-   - explain that `npm run dev` and watch mode support both states during the transition
-   - explain that `step-templates/*.json` becomes generated output after full cutover
-   - document the permanent helper scripts used for generation and watch mode
-   - document temporary `migration-*` scripts and note they are disposable after migration
-   - remove review guidance that depends on unpacking JSON blobs for diffs once full cutover is complete
-
-20. Remove or retire obsolete tooling and documentation after the migration is proven:
-   - remove `_diff.ps1` if it is no longer needed
-   - evaluate other pack/unpack-adjacent utilities and remove any that only existed to work around unreadable JSON diffs
-   - keep unchanged pack/unpack scripts and any permanent source-to-generated helpers still required post-migration
-   - update docs so only supported scripts remain documented
-
-21. Perform final cutover after the last migration batch:
-   - confirm all templates now exist under `src/step-templates/*`
-   - switch `.gitignore` and workflow assumptions fully to generated-only `step-templates/*.json`
-   - ensure no legacy authored template JSON remains outside generated output
-
-22. After all batches and asset moves are complete, run full generation and repo-wide validation to confirm every packed JSON file is reproducible from `src/step-templates/*`.
-
-23. Finalize the PR state:
-   - ensure `src/step-templates/*` is the only authored source
-   - ensure packed `step-templates/*.json` are generated and untracked
-   - ensure `.json.orig` files are removed
-   - ensure docs and dev workflow reflect the new model
-   - retain only the helper scripts needed after migration
-   - remove temporary `migration-*` scripts and obsolete review helpers that are no longer needed
-
-## Script Roles
-
-- Permanent scripts:
-  - source-to-generated helper scripts needed for `npm run dev`, watch mode, and ongoing local authoring
-  - unchanged legacy pack/unpack scripts still used for byte-identical generation
-- Migration-only scripts:
-  - must be clearly named with `migration-` prefixes
-  - include prepare, verify, batch migration, and cleanup helpers
-  - may be deleted after the migration is complete
-- Obsolete scripts to evaluate for removal:
-  - `_diff.ps1` is expected to become unnecessary because GitHub diffs become readable from real source files
-  - any other script whose purpose was to compensate for embedded JSON script blobs should be reviewed for removal
-
-## Public Interfaces And Behavior
-
-- New authored source layout:
-  - `src/step-templates/<template>/metadata.json`
-  - `src/step-templates/<template>/scriptbody.<ext>`
-  - optional staged script files
-  - `src/step-templates/logos`
-  - `src/step-templates/tests`
-- Existing runtime/site interface remains unchanged:
-  - the site still consumes packed JSON from `step-templates/*.json`
-- Contributor workflow changes:
-  - contributors edit migrated templates in `src/step-templates/*`
-  - contributors may still encounter unmigrated legacy JSON during the migration window inside the PR
-  - contributors no longer need special diff tooling for migrated templates
-  - contributors rely on generation and validation tooling for round-trip safety
-- Existing pack/unpack commands remain behaviorally unchanged:
-  - helper scripts wrap them rather than replacing or editing them
-
-## Test Plan
-
-- Verify generation from migrated templates in `src/step-templates/*` produces valid packed `step-templates/*.json`
-- Verify the proof batch covers the intended edge cases and every template matches its `.json.orig` exactly after repack
-- Verify each 100-template migration batch passes strict `.json.orig` validation before the next batch starts
-- Verify `npm run dev` works after the proof batch, after batch 100, and after every later batch checkpoint
-- Verify hot reload works for migrated templates in `src/step-templates/*` throughout the migration
-- Verify unmigrated legacy templates continue to participate in dev/test/build until they are migrated
-- Verify `.gitignore` prevents newly generated files in `step-templates/` from being staged unintentionally at final cutover
-- Verify shared asset changes in `src/step-templates/logos` and `src/step-templates/tests` trigger the correct downstream regeneration
-- Verify existing validations still pass against the effective packed outputs
-- Verify existing pack/unpack behavior is unchanged and still produces identical files for diffing
-- Verify `_diff.ps1` and any other obsolete review helpers can be removed without losing required workflow support
-- Verify `.orig` artifacts are temporary, untracked, and removed after successful validation
-- Verify temporary `migration-*` scripts can be removed without affecting the post-migration dev workflow
-
-## Assumptions And Defaults
-
-- This remains one cutover PR composed of smaller commits
-- The proof batch comes first, and subsequent migration batches are fixed at 100 templates each
-- During migration, the repo must support a mixed state where some templates are authored in `src/step-templates/*` and others remain as legacy JSON
-- `metadata.json` uses placeholders for script-backed properties
-- Packed JSON equivalence is strict apart from two accepted normalization differences:
-  - `"$Meta.ExportedAt"` may be rewritten into the unchanged packer's normalized format
-  - a single trailing newline at end of file may differ
-- `step-templates/` becomes generated-only after final cutover, not before the last migrated batch is complete
-- Shared authoring assets currently under `step-templates/logos` and `step-templates/tests` move to `src/step-templates/`
-- `.json.orig` files are local migration artifacts only and are never committed
-- Existing pack/unpack scripts remain unchanged; all new behavior is introduced through helper scripts around them
diff --git a/progress-src-step-templates-legacy-clean.md b/progress-src-step-templates-legacy-clean.md
deleted file mode 100644
index 0f7f76e12..000000000
--- a/progress-src-step-templates-legacy-clean.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Progress Handoff: `src-step-templates-legacy-clean`
-
-## Purpose
-
-This branch is migrating legacy step template authoring away from packed files in `step-templates/*.json` and into source folders under `src/step-templates/<template-name>/`.
-
-The target shape for a migrated template is:
-
-- `src/step-templates/<template-name>/metadata.json`
-- optional `scriptbody.ps1`
-- optional `scriptbody.sh`
-- optional `scriptbody.py`
-- optional `predeploy.ps1`
-- optional `deploy.ps1`
-- optional `postdeploy.ps1`
-
-## What Was Done
-
-The branch added infrastructure and migrated an initial set of script-bearing templates in batches.
-
-Key commits on that branch at the time of this handoff:
-
-- `dc7e4979` Add legacy-backed step-template source infrastructure
-- `d6d73b62` Add step-template migration verification helpers
-- `e1dcec3b` Move proof set metadata into source root
-- `d1c13e56` Extract proof set source files into source root
-- `72ac72b3` Move script-bearing batch 1 metadata into source root
-- `19c21070` Extract script-bearing batch 1 source files into source root
-- `c0f16dd0` Move script-bearing batch 2 metadata into source root
-- `12347221` Extract script-bearing batch 2 source files into source root
-- `e71d0c46` Ignore temporary `.tmp*` folders
-
-## Reconstructed Workflow Used On That Branch
-
-The branch introduced and used these scripts:
-
-- `tools/Prepare-StepTemplateSourceOriginals.ps1`
-- `tools/Pack-SourceStepTemplates.ps1`
-- `tools/Finalize-StepTemplateSourceMigration.ps1`
-
-Operational flow:
-
-1. Prepare a template by exporting legacy script bodies out of `step-templates/<name>.json`.
-2. Move the template metadata into `src/step-templates/<name>/metadata.json`.
-3. Store script content as real files in the template folder.
-4. Pack from source back into legacy layout and verify the output still round-trips.
-5. Finalize by removing embedded script properties from `metadata.json` after the extracted files are confirmed.
-
-## State At Time Of Handoff
-
-Counts observed while inspecting the branch:
-
-- `step-templates/*.json`: `584`
-- `src/step-templates/<template>/metadata.json`: `212`
-- remaining legacy-only templates: `372`
-
-Additional observations:
-
-- `212` migrated template folders already had extracted script files.
-- Exactly one migrated template still appeared partially finalized:
-  - `src/step-templates/azure-function-deployment/metadata.json`
-  - still contained:
-    - `Octopus.Action.CustomScripts.PreDeploy.ps1`
-    - `Octopus.Action.CustomScripts.Deploy.ps1`
-
-## Recommended Next Actions On That Branch
-
-1. Finalize `azure-function-deployment` so its metadata no longer carries embedded custom script properties.
-2. Choose the next migration batch from the `372` legacy-only templates.
-3. Repeat the same metadata move, extraction, pack verification, and finalize sequence.
-4. Continue until `src/step-templates` becomes the complete source of truth for all templates.
-
-## Notes For Continuing On Another Machine
-
-If resuming this work elsewhere:
-
-- check out `src-step-templates-legacy-clean`
-- read this file first
-- inspect the three migration scripts above
-- verify the current counts before starting the next batch
-- use small batches and validate each one before moving on
diff --git a/spec/step-template-validation-tests.js b/spec/step-template-validation-tests.js
index d04ec1238..d0e93a3ef 100644
--- a/spec/step-template-validation-tests.js
+++ b/spec/step-template-validation-tests.js
@@ -110,8 +110,7 @@ describe("step-templates", function () {
 
       var otherThings = results.filter(function (file) {
         var jsonFile = file.endsWith(".json");
-        var jsonOrigFile = file.endsWith(".json.orig");
-        return !jsonFile && !jsonOrigFile;
+        return !jsonFile;
       });
       expect(otherThings).toEqual([]);
       done();
diff --git a/tools/README.md b/tools/README.md
index 3ecbdf71e..38ebecc9d 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -34,6 +34,7 @@ Retained legacy utilities
 
 These remain for compatibility and round-trip fidelity:
 
+* `_diff.ps1`
 * `_pack.ps1`
 * `_unpack.ps1`
 * `Converter.ps1`
diff --git a/tools/_diff.ps1 b/tools/_diff.ps1
new file mode 100644
index 000000000..8e66e9939
--- /dev/null
+++ b/tools/_diff.ps1
@@ -0,0 +1,91 @@
+param
+(
+    [Parameter(Mandatory=$true)]
+    [string] $SearchPattern,
+
+    [Parameter(Mandatory=$false)]
+    [string] $CompareWith = "HEAD~1",
+
+    [Parameter(Mandatory=$false)]
+    [string] $OutputFolder = "diff-output"
+)
+
+$ErrorActionPreference = "Stop";
+Set-StrictMode -Version "Latest";
+
+$thisScript  = $MyInvocation.MyCommand.Path;
+$thisFolder  = [System.IO.Path]::GetDirectoryName($thisScript);
+$repoRoot    = [System.IO.Path]::GetDirectoryName($thisFolder);
+
+$stepTemplateFolder = [System.IO.Path]::Combine($repoRoot, "step-templates");
+$stepTemplates = [System.IO.Directory]::GetFiles($stepTemplateFolder, "$SearchPattern.json");
+
+if ($stepTemplates.Length -eq 0)
+{
+    Write-Error "No step templates found matching '$SearchPattern'";
+    return;
+}
+
+Import-Module -Name ([System.IO.Path]::Combine($thisFolder, "StepTemplatePacker")) -ErrorAction "Stop";
+
+$outputPath = [System.IO.Path]::Combine($repoRoot, $OutputFolder);
+if (-not (Test-Path $outputPath))
+{
+    New-Item -ItemType Directory -Path $outputPath | Out-Null;
+}
+
+$scriptProperties = @(
+    @{ Name = "ScriptBody"; Property = "Octopus.Action.Script.ScriptBody" },
+    @{ Name = "PreDeploy";  Property = "Octopus.Action.CustomScripts.PreDeploy.ps1" },
+    @{ Name = "Deploy";     Property = "Octopus.Action.CustomScripts.Deploy.ps1" },
+    @{ Name = "PostDeploy"; Property = "Octopus.Action.CustomScripts.PostDeploy.ps1" }
+)
+
+foreach ($stepTemplate in $stepTemplates)
+{
+    $relativePath = "step-templates/$([System.IO.Path]::GetFileName($stepTemplate))";
+    $templateName = [System.IO.Path]::GetFileNameWithoutExtension($stepTemplate);
+
+    $oldJson = $null;
+    try
+    {
+        $oldText = git show "${CompareWith}:${relativePath}" 2>$null;
+        if ($LASTEXITCODE -eq 0 -and $oldText)
+        {
+            $oldJson = ConvertFrom-Json -InputObject ($oldText -join "`n");
+        }
+    }
+    catch
+    {
+        Write-Host "No previous version found for '$templateName' at $CompareWith" -ForegroundColor Yellow;
+        continue;
+    }
+
+    $newText = Get-Content -Path $stepTemplate -Raw;
+    $newJson = ConvertFrom-Json -InputObject $newText;
+
+    # Get file extension from syntax
+    $syntax = Get-OctopusStepTemplateProperty -StepJson $newJson -PropertyName "Octopus.Action.Script.Syntax" -DefaultValue "PowerShell";
+    $fileType = Get-OctopusStepTemplateFileType -Syntax $syntax;
+
+    foreach ($prop in $scriptProperties)
+    {
+        $oldValue = Get-OctopusStepTemplateProperty -StepJson $oldJson -PropertyName $prop.Property;
+        $newValue = Get-OctopusStepTemplateProperty -StepJson $newJson -PropertyName $prop.Property;
+
+        if ([string]::IsNullOrEmpty($oldValue) -and [string]::IsNullOrEmpty($newValue)) { continue; }
+
+        $oldFile = [System.IO.Path]::Combine($outputPath, "$templateName.$($prop.Name).old$fileType");
+        $newFile = [System.IO.Path]::Combine($outputPath, "$templateName.$($prop.Name).new$fileType");
+
+        Set-Content -Path $oldFile -Value $oldValue -NoNewline;
+        Set-Content -Path $newFile -Value $newValue -NoNewline;
+
+        Write-Host "Created: $($prop.Name)" -ForegroundColor Cyan;
+        Write-Host "  Old: $oldFile";
+        Write-Host "  New: $newFile";
+    }
+}
+
+Write-Host "";
+Write-Host "Files written to: $outputPath" -ForegroundColor Green;
diff --git a/tools/source-step-template-lib.js b/tools/source-step-template-lib.js
index 02804e8e7..94e97c87a 100644
--- a/tools/source-step-template-lib.js
+++ b/tools/source-step-template-lib.js
@@ -61,10 +61,6 @@ function getLegacyJsonPath(templateName) {
   return path.join(legacyRoot, `${normalizeTemplateName(templateName)}.json`);
 }
 
-function getLegacyOrigPath(templateName) {
-  return path.join(legacyRoot, `${normalizeTemplateName(templateName)}.json.orig`);
-}
-
 function getPowerShellCommand() {
   return process.env.PWSH_PATH || "pwsh";
 }
@@ -80,10 +76,6 @@ function runPack(templateName) {
   runPowerShellScript(path.join(repoRoot, "tools", "_pack.ps1"), ["-SearchPattern", normalizeTemplateName(templateName)]);
 }
 
-function runUnpack(templateName) {
-  runPowerShellScript(path.join(repoRoot, "tools", "_unpack.ps1"), ["-SearchPattern", normalizeTemplateName(templateName), "-Force"]);
-}
-
 function listMigratedTemplates() {
   if (!isDirectory(sourceRoot)) {
     return [];
@@ -97,18 +89,6 @@ function listMigratedTemplates() {
     .sort();
 }
 
-function listLegacyTemplates() {
-  if (!isDirectory(legacyRoot)) {
-    return [];
-  }
-
-  return fs
-    .readdirSync(legacyRoot)
-    .filter((entry) => entry.endsWith(".json"))
-    .map((entry) => entry.replace(/\.json$/i, ""))
-    .sort();
-}
-
 function readJson(jsonPath) {
   return JSON.parse(fs.readFileSync(jsonPath, "utf8"));
 }
@@ -230,83 +210,24 @@ function inferTemplateNameFromSourcePath(changedPath) {
   return { type: "template", templateName: firstSegment };
 }
 
-function updateMetadataWithPlaceholders(templateName) {
-  const metadataPath = getMetadataPath(templateName);
-  const templateDirectory = getSourceTemplateDirectory(templateName);
-  const metadata = readJson(metadataPath);
-  metadata.Properties = metadata.Properties || {};
-
-  for (const definition of scriptDefinitions) {
-    const sourceFileName = getScriptSourceFileName(templateDirectory, definition);
-    if (!sourceFileName) {
-      continue;
-    }
-
-    metadata.Properties[definition.propertyName] = setPlaceholderValue(sourceFileName);
-  }
-
-  writeJson(metadataPath, metadata);
-}
-
-function moveExtractedSidecarsIntoSource(templateName) {
-  const templateDirectory = getSourceTemplateDirectory(templateName);
-  ensureDirectory(templateDirectory);
-
-  for (const definition of scriptDefinitions) {
-    for (const suffix of definition.legacySuffixes) {
-      const legacyPath = path.join(legacyRoot, `${normalizeTemplateName(templateName)}${suffix}`);
-      if (!fs.existsSync(legacyPath)) {
-        continue;
-      }
-
-      const extension = path.extname(legacyPath);
-      const destinationPath = path.join(templateDirectory, `${definition.sourceBaseName}${extension}`);
-      fs.renameSync(legacyPath, destinationPath);
-    }
-  }
-}
-
-function compareGeneratedToOrig(templateName) {
-  const generatedPath = getLegacyJsonPath(templateName);
-  const originalPath = getLegacyOrigPath(templateName);
-  const generated = readJson(generatedPath);
-  const original = readJson(originalPath);
-
-  if (generated.$Meta && original.$Meta) {
-    if (Object.prototype.hasOwnProperty.call(generated.$Meta, "ExportedAt") && Object.prototype.hasOwnProperty.call(original.$Meta, "ExportedAt")) {
-      original.$Meta.ExportedAt = generated.$Meta.ExportedAt;
-    }
-  }
-
-  const normalizedGenerated = `${JSON.stringify(generated, null, 2)}\n`;
-  const normalizedOriginal = `${JSON.stringify(original, null, 2)}\n`;
-  return normalizedGenerated === normalizedOriginal;
-}
-
 module.exports = {
   cleanGeneratedSidecars,
-  compareGeneratedToOrig,
   ensureDirectory,
   generateAllMigratedTemplates,
   generateTemplate,
   getLegacyJsonPath,
-  getLegacyOrigPath,
   getMetadataPath,
   getSourceTemplateDirectory,
   inferTemplateNameFromSourcePath,
   legacyRoot,
-  listLegacyTemplates,
   listMigratedTemplates,
-  moveExtractedSidecarsIntoSource,
   normalizeTemplateName,
   placeholderPrefix,
   readJson,
   repoRoot,
   runPack,
-  runUnpack,
   scriptDefinitions,
   setPlaceholderValue,
   sourceRoot,
-  updateMetadataWithPlaceholders,
   writeJson,
 };

From 3ae381606d15bb163b0f89e55ea82177e69a9d14 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 13:13:47 -0700
Subject: [PATCH 15/21] chore: simplify generated step-templates ignore rules

---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3448812dd..7813b9105 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,7 @@ junitresults.xml
 scriptcs_packages/
 scriptcs_packages.config
 
-step-templates/*.ps1
-step-templates/*.sh
-step-templates/*.py
-step-templates/*.json.orig
-step-templates/*.json
+step-templates/*
 diff-output/
 .tmp*/
 /.vs

From c896e730a0e72ada96f3e10d1ba7aca2c1480d0e Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 13:28:55 -0700
Subject: [PATCH 16/21] perf: speed up step template generation

---
 gulpfile.babel.js                 | 38 +++++++++++++++----------------
 tools/source-step-template-lib.js | 36 +++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index d19d193f5..d5e9f925b 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -94,6 +94,7 @@ gulp.task("prepare:step-templates", (done) => {
   generateAllMigratedTemplates();
   done();
 });
+
 gulp.task("lint:step-templates", () => {
   return gulp
     .src("./step-templates/*.json")
@@ -103,25 +104,24 @@ gulp.task("lint:step-templates", () => {
     .pipe(jsonlint.reporter());
 });
 
-gulp.task(
-  "tests",
-  gulp.series("prepare:step-templates", "lint:step-templates", () => {
-    return (
-      gulp
-        .src("./spec/*-tests.js")
-        // gulp-jasmine works on filepaths so you can't have any plugins before it
-        .pipe(
-          jasmine({
-            includeStackTrace: false,
-            reporter: [new jasmineReporters.JUnitXmlReporter(), process.env.TEAMCITY_VERSION ? new jasmineReporters.TeamCityReporter() : new jasmineTerminalReporter()],
-          })
-        )
-        .on("error", function () {
-          process.exit(1);
+gulp.task("test:step-templates", () => {
+  return (
+    gulp
+      .src("./spec/*-tests.js")
+      // gulp-jasmine works on filepaths so you can't have any plugins before it
+      .pipe(
+        jasmine({
+          includeStackTrace: false,
+          reporter: [new jasmineReporters.JUnitXmlReporter(), process.env.TEAMCITY_VERSION ? new jasmineReporters.TeamCityReporter() : new jasmineTerminalReporter()],
         })
-    );
-  })
-);
+      )
+      .on("error", function () {
+        process.exit(1);
+      })
+  );
+});
+
+gulp.task("tests", gulp.series("prepare:step-templates", "lint:step-templates", "test:step-templates"));
 
 function humanize(categoryId) {
   switch (categoryId) {
@@ -357,7 +357,7 @@ gulp.task("step-templates:data", () => {
     .pipe(argv.production ? gulp.dest(`${publishDir}/app/services`) : gulp.dest(`${buildDir}/app/services`));
 });
 
-gulp.task("step-templates", gulp.series("tests", "step-templates:data"));
+gulp.task("step-templates", gulp.series("prepare:step-templates", "lint:step-templates", "test:step-templates", "step-templates:data"));
 
 gulp.task("styles:vendor", () => {
   return gulp.src(vendorStyles, { base: "node_modules/" }).pipe(argv.production ? gulp.dest(`${publishDir}/public/styles/vendor`) : gulp.dest(`${buildDir}/public/styles/vendor`));
diff --git a/tools/source-step-template-lib.js b/tools/source-step-template-lib.js
index 94e97c87a..8fc6e7b0c 100644
--- a/tools/source-step-template-lib.js
+++ b/tools/source-step-template-lib.js
@@ -76,6 +76,10 @@ function runPack(templateName) {
   runPowerShellScript(path.join(repoRoot, "tools", "_pack.ps1"), ["-SearchPattern", normalizeTemplateName(templateName)]);
 }
 
+function runPackAll() {
+  runPowerShellScript(path.join(repoRoot, "tools", "_pack.ps1"));
+}
+
 function listMigratedTemplates() {
   if (!isDirectory(sourceRoot)) {
     return [];
@@ -137,6 +141,12 @@ function cleanGeneratedSidecars(templateName) {
   }
 }
 
+function cleanGeneratedSidecarsForTemplates(templateNames) {
+  for (const templateName of templateNames) {
+    cleanGeneratedSidecars(templateName);
+  }
+}
+
 function materializeLegacyTemplate(templateName) {
   const normalizedName = normalizeTemplateName(templateName);
   const templateDirectory = getSourceTemplateDirectory(normalizedName);
@@ -163,6 +173,18 @@ function materializeLegacyTemplate(templateName) {
   return true;
 }
 
+function materializeLegacyTemplates(templateNames) {
+  const materializedTemplateNames = [];
+
+  for (const templateName of templateNames) {
+    if (materializeLegacyTemplate(templateName)) {
+      materializedTemplateNames.push(normalizeTemplateName(templateName));
+    }
+  }
+
+  return materializedTemplateNames;
+}
+
 function generateTemplate(templateName) {
   const normalizedName = normalizeTemplateName(templateName);
   const generated = materializeLegacyTemplate(normalizedName);
@@ -180,9 +202,18 @@ function generateTemplate(templateName) {
 }
 
 function generateAllMigratedTemplates() {
-  for (const templateName of listMigratedTemplates()) {
-    generateTemplate(templateName);
+  const templateNames = materializeLegacyTemplates(listMigratedTemplates());
+  if (templateNames.length === 0) {
+    return false;
   }
+
+  try {
+    runPackAll();
+  } finally {
+    cleanGeneratedSidecarsForTemplates(templateNames);
+  }
+
+  return true;
 }
 
 function inferTemplateNameFromSourcePath(changedPath) {
@@ -226,6 +257,7 @@ module.exports = {
   readJson,
   repoRoot,
   runPack,
+  runPackAll,
   scriptDefinitions,
   setPlaceholderValue,
   sourceRoot,

From c077df675bfb49904fc691f594067190eb6947a4 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 13:38:12 -0700
Subject: [PATCH 17/21] fix: reload dev pages after step template changes

---
 gulpfile.babel.js      | 3 +++
 server/server.js       | 2 ++
 server/views/index.pug | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index d5e9f925b..7c0cb133f 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -467,7 +467,10 @@ gulp.task(
       gulp.series("step-templates:data")((error) => {
         if (error) {
           log.error(error);
+          return;
         }
+
+        reload();
       });
     });
 
diff --git a/server/server.js b/server/server.js
index a219f0ac3..92021e31b 100644
--- a/server/server.js
+++ b/server/server.js
@@ -74,11 +74,13 @@ app.get("*", (req, res) => {
 
         LibraryActions.sendTemplates(data, () => {
           var libraryAppHtml = ReactDOMServer.renderToStaticMarkup(<RouterContext {...renderProps} />);
+          const browserSyncClientUrl = process.env.NODE_ENV === "development" ? `${req.protocol}://${req.hostname}:3000/browser-sync/browser-sync-client.js` : null;
           res.render("index", {
             siteKeywords: config.keywords.join(),
             siteDescription: config.description,
             reactOutput: libraryAppHtml,
             stepTemplates: JSON.stringify(data),
+            browserSyncClientUrl,
           });
         });
       });
diff --git a/server/views/index.pug b/server/views/index.pug
index 7e5d21571..4732d1874 100644
--- a/server/views/index.pug
+++ b/server/views/index.pug
@@ -46,5 +46,8 @@ html
 
       ga('create', 'UA-24461753-5', 'octopusdeploy.com');
 
+    if browserSyncClientUrl
+      script(type='text/javascript', async=true, src=browserSyncClientUrl)
+
     //- inject:js
     //- endinject

From c6913f9e0d3efd7cd752e1af4ca1cabb68ea8fa5 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 13:43:24 -0700
Subject: [PATCH 18/21] fix: open dev app on the primary server port

---
 gulpfile.babel.js | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 7c0cb133f..5ddd06e74 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -32,7 +32,7 @@ import eventStream from "event-stream";
 import fs from "fs";
 import jsonlint from "gulp-jsonlint";
 import path from "path";
-import { execFileSync } from "child_process";
+import { execFileSync, spawn } from "child_process";
 
 const sass = gulpSass(dartSass);
 const clientDir = "app";
@@ -66,6 +66,24 @@ function generateFromChangedSourcePath(changedPath) {
   runStepTemplateGenerator(["changed-path", changedPath]);
 }
 
+function openBrowser(url) {
+  if (process.env.CI) {
+    return;
+  }
+
+  if (process.platform === "darwin") {
+    spawn("open", [url], { detached: true, stdio: "ignore" }).unref();
+    return;
+  }
+
+  if (process.platform === "win32") {
+    spawn("cmd", ["/c", "start", "", url], { detached: true, stdio: "ignore" }).unref();
+    return;
+  }
+
+  spawn("xdg-open", [url], { detached: true, stdio: "ignore" }).unref();
+}
+
 const vendorStyles = [
   "node_modules/font-awesome/css/font-awesome.min.css",
   "node_modules/font-awesome/css/font-awesome.css.map",
@@ -450,9 +468,16 @@ gulp.task(
     server.start();
     process.chdir(`../`);
 
-    browserSync.init(null, {
-      proxy: "http://localhost:9000",
-    });
+    browserSync.init(
+      null,
+      {
+        proxy: "http://localhost:9000",
+        open: false,
+      },
+      () => {
+        openBrowser("http://localhost:9000");
+      }
+    );
 
     gulp.watch(`${clientDir}/**/*.jade`, gulp.series("build:client"));
     gulp.watch(`${clientDir}/**/*.jsx`, gulp.series("scripts", "copy:app"));

From 066f541703065107a07e943d9e2ca06b1da1eae0 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 14:29:15 -0700
Subject: [PATCH 19/21] fix: correct history links in the library UI

---
 app/components/TemplateItem.jsx | 16 +++++++++++++++-
 gulpfile.babel.js               | 10 +++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/components/TemplateItem.jsx b/app/components/TemplateItem.jsx
index 20aaf8cd6..9ffde9d7f 100644
--- a/app/components/TemplateItem.jsx
+++ b/app/components/TemplateItem.jsx
@@ -54,6 +54,20 @@ export default class TemplateItem extends React.Component {
     });
   }
 
+  openHistory(event) {
+    event.preventDefault();
+
+    const historyUrl = this.state.template && this.state.template.HistoryUrl;
+    if (!historyUrl) {
+      return;
+    }
+
+    const historyWindow = window.open(historyUrl, "_blank", "noopener,noreferrer");
+    if (historyWindow) {
+      historyWindow.opener = null;
+    }
+  }
+
   getJsonBlobHeight() {
     if (this.state.showJsonBlob) {
       return "9000px";
@@ -114,7 +128,7 @@ export default class TemplateItem extends React.Component {
                 </SyntaxHighlighter>
               </div>
               <p className="align-right">
-                <a className="faint" href={this.state.template.HistoryUrl}>
+                <a className="faint" href={this.state.template.HistoryUrl} onClick={this.openHistory.bind(this)} rel="noopener noreferrer" target="_blank">
                   History &raquo;
                 </a>
               </p>
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 5ddd06e74..5c12ef5bd 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -332,8 +332,7 @@ function provideMissingData() {
   return eventStream.map(function (file, cb) {
     var fileContent = file.contents.toString();
     var template = JSON.parse(fileContent);
-    var pathParts = file.path.split("\\");
-    var fileName = pathParts[pathParts.length - 1];
+    var fileName = path.basename(file.path);
     var templateName = fileName.replace(/\.json$/i, "");
     var expectedHistoryUrl = "https://github.com/OctopusDeploy/Library/commits/master/src/step-templates/" + templateName;
     var hasBrokenGeneratedHistoryUrl = template.HistoryUrl && (template.HistoryUrl.indexOf("/step-templates/") !== -1 || template.HistoryUrl.indexOf("/opt/") !== -1);
@@ -479,8 +478,13 @@ gulp.task(
       }
     );
 
+    function reloadServer(done) {
+      server.start.bind(server)();
+      done();
+    }
+
     gulp.watch(`${clientDir}/**/*.jade`, gulp.series("build:client"));
-    gulp.watch(`${clientDir}/**/*.jsx`, gulp.series("scripts", "copy:app"));
+    gulp.watch(`${clientDir}/**/*.jsx`, gulp.series("scripts", "copy:app", reloadServer));
     gulp.watch(`${clientDir}/content/styles/**/*.scss`, gulp.series("styles:client"));
     gulp.watch("step-templates/*.json", gulp.series("step-templates:data"));
     gulp.watch(`${sourceStepTemplatesDir}/**/*`).on("all", (eventName, changedPath) => {

From cd39931ddf9413a03f2a316a121ffa574bee93b0 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 18:33:11 -0700
Subject: [PATCH 20/21] refactor: simplify history link handling

---
 app/components/TemplateItem.jsx  | 16 +---------------
 tools/generate-step-templates.js |  6 +-----
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app/components/TemplateItem.jsx b/app/components/TemplateItem.jsx
index 9ffde9d7f..04e33d40b 100644
--- a/app/components/TemplateItem.jsx
+++ b/app/components/TemplateItem.jsx
@@ -54,20 +54,6 @@ export default class TemplateItem extends React.Component {
     });
   }
 
-  openHistory(event) {
-    event.preventDefault();
-
-    const historyUrl = this.state.template && this.state.template.HistoryUrl;
-    if (!historyUrl) {
-      return;
-    }
-
-    const historyWindow = window.open(historyUrl, "_blank", "noopener,noreferrer");
-    if (historyWindow) {
-      historyWindow.opener = null;
-    }
-  }
-
   getJsonBlobHeight() {
     if (this.state.showJsonBlob) {
       return "9000px";
@@ -128,7 +114,7 @@ export default class TemplateItem extends React.Component {
                 </SyntaxHighlighter>
               </div>
               <p className="align-right">
-                <a className="faint" href={this.state.template.HistoryUrl} onClick={this.openHistory.bind(this)} rel="noopener noreferrer" target="_blank">
+                <a className="faint" href={this.state.template.HistoryUrl} rel="noopener noreferrer" target="_blank">
                   History &raquo;
                 </a>
               </p>
diff --git a/tools/generate-step-templates.js b/tools/generate-step-templates.js
index a10edf8be..4e5128a8a 100644
--- a/tools/generate-step-templates.js
+++ b/tools/generate-step-templates.js
@@ -1,10 +1,6 @@
 "use strict";
 
-const {
-  generateAllMigratedTemplates,
-  generateTemplate,
-  inferTemplateNameFromSourcePath,
-} = require("./source-step-template-lib");
+const { generateAllMigratedTemplates, generateTemplate, inferTemplateNameFromSourcePath } = require("./source-step-template-lib");
 
 function main() {
   const [, , command = "all", value] = process.argv;

From fb8149093f9c089eaba92a2d12a5370c59835a18 Mon Sep 17 00:00:00 2001
From: bullman <brad@ullman.com>
Date: Sat, 28 Mar 2026 18:37:40 -0700
Subject: [PATCH 21/21] fix: wait for dev server before opening browser

---
 gulpfile.babel.js | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 5c12ef5bd..280b62849 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -30,6 +30,8 @@ import jasmineReporters from "jasmine-reporters";
 import jasmineTerminalReporter from "jasmine-terminal-reporter";
 import eventStream from "event-stream";
 import fs from "fs";
+import http from "http";
+import https from "https";
 import jsonlint from "gulp-jsonlint";
 import path from "path";
 import { execFileSync, spawn } from "child_process";
@@ -84,6 +86,36 @@ function openBrowser(url) {
   spawn("xdg-open", [url], { detached: true, stdio: "ignore" }).unref();
 }
 
+function waitForServer(url, { timeoutMs = 10000, pollIntervalMs = 200 } = {}) {
+  const parsedUrl = new URL(url);
+  const client = parsedUrl.protocol === "https:" ? https : http;
+  const startedAt = Date.now();
+
+  return new Promise((resolve) => {
+    function tryConnect() {
+      const request = client.get(url, (response) => {
+        response.resume();
+        resolve();
+      });
+
+      request.on("error", () => {
+        if (Date.now() - startedAt >= timeoutMs) {
+          resolve();
+          return;
+        }
+
+        setTimeout(tryConnect, pollIntervalMs);
+      });
+
+      request.setTimeout(pollIntervalMs, () => {
+        request.destroy();
+      });
+    }
+
+    tryConnect();
+  });
+}
+
 const vendorStyles = [
   "node_modules/font-awesome/css/font-awesome.min.css",
   "node_modules/font-awesome/css/font-awesome.css.map",
@@ -474,7 +506,9 @@ gulp.task(
         open: false,
       },
       () => {
-        openBrowser("http://localhost:9000");
+        waitForServer("http://localhost:9000").then(() => {
+          openBrowser("http://localhost:9000");
+        });
       }
     );